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 8e9d809a92..ee63c26884 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 Tue Jul 28 13:12:25 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Jul 29 18:54:53 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3533,4 +3533,4 @@ struct persistent_config_s { typedef struct persistent_config_s persistent_config_s; // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Tue Jul 28 13:12:25 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Jul 29 18:54:53 UTC 2020 diff --git a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h index adf82e7b03..13e94a6286 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -332,7 +332,8 @@ #define ET_FRANKENSO_MIATA_NA6_VAF 57 #define ET_FRANKENSO_MIATA_NB2 47 #define ET_MRE_DEFAULTS 60 -#define ET_MRE_MIATA_NA6 12 +#define ET_MRE_MIATA_NA6_MAP 66 +#define ET_MRE_MIATA_NA6_VAF 12 #define ET_MRE_MIATA_NB2_MAF 15 #define ET_MRE_MIATA_NB2_MAP 11 #define ET_MRE_NEW_TEST_BOARD 31 @@ -1075,8 +1076,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD kin -#define SIGNATURE_DATE 2020.07.28 -#define SIGNATURE_HASH 2529711359 +#define SIGNATURE_DATE 2020.07.29 +#define SIGNATURE_HASH 1070357288 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1344,7 +1345,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.07.28.kin.2529711359" +#define TS_SIGNATURE "rusEFI 2020.07.29.kin.1070357288" #define TS_SINGLE_WRITE_COMMAND 'W' #define tunerStudioSerialSpeed_offset 728 #define twoWireBatchIgnition_offset 1476 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 6f3d882cea..642ba149a0 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 Tue Jul 28 13:12:08 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 29 18:54:42 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3533,4 +3533,4 @@ struct persistent_config_s { typedef struct persistent_config_s persistent_config_s; // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jul 28 13:12:08 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 29 18:54:42 UTC 2020 diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index 454ba06590..27761e5e5e 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 Tue Jul 28 13:12:08 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 29 18:54:42 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer FSIO_SETTING_FANONTEMPERATURE = 1000, diff --git a/firmware/controllers/generated/fsio_getters.def b/firmware/controllers/generated/fsio_getters.def index 06a179ea14..83ce71a40c 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 Tue Jul 28 13:12:08 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 29 18:54:42 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_FANONTEMPERATURE: diff --git a/firmware/controllers/generated/fsio_names.def b/firmware/controllers/generated/fsio_names.def index bc2202ffd5..4541903555 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 Tue Jul 28 13:12:08 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 29 18:54:42 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer static LENameOrdinalPair lefanOnTemperature(FSIO_SETTING_FANONTEMPERATURE, "cfg_fanOnTemperature"); diff --git a/firmware/controllers/generated/fsio_strings.def b/firmware/controllers/generated/fsio_strings.def index 92a23ce5f5..efdfc39ba1 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 Tue Jul 28 13:12:08 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 29 18:54:42 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_FANONTEMPERATURE: diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index acd035bf2c..872065896d 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -332,7 +332,8 @@ #define ET_FRANKENSO_MIATA_NA6_VAF 57 #define ET_FRANKENSO_MIATA_NB2 47 #define ET_MRE_DEFAULTS 60 -#define ET_MRE_MIATA_NA6 12 +#define ET_MRE_MIATA_NA6_MAP 66 +#define ET_MRE_MIATA_NA6_VAF 12 #define ET_MRE_MIATA_NB2_MAF 15 #define ET_MRE_MIATA_NB2_MAP 11 #define ET_MRE_NEW_TEST_BOARD 31 @@ -1075,8 +1076,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD all -#define SIGNATURE_DATE 2020.07.28 -#define SIGNATURE_HASH 1542883429 +#define SIGNATURE_DATE 2020.07.29 +#define SIGNATURE_HASH 4075980722 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1344,7 +1345,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.07.28.all.1542883429" +#define TS_SIGNATURE "rusEFI 2020.07.29.all.4075980722" #define TS_SINGLE_WRITE_COMMAND 'W' #define tunerStudioSerialSpeed_offset 728 #define twoWireBatchIgnition_offset 1476 diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index 6e6409065d..5c2c14bd54 100644 --- a/firmware/controllers/generated/signature_all.h +++ b/firmware/controllers/generated/signature_all.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD all #define SIGNATURE_DATE 2020.07.29 -#define SIGNATURE_HASH 714281655 -#define TS_SIGNATURE "rusEFI 2020.07.29.all.714281655" +#define SIGNATURE_HASH 4075980722 +#define TS_SIGNATURE "rusEFI 2020.07.29.all.4075980722" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 4889cc3557..d33ba57475 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD frankenso_na6 #define SIGNATURE_DATE 2020.07.29 -#define SIGNATURE_HASH 4094983764 -#define TS_SIGNATURE "rusEFI 2020.07.29.frankenso_na6.4094983764" +#define SIGNATURE_HASH 745925457 +#define TS_SIGNATURE "rusEFI 2020.07.29.frankenso_na6.745925457" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index fed2e2ae1b..d4d2dc6720 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD kin #define SIGNATURE_DATE 2020.07.29 -#define SIGNATURE_HASH 3886927405 -#define TS_SIGNATURE "rusEFI 2020.07.29.kin.3886927405" +#define SIGNATURE_HASH 1070357288 +#define TS_SIGNATURE "rusEFI 2020.07.29.kin.1070357288" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index cd82ac0d1e..0ea3ff058e 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD mre_f4 #define SIGNATURE_DATE 2020.07.29 -#define SIGNATURE_HASH 1668138041 -#define TS_SIGNATURE "rusEFI 2020.07.29.mre_f4.1668138041" +#define SIGNATURE_HASH 3138146620 +#define TS_SIGNATURE "rusEFI 2020.07.29.mre_f4.3138146620" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 998ca0b5bf..d91739d4f1 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD mre_f7 #define SIGNATURE_DATE 2020.07.29 -#define SIGNATURE_HASH 1668138041 -#define TS_SIGNATURE "rusEFI 2020.07.29.mre_f7.1668138041" +#define SIGNATURE_HASH 3138146620 +#define TS_SIGNATURE "rusEFI 2020.07.29.mre_f7.3138146620" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 1fef61fc69..514df50dae 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD prometheus_405 #define SIGNATURE_DATE 2020.07.29 -#define SIGNATURE_HASH 3750742579 -#define TS_SIGNATURE "rusEFI 2020.07.29.prometheus_405.3750742579" +#define SIGNATURE_HASH 133062454 +#define TS_SIGNATURE "rusEFI 2020.07.29.prometheus_405.133062454" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 12b3ee96d0..c12cb578df 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD prometheus_469 #define SIGNATURE_DATE 2020.07.29 -#define SIGNATURE_HASH 3750742579 -#define TS_SIGNATURE "rusEFI 2020.07.29.prometheus_469.3750742579" +#define SIGNATURE_HASH 133062454 +#define TS_SIGNATURE "rusEFI 2020.07.29.prometheus_469.133062454" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index f417bdb94c..43a2c6b41b 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD proteus_f4 #define SIGNATURE_DATE 2020.07.29 -#define SIGNATURE_HASH 2801951608 -#define TS_SIGNATURE "rusEFI 2020.07.29.proteus_f4.2801951608" +#define SIGNATURE_HASH 2137257597 +#define TS_SIGNATURE "rusEFI 2020.07.29.proteus_f4.2137257597" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 73ddee635c..f4f12d4eb5 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD proteus_f7 #define SIGNATURE_DATE 2020.07.29 -#define SIGNATURE_HASH 2801951608 -#define TS_SIGNATURE "rusEFI 2020.07.29.proteus_f7.2801951608" +#define SIGNATURE_HASH 2137257597 +#define TS_SIGNATURE "rusEFI 2020.07.29.proteus_f7.2137257597" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index e95bdc7c37..f44d9e0fc9 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 e8469658a3..99e28450ba 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.29.all.714281655" + signature = "rusEFI 2020.07.29.all.4075980722" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.29.all.714281655" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.29.all.4075980722" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -76,7 +76,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 29 09:38:09 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 29 18:54:42 UTC 2020 pageSize = 20000 page = 1 @@ -2775,7 +2775,10 @@ cmd_dfu = "w\x00\xba\x00\x00" cmd_set_engine_type_microRusEFI_Miata_NB2_MAP = "w\x00\x30\x00\x0b" ; MRE_MIATA_NA6 12 -cmd_set_engine_type_microRusEFI_Miata_NA6 = "w\x00\x30\x00\x0c" +cmd_set_engine_type_microRusEFI_Miata_NA6_VAF = "w\x00\x30\x00\x0c" + +cmd_set_engine_type_microRusEFI_Miata_NA6_MAP = "w\x00\x30\x00\x42" + ; MRE_MIATA_NB2_MAF = 15 cmd_set_engine_type_microRusEFI_Miata_NB2_MAF = "w\x00\x30\x00\x0f" @@ -4238,6 +4241,8 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" commandButton = "Frankenso Miata NA6 Stage 1", cmd_set_engine_type_Frankenso_Miata_NA6_MAP commandButton = "Frankenso Miata NB2 MAP", cmd_set_engine_type_Frankenso_Miata_NB2 + commandButton = "microRusEFI Miata NA6 VAF", cmd_set_engine_type_microRusEFI_Miata_NA6_VAF + commandButton = "microRusEFI Miata NA6 MAP", cmd_set_engine_type_microRusEFI_Miata_NA6_MAP commandButton = "microRusEfi Miata NB2 MAP", cmd_set_engine_type_microRusEFI_Miata_NB2_MAP commandButton = "microRusEFI Miata NB2 MAF", cmd_set_engine_type_microRusEFI_Miata_NB2_MAF commandButton = "microRusEFI Defaults", cmd_set_engine_type_microRusEFI_Defaults diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 85887fef99..82c08f5816 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.29.frankenso_na6.4094983764" + signature = "rusEFI 2020.07.29.frankenso_na6.745925457" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.29.frankenso_na6.4094983764" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.29.frankenso_na6.745925457" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -76,7 +76,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 29 09:38:14 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 29 18:54:46 UTC 2020 pageSize = 20000 page = 1 @@ -2775,7 +2775,10 @@ cmd_dfu = "w\x00\xba\x00\x00" cmd_set_engine_type_microRusEFI_Miata_NB2_MAP = "w\x00\x30\x00\x0b" ; MRE_MIATA_NA6 12 -cmd_set_engine_type_microRusEFI_Miata_NA6 = "w\x00\x30\x00\x0c" +cmd_set_engine_type_microRusEFI_Miata_NA6_VAF = "w\x00\x30\x00\x0c" + +cmd_set_engine_type_microRusEFI_Miata_NA6_MAP = "w\x00\x30\x00\x42" + ; MRE_MIATA_NB2_MAF = 15 cmd_set_engine_type_microRusEFI_Miata_NB2_MAF = "w\x00\x30\x00\x0f" @@ -4238,6 +4241,8 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" commandButton = "Frankenso Miata NA6 Stage 1", cmd_set_engine_type_Frankenso_Miata_NA6_MAP commandButton = "Frankenso Miata NB2 MAP", cmd_set_engine_type_Frankenso_Miata_NB2 + commandButton = "microRusEFI Miata NA6 VAF", cmd_set_engine_type_microRusEFI_Miata_NA6_VAF + commandButton = "microRusEFI Miata NA6 MAP", cmd_set_engine_type_microRusEFI_Miata_NA6_MAP commandButton = "microRusEfi Miata NB2 MAP", cmd_set_engine_type_microRusEFI_Miata_NB2_MAP commandButton = "microRusEFI Miata NB2 MAF", cmd_set_engine_type_microRusEFI_Miata_NB2_MAF commandButton = "microRusEFI Defaults", cmd_set_engine_type_microRusEFI_Defaults diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index aa24ab87dd..aebda42d85 100644 --- a/firmware/tunerstudio/generated/rusefi_kinetis.ini +++ b/firmware/tunerstudio/generated/rusefi_kinetis.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.29.kin.3886927405" + signature = "rusEFI 2020.07.29.kin.1070357288" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.29.kin.3886927405" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.29.kin.1070357288" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -76,7 +76,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 29 09:38:20 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Jul 29 18:54:53 UTC 2020 pageSize = 20000 page = 1 @@ -2775,7 +2775,10 @@ cmd_dfu = "w\x00\xba\x00\x00" cmd_set_engine_type_microRusEFI_Miata_NB2_MAP = "w\x00\x30\x00\x0b" ; MRE_MIATA_NA6 12 -cmd_set_engine_type_microRusEFI_Miata_NA6 = "w\x00\x30\x00\x0c" +cmd_set_engine_type_microRusEFI_Miata_NA6_VAF = "w\x00\x30\x00\x0c" + +cmd_set_engine_type_microRusEFI_Miata_NA6_MAP = "w\x00\x30\x00\x42" + ; MRE_MIATA_NB2_MAF = 15 cmd_set_engine_type_microRusEFI_Miata_NB2_MAF = "w\x00\x30\x00\x0f" @@ -4239,6 +4242,8 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" commandButton = "Frankenso Miata NA6 Stage 1", cmd_set_engine_type_Frankenso_Miata_NA6_MAP commandButton = "Frankenso Miata NB2 MAP", cmd_set_engine_type_Frankenso_Miata_NB2 + commandButton = "microRusEFI Miata NA6 VAF", cmd_set_engine_type_microRusEFI_Miata_NA6_VAF + commandButton = "microRusEFI Miata NA6 MAP", cmd_set_engine_type_microRusEFI_Miata_NA6_MAP commandButton = "microRusEfi Miata NB2 MAP", cmd_set_engine_type_microRusEFI_Miata_NB2_MAP commandButton = "microRusEFI Miata NB2 MAF", cmd_set_engine_type_microRusEFI_Miata_NB2_MAF commandButton = "microRusEFI Defaults", cmd_set_engine_type_microRusEFI_Defaults diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 8ae905b86a..7728125074 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.29.mre_f4.1668138041" + signature = "rusEFI 2020.07.29.mre_f4.3138146620" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.29.mre_f4.1668138041" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.29.mre_f4.3138146620" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -76,7 +76,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 29 09:38:12 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 29 18:54:45 UTC 2020 pageSize = 20000 page = 1 @@ -2770,7 +2770,10 @@ cmd_dfu = "w\x00\xba\x00\x00" cmd_set_engine_type_microRusEFI_Miata_NB2_MAP = "w\x00\x30\x00\x0b" ; MRE_MIATA_NA6 12 -cmd_set_engine_type_microRusEFI_Miata_NA6 = "w\x00\x30\x00\x0c" +cmd_set_engine_type_microRusEFI_Miata_NA6_VAF = "w\x00\x30\x00\x0c" + +cmd_set_engine_type_microRusEFI_Miata_NA6_MAP = "w\x00\x30\x00\x42" + ; MRE_MIATA_NB2_MAF = 15 cmd_set_engine_type_microRusEFI_Miata_NB2_MAF = "w\x00\x30\x00\x0f" @@ -4212,6 +4215,8 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "!These buttons send a command to rusEfi controller to apply preset values" field = "!Once you send the command, please reconnect to rusEfi controller in order to read fresh values" + commandButton = "microRusEFI Miata NA6 VAF", cmd_set_engine_type_microRusEFI_Miata_NA6_VAF + commandButton = "microRusEFI Miata NA6 MAP", cmd_set_engine_type_microRusEFI_Miata_NA6_MAP commandButton = "microRusEfi Miata NB2 MAP", cmd_set_engine_type_microRusEFI_Miata_NB2_MAP commandButton = "microRusEFI Miata NB2 MAF", cmd_set_engine_type_microRusEFI_Miata_NB2_MAF commandButton = "microRusEFI Defaults", cmd_set_engine_type_microRusEFI_Defaults diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 0da767f33e..bb9ff6fc45 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.29.mre_f7.1668138041" + signature = "rusEFI 2020.07.29.mre_f7.3138146620" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.29.mre_f7.1668138041" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.29.mre_f7.3138146620" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -76,7 +76,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 29 09:38:11 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 29 18:54:44 UTC 2020 pageSize = 20000 page = 1 @@ -2770,7 +2770,10 @@ cmd_dfu = "w\x00\xba\x00\x00" cmd_set_engine_type_microRusEFI_Miata_NB2_MAP = "w\x00\x30\x00\x0b" ; MRE_MIATA_NA6 12 -cmd_set_engine_type_microRusEFI_Miata_NA6 = "w\x00\x30\x00\x0c" +cmd_set_engine_type_microRusEFI_Miata_NA6_VAF = "w\x00\x30\x00\x0c" + +cmd_set_engine_type_microRusEFI_Miata_NA6_MAP = "w\x00\x30\x00\x42" + ; MRE_MIATA_NB2_MAF = 15 cmd_set_engine_type_microRusEFI_Miata_NB2_MAF = "w\x00\x30\x00\x0f" @@ -4212,6 +4215,8 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "!These buttons send a command to rusEfi controller to apply preset values" field = "!Once you send the command, please reconnect to rusEfi controller in order to read fresh values" + commandButton = "microRusEFI Miata NA6 VAF", cmd_set_engine_type_microRusEFI_Miata_NA6_VAF + commandButton = "microRusEFI Miata NA6 MAP", cmd_set_engine_type_microRusEFI_Miata_NA6_MAP commandButton = "microRusEfi Miata NB2 MAP", cmd_set_engine_type_microRusEFI_Miata_NB2_MAP commandButton = "microRusEFI Miata NB2 MAF", cmd_set_engine_type_microRusEFI_Miata_NB2_MAF commandButton = "microRusEFI Defaults", cmd_set_engine_type_microRusEFI_Defaults diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index c1a3db50da..92e4e228cd 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.29.prometheus_405.3750742579" + signature = "rusEFI 2020.07.29.prometheus_405.133062454" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.29.prometheus_405.3750742579" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.29.prometheus_405.133062454" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -76,7 +76,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 29 09:38:16 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 29 18:54:49 UTC 2020 pageSize = 20000 page = 1 @@ -2771,7 +2771,10 @@ cmd_dfu = "w\x00\xba\x00\x00" cmd_set_engine_type_microRusEFI_Miata_NB2_MAP = "w\x00\x30\x00\x0b" ; MRE_MIATA_NA6 12 -cmd_set_engine_type_microRusEFI_Miata_NA6 = "w\x00\x30\x00\x0c" +cmd_set_engine_type_microRusEFI_Miata_NA6_VAF = "w\x00\x30\x00\x0c" + +cmd_set_engine_type_microRusEFI_Miata_NA6_MAP = "w\x00\x30\x00\x42" + ; MRE_MIATA_NB2_MAF = 15 cmd_set_engine_type_microRusEFI_Miata_NB2_MAF = "w\x00\x30\x00\x0f" @@ -4234,6 +4237,8 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" commandButton = "Frankenso Miata NA6 Stage 1", cmd_set_engine_type_Frankenso_Miata_NA6_MAP commandButton = "Frankenso Miata NB2 MAP", cmd_set_engine_type_Frankenso_Miata_NB2 + commandButton = "microRusEFI Miata NA6 VAF", cmd_set_engine_type_microRusEFI_Miata_NA6_VAF + commandButton = "microRusEFI Miata NA6 MAP", cmd_set_engine_type_microRusEFI_Miata_NA6_MAP commandButton = "microRusEfi Miata NB2 MAP", cmd_set_engine_type_microRusEFI_Miata_NB2_MAP commandButton = "microRusEFI Miata NB2 MAF", cmd_set_engine_type_microRusEFI_Miata_NB2_MAF commandButton = "microRusEFI Defaults", cmd_set_engine_type_microRusEFI_Defaults diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 71386b0ba4..5d5500d18b 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.29.prometheus_469.3750742579" + signature = "rusEFI 2020.07.29.prometheus_469.133062454" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.29.prometheus_469.3750742579" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.29.prometheus_469.133062454" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -76,7 +76,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 29 09:38:15 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 29 18:54:48 UTC 2020 pageSize = 20000 page = 1 @@ -2771,7 +2771,10 @@ cmd_dfu = "w\x00\xba\x00\x00" cmd_set_engine_type_microRusEFI_Miata_NB2_MAP = "w\x00\x30\x00\x0b" ; MRE_MIATA_NA6 12 -cmd_set_engine_type_microRusEFI_Miata_NA6 = "w\x00\x30\x00\x0c" +cmd_set_engine_type_microRusEFI_Miata_NA6_VAF = "w\x00\x30\x00\x0c" + +cmd_set_engine_type_microRusEFI_Miata_NA6_MAP = "w\x00\x30\x00\x42" + ; MRE_MIATA_NB2_MAF = 15 cmd_set_engine_type_microRusEFI_Miata_NB2_MAF = "w\x00\x30\x00\x0f" @@ -4234,6 +4237,8 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" commandButton = "Frankenso Miata NA6 Stage 1", cmd_set_engine_type_Frankenso_Miata_NA6_MAP commandButton = "Frankenso Miata NB2 MAP", cmd_set_engine_type_Frankenso_Miata_NB2 + commandButton = "microRusEFI Miata NA6 VAF", cmd_set_engine_type_microRusEFI_Miata_NA6_VAF + commandButton = "microRusEFI Miata NA6 MAP", cmd_set_engine_type_microRusEFI_Miata_NA6_MAP commandButton = "microRusEfi Miata NB2 MAP", cmd_set_engine_type_microRusEFI_Miata_NB2_MAP commandButton = "microRusEFI Miata NB2 MAF", cmd_set_engine_type_microRusEFI_Miata_NB2_MAF commandButton = "microRusEFI Defaults", cmd_set_engine_type_microRusEFI_Defaults diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 3b17785489..b7e7b21e03 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.29.proteus_f4.2801951608" + signature = "rusEFI 2020.07.29.proteus_f4.2137257597" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.29.proteus_f4.2801951608" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.29.proteus_f4.2137257597" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -76,7 +76,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 29 09:38:19 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 29 18:54:52 UTC 2020 pageSize = 20000 page = 1 @@ -2766,7 +2766,10 @@ cmd_dfu = "w\x00\xba\x00\x00" cmd_set_engine_type_microRusEFI_Miata_NB2_MAP = "w\x00\x30\x00\x0b" ; MRE_MIATA_NA6 12 -cmd_set_engine_type_microRusEFI_Miata_NA6 = "w\x00\x30\x00\x0c" +cmd_set_engine_type_microRusEFI_Miata_NA6_VAF = "w\x00\x30\x00\x0c" + +cmd_set_engine_type_microRusEFI_Miata_NA6_MAP = "w\x00\x30\x00\x42" + ; MRE_MIATA_NB2_MAF = 15 cmd_set_engine_type_microRusEFI_Miata_NB2_MAF = "w\x00\x30\x00\x0f" @@ -4205,6 +4208,8 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" commandButton = "Frankenso Miata NA6 Stage 1", cmd_set_engine_type_Frankenso_Miata_NA6_MAP commandButton = "Frankenso Miata NB2 MAP", cmd_set_engine_type_Frankenso_Miata_NB2 + commandButton = "microRusEFI Miata NA6 VAF", cmd_set_engine_type_microRusEFI_Miata_NA6_VAF + commandButton = "microRusEFI Miata NA6 MAP", cmd_set_engine_type_microRusEFI_Miata_NA6_MAP commandButton = "microRusEfi Miata NB2 MAP", cmd_set_engine_type_microRusEFI_Miata_NB2_MAP commandButton = "microRusEFI Miata NB2 MAF", cmd_set_engine_type_microRusEFI_Miata_NB2_MAF commandButton = "microRusEFI Defaults", cmd_set_engine_type_microRusEFI_Defaults diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 524aa0cabf..4a3d583580 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.29.proteus_f7.2801951608" + signature = "rusEFI 2020.07.29.proteus_f7.2137257597" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.29.proteus_f7.2801951608" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.29.proteus_f7.2137257597" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -76,7 +76,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 29 09:38:18 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 29 18:54:50 UTC 2020 pageSize = 20000 page = 1 @@ -2766,7 +2766,10 @@ cmd_dfu = "w\x00\xba\x00\x00" cmd_set_engine_type_microRusEFI_Miata_NB2_MAP = "w\x00\x30\x00\x0b" ; MRE_MIATA_NA6 12 -cmd_set_engine_type_microRusEFI_Miata_NA6 = "w\x00\x30\x00\x0c" +cmd_set_engine_type_microRusEFI_Miata_NA6_VAF = "w\x00\x30\x00\x0c" + +cmd_set_engine_type_microRusEFI_Miata_NA6_MAP = "w\x00\x30\x00\x42" + ; MRE_MIATA_NB2_MAF = 15 cmd_set_engine_type_microRusEFI_Miata_NB2_MAF = "w\x00\x30\x00\x0f" @@ -4205,6 +4208,8 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" commandButton = "Frankenso Miata NA6 Stage 1", cmd_set_engine_type_Frankenso_Miata_NA6_MAP commandButton = "Frankenso Miata NB2 MAP", cmd_set_engine_type_Frankenso_Miata_NB2 + commandButton = "microRusEFI Miata NA6 VAF", cmd_set_engine_type_microRusEFI_Miata_NA6_VAF + commandButton = "microRusEFI Miata NA6 MAP", cmd_set_engine_type_microRusEFI_Miata_NA6_MAP commandButton = "microRusEfi Miata NB2 MAP", cmd_set_engine_type_microRusEFI_Miata_NB2_MAP commandButton = "microRusEFI Miata NB2 MAF", cmd_set_engine_type_microRusEFI_Miata_NB2_MAF commandButton = "microRusEFI Defaults", cmd_set_engine_type_microRusEFI_Defaults 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 5296ac51f7..d4c63b1be5 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 Tue Jul 28 13:12:08 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 29 18:54:42 UTC 2020 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -327,7 +327,8 @@ public class Fields { public static final int ET_FRANKENSO_MIATA_NA6_VAF = 57; public static final int ET_FRANKENSO_MIATA_NB2 = 47; public static final int ET_MRE_DEFAULTS = 60; - public static final int ET_MRE_MIATA_NA6 = 12; + public static final int ET_MRE_MIATA_NA6_MAP = 66; + public static final int ET_MRE_MIATA_NA6_VAF = 12; public static final int ET_MRE_MIATA_NB2_MAF = 15; public static final int ET_MRE_MIATA_NB2_MAP = 11; public static final int ET_MRE_NEW_TEST_BOARD = 31; @@ -1057,7 +1058,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 = 1542883429; public static final int silentTriggerError_offset = 1464; public static final int slowAdcAlpha_offset = 2088; public static final int sparkDwellRpmBins_offset = 332; @@ -1304,7 +1304,7 @@ public class Fields { public static final int TS_RESPONSE_COMMAND_OK = 7; public static final int TS_RESPONSE_OK = 0; public static final char TS_SET_LOGGER_SWITCH = 'l'; - public static final String TS_SIGNATURE = "rusEFI 2020.07.28.all.1542883429"; + public static final String TS_SIGNATURE = "rusEFI 2020.07.29.all.4075980722"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final int tunerStudioSerialSpeed_offset = 728; public static final int twoWireBatchIgnition_offset = 1476; diff --git a/java_console/rusefi.xml b/java_console/rusefi.xml index 791997042b..ac909f0bf9 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -1,6 +1,6 @@ - +