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

auto-sync

This commit is contained in:
rusEfi 2015-02-11 21:04:21 -06:00
parent 05a6967c46
commit 0e9964e01d
6 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/controllers/algo/auto_generated_enums.cpp
View File

@ -176,6 +176,8 @@ case LM_ALPHA_N:
return "LM_ALPHA_N"; return "LM_ALPHA_N";
case LM_PLAIN_MAF: case LM_PLAIN_MAF:
return "LM_PLAIN_MAF"; return "LM_PLAIN_MAF";
case LM_REAL_MAF:
return "LM_REAL_MAF";
case LM_MAP: case LM_MAP:
return "LM_MAP"; return "LM_MAP";
case LM_SPEED_DENSITY: case LM_SPEED_DENSITY:

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

@ -139,6 +139,8 @@ void setDefaultConfiguration(engine_configuration_s *engineConfiguration, board_
setDetaultVETable(engineConfiguration); setDetaultVETable(engineConfiguration);
setBosch0280218037(engineConfiguration);
engineConfiguration->injector.lag = 1.0; engineConfiguration->injector.lag = 1.0;
engineConfiguration->acCutoffLowRpm = 700; engineConfiguration->acCutoffLowRpm = 700;

5
firmware/controllers/algo/rusefi_enums.h
View File

@ -185,6 +185,11 @@ typedef enum {
*/ */
LM_SPEED_DENSITY = 3, LM_SPEED_DENSITY = 3,
/**
* MAF with a known kg/hour function
*/
LM_REAL_MAF = 4,
Force_4b_engine_load_mode = ENUM_32_BITS, Force_4b_engine_load_mode = ENUM_32_BITS,
} engine_load_mode_e; } engine_load_mode_e;

3
firmware/controllers/sensors/maf.cpp
View File

@ -32,6 +32,7 @@ void setBosch0280218037(engine_configuration_s *engineConfiguration) {
while (i < MAF_DECODING_COUNT) { while (i < MAF_DECODING_COUNT) {
engineConfiguration->mafDecoding[i] = 738; engineConfiguration->mafDecoding[i] = 738;
engineConfiguration->mafDecodingBins[i++] = 4.98046875 + i; engineConfiguration->mafDecodingBins[i] = 4.98046875 + i;
i++;
} }
} }

6
firmware/rusefi_config.ini
View File

@ -206,7 +206,7 @@ struct trigger_config_s @brief Trigger wheel(s) configuration
custom bool32_t 4 bits, U32, @OFFSET@, [0:0], "false", "true" custom bool32_t 4 bits, U32, @OFFSET@, [0:0], "false", "true"
custom trigger_type_e 4 bits, U32, @OFFSET@, [0:4], "custom toothed wheel", "ford aspire", "dodge neon", "Miata NA", "Miata NB", "GM_7X", "Cooper", "Mazda SOHC 4", "60/2", "36/1", "Accord CD", "MITSU", "ACCORD 2", "ACCORD DIP", "Neon 2003", "MAZDA D 1+4", "1+1", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" custom trigger_type_e 4 bits, U32, @OFFSET@, [0:4], "custom toothed wheel", "ford aspire", "dodge neon", "Miata NA", "Miata NB", "GM_7X", "Cooper", "Mazda SOHC 4", "60/2", "36/1", "Accord CD", "MITSU", "ACCORD 2", "ACCORD DIP", "Neon 2003", "MAZDA D 1+4", "1+1", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
trigger_type_e type; trigger_type_e type;
bit customIsSynchronizationNeeded; bit customIsSynchronizationNeeded;
@ -473,8 +473,8 @@ custom pin_input_mode_e 4 scalar, F32, @OFFSET@, "ms", 1, 0, 0, 200, 1
le_formula_t timingMultiplier; le_formula_t timingMultiplier;
le_formula_t timingAdditive; le_formula_t timingAdditive;
float[MAF_DECODING_COUNT] mafDecoding; float[MAF_DECODING_COUNT] mafDecoding;;"kg/hour", 1, 0, -500.0, 4000.0, 2
float[MAF_DECODING_COUNT] mafDecodingBins; float[MAF_DECODING_COUNT] mafDecodingBins;; "V", 1, 0, -5.0, 150.0, 2
fuel_table_t fuelTable; fuel_table_t fuelTable;

23
firmware/tunerstudio/rusefi.ini
View File

