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 bc953f5af3..998aecc15f 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 Thu Jul 02 18:26:35 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Fri Jul 03 18:55:58 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #ifndef CONFIG_BOARDS_KINETIS_CONFIG_CONTROLLERS_ALGO_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H @@ -2854,11 +2854,11 @@ struct engine_configuration_s { /** * offset 2713 */ - adc_channel_e auxVoltage1; + uint8_t unusedAuxVoltage1_TODO_332; /** * offset 2714 */ - adc_channel_e auxVoltage2; + uint8_t unusedAuxVoltage2_TODO_332; /** * offset 2715 */ @@ -3522,4 +3522,4 @@ typedef struct persistent_config_s persistent_config_s; #endif // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Thu Jul 02 18:26:35 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Fri Jul 03 18:55:58 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 d2bf9b1bd4..b764152db0 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -130,8 +130,6 @@ #define auxTempSensor2_tempC_3_offset 2484 #define auxValves1_offset 1816 #define auxValves2_offset 1817 -#define auxVoltage1_offset 2713 -#define auxVoltage2_offset 2714 #define BARO_CORR_SIZE 4 #define baroCorrPressureBins_offset 1544 #define baroCorrRpmBins_offset 1560 @@ -1058,8 +1056,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD kin -#define SIGNATURE_DATE 2020.07.02 -#define SIGNATURE_HASH 872239884 +#define SIGNATURE_DATE 2020.07.03 +#define SIGNATURE_HASH 3817459231 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1319,7 +1317,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.07.02.kin.872239884" +#define TS_SIGNATURE "rusEFI 2020.07.03.kin.3817459231" #define TS_SINGLE_WRITE_COMMAND 'W' #define tunerStudioSerialSpeed_offset 728 #define twoWireBatchIgnition_offset 1476 @@ -1353,6 +1351,8 @@ #define unusedAt720_offset 720 #define unusedAt724_offset 724 #define unusedAtOldBoardConfigurationEnd_offset 1200 +#define unusedAuxVoltage1_TODO_332_offset 2713 +#define unusedAuxVoltage2_TODO_332_offset 2714 #define unusedBit4_1476_offset 1476 #define unusedBit_251_11_offset 976 #define unusedBit_251_12_offset 976 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index be0f533068..312184dcb1 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 Thu Jul 02 18:26:29 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Jul 03 18:55:52 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #ifndef CONTROLLERS_GENERATED_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H @@ -2854,11 +2854,11 @@ struct engine_configuration_s { /** * offset 2713 */ - adc_channel_e auxVoltage1; + uint8_t unusedAuxVoltage1_TODO_332; /** * offset 2714 */ - adc_channel_e auxVoltage2; + uint8_t unusedAuxVoltage2_TODO_332; /** * offset 2715 */ @@ -3522,4 +3522,4 @@ typedef struct persistent_config_s persistent_config_s; #endif // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jul 02 18:26:29 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Jul 03 18:55:52 UTC 2020 diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index eb1c25d525..2ba4d26a9b 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 Thu Jul 02 18:26:29 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Jul 03 18:55:52 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 b249ad533a..7c30403bf5 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 Thu Jul 02 18:26:29 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Jul 03 18:55:52 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 fa0d78d734..7108649fbc 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 Thu Jul 02 18:26:29 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Jul 03 18:55:52 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 fcc8989d12..b2f8757e00 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 Thu Jul 02 18:26:29 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Jul 03 18:55:52 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 ace01f653e..930b91051c 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -130,8 +130,6 @@ #define auxTempSensor2_tempC_3_offset 2484 #define auxValves1_offset 1816 #define auxValves2_offset 1817 -#define auxVoltage1_offset 2713 -#define auxVoltage2_offset 2714 #define BARO_CORR_SIZE 4 #define baroCorrPressureBins_offset 1544 #define baroCorrRpmBins_offset 1560 @@ -1058,8 +1056,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD all -#define SIGNATURE_DATE 2020.07.02 -#define SIGNATURE_HASH 4274229142 +#define SIGNATURE_DATE 2020.07.03 +#define SIGNATURE_HASH 783749765 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1319,7 +1317,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.07.02.all.4274229142" +#define TS_SIGNATURE "rusEFI 2020.07.03.all.783749765" #define TS_SINGLE_WRITE_COMMAND 'W' #define tunerStudioSerialSpeed_offset 728 #define twoWireBatchIgnition_offset 1476 @@ -1353,6 +1351,8 @@ #define unusedAt720_offset 720 #define unusedAt724_offset 724 #define unusedAtOldBoardConfigurationEnd_offset 1200 +#define unusedAuxVoltage1_TODO_332_offset 2713 +#define unusedAuxVoltage2_TODO_332_offset 2714 #define unusedBit4_1476_offset 1476 #define unusedBit_251_11_offset 976 #define unusedBit_251_12_offset 976 diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index f01e5fc11c..c189837a06 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.07.03 -#define SIGNATURE_HASH 2903991359 -#define TS_SIGNATURE "rusEFI 2020.07.03.all.2903991359" +#define SIGNATURE_HASH 783749765 +#define TS_SIGNATURE "rusEFI 2020.07.03.all.783749765" diff --git a/firmware/controllers/generated/signature_fra.h b/firmware/controllers/generated/signature_fra.h index 2df1d280c5..009ad48aa3 100644 --- a/firmware/controllers/generated/signature_fra.h +++ b/firmware/controllers/generated/signature_fra.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD fra #define SIGNATURE_DATE 2020.07.03 -#define SIGNATURE_HASH 1938819292 -#define TS_SIGNATURE "rusEFI 2020.07.03.fra.1938819292" +#define SIGNATURE_HASH 4029709926 +#define TS_SIGNATURE "rusEFI 2020.07.03.fra.4029709926" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 0fa2348ca2..0fed885012 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.07.03 -#define SIGNATURE_HASH 1613346981 -#define TS_SIGNATURE "rusEFI 2020.07.03.kin.1613346981" +#define SIGNATURE_HASH 3817459231 +#define TS_SIGNATURE "rusEFI 2020.07.03.kin.3817459231" diff --git a/firmware/controllers/generated/signature_mre.h b/firmware/controllers/generated/signature_mre.h index 772c87462f..16318a224e 100644 --- a/firmware/controllers/generated/signature_mre.h +++ b/firmware/controllers/generated/signature_mre.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD mre #define SIGNATURE_DATE 2020.07.03 -#define SIGNATURE_HASH 82045768 -#define TS_SIGNATURE "rusEFI 2020.07.03.mre.82045768" +#define SIGNATURE_HASH 2269355506 +#define TS_SIGNATURE "rusEFI 2020.07.03.mre.2269355506" diff --git a/firmware/controllers/generated/signature_pro.h b/firmware/controllers/generated/signature_pro.h index 339821b83d..3b6501786a 100644 --- a/firmware/controllers/generated/signature_pro.h +++ b/firmware/controllers/generated/signature_pro.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD pro #define SIGNATURE_DATE 2020.07.03 -#define SIGNATURE_HASH 545658352 -#define TS_SIGNATURE "rusEFI 2020.07.03.pro.545658352" +#define SIGNATURE_HASH 2737201994 +#define TS_SIGNATURE "rusEFI 2020.07.03.pro.2737201994" diff --git a/firmware/controllers/generated/signature_pth.h b/firmware/controllers/generated/signature_pth.h index d3ac648ddb..b33b30b8d8 100644 --- a/firmware/controllers/generated/signature_pth.h +++ b/firmware/controllers/generated/signature_pth.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD pth #define SIGNATURE_DATE 2020.07.03 -#define SIGNATURE_HASH 1477164219 -#define TS_SIGNATURE "rusEFI 2020.07.03.pth.1477164219" +#define SIGNATURE_HASH 3685468673 +#define TS_SIGNATURE "rusEFI 2020.07.03.pth.3685468673" diff --git a/firmware/tunerstudio/cache.zip b/firmware/tunerstudio/cache.zip index decadcdc58..1ca7a36b9c 100644 Binary files a/firmware/tunerstudio/cache.zip and b/firmware/tunerstudio/cache.zip differ diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 9507d6d166..4c13fbb828 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -45,12 +45,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.03.all.2903991359" + signature = "rusEFI 2020.07.03.all.783749765" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.03.all.2903991359" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.03.all.783749765" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -88,7 +88,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 Fri Jul 03 00:44:20 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Jul 03 18:55:52 UTC 2020 pageSize = 20000 page = 1 @@ -965,8 +965,8 @@ page = 1 oilPressure_v2 = scalar, F32, 2704, "volts", 1, 0.0, 0, 10.0, 2 oilPressure_value2 = scalar, F32, 2708, "kPa", 1, 0.0, 0, 1000.0, 2 accelerometerSpiDevice = bits,U32, 2712, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "INVALID", "INVALID", "INVALID" - auxVoltage1 = bits, U08, 2713, [0:4] "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "Disabled", "PB12", "PB13", "PC14", "PC15", "PC16", "PC17", "PD3", "PD4", "PE2", "PE6", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" - auxVoltage2 = bits, U08, 2714, [0:4] "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "Disabled", "PB12", "PB13", "PC14", "PC15", "PC16", "PC17", "PD3", "PD4", "PE2", "PE6", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" + unusedAuxVoltage1_TODO_332 = scalar, U08, 2713, "units", 1, 0, -20, 100, 0 + unusedAuxVoltage2_TODO_332 = scalar, U08, 2714, "units", 1, 0, -20, 100, 0 unusedSpiPadding5 = scalar, U08, 2715, "units", 1, 0, -20, 100, 0 fsioCurve1Bins = array, F32, 2716, [16], "x", 1, 0, -999, 1000.0, 3 fsioCurve1 = array, F32, 2780, [16], "y", 1, 0, -999, 1000.0, 3 diff --git a/firmware/tunerstudio/rusefi_frankenso.ini b/firmware/tunerstudio/rusefi_frankenso.ini index f431be8b2a..d8ea4d523b 100644 --- a/firmware/tunerstudio/rusefi_frankenso.ini +++ b/firmware/tunerstudio/rusefi_frankenso.ini @@ -45,12 +45,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.03.fra.1938819292" + signature = "rusEFI 2020.07.03.fra.4029709926" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.03.fra.1938819292" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.03.fra.4029709926" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -88,7 +88,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 Fri Jul 03 00:44:23 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Jul 03 18:55:55 UTC 2020 pageSize = 20000 page = 1 @@ -965,8 +965,8 @@ page = 1 oilPressure_v2 = scalar, F32, 2704, "volts", 1, 0.0, 0, 10.0, 2 oilPressure_value2 = scalar, F32, 2708, "kPa", 1, 0.0, 0, 1000.0, 2 accelerometerSpiDevice = bits,U32, 2712, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "INVALID", "INVALID", "INVALID" - auxVoltage1 = bits, U08, 2713, [0:4] "Analog 3O","Analog 3L","Analog 3M","Analog 3J","Analog 3I","INVALID","Analog 3H","Analog 3G","INVALID","INVALID","INVALID","Analog 3P","Analog 3Q","Analog 3N","Analog VBatt","Analog 3E","NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" - auxVoltage2 = bits, U08, 2714, [0:4] "Analog 3O","Analog 3L","Analog 3M","Analog 3J","Analog 3I","INVALID","Analog 3H","Analog 3G","INVALID","INVALID","INVALID","Analog 3P","Analog 3Q","Analog 3N","Analog VBatt","Analog 3E","NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" + unusedAuxVoltage1_TODO_332 = scalar, U08, 2713, "units", 1, 0, -20, 100, 0 + unusedAuxVoltage2_TODO_332 = scalar, U08, 2714, "units", 1, 0, -20, 100, 0 unusedSpiPadding5 = scalar, U08, 2715, "units", 1, 0, -20, 100, 0 fsioCurve1Bins = array, F32, 2716, [16], "x", 1, 0, -999, 1000.0, 3 fsioCurve1 = array, F32, 2780, [16], "y", 1, 0, -999, 1000.0, 3 diff --git a/firmware/tunerstudio/rusefi_kinetis.ini b/firmware/tunerstudio/rusefi_kinetis.ini index d2dd06fa99..813d79ede0 100644 --- a/firmware/tunerstudio/rusefi_kinetis.ini +++ b/firmware/tunerstudio/rusefi_kinetis.ini @@ -45,12 +45,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.03.kin.1613346981" + signature = "rusEFI 2020.07.03.kin.3817459231" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.03.kin.1613346981" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.03.kin.3817459231" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -88,7 +88,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 Fri Jul 03 00:44:26 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Fri Jul 03 18:55:58 UTC 2020 pageSize = 20000 page = 1 @@ -965,8 +965,8 @@ page = 1 oilPressure_v2 = scalar, F32, 2704, "volts", 1, 0.0, 0, 10.0, 2 oilPressure_value2 = scalar, F32, 2708, "kPa", 1, 0.0, 0, 1000.0, 2 accelerometerSpiDevice = bits,U32, 2712, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "INVALID", "INVALID", "INVALID" - auxVoltage1 = bits, U08, 2713, [0:4] "PA2", "PA3", "INVALID", "PD3", "INVALID", "INVALID", "INVALID", "PB12", "PB13", "INVALID", "PE2", "INVALID", "PC14", "PC15", "PC16", "PC17", "Disabled", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" - auxVoltage2 = bits, U08, 2714, [0:4] "PA2", "PA3", "INVALID", "PD3", "INVALID", "INVALID", "INVALID", "PB12", "PB13", "INVALID", "PE2", "INVALID", "PC14", "PC15", "PC16", "PC17", "Disabled", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" + unusedAuxVoltage1_TODO_332 = scalar, U08, 2713, "units", 1, 0, -20, 100, 0 + unusedAuxVoltage2_TODO_332 = scalar, U08, 2714, "units", 1, 0, -20, 100, 0 unusedSpiPadding5 = scalar, U08, 2715, "units", 1, 0, -20, 100, 0 fsioCurve1Bins = array, F32, 2716, [16], "x", 1, 0, -999, 1000.0, 3 fsioCurve1 = array, F32, 2780, [16], "y", 1, 0, -999, 1000.0, 3 diff --git a/firmware/tunerstudio/rusefi_microrusefi.ini b/firmware/tunerstudio/rusefi_microrusefi.ini index d70a262d05..d78e931cef 100644 --- a/firmware/tunerstudio/rusefi_microrusefi.ini +++ b/firmware/tunerstudio/rusefi_microrusefi.ini @@ -45,12 +45,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.03.mre.82045768" + signature = "rusEFI 2020.07.03.mre.2269355506" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.03.mre.82045768" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.03.mre.2269355506" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -88,7 +88,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 Fri Jul 03 00:44:22 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Jul 03 18:55:53 UTC 2020 pageSize = 20000 page = 1 @@ -965,8 +965,8 @@ page = 1 oilPressure_v2 = scalar, F32, 2704, "volts", 1, 0.0, 0, 10.0, 2 oilPressure_value2 = scalar, F32, 2708, "kPa", 1, 0.0, 0, 1000.0, 2 accelerometerSpiDevice = bits,U32, 2712, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "INVALID", "INVALID", "INVALID" - auxVoltage1 = bits, U08, 2713, [0:4] "18 - AN temp 1","23 - AN temp 2","24 - AN temp 3","22 - AN temp 4","28 - AN volt 10","INVALID","26 - AN volt 2","31 - AN volt 3","36 - AN volt 8","40 - AN volt 9","27 - AN volt 1","Battery Sense","19 - AN volt 4","20 - AN volt 5","32 - AN volt 6","30 - AN volt 7","NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" - auxVoltage2 = bits, U08, 2714, [0:4] "18 - AN temp 1","23 - AN temp 2","24 - AN temp 3","22 - AN temp 4","28 - AN volt 10","INVALID","26 - AN volt 2","31 - AN volt 3","36 - AN volt 8","40 - AN volt 9","27 - AN volt 1","Battery Sense","19 - AN volt 4","20 - AN volt 5","32 - AN volt 6","30 - AN volt 7","NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" + unusedAuxVoltage1_TODO_332 = scalar, U08, 2713, "units", 1, 0, -20, 100, 0 + unusedAuxVoltage2_TODO_332 = scalar, U08, 2714, "units", 1, 0, -20, 100, 0 unusedSpiPadding5 = scalar, U08, 2715, "units", 1, 0, -20, 100, 0 fsioCurve1Bins = array, F32, 2716, [16], "x", 1, 0, -999, 1000.0, 3 fsioCurve1 = array, F32, 2780, [16], "y", 1, 0, -999, 1000.0, 3 diff --git a/firmware/tunerstudio/rusefi_prometheus.ini b/firmware/tunerstudio/rusefi_prometheus.ini index b54ab0e7df..d40cf90873 100644 --- a/firmware/tunerstudio/rusefi_prometheus.ini +++ b/firmware/tunerstudio/rusefi_prometheus.ini @@ -45,12 +45,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.03.pth.1477164219" + signature = "rusEFI 2020.07.03.pth.3685468673" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.03.pth.1477164219" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.03.pth.3685468673" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -88,7 +88,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 Fri Jul 03 00:44:24 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Jul 03 18:55:56 UTC 2020 pageSize = 20000 page = 1 @@ -965,8 +965,8 @@ page = 1 oilPressure_v2 = scalar, F32, 2704, "volts", 1, 0.0, 0, 10.0, 2 oilPressure_value2 = scalar, F32, 2708, "kPa", 1, 0.0, 0, 1000.0, 2 accelerometerSpiDevice = bits,U32, 2712, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "INVALID", "INVALID", "INVALID" - auxVoltage1 = bits, U08, 2713, [0:4] "Analog 3O","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" - auxVoltage2 = bits, U08, 2714, [0:4] "Analog 3O","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" + unusedAuxVoltage1_TODO_332 = scalar, U08, 2713, "units", 1, 0, -20, 100, 0 + unusedAuxVoltage2_TODO_332 = scalar, U08, 2714, "units", 1, 0, -20, 100, 0 unusedSpiPadding5 = scalar, U08, 2715, "units", 1, 0, -20, 100, 0 fsioCurve1Bins = array, F32, 2716, [16], "x", 1, 0, -999, 1000.0, 3 fsioCurve1 = array, F32, 2780, [16], "y", 1, 0, -999, 1000.0, 3 diff --git a/firmware/tunerstudio/rusefi_proteus.ini b/firmware/tunerstudio/rusefi_proteus.ini index 05cd1989ce..963e19e031 100644 --- a/firmware/tunerstudio/rusefi_proteus.ini +++ b/firmware/tunerstudio/rusefi_proteus.ini @@ -45,12 +45,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.03.pro.545658352" + signature = "rusEFI 2020.07.03.pro.2737201994" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.03.pro.545658352" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.03.pro.2737201994" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -88,7 +88,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 Fri Jul 03 00:44:25 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Jul 03 18:55:57 UTC 2020 pageSize = 20000 page = 1 @@ -965,8 +965,8 @@ page = 1 oilPressure_v2 = scalar, F32, 2704, "volts", 1, 0.0, 0, 10.0, 2 oilPressure_value2 = scalar, F32, 2708, "kPa", 1, 0.0, 0, 1000.0, 2 accelerometerSpiDevice = bits,U32, 2712, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "INVALID", "INVALID", "INVALID" - auxVoltage1 = bits, U08, 2713, [0:4] "Analog Volt 5","Analog Volt 6","Analog Volt 7","Analog Volt 8","Analog Volt 9","Analog Volt 10","Analog Volt 11","Battery Sense","Analog Temp 3","Analog Temp 4","Analog Volt 1","Analog Volt 2","Analog Volt 3","Analog Volt 4","Analog Temp 1","Analog Temp 2","NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" - auxVoltage2 = bits, U08, 2714, [0:4] "Analog Volt 5","Analog Volt 6","Analog Volt 7","Analog Volt 8","Analog Volt 9","Analog Volt 10","Analog Volt 11","Battery Sense","Analog Temp 3","Analog Temp 4","Analog Volt 1","Analog Volt 2","Analog Volt 3","Analog Volt 4","Analog Temp 1","Analog Temp 2","NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" + unusedAuxVoltage1_TODO_332 = scalar, U08, 2713, "units", 1, 0, -20, 100, 0 + unusedAuxVoltage2_TODO_332 = scalar, U08, 2714, "units", 1, 0, -20, 100, 0 unusedSpiPadding5 = scalar, U08, 2715, "units", 1, 0, -20, 100, 0 fsioCurve1Bins = array, F32, 2716, [16], "x", 1, 0, -999, 1000.0, 3 fsioCurve1 = array, F32, 2780, [16], "y", 1, 0, -999, 1000.0, 3 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 6f67bcb98b..60d6b4a754 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 Thu Jul 02 18:26:29 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Jul 03 18:55:52 UTC 2020 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -132,8 +132,6 @@ public class Fields { public static final int auxTempSensor2_tempC_3_offset = 2484; public static final int auxValves1_offset = 1816; public static final int auxValves2_offset = 1817; - public static final int auxVoltage1_offset = 2713; - public static final int auxVoltage2_offset = 2714; public static final int BARO_CORR_SIZE = 4; public static final int baroCorrPressureBins_offset = 1544; public static final int baroCorrRpmBins_offset = 1560; @@ -1040,6 +1038,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 = 783749765; public static final int silentTriggerError_offset = 1464; public static final int slowAdcAlpha_offset = 2088; public static final int sparkDwellRpmBins_offset = 332; @@ -1278,7 +1277,7 @@ public class Fields { public static final int TS_RESPONSE_COMMAND_OK = 7; public static final int TS_RESPONSE_OK = 0; public static final char TS_SET_LOGGER_SWITCH = 'l'; - public static final String TS_SIGNATURE = "rusEFI 2020.07.02.all.4274229142"; + public static final String TS_SIGNATURE = "rusEFI 2020.07.03.all.783749765"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final int tunerStudioSerialSpeed_offset = 728; public static final int twoWireBatchIgnition_offset = 1476; @@ -1312,6 +1311,8 @@ public class Fields { public static final int unusedAt720_offset = 720; public static final int unusedAt724_offset = 724; public static final int unusedAtOldBoardConfigurationEnd_offset = 1200; + 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_11_offset = 976; public static final int unusedBit_251_12_offset = 976; @@ -2256,8 +2257,8 @@ public class Fields { public static final Field OILPRESSURE_V2 = Field.create("OILPRESSURE_V2", 2704, FieldType.FLOAT); public static final Field OILPRESSURE_VALUE2 = Field.create("OILPRESSURE_VALUE2", 2708, FieldType.FLOAT); public static final Field ACCELEROMETERSPIDEVICE = Field.create("ACCELEROMETERSPIDEVICE", 2712, FieldType.INT8); - public static final Field AUXVOLTAGE1 = Field.create("AUXVOLTAGE1", 2713, FieldType.INT8, adc_channel_e); - public static final Field AUXVOLTAGE2 = Field.create("AUXVOLTAGE2", 2714, FieldType.INT8, adc_channel_e); + public static final Field UNUSEDAUXVOLTAGE1_TODO_332 = Field.create("UNUSEDAUXVOLTAGE1_TODO_332", 2713, FieldType.INT8); + public static final Field UNUSEDAUXVOLTAGE2_TODO_332 = Field.create("UNUSEDAUXVOLTAGE2_TODO_332", 2714, FieldType.INT8); public static final Field UNUSEDSPIPADDING5 = Field.create("UNUSEDSPIPADDING5", 2715, FieldType.INT8); public static final Field UNUSEDFLEXFUELSENSOR = Field.create("UNUSEDFLEXFUELSENSOR", 3100, FieldType.INT8); public static final Field TEST557PIN = Field.create("TEST557PIN", 3101, FieldType.INT8, brain_pin_e); @@ -3235,8 +3236,8 @@ public class Fields { OILPRESSURE_V2, OILPRESSURE_VALUE2, ACCELEROMETERSPIDEVICE, - AUXVOLTAGE1, - AUXVOLTAGE2, + UNUSEDAUXVOLTAGE1_TODO_332, + UNUSEDAUXVOLTAGE2_TODO_332, UNUSEDSPIPADDING5, UNUSEDFLEXFUELSENSOR, TEST557PIN, diff --git a/java_console/rusefi.xml b/java_console/rusefi.xml index 1956515579..ed4f123bb9 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -1,6 +1,6 @@ - +