diff --git a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h index 5f1550f069..806ee0c234 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Sep 02 11:22:35 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Sep 02 19:34:05 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1819,7 +1819,7 @@ struct engine_configuration_s { bool knockBankCyl12 : 1; /** offset 976 bit 28 */ - bool unusedBit_251_28 : 1; + bool tcuEnabled : 1; /** offset 976 bit 29 */ bool unusedBit_251_29 : 1; @@ -3355,10 +3355,13 @@ struct engine_configuration_s { */ uint16_t mc33_t_hold_tot; /** - * need 4 byte alignment * offset 4514 */ - uint8_t alignmentFill_at_4514[2]; + pin_input_mode_e tcuUpshiftButtonPinMode; + /** + * offset 4515 + */ + pin_input_mode_e tcuDownshiftButtonPinMode; /** * offset 4516 */ @@ -3656,4 +3659,4 @@ struct persistent_config_s { typedef struct persistent_config_s persistent_config_s; // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Sep 02 11:22:35 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Sep 02 19:34:05 UTC 2020 diff --git a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h index 2eacdfe708..95ffe0afd6 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -43,7 +43,6 @@ #define air_pressure_sensor_config_s_size 16 #define air_pressure_sensor_type_e_auto_enum "MT_CUSTOM", "MT_DENSO183", "MT_MPX4250", "MT_HONDA3BAR", "MT_DODGE_NEON_2003", "MT_SUBY_DENSO", "MT_GM_3_BAR", "MT_MPX4100", "MT_TOYOTA_89420_02010", "MT_MPX4250A", "MT_BOSCH_2_5", "MT_MAZDA_1_BAR" #define alignEngineSnifferAtTDC_offset 744 -#define alignmentFill_at_4514_offset 4514 #define alternator_antiwindupFreq_offset 1764 #define alternator_derivativeFilterLoss_offset 1760 #define alternatorControl_dFactor_offset 1724 @@ -1148,7 +1147,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD kin #define SIGNATURE_DATE 2020.09.02 -#define SIGNATURE_HASH 555686289 +#define SIGNATURE_HASH 939780321 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1249,7 +1248,10 @@ #define tcu_solenoid8_offset 1199 #define TCU_SOLENOID_COUNT 8 #define tcuDownshiftButtonPin_offset 1819 +#define tcuDownshiftButtonPinMode_offset 4515 +#define tcuEnabled_offset 976 #define tcuUpshiftButtonPin_offset 1818 +#define tcuUpshiftButtonPinMode_offset 4514 #define test557pin_offset 3101 #define thermistor_conf_s_size 28 #define ThermistorConf_size 32 @@ -1455,7 +1457,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.09.02.kin.555686289" +#define TS_SIGNATURE "rusEFI 2020.09.02.kin.939780321" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 @@ -1500,7 +1502,6 @@ #define unusedAuxVoltage1_TODO_332_offset 2713 #define unusedAuxVoltage2_TODO_332_offset 2714 #define unusedBit4_1476_offset 1476 -#define unusedBit_251_28_offset 976 #define unusedBit_251_29_offset 976 #define unusedBit_284_30_offset 976 #define unusedBit_284_31_offset 976 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 5ce91059a0..6be7f9feb9 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Sep 02 11:22:23 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Sep 02 19:33:49 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1819,7 +1819,7 @@ struct engine_configuration_s { bool knockBankCyl12 : 1; /** offset 976 bit 28 */ - bool unusedBit_251_28 : 1; + bool tcuEnabled : 1; /** offset 976 bit 29 */ bool unusedBit_251_29 : 1; @@ -3355,10 +3355,13 @@ struct engine_configuration_s { */ uint16_t mc33_t_hold_tot; /** - * need 4 byte alignment * offset 4514 */ - uint8_t alignmentFill_at_4514[2]; + pin_input_mode_e tcuUpshiftButtonPinMode; + /** + * offset 4515 + */ + pin_input_mode_e tcuDownshiftButtonPinMode; /** * offset 4516 */ @@ -3656,4 +3659,4 @@ struct persistent_config_s { typedef struct persistent_config_s persistent_config_s; // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Sep 02 11:22:23 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Sep 02 19:33:49 UTC 2020 diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index 9f8f616e04..8f300d21ec 100644 --- a/firmware/controllers/generated/fsio_enums_generated.def +++ b/firmware/controllers/generated/fsio_enums_generated.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Sep 02 11:22:23 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Sep 02 19:33:49 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer FSIO_SETTING_FANONTEMPERATURE = 1000, diff --git a/firmware/controllers/generated/fsio_getters.def b/firmware/controllers/generated/fsio_getters.def index 5d99c786f8..bba0f57100 100644 --- a/firmware/controllers/generated/fsio_getters.def +++ b/firmware/controllers/generated/fsio_getters.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Sep 02 11:22:23 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Sep 02 19:33:49 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_FANONTEMPERATURE: diff --git a/firmware/controllers/generated/fsio_names.def b/firmware/controllers/generated/fsio_names.def index e91649ad10..188b9b29c4 100644 --- a/firmware/controllers/generated/fsio_names.def +++ b/firmware/controllers/generated/fsio_names.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Sep 02 11:22:23 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Sep 02 19:33:49 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer static LENameOrdinalPair lefanOnTemperature(FSIO_SETTING_FANONTEMPERATURE, "cfg_fanOnTemperature"); diff --git a/firmware/controllers/generated/fsio_strings.def b/firmware/controllers/generated/fsio_strings.def index f2308821e4..a760b4febb 100644 --- a/firmware/controllers/generated/fsio_strings.def +++ b/firmware/controllers/generated/fsio_strings.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Sep 02 11:22:23 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Sep 02 19:33:49 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_FANONTEMPERATURE: diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 6e935aad35..2c9e1f4bfa 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -43,7 +43,6 @@ #define air_pressure_sensor_config_s_size 16 #define air_pressure_sensor_type_e_auto_enum "MT_CUSTOM", "MT_DENSO183", "MT_MPX4250", "MT_HONDA3BAR", "MT_DODGE_NEON_2003", "MT_SUBY_DENSO", "MT_GM_3_BAR", "MT_MPX4100", "MT_TOYOTA_89420_02010", "MT_MPX4250A", "MT_BOSCH_2_5", "MT_MAZDA_1_BAR" #define alignEngineSnifferAtTDC_offset 744 -#define alignmentFill_at_4514_offset 4514 #define alternator_antiwindupFreq_offset 1764 #define alternator_derivativeFilterLoss_offset 1760 #define alternatorControl_dFactor_offset 1724 @@ -1148,7 +1147,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD all #define SIGNATURE_DATE 2020.09.02 -#define SIGNATURE_HASH 248208433 +#define SIGNATURE_HASH 400010561 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1249,7 +1248,10 @@ #define tcu_solenoid8_offset 1199 #define TCU_SOLENOID_COUNT 8 #define tcuDownshiftButtonPin_offset 1819 +#define tcuDownshiftButtonPinMode_offset 4515 +#define tcuEnabled_offset 976 #define tcuUpshiftButtonPin_offset 1818 +#define tcuUpshiftButtonPinMode_offset 4514 #define test557pin_offset 3101 #define thermistor_conf_s_size 28 #define ThermistorConf_size 32 @@ -1455,7 +1457,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.09.02.all.248208433" +#define TS_SIGNATURE "rusEFI 2020.09.02.all.400010561" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 @@ -1500,7 +1502,6 @@ #define unusedAuxVoltage1_TODO_332_offset 2713 #define unusedAuxVoltage2_TODO_332_offset 2714 #define unusedBit4_1476_offset 1476 -#define unusedBit_251_28_offset 976 #define unusedBit_251_29_offset 976 #define unusedBit_284_30_offset 976 #define unusedBit_284_31_offset 976 diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index ea1fc19f89..5671d8f4f2 100644 --- a/firmware/controllers/generated/signature_all.h +++ b/firmware/controllers/generated/signature_all.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD all #define SIGNATURE_DATE 2020.09.02 -#define SIGNATURE_HASH 22152861 -#define TS_SIGNATURE "rusEFI 2020.09.02.all.22152861" +#define SIGNATURE_HASH 400010561 +#define TS_SIGNATURE "rusEFI 2020.09.02.all.400010561" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 6fa6f1c1da..cedac14351 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD frankenso_na6 #define SIGNATURE_DATE 2020.09.02 -#define SIGNATURE_HASH 3387818900 -#define TS_SIGNATURE "rusEFI 2020.09.02.frankenso_na6.3387818900" +#define SIGNATURE_HASH 3748374600 +#define TS_SIGNATURE "rusEFI 2020.09.02.frankenso_na6.3748374600" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index f3b303f841..90013a4a63 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD kin #define SIGNATURE_DATE 2020.09.02 -#define SIGNATURE_HASH 780550973 -#define TS_SIGNATURE "rusEFI 2020.09.02.kin.780550973" +#define SIGNATURE_HASH 939780321 +#define TS_SIGNATURE "rusEFI 2020.09.02.kin.939780321" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 632583aaac..567d0fdf9e 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD mre_f4 #define SIGNATURE_DATE 2020.09.02 -#define SIGNATURE_HASH 4210856902 -#define TS_SIGNATURE "rusEFI 2020.09.02.mre_f4.4210856902" +#define SIGNATURE_HASH 3967367194 +#define TS_SIGNATURE "rusEFI 2020.09.02.mre_f4.3967367194" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 6d9c98bc67..fe66e31e4b 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD mre_f7 #define SIGNATURE_DATE 2020.09.02 -#define SIGNATURE_HASH 4210856902 -#define TS_SIGNATURE "rusEFI 2020.09.02.mre_f7.4210856902" +#define SIGNATURE_HASH 3967367194 +#define TS_SIGNATURE "rusEFI 2020.09.02.mre_f7.3967367194" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index e2336ab9ce..da03a3f2b5 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD prometheus_405 #define SIGNATURE_DATE 2020.09.02 -#define SIGNATURE_HASH 379864867 -#define TS_SIGNATURE "rusEFI 2020.09.02.prometheus_405.379864867" +#define SIGNATURE_HASH 2223359 +#define TS_SIGNATURE "rusEFI 2020.09.02.prometheus_405.2223359" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 4cbad5914b..c92a2db486 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD prometheus_469 #define SIGNATURE_DATE 2020.09.02 -#define SIGNATURE_HASH 379864867 -#define TS_SIGNATURE "rusEFI 2020.09.02.prometheus_469.379864867" +#define SIGNATURE_HASH 2223359 +#define TS_SIGNATURE "rusEFI 2020.09.02.prometheus_469.2223359" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index b4a5c86737..a4e1e87419 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD proteus_f4 #define SIGNATURE_DATE 2020.09.02 -#define SIGNATURE_HASH 873220568 -#define TS_SIGNATURE "rusEFI 2020.09.02.proteus_f4.873220568" +#define SIGNATURE_HASH 579461636 +#define TS_SIGNATURE "rusEFI 2020.09.02.proteus_f4.579461636" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 92933cd01f..d19e636cc9 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD proteus_f7 #define SIGNATURE_DATE 2020.09.02 -#define SIGNATURE_HASH 873220568 -#define TS_SIGNATURE "rusEFI 2020.09.02.proteus_f7.873220568" +#define SIGNATURE_HASH 579461636 +#define TS_SIGNATURE "rusEFI 2020.09.02.proteus_f7.579461636" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index 6a9a87e875..bbde4752a5 100644 Binary files a/firmware/tunerstudio/generated/cache.zip and b/firmware/tunerstudio/generated/cache.zip differ diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index 750aac322e..6380baaa9b 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.09.02.all.22152861" + signature = "rusEFI 2020.09.02.all.400010561" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.09.02.all.22152861" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.09.02.all.400010561" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Sep 02 17:31:59 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Sep 02 19:33:49 UTC 2020 pageSize = 20000 page = 1 @@ -556,7 +556,7 @@ page = 1 knockBankCyl10 = bits, U32, 976, [25:25], "Channel 1", "Channel 2" knockBankCyl11 = bits, U32, 976, [26:26], "Channel 1", "Channel 2" knockBankCyl12 = bits, U32, 976, [27:27], "Channel 1", "Channel 2" - unusedBit_251_28 = bits, U32, 976, [28:28], "false", "true" + tcuEnabled = bits, U32, 976, [28:28], "false", "true" unusedBit_251_29 = bits, U32, 976, [29:29], "false", "true" unusedBit_284_30 = bits, U32, 976, [30:30], "false", "true" unusedBit_284_31 = bits, U32, 976, [31:31], "false", "true" @@ -1130,7 +1130,8 @@ page = 1 mc33_t_bypass = scalar, U16, 4508, "us", 1.0, 0.0, 0, 10000, 0 mc33_t_hold_off = scalar, U16, 4510, "us", 1.0, 0.0, 0, 10000, 0 mc33_t_hold_tot = scalar, U16, 4512, "us", 1.0, 0.0, 0, 10000, 0 - alignmentFill_at_4514 = array, U08, 4514, [2], "units", 1.0, 0, -20, 100, 0 + tcuUpshiftButtonPinMode = bits, U08, 4514, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" + tcuDownshiftButtonPinMode = bits, U08, 4515, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" mainUnusedEnd = array, S32, 4516, [371], "units", 1.0, 0, -20, 100, 0 warning_message = string, ASCII, 6000, 120 afterstartCoolantBins = array, F32, 6120, [8], "C", 1.0, 0, -100.0, 250.0, 0 diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 0da3599975..c4aa1d605c 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.09.02.frankenso_na6.3387818900" + signature = "rusEFI 2020.09.02.frankenso_na6.3748374600" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.09.02.frankenso_na6.3387818900" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.09.02.frankenso_na6.3748374600" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Sep 02 17:32:04 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Sep 02 19:33:54 UTC 2020 pageSize = 20000 page = 1 @@ -556,7 +556,7 @@ page = 1 knockBankCyl10 = bits, U32, 976, [25:25], "Channel 1", "Channel 2" knockBankCyl11 = bits, U32, 976, [26:26], "Channel 1", "Channel 2" knockBankCyl12 = bits, U32, 976, [27:27], "Channel 1", "Channel 2" - unusedBit_251_28 = bits, U32, 976, [28:28], "false", "true" + tcuEnabled = bits, U32, 976, [28:28], "false", "true" unusedBit_251_29 = bits, U32, 976, [29:29], "false", "true" unusedBit_284_30 = bits, U32, 976, [30:30], "false", "true" unusedBit_284_31 = bits, U32, 976, [31:31], "false", "true" @@ -1130,7 +1130,8 @@ page = 1 mc33_t_bypass = scalar, U16, 4508, "us", 1.0, 0.0, 0, 10000, 0 mc33_t_hold_off = scalar, U16, 4510, "us", 1.0, 0.0, 0, 10000, 0 mc33_t_hold_tot = scalar, U16, 4512, "us", 1.0, 0.0, 0, 10000, 0 - alignmentFill_at_4514 = array, U08, 4514, [2], "units", 1.0, 0, -20, 100, 0 + tcuUpshiftButtonPinMode = bits, U08, 4514, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" + tcuDownshiftButtonPinMode = bits, U08, 4515, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" mainUnusedEnd = array, S32, 4516, [371], "units", 1.0, 0, -20, 100, 0 warning_message = string, ASCII, 6000, 120 afterstartCoolantBins = array, F32, 6120, [8], "C", 1.0, 0, -100.0, 250.0, 0 diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index f6a50e52ff..df5d64f3ef 100644 --- a/firmware/tunerstudio/generated/rusefi_kinetis.ini +++ b/firmware/tunerstudio/generated/rusefi_kinetis.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.09.02.kin.780550973" + signature = "rusEFI 2020.09.02.kin.939780321" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.09.02.kin.780550973" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.09.02.kin.939780321" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Sep 02 17:32:11 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Sep 02 19:34:05 UTC 2020 pageSize = 20000 page = 1 @@ -556,7 +556,7 @@ page = 1 knockBankCyl10 = bits, U32, 976, [25:25], "Channel 1", "Channel 2" knockBankCyl11 = bits, U32, 976, [26:26], "Channel 1", "Channel 2" knockBankCyl12 = bits, U32, 976, [27:27], "Channel 1", "Channel 2" - unusedBit_251_28 = bits, U32, 976, [28:28], "false", "true" + tcuEnabled = bits, U32, 976, [28:28], "false", "true" unusedBit_251_29 = bits, U32, 976, [29:29], "false", "true" unusedBit_284_30 = bits, U32, 976, [30:30], "false", "true" unusedBit_284_31 = bits, U32, 976, [31:31], "false", "true" @@ -1130,7 +1130,8 @@ page = 1 mc33_t_bypass = scalar, U16, 4508, "us", 1.0, 0.0, 0, 10000, 0 mc33_t_hold_off = scalar, U16, 4510, "us", 1.0, 0.0, 0, 10000, 0 mc33_t_hold_tot = scalar, U16, 4512, "us", 1.0, 0.0, 0, 10000, 0 - alignmentFill_at_4514 = array, U08, 4514, [2], "units", 1.0, 0, -20, 100, 0 + tcuUpshiftButtonPinMode = bits, U08, 4514, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" + tcuDownshiftButtonPinMode = bits, U08, 4515, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" mainUnusedEnd = array, S32, 4516, [371], "units", 1.0, 0, -20, 100, 0 warning_message = string, ASCII, 6000, 120 afterstartCoolantBins = array, F32, 6120, [8], "C", 1.0, 0, -100.0, 250.0, 0 diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 4c57698001..404fe625a5 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.09.02.mre_f4.4210856902" + signature = "rusEFI 2020.09.02.mre_f4.3967367194" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.09.02.mre_f4.4210856902" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.09.02.mre_f4.3967367194" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Sep 02 17:32:03 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Sep 02 19:33:52 UTC 2020 pageSize = 20000 page = 1 @@ -556,7 +556,7 @@ page = 1 knockBankCyl10 = bits, U32, 976, [25:25], "Channel 1", "Channel 2" knockBankCyl11 = bits, U32, 976, [26:26], "Channel 1", "Channel 2" knockBankCyl12 = bits, U32, 976, [27:27], "Channel 1", "Channel 2" - unusedBit_251_28 = bits, U32, 976, [28:28], "false", "true" + tcuEnabled = bits, U32, 976, [28:28], "false", "true" unusedBit_251_29 = bits, U32, 976, [29:29], "false", "true" unusedBit_284_30 = bits, U32, 976, [30:30], "false", "true" unusedBit_284_31 = bits, U32, 976, [31:31], "false", "true" @@ -1130,7 +1130,8 @@ page = 1 mc33_t_bypass = scalar, U16, 4508, "us", 1.0, 0.0, 0, 10000, 0 mc33_t_hold_off = scalar, U16, 4510, "us", 1.0, 0.0, 0, 10000, 0 mc33_t_hold_tot = scalar, U16, 4512, "us", 1.0, 0.0, 0, 10000, 0 - alignmentFill_at_4514 = array, U08, 4514, [2], "units", 1.0, 0, -20, 100, 0 + tcuUpshiftButtonPinMode = bits, U08, 4514, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" + tcuDownshiftButtonPinMode = bits, U08, 4515, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" mainUnusedEnd = array, S32, 4516, [371], "units", 1.0, 0, -20, 100, 0 warning_message = string, ASCII, 6000, 120 afterstartCoolantBins = array, F32, 6120, [8], "C", 1.0, 0, -100.0, 250.0, 0 diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 0710891ed7..2978ea3281 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.09.02.mre_f7.4210856902" + signature = "rusEFI 2020.09.02.mre_f7.3967367194" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.09.02.mre_f7.4210856902" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.09.02.mre_f7.3967367194" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Sep 02 17:32:01 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Sep 02 19:33:51 UTC 2020 pageSize = 20000 page = 1 @@ -556,7 +556,7 @@ page = 1 knockBankCyl10 = bits, U32, 976, [25:25], "Channel 1", "Channel 2" knockBankCyl11 = bits, U32, 976, [26:26], "Channel 1", "Channel 2" knockBankCyl12 = bits, U32, 976, [27:27], "Channel 1", "Channel 2" - unusedBit_251_28 = bits, U32, 976, [28:28], "false", "true" + tcuEnabled = bits, U32, 976, [28:28], "false", "true" unusedBit_251_29 = bits, U32, 976, [29:29], "false", "true" unusedBit_284_30 = bits, U32, 976, [30:30], "false", "true" unusedBit_284_31 = bits, U32, 976, [31:31], "false", "true" @@ -1130,7 +1130,8 @@ page = 1 mc33_t_bypass = scalar, U16, 4508, "us", 1.0, 0.0, 0, 10000, 0 mc33_t_hold_off = scalar, U16, 4510, "us", 1.0, 0.0, 0, 10000, 0 mc33_t_hold_tot = scalar, U16, 4512, "us", 1.0, 0.0, 0, 10000, 0 - alignmentFill_at_4514 = array, U08, 4514, [2], "units", 1.0, 0, -20, 100, 0 + tcuUpshiftButtonPinMode = bits, U08, 4514, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" + tcuDownshiftButtonPinMode = bits, U08, 4515, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" mainUnusedEnd = array, S32, 4516, [371], "units", 1.0, 0, -20, 100, 0 warning_message = string, ASCII, 6000, 120 afterstartCoolantBins = array, F32, 6120, [8], "C", 1.0, 0, -100.0, 250.0, 0 diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index d1e794082a..e478d1f71d 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.09.02.prometheus_405.379864867" + signature = "rusEFI 2020.09.02.prometheus_405.2223359" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.09.02.prometheus_405.379864867" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.09.02.prometheus_405.2223359" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Sep 02 17:32:07 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Sep 02 19:33:59 UTC 2020 pageSize = 20000 page = 1 @@ -556,7 +556,7 @@ page = 1 knockBankCyl10 = bits, U32, 976, [25:25], "Channel 1", "Channel 2" knockBankCyl11 = bits, U32, 976, [26:26], "Channel 1", "Channel 2" knockBankCyl12 = bits, U32, 976, [27:27], "Channel 1", "Channel 2" - unusedBit_251_28 = bits, U32, 976, [28:28], "false", "true" + tcuEnabled = bits, U32, 976, [28:28], "false", "true" unusedBit_251_29 = bits, U32, 976, [29:29], "false", "true" unusedBit_284_30 = bits, U32, 976, [30:30], "false", "true" unusedBit_284_31 = bits, U32, 976, [31:31], "false", "true" @@ -1130,7 +1130,8 @@ page = 1 mc33_t_bypass = scalar, U16, 4508, "us", 1.0, 0.0, 0, 10000, 0 mc33_t_hold_off = scalar, U16, 4510, "us", 1.0, 0.0, 0, 10000, 0 mc33_t_hold_tot = scalar, U16, 4512, "us", 1.0, 0.0, 0, 10000, 0 - alignmentFill_at_4514 = array, U08, 4514, [2], "units", 1.0, 0, -20, 100, 0 + tcuUpshiftButtonPinMode = bits, U08, 4514, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" + tcuDownshiftButtonPinMode = bits, U08, 4515, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" mainUnusedEnd = array, S32, 4516, [371], "units", 1.0, 0, -20, 100, 0 warning_message = string, ASCII, 6000, 120 afterstartCoolantBins = array, F32, 6120, [8], "C", 1.0, 0, -100.0, 250.0, 0 diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index f6da50ee31..0e8e64cc8c 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.09.02.prometheus_469.379864867" + signature = "rusEFI 2020.09.02.prometheus_469.2223359" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.09.02.prometheus_469.379864867" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.09.02.prometheus_469.2223359" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Sep 02 17:32:06 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Sep 02 19:33:55 UTC 2020 pageSize = 20000 page = 1 @@ -556,7 +556,7 @@ page = 1 knockBankCyl10 = bits, U32, 976, [25:25], "Channel 1", "Channel 2" knockBankCyl11 = bits, U32, 976, [26:26], "Channel 1", "Channel 2" knockBankCyl12 = bits, U32, 976, [27:27], "Channel 1", "Channel 2" - unusedBit_251_28 = bits, U32, 976, [28:28], "false", "true" + tcuEnabled = bits, U32, 976, [28:28], "false", "true" unusedBit_251_29 = bits, U32, 976, [29:29], "false", "true" unusedBit_284_30 = bits, U32, 976, [30:30], "false", "true" unusedBit_284_31 = bits, U32, 976, [31:31], "false", "true" @@ -1130,7 +1130,8 @@ page = 1 mc33_t_bypass = scalar, U16, 4508, "us", 1.0, 0.0, 0, 10000, 0 mc33_t_hold_off = scalar, U16, 4510, "us", 1.0, 0.0, 0, 10000, 0 mc33_t_hold_tot = scalar, U16, 4512, "us", 1.0, 0.0, 0, 10000, 0 - alignmentFill_at_4514 = array, U08, 4514, [2], "units", 1.0, 0, -20, 100, 0 + tcuUpshiftButtonPinMode = bits, U08, 4514, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" + tcuDownshiftButtonPinMode = bits, U08, 4515, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" mainUnusedEnd = array, S32, 4516, [371], "units", 1.0, 0, -20, 100, 0 warning_message = string, ASCII, 6000, 120 afterstartCoolantBins = array, F32, 6120, [8], "C", 1.0, 0, -100.0, 250.0, 0 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 38e3b32826..847c173233 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.09.02.proteus_f4.873220568" + signature = "rusEFI 2020.09.02.proteus_f4.579461636" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.09.02.proteus_f4.873220568" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.09.02.proteus_f4.579461636" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Sep 02 17:32:10 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Sep 02 19:34:04 UTC 2020 pageSize = 20000 page = 1 @@ -556,7 +556,7 @@ page = 1 knockBankCyl10 = bits, U32, 976, [25:25], "Channel 1", "Channel 2" knockBankCyl11 = bits, U32, 976, [26:26], "Channel 1", "Channel 2" knockBankCyl12 = bits, U32, 976, [27:27], "Channel 1", "Channel 2" - unusedBit_251_28 = bits, U32, 976, [28:28], "false", "true" + tcuEnabled = bits, U32, 976, [28:28], "false", "true" unusedBit_251_29 = bits, U32, 976, [29:29], "false", "true" unusedBit_284_30 = bits, U32, 976, [30:30], "false", "true" unusedBit_284_31 = bits, U32, 976, [31:31], "false", "true" @@ -1130,7 +1130,8 @@ page = 1 mc33_t_bypass = scalar, U16, 4508, "us", 1.0, 0.0, 0, 10000, 0 mc33_t_hold_off = scalar, U16, 4510, "us", 1.0, 0.0, 0, 10000, 0 mc33_t_hold_tot = scalar, U16, 4512, "us", 1.0, 0.0, 0, 10000, 0 - alignmentFill_at_4514 = array, U08, 4514, [2], "units", 1.0, 0, -20, 100, 0 + tcuUpshiftButtonPinMode = bits, U08, 4514, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" + tcuDownshiftButtonPinMode = bits, U08, 4515, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" mainUnusedEnd = array, S32, 4516, [371], "units", 1.0, 0, -20, 100, 0 warning_message = string, ASCII, 6000, 120 afterstartCoolantBins = array, F32, 6120, [8], "C", 1.0, 0, -100.0, 250.0, 0 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 5008fc1795..c3d1de6037 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.09.02.proteus_f7.873220568" + signature = "rusEFI 2020.09.02.proteus_f7.579461636" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.09.02.proteus_f7.873220568" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.09.02.proteus_f7.579461636" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Sep 02 17:32:09 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Sep 02 19:34:02 UTC 2020 pageSize = 20000 page = 1 @@ -556,7 +556,7 @@ page = 1 knockBankCyl10 = bits, U32, 976, [25:25], "Channel 1", "Channel 2" knockBankCyl11 = bits, U32, 976, [26:26], "Channel 1", "Channel 2" knockBankCyl12 = bits, U32, 976, [27:27], "Channel 1", "Channel 2" - unusedBit_251_28 = bits, U32, 976, [28:28], "false", "true" + tcuEnabled = bits, U32, 976, [28:28], "false", "true" unusedBit_251_29 = bits, U32, 976, [29:29], "false", "true" unusedBit_284_30 = bits, U32, 976, [30:30], "false", "true" unusedBit_284_31 = bits, U32, 976, [31:31], "false", "true" @@ -1130,7 +1130,8 @@ page = 1 mc33_t_bypass = scalar, U16, 4508, "us", 1.0, 0.0, 0, 10000, 0 mc33_t_hold_off = scalar, U16, 4510, "us", 1.0, 0.0, 0, 10000, 0 mc33_t_hold_tot = scalar, U16, 4512, "us", 1.0, 0.0, 0, 10000, 0 - alignmentFill_at_4514 = array, U08, 4514, [2], "units", 1.0, 0, -20, 100, 0 + tcuUpshiftButtonPinMode = bits, U08, 4514, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" + tcuDownshiftButtonPinMode = bits, U08, 4515, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" mainUnusedEnd = array, S32, 4516, [371], "units", 1.0, 0, -20, 100, 0 warning_message = string, ASCII, 6000, 120 afterstartCoolantBins = array, F32, 6120, [8], "C", 1.0, 0, -100.0, 250.0, 0 diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java index 81322e75dc..9337f557d7 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Sep 02 11:22:23 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Sep 02 19:33:49 UTC 2020 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -44,7 +44,6 @@ public class Fields { public static final int afterstartHoldTime_offset = 6152; public static final int air_pressure_sensor_config_s_size = 16; public static final int alignEngineSnifferAtTDC_offset = 744; - public static final int alignmentFill_at_4514_offset = 4514; public static final int alternator_antiwindupFreq_offset = 1764; public static final int alternator_derivativeFilterLoss_offset = 1760; public static final int alternatorControl_dFactor_offset = 1724; @@ -1105,7 +1104,7 @@ public class Fields { public static final int servoOutputPins8_offset = 3147; public static final int showHumanReadableWarning_offset = 976; public static final int showSdCardWarning_offset = 76; - public static final int SIGNATURE_HASH = 248208433; + public static final int SIGNATURE_HASH = 400010561; public static final int silentTriggerError_offset = 1464; public static final int slowAdcAlpha_offset = 2088; public static final int sparkDwellRpmBins_offset = 332; @@ -1202,7 +1201,10 @@ public class Fields { public static final int tcu_solenoid8_offset = 1199; public static final int TCU_SOLENOID_COUNT = 8; public static final int tcuDownshiftButtonPin_offset = 1819; + public static final int tcuDownshiftButtonPinMode_offset = 4515; + public static final int tcuEnabled_offset = 976; public static final int tcuUpshiftButtonPin_offset = 1818; + public static final int tcuUpshiftButtonPinMode_offset = 4514; public static final int test557pin_offset = 3101; public static final int thermistor_conf_s_size = 28; public static final int ThermistorConf_size = 32; @@ -1362,7 +1364,7 @@ public class Fields { public static final char TS_SD_R_COMMAND = 'r'; public static final char TS_SD_W_COMMAND = 'w'; public static final char TS_SET_LOGGER_SWITCH = 'l'; - public static final String TS_SIGNATURE = "rusEFI 2020.09.02.all.248208433"; + public static final String TS_SIGNATURE = "rusEFI 2020.09.02.all.400010561"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final int tunerStudioSerialSpeed_offset = 728; public static final int twoWireBatchIgnition_offset = 1476; @@ -1404,7 +1406,6 @@ public class Fields { public static final int unusedAuxVoltage1_TODO_332_offset = 2713; public static final int unusedAuxVoltage2_TODO_332_offset = 2714; public static final int unusedBit4_1476_offset = 1476; - public static final int unusedBit_251_28_offset = 976; public static final int unusedBit_251_29_offset = 976; public static final int unusedBit_284_30_offset = 976; public static final int unusedBit_284_31_offset = 976; @@ -1980,7 +1981,7 @@ public class Fields { public static final Field KNOCKBANKCYL10 = Field.create("KNOCKBANKCYL10", 976, FieldType.BIT, 25); public static final Field KNOCKBANKCYL11 = Field.create("KNOCKBANKCYL11", 976, FieldType.BIT, 26); public static final Field KNOCKBANKCYL12 = Field.create("KNOCKBANKCYL12", 976, FieldType.BIT, 27); - public static final Field UNUSEDBIT_251_28 = Field.create("UNUSEDBIT_251_28", 976, FieldType.BIT, 28); + public static final Field TCUENABLED = Field.create("TCUENABLED", 976, FieldType.BIT, 28); public static final Field UNUSEDBIT_251_29 = Field.create("UNUSEDBIT_251_29", 976, FieldType.BIT, 29); public static final Field UNUSEDBIT_284_30 = Field.create("UNUSEDBIT_284_30", 976, FieldType.BIT, 30); public static final Field UNUSEDBIT_284_31 = Field.create("UNUSEDBIT_284_31", 976, FieldType.BIT, 31); @@ -2508,6 +2509,8 @@ public class Fields { public static final Field MC33_T_BYPASS = Field.create("MC33_T_BYPASS", 4508, FieldType.INT16); public static final Field MC33_T_HOLD_OFF = Field.create("MC33_T_HOLD_OFF", 4510, FieldType.INT16); public static final Field MC33_T_HOLD_TOT = Field.create("MC33_T_HOLD_TOT", 4512, FieldType.INT16); + public static final Field TCUUPSHIFTBUTTONPINMODE = Field.create("TCUUPSHIFTBUTTONPINMODE", 4514, FieldType.INT8, pin_input_mode_e); + public static final Field TCUDOWNSHIFTBUTTONPINMODE = Field.create("TCUDOWNSHIFTBUTTONPINMODE", 4515, FieldType.INT8, pin_input_mode_e); public static final Field WARNING_MESSAGE = Field.create("WARNING_MESSAGE", 6000, 120, FieldType.STRING); public static final Field BOOSTTABLEOPENLOOP = Field.create("BOOSTTABLEOPENLOOP", 6248, FieldType.INT); public static final Field BOOSTTABLECLOSEDLOOP = Field.create("BOOSTTABLECLOSEDLOOP", 6328, FieldType.INT); @@ -3004,7 +3007,7 @@ public class Fields { KNOCKBANKCYL10, KNOCKBANKCYL11, KNOCKBANKCYL12, - UNUSEDBIT_251_28, + TCUENABLED, UNUSEDBIT_251_29, UNUSEDBIT_284_30, UNUSEDBIT_284_31, @@ -3523,6 +3526,8 @@ public class Fields { MC33_T_BYPASS, MC33_T_HOLD_OFF, MC33_T_HOLD_TOT, + TCUUPSHIFTBUTTONPINMODE, + TCUDOWNSHIFTBUTTONPINMODE, WARNING_MESSAGE, BOOSTTABLEOPENLOOP, BOOSTTABLECLOSEDLOOP, diff --git a/java_console/rusefi.xml b/java_console/rusefi.xml index 46b8821c41..fc429f0af5 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -1,6 +1,6 @@ - +