rusefi
/
rusefi
mirror of https://github.com/rusefi/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

auto-sync

This commit is contained in:
rusEfi 2015-03-14 22:08:42 -05:00
parent cf709cea5b
commit 7ef4f0a3c4
7 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/console/binary/tunerstudio_configuration.h
View File

@ -16,7 +16,7 @@
/**
* this is used to confirm that firmware and TunerStudio are using the same rusefi.ini version
*/
#define TS_FILE_VERSION 20150216
#define TS_FILE_VERSION 20150314
#define PAGE_COUNT 2

5
firmware/controllers/algo/engine_configuration.cpp
View File

@ -139,8 +139,6 @@ void setDefaultConfiguration(DECLARE_ENGINE_PARAMETER_F) {
memset(engineConfiguration, 0, sizeof(engine_configuration_s));
memset(boardConfiguration, 0, sizeof(board_configuration_s));
setDetaultVETable(PASS_ENGINE_PARAMETER_F);
boardConfiguration->mafSensorType = Bosch0280218037;
setBosch0280218037(engineConfiguration);
@ -192,9 +190,10 @@ void setDefaultConfiguration(DECLARE_ENGINE_PARAMETER_F) {
// set_whole_timing_map 3
setWholeFuelMap(3 PASS_ENGINE_PARAMETER);
setWholeVEMap(0.8 PASS_ENGINE_PARAMETER);
setMap(engineConfiguration->afrTable, 14.7);
setDetaultVETable(PASS_ENGINE_PARAMETER_F);
setMap(engineConfiguration->injectionPhase, -180);
setRpmTableBin(engineConfiguration->injPhaseRpmBins, FUEL_RPM_COUNT);
setTableBin2(engineConfiguration->injPhaseLoadBins, FUEL_LOAD_COUNT, 10, 300, 1);

2
firmware/controllers/flash_main.h
View File

@ -12,7 +12,7 @@
#include "engine_configuration.h"
#include "engine.h"
#define FLASH_DATA_VERSION 6667
#define FLASH_DATA_VERSION 7427
void readFromFlash(void);
void initFlash(Logging *sharedLogger, Engine *engine);

7
firmware/controllers/math/speed_density.cpp
View File

@ -86,7 +86,10 @@ float getSpeedDensityFuel(int rpm DECLARE_ENGINE_PARAMETER_S) {
float intakeC = engine->engineState.iat;
float tChargeK = convertCelsiusToKelvin(getTCharge(rpm, tps, coolantC, intakeC));
float map = getMap() + engine->accelEnrichment.getEnrichment(PASS_ENGINE_PARAMETER_F);
float VE = veMap.getValue(map, rpm);
/**
* *0.01 because of https://sourceforge.net/p/rusefi/tickets/153/
*/
float VE = veMap.getValue(map, rpm) * 0.01;
float AFR = afrMap.getValue(map, rpm);
return sdMath(engineConfiguration, VE, map, AFR, tChargeK) * 1000;
@ -95,7 +98,7 @@ float getSpeedDensityFuel(int rpm DECLARE_ENGINE_PARAMETER_S) {
void setDetaultVETable(DECLARE_ENGINE_PARAMETER_F) {
setRpmTableBin(engineConfiguration->veRpmBins, FUEL_RPM_COUNT);
setTableBin2(engineConfiguration->veLoadBins, FUEL_LOAD_COUNT, 10, 300, 1);
veMap.setAll(0.8);
veMap.setAll(80);
// setRpmTableBin(engineConfiguration->ve2RpmBins, FUEL_RPM_COUNT);
// setTableBin2(engineConfiguration->ve2LoadBins, FUEL_LOAD_COUNT, 10, 300, 1);

2
firmware/integration/rusefi_config.txt
View File

@ -39,7 +39,7 @@ struct engine_configuration_s
! please note that 1024 here is 4 * FUEL_RPM_COUNT * FUEL_LOAD_COUNT
custom fuel_table_t 1024 array, F32, @OFFSET@, [16x16],"ms", 1, 0, 0.0, 300.0, 2
custom ve_table_t 1024 array, F32, @OFFSET@, [16x16],"%", 100, 0, 0, 100.0, 2
custom ve_table_t 1024 array, F32, @OFFSET@, [16x16],"%", 1, 0, 0, 200.0, 2
custom afr_table_t 1024 array, F32, @OFFSET@, [16x16],"deg", 1, 0, 0, 25.0, 2
! please note that 1024 here is 4 * IGN_LOAD_COUNT * IGN_RPM_COUNT

4
firmware/svnversion.h
View File

@ -1,5 +1,5 @@
// This file was generated by Version2Header
// Sat Mar 14 12:46:31 EDT 2015
// Sat Mar 14 21:30:36 EDT 2015
#ifndef VCS_VERSION
#define VCS_VERSION "7411"
#define VCS_VERSION "7427"
#endif

10
firmware/tunerstudio/rusefi.ini
View File

@ -41,7 +41,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated by ConfigDefinition.jar on Sat Mar 14 19:07:36 EDT 2015
; this section was generated by ConfigDefinition.jar on Sat Mar 14 22:31:50 EDT 2015
page = 1
engineType = bits, S32, 0, [0:2], "AUDI_AAN", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "FORD_FIESTA", "NISSAN_PRIMERA", "HONDA_ACCORD", "FORD_INLINE_6_1995", "GY6_139QMB"
@ -480,7 +480,7 @@ page = 1
ignitionTable = array, F32, 9400, [16x16],"deg", 1, 0, -360, 360, 2
ignitionLoadBins = array, F32, 10424, [16], "Load", 1, 0.0, 0, 300.0, 2
ignitionRpmBins = array, F32, 10488, [16], "RPM", 1, 0.0, 0, 18000.0, 2
veTable = array, F32, 10552, [16x16],"%", 100, 0, 0, 100.0, 2
veTable = array, F32, 10552, [16x16],"%", 1, 0, 0, 200.0, 2
veLoadBins = array, F32, 11576, [16], "%", 1, 0.0, 0, 300.0, 2
veRpmBins = array, F32, 11640, [16], "RPM", 1, 0.0, 0, 18000.0, 2
afrTable = array, F32, 11704, [16x16],"deg", 1, 0, 0, 25.0, 2
@ -520,12 +520,16 @@ page = 1
filter = minCltFilter, "Minimum CLT", coolant, < , 160, , true
#endif
;[VeAnalyze]
; fuelAnalyzeMap = fuelTableTbl, afrTableTbl, AFRactual, egoCorrection , { 1 }
; filter = minRPMFilter, "Minimum RPM", rpm, < , 500, , true
[OutputChannels]
; see TS_FILE_VERSION in firmware code
fileVersion = { 20150216 }
fileVersion = { 20150314 }
ochGetCommand = "O"