diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 7d6483512d..3a5d883acf 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -781,7 +781,7 @@ int16_t etbFreq;;"Hz", 1, 0, 0, 500, 10 adc_channel_e cj125ua;lampda input adc_channel_e cj125ur;heater input - custom cfg_float_t_1f 4 scalar, F32, @OFFSET@, "Val", 1, 0, 0, 18000, 1 + custom cfg_float_t_1f 4 scalar, F32, @OFFSET@, "Val", 1, 0, -20000000, 20000000, 1 cfg_float_t_1f[IGNITION_PIN_COUNT iterate] timing_offset_cylinder; int[56] unused; diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 6436fe11a7..89de09e4a3 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -42,7 +42,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 Sat Mar 11 20:14:23 EST 2017 +; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Mar 12 10:01:30 EDT 2017 pageSize = 16376 page = 1 @@ -657,18 +657,18 @@ page = 1 stepperEnablePinMode = bits, U32, 2764, [0:5], "default", "INVALID", "INVALID", "INVALID", "opendrain", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "mode12", "mode13", "mode14", "mode15", "mode16", "mode17", "mode18", "mode19", "mode20", "mode21", "mode22", "mode23", "mode24", "mode25", "mode26", "mode27", "mode28", "mode29", "mode30", "mode31", "PULLUP", "mode33", "mode34", "mode35" cj125ua = bits, U32, 2768, [0:4] "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "Disabled", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" cj125ur = bits, U32, 2772, [0:4] "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "Disabled", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" - timing_offset_cylinder1 = scalar, F32, 2776, "Val", 1, 0, 0, 18000, 1 - timing_offset_cylinder2 = scalar, F32, 2780, "Val", 1, 0, 0, 18000, 1 - timing_offset_cylinder3 = scalar, F32, 2784, "Val", 1, 0, 0, 18000, 1 - timing_offset_cylinder4 = scalar, F32, 2788, "Val", 1, 0, 0, 18000, 1 - timing_offset_cylinder5 = scalar, F32, 2792, "Val", 1, 0, 0, 18000, 1 - timing_offset_cylinder6 = scalar, F32, 2796, "Val", 1, 0, 0, 18000, 1 - timing_offset_cylinder7 = scalar, F32, 2800, "Val", 1, 0, 0, 18000, 1 - timing_offset_cylinder8 = scalar, F32, 2804, "Val", 1, 0, 0, 18000, 1 - timing_offset_cylinder9 = scalar, F32, 2808, "Val", 1, 0, 0, 18000, 1 - timing_offset_cylinder10 = scalar, F32, 2812, "Val", 1, 0, 0, 18000, 1 - timing_offset_cylinder11 = scalar, F32, 2816, "Val", 1, 0, 0, 18000, 1 - timing_offset_cylinder12 = scalar, F32, 2820, "Val", 1, 0, 0, 18000, 1 + timing_offset_cylinder1 = scalar, F32, 2776, "Val", 1, 0, -20000000, 20000000, 1 + timing_offset_cylinder2 = scalar, F32, 2780, "Val", 1, 0, -20000000, 20000000, 1 + timing_offset_cylinder3 = scalar, F32, 2784, "Val", 1, 0, -20000000, 20000000, 1 + timing_offset_cylinder4 = scalar, F32, 2788, "Val", 1, 0, -20000000, 20000000, 1 + timing_offset_cylinder5 = scalar, F32, 2792, "Val", 1, 0, -20000000, 20000000, 1 + timing_offset_cylinder6 = scalar, F32, 2796, "Val", 1, 0, -20000000, 20000000, 1 + timing_offset_cylinder7 = scalar, F32, 2800, "Val", 1, 0, -20000000, 20000000, 1 + timing_offset_cylinder8 = scalar, F32, 2804, "Val", 1, 0, -20000000, 20000000, 1 + timing_offset_cylinder9 = scalar, F32, 2808, "Val", 1, 0, -20000000, 20000000, 1 + timing_offset_cylinder10 = scalar, F32, 2812, "Val", 1, 0, -20000000, 20000000, 1 + timing_offset_cylinder11 = scalar, F32, 2816, "Val", 1, 0, -20000000, 20000000, 1 + timing_offset_cylinder12 = scalar, F32, 2820, "Val", 1, 0, -20000000, 20000000, 1 ;skipping unused offset 2824 le_formulas1 = array, U08, 3048, [200],"char", 1, 0, 0.0, 3.0, 2 le_formulas2 = array, U08, 3248, [200],"char", 1, 0, 0.0, 3.0, 2 @@ -1627,17 +1627,17 @@ cmd_test_idle_valve = "w\x00\x17\x00\x01" dialog = ignitionCylExtra, "Ignition Cyliner Extra" field = "Extra cyl #1", timing_offset_cylinder1 - field = "Extra cyl #2", timing_offset_cylinder2 - field = "Extra cyl #3", timing_offset_cylinder3 - field = "Extra cyl #4", timing_offset_cylinder4 - field = "Extra cyl #5", timing_offset_cylinder5 - field = "Extra cyl #6", timing_offset_cylinder6 - field = "Extra cyl #7", timing_offset_cylinder7 - field = "Extra cyl #8", timing_offset_cylinder8 - field = "Extra cyl #9", timing_offset_cylinder9 - field = "Extra cyl #10", timing_offset_cylinder10 - field = "Extra cyl #11", timing_offset_cylinder11 - field = "Extra cyl #12", timing_offset_cylinder12 + field = "Extra cyl #2", timing_offset_cylinder2, {cylindersCount > 1} + field = "Extra cyl #3", timing_offset_cylinder3, {cylindersCount > 2} + field = "Extra cyl #4", timing_offset_cylinder4, {cylindersCount > 3} + field = "Extra cyl #5", timing_offset_cylinder5, {cylindersCount > 4} + field = "Extra cyl #6", timing_offset_cylinder6, {cylindersCount > 5} + field = "Extra cyl #7", timing_offset_cylinder7, {cylindersCount > 6} + field = "Extra cyl #8", timing_offset_cylinder8, {cylindersCount > 7} + field = "Extra cyl #9", timing_offset_cylinder9, {cylindersCount > 8} + field = "Extra cyl #10", timing_offset_cylinder10, {cylindersCount > 9} + field = "Extra cyl #11", timing_offset_cylinder11, {cylindersCount > 10} + field = "Extra cyl #12", timing_offset_cylinder12, {cylindersCount > 11} ; Engine->Ignition Settings diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 3f929e5443..21502a7d13 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -1547,17 +1547,17 @@ cmd_test_idle_valve = "w\x00\x17\x00\x01" dialog = ignitionCylExtra, "Ignition Cyliner Extra" field = "Extra cyl #1", timing_offset_cylinder1 - field = "Extra cyl #2", timing_offset_cylinder2 - field = "Extra cyl #3", timing_offset_cylinder3 - field = "Extra cyl #4", timing_offset_cylinder4 - field = "Extra cyl #5", timing_offset_cylinder5 - field = "Extra cyl #6", timing_offset_cylinder6 - field = "Extra cyl #7", timing_offset_cylinder7 - field = "Extra cyl #8", timing_offset_cylinder8 - field = "Extra cyl #9", timing_offset_cylinder9 - field = "Extra cyl #10", timing_offset_cylinder10 - field = "Extra cyl #11", timing_offset_cylinder11 - field = "Extra cyl #12", timing_offset_cylinder12 + field = "Extra cyl #2", timing_offset_cylinder2, {cylindersCount > 1} + field = "Extra cyl #3", timing_offset_cylinder3, {cylindersCount > 2} + field = "Extra cyl #4", timing_offset_cylinder4, {cylindersCount > 3} + field = "Extra cyl #5", timing_offset_cylinder5, {cylindersCount > 4} + field = "Extra cyl #6", timing_offset_cylinder6, {cylindersCount > 5} + field = "Extra cyl #7", timing_offset_cylinder7, {cylindersCount > 6} + field = "Extra cyl #8", timing_offset_cylinder8, {cylindersCount > 7} + field = "Extra cyl #9", timing_offset_cylinder9, {cylindersCount > 8} + field = "Extra cyl #10", timing_offset_cylinder10, {cylindersCount > 9} + field = "Extra cyl #11", timing_offset_cylinder11, {cylindersCount > 10} + field = "Extra cyl #12", timing_offset_cylinder12, {cylindersCount > 11} ; Engine->Ignition Settings