diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index 4b012294ca..6c6822f3eb 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 Sat Mar 11 20:01:02 EST 2017 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat Mar 11 20:14:23 EST 2017 // begin #ifndef ENGINE_CONFIGURATION_GENERATED_H_ #define ENGINE_CONFIGURATION_GENERATED_H_ @@ -1837,7 +1837,7 @@ typedef struct { /** * offset 2776 */ - cfg_float_t timing_offset_cylinder[IGNITION_PIN_COUNT]; + cfg_float_t_1f timing_offset_cylinder[IGNITION_PIN_COUNT]; /** * offset 2824 */ @@ -2056,4 +2056,4 @@ typedef struct { #endif // end -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat Mar 11 20:01:02 EST 2017 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat Mar 11 20:14:23 EST 2017 diff --git a/firmware/controllers/algo/rusefi_types.h b/firmware/controllers/algo/rusefi_types.h index c75793e81f..de6a90d04e 100644 --- a/firmware/controllers/algo/rusefi_types.h +++ b/firmware/controllers/algo/rusefi_types.h @@ -90,7 +90,7 @@ typedef int32_t bool32_t; typedef int16_t fsio_pwm_freq_t; typedef float fsio_setting_t; -typedef float cfg_float_t; +typedef float cfg_float_t_1f; typedef brain_pin_e brain_input_pin_e; diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 78c8b99bbb..7d6483512d 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -781,8 +781,8 @@ 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 4 scalar, F32, @OFFSET@, "Val", 1, 0, 0, 18000, 4 - cfg_float_t[IGNITION_PIN_COUNT iterate] timing_offset_cylinder; + custom cfg_float_t_1f 4 scalar, F32, @OFFSET@, "Val", 1, 0, 0, 18000, 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 fc85bbe714..6436fe11a7 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 Mon Mar 06 19:02:13 EST 2017 +; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat Mar 11 20:14:23 EST 2017 pageSize = 16376 page = 1 @@ -657,7 +657,19 @@ 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" -;skipping unused offset 2776 + 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 +;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 le_formulas3 = array, U08, 3448, [200],"char", 1, 0, 0.0, 3.0, 2 @@ -1613,6 +1625,21 @@ cmd_test_idle_valve = "w\x00\x17\x00\x01" panel = injectorSetting, West panel = injectorsDeadTime, East + 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 + + ; Engine->Ignition Settings dialog = ignitionOutputs, "Ignition Outputs" field = "Ignition Pin Mode", ignitionPinMode @@ -1635,6 +1662,7 @@ cmd_test_idle_valve = "w\x00\x17\x00\x01" dialog = ignitionSettings, "", xAxis panel = ignitionOutputs, West panel = dwellCorrection, Center + panel = ignitionCylExtra, East ; Engine->Aux1 Thermistor Settings dialog = auxTempSensor1_thermistor, "aux1 Thermistor Settings" diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index bf39429b42..3f929e5443 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -1545,6 +1545,21 @@ cmd_test_idle_valve = "w\x00\x17\x00\x01" panel = injectorSetting, West panel = injectorsDeadTime, East + 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 + + ; Engine->Ignition Settings dialog = ignitionOutputs, "Ignition Outputs" field = "Ignition Pin Mode", ignitionPinMode @@ -1567,6 +1582,7 @@ cmd_test_idle_valve = "w\x00\x17\x00\x01" dialog = ignitionSettings, "", xAxis panel = ignitionOutputs, West panel = dwellCorrection, Center + panel = ignitionCylExtra, East ; Engine->Aux1 Thermistor Settings dialog = auxTempSensor1_thermistor, "aux1 Thermistor Settings"