diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index f107c0e1c7..9a05ae1a57 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -366,6 +366,10 @@ void setDefaultConfiguration(DECLARE_ENGINE_PARAMETER_F) { setFuelTablesLoadBin(10, 160 PASS_ENGINE_PARAMETER); setDefaultIatTimingCorrection(PASS_ENGINE_PARAMETER_F); + + setTableBin2(config->tpsTpsAccelFromRpmBins, FSIO_TABLE_8, 0, 100, 10); + setTableBin2(config->tpsTpsAccelToRpmBins, FSIO_TABLE_8, 0, 100, 10); + setTableBin2(config->fsioTable1LoadBins, FSIO_TABLE_8, 20, 120, 10); setRpmTableBin(config->fsioTable1RpmBins, FSIO_TABLE_8); setTableBin2(config->fsioTable2LoadBins, FSIO_TABLE_8, 20, 120, 10); diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index d60dc76cf7..9a364204cc 100644 --- a/firmware/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Mar 08 21:51:11 EST 2016 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Mar 08 23:31:32 EST 2016 // begin #ifndef ENGINE_CONFIGURATION_GENERATED_H_ #define ENGINE_CONFIGURATION_GENERATED_H_ @@ -26,12 +26,13 @@ typedef struct { typedef struct { /** + * Fuel squirt duration while cranking + * A number of curves adjust this value according to CLT/IAT/TPS etc * offset 0 */ float baseFuel; /** - * This value controls what RPM values we consider 'cranking' (any RPM below 'crankingRpm') - * Anything above 'crankingRpm' would be 'running' + * Cranking mode threshold. Special cranking logic controls fuel and spark while RPM is below this threshold * offset 4 */ int16_t rpm; @@ -178,6 +179,8 @@ typedef struct { */ float flow; /** + * Base injector lag + * See also vBatt correction curve * offset 4 */ float lag; @@ -1691,4 +1694,4 @@ typedef struct { #endif // end -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Mar 08 21:51:11 EST 2016 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Mar 08 23:31:32 EST 2016 diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index a60bc9ee45..dab824b7ce 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -89,8 +89,8 @@ struct pid_s end_struct struct cranking_parameters_s -float baseFuel;;"ms", 1, 0, 0, 200, 1 -int16_t rpm;This value controls what RPM values we consider 'cranking' (any RPM below 'crankingRpm')\nAnything above 'crankingRpm' would be 'running';"RPM", 1, 0, 0, 3000, 0 +float baseFuel;+Fuel squirt duration while cranking\nA number of curves adjust this value according to CLT/IAT/TPS etc;"ms", 1, 0, 0, 200, 1 +int16_t rpm;+Cranking mode threshold. Special cranking logic controls fuel and spark while RPM is below this threshold;"RPM", 1, 0, 0, 3000, 0 end_struct #define debug_mode_e_enum "ALTERNATOR", "TPS_ACCEL", "WARMUP_PID", "mode3" @@ -153,8 +153,8 @@ engine_type_e engineType;http://rusefi.com/wiki/index.php?title=Manual:Engine_Ty int engineSnifferRpmThreshold;Disable engine sniffer above this rpm;"RPM", 1, 0, 0,30000, 0 struct injector_s - float flow;cc/min, cubic centimeter per minute\nBy the way, g/s = 0.125997881 * (lb/hr)\ng/s = 0.125997881 * (cc/min)/10.5\ng/s = 0.0119997981 * cc/min;"cm3/min", 1, 0, 0, 1000, 2 - float lag;;"msec", 1, 0, -10, 25.50, 2 + float flow;+cc/min, cubic centimeter per minute\nBy the way, g/s = 0.125997881 * (lb/hr)\ng/s = 0.125997881 * (cc/min)/10.5\ng/s = 0.0119997981 * cc/min;"cm3/min", 1, 0, 0, 1000, 2 + float lag;+Base injector lag\nSee also vBatt correction curve;"msec", 1, 0, -10, 25.50, 2 float[VBAT_INJECTOR_CURVE_SIZE] battLagCorrBins;;"V", 1, 0, 0.0, 20.0, 2 float[VBAT_INJECTOR_CURVE_SIZE] battLagCorr;;"ms/V", 1, 0, 0.0, 50.0, 2 diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 0ebdbb61e0..0d7e25e24e 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -41,7 +41,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Mar 08 21:51:11 EST 2016 +; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Mar 08 23:34:32 EST 2016 pageSize = 17080 page = 1 @@ -592,6 +592,13 @@ page = 1 fsioTable2LoadBins = array, F32, 17016, [8], "L", 1, 0, 0.0, 30000.0, 2 fsioTable2RpmBins = array, F32, 17048, [8], "RPM", 1, 0, 0.0, 25500.0, 2 ; total TS size = 17080 +[SettingContextHelp] + injector_flow = "cc/min, cubic centimeter per minute\nBy the way, g/s = 0.125997881 * (lb/hr)\ng/s = 0.125997881 * (cc/min)/10.5\ng/s = 0.0119997981 * cc/min" + injector_lag = "Base injector lag\nSee also vBatt correction curve" + cranking_baseFuel = "Fuel squirt duration while cranking\nA number of curves adjust this value according to CLT/IAT/TPS etc" + cranking_rpm = "Cranking mode threshold. Special cranking logic controls fuel and spark while RPM is below this threshold" + + ; CONFIG_DEFINITION_END @@ -854,6 +861,11 @@ fileVersion = { 20160122 } ; gridHeight = 2.0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. upDownLabel = "(RICHER)", "(LEANER)" + + table = tpsTpsAccelTbl, tpsTpsAccelMap, "TPS acceleration", 1 + xBins = tpsTpsAccelFromRpmBins, tps + yBins = tpsTpsAccelToRpmBins, tps + zBins = tpsTpsAccelTable table = fsioTable1Tbl, fsioTable1Map, "FSIO Table #1", 1 @@ -1144,6 +1156,7 @@ fileVersion = { 20160122 } subMenu = AccelEnrich, "Accel/Decel Enrichment/Enleanment" subMenu = iatFuelCorrCurve, "Intake air temperature fuel Multiplier" subMenu = injPhaseTableTbl, "Injection Phase" + subMenu = tpsTpsAccelTbl, "TPS/TPS acceleration Multiplier" subMenu = std_separator subMenu = ignitionTableTbl, "Ignition Table" subMenu = ignitionIatCorrTableTbl, "Ignition Intake Air Temp correction"