@ -37,7 +37,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code ; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START ; CONFIG_DEFINITION_START
; this section was generated by ConfigDefinition.jar on Wed Feb 11 16:24:33 EST 2015 ; this section was generated by ConfigDefinition.jar on Wed Feb 11 21:39:34 EST 2015
pageSize = 15160 pageSize = 15160
page = 1 page = 1
@ -122,7 +122,7 @@ page = 1
tpsAdcChannel = bits, U32, 760, [0:3] "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" tpsAdcChannel = bits, U32, 760, [0:3] "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5"
;skipping overrideCrankingIgnition offset 764 ;skipping overrideCrankingIgnition offset 764
analogChartFrequency = scalar, S32, 768, "index", 1, 0, 0, 300, 0 ; size 4 analogChartFrequency = scalar, S32, 768, "index", 1, 0, 0, 300, 0 ; size 4
trigger_type = bits, U32, 772, [0:4], "custom toothed wheel", "ford aspire", "dodge neon", "Miata NA", "Miata NB", "GM_7X", "Cooper", "Mazda SOHC 4", "60/2", "36/1", "Accord CD", "MITSU", "ACCORD 2", "ACCORD DIP", "Neon 2003", "MAZDA D 1+4", "1+1", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" trigger_type = bits, U32, 772, [0:4], "custom toothed wheel", "ford aspire", "dodge neon", "Miata NA", "Miata NB", "GM_7X", "Cooper", "Mazda SOHC 4", "60/2", "36/1", "Accord CD", "MITSU", "ACCORD 2", "ACCORD DIP", "Neon 2003", "MAZDA D 1+4", "1+1", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
trigger_customIsSynchronizationNeeded= bits, U32, 776, [0:0], "false", "true" trigger_customIsSynchronizationNeeded= bits, U32, 776, [0:0], "false", "true"
trigger_customNeedSecondTriggerInput= bits, U32, 776, [1:1], "false", "true" trigger_customNeedSecondTriggerInput= bits, U32, 776, [1:1], "false", "true"
trigger_customTotalToothCount = scalar, S32, 780, "number", 1, 0.0, 0, 1000.0, 2 trigger_customTotalToothCount = scalar, S32, 780, "number", 1, 0.0, 0, 1000.0, 2
@ -460,8 +460,8 @@ page = 1
;skipping unused3 offset 5204 ;skipping unused3 offset 5204
timingMultiplier = array, U08, 5800, [200],"char", 1, 0, 0.0, 3.0, 2 timingMultiplier = array, U08, 5800, [200],"char", 1, 0, 0.0, 3.0, 2
timingAdditive = array, U08, 6000, [200],"char", 1, 0, 0.0, 3.0, 2 timingAdditive = array, U08, 6000, [200],"char", 1, 0, 0.0, 3.0, 2
;skipping mafDecoding offset 6200 mafDecoding = array, F32, 6200, [256], "kg/hour", 1, 0, -500.0, 4000.0, 2
;skipping mafDecodingBins offset 7224 mafDecodingBins = array, F32, 7224, [256], "V", 1, 0, -5.0, 150.0, 2
fuelTable = array, F32, 8248, [16x16],"ms", 1, 0, 0.0, 300.0, 2 fuelTable = array, F32, 8248, [16x16],"ms", 1, 0, 0.0, 300.0, 2
fuelLoadBins = array, F32, 9272, [16], "V", 1, 0, 0.0, 300.0, 2 fuelLoadBins = array, F32, 9272, [16], "V", 1, 0, 0.0, 300.0, 2
fuelRpmBins = array, F32, 9336, [16], "RPM", 1, 0, 0.0, 25500.0, 2 fuelRpmBins = array, F32, 9336, [16], "RPM", 1, 0, 0.0, 25500.0, 2
@ -514,12 +514,12 @@ fileVersion = { 20150211 }
#if CELSIUS #if CELSIUS
coolant = scalar, F32, 4, "°C", 1, 0.0 coolant = scalar, F32, 4, "°C", 1, 0.0
#else #else
coolant = scalar, F32, 4, "°F", {1 * 9/5}, 32.0 coolant = scalar, F32, 4, "°F", {9/5}, 17.77777
#endif #endif
#if CELSIUS #if CELSIUS
intake = scalar, F32, 8, "°C", 1, 0.0 intake = scalar, F32, 8, "°C", 1, 0.0
#else #else
intake = scalar, F32, 8, "°F", {1 * 9/5}, 32.0 intake = scalar, F32, 8, "°F", {9/5}, 17.77777
#endif #endif
TPS = scalar, F32, 12, "%", 1, 0 TPS = scalar, F32, 12, "%", 1, 0
MAF = scalar, F32, 16, "V", 1, 0 MAF = scalar, F32, 16, "V", 1, 0
@ -607,6 +607,14 @@ fileVersion = { 20150211 }
yBins = injector_battLagCorr yBins = injector_battLagCorr
gauge = VBattGauge gauge = VBattGauge
curve = mafDecodingCurve, "MAF decoding"
columnLabel = "Voltage", "kg/hour"
xAxis = -1, 6, 10
yAxis = -30, 1300, 10
xBins = mafDecodingBins, MAF
yBins = mafDecoding
gauge = mafGauge
curve = iatFuelCorrCurve, "Intake air temp fuel correction" curve = iatFuelCorrCurve, "Intake air temp fuel correction"
columnLabel = "Coolant", "Correction" columnLabel = "Coolant", "Correction"
xAxis = -40, 120, 10 xAxis = -40, 120, 10
@ -813,6 +821,7 @@ fileVersion = { 20150211 }
subMenu = afrTableTbl, "Targe AFR Table", {algorithm == 3} subMenu = afrTableTbl, "Targe AFR Table", {algorithm == 3}
subMenu = std_separator subMenu = std_separator
subMenu = ignitionTableTbl, "Ignition Table" subMenu = ignitionTableTbl, "Ignition Table"
subMenu = mafDecodingCurve, "MAF Decoding Curve"
subMenu = std_separator subMenu = std_separator
; subMenu = otherSettings ; subMenu = otherSettings
@ -859,7 +868,7 @@ fileVersion = { 20150211 }
field = "sync Ratio From", trigger_customSyncRatioFrom, {trigger_type == 0} field = "sync Ratio From", trigger_customSyncRatioFrom, {trigger_type == 0}
field = "sync Ratio To", trigger_customSyncRatioTo, {trigger_type == 0} field = "sync Ratio To", trigger_customSyncRatioTo, {trigger_type == 0}
field = "use Rise Edge?", trigger_customUseRiseEdge, {trigger_type == 0} field = "use Rise Edge?", trigger_customUseRiseEdge, {trigger_type == 0}
field = "needed Second Trigger Input?", needSecondTriggerInput field = "needed Second Trigger Input?", trigger_customNeedSecondTriggerInput, {trigger_type == 0}
; Engine->Injection Settings ; Engine->Injection Settings
dialog = injChars, "Injector Settings" dialog = injChars, "Injector Settings"