diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index e3a1af1d60..281ca618d8 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 Sun Jul 24 22:10:22 EDT 2016 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Jul 24 22:23:59 EDT 2016 // begin #ifndef ENGINE_CONFIGURATION_GENERATED_H_ #define ENGINE_CONFIGURATION_GENERATED_H_ @@ -179,11 +179,9 @@ typedef struct { */ float flow; /** - * Base injector lag - * See also extra vBatt correction curve * offset 4 */ - float lag; + float unusedlag; /** * offset 8 */ @@ -1906,4 +1904,4 @@ typedef struct { #endif // end -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Jul 24 22:10:22 EDT 2016 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Jul 24 22:23:59 EDT 2016 diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 29eaf4e7e5..8a7db708e3 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -172,7 +172,7 @@ int engineSnifferRpmThreshold;Engine sniffer would be disabled above this rpm;"R 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;+Base injector lag\nSee also extra vBatt correction curve;"msec", 1, 0, -10, 25.50, 2 + float unusedlag; 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 5be5bfee82..e9300a93ca 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -42,14 +42,14 @@ 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 Sun Jul 24 22:10:22 EDT 2016 +; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Jul 24 22:23:59 EDT 2016 pageSize = 16376 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" engineSnifferRpmThreshold = scalar, S32, 4, "RPM", 1, 0, 0,30000, 0 injector_flow = scalar, F32, 8, "cm3/min", 1, 0, 0, 1000, 2 - injector_lag = scalar, F32, 12, "msec", 1, 0, -10, 25.50, 2 +;skipping injector_unusedlag offset 12 injector_battLagCorrBins = array, F32, 16, [8], "V", 1, 0, 0.0, 20.0, 2 injector_battLagCorr = array, F32, 48, [8], "ms/V", 1, 0, 0.0, 50.0, 2 directSelfStimulation = bits, U32, 80, [0:0], "false", "true" @@ -679,7 +679,6 @@ page = 1 ; total TS size = 16376 [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 extra vBatt correction curve" directSelfStimulation = "Should trigger emulator push data right into trigger handling logic, eliminating the need for physical jumper wires?\nPS: Funny name, right? :)" 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" @@ -913,7 +912,7 @@ fileVersion = { 20160702 } yBins = map_samplingWindow gauge = rpm - curve = injectorsDeadTime, "Injector Extra Dead Time Battery Correction" + curve = injectorsDeadTime, "Injector Dead Time by VBatt" columnLabel = "Voltage", "Dead Time" xAxis = 8, 21, 10 yAxis = -3, 3, 10 @@ -1462,7 +1461,6 @@ cmd_test_idle_valve = "w\x00\x17\x00\x01" ; Engine->Injection Settings dialog = injChars, "Injector Settings", yAxis - field = "Base Injector Dead Time", injector_lag field = "Injector Flow", injector_flow field = "phase offset", injectionOffset diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index ba14fa8f02..8591a0f6ae 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -897,7 +897,7 @@ fileVersion = { 20160702 } yBins = map_samplingWindow gauge = rpm - curve = injectorsDeadTime, "Injector Extra Dead Time Battery Correction" + curve = injectorsDeadTime, "Injector Dead Time by VBatt" columnLabel = "Voltage", "Dead Time" xAxis = 8, 21, 10 yAxis = -3, 3, 10 @@ -1446,7 +1446,6 @@ cmd_test_idle_valve = "w\x00\x17\x00\x01" ; Engine->Injection Settings dialog = injChars, "Injector Settings", yAxis - field = "Base Injector Dead Time", injector_lag field = "Injector Flow", injector_flow field = "phase offset", injectionOffset