diff --git a/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h index a745fcbf9c..3fa2784b44 100644 --- a/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Wed Jul 21 01:25:21 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Wed Jul 21 02:11:06 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4274,4 +4274,4 @@ struct persistent_config_s { }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Wed Jul 21 01:25:21 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Wed Jul 21 02:11:06 UTC 2021 diff --git a/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h index eb56942036..b90c87e2d5 100644 --- a/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h @@ -1316,7 +1316,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD hellen_cypress #define SIGNATURE_DATE 2021.07.21 -#define SIGNATURE_HASH 95872439 +#define SIGNATURE_HASH 3946674638 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1685,7 +1685,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.07.21.hellen_cypress.95872439" +#define TS_SIGNATURE "rusEFI 2021.07.21.hellen_cypress.3946674638" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' 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 d9f7dcc48e..deaead8516 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 21 01:25:19 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Jul 21 02:11:04 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4268,4 +4268,4 @@ struct 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 21 01:25:19 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Jul 21 02:11:04 UTC 2021 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 518838e425..0c28027c45 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1297,7 +1297,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD kin #define SIGNATURE_DATE 2021.07.21 -#define SIGNATURE_HASH 4195559755 +#define SIGNATURE_HASH 345552178 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1666,7 +1666,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.07.21.kin.4195559755" +#define TS_SIGNATURE "rusEFI 2021.07.21.kin.345552178" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' diff --git a/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h index 06ecff115a..2019caef25 100644 --- a/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Wed Jul 21 01:25:23 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Wed Jul 21 02:11:09 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4274,4 +4274,4 @@ struct persistent_config_s { }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Wed Jul 21 01:25:23 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Wed Jul 21 02:11:09 UTC 2021 diff --git a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h index 493167912b..b4250a25a2 100644 --- a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h @@ -1317,7 +1317,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD subaru_eg33_f7 #define SIGNATURE_DATE 2021.07.21 -#define SIGNATURE_HASH 2171336657 +#define SIGNATURE_HASH 1876978600 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1686,7 +1686,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port false -#define TS_SIGNATURE "rusEFI 2021.07.21.subaru_eg33_f7.2171336657" +#define TS_SIGNATURE "rusEFI 2021.07.21.subaru_eg33_f7.1876978600" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index abf4b65cda..c1bb3b439c 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 21 01:24:41 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 21 02:10:28 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4274,4 +4274,4 @@ struct 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 21 01:24:41 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 21 02:10:28 UTC 2021 diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index 981d54f68a..d2fb33e3be 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 21 01:24:41 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 21 02:10:28 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer FSIO_SETTING_ACIDLEEXTRAOFFSET = 1000, diff --git a/firmware/controllers/generated/fsio_getters.def b/firmware/controllers/generated/fsio_getters.def index 2cfbd4be57..35ab90a4fc 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 21 01:24:41 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 21 02:10:28 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_ACIDLEEXTRAOFFSET: diff --git a/firmware/controllers/generated/fsio_names.def b/firmware/controllers/generated/fsio_names.def index e4154004f8..5ee102ddbe 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 21 01:24:41 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 21 02:10:28 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer static LENameOrdinalPair leacIdleExtraOffset(FSIO_SETTING_ACIDLEEXTRAOFFSET, "cfg_acIdleExtraOffset"); diff --git a/firmware/controllers/generated/fsio_strings.def b/firmware/controllers/generated/fsio_strings.def index 79dae6e698..ede5182fa6 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 21 01:24:41 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 21 02:10:28 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_ACIDLEEXTRAOFFSET: diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 293ad46f01..18dbf6248f 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1313,7 +1313,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD all #define SIGNATURE_DATE 2021.07.21 -#define SIGNATURE_HASH 1204436583 +#define SIGNATURE_HASH 2839650846 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1682,7 +1682,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.07.21.all.1204436583" +#define TS_SIGNATURE "rusEFI 2021.07.21.all.2839650846" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index 807d6a6be5..3d30fecf27 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 2021.07.21 -#define SIGNATURE_HASH 1204436583 -#define TS_SIGNATURE "rusEFI 2021.07.21.all.1204436583" +#define SIGNATURE_HASH 2839650846 +#define TS_SIGNATURE "rusEFI 2021.07.21.all.2839650846" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index 7fef24652d..a5b020400e 100644 --- a/firmware/controllers/generated/signature_f429-discovery.h +++ b/firmware/controllers/generated/signature_f429-discovery.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD f429-discovery #define SIGNATURE_DATE 2021.07.21 -#define SIGNATURE_HASH 95872439 -#define TS_SIGNATURE "rusEFI 2021.07.21.f429-discovery.95872439" +#define SIGNATURE_HASH 3946674638 +#define TS_SIGNATURE "rusEFI 2021.07.21.f429-discovery.3946674638" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 79c4b911e9..c959457290 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 2021.07.21 -#define SIGNATURE_HASH 2139402334 -#define TS_SIGNATURE "rusEFI 2021.07.21.frankenso_na6.2139402334" +#define SIGNATURE_HASH 2433690663 +#define TS_SIGNATURE "rusEFI 2021.07.21.frankenso_na6.2433690663" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index 7ac467419a..71a8a32b6c 100644 --- a/firmware/controllers/generated/signature_hellen121nissan.h +++ b/firmware/controllers/generated/signature_hellen121nissan.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellen121nissan #define SIGNATURE_DATE 2021.07.21 -#define SIGNATURE_HASH 771339977 -#define TS_SIGNATURE "rusEFI 2021.07.21.hellen121nissan.771339977" +#define SIGNATURE_HASH 3279039152 +#define TS_SIGNATURE "rusEFI 2021.07.21.hellen121nissan.3279039152" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index 6ba4a3fc3e..94d43fe917 100644 --- a/firmware/controllers/generated/signature_hellen121vag.h +++ b/firmware/controllers/generated/signature_hellen121vag.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellen121vag #define SIGNATURE_DATE 2021.07.21 -#define SIGNATURE_HASH 2874452246 -#define TS_SIGNATURE "rusEFI 2021.07.21.hellen121vag.2874452246" +#define SIGNATURE_HASH 1172256111 +#define TS_SIGNATURE "rusEFI 2021.07.21.hellen121vag.1172256111" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index dc17afad2e..2ec427d703 100644 --- a/firmware/controllers/generated/signature_hellen128.h +++ b/firmware/controllers/generated/signature_hellen128.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellen128 #define SIGNATURE_DATE 2021.07.21 -#define SIGNATURE_HASH 581699704 -#define TS_SIGNATURE "rusEFI 2021.07.21.hellen128.581699704" +#define SIGNATURE_HASH 3425145857 +#define TS_SIGNATURE "rusEFI 2021.07.21.hellen128.3425145857" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index 184b5d2e7e..f3ea625cb1 100644 --- a/firmware/controllers/generated/signature_hellen72.h +++ b/firmware/controllers/generated/signature_hellen72.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellen72 #define SIGNATURE_DATE 2021.07.21 -#define SIGNATURE_HASH 337282649 -#define TS_SIGNATURE "rusEFI 2021.07.21.hellen72.337282649" +#define SIGNATURE_HASH 4203813408 +#define TS_SIGNATURE "rusEFI 2021.07.21.hellen72.4203813408" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index 6eb08bee23..8375f41365 100644 --- a/firmware/controllers/generated/signature_hellenNA6.h +++ b/firmware/controllers/generated/signature_hellenNA6.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellenNA6 #define SIGNATURE_DATE 2021.07.21 -#define SIGNATURE_HASH 1273525530 -#define TS_SIGNATURE "rusEFI 2021.07.21.hellenNA6.1273525530" +#define SIGNATURE_HASH 2774788451 +#define TS_SIGNATURE "rusEFI 2021.07.21.hellenNA6.2774788451" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index a3ce373026..ea2c567e65 100644 --- a/firmware/controllers/generated/signature_hellen_cypress.h +++ b/firmware/controllers/generated/signature_hellen_cypress.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellen_cypress #define SIGNATURE_DATE 2021.07.21 -#define SIGNATURE_HASH 95872439 -#define TS_SIGNATURE "rusEFI 2021.07.21.hellen_cypress.95872439" +#define SIGNATURE_HASH 3946674638 +#define TS_SIGNATURE "rusEFI 2021.07.21.hellen_cypress.3946674638" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index d82ddf23d5..d1c2e6957d 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 2021.07.21 -#define SIGNATURE_HASH 4195559755 -#define TS_SIGNATURE "rusEFI 2021.07.21.kin.4195559755" +#define SIGNATURE_HASH 345552178 +#define TS_SIGNATURE "rusEFI 2021.07.21.kin.345552178" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 1dc8ada297..4a63f22271 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 2021.07.21 -#define SIGNATURE_HASH 2097133145 -#define TS_SIGNATURE "rusEFI 2021.07.21.mre_f4.2097133145" +#define SIGNATURE_HASH 2457086496 +#define TS_SIGNATURE "rusEFI 2021.07.21.mre_f4.2457086496" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index e1ab3b9e20..0f74783c7e 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 2021.07.21 -#define SIGNATURE_HASH 2097133145 -#define TS_SIGNATURE "rusEFI 2021.07.21.mre_f7.2097133145" +#define SIGNATURE_HASH 2457086496 +#define TS_SIGNATURE "rusEFI 2021.07.21.mre_f7.2457086496" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 22d04e1ef8..ff7ef1e1e7 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 2021.07.21 -#define SIGNATURE_HASH 1432108113 -#define TS_SIGNATURE "rusEFI 2021.07.21.prometheus_405.1432108113" +#define SIGNATURE_HASH 3151470632 +#define TS_SIGNATURE "rusEFI 2021.07.21.prometheus_405.3151470632" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 678b65c298..91c8e93668 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 2021.07.21 -#define SIGNATURE_HASH 1432108113 -#define TS_SIGNATURE "rusEFI 2021.07.21.prometheus_469.1432108113" +#define SIGNATURE_HASH 3151470632 +#define TS_SIGNATURE "rusEFI 2021.07.21.prometheus_469.3151470632" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 34b1527456..05dd477e3b 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 2021.07.21 -#define SIGNATURE_HASH 2189718907 -#define TS_SIGNATURE "rusEFI 2021.07.21.proteus_f4.2189718907" +#define SIGNATURE_HASH 1812982018 +#define TS_SIGNATURE "rusEFI 2021.07.21.proteus_f4.1812982018" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 3ba9543b3a..cb50bb2d1b 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 2021.07.21 -#define SIGNATURE_HASH 2189718907 -#define TS_SIGNATURE "rusEFI 2021.07.21.proteus_f7.2189718907" +#define SIGNATURE_HASH 1812982018 +#define TS_SIGNATURE "rusEFI 2021.07.21.proteus_f7.1812982018" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index 4fa52033f7..1f8018d64d 100644 --- a/firmware/controllers/generated/signature_subaru_eg33_f7.h +++ b/firmware/controllers/generated/signature_subaru_eg33_f7.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD subaru_eg33_f7 #define SIGNATURE_DATE 2021.07.21 -#define SIGNATURE_HASH 2171336657 -#define TS_SIGNATURE "rusEFI 2021.07.21.subaru_eg33_f7.2171336657" +#define SIGNATURE_HASH 1876978600 +#define TS_SIGNATURE "rusEFI 2021.07.21.subaru_eg33_f7.1876978600" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index c3c262717b..6c8742e47f 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 8888231caf..ea38c9cc13 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 2021.07.21.all.1204436583" + signature = "rusEFI 2021.07.21.all.2839650846" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.21.all.1204436583" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.21.all.2839650846" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 21 01:24:41 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 21 02:10:28 UTC 2021 pageSize = 20000 page = 1 @@ -164,7 +164,7 @@ sparkDwellRpmBins = array, F32, 332, [8], "RPM", 1, 0, 0, 18000, 2 sparkDwellValues = array, F32, 364, [8], "ms", 1, 0, 0, 30, 2 displacement = scalar, F32, 396, "L", 1, 0, 0, 1000, 2 cylindersCount = scalar, U32, 400, "", 1, 0, 1, 12, 0 -firingOrder = bits, U32, 404, [0:4], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-2-4-5-3", "1-4-2-5-3-6", "1-2", "1-2-3-4-5-6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8", "1-6-3-2-5-4", "1-10-9-4-3-6-5-8-7_2", "1-7-5-11-3-9-6-12-2-8-4-10", "1-7-4-10-2-8-6-12-3-9-5-11", "1-4-3-2", "1-12-5-8-3-10-6-7-2-11-4-9", "1-2-7-8-4-5-6-3", "1-3-7-2-6-5-4-8", "1-2-3-4-5-6-7-8-9", "INVALID", "1-2-3-4-5-6-7-8-9-10-11-12", "1-3-2", "1-2-3-4-5-6-7-8", "1-5-4-8-6-3-7-2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +firingOrder = bits, U32, 404, [0:4], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-2-4-5-3", "1-4-2-5-3-6", "1-2", "1-2-3-4-5-6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8", "1-6-3-2-5-4", "1-10-9-4-3-6-5-8-7_2", "1-7-5-11-3-9-6-12-2-8-4-10", "1-7-4-10-2-8-6-12-3-9-5-11", "1-4-3-2", "1-12-5-8-3-10-6-7-2-11-4-9", "1-2-7-8-4-5-6-3", "1-3-7-2-6-5-4-8", "1-2-3-4-5-6-7-8-9", "INVALID", "1-2-3-4-5-6-7-8-9-10-11-12", "1-3-2", "1-2-3-4-5-6-7-8", "1-5-4-8-6-3-7-2", "1-4-3-6-2-5", "1-8-7-3-6-5-4-2", "fo29", "fo30", "fo31" cylinderBore = scalar, F32, 408, "mm", 1, 0, 0, 20000, 2 sensorSnifferRpmThreshold = scalar, S32, 412, "RPM", 1, 0, 0, 30000, 0 rpmHardLimit = scalar, S32, 416, "rpm", 1, 0, 0, 20000, 2 @@ -1695,7 +1695,7 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 ; ; Bit flags - hasSdCard = bits, U32, 0, [0:0], "true", "false"; + sd_present = bits, U32, 0, [0:0], "true", "false"; isIgnitionEnabledIndicator=bits,U32, 0, [1:1], "true", "false"; isInjectionEnabledIndicator=bits,U32,0, [2:2], "true", "false"; isCylinderCleanupActivated=bits,U32, 0, [4:4], "true", "false"; @@ -1883,7 +1883,8 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 ; we use this to match logs to tunes tuneCrc16 = scalar, U16, 244, "crc16", 1, 0 - sd_status = scalar, U08, 246, "", 1.0, 0.0 + sd_logging_internal = bits, U08, 246, [0:0], "true", "false" + sd_msd = bits, U08, 246, [1:1], "true", "false" ; Transmission tcuCurrentGear = scalar, S08, 247, "gear", 1, 0 @@ -2737,14 +2738,9 @@ gaugeCategory = DynoView indicator = { knockEverIndicator }, "", "Knock recently", white, black, red, black indicator = { knockNowIndicator }, "no knock", "Knock NOW", white, black, red, black -; this bit array has special meaning for TS - that's part of TS build in file transfer -; we _probably_ should officially retire TS file transfer since we have something way cooler! - indicator = { sd_status & 1}, "No SD", "SD in", white, black, green, black - indicator = { sd_status & 4}, "SD ready", "SD ready", white, black, green, black - indicator = { sd_status & 8}, "SD Log", "SD Log", white, black, green, black - indicator = { sd_status & 16}, "SD Err", "SD Err", white, black, red, black -; todo: duplication with 'SD in'?! - indicator = { hasSdCard}, "no SD", "with SD", white, black, green, black + indicator = { sd_present }, "no SD card", "SD card OK", white, black, green, black + indicator = { sd_logging_internal }, "SD logging", "SD logging", white, black, green, black + indicator = { sd_msd }, "SD USB", "SD USB", white, black, green, black ; looks like TS would append four system indicators below: Data Logging, ???, Not Connected, Protocol Error diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index 45b3cda96f..0a10da88c4 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.07.21.f429-discovery.95872439" + signature = "rusEFI 2021.07.21.f429-discovery.3946674638" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.21.f429-discovery.95872439" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.21.f429-discovery.3946674638" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 21 01:24:45 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 21 02:10:31 UTC 2021 pageSize = 20000 page = 1 @@ -164,7 +164,7 @@ sparkDwellRpmBins = array, F32, 332, [8], "RPM", 1, 0, 0, 18000, 2 sparkDwellValues = array, F32, 364, [8], "ms", 1, 0, 0, 30, 2 displacement = scalar, F32, 396, "L", 1, 0, 0, 1000, 2 cylindersCount = scalar, U32, 400, "", 1, 0, 1, 12, 0 -firingOrder = bits, U32, 404, [0:4], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-2-4-5-3", "1-4-2-5-3-6", "1-2", "1-2-3-4-5-6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8", "1-6-3-2-5-4", "1-10-9-4-3-6-5-8-7_2", "1-7-5-11-3-9-6-12-2-8-4-10", "1-7-4-10-2-8-6-12-3-9-5-11", "1-4-3-2", "1-12-5-8-3-10-6-7-2-11-4-9", "1-2-7-8-4-5-6-3", "1-3-7-2-6-5-4-8", "1-2-3-4-5-6-7-8-9", "INVALID", "1-2-3-4-5-6-7-8-9-10-11-12", "1-3-2", "1-2-3-4-5-6-7-8", "1-5-4-8-6-3-7-2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +firingOrder = bits, U32, 404, [0:4], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-2-4-5-3", "1-4-2-5-3-6", "1-2", "1-2-3-4-5-6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8", "1-6-3-2-5-4", "1-10-9-4-3-6-5-8-7_2", "1-7-5-11-3-9-6-12-2-8-4-10", "1-7-4-10-2-8-6-12-3-9-5-11", "1-4-3-2", "1-12-5-8-3-10-6-7-2-11-4-9", "1-2-7-8-4-5-6-3", "1-3-7-2-6-5-4-8", "1-2-3-4-5-6-7-8-9", "INVALID", "1-2-3-4-5-6-7-8-9-10-11-12", "1-3-2", "1-2-3-4-5-6-7-8", "1-5-4-8-6-3-7-2", "1-4-3-6-2-5", "1-8-7-3-6-5-4-2", "fo29", "fo30", "fo31" cylinderBore = scalar, F32, 408, "mm", 1, 0, 0, 20000, 2 sensorSnifferRpmThreshold = scalar, S32, 412, "RPM", 1, 0, 0, 30000, 0 rpmHardLimit = scalar, S32, 416, "rpm", 1, 0, 0, 20000, 2 @@ -1695,7 +1695,7 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 ; ; Bit flags - hasSdCard = bits, U32, 0, [0:0], "true", "false"; + sd_present = bits, U32, 0, [0:0], "true", "false"; isIgnitionEnabledIndicator=bits,U32, 0, [1:1], "true", "false"; isInjectionEnabledIndicator=bits,U32,0, [2:2], "true", "false"; isCylinderCleanupActivated=bits,U32, 0, [4:4], "true", "false"; @@ -1883,7 +1883,8 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 ; we use this to match logs to tunes tuneCrc16 = scalar, U16, 244, "crc16", 1, 0 - sd_status = scalar, U08, 246, "", 1.0, 0.0 + sd_logging_internal = bits, U08, 246, [0:0], "true", "false" + sd_msd = bits, U08, 246, [1:1], "true", "false" ; Transmission tcuCurrentGear = scalar, S08, 247, "gear", 1, 0 @@ -2737,14 +2738,9 @@ gaugeCategory = DynoView indicator = { knockEverIndicator }, "", "Knock recently", white, black, red, black indicator = { knockNowIndicator }, "no knock", "Knock NOW", white, black, red, black -; this bit array has special meaning for TS - that's part of TS build in file transfer -; we _probably_ should officially retire TS file transfer since we have something way cooler! - indicator = { sd_status & 1}, "No SD", "SD in", white, black, green, black - indicator = { sd_status & 4}, "SD ready", "SD ready", white, black, green, black - indicator = { sd_status & 8}, "SD Log", "SD Log", white, black, green, black - indicator = { sd_status & 16}, "SD Err", "SD Err", white, black, red, black -; todo: duplication with 'SD in'?! - indicator = { hasSdCard}, "no SD", "with SD", white, black, green, black + indicator = { sd_present }, "no SD card", "SD card OK", white, black, green, black + indicator = { sd_logging_internal }, "SD logging", "SD logging", white, black, green, black + indicator = { sd_msd }, "SD USB", "SD USB", white, black, green, black ; looks like TS would append four system indicators below: Data Logging, ???, Not Connected, Protocol Error diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 522c359d1a..4604dd17d7 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 2021.07.21.frankenso_na6.2139402334" + signature = "rusEFI 2021.07.21.frankenso_na6.2433690663" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.21.frankenso_na6.2139402334" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.21.frankenso_na6.2433690663" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 21 01:25:06 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 21 02:10:51 UTC 2021 pageSize = 20000 page = 1 @@ -164,7 +164,7 @@ sparkDwellRpmBins = array, F32, 332, [8], "RPM", 1, 0, 0, 18000, 2 sparkDwellValues = array, F32, 364, [8], "ms", 1, 0, 0, 30, 2 displacement = scalar, F32, 396, "L", 1, 0, 0, 1000, 2 cylindersCount = scalar, U32, 400, "", 1, 0, 1, 12, 0 -firingOrder = bits, U32, 404, [0:4], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-2-4-5-3", "1-4-2-5-3-6", "1-2", "1-2-3-4-5-6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8", "1-6-3-2-5-4", "1-10-9-4-3-6-5-8-7_2", "1-7-5-11-3-9-6-12-2-8-4-10", "1-7-4-10-2-8-6-12-3-9-5-11", "1-4-3-2", "1-12-5-8-3-10-6-7-2-11-4-9", "1-2-7-8-4-5-6-3", "1-3-7-2-6-5-4-8", "1-2-3-4-5-6-7-8-9", "INVALID", "1-2-3-4-5-6-7-8-9-10-11-12", "1-3-2", "1-2-3-4-5-6-7-8", "1-5-4-8-6-3-7-2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +firingOrder = bits, U32, 404, [0:4], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-2-4-5-3", "1-4-2-5-3-6", "1-2", "1-2-3-4-5-6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8", "1-6-3-2-5-4", "1-10-9-4-3-6-5-8-7_2", "1-7-5-11-3-9-6-12-2-8-4-10", "1-7-4-10-2-8-6-12-3-9-5-11", "1-4-3-2", "1-12-5-8-3-10-6-7-2-11-4-9", "1-2-7-8-4-5-6-3", "1-3-7-2-6-5-4-8", "1-2-3-4-5-6-7-8-9", "INVALID", "1-2-3-4-5-6-7-8-9-10-11-12", "1-3-2", "1-2-3-4-5-6-7-8", "1-5-4-8-6-3-7-2", "1-4-3-6-2-5", "1-8-7-3-6-5-4-2", "fo29", "fo30", "fo31" cylinderBore = scalar, F32, 408, "mm", 1, 0, 0, 20000, 2 sensorSnifferRpmThreshold = scalar, S32, 412, "RPM", 1, 0, 0, 30000, 0 rpmHardLimit = scalar, S32, 416, "rpm", 1, 0, 0, 20000, 2 @@ -1695,7 +1695,7 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 ; ; Bit flags - hasSdCard = bits, U32, 0, [0:0], "true", "false"; + sd_present = bits, U32, 0, [0:0], "true", "false"; isIgnitionEnabledIndicator=bits,U32, 0, [1:1], "true", "false"; isInjectionEnabledIndicator=bits,U32,0, [2:2], "true", "false"; isCylinderCleanupActivated=bits,U32, 0, [4:4], "true", "false"; @@ -1883,7 +1883,8 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 ; we use this to match logs to tunes tuneCrc16 = scalar, U16, 244, "crc16", 1, 0 - sd_status = scalar, U08, 246, "", 1.0, 0.0 + sd_logging_internal = bits, U08, 246, [0:0], "true", "false" + sd_msd = bits, U08, 246, [1:1], "true", "false" ; Transmission tcuCurrentGear = scalar, S08, 247, "gear", 1, 0 @@ -2737,14 +2738,9 @@ gaugeCategory = DynoView indicator = { knockEverIndicator }, "", "Knock recently", white, black, red, black indicator = { knockNowIndicator }, "no knock", "Knock NOW", white, black, red, black -; this bit array has special meaning for TS - that's part of TS build in file transfer -; we _probably_ should officially retire TS file transfer since we have something way cooler! - indicator = { sd_status & 1}, "No SD", "SD in", white, black, green, black - indicator = { sd_status & 4}, "SD ready", "SD ready", white, black, green, black - indicator = { sd_status & 8}, "SD Log", "SD Log", white, black, green, black - indicator = { sd_status & 16}, "SD Err", "SD Err", white, black, red, black -; todo: duplication with 'SD in'?! - indicator = { hasSdCard}, "no SD", "with SD", white, black, green, black + indicator = { sd_present }, "no SD card", "SD card OK", white, black, green, black + indicator = { sd_logging_internal }, "SD logging", "SD logging", white, black, green, black + indicator = { sd_msd }, "SD USB", "SD USB", white, black, green, black ; looks like TS would append four system indicators below: Data Logging, ???, Not Connected, Protocol Error diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index 2ad1814cb6..ab3acbb86d 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.07.21.hellen121nissan.771339977" + signature = "rusEFI 2021.07.21.hellen121nissan.3279039152" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.21.hellen121nissan.771339977" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.21.hellen121nissan.3279039152" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 21 01:24:53 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 21 02:10:39 UTC 2021 pageSize = 20000 page = 1 @@ -164,7 +164,7 @@ sparkDwellRpmBins = array, F32, 332, [8], "RPM", 1, 0, 0, 18000, 2 sparkDwellValues = array, F32, 364, [8], "ms", 1, 0, 0, 30, 2 displacement = scalar, F32, 396, "L", 1, 0, 0, 1000, 2 cylindersCount = scalar, U32, 400, "", 1, 0, 1, 12, 0 -firingOrder = bits, U32, 404, [0:4], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-2-4-5-3", "1-4-2-5-3-6", "1-2", "1-2-3-4-5-6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8", "1-6-3-2-5-4", "1-10-9-4-3-6-5-8-7_2", "1-7-5-11-3-9-6-12-2-8-4-10", "1-7-4-10-2-8-6-12-3-9-5-11", "1-4-3-2", "1-12-5-8-3-10-6-7-2-11-4-9", "1-2-7-8-4-5-6-3", "1-3-7-2-6-5-4-8", "1-2-3-4-5-6-7-8-9", "INVALID", "1-2-3-4-5-6-7-8-9-10-11-12", "1-3-2", "1-2-3-4-5-6-7-8", "1-5-4-8-6-3-7-2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +firingOrder = bits, U32, 404, [0:4], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-2-4-5-3", "1-4-2-5-3-6", "1-2", "1-2-3-4-5-6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8", "1-6-3-2-5-4", "1-10-9-4-3-6-5-8-7_2", "1-7-5-11-3-9-6-12-2-8-4-10", "1-7-4-10-2-8-6-12-3-9-5-11", "1-4-3-2", "1-12-5-8-3-10-6-7-2-11-4-9", "1-2-7-8-4-5-6-3", "1-3-7-2-6-5-4-8", "1-2-3-4-5-6-7-8-9", "INVALID", "1-2-3-4-5-6-7-8-9-10-11-12", "1-3-2", "1-2-3-4-5-6-7-8", "1-5-4-8-6-3-7-2", "1-4-3-6-2-5", "1-8-7-3-6-5-4-2", "fo29", "fo30", "fo31" cylinderBore = scalar, F32, 408, "mm", 1, 0, 0, 20000, 2 sensorSnifferRpmThreshold = scalar, S32, 412, "RPM", 1, 0, 0, 30000, 0 rpmHardLimit = scalar, S32, 416, "rpm", 1, 0, 0, 20000, 2 @@ -1695,7 +1695,7 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 ; ; Bit flags - hasSdCard = bits, U32, 0, [0:0], "true", "false"; + sd_present = bits, U32, 0, [0:0], "true", "false"; isIgnitionEnabledIndicator=bits,U32, 0, [1:1], "true", "false"; isInjectionEnabledIndicator=bits,U32,0, [2:2], "true", "false"; isCylinderCleanupActivated=bits,U32, 0, [4:4], "true", "false"; @@ -1883,7 +1883,8 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 ; we use this to match logs to tunes tuneCrc16 = scalar, U16, 244, "crc16", 1, 0 - sd_status = scalar, U08, 246, "", 1.0, 0.0 + sd_logging_internal = bits, U08, 246, [0:0], "true", "false" + sd_msd = bits, U08, 246, [1:1], "true", "false" ; Transmission tcuCurrentGear = scalar, S08, 247, "gear", 1, 0 @@ -2737,14 +2738,9 @@ gaugeCategory = DynoView indicator = { knockEverIndicator }, "", "Knock recently", white, black, red, black indicator = { knockNowIndicator }, "no knock", "Knock NOW", white, black, red, black -; this bit array has special meaning for TS - that's part of TS build in file transfer -; we _probably_ should officially retire TS file transfer since we have something way cooler! - indicator = { sd_status & 1}, "No SD", "SD in", white, black, green, black - indicator = { sd_status & 4}, "SD ready", "SD ready", white, black, green, black - indicator = { sd_status & 8}, "SD Log", "SD Log", white, black, green, black - indicator = { sd_status & 16}, "SD Err", "SD Err", white, black, red, black -; todo: duplication with 'SD in'?! - indicator = { hasSdCard}, "no SD", "with SD", white, black, green, black + indicator = { sd_present }, "no SD card", "SD card OK", white, black, green, black + indicator = { sd_logging_internal }, "SD logging", "SD logging", white, black, green, black + indicator = { sd_msd }, "SD USB", "SD USB", white, black, green, black ; looks like TS would append four system indicators below: Data Logging, ???, Not Connected, Protocol Error diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index ab2f9741a7..1b94c31700 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.07.21.hellen121vag.2874452246" + signature = "rusEFI 2021.07.21.hellen121vag.1172256111" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.21.hellen121vag.2874452246" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.21.hellen121vag.1172256111" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 21 01:24:50 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 21 02:10:36 UTC 2021 pageSize = 20000 page = 1 @@ -164,7 +164,7 @@ sparkDwellRpmBins = array, F32, 332, [8], "RPM", 1, 0, 0, 18000, 2 sparkDwellValues = array, F32, 364, [8], "ms", 1, 0, 0, 30, 2 displacement = scalar, F32, 396, "L", 1, 0, 0, 1000, 2 cylindersCount = scalar, U32, 400, "", 1, 0, 1, 12, 0 -firingOrder = bits, U32, 404, [0:4], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-2-4-5-3", "1-4-2-5-3-6", "1-2", "1-2-3-4-5-6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8", "1-6-3-2-5-4", "1-10-9-4-3-6-5-8-7_2", "1-7-5-11-3-9-6-12-2-8-4-10", "1-7-4-10-2-8-6-12-3-9-5-11", "1-4-3-2", "1-12-5-8-3-10-6-7-2-11-4-9", "1-2-7-8-4-5-6-3", "1-3-7-2-6-5-4-8", "1-2-3-4-5-6-7-8-9", "INVALID", "1-2-3-4-5-6-7-8-9-10-11-12", "1-3-2", "1-2-3-4-5-6-7-8", "1-5-4-8-6-3-7-2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +firingOrder = bits, U32, 404, [0:4], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-2-4-5-3", "1-4-2-5-3-6", "1-2", "1-2-3-4-5-6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8", "1-6-3-2-5-4", "1-10-9-4-3-6-5-8-7_2", "1-7-5-11-3-9-6-12-2-8-4-10", "1-7-4-10-2-8-6-12-3-9-5-11", "1-4-3-2", "1-12-5-8-3-10-6-7-2-11-4-9", "1-2-7-8-4-5-6-3", "1-3-7-2-6-5-4-8", "1-2-3-4-5-6-7-8-9", "INVALID", "1-2-3-4-5-6-7-8-9-10-11-12", "1-3-2", "1-2-3-4-5-6-7-8", "1-5-4-8-6-3-7-2", "1-4-3-6-2-5", "1-8-7-3-6-5-4-2", "fo29", "fo30", "fo31" cylinderBore = scalar, F32, 408, "mm", 1, 0, 0, 20000, 2 sensorSnifferRpmThreshold = scalar, S32, 412, "RPM", 1, 0, 0, 30000, 0 rpmHardLimit = scalar, S32, 416, "rpm", 1, 0, 0, 20000, 2 @@ -1695,7 +1695,7 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 ; ; Bit flags - hasSdCard = bits, U32, 0, [0:0], "true", "false"; + sd_present = bits, U32, 0, [0:0], "true", "false"; isIgnitionEnabledIndicator=bits,U32, 0, [1:1], "true", "false"; isInjectionEnabledIndicator=bits,U32,0, [2:2], "true", "false"; isCylinderCleanupActivated=bits,U32, 0, [4:4], "true", "false"; @@ -1883,7 +1883,8 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 ; we use this to match logs to tunes tuneCrc16 = scalar, U16, 244, "crc16", 1, 0 - sd_status = scalar, U08, 246, "", 1.0, 0.0 + sd_logging_internal = bits, U08, 246, [0:0], "true", "false" + sd_msd = bits, U08, 246, [1:1], "true", "false" ; Transmission tcuCurrentGear = scalar, S08, 247, "gear", 1, 0 @@ -2737,14 +2738,9 @@ gaugeCategory = DynoView indicator = { knockEverIndicator }, "", "Knock recently", white, black, red, black indicator = { knockNowIndicator }, "no knock", "Knock NOW", white, black, red, black -; this bit array has special meaning for TS - that's part of TS build in file transfer -; we _probably_ should officially retire TS file transfer since we have something way cooler! - indicator = { sd_status & 1}, "No SD", "SD in", white, black, green, black - indicator = { sd_status & 4}, "SD ready", "SD ready", white, black, green, black - indicator = { sd_status & 8}, "SD Log", "SD Log", white, black, green, black - indicator = { sd_status & 16}, "SD Err", "SD Err", white, black, red, black -; todo: duplication with 'SD in'?! - indicator = { hasSdCard}, "no SD", "with SD", white, black, green, black + indicator = { sd_present }, "no SD card", "SD card OK", white, black, green, black + indicator = { sd_logging_internal }, "SD logging", "SD logging", white, black, green, black + indicator = { sd_msd }, "SD USB", "SD USB", white, black, green, black ; looks like TS would append four system indicators below: Data Logging, ???, Not Connected, Protocol Error diff --git a/firmware/tunerstudio/generated/rusefi_hellen128.ini b/firmware/tunerstudio/generated/rusefi_hellen128.ini index 9d0f1548a2..76297f8f82 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.07.21.hellen128.581699704" + signature = "rusEFI 2021.07.21.hellen128.3425145857" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.21.hellen128.581699704" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.21.hellen128.3425145857" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 21 01:24:47 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 21 02:10:34 UTC 2021 pageSize = 20000 page = 1 @@ -164,7 +164,7 @@ sparkDwellRpmBins = array, F32, 332, [8], "RPM", 1, 0, 0, 18000, 2 sparkDwellValues = array, F32, 364, [8], "ms", 1, 0, 0, 30, 2 displacement = scalar, F32, 396, "L", 1, 0, 0, 1000, 2 cylindersCount = scalar, U32, 400, "", 1, 0, 1, 12, 0 -firingOrder = bits, U32, 404, [0:4], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-2-4-5-3", "1-4-2-5-3-6", "1-2", "1-2-3-4-5-6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8", "1-6-3-2-5-4", "1-10-9-4-3-6-5-8-7_2", "1-7-5-11-3-9-6-12-2-8-4-10", "1-7-4-10-2-8-6-12-3-9-5-11", "1-4-3-2", "1-12-5-8-3-10-6-7-2-11-4-9", "1-2-7-8-4-5-6-3", "1-3-7-2-6-5-4-8", "1-2-3-4-5-6-7-8-9", "INVALID", "1-2-3-4-5-6-7-8-9-10-11-12", "1-3-2", "1-2-3-4-5-6-7-8", "1-5-4-8-6-3-7-2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +firingOrder = bits, U32, 404, [0:4], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-2-4-5-3", "1-4-2-5-3-6", "1-2", "1-2-3-4-5-6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8", "1-6-3-2-5-4", "1-10-9-4-3-6-5-8-7_2", "1-7-5-11-3-9-6-12-2-8-4-10", "1-7-4-10-2-8-6-12-3-9-5-11", "1-4-3-2", "1-12-5-8-3-10-6-7-2-11-4-9", "1-2-7-8-4-5-6-3", "1-3-7-2-6-5-4-8", "1-2-3-4-5-6-7-8-9", "INVALID", "1-2-3-4-5-6-7-8-9-10-11-12", "1-3-2", "1-2-3-4-5-6-7-8", "1-5-4-8-6-3-7-2", "1-4-3-6-2-5", "1-8-7-3-6-5-4-2", "fo29", "fo30", "fo31" cylinderBore = scalar, F32, 408, "mm", 1, 0, 0, 20000, 2 sensorSnifferRpmThreshold = scalar, S32, 412, "RPM", 1, 0, 0, 30000, 0 rpmHardLimit = scalar, S32, 416, "rpm", 1, 0, 0, 20000, 2 @@ -1695,7 +1695,7 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 ; ; Bit flags - hasSdCard = bits, U32, 0, [0:0], "true", "false"; + sd_present = bits, U32, 0, [0:0], "true", "false"; isIgnitionEnabledIndicator=bits,U32, 0, [1:1], "true", "false"; isInjectionEnabledIndicator=bits,U32,0, [2:2], "true", "false"; isCylinderCleanupActivated=bits,U32, 0, [4:4], "true", "false"; @@ -1883,7 +1883,8 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 ; we use this to match logs to tunes tuneCrc16 = scalar, U16, 244, "crc16", 1, 0 - sd_status = scalar, U08, 246, "", 1.0, 0.0 + sd_logging_internal = bits, U08, 246, [0:0], "true", "false" + sd_msd = bits, U08, 246, [1:1], "true", "false" ; Transmission tcuCurrentGear = scalar, S08, 247, "gear", 1, 0 @@ -2737,14 +2738,9 @@ gaugeCategory = DynoView indicator = { knockEverIndicator }, "", "Knock recently", white, black, red, black indicator = { knockNowIndicator }, "no knock", "Knock NOW", white, black, red, black -; this bit array has special meaning for TS - that's part of TS build in file transfer -; we _probably_ should officially retire TS file transfer since we have something way cooler! - indicator = { sd_status & 1}, "No SD", "SD in", white, black, green, black - indicator = { sd_status & 4}, "SD ready", "SD ready", white, black, green, black - indicator = { sd_status & 8}, "SD Log", "SD Log", white, black, green, black - indicator = { sd_status & 16}, "SD Err", "SD Err", white, black, red, black -; todo: duplication with 'SD in'?! - indicator = { hasSdCard}, "no SD", "with SD", white, black, green, black + indicator = { sd_present }, "no SD card", "SD card OK", white, black, green, black + indicator = { sd_logging_internal }, "SD logging", "SD logging", white, black, green, black + indicator = { sd_msd }, "SD USB", "SD USB", white, black, green, black ; looks like TS would append four system indicators below: Data Logging, ???, Not Connected, Protocol Error diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index 7bf16c41bd..662b58c95a 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.07.21.hellen72.337282649" + signature = "rusEFI 2021.07.21.hellen72.4203813408" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.21.hellen72.337282649" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.21.hellen72.4203813408" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 21 01:24:56 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 21 02:10:41 UTC 2021 pageSize = 20000 page = 1 @@ -164,7 +164,7 @@ sparkDwellRpmBins = array, F32, 332, [8], "RPM", 1, 0, 0, 18000, 2 sparkDwellValues = array, F32, 364, [8], "ms", 1, 0, 0, 30, 2 displacement = scalar, F32, 396, "L", 1, 0, 0, 1000, 2 cylindersCount = scalar, U32, 400, "", 1, 0, 1, 12, 0 -firingOrder = bits, U32, 404, [0:4], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-2-4-5-3", "1-4-2-5-3-6", "1-2", "1-2-3-4-5-6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8", "1-6-3-2-5-4", "1-10-9-4-3-6-5-8-7_2", "1-7-5-11-3-9-6-12-2-8-4-10", "1-7-4-10-2-8-6-12-3-9-5-11", "1-4-3-2", "1-12-5-8-3-10-6-7-2-11-4-9", "1-2-7-8-4-5-6-3", "1-3-7-2-6-5-4-8", "1-2-3-4-5-6-7-8-9", "INVALID", "1-2-3-4-5-6-7-8-9-10-11-12", "1-3-2", "1-2-3-4-5-6-7-8", "1-5-4-8-6-3-7-2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +firingOrder = bits, U32, 404, [0:4], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-2-4-5-3", "1-4-2-5-3-6", "1-2", "1-2-3-4-5-6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8", "1-6-3-2-5-4", "1-10-9-4-3-6-5-8-7_2", "1-7-5-11-3-9-6-12-2-8-4-10", "1-7-4-10-2-8-6-12-3-9-5-11", "1-4-3-2", "1-12-5-8-3-10-6-7-2-11-4-9", "1-2-7-8-4-5-6-3", "1-3-7-2-6-5-4-8", "1-2-3-4-5-6-7-8-9", "INVALID", "1-2-3-4-5-6-7-8-9-10-11-12", "1-3-2", "1-2-3-4-5-6-7-8", "1-5-4-8-6-3-7-2", "1-4-3-6-2-5", "1-8-7-3-6-5-4-2", "fo29", "fo30", "fo31" cylinderBore = scalar, F32, 408, "mm", 1, 0, 0, 20000, 2 sensorSnifferRpmThreshold = scalar, S32, 412, "RPM", 1, 0, 0, 30000, 0 rpmHardLimit = scalar, S32, 416, "rpm", 1, 0, 0, 20000, 2 @@ -1695,7 +1695,7 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 ; ; Bit flags - hasSdCard = bits, U32, 0, [0:0], "true", "false"; + sd_present = bits, U32, 0, [0:0], "true", "false"; isIgnitionEnabledIndicator=bits,U32, 0, [1:1], "true", "false"; isInjectionEnabledIndicator=bits,U32,0, [2:2], "true", "false"; isCylinderCleanupActivated=bits,U32, 0, [4:4], "true", "false"; @@ -1883,7 +1883,8 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 ; we use this to match logs to tunes tuneCrc16 = scalar, U16, 244, "crc16", 1, 0 - sd_status = scalar, U08, 246, "", 1.0, 0.0 + sd_logging_internal = bits, U08, 246, [0:0], "true", "false" + sd_msd = bits, U08, 246, [1:1], "true", "false" ; Transmission tcuCurrentGear = scalar, S08, 247, "gear", 1, 0 @@ -2737,14 +2738,9 @@ gaugeCategory = DynoView indicator = { knockEverIndicator }, "", "Knock recently", white, black, red, black indicator = { knockNowIndicator }, "no knock", "Knock NOW", white, black, red, black -; this bit array has special meaning for TS - that's part of TS build in file transfer -; we _probably_ should officially retire TS file transfer since we have something way cooler! - indicator = { sd_status & 1}, "No SD", "SD in", white, black, green, black - indicator = { sd_status & 4}, "SD ready", "SD ready", white, black, green, black - indicator = { sd_status & 8}, "SD Log", "SD Log", white, black, green, black - indicator = { sd_status & 16}, "SD Err", "SD Err", white, black, red, black -; todo: duplication with 'SD in'?! - indicator = { hasSdCard}, "no SD", "with SD", white, black, green, black + indicator = { sd_present }, "no SD card", "SD card OK", white, black, green, black + indicator = { sd_logging_internal }, "SD logging", "SD logging", white, black, green, black + indicator = { sd_msd }, "SD USB", "SD USB", white, black, green, black ; looks like TS would append four system indicators below: Data Logging, ???, Not Connected, Protocol Error diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index 98987bdf88..7de56ae511 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.07.21.hellenNA6.1273525530" + signature = "rusEFI 2021.07.21.hellenNA6.2774788451" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.21.hellenNA6.1273525530" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.21.hellenNA6.2774788451" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 21 01:24:58 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 21 02:10:44 UTC 2021 pageSize = 20000 page = 1 @@ -164,7 +164,7 @@ sparkDwellRpmBins = array, F32, 332, [8], "RPM", 1, 0, 0, 18000, 2 sparkDwellValues = array, F32, 364, [8], "ms", 1, 0, 0, 30, 2 displacement = scalar, F32, 396, "L", 1, 0, 0, 1000, 2 cylindersCount = scalar, U32, 400, "", 1, 0, 1, 12, 0 -firingOrder = bits, U32, 404, [0:4], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-2-4-5-3", "1-4-2-5-3-6", "1-2", "1-2-3-4-5-6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8", "1-6-3-2-5-4", "1-10-9-4-3-6-5-8-7_2", "1-7-5-11-3-9-6-12-2-8-4-10", "1-7-4-10-2-8-6-12-3-9-5-11", "1-4-3-2", "1-12-5-8-3-10-6-7-2-11-4-9", "1-2-7-8-4-5-6-3", "1-3-7-2-6-5-4-8", "1-2-3-4-5-6-7-8-9", "INVALID", "1-2-3-4-5-6-7-8-9-10-11-12", "1-3-2", "1-2-3-4-5-6-7-8", "1-5-4-8-6-3-7-2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +firingOrder = bits, U32, 404, [0:4], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-2-4-5-3", "1-4-2-5-3-6", "1-2", "1-2-3-4-5-6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8", "1-6-3-2-5-4", "1-10-9-4-3-6-5-8-7_2", "1-7-5-11-3-9-6-12-2-8-4-10", "1-7-4-10-2-8-6-12-3-9-5-11", "1-4-3-2", "1-12-5-8-3-10-6-7-2-11-4-9", "1-2-7-8-4-5-6-3", "1-3-7-2-6-5-4-8", "1-2-3-4-5-6-7-8-9", "INVALID", "1-2-3-4-5-6-7-8-9-10-11-12", "1-3-2", "1-2-3-4-5-6-7-8", "1-5-4-8-6-3-7-2", "1-4-3-6-2-5", "1-8-7-3-6-5-4-2", "fo29", "fo30", "fo31" cylinderBore = scalar, F32, 408, "mm", 1, 0, 0, 20000, 2 sensorSnifferRpmThreshold = scalar, S32, 412, "RPM", 1, 0, 0, 30000, 0 rpmHardLimit = scalar, S32, 416, "rpm", 1, 0, 0, 20000, 2 @@ -1695,7 +1695,7 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 ; ; Bit flags - hasSdCard = bits, U32, 0, [0:0], "true", "false"; + sd_present = bits, U32, 0, [0:0], "true", "false"; isIgnitionEnabledIndicator=bits,U32, 0, [1:1], "true", "false"; isInjectionEnabledIndicator=bits,U32,0, [2:2], "true", "false"; isCylinderCleanupActivated=bits,U32, 0, [4:4], "true", "false"; @@ -1883,7 +1883,8 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 ; we use this to match logs to tunes tuneCrc16 = scalar, U16, 244, "crc16", 1, 0 - sd_status = scalar, U08, 246, "", 1.0, 0.0 + sd_logging_internal = bits, U08, 246, [0:0], "true", "false" + sd_msd = bits, U08, 246, [1:1], "true", "false" ; Transmission tcuCurrentGear = scalar, S08, 247, "gear", 1, 0 @@ -2737,14 +2738,9 @@ gaugeCategory = DynoView indicator = { knockEverIndicator }, "", "Knock recently", white, black, red, black indicator = { knockNowIndicator }, "no knock", "Knock NOW", white, black, red, black -; this bit array has special meaning for TS - that's part of TS build in file transfer -; we _probably_ should officially retire TS file transfer since we have something way cooler! - indicator = { sd_status & 1}, "No SD", "SD in", white, black, green, black - indicator = { sd_status & 4}, "SD ready", "SD ready", white, black, green, black - indicator = { sd_status & 8}, "SD Log", "SD Log", white, black, green, black - indicator = { sd_status & 16}, "SD Err", "SD Err", white, black, red, black -; todo: duplication with 'SD in'?! - indicator = { hasSdCard}, "no SD", "with SD", white, black, green, black + indicator = { sd_present }, "no SD card", "SD card OK", white, black, green, black + indicator = { sd_logging_internal }, "SD logging", "SD logging", white, black, green, black + indicator = { sd_msd }, "SD USB", "SD USB", white, black, green, black ; looks like TS would append four system indicators below: Data Logging, ???, Not Connected, Protocol Error diff --git a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini index 0d4532055d..a98c8b3dec 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.07.21.hellen_cypress.95872439" + signature = "rusEFI 2021.07.21.hellen_cypress.3946674638" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.21.hellen_cypress.95872439" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.21.hellen_cypress.3946674638" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 hellen_cypress_gen_config.bat integration/rusefi_config.txt Wed Jul 21 01:25:21 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Wed Jul 21 02:11:06 UTC 2021 pageSize = 20000 page = 1 @@ -164,7 +164,7 @@ sparkDwellRpmBins = array, F32, 332, [8], "RPM", 1, 0, 0, 18000, 2 sparkDwellValues = array, F32, 364, [8], "ms", 1, 0, 0, 30, 2 displacement = scalar, F32, 396, "L", 1, 0, 0, 1000, 2 cylindersCount = scalar, U32, 400, "", 1, 0, 1, 12, 0 -firingOrder = bits, U32, 404, [0:4], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-2-4-5-3", "1-4-2-5-3-6", "1-2", "1-2-3-4-5-6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8", "1-6-3-2-5-4", "1-10-9-4-3-6-5-8-7_2", "1-7-5-11-3-9-6-12-2-8-4-10", "1-7-4-10-2-8-6-12-3-9-5-11", "1-4-3-2", "1-12-5-8-3-10-6-7-2-11-4-9", "1-2-7-8-4-5-6-3", "1-3-7-2-6-5-4-8", "1-2-3-4-5-6-7-8-9", "INVALID", "1-2-3-4-5-6-7-8-9-10-11-12", "1-3-2", "1-2-3-4-5-6-7-8", "1-5-4-8-6-3-7-2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +firingOrder = bits, U32, 404, [0:4], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-2-4-5-3", "1-4-2-5-3-6", "1-2", "1-2-3-4-5-6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8", "1-6-3-2-5-4", "1-10-9-4-3-6-5-8-7_2", "1-7-5-11-3-9-6-12-2-8-4-10", "1-7-4-10-2-8-6-12-3-9-5-11", "1-4-3-2", "1-12-5-8-3-10-6-7-2-11-4-9", "1-2-7-8-4-5-6-3", "1-3-7-2-6-5-4-8", "1-2-3-4-5-6-7-8-9", "INVALID", "1-2-3-4-5-6-7-8-9-10-11-12", "1-3-2", "1-2-3-4-5-6-7-8", "1-5-4-8-6-3-7-2", "1-4-3-6-2-5", "1-8-7-3-6-5-4-2", "fo29", "fo30", "fo31" cylinderBore = scalar, F32, 408, "mm", 1, 0, 0, 20000, 2 sensorSnifferRpmThreshold = scalar, S32, 412, "RPM", 1, 0, 0, 30000, 0 rpmHardLimit = scalar, S32, 416, "rpm", 1, 0, 0, 20000, 2 @@ -1695,7 +1695,7 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 ; ; Bit flags - hasSdCard = bits, U32, 0, [0:0], "true", "false"; + sd_present = bits, U32, 0, [0:0], "true", "false"; isIgnitionEnabledIndicator=bits,U32, 0, [1:1], "true", "false"; isInjectionEnabledIndicator=bits,U32,0, [2:2], "true", "false"; isCylinderCleanupActivated=bits,U32, 0, [4:4], "true", "false"; @@ -1883,7 +1883,8 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 ; we use this to match logs to tunes tuneCrc16 = scalar, U16, 244, "crc16", 1, 0 - sd_status = scalar, U08, 246, "", 1.0, 0.0 + sd_logging_internal = bits, U08, 246, [0:0], "true", "false" + sd_msd = bits, U08, 246, [1:1], "true", "false" ; Transmission tcuCurrentGear = scalar, S08, 247, "gear", 1, 0 @@ -2737,14 +2738,9 @@ gaugeCategory = DynoView indicator = { knockEverIndicator }, "", "Knock recently", white, black, red, black indicator = { knockNowIndicator }, "no knock", "Knock NOW", white, black, red, black -; this bit array has special meaning for TS - that's part of TS build in file transfer -; we _probably_ should officially retire TS file transfer since we have something way cooler! - indicator = { sd_status & 1}, "No SD", "SD in", white, black, green, black - indicator = { sd_status & 4}, "SD ready", "SD ready", white, black, green, black - indicator = { sd_status & 8}, "SD Log", "SD Log", white, black, green, black - indicator = { sd_status & 16}, "SD Err", "SD Err", white, black, red, black -; todo: duplication with 'SD in'?! - indicator = { hasSdCard}, "no SD", "with SD", white, black, green, black + indicator = { sd_present }, "no SD card", "SD card OK", white, black, green, black + indicator = { sd_logging_internal }, "SD logging", "SD logging", white, black, green, black + indicator = { sd_msd }, "SD USB", "SD USB", white, black, green, black ; looks like TS would append four system indicators below: Data Logging, ???, Not Connected, Protocol Error diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index 402c1051c4..215189bf67 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 2021.07.21.kin.4195559755" + signature = "rusEFI 2021.07.21.kin.345552178" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.21.kin.4195559755" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.21.kin.345552178" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 21 01:25:19 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Jul 21 02:11:04 UTC 2021 pageSize = 19972 page = 1 @@ -164,7 +164,7 @@ sparkDwellRpmBins = array, F32, 332, [8], "RPM", 1, 0, 0, 18000, 2 sparkDwellValues = array, F32, 364, [8], "ms", 1, 0, 0, 30, 2 displacement = scalar, F32, 396, "L", 1, 0, 0, 1000, 2 cylindersCount = scalar, U32, 400, "", 1, 0, 1, 12, 0 -firingOrder = bits, U32, 404, [0:4], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-2-4-5-3", "1-4-2-5-3-6", "1-2", "1-2-3-4-5-6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8", "1-6-3-2-5-4", "1-10-9-4-3-6-5-8-7_2", "1-7-5-11-3-9-6-12-2-8-4-10", "1-7-4-10-2-8-6-12-3-9-5-11", "1-4-3-2", "1-12-5-8-3-10-6-7-2-11-4-9", "1-2-7-8-4-5-6-3", "1-3-7-2-6-5-4-8", "1-2-3-4-5-6-7-8-9", "INVALID", "1-2-3-4-5-6-7-8-9-10-11-12", "1-3-2", "1-2-3-4-5-6-7-8", "1-5-4-8-6-3-7-2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +firingOrder = bits, U32, 404, [0:4], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-2-4-5-3", "1-4-2-5-3-6", "1-2", "1-2-3-4-5-6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8", "1-6-3-2-5-4", "1-10-9-4-3-6-5-8-7_2", "1-7-5-11-3-9-6-12-2-8-4-10", "1-7-4-10-2-8-6-12-3-9-5-11", "1-4-3-2", "1-12-5-8-3-10-6-7-2-11-4-9", "1-2-7-8-4-5-6-3", "1-3-7-2-6-5-4-8", "1-2-3-4-5-6-7-8-9", "INVALID", "1-2-3-4-5-6-7-8-9-10-11-12", "1-3-2", "1-2-3-4-5-6-7-8", "1-5-4-8-6-3-7-2", "1-4-3-6-2-5", "1-8-7-3-6-5-4-2", "fo29", "fo30", "fo31" cylinderBore = scalar, F32, 408, "mm", 1, 0, 0, 20000, 2 sensorSnifferRpmThreshold = scalar, S32, 412, "RPM", 1, 0, 0, 30000, 0 rpmHardLimit = scalar, S32, 416, "rpm", 1, 0, 0, 20000, 2 @@ -1667,7 +1667,7 @@ fsioTable4RpmBins = array, F32, 19940, [8], "RPM", 1, 0, 0, 25500, 2 ; ; Bit flags - hasSdCard = bits, U32, 0, [0:0], "true", "false"; + sd_present = bits, U32, 0, [0:0], "true", "false"; isIgnitionEnabledIndicator=bits,U32, 0, [1:1], "true", "false"; isInjectionEnabledIndicator=bits,U32,0, [2:2], "true", "false"; isCylinderCleanupActivated=bits,U32, 0, [4:4], "true", "false"; @@ -1855,7 +1855,8 @@ fsioTable4RpmBins = array, F32, 19940, [8], "RPM", 1, 0, 0, 25500, 2 ; we use this to match logs to tunes tuneCrc16 = scalar, U16, 244, "crc16", 1, 0 - sd_status = scalar, U08, 246, "", 1.0, 0.0 + sd_logging_internal = bits, U08, 246, [0:0], "true", "false" + sd_msd = bits, U08, 246, [1:1], "true", "false" ; Transmission tcuCurrentGear = scalar, S08, 247, "gear", 1, 0 @@ -2709,14 +2710,9 @@ gaugeCategory = DynoView indicator = { knockEverIndicator }, "", "Knock recently", white, black, red, black indicator = { knockNowIndicator }, "no knock", "Knock NOW", white, black, red, black -; this bit array has special meaning for TS - that's part of TS build in file transfer -; we _probably_ should officially retire TS file transfer since we have something way cooler! - indicator = { sd_status & 1}, "No SD", "SD in", white, black, green, black - indicator = { sd_status & 4}, "SD ready", "SD ready", white, black, green, black - indicator = { sd_status & 8}, "SD Log", "SD Log", white, black, green, black - indicator = { sd_status & 16}, "SD Err", "SD Err", white, black, red, black -; todo: duplication with 'SD in'?! - indicator = { hasSdCard}, "no SD", "with SD", white, black, green, black + indicator = { sd_present }, "no SD card", "SD card OK", white, black, green, black + indicator = { sd_logging_internal }, "SD logging", "SD logging", white, black, green, black + indicator = { sd_msd }, "SD USB", "SD USB", white, black, green, black ; looks like TS would append four system indicators below: Data Logging, ???, Not Connected, Protocol Error diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 5c485d5f1f..dc087db9e2 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 2021.07.21.mre_f4.2097133145" + signature = "rusEFI 2021.07.21.mre_f4.2457086496" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.21.mre_f4.2097133145" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.21.mre_f4.2457086496" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 21 01:25:04 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 21 02:10:49 UTC 2021 pageSize = 20000 page = 1 @@ -164,7 +164,7 @@ sparkDwellRpmBins = array, F32, 332, [8], "RPM", 1, 0, 0, 18000, 2 sparkDwellValues = array, F32, 364, [8], "ms", 1, 0, 0, 30, 2 displacement = scalar, F32, 396, "L", 1, 0, 0, 1000, 2 cylindersCount = scalar, U32, 400, "", 1, 0, 1, 12, 0 -firingOrder = bits, U32, 404, [0:4], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-2-4-5-3", "1-4-2-5-3-6", "1-2", "1-2-3-4-5-6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8", "1-6-3-2-5-4", "1-10-9-4-3-6-5-8-7_2", "1-7-5-11-3-9-6-12-2-8-4-10", "1-7-4-10-2-8-6-12-3-9-5-11", "1-4-3-2", "1-12-5-8-3-10-6-7-2-11-4-9", "1-2-7-8-4-5-6-3", "1-3-7-2-6-5-4-8", "1-2-3-4-5-6-7-8-9", "INVALID", "1-2-3-4-5-6-7-8-9-10-11-12", "1-3-2", "1-2-3-4-5-6-7-8", "1-5-4-8-6-3-7-2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +firingOrder = bits, U32, 404, [0:4], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-2-4-5-3", "1-4-2-5-3-6", "1-2", "1-2-3-4-5-6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8", "1-6-3-2-5-4", "1-10-9-4-3-6-5-8-7_2", "1-7-5-11-3-9-6-12-2-8-4-10", "1-7-4-10-2-8-6-12-3-9-5-11", "1-4-3-2", "1-12-5-8-3-10-6-7-2-11-4-9", "1-2-7-8-4-5-6-3", "1-3-7-2-6-5-4-8", "1-2-3-4-5-6-7-8-9", "INVALID", "1-2-3-4-5-6-7-8-9-10-11-12", "1-3-2", "1-2-3-4-5-6-7-8", "1-5-4-8-6-3-7-2", "1-4-3-6-2-5", "1-8-7-3-6-5-4-2", "fo29", "fo30", "fo31" cylinderBore = scalar, F32, 408, "mm", 1, 0, 0, 20000, 2 sensorSnifferRpmThreshold = scalar, S32, 412, "RPM", 1, 0, 0, 30000, 0 rpmHardLimit = scalar, S32, 416, "rpm", 1, 0, 0, 20000, 2 @@ -1695,7 +1695,7 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 ; ; Bit flags - hasSdCard = bits, U32, 0, [0:0], "true", "false"; + sd_present = bits, U32, 0, [0:0], "true", "false"; isIgnitionEnabledIndicator=bits,U32, 0, [1:1], "true", "false"; isInjectionEnabledIndicator=bits,U32,0, [2:2], "true", "false"; isCylinderCleanupActivated=bits,U32, 0, [4:4], "true", "false"; @@ -1883,7 +1883,8 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 ; we use this to match logs to tunes tuneCrc16 = scalar, U16, 244, "crc16", 1, 0 - sd_status = scalar, U08, 246, "", 1.0, 0.0 + sd_logging_internal = bits, U08, 246, [0:0], "true", "false" + sd_msd = bits, U08, 246, [1:1], "true", "false" ; Transmission tcuCurrentGear = scalar, S08, 247, "gear", 1, 0 @@ -2737,14 +2738,9 @@ gaugeCategory = DynoView indicator = { knockEverIndicator }, "", "Knock recently", white, black, red, black indicator = { knockNowIndicator }, "no knock", "Knock NOW", white, black, red, black -; this bit array has special meaning for TS - that's part of TS build in file transfer -; we _probably_ should officially retire TS file transfer since we have something way cooler! - indicator = { sd_status & 1}, "No SD", "SD in", white, black, green, black - indicator = { sd_status & 4}, "SD ready", "SD ready", white, black, green, black - indicator = { sd_status & 8}, "SD Log", "SD Log", white, black, green, black - indicator = { sd_status & 16}, "SD Err", "SD Err", white, black, red, black -; todo: duplication with 'SD in'?! - indicator = { hasSdCard}, "no SD", "with SD", white, black, green, black + indicator = { sd_present }, "no SD card", "SD card OK", white, black, green, black + indicator = { sd_logging_internal }, "SD logging", "SD logging", white, black, green, black + indicator = { sd_msd }, "SD USB", "SD USB", white, black, green, black ; looks like TS would append four system indicators below: Data Logging, ???, Not Connected, Protocol Error diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 32796e1284..5f41b648f3 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 2021.07.21.mre_f7.2097133145" + signature = "rusEFI 2021.07.21.mre_f7.2457086496" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.21.mre_f7.2097133145" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.21.mre_f7.2457086496" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 21 01:25:01 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 21 02:10:46 UTC 2021 pageSize = 20000 page = 1 @@ -164,7 +164,7 @@ sparkDwellRpmBins = array, F32, 332, [8], "RPM", 1, 0, 0, 18000, 2 sparkDwellValues = array, F32, 364, [8], "ms", 1, 0, 0, 30, 2 displacement = scalar, F32, 396, "L", 1, 0, 0, 1000, 2 cylindersCount = scalar, U32, 400, "", 1, 0, 1, 12, 0 -firingOrder = bits, U32, 404, [0:4], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-2-4-5-3", "1-4-2-5-3-6", "1-2", "1-2-3-4-5-6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8", "1-6-3-2-5-4", "1-10-9-4-3-6-5-8-7_2", "1-7-5-11-3-9-6-12-2-8-4-10", "1-7-4-10-2-8-6-12-3-9-5-11", "1-4-3-2", "1-12-5-8-3-10-6-7-2-11-4-9", "1-2-7-8-4-5-6-3", "1-3-7-2-6-5-4-8", "1-2-3-4-5-6-7-8-9", "INVALID", "1-2-3-4-5-6-7-8-9-10-11-12", "1-3-2", "1-2-3-4-5-6-7-8", "1-5-4-8-6-3-7-2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +firingOrder = bits, U32, 404, [0:4], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-2-4-5-3", "1-4-2-5-3-6", "1-2", "1-2-3-4-5-6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8", "1-6-3-2-5-4", "1-10-9-4-3-6-5-8-7_2", "1-7-5-11-3-9-6-12-2-8-4-10", "1-7-4-10-2-8-6-12-3-9-5-11", "1-4-3-2", "1-12-5-8-3-10-6-7-2-11-4-9", "1-2-7-8-4-5-6-3", "1-3-7-2-6-5-4-8", "1-2-3-4-5-6-7-8-9", "INVALID", "1-2-3-4-5-6-7-8-9-10-11-12", "1-3-2", "1-2-3-4-5-6-7-8", "1-5-4-8-6-3-7-2", "1-4-3-6-2-5", "1-8-7-3-6-5-4-2", "fo29", "fo30", "fo31" cylinderBore = scalar, F32, 408, "mm", 1, 0, 0, 20000, 2 sensorSnifferRpmThreshold = scalar, S32, 412, "RPM", 1, 0, 0, 30000, 0 rpmHardLimit = scalar, S32, 416, "rpm", 1, 0, 0, 20000, 2 @@ -1695,7 +1695,7 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 ; ; Bit flags - hasSdCard = bits, U32, 0, [0:0], "true", "false"; + sd_present = bits, U32, 0, [0:0], "true", "false"; isIgnitionEnabledIndicator=bits,U32, 0, [1:1], "true", "false"; isInjectionEnabledIndicator=bits,U32,0, [2:2], "true", "false"; isCylinderCleanupActivated=bits,U32, 0, [4:4], "true", "false"; @@ -1883,7 +1883,8 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 ; we use this to match logs to tunes tuneCrc16 = scalar, U16, 244, "crc16", 1, 0 - sd_status = scalar, U08, 246, "", 1.0, 0.0 + sd_logging_internal = bits, U08, 246, [0:0], "true", "false" + sd_msd = bits, U08, 246, [1:1], "true", "false" ; Transmission tcuCurrentGear = scalar, S08, 247, "gear", 1, 0 @@ -2737,14 +2738,9 @@ gaugeCategory = DynoView indicator = { knockEverIndicator }, "", "Knock recently", white, black, red, black indicator = { knockNowIndicator }, "no knock", "Knock NOW", white, black, red, black -; this bit array has special meaning for TS - that's part of TS build in file transfer -; we _probably_ should officially retire TS file transfer since we have something way cooler! - indicator = { sd_status & 1}, "No SD", "SD in", white, black, green, black - indicator = { sd_status & 4}, "SD ready", "SD ready", white, black, green, black - indicator = { sd_status & 8}, "SD Log", "SD Log", white, black, green, black - indicator = { sd_status & 16}, "SD Err", "SD Err", white, black, red, black -; todo: duplication with 'SD in'?! - indicator = { hasSdCard}, "no SD", "with SD", white, black, green, black + indicator = { sd_present }, "no SD card", "SD card OK", white, black, green, black + indicator = { sd_logging_internal }, "SD logging", "SD logging", white, black, green, black + indicator = { sd_msd }, "SD USB", "SD USB", white, black, green, black ; looks like TS would append four system indicators below: Data Logging, ???, Not Connected, Protocol Error diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index 6b1ff64aef..875c44b471 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 2021.07.21.prometheus_405.1432108113" + signature = "rusEFI 2021.07.21.prometheus_405.3151470632" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.21.prometheus_405.1432108113" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.21.prometheus_405.3151470632" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 21 01:25:11 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 21 02:10:57 UTC 2021 pageSize = 20000 page = 1 @@ -164,7 +164,7 @@ sparkDwellRpmBins = array, F32, 332, [8], "RPM", 1, 0, 0, 18000, 2 sparkDwellValues = array, F32, 364, [8], "ms", 1, 0, 0, 30, 2 displacement = scalar, F32, 396, "L", 1, 0, 0, 1000, 2 cylindersCount = scalar, U32, 400, "", 1, 0, 1, 12, 0 -firingOrder = bits, U32, 404, [0:4], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-2-4-5-3", "1-4-2-5-3-6", "1-2", "1-2-3-4-5-6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8", "1-6-3-2-5-4", "1-10-9-4-3-6-5-8-7_2", "1-7-5-11-3-9-6-12-2-8-4-10", "1-7-4-10-2-8-6-12-3-9-5-11", "1-4-3-2", "1-12-5-8-3-10-6-7-2-11-4-9", "1-2-7-8-4-5-6-3", "1-3-7-2-6-5-4-8", "1-2-3-4-5-6-7-8-9", "INVALID", "1-2-3-4-5-6-7-8-9-10-11-12", "1-3-2", "1-2-3-4-5-6-7-8", "1-5-4-8-6-3-7-2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +firingOrder = bits, U32, 404, [0:4], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-2-4-5-3", "1-4-2-5-3-6", "1-2", "1-2-3-4-5-6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8", "1-6-3-2-5-4", "1-10-9-4-3-6-5-8-7_2", "1-7-5-11-3-9-6-12-2-8-4-10", "1-7-4-10-2-8-6-12-3-9-5-11", "1-4-3-2", "1-12-5-8-3-10-6-7-2-11-4-9", "1-2-7-8-4-5-6-3", "1-3-7-2-6-5-4-8", "1-2-3-4-5-6-7-8-9", "INVALID", "1-2-3-4-5-6-7-8-9-10-11-12", "1-3-2", "1-2-3-4-5-6-7-8", "1-5-4-8-6-3-7-2", "1-4-3-6-2-5", "1-8-7-3-6-5-4-2", "fo29", "fo30", "fo31" cylinderBore = scalar, F32, 408, "mm", 1, 0, 0, 20000, 2 sensorSnifferRpmThreshold = scalar, S32, 412, "RPM", 1, 0, 0, 30000, 0 rpmHardLimit = scalar, S32, 416, "rpm", 1, 0, 0, 20000, 2 @@ -1695,7 +1695,7 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 ; ; Bit flags - hasSdCard = bits, U32, 0, [0:0], "true", "false"; + sd_present = bits, U32, 0, [0:0], "true", "false"; isIgnitionEnabledIndicator=bits,U32, 0, [1:1], "true", "false"; isInjectionEnabledIndicator=bits,U32,0, [2:2], "true", "false"; isCylinderCleanupActivated=bits,U32, 0, [4:4], "true", "false"; @@ -1883,7 +1883,8 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 ; we use this to match logs to tunes tuneCrc16 = scalar, U16, 244, "crc16", 1, 0 - sd_status = scalar, U08, 246, "", 1.0, 0.0 + sd_logging_internal = bits, U08, 246, [0:0], "true", "false" + sd_msd = bits, U08, 246, [1:1], "true", "false" ; Transmission tcuCurrentGear = scalar, S08, 247, "gear", 1, 0 @@ -2737,14 +2738,9 @@ gaugeCategory = DynoView indicator = { knockEverIndicator }, "", "Knock recently", white, black, red, black indicator = { knockNowIndicator }, "no knock", "Knock NOW", white, black, red, black -; this bit array has special meaning for TS - that's part of TS build in file transfer -; we _probably_ should officially retire TS file transfer since we have something way cooler! - indicator = { sd_status & 1}, "No SD", "SD in", white, black, green, black - indicator = { sd_status & 4}, "SD ready", "SD ready", white, black, green, black - indicator = { sd_status & 8}, "SD Log", "SD Log", white, black, green, black - indicator = { sd_status & 16}, "SD Err", "SD Err", white, black, red, black -; todo: duplication with 'SD in'?! - indicator = { hasSdCard}, "no SD", "with SD", white, black, green, black + indicator = { sd_present }, "no SD card", "SD card OK", white, black, green, black + indicator = { sd_logging_internal }, "SD logging", "SD logging", white, black, green, black + indicator = { sd_msd }, "SD USB", "SD USB", white, black, green, black ; looks like TS would append four system indicators below: Data Logging, ???, Not Connected, Protocol Error diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 393513f332..cda6609d43 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 2021.07.21.prometheus_469.1432108113" + signature = "rusEFI 2021.07.21.prometheus_469.3151470632" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.21.prometheus_469.1432108113" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.21.prometheus_469.3151470632" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 21 01:25:09 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 21 02:10:54 UTC 2021 pageSize = 20000 page = 1 @@ -164,7 +164,7 @@ sparkDwellRpmBins = array, F32, 332, [8], "RPM", 1, 0, 0, 18000, 2 sparkDwellValues = array, F32, 364, [8], "ms", 1, 0, 0, 30, 2 displacement = scalar, F32, 396, "L", 1, 0, 0, 1000, 2 cylindersCount = scalar, U32, 400, "", 1, 0, 1, 12, 0 -firingOrder = bits, U32, 404, [0:4], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-2-4-5-3", "1-4-2-5-3-6", "1-2", "1-2-3-4-5-6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8", "1-6-3-2-5-4", "1-10-9-4-3-6-5-8-7_2", "1-7-5-11-3-9-6-12-2-8-4-10", "1-7-4-10-2-8-6-12-3-9-5-11", "1-4-3-2", "1-12-5-8-3-10-6-7-2-11-4-9", "1-2-7-8-4-5-6-3", "1-3-7-2-6-5-4-8", "1-2-3-4-5-6-7-8-9", "INVALID", "1-2-3-4-5-6-7-8-9-10-11-12", "1-3-2", "1-2-3-4-5-6-7-8", "1-5-4-8-6-3-7-2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +firingOrder = bits, U32, 404, [0:4], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-2-4-5-3", "1-4-2-5-3-6", "1-2", "1-2-3-4-5-6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8", "1-6-3-2-5-4", "1-10-9-4-3-6-5-8-7_2", "1-7-5-11-3-9-6-12-2-8-4-10", "1-7-4-10-2-8-6-12-3-9-5-11", "1-4-3-2", "1-12-5-8-3-10-6-7-2-11-4-9", "1-2-7-8-4-5-6-3", "1-3-7-2-6-5-4-8", "1-2-3-4-5-6-7-8-9", "INVALID", "1-2-3-4-5-6-7-8-9-10-11-12", "1-3-2", "1-2-3-4-5-6-7-8", "1-5-4-8-6-3-7-2", "1-4-3-6-2-5", "1-8-7-3-6-5-4-2", "fo29", "fo30", "fo31" cylinderBore = scalar, F32, 408, "mm", 1, 0, 0, 20000, 2 sensorSnifferRpmThreshold = scalar, S32, 412, "RPM", 1, 0, 0, 30000, 0 rpmHardLimit = scalar, S32, 416, "rpm", 1, 0, 0, 20000, 2 @@ -1695,7 +1695,7 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 ; ; Bit flags - hasSdCard = bits, U32, 0, [0:0], "true", "false"; + sd_present = bits, U32, 0, [0:0], "true", "false"; isIgnitionEnabledIndicator=bits,U32, 0, [1:1], "true", "false"; isInjectionEnabledIndicator=bits,U32,0, [2:2], "true", "false"; isCylinderCleanupActivated=bits,U32, 0, [4:4], "true", "false"; @@ -1883,7 +1883,8 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 ; we use this to match logs to tunes tuneCrc16 = scalar, U16, 244, "crc16", 1, 0 - sd_status = scalar, U08, 246, "", 1.0, 0.0 + sd_logging_internal = bits, U08, 246, [0:0], "true", "false" + sd_msd = bits, U08, 246, [1:1], "true", "false" ; Transmission tcuCurrentGear = scalar, S08, 247, "gear", 1, 0 @@ -2737,14 +2738,9 @@ gaugeCategory = DynoView indicator = { knockEverIndicator }, "", "Knock recently", white, black, red, black indicator = { knockNowIndicator }, "no knock", "Knock NOW", white, black, red, black -; this bit array has special meaning for TS - that's part of TS build in file transfer -; we _probably_ should officially retire TS file transfer since we have something way cooler! - indicator = { sd_status & 1}, "No SD", "SD in", white, black, green, black - indicator = { sd_status & 4}, "SD ready", "SD ready", white, black, green, black - indicator = { sd_status & 8}, "SD Log", "SD Log", white, black, green, black - indicator = { sd_status & 16}, "SD Err", "SD Err", white, black, red, black -; todo: duplication with 'SD in'?! - indicator = { hasSdCard}, "no SD", "with SD", white, black, green, black + indicator = { sd_present }, "no SD card", "SD card OK", white, black, green, black + indicator = { sd_logging_internal }, "SD logging", "SD logging", white, black, green, black + indicator = { sd_msd }, "SD USB", "SD USB", white, black, green, black ; looks like TS would append four system indicators below: Data Logging, ???, Not Connected, Protocol Error diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 87b3e016f8..d2314113bf 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 2021.07.21.proteus_f4.2189718907" + signature = "rusEFI 2021.07.21.proteus_f4.1812982018" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.21.proteus_f4.2189718907" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.21.proteus_f4.1812982018" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 21 01:25:16 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 21 02:11:01 UTC 2021 pageSize = 20000 page = 1 @@ -164,7 +164,7 @@ sparkDwellRpmBins = array, F32, 332, [8], "RPM", 1, 0, 0, 18000, 2 sparkDwellValues = array, F32, 364, [8], "ms", 1, 0, 0, 30, 2 displacement = scalar, F32, 396, "L", 1, 0, 0, 1000, 2 cylindersCount = scalar, U32, 400, "", 1, 0, 1, 12, 0 -firingOrder = bits, U32, 404, [0:4], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-2-4-5-3", "1-4-2-5-3-6", "1-2", "1-2-3-4-5-6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8", "1-6-3-2-5-4", "1-10-9-4-3-6-5-8-7_2", "1-7-5-11-3-9-6-12-2-8-4-10", "1-7-4-10-2-8-6-12-3-9-5-11", "1-4-3-2", "1-12-5-8-3-10-6-7-2-11-4-9", "1-2-7-8-4-5-6-3", "1-3-7-2-6-5-4-8", "1-2-3-4-5-6-7-8-9", "INVALID", "1-2-3-4-5-6-7-8-9-10-11-12", "1-3-2", "1-2-3-4-5-6-7-8", "1-5-4-8-6-3-7-2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +firingOrder = bits, U32, 404, [0:4], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-2-4-5-3", "1-4-2-5-3-6", "1-2", "1-2-3-4-5-6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8", "1-6-3-2-5-4", "1-10-9-4-3-6-5-8-7_2", "1-7-5-11-3-9-6-12-2-8-4-10", "1-7-4-10-2-8-6-12-3-9-5-11", "1-4-3-2", "1-12-5-8-3-10-6-7-2-11-4-9", "1-2-7-8-4-5-6-3", "1-3-7-2-6-5-4-8", "1-2-3-4-5-6-7-8-9", "INVALID", "1-2-3-4-5-6-7-8-9-10-11-12", "1-3-2", "1-2-3-4-5-6-7-8", "1-5-4-8-6-3-7-2", "1-4-3-6-2-5", "1-8-7-3-6-5-4-2", "fo29", "fo30", "fo31" cylinderBore = scalar, F32, 408, "mm", 1, 0, 0, 20000, 2 sensorSnifferRpmThreshold = scalar, S32, 412, "RPM", 1, 0, 0, 30000, 0 rpmHardLimit = scalar, S32, 416, "rpm", 1, 0, 0, 20000, 2 @@ -1695,7 +1695,7 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 ; ; Bit flags - hasSdCard = bits, U32, 0, [0:0], "true", "false"; + sd_present = bits, U32, 0, [0:0], "true", "false"; isIgnitionEnabledIndicator=bits,U32, 0, [1:1], "true", "false"; isInjectionEnabledIndicator=bits,U32,0, [2:2], "true", "false"; isCylinderCleanupActivated=bits,U32, 0, [4:4], "true", "false"; @@ -1883,7 +1883,8 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 ; we use this to match logs to tunes tuneCrc16 = scalar, U16, 244, "crc16", 1, 0 - sd_status = scalar, U08, 246, "", 1.0, 0.0 + sd_logging_internal = bits, U08, 246, [0:0], "true", "false" + sd_msd = bits, U08, 246, [1:1], "true", "false" ; Transmission tcuCurrentGear = scalar, S08, 247, "gear", 1, 0 @@ -2737,14 +2738,9 @@ gaugeCategory = DynoView indicator = { knockEverIndicator }, "", "Knock recently", white, black, red, black indicator = { knockNowIndicator }, "no knock", "Knock NOW", white, black, red, black -; this bit array has special meaning for TS - that's part of TS build in file transfer -; we _probably_ should officially retire TS file transfer since we have something way cooler! - indicator = { sd_status & 1}, "No SD", "SD in", white, black, green, black - indicator = { sd_status & 4}, "SD ready", "SD ready", white, black, green, black - indicator = { sd_status & 8}, "SD Log", "SD Log", white, black, green, black - indicator = { sd_status & 16}, "SD Err", "SD Err", white, black, red, black -; todo: duplication with 'SD in'?! - indicator = { hasSdCard}, "no SD", "with SD", white, black, green, black + indicator = { sd_present }, "no SD card", "SD card OK", white, black, green, black + indicator = { sd_logging_internal }, "SD logging", "SD logging", white, black, green, black + indicator = { sd_msd }, "SD USB", "SD USB", white, black, green, black ; looks like TS would append four system indicators below: Data Logging, ???, Not Connected, Protocol Error diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 2aec3bdf67..5b79ae1baf 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 2021.07.21.proteus_f7.2189718907" + signature = "rusEFI 2021.07.21.proteus_f7.1812982018" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.21.proteus_f7.2189718907" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.21.proteus_f7.1812982018" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 21 01:25:14 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 21 02:10:59 UTC 2021 pageSize = 20000 page = 1 @@ -164,7 +164,7 @@ sparkDwellRpmBins = array, F32, 332, [8], "RPM", 1, 0, 0, 18000, 2 sparkDwellValues = array, F32, 364, [8], "ms", 1, 0, 0, 30, 2 displacement = scalar, F32, 396, "L", 1, 0, 0, 1000, 2 cylindersCount = scalar, U32, 400, "", 1, 0, 1, 12, 0 -firingOrder = bits, U32, 404, [0:4], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-2-4-5-3", "1-4-2-5-3-6", "1-2", "1-2-3-4-5-6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8", "1-6-3-2-5-4", "1-10-9-4-3-6-5-8-7_2", "1-7-5-11-3-9-6-12-2-8-4-10", "1-7-4-10-2-8-6-12-3-9-5-11", "1-4-3-2", "1-12-5-8-3-10-6-7-2-11-4-9", "1-2-7-8-4-5-6-3", "1-3-7-2-6-5-4-8", "1-2-3-4-5-6-7-8-9", "INVALID", "1-2-3-4-5-6-7-8-9-10-11-12", "1-3-2", "1-2-3-4-5-6-7-8", "1-5-4-8-6-3-7-2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +firingOrder = bits, U32, 404, [0:4], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-2-4-5-3", "1-4-2-5-3-6", "1-2", "1-2-3-4-5-6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8", "1-6-3-2-5-4", "1-10-9-4-3-6-5-8-7_2", "1-7-5-11-3-9-6-12-2-8-4-10", "1-7-4-10-2-8-6-12-3-9-5-11", "1-4-3-2", "1-12-5-8-3-10-6-7-2-11-4-9", "1-2-7-8-4-5-6-3", "1-3-7-2-6-5-4-8", "1-2-3-4-5-6-7-8-9", "INVALID", "1-2-3-4-5-6-7-8-9-10-11-12", "1-3-2", "1-2-3-4-5-6-7-8", "1-5-4-8-6-3-7-2", "1-4-3-6-2-5", "1-8-7-3-6-5-4-2", "fo29", "fo30", "fo31" cylinderBore = scalar, F32, 408, "mm", 1, 0, 0, 20000, 2 sensorSnifferRpmThreshold = scalar, S32, 412, "RPM", 1, 0, 0, 30000, 0 rpmHardLimit = scalar, S32, 416, "rpm", 1, 0, 0, 20000, 2 @@ -1695,7 +1695,7 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 ; ; Bit flags - hasSdCard = bits, U32, 0, [0:0], "true", "false"; + sd_present = bits, U32, 0, [0:0], "true", "false"; isIgnitionEnabledIndicator=bits,U32, 0, [1:1], "true", "false"; isInjectionEnabledIndicator=bits,U32,0, [2:2], "true", "false"; isCylinderCleanupActivated=bits,U32, 0, [4:4], "true", "false"; @@ -1883,7 +1883,8 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 ; we use this to match logs to tunes tuneCrc16 = scalar, U16, 244, "crc16", 1, 0 - sd_status = scalar, U08, 246, "", 1.0, 0.0 + sd_logging_internal = bits, U08, 246, [0:0], "true", "false" + sd_msd = bits, U08, 246, [1:1], "true", "false" ; Transmission tcuCurrentGear = scalar, S08, 247, "gear", 1, 0 @@ -2737,14 +2738,9 @@ gaugeCategory = DynoView indicator = { knockEverIndicator }, "", "Knock recently", white, black, red, black indicator = { knockNowIndicator }, "no knock", "Knock NOW", white, black, red, black -; this bit array has special meaning for TS - that's part of TS build in file transfer -; we _probably_ should officially retire TS file transfer since we have something way cooler! - indicator = { sd_status & 1}, "No SD", "SD in", white, black, green, black - indicator = { sd_status & 4}, "SD ready", "SD ready", white, black, green, black - indicator = { sd_status & 8}, "SD Log", "SD Log", white, black, green, black - indicator = { sd_status & 16}, "SD Err", "SD Err", white, black, red, black -; todo: duplication with 'SD in'?! - indicator = { hasSdCard}, "no SD", "with SD", white, black, green, black + indicator = { sd_present }, "no SD card", "SD card OK", white, black, green, black + indicator = { sd_logging_internal }, "SD logging", "SD logging", white, black, green, black + indicator = { sd_msd }, "SD USB", "SD USB", white, black, green, black ; looks like TS would append four system indicators below: Data Logging, ???, Not Connected, Protocol Error diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index 4a6395cac2..aa63553418 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.07.21.subaru_eg33_f7.2171336657" + signature = "rusEFI 2021.07.21.subaru_eg33_f7.1876978600" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.21.subaru_eg33_f7.2171336657" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.21.subaru_eg33_f7.1876978600" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Wed Jul 21 01:25:23 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Wed Jul 21 02:11:09 UTC 2021 pageSize = 20000 page = 1 @@ -164,7 +164,7 @@ sparkDwellRpmBins = array, F32, 332, [8], "RPM", 1, 0, 0, 18000, 2 sparkDwellValues = array, F32, 364, [8], "ms", 1, 0, 0, 30, 2 displacement = scalar, F32, 396, "L", 1, 0, 0, 1000, 2 cylindersCount = scalar, U32, 400, "", 1, 0, 1, 12, 0 -firingOrder = bits, U32, 404, [0:4], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-2-4-5-3", "1-4-2-5-3-6", "1-2", "1-2-3-4-5-6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8", "1-6-3-2-5-4", "1-10-9-4-3-6-5-8-7_2", "1-7-5-11-3-9-6-12-2-8-4-10", "1-7-4-10-2-8-6-12-3-9-5-11", "1-4-3-2", "1-12-5-8-3-10-6-7-2-11-4-9", "1-2-7-8-4-5-6-3", "1-3-7-2-6-5-4-8", "1-2-3-4-5-6-7-8-9", "INVALID", "1-2-3-4-5-6-7-8-9-10-11-12", "1-3-2", "1-2-3-4-5-6-7-8", "1-5-4-8-6-3-7-2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +firingOrder = bits, U32, 404, [0:4], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-2-4-5-3", "1-4-2-5-3-6", "1-2", "1-2-3-4-5-6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8", "1-6-3-2-5-4", "1-10-9-4-3-6-5-8-7_2", "1-7-5-11-3-9-6-12-2-8-4-10", "1-7-4-10-2-8-6-12-3-9-5-11", "1-4-3-2", "1-12-5-8-3-10-6-7-2-11-4-9", "1-2-7-8-4-5-6-3", "1-3-7-2-6-5-4-8", "1-2-3-4-5-6-7-8-9", "INVALID", "1-2-3-4-5-6-7-8-9-10-11-12", "1-3-2", "1-2-3-4-5-6-7-8", "1-5-4-8-6-3-7-2", "1-4-3-6-2-5", "1-8-7-3-6-5-4-2", "fo29", "fo30", "fo31" cylinderBore = scalar, F32, 408, "mm", 1, 0, 0, 20000, 2 sensorSnifferRpmThreshold = scalar, S32, 412, "RPM", 1, 0, 0, 30000, 0 rpmHardLimit = scalar, S32, 416, "rpm", 1, 0, 0, 20000, 2 @@ -1695,7 +1695,7 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 ; ; Bit flags - hasSdCard = bits, U32, 0, [0:0], "true", "false"; + sd_present = bits, U32, 0, [0:0], "true", "false"; isIgnitionEnabledIndicator=bits,U32, 0, [1:1], "true", "false"; isInjectionEnabledIndicator=bits,U32,0, [2:2], "true", "false"; isCylinderCleanupActivated=bits,U32, 0, [4:4], "true", "false"; @@ -1883,7 +1883,8 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 ; we use this to match logs to tunes tuneCrc16 = scalar, U16, 244, "crc16", 1, 0 - sd_status = scalar, U08, 246, "", 1.0, 0.0 + sd_logging_internal = bits, U08, 246, [0:0], "true", "false" + sd_msd = bits, U08, 246, [1:1], "true", "false" ; Transmission tcuCurrentGear = scalar, S08, 247, "gear", 1, 0 @@ -2737,14 +2738,9 @@ gaugeCategory = DynoView indicator = { knockEverIndicator }, "", "Knock recently", white, black, red, black indicator = { knockNowIndicator }, "no knock", "Knock NOW", white, black, red, black -; this bit array has special meaning for TS - that's part of TS build in file transfer -; we _probably_ should officially retire TS file transfer since we have something way cooler! - indicator = { sd_status & 1}, "No SD", "SD in", white, black, green, black - indicator = { sd_status & 4}, "SD ready", "SD ready", white, black, green, black - indicator = { sd_status & 8}, "SD Log", "SD Log", white, black, green, black - indicator = { sd_status & 16}, "SD Err", "SD Err", white, black, red, black -; todo: duplication with 'SD in'?! - indicator = { hasSdCard}, "no SD", "with SD", white, black, green, black + indicator = { sd_present }, "no SD card", "SD card OK", white, black, green, black + indicator = { sd_logging_internal }, "SD logging", "SD logging", white, black, green, black + indicator = { sd_msd }, "SD USB", "SD USB", white, black, green, black ; looks like TS would append four system indicators below: Data Logging, ???, Not Connected, Protocol Error 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 90b6330d89..ca0cb74d28 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 21 01:24:41 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 21 02:10:28 UTC 2021 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1268,7 +1268,6 @@ 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 = 1204436583; public static final int silentTriggerError_offset = 1464; public static final int slowAdcAlpha_offset = 2088; public static final int sparkDwellRpmBins_offset = 332; @@ -1586,7 +1585,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 2021.07.21.all.1204436583"; + public static final String TS_SIGNATURE = "rusEFI 2021.07.21.all.2839650846"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final char TS_TEST_COMMAND = 't'; public static final int TT_TT_1_16 = 50; diff --git a/java_console/rusefi.xml b/java_console/rusefi.xml index a6d0eae400..c80d191d37 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -1,6 +1,6 @@ - +