From d2df6f9675420339323f82ae43bf886a069d7d59 Mon Sep 17 00:00:00 2001 From: GitHub build-firmware Action Date: Mon, 29 Mar 2021 13:06:35 +0000 Subject: [PATCH] Auto-generated configs and docs --- .../controllers/algo/auto_generated_enums.cpp | 6 +++++- ...ngine_configuration_generated_structures.h | 4 ++-- .../controllers/algo/rusefi_generated.h | 10 +++++----- .../controllers/algo/auto_generated_enums.cpp | 6 +++++- ...ngine_configuration_generated_structures.h | 4 ++-- .../controllers/algo/rusefi_generated.h | 10 +++++----- .../controllers/algo/auto_generated_enums.cpp | 6 +++++- ...ngine_configuration_generated_structures.h | 4 ++-- .../controllers/algo/rusefi_generated.h | 10 +++++----- .../controllers/algo/auto_generated_enums.cpp | 6 +++++- ...ngine_configuration_generated_structures.h | 4 ++-- .../generated/fsio_enums_generated.def | 2 +- .../controllers/generated/fsio_getters.def | 2 +- firmware/controllers/generated/fsio_names.def | 2 +- .../controllers/generated/fsio_strings.def | 2 +- .../controllers/generated/rusefi_generated.h | 10 +++++----- .../controllers/generated/signature_all.h | 6 +++--- .../generated/signature_frankenso_na6.h | 6 +++--- .../generated/signature_hellen72.h | 6 +++--- .../generated/signature_hellen_cypress.h | 6 +++--- .../controllers/generated/signature_kin.h | 6 +++--- .../controllers/generated/signature_mre_f4.h | 6 +++--- .../controllers/generated/signature_mre_f7.h | 6 +++--- .../generated/signature_prometheus_405.h | 6 +++--- .../generated/signature_prometheus_469.h | 6 +++--- .../generated/signature_proteus_f4.h | 6 +++--- .../generated/signature_proteus_f7.h | 6 +++--- .../generated/signature_subaru_eg33_f7.h | 6 +++--- firmware/tunerstudio/generated/cache.zip | Bin 1161385 -> 1161529 bytes firmware/tunerstudio/generated/rusefi.ini | 14 +++++++------- .../generated/rusefi_frankenso_na6.ini | 14 +++++++------- .../tunerstudio/generated/rusefi_hellen72.ini | 14 +++++++------- .../generated/rusefi_hellen_cypress.ini | 14 +++++++------- .../tunerstudio/generated/rusefi_kinetis.ini | 14 +++++++------- .../tunerstudio/generated/rusefi_mre_f4.ini | 14 +++++++------- .../tunerstudio/generated/rusefi_mre_f7.ini | 14 +++++++------- .../generated/rusefi_prometheus_405.ini | 14 +++++++------- .../generated/rusefi_prometheus_469.ini | 14 +++++++------- .../generated/rusefi_proteus_f4.ini | 14 +++++++------- .../generated/rusefi_proteus_f7.ini | 14 +++++++------- .../generated/rusefi_subaru_eg33_f7.ini | 14 +++++++------- .../com/rusefi/config/generated/Fields.java | 6 +++--- java_console/rusefi.xml | 2 +- 43 files changed, 176 insertions(+), 160 deletions(-) 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 469e17a84f5dfe2b0a70186d5f53b347fd4e63b5..1bedf8116d5c9cd3b24ad05482698835c0feca30 100644 GIT binary patch delta 298212 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

4pv5A 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 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 @@ - +