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 f4dfed30cb..e61954e695 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 Jul 15 01:37:11 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Jul 18 23:22:09 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3530,4 +3530,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 Jul 15 01:37:11 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Jul 18 23:22:09 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 7afbbc1e6a..a657d3a5b4 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1075,8 +1075,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD kin -#define SIGNATURE_DATE 2020.07.15 -#define SIGNATURE_HASH 716980676 +#define SIGNATURE_DATE 2020.07.18 +#define SIGNATURE_HASH 3679226275 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1344,7 +1344,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.07.15.kin.716980676" +#define TS_SIGNATURE "rusEFI 2020.07.18.kin.3679226275" #define TS_SINGLE_WRITE_COMMAND 'W' #define tunerStudioSerialSpeed_offset 728 #define twoWireBatchIgnition_offset 1476 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 4306a7efe1..52b88ef72a 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 Jul 15 01:37:00 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 18 23:21:57 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3530,4 +3530,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 Jul 15 01:37:00 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 18 23:21:57 UTC 2020 diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index db2d4d4a12..618ac2d95e 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 Jul 15 01:37:00 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 18 23:21:57 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 deda82a1f2..496b0378c9 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 Jul 15 01:37:00 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 18 23:21:57 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 8c05942e09..de41b508a4 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 Jul 15 01:37:00 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 18 23:21:57 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 ea70e154b8..cd052923bc 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 Jul 15 01:37:00 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 18 23:21:57 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 15cf891dd0..e0699c6cb3 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1075,8 +1075,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD all -#define SIGNATURE_DATE 2020.07.15 -#define SIGNATURE_HASH 3884096862 +#define SIGNATURE_DATE 2020.07.18 +#define SIGNATURE_HASH 376591673 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1344,7 +1344,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.07.15.all.3884096862" +#define TS_SIGNATURE "rusEFI 2020.07.18.all.376591673" #define TS_SINGLE_WRITE_COMMAND 'W' #define tunerStudioSerialSpeed_offset 728 #define twoWireBatchIgnition_offset 1476 diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index 9df142a374..2b4f008711 100644 --- a/firmware/controllers/generated/signature_all.h +++ b/firmware/controllers/generated/signature_all.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD all -#define SIGNATURE_DATE 2020.07.15 -#define SIGNATURE_HASH 3884096862 -#define TS_SIGNATURE "rusEFI 2020.07.15.all.3884096862" +#define SIGNATURE_DATE 2020.07.18 +#define SIGNATURE_HASH 376591673 +#define TS_SIGNATURE "rusEFI 2020.07.18.all.376591673" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 94dc381bb6..dffeaf9db1 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD frankenso_na6 -#define SIGNATURE_DATE 2020.07.15 -#define SIGNATURE_HASH 956690877 -#define TS_SIGNATURE "rusEFI 2020.07.15.frankenso_na6.956690877" +#define SIGNATURE_DATE 2020.07.18 +#define SIGNATURE_HASH 3371514330 +#define TS_SIGNATURE "rusEFI 2020.07.18.frankenso_na6.3371514330" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 9207a1fbca..14093db588 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD kin -#define SIGNATURE_DATE 2020.07.15 -#define SIGNATURE_HASH 716980676 -#define TS_SIGNATURE "rusEFI 2020.07.15.kin.716980676" +#define SIGNATURE_DATE 2020.07.18 +#define SIGNATURE_HASH 3679226275 +#define TS_SIGNATURE "rusEFI 2020.07.18.kin.3679226275" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 7e36590ab0..5a1aab9e36 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD mre_f4 -#define SIGNATURE_DATE 2020.07.15 -#define SIGNATURE_HASH 2927381456 -#define TS_SIGNATURE "rusEFI 2020.07.15.mre_f4.2927381456" +#define SIGNATURE_DATE 2020.07.18 +#define SIGNATURE_HASH 1603044279 +#define TS_SIGNATURE "rusEFI 2020.07.18.mre_f4.1603044279" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index af5aee3e1b..0fbde2d8d2 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD mre_f7 -#define SIGNATURE_DATE 2020.07.15 -#define SIGNATURE_HASH 2927381456 -#define TS_SIGNATURE "rusEFI 2020.07.15.mre_f7.2927381456" +#define SIGNATURE_DATE 2020.07.18 +#define SIGNATURE_HASH 1603044279 +#define TS_SIGNATURE "rusEFI 2020.07.18.mre_f7.1603044279" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 8eb816a4d0..fd9fa5c7ea 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD prometheus_405 -#define SIGNATURE_DATE 2020.07.15 -#define SIGNATURE_HASH 312362458 -#define TS_SIGNATURE "rusEFI 2020.07.15.prometheus_405.312362458" +#define SIGNATURE_DATE 2020.07.18 +#define SIGNATURE_HASH 3815673277 +#define TS_SIGNATURE "rusEFI 2020.07.18.prometheus_405.3815673277" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 5cfb55af2d..a19f47a050 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD prometheus_469 -#define SIGNATURE_DATE 2020.07.15 -#define SIGNATURE_HASH 312362458 -#define TS_SIGNATURE "rusEFI 2020.07.15.prometheus_469.312362458" +#define SIGNATURE_DATE 2020.07.18 +#define SIGNATURE_HASH 3815673277 +#define TS_SIGNATURE "rusEFI 2020.07.18.prometheus_469.3815673277" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 2d6bff82db..b970ac1305 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD proteus_f4 -#define SIGNATURE_DATE 2020.07.15 -#define SIGNATURE_HASH 1779690641 -#define TS_SIGNATURE "rusEFI 2020.07.15.proteus_f4.1779690641" +#define SIGNATURE_DATE 2020.07.18 +#define SIGNATURE_HASH 2615354614 +#define TS_SIGNATURE "rusEFI 2020.07.18.proteus_f4.2615354614" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index edebc0f0b9..b0b5fe8c82 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD proteus_f7 -#define SIGNATURE_DATE 2020.07.15 -#define SIGNATURE_HASH 1779690641 -#define TS_SIGNATURE "rusEFI 2020.07.15.proteus_f7.1779690641" +#define SIGNATURE_DATE 2020.07.18 +#define SIGNATURE_HASH 2615354614 +#define TS_SIGNATURE "rusEFI 2020.07.18.proteus_f7.2615354614" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index 3811e02aff..9e502b3c6c 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 9ef8291ce9..241830a3c0 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -45,12 +45,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.15.all.3884096862" + signature = "rusEFI 2020.07.18.all.376591673" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.15.all.3884096862" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.18.all.376591673" ; 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 Wed Jul 15 01:37:00 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 18 23:21:57 UTC 2020 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 9e21cfc7e4..66ae2130e8 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -45,12 +45,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.15.frankenso_na6.956690877" + signature = "rusEFI 2020.07.18.frankenso_na6.3371514330" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.15.frankenso_na6.956690877" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.18.frankenso_na6.3371514330" ; 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 Wed Jul 15 01:37:05 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 18 23:22:02 UTC 2020 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index acb0237339..5263a6b38f 100644 --- a/firmware/tunerstudio/generated/rusefi_kinetis.ini +++ b/firmware/tunerstudio/generated/rusefi_kinetis.ini @@ -45,12 +45,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.15.kin.716980676" + signature = "rusEFI 2020.07.18.kin.3679226275" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.15.kin.716980676" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.18.kin.3679226275" ; 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 Wed Jul 15 01:37:11 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Jul 18 23:22:09 UTC 2020 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index f26f8b356e..76428f93b2 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -45,12 +45,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.15.mre_f4.2927381456" + signature = "rusEFI 2020.07.18.mre_f4.1603044279" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.15.mre_f4.2927381456" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.18.mre_f4.1603044279" ; 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 Wed Jul 15 01:37:04 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 18 23:22:00 UTC 2020 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index f65f9ae752..5b9650b674 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -45,12 +45,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.15.mre_f7.2927381456" + signature = "rusEFI 2020.07.18.mre_f7.1603044279" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.15.mre_f7.2927381456" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.18.mre_f7.1603044279" ; 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 Wed Jul 15 01:37:03 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 18 23:21:59 UTC 2020 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index ee8642a9bb..563facc191 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -45,12 +45,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.15.prometheus_405.312362458" + signature = "rusEFI 2020.07.18.prometheus_405.3815673277" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.15.prometheus_405.312362458" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.18.prometheus_405.3815673277" ; 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 Wed Jul 15 01:37:07 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 18 23:22:04 UTC 2020 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 891baebf77..38f8dbf3a5 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -45,12 +45,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.15.prometheus_469.312362458" + signature = "rusEFI 2020.07.18.prometheus_469.3815673277" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.15.prometheus_469.312362458" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.18.prometheus_469.3815673277" ; 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 Wed Jul 15 01:37:06 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 18 23:22:03 UTC 2020 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 0505c87579..e12214d8b1 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -45,12 +45,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.15.proteus_f4.1779690641" + signature = "rusEFI 2020.07.18.proteus_f4.2615354614" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.15.proteus_f4.1779690641" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.18.proteus_f4.2615354614" ; 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 Wed Jul 15 01:37:10 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 18 23:22:07 UTC 2020 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index f4a426216e..90e73d9d82 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -45,12 +45,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.15.proteus_f7.1779690641" + signature = "rusEFI 2020.07.18.proteus_f7.2615354614" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.15.proteus_f7.1779690641" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.18.proteus_f7.2615354614" ; 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 Wed Jul 15 01:37:09 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 18 23:22:06 UTC 2020 pageSize = 20000 page = 1 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 bc5fa6e89f..cb513e752d 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 Jul 15 01:37:00 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 18 23:21:57 UTC 2020 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1057,6 +1057,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 = 376591673; public static final int silentTriggerError_offset = 1464; public static final int slowAdcAlpha_offset = 2088; public static final int sparkDwellRpmBins_offset = 332; @@ -1303,7 +1304,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.15.all.3884096862"; + public static final String TS_SIGNATURE = "rusEFI 2020.07.18.all.376591673"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final int tunerStudioSerialSpeed_offset = 728; public static final int twoWireBatchIgnition_offset = 1476; @@ -1970,9 +1971,9 @@ public class Fields { public static final Field ETBIO22_DIRECTIONPIN2 = Field.create("ETBIO22_DIRECTIONPIN2", 1093, FieldType.INT8, brain_pin_e); public static final Field ETBIO22_CONTROLPIN1 = Field.create("ETBIO22_CONTROLPIN1", 1094, FieldType.INT8, brain_pin_e); public static final Field ETBIO22_DISABLEPIN = Field.create("ETBIO22_DISABLEPIN", 1095, FieldType.INT8, brain_pin_e); - public static final Field ENGINEMAKE = Field.create("ENGINEMAKE", 1096, FieldType.INT); - public static final Field ENGINECODE = Field.create("ENGINECODE", 1128, FieldType.INT); - public static final Field VEHICLENAME = Field.create("VEHICLENAME", 1160, FieldType.INT); + public static final Field ENGINEMAKE = Field.create("ENGINEMAKE", 1096, FieldType.STRING); + public static final Field ENGINECODE = Field.create("ENGINECODE", 1128, FieldType.STRING); + public static final Field VEHICLENAME = Field.create("VEHICLENAME", 1160, FieldType.STRING); public static final Field TCU_SOLENOID1 = Field.create("TCU_SOLENOID1", 1192, FieldType.INT8, output_pin_e); public static final Field TCU_SOLENOID2 = Field.create("TCU_SOLENOID2", 1193, FieldType.INT8, output_pin_e); public static final Field TCU_SOLENOID3 = Field.create("TCU_SOLENOID3", 1194, FieldType.INT8, output_pin_e); @@ -2394,28 +2395,28 @@ 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 WARNING_MESSAGE = Field.create("WARNING_MESSAGE", 6000, FieldType.INT); + public static final Field WARNING_MESSAGE = Field.create("WARNING_MESSAGE", 6000, FieldType.STRING); public static final Field BOOSTTABLEOPENLOOP = Field.create("BOOSTTABLEOPENLOOP", 6248, FieldType.INT); public static final Field BOOSTTABLECLOSEDLOOP = Field.create("BOOSTTABLECLOSEDLOOP", 6328, FieldType.INT); public static final Field PEDALTOTPSTABLE = Field.create("PEDALTOTPSTABLE", 6400, FieldType.INT); - public static final Field FSIOFORMULAS1 = Field.create("FSIOFORMULAS1", 6672, FieldType.INT); - public static final Field FSIOFORMULAS2 = Field.create("FSIOFORMULAS2", 6872, FieldType.INT); - public static final Field FSIOFORMULAS3 = Field.create("FSIOFORMULAS3", 7072, FieldType.INT); - public static final Field FSIOFORMULAS4 = Field.create("FSIOFORMULAS4", 7272, FieldType.INT); - public static final Field FSIOFORMULAS5 = Field.create("FSIOFORMULAS5", 7472, FieldType.INT); - public static final Field FSIOFORMULAS6 = Field.create("FSIOFORMULAS6", 7672, FieldType.INT); - public static final Field FSIOFORMULAS7 = Field.create("FSIOFORMULAS7", 7872, FieldType.INT); - public static final Field FSIOFORMULAS8 = Field.create("FSIOFORMULAS8", 8072, FieldType.INT); - public static final Field FSIOFORMULAS9 = Field.create("FSIOFORMULAS9", 8272, FieldType.INT); - public static final Field FSIOFORMULAS10 = Field.create("FSIOFORMULAS10", 8472, FieldType.INT); - public static final Field FSIOFORMULAS11 = Field.create("FSIOFORMULAS11", 8672, FieldType.INT); - public static final Field FSIOFORMULAS12 = Field.create("FSIOFORMULAS12", 8872, FieldType.INT); - public static final Field FSIOFORMULAS13 = Field.create("FSIOFORMULAS13", 9072, FieldType.INT); - public static final Field FSIOFORMULAS14 = Field.create("FSIOFORMULAS14", 9272, FieldType.INT); - public static final Field FSIOFORMULAS15 = Field.create("FSIOFORMULAS15", 9472, FieldType.INT); - public static final Field FSIOFORMULAS16 = Field.create("FSIOFORMULAS16", 9672, FieldType.INT); - public static final Field TIMINGMULTIPLIER = Field.create("TIMINGMULTIPLIER", 9872, FieldType.INT); - public static final Field TIMINGADDITIVE = Field.create("TIMINGADDITIVE", 10072, FieldType.INT); + public static final Field FSIOFORMULAS1 = Field.create("FSIOFORMULAS1", 6672, FieldType.STRING); + public static final Field FSIOFORMULAS2 = Field.create("FSIOFORMULAS2", 6872, FieldType.STRING); + public static final Field FSIOFORMULAS3 = Field.create("FSIOFORMULAS3", 7072, FieldType.STRING); + public static final Field FSIOFORMULAS4 = Field.create("FSIOFORMULAS4", 7272, FieldType.STRING); + public static final Field FSIOFORMULAS5 = Field.create("FSIOFORMULAS5", 7472, FieldType.STRING); + public static final Field FSIOFORMULAS6 = Field.create("FSIOFORMULAS6", 7672, FieldType.STRING); + public static final Field FSIOFORMULAS7 = Field.create("FSIOFORMULAS7", 7872, FieldType.STRING); + public static final Field FSIOFORMULAS8 = Field.create("FSIOFORMULAS8", 8072, FieldType.STRING); + public static final Field FSIOFORMULAS9 = Field.create("FSIOFORMULAS9", 8272, FieldType.STRING); + public static final Field FSIOFORMULAS10 = Field.create("FSIOFORMULAS10", 8472, FieldType.STRING); + public static final Field FSIOFORMULAS11 = Field.create("FSIOFORMULAS11", 8672, FieldType.STRING); + public static final Field FSIOFORMULAS12 = Field.create("FSIOFORMULAS12", 8872, FieldType.STRING); + public static final Field FSIOFORMULAS13 = Field.create("FSIOFORMULAS13", 9072, FieldType.STRING); + public static final Field FSIOFORMULAS14 = Field.create("FSIOFORMULAS14", 9272, FieldType.STRING); + public static final Field FSIOFORMULAS15 = Field.create("FSIOFORMULAS15", 9472, FieldType.STRING); + public static final Field FSIOFORMULAS16 = Field.create("FSIOFORMULAS16", 9672, FieldType.STRING); + public static final Field TIMINGMULTIPLIER = Field.create("TIMINGMULTIPLIER", 9872, FieldType.STRING); + public static final Field TIMINGADDITIVE = Field.create("TIMINGADDITIVE", 10072, FieldType.STRING); public static final Field IGNITIONIATCORRTABLE = Field.create("IGNITIONIATCORRTABLE", 12832, FieldType.INT); public static final Field INJECTIONPHASE = Field.create("INJECTIONPHASE", 13984, FieldType.INT); public static final Field FUELTABLE = Field.create("FUELTABLE", 15136, FieldType.INT); diff --git a/java_console/rusefi.xml b/java_console/rusefi.xml index ff2ef4516c..552ddc7860 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -1,6 +1,6 @@ - +