diff --git a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h index 9827156fd8..b9e3338fd5 100644 --- a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h @@ -734,7 +734,7 @@ #define firingOrder_offset 372 #define fixedModeTiming_offset 404 #define fixedTiming_offset 1684 -#define FLASH_DATA_VERSION 10014 +#define FLASH_DATA_VERSION 10015 #define flexCranking_offset 1372 #define flexSensorPin_offset 844 #define forceO2Heating_offset 1372 @@ -1231,19 +1231,26 @@ #define gppwm4_pwmFrequency_offset 2844 #define gppwm4_rpmBins_offset 2858 #define gppwm4_table_offset 2866 -#define gppwm_channel_e_auto_enum 0="GPPWM_Tps",9="GPPWM_AccelPedal",6="GPPWM_AuxTemp1",7="GPPWM_AuxTemp2",2="GPPWM_Clt",4="GPPWM_FuelLoad",3="GPPWM_Iat",5="GPPWM_IgnLoad",1="GPPWM_Map",10="GPPWM_Vbatt",8="GPPWM_Zero" -#define gppwm_channel_e_enum "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +#define gppwm_channel_e_auto_enum 0="GPPWM_Zero",9="GPPWM_AccelPedal",16="GPPWM_AuxLinear1",17="GPPWM_AuxLinear2",7="GPPWM_AuxTemp1",8="GPPWM_AuxTemp2",3="GPPWM_Clt",15="GPPWM_EthanolPercent",5="GPPWM_FuelLoad",4="GPPWM_Iat",6="GPPWM_IgnLoad",2="GPPWM_Map",1="GPPWM_Tps",12="GPPWM_VVT_1E",11="GPPWM_VVT_1I",14="GPPWM_VVT_2E",13="GPPWM_VVT_2I",10="GPPWM_Vbatt" +#define gppwm_channel_e_enum "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" #define gppwm_channel_e_GPPWM_AccelPedal 9 -#define gppwm_channel_e_GPPWM_AuxTemp1 6 -#define gppwm_channel_e_GPPWM_AuxTemp2 7 -#define gppwm_channel_e_GPPWM_Clt 2 -#define gppwm_channel_e_GPPWM_FuelLoad 4 -#define gppwm_channel_e_GPPWM_Iat 3 -#define gppwm_channel_e_GPPWM_IgnLoad 5 -#define gppwm_channel_e_GPPWM_Map 1 -#define gppwm_channel_e_GPPWM_Tps 0 +#define gppwm_channel_e_GPPWM_AuxLinear1 16 +#define gppwm_channel_e_GPPWM_AuxLinear2 17 +#define gppwm_channel_e_GPPWM_AuxTemp1 7 +#define gppwm_channel_e_GPPWM_AuxTemp2 8 +#define gppwm_channel_e_GPPWM_Clt 3 +#define gppwm_channel_e_GPPWM_EthanolPercent 15 +#define gppwm_channel_e_GPPWM_FuelLoad 5 +#define gppwm_channel_e_GPPWM_Iat 4 +#define gppwm_channel_e_GPPWM_IgnLoad 6 +#define gppwm_channel_e_GPPWM_Map 2 +#define gppwm_channel_e_GPPWM_Tps 1 #define gppwm_channel_e_GPPWM_Vbatt 10 -#define gppwm_channel_e_GPPWM_Zero 8 +#define gppwm_channel_e_GPPWM_VVT_1E 12 +#define gppwm_channel_e_GPPWM_VVT_1I 11 +#define gppwm_channel_e_GPPWM_VVT_2E 14 +#define gppwm_channel_e_GPPWM_VVT_2I 13 +#define gppwm_channel_e_GPPWM_Zero 0 #define gppwm_channel_size 92 #define GPPWM_CHANNELS 4 #define gppwm_compare_mode_e_GPPWM_GreaterThan 0 @@ -1925,7 +1932,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 960 -#define SIGNATURE_HASH 1743871579 +#define SIGNATURE_HASH 2388932933 #define silentTriggerError_offset 1360 #define skippedWheelOnCam_offset 1360 #define slowAdcAlpha_offset 1600 @@ -2485,7 +2492,7 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2022.09.16.cypress.1743871579" +#define TS_SIGNATURE "rusEFI 2022.09.16.cypress.2388932933" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' diff --git a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h index 4efceb5594..2d42d41897 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -734,7 +734,7 @@ #define firingOrder_offset 372 #define fixedModeTiming_offset 404 #define fixedTiming_offset 1684 -#define FLASH_DATA_VERSION 10014 +#define FLASH_DATA_VERSION 10015 #define flexCranking_offset 1372 #define flexSensorPin_offset 844 #define forceO2Heating_offset 1372 @@ -1231,19 +1231,26 @@ #define gppwm4_pwmFrequency_offset 2844 #define gppwm4_rpmBins_offset 2858 #define gppwm4_table_offset 2866 -#define gppwm_channel_e_auto_enum 0="GPPWM_Tps",9="GPPWM_AccelPedal",6="GPPWM_AuxTemp1",7="GPPWM_AuxTemp2",2="GPPWM_Clt",4="GPPWM_FuelLoad",3="GPPWM_Iat",5="GPPWM_IgnLoad",1="GPPWM_Map",10="GPPWM_Vbatt",8="GPPWM_Zero" -#define gppwm_channel_e_enum "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +#define gppwm_channel_e_auto_enum 0="GPPWM_Zero",9="GPPWM_AccelPedal",16="GPPWM_AuxLinear1",17="GPPWM_AuxLinear2",7="GPPWM_AuxTemp1",8="GPPWM_AuxTemp2",3="GPPWM_Clt",15="GPPWM_EthanolPercent",5="GPPWM_FuelLoad",4="GPPWM_Iat",6="GPPWM_IgnLoad",2="GPPWM_Map",1="GPPWM_Tps",12="GPPWM_VVT_1E",11="GPPWM_VVT_1I",14="GPPWM_VVT_2E",13="GPPWM_VVT_2I",10="GPPWM_Vbatt" +#define gppwm_channel_e_enum "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" #define gppwm_channel_e_GPPWM_AccelPedal 9 -#define gppwm_channel_e_GPPWM_AuxTemp1 6 -#define gppwm_channel_e_GPPWM_AuxTemp2 7 -#define gppwm_channel_e_GPPWM_Clt 2 -#define gppwm_channel_e_GPPWM_FuelLoad 4 -#define gppwm_channel_e_GPPWM_Iat 3 -#define gppwm_channel_e_GPPWM_IgnLoad 5 -#define gppwm_channel_e_GPPWM_Map 1 -#define gppwm_channel_e_GPPWM_Tps 0 +#define gppwm_channel_e_GPPWM_AuxLinear1 16 +#define gppwm_channel_e_GPPWM_AuxLinear2 17 +#define gppwm_channel_e_GPPWM_AuxTemp1 7 +#define gppwm_channel_e_GPPWM_AuxTemp2 8 +#define gppwm_channel_e_GPPWM_Clt 3 +#define gppwm_channel_e_GPPWM_EthanolPercent 15 +#define gppwm_channel_e_GPPWM_FuelLoad 5 +#define gppwm_channel_e_GPPWM_Iat 4 +#define gppwm_channel_e_GPPWM_IgnLoad 6 +#define gppwm_channel_e_GPPWM_Map 2 +#define gppwm_channel_e_GPPWM_Tps 1 #define gppwm_channel_e_GPPWM_Vbatt 10 -#define gppwm_channel_e_GPPWM_Zero 8 +#define gppwm_channel_e_GPPWM_VVT_1E 12 +#define gppwm_channel_e_GPPWM_VVT_1I 11 +#define gppwm_channel_e_GPPWM_VVT_2E 14 +#define gppwm_channel_e_GPPWM_VVT_2I 13 +#define gppwm_channel_e_GPPWM_Zero 0 #define gppwm_channel_size 92 #define GPPWM_CHANNELS 4 #define gppwm_compare_mode_e_GPPWM_GreaterThan 0 @@ -1925,7 +1932,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 960 -#define SIGNATURE_HASH 254213271 +#define SIGNATURE_HASH 3870530441 #define silentTriggerError_offset 1360 #define skippedWheelOnCam_offset 1360 #define slowAdcAlpha_offset 1600 @@ -2485,7 +2492,7 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2022.09.16.kin.254213271" +#define TS_SIGNATURE "rusEFI 2022.09.16.kin.3870530441" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' diff --git a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h index fa396c1155..128ca39be8 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 @@ -744,7 +744,7 @@ #define firingOrder_offset 372 #define fixedModeTiming_offset 404 #define fixedTiming_offset 1684 -#define FLASH_DATA_VERSION 10014 +#define FLASH_DATA_VERSION 10015 #define flexCranking_offset 1372 #define flexSensorPin_offset 844 #define forceO2Heating_offset 1372 @@ -1195,19 +1195,26 @@ #define gppwm4_pwmFrequency_offset 2844 #define gppwm4_rpmBins_offset 2858 #define gppwm4_table_offset 2866 -#define gppwm_channel_e_auto_enum 0="GPPWM_Tps",9="GPPWM_AccelPedal",6="GPPWM_AuxTemp1",7="GPPWM_AuxTemp2",2="GPPWM_Clt",4="GPPWM_FuelLoad",3="GPPWM_Iat",5="GPPWM_IgnLoad",1="GPPWM_Map",10="GPPWM_Vbatt",8="GPPWM_Zero" -#define gppwm_channel_e_enum "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +#define gppwm_channel_e_auto_enum 0="GPPWM_Zero",9="GPPWM_AccelPedal",16="GPPWM_AuxLinear1",17="GPPWM_AuxLinear2",7="GPPWM_AuxTemp1",8="GPPWM_AuxTemp2",3="GPPWM_Clt",15="GPPWM_EthanolPercent",5="GPPWM_FuelLoad",4="GPPWM_Iat",6="GPPWM_IgnLoad",2="GPPWM_Map",1="GPPWM_Tps",12="GPPWM_VVT_1E",11="GPPWM_VVT_1I",14="GPPWM_VVT_2E",13="GPPWM_VVT_2I",10="GPPWM_Vbatt" +#define gppwm_channel_e_enum "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" #define gppwm_channel_e_GPPWM_AccelPedal 9 -#define gppwm_channel_e_GPPWM_AuxTemp1 6 -#define gppwm_channel_e_GPPWM_AuxTemp2 7 -#define gppwm_channel_e_GPPWM_Clt 2 -#define gppwm_channel_e_GPPWM_FuelLoad 4 -#define gppwm_channel_e_GPPWM_Iat 3 -#define gppwm_channel_e_GPPWM_IgnLoad 5 -#define gppwm_channel_e_GPPWM_Map 1 -#define gppwm_channel_e_GPPWM_Tps 0 +#define gppwm_channel_e_GPPWM_AuxLinear1 16 +#define gppwm_channel_e_GPPWM_AuxLinear2 17 +#define gppwm_channel_e_GPPWM_AuxTemp1 7 +#define gppwm_channel_e_GPPWM_AuxTemp2 8 +#define gppwm_channel_e_GPPWM_Clt 3 +#define gppwm_channel_e_GPPWM_EthanolPercent 15 +#define gppwm_channel_e_GPPWM_FuelLoad 5 +#define gppwm_channel_e_GPPWM_Iat 4 +#define gppwm_channel_e_GPPWM_IgnLoad 6 +#define gppwm_channel_e_GPPWM_Map 2 +#define gppwm_channel_e_GPPWM_Tps 1 #define gppwm_channel_e_GPPWM_Vbatt 10 -#define gppwm_channel_e_GPPWM_Zero 8 +#define gppwm_channel_e_GPPWM_VVT_1E 12 +#define gppwm_channel_e_GPPWM_VVT_1I 11 +#define gppwm_channel_e_GPPWM_VVT_2E 14 +#define gppwm_channel_e_GPPWM_VVT_2I 13 +#define gppwm_channel_e_GPPWM_Zero 0 #define gppwm_channel_size 92 #define GPPWM_CHANNELS 4 #define gppwm_compare_mode_e_GPPWM_GreaterThan 0 @@ -1891,7 +1898,7 @@ #define show_Proteus_presets false #define show_test_presets false #define showHumanReadableWarning_offset 960 -#define SIGNATURE_HASH 519014273 +#define SIGNATURE_HASH 4152025247 #define silentTriggerError_offset 1360 #define skippedWheelOnCam_offset 1360 #define slowAdcAlpha_offset 1600 @@ -2452,7 +2459,7 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2022.09.16.subaru_eg33_f7.519014273" +#define TS_SIGNATURE "rusEFI 2022.09.16.subaru_eg33_f7.4152025247" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' diff --git a/firmware/controllers/algo/auto_generated_commonenum.cpp b/firmware/controllers/algo/auto_generated_commonenum.cpp index 03a9f1d622..334ceb3c83 100644 --- a/firmware/controllers/algo/auto_generated_commonenum.cpp +++ b/firmware/controllers/algo/auto_generated_commonenum.cpp @@ -1,6 +1,6 @@ #include "global.h" #include "rusefi_enums.h" -// was generated automatically by rusEFI tool from rusefi_enums.h // by enum2string.jar tool on Sun Sep 11 07:52:24 UTC 2022 +// was generated automatically by rusEFI tool from rusefi_enums.h // by enum2string.jar tool on Fri Sep 16 20:09:28 UTC 2022 // see also gen_config_and_enums.bat @@ -356,12 +356,18 @@ const char *getGppwm_channel_e(gppwm_channel_e value){ switch(value) { case GPPWM_AccelPedal: return "GPPWM_AccelPedal"; +case GPPWM_AuxLinear1: + return "GPPWM_AuxLinear1"; +case GPPWM_AuxLinear2: + return "GPPWM_AuxLinear2"; case GPPWM_AuxTemp1: return "GPPWM_AuxTemp1"; case GPPWM_AuxTemp2: return "GPPWM_AuxTemp2"; case GPPWM_Clt: return "GPPWM_Clt"; +case GPPWM_EthanolPercent: + return "GPPWM_EthanolPercent"; case GPPWM_FuelLoad: return "GPPWM_FuelLoad"; case GPPWM_Iat: @@ -372,6 +378,14 @@ case GPPWM_Map: return "GPPWM_Map"; case GPPWM_Tps: return "GPPWM_Tps"; +case GPPWM_VVT_1E: + return "GPPWM_VVT_1E"; +case GPPWM_VVT_1I: + return "GPPWM_VVT_1I"; +case GPPWM_VVT_2E: + return "GPPWM_VVT_2E"; +case GPPWM_VVT_2I: + return "GPPWM_VVT_2I"; case GPPWM_Vbatt: return "GPPWM_Vbatt"; case GPPWM_Zero: diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index a88235a2ea..d266b601e2 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -734,7 +734,7 @@ #define firingOrder_offset 372 #define fixedModeTiming_offset 404 #define fixedTiming_offset 1684 -#define FLASH_DATA_VERSION 10014 +#define FLASH_DATA_VERSION 10015 #define flexCranking_offset 1372 #define flexSensorPin_offset 844 #define forceO2Heating_offset 1372 @@ -1231,19 +1231,26 @@ #define gppwm4_pwmFrequency_offset 2844 #define gppwm4_rpmBins_offset 2858 #define gppwm4_table_offset 2866 -#define gppwm_channel_e_auto_enum 0="GPPWM_Tps",9="GPPWM_AccelPedal",6="GPPWM_AuxTemp1",7="GPPWM_AuxTemp2",2="GPPWM_Clt",4="GPPWM_FuelLoad",3="GPPWM_Iat",5="GPPWM_IgnLoad",1="GPPWM_Map",10="GPPWM_Vbatt",8="GPPWM_Zero" -#define gppwm_channel_e_enum "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +#define gppwm_channel_e_auto_enum 0="GPPWM_Zero",9="GPPWM_AccelPedal",16="GPPWM_AuxLinear1",17="GPPWM_AuxLinear2",7="GPPWM_AuxTemp1",8="GPPWM_AuxTemp2",3="GPPWM_Clt",15="GPPWM_EthanolPercent",5="GPPWM_FuelLoad",4="GPPWM_Iat",6="GPPWM_IgnLoad",2="GPPWM_Map",1="GPPWM_Tps",12="GPPWM_VVT_1E",11="GPPWM_VVT_1I",14="GPPWM_VVT_2E",13="GPPWM_VVT_2I",10="GPPWM_Vbatt" +#define gppwm_channel_e_enum "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" #define gppwm_channel_e_GPPWM_AccelPedal 9 -#define gppwm_channel_e_GPPWM_AuxTemp1 6 -#define gppwm_channel_e_GPPWM_AuxTemp2 7 -#define gppwm_channel_e_GPPWM_Clt 2 -#define gppwm_channel_e_GPPWM_FuelLoad 4 -#define gppwm_channel_e_GPPWM_Iat 3 -#define gppwm_channel_e_GPPWM_IgnLoad 5 -#define gppwm_channel_e_GPPWM_Map 1 -#define gppwm_channel_e_GPPWM_Tps 0 +#define gppwm_channel_e_GPPWM_AuxLinear1 16 +#define gppwm_channel_e_GPPWM_AuxLinear2 17 +#define gppwm_channel_e_GPPWM_AuxTemp1 7 +#define gppwm_channel_e_GPPWM_AuxTemp2 8 +#define gppwm_channel_e_GPPWM_Clt 3 +#define gppwm_channel_e_GPPWM_EthanolPercent 15 +#define gppwm_channel_e_GPPWM_FuelLoad 5 +#define gppwm_channel_e_GPPWM_Iat 4 +#define gppwm_channel_e_GPPWM_IgnLoad 6 +#define gppwm_channel_e_GPPWM_Map 2 +#define gppwm_channel_e_GPPWM_Tps 1 #define gppwm_channel_e_GPPWM_Vbatt 10 -#define gppwm_channel_e_GPPWM_Zero 8 +#define gppwm_channel_e_GPPWM_VVT_1E 12 +#define gppwm_channel_e_GPPWM_VVT_1I 11 +#define gppwm_channel_e_GPPWM_VVT_2E 14 +#define gppwm_channel_e_GPPWM_VVT_2I 13 +#define gppwm_channel_e_GPPWM_Zero 0 #define gppwm_channel_size 92 #define GPPWM_CHANNELS 4 #define gppwm_compare_mode_e_GPPWM_GreaterThan 0 @@ -1925,7 +1932,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 960 -#define SIGNATURE_HASH 1743871579 +#define SIGNATURE_HASH 2388932933 #define silentTriggerError_offset 1360 #define skippedWheelOnCam_offset 1360 #define slowAdcAlpha_offset 1600 @@ -2485,7 +2492,7 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2022.09.16.all.1743871579" +#define TS_SIGNATURE "rusEFI 2022.09.16.all.2388932933" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' diff --git a/firmware/controllers/generated/signature_48way.h b/firmware/controllers/generated/signature_48way.h index 6b906cee0a..cc45f8b5f6 100644 --- a/firmware/controllers/generated/signature_48way.h +++ b/firmware/controllers/generated/signature_48way.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1893094932 -#define TS_SIGNATURE "rusEFI 2022.09.16.48way.1893094932" +#define SIGNATURE_HASH 2571317514 +#define TS_SIGNATURE "rusEFI 2022.09.16.48way.2571317514" diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index 38bbe0cbf1..c09d3828e3 100644 --- a/firmware/controllers/generated/signature_all.h +++ b/firmware/controllers/generated/signature_all.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1743871579 -#define TS_SIGNATURE "rusEFI 2022.09.16.all.1743871579" +#define SIGNATURE_HASH 2388932933 +#define TS_SIGNATURE "rusEFI 2022.09.16.all.2388932933" diff --git a/firmware/controllers/generated/signature_alphax-2chan.h b/firmware/controllers/generated/signature_alphax-2chan.h index ce2c45e20f..1dc2f89eb3 100644 --- a/firmware/controllers/generated/signature_alphax-2chan.h +++ b/firmware/controllers/generated/signature_alphax-2chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1440990007 -#define TS_SIGNATURE "rusEFI 2022.09.16.alphax-2chan.1440990007" +#define SIGNATURE_HASH 3161891881 +#define TS_SIGNATURE "rusEFI 2022.09.16.alphax-2chan.3161891881" diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h index 21b91e8de9..b79c84e5b3 100644 --- a/firmware/controllers/generated/signature_alphax-4chan.h +++ b/firmware/controllers/generated/signature_alphax-4chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3974995412 -#define TS_SIGNATURE "rusEFI 2022.09.16.alphax-4chan.3974995412" +#define SIGNATURE_HASH 91814602 +#define TS_SIGNATURE "rusEFI 2022.09.16.alphax-4chan.91814602" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index 5e03b13b08..0af3179d72 100644 --- a/firmware/controllers/generated/signature_atlas.h +++ b/firmware/controllers/generated/signature_atlas.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2067508092 -#define TS_SIGNATURE "rusEFI 2022.09.16.atlas.2067508092" +#define SIGNATURE_HASH 2460929122 +#define TS_SIGNATURE "rusEFI 2022.09.16.atlas.2460929122" diff --git a/firmware/controllers/generated/signature_core8.h b/firmware/controllers/generated/signature_core8.h index e7c33cf517..dc145bb9ed 100644 --- a/firmware/controllers/generated/signature_core8.h +++ b/firmware/controllers/generated/signature_core8.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2434600866 -#define TS_SIGNATURE "rusEFI 2022.09.16.core8.2434600866" +#define SIGNATURE_HASH 2022205628 +#define TS_SIGNATURE "rusEFI 2022.09.16.core8.2022205628" diff --git a/firmware/controllers/generated/signature_cypress.h b/firmware/controllers/generated/signature_cypress.h index d1ce3be834..b6ca8aa450 100644 --- a/firmware/controllers/generated/signature_cypress.h +++ b/firmware/controllers/generated/signature_cypress.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat null // -#define SIGNATURE_HASH 1743871579 -#define TS_SIGNATURE "rusEFI 2022.09.16.cypress.1743871579" +#define SIGNATURE_HASH 2388932933 +#define TS_SIGNATURE "rusEFI 2022.09.16.cypress.2388932933" diff --git a/firmware/controllers/generated/signature_f407-discovery.h b/firmware/controllers/generated/signature_f407-discovery.h index f11b85818c..4a41a0ca50 100644 --- a/firmware/controllers/generated/signature_f407-discovery.h +++ b/firmware/controllers/generated/signature_f407-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1743871579 -#define TS_SIGNATURE "rusEFI 2022.09.16.f407-discovery.1743871579" +#define SIGNATURE_HASH 2388932933 +#define TS_SIGNATURE "rusEFI 2022.09.16.f407-discovery.2388932933" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index 3b193a5d30..584b66acb2 100644 --- a/firmware/controllers/generated/signature_f429-discovery.h +++ b/firmware/controllers/generated/signature_f429-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1743871579 -#define TS_SIGNATURE "rusEFI 2022.09.16.f429-discovery.1743871579" +#define SIGNATURE_HASH 2388932933 +#define TS_SIGNATURE "rusEFI 2022.09.16.f429-discovery.2388932933" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 6c8f5a8368..62bc2bdf4a 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 631087775 -#define TS_SIGNATURE "rusEFI 2022.09.16.frankenso_na6.631087775" +#define SIGNATURE_HASH 3423126913 +#define TS_SIGNATURE "rusEFI 2022.09.16.frankenso_na6.3423126913" diff --git a/firmware/controllers/generated/signature_harley81.h b/firmware/controllers/generated/signature_harley81.h index dafde00159..3e7d2df42b 100644 --- a/firmware/controllers/generated/signature_harley81.h +++ b/firmware/controllers/generated/signature_harley81.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2534169460 -#define TS_SIGNATURE "rusEFI 2022.09.16.harley81.2534169460" +#define SIGNATURE_HASH 2123971690 +#define TS_SIGNATURE "rusEFI 2022.09.16.harley81.2123971690" diff --git a/firmware/controllers/generated/signature_hellen-gm-e67.h b/firmware/controllers/generated/signature_hellen-gm-e67.h index 582473a0f4..e4a3f9b9a0 100644 --- a/firmware/controllers/generated/signature_hellen-gm-e67.h +++ b/firmware/controllers/generated/signature_hellen-gm-e67.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3549879277 -#define TS_SIGNATURE "rusEFI 2022.09.16.hellen-gm-e67.3549879277" +#define SIGNATURE_HASH 973323507 +#define TS_SIGNATURE "rusEFI 2022.09.16.hellen-gm-e67.973323507" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index 953091e229..3915823646 100644 --- a/firmware/controllers/generated/signature_hellen-nb1.h +++ b/firmware/controllers/generated/signature_hellen-nb1.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3195694999 -#define TS_SIGNATURE "rusEFI 2022.09.16.hellen-nb1.3195694999" +#define SIGNATURE_HASH 1475283081 +#define TS_SIGNATURE "rusEFI 2022.09.16.hellen-nb1.1475283081" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index 6d5ca6c165..4cf6c90fa7 100644 --- a/firmware/controllers/generated/signature_hellen121nissan.h +++ b/firmware/controllers/generated/signature_hellen121nissan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 4012893873 -#define TS_SIGNATURE "rusEFI 2022.09.16.hellen121nissan.4012893873" +#define SIGNATURE_HASH 112886191 +#define TS_SIGNATURE "rusEFI 2022.09.16.hellen121nissan.112886191" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index 9fdb5fa847..e41e4204e7 100644 --- a/firmware/controllers/generated/signature_hellen121vag.h +++ b/firmware/controllers/generated/signature_hellen121vag.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 399547681 -#define TS_SIGNATURE "rusEFI 2022.09.16.hellen121vag.399547681" +#define SIGNATURE_HASH 4265998911 +#define TS_SIGNATURE "rusEFI 2022.09.16.hellen121vag.4265998911" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index 1eb3d16a89..7b6cdd8d46 100644 --- a/firmware/controllers/generated/signature_hellen128.h +++ b/firmware/controllers/generated/signature_hellen128.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2567922533 -#define TS_SIGNATURE "rusEFI 2022.09.16.hellen128.2567922533" +#define SIGNATURE_HASH 1889141883 +#define TS_SIGNATURE "rusEFI 2022.09.16.hellen128.1889141883" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index e28396e857..c8282fb8a0 100644 --- a/firmware/controllers/generated/signature_hellen154hyundai.h +++ b/firmware/controllers/generated/signature_hellen154hyundai.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 4290653407 -#define TS_SIGNATURE "rusEFI 2022.09.16.hellen154hyundai.4290653407" +#define SIGNATURE_HASH 371936193 +#define TS_SIGNATURE "rusEFI 2022.09.16.hellen154hyundai.371936193" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index 296f7a8e38..266586d411 100644 --- a/firmware/controllers/generated/signature_hellen72.h +++ b/firmware/controllers/generated/signature_hellen72.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2513336159 -#define TS_SIGNATURE "rusEFI 2022.09.16.hellen72.2513336159" +#define SIGNATURE_HASH 2086342721 +#define TS_SIGNATURE "rusEFI 2022.09.16.hellen72.2086342721" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index 61a99fe3df..7d02cd903e 100644 --- a/firmware/controllers/generated/signature_hellen81.h +++ b/firmware/controllers/generated/signature_hellen81.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1162118737 -#define TS_SIGNATURE "rusEFI 2022.09.16.hellen81.1162118737" +#define SIGNATURE_HASH 2899435855 +#define TS_SIGNATURE "rusEFI 2022.09.16.hellen81.2899435855" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index 6cad9534f8..4d292b80a5 100644 --- a/firmware/controllers/generated/signature_hellen88bmw.h +++ b/firmware/controllers/generated/signature_hellen88bmw.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1912884631 -#define TS_SIGNATURE "rusEFI 2022.09.16.hellen88bmw.1912884631" +#define SIGNATURE_HASH 2609982089 +#define TS_SIGNATURE "rusEFI 2022.09.16.hellen88bmw.2609982089" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index ea42c28c5c..e2dbcfbb16 100644 --- a/firmware/controllers/generated/signature_hellenNA6.h +++ b/firmware/controllers/generated/signature_hellenNA6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2718105817 -#define TS_SIGNATURE "rusEFI 2022.09.16.hellenNA6.2718105817" +#define SIGNATURE_HASH 1268148167 +#define TS_SIGNATURE "rusEFI 2022.09.16.hellenNA6.1268148167" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index d505176fca..ee8fd5f7c0 100644 --- a/firmware/controllers/generated/signature_hellenNA8_96.h +++ b/firmware/controllers/generated/signature_hellenNA8_96.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3354980275 -#define TS_SIGNATURE "rusEFI 2022.09.16.hellenNA8_96.3354980275" +#define SIGNATURE_HASH 778930349 +#define TS_SIGNATURE "rusEFI 2022.09.16.hellenNA8_96.778930349" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 4efeed6119..f1fae0f47c 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat null // -#define SIGNATURE_HASH 254213271 -#define TS_SIGNATURE "rusEFI 2022.09.16.kin.254213271" +#define SIGNATURE_HASH 3870530441 +#define TS_SIGNATURE "rusEFI 2022.09.16.kin.3870530441" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index c54ef1167a..0ee7758bae 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2821182125 -#define TS_SIGNATURE "rusEFI 2022.09.16.mre_f4.2821182125" +#define SIGNATURE_HASH 1102230963 +#define TS_SIGNATURE "rusEFI 2022.09.16.mre_f4.1102230963" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 7da66bc01c..7bc3826db4 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2821182125 -#define TS_SIGNATURE "rusEFI 2022.09.16.mre_f7.2821182125" +#define SIGNATURE_HASH 1102230963 +#define TS_SIGNATURE "rusEFI 2022.09.16.mre_f7.1102230963" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index aaa9240e6f..5ff30e4d35 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 924551101 -#define TS_SIGNATURE "rusEFI 2022.09.16.prometheus_405.924551101" +#define SIGNATURE_HASH 3733905571 +#define TS_SIGNATURE "rusEFI 2022.09.16.prometheus_405.3733905571" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 0c367f7cf2..f4fa56757f 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 924551101 -#define TS_SIGNATURE "rusEFI 2022.09.16.prometheus_469.924551101" +#define SIGNATURE_HASH 3733905571 +#define TS_SIGNATURE "rusEFI 2022.09.16.prometheus_469.3733905571" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 416eb61375..b4a5a44f50 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3258751277 -#define TS_SIGNATURE "rusEFI 2022.09.16.proteus_f4.3258751277" +#define SIGNATURE_HASH 732560947 +#define TS_SIGNATURE "rusEFI 2022.09.16.proteus_f4.732560947" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 9afb4857a6..e2c8828060 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3258751277 -#define TS_SIGNATURE "rusEFI 2022.09.16.proteus_f7.3258751277" +#define SIGNATURE_HASH 732560947 +#define TS_SIGNATURE "rusEFI 2022.09.16.proteus_f7.732560947" diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h index 6573fea819..c6149c4152 100644 --- a/firmware/controllers/generated/signature_proteus_h7.h +++ b/firmware/controllers/generated/signature_proteus_h7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3258751277 -#define TS_SIGNATURE "rusEFI 2022.09.16.proteus_h7.3258751277" +#define SIGNATURE_HASH 732560947 +#define TS_SIGNATURE "rusEFI 2022.09.16.proteus_h7.732560947" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index 2e2c5541d8..0e4d9f9047 100644 --- a/firmware/controllers/generated/signature_subaru_eg33_f7.h +++ b/firmware/controllers/generated/signature_subaru_eg33_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh null // -#define SIGNATURE_HASH 519014273 -#define TS_SIGNATURE "rusEFI 2022.09.16.subaru_eg33_f7.519014273" +#define SIGNATURE_HASH 4152025247 +#define TS_SIGNATURE "rusEFI 2022.09.16.subaru_eg33_f7.4152025247" diff --git a/firmware/controllers/generated/signature_tdg-pdm8.h b/firmware/controllers/generated/signature_tdg-pdm8.h index 9d9fbcf29f..3f26c02bda 100644 --- a/firmware/controllers/generated/signature_tdg-pdm8.h +++ b/firmware/controllers/generated/signature_tdg-pdm8.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3455684623 -#define TS_SIGNATURE "rusEFI 2022.09.16.tdg-pdm8.3455684623" +#define SIGNATURE_HASH 611120913 +#define TS_SIGNATURE "rusEFI 2022.09.16.tdg-pdm8.611120913" diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index 1652c9bc82..211b266042 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 2022.09.16.all.1743871579" + signature = "rusEFI 2022.09.16.all.2388932933" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.16.all.1743871579" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.16.all.2388932933" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Sep 16 01:34:26 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Sep 16 20:10:31 UTC 2022 pageSize = 21296 page = 1 @@ -1047,7 +1047,7 @@ gppwm1_dutyIfError = scalar, U08, 2566, "%", 1, 0, 0, 100, 0 gppwm1_pwmFrequency = scalar, U16, 2568, "hz", 1, 0, 0, 500, 0 gppwm1_onAboveDuty = scalar, U08, 2570, "%", 1, 0, 0, 100, 0 gppwm1_offBelowDuty = scalar, U08, 2571, "%", 1, 0, 0, 100, 0 -gppwm1_loadAxis = bits, U08, 2572, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm1_loadAxis = bits, U08, 2572, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm1_alignmentFill_map = scalar, U08, 2573, "unit", 1, 0, 0, 100, 0 gppwm1_loadBins = array, U08, 2574, [8], "load", 1, 0, 0, 250, 0 gppwm1_rpmBins = array, U08, 2582, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1057,7 +1057,7 @@ gppwm2_dutyIfError = scalar, U08, 2658, "%", 1, 0, 0, 100, 0 gppwm2_pwmFrequency = scalar, U16, 2660, "hz", 1, 0, 0, 500, 0 gppwm2_onAboveDuty = scalar, U08, 2662, "%", 1, 0, 0, 100, 0 gppwm2_offBelowDuty = scalar, U08, 2663, "%", 1, 0, 0, 100, 0 -gppwm2_loadAxis = bits, U08, 2664, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm2_loadAxis = bits, U08, 2664, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm2_alignmentFill_map = scalar, U08, 2665, "unit", 1, 0, 0, 100, 0 gppwm2_loadBins = array, U08, 2666, [8], "load", 1, 0, 0, 250, 0 gppwm2_rpmBins = array, U08, 2674, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1067,7 +1067,7 @@ gppwm3_dutyIfError = scalar, U08, 2750, "%", 1, 0, 0, 100, 0 gppwm3_pwmFrequency = scalar, U16, 2752, "hz", 1, 0, 0, 500, 0 gppwm3_onAboveDuty = scalar, U08, 2754, "%", 1, 0, 0, 100, 0 gppwm3_offBelowDuty = scalar, U08, 2755, "%", 1, 0, 0, 100, 0 -gppwm3_loadAxis = bits, U08, 2756, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm3_loadAxis = bits, U08, 2756, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm3_alignmentFill_map = scalar, U08, 2757, "unit", 1, 0, 0, 100, 0 gppwm3_loadBins = array, U08, 2758, [8], "load", 1, 0, 0, 250, 0 gppwm3_rpmBins = array, U08, 2766, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1077,7 +1077,7 @@ gppwm4_dutyIfError = scalar, U08, 2842, "%", 1, 0, 0, 100, 0 gppwm4_pwmFrequency = scalar, U16, 2844, "hz", 1, 0, 0, 500, 0 gppwm4_onAboveDuty = scalar, U08, 2846, "%", 1, 0, 0, 100, 0 gppwm4_offBelowDuty = scalar, U08, 2847, "%", 1, 0, 0, 100, 0 -gppwm4_loadAxis = bits, U08, 2848, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm4_loadAxis = bits, U08, 2848, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm4_alignmentFill_map = scalar, U08, 2849, "unit", 1, 0, 0, 100, 0 gppwm4_loadBins = array, U08, 2850, [8], "load", 1, 0, 0, 250, 0 gppwm4_rpmBins = array, U08, 2858, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -3259,10 +3259,10 @@ esr = scalar, U16, 1244, "", 1, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } ; These "synthetic" channels provide the Y-axis (load) value for gen purp PWM table's Y axes - gppwm1_load = {(gppwm1_loadAxis == 0) ? TPSValue : ((gppwm1_loadAxis == 1) ? MAPValue : ((gppwm1_loadAxis == 2) ? coolant : ((gppwm1_loadAxis == 3) ? intake : ((gppwm1_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm2_load = {(gppwm2_loadAxis == 0) ? TPSValue : ((gppwm2_loadAxis == 1) ? MAPValue : ((gppwm2_loadAxis == 2) ? coolant : ((gppwm2_loadAxis == 3) ? intake : ((gppwm2_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm3_load = {(gppwm3_loadAxis == 0) ? TPSValue : ((gppwm3_loadAxis == 1) ? MAPValue : ((gppwm3_loadAxis == 2) ? coolant : ((gppwm3_loadAxis == 3) ? intake : ((gppwm3_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm4_load = {(gppwm4_loadAxis == 0) ? TPSValue : ((gppwm4_loadAxis == 1) ? MAPValue : ((gppwm4_loadAxis == 2) ? coolant : ((gppwm4_loadAxis == 3) ? intake : ((gppwm4_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} + gppwm1_load = {(gppwm1_loadAxis == 0) ? 0 : (gppwm1_loadAxis == 1) ? TPSValue : (gppwm1_loadAxis == 2) ? MAPValue : (gppwm1_loadAxis == 3) ? coolant : (gppwm1_loadAxis == 4) ? intake : (gppwm1_loadAxis == 5) ? fuelingLoad : (gppwm1_loadAxis == 6) ? ignitionLoad : (gppwm1_loadAxis == 7) ? auxTemp1 : (gppwm1_loadAxis == 8) ? auxTemp2 : (gppwm1_loadAxis == 9) ? throttlePedalPosition : (gppwm1_loadAxis == 10) ? VBatt : (gppwm1_loadAxis == 11) ? vvtPositionB1I : (gppwm1_loadAxis == 12) ? vvtPositionB1E : (gppwm1_loadAxis == 13) ? vvtPositionB2I : (gppwm1_loadAxis == 14) ? vvtPositionB2E : (gppwm1_loadAxis == 15) ? flexPercent : (gppwm1_loadAxis == 16) ? auxLinear1 : (gppwm1_loadAxis == 17) ? auxLinear2 : 0} + gppwm2_load = {(gppwm2_loadAxis == 0) ? 0 : (gppwm2_loadAxis == 1) ? TPSValue : (gppwm2_loadAxis == 2) ? MAPValue : (gppwm2_loadAxis == 3) ? coolant : (gppwm2_loadAxis == 4) ? intake : (gppwm2_loadAxis == 5) ? fuelingLoad : (gppwm2_loadAxis == 6) ? ignitionLoad : (gppwm2_loadAxis == 7) ? auxTemp1 : (gppwm2_loadAxis == 8) ? auxTemp2 : (gppwm2_loadAxis == 9) ? throttlePedalPosition : (gppwm2_loadAxis == 10) ? VBatt : (gppwm2_loadAxis == 11) ? vvtPositionB1I : (gppwm2_loadAxis == 12) ? vvtPositionB1E : (gppwm2_loadAxis == 13) ? vvtPositionB2I : (gppwm2_loadAxis == 14) ? vvtPositionB2E : (gppwm2_loadAxis == 15) ? flexPercent : (gppwm2_loadAxis == 16) ? auxLinear1 : (gppwm2_loadAxis == 17) ? auxLinear2 : 0} + gppwm3_load = {(gppwm3_loadAxis == 0) ? 0 : (gppwm3_loadAxis == 1) ? TPSValue : (gppwm3_loadAxis == 2) ? MAPValue : (gppwm3_loadAxis == 3) ? coolant : (gppwm3_loadAxis == 4) ? intake : (gppwm3_loadAxis == 5) ? fuelingLoad : (gppwm3_loadAxis == 6) ? ignitionLoad : (gppwm3_loadAxis == 7) ? auxTemp1 : (gppwm3_loadAxis == 8) ? auxTemp2 : (gppwm3_loadAxis == 9) ? throttlePedalPosition : (gppwm3_loadAxis == 10) ? VBatt : (gppwm3_loadAxis == 11) ? vvtPositionB1I : (gppwm3_loadAxis == 12) ? vvtPositionB1E : (gppwm3_loadAxis == 13) ? vvtPositionB2I : (gppwm3_loadAxis == 14) ? vvtPositionB2E : (gppwm3_loadAxis == 15) ? flexPercent : (gppwm3_loadAxis == 16) ? auxLinear1 : (gppwm3_loadAxis == 17) ? auxLinear2 : 0} + gppwm4_load = {(gppwm4_loadAxis == 0) ? 0 : (gppwm4_loadAxis == 1) ? TPSValue : (gppwm4_loadAxis == 2) ? MAPValue : (gppwm4_loadAxis == 3) ? coolant : (gppwm4_loadAxis == 4) ? intake : (gppwm4_loadAxis == 5) ? fuelingLoad : (gppwm4_loadAxis == 6) ? ignitionLoad : (gppwm4_loadAxis == 7) ? auxTemp1 : (gppwm4_loadAxis == 8) ? auxTemp2 : (gppwm4_loadAxis == 9) ? throttlePedalPosition : (gppwm4_loadAxis == 10) ? VBatt : (gppwm4_loadAxis == 11) ? vvtPositionB1I : (gppwm4_loadAxis == 12) ? vvtPositionB1E : (gppwm4_loadAxis == 13) ? vvtPositionB2I : (gppwm4_loadAxis == 14) ? vvtPositionB2E : (gppwm4_loadAxis == 15) ? flexPercent : (gppwm4_loadAxis == 16) ? auxLinear1 : (gppwm4_loadAxis == 17) ? auxLinear2 : 0} [PcVariables] tuneCrcPcVariable = continuousChannelValue, tuneCrc16 diff --git a/firmware/tunerstudio/generated/rusefi_48way.ini b/firmware/tunerstudio/generated/rusefi_48way.ini index 990b826ad2..55d25a404f 100644 --- a/firmware/tunerstudio/generated/rusefi_48way.ini +++ b/firmware/tunerstudio/generated/rusefi_48way.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.09.16.48way.1893094932" + signature = "rusEFI 2022.09.16.48way.2571317514" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.16.48way.1893094932" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.16.48way.2571317514" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Sep 16 01:34:03 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Sep 16 20:10:10 UTC 2022 pageSize = 21296 page = 1 @@ -1047,7 +1047,7 @@ gppwm1_dutyIfError = scalar, U08, 2566, "%", 1, 0, 0, 100, 0 gppwm1_pwmFrequency = scalar, U16, 2568, "hz", 1, 0, 0, 500, 0 gppwm1_onAboveDuty = scalar, U08, 2570, "%", 1, 0, 0, 100, 0 gppwm1_offBelowDuty = scalar, U08, 2571, "%", 1, 0, 0, 100, 0 -gppwm1_loadAxis = bits, U08, 2572, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm1_loadAxis = bits, U08, 2572, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm1_alignmentFill_map = scalar, U08, 2573, "unit", 1, 0, 0, 100, 0 gppwm1_loadBins = array, U08, 2574, [8], "load", 1, 0, 0, 250, 0 gppwm1_rpmBins = array, U08, 2582, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1057,7 +1057,7 @@ gppwm2_dutyIfError = scalar, U08, 2658, "%", 1, 0, 0, 100, 0 gppwm2_pwmFrequency = scalar, U16, 2660, "hz", 1, 0, 0, 500, 0 gppwm2_onAboveDuty = scalar, U08, 2662, "%", 1, 0, 0, 100, 0 gppwm2_offBelowDuty = scalar, U08, 2663, "%", 1, 0, 0, 100, 0 -gppwm2_loadAxis = bits, U08, 2664, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm2_loadAxis = bits, U08, 2664, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm2_alignmentFill_map = scalar, U08, 2665, "unit", 1, 0, 0, 100, 0 gppwm2_loadBins = array, U08, 2666, [8], "load", 1, 0, 0, 250, 0 gppwm2_rpmBins = array, U08, 2674, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1067,7 +1067,7 @@ gppwm3_dutyIfError = scalar, U08, 2750, "%", 1, 0, 0, 100, 0 gppwm3_pwmFrequency = scalar, U16, 2752, "hz", 1, 0, 0, 500, 0 gppwm3_onAboveDuty = scalar, U08, 2754, "%", 1, 0, 0, 100, 0 gppwm3_offBelowDuty = scalar, U08, 2755, "%", 1, 0, 0, 100, 0 -gppwm3_loadAxis = bits, U08, 2756, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm3_loadAxis = bits, U08, 2756, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm3_alignmentFill_map = scalar, U08, 2757, "unit", 1, 0, 0, 100, 0 gppwm3_loadBins = array, U08, 2758, [8], "load", 1, 0, 0, 250, 0 gppwm3_rpmBins = array, U08, 2766, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1077,7 +1077,7 @@ gppwm4_dutyIfError = scalar, U08, 2842, "%", 1, 0, 0, 100, 0 gppwm4_pwmFrequency = scalar, U16, 2844, "hz", 1, 0, 0, 500, 0 gppwm4_onAboveDuty = scalar, U08, 2846, "%", 1, 0, 0, 100, 0 gppwm4_offBelowDuty = scalar, U08, 2847, "%", 1, 0, 0, 100, 0 -gppwm4_loadAxis = bits, U08, 2848, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm4_loadAxis = bits, U08, 2848, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm4_alignmentFill_map = scalar, U08, 2849, "unit", 1, 0, 0, 100, 0 gppwm4_loadBins = array, U08, 2850, [8], "load", 1, 0, 0, 250, 0 gppwm4_rpmBins = array, U08, 2858, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -3259,10 +3259,10 @@ esr = scalar, U16, 1244, "", 1, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } ; These "synthetic" channels provide the Y-axis (load) value for gen purp PWM table's Y axes - gppwm1_load = {(gppwm1_loadAxis == 0) ? TPSValue : ((gppwm1_loadAxis == 1) ? MAPValue : ((gppwm1_loadAxis == 2) ? coolant : ((gppwm1_loadAxis == 3) ? intake : ((gppwm1_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm2_load = {(gppwm2_loadAxis == 0) ? TPSValue : ((gppwm2_loadAxis == 1) ? MAPValue : ((gppwm2_loadAxis == 2) ? coolant : ((gppwm2_loadAxis == 3) ? intake : ((gppwm2_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm3_load = {(gppwm3_loadAxis == 0) ? TPSValue : ((gppwm3_loadAxis == 1) ? MAPValue : ((gppwm3_loadAxis == 2) ? coolant : ((gppwm3_loadAxis == 3) ? intake : ((gppwm3_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm4_load = {(gppwm4_loadAxis == 0) ? TPSValue : ((gppwm4_loadAxis == 1) ? MAPValue : ((gppwm4_loadAxis == 2) ? coolant : ((gppwm4_loadAxis == 3) ? intake : ((gppwm4_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} + gppwm1_load = {(gppwm1_loadAxis == 0) ? 0 : (gppwm1_loadAxis == 1) ? TPSValue : (gppwm1_loadAxis == 2) ? MAPValue : (gppwm1_loadAxis == 3) ? coolant : (gppwm1_loadAxis == 4) ? intake : (gppwm1_loadAxis == 5) ? fuelingLoad : (gppwm1_loadAxis == 6) ? ignitionLoad : (gppwm1_loadAxis == 7) ? auxTemp1 : (gppwm1_loadAxis == 8) ? auxTemp2 : (gppwm1_loadAxis == 9) ? throttlePedalPosition : (gppwm1_loadAxis == 10) ? VBatt : (gppwm1_loadAxis == 11) ? vvtPositionB1I : (gppwm1_loadAxis == 12) ? vvtPositionB1E : (gppwm1_loadAxis == 13) ? vvtPositionB2I : (gppwm1_loadAxis == 14) ? vvtPositionB2E : (gppwm1_loadAxis == 15) ? flexPercent : (gppwm1_loadAxis == 16) ? auxLinear1 : (gppwm1_loadAxis == 17) ? auxLinear2 : 0} + gppwm2_load = {(gppwm2_loadAxis == 0) ? 0 : (gppwm2_loadAxis == 1) ? TPSValue : (gppwm2_loadAxis == 2) ? MAPValue : (gppwm2_loadAxis == 3) ? coolant : (gppwm2_loadAxis == 4) ? intake : (gppwm2_loadAxis == 5) ? fuelingLoad : (gppwm2_loadAxis == 6) ? ignitionLoad : (gppwm2_loadAxis == 7) ? auxTemp1 : (gppwm2_loadAxis == 8) ? auxTemp2 : (gppwm2_loadAxis == 9) ? throttlePedalPosition : (gppwm2_loadAxis == 10) ? VBatt : (gppwm2_loadAxis == 11) ? vvtPositionB1I : (gppwm2_loadAxis == 12) ? vvtPositionB1E : (gppwm2_loadAxis == 13) ? vvtPositionB2I : (gppwm2_loadAxis == 14) ? vvtPositionB2E : (gppwm2_loadAxis == 15) ? flexPercent : (gppwm2_loadAxis == 16) ? auxLinear1 : (gppwm2_loadAxis == 17) ? auxLinear2 : 0} + gppwm3_load = {(gppwm3_loadAxis == 0) ? 0 : (gppwm3_loadAxis == 1) ? TPSValue : (gppwm3_loadAxis == 2) ? MAPValue : (gppwm3_loadAxis == 3) ? coolant : (gppwm3_loadAxis == 4) ? intake : (gppwm3_loadAxis == 5) ? fuelingLoad : (gppwm3_loadAxis == 6) ? ignitionLoad : (gppwm3_loadAxis == 7) ? auxTemp1 : (gppwm3_loadAxis == 8) ? auxTemp2 : (gppwm3_loadAxis == 9) ? throttlePedalPosition : (gppwm3_loadAxis == 10) ? VBatt : (gppwm3_loadAxis == 11) ? vvtPositionB1I : (gppwm3_loadAxis == 12) ? vvtPositionB1E : (gppwm3_loadAxis == 13) ? vvtPositionB2I : (gppwm3_loadAxis == 14) ? vvtPositionB2E : (gppwm3_loadAxis == 15) ? flexPercent : (gppwm3_loadAxis == 16) ? auxLinear1 : (gppwm3_loadAxis == 17) ? auxLinear2 : 0} + gppwm4_load = {(gppwm4_loadAxis == 0) ? 0 : (gppwm4_loadAxis == 1) ? TPSValue : (gppwm4_loadAxis == 2) ? MAPValue : (gppwm4_loadAxis == 3) ? coolant : (gppwm4_loadAxis == 4) ? intake : (gppwm4_loadAxis == 5) ? fuelingLoad : (gppwm4_loadAxis == 6) ? ignitionLoad : (gppwm4_loadAxis == 7) ? auxTemp1 : (gppwm4_loadAxis == 8) ? auxTemp2 : (gppwm4_loadAxis == 9) ? throttlePedalPosition : (gppwm4_loadAxis == 10) ? VBatt : (gppwm4_loadAxis == 11) ? vvtPositionB1I : (gppwm4_loadAxis == 12) ? vvtPositionB1E : (gppwm4_loadAxis == 13) ? vvtPositionB2I : (gppwm4_loadAxis == 14) ? vvtPositionB2E : (gppwm4_loadAxis == 15) ? flexPercent : (gppwm4_loadAxis == 16) ? auxLinear1 : (gppwm4_loadAxis == 17) ? auxLinear2 : 0} [PcVariables] tuneCrcPcVariable = continuousChannelValue, tuneCrc16 diff --git a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini index c5bf0097b7..4974f71da6 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.09.16.alphax-2chan.1440990007" + signature = "rusEFI 2022.09.16.alphax-2chan.3161891881" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.16.alphax-2chan.1440990007" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.16.alphax-2chan.3161891881" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Sep 16 01:33:26 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Sep 16 20:09:37 UTC 2022 pageSize = 21296 page = 1 @@ -1047,7 +1047,7 @@ gppwm1_dutyIfError = scalar, U08, 2566, "%", 1, 0, 0, 100, 0 gppwm1_pwmFrequency = scalar, U16, 2568, "hz", 1, 0, 0, 500, 0 gppwm1_onAboveDuty = scalar, U08, 2570, "%", 1, 0, 0, 100, 0 gppwm1_offBelowDuty = scalar, U08, 2571, "%", 1, 0, 0, 100, 0 -gppwm1_loadAxis = bits, U08, 2572, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm1_loadAxis = bits, U08, 2572, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm1_alignmentFill_map = scalar, U08, 2573, "unit", 1, 0, 0, 100, 0 gppwm1_loadBins = array, U08, 2574, [8], "load", 1, 0, 0, 250, 0 gppwm1_rpmBins = array, U08, 2582, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1057,7 +1057,7 @@ gppwm2_dutyIfError = scalar, U08, 2658, "%", 1, 0, 0, 100, 0 gppwm2_pwmFrequency = scalar, U16, 2660, "hz", 1, 0, 0, 500, 0 gppwm2_onAboveDuty = scalar, U08, 2662, "%", 1, 0, 0, 100, 0 gppwm2_offBelowDuty = scalar, U08, 2663, "%", 1, 0, 0, 100, 0 -gppwm2_loadAxis = bits, U08, 2664, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm2_loadAxis = bits, U08, 2664, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm2_alignmentFill_map = scalar, U08, 2665, "unit", 1, 0, 0, 100, 0 gppwm2_loadBins = array, U08, 2666, [8], "load", 1, 0, 0, 250, 0 gppwm2_rpmBins = array, U08, 2674, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1067,7 +1067,7 @@ gppwm3_dutyIfError = scalar, U08, 2750, "%", 1, 0, 0, 100, 0 gppwm3_pwmFrequency = scalar, U16, 2752, "hz", 1, 0, 0, 500, 0 gppwm3_onAboveDuty = scalar, U08, 2754, "%", 1, 0, 0, 100, 0 gppwm3_offBelowDuty = scalar, U08, 2755, "%", 1, 0, 0, 100, 0 -gppwm3_loadAxis = bits, U08, 2756, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm3_loadAxis = bits, U08, 2756, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm3_alignmentFill_map = scalar, U08, 2757, "unit", 1, 0, 0, 100, 0 gppwm3_loadBins = array, U08, 2758, [8], "load", 1, 0, 0, 250, 0 gppwm3_rpmBins = array, U08, 2766, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1077,7 +1077,7 @@ gppwm4_dutyIfError = scalar, U08, 2842, "%", 1, 0, 0, 100, 0 gppwm4_pwmFrequency = scalar, U16, 2844, "hz", 1, 0, 0, 500, 0 gppwm4_onAboveDuty = scalar, U08, 2846, "%", 1, 0, 0, 100, 0 gppwm4_offBelowDuty = scalar, U08, 2847, "%", 1, 0, 0, 100, 0 -gppwm4_loadAxis = bits, U08, 2848, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm4_loadAxis = bits, U08, 2848, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm4_alignmentFill_map = scalar, U08, 2849, "unit", 1, 0, 0, 100, 0 gppwm4_loadBins = array, U08, 2850, [8], "load", 1, 0, 0, 250, 0 gppwm4_rpmBins = array, U08, 2858, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -3259,10 +3259,10 @@ esr = scalar, U16, 1244, "", 1, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } ; These "synthetic" channels provide the Y-axis (load) value for gen purp PWM table's Y axes - gppwm1_load = {(gppwm1_loadAxis == 0) ? TPSValue : ((gppwm1_loadAxis == 1) ? MAPValue : ((gppwm1_loadAxis == 2) ? coolant : ((gppwm1_loadAxis == 3) ? intake : ((gppwm1_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm2_load = {(gppwm2_loadAxis == 0) ? TPSValue : ((gppwm2_loadAxis == 1) ? MAPValue : ((gppwm2_loadAxis == 2) ? coolant : ((gppwm2_loadAxis == 3) ? intake : ((gppwm2_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm3_load = {(gppwm3_loadAxis == 0) ? TPSValue : ((gppwm3_loadAxis == 1) ? MAPValue : ((gppwm3_loadAxis == 2) ? coolant : ((gppwm3_loadAxis == 3) ? intake : ((gppwm3_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm4_load = {(gppwm4_loadAxis == 0) ? TPSValue : ((gppwm4_loadAxis == 1) ? MAPValue : ((gppwm4_loadAxis == 2) ? coolant : ((gppwm4_loadAxis == 3) ? intake : ((gppwm4_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} + gppwm1_load = {(gppwm1_loadAxis == 0) ? 0 : (gppwm1_loadAxis == 1) ? TPSValue : (gppwm1_loadAxis == 2) ? MAPValue : (gppwm1_loadAxis == 3) ? coolant : (gppwm1_loadAxis == 4) ? intake : (gppwm1_loadAxis == 5) ? fuelingLoad : (gppwm1_loadAxis == 6) ? ignitionLoad : (gppwm1_loadAxis == 7) ? auxTemp1 : (gppwm1_loadAxis == 8) ? auxTemp2 : (gppwm1_loadAxis == 9) ? throttlePedalPosition : (gppwm1_loadAxis == 10) ? VBatt : (gppwm1_loadAxis == 11) ? vvtPositionB1I : (gppwm1_loadAxis == 12) ? vvtPositionB1E : (gppwm1_loadAxis == 13) ? vvtPositionB2I : (gppwm1_loadAxis == 14) ? vvtPositionB2E : (gppwm1_loadAxis == 15) ? flexPercent : (gppwm1_loadAxis == 16) ? auxLinear1 : (gppwm1_loadAxis == 17) ? auxLinear2 : 0} + gppwm2_load = {(gppwm2_loadAxis == 0) ? 0 : (gppwm2_loadAxis == 1) ? TPSValue : (gppwm2_loadAxis == 2) ? MAPValue : (gppwm2_loadAxis == 3) ? coolant : (gppwm2_loadAxis == 4) ? intake : (gppwm2_loadAxis == 5) ? fuelingLoad : (gppwm2_loadAxis == 6) ? ignitionLoad : (gppwm2_loadAxis == 7) ? auxTemp1 : (gppwm2_loadAxis == 8) ? auxTemp2 : (gppwm2_loadAxis == 9) ? throttlePedalPosition : (gppwm2_loadAxis == 10) ? VBatt : (gppwm2_loadAxis == 11) ? vvtPositionB1I : (gppwm2_loadAxis == 12) ? vvtPositionB1E : (gppwm2_loadAxis == 13) ? vvtPositionB2I : (gppwm2_loadAxis == 14) ? vvtPositionB2E : (gppwm2_loadAxis == 15) ? flexPercent : (gppwm2_loadAxis == 16) ? auxLinear1 : (gppwm2_loadAxis == 17) ? auxLinear2 : 0} + gppwm3_load = {(gppwm3_loadAxis == 0) ? 0 : (gppwm3_loadAxis == 1) ? TPSValue : (gppwm3_loadAxis == 2) ? MAPValue : (gppwm3_loadAxis == 3) ? coolant : (gppwm3_loadAxis == 4) ? intake : (gppwm3_loadAxis == 5) ? fuelingLoad : (gppwm3_loadAxis == 6) ? ignitionLoad : (gppwm3_loadAxis == 7) ? auxTemp1 : (gppwm3_loadAxis == 8) ? auxTemp2 : (gppwm3_loadAxis == 9) ? throttlePedalPosition : (gppwm3_loadAxis == 10) ? VBatt : (gppwm3_loadAxis == 11) ? vvtPositionB1I : (gppwm3_loadAxis == 12) ? vvtPositionB1E : (gppwm3_loadAxis == 13) ? vvtPositionB2I : (gppwm3_loadAxis == 14) ? vvtPositionB2E : (gppwm3_loadAxis == 15) ? flexPercent : (gppwm3_loadAxis == 16) ? auxLinear1 : (gppwm3_loadAxis == 17) ? auxLinear2 : 0} + gppwm4_load = {(gppwm4_loadAxis == 0) ? 0 : (gppwm4_loadAxis == 1) ? TPSValue : (gppwm4_loadAxis == 2) ? MAPValue : (gppwm4_loadAxis == 3) ? coolant : (gppwm4_loadAxis == 4) ? intake : (gppwm4_loadAxis == 5) ? fuelingLoad : (gppwm4_loadAxis == 6) ? ignitionLoad : (gppwm4_loadAxis == 7) ? auxTemp1 : (gppwm4_loadAxis == 8) ? auxTemp2 : (gppwm4_loadAxis == 9) ? throttlePedalPosition : (gppwm4_loadAxis == 10) ? VBatt : (gppwm4_loadAxis == 11) ? vvtPositionB1I : (gppwm4_loadAxis == 12) ? vvtPositionB1E : (gppwm4_loadAxis == 13) ? vvtPositionB2I : (gppwm4_loadAxis == 14) ? vvtPositionB2E : (gppwm4_loadAxis == 15) ? flexPercent : (gppwm4_loadAxis == 16) ? auxLinear1 : (gppwm4_loadAxis == 17) ? auxLinear2 : 0} [PcVariables] tuneCrcPcVariable = continuousChannelValue, tuneCrc16 diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini index af3f6566d3..5729c76ada 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.09.16.alphax-4chan.3974995412" + signature = "rusEFI 2022.09.16.alphax-4chan.91814602" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.16.alphax-4chan.3974995412" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.16.alphax-4chan.91814602" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Sep 16 01:33:28 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Sep 16 20:09:39 UTC 2022 pageSize = 21296 page = 1 @@ -1047,7 +1047,7 @@ gppwm1_dutyIfError = scalar, U08, 2566, "%", 1, 0, 0, 100, 0 gppwm1_pwmFrequency = scalar, U16, 2568, "hz", 1, 0, 0, 500, 0 gppwm1_onAboveDuty = scalar, U08, 2570, "%", 1, 0, 0, 100, 0 gppwm1_offBelowDuty = scalar, U08, 2571, "%", 1, 0, 0, 100, 0 -gppwm1_loadAxis = bits, U08, 2572, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm1_loadAxis = bits, U08, 2572, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm1_alignmentFill_map = scalar, U08, 2573, "unit", 1, 0, 0, 100, 0 gppwm1_loadBins = array, U08, 2574, [8], "load", 1, 0, 0, 250, 0 gppwm1_rpmBins = array, U08, 2582, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1057,7 +1057,7 @@ gppwm2_dutyIfError = scalar, U08, 2658, "%", 1, 0, 0, 100, 0 gppwm2_pwmFrequency = scalar, U16, 2660, "hz", 1, 0, 0, 500, 0 gppwm2_onAboveDuty = scalar, U08, 2662, "%", 1, 0, 0, 100, 0 gppwm2_offBelowDuty = scalar, U08, 2663, "%", 1, 0, 0, 100, 0 -gppwm2_loadAxis = bits, U08, 2664, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm2_loadAxis = bits, U08, 2664, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm2_alignmentFill_map = scalar, U08, 2665, "unit", 1, 0, 0, 100, 0 gppwm2_loadBins = array, U08, 2666, [8], "load", 1, 0, 0, 250, 0 gppwm2_rpmBins = array, U08, 2674, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1067,7 +1067,7 @@ gppwm3_dutyIfError = scalar, U08, 2750, "%", 1, 0, 0, 100, 0 gppwm3_pwmFrequency = scalar, U16, 2752, "hz", 1, 0, 0, 500, 0 gppwm3_onAboveDuty = scalar, U08, 2754, "%", 1, 0, 0, 100, 0 gppwm3_offBelowDuty = scalar, U08, 2755, "%", 1, 0, 0, 100, 0 -gppwm3_loadAxis = bits, U08, 2756, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm3_loadAxis = bits, U08, 2756, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm3_alignmentFill_map = scalar, U08, 2757, "unit", 1, 0, 0, 100, 0 gppwm3_loadBins = array, U08, 2758, [8], "load", 1, 0, 0, 250, 0 gppwm3_rpmBins = array, U08, 2766, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1077,7 +1077,7 @@ gppwm4_dutyIfError = scalar, U08, 2842, "%", 1, 0, 0, 100, 0 gppwm4_pwmFrequency = scalar, U16, 2844, "hz", 1, 0, 0, 500, 0 gppwm4_onAboveDuty = scalar, U08, 2846, "%", 1, 0, 0, 100, 0 gppwm4_offBelowDuty = scalar, U08, 2847, "%", 1, 0, 0, 100, 0 -gppwm4_loadAxis = bits, U08, 2848, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm4_loadAxis = bits, U08, 2848, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm4_alignmentFill_map = scalar, U08, 2849, "unit", 1, 0, 0, 100, 0 gppwm4_loadBins = array, U08, 2850, [8], "load", 1, 0, 0, 250, 0 gppwm4_rpmBins = array, U08, 2858, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -3259,10 +3259,10 @@ esr = scalar, U16, 1244, "", 1, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } ; These "synthetic" channels provide the Y-axis (load) value for gen purp PWM table's Y axes - gppwm1_load = {(gppwm1_loadAxis == 0) ? TPSValue : ((gppwm1_loadAxis == 1) ? MAPValue : ((gppwm1_loadAxis == 2) ? coolant : ((gppwm1_loadAxis == 3) ? intake : ((gppwm1_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm2_load = {(gppwm2_loadAxis == 0) ? TPSValue : ((gppwm2_loadAxis == 1) ? MAPValue : ((gppwm2_loadAxis == 2) ? coolant : ((gppwm2_loadAxis == 3) ? intake : ((gppwm2_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm3_load = {(gppwm3_loadAxis == 0) ? TPSValue : ((gppwm3_loadAxis == 1) ? MAPValue : ((gppwm3_loadAxis == 2) ? coolant : ((gppwm3_loadAxis == 3) ? intake : ((gppwm3_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm4_load = {(gppwm4_loadAxis == 0) ? TPSValue : ((gppwm4_loadAxis == 1) ? MAPValue : ((gppwm4_loadAxis == 2) ? coolant : ((gppwm4_loadAxis == 3) ? intake : ((gppwm4_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} + gppwm1_load = {(gppwm1_loadAxis == 0) ? 0 : (gppwm1_loadAxis == 1) ? TPSValue : (gppwm1_loadAxis == 2) ? MAPValue : (gppwm1_loadAxis == 3) ? coolant : (gppwm1_loadAxis == 4) ? intake : (gppwm1_loadAxis == 5) ? fuelingLoad : (gppwm1_loadAxis == 6) ? ignitionLoad : (gppwm1_loadAxis == 7) ? auxTemp1 : (gppwm1_loadAxis == 8) ? auxTemp2 : (gppwm1_loadAxis == 9) ? throttlePedalPosition : (gppwm1_loadAxis == 10) ? VBatt : (gppwm1_loadAxis == 11) ? vvtPositionB1I : (gppwm1_loadAxis == 12) ? vvtPositionB1E : (gppwm1_loadAxis == 13) ? vvtPositionB2I : (gppwm1_loadAxis == 14) ? vvtPositionB2E : (gppwm1_loadAxis == 15) ? flexPercent : (gppwm1_loadAxis == 16) ? auxLinear1 : (gppwm1_loadAxis == 17) ? auxLinear2 : 0} + gppwm2_load = {(gppwm2_loadAxis == 0) ? 0 : (gppwm2_loadAxis == 1) ? TPSValue : (gppwm2_loadAxis == 2) ? MAPValue : (gppwm2_loadAxis == 3) ? coolant : (gppwm2_loadAxis == 4) ? intake : (gppwm2_loadAxis == 5) ? fuelingLoad : (gppwm2_loadAxis == 6) ? ignitionLoad : (gppwm2_loadAxis == 7) ? auxTemp1 : (gppwm2_loadAxis == 8) ? auxTemp2 : (gppwm2_loadAxis == 9) ? throttlePedalPosition : (gppwm2_loadAxis == 10) ? VBatt : (gppwm2_loadAxis == 11) ? vvtPositionB1I : (gppwm2_loadAxis == 12) ? vvtPositionB1E : (gppwm2_loadAxis == 13) ? vvtPositionB2I : (gppwm2_loadAxis == 14) ? vvtPositionB2E : (gppwm2_loadAxis == 15) ? flexPercent : (gppwm2_loadAxis == 16) ? auxLinear1 : (gppwm2_loadAxis == 17) ? auxLinear2 : 0} + gppwm3_load = {(gppwm3_loadAxis == 0) ? 0 : (gppwm3_loadAxis == 1) ? TPSValue : (gppwm3_loadAxis == 2) ? MAPValue : (gppwm3_loadAxis == 3) ? coolant : (gppwm3_loadAxis == 4) ? intake : (gppwm3_loadAxis == 5) ? fuelingLoad : (gppwm3_loadAxis == 6) ? ignitionLoad : (gppwm3_loadAxis == 7) ? auxTemp1 : (gppwm3_loadAxis == 8) ? auxTemp2 : (gppwm3_loadAxis == 9) ? throttlePedalPosition : (gppwm3_loadAxis == 10) ? VBatt : (gppwm3_loadAxis == 11) ? vvtPositionB1I : (gppwm3_loadAxis == 12) ? vvtPositionB1E : (gppwm3_loadAxis == 13) ? vvtPositionB2I : (gppwm3_loadAxis == 14) ? vvtPositionB2E : (gppwm3_loadAxis == 15) ? flexPercent : (gppwm3_loadAxis == 16) ? auxLinear1 : (gppwm3_loadAxis == 17) ? auxLinear2 : 0} + gppwm4_load = {(gppwm4_loadAxis == 0) ? 0 : (gppwm4_loadAxis == 1) ? TPSValue : (gppwm4_loadAxis == 2) ? MAPValue : (gppwm4_loadAxis == 3) ? coolant : (gppwm4_loadAxis == 4) ? intake : (gppwm4_loadAxis == 5) ? fuelingLoad : (gppwm4_loadAxis == 6) ? ignitionLoad : (gppwm4_loadAxis == 7) ? auxTemp1 : (gppwm4_loadAxis == 8) ? auxTemp2 : (gppwm4_loadAxis == 9) ? throttlePedalPosition : (gppwm4_loadAxis == 10) ? VBatt : (gppwm4_loadAxis == 11) ? vvtPositionB1I : (gppwm4_loadAxis == 12) ? vvtPositionB1E : (gppwm4_loadAxis == 13) ? vvtPositionB2I : (gppwm4_loadAxis == 14) ? vvtPositionB2E : (gppwm4_loadAxis == 15) ? flexPercent : (gppwm4_loadAxis == 16) ? auxLinear1 : (gppwm4_loadAxis == 17) ? auxLinear2 : 0} [PcVariables] tuneCrcPcVariable = continuousChannelValue, tuneCrc16 diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index bb0a61667e..480002ef6f 100644 --- a/firmware/tunerstudio/generated/rusefi_atlas.ini +++ b/firmware/tunerstudio/generated/rusefi_atlas.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.09.16.atlas.2067508092" + signature = "rusEFI 2022.09.16.atlas.2460929122" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.16.atlas.2067508092" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.16.atlas.2460929122" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Sep 16 01:34:22 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Sep 16 20:10:27 UTC 2022 pageSize = 21296 page = 1 @@ -1047,7 +1047,7 @@ gppwm1_dutyIfError = scalar, U08, 2566, "%", 1, 0, 0, 100, 0 gppwm1_pwmFrequency = scalar, U16, 2568, "hz", 1, 0, 0, 500, 0 gppwm1_onAboveDuty = scalar, U08, 2570, "%", 1, 0, 0, 100, 0 gppwm1_offBelowDuty = scalar, U08, 2571, "%", 1, 0, 0, 100, 0 -gppwm1_loadAxis = bits, U08, 2572, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm1_loadAxis = bits, U08, 2572, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm1_alignmentFill_map = scalar, U08, 2573, "unit", 1, 0, 0, 100, 0 gppwm1_loadBins = array, U08, 2574, [8], "load", 1, 0, 0, 250, 0 gppwm1_rpmBins = array, U08, 2582, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1057,7 +1057,7 @@ gppwm2_dutyIfError = scalar, U08, 2658, "%", 1, 0, 0, 100, 0 gppwm2_pwmFrequency = scalar, U16, 2660, "hz", 1, 0, 0, 500, 0 gppwm2_onAboveDuty = scalar, U08, 2662, "%", 1, 0, 0, 100, 0 gppwm2_offBelowDuty = scalar, U08, 2663, "%", 1, 0, 0, 100, 0 -gppwm2_loadAxis = bits, U08, 2664, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm2_loadAxis = bits, U08, 2664, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm2_alignmentFill_map = scalar, U08, 2665, "unit", 1, 0, 0, 100, 0 gppwm2_loadBins = array, U08, 2666, [8], "load", 1, 0, 0, 250, 0 gppwm2_rpmBins = array, U08, 2674, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1067,7 +1067,7 @@ gppwm3_dutyIfError = scalar, U08, 2750, "%", 1, 0, 0, 100, 0 gppwm3_pwmFrequency = scalar, U16, 2752, "hz", 1, 0, 0, 500, 0 gppwm3_onAboveDuty = scalar, U08, 2754, "%", 1, 0, 0, 100, 0 gppwm3_offBelowDuty = scalar, U08, 2755, "%", 1, 0, 0, 100, 0 -gppwm3_loadAxis = bits, U08, 2756, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm3_loadAxis = bits, U08, 2756, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm3_alignmentFill_map = scalar, U08, 2757, "unit", 1, 0, 0, 100, 0 gppwm3_loadBins = array, U08, 2758, [8], "load", 1, 0, 0, 250, 0 gppwm3_rpmBins = array, U08, 2766, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1077,7 +1077,7 @@ gppwm4_dutyIfError = scalar, U08, 2842, "%", 1, 0, 0, 100, 0 gppwm4_pwmFrequency = scalar, U16, 2844, "hz", 1, 0, 0, 500, 0 gppwm4_onAboveDuty = scalar, U08, 2846, "%", 1, 0, 0, 100, 0 gppwm4_offBelowDuty = scalar, U08, 2847, "%", 1, 0, 0, 100, 0 -gppwm4_loadAxis = bits, U08, 2848, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm4_loadAxis = bits, U08, 2848, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm4_alignmentFill_map = scalar, U08, 2849, "unit", 1, 0, 0, 100, 0 gppwm4_loadBins = array, U08, 2850, [8], "load", 1, 0, 0, 250, 0 gppwm4_rpmBins = array, U08, 2858, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -3259,10 +3259,10 @@ esr = scalar, U16, 1244, "", 1, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } ; These "synthetic" channels provide the Y-axis (load) value for gen purp PWM table's Y axes - gppwm1_load = {(gppwm1_loadAxis == 0) ? TPSValue : ((gppwm1_loadAxis == 1) ? MAPValue : ((gppwm1_loadAxis == 2) ? coolant : ((gppwm1_loadAxis == 3) ? intake : ((gppwm1_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm2_load = {(gppwm2_loadAxis == 0) ? TPSValue : ((gppwm2_loadAxis == 1) ? MAPValue : ((gppwm2_loadAxis == 2) ? coolant : ((gppwm2_loadAxis == 3) ? intake : ((gppwm2_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm3_load = {(gppwm3_loadAxis == 0) ? TPSValue : ((gppwm3_loadAxis == 1) ? MAPValue : ((gppwm3_loadAxis == 2) ? coolant : ((gppwm3_loadAxis == 3) ? intake : ((gppwm3_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm4_load = {(gppwm4_loadAxis == 0) ? TPSValue : ((gppwm4_loadAxis == 1) ? MAPValue : ((gppwm4_loadAxis == 2) ? coolant : ((gppwm4_loadAxis == 3) ? intake : ((gppwm4_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} + gppwm1_load = {(gppwm1_loadAxis == 0) ? 0 : (gppwm1_loadAxis == 1) ? TPSValue : (gppwm1_loadAxis == 2) ? MAPValue : (gppwm1_loadAxis == 3) ? coolant : (gppwm1_loadAxis == 4) ? intake : (gppwm1_loadAxis == 5) ? fuelingLoad : (gppwm1_loadAxis == 6) ? ignitionLoad : (gppwm1_loadAxis == 7) ? auxTemp1 : (gppwm1_loadAxis == 8) ? auxTemp2 : (gppwm1_loadAxis == 9) ? throttlePedalPosition : (gppwm1_loadAxis == 10) ? VBatt : (gppwm1_loadAxis == 11) ? vvtPositionB1I : (gppwm1_loadAxis == 12) ? vvtPositionB1E : (gppwm1_loadAxis == 13) ? vvtPositionB2I : (gppwm1_loadAxis == 14) ? vvtPositionB2E : (gppwm1_loadAxis == 15) ? flexPercent : (gppwm1_loadAxis == 16) ? auxLinear1 : (gppwm1_loadAxis == 17) ? auxLinear2 : 0} + gppwm2_load = {(gppwm2_loadAxis == 0) ? 0 : (gppwm2_loadAxis == 1) ? TPSValue : (gppwm2_loadAxis == 2) ? MAPValue : (gppwm2_loadAxis == 3) ? coolant : (gppwm2_loadAxis == 4) ? intake : (gppwm2_loadAxis == 5) ? fuelingLoad : (gppwm2_loadAxis == 6) ? ignitionLoad : (gppwm2_loadAxis == 7) ? auxTemp1 : (gppwm2_loadAxis == 8) ? auxTemp2 : (gppwm2_loadAxis == 9) ? throttlePedalPosition : (gppwm2_loadAxis == 10) ? VBatt : (gppwm2_loadAxis == 11) ? vvtPositionB1I : (gppwm2_loadAxis == 12) ? vvtPositionB1E : (gppwm2_loadAxis == 13) ? vvtPositionB2I : (gppwm2_loadAxis == 14) ? vvtPositionB2E : (gppwm2_loadAxis == 15) ? flexPercent : (gppwm2_loadAxis == 16) ? auxLinear1 : (gppwm2_loadAxis == 17) ? auxLinear2 : 0} + gppwm3_load = {(gppwm3_loadAxis == 0) ? 0 : (gppwm3_loadAxis == 1) ? TPSValue : (gppwm3_loadAxis == 2) ? MAPValue : (gppwm3_loadAxis == 3) ? coolant : (gppwm3_loadAxis == 4) ? intake : (gppwm3_loadAxis == 5) ? fuelingLoad : (gppwm3_loadAxis == 6) ? ignitionLoad : (gppwm3_loadAxis == 7) ? auxTemp1 : (gppwm3_loadAxis == 8) ? auxTemp2 : (gppwm3_loadAxis == 9) ? throttlePedalPosition : (gppwm3_loadAxis == 10) ? VBatt : (gppwm3_loadAxis == 11) ? vvtPositionB1I : (gppwm3_loadAxis == 12) ? vvtPositionB1E : (gppwm3_loadAxis == 13) ? vvtPositionB2I : (gppwm3_loadAxis == 14) ? vvtPositionB2E : (gppwm3_loadAxis == 15) ? flexPercent : (gppwm3_loadAxis == 16) ? auxLinear1 : (gppwm3_loadAxis == 17) ? auxLinear2 : 0} + gppwm4_load = {(gppwm4_loadAxis == 0) ? 0 : (gppwm4_loadAxis == 1) ? TPSValue : (gppwm4_loadAxis == 2) ? MAPValue : (gppwm4_loadAxis == 3) ? coolant : (gppwm4_loadAxis == 4) ? intake : (gppwm4_loadAxis == 5) ? fuelingLoad : (gppwm4_loadAxis == 6) ? ignitionLoad : (gppwm4_loadAxis == 7) ? auxTemp1 : (gppwm4_loadAxis == 8) ? auxTemp2 : (gppwm4_loadAxis == 9) ? throttlePedalPosition : (gppwm4_loadAxis == 10) ? VBatt : (gppwm4_loadAxis == 11) ? vvtPositionB1I : (gppwm4_loadAxis == 12) ? vvtPositionB1E : (gppwm4_loadAxis == 13) ? vvtPositionB2I : (gppwm4_loadAxis == 14) ? vvtPositionB2E : (gppwm4_loadAxis == 15) ? flexPercent : (gppwm4_loadAxis == 16) ? auxLinear1 : (gppwm4_loadAxis == 17) ? auxLinear2 : 0} [PcVariables] tuneCrcPcVariable = continuousChannelValue, tuneCrc16 diff --git a/firmware/tunerstudio/generated/rusefi_core8.ini b/firmware/tunerstudio/generated/rusefi_core8.ini index 1234c8ca80..a03e9b7219 100644 --- a/firmware/tunerstudio/generated/rusefi_core8.ini +++ b/firmware/tunerstudio/generated/rusefi_core8.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.09.16.core8.2434600866" + signature = "rusEFI 2022.09.16.core8.2022205628" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.16.core8.2434600866" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.16.core8.2022205628" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Sep 16 01:34:00 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Sep 16 20:10:08 UTC 2022 pageSize = 21296 page = 1 @@ -1047,7 +1047,7 @@ gppwm1_dutyIfError = scalar, U08, 2566, "%", 1, 0, 0, 100, 0 gppwm1_pwmFrequency = scalar, U16, 2568, "hz", 1, 0, 0, 500, 0 gppwm1_onAboveDuty = scalar, U08, 2570, "%", 1, 0, 0, 100, 0 gppwm1_offBelowDuty = scalar, U08, 2571, "%", 1, 0, 0, 100, 0 -gppwm1_loadAxis = bits, U08, 2572, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm1_loadAxis = bits, U08, 2572, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm1_alignmentFill_map = scalar, U08, 2573, "unit", 1, 0, 0, 100, 0 gppwm1_loadBins = array, U08, 2574, [8], "load", 1, 0, 0, 250, 0 gppwm1_rpmBins = array, U08, 2582, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1057,7 +1057,7 @@ gppwm2_dutyIfError = scalar, U08, 2658, "%", 1, 0, 0, 100, 0 gppwm2_pwmFrequency = scalar, U16, 2660, "hz", 1, 0, 0, 500, 0 gppwm2_onAboveDuty = scalar, U08, 2662, "%", 1, 0, 0, 100, 0 gppwm2_offBelowDuty = scalar, U08, 2663, "%", 1, 0, 0, 100, 0 -gppwm2_loadAxis = bits, U08, 2664, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm2_loadAxis = bits, U08, 2664, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm2_alignmentFill_map = scalar, U08, 2665, "unit", 1, 0, 0, 100, 0 gppwm2_loadBins = array, U08, 2666, [8], "load", 1, 0, 0, 250, 0 gppwm2_rpmBins = array, U08, 2674, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1067,7 +1067,7 @@ gppwm3_dutyIfError = scalar, U08, 2750, "%", 1, 0, 0, 100, 0 gppwm3_pwmFrequency = scalar, U16, 2752, "hz", 1, 0, 0, 500, 0 gppwm3_onAboveDuty = scalar, U08, 2754, "%", 1, 0, 0, 100, 0 gppwm3_offBelowDuty = scalar, U08, 2755, "%", 1, 0, 0, 100, 0 -gppwm3_loadAxis = bits, U08, 2756, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm3_loadAxis = bits, U08, 2756, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm3_alignmentFill_map = scalar, U08, 2757, "unit", 1, 0, 0, 100, 0 gppwm3_loadBins = array, U08, 2758, [8], "load", 1, 0, 0, 250, 0 gppwm3_rpmBins = array, U08, 2766, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1077,7 +1077,7 @@ gppwm4_dutyIfError = scalar, U08, 2842, "%", 1, 0, 0, 100, 0 gppwm4_pwmFrequency = scalar, U16, 2844, "hz", 1, 0, 0, 500, 0 gppwm4_onAboveDuty = scalar, U08, 2846, "%", 1, 0, 0, 100, 0 gppwm4_offBelowDuty = scalar, U08, 2847, "%", 1, 0, 0, 100, 0 -gppwm4_loadAxis = bits, U08, 2848, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm4_loadAxis = bits, U08, 2848, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm4_alignmentFill_map = scalar, U08, 2849, "unit", 1, 0, 0, 100, 0 gppwm4_loadBins = array, U08, 2850, [8], "load", 1, 0, 0, 250, 0 gppwm4_rpmBins = array, U08, 2858, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -3259,10 +3259,10 @@ esr = scalar, U16, 1244, "", 1, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } ; These "synthetic" channels provide the Y-axis (load) value for gen purp PWM table's Y axes - gppwm1_load = {(gppwm1_loadAxis == 0) ? TPSValue : ((gppwm1_loadAxis == 1) ? MAPValue : ((gppwm1_loadAxis == 2) ? coolant : ((gppwm1_loadAxis == 3) ? intake : ((gppwm1_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm2_load = {(gppwm2_loadAxis == 0) ? TPSValue : ((gppwm2_loadAxis == 1) ? MAPValue : ((gppwm2_loadAxis == 2) ? coolant : ((gppwm2_loadAxis == 3) ? intake : ((gppwm2_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm3_load = {(gppwm3_loadAxis == 0) ? TPSValue : ((gppwm3_loadAxis == 1) ? MAPValue : ((gppwm3_loadAxis == 2) ? coolant : ((gppwm3_loadAxis == 3) ? intake : ((gppwm3_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm4_load = {(gppwm4_loadAxis == 0) ? TPSValue : ((gppwm4_loadAxis == 1) ? MAPValue : ((gppwm4_loadAxis == 2) ? coolant : ((gppwm4_loadAxis == 3) ? intake : ((gppwm4_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} + gppwm1_load = {(gppwm1_loadAxis == 0) ? 0 : (gppwm1_loadAxis == 1) ? TPSValue : (gppwm1_loadAxis == 2) ? MAPValue : (gppwm1_loadAxis == 3) ? coolant : (gppwm1_loadAxis == 4) ? intake : (gppwm1_loadAxis == 5) ? fuelingLoad : (gppwm1_loadAxis == 6) ? ignitionLoad : (gppwm1_loadAxis == 7) ? auxTemp1 : (gppwm1_loadAxis == 8) ? auxTemp2 : (gppwm1_loadAxis == 9) ? throttlePedalPosition : (gppwm1_loadAxis == 10) ? VBatt : (gppwm1_loadAxis == 11) ? vvtPositionB1I : (gppwm1_loadAxis == 12) ? vvtPositionB1E : (gppwm1_loadAxis == 13) ? vvtPositionB2I : (gppwm1_loadAxis == 14) ? vvtPositionB2E : (gppwm1_loadAxis == 15) ? flexPercent : (gppwm1_loadAxis == 16) ? auxLinear1 : (gppwm1_loadAxis == 17) ? auxLinear2 : 0} + gppwm2_load = {(gppwm2_loadAxis == 0) ? 0 : (gppwm2_loadAxis == 1) ? TPSValue : (gppwm2_loadAxis == 2) ? MAPValue : (gppwm2_loadAxis == 3) ? coolant : (gppwm2_loadAxis == 4) ? intake : (gppwm2_loadAxis == 5) ? fuelingLoad : (gppwm2_loadAxis == 6) ? ignitionLoad : (gppwm2_loadAxis == 7) ? auxTemp1 : (gppwm2_loadAxis == 8) ? auxTemp2 : (gppwm2_loadAxis == 9) ? throttlePedalPosition : (gppwm2_loadAxis == 10) ? VBatt : (gppwm2_loadAxis == 11) ? vvtPositionB1I : (gppwm2_loadAxis == 12) ? vvtPositionB1E : (gppwm2_loadAxis == 13) ? vvtPositionB2I : (gppwm2_loadAxis == 14) ? vvtPositionB2E : (gppwm2_loadAxis == 15) ? flexPercent : (gppwm2_loadAxis == 16) ? auxLinear1 : (gppwm2_loadAxis == 17) ? auxLinear2 : 0} + gppwm3_load = {(gppwm3_loadAxis == 0) ? 0 : (gppwm3_loadAxis == 1) ? TPSValue : (gppwm3_loadAxis == 2) ? MAPValue : (gppwm3_loadAxis == 3) ? coolant : (gppwm3_loadAxis == 4) ? intake : (gppwm3_loadAxis == 5) ? fuelingLoad : (gppwm3_loadAxis == 6) ? ignitionLoad : (gppwm3_loadAxis == 7) ? auxTemp1 : (gppwm3_loadAxis == 8) ? auxTemp2 : (gppwm3_loadAxis == 9) ? throttlePedalPosition : (gppwm3_loadAxis == 10) ? VBatt : (gppwm3_loadAxis == 11) ? vvtPositionB1I : (gppwm3_loadAxis == 12) ? vvtPositionB1E : (gppwm3_loadAxis == 13) ? vvtPositionB2I : (gppwm3_loadAxis == 14) ? vvtPositionB2E : (gppwm3_loadAxis == 15) ? flexPercent : (gppwm3_loadAxis == 16) ? auxLinear1 : (gppwm3_loadAxis == 17) ? auxLinear2 : 0} + gppwm4_load = {(gppwm4_loadAxis == 0) ? 0 : (gppwm4_loadAxis == 1) ? TPSValue : (gppwm4_loadAxis == 2) ? MAPValue : (gppwm4_loadAxis == 3) ? coolant : (gppwm4_loadAxis == 4) ? intake : (gppwm4_loadAxis == 5) ? fuelingLoad : (gppwm4_loadAxis == 6) ? ignitionLoad : (gppwm4_loadAxis == 7) ? auxTemp1 : (gppwm4_loadAxis == 8) ? auxTemp2 : (gppwm4_loadAxis == 9) ? throttlePedalPosition : (gppwm4_loadAxis == 10) ? VBatt : (gppwm4_loadAxis == 11) ? vvtPositionB1I : (gppwm4_loadAxis == 12) ? vvtPositionB1E : (gppwm4_loadAxis == 13) ? vvtPositionB2I : (gppwm4_loadAxis == 14) ? vvtPositionB2E : (gppwm4_loadAxis == 15) ? flexPercent : (gppwm4_loadAxis == 16) ? auxLinear1 : (gppwm4_loadAxis == 17) ? auxLinear2 : 0} [PcVariables] tuneCrcPcVariable = continuousChannelValue, tuneCrc16 diff --git a/firmware/tunerstudio/generated/rusefi_cypress.ini b/firmware/tunerstudio/generated/rusefi_cypress.ini index 3f9740b44f..b1f54135e8 100644 --- a/firmware/tunerstudio/generated/rusefi_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_cypress.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.09.16.cypress.1743871579" + signature = "rusEFI 2022.09.16.cypress.2388932933" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.16.cypress.1743871579" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.16.cypress.2388932933" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Fri Sep 16 01:33:21 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Fri Sep 16 20:09:34 UTC 2022 pageSize = 21296 page = 1 @@ -1047,7 +1047,7 @@ gppwm1_dutyIfError = scalar, U08, 2566, "%", 1, 0, 0, 100, 0 gppwm1_pwmFrequency = scalar, U16, 2568, "hz", 1, 0, 0, 500, 0 gppwm1_onAboveDuty = scalar, U08, 2570, "%", 1, 0, 0, 100, 0 gppwm1_offBelowDuty = scalar, U08, 2571, "%", 1, 0, 0, 100, 0 -gppwm1_loadAxis = bits, U08, 2572, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm1_loadAxis = bits, U08, 2572, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm1_alignmentFill_map = scalar, U08, 2573, "unit", 1, 0, 0, 100, 0 gppwm1_loadBins = array, U08, 2574, [8], "load", 1, 0, 0, 250, 0 gppwm1_rpmBins = array, U08, 2582, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1057,7 +1057,7 @@ gppwm2_dutyIfError = scalar, U08, 2658, "%", 1, 0, 0, 100, 0 gppwm2_pwmFrequency = scalar, U16, 2660, "hz", 1, 0, 0, 500, 0 gppwm2_onAboveDuty = scalar, U08, 2662, "%", 1, 0, 0, 100, 0 gppwm2_offBelowDuty = scalar, U08, 2663, "%", 1, 0, 0, 100, 0 -gppwm2_loadAxis = bits, U08, 2664, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm2_loadAxis = bits, U08, 2664, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm2_alignmentFill_map = scalar, U08, 2665, "unit", 1, 0, 0, 100, 0 gppwm2_loadBins = array, U08, 2666, [8], "load", 1, 0, 0, 250, 0 gppwm2_rpmBins = array, U08, 2674, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1067,7 +1067,7 @@ gppwm3_dutyIfError = scalar, U08, 2750, "%", 1, 0, 0, 100, 0 gppwm3_pwmFrequency = scalar, U16, 2752, "hz", 1, 0, 0, 500, 0 gppwm3_onAboveDuty = scalar, U08, 2754, "%", 1, 0, 0, 100, 0 gppwm3_offBelowDuty = scalar, U08, 2755, "%", 1, 0, 0, 100, 0 -gppwm3_loadAxis = bits, U08, 2756, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm3_loadAxis = bits, U08, 2756, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm3_alignmentFill_map = scalar, U08, 2757, "unit", 1, 0, 0, 100, 0 gppwm3_loadBins = array, U08, 2758, [8], "load", 1, 0, 0, 250, 0 gppwm3_rpmBins = array, U08, 2766, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1077,7 +1077,7 @@ gppwm4_dutyIfError = scalar, U08, 2842, "%", 1, 0, 0, 100, 0 gppwm4_pwmFrequency = scalar, U16, 2844, "hz", 1, 0, 0, 500, 0 gppwm4_onAboveDuty = scalar, U08, 2846, "%", 1, 0, 0, 100, 0 gppwm4_offBelowDuty = scalar, U08, 2847, "%", 1, 0, 0, 100, 0 -gppwm4_loadAxis = bits, U08, 2848, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm4_loadAxis = bits, U08, 2848, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm4_alignmentFill_map = scalar, U08, 2849, "unit", 1, 0, 0, 100, 0 gppwm4_loadBins = array, U08, 2850, [8], "load", 1, 0, 0, 250, 0 gppwm4_rpmBins = array, U08, 2858, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -3259,10 +3259,10 @@ esr = scalar, U16, 1244, "", 1, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } ; These "synthetic" channels provide the Y-axis (load) value for gen purp PWM table's Y axes - gppwm1_load = {(gppwm1_loadAxis == 0) ? TPSValue : ((gppwm1_loadAxis == 1) ? MAPValue : ((gppwm1_loadAxis == 2) ? coolant : ((gppwm1_loadAxis == 3) ? intake : ((gppwm1_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm2_load = {(gppwm2_loadAxis == 0) ? TPSValue : ((gppwm2_loadAxis == 1) ? MAPValue : ((gppwm2_loadAxis == 2) ? coolant : ((gppwm2_loadAxis == 3) ? intake : ((gppwm2_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm3_load = {(gppwm3_loadAxis == 0) ? TPSValue : ((gppwm3_loadAxis == 1) ? MAPValue : ((gppwm3_loadAxis == 2) ? coolant : ((gppwm3_loadAxis == 3) ? intake : ((gppwm3_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm4_load = {(gppwm4_loadAxis == 0) ? TPSValue : ((gppwm4_loadAxis == 1) ? MAPValue : ((gppwm4_loadAxis == 2) ? coolant : ((gppwm4_loadAxis == 3) ? intake : ((gppwm4_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} + gppwm1_load = {(gppwm1_loadAxis == 0) ? 0 : (gppwm1_loadAxis == 1) ? TPSValue : (gppwm1_loadAxis == 2) ? MAPValue : (gppwm1_loadAxis == 3) ? coolant : (gppwm1_loadAxis == 4) ? intake : (gppwm1_loadAxis == 5) ? fuelingLoad : (gppwm1_loadAxis == 6) ? ignitionLoad : (gppwm1_loadAxis == 7) ? auxTemp1 : (gppwm1_loadAxis == 8) ? auxTemp2 : (gppwm1_loadAxis == 9) ? throttlePedalPosition : (gppwm1_loadAxis == 10) ? VBatt : (gppwm1_loadAxis == 11) ? vvtPositionB1I : (gppwm1_loadAxis == 12) ? vvtPositionB1E : (gppwm1_loadAxis == 13) ? vvtPositionB2I : (gppwm1_loadAxis == 14) ? vvtPositionB2E : (gppwm1_loadAxis == 15) ? flexPercent : (gppwm1_loadAxis == 16) ? auxLinear1 : (gppwm1_loadAxis == 17) ? auxLinear2 : 0} + gppwm2_load = {(gppwm2_loadAxis == 0) ? 0 : (gppwm2_loadAxis == 1) ? TPSValue : (gppwm2_loadAxis == 2) ? MAPValue : (gppwm2_loadAxis == 3) ? coolant : (gppwm2_loadAxis == 4) ? intake : (gppwm2_loadAxis == 5) ? fuelingLoad : (gppwm2_loadAxis == 6) ? ignitionLoad : (gppwm2_loadAxis == 7) ? auxTemp1 : (gppwm2_loadAxis == 8) ? auxTemp2 : (gppwm2_loadAxis == 9) ? throttlePedalPosition : (gppwm2_loadAxis == 10) ? VBatt : (gppwm2_loadAxis == 11) ? vvtPositionB1I : (gppwm2_loadAxis == 12) ? vvtPositionB1E : (gppwm2_loadAxis == 13) ? vvtPositionB2I : (gppwm2_loadAxis == 14) ? vvtPositionB2E : (gppwm2_loadAxis == 15) ? flexPercent : (gppwm2_loadAxis == 16) ? auxLinear1 : (gppwm2_loadAxis == 17) ? auxLinear2 : 0} + gppwm3_load = {(gppwm3_loadAxis == 0) ? 0 : (gppwm3_loadAxis == 1) ? TPSValue : (gppwm3_loadAxis == 2) ? MAPValue : (gppwm3_loadAxis == 3) ? coolant : (gppwm3_loadAxis == 4) ? intake : (gppwm3_loadAxis == 5) ? fuelingLoad : (gppwm3_loadAxis == 6) ? ignitionLoad : (gppwm3_loadAxis == 7) ? auxTemp1 : (gppwm3_loadAxis == 8) ? auxTemp2 : (gppwm3_loadAxis == 9) ? throttlePedalPosition : (gppwm3_loadAxis == 10) ? VBatt : (gppwm3_loadAxis == 11) ? vvtPositionB1I : (gppwm3_loadAxis == 12) ? vvtPositionB1E : (gppwm3_loadAxis == 13) ? vvtPositionB2I : (gppwm3_loadAxis == 14) ? vvtPositionB2E : (gppwm3_loadAxis == 15) ? flexPercent : (gppwm3_loadAxis == 16) ? auxLinear1 : (gppwm3_loadAxis == 17) ? auxLinear2 : 0} + gppwm4_load = {(gppwm4_loadAxis == 0) ? 0 : (gppwm4_loadAxis == 1) ? TPSValue : (gppwm4_loadAxis == 2) ? MAPValue : (gppwm4_loadAxis == 3) ? coolant : (gppwm4_loadAxis == 4) ? intake : (gppwm4_loadAxis == 5) ? fuelingLoad : (gppwm4_loadAxis == 6) ? ignitionLoad : (gppwm4_loadAxis == 7) ? auxTemp1 : (gppwm4_loadAxis == 8) ? auxTemp2 : (gppwm4_loadAxis == 9) ? throttlePedalPosition : (gppwm4_loadAxis == 10) ? VBatt : (gppwm4_loadAxis == 11) ? vvtPositionB1I : (gppwm4_loadAxis == 12) ? vvtPositionB1E : (gppwm4_loadAxis == 13) ? vvtPositionB2I : (gppwm4_loadAxis == 14) ? vvtPositionB2E : (gppwm4_loadAxis == 15) ? flexPercent : (gppwm4_loadAxis == 16) ? auxLinear1 : (gppwm4_loadAxis == 17) ? auxLinear2 : 0} [PcVariables] tuneCrcPcVariable = continuousChannelValue, tuneCrc16 diff --git a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini index 9d744a624b..8672ac639c 100644 --- a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.09.16.f407-discovery.1743871579" + signature = "rusEFI 2022.09.16.f407-discovery.2388932933" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.16.f407-discovery.1743871579" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.16.f407-discovery.2388932933" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Sep 16 01:34:18 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Sep 16 20:10:23 UTC 2022 pageSize = 21296 page = 1 @@ -1047,7 +1047,7 @@ gppwm1_dutyIfError = scalar, U08, 2566, "%", 1, 0, 0, 100, 0 gppwm1_pwmFrequency = scalar, U16, 2568, "hz", 1, 0, 0, 500, 0 gppwm1_onAboveDuty = scalar, U08, 2570, "%", 1, 0, 0, 100, 0 gppwm1_offBelowDuty = scalar, U08, 2571, "%", 1, 0, 0, 100, 0 -gppwm1_loadAxis = bits, U08, 2572, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm1_loadAxis = bits, U08, 2572, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm1_alignmentFill_map = scalar, U08, 2573, "unit", 1, 0, 0, 100, 0 gppwm1_loadBins = array, U08, 2574, [8], "load", 1, 0, 0, 250, 0 gppwm1_rpmBins = array, U08, 2582, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1057,7 +1057,7 @@ gppwm2_dutyIfError = scalar, U08, 2658, "%", 1, 0, 0, 100, 0 gppwm2_pwmFrequency = scalar, U16, 2660, "hz", 1, 0, 0, 500, 0 gppwm2_onAboveDuty = scalar, U08, 2662, "%", 1, 0, 0, 100, 0 gppwm2_offBelowDuty = scalar, U08, 2663, "%", 1, 0, 0, 100, 0 -gppwm2_loadAxis = bits, U08, 2664, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm2_loadAxis = bits, U08, 2664, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm2_alignmentFill_map = scalar, U08, 2665, "unit", 1, 0, 0, 100, 0 gppwm2_loadBins = array, U08, 2666, [8], "load", 1, 0, 0, 250, 0 gppwm2_rpmBins = array, U08, 2674, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1067,7 +1067,7 @@ gppwm3_dutyIfError = scalar, U08, 2750, "%", 1, 0, 0, 100, 0 gppwm3_pwmFrequency = scalar, U16, 2752, "hz", 1, 0, 0, 500, 0 gppwm3_onAboveDuty = scalar, U08, 2754, "%", 1, 0, 0, 100, 0 gppwm3_offBelowDuty = scalar, U08, 2755, "%", 1, 0, 0, 100, 0 -gppwm3_loadAxis = bits, U08, 2756, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm3_loadAxis = bits, U08, 2756, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm3_alignmentFill_map = scalar, U08, 2757, "unit", 1, 0, 0, 100, 0 gppwm3_loadBins = array, U08, 2758, [8], "load", 1, 0, 0, 250, 0 gppwm3_rpmBins = array, U08, 2766, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1077,7 +1077,7 @@ gppwm4_dutyIfError = scalar, U08, 2842, "%", 1, 0, 0, 100, 0 gppwm4_pwmFrequency = scalar, U16, 2844, "hz", 1, 0, 0, 500, 0 gppwm4_onAboveDuty = scalar, U08, 2846, "%", 1, 0, 0, 100, 0 gppwm4_offBelowDuty = scalar, U08, 2847, "%", 1, 0, 0, 100, 0 -gppwm4_loadAxis = bits, U08, 2848, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm4_loadAxis = bits, U08, 2848, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm4_alignmentFill_map = scalar, U08, 2849, "unit", 1, 0, 0, 100, 0 gppwm4_loadBins = array, U08, 2850, [8], "load", 1, 0, 0, 250, 0 gppwm4_rpmBins = array, U08, 2858, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -3259,10 +3259,10 @@ esr = scalar, U16, 1244, "", 1, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } ; These "synthetic" channels provide the Y-axis (load) value for gen purp PWM table's Y axes - gppwm1_load = {(gppwm1_loadAxis == 0) ? TPSValue : ((gppwm1_loadAxis == 1) ? MAPValue : ((gppwm1_loadAxis == 2) ? coolant : ((gppwm1_loadAxis == 3) ? intake : ((gppwm1_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm2_load = {(gppwm2_loadAxis == 0) ? TPSValue : ((gppwm2_loadAxis == 1) ? MAPValue : ((gppwm2_loadAxis == 2) ? coolant : ((gppwm2_loadAxis == 3) ? intake : ((gppwm2_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm3_load = {(gppwm3_loadAxis == 0) ? TPSValue : ((gppwm3_loadAxis == 1) ? MAPValue : ((gppwm3_loadAxis == 2) ? coolant : ((gppwm3_loadAxis == 3) ? intake : ((gppwm3_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm4_load = {(gppwm4_loadAxis == 0) ? TPSValue : ((gppwm4_loadAxis == 1) ? MAPValue : ((gppwm4_loadAxis == 2) ? coolant : ((gppwm4_loadAxis == 3) ? intake : ((gppwm4_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} + gppwm1_load = {(gppwm1_loadAxis == 0) ? 0 : (gppwm1_loadAxis == 1) ? TPSValue : (gppwm1_loadAxis == 2) ? MAPValue : (gppwm1_loadAxis == 3) ? coolant : (gppwm1_loadAxis == 4) ? intake : (gppwm1_loadAxis == 5) ? fuelingLoad : (gppwm1_loadAxis == 6) ? ignitionLoad : (gppwm1_loadAxis == 7) ? auxTemp1 : (gppwm1_loadAxis == 8) ? auxTemp2 : (gppwm1_loadAxis == 9) ? throttlePedalPosition : (gppwm1_loadAxis == 10) ? VBatt : (gppwm1_loadAxis == 11) ? vvtPositionB1I : (gppwm1_loadAxis == 12) ? vvtPositionB1E : (gppwm1_loadAxis == 13) ? vvtPositionB2I : (gppwm1_loadAxis == 14) ? vvtPositionB2E : (gppwm1_loadAxis == 15) ? flexPercent : (gppwm1_loadAxis == 16) ? auxLinear1 : (gppwm1_loadAxis == 17) ? auxLinear2 : 0} + gppwm2_load = {(gppwm2_loadAxis == 0) ? 0 : (gppwm2_loadAxis == 1) ? TPSValue : (gppwm2_loadAxis == 2) ? MAPValue : (gppwm2_loadAxis == 3) ? coolant : (gppwm2_loadAxis == 4) ? intake : (gppwm2_loadAxis == 5) ? fuelingLoad : (gppwm2_loadAxis == 6) ? ignitionLoad : (gppwm2_loadAxis == 7) ? auxTemp1 : (gppwm2_loadAxis == 8) ? auxTemp2 : (gppwm2_loadAxis == 9) ? throttlePedalPosition : (gppwm2_loadAxis == 10) ? VBatt : (gppwm2_loadAxis == 11) ? vvtPositionB1I : (gppwm2_loadAxis == 12) ? vvtPositionB1E : (gppwm2_loadAxis == 13) ? vvtPositionB2I : (gppwm2_loadAxis == 14) ? vvtPositionB2E : (gppwm2_loadAxis == 15) ? flexPercent : (gppwm2_loadAxis == 16) ? auxLinear1 : (gppwm2_loadAxis == 17) ? auxLinear2 : 0} + gppwm3_load = {(gppwm3_loadAxis == 0) ? 0 : (gppwm3_loadAxis == 1) ? TPSValue : (gppwm3_loadAxis == 2) ? MAPValue : (gppwm3_loadAxis == 3) ? coolant : (gppwm3_loadAxis == 4) ? intake : (gppwm3_loadAxis == 5) ? fuelingLoad : (gppwm3_loadAxis == 6) ? ignitionLoad : (gppwm3_loadAxis == 7) ? auxTemp1 : (gppwm3_loadAxis == 8) ? auxTemp2 : (gppwm3_loadAxis == 9) ? throttlePedalPosition : (gppwm3_loadAxis == 10) ? VBatt : (gppwm3_loadAxis == 11) ? vvtPositionB1I : (gppwm3_loadAxis == 12) ? vvtPositionB1E : (gppwm3_loadAxis == 13) ? vvtPositionB2I : (gppwm3_loadAxis == 14) ? vvtPositionB2E : (gppwm3_loadAxis == 15) ? flexPercent : (gppwm3_loadAxis == 16) ? auxLinear1 : (gppwm3_loadAxis == 17) ? auxLinear2 : 0} + gppwm4_load = {(gppwm4_loadAxis == 0) ? 0 : (gppwm4_loadAxis == 1) ? TPSValue : (gppwm4_loadAxis == 2) ? MAPValue : (gppwm4_loadAxis == 3) ? coolant : (gppwm4_loadAxis == 4) ? intake : (gppwm4_loadAxis == 5) ? fuelingLoad : (gppwm4_loadAxis == 6) ? ignitionLoad : (gppwm4_loadAxis == 7) ? auxTemp1 : (gppwm4_loadAxis == 8) ? auxTemp2 : (gppwm4_loadAxis == 9) ? throttlePedalPosition : (gppwm4_loadAxis == 10) ? VBatt : (gppwm4_loadAxis == 11) ? vvtPositionB1I : (gppwm4_loadAxis == 12) ? vvtPositionB1E : (gppwm4_loadAxis == 13) ? vvtPositionB2I : (gppwm4_loadAxis == 14) ? vvtPositionB2E : (gppwm4_loadAxis == 15) ? flexPercent : (gppwm4_loadAxis == 16) ? auxLinear1 : (gppwm4_loadAxis == 17) ? auxLinear2 : 0} [PcVariables] tuneCrcPcVariable = continuousChannelValue, tuneCrc16 diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index d286bdb075..772c27efda 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.09.16.f429-discovery.1743871579" + signature = "rusEFI 2022.09.16.f429-discovery.2388932933" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.16.f429-discovery.1743871579" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.16.f429-discovery.2388932933" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Sep 16 01:34:20 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Sep 16 20:10:25 UTC 2022 pageSize = 21296 page = 1 @@ -1047,7 +1047,7 @@ gppwm1_dutyIfError = scalar, U08, 2566, "%", 1, 0, 0, 100, 0 gppwm1_pwmFrequency = scalar, U16, 2568, "hz", 1, 0, 0, 500, 0 gppwm1_onAboveDuty = scalar, U08, 2570, "%", 1, 0, 0, 100, 0 gppwm1_offBelowDuty = scalar, U08, 2571, "%", 1, 0, 0, 100, 0 -gppwm1_loadAxis = bits, U08, 2572, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm1_loadAxis = bits, U08, 2572, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm1_alignmentFill_map = scalar, U08, 2573, "unit", 1, 0, 0, 100, 0 gppwm1_loadBins = array, U08, 2574, [8], "load", 1, 0, 0, 250, 0 gppwm1_rpmBins = array, U08, 2582, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1057,7 +1057,7 @@ gppwm2_dutyIfError = scalar, U08, 2658, "%", 1, 0, 0, 100, 0 gppwm2_pwmFrequency = scalar, U16, 2660, "hz", 1, 0, 0, 500, 0 gppwm2_onAboveDuty = scalar, U08, 2662, "%", 1, 0, 0, 100, 0 gppwm2_offBelowDuty = scalar, U08, 2663, "%", 1, 0, 0, 100, 0 -gppwm2_loadAxis = bits, U08, 2664, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm2_loadAxis = bits, U08, 2664, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm2_alignmentFill_map = scalar, U08, 2665, "unit", 1, 0, 0, 100, 0 gppwm2_loadBins = array, U08, 2666, [8], "load", 1, 0, 0, 250, 0 gppwm2_rpmBins = array, U08, 2674, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1067,7 +1067,7 @@ gppwm3_dutyIfError = scalar, U08, 2750, "%", 1, 0, 0, 100, 0 gppwm3_pwmFrequency = scalar, U16, 2752, "hz", 1, 0, 0, 500, 0 gppwm3_onAboveDuty = scalar, U08, 2754, "%", 1, 0, 0, 100, 0 gppwm3_offBelowDuty = scalar, U08, 2755, "%", 1, 0, 0, 100, 0 -gppwm3_loadAxis = bits, U08, 2756, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm3_loadAxis = bits, U08, 2756, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm3_alignmentFill_map = scalar, U08, 2757, "unit", 1, 0, 0, 100, 0 gppwm3_loadBins = array, U08, 2758, [8], "load", 1, 0, 0, 250, 0 gppwm3_rpmBins = array, U08, 2766, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1077,7 +1077,7 @@ gppwm4_dutyIfError = scalar, U08, 2842, "%", 1, 0, 0, 100, 0 gppwm4_pwmFrequency = scalar, U16, 2844, "hz", 1, 0, 0, 500, 0 gppwm4_onAboveDuty = scalar, U08, 2846, "%", 1, 0, 0, 100, 0 gppwm4_offBelowDuty = scalar, U08, 2847, "%", 1, 0, 0, 100, 0 -gppwm4_loadAxis = bits, U08, 2848, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm4_loadAxis = bits, U08, 2848, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm4_alignmentFill_map = scalar, U08, 2849, "unit", 1, 0, 0, 100, 0 gppwm4_loadBins = array, U08, 2850, [8], "load", 1, 0, 0, 250, 0 gppwm4_rpmBins = array, U08, 2858, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -3259,10 +3259,10 @@ esr = scalar, U16, 1244, "", 1, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } ; These "synthetic" channels provide the Y-axis (load) value for gen purp PWM table's Y axes - gppwm1_load = {(gppwm1_loadAxis == 0) ? TPSValue : ((gppwm1_loadAxis == 1) ? MAPValue : ((gppwm1_loadAxis == 2) ? coolant : ((gppwm1_loadAxis == 3) ? intake : ((gppwm1_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm2_load = {(gppwm2_loadAxis == 0) ? TPSValue : ((gppwm2_loadAxis == 1) ? MAPValue : ((gppwm2_loadAxis == 2) ? coolant : ((gppwm2_loadAxis == 3) ? intake : ((gppwm2_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm3_load = {(gppwm3_loadAxis == 0) ? TPSValue : ((gppwm3_loadAxis == 1) ? MAPValue : ((gppwm3_loadAxis == 2) ? coolant : ((gppwm3_loadAxis == 3) ? intake : ((gppwm3_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm4_load = {(gppwm4_loadAxis == 0) ? TPSValue : ((gppwm4_loadAxis == 1) ? MAPValue : ((gppwm4_loadAxis == 2) ? coolant : ((gppwm4_loadAxis == 3) ? intake : ((gppwm4_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} + gppwm1_load = {(gppwm1_loadAxis == 0) ? 0 : (gppwm1_loadAxis == 1) ? TPSValue : (gppwm1_loadAxis == 2) ? MAPValue : (gppwm1_loadAxis == 3) ? coolant : (gppwm1_loadAxis == 4) ? intake : (gppwm1_loadAxis == 5) ? fuelingLoad : (gppwm1_loadAxis == 6) ? ignitionLoad : (gppwm1_loadAxis == 7) ? auxTemp1 : (gppwm1_loadAxis == 8) ? auxTemp2 : (gppwm1_loadAxis == 9) ? throttlePedalPosition : (gppwm1_loadAxis == 10) ? VBatt : (gppwm1_loadAxis == 11) ? vvtPositionB1I : (gppwm1_loadAxis == 12) ? vvtPositionB1E : (gppwm1_loadAxis == 13) ? vvtPositionB2I : (gppwm1_loadAxis == 14) ? vvtPositionB2E : (gppwm1_loadAxis == 15) ? flexPercent : (gppwm1_loadAxis == 16) ? auxLinear1 : (gppwm1_loadAxis == 17) ? auxLinear2 : 0} + gppwm2_load = {(gppwm2_loadAxis == 0) ? 0 : (gppwm2_loadAxis == 1) ? TPSValue : (gppwm2_loadAxis == 2) ? MAPValue : (gppwm2_loadAxis == 3) ? coolant : (gppwm2_loadAxis == 4) ? intake : (gppwm2_loadAxis == 5) ? fuelingLoad : (gppwm2_loadAxis == 6) ? ignitionLoad : (gppwm2_loadAxis == 7) ? auxTemp1 : (gppwm2_loadAxis == 8) ? auxTemp2 : (gppwm2_loadAxis == 9) ? throttlePedalPosition : (gppwm2_loadAxis == 10) ? VBatt : (gppwm2_loadAxis == 11) ? vvtPositionB1I : (gppwm2_loadAxis == 12) ? vvtPositionB1E : (gppwm2_loadAxis == 13) ? vvtPositionB2I : (gppwm2_loadAxis == 14) ? vvtPositionB2E : (gppwm2_loadAxis == 15) ? flexPercent : (gppwm2_loadAxis == 16) ? auxLinear1 : (gppwm2_loadAxis == 17) ? auxLinear2 : 0} + gppwm3_load = {(gppwm3_loadAxis == 0) ? 0 : (gppwm3_loadAxis == 1) ? TPSValue : (gppwm3_loadAxis == 2) ? MAPValue : (gppwm3_loadAxis == 3) ? coolant : (gppwm3_loadAxis == 4) ? intake : (gppwm3_loadAxis == 5) ? fuelingLoad : (gppwm3_loadAxis == 6) ? ignitionLoad : (gppwm3_loadAxis == 7) ? auxTemp1 : (gppwm3_loadAxis == 8) ? auxTemp2 : (gppwm3_loadAxis == 9) ? throttlePedalPosition : (gppwm3_loadAxis == 10) ? VBatt : (gppwm3_loadAxis == 11) ? vvtPositionB1I : (gppwm3_loadAxis == 12) ? vvtPositionB1E : (gppwm3_loadAxis == 13) ? vvtPositionB2I : (gppwm3_loadAxis == 14) ? vvtPositionB2E : (gppwm3_loadAxis == 15) ? flexPercent : (gppwm3_loadAxis == 16) ? auxLinear1 : (gppwm3_loadAxis == 17) ? auxLinear2 : 0} + gppwm4_load = {(gppwm4_loadAxis == 0) ? 0 : (gppwm4_loadAxis == 1) ? TPSValue : (gppwm4_loadAxis == 2) ? MAPValue : (gppwm4_loadAxis == 3) ? coolant : (gppwm4_loadAxis == 4) ? intake : (gppwm4_loadAxis == 5) ? fuelingLoad : (gppwm4_loadAxis == 6) ? ignitionLoad : (gppwm4_loadAxis == 7) ? auxTemp1 : (gppwm4_loadAxis == 8) ? auxTemp2 : (gppwm4_loadAxis == 9) ? throttlePedalPosition : (gppwm4_loadAxis == 10) ? VBatt : (gppwm4_loadAxis == 11) ? vvtPositionB1I : (gppwm4_loadAxis == 12) ? vvtPositionB1E : (gppwm4_loadAxis == 13) ? vvtPositionB2I : (gppwm4_loadAxis == 14) ? vvtPositionB2E : (gppwm4_loadAxis == 15) ? flexPercent : (gppwm4_loadAxis == 16) ? auxLinear1 : (gppwm4_loadAxis == 17) ? auxLinear2 : 0} [PcVariables] tuneCrcPcVariable = continuousChannelValue, tuneCrc16 diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index e5846c7b2c..e2da595b7a 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 2022.09.16.frankenso_na6.631087775" + signature = "rusEFI 2022.09.16.frankenso_na6.3423126913" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.16.frankenso_na6.631087775" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.16.frankenso_na6.3423126913" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Sep 16 01:34:05 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Sep 16 20:10:12 UTC 2022 pageSize = 21296 page = 1 @@ -1047,7 +1047,7 @@ gppwm1_dutyIfError = scalar, U08, 2566, "%", 1, 0, 0, 100, 0 gppwm1_pwmFrequency = scalar, U16, 2568, "hz", 1, 0, 0, 500, 0 gppwm1_onAboveDuty = scalar, U08, 2570, "%", 1, 0, 0, 100, 0 gppwm1_offBelowDuty = scalar, U08, 2571, "%", 1, 0, 0, 100, 0 -gppwm1_loadAxis = bits, U08, 2572, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm1_loadAxis = bits, U08, 2572, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm1_alignmentFill_map = scalar, U08, 2573, "unit", 1, 0, 0, 100, 0 gppwm1_loadBins = array, U08, 2574, [8], "load", 1, 0, 0, 250, 0 gppwm1_rpmBins = array, U08, 2582, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1057,7 +1057,7 @@ gppwm2_dutyIfError = scalar, U08, 2658, "%", 1, 0, 0, 100, 0 gppwm2_pwmFrequency = scalar, U16, 2660, "hz", 1, 0, 0, 500, 0 gppwm2_onAboveDuty = scalar, U08, 2662, "%", 1, 0, 0, 100, 0 gppwm2_offBelowDuty = scalar, U08, 2663, "%", 1, 0, 0, 100, 0 -gppwm2_loadAxis = bits, U08, 2664, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm2_loadAxis = bits, U08, 2664, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm2_alignmentFill_map = scalar, U08, 2665, "unit", 1, 0, 0, 100, 0 gppwm2_loadBins = array, U08, 2666, [8], "load", 1, 0, 0, 250, 0 gppwm2_rpmBins = array, U08, 2674, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1067,7 +1067,7 @@ gppwm3_dutyIfError = scalar, U08, 2750, "%", 1, 0, 0, 100, 0 gppwm3_pwmFrequency = scalar, U16, 2752, "hz", 1, 0, 0, 500, 0 gppwm3_onAboveDuty = scalar, U08, 2754, "%", 1, 0, 0, 100, 0 gppwm3_offBelowDuty = scalar, U08, 2755, "%", 1, 0, 0, 100, 0 -gppwm3_loadAxis = bits, U08, 2756, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm3_loadAxis = bits, U08, 2756, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm3_alignmentFill_map = scalar, U08, 2757, "unit", 1, 0, 0, 100, 0 gppwm3_loadBins = array, U08, 2758, [8], "load", 1, 0, 0, 250, 0 gppwm3_rpmBins = array, U08, 2766, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1077,7 +1077,7 @@ gppwm4_dutyIfError = scalar, U08, 2842, "%", 1, 0, 0, 100, 0 gppwm4_pwmFrequency = scalar, U16, 2844, "hz", 1, 0, 0, 500, 0 gppwm4_onAboveDuty = scalar, U08, 2846, "%", 1, 0, 0, 100, 0 gppwm4_offBelowDuty = scalar, U08, 2847, "%", 1, 0, 0, 100, 0 -gppwm4_loadAxis = bits, U08, 2848, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm4_loadAxis = bits, U08, 2848, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm4_alignmentFill_map = scalar, U08, 2849, "unit", 1, 0, 0, 100, 0 gppwm4_loadBins = array, U08, 2850, [8], "load", 1, 0, 0, 250, 0 gppwm4_rpmBins = array, U08, 2858, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -3259,10 +3259,10 @@ esr = scalar, U16, 1244, "", 1, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } ; These "synthetic" channels provide the Y-axis (load) value for gen purp PWM table's Y axes - gppwm1_load = {(gppwm1_loadAxis == 0) ? TPSValue : ((gppwm1_loadAxis == 1) ? MAPValue : ((gppwm1_loadAxis == 2) ? coolant : ((gppwm1_loadAxis == 3) ? intake : ((gppwm1_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm2_load = {(gppwm2_loadAxis == 0) ? TPSValue : ((gppwm2_loadAxis == 1) ? MAPValue : ((gppwm2_loadAxis == 2) ? coolant : ((gppwm2_loadAxis == 3) ? intake : ((gppwm2_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm3_load = {(gppwm3_loadAxis == 0) ? TPSValue : ((gppwm3_loadAxis == 1) ? MAPValue : ((gppwm3_loadAxis == 2) ? coolant : ((gppwm3_loadAxis == 3) ? intake : ((gppwm3_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm4_load = {(gppwm4_loadAxis == 0) ? TPSValue : ((gppwm4_loadAxis == 1) ? MAPValue : ((gppwm4_loadAxis == 2) ? coolant : ((gppwm4_loadAxis == 3) ? intake : ((gppwm4_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} + gppwm1_load = {(gppwm1_loadAxis == 0) ? 0 : (gppwm1_loadAxis == 1) ? TPSValue : (gppwm1_loadAxis == 2) ? MAPValue : (gppwm1_loadAxis == 3) ? coolant : (gppwm1_loadAxis == 4) ? intake : (gppwm1_loadAxis == 5) ? fuelingLoad : (gppwm1_loadAxis == 6) ? ignitionLoad : (gppwm1_loadAxis == 7) ? auxTemp1 : (gppwm1_loadAxis == 8) ? auxTemp2 : (gppwm1_loadAxis == 9) ? throttlePedalPosition : (gppwm1_loadAxis == 10) ? VBatt : (gppwm1_loadAxis == 11) ? vvtPositionB1I : (gppwm1_loadAxis == 12) ? vvtPositionB1E : (gppwm1_loadAxis == 13) ? vvtPositionB2I : (gppwm1_loadAxis == 14) ? vvtPositionB2E : (gppwm1_loadAxis == 15) ? flexPercent : (gppwm1_loadAxis == 16) ? auxLinear1 : (gppwm1_loadAxis == 17) ? auxLinear2 : 0} + gppwm2_load = {(gppwm2_loadAxis == 0) ? 0 : (gppwm2_loadAxis == 1) ? TPSValue : (gppwm2_loadAxis == 2) ? MAPValue : (gppwm2_loadAxis == 3) ? coolant : (gppwm2_loadAxis == 4) ? intake : (gppwm2_loadAxis == 5) ? fuelingLoad : (gppwm2_loadAxis == 6) ? ignitionLoad : (gppwm2_loadAxis == 7) ? auxTemp1 : (gppwm2_loadAxis == 8) ? auxTemp2 : (gppwm2_loadAxis == 9) ? throttlePedalPosition : (gppwm2_loadAxis == 10) ? VBatt : (gppwm2_loadAxis == 11) ? vvtPositionB1I : (gppwm2_loadAxis == 12) ? vvtPositionB1E : (gppwm2_loadAxis == 13) ? vvtPositionB2I : (gppwm2_loadAxis == 14) ? vvtPositionB2E : (gppwm2_loadAxis == 15) ? flexPercent : (gppwm2_loadAxis == 16) ? auxLinear1 : (gppwm2_loadAxis == 17) ? auxLinear2 : 0} + gppwm3_load = {(gppwm3_loadAxis == 0) ? 0 : (gppwm3_loadAxis == 1) ? TPSValue : (gppwm3_loadAxis == 2) ? MAPValue : (gppwm3_loadAxis == 3) ? coolant : (gppwm3_loadAxis == 4) ? intake : (gppwm3_loadAxis == 5) ? fuelingLoad : (gppwm3_loadAxis == 6) ? ignitionLoad : (gppwm3_loadAxis == 7) ? auxTemp1 : (gppwm3_loadAxis == 8) ? auxTemp2 : (gppwm3_loadAxis == 9) ? throttlePedalPosition : (gppwm3_loadAxis == 10) ? VBatt : (gppwm3_loadAxis == 11) ? vvtPositionB1I : (gppwm3_loadAxis == 12) ? vvtPositionB1E : (gppwm3_loadAxis == 13) ? vvtPositionB2I : (gppwm3_loadAxis == 14) ? vvtPositionB2E : (gppwm3_loadAxis == 15) ? flexPercent : (gppwm3_loadAxis == 16) ? auxLinear1 : (gppwm3_loadAxis == 17) ? auxLinear2 : 0} + gppwm4_load = {(gppwm4_loadAxis == 0) ? 0 : (gppwm4_loadAxis == 1) ? TPSValue : (gppwm4_loadAxis == 2) ? MAPValue : (gppwm4_loadAxis == 3) ? coolant : (gppwm4_loadAxis == 4) ? intake : (gppwm4_loadAxis == 5) ? fuelingLoad : (gppwm4_loadAxis == 6) ? ignitionLoad : (gppwm4_loadAxis == 7) ? auxTemp1 : (gppwm4_loadAxis == 8) ? auxTemp2 : (gppwm4_loadAxis == 9) ? throttlePedalPosition : (gppwm4_loadAxis == 10) ? VBatt : (gppwm4_loadAxis == 11) ? vvtPositionB1I : (gppwm4_loadAxis == 12) ? vvtPositionB1E : (gppwm4_loadAxis == 13) ? vvtPositionB2I : (gppwm4_loadAxis == 14) ? vvtPositionB2E : (gppwm4_loadAxis == 15) ? flexPercent : (gppwm4_loadAxis == 16) ? auxLinear1 : (gppwm4_loadAxis == 17) ? auxLinear2 : 0} [PcVariables] tuneCrcPcVariable = continuousChannelValue, tuneCrc16 diff --git a/firmware/tunerstudio/generated/rusefi_harley81.ini b/firmware/tunerstudio/generated/rusefi_harley81.ini index d9d7521fa5..9a12847b30 100644 --- a/firmware/tunerstudio/generated/rusefi_harley81.ini +++ b/firmware/tunerstudio/generated/rusefi_harley81.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.09.16.harley81.2534169460" + signature = "rusEFI 2022.09.16.harley81.2123971690" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.16.harley81.2534169460" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.16.harley81.2123971690" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Sep 16 01:33:30 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Sep 16 20:09:41 UTC 2022 pageSize = 21296 page = 1 @@ -1047,7 +1047,7 @@ gppwm1_dutyIfError = scalar, U08, 2566, "%", 1, 0, 0, 100, 0 gppwm1_pwmFrequency = scalar, U16, 2568, "hz", 1, 0, 0, 500, 0 gppwm1_onAboveDuty = scalar, U08, 2570, "%", 1, 0, 0, 100, 0 gppwm1_offBelowDuty = scalar, U08, 2571, "%", 1, 0, 0, 100, 0 -gppwm1_loadAxis = bits, U08, 2572, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm1_loadAxis = bits, U08, 2572, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm1_alignmentFill_map = scalar, U08, 2573, "unit", 1, 0, 0, 100, 0 gppwm1_loadBins = array, U08, 2574, [8], "load", 1, 0, 0, 250, 0 gppwm1_rpmBins = array, U08, 2582, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1057,7 +1057,7 @@ gppwm2_dutyIfError = scalar, U08, 2658, "%", 1, 0, 0, 100, 0 gppwm2_pwmFrequency = scalar, U16, 2660, "hz", 1, 0, 0, 500, 0 gppwm2_onAboveDuty = scalar, U08, 2662, "%", 1, 0, 0, 100, 0 gppwm2_offBelowDuty = scalar, U08, 2663, "%", 1, 0, 0, 100, 0 -gppwm2_loadAxis = bits, U08, 2664, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm2_loadAxis = bits, U08, 2664, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm2_alignmentFill_map = scalar, U08, 2665, "unit", 1, 0, 0, 100, 0 gppwm2_loadBins = array, U08, 2666, [8], "load", 1, 0, 0, 250, 0 gppwm2_rpmBins = array, U08, 2674, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1067,7 +1067,7 @@ gppwm3_dutyIfError = scalar, U08, 2750, "%", 1, 0, 0, 100, 0 gppwm3_pwmFrequency = scalar, U16, 2752, "hz", 1, 0, 0, 500, 0 gppwm3_onAboveDuty = scalar, U08, 2754, "%", 1, 0, 0, 100, 0 gppwm3_offBelowDuty = scalar, U08, 2755, "%", 1, 0, 0, 100, 0 -gppwm3_loadAxis = bits, U08, 2756, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm3_loadAxis = bits, U08, 2756, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm3_alignmentFill_map = scalar, U08, 2757, "unit", 1, 0, 0, 100, 0 gppwm3_loadBins = array, U08, 2758, [8], "load", 1, 0, 0, 250, 0 gppwm3_rpmBins = array, U08, 2766, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1077,7 +1077,7 @@ gppwm4_dutyIfError = scalar, U08, 2842, "%", 1, 0, 0, 100, 0 gppwm4_pwmFrequency = scalar, U16, 2844, "hz", 1, 0, 0, 500, 0 gppwm4_onAboveDuty = scalar, U08, 2846, "%", 1, 0, 0, 100, 0 gppwm4_offBelowDuty = scalar, U08, 2847, "%", 1, 0, 0, 100, 0 -gppwm4_loadAxis = bits, U08, 2848, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm4_loadAxis = bits, U08, 2848, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm4_alignmentFill_map = scalar, U08, 2849, "unit", 1, 0, 0, 100, 0 gppwm4_loadBins = array, U08, 2850, [8], "load", 1, 0, 0, 250, 0 gppwm4_rpmBins = array, U08, 2858, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -3259,10 +3259,10 @@ esr = scalar, U16, 1244, "", 1, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } ; These "synthetic" channels provide the Y-axis (load) value for gen purp PWM table's Y axes - gppwm1_load = {(gppwm1_loadAxis == 0) ? TPSValue : ((gppwm1_loadAxis == 1) ? MAPValue : ((gppwm1_loadAxis == 2) ? coolant : ((gppwm1_loadAxis == 3) ? intake : ((gppwm1_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm2_load = {(gppwm2_loadAxis == 0) ? TPSValue : ((gppwm2_loadAxis == 1) ? MAPValue : ((gppwm2_loadAxis == 2) ? coolant : ((gppwm2_loadAxis == 3) ? intake : ((gppwm2_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm3_load = {(gppwm3_loadAxis == 0) ? TPSValue : ((gppwm3_loadAxis == 1) ? MAPValue : ((gppwm3_loadAxis == 2) ? coolant : ((gppwm3_loadAxis == 3) ? intake : ((gppwm3_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm4_load = {(gppwm4_loadAxis == 0) ? TPSValue : ((gppwm4_loadAxis == 1) ? MAPValue : ((gppwm4_loadAxis == 2) ? coolant : ((gppwm4_loadAxis == 3) ? intake : ((gppwm4_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} + gppwm1_load = {(gppwm1_loadAxis == 0) ? 0 : (gppwm1_loadAxis == 1) ? TPSValue : (gppwm1_loadAxis == 2) ? MAPValue : (gppwm1_loadAxis == 3) ? coolant : (gppwm1_loadAxis == 4) ? intake : (gppwm1_loadAxis == 5) ? fuelingLoad : (gppwm1_loadAxis == 6) ? ignitionLoad : (gppwm1_loadAxis == 7) ? auxTemp1 : (gppwm1_loadAxis == 8) ? auxTemp2 : (gppwm1_loadAxis == 9) ? throttlePedalPosition : (gppwm1_loadAxis == 10) ? VBatt : (gppwm1_loadAxis == 11) ? vvtPositionB1I : (gppwm1_loadAxis == 12) ? vvtPositionB1E : (gppwm1_loadAxis == 13) ? vvtPositionB2I : (gppwm1_loadAxis == 14) ? vvtPositionB2E : (gppwm1_loadAxis == 15) ? flexPercent : (gppwm1_loadAxis == 16) ? auxLinear1 : (gppwm1_loadAxis == 17) ? auxLinear2 : 0} + gppwm2_load = {(gppwm2_loadAxis == 0) ? 0 : (gppwm2_loadAxis == 1) ? TPSValue : (gppwm2_loadAxis == 2) ? MAPValue : (gppwm2_loadAxis == 3) ? coolant : (gppwm2_loadAxis == 4) ? intake : (gppwm2_loadAxis == 5) ? fuelingLoad : (gppwm2_loadAxis == 6) ? ignitionLoad : (gppwm2_loadAxis == 7) ? auxTemp1 : (gppwm2_loadAxis == 8) ? auxTemp2 : (gppwm2_loadAxis == 9) ? throttlePedalPosition : (gppwm2_loadAxis == 10) ? VBatt : (gppwm2_loadAxis == 11) ? vvtPositionB1I : (gppwm2_loadAxis == 12) ? vvtPositionB1E : (gppwm2_loadAxis == 13) ? vvtPositionB2I : (gppwm2_loadAxis == 14) ? vvtPositionB2E : (gppwm2_loadAxis == 15) ? flexPercent : (gppwm2_loadAxis == 16) ? auxLinear1 : (gppwm2_loadAxis == 17) ? auxLinear2 : 0} + gppwm3_load = {(gppwm3_loadAxis == 0) ? 0 : (gppwm3_loadAxis == 1) ? TPSValue : (gppwm3_loadAxis == 2) ? MAPValue : (gppwm3_loadAxis == 3) ? coolant : (gppwm3_loadAxis == 4) ? intake : (gppwm3_loadAxis == 5) ? fuelingLoad : (gppwm3_loadAxis == 6) ? ignitionLoad : (gppwm3_loadAxis == 7) ? auxTemp1 : (gppwm3_loadAxis == 8) ? auxTemp2 : (gppwm3_loadAxis == 9) ? throttlePedalPosition : (gppwm3_loadAxis == 10) ? VBatt : (gppwm3_loadAxis == 11) ? vvtPositionB1I : (gppwm3_loadAxis == 12) ? vvtPositionB1E : (gppwm3_loadAxis == 13) ? vvtPositionB2I : (gppwm3_loadAxis == 14) ? vvtPositionB2E : (gppwm3_loadAxis == 15) ? flexPercent : (gppwm3_loadAxis == 16) ? auxLinear1 : (gppwm3_loadAxis == 17) ? auxLinear2 : 0} + gppwm4_load = {(gppwm4_loadAxis == 0) ? 0 : (gppwm4_loadAxis == 1) ? TPSValue : (gppwm4_loadAxis == 2) ? MAPValue : (gppwm4_loadAxis == 3) ? coolant : (gppwm4_loadAxis == 4) ? intake : (gppwm4_loadAxis == 5) ? fuelingLoad : (gppwm4_loadAxis == 6) ? ignitionLoad : (gppwm4_loadAxis == 7) ? auxTemp1 : (gppwm4_loadAxis == 8) ? auxTemp2 : (gppwm4_loadAxis == 9) ? throttlePedalPosition : (gppwm4_loadAxis == 10) ? VBatt : (gppwm4_loadAxis == 11) ? vvtPositionB1I : (gppwm4_loadAxis == 12) ? vvtPositionB1E : (gppwm4_loadAxis == 13) ? vvtPositionB2I : (gppwm4_loadAxis == 14) ? vvtPositionB2E : (gppwm4_loadAxis == 15) ? flexPercent : (gppwm4_loadAxis == 16) ? auxLinear1 : (gppwm4_loadAxis == 17) ? auxLinear2 : 0} [PcVariables] tuneCrcPcVariable = continuousChannelValue, tuneCrc16 diff --git a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini index 9633bc582b..543842db71 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.09.16.hellen-gm-e67.3549879277" + signature = "rusEFI 2022.09.16.hellen-gm-e67.973323507" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.16.hellen-gm-e67.3549879277" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.16.hellen-gm-e67.973323507" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Sep 16 01:33:49 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Sep 16 20:09:58 UTC 2022 pageSize = 21296 page = 1 @@ -1047,7 +1047,7 @@ gppwm1_dutyIfError = scalar, U08, 2566, "%", 1, 0, 0, 100, 0 gppwm1_pwmFrequency = scalar, U16, 2568, "hz", 1, 0, 0, 500, 0 gppwm1_onAboveDuty = scalar, U08, 2570, "%", 1, 0, 0, 100, 0 gppwm1_offBelowDuty = scalar, U08, 2571, "%", 1, 0, 0, 100, 0 -gppwm1_loadAxis = bits, U08, 2572, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm1_loadAxis = bits, U08, 2572, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm1_alignmentFill_map = scalar, U08, 2573, "unit", 1, 0, 0, 100, 0 gppwm1_loadBins = array, U08, 2574, [8], "load", 1, 0, 0, 250, 0 gppwm1_rpmBins = array, U08, 2582, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1057,7 +1057,7 @@ gppwm2_dutyIfError = scalar, U08, 2658, "%", 1, 0, 0, 100, 0 gppwm2_pwmFrequency = scalar, U16, 2660, "hz", 1, 0, 0, 500, 0 gppwm2_onAboveDuty = scalar, U08, 2662, "%", 1, 0, 0, 100, 0 gppwm2_offBelowDuty = scalar, U08, 2663, "%", 1, 0, 0, 100, 0 -gppwm2_loadAxis = bits, U08, 2664, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm2_loadAxis = bits, U08, 2664, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm2_alignmentFill_map = scalar, U08, 2665, "unit", 1, 0, 0, 100, 0 gppwm2_loadBins = array, U08, 2666, [8], "load", 1, 0, 0, 250, 0 gppwm2_rpmBins = array, U08, 2674, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1067,7 +1067,7 @@ gppwm3_dutyIfError = scalar, U08, 2750, "%", 1, 0, 0, 100, 0 gppwm3_pwmFrequency = scalar, U16, 2752, "hz", 1, 0, 0, 500, 0 gppwm3_onAboveDuty = scalar, U08, 2754, "%", 1, 0, 0, 100, 0 gppwm3_offBelowDuty = scalar, U08, 2755, "%", 1, 0, 0, 100, 0 -gppwm3_loadAxis = bits, U08, 2756, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm3_loadAxis = bits, U08, 2756, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm3_alignmentFill_map = scalar, U08, 2757, "unit", 1, 0, 0, 100, 0 gppwm3_loadBins = array, U08, 2758, [8], "load", 1, 0, 0, 250, 0 gppwm3_rpmBins = array, U08, 2766, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1077,7 +1077,7 @@ gppwm4_dutyIfError = scalar, U08, 2842, "%", 1, 0, 0, 100, 0 gppwm4_pwmFrequency = scalar, U16, 2844, "hz", 1, 0, 0, 500, 0 gppwm4_onAboveDuty = scalar, U08, 2846, "%", 1, 0, 0, 100, 0 gppwm4_offBelowDuty = scalar, U08, 2847, "%", 1, 0, 0, 100, 0 -gppwm4_loadAxis = bits, U08, 2848, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm4_loadAxis = bits, U08, 2848, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm4_alignmentFill_map = scalar, U08, 2849, "unit", 1, 0, 0, 100, 0 gppwm4_loadBins = array, U08, 2850, [8], "load", 1, 0, 0, 250, 0 gppwm4_rpmBins = array, U08, 2858, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -3259,10 +3259,10 @@ esr = scalar, U16, 1244, "", 1, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } ; These "synthetic" channels provide the Y-axis (load) value for gen purp PWM table's Y axes - gppwm1_load = {(gppwm1_loadAxis == 0) ? TPSValue : ((gppwm1_loadAxis == 1) ? MAPValue : ((gppwm1_loadAxis == 2) ? coolant : ((gppwm1_loadAxis == 3) ? intake : ((gppwm1_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm2_load = {(gppwm2_loadAxis == 0) ? TPSValue : ((gppwm2_loadAxis == 1) ? MAPValue : ((gppwm2_loadAxis == 2) ? coolant : ((gppwm2_loadAxis == 3) ? intake : ((gppwm2_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm3_load = {(gppwm3_loadAxis == 0) ? TPSValue : ((gppwm3_loadAxis == 1) ? MAPValue : ((gppwm3_loadAxis == 2) ? coolant : ((gppwm3_loadAxis == 3) ? intake : ((gppwm3_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm4_load = {(gppwm4_loadAxis == 0) ? TPSValue : ((gppwm4_loadAxis == 1) ? MAPValue : ((gppwm4_loadAxis == 2) ? coolant : ((gppwm4_loadAxis == 3) ? intake : ((gppwm4_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} + gppwm1_load = {(gppwm1_loadAxis == 0) ? 0 : (gppwm1_loadAxis == 1) ? TPSValue : (gppwm1_loadAxis == 2) ? MAPValue : (gppwm1_loadAxis == 3) ? coolant : (gppwm1_loadAxis == 4) ? intake : (gppwm1_loadAxis == 5) ? fuelingLoad : (gppwm1_loadAxis == 6) ? ignitionLoad : (gppwm1_loadAxis == 7) ? auxTemp1 : (gppwm1_loadAxis == 8) ? auxTemp2 : (gppwm1_loadAxis == 9) ? throttlePedalPosition : (gppwm1_loadAxis == 10) ? VBatt : (gppwm1_loadAxis == 11) ? vvtPositionB1I : (gppwm1_loadAxis == 12) ? vvtPositionB1E : (gppwm1_loadAxis == 13) ? vvtPositionB2I : (gppwm1_loadAxis == 14) ? vvtPositionB2E : (gppwm1_loadAxis == 15) ? flexPercent : (gppwm1_loadAxis == 16) ? auxLinear1 : (gppwm1_loadAxis == 17) ? auxLinear2 : 0} + gppwm2_load = {(gppwm2_loadAxis == 0) ? 0 : (gppwm2_loadAxis == 1) ? TPSValue : (gppwm2_loadAxis == 2) ? MAPValue : (gppwm2_loadAxis == 3) ? coolant : (gppwm2_loadAxis == 4) ? intake : (gppwm2_loadAxis == 5) ? fuelingLoad : (gppwm2_loadAxis == 6) ? ignitionLoad : (gppwm2_loadAxis == 7) ? auxTemp1 : (gppwm2_loadAxis == 8) ? auxTemp2 : (gppwm2_loadAxis == 9) ? throttlePedalPosition : (gppwm2_loadAxis == 10) ? VBatt : (gppwm2_loadAxis == 11) ? vvtPositionB1I : (gppwm2_loadAxis == 12) ? vvtPositionB1E : (gppwm2_loadAxis == 13) ? vvtPositionB2I : (gppwm2_loadAxis == 14) ? vvtPositionB2E : (gppwm2_loadAxis == 15) ? flexPercent : (gppwm2_loadAxis == 16) ? auxLinear1 : (gppwm2_loadAxis == 17) ? auxLinear2 : 0} + gppwm3_load = {(gppwm3_loadAxis == 0) ? 0 : (gppwm3_loadAxis == 1) ? TPSValue : (gppwm3_loadAxis == 2) ? MAPValue : (gppwm3_loadAxis == 3) ? coolant : (gppwm3_loadAxis == 4) ? intake : (gppwm3_loadAxis == 5) ? fuelingLoad : (gppwm3_loadAxis == 6) ? ignitionLoad : (gppwm3_loadAxis == 7) ? auxTemp1 : (gppwm3_loadAxis == 8) ? auxTemp2 : (gppwm3_loadAxis == 9) ? throttlePedalPosition : (gppwm3_loadAxis == 10) ? VBatt : (gppwm3_loadAxis == 11) ? vvtPositionB1I : (gppwm3_loadAxis == 12) ? vvtPositionB1E : (gppwm3_loadAxis == 13) ? vvtPositionB2I : (gppwm3_loadAxis == 14) ? vvtPositionB2E : (gppwm3_loadAxis == 15) ? flexPercent : (gppwm3_loadAxis == 16) ? auxLinear1 : (gppwm3_loadAxis == 17) ? auxLinear2 : 0} + gppwm4_load = {(gppwm4_loadAxis == 0) ? 0 : (gppwm4_loadAxis == 1) ? TPSValue : (gppwm4_loadAxis == 2) ? MAPValue : (gppwm4_loadAxis == 3) ? coolant : (gppwm4_loadAxis == 4) ? intake : (gppwm4_loadAxis == 5) ? fuelingLoad : (gppwm4_loadAxis == 6) ? ignitionLoad : (gppwm4_loadAxis == 7) ? auxTemp1 : (gppwm4_loadAxis == 8) ? auxTemp2 : (gppwm4_loadAxis == 9) ? throttlePedalPosition : (gppwm4_loadAxis == 10) ? VBatt : (gppwm4_loadAxis == 11) ? vvtPositionB1I : (gppwm4_loadAxis == 12) ? vvtPositionB1E : (gppwm4_loadAxis == 13) ? vvtPositionB2I : (gppwm4_loadAxis == 14) ? vvtPositionB2E : (gppwm4_loadAxis == 15) ? flexPercent : (gppwm4_loadAxis == 16) ? auxLinear1 : (gppwm4_loadAxis == 17) ? auxLinear2 : 0} [PcVariables] tuneCrcPcVariable = continuousChannelValue, tuneCrc16 diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index e8f6345ff4..c55ffb2625 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.09.16.hellen-nb1.3195694999" + signature = "rusEFI 2022.09.16.hellen-nb1.1475283081" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.16.hellen-nb1.3195694999" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.16.hellen-nb1.1475283081" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Sep 16 01:33:47 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Sep 16 20:09:56 UTC 2022 pageSize = 21296 page = 1 @@ -1047,7 +1047,7 @@ gppwm1_dutyIfError = scalar, U08, 2566, "%", 1, 0, 0, 100, 0 gppwm1_pwmFrequency = scalar, U16, 2568, "hz", 1, 0, 0, 500, 0 gppwm1_onAboveDuty = scalar, U08, 2570, "%", 1, 0, 0, 100, 0 gppwm1_offBelowDuty = scalar, U08, 2571, "%", 1, 0, 0, 100, 0 -gppwm1_loadAxis = bits, U08, 2572, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm1_loadAxis = bits, U08, 2572, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm1_alignmentFill_map = scalar, U08, 2573, "unit", 1, 0, 0, 100, 0 gppwm1_loadBins = array, U08, 2574, [8], "load", 1, 0, 0, 250, 0 gppwm1_rpmBins = array, U08, 2582, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1057,7 +1057,7 @@ gppwm2_dutyIfError = scalar, U08, 2658, "%", 1, 0, 0, 100, 0 gppwm2_pwmFrequency = scalar, U16, 2660, "hz", 1, 0, 0, 500, 0 gppwm2_onAboveDuty = scalar, U08, 2662, "%", 1, 0, 0, 100, 0 gppwm2_offBelowDuty = scalar, U08, 2663, "%", 1, 0, 0, 100, 0 -gppwm2_loadAxis = bits, U08, 2664, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm2_loadAxis = bits, U08, 2664, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm2_alignmentFill_map = scalar, U08, 2665, "unit", 1, 0, 0, 100, 0 gppwm2_loadBins = array, U08, 2666, [8], "load", 1, 0, 0, 250, 0 gppwm2_rpmBins = array, U08, 2674, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1067,7 +1067,7 @@ gppwm3_dutyIfError = scalar, U08, 2750, "%", 1, 0, 0, 100, 0 gppwm3_pwmFrequency = scalar, U16, 2752, "hz", 1, 0, 0, 500, 0 gppwm3_onAboveDuty = scalar, U08, 2754, "%", 1, 0, 0, 100, 0 gppwm3_offBelowDuty = scalar, U08, 2755, "%", 1, 0, 0, 100, 0 -gppwm3_loadAxis = bits, U08, 2756, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm3_loadAxis = bits, U08, 2756, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm3_alignmentFill_map = scalar, U08, 2757, "unit", 1, 0, 0, 100, 0 gppwm3_loadBins = array, U08, 2758, [8], "load", 1, 0, 0, 250, 0 gppwm3_rpmBins = array, U08, 2766, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1077,7 +1077,7 @@ gppwm4_dutyIfError = scalar, U08, 2842, "%", 1, 0, 0, 100, 0 gppwm4_pwmFrequency = scalar, U16, 2844, "hz", 1, 0, 0, 500, 0 gppwm4_onAboveDuty = scalar, U08, 2846, "%", 1, 0, 0, 100, 0 gppwm4_offBelowDuty = scalar, U08, 2847, "%", 1, 0, 0, 100, 0 -gppwm4_loadAxis = bits, U08, 2848, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm4_loadAxis = bits, U08, 2848, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm4_alignmentFill_map = scalar, U08, 2849, "unit", 1, 0, 0, 100, 0 gppwm4_loadBins = array, U08, 2850, [8], "load", 1, 0, 0, 250, 0 gppwm4_rpmBins = array, U08, 2858, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -3259,10 +3259,10 @@ esr = scalar, U16, 1244, "", 1, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } ; These "synthetic" channels provide the Y-axis (load) value for gen purp PWM table's Y axes - gppwm1_load = {(gppwm1_loadAxis == 0) ? TPSValue : ((gppwm1_loadAxis == 1) ? MAPValue : ((gppwm1_loadAxis == 2) ? coolant : ((gppwm1_loadAxis == 3) ? intake : ((gppwm1_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm2_load = {(gppwm2_loadAxis == 0) ? TPSValue : ((gppwm2_loadAxis == 1) ? MAPValue : ((gppwm2_loadAxis == 2) ? coolant : ((gppwm2_loadAxis == 3) ? intake : ((gppwm2_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm3_load = {(gppwm3_loadAxis == 0) ? TPSValue : ((gppwm3_loadAxis == 1) ? MAPValue : ((gppwm3_loadAxis == 2) ? coolant : ((gppwm3_loadAxis == 3) ? intake : ((gppwm3_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm4_load = {(gppwm4_loadAxis == 0) ? TPSValue : ((gppwm4_loadAxis == 1) ? MAPValue : ((gppwm4_loadAxis == 2) ? coolant : ((gppwm4_loadAxis == 3) ? intake : ((gppwm4_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} + gppwm1_load = {(gppwm1_loadAxis == 0) ? 0 : (gppwm1_loadAxis == 1) ? TPSValue : (gppwm1_loadAxis == 2) ? MAPValue : (gppwm1_loadAxis == 3) ? coolant : (gppwm1_loadAxis == 4) ? intake : (gppwm1_loadAxis == 5) ? fuelingLoad : (gppwm1_loadAxis == 6) ? ignitionLoad : (gppwm1_loadAxis == 7) ? auxTemp1 : (gppwm1_loadAxis == 8) ? auxTemp2 : (gppwm1_loadAxis == 9) ? throttlePedalPosition : (gppwm1_loadAxis == 10) ? VBatt : (gppwm1_loadAxis == 11) ? vvtPositionB1I : (gppwm1_loadAxis == 12) ? vvtPositionB1E : (gppwm1_loadAxis == 13) ? vvtPositionB2I : (gppwm1_loadAxis == 14) ? vvtPositionB2E : (gppwm1_loadAxis == 15) ? flexPercent : (gppwm1_loadAxis == 16) ? auxLinear1 : (gppwm1_loadAxis == 17) ? auxLinear2 : 0} + gppwm2_load = {(gppwm2_loadAxis == 0) ? 0 : (gppwm2_loadAxis == 1) ? TPSValue : (gppwm2_loadAxis == 2) ? MAPValue : (gppwm2_loadAxis == 3) ? coolant : (gppwm2_loadAxis == 4) ? intake : (gppwm2_loadAxis == 5) ? fuelingLoad : (gppwm2_loadAxis == 6) ? ignitionLoad : (gppwm2_loadAxis == 7) ? auxTemp1 : (gppwm2_loadAxis == 8) ? auxTemp2 : (gppwm2_loadAxis == 9) ? throttlePedalPosition : (gppwm2_loadAxis == 10) ? VBatt : (gppwm2_loadAxis == 11) ? vvtPositionB1I : (gppwm2_loadAxis == 12) ? vvtPositionB1E : (gppwm2_loadAxis == 13) ? vvtPositionB2I : (gppwm2_loadAxis == 14) ? vvtPositionB2E : (gppwm2_loadAxis == 15) ? flexPercent : (gppwm2_loadAxis == 16) ? auxLinear1 : (gppwm2_loadAxis == 17) ? auxLinear2 : 0} + gppwm3_load = {(gppwm3_loadAxis == 0) ? 0 : (gppwm3_loadAxis == 1) ? TPSValue : (gppwm3_loadAxis == 2) ? MAPValue : (gppwm3_loadAxis == 3) ? coolant : (gppwm3_loadAxis == 4) ? intake : (gppwm3_loadAxis == 5) ? fuelingLoad : (gppwm3_loadAxis == 6) ? ignitionLoad : (gppwm3_loadAxis == 7) ? auxTemp1 : (gppwm3_loadAxis == 8) ? auxTemp2 : (gppwm3_loadAxis == 9) ? throttlePedalPosition : (gppwm3_loadAxis == 10) ? VBatt : (gppwm3_loadAxis == 11) ? vvtPositionB1I : (gppwm3_loadAxis == 12) ? vvtPositionB1E : (gppwm3_loadAxis == 13) ? vvtPositionB2I : (gppwm3_loadAxis == 14) ? vvtPositionB2E : (gppwm3_loadAxis == 15) ? flexPercent : (gppwm3_loadAxis == 16) ? auxLinear1 : (gppwm3_loadAxis == 17) ? auxLinear2 : 0} + gppwm4_load = {(gppwm4_loadAxis == 0) ? 0 : (gppwm4_loadAxis == 1) ? TPSValue : (gppwm4_loadAxis == 2) ? MAPValue : (gppwm4_loadAxis == 3) ? coolant : (gppwm4_loadAxis == 4) ? intake : (gppwm4_loadAxis == 5) ? fuelingLoad : (gppwm4_loadAxis == 6) ? ignitionLoad : (gppwm4_loadAxis == 7) ? auxTemp1 : (gppwm4_loadAxis == 8) ? auxTemp2 : (gppwm4_loadAxis == 9) ? throttlePedalPosition : (gppwm4_loadAxis == 10) ? VBatt : (gppwm4_loadAxis == 11) ? vvtPositionB1I : (gppwm4_loadAxis == 12) ? vvtPositionB1E : (gppwm4_loadAxis == 13) ? vvtPositionB2I : (gppwm4_loadAxis == 14) ? vvtPositionB2E : (gppwm4_loadAxis == 15) ? flexPercent : (gppwm4_loadAxis == 16) ? auxLinear1 : (gppwm4_loadAxis == 17) ? auxLinear2 : 0} [PcVariables] tuneCrcPcVariable = continuousChannelValue, tuneCrc16 diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index 135b2230e5..3522dac369 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.09.16.hellen121nissan.4012893873" + signature = "rusEFI 2022.09.16.hellen121nissan.112886191" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.16.hellen121nissan.4012893873" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.16.hellen121nissan.112886191" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Sep 16 01:33:36 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Sep 16 20:09:47 UTC 2022 pageSize = 21296 page = 1 @@ -1047,7 +1047,7 @@ gppwm1_dutyIfError = scalar, U08, 2566, "%", 1, 0, 0, 100, 0 gppwm1_pwmFrequency = scalar, U16, 2568, "hz", 1, 0, 0, 500, 0 gppwm1_onAboveDuty = scalar, U08, 2570, "%", 1, 0, 0, 100, 0 gppwm1_offBelowDuty = scalar, U08, 2571, "%", 1, 0, 0, 100, 0 -gppwm1_loadAxis = bits, U08, 2572, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm1_loadAxis = bits, U08, 2572, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm1_alignmentFill_map = scalar, U08, 2573, "unit", 1, 0, 0, 100, 0 gppwm1_loadBins = array, U08, 2574, [8], "load", 1, 0, 0, 250, 0 gppwm1_rpmBins = array, U08, 2582, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1057,7 +1057,7 @@ gppwm2_dutyIfError = scalar, U08, 2658, "%", 1, 0, 0, 100, 0 gppwm2_pwmFrequency = scalar, U16, 2660, "hz", 1, 0, 0, 500, 0 gppwm2_onAboveDuty = scalar, U08, 2662, "%", 1, 0, 0, 100, 0 gppwm2_offBelowDuty = scalar, U08, 2663, "%", 1, 0, 0, 100, 0 -gppwm2_loadAxis = bits, U08, 2664, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm2_loadAxis = bits, U08, 2664, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm2_alignmentFill_map = scalar, U08, 2665, "unit", 1, 0, 0, 100, 0 gppwm2_loadBins = array, U08, 2666, [8], "load", 1, 0, 0, 250, 0 gppwm2_rpmBins = array, U08, 2674, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1067,7 +1067,7 @@ gppwm3_dutyIfError = scalar, U08, 2750, "%", 1, 0, 0, 100, 0 gppwm3_pwmFrequency = scalar, U16, 2752, "hz", 1, 0, 0, 500, 0 gppwm3_onAboveDuty = scalar, U08, 2754, "%", 1, 0, 0, 100, 0 gppwm3_offBelowDuty = scalar, U08, 2755, "%", 1, 0, 0, 100, 0 -gppwm3_loadAxis = bits, U08, 2756, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm3_loadAxis = bits, U08, 2756, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm3_alignmentFill_map = scalar, U08, 2757, "unit", 1, 0, 0, 100, 0 gppwm3_loadBins = array, U08, 2758, [8], "load", 1, 0, 0, 250, 0 gppwm3_rpmBins = array, U08, 2766, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1077,7 +1077,7 @@ gppwm4_dutyIfError = scalar, U08, 2842, "%", 1, 0, 0, 100, 0 gppwm4_pwmFrequency = scalar, U16, 2844, "hz", 1, 0, 0, 500, 0 gppwm4_onAboveDuty = scalar, U08, 2846, "%", 1, 0, 0, 100, 0 gppwm4_offBelowDuty = scalar, U08, 2847, "%", 1, 0, 0, 100, 0 -gppwm4_loadAxis = bits, U08, 2848, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm4_loadAxis = bits, U08, 2848, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm4_alignmentFill_map = scalar, U08, 2849, "unit", 1, 0, 0, 100, 0 gppwm4_loadBins = array, U08, 2850, [8], "load", 1, 0, 0, 250, 0 gppwm4_rpmBins = array, U08, 2858, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -3259,10 +3259,10 @@ esr = scalar, U16, 1244, "", 1, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } ; These "synthetic" channels provide the Y-axis (load) value for gen purp PWM table's Y axes - gppwm1_load = {(gppwm1_loadAxis == 0) ? TPSValue : ((gppwm1_loadAxis == 1) ? MAPValue : ((gppwm1_loadAxis == 2) ? coolant : ((gppwm1_loadAxis == 3) ? intake : ((gppwm1_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm2_load = {(gppwm2_loadAxis == 0) ? TPSValue : ((gppwm2_loadAxis == 1) ? MAPValue : ((gppwm2_loadAxis == 2) ? coolant : ((gppwm2_loadAxis == 3) ? intake : ((gppwm2_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm3_load = {(gppwm3_loadAxis == 0) ? TPSValue : ((gppwm3_loadAxis == 1) ? MAPValue : ((gppwm3_loadAxis == 2) ? coolant : ((gppwm3_loadAxis == 3) ? intake : ((gppwm3_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm4_load = {(gppwm4_loadAxis == 0) ? TPSValue : ((gppwm4_loadAxis == 1) ? MAPValue : ((gppwm4_loadAxis == 2) ? coolant : ((gppwm4_loadAxis == 3) ? intake : ((gppwm4_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} + gppwm1_load = {(gppwm1_loadAxis == 0) ? 0 : (gppwm1_loadAxis == 1) ? TPSValue : (gppwm1_loadAxis == 2) ? MAPValue : (gppwm1_loadAxis == 3) ? coolant : (gppwm1_loadAxis == 4) ? intake : (gppwm1_loadAxis == 5) ? fuelingLoad : (gppwm1_loadAxis == 6) ? ignitionLoad : (gppwm1_loadAxis == 7) ? auxTemp1 : (gppwm1_loadAxis == 8) ? auxTemp2 : (gppwm1_loadAxis == 9) ? throttlePedalPosition : (gppwm1_loadAxis == 10) ? VBatt : (gppwm1_loadAxis == 11) ? vvtPositionB1I : (gppwm1_loadAxis == 12) ? vvtPositionB1E : (gppwm1_loadAxis == 13) ? vvtPositionB2I : (gppwm1_loadAxis == 14) ? vvtPositionB2E : (gppwm1_loadAxis == 15) ? flexPercent : (gppwm1_loadAxis == 16) ? auxLinear1 : (gppwm1_loadAxis == 17) ? auxLinear2 : 0} + gppwm2_load = {(gppwm2_loadAxis == 0) ? 0 : (gppwm2_loadAxis == 1) ? TPSValue : (gppwm2_loadAxis == 2) ? MAPValue : (gppwm2_loadAxis == 3) ? coolant : (gppwm2_loadAxis == 4) ? intake : (gppwm2_loadAxis == 5) ? fuelingLoad : (gppwm2_loadAxis == 6) ? ignitionLoad : (gppwm2_loadAxis == 7) ? auxTemp1 : (gppwm2_loadAxis == 8) ? auxTemp2 : (gppwm2_loadAxis == 9) ? throttlePedalPosition : (gppwm2_loadAxis == 10) ? VBatt : (gppwm2_loadAxis == 11) ? vvtPositionB1I : (gppwm2_loadAxis == 12) ? vvtPositionB1E : (gppwm2_loadAxis == 13) ? vvtPositionB2I : (gppwm2_loadAxis == 14) ? vvtPositionB2E : (gppwm2_loadAxis == 15) ? flexPercent : (gppwm2_loadAxis == 16) ? auxLinear1 : (gppwm2_loadAxis == 17) ? auxLinear2 : 0} + gppwm3_load = {(gppwm3_loadAxis == 0) ? 0 : (gppwm3_loadAxis == 1) ? TPSValue : (gppwm3_loadAxis == 2) ? MAPValue : (gppwm3_loadAxis == 3) ? coolant : (gppwm3_loadAxis == 4) ? intake : (gppwm3_loadAxis == 5) ? fuelingLoad : (gppwm3_loadAxis == 6) ? ignitionLoad : (gppwm3_loadAxis == 7) ? auxTemp1 : (gppwm3_loadAxis == 8) ? auxTemp2 : (gppwm3_loadAxis == 9) ? throttlePedalPosition : (gppwm3_loadAxis == 10) ? VBatt : (gppwm3_loadAxis == 11) ? vvtPositionB1I : (gppwm3_loadAxis == 12) ? vvtPositionB1E : (gppwm3_loadAxis == 13) ? vvtPositionB2I : (gppwm3_loadAxis == 14) ? vvtPositionB2E : (gppwm3_loadAxis == 15) ? flexPercent : (gppwm3_loadAxis == 16) ? auxLinear1 : (gppwm3_loadAxis == 17) ? auxLinear2 : 0} + gppwm4_load = {(gppwm4_loadAxis == 0) ? 0 : (gppwm4_loadAxis == 1) ? TPSValue : (gppwm4_loadAxis == 2) ? MAPValue : (gppwm4_loadAxis == 3) ? coolant : (gppwm4_loadAxis == 4) ? intake : (gppwm4_loadAxis == 5) ? fuelingLoad : (gppwm4_loadAxis == 6) ? ignitionLoad : (gppwm4_loadAxis == 7) ? auxTemp1 : (gppwm4_loadAxis == 8) ? auxTemp2 : (gppwm4_loadAxis == 9) ? throttlePedalPosition : (gppwm4_loadAxis == 10) ? VBatt : (gppwm4_loadAxis == 11) ? vvtPositionB1I : (gppwm4_loadAxis == 12) ? vvtPositionB1E : (gppwm4_loadAxis == 13) ? vvtPositionB2I : (gppwm4_loadAxis == 14) ? vvtPositionB2E : (gppwm4_loadAxis == 15) ? flexPercent : (gppwm4_loadAxis == 16) ? auxLinear1 : (gppwm4_loadAxis == 17) ? auxLinear2 : 0} [PcVariables] tuneCrcPcVariable = continuousChannelValue, tuneCrc16 diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index e9699414a7..c52604040e 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.09.16.hellen121vag.399547681" + signature = "rusEFI 2022.09.16.hellen121vag.4265998911" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.16.hellen121vag.399547681" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.16.hellen121vag.4265998911" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Sep 16 01:33:34 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Sep 16 20:09:45 UTC 2022 pageSize = 21296 page = 1 @@ -1047,7 +1047,7 @@ gppwm1_dutyIfError = scalar, U08, 2566, "%", 1, 0, 0, 100, 0 gppwm1_pwmFrequency = scalar, U16, 2568, "hz", 1, 0, 0, 500, 0 gppwm1_onAboveDuty = scalar, U08, 2570, "%", 1, 0, 0, 100, 0 gppwm1_offBelowDuty = scalar, U08, 2571, "%", 1, 0, 0, 100, 0 -gppwm1_loadAxis = bits, U08, 2572, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm1_loadAxis = bits, U08, 2572, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm1_alignmentFill_map = scalar, U08, 2573, "unit", 1, 0, 0, 100, 0 gppwm1_loadBins = array, U08, 2574, [8], "load", 1, 0, 0, 250, 0 gppwm1_rpmBins = array, U08, 2582, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1057,7 +1057,7 @@ gppwm2_dutyIfError = scalar, U08, 2658, "%", 1, 0, 0, 100, 0 gppwm2_pwmFrequency = scalar, U16, 2660, "hz", 1, 0, 0, 500, 0 gppwm2_onAboveDuty = scalar, U08, 2662, "%", 1, 0, 0, 100, 0 gppwm2_offBelowDuty = scalar, U08, 2663, "%", 1, 0, 0, 100, 0 -gppwm2_loadAxis = bits, U08, 2664, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm2_loadAxis = bits, U08, 2664, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm2_alignmentFill_map = scalar, U08, 2665, "unit", 1, 0, 0, 100, 0 gppwm2_loadBins = array, U08, 2666, [8], "load", 1, 0, 0, 250, 0 gppwm2_rpmBins = array, U08, 2674, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1067,7 +1067,7 @@ gppwm3_dutyIfError = scalar, U08, 2750, "%", 1, 0, 0, 100, 0 gppwm3_pwmFrequency = scalar, U16, 2752, "hz", 1, 0, 0, 500, 0 gppwm3_onAboveDuty = scalar, U08, 2754, "%", 1, 0, 0, 100, 0 gppwm3_offBelowDuty = scalar, U08, 2755, "%", 1, 0, 0, 100, 0 -gppwm3_loadAxis = bits, U08, 2756, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm3_loadAxis = bits, U08, 2756, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm3_alignmentFill_map = scalar, U08, 2757, "unit", 1, 0, 0, 100, 0 gppwm3_loadBins = array, U08, 2758, [8], "load", 1, 0, 0, 250, 0 gppwm3_rpmBins = array, U08, 2766, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1077,7 +1077,7 @@ gppwm4_dutyIfError = scalar, U08, 2842, "%", 1, 0, 0, 100, 0 gppwm4_pwmFrequency = scalar, U16, 2844, "hz", 1, 0, 0, 500, 0 gppwm4_onAboveDuty = scalar, U08, 2846, "%", 1, 0, 0, 100, 0 gppwm4_offBelowDuty = scalar, U08, 2847, "%", 1, 0, 0, 100, 0 -gppwm4_loadAxis = bits, U08, 2848, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm4_loadAxis = bits, U08, 2848, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm4_alignmentFill_map = scalar, U08, 2849, "unit", 1, 0, 0, 100, 0 gppwm4_loadBins = array, U08, 2850, [8], "load", 1, 0, 0, 250, 0 gppwm4_rpmBins = array, U08, 2858, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -3259,10 +3259,10 @@ esr = scalar, U16, 1244, "", 1, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } ; These "synthetic" channels provide the Y-axis (load) value for gen purp PWM table's Y axes - gppwm1_load = {(gppwm1_loadAxis == 0) ? TPSValue : ((gppwm1_loadAxis == 1) ? MAPValue : ((gppwm1_loadAxis == 2) ? coolant : ((gppwm1_loadAxis == 3) ? intake : ((gppwm1_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm2_load = {(gppwm2_loadAxis == 0) ? TPSValue : ((gppwm2_loadAxis == 1) ? MAPValue : ((gppwm2_loadAxis == 2) ? coolant : ((gppwm2_loadAxis == 3) ? intake : ((gppwm2_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm3_load = {(gppwm3_loadAxis == 0) ? TPSValue : ((gppwm3_loadAxis == 1) ? MAPValue : ((gppwm3_loadAxis == 2) ? coolant : ((gppwm3_loadAxis == 3) ? intake : ((gppwm3_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm4_load = {(gppwm4_loadAxis == 0) ? TPSValue : ((gppwm4_loadAxis == 1) ? MAPValue : ((gppwm4_loadAxis == 2) ? coolant : ((gppwm4_loadAxis == 3) ? intake : ((gppwm4_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} + gppwm1_load = {(gppwm1_loadAxis == 0) ? 0 : (gppwm1_loadAxis == 1) ? TPSValue : (gppwm1_loadAxis == 2) ? MAPValue : (gppwm1_loadAxis == 3) ? coolant : (gppwm1_loadAxis == 4) ? intake : (gppwm1_loadAxis == 5) ? fuelingLoad : (gppwm1_loadAxis == 6) ? ignitionLoad : (gppwm1_loadAxis == 7) ? auxTemp1 : (gppwm1_loadAxis == 8) ? auxTemp2 : (gppwm1_loadAxis == 9) ? throttlePedalPosition : (gppwm1_loadAxis == 10) ? VBatt : (gppwm1_loadAxis == 11) ? vvtPositionB1I : (gppwm1_loadAxis == 12) ? vvtPositionB1E : (gppwm1_loadAxis == 13) ? vvtPositionB2I : (gppwm1_loadAxis == 14) ? vvtPositionB2E : (gppwm1_loadAxis == 15) ? flexPercent : (gppwm1_loadAxis == 16) ? auxLinear1 : (gppwm1_loadAxis == 17) ? auxLinear2 : 0} + gppwm2_load = {(gppwm2_loadAxis == 0) ? 0 : (gppwm2_loadAxis == 1) ? TPSValue : (gppwm2_loadAxis == 2) ? MAPValue : (gppwm2_loadAxis == 3) ? coolant : (gppwm2_loadAxis == 4) ? intake : (gppwm2_loadAxis == 5) ? fuelingLoad : (gppwm2_loadAxis == 6) ? ignitionLoad : (gppwm2_loadAxis == 7) ? auxTemp1 : (gppwm2_loadAxis == 8) ? auxTemp2 : (gppwm2_loadAxis == 9) ? throttlePedalPosition : (gppwm2_loadAxis == 10) ? VBatt : (gppwm2_loadAxis == 11) ? vvtPositionB1I : (gppwm2_loadAxis == 12) ? vvtPositionB1E : (gppwm2_loadAxis == 13) ? vvtPositionB2I : (gppwm2_loadAxis == 14) ? vvtPositionB2E : (gppwm2_loadAxis == 15) ? flexPercent : (gppwm2_loadAxis == 16) ? auxLinear1 : (gppwm2_loadAxis == 17) ? auxLinear2 : 0} + gppwm3_load = {(gppwm3_loadAxis == 0) ? 0 : (gppwm3_loadAxis == 1) ? TPSValue : (gppwm3_loadAxis == 2) ? MAPValue : (gppwm3_loadAxis == 3) ? coolant : (gppwm3_loadAxis == 4) ? intake : (gppwm3_loadAxis == 5) ? fuelingLoad : (gppwm3_loadAxis == 6) ? ignitionLoad : (gppwm3_loadAxis == 7) ? auxTemp1 : (gppwm3_loadAxis == 8) ? auxTemp2 : (gppwm3_loadAxis == 9) ? throttlePedalPosition : (gppwm3_loadAxis == 10) ? VBatt : (gppwm3_loadAxis == 11) ? vvtPositionB1I : (gppwm3_loadAxis == 12) ? vvtPositionB1E : (gppwm3_loadAxis == 13) ? vvtPositionB2I : (gppwm3_loadAxis == 14) ? vvtPositionB2E : (gppwm3_loadAxis == 15) ? flexPercent : (gppwm3_loadAxis == 16) ? auxLinear1 : (gppwm3_loadAxis == 17) ? auxLinear2 : 0} + gppwm4_load = {(gppwm4_loadAxis == 0) ? 0 : (gppwm4_loadAxis == 1) ? TPSValue : (gppwm4_loadAxis == 2) ? MAPValue : (gppwm4_loadAxis == 3) ? coolant : (gppwm4_loadAxis == 4) ? intake : (gppwm4_loadAxis == 5) ? fuelingLoad : (gppwm4_loadAxis == 6) ? ignitionLoad : (gppwm4_loadAxis == 7) ? auxTemp1 : (gppwm4_loadAxis == 8) ? auxTemp2 : (gppwm4_loadAxis == 9) ? throttlePedalPosition : (gppwm4_loadAxis == 10) ? VBatt : (gppwm4_loadAxis == 11) ? vvtPositionB1I : (gppwm4_loadAxis == 12) ? vvtPositionB1E : (gppwm4_loadAxis == 13) ? vvtPositionB2I : (gppwm4_loadAxis == 14) ? vvtPositionB2E : (gppwm4_loadAxis == 15) ? flexPercent : (gppwm4_loadAxis == 16) ? auxLinear1 : (gppwm4_loadAxis == 17) ? auxLinear2 : 0} [PcVariables] tuneCrcPcVariable = continuousChannelValue, tuneCrc16 diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index 9b086e60a9..b5924145ab 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.09.16.hellen128.2567922533" + signature = "rusEFI 2022.09.16.hellen128.1889141883" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.16.hellen128.2567922533" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.16.hellen128.1889141883" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Sep 16 01:33:32 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Sep 16 20:09:43 UTC 2022 pageSize = 21296 page = 1 @@ -1047,7 +1047,7 @@ gppwm1_dutyIfError = scalar, U08, 2566, "%", 1, 0, 0, 100, 0 gppwm1_pwmFrequency = scalar, U16, 2568, "hz", 1, 0, 0, 500, 0 gppwm1_onAboveDuty = scalar, U08, 2570, "%", 1, 0, 0, 100, 0 gppwm1_offBelowDuty = scalar, U08, 2571, "%", 1, 0, 0, 100, 0 -gppwm1_loadAxis = bits, U08, 2572, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm1_loadAxis = bits, U08, 2572, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm1_alignmentFill_map = scalar, U08, 2573, "unit", 1, 0, 0, 100, 0 gppwm1_loadBins = array, U08, 2574, [8], "load", 1, 0, 0, 250, 0 gppwm1_rpmBins = array, U08, 2582, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1057,7 +1057,7 @@ gppwm2_dutyIfError = scalar, U08, 2658, "%", 1, 0, 0, 100, 0 gppwm2_pwmFrequency = scalar, U16, 2660, "hz", 1, 0, 0, 500, 0 gppwm2_onAboveDuty = scalar, U08, 2662, "%", 1, 0, 0, 100, 0 gppwm2_offBelowDuty = scalar, U08, 2663, "%", 1, 0, 0, 100, 0 -gppwm2_loadAxis = bits, U08, 2664, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm2_loadAxis = bits, U08, 2664, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm2_alignmentFill_map = scalar, U08, 2665, "unit", 1, 0, 0, 100, 0 gppwm2_loadBins = array, U08, 2666, [8], "load", 1, 0, 0, 250, 0 gppwm2_rpmBins = array, U08, 2674, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1067,7 +1067,7 @@ gppwm3_dutyIfError = scalar, U08, 2750, "%", 1, 0, 0, 100, 0 gppwm3_pwmFrequency = scalar, U16, 2752, "hz", 1, 0, 0, 500, 0 gppwm3_onAboveDuty = scalar, U08, 2754, "%", 1, 0, 0, 100, 0 gppwm3_offBelowDuty = scalar, U08, 2755, "%", 1, 0, 0, 100, 0 -gppwm3_loadAxis = bits, U08, 2756, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm3_loadAxis = bits, U08, 2756, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm3_alignmentFill_map = scalar, U08, 2757, "unit", 1, 0, 0, 100, 0 gppwm3_loadBins = array, U08, 2758, [8], "load", 1, 0, 0, 250, 0 gppwm3_rpmBins = array, U08, 2766, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1077,7 +1077,7 @@ gppwm4_dutyIfError = scalar, U08, 2842, "%", 1, 0, 0, 100, 0 gppwm4_pwmFrequency = scalar, U16, 2844, "hz", 1, 0, 0, 500, 0 gppwm4_onAboveDuty = scalar, U08, 2846, "%", 1, 0, 0, 100, 0 gppwm4_offBelowDuty = scalar, U08, 2847, "%", 1, 0, 0, 100, 0 -gppwm4_loadAxis = bits, U08, 2848, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm4_loadAxis = bits, U08, 2848, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm4_alignmentFill_map = scalar, U08, 2849, "unit", 1, 0, 0, 100, 0 gppwm4_loadBins = array, U08, 2850, [8], "load", 1, 0, 0, 250, 0 gppwm4_rpmBins = array, U08, 2858, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -3259,10 +3259,10 @@ esr = scalar, U16, 1244, "", 1, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } ; These "synthetic" channels provide the Y-axis (load) value for gen purp PWM table's Y axes - gppwm1_load = {(gppwm1_loadAxis == 0) ? TPSValue : ((gppwm1_loadAxis == 1) ? MAPValue : ((gppwm1_loadAxis == 2) ? coolant : ((gppwm1_loadAxis == 3) ? intake : ((gppwm1_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm2_load = {(gppwm2_loadAxis == 0) ? TPSValue : ((gppwm2_loadAxis == 1) ? MAPValue : ((gppwm2_loadAxis == 2) ? coolant : ((gppwm2_loadAxis == 3) ? intake : ((gppwm2_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm3_load = {(gppwm3_loadAxis == 0) ? TPSValue : ((gppwm3_loadAxis == 1) ? MAPValue : ((gppwm3_loadAxis == 2) ? coolant : ((gppwm3_loadAxis == 3) ? intake : ((gppwm3_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm4_load = {(gppwm4_loadAxis == 0) ? TPSValue : ((gppwm4_loadAxis == 1) ? MAPValue : ((gppwm4_loadAxis == 2) ? coolant : ((gppwm4_loadAxis == 3) ? intake : ((gppwm4_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} + gppwm1_load = {(gppwm1_loadAxis == 0) ? 0 : (gppwm1_loadAxis == 1) ? TPSValue : (gppwm1_loadAxis == 2) ? MAPValue : (gppwm1_loadAxis == 3) ? coolant : (gppwm1_loadAxis == 4) ? intake : (gppwm1_loadAxis == 5) ? fuelingLoad : (gppwm1_loadAxis == 6) ? ignitionLoad : (gppwm1_loadAxis == 7) ? auxTemp1 : (gppwm1_loadAxis == 8) ? auxTemp2 : (gppwm1_loadAxis == 9) ? throttlePedalPosition : (gppwm1_loadAxis == 10) ? VBatt : (gppwm1_loadAxis == 11) ? vvtPositionB1I : (gppwm1_loadAxis == 12) ? vvtPositionB1E : (gppwm1_loadAxis == 13) ? vvtPositionB2I : (gppwm1_loadAxis == 14) ? vvtPositionB2E : (gppwm1_loadAxis == 15) ? flexPercent : (gppwm1_loadAxis == 16) ? auxLinear1 : (gppwm1_loadAxis == 17) ? auxLinear2 : 0} + gppwm2_load = {(gppwm2_loadAxis == 0) ? 0 : (gppwm2_loadAxis == 1) ? TPSValue : (gppwm2_loadAxis == 2) ? MAPValue : (gppwm2_loadAxis == 3) ? coolant : (gppwm2_loadAxis == 4) ? intake : (gppwm2_loadAxis == 5) ? fuelingLoad : (gppwm2_loadAxis == 6) ? ignitionLoad : (gppwm2_loadAxis == 7) ? auxTemp1 : (gppwm2_loadAxis == 8) ? auxTemp2 : (gppwm2_loadAxis == 9) ? throttlePedalPosition : (gppwm2_loadAxis == 10) ? VBatt : (gppwm2_loadAxis == 11) ? vvtPositionB1I : (gppwm2_loadAxis == 12) ? vvtPositionB1E : (gppwm2_loadAxis == 13) ? vvtPositionB2I : (gppwm2_loadAxis == 14) ? vvtPositionB2E : (gppwm2_loadAxis == 15) ? flexPercent : (gppwm2_loadAxis == 16) ? auxLinear1 : (gppwm2_loadAxis == 17) ? auxLinear2 : 0} + gppwm3_load = {(gppwm3_loadAxis == 0) ? 0 : (gppwm3_loadAxis == 1) ? TPSValue : (gppwm3_loadAxis == 2) ? MAPValue : (gppwm3_loadAxis == 3) ? coolant : (gppwm3_loadAxis == 4) ? intake : (gppwm3_loadAxis == 5) ? fuelingLoad : (gppwm3_loadAxis == 6) ? ignitionLoad : (gppwm3_loadAxis == 7) ? auxTemp1 : (gppwm3_loadAxis == 8) ? auxTemp2 : (gppwm3_loadAxis == 9) ? throttlePedalPosition : (gppwm3_loadAxis == 10) ? VBatt : (gppwm3_loadAxis == 11) ? vvtPositionB1I : (gppwm3_loadAxis == 12) ? vvtPositionB1E : (gppwm3_loadAxis == 13) ? vvtPositionB2I : (gppwm3_loadAxis == 14) ? vvtPositionB2E : (gppwm3_loadAxis == 15) ? flexPercent : (gppwm3_loadAxis == 16) ? auxLinear1 : (gppwm3_loadAxis == 17) ? auxLinear2 : 0} + gppwm4_load = {(gppwm4_loadAxis == 0) ? 0 : (gppwm4_loadAxis == 1) ? TPSValue : (gppwm4_loadAxis == 2) ? MAPValue : (gppwm4_loadAxis == 3) ? coolant : (gppwm4_loadAxis == 4) ? intake : (gppwm4_loadAxis == 5) ? fuelingLoad : (gppwm4_loadAxis == 6) ? ignitionLoad : (gppwm4_loadAxis == 7) ? auxTemp1 : (gppwm4_loadAxis == 8) ? auxTemp2 : (gppwm4_loadAxis == 9) ? throttlePedalPosition : (gppwm4_loadAxis == 10) ? VBatt : (gppwm4_loadAxis == 11) ? vvtPositionB1I : (gppwm4_loadAxis == 12) ? vvtPositionB1E : (gppwm4_loadAxis == 13) ? vvtPositionB2I : (gppwm4_loadAxis == 14) ? vvtPositionB2E : (gppwm4_loadAxis == 15) ? flexPercent : (gppwm4_loadAxis == 16) ? auxLinear1 : (gppwm4_loadAxis == 17) ? auxLinear2 : 0} [PcVariables] tuneCrcPcVariable = continuousChannelValue, tuneCrc16 diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index 319314fd2e..edc41814f8 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.09.16.hellen154hyundai.4290653407" + signature = "rusEFI 2022.09.16.hellen154hyundai.371936193" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.16.hellen154hyundai.4290653407" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.16.hellen154hyundai.371936193" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Sep 16 01:33:39 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Sep 16 20:09:49 UTC 2022 pageSize = 21296 page = 1 @@ -1047,7 +1047,7 @@ gppwm1_dutyIfError = scalar, U08, 2566, "%", 1, 0, 0, 100, 0 gppwm1_pwmFrequency = scalar, U16, 2568, "hz", 1, 0, 0, 500, 0 gppwm1_onAboveDuty = scalar, U08, 2570, "%", 1, 0, 0, 100, 0 gppwm1_offBelowDuty = scalar, U08, 2571, "%", 1, 0, 0, 100, 0 -gppwm1_loadAxis = bits, U08, 2572, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm1_loadAxis = bits, U08, 2572, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm1_alignmentFill_map = scalar, U08, 2573, "unit", 1, 0, 0, 100, 0 gppwm1_loadBins = array, U08, 2574, [8], "load", 1, 0, 0, 250, 0 gppwm1_rpmBins = array, U08, 2582, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1057,7 +1057,7 @@ gppwm2_dutyIfError = scalar, U08, 2658, "%", 1, 0, 0, 100, 0 gppwm2_pwmFrequency = scalar, U16, 2660, "hz", 1, 0, 0, 500, 0 gppwm2_onAboveDuty = scalar, U08, 2662, "%", 1, 0, 0, 100, 0 gppwm2_offBelowDuty = scalar, U08, 2663, "%", 1, 0, 0, 100, 0 -gppwm2_loadAxis = bits, U08, 2664, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm2_loadAxis = bits, U08, 2664, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm2_alignmentFill_map = scalar, U08, 2665, "unit", 1, 0, 0, 100, 0 gppwm2_loadBins = array, U08, 2666, [8], "load", 1, 0, 0, 250, 0 gppwm2_rpmBins = array, U08, 2674, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1067,7 +1067,7 @@ gppwm3_dutyIfError = scalar, U08, 2750, "%", 1, 0, 0, 100, 0 gppwm3_pwmFrequency = scalar, U16, 2752, "hz", 1, 0, 0, 500, 0 gppwm3_onAboveDuty = scalar, U08, 2754, "%", 1, 0, 0, 100, 0 gppwm3_offBelowDuty = scalar, U08, 2755, "%", 1, 0, 0, 100, 0 -gppwm3_loadAxis = bits, U08, 2756, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm3_loadAxis = bits, U08, 2756, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm3_alignmentFill_map = scalar, U08, 2757, "unit", 1, 0, 0, 100, 0 gppwm3_loadBins = array, U08, 2758, [8], "load", 1, 0, 0, 250, 0 gppwm3_rpmBins = array, U08, 2766, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1077,7 +1077,7 @@ gppwm4_dutyIfError = scalar, U08, 2842, "%", 1, 0, 0, 100, 0 gppwm4_pwmFrequency = scalar, U16, 2844, "hz", 1, 0, 0, 500, 0 gppwm4_onAboveDuty = scalar, U08, 2846, "%", 1, 0, 0, 100, 0 gppwm4_offBelowDuty = scalar, U08, 2847, "%", 1, 0, 0, 100, 0 -gppwm4_loadAxis = bits, U08, 2848, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm4_loadAxis = bits, U08, 2848, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm4_alignmentFill_map = scalar, U08, 2849, "unit", 1, 0, 0, 100, 0 gppwm4_loadBins = array, U08, 2850, [8], "load", 1, 0, 0, 250, 0 gppwm4_rpmBins = array, U08, 2858, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -3259,10 +3259,10 @@ esr = scalar, U16, 1244, "", 1, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } ; These "synthetic" channels provide the Y-axis (load) value for gen purp PWM table's Y axes - gppwm1_load = {(gppwm1_loadAxis == 0) ? TPSValue : ((gppwm1_loadAxis == 1) ? MAPValue : ((gppwm1_loadAxis == 2) ? coolant : ((gppwm1_loadAxis == 3) ? intake : ((gppwm1_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm2_load = {(gppwm2_loadAxis == 0) ? TPSValue : ((gppwm2_loadAxis == 1) ? MAPValue : ((gppwm2_loadAxis == 2) ? coolant : ((gppwm2_loadAxis == 3) ? intake : ((gppwm2_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm3_load = {(gppwm3_loadAxis == 0) ? TPSValue : ((gppwm3_loadAxis == 1) ? MAPValue : ((gppwm3_loadAxis == 2) ? coolant : ((gppwm3_loadAxis == 3) ? intake : ((gppwm3_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm4_load = {(gppwm4_loadAxis == 0) ? TPSValue : ((gppwm4_loadAxis == 1) ? MAPValue : ((gppwm4_loadAxis == 2) ? coolant : ((gppwm4_loadAxis == 3) ? intake : ((gppwm4_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} + gppwm1_load = {(gppwm1_loadAxis == 0) ? 0 : (gppwm1_loadAxis == 1) ? TPSValue : (gppwm1_loadAxis == 2) ? MAPValue : (gppwm1_loadAxis == 3) ? coolant : (gppwm1_loadAxis == 4) ? intake : (gppwm1_loadAxis == 5) ? fuelingLoad : (gppwm1_loadAxis == 6) ? ignitionLoad : (gppwm1_loadAxis == 7) ? auxTemp1 : (gppwm1_loadAxis == 8) ? auxTemp2 : (gppwm1_loadAxis == 9) ? throttlePedalPosition : (gppwm1_loadAxis == 10) ? VBatt : (gppwm1_loadAxis == 11) ? vvtPositionB1I : (gppwm1_loadAxis == 12) ? vvtPositionB1E : (gppwm1_loadAxis == 13) ? vvtPositionB2I : (gppwm1_loadAxis == 14) ? vvtPositionB2E : (gppwm1_loadAxis == 15) ? flexPercent : (gppwm1_loadAxis == 16) ? auxLinear1 : (gppwm1_loadAxis == 17) ? auxLinear2 : 0} + gppwm2_load = {(gppwm2_loadAxis == 0) ? 0 : (gppwm2_loadAxis == 1) ? TPSValue : (gppwm2_loadAxis == 2) ? MAPValue : (gppwm2_loadAxis == 3) ? coolant : (gppwm2_loadAxis == 4) ? intake : (gppwm2_loadAxis == 5) ? fuelingLoad : (gppwm2_loadAxis == 6) ? ignitionLoad : (gppwm2_loadAxis == 7) ? auxTemp1 : (gppwm2_loadAxis == 8) ? auxTemp2 : (gppwm2_loadAxis == 9) ? throttlePedalPosition : (gppwm2_loadAxis == 10) ? VBatt : (gppwm2_loadAxis == 11) ? vvtPositionB1I : (gppwm2_loadAxis == 12) ? vvtPositionB1E : (gppwm2_loadAxis == 13) ? vvtPositionB2I : (gppwm2_loadAxis == 14) ? vvtPositionB2E : (gppwm2_loadAxis == 15) ? flexPercent : (gppwm2_loadAxis == 16) ? auxLinear1 : (gppwm2_loadAxis == 17) ? auxLinear2 : 0} + gppwm3_load = {(gppwm3_loadAxis == 0) ? 0 : (gppwm3_loadAxis == 1) ? TPSValue : (gppwm3_loadAxis == 2) ? MAPValue : (gppwm3_loadAxis == 3) ? coolant : (gppwm3_loadAxis == 4) ? intake : (gppwm3_loadAxis == 5) ? fuelingLoad : (gppwm3_loadAxis == 6) ? ignitionLoad : (gppwm3_loadAxis == 7) ? auxTemp1 : (gppwm3_loadAxis == 8) ? auxTemp2 : (gppwm3_loadAxis == 9) ? throttlePedalPosition : (gppwm3_loadAxis == 10) ? VBatt : (gppwm3_loadAxis == 11) ? vvtPositionB1I : (gppwm3_loadAxis == 12) ? vvtPositionB1E : (gppwm3_loadAxis == 13) ? vvtPositionB2I : (gppwm3_loadAxis == 14) ? vvtPositionB2E : (gppwm3_loadAxis == 15) ? flexPercent : (gppwm3_loadAxis == 16) ? auxLinear1 : (gppwm3_loadAxis == 17) ? auxLinear2 : 0} + gppwm4_load = {(gppwm4_loadAxis == 0) ? 0 : (gppwm4_loadAxis == 1) ? TPSValue : (gppwm4_loadAxis == 2) ? MAPValue : (gppwm4_loadAxis == 3) ? coolant : (gppwm4_loadAxis == 4) ? intake : (gppwm4_loadAxis == 5) ? fuelingLoad : (gppwm4_loadAxis == 6) ? ignitionLoad : (gppwm4_loadAxis == 7) ? auxTemp1 : (gppwm4_loadAxis == 8) ? auxTemp2 : (gppwm4_loadAxis == 9) ? throttlePedalPosition : (gppwm4_loadAxis == 10) ? VBatt : (gppwm4_loadAxis == 11) ? vvtPositionB1I : (gppwm4_loadAxis == 12) ? vvtPositionB1E : (gppwm4_loadAxis == 13) ? vvtPositionB2I : (gppwm4_loadAxis == 14) ? vvtPositionB2E : (gppwm4_loadAxis == 15) ? flexPercent : (gppwm4_loadAxis == 16) ? auxLinear1 : (gppwm4_loadAxis == 17) ? auxLinear2 : 0} [PcVariables] tuneCrcPcVariable = continuousChannelValue, tuneCrc16 diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index 95071dcfd8..b4ae12e6fb 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 2022.09.16.hellen72.2513336159" + signature = "rusEFI 2022.09.16.hellen72.2086342721" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.16.hellen72.2513336159" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.16.hellen72.2086342721" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Sep 16 01:33:43 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Sep 16 20:09:53 UTC 2022 pageSize = 21296 page = 1 @@ -1047,7 +1047,7 @@ gppwm1_dutyIfError = scalar, U08, 2566, "%", 1, 0, 0, 100, 0 gppwm1_pwmFrequency = scalar, U16, 2568, "hz", 1, 0, 0, 500, 0 gppwm1_onAboveDuty = scalar, U08, 2570, "%", 1, 0, 0, 100, 0 gppwm1_offBelowDuty = scalar, U08, 2571, "%", 1, 0, 0, 100, 0 -gppwm1_loadAxis = bits, U08, 2572, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm1_loadAxis = bits, U08, 2572, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm1_alignmentFill_map = scalar, U08, 2573, "unit", 1, 0, 0, 100, 0 gppwm1_loadBins = array, U08, 2574, [8], "load", 1, 0, 0, 250, 0 gppwm1_rpmBins = array, U08, 2582, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1057,7 +1057,7 @@ gppwm2_dutyIfError = scalar, U08, 2658, "%", 1, 0, 0, 100, 0 gppwm2_pwmFrequency = scalar, U16, 2660, "hz", 1, 0, 0, 500, 0 gppwm2_onAboveDuty = scalar, U08, 2662, "%", 1, 0, 0, 100, 0 gppwm2_offBelowDuty = scalar, U08, 2663, "%", 1, 0, 0, 100, 0 -gppwm2_loadAxis = bits, U08, 2664, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm2_loadAxis = bits, U08, 2664, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm2_alignmentFill_map = scalar, U08, 2665, "unit", 1, 0, 0, 100, 0 gppwm2_loadBins = array, U08, 2666, [8], "load", 1, 0, 0, 250, 0 gppwm2_rpmBins = array, U08, 2674, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1067,7 +1067,7 @@ gppwm3_dutyIfError = scalar, U08, 2750, "%", 1, 0, 0, 100, 0 gppwm3_pwmFrequency = scalar, U16, 2752, "hz", 1, 0, 0, 500, 0 gppwm3_onAboveDuty = scalar, U08, 2754, "%", 1, 0, 0, 100, 0 gppwm3_offBelowDuty = scalar, U08, 2755, "%", 1, 0, 0, 100, 0 -gppwm3_loadAxis = bits, U08, 2756, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm3_loadAxis = bits, U08, 2756, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm3_alignmentFill_map = scalar, U08, 2757, "unit", 1, 0, 0, 100, 0 gppwm3_loadBins = array, U08, 2758, [8], "load", 1, 0, 0, 250, 0 gppwm3_rpmBins = array, U08, 2766, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1077,7 +1077,7 @@ gppwm4_dutyIfError = scalar, U08, 2842, "%", 1, 0, 0, 100, 0 gppwm4_pwmFrequency = scalar, U16, 2844, "hz", 1, 0, 0, 500, 0 gppwm4_onAboveDuty = scalar, U08, 2846, "%", 1, 0, 0, 100, 0 gppwm4_offBelowDuty = scalar, U08, 2847, "%", 1, 0, 0, 100, 0 -gppwm4_loadAxis = bits, U08, 2848, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm4_loadAxis = bits, U08, 2848, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm4_alignmentFill_map = scalar, U08, 2849, "unit", 1, 0, 0, 100, 0 gppwm4_loadBins = array, U08, 2850, [8], "load", 1, 0, 0, 250, 0 gppwm4_rpmBins = array, U08, 2858, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -3259,10 +3259,10 @@ esr = scalar, U16, 1244, "", 1, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } ; These "synthetic" channels provide the Y-axis (load) value for gen purp PWM table's Y axes - gppwm1_load = {(gppwm1_loadAxis == 0) ? TPSValue : ((gppwm1_loadAxis == 1) ? MAPValue : ((gppwm1_loadAxis == 2) ? coolant : ((gppwm1_loadAxis == 3) ? intake : ((gppwm1_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm2_load = {(gppwm2_loadAxis == 0) ? TPSValue : ((gppwm2_loadAxis == 1) ? MAPValue : ((gppwm2_loadAxis == 2) ? coolant : ((gppwm2_loadAxis == 3) ? intake : ((gppwm2_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm3_load = {(gppwm3_loadAxis == 0) ? TPSValue : ((gppwm3_loadAxis == 1) ? MAPValue : ((gppwm3_loadAxis == 2) ? coolant : ((gppwm3_loadAxis == 3) ? intake : ((gppwm3_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm4_load = {(gppwm4_loadAxis == 0) ? TPSValue : ((gppwm4_loadAxis == 1) ? MAPValue : ((gppwm4_loadAxis == 2) ? coolant : ((gppwm4_loadAxis == 3) ? intake : ((gppwm4_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} + gppwm1_load = {(gppwm1_loadAxis == 0) ? 0 : (gppwm1_loadAxis == 1) ? TPSValue : (gppwm1_loadAxis == 2) ? MAPValue : (gppwm1_loadAxis == 3) ? coolant : (gppwm1_loadAxis == 4) ? intake : (gppwm1_loadAxis == 5) ? fuelingLoad : (gppwm1_loadAxis == 6) ? ignitionLoad : (gppwm1_loadAxis == 7) ? auxTemp1 : (gppwm1_loadAxis == 8) ? auxTemp2 : (gppwm1_loadAxis == 9) ? throttlePedalPosition : (gppwm1_loadAxis == 10) ? VBatt : (gppwm1_loadAxis == 11) ? vvtPositionB1I : (gppwm1_loadAxis == 12) ? vvtPositionB1E : (gppwm1_loadAxis == 13) ? vvtPositionB2I : (gppwm1_loadAxis == 14) ? vvtPositionB2E : (gppwm1_loadAxis == 15) ? flexPercent : (gppwm1_loadAxis == 16) ? auxLinear1 : (gppwm1_loadAxis == 17) ? auxLinear2 : 0} + gppwm2_load = {(gppwm2_loadAxis == 0) ? 0 : (gppwm2_loadAxis == 1) ? TPSValue : (gppwm2_loadAxis == 2) ? MAPValue : (gppwm2_loadAxis == 3) ? coolant : (gppwm2_loadAxis == 4) ? intake : (gppwm2_loadAxis == 5) ? fuelingLoad : (gppwm2_loadAxis == 6) ? ignitionLoad : (gppwm2_loadAxis == 7) ? auxTemp1 : (gppwm2_loadAxis == 8) ? auxTemp2 : (gppwm2_loadAxis == 9) ? throttlePedalPosition : (gppwm2_loadAxis == 10) ? VBatt : (gppwm2_loadAxis == 11) ? vvtPositionB1I : (gppwm2_loadAxis == 12) ? vvtPositionB1E : (gppwm2_loadAxis == 13) ? vvtPositionB2I : (gppwm2_loadAxis == 14) ? vvtPositionB2E : (gppwm2_loadAxis == 15) ? flexPercent : (gppwm2_loadAxis == 16) ? auxLinear1 : (gppwm2_loadAxis == 17) ? auxLinear2 : 0} + gppwm3_load = {(gppwm3_loadAxis == 0) ? 0 : (gppwm3_loadAxis == 1) ? TPSValue : (gppwm3_loadAxis == 2) ? MAPValue : (gppwm3_loadAxis == 3) ? coolant : (gppwm3_loadAxis == 4) ? intake : (gppwm3_loadAxis == 5) ? fuelingLoad : (gppwm3_loadAxis == 6) ? ignitionLoad : (gppwm3_loadAxis == 7) ? auxTemp1 : (gppwm3_loadAxis == 8) ? auxTemp2 : (gppwm3_loadAxis == 9) ? throttlePedalPosition : (gppwm3_loadAxis == 10) ? VBatt : (gppwm3_loadAxis == 11) ? vvtPositionB1I : (gppwm3_loadAxis == 12) ? vvtPositionB1E : (gppwm3_loadAxis == 13) ? vvtPositionB2I : (gppwm3_loadAxis == 14) ? vvtPositionB2E : (gppwm3_loadAxis == 15) ? flexPercent : (gppwm3_loadAxis == 16) ? auxLinear1 : (gppwm3_loadAxis == 17) ? auxLinear2 : 0} + gppwm4_load = {(gppwm4_loadAxis == 0) ? 0 : (gppwm4_loadAxis == 1) ? TPSValue : (gppwm4_loadAxis == 2) ? MAPValue : (gppwm4_loadAxis == 3) ? coolant : (gppwm4_loadAxis == 4) ? intake : (gppwm4_loadAxis == 5) ? fuelingLoad : (gppwm4_loadAxis == 6) ? ignitionLoad : (gppwm4_loadAxis == 7) ? auxTemp1 : (gppwm4_loadAxis == 8) ? auxTemp2 : (gppwm4_loadAxis == 9) ? throttlePedalPosition : (gppwm4_loadAxis == 10) ? VBatt : (gppwm4_loadAxis == 11) ? vvtPositionB1I : (gppwm4_loadAxis == 12) ? vvtPositionB1E : (gppwm4_loadAxis == 13) ? vvtPositionB2I : (gppwm4_loadAxis == 14) ? vvtPositionB2E : (gppwm4_loadAxis == 15) ? flexPercent : (gppwm4_loadAxis == 16) ? auxLinear1 : (gppwm4_loadAxis == 17) ? auxLinear2 : 0} [PcVariables] tuneCrcPcVariable = continuousChannelValue, tuneCrc16 diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index b63d93d673..266d96c5fb 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen81.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen81.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.09.16.hellen81.1162118737" + signature = "rusEFI 2022.09.16.hellen81.2899435855" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.16.hellen81.1162118737" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.16.hellen81.2899435855" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Sep 16 01:33:45 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Sep 16 20:09:55 UTC 2022 pageSize = 21296 page = 1 @@ -1047,7 +1047,7 @@ gppwm1_dutyIfError = scalar, U08, 2566, "%", 1, 0, 0, 100, 0 gppwm1_pwmFrequency = scalar, U16, 2568, "hz", 1, 0, 0, 500, 0 gppwm1_onAboveDuty = scalar, U08, 2570, "%", 1, 0, 0, 100, 0 gppwm1_offBelowDuty = scalar, U08, 2571, "%", 1, 0, 0, 100, 0 -gppwm1_loadAxis = bits, U08, 2572, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm1_loadAxis = bits, U08, 2572, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm1_alignmentFill_map = scalar, U08, 2573, "unit", 1, 0, 0, 100, 0 gppwm1_loadBins = array, U08, 2574, [8], "load", 1, 0, 0, 250, 0 gppwm1_rpmBins = array, U08, 2582, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1057,7 +1057,7 @@ gppwm2_dutyIfError = scalar, U08, 2658, "%", 1, 0, 0, 100, 0 gppwm2_pwmFrequency = scalar, U16, 2660, "hz", 1, 0, 0, 500, 0 gppwm2_onAboveDuty = scalar, U08, 2662, "%", 1, 0, 0, 100, 0 gppwm2_offBelowDuty = scalar, U08, 2663, "%", 1, 0, 0, 100, 0 -gppwm2_loadAxis = bits, U08, 2664, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm2_loadAxis = bits, U08, 2664, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm2_alignmentFill_map = scalar, U08, 2665, "unit", 1, 0, 0, 100, 0 gppwm2_loadBins = array, U08, 2666, [8], "load", 1, 0, 0, 250, 0 gppwm2_rpmBins = array, U08, 2674, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1067,7 +1067,7 @@ gppwm3_dutyIfError = scalar, U08, 2750, "%", 1, 0, 0, 100, 0 gppwm3_pwmFrequency = scalar, U16, 2752, "hz", 1, 0, 0, 500, 0 gppwm3_onAboveDuty = scalar, U08, 2754, "%", 1, 0, 0, 100, 0 gppwm3_offBelowDuty = scalar, U08, 2755, "%", 1, 0, 0, 100, 0 -gppwm3_loadAxis = bits, U08, 2756, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm3_loadAxis = bits, U08, 2756, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm3_alignmentFill_map = scalar, U08, 2757, "unit", 1, 0, 0, 100, 0 gppwm3_loadBins = array, U08, 2758, [8], "load", 1, 0, 0, 250, 0 gppwm3_rpmBins = array, U08, 2766, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1077,7 +1077,7 @@ gppwm4_dutyIfError = scalar, U08, 2842, "%", 1, 0, 0, 100, 0 gppwm4_pwmFrequency = scalar, U16, 2844, "hz", 1, 0, 0, 500, 0 gppwm4_onAboveDuty = scalar, U08, 2846, "%", 1, 0, 0, 100, 0 gppwm4_offBelowDuty = scalar, U08, 2847, "%", 1, 0, 0, 100, 0 -gppwm4_loadAxis = bits, U08, 2848, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm4_loadAxis = bits, U08, 2848, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm4_alignmentFill_map = scalar, U08, 2849, "unit", 1, 0, 0, 100, 0 gppwm4_loadBins = array, U08, 2850, [8], "load", 1, 0, 0, 250, 0 gppwm4_rpmBins = array, U08, 2858, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -3259,10 +3259,10 @@ esr = scalar, U16, 1244, "", 1, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } ; These "synthetic" channels provide the Y-axis (load) value for gen purp PWM table's Y axes - gppwm1_load = {(gppwm1_loadAxis == 0) ? TPSValue : ((gppwm1_loadAxis == 1) ? MAPValue : ((gppwm1_loadAxis == 2) ? coolant : ((gppwm1_loadAxis == 3) ? intake : ((gppwm1_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm2_load = {(gppwm2_loadAxis == 0) ? TPSValue : ((gppwm2_loadAxis == 1) ? MAPValue : ((gppwm2_loadAxis == 2) ? coolant : ((gppwm2_loadAxis == 3) ? intake : ((gppwm2_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm3_load = {(gppwm3_loadAxis == 0) ? TPSValue : ((gppwm3_loadAxis == 1) ? MAPValue : ((gppwm3_loadAxis == 2) ? coolant : ((gppwm3_loadAxis == 3) ? intake : ((gppwm3_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm4_load = {(gppwm4_loadAxis == 0) ? TPSValue : ((gppwm4_loadAxis == 1) ? MAPValue : ((gppwm4_loadAxis == 2) ? coolant : ((gppwm4_loadAxis == 3) ? intake : ((gppwm4_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} + gppwm1_load = {(gppwm1_loadAxis == 0) ? 0 : (gppwm1_loadAxis == 1) ? TPSValue : (gppwm1_loadAxis == 2) ? MAPValue : (gppwm1_loadAxis == 3) ? coolant : (gppwm1_loadAxis == 4) ? intake : (gppwm1_loadAxis == 5) ? fuelingLoad : (gppwm1_loadAxis == 6) ? ignitionLoad : (gppwm1_loadAxis == 7) ? auxTemp1 : (gppwm1_loadAxis == 8) ? auxTemp2 : (gppwm1_loadAxis == 9) ? throttlePedalPosition : (gppwm1_loadAxis == 10) ? VBatt : (gppwm1_loadAxis == 11) ? vvtPositionB1I : (gppwm1_loadAxis == 12) ? vvtPositionB1E : (gppwm1_loadAxis == 13) ? vvtPositionB2I : (gppwm1_loadAxis == 14) ? vvtPositionB2E : (gppwm1_loadAxis == 15) ? flexPercent : (gppwm1_loadAxis == 16) ? auxLinear1 : (gppwm1_loadAxis == 17) ? auxLinear2 : 0} + gppwm2_load = {(gppwm2_loadAxis == 0) ? 0 : (gppwm2_loadAxis == 1) ? TPSValue : (gppwm2_loadAxis == 2) ? MAPValue : (gppwm2_loadAxis == 3) ? coolant : (gppwm2_loadAxis == 4) ? intake : (gppwm2_loadAxis == 5) ? fuelingLoad : (gppwm2_loadAxis == 6) ? ignitionLoad : (gppwm2_loadAxis == 7) ? auxTemp1 : (gppwm2_loadAxis == 8) ? auxTemp2 : (gppwm2_loadAxis == 9) ? throttlePedalPosition : (gppwm2_loadAxis == 10) ? VBatt : (gppwm2_loadAxis == 11) ? vvtPositionB1I : (gppwm2_loadAxis == 12) ? vvtPositionB1E : (gppwm2_loadAxis == 13) ? vvtPositionB2I : (gppwm2_loadAxis == 14) ? vvtPositionB2E : (gppwm2_loadAxis == 15) ? flexPercent : (gppwm2_loadAxis == 16) ? auxLinear1 : (gppwm2_loadAxis == 17) ? auxLinear2 : 0} + gppwm3_load = {(gppwm3_loadAxis == 0) ? 0 : (gppwm3_loadAxis == 1) ? TPSValue : (gppwm3_loadAxis == 2) ? MAPValue : (gppwm3_loadAxis == 3) ? coolant : (gppwm3_loadAxis == 4) ? intake : (gppwm3_loadAxis == 5) ? fuelingLoad : (gppwm3_loadAxis == 6) ? ignitionLoad : (gppwm3_loadAxis == 7) ? auxTemp1 : (gppwm3_loadAxis == 8) ? auxTemp2 : (gppwm3_loadAxis == 9) ? throttlePedalPosition : (gppwm3_loadAxis == 10) ? VBatt : (gppwm3_loadAxis == 11) ? vvtPositionB1I : (gppwm3_loadAxis == 12) ? vvtPositionB1E : (gppwm3_loadAxis == 13) ? vvtPositionB2I : (gppwm3_loadAxis == 14) ? vvtPositionB2E : (gppwm3_loadAxis == 15) ? flexPercent : (gppwm3_loadAxis == 16) ? auxLinear1 : (gppwm3_loadAxis == 17) ? auxLinear2 : 0} + gppwm4_load = {(gppwm4_loadAxis == 0) ? 0 : (gppwm4_loadAxis == 1) ? TPSValue : (gppwm4_loadAxis == 2) ? MAPValue : (gppwm4_loadAxis == 3) ? coolant : (gppwm4_loadAxis == 4) ? intake : (gppwm4_loadAxis == 5) ? fuelingLoad : (gppwm4_loadAxis == 6) ? ignitionLoad : (gppwm4_loadAxis == 7) ? auxTemp1 : (gppwm4_loadAxis == 8) ? auxTemp2 : (gppwm4_loadAxis == 9) ? throttlePedalPosition : (gppwm4_loadAxis == 10) ? VBatt : (gppwm4_loadAxis == 11) ? vvtPositionB1I : (gppwm4_loadAxis == 12) ? vvtPositionB1E : (gppwm4_loadAxis == 13) ? vvtPositionB2I : (gppwm4_loadAxis == 14) ? vvtPositionB2E : (gppwm4_loadAxis == 15) ? flexPercent : (gppwm4_loadAxis == 16) ? auxLinear1 : (gppwm4_loadAxis == 17) ? auxLinear2 : 0} [PcVariables] tuneCrcPcVariable = continuousChannelValue, tuneCrc16 diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index 424b12b89c..e7d490221c 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.09.16.hellen88bmw.1912884631" + signature = "rusEFI 2022.09.16.hellen88bmw.2609982089" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.16.hellen88bmw.1912884631" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.16.hellen88bmw.2609982089" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Sep 16 01:33:41 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Sep 16 20:09:51 UTC 2022 pageSize = 21296 page = 1 @@ -1047,7 +1047,7 @@ gppwm1_dutyIfError = scalar, U08, 2566, "%", 1, 0, 0, 100, 0 gppwm1_pwmFrequency = scalar, U16, 2568, "hz", 1, 0, 0, 500, 0 gppwm1_onAboveDuty = scalar, U08, 2570, "%", 1, 0, 0, 100, 0 gppwm1_offBelowDuty = scalar, U08, 2571, "%", 1, 0, 0, 100, 0 -gppwm1_loadAxis = bits, U08, 2572, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm1_loadAxis = bits, U08, 2572, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm1_alignmentFill_map = scalar, U08, 2573, "unit", 1, 0, 0, 100, 0 gppwm1_loadBins = array, U08, 2574, [8], "load", 1, 0, 0, 250, 0 gppwm1_rpmBins = array, U08, 2582, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1057,7 +1057,7 @@ gppwm2_dutyIfError = scalar, U08, 2658, "%", 1, 0, 0, 100, 0 gppwm2_pwmFrequency = scalar, U16, 2660, "hz", 1, 0, 0, 500, 0 gppwm2_onAboveDuty = scalar, U08, 2662, "%", 1, 0, 0, 100, 0 gppwm2_offBelowDuty = scalar, U08, 2663, "%", 1, 0, 0, 100, 0 -gppwm2_loadAxis = bits, U08, 2664, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm2_loadAxis = bits, U08, 2664, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm2_alignmentFill_map = scalar, U08, 2665, "unit", 1, 0, 0, 100, 0 gppwm2_loadBins = array, U08, 2666, [8], "load", 1, 0, 0, 250, 0 gppwm2_rpmBins = array, U08, 2674, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1067,7 +1067,7 @@ gppwm3_dutyIfError = scalar, U08, 2750, "%", 1, 0, 0, 100, 0 gppwm3_pwmFrequency = scalar, U16, 2752, "hz", 1, 0, 0, 500, 0 gppwm3_onAboveDuty = scalar, U08, 2754, "%", 1, 0, 0, 100, 0 gppwm3_offBelowDuty = scalar, U08, 2755, "%", 1, 0, 0, 100, 0 -gppwm3_loadAxis = bits, U08, 2756, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm3_loadAxis = bits, U08, 2756, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm3_alignmentFill_map = scalar, U08, 2757, "unit", 1, 0, 0, 100, 0 gppwm3_loadBins = array, U08, 2758, [8], "load", 1, 0, 0, 250, 0 gppwm3_rpmBins = array, U08, 2766, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1077,7 +1077,7 @@ gppwm4_dutyIfError = scalar, U08, 2842, "%", 1, 0, 0, 100, 0 gppwm4_pwmFrequency = scalar, U16, 2844, "hz", 1, 0, 0, 500, 0 gppwm4_onAboveDuty = scalar, U08, 2846, "%", 1, 0, 0, 100, 0 gppwm4_offBelowDuty = scalar, U08, 2847, "%", 1, 0, 0, 100, 0 -gppwm4_loadAxis = bits, U08, 2848, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm4_loadAxis = bits, U08, 2848, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm4_alignmentFill_map = scalar, U08, 2849, "unit", 1, 0, 0, 100, 0 gppwm4_loadBins = array, U08, 2850, [8], "load", 1, 0, 0, 250, 0 gppwm4_rpmBins = array, U08, 2858, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -3259,10 +3259,10 @@ esr = scalar, U16, 1244, "", 1, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } ; These "synthetic" channels provide the Y-axis (load) value for gen purp PWM table's Y axes - gppwm1_load = {(gppwm1_loadAxis == 0) ? TPSValue : ((gppwm1_loadAxis == 1) ? MAPValue : ((gppwm1_loadAxis == 2) ? coolant : ((gppwm1_loadAxis == 3) ? intake : ((gppwm1_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm2_load = {(gppwm2_loadAxis == 0) ? TPSValue : ((gppwm2_loadAxis == 1) ? MAPValue : ((gppwm2_loadAxis == 2) ? coolant : ((gppwm2_loadAxis == 3) ? intake : ((gppwm2_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm3_load = {(gppwm3_loadAxis == 0) ? TPSValue : ((gppwm3_loadAxis == 1) ? MAPValue : ((gppwm3_loadAxis == 2) ? coolant : ((gppwm3_loadAxis == 3) ? intake : ((gppwm3_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm4_load = {(gppwm4_loadAxis == 0) ? TPSValue : ((gppwm4_loadAxis == 1) ? MAPValue : ((gppwm4_loadAxis == 2) ? coolant : ((gppwm4_loadAxis == 3) ? intake : ((gppwm4_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} + gppwm1_load = {(gppwm1_loadAxis == 0) ? 0 : (gppwm1_loadAxis == 1) ? TPSValue : (gppwm1_loadAxis == 2) ? MAPValue : (gppwm1_loadAxis == 3) ? coolant : (gppwm1_loadAxis == 4) ? intake : (gppwm1_loadAxis == 5) ? fuelingLoad : (gppwm1_loadAxis == 6) ? ignitionLoad : (gppwm1_loadAxis == 7) ? auxTemp1 : (gppwm1_loadAxis == 8) ? auxTemp2 : (gppwm1_loadAxis == 9) ? throttlePedalPosition : (gppwm1_loadAxis == 10) ? VBatt : (gppwm1_loadAxis == 11) ? vvtPositionB1I : (gppwm1_loadAxis == 12) ? vvtPositionB1E : (gppwm1_loadAxis == 13) ? vvtPositionB2I : (gppwm1_loadAxis == 14) ? vvtPositionB2E : (gppwm1_loadAxis == 15) ? flexPercent : (gppwm1_loadAxis == 16) ? auxLinear1 : (gppwm1_loadAxis == 17) ? auxLinear2 : 0} + gppwm2_load = {(gppwm2_loadAxis == 0) ? 0 : (gppwm2_loadAxis == 1) ? TPSValue : (gppwm2_loadAxis == 2) ? MAPValue : (gppwm2_loadAxis == 3) ? coolant : (gppwm2_loadAxis == 4) ? intake : (gppwm2_loadAxis == 5) ? fuelingLoad : (gppwm2_loadAxis == 6) ? ignitionLoad : (gppwm2_loadAxis == 7) ? auxTemp1 : (gppwm2_loadAxis == 8) ? auxTemp2 : (gppwm2_loadAxis == 9) ? throttlePedalPosition : (gppwm2_loadAxis == 10) ? VBatt : (gppwm2_loadAxis == 11) ? vvtPositionB1I : (gppwm2_loadAxis == 12) ? vvtPositionB1E : (gppwm2_loadAxis == 13) ? vvtPositionB2I : (gppwm2_loadAxis == 14) ? vvtPositionB2E : (gppwm2_loadAxis == 15) ? flexPercent : (gppwm2_loadAxis == 16) ? auxLinear1 : (gppwm2_loadAxis == 17) ? auxLinear2 : 0} + gppwm3_load = {(gppwm3_loadAxis == 0) ? 0 : (gppwm3_loadAxis == 1) ? TPSValue : (gppwm3_loadAxis == 2) ? MAPValue : (gppwm3_loadAxis == 3) ? coolant : (gppwm3_loadAxis == 4) ? intake : (gppwm3_loadAxis == 5) ? fuelingLoad : (gppwm3_loadAxis == 6) ? ignitionLoad : (gppwm3_loadAxis == 7) ? auxTemp1 : (gppwm3_loadAxis == 8) ? auxTemp2 : (gppwm3_loadAxis == 9) ? throttlePedalPosition : (gppwm3_loadAxis == 10) ? VBatt : (gppwm3_loadAxis == 11) ? vvtPositionB1I : (gppwm3_loadAxis == 12) ? vvtPositionB1E : (gppwm3_loadAxis == 13) ? vvtPositionB2I : (gppwm3_loadAxis == 14) ? vvtPositionB2E : (gppwm3_loadAxis == 15) ? flexPercent : (gppwm3_loadAxis == 16) ? auxLinear1 : (gppwm3_loadAxis == 17) ? auxLinear2 : 0} + gppwm4_load = {(gppwm4_loadAxis == 0) ? 0 : (gppwm4_loadAxis == 1) ? TPSValue : (gppwm4_loadAxis == 2) ? MAPValue : (gppwm4_loadAxis == 3) ? coolant : (gppwm4_loadAxis == 4) ? intake : (gppwm4_loadAxis == 5) ? fuelingLoad : (gppwm4_loadAxis == 6) ? ignitionLoad : (gppwm4_loadAxis == 7) ? auxTemp1 : (gppwm4_loadAxis == 8) ? auxTemp2 : (gppwm4_loadAxis == 9) ? throttlePedalPosition : (gppwm4_loadAxis == 10) ? VBatt : (gppwm4_loadAxis == 11) ? vvtPositionB1I : (gppwm4_loadAxis == 12) ? vvtPositionB1E : (gppwm4_loadAxis == 13) ? vvtPositionB2I : (gppwm4_loadAxis == 14) ? vvtPositionB2E : (gppwm4_loadAxis == 15) ? flexPercent : (gppwm4_loadAxis == 16) ? auxLinear1 : (gppwm4_loadAxis == 17) ? auxLinear2 : 0} [PcVariables] tuneCrcPcVariable = continuousChannelValue, tuneCrc16 diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index 475f3cfd07..1719772c52 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.09.16.hellenNA6.2718105817" + signature = "rusEFI 2022.09.16.hellenNA6.1268148167" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.16.hellenNA6.2718105817" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.16.hellenNA6.1268148167" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Sep 16 01:33:52 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Sep 16 20:10:00 UTC 2022 pageSize = 21296 page = 1 @@ -1047,7 +1047,7 @@ gppwm1_dutyIfError = scalar, U08, 2566, "%", 1, 0, 0, 100, 0 gppwm1_pwmFrequency = scalar, U16, 2568, "hz", 1, 0, 0, 500, 0 gppwm1_onAboveDuty = scalar, U08, 2570, "%", 1, 0, 0, 100, 0 gppwm1_offBelowDuty = scalar, U08, 2571, "%", 1, 0, 0, 100, 0 -gppwm1_loadAxis = bits, U08, 2572, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm1_loadAxis = bits, U08, 2572, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm1_alignmentFill_map = scalar, U08, 2573, "unit", 1, 0, 0, 100, 0 gppwm1_loadBins = array, U08, 2574, [8], "load", 1, 0, 0, 250, 0 gppwm1_rpmBins = array, U08, 2582, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1057,7 +1057,7 @@ gppwm2_dutyIfError = scalar, U08, 2658, "%", 1, 0, 0, 100, 0 gppwm2_pwmFrequency = scalar, U16, 2660, "hz", 1, 0, 0, 500, 0 gppwm2_onAboveDuty = scalar, U08, 2662, "%", 1, 0, 0, 100, 0 gppwm2_offBelowDuty = scalar, U08, 2663, "%", 1, 0, 0, 100, 0 -gppwm2_loadAxis = bits, U08, 2664, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm2_loadAxis = bits, U08, 2664, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm2_alignmentFill_map = scalar, U08, 2665, "unit", 1, 0, 0, 100, 0 gppwm2_loadBins = array, U08, 2666, [8], "load", 1, 0, 0, 250, 0 gppwm2_rpmBins = array, U08, 2674, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1067,7 +1067,7 @@ gppwm3_dutyIfError = scalar, U08, 2750, "%", 1, 0, 0, 100, 0 gppwm3_pwmFrequency = scalar, U16, 2752, "hz", 1, 0, 0, 500, 0 gppwm3_onAboveDuty = scalar, U08, 2754, "%", 1, 0, 0, 100, 0 gppwm3_offBelowDuty = scalar, U08, 2755, "%", 1, 0, 0, 100, 0 -gppwm3_loadAxis = bits, U08, 2756, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm3_loadAxis = bits, U08, 2756, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm3_alignmentFill_map = scalar, U08, 2757, "unit", 1, 0, 0, 100, 0 gppwm3_loadBins = array, U08, 2758, [8], "load", 1, 0, 0, 250, 0 gppwm3_rpmBins = array, U08, 2766, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1077,7 +1077,7 @@ gppwm4_dutyIfError = scalar, U08, 2842, "%", 1, 0, 0, 100, 0 gppwm4_pwmFrequency = scalar, U16, 2844, "hz", 1, 0, 0, 500, 0 gppwm4_onAboveDuty = scalar, U08, 2846, "%", 1, 0, 0, 100, 0 gppwm4_offBelowDuty = scalar, U08, 2847, "%", 1, 0, 0, 100, 0 -gppwm4_loadAxis = bits, U08, 2848, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm4_loadAxis = bits, U08, 2848, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm4_alignmentFill_map = scalar, U08, 2849, "unit", 1, 0, 0, 100, 0 gppwm4_loadBins = array, U08, 2850, [8], "load", 1, 0, 0, 250, 0 gppwm4_rpmBins = array, U08, 2858, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -3259,10 +3259,10 @@ esr = scalar, U16, 1244, "", 1, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } ; These "synthetic" channels provide the Y-axis (load) value for gen purp PWM table's Y axes - gppwm1_load = {(gppwm1_loadAxis == 0) ? TPSValue : ((gppwm1_loadAxis == 1) ? MAPValue : ((gppwm1_loadAxis == 2) ? coolant : ((gppwm1_loadAxis == 3) ? intake : ((gppwm1_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm2_load = {(gppwm2_loadAxis == 0) ? TPSValue : ((gppwm2_loadAxis == 1) ? MAPValue : ((gppwm2_loadAxis == 2) ? coolant : ((gppwm2_loadAxis == 3) ? intake : ((gppwm2_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm3_load = {(gppwm3_loadAxis == 0) ? TPSValue : ((gppwm3_loadAxis == 1) ? MAPValue : ((gppwm3_loadAxis == 2) ? coolant : ((gppwm3_loadAxis == 3) ? intake : ((gppwm3_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm4_load = {(gppwm4_loadAxis == 0) ? TPSValue : ((gppwm4_loadAxis == 1) ? MAPValue : ((gppwm4_loadAxis == 2) ? coolant : ((gppwm4_loadAxis == 3) ? intake : ((gppwm4_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} + gppwm1_load = {(gppwm1_loadAxis == 0) ? 0 : (gppwm1_loadAxis == 1) ? TPSValue : (gppwm1_loadAxis == 2) ? MAPValue : (gppwm1_loadAxis == 3) ? coolant : (gppwm1_loadAxis == 4) ? intake : (gppwm1_loadAxis == 5) ? fuelingLoad : (gppwm1_loadAxis == 6) ? ignitionLoad : (gppwm1_loadAxis == 7) ? auxTemp1 : (gppwm1_loadAxis == 8) ? auxTemp2 : (gppwm1_loadAxis == 9) ? throttlePedalPosition : (gppwm1_loadAxis == 10) ? VBatt : (gppwm1_loadAxis == 11) ? vvtPositionB1I : (gppwm1_loadAxis == 12) ? vvtPositionB1E : (gppwm1_loadAxis == 13) ? vvtPositionB2I : (gppwm1_loadAxis == 14) ? vvtPositionB2E : (gppwm1_loadAxis == 15) ? flexPercent : (gppwm1_loadAxis == 16) ? auxLinear1 : (gppwm1_loadAxis == 17) ? auxLinear2 : 0} + gppwm2_load = {(gppwm2_loadAxis == 0) ? 0 : (gppwm2_loadAxis == 1) ? TPSValue : (gppwm2_loadAxis == 2) ? MAPValue : (gppwm2_loadAxis == 3) ? coolant : (gppwm2_loadAxis == 4) ? intake : (gppwm2_loadAxis == 5) ? fuelingLoad : (gppwm2_loadAxis == 6) ? ignitionLoad : (gppwm2_loadAxis == 7) ? auxTemp1 : (gppwm2_loadAxis == 8) ? auxTemp2 : (gppwm2_loadAxis == 9) ? throttlePedalPosition : (gppwm2_loadAxis == 10) ? VBatt : (gppwm2_loadAxis == 11) ? vvtPositionB1I : (gppwm2_loadAxis == 12) ? vvtPositionB1E : (gppwm2_loadAxis == 13) ? vvtPositionB2I : (gppwm2_loadAxis == 14) ? vvtPositionB2E : (gppwm2_loadAxis == 15) ? flexPercent : (gppwm2_loadAxis == 16) ? auxLinear1 : (gppwm2_loadAxis == 17) ? auxLinear2 : 0} + gppwm3_load = {(gppwm3_loadAxis == 0) ? 0 : (gppwm3_loadAxis == 1) ? TPSValue : (gppwm3_loadAxis == 2) ? MAPValue : (gppwm3_loadAxis == 3) ? coolant : (gppwm3_loadAxis == 4) ? intake : (gppwm3_loadAxis == 5) ? fuelingLoad : (gppwm3_loadAxis == 6) ? ignitionLoad : (gppwm3_loadAxis == 7) ? auxTemp1 : (gppwm3_loadAxis == 8) ? auxTemp2 : (gppwm3_loadAxis == 9) ? throttlePedalPosition : (gppwm3_loadAxis == 10) ? VBatt : (gppwm3_loadAxis == 11) ? vvtPositionB1I : (gppwm3_loadAxis == 12) ? vvtPositionB1E : (gppwm3_loadAxis == 13) ? vvtPositionB2I : (gppwm3_loadAxis == 14) ? vvtPositionB2E : (gppwm3_loadAxis == 15) ? flexPercent : (gppwm3_loadAxis == 16) ? auxLinear1 : (gppwm3_loadAxis == 17) ? auxLinear2 : 0} + gppwm4_load = {(gppwm4_loadAxis == 0) ? 0 : (gppwm4_loadAxis == 1) ? TPSValue : (gppwm4_loadAxis == 2) ? MAPValue : (gppwm4_loadAxis == 3) ? coolant : (gppwm4_loadAxis == 4) ? intake : (gppwm4_loadAxis == 5) ? fuelingLoad : (gppwm4_loadAxis == 6) ? ignitionLoad : (gppwm4_loadAxis == 7) ? auxTemp1 : (gppwm4_loadAxis == 8) ? auxTemp2 : (gppwm4_loadAxis == 9) ? throttlePedalPosition : (gppwm4_loadAxis == 10) ? VBatt : (gppwm4_loadAxis == 11) ? vvtPositionB1I : (gppwm4_loadAxis == 12) ? vvtPositionB1E : (gppwm4_loadAxis == 13) ? vvtPositionB2I : (gppwm4_loadAxis == 14) ? vvtPositionB2E : (gppwm4_loadAxis == 15) ? flexPercent : (gppwm4_loadAxis == 16) ? auxLinear1 : (gppwm4_loadAxis == 17) ? auxLinear2 : 0} [PcVariables] tuneCrcPcVariable = continuousChannelValue, tuneCrc16 diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini index 6fb09924d2..481504a060 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.09.16.hellenNA8_96.3354980275" + signature = "rusEFI 2022.09.16.hellenNA8_96.778930349" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.16.hellenNA8_96.3354980275" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.16.hellenNA8_96.778930349" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Sep 16 01:33:54 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Sep 16 20:10:02 UTC 2022 pageSize = 21296 page = 1 @@ -1047,7 +1047,7 @@ gppwm1_dutyIfError = scalar, U08, 2566, "%", 1, 0, 0, 100, 0 gppwm1_pwmFrequency = scalar, U16, 2568, "hz", 1, 0, 0, 500, 0 gppwm1_onAboveDuty = scalar, U08, 2570, "%", 1, 0, 0, 100, 0 gppwm1_offBelowDuty = scalar, U08, 2571, "%", 1, 0, 0, 100, 0 -gppwm1_loadAxis = bits, U08, 2572, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm1_loadAxis = bits, U08, 2572, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm1_alignmentFill_map = scalar, U08, 2573, "unit", 1, 0, 0, 100, 0 gppwm1_loadBins = array, U08, 2574, [8], "load", 1, 0, 0, 250, 0 gppwm1_rpmBins = array, U08, 2582, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1057,7 +1057,7 @@ gppwm2_dutyIfError = scalar, U08, 2658, "%", 1, 0, 0, 100, 0 gppwm2_pwmFrequency = scalar, U16, 2660, "hz", 1, 0, 0, 500, 0 gppwm2_onAboveDuty = scalar, U08, 2662, "%", 1, 0, 0, 100, 0 gppwm2_offBelowDuty = scalar, U08, 2663, "%", 1, 0, 0, 100, 0 -gppwm2_loadAxis = bits, U08, 2664, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm2_loadAxis = bits, U08, 2664, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm2_alignmentFill_map = scalar, U08, 2665, "unit", 1, 0, 0, 100, 0 gppwm2_loadBins = array, U08, 2666, [8], "load", 1, 0, 0, 250, 0 gppwm2_rpmBins = array, U08, 2674, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1067,7 +1067,7 @@ gppwm3_dutyIfError = scalar, U08, 2750, "%", 1, 0, 0, 100, 0 gppwm3_pwmFrequency = scalar, U16, 2752, "hz", 1, 0, 0, 500, 0 gppwm3_onAboveDuty = scalar, U08, 2754, "%", 1, 0, 0, 100, 0 gppwm3_offBelowDuty = scalar, U08, 2755, "%", 1, 0, 0, 100, 0 -gppwm3_loadAxis = bits, U08, 2756, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm3_loadAxis = bits, U08, 2756, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm3_alignmentFill_map = scalar, U08, 2757, "unit", 1, 0, 0, 100, 0 gppwm3_loadBins = array, U08, 2758, [8], "load", 1, 0, 0, 250, 0 gppwm3_rpmBins = array, U08, 2766, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1077,7 +1077,7 @@ gppwm4_dutyIfError = scalar, U08, 2842, "%", 1, 0, 0, 100, 0 gppwm4_pwmFrequency = scalar, U16, 2844, "hz", 1, 0, 0, 500, 0 gppwm4_onAboveDuty = scalar, U08, 2846, "%", 1, 0, 0, 100, 0 gppwm4_offBelowDuty = scalar, U08, 2847, "%", 1, 0, 0, 100, 0 -gppwm4_loadAxis = bits, U08, 2848, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm4_loadAxis = bits, U08, 2848, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm4_alignmentFill_map = scalar, U08, 2849, "unit", 1, 0, 0, 100, 0 gppwm4_loadBins = array, U08, 2850, [8], "load", 1, 0, 0, 250, 0 gppwm4_rpmBins = array, U08, 2858, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -3259,10 +3259,10 @@ esr = scalar, U16, 1244, "", 1, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } ; These "synthetic" channels provide the Y-axis (load) value for gen purp PWM table's Y axes - gppwm1_load = {(gppwm1_loadAxis == 0) ? TPSValue : ((gppwm1_loadAxis == 1) ? MAPValue : ((gppwm1_loadAxis == 2) ? coolant : ((gppwm1_loadAxis == 3) ? intake : ((gppwm1_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm2_load = {(gppwm2_loadAxis == 0) ? TPSValue : ((gppwm2_loadAxis == 1) ? MAPValue : ((gppwm2_loadAxis == 2) ? coolant : ((gppwm2_loadAxis == 3) ? intake : ((gppwm2_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm3_load = {(gppwm3_loadAxis == 0) ? TPSValue : ((gppwm3_loadAxis == 1) ? MAPValue : ((gppwm3_loadAxis == 2) ? coolant : ((gppwm3_loadAxis == 3) ? intake : ((gppwm3_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm4_load = {(gppwm4_loadAxis == 0) ? TPSValue : ((gppwm4_loadAxis == 1) ? MAPValue : ((gppwm4_loadAxis == 2) ? coolant : ((gppwm4_loadAxis == 3) ? intake : ((gppwm4_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} + gppwm1_load = {(gppwm1_loadAxis == 0) ? 0 : (gppwm1_loadAxis == 1) ? TPSValue : (gppwm1_loadAxis == 2) ? MAPValue : (gppwm1_loadAxis == 3) ? coolant : (gppwm1_loadAxis == 4) ? intake : (gppwm1_loadAxis == 5) ? fuelingLoad : (gppwm1_loadAxis == 6) ? ignitionLoad : (gppwm1_loadAxis == 7) ? auxTemp1 : (gppwm1_loadAxis == 8) ? auxTemp2 : (gppwm1_loadAxis == 9) ? throttlePedalPosition : (gppwm1_loadAxis == 10) ? VBatt : (gppwm1_loadAxis == 11) ? vvtPositionB1I : (gppwm1_loadAxis == 12) ? vvtPositionB1E : (gppwm1_loadAxis == 13) ? vvtPositionB2I : (gppwm1_loadAxis == 14) ? vvtPositionB2E : (gppwm1_loadAxis == 15) ? flexPercent : (gppwm1_loadAxis == 16) ? auxLinear1 : (gppwm1_loadAxis == 17) ? auxLinear2 : 0} + gppwm2_load = {(gppwm2_loadAxis == 0) ? 0 : (gppwm2_loadAxis == 1) ? TPSValue : (gppwm2_loadAxis == 2) ? MAPValue : (gppwm2_loadAxis == 3) ? coolant : (gppwm2_loadAxis == 4) ? intake : (gppwm2_loadAxis == 5) ? fuelingLoad : (gppwm2_loadAxis == 6) ? ignitionLoad : (gppwm2_loadAxis == 7) ? auxTemp1 : (gppwm2_loadAxis == 8) ? auxTemp2 : (gppwm2_loadAxis == 9) ? throttlePedalPosition : (gppwm2_loadAxis == 10) ? VBatt : (gppwm2_loadAxis == 11) ? vvtPositionB1I : (gppwm2_loadAxis == 12) ? vvtPositionB1E : (gppwm2_loadAxis == 13) ? vvtPositionB2I : (gppwm2_loadAxis == 14) ? vvtPositionB2E : (gppwm2_loadAxis == 15) ? flexPercent : (gppwm2_loadAxis == 16) ? auxLinear1 : (gppwm2_loadAxis == 17) ? auxLinear2 : 0} + gppwm3_load = {(gppwm3_loadAxis == 0) ? 0 : (gppwm3_loadAxis == 1) ? TPSValue : (gppwm3_loadAxis == 2) ? MAPValue : (gppwm3_loadAxis == 3) ? coolant : (gppwm3_loadAxis == 4) ? intake : (gppwm3_loadAxis == 5) ? fuelingLoad : (gppwm3_loadAxis == 6) ? ignitionLoad : (gppwm3_loadAxis == 7) ? auxTemp1 : (gppwm3_loadAxis == 8) ? auxTemp2 : (gppwm3_loadAxis == 9) ? throttlePedalPosition : (gppwm3_loadAxis == 10) ? VBatt : (gppwm3_loadAxis == 11) ? vvtPositionB1I : (gppwm3_loadAxis == 12) ? vvtPositionB1E : (gppwm3_loadAxis == 13) ? vvtPositionB2I : (gppwm3_loadAxis == 14) ? vvtPositionB2E : (gppwm3_loadAxis == 15) ? flexPercent : (gppwm3_loadAxis == 16) ? auxLinear1 : (gppwm3_loadAxis == 17) ? auxLinear2 : 0} + gppwm4_load = {(gppwm4_loadAxis == 0) ? 0 : (gppwm4_loadAxis == 1) ? TPSValue : (gppwm4_loadAxis == 2) ? MAPValue : (gppwm4_loadAxis == 3) ? coolant : (gppwm4_loadAxis == 4) ? intake : (gppwm4_loadAxis == 5) ? fuelingLoad : (gppwm4_loadAxis == 6) ? ignitionLoad : (gppwm4_loadAxis == 7) ? auxTemp1 : (gppwm4_loadAxis == 8) ? auxTemp2 : (gppwm4_loadAxis == 9) ? throttlePedalPosition : (gppwm4_loadAxis == 10) ? VBatt : (gppwm4_loadAxis == 11) ? vvtPositionB1I : (gppwm4_loadAxis == 12) ? vvtPositionB1E : (gppwm4_loadAxis == 13) ? vvtPositionB2I : (gppwm4_loadAxis == 14) ? vvtPositionB2E : (gppwm4_loadAxis == 15) ? flexPercent : (gppwm4_loadAxis == 16) ? auxLinear1 : (gppwm4_loadAxis == 17) ? auxLinear2 : 0} [PcVariables] tuneCrcPcVariable = continuousChannelValue, tuneCrc16 diff --git a/firmware/tunerstudio/generated/rusefi_kin.ini b/firmware/tunerstudio/generated/rusefi_kin.ini index f3c8c7bb33..6f5487f58d 100644 --- a/firmware/tunerstudio/generated/rusefi_kin.ini +++ b/firmware/tunerstudio/generated/rusefi_kin.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.09.16.kin.254213271" + signature = "rusEFI 2022.09.16.kin.3870530441" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.16.kin.254213271" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.16.kin.3870530441" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Fri Sep 16 01:33:19 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Fri Sep 16 20:09:32 UTC 2022 pageSize = 21296 page = 1 @@ -1047,7 +1047,7 @@ gppwm1_dutyIfError = scalar, U08, 2566, "%", 1, 0, 0, 100, 0 gppwm1_pwmFrequency = scalar, U16, 2568, "hz", 1, 0, 0, 500, 0 gppwm1_onAboveDuty = scalar, U08, 2570, "%", 1, 0, 0, 100, 0 gppwm1_offBelowDuty = scalar, U08, 2571, "%", 1, 0, 0, 100, 0 -gppwm1_loadAxis = bits, U08, 2572, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm1_loadAxis = bits, U08, 2572, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm1_alignmentFill_map = scalar, U08, 2573, "unit", 1, 0, 0, 100, 0 gppwm1_loadBins = array, U08, 2574, [8], "load", 1, 0, 0, 250, 0 gppwm1_rpmBins = array, U08, 2582, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1057,7 +1057,7 @@ gppwm2_dutyIfError = scalar, U08, 2658, "%", 1, 0, 0, 100, 0 gppwm2_pwmFrequency = scalar, U16, 2660, "hz", 1, 0, 0, 500, 0 gppwm2_onAboveDuty = scalar, U08, 2662, "%", 1, 0, 0, 100, 0 gppwm2_offBelowDuty = scalar, U08, 2663, "%", 1, 0, 0, 100, 0 -gppwm2_loadAxis = bits, U08, 2664, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm2_loadAxis = bits, U08, 2664, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm2_alignmentFill_map = scalar, U08, 2665, "unit", 1, 0, 0, 100, 0 gppwm2_loadBins = array, U08, 2666, [8], "load", 1, 0, 0, 250, 0 gppwm2_rpmBins = array, U08, 2674, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1067,7 +1067,7 @@ gppwm3_dutyIfError = scalar, U08, 2750, "%", 1, 0, 0, 100, 0 gppwm3_pwmFrequency = scalar, U16, 2752, "hz", 1, 0, 0, 500, 0 gppwm3_onAboveDuty = scalar, U08, 2754, "%", 1, 0, 0, 100, 0 gppwm3_offBelowDuty = scalar, U08, 2755, "%", 1, 0, 0, 100, 0 -gppwm3_loadAxis = bits, U08, 2756, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm3_loadAxis = bits, U08, 2756, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm3_alignmentFill_map = scalar, U08, 2757, "unit", 1, 0, 0, 100, 0 gppwm3_loadBins = array, U08, 2758, [8], "load", 1, 0, 0, 250, 0 gppwm3_rpmBins = array, U08, 2766, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1077,7 +1077,7 @@ gppwm4_dutyIfError = scalar, U08, 2842, "%", 1, 0, 0, 100, 0 gppwm4_pwmFrequency = scalar, U16, 2844, "hz", 1, 0, 0, 500, 0 gppwm4_onAboveDuty = scalar, U08, 2846, "%", 1, 0, 0, 100, 0 gppwm4_offBelowDuty = scalar, U08, 2847, "%", 1, 0, 0, 100, 0 -gppwm4_loadAxis = bits, U08, 2848, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm4_loadAxis = bits, U08, 2848, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm4_alignmentFill_map = scalar, U08, 2849, "unit", 1, 0, 0, 100, 0 gppwm4_loadBins = array, U08, 2850, [8], "load", 1, 0, 0, 250, 0 gppwm4_rpmBins = array, U08, 2858, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -3259,10 +3259,10 @@ esr = scalar, U16, 1244, "", 1, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } ; These "synthetic" channels provide the Y-axis (load) value for gen purp PWM table's Y axes - gppwm1_load = {(gppwm1_loadAxis == 0) ? TPSValue : ((gppwm1_loadAxis == 1) ? MAPValue : ((gppwm1_loadAxis == 2) ? coolant : ((gppwm1_loadAxis == 3) ? intake : ((gppwm1_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm2_load = {(gppwm2_loadAxis == 0) ? TPSValue : ((gppwm2_loadAxis == 1) ? MAPValue : ((gppwm2_loadAxis == 2) ? coolant : ((gppwm2_loadAxis == 3) ? intake : ((gppwm2_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm3_load = {(gppwm3_loadAxis == 0) ? TPSValue : ((gppwm3_loadAxis == 1) ? MAPValue : ((gppwm3_loadAxis == 2) ? coolant : ((gppwm3_loadAxis == 3) ? intake : ((gppwm3_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm4_load = {(gppwm4_loadAxis == 0) ? TPSValue : ((gppwm4_loadAxis == 1) ? MAPValue : ((gppwm4_loadAxis == 2) ? coolant : ((gppwm4_loadAxis == 3) ? intake : ((gppwm4_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} + gppwm1_load = {(gppwm1_loadAxis == 0) ? 0 : (gppwm1_loadAxis == 1) ? TPSValue : (gppwm1_loadAxis == 2) ? MAPValue : (gppwm1_loadAxis == 3) ? coolant : (gppwm1_loadAxis == 4) ? intake : (gppwm1_loadAxis == 5) ? fuelingLoad : (gppwm1_loadAxis == 6) ? ignitionLoad : (gppwm1_loadAxis == 7) ? auxTemp1 : (gppwm1_loadAxis == 8) ? auxTemp2 : (gppwm1_loadAxis == 9) ? throttlePedalPosition : (gppwm1_loadAxis == 10) ? VBatt : (gppwm1_loadAxis == 11) ? vvtPositionB1I : (gppwm1_loadAxis == 12) ? vvtPositionB1E : (gppwm1_loadAxis == 13) ? vvtPositionB2I : (gppwm1_loadAxis == 14) ? vvtPositionB2E : (gppwm1_loadAxis == 15) ? flexPercent : (gppwm1_loadAxis == 16) ? auxLinear1 : (gppwm1_loadAxis == 17) ? auxLinear2 : 0} + gppwm2_load = {(gppwm2_loadAxis == 0) ? 0 : (gppwm2_loadAxis == 1) ? TPSValue : (gppwm2_loadAxis == 2) ? MAPValue : (gppwm2_loadAxis == 3) ? coolant : (gppwm2_loadAxis == 4) ? intake : (gppwm2_loadAxis == 5) ? fuelingLoad : (gppwm2_loadAxis == 6) ? ignitionLoad : (gppwm2_loadAxis == 7) ? auxTemp1 : (gppwm2_loadAxis == 8) ? auxTemp2 : (gppwm2_loadAxis == 9) ? throttlePedalPosition : (gppwm2_loadAxis == 10) ? VBatt : (gppwm2_loadAxis == 11) ? vvtPositionB1I : (gppwm2_loadAxis == 12) ? vvtPositionB1E : (gppwm2_loadAxis == 13) ? vvtPositionB2I : (gppwm2_loadAxis == 14) ? vvtPositionB2E : (gppwm2_loadAxis == 15) ? flexPercent : (gppwm2_loadAxis == 16) ? auxLinear1 : (gppwm2_loadAxis == 17) ? auxLinear2 : 0} + gppwm3_load = {(gppwm3_loadAxis == 0) ? 0 : (gppwm3_loadAxis == 1) ? TPSValue : (gppwm3_loadAxis == 2) ? MAPValue : (gppwm3_loadAxis == 3) ? coolant : (gppwm3_loadAxis == 4) ? intake : (gppwm3_loadAxis == 5) ? fuelingLoad : (gppwm3_loadAxis == 6) ? ignitionLoad : (gppwm3_loadAxis == 7) ? auxTemp1 : (gppwm3_loadAxis == 8) ? auxTemp2 : (gppwm3_loadAxis == 9) ? throttlePedalPosition : (gppwm3_loadAxis == 10) ? VBatt : (gppwm3_loadAxis == 11) ? vvtPositionB1I : (gppwm3_loadAxis == 12) ? vvtPositionB1E : (gppwm3_loadAxis == 13) ? vvtPositionB2I : (gppwm3_loadAxis == 14) ? vvtPositionB2E : (gppwm3_loadAxis == 15) ? flexPercent : (gppwm3_loadAxis == 16) ? auxLinear1 : (gppwm3_loadAxis == 17) ? auxLinear2 : 0} + gppwm4_load = {(gppwm4_loadAxis == 0) ? 0 : (gppwm4_loadAxis == 1) ? TPSValue : (gppwm4_loadAxis == 2) ? MAPValue : (gppwm4_loadAxis == 3) ? coolant : (gppwm4_loadAxis == 4) ? intake : (gppwm4_loadAxis == 5) ? fuelingLoad : (gppwm4_loadAxis == 6) ? ignitionLoad : (gppwm4_loadAxis == 7) ? auxTemp1 : (gppwm4_loadAxis == 8) ? auxTemp2 : (gppwm4_loadAxis == 9) ? throttlePedalPosition : (gppwm4_loadAxis == 10) ? VBatt : (gppwm4_loadAxis == 11) ? vvtPositionB1I : (gppwm4_loadAxis == 12) ? vvtPositionB1E : (gppwm4_loadAxis == 13) ? vvtPositionB2I : (gppwm4_loadAxis == 14) ? vvtPositionB2E : (gppwm4_loadAxis == 15) ? flexPercent : (gppwm4_loadAxis == 16) ? auxLinear1 : (gppwm4_loadAxis == 17) ? auxLinear2 : 0} [PcVariables] tuneCrcPcVariable = continuousChannelValue, tuneCrc16 diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index d7e4d8baa9..5d39b73de9 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 2022.09.16.mre_f4.2821182125" + signature = "rusEFI 2022.09.16.mre_f4.1102230963" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.16.mre_f4.2821182125" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.16.mre_f4.1102230963" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Sep 16 01:33:58 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Sep 16 20:10:06 UTC 2022 pageSize = 21296 page = 1 @@ -1047,7 +1047,7 @@ gppwm1_dutyIfError = scalar, U08, 2566, "%", 1, 0, 0, 100, 0 gppwm1_pwmFrequency = scalar, U16, 2568, "hz", 1, 0, 0, 500, 0 gppwm1_onAboveDuty = scalar, U08, 2570, "%", 1, 0, 0, 100, 0 gppwm1_offBelowDuty = scalar, U08, 2571, "%", 1, 0, 0, 100, 0 -gppwm1_loadAxis = bits, U08, 2572, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm1_loadAxis = bits, U08, 2572, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm1_alignmentFill_map = scalar, U08, 2573, "unit", 1, 0, 0, 100, 0 gppwm1_loadBins = array, U08, 2574, [8], "load", 1, 0, 0, 250, 0 gppwm1_rpmBins = array, U08, 2582, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1057,7 +1057,7 @@ gppwm2_dutyIfError = scalar, U08, 2658, "%", 1, 0, 0, 100, 0 gppwm2_pwmFrequency = scalar, U16, 2660, "hz", 1, 0, 0, 500, 0 gppwm2_onAboveDuty = scalar, U08, 2662, "%", 1, 0, 0, 100, 0 gppwm2_offBelowDuty = scalar, U08, 2663, "%", 1, 0, 0, 100, 0 -gppwm2_loadAxis = bits, U08, 2664, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm2_loadAxis = bits, U08, 2664, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm2_alignmentFill_map = scalar, U08, 2665, "unit", 1, 0, 0, 100, 0 gppwm2_loadBins = array, U08, 2666, [8], "load", 1, 0, 0, 250, 0 gppwm2_rpmBins = array, U08, 2674, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1067,7 +1067,7 @@ gppwm3_dutyIfError = scalar, U08, 2750, "%", 1, 0, 0, 100, 0 gppwm3_pwmFrequency = scalar, U16, 2752, "hz", 1, 0, 0, 500, 0 gppwm3_onAboveDuty = scalar, U08, 2754, "%", 1, 0, 0, 100, 0 gppwm3_offBelowDuty = scalar, U08, 2755, "%", 1, 0, 0, 100, 0 -gppwm3_loadAxis = bits, U08, 2756, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm3_loadAxis = bits, U08, 2756, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm3_alignmentFill_map = scalar, U08, 2757, "unit", 1, 0, 0, 100, 0 gppwm3_loadBins = array, U08, 2758, [8], "load", 1, 0, 0, 250, 0 gppwm3_rpmBins = array, U08, 2766, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1077,7 +1077,7 @@ gppwm4_dutyIfError = scalar, U08, 2842, "%", 1, 0, 0, 100, 0 gppwm4_pwmFrequency = scalar, U16, 2844, "hz", 1, 0, 0, 500, 0 gppwm4_onAboveDuty = scalar, U08, 2846, "%", 1, 0, 0, 100, 0 gppwm4_offBelowDuty = scalar, U08, 2847, "%", 1, 0, 0, 100, 0 -gppwm4_loadAxis = bits, U08, 2848, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm4_loadAxis = bits, U08, 2848, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm4_alignmentFill_map = scalar, U08, 2849, "unit", 1, 0, 0, 100, 0 gppwm4_loadBins = array, U08, 2850, [8], "load", 1, 0, 0, 250, 0 gppwm4_rpmBins = array, U08, 2858, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -3259,10 +3259,10 @@ esr = scalar, U16, 1244, "", 1, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } ; These "synthetic" channels provide the Y-axis (load) value for gen purp PWM table's Y axes - gppwm1_load = {(gppwm1_loadAxis == 0) ? TPSValue : ((gppwm1_loadAxis == 1) ? MAPValue : ((gppwm1_loadAxis == 2) ? coolant : ((gppwm1_loadAxis == 3) ? intake : ((gppwm1_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm2_load = {(gppwm2_loadAxis == 0) ? TPSValue : ((gppwm2_loadAxis == 1) ? MAPValue : ((gppwm2_loadAxis == 2) ? coolant : ((gppwm2_loadAxis == 3) ? intake : ((gppwm2_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm3_load = {(gppwm3_loadAxis == 0) ? TPSValue : ((gppwm3_loadAxis == 1) ? MAPValue : ((gppwm3_loadAxis == 2) ? coolant : ((gppwm3_loadAxis == 3) ? intake : ((gppwm3_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm4_load = {(gppwm4_loadAxis == 0) ? TPSValue : ((gppwm4_loadAxis == 1) ? MAPValue : ((gppwm4_loadAxis == 2) ? coolant : ((gppwm4_loadAxis == 3) ? intake : ((gppwm4_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} + gppwm1_load = {(gppwm1_loadAxis == 0) ? 0 : (gppwm1_loadAxis == 1) ? TPSValue : (gppwm1_loadAxis == 2) ? MAPValue : (gppwm1_loadAxis == 3) ? coolant : (gppwm1_loadAxis == 4) ? intake : (gppwm1_loadAxis == 5) ? fuelingLoad : (gppwm1_loadAxis == 6) ? ignitionLoad : (gppwm1_loadAxis == 7) ? auxTemp1 : (gppwm1_loadAxis == 8) ? auxTemp2 : (gppwm1_loadAxis == 9) ? throttlePedalPosition : (gppwm1_loadAxis == 10) ? VBatt : (gppwm1_loadAxis == 11) ? vvtPositionB1I : (gppwm1_loadAxis == 12) ? vvtPositionB1E : (gppwm1_loadAxis == 13) ? vvtPositionB2I : (gppwm1_loadAxis == 14) ? vvtPositionB2E : (gppwm1_loadAxis == 15) ? flexPercent : (gppwm1_loadAxis == 16) ? auxLinear1 : (gppwm1_loadAxis == 17) ? auxLinear2 : 0} + gppwm2_load = {(gppwm2_loadAxis == 0) ? 0 : (gppwm2_loadAxis == 1) ? TPSValue : (gppwm2_loadAxis == 2) ? MAPValue : (gppwm2_loadAxis == 3) ? coolant : (gppwm2_loadAxis == 4) ? intake : (gppwm2_loadAxis == 5) ? fuelingLoad : (gppwm2_loadAxis == 6) ? ignitionLoad : (gppwm2_loadAxis == 7) ? auxTemp1 : (gppwm2_loadAxis == 8) ? auxTemp2 : (gppwm2_loadAxis == 9) ? throttlePedalPosition : (gppwm2_loadAxis == 10) ? VBatt : (gppwm2_loadAxis == 11) ? vvtPositionB1I : (gppwm2_loadAxis == 12) ? vvtPositionB1E : (gppwm2_loadAxis == 13) ? vvtPositionB2I : (gppwm2_loadAxis == 14) ? vvtPositionB2E : (gppwm2_loadAxis == 15) ? flexPercent : (gppwm2_loadAxis == 16) ? auxLinear1 : (gppwm2_loadAxis == 17) ? auxLinear2 : 0} + gppwm3_load = {(gppwm3_loadAxis == 0) ? 0 : (gppwm3_loadAxis == 1) ? TPSValue : (gppwm3_loadAxis == 2) ? MAPValue : (gppwm3_loadAxis == 3) ? coolant : (gppwm3_loadAxis == 4) ? intake : (gppwm3_loadAxis == 5) ? fuelingLoad : (gppwm3_loadAxis == 6) ? ignitionLoad : (gppwm3_loadAxis == 7) ? auxTemp1 : (gppwm3_loadAxis == 8) ? auxTemp2 : (gppwm3_loadAxis == 9) ? throttlePedalPosition : (gppwm3_loadAxis == 10) ? VBatt : (gppwm3_loadAxis == 11) ? vvtPositionB1I : (gppwm3_loadAxis == 12) ? vvtPositionB1E : (gppwm3_loadAxis == 13) ? vvtPositionB2I : (gppwm3_loadAxis == 14) ? vvtPositionB2E : (gppwm3_loadAxis == 15) ? flexPercent : (gppwm3_loadAxis == 16) ? auxLinear1 : (gppwm3_loadAxis == 17) ? auxLinear2 : 0} + gppwm4_load = {(gppwm4_loadAxis == 0) ? 0 : (gppwm4_loadAxis == 1) ? TPSValue : (gppwm4_loadAxis == 2) ? MAPValue : (gppwm4_loadAxis == 3) ? coolant : (gppwm4_loadAxis == 4) ? intake : (gppwm4_loadAxis == 5) ? fuelingLoad : (gppwm4_loadAxis == 6) ? ignitionLoad : (gppwm4_loadAxis == 7) ? auxTemp1 : (gppwm4_loadAxis == 8) ? auxTemp2 : (gppwm4_loadAxis == 9) ? throttlePedalPosition : (gppwm4_loadAxis == 10) ? VBatt : (gppwm4_loadAxis == 11) ? vvtPositionB1I : (gppwm4_loadAxis == 12) ? vvtPositionB1E : (gppwm4_loadAxis == 13) ? vvtPositionB2I : (gppwm4_loadAxis == 14) ? vvtPositionB2E : (gppwm4_loadAxis == 15) ? flexPercent : (gppwm4_loadAxis == 16) ? auxLinear1 : (gppwm4_loadAxis == 17) ? auxLinear2 : 0} [PcVariables] tuneCrcPcVariable = continuousChannelValue, tuneCrc16 diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 4edf0e4021..a69dc7b638 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 2022.09.16.mre_f7.2821182125" + signature = "rusEFI 2022.09.16.mre_f7.1102230963" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.16.mre_f7.2821182125" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.16.mre_f7.1102230963" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Sep 16 01:33:56 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Sep 16 20:10:04 UTC 2022 pageSize = 21296 page = 1 @@ -1047,7 +1047,7 @@ gppwm1_dutyIfError = scalar, U08, 2566, "%", 1, 0, 0, 100, 0 gppwm1_pwmFrequency = scalar, U16, 2568, "hz", 1, 0, 0, 500, 0 gppwm1_onAboveDuty = scalar, U08, 2570, "%", 1, 0, 0, 100, 0 gppwm1_offBelowDuty = scalar, U08, 2571, "%", 1, 0, 0, 100, 0 -gppwm1_loadAxis = bits, U08, 2572, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm1_loadAxis = bits, U08, 2572, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm1_alignmentFill_map = scalar, U08, 2573, "unit", 1, 0, 0, 100, 0 gppwm1_loadBins = array, U08, 2574, [8], "load", 1, 0, 0, 250, 0 gppwm1_rpmBins = array, U08, 2582, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1057,7 +1057,7 @@ gppwm2_dutyIfError = scalar, U08, 2658, "%", 1, 0, 0, 100, 0 gppwm2_pwmFrequency = scalar, U16, 2660, "hz", 1, 0, 0, 500, 0 gppwm2_onAboveDuty = scalar, U08, 2662, "%", 1, 0, 0, 100, 0 gppwm2_offBelowDuty = scalar, U08, 2663, "%", 1, 0, 0, 100, 0 -gppwm2_loadAxis = bits, U08, 2664, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm2_loadAxis = bits, U08, 2664, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm2_alignmentFill_map = scalar, U08, 2665, "unit", 1, 0, 0, 100, 0 gppwm2_loadBins = array, U08, 2666, [8], "load", 1, 0, 0, 250, 0 gppwm2_rpmBins = array, U08, 2674, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1067,7 +1067,7 @@ gppwm3_dutyIfError = scalar, U08, 2750, "%", 1, 0, 0, 100, 0 gppwm3_pwmFrequency = scalar, U16, 2752, "hz", 1, 0, 0, 500, 0 gppwm3_onAboveDuty = scalar, U08, 2754, "%", 1, 0, 0, 100, 0 gppwm3_offBelowDuty = scalar, U08, 2755, "%", 1, 0, 0, 100, 0 -gppwm3_loadAxis = bits, U08, 2756, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm3_loadAxis = bits, U08, 2756, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm3_alignmentFill_map = scalar, U08, 2757, "unit", 1, 0, 0, 100, 0 gppwm3_loadBins = array, U08, 2758, [8], "load", 1, 0, 0, 250, 0 gppwm3_rpmBins = array, U08, 2766, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1077,7 +1077,7 @@ gppwm4_dutyIfError = scalar, U08, 2842, "%", 1, 0, 0, 100, 0 gppwm4_pwmFrequency = scalar, U16, 2844, "hz", 1, 0, 0, 500, 0 gppwm4_onAboveDuty = scalar, U08, 2846, "%", 1, 0, 0, 100, 0 gppwm4_offBelowDuty = scalar, U08, 2847, "%", 1, 0, 0, 100, 0 -gppwm4_loadAxis = bits, U08, 2848, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm4_loadAxis = bits, U08, 2848, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm4_alignmentFill_map = scalar, U08, 2849, "unit", 1, 0, 0, 100, 0 gppwm4_loadBins = array, U08, 2850, [8], "load", 1, 0, 0, 250, 0 gppwm4_rpmBins = array, U08, 2858, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -3259,10 +3259,10 @@ esr = scalar, U16, 1244, "", 1, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } ; These "synthetic" channels provide the Y-axis (load) value for gen purp PWM table's Y axes - gppwm1_load = {(gppwm1_loadAxis == 0) ? TPSValue : ((gppwm1_loadAxis == 1) ? MAPValue : ((gppwm1_loadAxis == 2) ? coolant : ((gppwm1_loadAxis == 3) ? intake : ((gppwm1_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm2_load = {(gppwm2_loadAxis == 0) ? TPSValue : ((gppwm2_loadAxis == 1) ? MAPValue : ((gppwm2_loadAxis == 2) ? coolant : ((gppwm2_loadAxis == 3) ? intake : ((gppwm2_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm3_load = {(gppwm3_loadAxis == 0) ? TPSValue : ((gppwm3_loadAxis == 1) ? MAPValue : ((gppwm3_loadAxis == 2) ? coolant : ((gppwm3_loadAxis == 3) ? intake : ((gppwm3_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm4_load = {(gppwm4_loadAxis == 0) ? TPSValue : ((gppwm4_loadAxis == 1) ? MAPValue : ((gppwm4_loadAxis == 2) ? coolant : ((gppwm4_loadAxis == 3) ? intake : ((gppwm4_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} + gppwm1_load = {(gppwm1_loadAxis == 0) ? 0 : (gppwm1_loadAxis == 1) ? TPSValue : (gppwm1_loadAxis == 2) ? MAPValue : (gppwm1_loadAxis == 3) ? coolant : (gppwm1_loadAxis == 4) ? intake : (gppwm1_loadAxis == 5) ? fuelingLoad : (gppwm1_loadAxis == 6) ? ignitionLoad : (gppwm1_loadAxis == 7) ? auxTemp1 : (gppwm1_loadAxis == 8) ? auxTemp2 : (gppwm1_loadAxis == 9) ? throttlePedalPosition : (gppwm1_loadAxis == 10) ? VBatt : (gppwm1_loadAxis == 11) ? vvtPositionB1I : (gppwm1_loadAxis == 12) ? vvtPositionB1E : (gppwm1_loadAxis == 13) ? vvtPositionB2I : (gppwm1_loadAxis == 14) ? vvtPositionB2E : (gppwm1_loadAxis == 15) ? flexPercent : (gppwm1_loadAxis == 16) ? auxLinear1 : (gppwm1_loadAxis == 17) ? auxLinear2 : 0} + gppwm2_load = {(gppwm2_loadAxis == 0) ? 0 : (gppwm2_loadAxis == 1) ? TPSValue : (gppwm2_loadAxis == 2) ? MAPValue : (gppwm2_loadAxis == 3) ? coolant : (gppwm2_loadAxis == 4) ? intake : (gppwm2_loadAxis == 5) ? fuelingLoad : (gppwm2_loadAxis == 6) ? ignitionLoad : (gppwm2_loadAxis == 7) ? auxTemp1 : (gppwm2_loadAxis == 8) ? auxTemp2 : (gppwm2_loadAxis == 9) ? throttlePedalPosition : (gppwm2_loadAxis == 10) ? VBatt : (gppwm2_loadAxis == 11) ? vvtPositionB1I : (gppwm2_loadAxis == 12) ? vvtPositionB1E : (gppwm2_loadAxis == 13) ? vvtPositionB2I : (gppwm2_loadAxis == 14) ? vvtPositionB2E : (gppwm2_loadAxis == 15) ? flexPercent : (gppwm2_loadAxis == 16) ? auxLinear1 : (gppwm2_loadAxis == 17) ? auxLinear2 : 0} + gppwm3_load = {(gppwm3_loadAxis == 0) ? 0 : (gppwm3_loadAxis == 1) ? TPSValue : (gppwm3_loadAxis == 2) ? MAPValue : (gppwm3_loadAxis == 3) ? coolant : (gppwm3_loadAxis == 4) ? intake : (gppwm3_loadAxis == 5) ? fuelingLoad : (gppwm3_loadAxis == 6) ? ignitionLoad : (gppwm3_loadAxis == 7) ? auxTemp1 : (gppwm3_loadAxis == 8) ? auxTemp2 : (gppwm3_loadAxis == 9) ? throttlePedalPosition : (gppwm3_loadAxis == 10) ? VBatt : (gppwm3_loadAxis == 11) ? vvtPositionB1I : (gppwm3_loadAxis == 12) ? vvtPositionB1E : (gppwm3_loadAxis == 13) ? vvtPositionB2I : (gppwm3_loadAxis == 14) ? vvtPositionB2E : (gppwm3_loadAxis == 15) ? flexPercent : (gppwm3_loadAxis == 16) ? auxLinear1 : (gppwm3_loadAxis == 17) ? auxLinear2 : 0} + gppwm4_load = {(gppwm4_loadAxis == 0) ? 0 : (gppwm4_loadAxis == 1) ? TPSValue : (gppwm4_loadAxis == 2) ? MAPValue : (gppwm4_loadAxis == 3) ? coolant : (gppwm4_loadAxis == 4) ? intake : (gppwm4_loadAxis == 5) ? fuelingLoad : (gppwm4_loadAxis == 6) ? ignitionLoad : (gppwm4_loadAxis == 7) ? auxTemp1 : (gppwm4_loadAxis == 8) ? auxTemp2 : (gppwm4_loadAxis == 9) ? throttlePedalPosition : (gppwm4_loadAxis == 10) ? VBatt : (gppwm4_loadAxis == 11) ? vvtPositionB1I : (gppwm4_loadAxis == 12) ? vvtPositionB1E : (gppwm4_loadAxis == 13) ? vvtPositionB2I : (gppwm4_loadAxis == 14) ? vvtPositionB2E : (gppwm4_loadAxis == 15) ? flexPercent : (gppwm4_loadAxis == 16) ? auxLinear1 : (gppwm4_loadAxis == 17) ? auxLinear2 : 0} [PcVariables] tuneCrcPcVariable = continuousChannelValue, tuneCrc16 diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index e8c95475d8..b5046a20b8 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 2022.09.16.prometheus_405.924551101" + signature = "rusEFI 2022.09.16.prometheus_405.3733905571" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.16.prometheus_405.924551101" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.16.prometheus_405.3733905571" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Sep 16 01:34:09 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Sep 16 20:10:15 UTC 2022 pageSize = 21296 page = 1 @@ -1047,7 +1047,7 @@ gppwm1_dutyIfError = scalar, U08, 2566, "%", 1, 0, 0, 100, 0 gppwm1_pwmFrequency = scalar, U16, 2568, "hz", 1, 0, 0, 500, 0 gppwm1_onAboveDuty = scalar, U08, 2570, "%", 1, 0, 0, 100, 0 gppwm1_offBelowDuty = scalar, U08, 2571, "%", 1, 0, 0, 100, 0 -gppwm1_loadAxis = bits, U08, 2572, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm1_loadAxis = bits, U08, 2572, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm1_alignmentFill_map = scalar, U08, 2573, "unit", 1, 0, 0, 100, 0 gppwm1_loadBins = array, U08, 2574, [8], "load", 1, 0, 0, 250, 0 gppwm1_rpmBins = array, U08, 2582, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1057,7 +1057,7 @@ gppwm2_dutyIfError = scalar, U08, 2658, "%", 1, 0, 0, 100, 0 gppwm2_pwmFrequency = scalar, U16, 2660, "hz", 1, 0, 0, 500, 0 gppwm2_onAboveDuty = scalar, U08, 2662, "%", 1, 0, 0, 100, 0 gppwm2_offBelowDuty = scalar, U08, 2663, "%", 1, 0, 0, 100, 0 -gppwm2_loadAxis = bits, U08, 2664, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm2_loadAxis = bits, U08, 2664, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm2_alignmentFill_map = scalar, U08, 2665, "unit", 1, 0, 0, 100, 0 gppwm2_loadBins = array, U08, 2666, [8], "load", 1, 0, 0, 250, 0 gppwm2_rpmBins = array, U08, 2674, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1067,7 +1067,7 @@ gppwm3_dutyIfError = scalar, U08, 2750, "%", 1, 0, 0, 100, 0 gppwm3_pwmFrequency = scalar, U16, 2752, "hz", 1, 0, 0, 500, 0 gppwm3_onAboveDuty = scalar, U08, 2754, "%", 1, 0, 0, 100, 0 gppwm3_offBelowDuty = scalar, U08, 2755, "%", 1, 0, 0, 100, 0 -gppwm3_loadAxis = bits, U08, 2756, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm3_loadAxis = bits, U08, 2756, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm3_alignmentFill_map = scalar, U08, 2757, "unit", 1, 0, 0, 100, 0 gppwm3_loadBins = array, U08, 2758, [8], "load", 1, 0, 0, 250, 0 gppwm3_rpmBins = array, U08, 2766, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1077,7 +1077,7 @@ gppwm4_dutyIfError = scalar, U08, 2842, "%", 1, 0, 0, 100, 0 gppwm4_pwmFrequency = scalar, U16, 2844, "hz", 1, 0, 0, 500, 0 gppwm4_onAboveDuty = scalar, U08, 2846, "%", 1, 0, 0, 100, 0 gppwm4_offBelowDuty = scalar, U08, 2847, "%", 1, 0, 0, 100, 0 -gppwm4_loadAxis = bits, U08, 2848, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm4_loadAxis = bits, U08, 2848, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm4_alignmentFill_map = scalar, U08, 2849, "unit", 1, 0, 0, 100, 0 gppwm4_loadBins = array, U08, 2850, [8], "load", 1, 0, 0, 250, 0 gppwm4_rpmBins = array, U08, 2858, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -3259,10 +3259,10 @@ esr = scalar, U16, 1244, "", 1, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } ; These "synthetic" channels provide the Y-axis (load) value for gen purp PWM table's Y axes - gppwm1_load = {(gppwm1_loadAxis == 0) ? TPSValue : ((gppwm1_loadAxis == 1) ? MAPValue : ((gppwm1_loadAxis == 2) ? coolant : ((gppwm1_loadAxis == 3) ? intake : ((gppwm1_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm2_load = {(gppwm2_loadAxis == 0) ? TPSValue : ((gppwm2_loadAxis == 1) ? MAPValue : ((gppwm2_loadAxis == 2) ? coolant : ((gppwm2_loadAxis == 3) ? intake : ((gppwm2_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm3_load = {(gppwm3_loadAxis == 0) ? TPSValue : ((gppwm3_loadAxis == 1) ? MAPValue : ((gppwm3_loadAxis == 2) ? coolant : ((gppwm3_loadAxis == 3) ? intake : ((gppwm3_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm4_load = {(gppwm4_loadAxis == 0) ? TPSValue : ((gppwm4_loadAxis == 1) ? MAPValue : ((gppwm4_loadAxis == 2) ? coolant : ((gppwm4_loadAxis == 3) ? intake : ((gppwm4_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} + gppwm1_load = {(gppwm1_loadAxis == 0) ? 0 : (gppwm1_loadAxis == 1) ? TPSValue : (gppwm1_loadAxis == 2) ? MAPValue : (gppwm1_loadAxis == 3) ? coolant : (gppwm1_loadAxis == 4) ? intake : (gppwm1_loadAxis == 5) ? fuelingLoad : (gppwm1_loadAxis == 6) ? ignitionLoad : (gppwm1_loadAxis == 7) ? auxTemp1 : (gppwm1_loadAxis == 8) ? auxTemp2 : (gppwm1_loadAxis == 9) ? throttlePedalPosition : (gppwm1_loadAxis == 10) ? VBatt : (gppwm1_loadAxis == 11) ? vvtPositionB1I : (gppwm1_loadAxis == 12) ? vvtPositionB1E : (gppwm1_loadAxis == 13) ? vvtPositionB2I : (gppwm1_loadAxis == 14) ? vvtPositionB2E : (gppwm1_loadAxis == 15) ? flexPercent : (gppwm1_loadAxis == 16) ? auxLinear1 : (gppwm1_loadAxis == 17) ? auxLinear2 : 0} + gppwm2_load = {(gppwm2_loadAxis == 0) ? 0 : (gppwm2_loadAxis == 1) ? TPSValue : (gppwm2_loadAxis == 2) ? MAPValue : (gppwm2_loadAxis == 3) ? coolant : (gppwm2_loadAxis == 4) ? intake : (gppwm2_loadAxis == 5) ? fuelingLoad : (gppwm2_loadAxis == 6) ? ignitionLoad : (gppwm2_loadAxis == 7) ? auxTemp1 : (gppwm2_loadAxis == 8) ? auxTemp2 : (gppwm2_loadAxis == 9) ? throttlePedalPosition : (gppwm2_loadAxis == 10) ? VBatt : (gppwm2_loadAxis == 11) ? vvtPositionB1I : (gppwm2_loadAxis == 12) ? vvtPositionB1E : (gppwm2_loadAxis == 13) ? vvtPositionB2I : (gppwm2_loadAxis == 14) ? vvtPositionB2E : (gppwm2_loadAxis == 15) ? flexPercent : (gppwm2_loadAxis == 16) ? auxLinear1 : (gppwm2_loadAxis == 17) ? auxLinear2 : 0} + gppwm3_load = {(gppwm3_loadAxis == 0) ? 0 : (gppwm3_loadAxis == 1) ? TPSValue : (gppwm3_loadAxis == 2) ? MAPValue : (gppwm3_loadAxis == 3) ? coolant : (gppwm3_loadAxis == 4) ? intake : (gppwm3_loadAxis == 5) ? fuelingLoad : (gppwm3_loadAxis == 6) ? ignitionLoad : (gppwm3_loadAxis == 7) ? auxTemp1 : (gppwm3_loadAxis == 8) ? auxTemp2 : (gppwm3_loadAxis == 9) ? throttlePedalPosition : (gppwm3_loadAxis == 10) ? VBatt : (gppwm3_loadAxis == 11) ? vvtPositionB1I : (gppwm3_loadAxis == 12) ? vvtPositionB1E : (gppwm3_loadAxis == 13) ? vvtPositionB2I : (gppwm3_loadAxis == 14) ? vvtPositionB2E : (gppwm3_loadAxis == 15) ? flexPercent : (gppwm3_loadAxis == 16) ? auxLinear1 : (gppwm3_loadAxis == 17) ? auxLinear2 : 0} + gppwm4_load = {(gppwm4_loadAxis == 0) ? 0 : (gppwm4_loadAxis == 1) ? TPSValue : (gppwm4_loadAxis == 2) ? MAPValue : (gppwm4_loadAxis == 3) ? coolant : (gppwm4_loadAxis == 4) ? intake : (gppwm4_loadAxis == 5) ? fuelingLoad : (gppwm4_loadAxis == 6) ? ignitionLoad : (gppwm4_loadAxis == 7) ? auxTemp1 : (gppwm4_loadAxis == 8) ? auxTemp2 : (gppwm4_loadAxis == 9) ? throttlePedalPosition : (gppwm4_loadAxis == 10) ? VBatt : (gppwm4_loadAxis == 11) ? vvtPositionB1I : (gppwm4_loadAxis == 12) ? vvtPositionB1E : (gppwm4_loadAxis == 13) ? vvtPositionB2I : (gppwm4_loadAxis == 14) ? vvtPositionB2E : (gppwm4_loadAxis == 15) ? flexPercent : (gppwm4_loadAxis == 16) ? auxLinear1 : (gppwm4_loadAxis == 17) ? auxLinear2 : 0} [PcVariables] tuneCrcPcVariable = continuousChannelValue, tuneCrc16 diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index df3f8d6fc7..59b62388c1 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 2022.09.16.prometheus_469.924551101" + signature = "rusEFI 2022.09.16.prometheus_469.3733905571" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.16.prometheus_469.924551101" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.16.prometheus_469.3733905571" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Sep 16 01:34:07 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Sep 16 20:10:14 UTC 2022 pageSize = 21296 page = 1 @@ -1047,7 +1047,7 @@ gppwm1_dutyIfError = scalar, U08, 2566, "%", 1, 0, 0, 100, 0 gppwm1_pwmFrequency = scalar, U16, 2568, "hz", 1, 0, 0, 500, 0 gppwm1_onAboveDuty = scalar, U08, 2570, "%", 1, 0, 0, 100, 0 gppwm1_offBelowDuty = scalar, U08, 2571, "%", 1, 0, 0, 100, 0 -gppwm1_loadAxis = bits, U08, 2572, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm1_loadAxis = bits, U08, 2572, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm1_alignmentFill_map = scalar, U08, 2573, "unit", 1, 0, 0, 100, 0 gppwm1_loadBins = array, U08, 2574, [8], "load", 1, 0, 0, 250, 0 gppwm1_rpmBins = array, U08, 2582, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1057,7 +1057,7 @@ gppwm2_dutyIfError = scalar, U08, 2658, "%", 1, 0, 0, 100, 0 gppwm2_pwmFrequency = scalar, U16, 2660, "hz", 1, 0, 0, 500, 0 gppwm2_onAboveDuty = scalar, U08, 2662, "%", 1, 0, 0, 100, 0 gppwm2_offBelowDuty = scalar, U08, 2663, "%", 1, 0, 0, 100, 0 -gppwm2_loadAxis = bits, U08, 2664, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm2_loadAxis = bits, U08, 2664, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm2_alignmentFill_map = scalar, U08, 2665, "unit", 1, 0, 0, 100, 0 gppwm2_loadBins = array, U08, 2666, [8], "load", 1, 0, 0, 250, 0 gppwm2_rpmBins = array, U08, 2674, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1067,7 +1067,7 @@ gppwm3_dutyIfError = scalar, U08, 2750, "%", 1, 0, 0, 100, 0 gppwm3_pwmFrequency = scalar, U16, 2752, "hz", 1, 0, 0, 500, 0 gppwm3_onAboveDuty = scalar, U08, 2754, "%", 1, 0, 0, 100, 0 gppwm3_offBelowDuty = scalar, U08, 2755, "%", 1, 0, 0, 100, 0 -gppwm3_loadAxis = bits, U08, 2756, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm3_loadAxis = bits, U08, 2756, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm3_alignmentFill_map = scalar, U08, 2757, "unit", 1, 0, 0, 100, 0 gppwm3_loadBins = array, U08, 2758, [8], "load", 1, 0, 0, 250, 0 gppwm3_rpmBins = array, U08, 2766, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1077,7 +1077,7 @@ gppwm4_dutyIfError = scalar, U08, 2842, "%", 1, 0, 0, 100, 0 gppwm4_pwmFrequency = scalar, U16, 2844, "hz", 1, 0, 0, 500, 0 gppwm4_onAboveDuty = scalar, U08, 2846, "%", 1, 0, 0, 100, 0 gppwm4_offBelowDuty = scalar, U08, 2847, "%", 1, 0, 0, 100, 0 -gppwm4_loadAxis = bits, U08, 2848, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm4_loadAxis = bits, U08, 2848, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm4_alignmentFill_map = scalar, U08, 2849, "unit", 1, 0, 0, 100, 0 gppwm4_loadBins = array, U08, 2850, [8], "load", 1, 0, 0, 250, 0 gppwm4_rpmBins = array, U08, 2858, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -3259,10 +3259,10 @@ esr = scalar, U16, 1244, "", 1, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } ; These "synthetic" channels provide the Y-axis (load) value for gen purp PWM table's Y axes - gppwm1_load = {(gppwm1_loadAxis == 0) ? TPSValue : ((gppwm1_loadAxis == 1) ? MAPValue : ((gppwm1_loadAxis == 2) ? coolant : ((gppwm1_loadAxis == 3) ? intake : ((gppwm1_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm2_load = {(gppwm2_loadAxis == 0) ? TPSValue : ((gppwm2_loadAxis == 1) ? MAPValue : ((gppwm2_loadAxis == 2) ? coolant : ((gppwm2_loadAxis == 3) ? intake : ((gppwm2_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm3_load = {(gppwm3_loadAxis == 0) ? TPSValue : ((gppwm3_loadAxis == 1) ? MAPValue : ((gppwm3_loadAxis == 2) ? coolant : ((gppwm3_loadAxis == 3) ? intake : ((gppwm3_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm4_load = {(gppwm4_loadAxis == 0) ? TPSValue : ((gppwm4_loadAxis == 1) ? MAPValue : ((gppwm4_loadAxis == 2) ? coolant : ((gppwm4_loadAxis == 3) ? intake : ((gppwm4_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} + gppwm1_load = {(gppwm1_loadAxis == 0) ? 0 : (gppwm1_loadAxis == 1) ? TPSValue : (gppwm1_loadAxis == 2) ? MAPValue : (gppwm1_loadAxis == 3) ? coolant : (gppwm1_loadAxis == 4) ? intake : (gppwm1_loadAxis == 5) ? fuelingLoad : (gppwm1_loadAxis == 6) ? ignitionLoad : (gppwm1_loadAxis == 7) ? auxTemp1 : (gppwm1_loadAxis == 8) ? auxTemp2 : (gppwm1_loadAxis == 9) ? throttlePedalPosition : (gppwm1_loadAxis == 10) ? VBatt : (gppwm1_loadAxis == 11) ? vvtPositionB1I : (gppwm1_loadAxis == 12) ? vvtPositionB1E : (gppwm1_loadAxis == 13) ? vvtPositionB2I : (gppwm1_loadAxis == 14) ? vvtPositionB2E : (gppwm1_loadAxis == 15) ? flexPercent : (gppwm1_loadAxis == 16) ? auxLinear1 : (gppwm1_loadAxis == 17) ? auxLinear2 : 0} + gppwm2_load = {(gppwm2_loadAxis == 0) ? 0 : (gppwm2_loadAxis == 1) ? TPSValue : (gppwm2_loadAxis == 2) ? MAPValue : (gppwm2_loadAxis == 3) ? coolant : (gppwm2_loadAxis == 4) ? intake : (gppwm2_loadAxis == 5) ? fuelingLoad : (gppwm2_loadAxis == 6) ? ignitionLoad : (gppwm2_loadAxis == 7) ? auxTemp1 : (gppwm2_loadAxis == 8) ? auxTemp2 : (gppwm2_loadAxis == 9) ? throttlePedalPosition : (gppwm2_loadAxis == 10) ? VBatt : (gppwm2_loadAxis == 11) ? vvtPositionB1I : (gppwm2_loadAxis == 12) ? vvtPositionB1E : (gppwm2_loadAxis == 13) ? vvtPositionB2I : (gppwm2_loadAxis == 14) ? vvtPositionB2E : (gppwm2_loadAxis == 15) ? flexPercent : (gppwm2_loadAxis == 16) ? auxLinear1 : (gppwm2_loadAxis == 17) ? auxLinear2 : 0} + gppwm3_load = {(gppwm3_loadAxis == 0) ? 0 : (gppwm3_loadAxis == 1) ? TPSValue : (gppwm3_loadAxis == 2) ? MAPValue : (gppwm3_loadAxis == 3) ? coolant : (gppwm3_loadAxis == 4) ? intake : (gppwm3_loadAxis == 5) ? fuelingLoad : (gppwm3_loadAxis == 6) ? ignitionLoad : (gppwm3_loadAxis == 7) ? auxTemp1 : (gppwm3_loadAxis == 8) ? auxTemp2 : (gppwm3_loadAxis == 9) ? throttlePedalPosition : (gppwm3_loadAxis == 10) ? VBatt : (gppwm3_loadAxis == 11) ? vvtPositionB1I : (gppwm3_loadAxis == 12) ? vvtPositionB1E : (gppwm3_loadAxis == 13) ? vvtPositionB2I : (gppwm3_loadAxis == 14) ? vvtPositionB2E : (gppwm3_loadAxis == 15) ? flexPercent : (gppwm3_loadAxis == 16) ? auxLinear1 : (gppwm3_loadAxis == 17) ? auxLinear2 : 0} + gppwm4_load = {(gppwm4_loadAxis == 0) ? 0 : (gppwm4_loadAxis == 1) ? TPSValue : (gppwm4_loadAxis == 2) ? MAPValue : (gppwm4_loadAxis == 3) ? coolant : (gppwm4_loadAxis == 4) ? intake : (gppwm4_loadAxis == 5) ? fuelingLoad : (gppwm4_loadAxis == 6) ? ignitionLoad : (gppwm4_loadAxis == 7) ? auxTemp1 : (gppwm4_loadAxis == 8) ? auxTemp2 : (gppwm4_loadAxis == 9) ? throttlePedalPosition : (gppwm4_loadAxis == 10) ? VBatt : (gppwm4_loadAxis == 11) ? vvtPositionB1I : (gppwm4_loadAxis == 12) ? vvtPositionB1E : (gppwm4_loadAxis == 13) ? vvtPositionB2I : (gppwm4_loadAxis == 14) ? vvtPositionB2E : (gppwm4_loadAxis == 15) ? flexPercent : (gppwm4_loadAxis == 16) ? auxLinear1 : (gppwm4_loadAxis == 17) ? auxLinear2 : 0} [PcVariables] tuneCrcPcVariable = continuousChannelValue, tuneCrc16 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 7141911bea..d338f134ff 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 2022.09.16.proteus_f4.3258751277" + signature = "rusEFI 2022.09.16.proteus_f4.732560947" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.16.proteus_f4.3258751277" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.16.proteus_f4.732560947" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Sep 16 01:34:14 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Sep 16 20:10:19 UTC 2022 pageSize = 21296 page = 1 @@ -1047,7 +1047,7 @@ gppwm1_dutyIfError = scalar, U08, 2566, "%", 1, 0, 0, 100, 0 gppwm1_pwmFrequency = scalar, U16, 2568, "hz", 1, 0, 0, 500, 0 gppwm1_onAboveDuty = scalar, U08, 2570, "%", 1, 0, 0, 100, 0 gppwm1_offBelowDuty = scalar, U08, 2571, "%", 1, 0, 0, 100, 0 -gppwm1_loadAxis = bits, U08, 2572, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm1_loadAxis = bits, U08, 2572, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm1_alignmentFill_map = scalar, U08, 2573, "unit", 1, 0, 0, 100, 0 gppwm1_loadBins = array, U08, 2574, [8], "load", 1, 0, 0, 250, 0 gppwm1_rpmBins = array, U08, 2582, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1057,7 +1057,7 @@ gppwm2_dutyIfError = scalar, U08, 2658, "%", 1, 0, 0, 100, 0 gppwm2_pwmFrequency = scalar, U16, 2660, "hz", 1, 0, 0, 500, 0 gppwm2_onAboveDuty = scalar, U08, 2662, "%", 1, 0, 0, 100, 0 gppwm2_offBelowDuty = scalar, U08, 2663, "%", 1, 0, 0, 100, 0 -gppwm2_loadAxis = bits, U08, 2664, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm2_loadAxis = bits, U08, 2664, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm2_alignmentFill_map = scalar, U08, 2665, "unit", 1, 0, 0, 100, 0 gppwm2_loadBins = array, U08, 2666, [8], "load", 1, 0, 0, 250, 0 gppwm2_rpmBins = array, U08, 2674, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1067,7 +1067,7 @@ gppwm3_dutyIfError = scalar, U08, 2750, "%", 1, 0, 0, 100, 0 gppwm3_pwmFrequency = scalar, U16, 2752, "hz", 1, 0, 0, 500, 0 gppwm3_onAboveDuty = scalar, U08, 2754, "%", 1, 0, 0, 100, 0 gppwm3_offBelowDuty = scalar, U08, 2755, "%", 1, 0, 0, 100, 0 -gppwm3_loadAxis = bits, U08, 2756, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm3_loadAxis = bits, U08, 2756, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm3_alignmentFill_map = scalar, U08, 2757, "unit", 1, 0, 0, 100, 0 gppwm3_loadBins = array, U08, 2758, [8], "load", 1, 0, 0, 250, 0 gppwm3_rpmBins = array, U08, 2766, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1077,7 +1077,7 @@ gppwm4_dutyIfError = scalar, U08, 2842, "%", 1, 0, 0, 100, 0 gppwm4_pwmFrequency = scalar, U16, 2844, "hz", 1, 0, 0, 500, 0 gppwm4_onAboveDuty = scalar, U08, 2846, "%", 1, 0, 0, 100, 0 gppwm4_offBelowDuty = scalar, U08, 2847, "%", 1, 0, 0, 100, 0 -gppwm4_loadAxis = bits, U08, 2848, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm4_loadAxis = bits, U08, 2848, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm4_alignmentFill_map = scalar, U08, 2849, "unit", 1, 0, 0, 100, 0 gppwm4_loadBins = array, U08, 2850, [8], "load", 1, 0, 0, 250, 0 gppwm4_rpmBins = array, U08, 2858, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -3259,10 +3259,10 @@ esr = scalar, U16, 1244, "", 1, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } ; These "synthetic" channels provide the Y-axis (load) value for gen purp PWM table's Y axes - gppwm1_load = {(gppwm1_loadAxis == 0) ? TPSValue : ((gppwm1_loadAxis == 1) ? MAPValue : ((gppwm1_loadAxis == 2) ? coolant : ((gppwm1_loadAxis == 3) ? intake : ((gppwm1_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm2_load = {(gppwm2_loadAxis == 0) ? TPSValue : ((gppwm2_loadAxis == 1) ? MAPValue : ((gppwm2_loadAxis == 2) ? coolant : ((gppwm2_loadAxis == 3) ? intake : ((gppwm2_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm3_load = {(gppwm3_loadAxis == 0) ? TPSValue : ((gppwm3_loadAxis == 1) ? MAPValue : ((gppwm3_loadAxis == 2) ? coolant : ((gppwm3_loadAxis == 3) ? intake : ((gppwm3_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm4_load = {(gppwm4_loadAxis == 0) ? TPSValue : ((gppwm4_loadAxis == 1) ? MAPValue : ((gppwm4_loadAxis == 2) ? coolant : ((gppwm4_loadAxis == 3) ? intake : ((gppwm4_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} + gppwm1_load = {(gppwm1_loadAxis == 0) ? 0 : (gppwm1_loadAxis == 1) ? TPSValue : (gppwm1_loadAxis == 2) ? MAPValue : (gppwm1_loadAxis == 3) ? coolant : (gppwm1_loadAxis == 4) ? intake : (gppwm1_loadAxis == 5) ? fuelingLoad : (gppwm1_loadAxis == 6) ? ignitionLoad : (gppwm1_loadAxis == 7) ? auxTemp1 : (gppwm1_loadAxis == 8) ? auxTemp2 : (gppwm1_loadAxis == 9) ? throttlePedalPosition : (gppwm1_loadAxis == 10) ? VBatt : (gppwm1_loadAxis == 11) ? vvtPositionB1I : (gppwm1_loadAxis == 12) ? vvtPositionB1E : (gppwm1_loadAxis == 13) ? vvtPositionB2I : (gppwm1_loadAxis == 14) ? vvtPositionB2E : (gppwm1_loadAxis == 15) ? flexPercent : (gppwm1_loadAxis == 16) ? auxLinear1 : (gppwm1_loadAxis == 17) ? auxLinear2 : 0} + gppwm2_load = {(gppwm2_loadAxis == 0) ? 0 : (gppwm2_loadAxis == 1) ? TPSValue : (gppwm2_loadAxis == 2) ? MAPValue : (gppwm2_loadAxis == 3) ? coolant : (gppwm2_loadAxis == 4) ? intake : (gppwm2_loadAxis == 5) ? fuelingLoad : (gppwm2_loadAxis == 6) ? ignitionLoad : (gppwm2_loadAxis == 7) ? auxTemp1 : (gppwm2_loadAxis == 8) ? auxTemp2 : (gppwm2_loadAxis == 9) ? throttlePedalPosition : (gppwm2_loadAxis == 10) ? VBatt : (gppwm2_loadAxis == 11) ? vvtPositionB1I : (gppwm2_loadAxis == 12) ? vvtPositionB1E : (gppwm2_loadAxis == 13) ? vvtPositionB2I : (gppwm2_loadAxis == 14) ? vvtPositionB2E : (gppwm2_loadAxis == 15) ? flexPercent : (gppwm2_loadAxis == 16) ? auxLinear1 : (gppwm2_loadAxis == 17) ? auxLinear2 : 0} + gppwm3_load = {(gppwm3_loadAxis == 0) ? 0 : (gppwm3_loadAxis == 1) ? TPSValue : (gppwm3_loadAxis == 2) ? MAPValue : (gppwm3_loadAxis == 3) ? coolant : (gppwm3_loadAxis == 4) ? intake : (gppwm3_loadAxis == 5) ? fuelingLoad : (gppwm3_loadAxis == 6) ? ignitionLoad : (gppwm3_loadAxis == 7) ? auxTemp1 : (gppwm3_loadAxis == 8) ? auxTemp2 : (gppwm3_loadAxis == 9) ? throttlePedalPosition : (gppwm3_loadAxis == 10) ? VBatt : (gppwm3_loadAxis == 11) ? vvtPositionB1I : (gppwm3_loadAxis == 12) ? vvtPositionB1E : (gppwm3_loadAxis == 13) ? vvtPositionB2I : (gppwm3_loadAxis == 14) ? vvtPositionB2E : (gppwm3_loadAxis == 15) ? flexPercent : (gppwm3_loadAxis == 16) ? auxLinear1 : (gppwm3_loadAxis == 17) ? auxLinear2 : 0} + gppwm4_load = {(gppwm4_loadAxis == 0) ? 0 : (gppwm4_loadAxis == 1) ? TPSValue : (gppwm4_loadAxis == 2) ? MAPValue : (gppwm4_loadAxis == 3) ? coolant : (gppwm4_loadAxis == 4) ? intake : (gppwm4_loadAxis == 5) ? fuelingLoad : (gppwm4_loadAxis == 6) ? ignitionLoad : (gppwm4_loadAxis == 7) ? auxTemp1 : (gppwm4_loadAxis == 8) ? auxTemp2 : (gppwm4_loadAxis == 9) ? throttlePedalPosition : (gppwm4_loadAxis == 10) ? VBatt : (gppwm4_loadAxis == 11) ? vvtPositionB1I : (gppwm4_loadAxis == 12) ? vvtPositionB1E : (gppwm4_loadAxis == 13) ? vvtPositionB2I : (gppwm4_loadAxis == 14) ? vvtPositionB2E : (gppwm4_loadAxis == 15) ? flexPercent : (gppwm4_loadAxis == 16) ? auxLinear1 : (gppwm4_loadAxis == 17) ? auxLinear2 : 0} [PcVariables] tuneCrcPcVariable = continuousChannelValue, tuneCrc16 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index f49c2a6a64..309db74b38 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 2022.09.16.proteus_f7.3258751277" + signature = "rusEFI 2022.09.16.proteus_f7.732560947" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.16.proteus_f7.3258751277" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.16.proteus_f7.732560947" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Sep 16 01:34:11 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Sep 16 20:10:17 UTC 2022 pageSize = 21296 page = 1 @@ -1047,7 +1047,7 @@ gppwm1_dutyIfError = scalar, U08, 2566, "%", 1, 0, 0, 100, 0 gppwm1_pwmFrequency = scalar, U16, 2568, "hz", 1, 0, 0, 500, 0 gppwm1_onAboveDuty = scalar, U08, 2570, "%", 1, 0, 0, 100, 0 gppwm1_offBelowDuty = scalar, U08, 2571, "%", 1, 0, 0, 100, 0 -gppwm1_loadAxis = bits, U08, 2572, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm1_loadAxis = bits, U08, 2572, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm1_alignmentFill_map = scalar, U08, 2573, "unit", 1, 0, 0, 100, 0 gppwm1_loadBins = array, U08, 2574, [8], "load", 1, 0, 0, 250, 0 gppwm1_rpmBins = array, U08, 2582, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1057,7 +1057,7 @@ gppwm2_dutyIfError = scalar, U08, 2658, "%", 1, 0, 0, 100, 0 gppwm2_pwmFrequency = scalar, U16, 2660, "hz", 1, 0, 0, 500, 0 gppwm2_onAboveDuty = scalar, U08, 2662, "%", 1, 0, 0, 100, 0 gppwm2_offBelowDuty = scalar, U08, 2663, "%", 1, 0, 0, 100, 0 -gppwm2_loadAxis = bits, U08, 2664, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm2_loadAxis = bits, U08, 2664, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm2_alignmentFill_map = scalar, U08, 2665, "unit", 1, 0, 0, 100, 0 gppwm2_loadBins = array, U08, 2666, [8], "load", 1, 0, 0, 250, 0 gppwm2_rpmBins = array, U08, 2674, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1067,7 +1067,7 @@ gppwm3_dutyIfError = scalar, U08, 2750, "%", 1, 0, 0, 100, 0 gppwm3_pwmFrequency = scalar, U16, 2752, "hz", 1, 0, 0, 500, 0 gppwm3_onAboveDuty = scalar, U08, 2754, "%", 1, 0, 0, 100, 0 gppwm3_offBelowDuty = scalar, U08, 2755, "%", 1, 0, 0, 100, 0 -gppwm3_loadAxis = bits, U08, 2756, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm3_loadAxis = bits, U08, 2756, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm3_alignmentFill_map = scalar, U08, 2757, "unit", 1, 0, 0, 100, 0 gppwm3_loadBins = array, U08, 2758, [8], "load", 1, 0, 0, 250, 0 gppwm3_rpmBins = array, U08, 2766, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1077,7 +1077,7 @@ gppwm4_dutyIfError = scalar, U08, 2842, "%", 1, 0, 0, 100, 0 gppwm4_pwmFrequency = scalar, U16, 2844, "hz", 1, 0, 0, 500, 0 gppwm4_onAboveDuty = scalar, U08, 2846, "%", 1, 0, 0, 100, 0 gppwm4_offBelowDuty = scalar, U08, 2847, "%", 1, 0, 0, 100, 0 -gppwm4_loadAxis = bits, U08, 2848, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm4_loadAxis = bits, U08, 2848, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm4_alignmentFill_map = scalar, U08, 2849, "unit", 1, 0, 0, 100, 0 gppwm4_loadBins = array, U08, 2850, [8], "load", 1, 0, 0, 250, 0 gppwm4_rpmBins = array, U08, 2858, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -3259,10 +3259,10 @@ esr = scalar, U16, 1244, "", 1, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } ; These "synthetic" channels provide the Y-axis (load) value for gen purp PWM table's Y axes - gppwm1_load = {(gppwm1_loadAxis == 0) ? TPSValue : ((gppwm1_loadAxis == 1) ? MAPValue : ((gppwm1_loadAxis == 2) ? coolant : ((gppwm1_loadAxis == 3) ? intake : ((gppwm1_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm2_load = {(gppwm2_loadAxis == 0) ? TPSValue : ((gppwm2_loadAxis == 1) ? MAPValue : ((gppwm2_loadAxis == 2) ? coolant : ((gppwm2_loadAxis == 3) ? intake : ((gppwm2_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm3_load = {(gppwm3_loadAxis == 0) ? TPSValue : ((gppwm3_loadAxis == 1) ? MAPValue : ((gppwm3_loadAxis == 2) ? coolant : ((gppwm3_loadAxis == 3) ? intake : ((gppwm3_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm4_load = {(gppwm4_loadAxis == 0) ? TPSValue : ((gppwm4_loadAxis == 1) ? MAPValue : ((gppwm4_loadAxis == 2) ? coolant : ((gppwm4_loadAxis == 3) ? intake : ((gppwm4_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} + gppwm1_load = {(gppwm1_loadAxis == 0) ? 0 : (gppwm1_loadAxis == 1) ? TPSValue : (gppwm1_loadAxis == 2) ? MAPValue : (gppwm1_loadAxis == 3) ? coolant : (gppwm1_loadAxis == 4) ? intake : (gppwm1_loadAxis == 5) ? fuelingLoad : (gppwm1_loadAxis == 6) ? ignitionLoad : (gppwm1_loadAxis == 7) ? auxTemp1 : (gppwm1_loadAxis == 8) ? auxTemp2 : (gppwm1_loadAxis == 9) ? throttlePedalPosition : (gppwm1_loadAxis == 10) ? VBatt : (gppwm1_loadAxis == 11) ? vvtPositionB1I : (gppwm1_loadAxis == 12) ? vvtPositionB1E : (gppwm1_loadAxis == 13) ? vvtPositionB2I : (gppwm1_loadAxis == 14) ? vvtPositionB2E : (gppwm1_loadAxis == 15) ? flexPercent : (gppwm1_loadAxis == 16) ? auxLinear1 : (gppwm1_loadAxis == 17) ? auxLinear2 : 0} + gppwm2_load = {(gppwm2_loadAxis == 0) ? 0 : (gppwm2_loadAxis == 1) ? TPSValue : (gppwm2_loadAxis == 2) ? MAPValue : (gppwm2_loadAxis == 3) ? coolant : (gppwm2_loadAxis == 4) ? intake : (gppwm2_loadAxis == 5) ? fuelingLoad : (gppwm2_loadAxis == 6) ? ignitionLoad : (gppwm2_loadAxis == 7) ? auxTemp1 : (gppwm2_loadAxis == 8) ? auxTemp2 : (gppwm2_loadAxis == 9) ? throttlePedalPosition : (gppwm2_loadAxis == 10) ? VBatt : (gppwm2_loadAxis == 11) ? vvtPositionB1I : (gppwm2_loadAxis == 12) ? vvtPositionB1E : (gppwm2_loadAxis == 13) ? vvtPositionB2I : (gppwm2_loadAxis == 14) ? vvtPositionB2E : (gppwm2_loadAxis == 15) ? flexPercent : (gppwm2_loadAxis == 16) ? auxLinear1 : (gppwm2_loadAxis == 17) ? auxLinear2 : 0} + gppwm3_load = {(gppwm3_loadAxis == 0) ? 0 : (gppwm3_loadAxis == 1) ? TPSValue : (gppwm3_loadAxis == 2) ? MAPValue : (gppwm3_loadAxis == 3) ? coolant : (gppwm3_loadAxis == 4) ? intake : (gppwm3_loadAxis == 5) ? fuelingLoad : (gppwm3_loadAxis == 6) ? ignitionLoad : (gppwm3_loadAxis == 7) ? auxTemp1 : (gppwm3_loadAxis == 8) ? auxTemp2 : (gppwm3_loadAxis == 9) ? throttlePedalPosition : (gppwm3_loadAxis == 10) ? VBatt : (gppwm3_loadAxis == 11) ? vvtPositionB1I : (gppwm3_loadAxis == 12) ? vvtPositionB1E : (gppwm3_loadAxis == 13) ? vvtPositionB2I : (gppwm3_loadAxis == 14) ? vvtPositionB2E : (gppwm3_loadAxis == 15) ? flexPercent : (gppwm3_loadAxis == 16) ? auxLinear1 : (gppwm3_loadAxis == 17) ? auxLinear2 : 0} + gppwm4_load = {(gppwm4_loadAxis == 0) ? 0 : (gppwm4_loadAxis == 1) ? TPSValue : (gppwm4_loadAxis == 2) ? MAPValue : (gppwm4_loadAxis == 3) ? coolant : (gppwm4_loadAxis == 4) ? intake : (gppwm4_loadAxis == 5) ? fuelingLoad : (gppwm4_loadAxis == 6) ? ignitionLoad : (gppwm4_loadAxis == 7) ? auxTemp1 : (gppwm4_loadAxis == 8) ? auxTemp2 : (gppwm4_loadAxis == 9) ? throttlePedalPosition : (gppwm4_loadAxis == 10) ? VBatt : (gppwm4_loadAxis == 11) ? vvtPositionB1I : (gppwm4_loadAxis == 12) ? vvtPositionB1E : (gppwm4_loadAxis == 13) ? vvtPositionB2I : (gppwm4_loadAxis == 14) ? vvtPositionB2E : (gppwm4_loadAxis == 15) ? flexPercent : (gppwm4_loadAxis == 16) ? auxLinear1 : (gppwm4_loadAxis == 17) ? auxLinear2 : 0} [PcVariables] tuneCrcPcVariable = continuousChannelValue, tuneCrc16 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini index fe1124feff..dd27bfe579 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.09.16.proteus_h7.3258751277" + signature = "rusEFI 2022.09.16.proteus_h7.732560947" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.16.proteus_h7.3258751277" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.16.proteus_h7.732560947" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Sep 16 01:34:16 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Sep 16 20:10:21 UTC 2022 pageSize = 21296 page = 1 @@ -1047,7 +1047,7 @@ gppwm1_dutyIfError = scalar, U08, 2566, "%", 1, 0, 0, 100, 0 gppwm1_pwmFrequency = scalar, U16, 2568, "hz", 1, 0, 0, 500, 0 gppwm1_onAboveDuty = scalar, U08, 2570, "%", 1, 0, 0, 100, 0 gppwm1_offBelowDuty = scalar, U08, 2571, "%", 1, 0, 0, 100, 0 -gppwm1_loadAxis = bits, U08, 2572, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm1_loadAxis = bits, U08, 2572, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm1_alignmentFill_map = scalar, U08, 2573, "unit", 1, 0, 0, 100, 0 gppwm1_loadBins = array, U08, 2574, [8], "load", 1, 0, 0, 250, 0 gppwm1_rpmBins = array, U08, 2582, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1057,7 +1057,7 @@ gppwm2_dutyIfError = scalar, U08, 2658, "%", 1, 0, 0, 100, 0 gppwm2_pwmFrequency = scalar, U16, 2660, "hz", 1, 0, 0, 500, 0 gppwm2_onAboveDuty = scalar, U08, 2662, "%", 1, 0, 0, 100, 0 gppwm2_offBelowDuty = scalar, U08, 2663, "%", 1, 0, 0, 100, 0 -gppwm2_loadAxis = bits, U08, 2664, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm2_loadAxis = bits, U08, 2664, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm2_alignmentFill_map = scalar, U08, 2665, "unit", 1, 0, 0, 100, 0 gppwm2_loadBins = array, U08, 2666, [8], "load", 1, 0, 0, 250, 0 gppwm2_rpmBins = array, U08, 2674, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1067,7 +1067,7 @@ gppwm3_dutyIfError = scalar, U08, 2750, "%", 1, 0, 0, 100, 0 gppwm3_pwmFrequency = scalar, U16, 2752, "hz", 1, 0, 0, 500, 0 gppwm3_onAboveDuty = scalar, U08, 2754, "%", 1, 0, 0, 100, 0 gppwm3_offBelowDuty = scalar, U08, 2755, "%", 1, 0, 0, 100, 0 -gppwm3_loadAxis = bits, U08, 2756, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm3_loadAxis = bits, U08, 2756, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm3_alignmentFill_map = scalar, U08, 2757, "unit", 1, 0, 0, 100, 0 gppwm3_loadBins = array, U08, 2758, [8], "load", 1, 0, 0, 250, 0 gppwm3_rpmBins = array, U08, 2766, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1077,7 +1077,7 @@ gppwm4_dutyIfError = scalar, U08, 2842, "%", 1, 0, 0, 100, 0 gppwm4_pwmFrequency = scalar, U16, 2844, "hz", 1, 0, 0, 500, 0 gppwm4_onAboveDuty = scalar, U08, 2846, "%", 1, 0, 0, 100, 0 gppwm4_offBelowDuty = scalar, U08, 2847, "%", 1, 0, 0, 100, 0 -gppwm4_loadAxis = bits, U08, 2848, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm4_loadAxis = bits, U08, 2848, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm4_alignmentFill_map = scalar, U08, 2849, "unit", 1, 0, 0, 100, 0 gppwm4_loadBins = array, U08, 2850, [8], "load", 1, 0, 0, 250, 0 gppwm4_rpmBins = array, U08, 2858, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -3259,10 +3259,10 @@ esr = scalar, U16, 1244, "", 1, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } ; These "synthetic" channels provide the Y-axis (load) value for gen purp PWM table's Y axes - gppwm1_load = {(gppwm1_loadAxis == 0) ? TPSValue : ((gppwm1_loadAxis == 1) ? MAPValue : ((gppwm1_loadAxis == 2) ? coolant : ((gppwm1_loadAxis == 3) ? intake : ((gppwm1_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm2_load = {(gppwm2_loadAxis == 0) ? TPSValue : ((gppwm2_loadAxis == 1) ? MAPValue : ((gppwm2_loadAxis == 2) ? coolant : ((gppwm2_loadAxis == 3) ? intake : ((gppwm2_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm3_load = {(gppwm3_loadAxis == 0) ? TPSValue : ((gppwm3_loadAxis == 1) ? MAPValue : ((gppwm3_loadAxis == 2) ? coolant : ((gppwm3_loadAxis == 3) ? intake : ((gppwm3_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm4_load = {(gppwm4_loadAxis == 0) ? TPSValue : ((gppwm4_loadAxis == 1) ? MAPValue : ((gppwm4_loadAxis == 2) ? coolant : ((gppwm4_loadAxis == 3) ? intake : ((gppwm4_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} + gppwm1_load = {(gppwm1_loadAxis == 0) ? 0 : (gppwm1_loadAxis == 1) ? TPSValue : (gppwm1_loadAxis == 2) ? MAPValue : (gppwm1_loadAxis == 3) ? coolant : (gppwm1_loadAxis == 4) ? intake : (gppwm1_loadAxis == 5) ? fuelingLoad : (gppwm1_loadAxis == 6) ? ignitionLoad : (gppwm1_loadAxis == 7) ? auxTemp1 : (gppwm1_loadAxis == 8) ? auxTemp2 : (gppwm1_loadAxis == 9) ? throttlePedalPosition : (gppwm1_loadAxis == 10) ? VBatt : (gppwm1_loadAxis == 11) ? vvtPositionB1I : (gppwm1_loadAxis == 12) ? vvtPositionB1E : (gppwm1_loadAxis == 13) ? vvtPositionB2I : (gppwm1_loadAxis == 14) ? vvtPositionB2E : (gppwm1_loadAxis == 15) ? flexPercent : (gppwm1_loadAxis == 16) ? auxLinear1 : (gppwm1_loadAxis == 17) ? auxLinear2 : 0} + gppwm2_load = {(gppwm2_loadAxis == 0) ? 0 : (gppwm2_loadAxis == 1) ? TPSValue : (gppwm2_loadAxis == 2) ? MAPValue : (gppwm2_loadAxis == 3) ? coolant : (gppwm2_loadAxis == 4) ? intake : (gppwm2_loadAxis == 5) ? fuelingLoad : (gppwm2_loadAxis == 6) ? ignitionLoad : (gppwm2_loadAxis == 7) ? auxTemp1 : (gppwm2_loadAxis == 8) ? auxTemp2 : (gppwm2_loadAxis == 9) ? throttlePedalPosition : (gppwm2_loadAxis == 10) ? VBatt : (gppwm2_loadAxis == 11) ? vvtPositionB1I : (gppwm2_loadAxis == 12) ? vvtPositionB1E : (gppwm2_loadAxis == 13) ? vvtPositionB2I : (gppwm2_loadAxis == 14) ? vvtPositionB2E : (gppwm2_loadAxis == 15) ? flexPercent : (gppwm2_loadAxis == 16) ? auxLinear1 : (gppwm2_loadAxis == 17) ? auxLinear2 : 0} + gppwm3_load = {(gppwm3_loadAxis == 0) ? 0 : (gppwm3_loadAxis == 1) ? TPSValue : (gppwm3_loadAxis == 2) ? MAPValue : (gppwm3_loadAxis == 3) ? coolant : (gppwm3_loadAxis == 4) ? intake : (gppwm3_loadAxis == 5) ? fuelingLoad : (gppwm3_loadAxis == 6) ? ignitionLoad : (gppwm3_loadAxis == 7) ? auxTemp1 : (gppwm3_loadAxis == 8) ? auxTemp2 : (gppwm3_loadAxis == 9) ? throttlePedalPosition : (gppwm3_loadAxis == 10) ? VBatt : (gppwm3_loadAxis == 11) ? vvtPositionB1I : (gppwm3_loadAxis == 12) ? vvtPositionB1E : (gppwm3_loadAxis == 13) ? vvtPositionB2I : (gppwm3_loadAxis == 14) ? vvtPositionB2E : (gppwm3_loadAxis == 15) ? flexPercent : (gppwm3_loadAxis == 16) ? auxLinear1 : (gppwm3_loadAxis == 17) ? auxLinear2 : 0} + gppwm4_load = {(gppwm4_loadAxis == 0) ? 0 : (gppwm4_loadAxis == 1) ? TPSValue : (gppwm4_loadAxis == 2) ? MAPValue : (gppwm4_loadAxis == 3) ? coolant : (gppwm4_loadAxis == 4) ? intake : (gppwm4_loadAxis == 5) ? fuelingLoad : (gppwm4_loadAxis == 6) ? ignitionLoad : (gppwm4_loadAxis == 7) ? auxTemp1 : (gppwm4_loadAxis == 8) ? auxTemp2 : (gppwm4_loadAxis == 9) ? throttlePedalPosition : (gppwm4_loadAxis == 10) ? VBatt : (gppwm4_loadAxis == 11) ? vvtPositionB1I : (gppwm4_loadAxis == 12) ? vvtPositionB1E : (gppwm4_loadAxis == 13) ? vvtPositionB2I : (gppwm4_loadAxis == 14) ? vvtPositionB2E : (gppwm4_loadAxis == 15) ? flexPercent : (gppwm4_loadAxis == 16) ? auxLinear1 : (gppwm4_loadAxis == 17) ? auxLinear2 : 0} [PcVariables] tuneCrcPcVariable = continuousChannelValue, tuneCrc16 diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index a534126825..34d293e931 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 2022.09.16.subaru_eg33_f7.519014273" + signature = "rusEFI 2022.09.16.subaru_eg33_f7.4152025247" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.16.subaru_eg33_f7.519014273" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.16.subaru_eg33_f7.4152025247" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Fri Sep 16 01:33:23 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Fri Sep 16 20:09:35 UTC 2022 pageSize = 21296 page = 1 @@ -1047,7 +1047,7 @@ gppwm1_dutyIfError = scalar, U08, 2566, "%", 1, 0, 0, 100, 0 gppwm1_pwmFrequency = scalar, U16, 2568, "hz", 1, 0, 0, 500, 0 gppwm1_onAboveDuty = scalar, U08, 2570, "%", 1, 0, 0, 100, 0 gppwm1_offBelowDuty = scalar, U08, 2571, "%", 1, 0, 0, 100, 0 -gppwm1_loadAxis = bits, U08, 2572, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm1_loadAxis = bits, U08, 2572, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm1_alignmentFill_map = scalar, U08, 2573, "unit", 1, 0, 0, 100, 0 gppwm1_loadBins = array, U08, 2574, [8], "load", 1, 0, 0, 250, 0 gppwm1_rpmBins = array, U08, 2582, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1057,7 +1057,7 @@ gppwm2_dutyIfError = scalar, U08, 2658, "%", 1, 0, 0, 100, 0 gppwm2_pwmFrequency = scalar, U16, 2660, "hz", 1, 0, 0, 500, 0 gppwm2_onAboveDuty = scalar, U08, 2662, "%", 1, 0, 0, 100, 0 gppwm2_offBelowDuty = scalar, U08, 2663, "%", 1, 0, 0, 100, 0 -gppwm2_loadAxis = bits, U08, 2664, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm2_loadAxis = bits, U08, 2664, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm2_alignmentFill_map = scalar, U08, 2665, "unit", 1, 0, 0, 100, 0 gppwm2_loadBins = array, U08, 2666, [8], "load", 1, 0, 0, 250, 0 gppwm2_rpmBins = array, U08, 2674, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1067,7 +1067,7 @@ gppwm3_dutyIfError = scalar, U08, 2750, "%", 1, 0, 0, 100, 0 gppwm3_pwmFrequency = scalar, U16, 2752, "hz", 1, 0, 0, 500, 0 gppwm3_onAboveDuty = scalar, U08, 2754, "%", 1, 0, 0, 100, 0 gppwm3_offBelowDuty = scalar, U08, 2755, "%", 1, 0, 0, 100, 0 -gppwm3_loadAxis = bits, U08, 2756, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm3_loadAxis = bits, U08, 2756, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm3_alignmentFill_map = scalar, U08, 2757, "unit", 1, 0, 0, 100, 0 gppwm3_loadBins = array, U08, 2758, [8], "load", 1, 0, 0, 250, 0 gppwm3_rpmBins = array, U08, 2766, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1077,7 +1077,7 @@ gppwm4_dutyIfError = scalar, U08, 2842, "%", 1, 0, 0, 100, 0 gppwm4_pwmFrequency = scalar, U16, 2844, "hz", 1, 0, 0, 500, 0 gppwm4_onAboveDuty = scalar, U08, 2846, "%", 1, 0, 0, 100, 0 gppwm4_offBelowDuty = scalar, U08, 2847, "%", 1, 0, 0, 100, 0 -gppwm4_loadAxis = bits, U08, 2848, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm4_loadAxis = bits, U08, 2848, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm4_alignmentFill_map = scalar, U08, 2849, "unit", 1, 0, 0, 100, 0 gppwm4_loadBins = array, U08, 2850, [8], "load", 1, 0, 0, 250, 0 gppwm4_rpmBins = array, U08, 2858, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -3259,10 +3259,10 @@ esr = scalar, U16, 1244, "", 1, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } ; These "synthetic" channels provide the Y-axis (load) value for gen purp PWM table's Y axes - gppwm1_load = {(gppwm1_loadAxis == 0) ? TPSValue : ((gppwm1_loadAxis == 1) ? MAPValue : ((gppwm1_loadAxis == 2) ? coolant : ((gppwm1_loadAxis == 3) ? intake : ((gppwm1_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm2_load = {(gppwm2_loadAxis == 0) ? TPSValue : ((gppwm2_loadAxis == 1) ? MAPValue : ((gppwm2_loadAxis == 2) ? coolant : ((gppwm2_loadAxis == 3) ? intake : ((gppwm2_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm3_load = {(gppwm3_loadAxis == 0) ? TPSValue : ((gppwm3_loadAxis == 1) ? MAPValue : ((gppwm3_loadAxis == 2) ? coolant : ((gppwm3_loadAxis == 3) ? intake : ((gppwm3_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm4_load = {(gppwm4_loadAxis == 0) ? TPSValue : ((gppwm4_loadAxis == 1) ? MAPValue : ((gppwm4_loadAxis == 2) ? coolant : ((gppwm4_loadAxis == 3) ? intake : ((gppwm4_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} + gppwm1_load = {(gppwm1_loadAxis == 0) ? 0 : (gppwm1_loadAxis == 1) ? TPSValue : (gppwm1_loadAxis == 2) ? MAPValue : (gppwm1_loadAxis == 3) ? coolant : (gppwm1_loadAxis == 4) ? intake : (gppwm1_loadAxis == 5) ? fuelingLoad : (gppwm1_loadAxis == 6) ? ignitionLoad : (gppwm1_loadAxis == 7) ? auxTemp1 : (gppwm1_loadAxis == 8) ? auxTemp2 : (gppwm1_loadAxis == 9) ? throttlePedalPosition : (gppwm1_loadAxis == 10) ? VBatt : (gppwm1_loadAxis == 11) ? vvtPositionB1I : (gppwm1_loadAxis == 12) ? vvtPositionB1E : (gppwm1_loadAxis == 13) ? vvtPositionB2I : (gppwm1_loadAxis == 14) ? vvtPositionB2E : (gppwm1_loadAxis == 15) ? flexPercent : (gppwm1_loadAxis == 16) ? auxLinear1 : (gppwm1_loadAxis == 17) ? auxLinear2 : 0} + gppwm2_load = {(gppwm2_loadAxis == 0) ? 0 : (gppwm2_loadAxis == 1) ? TPSValue : (gppwm2_loadAxis == 2) ? MAPValue : (gppwm2_loadAxis == 3) ? coolant : (gppwm2_loadAxis == 4) ? intake : (gppwm2_loadAxis == 5) ? fuelingLoad : (gppwm2_loadAxis == 6) ? ignitionLoad : (gppwm2_loadAxis == 7) ? auxTemp1 : (gppwm2_loadAxis == 8) ? auxTemp2 : (gppwm2_loadAxis == 9) ? throttlePedalPosition : (gppwm2_loadAxis == 10) ? VBatt : (gppwm2_loadAxis == 11) ? vvtPositionB1I : (gppwm2_loadAxis == 12) ? vvtPositionB1E : (gppwm2_loadAxis == 13) ? vvtPositionB2I : (gppwm2_loadAxis == 14) ? vvtPositionB2E : (gppwm2_loadAxis == 15) ? flexPercent : (gppwm2_loadAxis == 16) ? auxLinear1 : (gppwm2_loadAxis == 17) ? auxLinear2 : 0} + gppwm3_load = {(gppwm3_loadAxis == 0) ? 0 : (gppwm3_loadAxis == 1) ? TPSValue : (gppwm3_loadAxis == 2) ? MAPValue : (gppwm3_loadAxis == 3) ? coolant : (gppwm3_loadAxis == 4) ? intake : (gppwm3_loadAxis == 5) ? fuelingLoad : (gppwm3_loadAxis == 6) ? ignitionLoad : (gppwm3_loadAxis == 7) ? auxTemp1 : (gppwm3_loadAxis == 8) ? auxTemp2 : (gppwm3_loadAxis == 9) ? throttlePedalPosition : (gppwm3_loadAxis == 10) ? VBatt : (gppwm3_loadAxis == 11) ? vvtPositionB1I : (gppwm3_loadAxis == 12) ? vvtPositionB1E : (gppwm3_loadAxis == 13) ? vvtPositionB2I : (gppwm3_loadAxis == 14) ? vvtPositionB2E : (gppwm3_loadAxis == 15) ? flexPercent : (gppwm3_loadAxis == 16) ? auxLinear1 : (gppwm3_loadAxis == 17) ? auxLinear2 : 0} + gppwm4_load = {(gppwm4_loadAxis == 0) ? 0 : (gppwm4_loadAxis == 1) ? TPSValue : (gppwm4_loadAxis == 2) ? MAPValue : (gppwm4_loadAxis == 3) ? coolant : (gppwm4_loadAxis == 4) ? intake : (gppwm4_loadAxis == 5) ? fuelingLoad : (gppwm4_loadAxis == 6) ? ignitionLoad : (gppwm4_loadAxis == 7) ? auxTemp1 : (gppwm4_loadAxis == 8) ? auxTemp2 : (gppwm4_loadAxis == 9) ? throttlePedalPosition : (gppwm4_loadAxis == 10) ? VBatt : (gppwm4_loadAxis == 11) ? vvtPositionB1I : (gppwm4_loadAxis == 12) ? vvtPositionB1E : (gppwm4_loadAxis == 13) ? vvtPositionB2I : (gppwm4_loadAxis == 14) ? vvtPositionB2E : (gppwm4_loadAxis == 15) ? flexPercent : (gppwm4_loadAxis == 16) ? auxLinear1 : (gppwm4_loadAxis == 17) ? auxLinear2 : 0} [PcVariables] tuneCrcPcVariable = continuousChannelValue, tuneCrc16 diff --git a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini index fdf2ae88ed..44d4859632 100644 --- a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini +++ b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.09.16.tdg-pdm8.3455684623" + signature = "rusEFI 2022.09.16.tdg-pdm8.611120913" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.16.tdg-pdm8.3455684623" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.16.tdg-pdm8.611120913" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Sep 16 01:34:24 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Sep 16 20:10:29 UTC 2022 pageSize = 21296 page = 1 @@ -1047,7 +1047,7 @@ gppwm1_dutyIfError = scalar, U08, 2566, "%", 1, 0, 0, 100, 0 gppwm1_pwmFrequency = scalar, U16, 2568, "hz", 1, 0, 0, 500, 0 gppwm1_onAboveDuty = scalar, U08, 2570, "%", 1, 0, 0, 100, 0 gppwm1_offBelowDuty = scalar, U08, 2571, "%", 1, 0, 0, 100, 0 -gppwm1_loadAxis = bits, U08, 2572, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm1_loadAxis = bits, U08, 2572, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm1_alignmentFill_map = scalar, U08, 2573, "unit", 1, 0, 0, 100, 0 gppwm1_loadBins = array, U08, 2574, [8], "load", 1, 0, 0, 250, 0 gppwm1_rpmBins = array, U08, 2582, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1057,7 +1057,7 @@ gppwm2_dutyIfError = scalar, U08, 2658, "%", 1, 0, 0, 100, 0 gppwm2_pwmFrequency = scalar, U16, 2660, "hz", 1, 0, 0, 500, 0 gppwm2_onAboveDuty = scalar, U08, 2662, "%", 1, 0, 0, 100, 0 gppwm2_offBelowDuty = scalar, U08, 2663, "%", 1, 0, 0, 100, 0 -gppwm2_loadAxis = bits, U08, 2664, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm2_loadAxis = bits, U08, 2664, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm2_alignmentFill_map = scalar, U08, 2665, "unit", 1, 0, 0, 100, 0 gppwm2_loadBins = array, U08, 2666, [8], "load", 1, 0, 0, 250, 0 gppwm2_rpmBins = array, U08, 2674, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1067,7 +1067,7 @@ gppwm3_dutyIfError = scalar, U08, 2750, "%", 1, 0, 0, 100, 0 gppwm3_pwmFrequency = scalar, U16, 2752, "hz", 1, 0, 0, 500, 0 gppwm3_onAboveDuty = scalar, U08, 2754, "%", 1, 0, 0, 100, 0 gppwm3_offBelowDuty = scalar, U08, 2755, "%", 1, 0, 0, 100, 0 -gppwm3_loadAxis = bits, U08, 2756, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm3_loadAxis = bits, U08, 2756, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm3_alignmentFill_map = scalar, U08, 2757, "unit", 1, 0, 0, 100, 0 gppwm3_loadBins = array, U08, 2758, [8], "load", 1, 0, 0, 250, 0 gppwm3_rpmBins = array, U08, 2766, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -1077,7 +1077,7 @@ gppwm4_dutyIfError = scalar, U08, 2842, "%", 1, 0, 0, 100, 0 gppwm4_pwmFrequency = scalar, U16, 2844, "hz", 1, 0, 0, 500, 0 gppwm4_onAboveDuty = scalar, U08, 2846, "%", 1, 0, 0, 100, 0 gppwm4_offBelowDuty = scalar, U08, 2847, "%", 1, 0, 0, 100, 0 -gppwm4_loadAxis = bits, U08, 2848, [0:3], "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage" +gppwm4_loadAxis = bits, U08, 2848, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2" gppwm4_alignmentFill_map = scalar, U08, 2849, "unit", 1, 0, 0, 100, 0 gppwm4_loadBins = array, U08, 2850, [8], "load", 1, 0, 0, 250, 0 gppwm4_rpmBins = array, U08, 2858, [8], "RPM", 100.0, 0, 0, 25000, 0 @@ -3259,10 +3259,10 @@ esr = scalar, U16, 1244, "", 1, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } ; These "synthetic" channels provide the Y-axis (load) value for gen purp PWM table's Y axes - gppwm1_load = {(gppwm1_loadAxis == 0) ? TPSValue : ((gppwm1_loadAxis == 1) ? MAPValue : ((gppwm1_loadAxis == 2) ? coolant : ((gppwm1_loadAxis == 3) ? intake : ((gppwm1_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm2_load = {(gppwm2_loadAxis == 0) ? TPSValue : ((gppwm2_loadAxis == 1) ? MAPValue : ((gppwm2_loadAxis == 2) ? coolant : ((gppwm2_loadAxis == 3) ? intake : ((gppwm2_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm3_load = {(gppwm3_loadAxis == 0) ? TPSValue : ((gppwm3_loadAxis == 1) ? MAPValue : ((gppwm3_loadAxis == 2) ? coolant : ((gppwm3_loadAxis == 3) ? intake : ((gppwm3_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} - gppwm4_load = {(gppwm4_loadAxis == 0) ? TPSValue : ((gppwm4_loadAxis == 1) ? MAPValue : ((gppwm4_loadAxis == 2) ? coolant : ((gppwm4_loadAxis == 3) ? intake : ((gppwm4_loadAxis == 4) ? fuelingLoad : ignitionLoad))))} + gppwm1_load = {(gppwm1_loadAxis == 0) ? 0 : (gppwm1_loadAxis == 1) ? TPSValue : (gppwm1_loadAxis == 2) ? MAPValue : (gppwm1_loadAxis == 3) ? coolant : (gppwm1_loadAxis == 4) ? intake : (gppwm1_loadAxis == 5) ? fuelingLoad : (gppwm1_loadAxis == 6) ? ignitionLoad : (gppwm1_loadAxis == 7) ? auxTemp1 : (gppwm1_loadAxis == 8) ? auxTemp2 : (gppwm1_loadAxis == 9) ? throttlePedalPosition : (gppwm1_loadAxis == 10) ? VBatt : (gppwm1_loadAxis == 11) ? vvtPositionB1I : (gppwm1_loadAxis == 12) ? vvtPositionB1E : (gppwm1_loadAxis == 13) ? vvtPositionB2I : (gppwm1_loadAxis == 14) ? vvtPositionB2E : (gppwm1_loadAxis == 15) ? flexPercent : (gppwm1_loadAxis == 16) ? auxLinear1 : (gppwm1_loadAxis == 17) ? auxLinear2 : 0} + gppwm2_load = {(gppwm2_loadAxis == 0) ? 0 : (gppwm2_loadAxis == 1) ? TPSValue : (gppwm2_loadAxis == 2) ? MAPValue : (gppwm2_loadAxis == 3) ? coolant : (gppwm2_loadAxis == 4) ? intake : (gppwm2_loadAxis == 5) ? fuelingLoad : (gppwm2_loadAxis == 6) ? ignitionLoad : (gppwm2_loadAxis == 7) ? auxTemp1 : (gppwm2_loadAxis == 8) ? auxTemp2 : (gppwm2_loadAxis == 9) ? throttlePedalPosition : (gppwm2_loadAxis == 10) ? VBatt : (gppwm2_loadAxis == 11) ? vvtPositionB1I : (gppwm2_loadAxis == 12) ? vvtPositionB1E : (gppwm2_loadAxis == 13) ? vvtPositionB2I : (gppwm2_loadAxis == 14) ? vvtPositionB2E : (gppwm2_loadAxis == 15) ? flexPercent : (gppwm2_loadAxis == 16) ? auxLinear1 : (gppwm2_loadAxis == 17) ? auxLinear2 : 0} + gppwm3_load = {(gppwm3_loadAxis == 0) ? 0 : (gppwm3_loadAxis == 1) ? TPSValue : (gppwm3_loadAxis == 2) ? MAPValue : (gppwm3_loadAxis == 3) ? coolant : (gppwm3_loadAxis == 4) ? intake : (gppwm3_loadAxis == 5) ? fuelingLoad : (gppwm3_loadAxis == 6) ? ignitionLoad : (gppwm3_loadAxis == 7) ? auxTemp1 : (gppwm3_loadAxis == 8) ? auxTemp2 : (gppwm3_loadAxis == 9) ? throttlePedalPosition : (gppwm3_loadAxis == 10) ? VBatt : (gppwm3_loadAxis == 11) ? vvtPositionB1I : (gppwm3_loadAxis == 12) ? vvtPositionB1E : (gppwm3_loadAxis == 13) ? vvtPositionB2I : (gppwm3_loadAxis == 14) ? vvtPositionB2E : (gppwm3_loadAxis == 15) ? flexPercent : (gppwm3_loadAxis == 16) ? auxLinear1 : (gppwm3_loadAxis == 17) ? auxLinear2 : 0} + gppwm4_load = {(gppwm4_loadAxis == 0) ? 0 : (gppwm4_loadAxis == 1) ? TPSValue : (gppwm4_loadAxis == 2) ? MAPValue : (gppwm4_loadAxis == 3) ? coolant : (gppwm4_loadAxis == 4) ? intake : (gppwm4_loadAxis == 5) ? fuelingLoad : (gppwm4_loadAxis == 6) ? ignitionLoad : (gppwm4_loadAxis == 7) ? auxTemp1 : (gppwm4_loadAxis == 8) ? auxTemp2 : (gppwm4_loadAxis == 9) ? throttlePedalPosition : (gppwm4_loadAxis == 10) ? VBatt : (gppwm4_loadAxis == 11) ? vvtPositionB1I : (gppwm4_loadAxis == 12) ? vvtPositionB1E : (gppwm4_loadAxis == 13) ? vvtPositionB2I : (gppwm4_loadAxis == 14) ? vvtPositionB2E : (gppwm4_loadAxis == 15) ? flexPercent : (gppwm4_loadAxis == 16) ? auxLinear1 : (gppwm4_loadAxis == 17) ? auxLinear2 : 0} [PcVariables] tuneCrcPcVariable = continuousChannelValue, tuneCrc16 diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/AcControl.java b/java_console/models/src/main/java/com/rusefi/config/generated/AcControl.java index cd69d614c6..c442b20a13 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/AcControl.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/AcControl.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/ac_control.txt Sun Sep 11 05:06:58 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/ac_control.txt Fri Sep 16 20:09:31 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -99,7 +99,7 @@ public class AcControl { public static final int ETB_BIAS_CURVE_LENGTH = 8; public static final int ETB_COUNT = 2; public static final int ETB_HW_MAX_FREQUENCY = 3000; - public static final int FLASH_DATA_VERSION = 10014; + public static final int FLASH_DATA_VERSION = 10015; public static final int FUEL_LEVEL_TABLE_COUNT = 8; public static final int FUEL_LOAD_COUNT = 16; public static final int FUEL_RPM_COUNT = 16; diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/BoostControl.java b/java_console/models/src/main/java/com/rusefi/config/generated/BoostControl.java index bb313eb34c..40a71bab73 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/BoostControl.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/BoostControl.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/boost_control.txt Sun Sep 11 05:06:58 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/boost_control.txt Fri Sep 16 20:09:31 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -99,7 +99,7 @@ public class BoostControl { public static final int ETB_BIAS_CURVE_LENGTH = 8; public static final int ETB_COUNT = 2; public static final int ETB_HW_MAX_FREQUENCY = 3000; - public static final int FLASH_DATA_VERSION = 10014; + public static final int FLASH_DATA_VERSION = 10015; public static final int FUEL_LEVEL_TABLE_COUNT = 8; public static final int FUEL_LOAD_COUNT = 16; public static final int FUEL_RPM_COUNT = 16; diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java b/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java index f42f3641ea..eeabd37f90 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/engine_state.txt Sun Sep 11 05:06:59 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/engine_state.txt Fri Sep 16 20:09:31 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -99,7 +99,7 @@ public class EngineState { public static final int ETB_BIAS_CURVE_LENGTH = 8; public static final int ETB_COUNT = 2; public static final int ETB_HW_MAX_FREQUENCY = 3000; - public static final int FLASH_DATA_VERSION = 10014; + public static final int FLASH_DATA_VERSION = 10015; public static final int FUEL_LEVEL_TABLE_COUNT = 8; public static final int FUEL_LOAD_COUNT = 16; public static final int FUEL_RPM_COUNT = 16; 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 d0d9788ead..7e811e1ca6 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 Fri Sep 16 01:34:30 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Sep 16 20:10:35 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -718,7 +718,7 @@ public class Fields { public static final int firingOrder_offset = 372; public static final int fixedModeTiming_offset = 404; public static final int fixedTiming_offset = 1684; - public static final int FLASH_DATA_VERSION = 10014; + public static final int FLASH_DATA_VERSION = 10015; public static final int flexCranking_offset = 1372; public static final int flexSensorPin_offset = 844; public static final int forceO2Heating_offset = 1372; @@ -1212,16 +1212,23 @@ public class Fields { public static final int gppwm4_rpmBins_offset = 2858; public static final int gppwm4_table_offset = 2866; public static final int gppwm_channel_e_GPPWM_AccelPedal = 9; - public static final int gppwm_channel_e_GPPWM_AuxTemp1 = 6; - public static final int gppwm_channel_e_GPPWM_AuxTemp2 = 7; - public static final int gppwm_channel_e_GPPWM_Clt = 2; - public static final int gppwm_channel_e_GPPWM_FuelLoad = 4; - public static final int gppwm_channel_e_GPPWM_Iat = 3; - public static final int gppwm_channel_e_GPPWM_IgnLoad = 5; - public static final int gppwm_channel_e_GPPWM_Map = 1; - public static final int gppwm_channel_e_GPPWM_Tps = 0; + public static final int gppwm_channel_e_GPPWM_AuxLinear1 = 16; + public static final int gppwm_channel_e_GPPWM_AuxLinear2 = 17; + public static final int gppwm_channel_e_GPPWM_AuxTemp1 = 7; + public static final int gppwm_channel_e_GPPWM_AuxTemp2 = 8; + public static final int gppwm_channel_e_GPPWM_Clt = 3; + public static final int gppwm_channel_e_GPPWM_EthanolPercent = 15; + public static final int gppwm_channel_e_GPPWM_FuelLoad = 5; + public static final int gppwm_channel_e_GPPWM_Iat = 4; + public static final int gppwm_channel_e_GPPWM_IgnLoad = 6; + public static final int gppwm_channel_e_GPPWM_Map = 2; + public static final int gppwm_channel_e_GPPWM_Tps = 1; public static final int gppwm_channel_e_GPPWM_Vbatt = 10; - public static final int gppwm_channel_e_GPPWM_Zero = 8; + public static final int gppwm_channel_e_GPPWM_VVT_1E = 12; + public static final int gppwm_channel_e_GPPWM_VVT_1I = 11; + public static final int gppwm_channel_e_GPPWM_VVT_2E = 14; + public static final int gppwm_channel_e_GPPWM_VVT_2I = 13; + public static final int gppwm_channel_e_GPPWM_Zero = 0; public static final int gppwm_channel_size = 92; public static final int GPPWM_CHANNELS = 4; public static final int gppwm_compare_mode_e_GPPWM_GreaterThan = 0; @@ -1874,7 +1881,6 @@ public class Fields { public static final int sensorChartMode_offset = 955; public static final int sensorSnifferRpmThreshold_offset = 4; public static final int showHumanReadableWarning_offset = 960; - public static final int SIGNATURE_HASH = 1743871579; public static final int silentTriggerError_offset = 1360; public static final int skippedWheelOnCam_offset = 1360; public static final int slowAdcAlpha_offset = 1600; @@ -2369,7 +2375,7 @@ public class Fields { public static final int TS_RESPONSE_UNDERRUN = 0x80; public static final int TS_RESPONSE_UNRECOGNIZED_COMMAND = 0x83; public static final char TS_SET_LOGGER_SWITCH = 'l'; - public static final String TS_SIGNATURE = "rusEFI 2022.09.16.all.1743871579"; + public static final String TS_SIGNATURE = "rusEFI 2022.09.16.all.2388932933"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final char TS_TEST_COMMAND = 't'; public static final int TS_TOTAL_OUTPUT_SIZE = 1248; @@ -3605,7 +3611,7 @@ public class Fields { public static final Field GPPWM1_PWMFREQUENCY = Field.create("GPPWM1_PWMFREQUENCY", 2568, FieldType.INT16).setScale(1.0); public static final Field GPPWM1_ONABOVEDUTY = Field.create("GPPWM1_ONABOVEDUTY", 2570, FieldType.INT8).setScale(1.0); public static final Field GPPWM1_OFFBELOWDUTY = Field.create("GPPWM1_OFFBELOWDUTY", 2571, FieldType.INT8).setScale(1.0); - public static final String[] gppwm_channel_e = {"TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Zero", "Accel Pedal", "Battery Voltage"}; + public static final String[] gppwm_channel_e = {"Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2"}; public static final Field GPPWM1_LOADAXIS = Field.create("GPPWM1_LOADAXIS", 2572, FieldType.INT8, gppwm_channel_e).setScale(1.0); public static final Field GPPWM1_ALIGNMENTFILL_MAP = Field.create("GPPWM1_ALIGNMENTFILL_MAP", 2573, FieldType.INT8).setScale(1.0); public static final Field GPPWM1_LOADBINS = Field.create("GPPWM1_LOADBINS", 2574, FieldType.INT8).setScale(1.0); diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/FuelComputer.java b/java_console/models/src/main/java/com/rusefi/config/generated/FuelComputer.java index 9002e0444d..dbcb4d76c8 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/FuelComputer.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/FuelComputer.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/fuel/fuel_computer.txt Sun Sep 11 05:06:58 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/fuel/fuel_computer.txt Fri Sep 16 20:09:31 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -99,7 +99,7 @@ public class FuelComputer { public static final int ETB_BIAS_CURVE_LENGTH = 8; public static final int ETB_COUNT = 2; public static final int ETB_HW_MAX_FREQUENCY = 3000; - public static final int FLASH_DATA_VERSION = 10014; + public static final int FLASH_DATA_VERSION = 10015; public static final int FUEL_LEVEL_TABLE_COUNT = 8; public static final int FUEL_LOAD_COUNT = 16; public static final int FUEL_RPM_COUNT = 16; diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerState.java b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerState.java index 257c035f39..972cf2fee7 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerState.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerState.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_state.txt Sun Sep 11 05:06:59 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_state.txt Fri Sep 16 20:09:31 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -99,7 +99,7 @@ public class TriggerState { public static final int ETB_BIAS_CURVE_LENGTH = 8; public static final int ETB_COUNT = 2; public static final int ETB_HW_MAX_FREQUENCY = 3000; - public static final int FLASH_DATA_VERSION = 10014; + public static final int FLASH_DATA_VERSION = 10015; public static final int FUEL_LEVEL_TABLE_COUNT = 8; public static final int FUEL_LOAD_COUNT = 16; public static final int FUEL_RPM_COUNT = 16; diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerStatePrimary.java b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerStatePrimary.java index 4a5e110254..05b030a965 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerStatePrimary.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerStatePrimary.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_state_primary.txt Sun Sep 11 05:06:59 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_state_primary.txt Fri Sep 16 20:09:31 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -99,7 +99,7 @@ public class TriggerStatePrimary { public static final int ETB_BIAS_CURVE_LENGTH = 8; public static final int ETB_COUNT = 2; public static final int ETB_HW_MAX_FREQUENCY = 3000; - public static final int FLASH_DATA_VERSION = 10014; + public static final int FLASH_DATA_VERSION = 10015; public static final int FUEL_LEVEL_TABLE_COUNT = 8; public static final int FUEL_LOAD_COUNT = 16; public static final int FUEL_RPM_COUNT = 16; diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java b/java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java index 1926e29631..840a1d1bf4 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Thu Sep 15 18:59:53 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Fri Sep 16 20:09:30 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -99,7 +99,7 @@ public class TsOutputs { public static final int ETB_BIAS_CURVE_LENGTH = 8; public static final int ETB_COUNT = 2; public static final int ETB_HW_MAX_FREQUENCY = 3000; - public static final int FLASH_DATA_VERSION = 10014; + public static final int FLASH_DATA_VERSION = 10015; public static final int FUEL_LEVEL_TABLE_COUNT = 8; public static final int FUEL_LOAD_COUNT = 16; public static final int FUEL_RPM_COUNT = 16;