diff --git a/firmware/config/boards/hellen/cypress/config/controllers/algo/auto_generated_enums.cpp b/firmware/config/boards/hellen/cypress/config/controllers/algo/auto_generated_enums.cpp index 399be43326..a86311111d 100644 --- a/firmware/config/boards/hellen/cypress/config/controllers/algo/auto_generated_enums.cpp +++ b/firmware/config/boards/hellen/cypress/config/controllers/algo/auto_generated_enums.cpp @@ -1,7 +1,7 @@ #include "global.h" #include "rusefi_enums.h" #include "rusefi_hw_enums.h" -// was generated automatically by rusEfi tool from rusefi_hw_enums.h // was generated automatically by rusEfi tool from rusefi_enums.h // by enum2string.jar tool on Mon Mar 22 11:53:46 UTC 2021 +// was generated automatically by rusEfi tool from rusefi_hw_enums.h // was generated automatically by rusEfi tool from rusefi_enums.h // by enum2string.jar tool on Mon Mar 29 13:05:34 UTC 2021 // see also gen_config_and_enums.bat @@ -1028,6 +1028,10 @@ case REVERSE: } const char *getGppwm_channel_e(gppwm_channel_e value){ switch(value) { +case GPPWM_AuxTemp1: + return "GPPWM_AuxTemp1"; +case GPPWM_AuxTemp2: + return "GPPWM_AuxTemp2"; case GPPWM_Clt: return "GPPWM_Clt"; case GPPWM_FuelLoad: 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 b7441ac001..d7777d8f5b 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 Sun Mar 28 12:41:00 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Mar 29 13:06:07 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3866,4 +3866,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 hellen_cypress_gen_config.bat integration/rusefi_config.txt Sun Mar 28 12:41:00 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Mar 29 13:06:07 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 b200e27e70..9bc5141f7d 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 @@ -776,8 +776,8 @@ #define gppwm4_pwmFrequency_offset 4410 #define gppwm4_rpmBins_offset 4424 #define gppwm4_table_offset 4432 -#define gppwm_channel_e_auto_enum "GPPWM_Tps", "GPPWM_Map", "GPPWM_Clt", "GPPWM_Iat", "GPPWM_FuelLoad", "GPPWM_IgnLoad" -#define gppwm_channel_e_enum "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "INVALID", "INVALID" +#define gppwm_channel_e_auto_enum "GPPWM_Tps", "GPPWM_Map", "GPPWM_Clt", "GPPWM_Iat", "GPPWM_FuelLoad", "GPPWM_IgnLoad", "GPPWM_AuxTemp1", "GPPWM_AuxTemp2" +#define gppwm_channel_e_enum "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2" #define gppwm_channel_size 88 #define GPPWM_CHANNELS 4 #define GPPWM_LOAD_COUNT 8 @@ -1244,8 +1244,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD hellen_cypress -#define SIGNATURE_DATE 2021.03.28 -#define SIGNATURE_HASH 2929238159 +#define SIGNATURE_DATE 2021.03.29 +#define SIGNATURE_HASH 2709231296 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1580,7 +1580,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.03.28.hellen_cypress.2929238159" +#define TS_SIGNATURE "rusEFI 2021.03.29.hellen_cypress.2709231296" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 diff --git a/firmware/config/boards/kinetis/config/controllers/algo/auto_generated_enums.cpp b/firmware/config/boards/kinetis/config/controllers/algo/auto_generated_enums.cpp index 1e4bd13ee1..789ebb2a2d 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/auto_generated_enums.cpp +++ b/firmware/config/boards/kinetis/config/controllers/algo/auto_generated_enums.cpp @@ -1,7 +1,7 @@ #include "global.h" #include "rusefi_enums.h" #include "rusefi_hw_enums.h" -// was generated automatically by rusEfi tool from rusefi_hw_enums.h // was generated automatically by rusEfi tool from rusefi_enums.h // by enum2string.jar tool on Mon Mar 22 11:53:45 UTC 2021 +// was generated automatically by rusEfi tool from rusefi_hw_enums.h // was generated automatically by rusEfi tool from rusefi_enums.h // by enum2string.jar tool on Mon Mar 29 13:05:33 UTC 2021 // see also gen_config_and_enums.bat @@ -824,6 +824,10 @@ case REVERSE: } const char *getGppwm_channel_e(gppwm_channel_e value){ switch(value) { +case GPPWM_AuxTemp1: + return "GPPWM_AuxTemp1"; +case GPPWM_AuxTemp2: + return "GPPWM_AuxTemp2"; case GPPWM_Clt: return "GPPWM_Clt"; case GPPWM_FuelLoad: 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 22dd8099d9..6f3801b270 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 Sun Mar 28 12:40:58 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Mar 29 13:06:05 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3861,4 +3861,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 Sun Mar 28 12:40:58 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Mar 29 13:06:05 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 ef174b82ba..1b3b71d96f 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -760,8 +760,8 @@ #define gppwm4_pwmFrequency_offset 4382 #define gppwm4_rpmBins_offset 4396 #define gppwm4_table_offset 4404 -#define gppwm_channel_e_auto_enum "GPPWM_Tps", "GPPWM_Map", "GPPWM_Clt", "GPPWM_Iat", "GPPWM_FuelLoad", "GPPWM_IgnLoad" -#define gppwm_channel_e_enum "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "INVALID", "INVALID" +#define gppwm_channel_e_auto_enum "GPPWM_Tps", "GPPWM_Map", "GPPWM_Clt", "GPPWM_Iat", "GPPWM_FuelLoad", "GPPWM_IgnLoad", "GPPWM_AuxTemp1", "GPPWM_AuxTemp2" +#define gppwm_channel_e_enum "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2" #define gppwm_channel_size 88 #define GPPWM_CHANNELS 4 #define GPPWM_LOAD_COUNT 8 @@ -1228,8 +1228,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD kin -#define SIGNATURE_DATE 2021.03.28 -#define SIGNATURE_HASH 1362979955 +#define SIGNATURE_DATE 2021.03.29 +#define SIGNATURE_HASH 1591630396 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1564,7 +1564,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.03.28.kin.1362979955" +#define TS_SIGNATURE "rusEFI 2021.03.29.kin.1591630396" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 diff --git a/firmware/config/boards/subaru_eg33/config/controllers/algo/auto_generated_enums.cpp b/firmware/config/boards/subaru_eg33/config/controllers/algo/auto_generated_enums.cpp index 44f2d1fe93..da6531c520 100644 --- a/firmware/config/boards/subaru_eg33/config/controllers/algo/auto_generated_enums.cpp +++ b/firmware/config/boards/subaru_eg33/config/controllers/algo/auto_generated_enums.cpp @@ -1,7 +1,7 @@ #include "global.h" #include "rusefi_enums.h" #include "rusefi_hw_enums.h" -// was generated automatically by rusEfi tool from rusefi_hw_enums.h // was generated automatically by rusEfi tool from rusefi_enums.h // by enum2string.jar tool on Mon Mar 22 11:53:46 UTC 2021 +// was generated automatically by rusEfi tool from rusefi_hw_enums.h // was generated automatically by rusEfi tool from rusefi_enums.h // by enum2string.jar tool on Mon Mar 29 13:05:34 UTC 2021 // see also gen_config_and_enums.bat @@ -1024,6 +1024,10 @@ case REVERSE: } const char *getGppwm_channel_e(gppwm_channel_e value){ switch(value) { +case GPPWM_AuxTemp1: + return "GPPWM_AuxTemp1"; +case GPPWM_AuxTemp2: + return "GPPWM_AuxTemp2"; case GPPWM_Clt: return "GPPWM_Clt"; case GPPWM_FuelLoad: 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 cba177369e..4eacbada2b 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 Sun Mar 28 12:41:02 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 Mon Mar 29 13:06:09 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3866,4 +3866,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 config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Sun Mar 28 12:41:02 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 Mon Mar 29 13:06: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 989687e188..93efa05e74 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 @@ -776,8 +776,8 @@ #define gppwm4_pwmFrequency_offset 4410 #define gppwm4_rpmBins_offset 4424 #define gppwm4_table_offset 4432 -#define gppwm_channel_e_auto_enum "GPPWM_Tps", "GPPWM_Map", "GPPWM_Clt", "GPPWM_Iat", "GPPWM_FuelLoad", "GPPWM_IgnLoad" -#define gppwm_channel_e_enum "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "INVALID", "INVALID" +#define gppwm_channel_e_auto_enum "GPPWM_Tps", "GPPWM_Map", "GPPWM_Clt", "GPPWM_Iat", "GPPWM_FuelLoad", "GPPWM_IgnLoad", "GPPWM_AuxTemp1", "GPPWM_AuxTemp2" +#define gppwm_channel_e_enum "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2" #define gppwm_channel_size 88 #define GPPWM_CHANNELS 4 #define GPPWM_LOAD_COUNT 8 @@ -1244,8 +1244,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD subaru_eg33_f7 -#define SIGNATURE_DATE 2021.03.28 -#define SIGNATURE_HASH 775359849 +#define SIGNATURE_DATE 2021.03.29 +#define SIGNATURE_HASH 567556902 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1580,7 +1580,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port false -#define TS_SIGNATURE "rusEFI 2021.03.28.subaru_eg33_f7.775359849" +#define TS_SIGNATURE "rusEFI 2021.03.29.subaru_eg33_f7.567556902" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 diff --git a/firmware/controllers/algo/auto_generated_enums.cpp b/firmware/controllers/algo/auto_generated_enums.cpp index 0741ab14cc..b9ed162441 100644 --- a/firmware/controllers/algo/auto_generated_enums.cpp +++ b/firmware/controllers/algo/auto_generated_enums.cpp @@ -1,7 +1,7 @@ #include "global.h" #include "rusefi_enums.h" #include "rusefi_hw_enums.h" -// was generated automatically by rusEfi tool from rusefi_hw_enums.h // was generated automatically by rusEfi tool from rusefi_enums.h // by enum2string.jar tool on Mon Mar 22 11:53:45 UTC 2021 +// was generated automatically by rusEfi tool from rusefi_hw_enums.h // was generated automatically by rusEfi tool from rusefi_enums.h // by enum2string.jar tool on Mon Mar 29 13:05:33 UTC 2021 // see also gen_config_and_enums.bat @@ -1000,6 +1000,10 @@ case REVERSE: } const char *getGppwm_channel_e(gppwm_channel_e value){ switch(value) { +case GPPWM_AuxTemp1: + return "GPPWM_AuxTemp1"; +case GPPWM_AuxTemp2: + return "GPPWM_AuxTemp2"; case GPPWM_Clt: return "GPPWM_Clt"; case GPPWM_FuelLoad: diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index c09eee1b61..c16e599c67 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 Sun Mar 28 12:40:35 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Mar 29 13:05:35 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3866,4 +3866,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 Sun Mar 28 12:40:35 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Mar 29 13:05:35 UTC 2021 diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index c3b6195080..2d2faf4af4 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 Sun Mar 28 12:40:35 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Mar 29 13:05:35 UTC 2021 // 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 99f654b477..adcbe9542d 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 Sun Mar 28 12:40:35 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Mar 29 13:05:35 UTC 2021 // 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 eb27599d7d..34fb4b3567 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 Sun Mar 28 12:40:35 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Mar 29 13:05:35 UTC 2021 // 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 139558e4d6..455a58ab9e 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 Sun Mar 28 12:40:35 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Mar 29 13:05:35 UTC 2021 // 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 f7f2d1c056..6e4baa80b6 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -774,8 +774,8 @@ #define gppwm4_pwmFrequency_offset 4410 #define gppwm4_rpmBins_offset 4424 #define gppwm4_table_offset 4432 -#define gppwm_channel_e_auto_enum "GPPWM_Tps", "GPPWM_Map", "GPPWM_Clt", "GPPWM_Iat", "GPPWM_FuelLoad", "GPPWM_IgnLoad" -#define gppwm_channel_e_enum "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "INVALID", "INVALID" +#define gppwm_channel_e_auto_enum "GPPWM_Tps", "GPPWM_Map", "GPPWM_Clt", "GPPWM_Iat", "GPPWM_FuelLoad", "GPPWM_IgnLoad", "GPPWM_AuxTemp1", "GPPWM_AuxTemp2" +#define gppwm_channel_e_enum "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2" #define gppwm_channel_size 88 #define GPPWM_CHANNELS 4 #define GPPWM_LOAD_COUNT 8 @@ -1241,8 +1241,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD all -#define SIGNATURE_DATE 2021.03.28 -#define SIGNATURE_HASH 3974396767 +#define SIGNATURE_DATE 2021.03.29 +#define SIGNATURE_HASH 3808906512 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1577,7 +1577,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.03.28.all.3974396767" +#define TS_SIGNATURE "rusEFI 2021.03.29.all.3808906512" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index 2b5fdac686..af2f5ce937 100644 --- a/firmware/controllers/generated/signature_all.h +++ b/firmware/controllers/generated/signature_all.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD all -#define SIGNATURE_DATE 2021.03.28 -#define SIGNATURE_HASH 3974396767 -#define TS_SIGNATURE "rusEFI 2021.03.28.all.3974396767" +#define SIGNATURE_DATE 2021.03.29 +#define SIGNATURE_HASH 3808906512 +#define TS_SIGNATURE "rusEFI 2021.03.29.all.3808906512" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 0a4a9056b9..796a88fa8c 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD frankenso_na6 -#define SIGNATURE_DATE 2021.03.28 -#define SIGNATURE_HASH 1755207372 -#define TS_SIGNATURE "rusEFI 2021.03.28.frankenso_na6.1755207372" +#define SIGNATURE_DATE 2021.03.29 +#define SIGNATURE_HASH 1736269955 +#define TS_SIGNATURE "rusEFI 2021.03.29.frankenso_na6.1736269955" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index b38f6e5614..46fc5e91b4 100644 --- a/firmware/controllers/generated/signature_hellen72.h +++ b/firmware/controllers/generated/signature_hellen72.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD hellen72 -#define SIGNATURE_DATE 2021.03.28 -#define SIGNATURE_HASH 3716630561 -#define TS_SIGNATURE "rusEFI 2021.03.28.hellen72.3716630561" +#define SIGNATURE_DATE 2021.03.29 +#define SIGNATURE_HASH 3529801326 +#define TS_SIGNATURE "rusEFI 2021.03.29.hellen72.3529801326" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index 2215bb6db4..bdeb029c66 100644 --- a/firmware/controllers/generated/signature_hellen_cypress.h +++ b/firmware/controllers/generated/signature_hellen_cypress.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD hellen_cypress -#define SIGNATURE_DATE 2021.03.28 -#define SIGNATURE_HASH 2929238159 -#define TS_SIGNATURE "rusEFI 2021.03.28.hellen_cypress.2929238159" +#define SIGNATURE_DATE 2021.03.29 +#define SIGNATURE_HASH 2709231296 +#define TS_SIGNATURE "rusEFI 2021.03.29.hellen_cypress.2709231296" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 953e3555e8..aefd0acd40 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD kin -#define SIGNATURE_DATE 2021.03.28 -#define SIGNATURE_HASH 1362979955 -#define TS_SIGNATURE "rusEFI 2021.03.28.kin.1362979955" +#define SIGNATURE_DATE 2021.03.29 +#define SIGNATURE_HASH 1591630396 +#define TS_SIGNATURE "rusEFI 2021.03.29.kin.1591630396" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index c4abd75a08..acd5039e72 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD mre_f4 -#define SIGNATURE_DATE 2021.03.28 -#define SIGNATURE_HASH 2673453912 -#define TS_SIGNATURE "rusEFI 2021.03.28.mre_f4.2673453912" +#define SIGNATURE_DATE 2021.03.29 +#define SIGNATURE_HASH 2428149015 +#define TS_SIGNATURE "rusEFI 2021.03.29.mre_f4.2428149015" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index dca3341bd3..212752b95d 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD mre_f7 -#define SIGNATURE_DATE 2021.03.28 -#define SIGNATURE_HASH 2673453912 -#define TS_SIGNATURE "rusEFI 2021.03.28.mre_f7.2673453912" +#define SIGNATURE_DATE 2021.03.29 +#define SIGNATURE_HASH 2428149015 +#define TS_SIGNATURE "rusEFI 2021.03.29.mre_f7.2428149015" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 86a026cbce..d21fcd0c4b 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD prometheus_405 -#define SIGNATURE_DATE 2021.03.28 -#define SIGNATURE_HASH 4268915049 -#define TS_SIGNATURE "rusEFI 2021.03.28.prometheus_405.4268915049" +#define SIGNATURE_DATE 2021.03.29 +#define SIGNATURE_HASH 4052832038 +#define TS_SIGNATURE "rusEFI 2021.03.29.prometheus_405.4052832038" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 1837d9055e..0607ba2b69 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD prometheus_469 -#define SIGNATURE_DATE 2021.03.28 -#define SIGNATURE_HASH 4268915049 -#define TS_SIGNATURE "rusEFI 2021.03.28.prometheus_469.4268915049" +#define SIGNATURE_DATE 2021.03.29 +#define SIGNATURE_HASH 4052832038 +#define TS_SIGNATURE "rusEFI 2021.03.29.prometheus_469.4052832038" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 6a4f93c455..2956ef6a73 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD proteus_f4 -#define SIGNATURE_DATE 2021.03.28 -#define SIGNATURE_HASH 163927756 -#define TS_SIGNATURE "rusEFI 2021.03.28.proteus_f4.163927756" +#define SIGNATURE_DATE 2021.03.29 +#define SIGNATURE_HASH 103178371 +#define TS_SIGNATURE "rusEFI 2021.03.29.proteus_f4.103178371" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index d7dea413ac..4980597081 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD proteus_f7 -#define SIGNATURE_DATE 2021.03.28 -#define SIGNATURE_HASH 163927756 -#define TS_SIGNATURE "rusEFI 2021.03.28.proteus_f7.163927756" +#define SIGNATURE_DATE 2021.03.29 +#define SIGNATURE_HASH 103178371 +#define TS_SIGNATURE "rusEFI 2021.03.29.proteus_f7.103178371" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index 5677a57d40..0b308c8637 100644 --- a/firmware/controllers/generated/signature_subaru_eg33_f7.h +++ b/firmware/controllers/generated/signature_subaru_eg33_f7.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD subaru_eg33_f7 -#define SIGNATURE_DATE 2021.03.28 -#define SIGNATURE_HASH 775359849 -#define TS_SIGNATURE "rusEFI 2021.03.28.subaru_eg33_f7.775359849" +#define SIGNATURE_DATE 2021.03.29 +#define SIGNATURE_HASH 567556902 +#define TS_SIGNATURE "rusEFI 2021.03.29.subaru_eg33_f7.567556902" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index 469e17a84f..1bedf8116d 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 d5c4277392..4446525e87 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.03.28.all.3974396767" + signature = "rusEFI 2021.03.29.all.3808906512" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.03.28.all.3974396767" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.03.29.all.3808906512" ; 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 Sun Mar 28 12:40:35 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Mar 29 13:05:35 UTC 2021 pageSize = 20000 page = 1 @@ -1128,7 +1128,7 @@ gppwm1_dutyIfError = scalar, U08, 4145, "%", 1.0, 0, 0, 100, 0 gppwm1_pwmFrequency = scalar, U16, 4146, "hz", 1.0, 0, 0, 500, 0 gppwm1_onAboveDuty = scalar, U08, 4148, "%", 1.0, 0, 0, 100, 0 gppwm1_offBelowDuty = scalar, U08, 4149, "%", 1.0, 0, 0, 100, 0 -gppwm1_loadAxis = bits, U08, 4150, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "INVALID", "INVALID" +gppwm1_loadAxis = bits, U08, 4150, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2" gppwm1_alignmentFill_map = scalar, U08, 4151, "unit", 1.0, 0, 0, 100, 0 gppwm1_loadBins = array, U08, 4152, [8], "load", 1.0, 0, 0.0, 250, 0 gppwm1_rpmBins = array, U08, 4160, [8], "RPM", 50.0, 0, 0.0, 12000.0, 0 @@ -1138,7 +1138,7 @@ gppwm2_dutyIfError = scalar, U08, 4233, "%", 1.0, 0, 0, 100, 0 gppwm2_pwmFrequency = scalar, U16, 4234, "hz", 1.0, 0, 0, 500, 0 gppwm2_onAboveDuty = scalar, U08, 4236, "%", 1.0, 0, 0, 100, 0 gppwm2_offBelowDuty = scalar, U08, 4237, "%", 1.0, 0, 0, 100, 0 -gppwm2_loadAxis = bits, U08, 4238, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "INVALID", "INVALID" +gppwm2_loadAxis = bits, U08, 4238, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2" gppwm2_alignmentFill_map = scalar, U08, 4239, "unit", 1.0, 0, 0, 100, 0 gppwm2_loadBins = array, U08, 4240, [8], "load", 1.0, 0, 0.0, 250, 0 gppwm2_rpmBins = array, U08, 4248, [8], "RPM", 50.0, 0, 0.0, 12000.0, 0 @@ -1148,7 +1148,7 @@ gppwm3_dutyIfError = scalar, U08, 4321, "%", 1.0, 0, 0, 100, 0 gppwm3_pwmFrequency = scalar, U16, 4322, "hz", 1.0, 0, 0, 500, 0 gppwm3_onAboveDuty = scalar, U08, 4324, "%", 1.0, 0, 0, 100, 0 gppwm3_offBelowDuty = scalar, U08, 4325, "%", 1.0, 0, 0, 100, 0 -gppwm3_loadAxis = bits, U08, 4326, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "INVALID", "INVALID" +gppwm3_loadAxis = bits, U08, 4326, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2" gppwm3_alignmentFill_map = scalar, U08, 4327, "unit", 1.0, 0, 0, 100, 0 gppwm3_loadBins = array, U08, 4328, [8], "load", 1.0, 0, 0.0, 250, 0 gppwm3_rpmBins = array, U08, 4336, [8], "RPM", 50.0, 0, 0.0, 12000.0, 0 @@ -1158,7 +1158,7 @@ gppwm4_dutyIfError = scalar, U08, 4409, "%", 1.0, 0, 0, 100, 0 gppwm4_pwmFrequency = scalar, U16, 4410, "hz", 1.0, 0, 0, 500, 0 gppwm4_onAboveDuty = scalar, U08, 4412, "%", 1.0, 0, 0, 100, 0 gppwm4_offBelowDuty = scalar, U08, 4413, "%", 1.0, 0, 0, 100, 0 -gppwm4_loadAxis = bits, U08, 4414, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "INVALID", "INVALID" +gppwm4_loadAxis = bits, U08, 4414, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2" gppwm4_alignmentFill_map = scalar, U08, 4415, "unit", 1.0, 0, 0, 100, 0 gppwm4_loadBins = array, U08, 4416, [8], "load", 1.0, 0, 0.0, 250, 0 gppwm4_rpmBins = array, U08, 4424, [8], "RPM", 50.0, 0, 0.0, 12000.0, 0 diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 43a82d50d8..88d1c6f196 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.03.28.frankenso_na6.1755207372" + signature = "rusEFI 2021.03.29.frankenso_na6.1736269955" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.03.28.frankenso_na6.1755207372" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.03.29.frankenso_na6.1736269955" ; 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 Sun Mar 28 12:40:45 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Mar 29 13:05:53 UTC 2021 pageSize = 20000 page = 1 @@ -1128,7 +1128,7 @@ gppwm1_dutyIfError = scalar, U08, 4145, "%", 1.0, 0, 0, 100, 0 gppwm1_pwmFrequency = scalar, U16, 4146, "hz", 1.0, 0, 0, 500, 0 gppwm1_onAboveDuty = scalar, U08, 4148, "%", 1.0, 0, 0, 100, 0 gppwm1_offBelowDuty = scalar, U08, 4149, "%", 1.0, 0, 0, 100, 0 -gppwm1_loadAxis = bits, U08, 4150, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "INVALID", "INVALID" +gppwm1_loadAxis = bits, U08, 4150, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2" gppwm1_alignmentFill_map = scalar, U08, 4151, "unit", 1.0, 0, 0, 100, 0 gppwm1_loadBins = array, U08, 4152, [8], "load", 1.0, 0, 0.0, 250, 0 gppwm1_rpmBins = array, U08, 4160, [8], "RPM", 50.0, 0, 0.0, 12000.0, 0 @@ -1138,7 +1138,7 @@ gppwm2_dutyIfError = scalar, U08, 4233, "%", 1.0, 0, 0, 100, 0 gppwm2_pwmFrequency = scalar, U16, 4234, "hz", 1.0, 0, 0, 500, 0 gppwm2_onAboveDuty = scalar, U08, 4236, "%", 1.0, 0, 0, 100, 0 gppwm2_offBelowDuty = scalar, U08, 4237, "%", 1.0, 0, 0, 100, 0 -gppwm2_loadAxis = bits, U08, 4238, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "INVALID", "INVALID" +gppwm2_loadAxis = bits, U08, 4238, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2" gppwm2_alignmentFill_map = scalar, U08, 4239, "unit", 1.0, 0, 0, 100, 0 gppwm2_loadBins = array, U08, 4240, [8], "load", 1.0, 0, 0.0, 250, 0 gppwm2_rpmBins = array, U08, 4248, [8], "RPM", 50.0, 0, 0.0, 12000.0, 0 @@ -1148,7 +1148,7 @@ gppwm3_dutyIfError = scalar, U08, 4321, "%", 1.0, 0, 0, 100, 0 gppwm3_pwmFrequency = scalar, U16, 4322, "hz", 1.0, 0, 0, 500, 0 gppwm3_onAboveDuty = scalar, U08, 4324, "%", 1.0, 0, 0, 100, 0 gppwm3_offBelowDuty = scalar, U08, 4325, "%", 1.0, 0, 0, 100, 0 -gppwm3_loadAxis = bits, U08, 4326, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "INVALID", "INVALID" +gppwm3_loadAxis = bits, U08, 4326, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2" gppwm3_alignmentFill_map = scalar, U08, 4327, "unit", 1.0, 0, 0, 100, 0 gppwm3_loadBins = array, U08, 4328, [8], "load", 1.0, 0, 0.0, 250, 0 gppwm3_rpmBins = array, U08, 4336, [8], "RPM", 50.0, 0, 0.0, 12000.0, 0 @@ -1158,7 +1158,7 @@ gppwm4_dutyIfError = scalar, U08, 4409, "%", 1.0, 0, 0, 100, 0 gppwm4_pwmFrequency = scalar, U16, 4410, "hz", 1.0, 0, 0, 500, 0 gppwm4_onAboveDuty = scalar, U08, 4412, "%", 1.0, 0, 0, 100, 0 gppwm4_offBelowDuty = scalar, U08, 4413, "%", 1.0, 0, 0, 100, 0 -gppwm4_loadAxis = bits, U08, 4414, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "INVALID", "INVALID" +gppwm4_loadAxis = bits, U08, 4414, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2" gppwm4_alignmentFill_map = scalar, U08, 4415, "unit", 1.0, 0, 0, 100, 0 gppwm4_loadBins = array, U08, 4416, [8], "load", 1.0, 0, 0.0, 250, 0 gppwm4_rpmBins = array, U08, 4424, [8], "RPM", 50.0, 0, 0.0, 12000.0, 0 diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index 145e45d3cb..b3e7224987 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.03.28.hellen72.3716630561" + signature = "rusEFI 2021.03.29.hellen72.3529801326" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.03.28.hellen72.3716630561" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.03.29.hellen72.3529801326" ; 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 Sun Mar 28 12:40:38 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Mar 29 13:05:38 UTC 2021 pageSize = 20000 page = 1 @@ -1128,7 +1128,7 @@ gppwm1_dutyIfError = scalar, U08, 4145, "%", 1.0, 0, 0, 100, 0 gppwm1_pwmFrequency = scalar, U16, 4146, "hz", 1.0, 0, 0, 500, 0 gppwm1_onAboveDuty = scalar, U08, 4148, "%", 1.0, 0, 0, 100, 0 gppwm1_offBelowDuty = scalar, U08, 4149, "%", 1.0, 0, 0, 100, 0 -gppwm1_loadAxis = bits, U08, 4150, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "INVALID", "INVALID" +gppwm1_loadAxis = bits, U08, 4150, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2" gppwm1_alignmentFill_map = scalar, U08, 4151, "unit", 1.0, 0, 0, 100, 0 gppwm1_loadBins = array, U08, 4152, [8], "load", 1.0, 0, 0.0, 250, 0 gppwm1_rpmBins = array, U08, 4160, [8], "RPM", 50.0, 0, 0.0, 12000.0, 0 @@ -1138,7 +1138,7 @@ gppwm2_dutyIfError = scalar, U08, 4233, "%", 1.0, 0, 0, 100, 0 gppwm2_pwmFrequency = scalar, U16, 4234, "hz", 1.0, 0, 0, 500, 0 gppwm2_onAboveDuty = scalar, U08, 4236, "%", 1.0, 0, 0, 100, 0 gppwm2_offBelowDuty = scalar, U08, 4237, "%", 1.0, 0, 0, 100, 0 -gppwm2_loadAxis = bits, U08, 4238, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "INVALID", "INVALID" +gppwm2_loadAxis = bits, U08, 4238, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2" gppwm2_alignmentFill_map = scalar, U08, 4239, "unit", 1.0, 0, 0, 100, 0 gppwm2_loadBins = array, U08, 4240, [8], "load", 1.0, 0, 0.0, 250, 0 gppwm2_rpmBins = array, U08, 4248, [8], "RPM", 50.0, 0, 0.0, 12000.0, 0 @@ -1148,7 +1148,7 @@ gppwm3_dutyIfError = scalar, U08, 4321, "%", 1.0, 0, 0, 100, 0 gppwm3_pwmFrequency = scalar, U16, 4322, "hz", 1.0, 0, 0, 500, 0 gppwm3_onAboveDuty = scalar, U08, 4324, "%", 1.0, 0, 0, 100, 0 gppwm3_offBelowDuty = scalar, U08, 4325, "%", 1.0, 0, 0, 100, 0 -gppwm3_loadAxis = bits, U08, 4326, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "INVALID", "INVALID" +gppwm3_loadAxis = bits, U08, 4326, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2" gppwm3_alignmentFill_map = scalar, U08, 4327, "unit", 1.0, 0, 0, 100, 0 gppwm3_loadBins = array, U08, 4328, [8], "load", 1.0, 0, 0.0, 250, 0 gppwm3_rpmBins = array, U08, 4336, [8], "RPM", 50.0, 0, 0.0, 12000.0, 0 @@ -1158,7 +1158,7 @@ gppwm4_dutyIfError = scalar, U08, 4409, "%", 1.0, 0, 0, 100, 0 gppwm4_pwmFrequency = scalar, U16, 4410, "hz", 1.0, 0, 0, 500, 0 gppwm4_onAboveDuty = scalar, U08, 4412, "%", 1.0, 0, 0, 100, 0 gppwm4_offBelowDuty = scalar, U08, 4413, "%", 1.0, 0, 0, 100, 0 -gppwm4_loadAxis = bits, U08, 4414, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "INVALID", "INVALID" +gppwm4_loadAxis = bits, U08, 4414, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2" gppwm4_alignmentFill_map = scalar, U08, 4415, "unit", 1.0, 0, 0, 100, 0 gppwm4_loadBins = array, U08, 4416, [8], "load", 1.0, 0, 0.0, 250, 0 gppwm4_rpmBins = array, U08, 4424, [8], "RPM", 50.0, 0, 0.0, 12000.0, 0 diff --git a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini index 1347159742..564cb774b3 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.03.28.hellen_cypress.2929238159" + signature = "rusEFI 2021.03.29.hellen_cypress.2709231296" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.03.28.hellen_cypress.2929238159" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.03.29.hellen_cypress.2709231296" ; 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 Sun Mar 28 12:41:00 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Mar 29 13:06:07 UTC 2021 pageSize = 20000 page = 1 @@ -1128,7 +1128,7 @@ gppwm1_dutyIfError = scalar, U08, 4145, "%", 1.0, 0, 0, 100, 0 gppwm1_pwmFrequency = scalar, U16, 4146, "hz", 1.0, 0, 0, 500, 0 gppwm1_onAboveDuty = scalar, U08, 4148, "%", 1.0, 0, 0, 100, 0 gppwm1_offBelowDuty = scalar, U08, 4149, "%", 1.0, 0, 0, 100, 0 -gppwm1_loadAxis = bits, U08, 4150, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "INVALID", "INVALID" +gppwm1_loadAxis = bits, U08, 4150, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2" gppwm1_alignmentFill_map = scalar, U08, 4151, "unit", 1.0, 0, 0, 100, 0 gppwm1_loadBins = array, U08, 4152, [8], "load", 1.0, 0, 0.0, 250, 0 gppwm1_rpmBins = array, U08, 4160, [8], "RPM", 50.0, 0, 0.0, 12000.0, 0 @@ -1138,7 +1138,7 @@ gppwm2_dutyIfError = scalar, U08, 4233, "%", 1.0, 0, 0, 100, 0 gppwm2_pwmFrequency = scalar, U16, 4234, "hz", 1.0, 0, 0, 500, 0 gppwm2_onAboveDuty = scalar, U08, 4236, "%", 1.0, 0, 0, 100, 0 gppwm2_offBelowDuty = scalar, U08, 4237, "%", 1.0, 0, 0, 100, 0 -gppwm2_loadAxis = bits, U08, 4238, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "INVALID", "INVALID" +gppwm2_loadAxis = bits, U08, 4238, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2" gppwm2_alignmentFill_map = scalar, U08, 4239, "unit", 1.0, 0, 0, 100, 0 gppwm2_loadBins = array, U08, 4240, [8], "load", 1.0, 0, 0.0, 250, 0 gppwm2_rpmBins = array, U08, 4248, [8], "RPM", 50.0, 0, 0.0, 12000.0, 0 @@ -1148,7 +1148,7 @@ gppwm3_dutyIfError = scalar, U08, 4321, "%", 1.0, 0, 0, 100, 0 gppwm3_pwmFrequency = scalar, U16, 4322, "hz", 1.0, 0, 0, 500, 0 gppwm3_onAboveDuty = scalar, U08, 4324, "%", 1.0, 0, 0, 100, 0 gppwm3_offBelowDuty = scalar, U08, 4325, "%", 1.0, 0, 0, 100, 0 -gppwm3_loadAxis = bits, U08, 4326, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "INVALID", "INVALID" +gppwm3_loadAxis = bits, U08, 4326, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2" gppwm3_alignmentFill_map = scalar, U08, 4327, "unit", 1.0, 0, 0, 100, 0 gppwm3_loadBins = array, U08, 4328, [8], "load", 1.0, 0, 0.0, 250, 0 gppwm3_rpmBins = array, U08, 4336, [8], "RPM", 50.0, 0, 0.0, 12000.0, 0 @@ -1158,7 +1158,7 @@ gppwm4_dutyIfError = scalar, U08, 4409, "%", 1.0, 0, 0, 100, 0 gppwm4_pwmFrequency = scalar, U16, 4410, "hz", 1.0, 0, 0, 500, 0 gppwm4_onAboveDuty = scalar, U08, 4412, "%", 1.0, 0, 0, 100, 0 gppwm4_offBelowDuty = scalar, U08, 4413, "%", 1.0, 0, 0, 100, 0 -gppwm4_loadAxis = bits, U08, 4414, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "INVALID", "INVALID" +gppwm4_loadAxis = bits, U08, 4414, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2" gppwm4_alignmentFill_map = scalar, U08, 4415, "unit", 1.0, 0, 0, 100, 0 gppwm4_loadBins = array, U08, 4416, [8], "load", 1.0, 0, 0.0, 250, 0 gppwm4_rpmBins = array, U08, 4424, [8], "RPM", 50.0, 0, 0.0, 12000.0, 0 diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index a0230801ea..f21561cefb 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.03.28.kin.1362979955" + signature = "rusEFI 2021.03.29.kin.1591630396" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.03.28.kin.1362979955" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.03.29.kin.1591630396" ; 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 Sun Mar 28 12:40:58 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Mar 29 13:06:05 UTC 2021 pageSize = 19972 page = 1 @@ -1112,7 +1112,7 @@ gppwm1_dutyIfError = scalar, U08, 4117, "%", 1.0, 0, 0, 100, 0 gppwm1_pwmFrequency = scalar, U16, 4118, "hz", 1.0, 0, 0, 500, 0 gppwm1_onAboveDuty = scalar, U08, 4120, "%", 1.0, 0, 0, 100, 0 gppwm1_offBelowDuty = scalar, U08, 4121, "%", 1.0, 0, 0, 100, 0 -gppwm1_loadAxis = bits, U08, 4122, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "INVALID", "INVALID" +gppwm1_loadAxis = bits, U08, 4122, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2" gppwm1_alignmentFill_map = scalar, U08, 4123, "unit", 1.0, 0, 0, 100, 0 gppwm1_loadBins = array, U08, 4124, [8], "load", 1.0, 0, 0.0, 250, 0 gppwm1_rpmBins = array, U08, 4132, [8], "RPM", 50.0, 0, 0.0, 12000.0, 0 @@ -1122,7 +1122,7 @@ gppwm2_dutyIfError = scalar, U08, 4205, "%", 1.0, 0, 0, 100, 0 gppwm2_pwmFrequency = scalar, U16, 4206, "hz", 1.0, 0, 0, 500, 0 gppwm2_onAboveDuty = scalar, U08, 4208, "%", 1.0, 0, 0, 100, 0 gppwm2_offBelowDuty = scalar, U08, 4209, "%", 1.0, 0, 0, 100, 0 -gppwm2_loadAxis = bits, U08, 4210, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "INVALID", "INVALID" +gppwm2_loadAxis = bits, U08, 4210, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2" gppwm2_alignmentFill_map = scalar, U08, 4211, "unit", 1.0, 0, 0, 100, 0 gppwm2_loadBins = array, U08, 4212, [8], "load", 1.0, 0, 0.0, 250, 0 gppwm2_rpmBins = array, U08, 4220, [8], "RPM", 50.0, 0, 0.0, 12000.0, 0 @@ -1132,7 +1132,7 @@ gppwm3_dutyIfError = scalar, U08, 4293, "%", 1.0, 0, 0, 100, 0 gppwm3_pwmFrequency = scalar, U16, 4294, "hz", 1.0, 0, 0, 500, 0 gppwm3_onAboveDuty = scalar, U08, 4296, "%", 1.0, 0, 0, 100, 0 gppwm3_offBelowDuty = scalar, U08, 4297, "%", 1.0, 0, 0, 100, 0 -gppwm3_loadAxis = bits, U08, 4298, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "INVALID", "INVALID" +gppwm3_loadAxis = bits, U08, 4298, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2" gppwm3_alignmentFill_map = scalar, U08, 4299, "unit", 1.0, 0, 0, 100, 0 gppwm3_loadBins = array, U08, 4300, [8], "load", 1.0, 0, 0.0, 250, 0 gppwm3_rpmBins = array, U08, 4308, [8], "RPM", 50.0, 0, 0.0, 12000.0, 0 @@ -1142,7 +1142,7 @@ gppwm4_dutyIfError = scalar, U08, 4381, "%", 1.0, 0, 0, 100, 0 gppwm4_pwmFrequency = scalar, U16, 4382, "hz", 1.0, 0, 0, 500, 0 gppwm4_onAboveDuty = scalar, U08, 4384, "%", 1.0, 0, 0, 100, 0 gppwm4_offBelowDuty = scalar, U08, 4385, "%", 1.0, 0, 0, 100, 0 -gppwm4_loadAxis = bits, U08, 4386, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "INVALID", "INVALID" +gppwm4_loadAxis = bits, U08, 4386, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2" gppwm4_alignmentFill_map = scalar, U08, 4387, "unit", 1.0, 0, 0, 100, 0 gppwm4_loadBins = array, U08, 4388, [8], "load", 1.0, 0, 0.0, 250, 0 gppwm4_rpmBins = array, U08, 4396, [8], "RPM", 50.0, 0, 0.0, 12000.0, 0 diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index b137edd627..d68e8acd00 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.03.28.mre_f4.2673453912" + signature = "rusEFI 2021.03.29.mre_f4.2428149015" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.03.28.mre_f4.2673453912" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.03.29.mre_f4.2428149015" ; 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 Sun Mar 28 12:40:42 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Mar 29 13:05:43 UTC 2021 pageSize = 20000 page = 1 @@ -1128,7 +1128,7 @@ gppwm1_dutyIfError = scalar, U08, 4145, "%", 1.0, 0, 0, 100, 0 gppwm1_pwmFrequency = scalar, U16, 4146, "hz", 1.0, 0, 0, 500, 0 gppwm1_onAboveDuty = scalar, U08, 4148, "%", 1.0, 0, 0, 100, 0 gppwm1_offBelowDuty = scalar, U08, 4149, "%", 1.0, 0, 0, 100, 0 -gppwm1_loadAxis = bits, U08, 4150, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "INVALID", "INVALID" +gppwm1_loadAxis = bits, U08, 4150, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2" gppwm1_alignmentFill_map = scalar, U08, 4151, "unit", 1.0, 0, 0, 100, 0 gppwm1_loadBins = array, U08, 4152, [8], "load", 1.0, 0, 0.0, 250, 0 gppwm1_rpmBins = array, U08, 4160, [8], "RPM", 50.0, 0, 0.0, 12000.0, 0 @@ -1138,7 +1138,7 @@ gppwm2_dutyIfError = scalar, U08, 4233, "%", 1.0, 0, 0, 100, 0 gppwm2_pwmFrequency = scalar, U16, 4234, "hz", 1.0, 0, 0, 500, 0 gppwm2_onAboveDuty = scalar, U08, 4236, "%", 1.0, 0, 0, 100, 0 gppwm2_offBelowDuty = scalar, U08, 4237, "%", 1.0, 0, 0, 100, 0 -gppwm2_loadAxis = bits, U08, 4238, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "INVALID", "INVALID" +gppwm2_loadAxis = bits, U08, 4238, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2" gppwm2_alignmentFill_map = scalar, U08, 4239, "unit", 1.0, 0, 0, 100, 0 gppwm2_loadBins = array, U08, 4240, [8], "load", 1.0, 0, 0.0, 250, 0 gppwm2_rpmBins = array, U08, 4248, [8], "RPM", 50.0, 0, 0.0, 12000.0, 0 @@ -1148,7 +1148,7 @@ gppwm3_dutyIfError = scalar, U08, 4321, "%", 1.0, 0, 0, 100, 0 gppwm3_pwmFrequency = scalar, U16, 4322, "hz", 1.0, 0, 0, 500, 0 gppwm3_onAboveDuty = scalar, U08, 4324, "%", 1.0, 0, 0, 100, 0 gppwm3_offBelowDuty = scalar, U08, 4325, "%", 1.0, 0, 0, 100, 0 -gppwm3_loadAxis = bits, U08, 4326, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "INVALID", "INVALID" +gppwm3_loadAxis = bits, U08, 4326, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2" gppwm3_alignmentFill_map = scalar, U08, 4327, "unit", 1.0, 0, 0, 100, 0 gppwm3_loadBins = array, U08, 4328, [8], "load", 1.0, 0, 0.0, 250, 0 gppwm3_rpmBins = array, U08, 4336, [8], "RPM", 50.0, 0, 0.0, 12000.0, 0 @@ -1158,7 +1158,7 @@ gppwm4_dutyIfError = scalar, U08, 4409, "%", 1.0, 0, 0, 100, 0 gppwm4_pwmFrequency = scalar, U16, 4410, "hz", 1.0, 0, 0, 500, 0 gppwm4_onAboveDuty = scalar, U08, 4412, "%", 1.0, 0, 0, 100, 0 gppwm4_offBelowDuty = scalar, U08, 4413, "%", 1.0, 0, 0, 100, 0 -gppwm4_loadAxis = bits, U08, 4414, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "INVALID", "INVALID" +gppwm4_loadAxis = bits, U08, 4414, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2" gppwm4_alignmentFill_map = scalar, U08, 4415, "unit", 1.0, 0, 0, 100, 0 gppwm4_loadBins = array, U08, 4416, [8], "load", 1.0, 0, 0.0, 250, 0 gppwm4_rpmBins = array, U08, 4424, [8], "RPM", 50.0, 0, 0.0, 12000.0, 0 diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 8b1a0059d9..aea5280d85 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.03.28.mre_f7.2673453912" + signature = "rusEFI 2021.03.29.mre_f7.2428149015" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.03.28.mre_f7.2673453912" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.03.29.mre_f7.2428149015" ; 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 Sun Mar 28 12:40:40 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Mar 29 13:05:41 UTC 2021 pageSize = 20000 page = 1 @@ -1128,7 +1128,7 @@ gppwm1_dutyIfError = scalar, U08, 4145, "%", 1.0, 0, 0, 100, 0 gppwm1_pwmFrequency = scalar, U16, 4146, "hz", 1.0, 0, 0, 500, 0 gppwm1_onAboveDuty = scalar, U08, 4148, "%", 1.0, 0, 0, 100, 0 gppwm1_offBelowDuty = scalar, U08, 4149, "%", 1.0, 0, 0, 100, 0 -gppwm1_loadAxis = bits, U08, 4150, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "INVALID", "INVALID" +gppwm1_loadAxis = bits, U08, 4150, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2" gppwm1_alignmentFill_map = scalar, U08, 4151, "unit", 1.0, 0, 0, 100, 0 gppwm1_loadBins = array, U08, 4152, [8], "load", 1.0, 0, 0.0, 250, 0 gppwm1_rpmBins = array, U08, 4160, [8], "RPM", 50.0, 0, 0.0, 12000.0, 0 @@ -1138,7 +1138,7 @@ gppwm2_dutyIfError = scalar, U08, 4233, "%", 1.0, 0, 0, 100, 0 gppwm2_pwmFrequency = scalar, U16, 4234, "hz", 1.0, 0, 0, 500, 0 gppwm2_onAboveDuty = scalar, U08, 4236, "%", 1.0, 0, 0, 100, 0 gppwm2_offBelowDuty = scalar, U08, 4237, "%", 1.0, 0, 0, 100, 0 -gppwm2_loadAxis = bits, U08, 4238, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "INVALID", "INVALID" +gppwm2_loadAxis = bits, U08, 4238, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2" gppwm2_alignmentFill_map = scalar, U08, 4239, "unit", 1.0, 0, 0, 100, 0 gppwm2_loadBins = array, U08, 4240, [8], "load", 1.0, 0, 0.0, 250, 0 gppwm2_rpmBins = array, U08, 4248, [8], "RPM", 50.0, 0, 0.0, 12000.0, 0 @@ -1148,7 +1148,7 @@ gppwm3_dutyIfError = scalar, U08, 4321, "%", 1.0, 0, 0, 100, 0 gppwm3_pwmFrequency = scalar, U16, 4322, "hz", 1.0, 0, 0, 500, 0 gppwm3_onAboveDuty = scalar, U08, 4324, "%", 1.0, 0, 0, 100, 0 gppwm3_offBelowDuty = scalar, U08, 4325, "%", 1.0, 0, 0, 100, 0 -gppwm3_loadAxis = bits, U08, 4326, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "INVALID", "INVALID" +gppwm3_loadAxis = bits, U08, 4326, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2" gppwm3_alignmentFill_map = scalar, U08, 4327, "unit", 1.0, 0, 0, 100, 0 gppwm3_loadBins = array, U08, 4328, [8], "load", 1.0, 0, 0.0, 250, 0 gppwm3_rpmBins = array, U08, 4336, [8], "RPM", 50.0, 0, 0.0, 12000.0, 0 @@ -1158,7 +1158,7 @@ gppwm4_dutyIfError = scalar, U08, 4409, "%", 1.0, 0, 0, 100, 0 gppwm4_pwmFrequency = scalar, U16, 4410, "hz", 1.0, 0, 0, 500, 0 gppwm4_onAboveDuty = scalar, U08, 4412, "%", 1.0, 0, 0, 100, 0 gppwm4_offBelowDuty = scalar, U08, 4413, "%", 1.0, 0, 0, 100, 0 -gppwm4_loadAxis = bits, U08, 4414, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "INVALID", "INVALID" +gppwm4_loadAxis = bits, U08, 4414, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2" gppwm4_alignmentFill_map = scalar, U08, 4415, "unit", 1.0, 0, 0, 100, 0 gppwm4_loadBins = array, U08, 4416, [8], "load", 1.0, 0, 0.0, 250, 0 gppwm4_rpmBins = array, U08, 4424, [8], "RPM", 50.0, 0, 0.0, 12000.0, 0 diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index 8c38fd6ce8..b2a9b1f0aa 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.03.28.prometheus_405.4268915049" + signature = "rusEFI 2021.03.29.prometheus_405.4052832038" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.03.28.prometheus_405.4268915049" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.03.29.prometheus_405.4052832038" ; 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 Sun Mar 28 12:40:52 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Mar 29 13:05:57 UTC 2021 pageSize = 20000 page = 1 @@ -1128,7 +1128,7 @@ gppwm1_dutyIfError = scalar, U08, 4145, "%", 1.0, 0, 0, 100, 0 gppwm1_pwmFrequency = scalar, U16, 4146, "hz", 1.0, 0, 0, 500, 0 gppwm1_onAboveDuty = scalar, U08, 4148, "%", 1.0, 0, 0, 100, 0 gppwm1_offBelowDuty = scalar, U08, 4149, "%", 1.0, 0, 0, 100, 0 -gppwm1_loadAxis = bits, U08, 4150, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "INVALID", "INVALID" +gppwm1_loadAxis = bits, U08, 4150, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2" gppwm1_alignmentFill_map = scalar, U08, 4151, "unit", 1.0, 0, 0, 100, 0 gppwm1_loadBins = array, U08, 4152, [8], "load", 1.0, 0, 0.0, 250, 0 gppwm1_rpmBins = array, U08, 4160, [8], "RPM", 50.0, 0, 0.0, 12000.0, 0 @@ -1138,7 +1138,7 @@ gppwm2_dutyIfError = scalar, U08, 4233, "%", 1.0, 0, 0, 100, 0 gppwm2_pwmFrequency = scalar, U16, 4234, "hz", 1.0, 0, 0, 500, 0 gppwm2_onAboveDuty = scalar, U08, 4236, "%", 1.0, 0, 0, 100, 0 gppwm2_offBelowDuty = scalar, U08, 4237, "%", 1.0, 0, 0, 100, 0 -gppwm2_loadAxis = bits, U08, 4238, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "INVALID", "INVALID" +gppwm2_loadAxis = bits, U08, 4238, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2" gppwm2_alignmentFill_map = scalar, U08, 4239, "unit", 1.0, 0, 0, 100, 0 gppwm2_loadBins = array, U08, 4240, [8], "load", 1.0, 0, 0.0, 250, 0 gppwm2_rpmBins = array, U08, 4248, [8], "RPM", 50.0, 0, 0.0, 12000.0, 0 @@ -1148,7 +1148,7 @@ gppwm3_dutyIfError = scalar, U08, 4321, "%", 1.0, 0, 0, 100, 0 gppwm3_pwmFrequency = scalar, U16, 4322, "hz", 1.0, 0, 0, 500, 0 gppwm3_onAboveDuty = scalar, U08, 4324, "%", 1.0, 0, 0, 100, 0 gppwm3_offBelowDuty = scalar, U08, 4325, "%", 1.0, 0, 0, 100, 0 -gppwm3_loadAxis = bits, U08, 4326, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "INVALID", "INVALID" +gppwm3_loadAxis = bits, U08, 4326, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2" gppwm3_alignmentFill_map = scalar, U08, 4327, "unit", 1.0, 0, 0, 100, 0 gppwm3_loadBins = array, U08, 4328, [8], "load", 1.0, 0, 0.0, 250, 0 gppwm3_rpmBins = array, U08, 4336, [8], "RPM", 50.0, 0, 0.0, 12000.0, 0 @@ -1158,7 +1158,7 @@ gppwm4_dutyIfError = scalar, U08, 4409, "%", 1.0, 0, 0, 100, 0 gppwm4_pwmFrequency = scalar, U16, 4410, "hz", 1.0, 0, 0, 500, 0 gppwm4_onAboveDuty = scalar, U08, 4412, "%", 1.0, 0, 0, 100, 0 gppwm4_offBelowDuty = scalar, U08, 4413, "%", 1.0, 0, 0, 100, 0 -gppwm4_loadAxis = bits, U08, 4414, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "INVALID", "INVALID" +gppwm4_loadAxis = bits, U08, 4414, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2" gppwm4_alignmentFill_map = scalar, U08, 4415, "unit", 1.0, 0, 0, 100, 0 gppwm4_loadBins = array, U08, 4416, [8], "load", 1.0, 0, 0.0, 250, 0 gppwm4_rpmBins = array, U08, 4424, [8], "RPM", 50.0, 0, 0.0, 12000.0, 0 diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 25220288a7..a04772a089 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.03.28.prometheus_469.4268915049" + signature = "rusEFI 2021.03.29.prometheus_469.4052832038" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.03.28.prometheus_469.4268915049" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.03.29.prometheus_469.4052832038" ; 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 Sun Mar 28 12:40:49 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Mar 29 13:05:55 UTC 2021 pageSize = 20000 page = 1 @@ -1128,7 +1128,7 @@ gppwm1_dutyIfError = scalar, U08, 4145, "%", 1.0, 0, 0, 100, 0 gppwm1_pwmFrequency = scalar, U16, 4146, "hz", 1.0, 0, 0, 500, 0 gppwm1_onAboveDuty = scalar, U08, 4148, "%", 1.0, 0, 0, 100, 0 gppwm1_offBelowDuty = scalar, U08, 4149, "%", 1.0, 0, 0, 100, 0 -gppwm1_loadAxis = bits, U08, 4150, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "INVALID", "INVALID" +gppwm1_loadAxis = bits, U08, 4150, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2" gppwm1_alignmentFill_map = scalar, U08, 4151, "unit", 1.0, 0, 0, 100, 0 gppwm1_loadBins = array, U08, 4152, [8], "load", 1.0, 0, 0.0, 250, 0 gppwm1_rpmBins = array, U08, 4160, [8], "RPM", 50.0, 0, 0.0, 12000.0, 0 @@ -1138,7 +1138,7 @@ gppwm2_dutyIfError = scalar, U08, 4233, "%", 1.0, 0, 0, 100, 0 gppwm2_pwmFrequency = scalar, U16, 4234, "hz", 1.0, 0, 0, 500, 0 gppwm2_onAboveDuty = scalar, U08, 4236, "%", 1.0, 0, 0, 100, 0 gppwm2_offBelowDuty = scalar, U08, 4237, "%", 1.0, 0, 0, 100, 0 -gppwm2_loadAxis = bits, U08, 4238, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "INVALID", "INVALID" +gppwm2_loadAxis = bits, U08, 4238, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2" gppwm2_alignmentFill_map = scalar, U08, 4239, "unit", 1.0, 0, 0, 100, 0 gppwm2_loadBins = array, U08, 4240, [8], "load", 1.0, 0, 0.0, 250, 0 gppwm2_rpmBins = array, U08, 4248, [8], "RPM", 50.0, 0, 0.0, 12000.0, 0 @@ -1148,7 +1148,7 @@ gppwm3_dutyIfError = scalar, U08, 4321, "%", 1.0, 0, 0, 100, 0 gppwm3_pwmFrequency = scalar, U16, 4322, "hz", 1.0, 0, 0, 500, 0 gppwm3_onAboveDuty = scalar, U08, 4324, "%", 1.0, 0, 0, 100, 0 gppwm3_offBelowDuty = scalar, U08, 4325, "%", 1.0, 0, 0, 100, 0 -gppwm3_loadAxis = bits, U08, 4326, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "INVALID", "INVALID" +gppwm3_loadAxis = bits, U08, 4326, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2" gppwm3_alignmentFill_map = scalar, U08, 4327, "unit", 1.0, 0, 0, 100, 0 gppwm3_loadBins = array, U08, 4328, [8], "load", 1.0, 0, 0.0, 250, 0 gppwm3_rpmBins = array, U08, 4336, [8], "RPM", 50.0, 0, 0.0, 12000.0, 0 @@ -1158,7 +1158,7 @@ gppwm4_dutyIfError = scalar, U08, 4409, "%", 1.0, 0, 0, 100, 0 gppwm4_pwmFrequency = scalar, U16, 4410, "hz", 1.0, 0, 0, 500, 0 gppwm4_onAboveDuty = scalar, U08, 4412, "%", 1.0, 0, 0, 100, 0 gppwm4_offBelowDuty = scalar, U08, 4413, "%", 1.0, 0, 0, 100, 0 -gppwm4_loadAxis = bits, U08, 4414, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "INVALID", "INVALID" +gppwm4_loadAxis = bits, U08, 4414, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2" gppwm4_alignmentFill_map = scalar, U08, 4415, "unit", 1.0, 0, 0, 100, 0 gppwm4_loadBins = array, U08, 4416, [8], "load", 1.0, 0, 0.0, 250, 0 gppwm4_rpmBins = array, U08, 4424, [8], "RPM", 50.0, 0, 0.0, 12000.0, 0 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index aec8dffd0f..f3a21e3425 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.03.28.proteus_f4.163927756" + signature = "rusEFI 2021.03.29.proteus_f4.103178371" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.03.28.proteus_f4.163927756" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.03.29.proteus_f4.103178371" ; 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 Sun Mar 28 12:40:56 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Mar 29 13:06:02 UTC 2021 pageSize = 20000 page = 1 @@ -1128,7 +1128,7 @@ gppwm1_dutyIfError = scalar, U08, 4145, "%", 1.0, 0, 0, 100, 0 gppwm1_pwmFrequency = scalar, U16, 4146, "hz", 1.0, 0, 0, 500, 0 gppwm1_onAboveDuty = scalar, U08, 4148, "%", 1.0, 0, 0, 100, 0 gppwm1_offBelowDuty = scalar, U08, 4149, "%", 1.0, 0, 0, 100, 0 -gppwm1_loadAxis = bits, U08, 4150, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "INVALID", "INVALID" +gppwm1_loadAxis = bits, U08, 4150, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2" gppwm1_alignmentFill_map = scalar, U08, 4151, "unit", 1.0, 0, 0, 100, 0 gppwm1_loadBins = array, U08, 4152, [8], "load", 1.0, 0, 0.0, 250, 0 gppwm1_rpmBins = array, U08, 4160, [8], "RPM", 50.0, 0, 0.0, 12000.0, 0 @@ -1138,7 +1138,7 @@ gppwm2_dutyIfError = scalar, U08, 4233, "%", 1.0, 0, 0, 100, 0 gppwm2_pwmFrequency = scalar, U16, 4234, "hz", 1.0, 0, 0, 500, 0 gppwm2_onAboveDuty = scalar, U08, 4236, "%", 1.0, 0, 0, 100, 0 gppwm2_offBelowDuty = scalar, U08, 4237, "%", 1.0, 0, 0, 100, 0 -gppwm2_loadAxis = bits, U08, 4238, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "INVALID", "INVALID" +gppwm2_loadAxis = bits, U08, 4238, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2" gppwm2_alignmentFill_map = scalar, U08, 4239, "unit", 1.0, 0, 0, 100, 0 gppwm2_loadBins = array, U08, 4240, [8], "load", 1.0, 0, 0.0, 250, 0 gppwm2_rpmBins = array, U08, 4248, [8], "RPM", 50.0, 0, 0.0, 12000.0, 0 @@ -1148,7 +1148,7 @@ gppwm3_dutyIfError = scalar, U08, 4321, "%", 1.0, 0, 0, 100, 0 gppwm3_pwmFrequency = scalar, U16, 4322, "hz", 1.0, 0, 0, 500, 0 gppwm3_onAboveDuty = scalar, U08, 4324, "%", 1.0, 0, 0, 100, 0 gppwm3_offBelowDuty = scalar, U08, 4325, "%", 1.0, 0, 0, 100, 0 -gppwm3_loadAxis = bits, U08, 4326, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "INVALID", "INVALID" +gppwm3_loadAxis = bits, U08, 4326, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2" gppwm3_alignmentFill_map = scalar, U08, 4327, "unit", 1.0, 0, 0, 100, 0 gppwm3_loadBins = array, U08, 4328, [8], "load", 1.0, 0, 0.0, 250, 0 gppwm3_rpmBins = array, U08, 4336, [8], "RPM", 50.0, 0, 0.0, 12000.0, 0 @@ -1158,7 +1158,7 @@ gppwm4_dutyIfError = scalar, U08, 4409, "%", 1.0, 0, 0, 100, 0 gppwm4_pwmFrequency = scalar, U16, 4410, "hz", 1.0, 0, 0, 500, 0 gppwm4_onAboveDuty = scalar, U08, 4412, "%", 1.0, 0, 0, 100, 0 gppwm4_offBelowDuty = scalar, U08, 4413, "%", 1.0, 0, 0, 100, 0 -gppwm4_loadAxis = bits, U08, 4414, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "INVALID", "INVALID" +gppwm4_loadAxis = bits, U08, 4414, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2" gppwm4_alignmentFill_map = scalar, U08, 4415, "unit", 1.0, 0, 0, 100, 0 gppwm4_loadBins = array, U08, 4416, [8], "load", 1.0, 0, 0.0, 250, 0 gppwm4_rpmBins = array, U08, 4424, [8], "RPM", 50.0, 0, 0.0, 12000.0, 0 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 75d385ae84..48871e9c2b 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.03.28.proteus_f7.163927756" + signature = "rusEFI 2021.03.29.proteus_f7.103178371" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.03.28.proteus_f7.163927756" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.03.29.proteus_f7.103178371" ; 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 Sun Mar 28 12:40:54 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Mar 29 13:06:00 UTC 2021 pageSize = 20000 page = 1 @@ -1128,7 +1128,7 @@ gppwm1_dutyIfError = scalar, U08, 4145, "%", 1.0, 0, 0, 100, 0 gppwm1_pwmFrequency = scalar, U16, 4146, "hz", 1.0, 0, 0, 500, 0 gppwm1_onAboveDuty = scalar, U08, 4148, "%", 1.0, 0, 0, 100, 0 gppwm1_offBelowDuty = scalar, U08, 4149, "%", 1.0, 0, 0, 100, 0 -gppwm1_loadAxis = bits, U08, 4150, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "INVALID", "INVALID" +gppwm1_loadAxis = bits, U08, 4150, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2" gppwm1_alignmentFill_map = scalar, U08, 4151, "unit", 1.0, 0, 0, 100, 0 gppwm1_loadBins = array, U08, 4152, [8], "load", 1.0, 0, 0.0, 250, 0 gppwm1_rpmBins = array, U08, 4160, [8], "RPM", 50.0, 0, 0.0, 12000.0, 0 @@ -1138,7 +1138,7 @@ gppwm2_dutyIfError = scalar, U08, 4233, "%", 1.0, 0, 0, 100, 0 gppwm2_pwmFrequency = scalar, U16, 4234, "hz", 1.0, 0, 0, 500, 0 gppwm2_onAboveDuty = scalar, U08, 4236, "%", 1.0, 0, 0, 100, 0 gppwm2_offBelowDuty = scalar, U08, 4237, "%", 1.0, 0, 0, 100, 0 -gppwm2_loadAxis = bits, U08, 4238, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "INVALID", "INVALID" +gppwm2_loadAxis = bits, U08, 4238, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2" gppwm2_alignmentFill_map = scalar, U08, 4239, "unit", 1.0, 0, 0, 100, 0 gppwm2_loadBins = array, U08, 4240, [8], "load", 1.0, 0, 0.0, 250, 0 gppwm2_rpmBins = array, U08, 4248, [8], "RPM", 50.0, 0, 0.0, 12000.0, 0 @@ -1148,7 +1148,7 @@ gppwm3_dutyIfError = scalar, U08, 4321, "%", 1.0, 0, 0, 100, 0 gppwm3_pwmFrequency = scalar, U16, 4322, "hz", 1.0, 0, 0, 500, 0 gppwm3_onAboveDuty = scalar, U08, 4324, "%", 1.0, 0, 0, 100, 0 gppwm3_offBelowDuty = scalar, U08, 4325, "%", 1.0, 0, 0, 100, 0 -gppwm3_loadAxis = bits, U08, 4326, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "INVALID", "INVALID" +gppwm3_loadAxis = bits, U08, 4326, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2" gppwm3_alignmentFill_map = scalar, U08, 4327, "unit", 1.0, 0, 0, 100, 0 gppwm3_loadBins = array, U08, 4328, [8], "load", 1.0, 0, 0.0, 250, 0 gppwm3_rpmBins = array, U08, 4336, [8], "RPM", 50.0, 0, 0.0, 12000.0, 0 @@ -1158,7 +1158,7 @@ gppwm4_dutyIfError = scalar, U08, 4409, "%", 1.0, 0, 0, 100, 0 gppwm4_pwmFrequency = scalar, U16, 4410, "hz", 1.0, 0, 0, 500, 0 gppwm4_onAboveDuty = scalar, U08, 4412, "%", 1.0, 0, 0, 100, 0 gppwm4_offBelowDuty = scalar, U08, 4413, "%", 1.0, 0, 0, 100, 0 -gppwm4_loadAxis = bits, U08, 4414, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "INVALID", "INVALID" +gppwm4_loadAxis = bits, U08, 4414, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2" gppwm4_alignmentFill_map = scalar, U08, 4415, "unit", 1.0, 0, 0, 100, 0 gppwm4_loadBins = array, U08, 4416, [8], "load", 1.0, 0, 0.0, 250, 0 gppwm4_rpmBins = array, U08, 4424, [8], "RPM", 50.0, 0, 0.0, 12000.0, 0 diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index e83a3a2b39..ef83c741b2 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.03.28.subaru_eg33_f7.775359849" + signature = "rusEFI 2021.03.29.subaru_eg33_f7.567556902" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.03.28.subaru_eg33_f7.775359849" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.03.29.subaru_eg33_f7.567556902" ; 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 Sun Mar 28 12:41:02 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 Mon Mar 29 13:06:09 UTC 2021 pageSize = 20000 page = 1 @@ -1128,7 +1128,7 @@ gppwm1_dutyIfError = scalar, U08, 4145, "%", 1.0, 0, 0, 100, 0 gppwm1_pwmFrequency = scalar, U16, 4146, "hz", 1.0, 0, 0, 500, 0 gppwm1_onAboveDuty = scalar, U08, 4148, "%", 1.0, 0, 0, 100, 0 gppwm1_offBelowDuty = scalar, U08, 4149, "%", 1.0, 0, 0, 100, 0 -gppwm1_loadAxis = bits, U08, 4150, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "INVALID", "INVALID" +gppwm1_loadAxis = bits, U08, 4150, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2" gppwm1_alignmentFill_map = scalar, U08, 4151, "unit", 1.0, 0, 0, 100, 0 gppwm1_loadBins = array, U08, 4152, [8], "load", 1.0, 0, 0.0, 250, 0 gppwm1_rpmBins = array, U08, 4160, [8], "RPM", 50.0, 0, 0.0, 12000.0, 0 @@ -1138,7 +1138,7 @@ gppwm2_dutyIfError = scalar, U08, 4233, "%", 1.0, 0, 0, 100, 0 gppwm2_pwmFrequency = scalar, U16, 4234, "hz", 1.0, 0, 0, 500, 0 gppwm2_onAboveDuty = scalar, U08, 4236, "%", 1.0, 0, 0, 100, 0 gppwm2_offBelowDuty = scalar, U08, 4237, "%", 1.0, 0, 0, 100, 0 -gppwm2_loadAxis = bits, U08, 4238, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "INVALID", "INVALID" +gppwm2_loadAxis = bits, U08, 4238, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2" gppwm2_alignmentFill_map = scalar, U08, 4239, "unit", 1.0, 0, 0, 100, 0 gppwm2_loadBins = array, U08, 4240, [8], "load", 1.0, 0, 0.0, 250, 0 gppwm2_rpmBins = array, U08, 4248, [8], "RPM", 50.0, 0, 0.0, 12000.0, 0 @@ -1148,7 +1148,7 @@ gppwm3_dutyIfError = scalar, U08, 4321, "%", 1.0, 0, 0, 100, 0 gppwm3_pwmFrequency = scalar, U16, 4322, "hz", 1.0, 0, 0, 500, 0 gppwm3_onAboveDuty = scalar, U08, 4324, "%", 1.0, 0, 0, 100, 0 gppwm3_offBelowDuty = scalar, U08, 4325, "%", 1.0, 0, 0, 100, 0 -gppwm3_loadAxis = bits, U08, 4326, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "INVALID", "INVALID" +gppwm3_loadAxis = bits, U08, 4326, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2" gppwm3_alignmentFill_map = scalar, U08, 4327, "unit", 1.0, 0, 0, 100, 0 gppwm3_loadBins = array, U08, 4328, [8], "load", 1.0, 0, 0.0, 250, 0 gppwm3_rpmBins = array, U08, 4336, [8], "RPM", 50.0, 0, 0.0, 12000.0, 0 @@ -1158,7 +1158,7 @@ gppwm4_dutyIfError = scalar, U08, 4409, "%", 1.0, 0, 0, 100, 0 gppwm4_pwmFrequency = scalar, U16, 4410, "hz", 1.0, 0, 0, 500, 0 gppwm4_onAboveDuty = scalar, U08, 4412, "%", 1.0, 0, 0, 100, 0 gppwm4_offBelowDuty = scalar, U08, 4413, "%", 1.0, 0, 0, 100, 0 -gppwm4_loadAxis = bits, U08, 4414, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "INVALID", "INVALID" +gppwm4_loadAxis = bits, U08, 4414, [0:2], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2" gppwm4_alignmentFill_map = scalar, U08, 4415, "unit", 1.0, 0, 0, 100, 0 gppwm4_loadBins = array, U08, 4416, [8], "load", 1.0, 0, 0.0, 250, 0 gppwm4_rpmBins = array, U08, 4424, [8], "RPM", 50.0, 0, 0.0, 12000.0, 0 diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java index 343584668d..d1b2ca56fa 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 Sun Mar 28 12:40:35 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Mar 29 13:05:35 UTC 2021 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1479,7 +1479,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.03.28.all.3974396767"; + public static final String TS_SIGNATURE = "rusEFI 2021.03.29.all.3808906512"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final int TT_TT_1_16 = 50; public static final int TT_TT_2JZ_1_12 = 29; @@ -2688,7 +2688,7 @@ public class Fields { public static final Field GPPWM1_PWMFREQUENCY = Field.create("GPPWM1_PWMFREQUENCY", 4146, FieldType.INT16); public static final Field GPPWM1_ONABOVEDUTY = Field.create("GPPWM1_ONABOVEDUTY", 4148, FieldType.INT8); public static final Field GPPWM1_OFFBELOWDUTY = Field.create("GPPWM1_OFFBELOWDUTY", 4149, FieldType.INT8); - public static final String[] gppwm_channel_e = {"TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "INVALID", "INVALID"}; + public static final String[] gppwm_channel_e = {"TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2"}; public static final Field GPPWM1_LOADAXIS = Field.create("GPPWM1_LOADAXIS", 4150, FieldType.INT8, gppwm_channel_e); public static final Field GPPWM1_ALIGNMENTFILL_MAP = Field.create("GPPWM1_ALIGNMENTFILL_MAP", 4151, FieldType.INT8); public static final Field GPPWM1_TABLE = Field.create("GPPWM1_TABLE", 4168, FieldType.INT); diff --git a/java_console/rusefi.xml b/java_console/rusefi.xml index 9498e4603c..5909e725d2 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -1,6 +1,6 @@ - +