diff --git a/firmware/config/boards/cypress/config/controllers/algo/engine_configuration_generated_structures_cypress.h b/firmware/config/boards/cypress/config/controllers/algo/engine_configuration_generated_structures_cypress.h index a7d1a51d59..3b814f38f1 100644 --- a/firmware/config/boards/cypress/config/controllers/algo/engine_configuration_generated_structures_cypress.h +++ b/firmware/config/boards/cypress/config/controllers/algo/engine_configuration_generated_structures_cypress.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:18:37 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:17:33 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3762,9 +3762,19 @@ struct engine_configuration_s { */ scaled_channel triggerCompSensorSatRpm; /** + ratio * offset 2672 */ - int8_t unusedHere[20]; + scaled_channel tractionControlSlipBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + RPM + * offset 2684 + */ + uint8_t tractionControlSpeedBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + * offset 2690 + */ + int8_t unusedHere[2]; /** * offset 2692 */ @@ -4468,10 +4478,15 @@ struct engine_configuration_s { */ float triggerVVTGapOverrideTo[VVT_TRACKING_LENGTH]; /** - units + % * offset 4348 */ - uint8_t mainUnusedEnd[208]; + int8_t tractionControlEtbDrop[TRACTION_CONTROL_ETB_DROP_SIZE][TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + units + * offset 4384 + */ + uint8_t mainUnusedEnd[172]; }; static_assert(sizeof(engine_configuration_s) == 4556); @@ -5206,17 +5221,17 @@ struct persistent_config_s { % * offset 19444 */ - scaled_channel throttle2TrimTable[6][6]; + scaled_channel throttle2TrimTable[ETB2_TRIM_SIZE][ETB2_TRIM_SIZE]; /** % * offset 19480 */ - uint8_t throttle2TrimTpsBins[6]; + uint8_t throttle2TrimTpsBins[ETB2_TRIM_SIZE]; /** RPM * offset 19486 */ - scaled_channel throttle2TrimRpmBins[6]; + scaled_channel throttle2TrimRpmBins[ETB2_TRIM_SIZE]; /** deg * offset 19492 @@ -5383,4 +5398,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22088); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:18:37 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:17:33 UTC 2023 diff --git a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated_cypress.h b/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated_cypress.h index 19f24a8329..646e1ed7eb 100644 --- a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated_cypress.h +++ b/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated_cypress.h @@ -401,6 +401,7 @@ #define engine_type_e_VW_ABA 32 #define engine_type_e_WASTEGATE_PROTEUS_TEST 96 #define engineSyncCam_enum "Intake First Bank", "Exhaust First Bank", "Intake Second Bank", "Exhaust Second Bank" +#define ETB2_TRIM_SIZE 6 #define ETB_BIAS_CURVE_LENGTH 8 #define ETB_COUNT 2 #define ETB_HW_MAX_FREQUENCY 3000 @@ -819,7 +820,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2964181907 +#define SIGNATURE_HASH 1289969461 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -873,6 +874,7 @@ #define TPS_2_BYTE_PACKING_MULT 100 #define TPS_TPS_ACCEL_CLT_CORR_TABLE 4 #define TPS_TPS_ACCEL_TABLE 8 +#define TRACTION_CONTROL_ETB_DROP_SIZE 6 #define transmission_controller_e_enum "None", "Simple Transmission", "GM 4L6X" #define TransmissionControllerMode_auto_enum 0="None",2="Gm4l6x",1="SimpleTransmissionController" #define TransmissionControllerMode_Gm4l6x 2 @@ -1118,7 +1120,7 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.31.cypress.2964181907" +#define TS_SIGNATURE "rusEFI master.2023.12.31.cypress.1289969461" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures_kin.h b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures_kin.h index 2cd03c50cc..2e14c5ccb6 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures_kin.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures_kin.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:18:35 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:17:32 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3762,9 +3762,19 @@ struct engine_configuration_s { */ scaled_channel triggerCompSensorSatRpm; /** + ratio * offset 2672 */ - int8_t unusedHere[20]; + scaled_channel tractionControlSlipBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + RPM + * offset 2684 + */ + uint8_t tractionControlSpeedBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + * offset 2690 + */ + int8_t unusedHere[2]; /** * offset 2692 */ @@ -4468,10 +4478,15 @@ struct engine_configuration_s { */ float triggerVVTGapOverrideTo[VVT_TRACKING_LENGTH]; /** - units + % * offset 4348 */ - uint8_t mainUnusedEnd[208]; + int8_t tractionControlEtbDrop[TRACTION_CONTROL_ETB_DROP_SIZE][TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + units + * offset 4384 + */ + uint8_t mainUnusedEnd[172]; }; static_assert(sizeof(engine_configuration_s) == 4556); @@ -5206,17 +5221,17 @@ struct persistent_config_s { % * offset 18068 */ - scaled_channel throttle2TrimTable[6][6]; + scaled_channel throttle2TrimTable[ETB2_TRIM_SIZE][ETB2_TRIM_SIZE]; /** % * offset 18104 */ - uint8_t throttle2TrimTpsBins[6]; + uint8_t throttle2TrimTpsBins[ETB2_TRIM_SIZE]; /** RPM * offset 18110 */ - scaled_channel throttle2TrimRpmBins[6]; + scaled_channel throttle2TrimRpmBins[ETB2_TRIM_SIZE]; /** deg * offset 18116 @@ -5383,4 +5398,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 20712); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:18:35 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:17:32 UTC 2023 diff --git a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated_kin.h b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated_kin.h index 0fc3e949a1..18d08c214f 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated_kin.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated_kin.h @@ -401,6 +401,7 @@ #define engine_type_e_VW_ABA 32 #define engine_type_e_WASTEGATE_PROTEUS_TEST 96 #define engineSyncCam_enum "Intake First Bank", "Exhaust First Bank", "Intake Second Bank", "Exhaust Second Bank" +#define ETB2_TRIM_SIZE 6 #define ETB_BIAS_CURVE_LENGTH 8 #define ETB_COUNT 2 #define ETB_HW_MAX_FREQUENCY 3000 @@ -819,7 +820,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 4068217917 +#define SIGNATURE_HASH 238196891 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -873,6 +874,7 @@ #define TPS_2_BYTE_PACKING_MULT 100 #define TPS_TPS_ACCEL_CLT_CORR_TABLE 4 #define TPS_TPS_ACCEL_TABLE 8 +#define TRACTION_CONTROL_ETB_DROP_SIZE 6 #define transmission_controller_e_enum "None", "Simple Transmission", "GM 4L6X" #define TransmissionControllerMode_auto_enum 0="None",2="Gm4l6x",1="SimpleTransmissionController" #define TransmissionControllerMode_Gm4l6x 2 @@ -1118,7 +1120,7 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.31.kin.4068217917" +#define TS_SIGNATURE "rusEFI master.2023.12.31.kin.238196891" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures_subaru_eg33_f7.h b/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures_subaru_eg33_f7.h index d81f4461be..3a92e650bc 100644 --- a/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures_subaru_eg33_f7.h +++ b/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures_subaru_eg33_f7.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:18:38 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:17:34 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3762,9 +3762,19 @@ struct engine_configuration_s { */ scaled_channel triggerCompSensorSatRpm; /** + ratio * offset 2672 */ - int8_t unusedHere[20]; + scaled_channel tractionControlSlipBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + RPM + * offset 2684 + */ + uint8_t tractionControlSpeedBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + * offset 2690 + */ + int8_t unusedHere[2]; /** * offset 2692 */ @@ -4468,10 +4478,15 @@ struct engine_configuration_s { */ float triggerVVTGapOverrideTo[VVT_TRACKING_LENGTH]; /** - units + % * offset 4348 */ - uint8_t mainUnusedEnd[208]; + int8_t tractionControlEtbDrop[TRACTION_CONTROL_ETB_DROP_SIZE][TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + units + * offset 4384 + */ + uint8_t mainUnusedEnd[172]; }; static_assert(sizeof(engine_configuration_s) == 4556); @@ -5206,17 +5221,17 @@ struct persistent_config_s { % * offset 19444 */ - scaled_channel throttle2TrimTable[6][6]; + scaled_channel throttle2TrimTable[ETB2_TRIM_SIZE][ETB2_TRIM_SIZE]; /** % * offset 19480 */ - uint8_t throttle2TrimTpsBins[6]; + uint8_t throttle2TrimTpsBins[ETB2_TRIM_SIZE]; /** RPM * offset 19486 */ - scaled_channel throttle2TrimRpmBins[6]; + scaled_channel throttle2TrimRpmBins[ETB2_TRIM_SIZE]; /** deg * offset 19492 @@ -5383,4 +5398,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22088); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:18:38 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:17:34 UTC 2023 diff --git a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated_subaru_eg33_f7.h b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated_subaru_eg33_f7.h index 5c92884013..14307b7624 100644 --- a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated_subaru_eg33_f7.h +++ b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated_subaru_eg33_f7.h @@ -429,6 +429,7 @@ #define engine_type_e_VW_ABA 32 #define engine_type_e_WASTEGATE_PROTEUS_TEST 96 #define engineSyncCam_enum "Intake First Bank", "Exhaust First Bank", "Intake Second Bank", "Exhaust Second Bank" +#define ETB2_TRIM_SIZE 6 #define ETB_BIAS_CURVE_LENGTH 8 #define ETB_COUNT 2 #define ETB_HW_MAX_FREQUENCY 3000 @@ -1056,7 +1057,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 1063516245 +#define SIGNATURE_HASH 3274536179 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1110,6 +1111,7 @@ #define TPS_2_BYTE_PACKING_MULT 100 #define TPS_TPS_ACCEL_CLT_CORR_TABLE 4 #define TPS_TPS_ACCEL_TABLE 8 +#define TRACTION_CONTROL_ETB_DROP_SIZE 6 #define transmission_controller_e_enum "None", "Simple Transmission", "GM 4L6X" #define TransmissionControllerMode_auto_enum 0="None",2="Gm4l6x",1="SimpleTransmissionController" #define TransmissionControllerMode_Gm4l6x 2 @@ -1355,7 +1357,7 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.31.subaru_eg33_f7.1063516245" +#define TS_SIGNATURE "rusEFI master.2023.12.31.subaru_eg33_f7.3274536179" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/console/binary/generated/data_logs.ini b/firmware/console/binary/generated/data_logs.ini index d45ea386e7..894d255ca0 100644 --- a/firmware/console/binary/generated/data_logs.ini +++ b/firmware/console/binary/generated/data_logs.ini @@ -667,6 +667,7 @@ entry = etbDutyAverage0, "ETB average duty0", float, "%.3f" entry = etbTpsErrorCounter0, "ETB TPS error counter0", int, "%d" entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" +entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" ;entry = trim1, "ETB: trim1", float, "%.3f" @@ -683,6 +684,7 @@ entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = etbTpsErrorCounter1, "ETB TPS error counter1", int, "%d" ;entry = etbPpsErrorCounter1, "ETB pedal error counter1", int, "%d" ;entry = etbErrorCode1, "etbErrorCode1", int, "%d" +;entry = tcEtbDrop1, "tcEtbDrop1", int, "%d" ;entry = jamTimer1, "ETB jam timer1", float, "%.3f" entry = faultCode0, "WBO: Fault code0", int, "%d" entry = heaterDuty0, "WBO: Heater duty0", int, "%d" diff --git a/firmware/console/binary/generated/fancy_content.ini b/firmware/console/binary/generated/fancy_content.ini index 133a183f1b..5a08deb4a9 100644 --- a/firmware/console/binary/generated/fancy_content.ini +++ b/firmware/console/binary/generated/fancy_content.ini @@ -398,6 +398,7 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etbPpsErrorCounter0 liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etbErrorCode0 + graphLine = tcEtbDrop0 graphLine = jamTimer0 diff --git a/firmware/console/binary/generated/output_channels.ini b/firmware/console/binary/generated/output_channels.ini index 4ef649ee89..b58a1d5422 100644 --- a/firmware/console/binary/generated/output_channels.ini +++ b/firmware/console/binary/generated/output_channels.ini @@ -754,6 +754,7 @@ etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1401, "", 1, 0 jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 ; total TS size = 1404 faultCode0 = scalar, U08, 1404, "", 1, 0 diff --git a/firmware/controllers/actuators/electronic_throttle_generated.h b/firmware/controllers/actuators/electronic_throttle_generated.h index f7d443ce63..9ea85da8cc 100644 --- a/firmware/controllers/actuators/electronic_throttle_generated.h +++ b/firmware/controllers/actuators/electronic_throttle_generated.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/electronic_throttle.txt Sat Feb 18 03:20:18 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/actuators/electronic_throttle.txt Sun Dec 31 20:17:24 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -171,11 +171,9 @@ struct electronic_throttle_s { */ int8_t etbErrorCode = (int8_t)0; /** - * need 4 byte alignment - units * offset 49 */ - uint8_t alignmentFill_at_49[1]; + int8_t tcEtbDrop = (int8_t)0; /** * ETB jam timer sec @@ -186,4 +184,4 @@ struct electronic_throttle_s { static_assert(sizeof(electronic_throttle_s) == 52); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/electronic_throttle.txt Sat Feb 18 03:20:18 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/actuators/electronic_throttle.txt Sun Dec 31 20:17:24 UTC 2023 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_alphax-2chan.h b/firmware/controllers/generated/engine_configuration_generated_structures_alphax-2chan.h index 6ae5252ef2..199c594277 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_alphax-2chan.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_alphax-2chan.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:18:40 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:17:37 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3762,9 +3762,19 @@ struct engine_configuration_s { */ scaled_channel triggerCompSensorSatRpm; /** + ratio * offset 2672 */ - int8_t unusedHere[20]; + scaled_channel tractionControlSlipBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + RPM + * offset 2684 + */ + uint8_t tractionControlSpeedBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + * offset 2690 + */ + int8_t unusedHere[2]; /** * offset 2692 */ @@ -4468,10 +4478,15 @@ struct engine_configuration_s { */ float triggerVVTGapOverrideTo[VVT_TRACKING_LENGTH]; /** - units + % * offset 4348 */ - uint8_t mainUnusedEnd[208]; + int8_t tractionControlEtbDrop[TRACTION_CONTROL_ETB_DROP_SIZE][TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + units + * offset 4384 + */ + uint8_t mainUnusedEnd[172]; }; static_assert(sizeof(engine_configuration_s) == 4556); @@ -5206,17 +5221,17 @@ struct persistent_config_s { % * offset 19444 */ - scaled_channel throttle2TrimTable[6][6]; + scaled_channel throttle2TrimTable[ETB2_TRIM_SIZE][ETB2_TRIM_SIZE]; /** % * offset 19480 */ - uint8_t throttle2TrimTpsBins[6]; + uint8_t throttle2TrimTpsBins[ETB2_TRIM_SIZE]; /** RPM * offset 19486 */ - scaled_channel throttle2TrimRpmBins[6]; + scaled_channel throttle2TrimRpmBins[ETB2_TRIM_SIZE]; /** deg * offset 19492 @@ -5383,4 +5398,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22088); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:18:40 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:17:37 UTC 2023 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_alphax-4chan.h b/firmware/controllers/generated/engine_configuration_generated_structures_alphax-4chan.h index 293b16c998..5f73501d41 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_alphax-4chan.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_alphax-4chan.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:18:43 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:17:40 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3762,9 +3762,19 @@ struct engine_configuration_s { */ scaled_channel triggerCompSensorSatRpm; /** + ratio * offset 2672 */ - int8_t unusedHere[20]; + scaled_channel tractionControlSlipBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + RPM + * offset 2684 + */ + uint8_t tractionControlSpeedBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + * offset 2690 + */ + int8_t unusedHere[2]; /** * offset 2692 */ @@ -4468,10 +4478,15 @@ struct engine_configuration_s { */ float triggerVVTGapOverrideTo[VVT_TRACKING_LENGTH]; /** - units + % * offset 4348 */ - uint8_t mainUnusedEnd[208]; + int8_t tractionControlEtbDrop[TRACTION_CONTROL_ETB_DROP_SIZE][TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + units + * offset 4384 + */ + uint8_t mainUnusedEnd[172]; }; static_assert(sizeof(engine_configuration_s) == 4556); @@ -5206,17 +5221,17 @@ struct persistent_config_s { % * offset 19444 */ - scaled_channel throttle2TrimTable[6][6]; + scaled_channel throttle2TrimTable[ETB2_TRIM_SIZE][ETB2_TRIM_SIZE]; /** % * offset 19480 */ - uint8_t throttle2TrimTpsBins[6]; + uint8_t throttle2TrimTpsBins[ETB2_TRIM_SIZE]; /** RPM * offset 19486 */ - scaled_channel throttle2TrimRpmBins[6]; + scaled_channel throttle2TrimRpmBins[ETB2_TRIM_SIZE]; /** deg * offset 19492 @@ -5383,4 +5398,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22088); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:18:43 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:17:40 UTC 2023 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_alphax-4chan_f7.h b/firmware/controllers/generated/engine_configuration_generated_structures_alphax-4chan_f7.h index 41203dfb74..740b56659d 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_alphax-4chan_f7.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_alphax-4chan_f7.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:18:46 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:17:42 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3762,9 +3762,19 @@ struct engine_configuration_s { */ scaled_channel triggerCompSensorSatRpm; /** + ratio * offset 2672 */ - int8_t unusedHere[20]; + scaled_channel tractionControlSlipBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + RPM + * offset 2684 + */ + uint8_t tractionControlSpeedBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + * offset 2690 + */ + int8_t unusedHere[2]; /** * offset 2692 */ @@ -4468,10 +4478,15 @@ struct engine_configuration_s { */ float triggerVVTGapOverrideTo[VVT_TRACKING_LENGTH]; /** - units + % * offset 4348 */ - uint8_t mainUnusedEnd[208]; + int8_t tractionControlEtbDrop[TRACTION_CONTROL_ETB_DROP_SIZE][TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + units + * offset 4384 + */ + uint8_t mainUnusedEnd[172]; }; static_assert(sizeof(engine_configuration_s) == 4556); @@ -5206,17 +5221,17 @@ struct persistent_config_s { % * offset 19444 */ - scaled_channel throttle2TrimTable[6][6]; + scaled_channel throttle2TrimTable[ETB2_TRIM_SIZE][ETB2_TRIM_SIZE]; /** % * offset 19480 */ - uint8_t throttle2TrimTpsBins[6]; + uint8_t throttle2TrimTpsBins[ETB2_TRIM_SIZE]; /** RPM * offset 19486 */ - scaled_channel throttle2TrimRpmBins[6]; + scaled_channel throttle2TrimRpmBins[ETB2_TRIM_SIZE]; /** deg * offset 19492 @@ -5383,4 +5398,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22088); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:18:46 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:17:42 UTC 2023 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_alphax-8chan-revA.h b/firmware/controllers/generated/engine_configuration_generated_structures_alphax-8chan-revA.h index 57e32ccde7..c98087cfa0 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_alphax-8chan-revA.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_alphax-8chan-revA.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:18:54 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:17:50 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3762,9 +3762,19 @@ struct engine_configuration_s { */ scaled_channel triggerCompSensorSatRpm; /** + ratio * offset 2672 */ - int8_t unusedHere[20]; + scaled_channel tractionControlSlipBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + RPM + * offset 2684 + */ + uint8_t tractionControlSpeedBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + * offset 2690 + */ + int8_t unusedHere[2]; /** * offset 2692 */ @@ -4468,10 +4478,15 @@ struct engine_configuration_s { */ float triggerVVTGapOverrideTo[VVT_TRACKING_LENGTH]; /** - units + % * offset 4348 */ - uint8_t mainUnusedEnd[208]; + int8_t tractionControlEtbDrop[TRACTION_CONTROL_ETB_DROP_SIZE][TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + units + * offset 4384 + */ + uint8_t mainUnusedEnd[172]; }; static_assert(sizeof(engine_configuration_s) == 4556); @@ -5206,17 +5221,17 @@ struct persistent_config_s { % * offset 19444 */ - scaled_channel throttle2TrimTable[6][6]; + scaled_channel throttle2TrimTable[ETB2_TRIM_SIZE][ETB2_TRIM_SIZE]; /** % * offset 19480 */ - uint8_t throttle2TrimTpsBins[6]; + uint8_t throttle2TrimTpsBins[ETB2_TRIM_SIZE]; /** RPM * offset 19486 */ - scaled_channel throttle2TrimRpmBins[6]; + scaled_channel throttle2TrimRpmBins[ETB2_TRIM_SIZE]; /** deg * offset 19492 @@ -5383,4 +5398,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22088); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:18:54 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:17:50 UTC 2023 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_alphax-8chan.h b/firmware/controllers/generated/engine_configuration_generated_structures_alphax-8chan.h index 1dcda68eff..f29e321d78 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_alphax-8chan.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_alphax-8chan.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:18:48 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:17:45 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3762,9 +3762,19 @@ struct engine_configuration_s { */ scaled_channel triggerCompSensorSatRpm; /** + ratio * offset 2688 */ - int8_t unusedHere[20]; + scaled_channel tractionControlSlipBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + RPM + * offset 2700 + */ + uint8_t tractionControlSpeedBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + * offset 2706 + */ + int8_t unusedHere[2]; /** * offset 2708 */ @@ -4468,10 +4478,15 @@ struct engine_configuration_s { */ float triggerVVTGapOverrideTo[VVT_TRACKING_LENGTH]; /** - units + % * offset 4364 */ - uint8_t mainUnusedEnd[208]; + int8_t tractionControlEtbDrop[TRACTION_CONTROL_ETB_DROP_SIZE][TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + units + * offset 4400 + */ + uint8_t mainUnusedEnd[172]; }; static_assert(sizeof(engine_configuration_s) == 4572); @@ -5206,17 +5221,17 @@ struct persistent_config_s { % * offset 19460 */ - scaled_channel throttle2TrimTable[6][6]; + scaled_channel throttle2TrimTable[ETB2_TRIM_SIZE][ETB2_TRIM_SIZE]; /** % * offset 19496 */ - uint8_t throttle2TrimTpsBins[6]; + uint8_t throttle2TrimTpsBins[ETB2_TRIM_SIZE]; /** RPM * offset 19502 */ - scaled_channel throttle2TrimRpmBins[6]; + scaled_channel throttle2TrimRpmBins[ETB2_TRIM_SIZE]; /** deg * offset 19508 @@ -5383,4 +5398,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22104); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:18:48 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:17:45 UTC 2023 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_alphax-8chan_f7.h b/firmware/controllers/generated/engine_configuration_generated_structures_alphax-8chan_f7.h index 3921e53dc8..f8869dd34f 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_alphax-8chan_f7.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_alphax-8chan_f7.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:18:51 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:17:48 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3762,9 +3762,19 @@ struct engine_configuration_s { */ scaled_channel triggerCompSensorSatRpm; /** + ratio * offset 2688 */ - int8_t unusedHere[20]; + scaled_channel tractionControlSlipBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + RPM + * offset 2700 + */ + uint8_t tractionControlSpeedBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + * offset 2706 + */ + int8_t unusedHere[2]; /** * offset 2708 */ @@ -4468,10 +4478,15 @@ struct engine_configuration_s { */ float triggerVVTGapOverrideTo[VVT_TRACKING_LENGTH]; /** - units + % * offset 4364 */ - uint8_t mainUnusedEnd[208]; + int8_t tractionControlEtbDrop[TRACTION_CONTROL_ETB_DROP_SIZE][TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + units + * offset 4400 + */ + uint8_t mainUnusedEnd[172]; }; static_assert(sizeof(engine_configuration_s) == 4572); @@ -5206,17 +5221,17 @@ struct persistent_config_s { % * offset 19460 */ - scaled_channel throttle2TrimTable[6][6]; + scaled_channel throttle2TrimTable[ETB2_TRIM_SIZE][ETB2_TRIM_SIZE]; /** % * offset 19496 */ - uint8_t throttle2TrimTpsBins[6]; + uint8_t throttle2TrimTpsBins[ETB2_TRIM_SIZE]; /** RPM * offset 19502 */ - scaled_channel throttle2TrimRpmBins[6]; + scaled_channel throttle2TrimRpmBins[ETB2_TRIM_SIZE]; /** deg * offset 19508 @@ -5383,4 +5398,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22104); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:18:51 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:17:48 UTC 2023 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_at_start_f435.h b/firmware/controllers/generated/engine_configuration_generated_structures_at_start_f435.h index c10e3fe254..00152bffaa 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_at_start_f435.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_at_start_f435.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:20:25 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:19:20 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3762,9 +3762,19 @@ struct engine_configuration_s { */ scaled_channel triggerCompSensorSatRpm; /** + ratio * offset 2672 */ - int8_t unusedHere[20]; + scaled_channel tractionControlSlipBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + RPM + * offset 2684 + */ + uint8_t tractionControlSpeedBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + * offset 2690 + */ + int8_t unusedHere[2]; /** * offset 2692 */ @@ -4468,10 +4478,15 @@ struct engine_configuration_s { */ float triggerVVTGapOverrideTo[VVT_TRACKING_LENGTH]; /** - units + % * offset 4348 */ - uint8_t mainUnusedEnd[208]; + int8_t tractionControlEtbDrop[TRACTION_CONTROL_ETB_DROP_SIZE][TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + units + * offset 4384 + */ + uint8_t mainUnusedEnd[172]; }; static_assert(sizeof(engine_configuration_s) == 4556); @@ -5206,17 +5221,17 @@ struct persistent_config_s { % * offset 19444 */ - scaled_channel throttle2TrimTable[6][6]; + scaled_channel throttle2TrimTable[ETB2_TRIM_SIZE][ETB2_TRIM_SIZE]; /** % * offset 19480 */ - uint8_t throttle2TrimTpsBins[6]; + uint8_t throttle2TrimTpsBins[ETB2_TRIM_SIZE]; /** RPM * offset 19486 */ - scaled_channel throttle2TrimRpmBins[6]; + scaled_channel throttle2TrimRpmBins[ETB2_TRIM_SIZE]; /** deg * offset 19492 @@ -5383,4 +5398,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22088); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:20:25 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:19:20 UTC 2023 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_atlas.h b/firmware/controllers/generated/engine_configuration_generated_structures_atlas.h index 18020de255..c7272b6ac1 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_atlas.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_atlas.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:20:18 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:19:13 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3762,9 +3762,19 @@ struct engine_configuration_s { */ scaled_channel triggerCompSensorSatRpm; /** + ratio * offset 2672 */ - int8_t unusedHere[20]; + scaled_channel tractionControlSlipBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + RPM + * offset 2684 + */ + uint8_t tractionControlSpeedBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + * offset 2690 + */ + int8_t unusedHere[2]; /** * offset 2692 */ @@ -4468,10 +4478,15 @@ struct engine_configuration_s { */ float triggerVVTGapOverrideTo[VVT_TRACKING_LENGTH]; /** - units + % * offset 4188 */ - uint8_t mainUnusedEnd[208]; + int8_t tractionControlEtbDrop[TRACTION_CONTROL_ETB_DROP_SIZE][TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + units + * offset 4224 + */ + uint8_t mainUnusedEnd[172]; }; static_assert(sizeof(engine_configuration_s) == 4396); @@ -5206,17 +5221,17 @@ struct persistent_config_s { % * offset 18944 */ - scaled_channel throttle2TrimTable[6][6]; + scaled_channel throttle2TrimTable[ETB2_TRIM_SIZE][ETB2_TRIM_SIZE]; /** % * offset 18980 */ - uint8_t throttle2TrimTpsBins[6]; + uint8_t throttle2TrimTpsBins[ETB2_TRIM_SIZE]; /** RPM * offset 18986 */ - scaled_channel throttle2TrimRpmBins[6]; + scaled_channel throttle2TrimRpmBins[ETB2_TRIM_SIZE]; /** deg * offset 18992 @@ -5383,4 +5398,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 21588); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:20:18 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:19:13 UTC 2023 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_f407-discovery.h b/firmware/controllers/generated/engine_configuration_generated_structures_f407-discovery.h index 6fe85765e9..1593e0147c 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_f407-discovery.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_f407-discovery.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:20:23 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:19:18 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3762,9 +3762,19 @@ struct engine_configuration_s { */ scaled_channel triggerCompSensorSatRpm; /** + ratio * offset 2672 */ - int8_t unusedHere[20]; + scaled_channel tractionControlSlipBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + RPM + * offset 2684 + */ + uint8_t tractionControlSpeedBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + * offset 2690 + */ + int8_t unusedHere[2]; /** * offset 2692 */ @@ -4468,10 +4478,15 @@ struct engine_configuration_s { */ float triggerVVTGapOverrideTo[VVT_TRACKING_LENGTH]; /** - units + % * offset 4348 */ - uint8_t mainUnusedEnd[208]; + int8_t tractionControlEtbDrop[TRACTION_CONTROL_ETB_DROP_SIZE][TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + units + * offset 4384 + */ + uint8_t mainUnusedEnd[172]; }; static_assert(sizeof(engine_configuration_s) == 4556); @@ -5206,17 +5221,17 @@ struct persistent_config_s { % * offset 19444 */ - scaled_channel throttle2TrimTable[6][6]; + scaled_channel throttle2TrimTable[ETB2_TRIM_SIZE][ETB2_TRIM_SIZE]; /** % * offset 19480 */ - uint8_t throttle2TrimTpsBins[6]; + uint8_t throttle2TrimTpsBins[ETB2_TRIM_SIZE]; /** RPM * offset 19486 */ - scaled_channel throttle2TrimRpmBins[6]; + scaled_channel throttle2TrimRpmBins[ETB2_TRIM_SIZE]; /** deg * offset 19492 @@ -5383,4 +5398,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22088); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:20:23 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:19:18 UTC 2023 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_f429-discovery.h b/firmware/controllers/generated/engine_configuration_generated_structures_f429-discovery.h index 22aef4a1a8..9c0444a229 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_f429-discovery.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_f429-discovery.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:20:03 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:18:59 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3762,9 +3762,19 @@ struct engine_configuration_s { */ scaled_channel triggerCompSensorSatRpm; /** + ratio * offset 2672 */ - int8_t unusedHere[20]; + scaled_channel tractionControlSlipBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + RPM + * offset 2684 + */ + uint8_t tractionControlSpeedBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + * offset 2690 + */ + int8_t unusedHere[2]; /** * offset 2692 */ @@ -4468,10 +4478,15 @@ struct engine_configuration_s { */ float triggerVVTGapOverrideTo[VVT_TRACKING_LENGTH]; /** - units + % * offset 4348 */ - uint8_t mainUnusedEnd[208]; + int8_t tractionControlEtbDrop[TRACTION_CONTROL_ETB_DROP_SIZE][TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + units + * offset 4384 + */ + uint8_t mainUnusedEnd[172]; }; static_assert(sizeof(engine_configuration_s) == 4556); @@ -5206,17 +5221,17 @@ struct persistent_config_s { % * offset 19444 */ - scaled_channel throttle2TrimTable[6][6]; + scaled_channel throttle2TrimTable[ETB2_TRIM_SIZE][ETB2_TRIM_SIZE]; /** % * offset 19480 */ - uint8_t throttle2TrimTpsBins[6]; + uint8_t throttle2TrimTpsBins[ETB2_TRIM_SIZE]; /** RPM * offset 19486 */ - scaled_channel throttle2TrimRpmBins[6]; + scaled_channel throttle2TrimRpmBins[ETB2_TRIM_SIZE]; /** deg * offset 19492 @@ -5383,4 +5398,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22088); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:20:03 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:18:59 UTC 2023 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_f469-discovery.h b/firmware/controllers/generated/engine_configuration_generated_structures_f469-discovery.h index b595393994..303aef759c 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_f469-discovery.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_f469-discovery.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:20:06 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:19:01 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3762,9 +3762,19 @@ struct engine_configuration_s { */ scaled_channel triggerCompSensorSatRpm; /** + ratio * offset 2672 */ - int8_t unusedHere[20]; + scaled_channel tractionControlSlipBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + RPM + * offset 2684 + */ + uint8_t tractionControlSpeedBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + * offset 2690 + */ + int8_t unusedHere[2]; /** * offset 2692 */ @@ -4468,10 +4478,15 @@ struct engine_configuration_s { */ float triggerVVTGapOverrideTo[VVT_TRACKING_LENGTH]; /** - units + % * offset 4348 */ - uint8_t mainUnusedEnd[208]; + int8_t tractionControlEtbDrop[TRACTION_CONTROL_ETB_DROP_SIZE][TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + units + * offset 4384 + */ + uint8_t mainUnusedEnd[172]; }; static_assert(sizeof(engine_configuration_s) == 4556); @@ -5206,17 +5221,17 @@ struct persistent_config_s { % * offset 19444 */ - scaled_channel throttle2TrimTable[6][6]; + scaled_channel throttle2TrimTable[ETB2_TRIM_SIZE][ETB2_TRIM_SIZE]; /** % * offset 19480 */ - uint8_t throttle2TrimTpsBins[6]; + uint8_t throttle2TrimTpsBins[ETB2_TRIM_SIZE]; /** RPM * offset 19486 */ - scaled_channel throttle2TrimRpmBins[6]; + scaled_channel throttle2TrimRpmBins[ETB2_TRIM_SIZE]; /** deg * offset 19492 @@ -5383,4 +5398,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22088); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:20:06 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:19:01 UTC 2023 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_frankenso_na6.h b/firmware/controllers/generated/engine_configuration_generated_structures_frankenso_na6.h index a64ff41716..9450126ed0 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_frankenso_na6.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_frankenso_na6.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:19:48 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:18:44 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3762,9 +3762,19 @@ struct engine_configuration_s { */ scaled_channel triggerCompSensorSatRpm; /** + ratio * offset 2672 */ - int8_t unusedHere[20]; + scaled_channel tractionControlSlipBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + RPM + * offset 2684 + */ + uint8_t tractionControlSpeedBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + * offset 2690 + */ + int8_t unusedHere[2]; /** * offset 2692 */ @@ -4468,10 +4478,15 @@ struct engine_configuration_s { */ float triggerVVTGapOverrideTo[VVT_TRACKING_LENGTH]; /** - units + % * offset 4348 */ - uint8_t mainUnusedEnd[208]; + int8_t tractionControlEtbDrop[TRACTION_CONTROL_ETB_DROP_SIZE][TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + units + * offset 4384 + */ + uint8_t mainUnusedEnd[172]; }; static_assert(sizeof(engine_configuration_s) == 4556); @@ -5206,17 +5221,17 @@ struct persistent_config_s { % * offset 19444 */ - scaled_channel throttle2TrimTable[6][6]; + scaled_channel throttle2TrimTable[ETB2_TRIM_SIZE][ETB2_TRIM_SIZE]; /** % * offset 19480 */ - uint8_t throttle2TrimTpsBins[6]; + uint8_t throttle2TrimTpsBins[ETB2_TRIM_SIZE]; /** RPM * offset 19486 */ - scaled_channel throttle2TrimRpmBins[6]; + scaled_channel throttle2TrimRpmBins[ETB2_TRIM_SIZE]; /** deg * offset 19492 @@ -5383,4 +5398,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22088); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:19:48 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:18:44 UTC 2023 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_hellen-112-17.h b/firmware/controllers/generated/engine_configuration_generated_structures_hellen-112-17.h index 25a3e2d805..750d21ddd2 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_hellen-112-17.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_hellen-112-17.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:19:15 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:18:11 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3762,9 +3762,19 @@ struct engine_configuration_s { */ scaled_channel triggerCompSensorSatRpm; /** + ratio * offset 2672 */ - int8_t unusedHere[20]; + scaled_channel tractionControlSlipBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + RPM + * offset 2684 + */ + uint8_t tractionControlSpeedBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + * offset 2690 + */ + int8_t unusedHere[2]; /** * offset 2692 */ @@ -4468,10 +4478,15 @@ struct engine_configuration_s { */ float triggerVVTGapOverrideTo[VVT_TRACKING_LENGTH]; /** - units + % * offset 4348 */ - uint8_t mainUnusedEnd[208]; + int8_t tractionControlEtbDrop[TRACTION_CONTROL_ETB_DROP_SIZE][TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + units + * offset 4384 + */ + uint8_t mainUnusedEnd[172]; }; static_assert(sizeof(engine_configuration_s) == 4556); @@ -5206,17 +5221,17 @@ struct persistent_config_s { % * offset 19444 */ - scaled_channel throttle2TrimTable[6][6]; + scaled_channel throttle2TrimTable[ETB2_TRIM_SIZE][ETB2_TRIM_SIZE]; /** % * offset 19480 */ - uint8_t throttle2TrimTpsBins[6]; + uint8_t throttle2TrimTpsBins[ETB2_TRIM_SIZE]; /** RPM * offset 19486 */ - scaled_channel throttle2TrimRpmBins[6]; + scaled_channel throttle2TrimRpmBins[ETB2_TRIM_SIZE]; /** deg * offset 19492 @@ -5383,4 +5398,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22088); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:19:15 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:18:11 UTC 2023 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_hellen-gm-e67.h b/firmware/controllers/generated/engine_configuration_generated_structures_hellen-gm-e67.h index 824962824e..5767ba95f1 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_hellen-gm-e67.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_hellen-gm-e67.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:19:25 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:18:21 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3762,9 +3762,19 @@ struct engine_configuration_s { */ scaled_channel triggerCompSensorSatRpm; /** + ratio * offset 2672 */ - int8_t unusedHere[20]; + scaled_channel tractionControlSlipBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + RPM + * offset 2684 + */ + uint8_t tractionControlSpeedBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + * offset 2690 + */ + int8_t unusedHere[2]; /** * offset 2692 */ @@ -4468,10 +4478,15 @@ struct engine_configuration_s { */ float triggerVVTGapOverrideTo[VVT_TRACKING_LENGTH]; /** - units + % * offset 4348 */ - uint8_t mainUnusedEnd[208]; + int8_t tractionControlEtbDrop[TRACTION_CONTROL_ETB_DROP_SIZE][TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + units + * offset 4384 + */ + uint8_t mainUnusedEnd[172]; }; static_assert(sizeof(engine_configuration_s) == 4556); @@ -5206,17 +5221,17 @@ struct persistent_config_s { % * offset 19444 */ - scaled_channel throttle2TrimTable[6][6]; + scaled_channel throttle2TrimTable[ETB2_TRIM_SIZE][ETB2_TRIM_SIZE]; /** % * offset 19480 */ - uint8_t throttle2TrimTpsBins[6]; + uint8_t throttle2TrimTpsBins[ETB2_TRIM_SIZE]; /** RPM * offset 19486 */ - scaled_channel throttle2TrimRpmBins[6]; + scaled_channel throttle2TrimRpmBins[ETB2_TRIM_SIZE]; /** deg * offset 19492 @@ -5383,4 +5398,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22088); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:19:25 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:18:21 UTC 2023 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_hellen-honda-k.h b/firmware/controllers/generated/engine_configuration_generated_structures_hellen-honda-k.h index ff4606761e..12e79677a9 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_hellen-honda-k.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_hellen-honda-k.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:19:04 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:18:01 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3762,9 +3762,19 @@ struct engine_configuration_s { */ scaled_channel triggerCompSensorSatRpm; /** + ratio * offset 2672 */ - int8_t unusedHere[20]; + scaled_channel tractionControlSlipBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + RPM + * offset 2684 + */ + uint8_t tractionControlSpeedBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + * offset 2690 + */ + int8_t unusedHere[2]; /** * offset 2692 */ @@ -4468,10 +4478,15 @@ struct engine_configuration_s { */ float triggerVVTGapOverrideTo[VVT_TRACKING_LENGTH]; /** - units + % * offset 4348 */ - uint8_t mainUnusedEnd[208]; + int8_t tractionControlEtbDrop[TRACTION_CONTROL_ETB_DROP_SIZE][TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + units + * offset 4384 + */ + uint8_t mainUnusedEnd[172]; }; static_assert(sizeof(engine_configuration_s) == 4556); @@ -5206,17 +5221,17 @@ struct persistent_config_s { % * offset 20116 */ - scaled_channel throttle2TrimTable[6][6]; + scaled_channel throttle2TrimTable[ETB2_TRIM_SIZE][ETB2_TRIM_SIZE]; /** % * offset 20152 */ - uint8_t throttle2TrimTpsBins[6]; + uint8_t throttle2TrimTpsBins[ETB2_TRIM_SIZE]; /** RPM * offset 20158 */ - scaled_channel throttle2TrimRpmBins[6]; + scaled_channel throttle2TrimRpmBins[ETB2_TRIM_SIZE]; /** deg * offset 20164 @@ -5383,4 +5398,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22760); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:19:04 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:18:01 UTC 2023 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_hellen-nb1.h b/firmware/controllers/generated/engine_configuration_generated_structures_hellen-nb1.h index 6d55086a49..75b1da7954 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_hellen-nb1.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_hellen-nb1.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:19:23 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:18:19 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3762,9 +3762,19 @@ struct engine_configuration_s { */ scaled_channel triggerCompSensorSatRpm; /** + ratio * offset 2672 */ - int8_t unusedHere[20]; + scaled_channel tractionControlSlipBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + RPM + * offset 2684 + */ + uint8_t tractionControlSpeedBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + * offset 2690 + */ + int8_t unusedHere[2]; /** * offset 2692 */ @@ -4468,10 +4478,15 @@ struct engine_configuration_s { */ float triggerVVTGapOverrideTo[VVT_TRACKING_LENGTH]; /** - units + % * offset 4348 */ - uint8_t mainUnusedEnd[208]; + int8_t tractionControlEtbDrop[TRACTION_CONTROL_ETB_DROP_SIZE][TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + units + * offset 4384 + */ + uint8_t mainUnusedEnd[172]; }; static_assert(sizeof(engine_configuration_s) == 4556); @@ -5206,17 +5221,17 @@ struct persistent_config_s { % * offset 19444 */ - scaled_channel throttle2TrimTable[6][6]; + scaled_channel throttle2TrimTable[ETB2_TRIM_SIZE][ETB2_TRIM_SIZE]; /** % * offset 19480 */ - uint8_t throttle2TrimTpsBins[6]; + uint8_t throttle2TrimTpsBins[ETB2_TRIM_SIZE]; /** RPM * offset 19486 */ - scaled_channel throttle2TrimRpmBins[6]; + scaled_channel throttle2TrimRpmBins[ETB2_TRIM_SIZE]; /** deg * offset 19492 @@ -5383,4 +5398,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22088); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:19:23 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:18:19 UTC 2023 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_hellen121nissan.h b/firmware/controllers/generated/engine_configuration_generated_structures_hellen121nissan.h index 48c6dd7728..210dceaaec 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_hellen121nissan.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_hellen121nissan.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:19:02 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:17:58 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3762,9 +3762,19 @@ struct engine_configuration_s { */ scaled_channel triggerCompSensorSatRpm; /** + ratio * offset 2672 */ - int8_t unusedHere[20]; + scaled_channel tractionControlSlipBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + RPM + * offset 2684 + */ + uint8_t tractionControlSpeedBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + * offset 2690 + */ + int8_t unusedHere[2]; /** * offset 2692 */ @@ -4468,10 +4478,15 @@ struct engine_configuration_s { */ float triggerVVTGapOverrideTo[VVT_TRACKING_LENGTH]; /** - units + % * offset 4348 */ - uint8_t mainUnusedEnd[208]; + int8_t tractionControlEtbDrop[TRACTION_CONTROL_ETB_DROP_SIZE][TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + units + * offset 4384 + */ + uint8_t mainUnusedEnd[172]; }; static_assert(sizeof(engine_configuration_s) == 4556); @@ -5206,17 +5221,17 @@ struct persistent_config_s { % * offset 19444 */ - scaled_channel throttle2TrimTable[6][6]; + scaled_channel throttle2TrimTable[ETB2_TRIM_SIZE][ETB2_TRIM_SIZE]; /** % * offset 19480 */ - uint8_t throttle2TrimTpsBins[6]; + uint8_t throttle2TrimTpsBins[ETB2_TRIM_SIZE]; /** RPM * offset 19486 */ - scaled_channel throttle2TrimRpmBins[6]; + scaled_channel throttle2TrimRpmBins[ETB2_TRIM_SIZE]; /** deg * offset 19492 @@ -5383,4 +5398,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22088); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:19:02 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:17:58 UTC 2023 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_hellen121vag.h b/firmware/controllers/generated/engine_configuration_generated_structures_hellen121vag.h index 0fa910d3fc..3e2fa1e910 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_hellen121vag.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_hellen121vag.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:18:59 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:17:56 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3762,9 +3762,19 @@ struct engine_configuration_s { */ scaled_channel triggerCompSensorSatRpm; /** + ratio * offset 2672 */ - int8_t unusedHere[20]; + scaled_channel tractionControlSlipBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + RPM + * offset 2684 + */ + uint8_t tractionControlSpeedBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + * offset 2690 + */ + int8_t unusedHere[2]; /** * offset 2692 */ @@ -4468,10 +4478,15 @@ struct engine_configuration_s { */ float triggerVVTGapOverrideTo[VVT_TRACKING_LENGTH]; /** - units + % * offset 4348 */ - uint8_t mainUnusedEnd[208]; + int8_t tractionControlEtbDrop[TRACTION_CONTROL_ETB_DROP_SIZE][TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + units + * offset 4384 + */ + uint8_t mainUnusedEnd[172]; }; static_assert(sizeof(engine_configuration_s) == 4556); @@ -5206,17 +5221,17 @@ struct persistent_config_s { % * offset 19444 */ - scaled_channel throttle2TrimTable[6][6]; + scaled_channel throttle2TrimTable[ETB2_TRIM_SIZE][ETB2_TRIM_SIZE]; /** % * offset 19480 */ - uint8_t throttle2TrimTpsBins[6]; + uint8_t throttle2TrimTpsBins[ETB2_TRIM_SIZE]; /** RPM * offset 19486 */ - scaled_channel throttle2TrimRpmBins[6]; + scaled_channel throttle2TrimRpmBins[ETB2_TRIM_SIZE]; /** deg * offset 19492 @@ -5383,4 +5398,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22088); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:18:59 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:17:56 UTC 2023 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_hellen128.h b/firmware/controllers/generated/engine_configuration_generated_structures_hellen128.h index 0d476ef702..71be426ba2 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_hellen128.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_hellen128.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:18:56 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:17:53 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3762,9 +3762,19 @@ struct engine_configuration_s { */ scaled_channel triggerCompSensorSatRpm; /** + ratio * offset 2672 */ - int8_t unusedHere[20]; + scaled_channel tractionControlSlipBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + RPM + * offset 2684 + */ + uint8_t tractionControlSpeedBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + * offset 2690 + */ + int8_t unusedHere[2]; /** * offset 2692 */ @@ -4468,10 +4478,15 @@ struct engine_configuration_s { */ float triggerVVTGapOverrideTo[VVT_TRACKING_LENGTH]; /** - units + % * offset 4348 */ - uint8_t mainUnusedEnd[208]; + int8_t tractionControlEtbDrop[TRACTION_CONTROL_ETB_DROP_SIZE][TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + units + * offset 4384 + */ + uint8_t mainUnusedEnd[172]; }; static_assert(sizeof(engine_configuration_s) == 4556); @@ -5206,17 +5221,17 @@ struct persistent_config_s { % * offset 19444 */ - scaled_channel throttle2TrimTable[6][6]; + scaled_channel throttle2TrimTable[ETB2_TRIM_SIZE][ETB2_TRIM_SIZE]; /** % * offset 19480 */ - uint8_t throttle2TrimTpsBins[6]; + uint8_t throttle2TrimTpsBins[ETB2_TRIM_SIZE]; /** RPM * offset 19486 */ - scaled_channel throttle2TrimRpmBins[6]; + scaled_channel throttle2TrimRpmBins[ETB2_TRIM_SIZE]; /** deg * offset 19492 @@ -5383,4 +5398,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22088); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:18:56 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:17:53 UTC 2023 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_hellen154hyundai.h b/firmware/controllers/generated/engine_configuration_generated_structures_hellen154hyundai.h index acbaaa46dc..fbbdfba66f 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_hellen154hyundai.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_hellen154hyundai.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:19:07 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:18:03 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3762,9 +3762,19 @@ struct engine_configuration_s { */ scaled_channel triggerCompSensorSatRpm; /** + ratio * offset 2672 */ - int8_t unusedHere[20]; + scaled_channel tractionControlSlipBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + RPM + * offset 2684 + */ + uint8_t tractionControlSpeedBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + * offset 2690 + */ + int8_t unusedHere[2]; /** * offset 2692 */ @@ -4468,10 +4478,15 @@ struct engine_configuration_s { */ float triggerVVTGapOverrideTo[VVT_TRACKING_LENGTH]; /** - units + % * offset 4348 */ - uint8_t mainUnusedEnd[208]; + int8_t tractionControlEtbDrop[TRACTION_CONTROL_ETB_DROP_SIZE][TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + units + * offset 4384 + */ + uint8_t mainUnusedEnd[172]; }; static_assert(sizeof(engine_configuration_s) == 4556); @@ -5206,17 +5221,17 @@ struct persistent_config_s { % * offset 19444 */ - scaled_channel throttle2TrimTable[6][6]; + scaled_channel throttle2TrimTable[ETB2_TRIM_SIZE][ETB2_TRIM_SIZE]; /** % * offset 19480 */ - uint8_t throttle2TrimTpsBins[6]; + uint8_t throttle2TrimTpsBins[ETB2_TRIM_SIZE]; /** RPM * offset 19486 */ - scaled_channel throttle2TrimRpmBins[6]; + scaled_channel throttle2TrimRpmBins[ETB2_TRIM_SIZE]; /** deg * offset 19492 @@ -5383,4 +5398,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22088); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:19:07 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:18:03 UTC 2023 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_hellen72.h b/firmware/controllers/generated/engine_configuration_generated_structures_hellen72.h index 65782f4dbb..f0f7ea0706 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_hellen72.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_hellen72.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:19:18 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:18:14 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3762,9 +3762,19 @@ struct engine_configuration_s { */ scaled_channel triggerCompSensorSatRpm; /** + ratio * offset 2672 */ - int8_t unusedHere[20]; + scaled_channel tractionControlSlipBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + RPM + * offset 2684 + */ + uint8_t tractionControlSpeedBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + * offset 2690 + */ + int8_t unusedHere[2]; /** * offset 2692 */ @@ -4468,10 +4478,15 @@ struct engine_configuration_s { */ float triggerVVTGapOverrideTo[VVT_TRACKING_LENGTH]; /** - units + % * offset 4348 */ - uint8_t mainUnusedEnd[208]; + int8_t tractionControlEtbDrop[TRACTION_CONTROL_ETB_DROP_SIZE][TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + units + * offset 4384 + */ + uint8_t mainUnusedEnd[172]; }; static_assert(sizeof(engine_configuration_s) == 4556); @@ -5206,17 +5221,17 @@ struct persistent_config_s { % * offset 19444 */ - scaled_channel throttle2TrimTable[6][6]; + scaled_channel throttle2TrimTable[ETB2_TRIM_SIZE][ETB2_TRIM_SIZE]; /** % * offset 19480 */ - uint8_t throttle2TrimTpsBins[6]; + uint8_t throttle2TrimTpsBins[ETB2_TRIM_SIZE]; /** RPM * offset 19486 */ - scaled_channel throttle2TrimRpmBins[6]; + scaled_channel throttle2TrimRpmBins[ETB2_TRIM_SIZE]; /** deg * offset 19492 @@ -5383,4 +5398,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22088); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:19:18 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:18:14 UTC 2023 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_hellen81.h b/firmware/controllers/generated/engine_configuration_generated_structures_hellen81.h index 7ed9d3b60b..4561231b82 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_hellen81.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_hellen81.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:19:20 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:18:16 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3762,9 +3762,19 @@ struct engine_configuration_s { */ scaled_channel triggerCompSensorSatRpm; /** + ratio * offset 2672 */ - int8_t unusedHere[20]; + scaled_channel tractionControlSlipBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + RPM + * offset 2684 + */ + uint8_t tractionControlSpeedBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + * offset 2690 + */ + int8_t unusedHere[2]; /** * offset 2692 */ @@ -4468,10 +4478,15 @@ struct engine_configuration_s { */ float triggerVVTGapOverrideTo[VVT_TRACKING_LENGTH]; /** - units + % * offset 4348 */ - uint8_t mainUnusedEnd[208]; + int8_t tractionControlEtbDrop[TRACTION_CONTROL_ETB_DROP_SIZE][TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + units + * offset 4384 + */ + uint8_t mainUnusedEnd[172]; }; static_assert(sizeof(engine_configuration_s) == 4556); @@ -5206,17 +5221,17 @@ struct persistent_config_s { % * offset 19444 */ - scaled_channel throttle2TrimTable[6][6]; + scaled_channel throttle2TrimTable[ETB2_TRIM_SIZE][ETB2_TRIM_SIZE]; /** % * offset 19480 */ - uint8_t throttle2TrimTpsBins[6]; + uint8_t throttle2TrimTpsBins[ETB2_TRIM_SIZE]; /** RPM * offset 19486 */ - scaled_channel throttle2TrimRpmBins[6]; + scaled_channel throttle2TrimRpmBins[ETB2_TRIM_SIZE]; /** deg * offset 19492 @@ -5383,4 +5398,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22088); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:19:20 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:18:16 UTC 2023 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_hellen88bmw.h b/firmware/controllers/generated/engine_configuration_generated_structures_hellen88bmw.h index 3f4a3f30fb..1affcc5536 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_hellen88bmw.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_hellen88bmw.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:19:10 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:18:06 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3762,9 +3762,19 @@ struct engine_configuration_s { */ scaled_channel triggerCompSensorSatRpm; /** + ratio * offset 2672 */ - int8_t unusedHere[20]; + scaled_channel tractionControlSlipBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + RPM + * offset 2684 + */ + uint8_t tractionControlSpeedBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + * offset 2690 + */ + int8_t unusedHere[2]; /** * offset 2692 */ @@ -4468,10 +4478,15 @@ struct engine_configuration_s { */ float triggerVVTGapOverrideTo[VVT_TRACKING_LENGTH]; /** - units + % * offset 4348 */ - uint8_t mainUnusedEnd[208]; + int8_t tractionControlEtbDrop[TRACTION_CONTROL_ETB_DROP_SIZE][TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + units + * offset 4384 + */ + uint8_t mainUnusedEnd[172]; }; static_assert(sizeof(engine_configuration_s) == 4556); @@ -5206,17 +5221,17 @@ struct persistent_config_s { % * offset 19444 */ - scaled_channel throttle2TrimTable[6][6]; + scaled_channel throttle2TrimTable[ETB2_TRIM_SIZE][ETB2_TRIM_SIZE]; /** % * offset 19480 */ - uint8_t throttle2TrimTpsBins[6]; + uint8_t throttle2TrimTpsBins[ETB2_TRIM_SIZE]; /** RPM * offset 19486 */ - scaled_channel throttle2TrimRpmBins[6]; + scaled_channel throttle2TrimRpmBins[ETB2_TRIM_SIZE]; /** deg * offset 19492 @@ -5383,4 +5398,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22088); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:19:10 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:18:06 UTC 2023 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_hellenNA6.h b/firmware/controllers/generated/engine_configuration_generated_structures_hellenNA6.h index 0fd8b12f23..d3420c3164 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_hellenNA6.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_hellenNA6.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:19:28 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:18:24 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3762,9 +3762,19 @@ struct engine_configuration_s { */ scaled_channel triggerCompSensorSatRpm; /** + ratio * offset 2672 */ - int8_t unusedHere[20]; + scaled_channel tractionControlSlipBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + RPM + * offset 2684 + */ + uint8_t tractionControlSpeedBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + * offset 2690 + */ + int8_t unusedHere[2]; /** * offset 2692 */ @@ -4468,10 +4478,15 @@ struct engine_configuration_s { */ float triggerVVTGapOverrideTo[VVT_TRACKING_LENGTH]; /** - units + % * offset 4348 */ - uint8_t mainUnusedEnd[208]; + int8_t tractionControlEtbDrop[TRACTION_CONTROL_ETB_DROP_SIZE][TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + units + * offset 4384 + */ + uint8_t mainUnusedEnd[172]; }; static_assert(sizeof(engine_configuration_s) == 4556); @@ -5206,17 +5221,17 @@ struct persistent_config_s { % * offset 19444 */ - scaled_channel throttle2TrimTable[6][6]; + scaled_channel throttle2TrimTable[ETB2_TRIM_SIZE][ETB2_TRIM_SIZE]; /** % * offset 19480 */ - uint8_t throttle2TrimTpsBins[6]; + uint8_t throttle2TrimTpsBins[ETB2_TRIM_SIZE]; /** RPM * offset 19486 */ - scaled_channel throttle2TrimRpmBins[6]; + scaled_channel throttle2TrimRpmBins[ETB2_TRIM_SIZE]; /** deg * offset 19492 @@ -5383,4 +5398,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22088); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:19:28 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:18:24 UTC 2023 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_hellenNA8_96.h b/firmware/controllers/generated/engine_configuration_generated_structures_hellenNA8_96.h index 14261b3e01..285120b3a3 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_hellenNA8_96.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_hellenNA8_96.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:19:30 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:18:27 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3762,9 +3762,19 @@ struct engine_configuration_s { */ scaled_channel triggerCompSensorSatRpm; /** + ratio * offset 2672 */ - int8_t unusedHere[20]; + scaled_channel tractionControlSlipBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + RPM + * offset 2684 + */ + uint8_t tractionControlSpeedBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + * offset 2690 + */ + int8_t unusedHere[2]; /** * offset 2692 */ @@ -4468,10 +4478,15 @@ struct engine_configuration_s { */ float triggerVVTGapOverrideTo[VVT_TRACKING_LENGTH]; /** - units + % * offset 4348 */ - uint8_t mainUnusedEnd[208]; + int8_t tractionControlEtbDrop[TRACTION_CONTROL_ETB_DROP_SIZE][TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + units + * offset 4384 + */ + uint8_t mainUnusedEnd[172]; }; static_assert(sizeof(engine_configuration_s) == 4556); @@ -5206,17 +5221,17 @@ struct persistent_config_s { % * offset 19444 */ - scaled_channel throttle2TrimTable[6][6]; + scaled_channel throttle2TrimTable[ETB2_TRIM_SIZE][ETB2_TRIM_SIZE]; /** % * offset 19480 */ - uint8_t throttle2TrimTpsBins[6]; + uint8_t throttle2TrimTpsBins[ETB2_TRIM_SIZE]; /** RPM * offset 19486 */ - scaled_channel throttle2TrimRpmBins[6]; + scaled_channel throttle2TrimRpmBins[ETB2_TRIM_SIZE]; /** deg * offset 19492 @@ -5383,4 +5398,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22088); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:19:30 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:18:27 UTC 2023 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_m74_9.h b/firmware/controllers/generated/engine_configuration_generated_structures_m74_9.h index dab3f58434..05ee6975db 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_m74_9.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_m74_9.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:19:41 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:18:37 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3762,9 +3762,19 @@ struct engine_configuration_s { */ scaled_channel triggerCompSensorSatRpm; /** + ratio * offset 2672 */ - int8_t unusedHere[20]; + scaled_channel tractionControlSlipBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + RPM + * offset 2684 + */ + uint8_t tractionControlSpeedBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + * offset 2690 + */ + int8_t unusedHere[2]; /** * offset 2692 */ @@ -4468,10 +4478,15 @@ struct engine_configuration_s { */ float triggerVVTGapOverrideTo[VVT_TRACKING_LENGTH]; /** - units + % * offset 4348 */ - uint8_t mainUnusedEnd[208]; + int8_t tractionControlEtbDrop[TRACTION_CONTROL_ETB_DROP_SIZE][TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + units + * offset 4384 + */ + uint8_t mainUnusedEnd[172]; }; static_assert(sizeof(engine_configuration_s) == 4556); @@ -5206,17 +5221,17 @@ struct persistent_config_s { % * offset 19444 */ - scaled_channel throttle2TrimTable[6][6]; + scaled_channel throttle2TrimTable[ETB2_TRIM_SIZE][ETB2_TRIM_SIZE]; /** % * offset 19480 */ - uint8_t throttle2TrimTpsBins[6]; + uint8_t throttle2TrimTpsBins[ETB2_TRIM_SIZE]; /** RPM * offset 19486 */ - scaled_channel throttle2TrimRpmBins[6]; + scaled_channel throttle2TrimRpmBins[ETB2_TRIM_SIZE]; /** deg * offset 19492 @@ -5383,4 +5398,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22088); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:19:41 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:18:37 UTC 2023 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_mre_f4.h b/firmware/controllers/generated/engine_configuration_generated_structures_mre_f4.h index f046c89377..493d8fa4a0 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_mre_f4.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_mre_f4.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:19:38 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:18:34 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3762,9 +3762,19 @@ struct engine_configuration_s { */ scaled_channel triggerCompSensorSatRpm; /** + ratio * offset 2672 */ - int8_t unusedHere[20]; + scaled_channel tractionControlSlipBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + RPM + * offset 2684 + */ + uint8_t tractionControlSpeedBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + * offset 2690 + */ + int8_t unusedHere[2]; /** * offset 2692 */ @@ -4468,10 +4478,15 @@ struct engine_configuration_s { */ float triggerVVTGapOverrideTo[VVT_TRACKING_LENGTH]; /** - units + % * offset 4348 */ - uint8_t mainUnusedEnd[208]; + int8_t tractionControlEtbDrop[TRACTION_CONTROL_ETB_DROP_SIZE][TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + units + * offset 4384 + */ + uint8_t mainUnusedEnd[172]; }; static_assert(sizeof(engine_configuration_s) == 4556); @@ -5206,17 +5221,17 @@ struct persistent_config_s { % * offset 19444 */ - scaled_channel throttle2TrimTable[6][6]; + scaled_channel throttle2TrimTable[ETB2_TRIM_SIZE][ETB2_TRIM_SIZE]; /** % * offset 19480 */ - uint8_t throttle2TrimTpsBins[6]; + uint8_t throttle2TrimTpsBins[ETB2_TRIM_SIZE]; /** RPM * offset 19486 */ - scaled_channel throttle2TrimRpmBins[6]; + scaled_channel throttle2TrimRpmBins[ETB2_TRIM_SIZE]; /** deg * offset 19492 @@ -5383,4 +5398,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22088); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:19:38 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:18:34 UTC 2023 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_mre_f7.h b/firmware/controllers/generated/engine_configuration_generated_structures_mre_f7.h index a127fc697e..00781fdb4e 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_mre_f7.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_mre_f7.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:19:35 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:18:32 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3762,9 +3762,19 @@ struct engine_configuration_s { */ scaled_channel triggerCompSensorSatRpm; /** + ratio * offset 2672 */ - int8_t unusedHere[20]; + scaled_channel tractionControlSlipBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + RPM + * offset 2684 + */ + uint8_t tractionControlSpeedBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + * offset 2690 + */ + int8_t unusedHere[2]; /** * offset 2692 */ @@ -4468,10 +4478,15 @@ struct engine_configuration_s { */ float triggerVVTGapOverrideTo[VVT_TRACKING_LENGTH]; /** - units + % * offset 4348 */ - uint8_t mainUnusedEnd[208]; + int8_t tractionControlEtbDrop[TRACTION_CONTROL_ETB_DROP_SIZE][TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + units + * offset 4384 + */ + uint8_t mainUnusedEnd[172]; }; static_assert(sizeof(engine_configuration_s) == 4556); @@ -5206,17 +5221,17 @@ struct persistent_config_s { % * offset 19444 */ - scaled_channel throttle2TrimTable[6][6]; + scaled_channel throttle2TrimTable[ETB2_TRIM_SIZE][ETB2_TRIM_SIZE]; /** % * offset 19480 */ - uint8_t throttle2TrimTpsBins[6]; + uint8_t throttle2TrimTpsBins[ETB2_TRIM_SIZE]; /** RPM * offset 19486 */ - scaled_channel throttle2TrimRpmBins[6]; + scaled_channel throttle2TrimRpmBins[ETB2_TRIM_SIZE]; /** deg * offset 19492 @@ -5383,4 +5398,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22088); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:19:35 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:18:32 UTC 2023 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_nucleo_h743.h b/firmware/controllers/generated/engine_configuration_generated_structures_nucleo_h743.h index a5d32100b1..130e55dfa4 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_nucleo_h743.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_nucleo_h743.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:20:15 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:19:11 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3762,9 +3762,19 @@ struct engine_configuration_s { */ scaled_channel triggerCompSensorSatRpm; /** + ratio * offset 2672 */ - int8_t unusedHere[20]; + scaled_channel tractionControlSlipBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + RPM + * offset 2684 + */ + uint8_t tractionControlSpeedBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + * offset 2690 + */ + int8_t unusedHere[2]; /** * offset 2692 */ @@ -4468,10 +4478,15 @@ struct engine_configuration_s { */ float triggerVVTGapOverrideTo[VVT_TRACKING_LENGTH]; /** - units + % * offset 4348 */ - uint8_t mainUnusedEnd[208]; + int8_t tractionControlEtbDrop[TRACTION_CONTROL_ETB_DROP_SIZE][TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + units + * offset 4384 + */ + uint8_t mainUnusedEnd[172]; }; static_assert(sizeof(engine_configuration_s) == 4556); @@ -5206,17 +5221,17 @@ struct persistent_config_s { % * offset 19444 */ - scaled_channel throttle2TrimTable[6][6]; + scaled_channel throttle2TrimTable[ETB2_TRIM_SIZE][ETB2_TRIM_SIZE]; /** % * offset 19480 */ - uint8_t throttle2TrimTpsBins[6]; + uint8_t throttle2TrimTpsBins[ETB2_TRIM_SIZE]; /** RPM * offset 19486 */ - scaled_channel throttle2TrimRpmBins[6]; + scaled_channel throttle2TrimRpmBins[ETB2_TRIM_SIZE]; /** deg * offset 19492 @@ -5383,4 +5398,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22088); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:20:15 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:19:11 UTC 2023 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_prometheus_405.h b/firmware/controllers/generated/engine_configuration_generated_structures_prometheus_405.h index 282f73be8c..89b0bcee0c 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_prometheus_405.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_prometheus_405.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:19:53 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:18:49 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3762,9 +3762,19 @@ struct engine_configuration_s { */ scaled_channel triggerCompSensorSatRpm; /** + ratio * offset 2672 */ - int8_t unusedHere[20]; + scaled_channel tractionControlSlipBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + RPM + * offset 2684 + */ + uint8_t tractionControlSpeedBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + * offset 2690 + */ + int8_t unusedHere[2]; /** * offset 2692 */ @@ -4468,10 +4478,15 @@ struct engine_configuration_s { */ float triggerVVTGapOverrideTo[VVT_TRACKING_LENGTH]; /** - units + % * offset 4348 */ - uint8_t mainUnusedEnd[208]; + int8_t tractionControlEtbDrop[TRACTION_CONTROL_ETB_DROP_SIZE][TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + units + * offset 4384 + */ + uint8_t mainUnusedEnd[172]; }; static_assert(sizeof(engine_configuration_s) == 4556); @@ -5206,17 +5221,17 @@ struct persistent_config_s { % * offset 19444 */ - scaled_channel throttle2TrimTable[6][6]; + scaled_channel throttle2TrimTable[ETB2_TRIM_SIZE][ETB2_TRIM_SIZE]; /** % * offset 19480 */ - uint8_t throttle2TrimTpsBins[6]; + uint8_t throttle2TrimTpsBins[ETB2_TRIM_SIZE]; /** RPM * offset 19486 */ - scaled_channel throttle2TrimRpmBins[6]; + scaled_channel throttle2TrimRpmBins[ETB2_TRIM_SIZE]; /** deg * offset 19492 @@ -5383,4 +5398,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22088); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:19:53 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:18:49 UTC 2023 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_prometheus_469.h b/firmware/controllers/generated/engine_configuration_generated_structures_prometheus_469.h index 24a9492a64..fe8854541c 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_prometheus_469.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_prometheus_469.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:19:51 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:18:47 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3762,9 +3762,19 @@ struct engine_configuration_s { */ scaled_channel triggerCompSensorSatRpm; /** + ratio * offset 2672 */ - int8_t unusedHere[20]; + scaled_channel tractionControlSlipBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + RPM + * offset 2684 + */ + uint8_t tractionControlSpeedBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + * offset 2690 + */ + int8_t unusedHere[2]; /** * offset 2692 */ @@ -4468,10 +4478,15 @@ struct engine_configuration_s { */ float triggerVVTGapOverrideTo[VVT_TRACKING_LENGTH]; /** - units + % * offset 4348 */ - uint8_t mainUnusedEnd[208]; + int8_t tractionControlEtbDrop[TRACTION_CONTROL_ETB_DROP_SIZE][TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + units + * offset 4384 + */ + uint8_t mainUnusedEnd[172]; }; static_assert(sizeof(engine_configuration_s) == 4556); @@ -5206,17 +5221,17 @@ struct persistent_config_s { % * offset 19444 */ - scaled_channel throttle2TrimTable[6][6]; + scaled_channel throttle2TrimTable[ETB2_TRIM_SIZE][ETB2_TRIM_SIZE]; /** % * offset 19480 */ - uint8_t throttle2TrimTpsBins[6]; + uint8_t throttle2TrimTpsBins[ETB2_TRIM_SIZE]; /** RPM * offset 19486 */ - scaled_channel throttle2TrimRpmBins[6]; + scaled_channel throttle2TrimRpmBins[ETB2_TRIM_SIZE]; /** deg * offset 19492 @@ -5383,4 +5398,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22088); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:19:51 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:18:47 UTC 2023 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_proteus_f4.h b/firmware/controllers/generated/engine_configuration_generated_structures_proteus_f4.h index 9b879257dd..6a10862ee2 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_proteus_f4.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_proteus_f4.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:19:58 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:18:54 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3762,9 +3762,19 @@ struct engine_configuration_s { */ scaled_channel triggerCompSensorSatRpm; /** + ratio * offset 2672 */ - int8_t unusedHere[20]; + scaled_channel tractionControlSlipBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + RPM + * offset 2684 + */ + uint8_t tractionControlSpeedBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + * offset 2690 + */ + int8_t unusedHere[2]; /** * offset 2692 */ @@ -4468,10 +4478,15 @@ struct engine_configuration_s { */ float triggerVVTGapOverrideTo[VVT_TRACKING_LENGTH]; /** - units + % * offset 4348 */ - uint8_t mainUnusedEnd[208]; + int8_t tractionControlEtbDrop[TRACTION_CONTROL_ETB_DROP_SIZE][TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + units + * offset 4384 + */ + uint8_t mainUnusedEnd[172]; }; static_assert(sizeof(engine_configuration_s) == 4556); @@ -5206,17 +5221,17 @@ struct persistent_config_s { % * offset 23444 */ - scaled_channel throttle2TrimTable[6][6]; + scaled_channel throttle2TrimTable[ETB2_TRIM_SIZE][ETB2_TRIM_SIZE]; /** % * offset 23480 */ - uint8_t throttle2TrimTpsBins[6]; + uint8_t throttle2TrimTpsBins[ETB2_TRIM_SIZE]; /** RPM * offset 23486 */ - scaled_channel throttle2TrimRpmBins[6]; + scaled_channel throttle2TrimRpmBins[ETB2_TRIM_SIZE]; /** deg * offset 23492 @@ -5383,4 +5398,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 26088); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:19:58 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:18:54 UTC 2023 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_proteus_f7.h b/firmware/controllers/generated/engine_configuration_generated_structures_proteus_f7.h index b8d132e69c..9bf155a572 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_proteus_f7.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_proteus_f7.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:19:55 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:18:51 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3762,9 +3762,19 @@ struct engine_configuration_s { */ scaled_channel triggerCompSensorSatRpm; /** + ratio * offset 2672 */ - int8_t unusedHere[20]; + scaled_channel tractionControlSlipBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + RPM + * offset 2684 + */ + uint8_t tractionControlSpeedBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + * offset 2690 + */ + int8_t unusedHere[2]; /** * offset 2692 */ @@ -4468,10 +4478,15 @@ struct engine_configuration_s { */ float triggerVVTGapOverrideTo[VVT_TRACKING_LENGTH]; /** - units + % * offset 4348 */ - uint8_t mainUnusedEnd[208]; + int8_t tractionControlEtbDrop[TRACTION_CONTROL_ETB_DROP_SIZE][TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + units + * offset 4384 + */ + uint8_t mainUnusedEnd[172]; }; static_assert(sizeof(engine_configuration_s) == 4556); @@ -5206,17 +5221,17 @@ struct persistent_config_s { % * offset 23444 */ - scaled_channel throttle2TrimTable[6][6]; + scaled_channel throttle2TrimTable[ETB2_TRIM_SIZE][ETB2_TRIM_SIZE]; /** % * offset 23480 */ - uint8_t throttle2TrimTpsBins[6]; + uint8_t throttle2TrimTpsBins[ETB2_TRIM_SIZE]; /** RPM * offset 23486 */ - scaled_channel throttle2TrimRpmBins[6]; + scaled_channel throttle2TrimRpmBins[ETB2_TRIM_SIZE]; /** deg * offset 23492 @@ -5383,4 +5398,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 26088); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:19:55 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:18:51 UTC 2023 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_proteus_h7.h b/firmware/controllers/generated/engine_configuration_generated_structures_proteus_h7.h index 6563b26198..4271c03551 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_proteus_h7.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_proteus_h7.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:20:01 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:18:56 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3762,9 +3762,19 @@ struct engine_configuration_s { */ scaled_channel triggerCompSensorSatRpm; /** + ratio * offset 2672 */ - int8_t unusedHere[20]; + scaled_channel tractionControlSlipBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + RPM + * offset 2684 + */ + uint8_t tractionControlSpeedBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + * offset 2690 + */ + int8_t unusedHere[2]; /** * offset 2692 */ @@ -4468,10 +4478,15 @@ struct engine_configuration_s { */ float triggerVVTGapOverrideTo[VVT_TRACKING_LENGTH]; /** - units + % * offset 4348 */ - uint8_t mainUnusedEnd[208]; + int8_t tractionControlEtbDrop[TRACTION_CONTROL_ETB_DROP_SIZE][TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + units + * offset 4384 + */ + uint8_t mainUnusedEnd[172]; }; static_assert(sizeof(engine_configuration_s) == 4556); @@ -5206,17 +5221,17 @@ struct persistent_config_s { % * offset 23444 */ - scaled_channel throttle2TrimTable[6][6]; + scaled_channel throttle2TrimTable[ETB2_TRIM_SIZE][ETB2_TRIM_SIZE]; /** % * offset 23480 */ - uint8_t throttle2TrimTpsBins[6]; + uint8_t throttle2TrimTpsBins[ETB2_TRIM_SIZE]; /** RPM * offset 23486 */ - scaled_channel throttle2TrimRpmBins[6]; + scaled_channel throttle2TrimRpmBins[ETB2_TRIM_SIZE]; /** deg * offset 23492 @@ -5383,4 +5398,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 26088); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:20:01 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:18:56 UTC 2023 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_s105.h b/firmware/controllers/generated/engine_configuration_generated_structures_s105.h index 137c908ae4..3b406622f9 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_s105.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_s105.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:19:43 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:18:39 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3762,9 +3762,19 @@ struct engine_configuration_s { */ scaled_channel triggerCompSensorSatRpm; /** + ratio * offset 2672 */ - int8_t unusedHere[20]; + scaled_channel tractionControlSlipBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + RPM + * offset 2684 + */ + uint8_t tractionControlSpeedBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + * offset 2690 + */ + int8_t unusedHere[2]; /** * offset 2692 */ @@ -4468,10 +4478,15 @@ struct engine_configuration_s { */ float triggerVVTGapOverrideTo[VVT_TRACKING_LENGTH]; /** - units + % * offset 4348 */ - uint8_t mainUnusedEnd[208]; + int8_t tractionControlEtbDrop[TRACTION_CONTROL_ETB_DROP_SIZE][TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + units + * offset 4384 + */ + uint8_t mainUnusedEnd[172]; }; static_assert(sizeof(engine_configuration_s) == 4556); @@ -5206,17 +5221,17 @@ struct persistent_config_s { % * offset 19444 */ - scaled_channel throttle2TrimTable[6][6]; + scaled_channel throttle2TrimTable[ETB2_TRIM_SIZE][ETB2_TRIM_SIZE]; /** % * offset 19480 */ - uint8_t throttle2TrimTpsBins[6]; + uint8_t throttle2TrimTpsBins[ETB2_TRIM_SIZE]; /** RPM * offset 19486 */ - scaled_channel throttle2TrimRpmBins[6]; + scaled_channel throttle2TrimRpmBins[ETB2_TRIM_SIZE]; /** deg * offset 19492 @@ -5383,4 +5398,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22088); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:19:43 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:18:39 UTC 2023 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_small-can-board.h b/firmware/controllers/generated/engine_configuration_generated_structures_small-can-board.h index 18f270c32f..c023f3cda4 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_small-can-board.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_small-can-board.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:19:33 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:18:29 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3762,9 +3762,19 @@ struct engine_configuration_s { */ scaled_channel triggerCompSensorSatRpm; /** + ratio * offset 2672 */ - int8_t unusedHere[20]; + scaled_channel tractionControlSlipBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + RPM + * offset 2684 + */ + uint8_t tractionControlSpeedBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + * offset 2690 + */ + int8_t unusedHere[2]; /** * offset 2692 */ @@ -4468,10 +4478,15 @@ struct engine_configuration_s { */ float triggerVVTGapOverrideTo[VVT_TRACKING_LENGTH]; /** - units + % * offset 4348 */ - uint8_t mainUnusedEnd[208]; + int8_t tractionControlEtbDrop[TRACTION_CONTROL_ETB_DROP_SIZE][TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + units + * offset 4384 + */ + uint8_t mainUnusedEnd[172]; }; static_assert(sizeof(engine_configuration_s) == 4556); @@ -5206,17 +5221,17 @@ struct persistent_config_s { % * offset 19444 */ - scaled_channel throttle2TrimTable[6][6]; + scaled_channel throttle2TrimTable[ETB2_TRIM_SIZE][ETB2_TRIM_SIZE]; /** % * offset 19480 */ - uint8_t throttle2TrimTpsBins[6]; + uint8_t throttle2TrimTpsBins[ETB2_TRIM_SIZE]; /** RPM * offset 19486 */ - scaled_channel throttle2TrimRpmBins[6]; + scaled_channel throttle2TrimRpmBins[ETB2_TRIM_SIZE]; /** deg * offset 19492 @@ -5383,4 +5398,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22088); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:19:33 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:18:29 UTC 2023 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_stm32f413_nucleo.h b/firmware/controllers/generated/engine_configuration_generated_structures_stm32f413_nucleo.h index d7a7e83111..455f71130d 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_stm32f413_nucleo.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_stm32f413_nucleo.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:20:08 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:19:04 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3762,9 +3762,19 @@ struct engine_configuration_s { */ scaled_channel triggerCompSensorSatRpm; /** + ratio * offset 2672 */ - int8_t unusedHere[20]; + scaled_channel tractionControlSlipBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + RPM + * offset 2684 + */ + uint8_t tractionControlSpeedBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + * offset 2690 + */ + int8_t unusedHere[2]; /** * offset 2692 */ @@ -4468,10 +4478,15 @@ struct engine_configuration_s { */ float triggerVVTGapOverrideTo[VVT_TRACKING_LENGTH]; /** - units + % * offset 4348 */ - uint8_t mainUnusedEnd[208]; + int8_t tractionControlEtbDrop[TRACTION_CONTROL_ETB_DROP_SIZE][TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + units + * offset 4384 + */ + uint8_t mainUnusedEnd[172]; }; static_assert(sizeof(engine_configuration_s) == 4556); @@ -5206,17 +5221,17 @@ struct persistent_config_s { % * offset 19444 */ - scaled_channel throttle2TrimTable[6][6]; + scaled_channel throttle2TrimTable[ETB2_TRIM_SIZE][ETB2_TRIM_SIZE]; /** % * offset 19480 */ - uint8_t throttle2TrimTpsBins[6]; + uint8_t throttle2TrimTpsBins[ETB2_TRIM_SIZE]; /** RPM * offset 19486 */ - scaled_channel throttle2TrimRpmBins[6]; + scaled_channel throttle2TrimRpmBins[ETB2_TRIM_SIZE]; /** deg * offset 19492 @@ -5383,4 +5398,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22088); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:20:08 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:19:04 UTC 2023 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_stm32f429_nucleo.h b/firmware/controllers/generated/engine_configuration_generated_structures_stm32f429_nucleo.h index 903a134e37..6181790ccb 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_stm32f429_nucleo.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_stm32f429_nucleo.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:20:10 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:19:06 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3762,9 +3762,19 @@ struct engine_configuration_s { */ scaled_channel triggerCompSensorSatRpm; /** + ratio * offset 2672 */ - int8_t unusedHere[20]; + scaled_channel tractionControlSlipBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + RPM + * offset 2684 + */ + uint8_t tractionControlSpeedBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + * offset 2690 + */ + int8_t unusedHere[2]; /** * offset 2692 */ @@ -4468,10 +4478,15 @@ struct engine_configuration_s { */ float triggerVVTGapOverrideTo[VVT_TRACKING_LENGTH]; /** - units + % * offset 4348 */ - uint8_t mainUnusedEnd[208]; + int8_t tractionControlEtbDrop[TRACTION_CONTROL_ETB_DROP_SIZE][TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + units + * offset 4384 + */ + uint8_t mainUnusedEnd[172]; }; static_assert(sizeof(engine_configuration_s) == 4556); @@ -5206,17 +5221,17 @@ struct persistent_config_s { % * offset 19444 */ - scaled_channel throttle2TrimTable[6][6]; + scaled_channel throttle2TrimTable[ETB2_TRIM_SIZE][ETB2_TRIM_SIZE]; /** % * offset 19480 */ - uint8_t throttle2TrimTpsBins[6]; + uint8_t throttle2TrimTpsBins[ETB2_TRIM_SIZE]; /** RPM * offset 19486 */ - scaled_channel throttle2TrimRpmBins[6]; + scaled_channel throttle2TrimRpmBins[ETB2_TRIM_SIZE]; /** deg * offset 19492 @@ -5383,4 +5398,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22088); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:20:10 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:19:06 UTC 2023 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_stm32f767_nucleo.h b/firmware/controllers/generated/engine_configuration_generated_structures_stm32f767_nucleo.h index 2a91f646f7..4f38919d5b 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_stm32f767_nucleo.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_stm32f767_nucleo.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:20:13 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:19:08 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3762,9 +3762,19 @@ struct engine_configuration_s { */ scaled_channel triggerCompSensorSatRpm; /** + ratio * offset 2672 */ - int8_t unusedHere[20]; + scaled_channel tractionControlSlipBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + RPM + * offset 2684 + */ + uint8_t tractionControlSpeedBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + * offset 2690 + */ + int8_t unusedHere[2]; /** * offset 2692 */ @@ -4468,10 +4478,15 @@ struct engine_configuration_s { */ float triggerVVTGapOverrideTo[VVT_TRACKING_LENGTH]; /** - units + % * offset 4348 */ - uint8_t mainUnusedEnd[208]; + int8_t tractionControlEtbDrop[TRACTION_CONTROL_ETB_DROP_SIZE][TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + units + * offset 4384 + */ + uint8_t mainUnusedEnd[172]; }; static_assert(sizeof(engine_configuration_s) == 4556); @@ -5206,17 +5221,17 @@ struct persistent_config_s { % * offset 19444 */ - scaled_channel throttle2TrimTable[6][6]; + scaled_channel throttle2TrimTable[ETB2_TRIM_SIZE][ETB2_TRIM_SIZE]; /** % * offset 19480 */ - uint8_t throttle2TrimTpsBins[6]; + uint8_t throttle2TrimTpsBins[ETB2_TRIM_SIZE]; /** RPM * offset 19486 */ - scaled_channel throttle2TrimRpmBins[6]; + scaled_channel throttle2TrimRpmBins[ETB2_TRIM_SIZE]; /** deg * offset 19492 @@ -5383,4 +5398,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22088); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:20:13 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:19:08 UTC 2023 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_t-b-g.h b/firmware/controllers/generated/engine_configuration_generated_structures_t-b-g.h index 281d94e82c..0336abf304 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_t-b-g.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_t-b-g.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:19:46 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:18:42 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3762,9 +3762,19 @@ struct engine_configuration_s { */ scaled_channel triggerCompSensorSatRpm; /** + ratio * offset 2672 */ - int8_t unusedHere[20]; + scaled_channel tractionControlSlipBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + RPM + * offset 2684 + */ + uint8_t tractionControlSpeedBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + * offset 2690 + */ + int8_t unusedHere[2]; /** * offset 2692 */ @@ -4468,10 +4478,15 @@ struct engine_configuration_s { */ float triggerVVTGapOverrideTo[VVT_TRACKING_LENGTH]; /** - units + % * offset 4348 */ - uint8_t mainUnusedEnd[208]; + int8_t tractionControlEtbDrop[TRACTION_CONTROL_ETB_DROP_SIZE][TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + units + * offset 4384 + */ + uint8_t mainUnusedEnd[172]; }; static_assert(sizeof(engine_configuration_s) == 4556); @@ -5206,17 +5221,17 @@ struct persistent_config_s { % * offset 19444 */ - scaled_channel throttle2TrimTable[6][6]; + scaled_channel throttle2TrimTable[ETB2_TRIM_SIZE][ETB2_TRIM_SIZE]; /** % * offset 19480 */ - uint8_t throttle2TrimTpsBins[6]; + uint8_t throttle2TrimTpsBins[ETB2_TRIM_SIZE]; /** RPM * offset 19486 */ - scaled_channel throttle2TrimRpmBins[6]; + scaled_channel throttle2TrimRpmBins[ETB2_TRIM_SIZE]; /** deg * offset 19492 @@ -5383,4 +5398,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22088); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:19:46 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:18:42 UTC 2023 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_tdg-pdm8.h b/firmware/controllers/generated/engine_configuration_generated_structures_tdg-pdm8.h index e1764c449e..46a70bf0f6 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_tdg-pdm8.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_tdg-pdm8.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:20:20 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:19:15 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3762,9 +3762,19 @@ struct engine_configuration_s { */ scaled_channel triggerCompSensorSatRpm; /** + ratio * offset 2672 */ - int8_t unusedHere[20]; + scaled_channel tractionControlSlipBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + RPM + * offset 2684 + */ + uint8_t tractionControlSpeedBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + * offset 2690 + */ + int8_t unusedHere[2]; /** * offset 2692 */ @@ -4468,10 +4478,15 @@ struct engine_configuration_s { */ float triggerVVTGapOverrideTo[VVT_TRACKING_LENGTH]; /** - units + % * offset 4348 */ - uint8_t mainUnusedEnd[208]; + int8_t tractionControlEtbDrop[TRACTION_CONTROL_ETB_DROP_SIZE][TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + units + * offset 4384 + */ + uint8_t mainUnusedEnd[172]; }; static_assert(sizeof(engine_configuration_s) == 4556); @@ -5206,17 +5221,17 @@ struct persistent_config_s { % * offset 19444 */ - scaled_channel throttle2TrimTable[6][6]; + scaled_channel throttle2TrimTable[ETB2_TRIM_SIZE][ETB2_TRIM_SIZE]; /** % * offset 19480 */ - uint8_t throttle2TrimTpsBins[6]; + uint8_t throttle2TrimTpsBins[ETB2_TRIM_SIZE]; /** RPM * offset 19486 */ - scaled_channel throttle2TrimRpmBins[6]; + scaled_channel throttle2TrimRpmBins[ETB2_TRIM_SIZE]; /** deg * offset 19492 @@ -5383,4 +5398,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22088); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:20:20 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:19:15 UTC 2023 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures_uaefi.h b/firmware/controllers/generated/engine_configuration_generated_structures_uaefi.h index 1925cc4bb2..39a962ae85 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures_uaefi.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures_uaefi.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:19:12 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:18:09 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3762,9 +3762,19 @@ struct engine_configuration_s { */ scaled_channel triggerCompSensorSatRpm; /** + ratio * offset 2672 */ - int8_t unusedHere[20]; + scaled_channel tractionControlSlipBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + RPM + * offset 2684 + */ + uint8_t tractionControlSpeedBins[TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + * offset 2690 + */ + int8_t unusedHere[2]; /** * offset 2692 */ @@ -4468,10 +4478,15 @@ struct engine_configuration_s { */ float triggerVVTGapOverrideTo[VVT_TRACKING_LENGTH]; /** - units + % * offset 4348 */ - uint8_t mainUnusedEnd[208]; + int8_t tractionControlEtbDrop[TRACTION_CONTROL_ETB_DROP_SIZE][TRACTION_CONTROL_ETB_DROP_SIZE]; + /** + units + * offset 4384 + */ + uint8_t mainUnusedEnd[172]; }; static_assert(sizeof(engine_configuration_s) == 4556); @@ -5206,17 +5221,17 @@ struct persistent_config_s { % * offset 19444 */ - scaled_channel throttle2TrimTable[6][6]; + scaled_channel throttle2TrimTable[ETB2_TRIM_SIZE][ETB2_TRIM_SIZE]; /** % * offset 19480 */ - uint8_t throttle2TrimTpsBins[6]; + uint8_t throttle2TrimTpsBins[ETB2_TRIM_SIZE]; /** RPM * offset 19486 */ - scaled_channel throttle2TrimRpmBins[6]; + scaled_channel throttle2TrimRpmBins[ETB2_TRIM_SIZE]; /** deg * offset 19492 @@ -5383,4 +5398,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22088); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:19:12 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:18:09 UTC 2023 diff --git a/firmware/controllers/generated/rusefi_generated_alphax-2chan.h b/firmware/controllers/generated/rusefi_generated_alphax-2chan.h index 8bf6a6c19e..fa27d76834 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-2chan.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-2chan.h @@ -437,6 +437,7 @@ #define engine_type_e_VW_ABA 32 #define engine_type_e_WASTEGATE_PROTEUS_TEST 96 #define engineSyncCam_enum "Intake First Bank", "Exhaust First Bank", "Intake Second Bank", "Exhaust Second Bank" +#define ETB2_TRIM_SIZE 6 #define ETB_BIAS_CURVE_LENGTH 8 #define ETB_COUNT 2 #define ETB_HW_MAX_FREQUENCY 3000 @@ -1147,7 +1148,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 3235407764 +#define SIGNATURE_HASH 1016523570 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1201,6 +1202,7 @@ #define TPS_2_BYTE_PACKING_MULT 100 #define TPS_TPS_ACCEL_CLT_CORR_TABLE 4 #define TPS_TPS_ACCEL_TABLE 8 +#define TRACTION_CONTROL_ETB_DROP_SIZE 6 #define transmission_controller_e_enum "None", "Simple Transmission", "GM 4L6X" #define TransmissionControllerMode_auto_enum 0="None",2="Gm4l6x",1="SimpleTransmissionController" #define TransmissionControllerMode_Gm4l6x 2 @@ -1446,7 +1448,7 @@ #define ts_show_vr_threshold_2 false #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins false -#define TS_SIGNATURE "rusEFI master.2023.12.31.alphax-2chan.3235407764" +#define TS_SIGNATURE "rusEFI master.2023.12.31.alphax-2chan.1016523570" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_alphax-4chan.h b/firmware/controllers/generated/rusefi_generated_alphax-4chan.h index 08d47833a7..729f52b851 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-4chan.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-4chan.h @@ -437,6 +437,7 @@ #define engine_type_e_VW_ABA 32 #define engine_type_e_WASTEGATE_PROTEUS_TEST 96 #define engineSyncCam_enum "Intake First Bank", "Exhaust First Bank", "Intake Second Bank", "Exhaust Second Bank" +#define ETB2_TRIM_SIZE 6 #define ETB_BIAS_CURVE_LENGTH 8 #define ETB_COUNT 2 #define ETB_HW_MAX_FREQUENCY 3000 @@ -1148,7 +1149,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2743929196 +#define SIGNATURE_HASH 1606649290 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1202,6 +1203,7 @@ #define TPS_2_BYTE_PACKING_MULT 100 #define TPS_TPS_ACCEL_CLT_CORR_TABLE 4 #define TPS_TPS_ACCEL_TABLE 8 +#define TRACTION_CONTROL_ETB_DROP_SIZE 6 #define transmission_controller_e_enum "None", "Simple Transmission", "GM 4L6X" #define TransmissionControllerMode_auto_enum 0="None",2="Gm4l6x",1="SimpleTransmissionController" #define TransmissionControllerMode_Gm4l6x 2 @@ -1447,7 +1449,7 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins false -#define TS_SIGNATURE "rusEFI master.2023.12.31.alphax-4chan.2743929196" +#define TS_SIGNATURE "rusEFI master.2023.12.31.alphax-4chan.1606649290" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_alphax-4chan_f7.h b/firmware/controllers/generated/rusefi_generated_alphax-4chan_f7.h index 62cad38bd6..f3081c00bc 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-4chan_f7.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-4chan_f7.h @@ -437,6 +437,7 @@ #define engine_type_e_VW_ABA 32 #define engine_type_e_WASTEGATE_PROTEUS_TEST 96 #define engineSyncCam_enum "Intake First Bank", "Exhaust First Bank", "Intake Second Bank", "Exhaust Second Bank" +#define ETB2_TRIM_SIZE 6 #define ETB_BIAS_CURVE_LENGTH 8 #define ETB_COUNT 2 #define ETB_HW_MAX_FREQUENCY 3000 @@ -1148,7 +1149,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2743929196 +#define SIGNATURE_HASH 1606649290 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1202,6 +1203,7 @@ #define TPS_2_BYTE_PACKING_MULT 100 #define TPS_TPS_ACCEL_CLT_CORR_TABLE 4 #define TPS_TPS_ACCEL_TABLE 8 +#define TRACTION_CONTROL_ETB_DROP_SIZE 6 #define transmission_controller_e_enum "None", "Simple Transmission", "GM 4L6X" #define TransmissionControllerMode_auto_enum 0="None",2="Gm4l6x",1="SimpleTransmissionController" #define TransmissionControllerMode_Gm4l6x 2 @@ -1447,7 +1449,7 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins false -#define TS_SIGNATURE "rusEFI master.2023.12.31.alphax-4chan_f7.2743929196" +#define TS_SIGNATURE "rusEFI master.2023.12.31.alphax-4chan_f7.1606649290" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_alphax-8chan-revA.h b/firmware/controllers/generated/rusefi_generated_alphax-8chan-revA.h index b63304ce76..a3e00b6b1c 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-8chan-revA.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-8chan-revA.h @@ -437,6 +437,7 @@ #define engine_type_e_VW_ABA 32 #define engine_type_e_WASTEGATE_PROTEUS_TEST 96 #define engineSyncCam_enum "Intake First Bank", "Exhaust First Bank", "Intake Second Bank", "Exhaust Second Bank" +#define ETB2_TRIM_SIZE 6 #define ETB_BIAS_CURVE_LENGTH 8 #define ETB_COUNT 2 #define ETB_HW_MAX_FREQUENCY 3000 @@ -1147,7 +1148,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 4058705291 +#define SIGNATURE_HASH 228876589 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1201,6 +1202,7 @@ #define TPS_2_BYTE_PACKING_MULT 100 #define TPS_TPS_ACCEL_CLT_CORR_TABLE 4 #define TPS_TPS_ACCEL_TABLE 8 +#define TRACTION_CONTROL_ETB_DROP_SIZE 6 #define transmission_controller_e_enum "None", "Simple Transmission", "GM 4L6X" #define TransmissionControllerMode_auto_enum 0="None",2="Gm4l6x",1="SimpleTransmissionController" #define TransmissionControllerMode_Gm4l6x 2 @@ -1446,7 +1448,7 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.31.alphax-8chan-revA.4058705291" +#define TS_SIGNATURE "rusEFI master.2023.12.31.alphax-8chan-revA.228876589" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_alphax-8chan.h b/firmware/controllers/generated/rusefi_generated_alphax-8chan.h index fb8dc152bb..69e100f099 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-8chan.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-8chan.h @@ -437,6 +437,7 @@ #define engine_type_e_VW_ABA 32 #define engine_type_e_WASTEGATE_PROTEUS_TEST 96 #define engineSyncCam_enum "Intake First Bank", "Exhaust First Bank", "Intake Second Bank", "Exhaust Second Bank" +#define ETB2_TRIM_SIZE 6 #define ETB_BIAS_CURVE_LENGTH 8 #define ETB_COUNT 2 #define ETB_HW_MAX_FREQUENCY 3000 @@ -1147,7 +1148,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2919579252 +#define SIGNATURE_HASH 1380692690 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1201,6 +1202,7 @@ #define TPS_2_BYTE_PACKING_MULT 100 #define TPS_TPS_ACCEL_CLT_CORR_TABLE 4 #define TPS_TPS_ACCEL_TABLE 8 +#define TRACTION_CONTROL_ETB_DROP_SIZE 6 #define transmission_controller_e_enum "None", "Simple Transmission", "GM 4L6X" #define TransmissionControllerMode_auto_enum 0="None",2="Gm4l6x",1="SimpleTransmissionController" #define TransmissionControllerMode_Gm4l6x 2 @@ -1446,7 +1448,7 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.31.alphax-8chan.2919579252" +#define TS_SIGNATURE "rusEFI master.2023.12.31.alphax-8chan.1380692690" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_alphax-8chan_f7.h b/firmware/controllers/generated/rusefi_generated_alphax-8chan_f7.h index 5f17b613e0..89b853bcf5 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-8chan_f7.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-8chan_f7.h @@ -437,6 +437,7 @@ #define engine_type_e_VW_ABA 32 #define engine_type_e_WASTEGATE_PROTEUS_TEST 96 #define engineSyncCam_enum "Intake First Bank", "Exhaust First Bank", "Intake Second Bank", "Exhaust Second Bank" +#define ETB2_TRIM_SIZE 6 #define ETB_BIAS_CURVE_LENGTH 8 #define ETB_COUNT 2 #define ETB_HW_MAX_FREQUENCY 3000 @@ -1147,7 +1148,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2919579252 +#define SIGNATURE_HASH 1380692690 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1201,6 +1202,7 @@ #define TPS_2_BYTE_PACKING_MULT 100 #define TPS_TPS_ACCEL_CLT_CORR_TABLE 4 #define TPS_TPS_ACCEL_TABLE 8 +#define TRACTION_CONTROL_ETB_DROP_SIZE 6 #define transmission_controller_e_enum "None", "Simple Transmission", "GM 4L6X" #define TransmissionControllerMode_auto_enum 0="None",2="Gm4l6x",1="SimpleTransmissionController" #define TransmissionControllerMode_Gm4l6x 2 @@ -1446,7 +1448,7 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.31.alphax-8chan_f7.2919579252" +#define TS_SIGNATURE "rusEFI master.2023.12.31.alphax-8chan_f7.1380692690" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_at_start_f435.h b/firmware/controllers/generated/rusefi_generated_at_start_f435.h index 9d2e2df74d..c8cb77c7d6 100644 --- a/firmware/controllers/generated/rusefi_generated_at_start_f435.h +++ b/firmware/controllers/generated/rusefi_generated_at_start_f435.h @@ -437,6 +437,7 @@ #define engine_type_e_VW_ABA 32 #define engine_type_e_WASTEGATE_PROTEUS_TEST 96 #define engineSyncCam_enum "Intake First Bank", "Exhaust First Bank", "Intake Second Bank", "Exhaust Second Bank" +#define ETB2_TRIM_SIZE 6 #define ETB_BIAS_CURVE_LENGTH 8 #define ETB_COUNT 2 #define ETB_HW_MAX_FREQUENCY 3000 @@ -1145,7 +1146,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2964181907 +#define SIGNATURE_HASH 1289969461 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1199,6 +1200,7 @@ #define TPS_2_BYTE_PACKING_MULT 100 #define TPS_TPS_ACCEL_CLT_CORR_TABLE 4 #define TPS_TPS_ACCEL_TABLE 8 +#define TRACTION_CONTROL_ETB_DROP_SIZE 6 #define transmission_controller_e_enum "None", "Simple Transmission", "GM 4L6X" #define TransmissionControllerMode_auto_enum 0="None",2="Gm4l6x",1="SimpleTransmissionController" #define TransmissionControllerMode_Gm4l6x 2 @@ -1444,7 +1446,7 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.31.at_start_f435.2964181907" +#define TS_SIGNATURE "rusEFI master.2023.12.31.at_start_f435.1289969461" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_atlas.h b/firmware/controllers/generated/rusefi_generated_atlas.h index 438d107e62..13b1cba1b5 100644 --- a/firmware/controllers/generated/rusefi_generated_atlas.h +++ b/firmware/controllers/generated/rusefi_generated_atlas.h @@ -437,6 +437,7 @@ #define engine_type_e_VW_ABA 32 #define engine_type_e_WASTEGATE_PROTEUS_TEST 96 #define engineSyncCam_enum "Intake First Bank", "Exhaust First Bank", "Intake Second Bank", "Exhaust Second Bank" +#define ETB2_TRIM_SIZE 6 #define ETB_BIAS_CURVE_LENGTH 8 #define ETB_COUNT 2 #define ETB_HW_MAX_FREQUENCY 3000 @@ -1145,7 +1146,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 4104783837 +#define SIGNATURE_HASH 149195643 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1199,6 +1200,7 @@ #define TPS_2_BYTE_PACKING_MULT 100 #define TPS_TPS_ACCEL_CLT_CORR_TABLE 4 #define TPS_TPS_ACCEL_TABLE 8 +#define TRACTION_CONTROL_ETB_DROP_SIZE 6 #define transmission_controller_e_enum "None", "Simple Transmission", "GM 4L6X" #define TransmissionControllerMode_auto_enum 0="None",2="Gm4l6x",1="SimpleTransmissionController" #define TransmissionControllerMode_Gm4l6x 2 @@ -1444,7 +1446,7 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.31.atlas.4104783837" +#define TS_SIGNATURE "rusEFI master.2023.12.31.atlas.149195643" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_f407-discovery.h b/firmware/controllers/generated/rusefi_generated_f407-discovery.h index 5531ba4e42..4825f8eb5c 100644 --- a/firmware/controllers/generated/rusefi_generated_f407-discovery.h +++ b/firmware/controllers/generated/rusefi_generated_f407-discovery.h @@ -437,6 +437,7 @@ #define engine_type_e_VW_ABA 32 #define engine_type_e_WASTEGATE_PROTEUS_TEST 96 #define engineSyncCam_enum "Intake First Bank", "Exhaust First Bank", "Intake Second Bank", "Exhaust Second Bank" +#define ETB2_TRIM_SIZE 6 #define ETB_BIAS_CURVE_LENGTH 8 #define ETB_COUNT 2 #define ETB_HW_MAX_FREQUENCY 3000 @@ -1145,7 +1146,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets true -#define SIGNATURE_HASH 2470149857 +#define SIGNATURE_HASH 1870000711 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1199,6 +1200,7 @@ #define TPS_2_BYTE_PACKING_MULT 100 #define TPS_TPS_ACCEL_CLT_CORR_TABLE 4 #define TPS_TPS_ACCEL_TABLE 8 +#define TRACTION_CONTROL_ETB_DROP_SIZE 6 #define transmission_controller_e_enum "None", "Simple Transmission", "GM 4L6X" #define TransmissionControllerMode_auto_enum 0="None",2="Gm4l6x",1="SimpleTransmissionController" #define TransmissionControllerMode_Gm4l6x 2 @@ -1444,7 +1446,7 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.31.f407-discovery.2470149857" +#define TS_SIGNATURE "rusEFI master.2023.12.31.f407-discovery.1870000711" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_f429-discovery.h b/firmware/controllers/generated/rusefi_generated_f429-discovery.h index 8f68e91287..dce1141afe 100644 --- a/firmware/controllers/generated/rusefi_generated_f429-discovery.h +++ b/firmware/controllers/generated/rusefi_generated_f429-discovery.h @@ -437,6 +437,7 @@ #define engine_type_e_VW_ABA 32 #define engine_type_e_WASTEGATE_PROTEUS_TEST 96 #define engineSyncCam_enum "Intake First Bank", "Exhaust First Bank", "Intake Second Bank", "Exhaust Second Bank" +#define ETB2_TRIM_SIZE 6 #define ETB_BIAS_CURVE_LENGTH 8 #define ETB_COUNT 2 #define ETB_HW_MAX_FREQUENCY 3000 @@ -1145,7 +1146,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2964181907 +#define SIGNATURE_HASH 1289969461 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1199,6 +1200,7 @@ #define TPS_2_BYTE_PACKING_MULT 100 #define TPS_TPS_ACCEL_CLT_CORR_TABLE 4 #define TPS_TPS_ACCEL_TABLE 8 +#define TRACTION_CONTROL_ETB_DROP_SIZE 6 #define transmission_controller_e_enum "None", "Simple Transmission", "GM 4L6X" #define TransmissionControllerMode_auto_enum 0="None",2="Gm4l6x",1="SimpleTransmissionController" #define TransmissionControllerMode_Gm4l6x 2 @@ -1444,7 +1446,7 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.31.f429-discovery.2964181907" +#define TS_SIGNATURE "rusEFI master.2023.12.31.f429-discovery.1289969461" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_f469-discovery.h b/firmware/controllers/generated/rusefi_generated_f469-discovery.h index a2055e4553..3ff4a4abcd 100644 --- a/firmware/controllers/generated/rusefi_generated_f469-discovery.h +++ b/firmware/controllers/generated/rusefi_generated_f469-discovery.h @@ -437,6 +437,7 @@ #define engine_type_e_VW_ABA 32 #define engine_type_e_WASTEGATE_PROTEUS_TEST 96 #define engineSyncCam_enum "Intake First Bank", "Exhaust First Bank", "Intake Second Bank", "Exhaust Second Bank" +#define ETB2_TRIM_SIZE 6 #define ETB_BIAS_CURVE_LENGTH 8 #define ETB_COUNT 2 #define ETB_HW_MAX_FREQUENCY 3000 @@ -1145,7 +1146,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2189088000 +#define SIGNATURE_HASH 2117360038 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1199,6 +1200,7 @@ #define TPS_2_BYTE_PACKING_MULT 100 #define TPS_TPS_ACCEL_CLT_CORR_TABLE 4 #define TPS_TPS_ACCEL_TABLE 8 +#define TRACTION_CONTROL_ETB_DROP_SIZE 6 #define transmission_controller_e_enum "None", "Simple Transmission", "GM 4L6X" #define TransmissionControllerMode_auto_enum 0="None",2="Gm4l6x",1="SimpleTransmissionController" #define TransmissionControllerMode_Gm4l6x 2 @@ -1444,7 +1446,7 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.31.f469-discovery.2189088000" +#define TS_SIGNATURE "rusEFI master.2023.12.31.f469-discovery.2117360038" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_frankenso_na6.h b/firmware/controllers/generated/rusefi_generated_frankenso_na6.h index 85f816bf28..1b8dbd7c33 100644 --- a/firmware/controllers/generated/rusefi_generated_frankenso_na6.h +++ b/firmware/controllers/generated/rusefi_generated_frankenso_na6.h @@ -437,6 +437,7 @@ #define engine_type_e_VW_ABA 32 #define engine_type_e_WASTEGATE_PROTEUS_TEST 96 #define engineSyncCam_enum "Intake First Bank", "Exhaust First Bank", "Intake Second Bank", "Exhaust Second Bank" +#define ETB2_TRIM_SIZE 6 #define ETB_BIAS_CURVE_LENGTH 8 #define ETB_COUNT 2 #define ETB_HW_MAX_FREQUENCY 3000 @@ -1145,7 +1146,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets true -#define SIGNATURE_HASH 3780798392 +#define SIGNATURE_HASH 487910174 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1199,6 +1200,7 @@ #define TPS_2_BYTE_PACKING_MULT 100 #define TPS_TPS_ACCEL_CLT_CORR_TABLE 4 #define TPS_TPS_ACCEL_TABLE 8 +#define TRACTION_CONTROL_ETB_DROP_SIZE 6 #define transmission_controller_e_enum "None", "Simple Transmission", "GM 4L6X" #define TransmissionControllerMode_auto_enum 0="None",2="Gm4l6x",1="SimpleTransmissionController" #define TransmissionControllerMode_Gm4l6x 2 @@ -1444,7 +1446,7 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.31.frankenso_na6.3780798392" +#define TS_SIGNATURE "rusEFI master.2023.12.31.frankenso_na6.487910174" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen-112-17.h b/firmware/controllers/generated/rusefi_generated_hellen-112-17.h index 8231de44f1..7c9ab54e67 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen-112-17.h +++ b/firmware/controllers/generated/rusefi_generated_hellen-112-17.h @@ -437,6 +437,7 @@ #define engine_type_e_VW_ABA 32 #define engine_type_e_WASTEGATE_PROTEUS_TEST 96 #define engineSyncCam_enum "Intake First Bank", "Exhaust First Bank", "Intake Second Bank", "Exhaust Second Bank" +#define ETB2_TRIM_SIZE 6 #define ETB_BIAS_CURVE_LENGTH 8 #define ETB_COUNT 2 #define ETB_HW_MAX_FREQUENCY 3000 @@ -1147,7 +1148,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2041866597 +#define SIGNATURE_HASH 2247812547 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1201,6 +1202,7 @@ #define TPS_2_BYTE_PACKING_MULT 100 #define TPS_TPS_ACCEL_CLT_CORR_TABLE 4 #define TPS_TPS_ACCEL_TABLE 8 +#define TRACTION_CONTROL_ETB_DROP_SIZE 6 #define transmission_controller_e_enum "None", "Simple Transmission", "GM 4L6X" #define TransmissionControllerMode_auto_enum 0="None",2="Gm4l6x",1="SimpleTransmissionController" #define TransmissionControllerMode_Gm4l6x 2 @@ -1446,7 +1448,7 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.31.hellen-112-17.2041866597" +#define TS_SIGNATURE "rusEFI master.2023.12.31.hellen-112-17.2247812547" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen-gm-e67.h b/firmware/controllers/generated/rusefi_generated_hellen-gm-e67.h index c50a5ea6a2..f29ae69d85 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen-gm-e67.h +++ b/firmware/controllers/generated/rusefi_generated_hellen-gm-e67.h @@ -437,6 +437,7 @@ #define engine_type_e_VW_ABA 32 #define engine_type_e_WASTEGATE_PROTEUS_TEST 96 #define engineSyncCam_enum "Intake First Bank", "Exhaust First Bank", "Intake Second Bank", "Exhaust Second Bank" +#define ETB2_TRIM_SIZE 6 #define ETB_BIAS_CURVE_LENGTH 8 #define ETB_COUNT 2 #define ETB_HW_MAX_FREQUENCY 3000 @@ -1146,7 +1147,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2458941483 +#define SIGNATURE_HASH 1860105357 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1200,6 +1201,7 @@ #define TPS_2_BYTE_PACKING_MULT 100 #define TPS_TPS_ACCEL_CLT_CORR_TABLE 4 #define TPS_TPS_ACCEL_TABLE 8 +#define TRACTION_CONTROL_ETB_DROP_SIZE 6 #define transmission_controller_e_enum "None", "Simple Transmission", "GM 4L6X" #define TransmissionControllerMode_auto_enum 0="None",2="Gm4l6x",1="SimpleTransmissionController" #define TransmissionControllerMode_Gm4l6x 2 @@ -1445,7 +1447,7 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.31.hellen-gm-e67.2458941483" +#define TS_SIGNATURE "rusEFI master.2023.12.31.hellen-gm-e67.1860105357" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen-honda-k.h b/firmware/controllers/generated/rusefi_generated_hellen-honda-k.h index d35792746b..feb53c2f3e 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen-honda-k.h +++ b/firmware/controllers/generated/rusefi_generated_hellen-honda-k.h @@ -437,6 +437,7 @@ #define engine_type_e_VW_ABA 32 #define engine_type_e_WASTEGATE_PROTEUS_TEST 96 #define engineSyncCam_enum "Intake First Bank", "Exhaust First Bank", "Intake Second Bank", "Exhaust Second Bank" +#define ETB2_TRIM_SIZE 6 #define ETB_BIAS_CURVE_LENGTH 8 #define ETB_COUNT 2 #define ETB_HW_MAX_FREQUENCY 3000 @@ -1146,7 +1147,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 4135989373 +#define SIGNATURE_HASH 180927707 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1200,6 +1201,7 @@ #define TPS_2_BYTE_PACKING_MULT 100 #define TPS_TPS_ACCEL_CLT_CORR_TABLE 4 #define TPS_TPS_ACCEL_TABLE 8 +#define TRACTION_CONTROL_ETB_DROP_SIZE 6 #define transmission_controller_e_enum "None", "Simple Transmission", "GM 4L6X" #define TransmissionControllerMode_auto_enum 0="None",2="Gm4l6x",1="SimpleTransmissionController" #define TransmissionControllerMode_Gm4l6x 2 @@ -1446,7 +1448,7 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.31.hellen-honda-k.4135989373" +#define TS_SIGNATURE "rusEFI master.2023.12.31.hellen-honda-k.180927707" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen-nb1.h b/firmware/controllers/generated/rusefi_generated_hellen-nb1.h index 2671084684..50eea65ab8 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen-nb1.h +++ b/firmware/controllers/generated/rusefi_generated_hellen-nb1.h @@ -437,6 +437,7 @@ #define engine_type_e_VW_ABA 32 #define engine_type_e_WASTEGATE_PROTEUS_TEST 96 #define engineSyncCam_enum "Intake First Bank", "Exhaust First Bank", "Intake Second Bank", "Exhaust Second Bank" +#define ETB2_TRIM_SIZE 6 #define ETB_BIAS_CURVE_LENGTH 8 #define ETB_COUNT 2 #define ETB_HW_MAX_FREQUENCY 3000 @@ -1147,7 +1148,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2898527322 +#define SIGNATURE_HASH 1351256316 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1201,6 +1202,7 @@ #define TPS_2_BYTE_PACKING_MULT 100 #define TPS_TPS_ACCEL_CLT_CORR_TABLE 4 #define TPS_TPS_ACCEL_TABLE 8 +#define TRACTION_CONTROL_ETB_DROP_SIZE 6 #define transmission_controller_e_enum "None", "Simple Transmission", "GM 4L6X" #define TransmissionControllerMode_auto_enum 0="None",2="Gm4l6x",1="SimpleTransmissionController" #define TransmissionControllerMode_Gm4l6x 2 @@ -1446,7 +1448,7 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.31.hellen-nb1.2898527322" +#define TS_SIGNATURE "rusEFI master.2023.12.31.hellen-nb1.1351256316" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen121nissan.h b/firmware/controllers/generated/rusefi_generated_hellen121nissan.h index b013e1b16e..71bb9af489 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen121nissan.h +++ b/firmware/controllers/generated/rusefi_generated_hellen121nissan.h @@ -437,6 +437,7 @@ #define engine_type_e_VW_ABA 32 #define engine_type_e_WASTEGATE_PROTEUS_TEST 96 #define engineSyncCam_enum "Intake First Bank", "Exhaust First Bank", "Intake Second Bank", "Exhaust Second Bank" +#define ETB2_TRIM_SIZE 6 #define ETB_BIAS_CURVE_LENGTH 8 #define ETB_COUNT 2 #define ETB_HW_MAX_FREQUENCY 3000 @@ -1146,7 +1147,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 3625633796 +#define SIGNATURE_HASH 609502370 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1200,6 +1201,7 @@ #define TPS_2_BYTE_PACKING_MULT 100 #define TPS_TPS_ACCEL_CLT_CORR_TABLE 4 #define TPS_TPS_ACCEL_TABLE 8 +#define TRACTION_CONTROL_ETB_DROP_SIZE 6 #define transmission_controller_e_enum "None", "Simple Transmission", "GM 4L6X" #define TransmissionControllerMode_auto_enum 0="None",2="Gm4l6x",1="SimpleTransmissionController" #define TransmissionControllerMode_Gm4l6x 2 @@ -1445,7 +1447,7 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.31.hellen121nissan.3625633796" +#define TS_SIGNATURE "rusEFI master.2023.12.31.hellen121nissan.609502370" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen121vag.h b/firmware/controllers/generated/rusefi_generated_hellen121vag.h index 78ee1abae5..f4d7d722b3 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen121vag.h +++ b/firmware/controllers/generated/rusefi_generated_hellen121vag.h @@ -437,6 +437,7 @@ #define engine_type_e_VW_ABA 32 #define engine_type_e_WASTEGATE_PROTEUS_TEST 96 #define engineSyncCam_enum "Intake First Bank", "Exhaust First Bank", "Intake Second Bank", "Exhaust Second Bank" +#define ETB2_TRIM_SIZE 6 #define ETB_BIAS_CURVE_LENGTH 8 #define ETB_COUNT 2 #define ETB_HW_MAX_FREQUENCY 3000 @@ -1146,7 +1147,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2161430133 +#define SIGNATURE_HASH 2090484435 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1200,6 +1201,7 @@ #define TPS_2_BYTE_PACKING_MULT 100 #define TPS_TPS_ACCEL_CLT_CORR_TABLE 4 #define TPS_TPS_ACCEL_TABLE 8 +#define TRACTION_CONTROL_ETB_DROP_SIZE 6 #define transmission_controller_e_enum "None", "Simple Transmission", "GM 4L6X" #define TransmissionControllerMode_auto_enum 0="None",2="Gm4l6x",1="SimpleTransmissionController" #define TransmissionControllerMode_Gm4l6x 2 @@ -1445,7 +1447,7 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.31.hellen121vag.2161430133" +#define TS_SIGNATURE "rusEFI master.2023.12.31.hellen121vag.2090484435" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen128.h b/firmware/controllers/generated/rusefi_generated_hellen128.h index 76de8d92dd..3b773c28f3 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen128.h +++ b/firmware/controllers/generated/rusefi_generated_hellen128.h @@ -437,6 +437,7 @@ #define engine_type_e_VW_ABA 32 #define engine_type_e_WASTEGATE_PROTEUS_TEST 96 #define engineSyncCam_enum "Intake First Bank", "Exhaust First Bank", "Intake Second Bank", "Exhaust Second Bank" +#define ETB2_TRIM_SIZE 6 #define ETB_BIAS_CURVE_LENGTH 8 #define ETB_COUNT 2 #define ETB_HW_MAX_FREQUENCY 3000 @@ -1146,7 +1147,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 1564473700 +#define SIGNATURE_HASH 2708567490 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1200,6 +1201,7 @@ #define TPS_2_BYTE_PACKING_MULT 100 #define TPS_TPS_ACCEL_CLT_CORR_TABLE 4 #define TPS_TPS_ACCEL_TABLE 8 +#define TRACTION_CONTROL_ETB_DROP_SIZE 6 #define transmission_controller_e_enum "None", "Simple Transmission", "GM 4L6X" #define TransmissionControllerMode_auto_enum 0="None",2="Gm4l6x",1="SimpleTransmissionController" #define TransmissionControllerMode_Gm4l6x 2 @@ -1445,7 +1447,7 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.31.hellen128.1564473700" +#define TS_SIGNATURE "rusEFI master.2023.12.31.hellen128.2708567490" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen154hyundai.h b/firmware/controllers/generated/rusefi_generated_hellen154hyundai.h index f9762887cb..0c9b398f9c 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen154hyundai.h +++ b/firmware/controllers/generated/rusefi_generated_hellen154hyundai.h @@ -437,6 +437,7 @@ #define engine_type_e_VW_ABA 32 #define engine_type_e_WASTEGATE_PROTEUS_TEST 96 #define engineSyncCam_enum "Intake First Bank", "Exhaust First Bank", "Intake Second Bank", "Exhaust Second Bank" +#define ETB2_TRIM_SIZE 6 #define ETB_BIAS_CURVE_LENGTH 8 #define ETB_COUNT 2 #define ETB_HW_MAX_FREQUENCY 3000 @@ -1146,7 +1147,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 471045162 +#define SIGNATURE_HASH 3764197516 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1200,6 +1201,7 @@ #define TPS_2_BYTE_PACKING_MULT 100 #define TPS_TPS_ACCEL_CLT_CORR_TABLE 4 #define TPS_TPS_ACCEL_TABLE 8 +#define TRACTION_CONTROL_ETB_DROP_SIZE 6 #define transmission_controller_e_enum "None", "Simple Transmission", "GM 4L6X" #define TransmissionControllerMode_auto_enum 0="None",2="Gm4l6x",1="SimpleTransmissionController" #define TransmissionControllerMode_Gm4l6x 2 @@ -1445,7 +1447,7 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.31.hellen154hyundai.471045162" +#define TS_SIGNATURE "rusEFI master.2023.12.31.hellen154hyundai.3764197516" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen72.h b/firmware/controllers/generated/rusefi_generated_hellen72.h index f29c09c79e..e4a989eed5 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen72.h +++ b/firmware/controllers/generated/rusefi_generated_hellen72.h @@ -437,6 +437,7 @@ #define engine_type_e_VW_ABA 32 #define engine_type_e_WASTEGATE_PROTEUS_TEST 96 #define engineSyncCam_enum "Intake First Bank", "Exhaust First Bank", "Intake Second Bank", "Exhaust Second Bank" +#define ETB2_TRIM_SIZE 6 #define ETB_BIAS_CURVE_LENGTH 8 #define ETB_COUNT 2 #define ETB_HW_MAX_FREQUENCY 3000 @@ -1146,7 +1147,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 810297103 +#define SIGNATURE_HASH 3422727081 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1200,6 +1201,7 @@ #define TPS_2_BYTE_PACKING_MULT 100 #define TPS_TPS_ACCEL_CLT_CORR_TABLE 4 #define TPS_TPS_ACCEL_TABLE 8 +#define TRACTION_CONTROL_ETB_DROP_SIZE 6 #define transmission_controller_e_enum "None", "Simple Transmission", "GM 4L6X" #define TransmissionControllerMode_auto_enum 0="None",2="Gm4l6x",1="SimpleTransmissionController" #define TransmissionControllerMode_Gm4l6x 2 @@ -1445,7 +1447,7 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.31.hellen72.810297103" +#define TS_SIGNATURE "rusEFI master.2023.12.31.hellen72.3422727081" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen81.h b/firmware/controllers/generated/rusefi_generated_hellen81.h index cee4e67497..52be3d8dc3 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen81.h +++ b/firmware/controllers/generated/rusefi_generated_hellen81.h @@ -437,6 +437,7 @@ #define engine_type_e_VW_ABA 32 #define engine_type_e_WASTEGATE_PROTEUS_TEST 96 #define engineSyncCam_enum "Intake First Bank", "Exhaust First Bank", "Intake Second Bank", "Exhaust Second Bank" +#define ETB2_TRIM_SIZE 6 #define ETB_BIAS_CURVE_LENGTH 8 #define ETB_COUNT 2 #define ETB_HW_MAX_FREQUENCY 3000 @@ -1145,7 +1146,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 3577561973 +#define SIGNATURE_HASH 695455699 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1199,6 +1200,7 @@ #define TPS_2_BYTE_PACKING_MULT 100 #define TPS_TPS_ACCEL_CLT_CORR_TABLE 4 #define TPS_TPS_ACCEL_TABLE 8 +#define TRACTION_CONTROL_ETB_DROP_SIZE 6 #define transmission_controller_e_enum "None", "Simple Transmission", "GM 4L6X" #define TransmissionControllerMode_auto_enum 0="None",2="Gm4l6x",1="SimpleTransmissionController" #define TransmissionControllerMode_Gm4l6x 2 @@ -1444,7 +1446,7 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.31.hellen81.3577561973" +#define TS_SIGNATURE "rusEFI master.2023.12.31.hellen81.695455699" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen88bmw.h b/firmware/controllers/generated/rusefi_generated_hellen88bmw.h index 64281d3e72..422e90ee94 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen88bmw.h +++ b/firmware/controllers/generated/rusefi_generated_hellen88bmw.h @@ -437,6 +437,7 @@ #define engine_type_e_VW_ABA 32 #define engine_type_e_WASTEGATE_PROTEUS_TEST 96 #define engineSyncCam_enum "Intake First Bank", "Exhaust First Bank", "Intake Second Bank", "Exhaust Second Bank" +#define ETB2_TRIM_SIZE 6 #define ETB_BIAS_CURVE_LENGTH 8 #define ETB_COUNT 2 #define ETB_HW_MAX_FREQUENCY 3000 @@ -1146,7 +1147,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 1680010929 +#define SIGNATURE_HASH 2557239831 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1200,6 +1201,7 @@ #define TPS_2_BYTE_PACKING_MULT 100 #define TPS_TPS_ACCEL_CLT_CORR_TABLE 4 #define TPS_TPS_ACCEL_TABLE 8 +#define TRACTION_CONTROL_ETB_DROP_SIZE 6 #define transmission_controller_e_enum "None", "Simple Transmission", "GM 4L6X" #define TransmissionControllerMode_auto_enum 0="None",2="Gm4l6x",1="SimpleTransmissionController" #define TransmissionControllerMode_Gm4l6x 2 @@ -1445,7 +1447,7 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.31.hellen88bmw.1680010929" +#define TS_SIGNATURE "rusEFI master.2023.12.31.hellen88bmw.2557239831" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellenNA6.h b/firmware/controllers/generated/rusefi_generated_hellenNA6.h index 1e234b398d..1c9e697cbf 100644 --- a/firmware/controllers/generated/rusefi_generated_hellenNA6.h +++ b/firmware/controllers/generated/rusefi_generated_hellenNA6.h @@ -437,6 +437,7 @@ #define engine_type_e_VW_ABA 32 #define engine_type_e_WASTEGATE_PROTEUS_TEST 96 #define engineSyncCam_enum "Intake First Bank", "Exhaust First Bank", "Intake Second Bank", "Exhaust Second Bank" +#define ETB2_TRIM_SIZE 6 #define ETB_BIAS_CURVE_LENGTH 8 #define ETB_COUNT 2 #define ETB_HW_MAX_FREQUENCY 3000 @@ -1147,7 +1148,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 63714671 +#define SIGNATURE_HASH 4286757321 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1201,6 +1202,7 @@ #define TPS_2_BYTE_PACKING_MULT 100 #define TPS_TPS_ACCEL_CLT_CORR_TABLE 4 #define TPS_TPS_ACCEL_TABLE 8 +#define TRACTION_CONTROL_ETB_DROP_SIZE 6 #define transmission_controller_e_enum "None", "Simple Transmission", "GM 4L6X" #define TransmissionControllerMode_auto_enum 0="None",2="Gm4l6x",1="SimpleTransmissionController" #define TransmissionControllerMode_Gm4l6x 2 @@ -1446,7 +1448,7 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.31.hellenNA6.63714671" +#define TS_SIGNATURE "rusEFI master.2023.12.31.hellenNA6.4286757321" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellenNA8_96.h b/firmware/controllers/generated/rusefi_generated_hellenNA8_96.h index 4cb6a01385..994790851a 100644 --- a/firmware/controllers/generated/rusefi_generated_hellenNA8_96.h +++ b/firmware/controllers/generated/rusefi_generated_hellenNA8_96.h @@ -437,6 +437,7 @@ #define engine_type_e_VW_ABA 32 #define engine_type_e_WASTEGATE_PROTEUS_TEST 96 #define engineSyncCam_enum "Intake First Bank", "Exhaust First Bank", "Intake Second Bank", "Exhaust Second Bank" +#define ETB2_TRIM_SIZE 6 #define ETB_BIAS_CURVE_LENGTH 8 #define ETB_COUNT 2 #define ETB_HW_MAX_FREQUENCY 3000 @@ -1148,7 +1149,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 3350536604 +#define SIGNATURE_HASH 1006349626 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1202,6 +1203,7 @@ #define TPS_2_BYTE_PACKING_MULT 100 #define TPS_TPS_ACCEL_CLT_CORR_TABLE 4 #define TPS_TPS_ACCEL_TABLE 8 +#define TRACTION_CONTROL_ETB_DROP_SIZE 6 #define transmission_controller_e_enum "None", "Simple Transmission", "GM 4L6X" #define TransmissionControllerMode_auto_enum 0="None",2="Gm4l6x",1="SimpleTransmissionController" #define TransmissionControllerMode_Gm4l6x 2 @@ -1447,7 +1449,7 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.31.hellenNA8_96.3350536604" +#define TS_SIGNATURE "rusEFI master.2023.12.31.hellenNA8_96.1006349626" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_m74_9.h b/firmware/controllers/generated/rusefi_generated_m74_9.h index 1fbb72bb6d..112c661799 100644 --- a/firmware/controllers/generated/rusefi_generated_m74_9.h +++ b/firmware/controllers/generated/rusefi_generated_m74_9.h @@ -437,6 +437,7 @@ #define engine_type_e_VW_ABA 32 #define engine_type_e_WASTEGATE_PROTEUS_TEST 96 #define engineSyncCam_enum "Intake First Bank", "Exhaust First Bank", "Intake Second Bank", "Exhaust Second Bank" +#define ETB2_TRIM_SIZE 6 #define ETB_BIAS_CURVE_LENGTH 8 #define ETB_COUNT 2 #define ETB_HW_MAX_FREQUENCY 3000 @@ -1146,7 +1147,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2971153446 +#define SIGNATURE_HASH 1297528960 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1200,6 +1201,7 @@ #define TPS_2_BYTE_PACKING_MULT 100 #define TPS_TPS_ACCEL_CLT_CORR_TABLE 4 #define TPS_TPS_ACCEL_TABLE 8 +#define TRACTION_CONTROL_ETB_DROP_SIZE 6 #define transmission_controller_e_enum "None", "Simple Transmission", "GM 4L6X" #define TransmissionControllerMode_auto_enum 0="None",2="Gm4l6x",1="SimpleTransmissionController" #define TransmissionControllerMode_Gm4l6x 2 @@ -1446,7 +1448,7 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.31.m74_9.2971153446" +#define TS_SIGNATURE "rusEFI master.2023.12.31.m74_9.1297528960" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_mre_f4.h b/firmware/controllers/generated/rusefi_generated_mre_f4.h index 107aa46949..0bba397d1b 100644 --- a/firmware/controllers/generated/rusefi_generated_mre_f4.h +++ b/firmware/controllers/generated/rusefi_generated_mre_f4.h @@ -437,6 +437,7 @@ #define engine_type_e_VW_ABA 32 #define engine_type_e_WASTEGATE_PROTEUS_TEST 96 #define engineSyncCam_enum "Intake First Bank", "Exhaust First Bank", "Intake Second Bank", "Exhaust Second Bank" +#define ETB2_TRIM_SIZE 6 #define ETB_BIAS_CURVE_LENGTH 8 #define ETB_COUNT 2 #define ETB_HW_MAX_FREQUENCY 3000 @@ -1146,7 +1147,7 @@ #define show_microRusEFI_presets true #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 3431517129 +#define SIGNATURE_HASH 818300783 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1200,6 +1201,7 @@ #define TPS_2_BYTE_PACKING_MULT 100 #define TPS_TPS_ACCEL_CLT_CORR_TABLE 4 #define TPS_TPS_ACCEL_TABLE 8 +#define TRACTION_CONTROL_ETB_DROP_SIZE 6 #define transmission_controller_e_enum "None", "Simple Transmission", "GM 4L6X" #define TransmissionControllerMode_auto_enum 0="None",2="Gm4l6x",1="SimpleTransmissionController" #define TransmissionControllerMode_Gm4l6x 2 @@ -1445,7 +1447,7 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.31.mre_f4.3431517129" +#define TS_SIGNATURE "rusEFI master.2023.12.31.mre_f4.818300783" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_mre_f7.h b/firmware/controllers/generated/rusefi_generated_mre_f7.h index c43a415055..fae1630740 100644 --- a/firmware/controllers/generated/rusefi_generated_mre_f7.h +++ b/firmware/controllers/generated/rusefi_generated_mre_f7.h @@ -437,6 +437,7 @@ #define engine_type_e_VW_ABA 32 #define engine_type_e_WASTEGATE_PROTEUS_TEST 96 #define engineSyncCam_enum "Intake First Bank", "Exhaust First Bank", "Intake Second Bank", "Exhaust Second Bank" +#define ETB2_TRIM_SIZE 6 #define ETB_BIAS_CURVE_LENGTH 8 #define ETB_COUNT 2 #define ETB_HW_MAX_FREQUENCY 3000 @@ -1146,7 +1147,7 @@ #define show_microRusEFI_presets true #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 3431517129 +#define SIGNATURE_HASH 818300783 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1200,6 +1201,7 @@ #define TPS_2_BYTE_PACKING_MULT 100 #define TPS_TPS_ACCEL_CLT_CORR_TABLE 4 #define TPS_TPS_ACCEL_TABLE 8 +#define TRACTION_CONTROL_ETB_DROP_SIZE 6 #define transmission_controller_e_enum "None", "Simple Transmission", "GM 4L6X" #define TransmissionControllerMode_auto_enum 0="None",2="Gm4l6x",1="SimpleTransmissionController" #define TransmissionControllerMode_Gm4l6x 2 @@ -1445,7 +1447,7 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.31.mre_f7.3431517129" +#define TS_SIGNATURE "rusEFI master.2023.12.31.mre_f7.818300783" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_nucleo_h743.h b/firmware/controllers/generated/rusefi_generated_nucleo_h743.h index ed848c5618..fbfc804531 100644 --- a/firmware/controllers/generated/rusefi_generated_nucleo_h743.h +++ b/firmware/controllers/generated/rusefi_generated_nucleo_h743.h @@ -437,6 +437,7 @@ #define engine_type_e_VW_ABA 32 #define engine_type_e_WASTEGATE_PROTEUS_TEST 96 #define engineSyncCam_enum "Intake First Bank", "Exhaust First Bank", "Intake Second Bank", "Exhaust Second Bank" +#define ETB2_TRIM_SIZE 6 #define ETB_BIAS_CURVE_LENGTH 8 #define ETB_COUNT 2 #define ETB_HW_MAX_FREQUENCY 3000 @@ -1145,7 +1146,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2964181907 +#define SIGNATURE_HASH 1289969461 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1199,6 +1200,7 @@ #define TPS_2_BYTE_PACKING_MULT 100 #define TPS_TPS_ACCEL_CLT_CORR_TABLE 4 #define TPS_TPS_ACCEL_TABLE 8 +#define TRACTION_CONTROL_ETB_DROP_SIZE 6 #define transmission_controller_e_enum "None", "Simple Transmission", "GM 4L6X" #define TransmissionControllerMode_auto_enum 0="None",2="Gm4l6x",1="SimpleTransmissionController" #define TransmissionControllerMode_Gm4l6x 2 @@ -1444,7 +1446,7 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.31.nucleo_h743.2964181907" +#define TS_SIGNATURE "rusEFI master.2023.12.31.nucleo_h743.1289969461" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_prometheus_405.h b/firmware/controllers/generated/rusefi_generated_prometheus_405.h index 4155001d23..4296c56870 100644 --- a/firmware/controllers/generated/rusefi_generated_prometheus_405.h +++ b/firmware/controllers/generated/rusefi_generated_prometheus_405.h @@ -437,6 +437,7 @@ #define engine_type_e_VW_ABA 32 #define engine_type_e_WASTEGATE_PROTEUS_TEST 96 #define engineSyncCam_enum "Intake First Bank", "Exhaust First Bank", "Intake Second Bank", "Exhaust Second Bank" +#define ETB2_TRIM_SIZE 6 #define ETB_BIAS_CURVE_LENGTH 8 #define ETB_COUNT 2 #define ETB_HW_MAX_FREQUENCY 3000 @@ -1145,7 +1146,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2151226883 +#define SIGNATURE_HASH 2088211109 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1199,6 +1200,7 @@ #define TPS_2_BYTE_PACKING_MULT 100 #define TPS_TPS_ACCEL_CLT_CORR_TABLE 4 #define TPS_TPS_ACCEL_TABLE 8 +#define TRACTION_CONTROL_ETB_DROP_SIZE 6 #define transmission_controller_e_enum "None", "Simple Transmission", "GM 4L6X" #define TransmissionControllerMode_auto_enum 0="None",2="Gm4l6x",1="SimpleTransmissionController" #define TransmissionControllerMode_Gm4l6x 2 @@ -1444,7 +1446,7 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.31.prometheus_405.2151226883" +#define TS_SIGNATURE "rusEFI master.2023.12.31.prometheus_405.2088211109" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_prometheus_469.h b/firmware/controllers/generated/rusefi_generated_prometheus_469.h index 3bc91ac304..97fa3478fa 100644 --- a/firmware/controllers/generated/rusefi_generated_prometheus_469.h +++ b/firmware/controllers/generated/rusefi_generated_prometheus_469.h @@ -437,6 +437,7 @@ #define engine_type_e_VW_ABA 32 #define engine_type_e_WASTEGATE_PROTEUS_TEST 96 #define engineSyncCam_enum "Intake First Bank", "Exhaust First Bank", "Intake Second Bank", "Exhaust Second Bank" +#define ETB2_TRIM_SIZE 6 #define ETB_BIAS_CURVE_LENGTH 8 #define ETB_COUNT 2 #define ETB_HW_MAX_FREQUENCY 3000 @@ -1145,7 +1146,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2151226883 +#define SIGNATURE_HASH 2088211109 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1199,6 +1200,7 @@ #define TPS_2_BYTE_PACKING_MULT 100 #define TPS_TPS_ACCEL_CLT_CORR_TABLE 4 #define TPS_TPS_ACCEL_TABLE 8 +#define TRACTION_CONTROL_ETB_DROP_SIZE 6 #define transmission_controller_e_enum "None", "Simple Transmission", "GM 4L6X" #define TransmissionControllerMode_auto_enum 0="None",2="Gm4l6x",1="SimpleTransmissionController" #define TransmissionControllerMode_Gm4l6x 2 @@ -1444,7 +1446,7 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.31.prometheus_469.2151226883" +#define TS_SIGNATURE "rusEFI master.2023.12.31.prometheus_469.2088211109" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_proteus_f4.h b/firmware/controllers/generated/rusefi_generated_proteus_f4.h index 97087924a4..0f90ab73ae 100644 --- a/firmware/controllers/generated/rusefi_generated_proteus_f4.h +++ b/firmware/controllers/generated/rusefi_generated_proteus_f4.h @@ -437,6 +437,7 @@ #define engine_type_e_VW_ABA 32 #define engine_type_e_WASTEGATE_PROTEUS_TEST 96 #define engineSyncCam_enum "Intake First Bank", "Exhaust First Bank", "Intake Second Bank", "Exhaust Second Bank" +#define ETB2_TRIM_SIZE 6 #define ETB_BIAS_CURVE_LENGTH 8 #define ETB_COUNT 2 #define ETB_HW_MAX_FREQUENCY 3000 @@ -1145,7 +1146,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets true #define show_test_presets false -#define SIGNATURE_HASH 3687605773 +#define SIGNATURE_HASH 662891179 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1199,6 +1200,7 @@ #define TPS_2_BYTE_PACKING_MULT 100 #define TPS_TPS_ACCEL_CLT_CORR_TABLE 4 #define TPS_TPS_ACCEL_TABLE 8 +#define TRACTION_CONTROL_ETB_DROP_SIZE 6 #define transmission_controller_e_enum "None", "Simple Transmission", "GM 4L6X" #define TransmissionControllerMode_auto_enum 0="None",2="Gm4l6x",1="SimpleTransmissionController" #define TransmissionControllerMode_Gm4l6x 2 @@ -1444,7 +1446,7 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.31.proteus_f4.3687605773" +#define TS_SIGNATURE "rusEFI master.2023.12.31.proteus_f4.662891179" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_proteus_f7.h b/firmware/controllers/generated/rusefi_generated_proteus_f7.h index 3d9b0b74c2..ac655b3a96 100644 --- a/firmware/controllers/generated/rusefi_generated_proteus_f7.h +++ b/firmware/controllers/generated/rusefi_generated_proteus_f7.h @@ -437,6 +437,7 @@ #define engine_type_e_VW_ABA 32 #define engine_type_e_WASTEGATE_PROTEUS_TEST 96 #define engineSyncCam_enum "Intake First Bank", "Exhaust First Bank", "Intake Second Bank", "Exhaust Second Bank" +#define ETB2_TRIM_SIZE 6 #define ETB_BIAS_CURVE_LENGTH 8 #define ETB_COUNT 2 #define ETB_HW_MAX_FREQUENCY 3000 @@ -1145,7 +1146,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets true #define show_test_presets false -#define SIGNATURE_HASH 3687605773 +#define SIGNATURE_HASH 662891179 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1199,6 +1200,7 @@ #define TPS_2_BYTE_PACKING_MULT 100 #define TPS_TPS_ACCEL_CLT_CORR_TABLE 4 #define TPS_TPS_ACCEL_TABLE 8 +#define TRACTION_CONTROL_ETB_DROP_SIZE 6 #define transmission_controller_e_enum "None", "Simple Transmission", "GM 4L6X" #define TransmissionControllerMode_auto_enum 0="None",2="Gm4l6x",1="SimpleTransmissionController" #define TransmissionControllerMode_Gm4l6x 2 @@ -1444,7 +1446,7 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.31.proteus_f7.3687605773" +#define TS_SIGNATURE "rusEFI master.2023.12.31.proteus_f7.662891179" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_proteus_h7.h b/firmware/controllers/generated/rusefi_generated_proteus_h7.h index b0824cb0dc..62661391b7 100644 --- a/firmware/controllers/generated/rusefi_generated_proteus_h7.h +++ b/firmware/controllers/generated/rusefi_generated_proteus_h7.h @@ -437,6 +437,7 @@ #define engine_type_e_VW_ABA 32 #define engine_type_e_WASTEGATE_PROTEUS_TEST 96 #define engineSyncCam_enum "Intake First Bank", "Exhaust First Bank", "Intake Second Bank", "Exhaust Second Bank" +#define ETB2_TRIM_SIZE 6 #define ETB_BIAS_CURVE_LENGTH 8 #define ETB_COUNT 2 #define ETB_HW_MAX_FREQUENCY 3000 @@ -1145,7 +1146,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets true #define show_test_presets false -#define SIGNATURE_HASH 3687605773 +#define SIGNATURE_HASH 662891179 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1199,6 +1200,7 @@ #define TPS_2_BYTE_PACKING_MULT 100 #define TPS_TPS_ACCEL_CLT_CORR_TABLE 4 #define TPS_TPS_ACCEL_TABLE 8 +#define TRACTION_CONTROL_ETB_DROP_SIZE 6 #define transmission_controller_e_enum "None", "Simple Transmission", "GM 4L6X" #define TransmissionControllerMode_auto_enum 0="None",2="Gm4l6x",1="SimpleTransmissionController" #define TransmissionControllerMode_Gm4l6x 2 @@ -1444,7 +1446,7 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.31.proteus_h7.3687605773" +#define TS_SIGNATURE "rusEFI master.2023.12.31.proteus_h7.662891179" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_s105.h b/firmware/controllers/generated/rusefi_generated_s105.h index ac48679038..2558dfa562 100644 --- a/firmware/controllers/generated/rusefi_generated_s105.h +++ b/firmware/controllers/generated/rusefi_generated_s105.h @@ -437,6 +437,7 @@ #define engine_type_e_VW_ABA 32 #define engine_type_e_WASTEGATE_PROTEUS_TEST 96 #define engineSyncCam_enum "Intake First Bank", "Exhaust First Bank", "Intake Second Bank", "Exhaust Second Bank" +#define ETB2_TRIM_SIZE 6 #define ETB_BIAS_CURVE_LENGTH 8 #define ETB_COUNT 2 #define ETB_HW_MAX_FREQUENCY 3000 @@ -1146,7 +1147,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 426427093 +#define SIGNATURE_HASH 3844361843 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1200,6 +1201,7 @@ #define TPS_2_BYTE_PACKING_MULT 100 #define TPS_TPS_ACCEL_CLT_CORR_TABLE 4 #define TPS_TPS_ACCEL_TABLE 8 +#define TRACTION_CONTROL_ETB_DROP_SIZE 6 #define transmission_controller_e_enum "None", "Simple Transmission", "GM 4L6X" #define TransmissionControllerMode_auto_enum 0="None",2="Gm4l6x",1="SimpleTransmissionController" #define TransmissionControllerMode_Gm4l6x 2 @@ -1446,7 +1448,7 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.31.s105.426427093" +#define TS_SIGNATURE "rusEFI master.2023.12.31.s105.3844361843" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_small-can-board.h b/firmware/controllers/generated/rusefi_generated_small-can-board.h index 2d271d45fb..2ac6988e27 100644 --- a/firmware/controllers/generated/rusefi_generated_small-can-board.h +++ b/firmware/controllers/generated/rusefi_generated_small-can-board.h @@ -437,6 +437,7 @@ #define engine_type_e_VW_ABA 32 #define engine_type_e_WASTEGATE_PROTEUS_TEST 96 #define engineSyncCam_enum "Intake First Bank", "Exhaust First Bank", "Intake Second Bank", "Exhaust Second Bank" +#define ETB2_TRIM_SIZE 6 #define ETB_BIAS_CURVE_LENGTH 8 #define ETB_COUNT 2 #define ETB_HW_MAX_FREQUENCY 3000 @@ -1146,7 +1147,7 @@ #define show_Proteus_presets false #define show_small_can_board_presets true #define show_test_presets false -#define SIGNATURE_HASH 2383159066 +#define SIGNATURE_HASH 1916965820 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1200,6 +1201,7 @@ #define TPS_2_BYTE_PACKING_MULT 100 #define TPS_TPS_ACCEL_CLT_CORR_TABLE 4 #define TPS_TPS_ACCEL_TABLE 8 +#define TRACTION_CONTROL_ETB_DROP_SIZE 6 #define transmission_controller_e_enum "None", "Simple Transmission", "GM 4L6X" #define TransmissionControllerMode_auto_enum 0="None",2="Gm4l6x",1="SimpleTransmissionController" #define TransmissionControllerMode_Gm4l6x 2 @@ -1445,7 +1447,7 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.31.small-can-board.2383159066" +#define TS_SIGNATURE "rusEFI master.2023.12.31.small-can-board.1916965820" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_stm32f413_nucleo.h b/firmware/controllers/generated/rusefi_generated_stm32f413_nucleo.h index b895d2ce9b..7dbaeb8950 100644 --- a/firmware/controllers/generated/rusefi_generated_stm32f413_nucleo.h +++ b/firmware/controllers/generated/rusefi_generated_stm32f413_nucleo.h @@ -437,6 +437,7 @@ #define engine_type_e_VW_ABA 32 #define engine_type_e_WASTEGATE_PROTEUS_TEST 96 #define engineSyncCam_enum "Intake First Bank", "Exhaust First Bank", "Intake Second Bank", "Exhaust Second Bank" +#define ETB2_TRIM_SIZE 6 #define ETB_BIAS_CURVE_LENGTH 8 #define ETB_COUNT 2 #define ETB_HW_MAX_FREQUENCY 3000 @@ -1145,7 +1146,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2964181907 +#define SIGNATURE_HASH 1289969461 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1199,6 +1200,7 @@ #define TPS_2_BYTE_PACKING_MULT 100 #define TPS_TPS_ACCEL_CLT_CORR_TABLE 4 #define TPS_TPS_ACCEL_TABLE 8 +#define TRACTION_CONTROL_ETB_DROP_SIZE 6 #define transmission_controller_e_enum "None", "Simple Transmission", "GM 4L6X" #define TransmissionControllerMode_auto_enum 0="None",2="Gm4l6x",1="SimpleTransmissionController" #define TransmissionControllerMode_Gm4l6x 2 @@ -1444,7 +1446,7 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.31.stm32f413_nucleo.2964181907" +#define TS_SIGNATURE "rusEFI master.2023.12.31.stm32f413_nucleo.1289969461" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_stm32f429_nucleo.h b/firmware/controllers/generated/rusefi_generated_stm32f429_nucleo.h index c5e9038518..2df29f3ebe 100644 --- a/firmware/controllers/generated/rusefi_generated_stm32f429_nucleo.h +++ b/firmware/controllers/generated/rusefi_generated_stm32f429_nucleo.h @@ -437,6 +437,7 @@ #define engine_type_e_VW_ABA 32 #define engine_type_e_WASTEGATE_PROTEUS_TEST 96 #define engineSyncCam_enum "Intake First Bank", "Exhaust First Bank", "Intake Second Bank", "Exhaust Second Bank" +#define ETB2_TRIM_SIZE 6 #define ETB_BIAS_CURVE_LENGTH 8 #define ETB_COUNT 2 #define ETB_HW_MAX_FREQUENCY 3000 @@ -1145,7 +1146,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2964181907 +#define SIGNATURE_HASH 1289969461 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1199,6 +1200,7 @@ #define TPS_2_BYTE_PACKING_MULT 100 #define TPS_TPS_ACCEL_CLT_CORR_TABLE 4 #define TPS_TPS_ACCEL_TABLE 8 +#define TRACTION_CONTROL_ETB_DROP_SIZE 6 #define transmission_controller_e_enum "None", "Simple Transmission", "GM 4L6X" #define TransmissionControllerMode_auto_enum 0="None",2="Gm4l6x",1="SimpleTransmissionController" #define TransmissionControllerMode_Gm4l6x 2 @@ -1444,7 +1446,7 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.31.stm32f429_nucleo.2964181907" +#define TS_SIGNATURE "rusEFI master.2023.12.31.stm32f429_nucleo.1289969461" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_stm32f767_nucleo.h b/firmware/controllers/generated/rusefi_generated_stm32f767_nucleo.h index 46dece6e13..64e689c1b7 100644 --- a/firmware/controllers/generated/rusefi_generated_stm32f767_nucleo.h +++ b/firmware/controllers/generated/rusefi_generated_stm32f767_nucleo.h @@ -437,6 +437,7 @@ #define engine_type_e_VW_ABA 32 #define engine_type_e_WASTEGATE_PROTEUS_TEST 96 #define engineSyncCam_enum "Intake First Bank", "Exhaust First Bank", "Intake Second Bank", "Exhaust Second Bank" +#define ETB2_TRIM_SIZE 6 #define ETB_BIAS_CURVE_LENGTH 8 #define ETB_COUNT 2 #define ETB_HW_MAX_FREQUENCY 3000 @@ -1145,7 +1146,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2964181907 +#define SIGNATURE_HASH 1289969461 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1199,6 +1200,7 @@ #define TPS_2_BYTE_PACKING_MULT 100 #define TPS_TPS_ACCEL_CLT_CORR_TABLE 4 #define TPS_TPS_ACCEL_TABLE 8 +#define TRACTION_CONTROL_ETB_DROP_SIZE 6 #define transmission_controller_e_enum "None", "Simple Transmission", "GM 4L6X" #define TransmissionControllerMode_auto_enum 0="None",2="Gm4l6x",1="SimpleTransmissionController" #define TransmissionControllerMode_Gm4l6x 2 @@ -1444,7 +1446,7 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.31.stm32f767_nucleo.2964181907" +#define TS_SIGNATURE "rusEFI master.2023.12.31.stm32f767_nucleo.1289969461" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_t-b-g.h b/firmware/controllers/generated/rusefi_generated_t-b-g.h index f876a82507..83c2d2605b 100644 --- a/firmware/controllers/generated/rusefi_generated_t-b-g.h +++ b/firmware/controllers/generated/rusefi_generated_t-b-g.h @@ -437,6 +437,7 @@ #define engine_type_e_VW_ABA 32 #define engine_type_e_WASTEGATE_PROTEUS_TEST 96 #define engineSyncCam_enum "Intake First Bank", "Exhaust First Bank", "Intake Second Bank", "Exhaust Second Bank" +#define ETB2_TRIM_SIZE 6 #define ETB_BIAS_CURVE_LENGTH 8 #define ETB_COUNT 2 #define ETB_HW_MAX_FREQUENCY 3000 @@ -1145,7 +1146,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2964181907 +#define SIGNATURE_HASH 1289969461 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1199,6 +1200,7 @@ #define TPS_2_BYTE_PACKING_MULT 100 #define TPS_TPS_ACCEL_CLT_CORR_TABLE 4 #define TPS_TPS_ACCEL_TABLE 8 +#define TRACTION_CONTROL_ETB_DROP_SIZE 6 #define transmission_controller_e_enum "None", "Simple Transmission", "GM 4L6X" #define TransmissionControllerMode_auto_enum 0="None",2="Gm4l6x",1="SimpleTransmissionController" #define TransmissionControllerMode_Gm4l6x 2 @@ -1444,7 +1446,7 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.31.t-b-g.2964181907" +#define TS_SIGNATURE "rusEFI master.2023.12.31.t-b-g.1289969461" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_tdg-pdm8.h b/firmware/controllers/generated/rusefi_generated_tdg-pdm8.h index bacba16ec7..4f5bf22ded 100644 --- a/firmware/controllers/generated/rusefi_generated_tdg-pdm8.h +++ b/firmware/controllers/generated/rusefi_generated_tdg-pdm8.h @@ -437,6 +437,7 @@ #define engine_type_e_VW_ABA 32 #define engine_type_e_WASTEGATE_PROTEUS_TEST 96 #define engineSyncCam_enum "Intake First Bank", "Exhaust First Bank", "Intake Second Bank", "Exhaust Second Bank" +#define ETB2_TRIM_SIZE 6 #define ETB_BIAS_CURVE_LENGTH 8 #define ETB_COUNT 2 #define ETB_HW_MAX_FREQUENCY 3000 @@ -1145,7 +1146,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 973340593 +#define SIGNATURE_HASH 3326964503 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1199,6 +1200,7 @@ #define TPS_2_BYTE_PACKING_MULT 100 #define TPS_TPS_ACCEL_CLT_CORR_TABLE 4 #define TPS_TPS_ACCEL_TABLE 8 +#define TRACTION_CONTROL_ETB_DROP_SIZE 6 #define transmission_controller_e_enum "None", "Simple Transmission", "GM 4L6X" #define TransmissionControllerMode_auto_enum 0="None",2="Gm4l6x",1="SimpleTransmissionController" #define TransmissionControllerMode_Gm4l6x 2 @@ -1444,7 +1446,7 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.31.tdg-pdm8.973340593" +#define TS_SIGNATURE "rusEFI master.2023.12.31.tdg-pdm8.3326964503" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_uaefi.h b/firmware/controllers/generated/rusefi_generated_uaefi.h index e8416edc1b..95b18816a7 100644 --- a/firmware/controllers/generated/rusefi_generated_uaefi.h +++ b/firmware/controllers/generated/rusefi_generated_uaefi.h @@ -437,6 +437,7 @@ #define engine_type_e_VW_ABA 32 #define engine_type_e_WASTEGATE_PROTEUS_TEST 96 #define engineSyncCam_enum "Intake First Bank", "Exhaust First Bank", "Intake Second Bank", "Exhaust Second Bank" +#define ETB2_TRIM_SIZE 6 #define ETB_BIAS_CURVE_LENGTH 8 #define ETB_COUNT 2 #define ETB_HW_MAX_FREQUENCY 3000 @@ -1147,7 +1148,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 3641308901 +#define SIGNATURE_HASH 625441347 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1201,6 +1202,7 @@ #define TPS_2_BYTE_PACKING_MULT 100 #define TPS_TPS_ACCEL_CLT_CORR_TABLE 4 #define TPS_TPS_ACCEL_TABLE 8 +#define TRACTION_CONTROL_ETB_DROP_SIZE 6 #define transmission_controller_e_enum "None", "Simple Transmission", "GM 4L6X" #define TransmissionControllerMode_auto_enum 0="None",2="Gm4l6x",1="SimpleTransmissionController" #define TransmissionControllerMode_Gm4l6x 2 @@ -1446,7 +1448,7 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.31.uaefi.3641308901" +#define TS_SIGNATURE "rusEFI master.2023.12.31.uaefi.625441347" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/signature_alphax-2chan.h b/firmware/controllers/generated/signature_alphax-2chan.h index 2f4a1eac1c..7b1f60e4d5 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 config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3235407764 -#define TS_SIGNATURE "rusEFI master.2023.12.31.alphax-2chan.3235407764" +#define SIGNATURE_HASH 1016523570 +#define TS_SIGNATURE "rusEFI master.2023.12.31.alphax-2chan.1016523570" diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h index ec12f9b957..98c8f04cd4 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 config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2743929196 -#define TS_SIGNATURE "rusEFI master.2023.12.31.alphax-4chan.2743929196" +#define SIGNATURE_HASH 1606649290 +#define TS_SIGNATURE "rusEFI master.2023.12.31.alphax-4chan.1606649290" diff --git a/firmware/controllers/generated/signature_alphax-4chan_f7.h b/firmware/controllers/generated/signature_alphax-4chan_f7.h index 0255fe9d45..cd93e307e1 100644 --- a/firmware/controllers/generated/signature_alphax-4chan_f7.h +++ b/firmware/controllers/generated/signature_alphax-4chan_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2743929196 -#define TS_SIGNATURE "rusEFI master.2023.12.31.alphax-4chan_f7.2743929196" +#define SIGNATURE_HASH 1606649290 +#define TS_SIGNATURE "rusEFI master.2023.12.31.alphax-4chan_f7.1606649290" diff --git a/firmware/controllers/generated/signature_alphax-8chan-revA.h b/firmware/controllers/generated/signature_alphax-8chan-revA.h index a70189e22f..245342efd1 100644 --- a/firmware/controllers/generated/signature_alphax-8chan-revA.h +++ b/firmware/controllers/generated/signature_alphax-8chan-revA.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 4058705291 -#define TS_SIGNATURE "rusEFI master.2023.12.31.alphax-8chan-revA.4058705291" +#define SIGNATURE_HASH 228876589 +#define TS_SIGNATURE "rusEFI master.2023.12.31.alphax-8chan-revA.228876589" diff --git a/firmware/controllers/generated/signature_alphax-8chan.h b/firmware/controllers/generated/signature_alphax-8chan.h index 010338d80c..16eaac58ef 100644 --- a/firmware/controllers/generated/signature_alphax-8chan.h +++ b/firmware/controllers/generated/signature_alphax-8chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2919579252 -#define TS_SIGNATURE "rusEFI master.2023.12.31.alphax-8chan.2919579252" +#define SIGNATURE_HASH 1380692690 +#define TS_SIGNATURE "rusEFI master.2023.12.31.alphax-8chan.1380692690" diff --git a/firmware/controllers/generated/signature_alphax-8chan_f7.h b/firmware/controllers/generated/signature_alphax-8chan_f7.h index 0201310a76..c38e4ce04f 100644 --- a/firmware/controllers/generated/signature_alphax-8chan_f7.h +++ b/firmware/controllers/generated/signature_alphax-8chan_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2919579252 -#define TS_SIGNATURE "rusEFI master.2023.12.31.alphax-8chan_f7.2919579252" +#define SIGNATURE_HASH 1380692690 +#define TS_SIGNATURE "rusEFI master.2023.12.31.alphax-8chan_f7.1380692690" diff --git a/firmware/controllers/generated/signature_at_start_f435.h b/firmware/controllers/generated/signature_at_start_f435.h index 171035457c..10c5fe0476 100644 --- a/firmware/controllers/generated/signature_at_start_f435.h +++ b/firmware/controllers/generated/signature_at_start_f435.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2964181907 -#define TS_SIGNATURE "rusEFI master.2023.12.31.at_start_f435.2964181907" +#define SIGNATURE_HASH 1289969461 +#define TS_SIGNATURE "rusEFI master.2023.12.31.at_start_f435.1289969461" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index 8622aa5b4f..fa865b7b50 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 config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 4104783837 -#define TS_SIGNATURE "rusEFI master.2023.12.31.atlas.4104783837" +#define SIGNATURE_HASH 149195643 +#define TS_SIGNATURE "rusEFI master.2023.12.31.atlas.149195643" diff --git a/firmware/controllers/generated/signature_cypress.h b/firmware/controllers/generated/signature_cypress.h index 9e8263931b..25a0266bac 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 config_definition.jar based on hellen_cypress_gen_config.bat by SignatureConsumer // -#define SIGNATURE_HASH 2964181907 -#define TS_SIGNATURE "rusEFI master.2023.12.31.cypress.2964181907" +#define SIGNATURE_HASH 1289969461 +#define TS_SIGNATURE "rusEFI master.2023.12.31.cypress.1289969461" diff --git a/firmware/controllers/generated/signature_f407-discovery.h b/firmware/controllers/generated/signature_f407-discovery.h index a64a9f7b16..52bf945068 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 config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2470149857 -#define TS_SIGNATURE "rusEFI master.2023.12.31.f407-discovery.2470149857" +#define SIGNATURE_HASH 1870000711 +#define TS_SIGNATURE "rusEFI master.2023.12.31.f407-discovery.1870000711" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index d582255744..2d384c306a 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 config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2964181907 -#define TS_SIGNATURE "rusEFI master.2023.12.31.f429-discovery.2964181907" +#define SIGNATURE_HASH 1289969461 +#define TS_SIGNATURE "rusEFI master.2023.12.31.f429-discovery.1289969461" diff --git a/firmware/controllers/generated/signature_f469-discovery.h b/firmware/controllers/generated/signature_f469-discovery.h index ec069e279d..89ea942a9e 100644 --- a/firmware/controllers/generated/signature_f469-discovery.h +++ b/firmware/controllers/generated/signature_f469-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2189088000 -#define TS_SIGNATURE "rusEFI master.2023.12.31.f469-discovery.2189088000" +#define SIGNATURE_HASH 2117360038 +#define TS_SIGNATURE "rusEFI master.2023.12.31.f469-discovery.2117360038" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 0be7600e11..2054ea1bdd 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 config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3780798392 -#define TS_SIGNATURE "rusEFI master.2023.12.31.frankenso_na6.3780798392" +#define SIGNATURE_HASH 487910174 +#define TS_SIGNATURE "rusEFI master.2023.12.31.frankenso_na6.487910174" diff --git a/firmware/controllers/generated/signature_hellen-112-17.h b/firmware/controllers/generated/signature_hellen-112-17.h index 5823d5802d..ccdb429855 100644 --- a/firmware/controllers/generated/signature_hellen-112-17.h +++ b/firmware/controllers/generated/signature_hellen-112-17.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2041866597 -#define TS_SIGNATURE "rusEFI master.2023.12.31.hellen-112-17.2041866597" +#define SIGNATURE_HASH 2247812547 +#define TS_SIGNATURE "rusEFI master.2023.12.31.hellen-112-17.2247812547" diff --git a/firmware/controllers/generated/signature_hellen-gm-e67.h b/firmware/controllers/generated/signature_hellen-gm-e67.h index edc1df9601..aac5ad07c6 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 config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2458941483 -#define TS_SIGNATURE "rusEFI master.2023.12.31.hellen-gm-e67.2458941483" +#define SIGNATURE_HASH 1860105357 +#define TS_SIGNATURE "rusEFI master.2023.12.31.hellen-gm-e67.1860105357" diff --git a/firmware/controllers/generated/signature_hellen-honda-k.h b/firmware/controllers/generated/signature_hellen-honda-k.h index 0474c8617a..e06c2ae391 100644 --- a/firmware/controllers/generated/signature_hellen-honda-k.h +++ b/firmware/controllers/generated/signature_hellen-honda-k.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 4135989373 -#define TS_SIGNATURE "rusEFI master.2023.12.31.hellen-honda-k.4135989373" +#define SIGNATURE_HASH 180927707 +#define TS_SIGNATURE "rusEFI master.2023.12.31.hellen-honda-k.180927707" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index f47511b274..e7eb7239f4 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 config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2898527322 -#define TS_SIGNATURE "rusEFI master.2023.12.31.hellen-nb1.2898527322" +#define SIGNATURE_HASH 1351256316 +#define TS_SIGNATURE "rusEFI master.2023.12.31.hellen-nb1.1351256316" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index e0908a14b6..9961217a14 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 config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3625633796 -#define TS_SIGNATURE "rusEFI master.2023.12.31.hellen121nissan.3625633796" +#define SIGNATURE_HASH 609502370 +#define TS_SIGNATURE "rusEFI master.2023.12.31.hellen121nissan.609502370" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index e81ed858d7..1295aa7554 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 config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2161430133 -#define TS_SIGNATURE "rusEFI master.2023.12.31.hellen121vag.2161430133" +#define SIGNATURE_HASH 2090484435 +#define TS_SIGNATURE "rusEFI master.2023.12.31.hellen121vag.2090484435" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index c39099ee75..7426bd8973 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 config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1564473700 -#define TS_SIGNATURE "rusEFI master.2023.12.31.hellen128.1564473700" +#define SIGNATURE_HASH 2708567490 +#define TS_SIGNATURE "rusEFI master.2023.12.31.hellen128.2708567490" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index 21096b4801..a7d4e3d8f2 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 config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 471045162 -#define TS_SIGNATURE "rusEFI master.2023.12.31.hellen154hyundai.471045162" +#define SIGNATURE_HASH 3764197516 +#define TS_SIGNATURE "rusEFI master.2023.12.31.hellen154hyundai.3764197516" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index c85c141cb7..d2e44fc893 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 config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 810297103 -#define TS_SIGNATURE "rusEFI master.2023.12.31.hellen72.810297103" +#define SIGNATURE_HASH 3422727081 +#define TS_SIGNATURE "rusEFI master.2023.12.31.hellen72.3422727081" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index 3a087d1d08..0979a20552 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 config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3577561973 -#define TS_SIGNATURE "rusEFI master.2023.12.31.hellen81.3577561973" +#define SIGNATURE_HASH 695455699 +#define TS_SIGNATURE "rusEFI master.2023.12.31.hellen81.695455699" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index 3bf649ce30..8e9ddde274 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 config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1680010929 -#define TS_SIGNATURE "rusEFI master.2023.12.31.hellen88bmw.1680010929" +#define SIGNATURE_HASH 2557239831 +#define TS_SIGNATURE "rusEFI master.2023.12.31.hellen88bmw.2557239831" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index 11907a933c..5159e6ca00 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 config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 63714671 -#define TS_SIGNATURE "rusEFI master.2023.12.31.hellenNA6.63714671" +#define SIGNATURE_HASH 4286757321 +#define TS_SIGNATURE "rusEFI master.2023.12.31.hellenNA6.4286757321" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index 30f40d5c10..3d957bc2f3 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 config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3350536604 -#define TS_SIGNATURE "rusEFI master.2023.12.31.hellenNA8_96.3350536604" +#define SIGNATURE_HASH 1006349626 +#define TS_SIGNATURE "rusEFI master.2023.12.31.hellenNA8_96.1006349626" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index a350ee0051..67b6989960 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 config_definition.jar based on kinetis_gen_config.bat by SignatureConsumer // -#define SIGNATURE_HASH 4068217917 -#define TS_SIGNATURE "rusEFI master.2023.12.31.kin.4068217917" +#define SIGNATURE_HASH 238196891 +#define TS_SIGNATURE "rusEFI master.2023.12.31.kin.238196891" diff --git a/firmware/controllers/generated/signature_m74_9.h b/firmware/controllers/generated/signature_m74_9.h index 349e6c9274..44bf355fad 100644 --- a/firmware/controllers/generated/signature_m74_9.h +++ b/firmware/controllers/generated/signature_m74_9.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2971153446 -#define TS_SIGNATURE "rusEFI master.2023.12.31.m74_9.2971153446" +#define SIGNATURE_HASH 1297528960 +#define TS_SIGNATURE "rusEFI master.2023.12.31.m74_9.1297528960" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 1ff1524cfe..513e823c72 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 config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3431517129 -#define TS_SIGNATURE "rusEFI master.2023.12.31.mre_f4.3431517129" +#define SIGNATURE_HASH 818300783 +#define TS_SIGNATURE "rusEFI master.2023.12.31.mre_f4.818300783" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 5dfdc7ec0b..fab1fa7a67 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 config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3431517129 -#define TS_SIGNATURE "rusEFI master.2023.12.31.mre_f7.3431517129" +#define SIGNATURE_HASH 818300783 +#define TS_SIGNATURE "rusEFI master.2023.12.31.mre_f7.818300783" diff --git a/firmware/controllers/generated/signature_nucleo_h743.h b/firmware/controllers/generated/signature_nucleo_h743.h index ee10bff63f..20c04f601b 100644 --- a/firmware/controllers/generated/signature_nucleo_h743.h +++ b/firmware/controllers/generated/signature_nucleo_h743.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2964181907 -#define TS_SIGNATURE "rusEFI master.2023.12.31.nucleo_h743.2964181907" +#define SIGNATURE_HASH 1289969461 +#define TS_SIGNATURE "rusEFI master.2023.12.31.nucleo_h743.1289969461" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index ce06ea33cb..6700290efd 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 config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2151226883 -#define TS_SIGNATURE "rusEFI master.2023.12.31.prometheus_405.2151226883" +#define SIGNATURE_HASH 2088211109 +#define TS_SIGNATURE "rusEFI master.2023.12.31.prometheus_405.2088211109" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index e119e141f7..aed7f65be5 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 config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2151226883 -#define TS_SIGNATURE "rusEFI master.2023.12.31.prometheus_469.2151226883" +#define SIGNATURE_HASH 2088211109 +#define TS_SIGNATURE "rusEFI master.2023.12.31.prometheus_469.2088211109" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 8278a33358..8057939dd5 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 config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3687605773 -#define TS_SIGNATURE "rusEFI master.2023.12.31.proteus_f4.3687605773" +#define SIGNATURE_HASH 662891179 +#define TS_SIGNATURE "rusEFI master.2023.12.31.proteus_f4.662891179" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 448d41b835..94a087a02a 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 config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3687605773 -#define TS_SIGNATURE "rusEFI master.2023.12.31.proteus_f7.3687605773" +#define SIGNATURE_HASH 662891179 +#define TS_SIGNATURE "rusEFI master.2023.12.31.proteus_f7.662891179" diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h index a9e0cce3b4..d8d977003a 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 config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3687605773 -#define TS_SIGNATURE "rusEFI master.2023.12.31.proteus_h7.3687605773" +#define SIGNATURE_HASH 662891179 +#define TS_SIGNATURE "rusEFI master.2023.12.31.proteus_h7.662891179" diff --git a/firmware/controllers/generated/signature_s105.h b/firmware/controllers/generated/signature_s105.h index 96625ad215..de49be3ab5 100644 --- a/firmware/controllers/generated/signature_s105.h +++ b/firmware/controllers/generated/signature_s105.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 426427093 -#define TS_SIGNATURE "rusEFI master.2023.12.31.s105.426427093" +#define SIGNATURE_HASH 3844361843 +#define TS_SIGNATURE "rusEFI master.2023.12.31.s105.3844361843" diff --git a/firmware/controllers/generated/signature_small-can-board.h b/firmware/controllers/generated/signature_small-can-board.h index 7dd36eaf1a..4c0d57eeba 100644 --- a/firmware/controllers/generated/signature_small-can-board.h +++ b/firmware/controllers/generated/signature_small-can-board.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2383159066 -#define TS_SIGNATURE "rusEFI master.2023.12.31.small-can-board.2383159066" +#define SIGNATURE_HASH 1916965820 +#define TS_SIGNATURE "rusEFI master.2023.12.31.small-can-board.1916965820" diff --git a/firmware/controllers/generated/signature_stm32f413_nucleo.h b/firmware/controllers/generated/signature_stm32f413_nucleo.h index f586ef2112..ea05518824 100644 --- a/firmware/controllers/generated/signature_stm32f413_nucleo.h +++ b/firmware/controllers/generated/signature_stm32f413_nucleo.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2964181907 -#define TS_SIGNATURE "rusEFI master.2023.12.31.stm32f413_nucleo.2964181907" +#define SIGNATURE_HASH 1289969461 +#define TS_SIGNATURE "rusEFI master.2023.12.31.stm32f413_nucleo.1289969461" diff --git a/firmware/controllers/generated/signature_stm32f429_nucleo.h b/firmware/controllers/generated/signature_stm32f429_nucleo.h index 75bbfaa28a..1d898f4eb7 100644 --- a/firmware/controllers/generated/signature_stm32f429_nucleo.h +++ b/firmware/controllers/generated/signature_stm32f429_nucleo.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2964181907 -#define TS_SIGNATURE "rusEFI master.2023.12.31.stm32f429_nucleo.2964181907" +#define SIGNATURE_HASH 1289969461 +#define TS_SIGNATURE "rusEFI master.2023.12.31.stm32f429_nucleo.1289969461" diff --git a/firmware/controllers/generated/signature_stm32f767_nucleo.h b/firmware/controllers/generated/signature_stm32f767_nucleo.h index ce059c0086..3219b9cabf 100644 --- a/firmware/controllers/generated/signature_stm32f767_nucleo.h +++ b/firmware/controllers/generated/signature_stm32f767_nucleo.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2964181907 -#define TS_SIGNATURE "rusEFI master.2023.12.31.stm32f767_nucleo.2964181907" +#define SIGNATURE_HASH 1289969461 +#define TS_SIGNATURE "rusEFI master.2023.12.31.stm32f767_nucleo.1289969461" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index b9c0e54996..61fe3684b9 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 config_definition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1063516245 -#define TS_SIGNATURE "rusEFI master.2023.12.31.subaru_eg33_f7.1063516245" +#define SIGNATURE_HASH 3274536179 +#define TS_SIGNATURE "rusEFI master.2023.12.31.subaru_eg33_f7.3274536179" diff --git a/firmware/controllers/generated/signature_t-b-g.h b/firmware/controllers/generated/signature_t-b-g.h index f2bb29331f..ba48cc5089 100644 --- a/firmware/controllers/generated/signature_t-b-g.h +++ b/firmware/controllers/generated/signature_t-b-g.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2964181907 -#define TS_SIGNATURE "rusEFI master.2023.12.31.t-b-g.2964181907" +#define SIGNATURE_HASH 1289969461 +#define TS_SIGNATURE "rusEFI master.2023.12.31.t-b-g.1289969461" diff --git a/firmware/controllers/generated/signature_tdg-pdm8.h b/firmware/controllers/generated/signature_tdg-pdm8.h index 5735de2808..aeaa21e0ad 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 config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 973340593 -#define TS_SIGNATURE "rusEFI master.2023.12.31.tdg-pdm8.973340593" +#define SIGNATURE_HASH 3326964503 +#define TS_SIGNATURE "rusEFI master.2023.12.31.tdg-pdm8.3326964503" diff --git a/firmware/controllers/generated/signature_uaefi.h b/firmware/controllers/generated/signature_uaefi.h index 6fcd4d882e..97b3527bda 100644 --- a/firmware/controllers/generated/signature_uaefi.h +++ b/firmware/controllers/generated/signature_uaefi.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3641308901 -#define TS_SIGNATURE "rusEFI master.2023.12.31.uaefi.3641308901" +#define SIGNATURE_HASH 625441347 +#define TS_SIGNATURE "rusEFI master.2023.12.31.uaefi.625441347" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini index 9c0dbe0f40..7391732d70 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.31.alphax-2chan.3235407764" + signature = "rusEFI master.2023.12.31.alphax-2chan.1016523570" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.31.alphax-2chan.3235407764" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.31.alphax-2chan.1016523570" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","B4 - O2","On-board MAP","INVALID","B5 - TPS","A2 Battery Sense","C7 - CAM Hall/Digital","INVALID","X1 - AIN1","INVALID","INVALID","B2 - MAP","B7 - CLT","B3 - IAT","X3 - AIN2","X7 - AIN4" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:18:40 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:17:37 UTC 2023 pageSize = 22088 page = 1 @@ -1010,7 +1010,9 @@ triggerCompCenterVolt = scalar, U08, 2668, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMin = scalar, U08, 2669, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMax = scalar, U08, 2670, "V", 0.02, 0, 0, 5.1, 2 triggerCompSensorSatRpm = scalar, U08, 2671, "RPM", 50.0, 0, 0, 12000, 0 -unusedHere = array, S08, 2672, [20], "", 1, 0, 0, 100, 0 +tractionControlSlipBins = array, U16, 2672, [6], "ratio", 0.1, 0, 0, 999, 1 +tractionControlSpeedBins = array, U08, 2684, [6], "RPM", 1, 0, 0, 250, 0 +unusedHere = array, S08, 2690, [2], "", 1, 0, 0, 100, 0 canVssNbcType = bits, U08, 2692, [0:2], "BMW_e46", "W202", "BMW E8x/E9x MK60e5", "Nissan 350", "Hyundai PB", "Honda Civic9" gppwm1_pin = bits, U16, 2696, [0:8], $output_pin_e_list gppwm1_dutyIfError = scalar, U08, 2698, "%", 1, 0, 0, 100, 0 @@ -1303,7 +1305,8 @@ triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 -mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 +tractionControlEtbDrop = array, S08, 4348, [6x6], "%", 1, 0, -100, 0, 0 +mainUnusedEnd = array, U08, 4384, [172], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -3131,6 +3134,7 @@ etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1401, "", 1, 0 jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 ; total TS size = 1404 faultCode0 = scalar, U08, 1404, "", 1, 0 @@ -3838,6 +3842,11 @@ curve = rangeMatrix, "Range Switch Input Matrix" yBins = tpsTpsAccelToRpmBins, TPSValue zBins = tpsTpsAccelTable + table = tractionEtbTableTbl, tractionEtb, "Traction Control ETB drop", 1 + xBins = tractionControlSpeedBins, vehicleSpeedKph + yBins = tractionControlSlipBins, wheelSlipRatio + zBins = tractionControlEtbDrop + table = boostTableTbl, boostMapOpen, "Boost control duty cycle (open loop)", 1 xBins = boostRpmBins, RPMValue yBins = boostTpsBins, TPSValue @@ -5381,6 +5390,7 @@ entry = etbDutyAverage0, "ETB average duty0", float, "%.3f" entry = etbTpsErrorCounter0, "ETB TPS error counter0", int, "%d" entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" +entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" ;entry = trim1, "ETB: trim1", float, "%.3f" @@ -5397,6 +5407,7 @@ entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = etbTpsErrorCounter1, "ETB TPS error counter1", int, "%d" ;entry = etbPpsErrorCounter1, "ETB pedal error counter1", int, "%d" ;entry = etbErrorCode1, "etbErrorCode1", int, "%d" +;entry = tcEtbDrop1, "tcEtbDrop1", int, "%d" ;entry = jamTimer1, "ETB jam timer1", float, "%.3f" entry = faultCode0, "WBO: Fault code0", int, "%d" entry = heaterDuty0, "WBO: Heater duty0", int, "%d" @@ -5728,6 +5739,7 @@ menuDialog = main subMenu = hpfpCompensationTable, "HPFP Pump Compensation", {hpfpCamLobes != 0} subMenu = std_separator subMenu = fancyHardwareDialog, "Fancy Hardware" + subMenu = tractionEtbTableTbl subMenu = std_separator @@ -6345,6 +6357,7 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etbPpsErrorCounter0 liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etbErrorCode0 + graphLine = tcEtbDrop0 graphLine = jamTimer0 diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini index 834bbf57b2..ac2a9e38c0 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.31.alphax-4chan.2743929196" + signature = "rusEFI master.2023.12.31.alphax-4chan.1606649290" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.31.alphax-4chan.2743929196" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.31.alphax-4chan.1606649290" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","B4 - O2","On-board MAP","D5 - PPS","B5 - TPS","F7 - Ignition Key Voltage","C7 - CAM Hall/Digital","X7 - AIN4","D4 - TPS2","INVALID","X5 - AIN3","B2 - MAP","B7 - CLT","B3 - IAT","F6 - PPS2","INVALID","INVALID","INVALID","INVALID","X3 - AIN2","X1 - AIN1 and D5 on older boards" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:18:43 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:17:40 UTC 2023 pageSize = 22088 page = 1 @@ -1010,7 +1010,9 @@ triggerCompCenterVolt = scalar, U08, 2668, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMin = scalar, U08, 2669, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMax = scalar, U08, 2670, "V", 0.02, 0, 0, 5.1, 2 triggerCompSensorSatRpm = scalar, U08, 2671, "RPM", 50.0, 0, 0, 12000, 0 -unusedHere = array, S08, 2672, [20], "", 1, 0, 0, 100, 0 +tractionControlSlipBins = array, U16, 2672, [6], "ratio", 0.1, 0, 0, 999, 1 +tractionControlSpeedBins = array, U08, 2684, [6], "RPM", 1, 0, 0, 250, 0 +unusedHere = array, S08, 2690, [2], "", 1, 0, 0, 100, 0 canVssNbcType = bits, U08, 2692, [0:2], "BMW_e46", "W202", "BMW E8x/E9x MK60e5", "Nissan 350", "Hyundai PB", "Honda Civic9" gppwm1_pin = bits, U16, 2696, [0:8], $output_pin_e_list gppwm1_dutyIfError = scalar, U08, 2698, "%", 1, 0, 0, 100, 0 @@ -1303,7 +1305,8 @@ triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 -mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 +tractionControlEtbDrop = array, S08, 4348, [6x6], "%", 1, 0, -100, 0, 0 +mainUnusedEnd = array, U08, 4384, [172], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -3131,6 +3134,7 @@ etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1401, "", 1, 0 jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 ; total TS size = 1404 faultCode0 = scalar, U08, 1404, "", 1, 0 @@ -3838,6 +3842,11 @@ curve = rangeMatrix, "Range Switch Input Matrix" yBins = tpsTpsAccelToRpmBins, TPSValue zBins = tpsTpsAccelTable + table = tractionEtbTableTbl, tractionEtb, "Traction Control ETB drop", 1 + xBins = tractionControlSpeedBins, vehicleSpeedKph + yBins = tractionControlSlipBins, wheelSlipRatio + zBins = tractionControlEtbDrop + table = boostTableTbl, boostMapOpen, "Boost control duty cycle (open loop)", 1 xBins = boostRpmBins, RPMValue yBins = boostTpsBins, TPSValue @@ -5381,6 +5390,7 @@ entry = etbDutyAverage0, "ETB average duty0", float, "%.3f" entry = etbTpsErrorCounter0, "ETB TPS error counter0", int, "%d" entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" +entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" ;entry = trim1, "ETB: trim1", float, "%.3f" @@ -5397,6 +5407,7 @@ entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = etbTpsErrorCounter1, "ETB TPS error counter1", int, "%d" ;entry = etbPpsErrorCounter1, "ETB pedal error counter1", int, "%d" ;entry = etbErrorCode1, "etbErrorCode1", int, "%d" +;entry = tcEtbDrop1, "tcEtbDrop1", int, "%d" ;entry = jamTimer1, "ETB jam timer1", float, "%.3f" entry = faultCode0, "WBO: Fault code0", int, "%d" entry = heaterDuty0, "WBO: Heater duty0", int, "%d" @@ -5730,6 +5741,7 @@ menuDialog = main subMenu = hpfpCompensationTable, "HPFP Pump Compensation", {hpfpCamLobes != 0} subMenu = std_separator subMenu = fancyHardwareDialog, "Fancy Hardware" + subMenu = tractionEtbTableTbl subMenu = std_separator @@ -6348,6 +6360,7 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etbPpsErrorCounter0 liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etbErrorCode0 + graphLine = tcEtbDrop0 graphLine = jamTimer0 diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan_f7.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan_f7.ini index f9622ac59d..e6e7500458 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4chan_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan_f7.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.31.alphax-4chan_f7.2743929196" + signature = "rusEFI master.2023.12.31.alphax-4chan_f7.1606649290" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.31.alphax-4chan_f7.2743929196" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.31.alphax-4chan_f7.1606649290" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","B4 - O2","On-board MAP","D5 - PPS","B5 - TPS","F7 - Ignition Key Voltage","C7 - CAM Hall/Digital","X7 - AIN4","D4 - TPS2","INVALID","X5 - AIN3","B2 - MAP","B7 - CLT","B3 - IAT","F6 - PPS2","INVALID","INVALID","INVALID","INVALID","X3 - AIN2","X1 - AIN1 and D5 on older boards" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:18:46 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:17:42 UTC 2023 pageSize = 22088 page = 1 @@ -1010,7 +1010,9 @@ triggerCompCenterVolt = scalar, U08, 2668, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMin = scalar, U08, 2669, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMax = scalar, U08, 2670, "V", 0.02, 0, 0, 5.1, 2 triggerCompSensorSatRpm = scalar, U08, 2671, "RPM", 50.0, 0, 0, 12000, 0 -unusedHere = array, S08, 2672, [20], "", 1, 0, 0, 100, 0 +tractionControlSlipBins = array, U16, 2672, [6], "ratio", 0.1, 0, 0, 999, 1 +tractionControlSpeedBins = array, U08, 2684, [6], "RPM", 1, 0, 0, 250, 0 +unusedHere = array, S08, 2690, [2], "", 1, 0, 0, 100, 0 canVssNbcType = bits, U08, 2692, [0:2], "BMW_e46", "W202", "BMW E8x/E9x MK60e5", "Nissan 350", "Hyundai PB", "Honda Civic9" gppwm1_pin = bits, U16, 2696, [0:8], $output_pin_e_list gppwm1_dutyIfError = scalar, U08, 2698, "%", 1, 0, 0, 100, 0 @@ -1303,7 +1305,8 @@ triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 -mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 +tractionControlEtbDrop = array, S08, 4348, [6x6], "%", 1, 0, -100, 0, 0 +mainUnusedEnd = array, U08, 4384, [172], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -3131,6 +3134,7 @@ etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1401, "", 1, 0 jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 ; total TS size = 1404 faultCode0 = scalar, U08, 1404, "", 1, 0 @@ -3838,6 +3842,11 @@ curve = rangeMatrix, "Range Switch Input Matrix" yBins = tpsTpsAccelToRpmBins, TPSValue zBins = tpsTpsAccelTable + table = tractionEtbTableTbl, tractionEtb, "Traction Control ETB drop", 1 + xBins = tractionControlSpeedBins, vehicleSpeedKph + yBins = tractionControlSlipBins, wheelSlipRatio + zBins = tractionControlEtbDrop + table = boostTableTbl, boostMapOpen, "Boost control duty cycle (open loop)", 1 xBins = boostRpmBins, RPMValue yBins = boostTpsBins, TPSValue @@ -5381,6 +5390,7 @@ entry = etbDutyAverage0, "ETB average duty0", float, "%.3f" entry = etbTpsErrorCounter0, "ETB TPS error counter0", int, "%d" entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" +entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" ;entry = trim1, "ETB: trim1", float, "%.3f" @@ -5397,6 +5407,7 @@ entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = etbTpsErrorCounter1, "ETB TPS error counter1", int, "%d" ;entry = etbPpsErrorCounter1, "ETB pedal error counter1", int, "%d" ;entry = etbErrorCode1, "etbErrorCode1", int, "%d" +;entry = tcEtbDrop1, "tcEtbDrop1", int, "%d" ;entry = jamTimer1, "ETB jam timer1", float, "%.3f" entry = faultCode0, "WBO: Fault code0", int, "%d" entry = heaterDuty0, "WBO: Heater duty0", int, "%d" @@ -5730,6 +5741,7 @@ menuDialog = main subMenu = hpfpCompensationTable, "HPFP Pump Compensation", {hpfpCamLobes != 0} subMenu = std_separator subMenu = fancyHardwareDialog, "Fancy Hardware" + subMenu = tractionEtbTableTbl subMenu = std_separator @@ -6348,6 +6360,7 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etbPpsErrorCounter0 liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etbErrorCode0 + graphLine = tcEtbDrop0 graphLine = jamTimer0 diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan-revA.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan-revA.ini index b0011d67e2..db7f452fa9 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-8chan-revA.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-8chan-revA.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.31.alphax-8chan-revA.4058705291" + signature = "rusEFI master.2023.12.31.alphax-8chan-revA.228876589" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.31.alphax-8chan-revA.4058705291" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.31.alphax-8chan-revA.228876589" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","INVALID","INVALID","17A - PPS","23C - TPS","Battery Sense","INVALID","15D - AN5","24C - TPS2","14A - Analog 1","22A - Analog 22","On-board MAP","16A - CLT","15A - IAT","31C - PPS2","33A - AN3","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","16D - AN6","INVALID","INVALID","INVALID","INVALID","7C - AT4","INVALID","6C - AT3","14D - AN4" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:18:54 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:17:50 UTC 2023 pageSize = 22088 page = 1 @@ -1010,7 +1010,9 @@ triggerCompCenterVolt = scalar, U08, 2668, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMin = scalar, U08, 2669, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMax = scalar, U08, 2670, "V", 0.02, 0, 0, 5.1, 2 triggerCompSensorSatRpm = scalar, U08, 2671, "RPM", 50.0, 0, 0, 12000, 0 -unusedHere = array, S08, 2672, [20], "", 1, 0, 0, 100, 0 +tractionControlSlipBins = array, U16, 2672, [6], "ratio", 0.1, 0, 0, 999, 1 +tractionControlSpeedBins = array, U08, 2684, [6], "RPM", 1, 0, 0, 250, 0 +unusedHere = array, S08, 2690, [2], "", 1, 0, 0, 100, 0 canVssNbcType = bits, U08, 2692, [0:2], "BMW_e46", "W202", "BMW E8x/E9x MK60e5", "Nissan 350", "Hyundai PB", "Honda Civic9" gppwm1_pin = bits, U16, 2696, [0:8], $output_pin_e_list gppwm1_dutyIfError = scalar, U08, 2698, "%", 1, 0, 0, 100, 0 @@ -1303,7 +1305,8 @@ triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 -mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 +tractionControlEtbDrop = array, S08, 4348, [6x6], "%", 1, 0, -100, 0, 0 +mainUnusedEnd = array, U08, 4384, [172], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -3131,6 +3134,7 @@ etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1401, "", 1, 0 jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 ; total TS size = 1404 faultCode0 = scalar, U08, 1404, "", 1, 0 @@ -3838,6 +3842,11 @@ curve = rangeMatrix, "Range Switch Input Matrix" yBins = tpsTpsAccelToRpmBins, TPSValue zBins = tpsTpsAccelTable + table = tractionEtbTableTbl, tractionEtb, "Traction Control ETB drop", 1 + xBins = tractionControlSpeedBins, vehicleSpeedKph + yBins = tractionControlSlipBins, wheelSlipRatio + zBins = tractionControlEtbDrop + table = boostTableTbl, boostMapOpen, "Boost control duty cycle (open loop)", 1 xBins = boostRpmBins, RPMValue yBins = boostTpsBins, TPSValue @@ -5381,6 +5390,7 @@ entry = etbDutyAverage0, "ETB average duty0", float, "%.3f" entry = etbTpsErrorCounter0, "ETB TPS error counter0", int, "%d" entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" +entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" ;entry = trim1, "ETB: trim1", float, "%.3f" @@ -5397,6 +5407,7 @@ entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = etbTpsErrorCounter1, "ETB TPS error counter1", int, "%d" ;entry = etbPpsErrorCounter1, "ETB pedal error counter1", int, "%d" ;entry = etbErrorCode1, "etbErrorCode1", int, "%d" +;entry = tcEtbDrop1, "tcEtbDrop1", int, "%d" ;entry = jamTimer1, "ETB jam timer1", float, "%.3f" entry = faultCode0, "WBO: Fault code0", int, "%d" entry = heaterDuty0, "WBO: Heater duty0", int, "%d" @@ -5730,6 +5741,7 @@ menuDialog = main subMenu = hpfpCompensationTable, "HPFP Pump Compensation", {hpfpCamLobes != 0} subMenu = std_separator subMenu = fancyHardwareDialog, "Fancy Hardware" + subMenu = tractionEtbTableTbl subMenu = std_separator @@ -6349,6 +6361,7 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etbPpsErrorCounter0 liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etbErrorCode0 + graphLine = tcEtbDrop0 graphLine = jamTimer0 diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini index 79aac1b1e3..cd487a528c 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.31.alphax-8chan.2919579252" + signature = "rusEFI master.2023.12.31.alphax-8chan.1380692690" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.31.alphax-8chan.2919579252" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.31.alphax-8chan.1380692690" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","3A - Aux Analog 2","On-board MAP","32A - PPS Sensor Input","31A - TPS Sensor Input","24 - Ignition Key Voltage","INVALID","INVALID","19A - Aux Analog 6","1A - Aux Analog 1","2A - Aux Analog 4","INVALID","29A - CLT Sensor Input","27A - IAT Sensor Input","INVALID","12A - Aux Analog 8","INVALID","11A - Aux Analog 3","INVALID","34A - PPS2 Sensor Input","33A - TPS2 Sensor Input","INVALID","INVALID","INVALID","4A - Aux Analog 7","INVALID","10A - Aux Analog 5","INVALID","28A - Aux Temp 2","28A - Aux Temp 1","INVALID","20A - Aux Analog 9" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:18:48 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:17:45 UTC 2023 pageSize = 22104 page = 1 @@ -1013,7 +1013,9 @@ triggerCompCenterVolt = scalar, U08, 2684, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMin = scalar, U08, 2685, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMax = scalar, U08, 2686, "V", 0.02, 0, 0, 5.1, 2 triggerCompSensorSatRpm = scalar, U08, 2687, "RPM", 50.0, 0, 0, 12000, 0 -unusedHere = array, S08, 2688, [20], "", 1, 0, 0, 100, 0 +tractionControlSlipBins = array, U16, 2688, [6], "ratio", 0.1, 0, 0, 999, 1 +tractionControlSpeedBins = array, U08, 2700, [6], "RPM", 1, 0, 0, 250, 0 +unusedHere = array, S08, 2706, [2], "", 1, 0, 0, 100, 0 canVssNbcType = bits, U08, 2708, [0:2], "BMW_e46", "W202", "BMW E8x/E9x MK60e5", "Nissan 350", "Hyundai PB", "Honda Civic9" gppwm1_pin = bits, U16, 2712, [0:8], $output_pin_e_list gppwm1_dutyIfError = scalar, U08, 2714, "%", 1, 0, 0, 100, 0 @@ -1306,7 +1308,8 @@ triggerVVTGapOverrideTo1 = scalar, F32, 4348, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo2 = scalar, F32, 4352, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo3 = scalar, F32, 4356, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo4 = scalar, F32, 4360, "ratio", 1, 0, 0, 20, 3 -mainUnusedEnd = array, U08, 4364, [208], "units", 1, 0, 0, 1, 0 +tractionControlEtbDrop = array, S08, 4364, [6x6], "%", 1, 0, -100, 0, 0 +mainUnusedEnd = array, U08, 4400, [172], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4572, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4604, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4636, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -3134,6 +3137,7 @@ etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1401, "", 1, 0 jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 ; total TS size = 1404 faultCode0 = scalar, U08, 1404, "", 1, 0 @@ -3841,6 +3845,11 @@ curve = rangeMatrix, "Range Switch Input Matrix" yBins = tpsTpsAccelToRpmBins, TPSValue zBins = tpsTpsAccelTable + table = tractionEtbTableTbl, tractionEtb, "Traction Control ETB drop", 1 + xBins = tractionControlSpeedBins, vehicleSpeedKph + yBins = tractionControlSlipBins, wheelSlipRatio + zBins = tractionControlEtbDrop + table = boostTableTbl, boostMapOpen, "Boost control duty cycle (open loop)", 1 xBins = boostRpmBins, RPMValue yBins = boostTpsBins, TPSValue @@ -5384,6 +5393,7 @@ entry = etbDutyAverage0, "ETB average duty0", float, "%.3f" entry = etbTpsErrorCounter0, "ETB TPS error counter0", int, "%d" entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" +entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" ;entry = trim1, "ETB: trim1", float, "%.3f" @@ -5400,6 +5410,7 @@ entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = etbTpsErrorCounter1, "ETB TPS error counter1", int, "%d" ;entry = etbPpsErrorCounter1, "ETB pedal error counter1", int, "%d" ;entry = etbErrorCode1, "etbErrorCode1", int, "%d" +;entry = tcEtbDrop1, "tcEtbDrop1", int, "%d" ;entry = jamTimer1, "ETB jam timer1", float, "%.3f" entry = faultCode0, "WBO: Fault code0", int, "%d" entry = heaterDuty0, "WBO: Heater duty0", int, "%d" @@ -5733,6 +5744,7 @@ menuDialog = main subMenu = hpfpCompensationTable, "HPFP Pump Compensation", {hpfpCamLobes != 0} subMenu = std_separator subMenu = fancyHardwareDialog, "Fancy Hardware" + subMenu = tractionEtbTableTbl subMenu = std_separator @@ -6352,6 +6364,7 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etbPpsErrorCounter0 liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etbErrorCode0 + graphLine = tcEtbDrop0 graphLine = jamTimer0 diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan_f7.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan_f7.ini index 0f51663b4a..f2942beb94 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-8chan_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-8chan_f7.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.31.alphax-8chan_f7.2919579252" + signature = "rusEFI master.2023.12.31.alphax-8chan_f7.1380692690" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.31.alphax-8chan_f7.2919579252" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.31.alphax-8chan_f7.1380692690" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","3A - Aux Analog 2","On-board MAP","32A - PPS Sensor Input","31A - TPS Sensor Input","24 - Ignition Key Voltage","INVALID","INVALID","19A - Aux Analog 6","1A - Aux Analog 1","2A - Aux Analog 4","INVALID","29A - CLT Sensor Input","27A - IAT Sensor Input","INVALID","12A - Aux Analog 8","INVALID","11A - Aux Analog 3","INVALID","34A - PPS2 Sensor Input","33A - TPS2 Sensor Input","INVALID","INVALID","INVALID","4A - Aux Analog 7","INVALID","10A - Aux Analog 5","INVALID","28A - Aux Temp 2","28A - Aux Temp 1","INVALID","20A - Aux Analog 9" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:18:51 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:17:48 UTC 2023 pageSize = 22104 page = 1 @@ -1013,7 +1013,9 @@ triggerCompCenterVolt = scalar, U08, 2684, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMin = scalar, U08, 2685, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMax = scalar, U08, 2686, "V", 0.02, 0, 0, 5.1, 2 triggerCompSensorSatRpm = scalar, U08, 2687, "RPM", 50.0, 0, 0, 12000, 0 -unusedHere = array, S08, 2688, [20], "", 1, 0, 0, 100, 0 +tractionControlSlipBins = array, U16, 2688, [6], "ratio", 0.1, 0, 0, 999, 1 +tractionControlSpeedBins = array, U08, 2700, [6], "RPM", 1, 0, 0, 250, 0 +unusedHere = array, S08, 2706, [2], "", 1, 0, 0, 100, 0 canVssNbcType = bits, U08, 2708, [0:2], "BMW_e46", "W202", "BMW E8x/E9x MK60e5", "Nissan 350", "Hyundai PB", "Honda Civic9" gppwm1_pin = bits, U16, 2712, [0:8], $output_pin_e_list gppwm1_dutyIfError = scalar, U08, 2714, "%", 1, 0, 0, 100, 0 @@ -1306,7 +1308,8 @@ triggerVVTGapOverrideTo1 = scalar, F32, 4348, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo2 = scalar, F32, 4352, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo3 = scalar, F32, 4356, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo4 = scalar, F32, 4360, "ratio", 1, 0, 0, 20, 3 -mainUnusedEnd = array, U08, 4364, [208], "units", 1, 0, 0, 1, 0 +tractionControlEtbDrop = array, S08, 4364, [6x6], "%", 1, 0, -100, 0, 0 +mainUnusedEnd = array, U08, 4400, [172], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4572, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4604, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4636, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -3134,6 +3137,7 @@ etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1401, "", 1, 0 jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 ; total TS size = 1404 faultCode0 = scalar, U08, 1404, "", 1, 0 @@ -3841,6 +3845,11 @@ curve = rangeMatrix, "Range Switch Input Matrix" yBins = tpsTpsAccelToRpmBins, TPSValue zBins = tpsTpsAccelTable + table = tractionEtbTableTbl, tractionEtb, "Traction Control ETB drop", 1 + xBins = tractionControlSpeedBins, vehicleSpeedKph + yBins = tractionControlSlipBins, wheelSlipRatio + zBins = tractionControlEtbDrop + table = boostTableTbl, boostMapOpen, "Boost control duty cycle (open loop)", 1 xBins = boostRpmBins, RPMValue yBins = boostTpsBins, TPSValue @@ -5384,6 +5393,7 @@ entry = etbDutyAverage0, "ETB average duty0", float, "%.3f" entry = etbTpsErrorCounter0, "ETB TPS error counter0", int, "%d" entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" +entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" ;entry = trim1, "ETB: trim1", float, "%.3f" @@ -5400,6 +5410,7 @@ entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = etbTpsErrorCounter1, "ETB TPS error counter1", int, "%d" ;entry = etbPpsErrorCounter1, "ETB pedal error counter1", int, "%d" ;entry = etbErrorCode1, "etbErrorCode1", int, "%d" +;entry = tcEtbDrop1, "tcEtbDrop1", int, "%d" ;entry = jamTimer1, "ETB jam timer1", float, "%.3f" entry = faultCode0, "WBO: Fault code0", int, "%d" entry = heaterDuty0, "WBO: Heater duty0", int, "%d" @@ -5733,6 +5744,7 @@ menuDialog = main subMenu = hpfpCompensationTable, "HPFP Pump Compensation", {hpfpCamLobes != 0} subMenu = std_separator subMenu = fancyHardwareDialog, "Fancy Hardware" + subMenu = tractionEtbTableTbl subMenu = std_separator @@ -6352,6 +6364,7 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etbPpsErrorCounter0 liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etbErrorCode0 + graphLine = tcEtbDrop0 graphLine = jamTimer0 diff --git a/firmware/tunerstudio/generated/rusefi_at_start_f435.ini b/firmware/tunerstudio/generated/rusefi_at_start_f435.ini index b498804064..126e950006 100644 --- a/firmware/tunerstudio/generated/rusefi_at_start_f435.ini +++ b/firmware/tunerstudio/generated/rusefi_at_start_f435.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.31.at_start_f435.2964181907" + signature = "rusEFI master.2023.12.31.at_start_f435.1289969461" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.31.at_start_f435.2964181907" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.31.at_start_f435.1289969461" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:20:25 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:19:20 UTC 2023 pageSize = 22088 page = 1 @@ -1010,7 +1010,9 @@ triggerCompCenterVolt = scalar, U08, 2668, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMin = scalar, U08, 2669, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMax = scalar, U08, 2670, "V", 0.02, 0, 0, 5.1, 2 triggerCompSensorSatRpm = scalar, U08, 2671, "RPM", 50.0, 0, 0, 12000, 0 -unusedHere = array, S08, 2672, [20], "", 1, 0, 0, 100, 0 +tractionControlSlipBins = array, U16, 2672, [6], "ratio", 0.1, 0, 0, 999, 1 +tractionControlSpeedBins = array, U08, 2684, [6], "RPM", 1, 0, 0, 250, 0 +unusedHere = array, S08, 2690, [2], "", 1, 0, 0, 100, 0 canVssNbcType = bits, U08, 2692, [0:2], "BMW_e46", "W202", "BMW E8x/E9x MK60e5", "Nissan 350", "Hyundai PB", "Honda Civic9" gppwm1_pin = bits, U16, 2696, [0:8], $output_pin_e_list gppwm1_dutyIfError = scalar, U08, 2698, "%", 1, 0, 0, 100, 0 @@ -1303,7 +1305,8 @@ triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 -mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 +tractionControlEtbDrop = array, S08, 4348, [6x6], "%", 1, 0, -100, 0, 0 +mainUnusedEnd = array, U08, 4384, [172], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -3131,6 +3134,7 @@ etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1401, "", 1, 0 jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 ; total TS size = 1404 faultCode0 = scalar, U08, 1404, "", 1, 0 @@ -3838,6 +3842,11 @@ curve = rangeMatrix, "Range Switch Input Matrix" yBins = tpsTpsAccelToRpmBins, TPSValue zBins = tpsTpsAccelTable + table = tractionEtbTableTbl, tractionEtb, "Traction Control ETB drop", 1 + xBins = tractionControlSpeedBins, vehicleSpeedKph + yBins = tractionControlSlipBins, wheelSlipRatio + zBins = tractionControlEtbDrop + table = boostTableTbl, boostMapOpen, "Boost control duty cycle (open loop)", 1 xBins = boostRpmBins, RPMValue yBins = boostTpsBins, TPSValue @@ -5381,6 +5390,7 @@ entry = etbDutyAverage0, "ETB average duty0", float, "%.3f" entry = etbTpsErrorCounter0, "ETB TPS error counter0", int, "%d" entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" +entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" ;entry = trim1, "ETB: trim1", float, "%.3f" @@ -5397,6 +5407,7 @@ entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = etbTpsErrorCounter1, "ETB TPS error counter1", int, "%d" ;entry = etbPpsErrorCounter1, "ETB pedal error counter1", int, "%d" ;entry = etbErrorCode1, "etbErrorCode1", int, "%d" +;entry = tcEtbDrop1, "tcEtbDrop1", int, "%d" ;entry = jamTimer1, "ETB jam timer1", float, "%.3f" entry = faultCode0, "WBO: Fault code0", int, "%d" entry = heaterDuty0, "WBO: Heater duty0", int, "%d" @@ -5730,6 +5741,7 @@ menuDialog = main subMenu = hpfpCompensationTable, "HPFP Pump Compensation", {hpfpCamLobes != 0} subMenu = std_separator subMenu = fancyHardwareDialog, "Fancy Hardware" + subMenu = tractionEtbTableTbl subMenu = std_separator @@ -6347,6 +6359,7 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etbPpsErrorCounter0 liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etbErrorCode0 + graphLine = tcEtbDrop0 graphLine = jamTimer0 diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index 29a26cd21e..c6da9a83ce 100644 --- a/firmware/tunerstudio/generated/rusefi_atlas.ini +++ b/firmware/tunerstudio/generated/rusefi_atlas.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.31.atlas.4104783837" + signature = "rusEFI master.2023.12.31.atlas.149195643" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.31.atlas.4104783837" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.31.atlas.149195643" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:20:18 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:19:13 UTC 2023 pageSize = 21588 page = 1 @@ -1010,7 +1010,9 @@ triggerCompCenterVolt = scalar, U08, 2668, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMin = scalar, U08, 2669, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMax = scalar, U08, 2670, "V", 0.02, 0, 0, 5.1, 2 triggerCompSensorSatRpm = scalar, U08, 2671, "RPM", 50.0, 0, 0, 12000, 0 -unusedHere = array, S08, 2672, [20], "", 1, 0, 0, 100, 0 +tractionControlSlipBins = array, U16, 2672, [6], "ratio", 0.1, 0, 0, 999, 1 +tractionControlSpeedBins = array, U08, 2684, [6], "RPM", 1, 0, 0, 250, 0 +unusedHere = array, S08, 2690, [2], "", 1, 0, 0, 100, 0 canVssNbcType = bits, U08, 2692, [0:2], "BMW_e46", "W202", "BMW E8x/E9x MK60e5", "Nissan 350", "Hyundai PB", "Honda Civic9" gppwm1_pin = bits, U16, 2696, [0:8], $output_pin_e_list gppwm1_dutyIfError = scalar, U08, 2698, "%", 1, 0, 0, 100, 0 @@ -1303,7 +1305,8 @@ triggerVVTGapOverrideTo1 = scalar, F32, 4172, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo2 = scalar, F32, 4176, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo3 = scalar, F32, 4180, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo4 = scalar, F32, 4184, "ratio", 1, 0, 0, 20, 3 -mainUnusedEnd = array, U08, 4188, [208], "units", 1, 0, 0, 1, 0 +tractionControlEtbDrop = array, S08, 4188, [6x6], "%", 1, 0, -100, 0, 0 +mainUnusedEnd = array, U08, 4224, [172], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4396, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4428, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4460, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -3131,6 +3134,7 @@ etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1401, "", 1, 0 jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 ; total TS size = 1404 faultCode0 = scalar, U08, 1404, "", 1, 0 @@ -3838,6 +3842,11 @@ curve = rangeMatrix, "Range Switch Input Matrix" yBins = tpsTpsAccelToRpmBins, TPSValue zBins = tpsTpsAccelTable + table = tractionEtbTableTbl, tractionEtb, "Traction Control ETB drop", 1 + xBins = tractionControlSpeedBins, vehicleSpeedKph + yBins = tractionControlSlipBins, wheelSlipRatio + zBins = tractionControlEtbDrop + table = boostTableTbl, boostMapOpen, "Boost control duty cycle (open loop)", 1 xBins = boostRpmBins, RPMValue yBins = boostTpsBins, TPSValue @@ -5381,6 +5390,7 @@ entry = etbDutyAverage0, "ETB average duty0", float, "%.3f" entry = etbTpsErrorCounter0, "ETB TPS error counter0", int, "%d" entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" +entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" ;entry = trim1, "ETB: trim1", float, "%.3f" @@ -5397,6 +5407,7 @@ entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = etbTpsErrorCounter1, "ETB TPS error counter1", int, "%d" ;entry = etbPpsErrorCounter1, "ETB pedal error counter1", int, "%d" ;entry = etbErrorCode1, "etbErrorCode1", int, "%d" +;entry = tcEtbDrop1, "tcEtbDrop1", int, "%d" ;entry = jamTimer1, "ETB jam timer1", float, "%.3f" entry = faultCode0, "WBO: Fault code0", int, "%d" entry = heaterDuty0, "WBO: Heater duty0", int, "%d" @@ -5730,6 +5741,7 @@ menuDialog = main subMenu = hpfpCompensationTable, "HPFP Pump Compensation", {hpfpCamLobes != 0} subMenu = std_separator subMenu = fancyHardwareDialog, "Fancy Hardware" + subMenu = tractionEtbTableTbl subMenu = std_separator @@ -6347,6 +6359,7 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etbPpsErrorCounter0 liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etbErrorCode0 + graphLine = tcEtbDrop0 graphLine = jamTimer0 diff --git a/firmware/tunerstudio/generated/rusefi_cypress.ini b/firmware/tunerstudio/generated/rusefi_cypress.ini index 7427e15057..d81a94eb1f 100644 --- a/firmware/tunerstudio/generated/rusefi_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_cypress.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.31.cypress.2964181907" + signature = "rusEFI master.2023.12.31.cypress.1289969461" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.31.cypress.2964181907" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.31.cypress.1289969461" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:18:37 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:17:33 UTC 2023 pageSize = 22088 page = 1 @@ -1010,7 +1010,9 @@ triggerCompCenterVolt = scalar, U08, 2668, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMin = scalar, U08, 2669, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMax = scalar, U08, 2670, "V", 0.02, 0, 0, 5.1, 2 triggerCompSensorSatRpm = scalar, U08, 2671, "RPM", 50.0, 0, 0, 12000, 0 -unusedHere = array, S08, 2672, [20], "", 1, 0, 0, 100, 0 +tractionControlSlipBins = array, U16, 2672, [6], "ratio", 0.1, 0, 0, 999, 1 +tractionControlSpeedBins = array, U08, 2684, [6], "RPM", 1, 0, 0, 250, 0 +unusedHere = array, S08, 2690, [2], "", 1, 0, 0, 100, 0 canVssNbcType = bits, U08, 2692, [0:2], "BMW_e46", "W202", "BMW E8x/E9x MK60e5", "Nissan 350", "Hyundai PB", "Honda Civic9" gppwm1_pin = bits, U16, 2696, [0:8], $output_pin_e_list gppwm1_dutyIfError = scalar, U08, 2698, "%", 1, 0, 0, 100, 0 @@ -1303,7 +1305,8 @@ triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 -mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 +tractionControlEtbDrop = array, S08, 4348, [6x6], "%", 1, 0, -100, 0, 0 +mainUnusedEnd = array, U08, 4384, [172], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -3131,6 +3134,7 @@ etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1401, "", 1, 0 jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 ; total TS size = 1404 faultCode0 = scalar, U08, 1404, "", 1, 0 @@ -3838,6 +3842,11 @@ curve = rangeMatrix, "Range Switch Input Matrix" yBins = tpsTpsAccelToRpmBins, TPSValue zBins = tpsTpsAccelTable + table = tractionEtbTableTbl, tractionEtb, "Traction Control ETB drop", 1 + xBins = tractionControlSpeedBins, vehicleSpeedKph + yBins = tractionControlSlipBins, wheelSlipRatio + zBins = tractionControlEtbDrop + table = boostTableTbl, boostMapOpen, "Boost control duty cycle (open loop)", 1 xBins = boostRpmBins, RPMValue yBins = boostTpsBins, TPSValue @@ -5381,6 +5390,7 @@ entry = etbDutyAverage0, "ETB average duty0", float, "%.3f" entry = etbTpsErrorCounter0, "ETB TPS error counter0", int, "%d" entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" +entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" ;entry = trim1, "ETB: trim1", float, "%.3f" @@ -5397,6 +5407,7 @@ entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = etbTpsErrorCounter1, "ETB TPS error counter1", int, "%d" ;entry = etbPpsErrorCounter1, "ETB pedal error counter1", int, "%d" ;entry = etbErrorCode1, "etbErrorCode1", int, "%d" +;entry = tcEtbDrop1, "tcEtbDrop1", int, "%d" ;entry = jamTimer1, "ETB jam timer1", float, "%.3f" entry = faultCode0, "WBO: Fault code0", int, "%d" entry = heaterDuty0, "WBO: Heater duty0", int, "%d" @@ -5730,6 +5741,7 @@ menuDialog = main subMenu = hpfpCompensationTable, "HPFP Pump Compensation", {hpfpCamLobes != 0} subMenu = std_separator subMenu = fancyHardwareDialog, "Fancy Hardware" + subMenu = tractionEtbTableTbl subMenu = std_separator @@ -6347,6 +6359,7 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etbPpsErrorCounter0 liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etbErrorCode0 + graphLine = tcEtbDrop0 graphLine = jamTimer0 diff --git a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini index 74f9fe9fea..cde3618c9d 100644 --- a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.31.f407-discovery.2470149857" + signature = "rusEFI master.2023.12.31.f407-discovery.1870000711" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.31.f407-discovery.2470149857" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.31.f407-discovery.1870000711" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:20:23 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:19:18 UTC 2023 pageSize = 22088 page = 1 @@ -1010,7 +1010,9 @@ triggerCompCenterVolt = scalar, U08, 2668, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMin = scalar, U08, 2669, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMax = scalar, U08, 2670, "V", 0.02, 0, 0, 5.1, 2 triggerCompSensorSatRpm = scalar, U08, 2671, "RPM", 50.0, 0, 0, 12000, 0 -unusedHere = array, S08, 2672, [20], "", 1, 0, 0, 100, 0 +tractionControlSlipBins = array, U16, 2672, [6], "ratio", 0.1, 0, 0, 999, 1 +tractionControlSpeedBins = array, U08, 2684, [6], "RPM", 1, 0, 0, 250, 0 +unusedHere = array, S08, 2690, [2], "", 1, 0, 0, 100, 0 canVssNbcType = bits, U08, 2692, [0:2], "BMW_e46", "W202", "BMW E8x/E9x MK60e5", "Nissan 350", "Hyundai PB", "Honda Civic9" gppwm1_pin = bits, U16, 2696, [0:8], $output_pin_e_list gppwm1_dutyIfError = scalar, U08, 2698, "%", 1, 0, 0, 100, 0 @@ -1303,7 +1305,8 @@ triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 -mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 +tractionControlEtbDrop = array, S08, 4348, [6x6], "%", 1, 0, -100, 0, 0 +mainUnusedEnd = array, U08, 4384, [172], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -3131,6 +3134,7 @@ etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1401, "", 1, 0 jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 ; total TS size = 1404 faultCode0 = scalar, U08, 1404, "", 1, 0 @@ -3838,6 +3842,11 @@ curve = rangeMatrix, "Range Switch Input Matrix" yBins = tpsTpsAccelToRpmBins, TPSValue zBins = tpsTpsAccelTable + table = tractionEtbTableTbl, tractionEtb, "Traction Control ETB drop", 1 + xBins = tractionControlSpeedBins, vehicleSpeedKph + yBins = tractionControlSlipBins, wheelSlipRatio + zBins = tractionControlEtbDrop + table = boostTableTbl, boostMapOpen, "Boost control duty cycle (open loop)", 1 xBins = boostRpmBins, RPMValue yBins = boostTpsBins, TPSValue @@ -5382,6 +5391,7 @@ entry = etbDutyAverage0, "ETB average duty0", float, "%.3f" entry = etbTpsErrorCounter0, "ETB TPS error counter0", int, "%d" entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" +entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" ;entry = trim1, "ETB: trim1", float, "%.3f" @@ -5398,6 +5408,7 @@ entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = etbTpsErrorCounter1, "ETB TPS error counter1", int, "%d" ;entry = etbPpsErrorCounter1, "ETB pedal error counter1", int, "%d" ;entry = etbErrorCode1, "etbErrorCode1", int, "%d" +;entry = tcEtbDrop1, "tcEtbDrop1", int, "%d" ;entry = jamTimer1, "ETB jam timer1", float, "%.3f" entry = faultCode0, "WBO: Fault code0", int, "%d" entry = heaterDuty0, "WBO: Heater duty0", int, "%d" @@ -5733,6 +5744,7 @@ menuDialog = main subMenu = hpfpCompensationTable, "HPFP Pump Compensation", {hpfpCamLobes != 0} subMenu = std_separator subMenu = fancyHardwareDialog, "Fancy Hardware" + subMenu = tractionEtbTableTbl subMenu = std_separator @@ -6350,6 +6362,7 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etbPpsErrorCounter0 liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etbErrorCode0 + graphLine = tcEtbDrop0 graphLine = jamTimer0 diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index 63e4dfdd77..7977f5e083 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.31.f429-discovery.2964181907" + signature = "rusEFI master.2023.12.31.f429-discovery.1289969461" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.31.f429-discovery.2964181907" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.31.f429-discovery.1289969461" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:20:03 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:18:59 UTC 2023 pageSize = 22088 page = 1 @@ -1010,7 +1010,9 @@ triggerCompCenterVolt = scalar, U08, 2668, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMin = scalar, U08, 2669, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMax = scalar, U08, 2670, "V", 0.02, 0, 0, 5.1, 2 triggerCompSensorSatRpm = scalar, U08, 2671, "RPM", 50.0, 0, 0, 12000, 0 -unusedHere = array, S08, 2672, [20], "", 1, 0, 0, 100, 0 +tractionControlSlipBins = array, U16, 2672, [6], "ratio", 0.1, 0, 0, 999, 1 +tractionControlSpeedBins = array, U08, 2684, [6], "RPM", 1, 0, 0, 250, 0 +unusedHere = array, S08, 2690, [2], "", 1, 0, 0, 100, 0 canVssNbcType = bits, U08, 2692, [0:2], "BMW_e46", "W202", "BMW E8x/E9x MK60e5", "Nissan 350", "Hyundai PB", "Honda Civic9" gppwm1_pin = bits, U16, 2696, [0:8], $output_pin_e_list gppwm1_dutyIfError = scalar, U08, 2698, "%", 1, 0, 0, 100, 0 @@ -1303,7 +1305,8 @@ triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 -mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 +tractionControlEtbDrop = array, S08, 4348, [6x6], "%", 1, 0, -100, 0, 0 +mainUnusedEnd = array, U08, 4384, [172], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -3131,6 +3134,7 @@ etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1401, "", 1, 0 jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 ; total TS size = 1404 faultCode0 = scalar, U08, 1404, "", 1, 0 @@ -3838,6 +3842,11 @@ curve = rangeMatrix, "Range Switch Input Matrix" yBins = tpsTpsAccelToRpmBins, TPSValue zBins = tpsTpsAccelTable + table = tractionEtbTableTbl, tractionEtb, "Traction Control ETB drop", 1 + xBins = tractionControlSpeedBins, vehicleSpeedKph + yBins = tractionControlSlipBins, wheelSlipRatio + zBins = tractionControlEtbDrop + table = boostTableTbl, boostMapOpen, "Boost control duty cycle (open loop)", 1 xBins = boostRpmBins, RPMValue yBins = boostTpsBins, TPSValue @@ -5381,6 +5390,7 @@ entry = etbDutyAverage0, "ETB average duty0", float, "%.3f" entry = etbTpsErrorCounter0, "ETB TPS error counter0", int, "%d" entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" +entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" ;entry = trim1, "ETB: trim1", float, "%.3f" @@ -5397,6 +5407,7 @@ entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = etbTpsErrorCounter1, "ETB TPS error counter1", int, "%d" ;entry = etbPpsErrorCounter1, "ETB pedal error counter1", int, "%d" ;entry = etbErrorCode1, "etbErrorCode1", int, "%d" +;entry = tcEtbDrop1, "tcEtbDrop1", int, "%d" ;entry = jamTimer1, "ETB jam timer1", float, "%.3f" entry = faultCode0, "WBO: Fault code0", int, "%d" entry = heaterDuty0, "WBO: Heater duty0", int, "%d" @@ -5730,6 +5741,7 @@ menuDialog = main subMenu = hpfpCompensationTable, "HPFP Pump Compensation", {hpfpCamLobes != 0} subMenu = std_separator subMenu = fancyHardwareDialog, "Fancy Hardware" + subMenu = tractionEtbTableTbl subMenu = std_separator @@ -6347,6 +6359,7 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etbPpsErrorCounter0 liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etbErrorCode0 + graphLine = tcEtbDrop0 graphLine = jamTimer0 diff --git a/firmware/tunerstudio/generated/rusefi_f469-discovery.ini b/firmware/tunerstudio/generated/rusefi_f469-discovery.ini index da011a754a..0b72936aab 100644 --- a/firmware/tunerstudio/generated/rusefi_f469-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f469-discovery.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.31.f469-discovery.2189088000" + signature = "rusEFI master.2023.12.31.f469-discovery.2117360038" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.31.f469-discovery.2189088000" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.31.f469-discovery.2117360038" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:20:06 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:19:01 UTC 2023 pageSize = 22088 page = 1 @@ -1010,7 +1010,9 @@ triggerCompCenterVolt = scalar, U08, 2668, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMin = scalar, U08, 2669, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMax = scalar, U08, 2670, "V", 0.02, 0, 0, 5.1, 2 triggerCompSensorSatRpm = scalar, U08, 2671, "RPM", 50.0, 0, 0, 12000, 0 -unusedHere = array, S08, 2672, [20], "", 1, 0, 0, 100, 0 +tractionControlSlipBins = array, U16, 2672, [6], "ratio", 0.1, 0, 0, 999, 1 +tractionControlSpeedBins = array, U08, 2684, [6], "RPM", 1, 0, 0, 250, 0 +unusedHere = array, S08, 2690, [2], "", 1, 0, 0, 100, 0 canVssNbcType = bits, U08, 2692, [0:2], "BMW_e46", "W202", "BMW E8x/E9x MK60e5", "Nissan 350", "Hyundai PB", "Honda Civic9" gppwm1_pin = bits, U16, 2696, [0:8], $output_pin_e_list gppwm1_dutyIfError = scalar, U08, 2698, "%", 1, 0, 0, 100, 0 @@ -1303,7 +1305,8 @@ triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 -mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 +tractionControlEtbDrop = array, S08, 4348, [6x6], "%", 1, 0, -100, 0, 0 +mainUnusedEnd = array, U08, 4384, [172], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -3131,6 +3134,7 @@ etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1401, "", 1, 0 jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 ; total TS size = 1404 faultCode0 = scalar, U08, 1404, "", 1, 0 @@ -3838,6 +3842,11 @@ curve = rangeMatrix, "Range Switch Input Matrix" yBins = tpsTpsAccelToRpmBins, TPSValue zBins = tpsTpsAccelTable + table = tractionEtbTableTbl, tractionEtb, "Traction Control ETB drop", 1 + xBins = tractionControlSpeedBins, vehicleSpeedKph + yBins = tractionControlSlipBins, wheelSlipRatio + zBins = tractionControlEtbDrop + table = boostTableTbl, boostMapOpen, "Boost control duty cycle (open loop)", 1 xBins = boostRpmBins, RPMValue yBins = boostTpsBins, TPSValue @@ -5381,6 +5390,7 @@ entry = etbDutyAverage0, "ETB average duty0", float, "%.3f" entry = etbTpsErrorCounter0, "ETB TPS error counter0", int, "%d" entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" +entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" ;entry = trim1, "ETB: trim1", float, "%.3f" @@ -5397,6 +5407,7 @@ entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = etbTpsErrorCounter1, "ETB TPS error counter1", int, "%d" ;entry = etbPpsErrorCounter1, "ETB pedal error counter1", int, "%d" ;entry = etbErrorCode1, "etbErrorCode1", int, "%d" +;entry = tcEtbDrop1, "tcEtbDrop1", int, "%d" ;entry = jamTimer1, "ETB jam timer1", float, "%.3f" entry = faultCode0, "WBO: Fault code0", int, "%d" entry = heaterDuty0, "WBO: Heater duty0", int, "%d" @@ -5730,6 +5741,7 @@ menuDialog = main subMenu = hpfpCompensationTable, "HPFP Pump Compensation", {hpfpCamLobes != 0} subMenu = std_separator subMenu = fancyHardwareDialog, "Fancy Hardware" + subMenu = tractionEtbTableTbl subMenu = std_separator @@ -6347,6 +6359,7 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etbPpsErrorCounter0 liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etbErrorCode0 + graphLine = tcEtbDrop0 graphLine = jamTimer0 diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 1ba90121dd..c01ccda838 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.31.frankenso_na6.3780798392" + signature = "rusEFI master.2023.12.31.frankenso_na6.487910174" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.31.frankenso_na6.3780798392" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.31.frankenso_na6.487910174" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","Analog 3O","Analog 3L","Analog 3M","Analog 3J","Analog 3I","INVALID","Analog 3H","Analog 3G","INVALID","INVALID","INVALID","Analog 3P","Analog 3Q","Analog 3N","Analog VBatt","Analog 3E" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:19:48 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:18:44 UTC 2023 pageSize = 22088 page = 1 @@ -1010,7 +1010,9 @@ triggerCompCenterVolt = scalar, U08, 2668, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMin = scalar, U08, 2669, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMax = scalar, U08, 2670, "V", 0.02, 0, 0, 5.1, 2 triggerCompSensorSatRpm = scalar, U08, 2671, "RPM", 50.0, 0, 0, 12000, 0 -unusedHere = array, S08, 2672, [20], "", 1, 0, 0, 100, 0 +tractionControlSlipBins = array, U16, 2672, [6], "ratio", 0.1, 0, 0, 999, 1 +tractionControlSpeedBins = array, U08, 2684, [6], "RPM", 1, 0, 0, 250, 0 +unusedHere = array, S08, 2690, [2], "", 1, 0, 0, 100, 0 canVssNbcType = bits, U08, 2692, [0:2], "BMW_e46", "W202", "BMW E8x/E9x MK60e5", "Nissan 350", "Hyundai PB", "Honda Civic9" gppwm1_pin = bits, U16, 2696, [0:8], $output_pin_e_list gppwm1_dutyIfError = scalar, U08, 2698, "%", 1, 0, 0, 100, 0 @@ -1303,7 +1305,8 @@ triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 -mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 +tractionControlEtbDrop = array, S08, 4348, [6x6], "%", 1, 0, -100, 0, 0 +mainUnusedEnd = array, U08, 4384, [172], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -3131,6 +3134,7 @@ etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1401, "", 1, 0 jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 ; total TS size = 1404 faultCode0 = scalar, U08, 1404, "", 1, 0 @@ -3838,6 +3842,11 @@ curve = rangeMatrix, "Range Switch Input Matrix" yBins = tpsTpsAccelToRpmBins, TPSValue zBins = tpsTpsAccelTable + table = tractionEtbTableTbl, tractionEtb, "Traction Control ETB drop", 1 + xBins = tractionControlSpeedBins, vehicleSpeedKph + yBins = tractionControlSlipBins, wheelSlipRatio + zBins = tractionControlEtbDrop + table = boostTableTbl, boostMapOpen, "Boost control duty cycle (open loop)", 1 xBins = boostRpmBins, RPMValue yBins = boostTpsBins, TPSValue @@ -5381,6 +5390,7 @@ entry = etbDutyAverage0, "ETB average duty0", float, "%.3f" entry = etbTpsErrorCounter0, "ETB TPS error counter0", int, "%d" entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" +entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" ;entry = trim1, "ETB: trim1", float, "%.3f" @@ -5397,6 +5407,7 @@ entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = etbTpsErrorCounter1, "ETB TPS error counter1", int, "%d" ;entry = etbPpsErrorCounter1, "ETB pedal error counter1", int, "%d" ;entry = etbErrorCode1, "etbErrorCode1", int, "%d" +;entry = tcEtbDrop1, "tcEtbDrop1", int, "%d" ;entry = jamTimer1, "ETB jam timer1", float, "%.3f" entry = faultCode0, "WBO: Fault code0", int, "%d" entry = heaterDuty0, "WBO: Heater duty0", int, "%d" @@ -5730,6 +5741,7 @@ menuDialog = main subMenu = hpfpCompensationTable, "HPFP Pump Compensation", {hpfpCamLobes != 0} subMenu = std_separator subMenu = fancyHardwareDialog, "Fancy Hardware" + subMenu = tractionEtbTableTbl subMenu = std_separator @@ -6347,6 +6359,7 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etbPpsErrorCounter0 liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etbErrorCode0 + graphLine = tcEtbDrop0 graphLine = jamTimer0 diff --git a/firmware/tunerstudio/generated/rusefi_hellen-112-17.ini b/firmware/tunerstudio/generated/rusefi_hellen-112-17.ini index 07981bfeba..1f51ca3407 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-112-17.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-112-17.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.31.hellen-112-17.2041866597" + signature = "rusEFI master.2023.12.31.hellen-112-17.2247812547" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.31.hellen-112-17.2041866597" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.31.hellen-112-17.2247812547" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","B20 TPS Throttle Position 2","A14 Analog Input","INVALID","A21 PPS1","B03 TPS Throttle Position 1","INVALID","A07 TODO","A12 Analog Input","A10 Analog Input","INVALID","B19 MAP","A09 Analog Input","B15 CLT","B27 IAT","A11 Analog Input","A19 Analog Input" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:19:15 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:18:11 UTC 2023 pageSize = 22088 page = 1 @@ -1010,7 +1010,9 @@ triggerCompCenterVolt = scalar, U08, 2668, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMin = scalar, U08, 2669, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMax = scalar, U08, 2670, "V", 0.02, 0, 0, 5.1, 2 triggerCompSensorSatRpm = scalar, U08, 2671, "RPM", 50.0, 0, 0, 12000, 0 -unusedHere = array, S08, 2672, [20], "", 1, 0, 0, 100, 0 +tractionControlSlipBins = array, U16, 2672, [6], "ratio", 0.1, 0, 0, 999, 1 +tractionControlSpeedBins = array, U08, 2684, [6], "RPM", 1, 0, 0, 250, 0 +unusedHere = array, S08, 2690, [2], "", 1, 0, 0, 100, 0 canVssNbcType = bits, U08, 2692, [0:2], "BMW_e46", "W202", "BMW E8x/E9x MK60e5", "Nissan 350", "Hyundai PB", "Honda Civic9" gppwm1_pin = bits, U16, 2696, [0:8], $output_pin_e_list gppwm1_dutyIfError = scalar, U08, 2698, "%", 1, 0, 0, 100, 0 @@ -1303,7 +1305,8 @@ triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 -mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 +tractionControlEtbDrop = array, S08, 4348, [6x6], "%", 1, 0, -100, 0, 0 +mainUnusedEnd = array, U08, 4384, [172], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -3131,6 +3134,7 @@ etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1401, "", 1, 0 jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 ; total TS size = 1404 faultCode0 = scalar, U08, 1404, "", 1, 0 @@ -3838,6 +3842,11 @@ curve = rangeMatrix, "Range Switch Input Matrix" yBins = tpsTpsAccelToRpmBins, TPSValue zBins = tpsTpsAccelTable + table = tractionEtbTableTbl, tractionEtb, "Traction Control ETB drop", 1 + xBins = tractionControlSpeedBins, vehicleSpeedKph + yBins = tractionControlSlipBins, wheelSlipRatio + zBins = tractionControlEtbDrop + table = boostTableTbl, boostMapOpen, "Boost control duty cycle (open loop)", 1 xBins = boostRpmBins, RPMValue yBins = boostTpsBins, TPSValue @@ -5381,6 +5390,7 @@ entry = etbDutyAverage0, "ETB average duty0", float, "%.3f" entry = etbTpsErrorCounter0, "ETB TPS error counter0", int, "%d" entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" +entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" ;entry = trim1, "ETB: trim1", float, "%.3f" @@ -5397,6 +5407,7 @@ entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = etbTpsErrorCounter1, "ETB TPS error counter1", int, "%d" ;entry = etbPpsErrorCounter1, "ETB pedal error counter1", int, "%d" ;entry = etbErrorCode1, "etbErrorCode1", int, "%d" +;entry = tcEtbDrop1, "tcEtbDrop1", int, "%d" ;entry = jamTimer1, "ETB jam timer1", float, "%.3f" entry = faultCode0, "WBO: Fault code0", int, "%d" entry = heaterDuty0, "WBO: Heater duty0", int, "%d" @@ -5729,6 +5740,7 @@ menuDialog = main subMenu = hpfpCompensationTable, "HPFP Pump Compensation", {hpfpCamLobes != 0} subMenu = std_separator subMenu = fancyHardwareDialog, "Fancy Hardware" + subMenu = tractionEtbTableTbl subMenu = std_separator @@ -6346,6 +6358,7 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etbPpsErrorCounter0 liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etbErrorCode0 + graphLine = tcEtbDrop0 graphLine = jamTimer0 diff --git a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini index b37cf46861..4b64bec51b 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.31.hellen-gm-e67.2458941483" + signature = "rusEFI master.2023.12.31.hellen-gm-e67.1860105357" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.31.hellen-gm-e67.2458941483" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.31.hellen-gm-e67.1860105357" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","C2-60 - Oil Pressure","C3-58 - Baro","C1-47 - PPS1","C2-64 - TPS1","C1-19 Battery Sense","C1-45 Secondary Fuel Level","C3-57 - A/C Pressure","C2-66 - TPS2","C1-44 Primary Fuel Level","C2-65 - Trans Fluids","C3-59 - MAP","C3-55 - CLT","C3-56 - IAT","C1-49 - PPS2","C1-46 Vac Sense" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:19:25 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:18:21 UTC 2023 pageSize = 22088 page = 1 @@ -1010,7 +1010,9 @@ triggerCompCenterVolt = scalar, U08, 2668, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMin = scalar, U08, 2669, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMax = scalar, U08, 2670, "V", 0.02, 0, 0, 5.1, 2 triggerCompSensorSatRpm = scalar, U08, 2671, "RPM", 50.0, 0, 0, 12000, 0 -unusedHere = array, S08, 2672, [20], "", 1, 0, 0, 100, 0 +tractionControlSlipBins = array, U16, 2672, [6], "ratio", 0.1, 0, 0, 999, 1 +tractionControlSpeedBins = array, U08, 2684, [6], "RPM", 1, 0, 0, 250, 0 +unusedHere = array, S08, 2690, [2], "", 1, 0, 0, 100, 0 canVssNbcType = bits, U08, 2692, [0:2], "BMW_e46", "W202", "BMW E8x/E9x MK60e5", "Nissan 350", "Hyundai PB", "Honda Civic9" gppwm1_pin = bits, U16, 2696, [0:8], $output_pin_e_list gppwm1_dutyIfError = scalar, U08, 2698, "%", 1, 0, 0, 100, 0 @@ -1303,7 +1305,8 @@ triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 -mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 +tractionControlEtbDrop = array, S08, 4348, [6x6], "%", 1, 0, -100, 0, 0 +mainUnusedEnd = array, U08, 4384, [172], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -3131,6 +3134,7 @@ etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1401, "", 1, 0 jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 ; total TS size = 1404 faultCode0 = scalar, U08, 1404, "", 1, 0 @@ -3838,6 +3842,11 @@ curve = rangeMatrix, "Range Switch Input Matrix" yBins = tpsTpsAccelToRpmBins, TPSValue zBins = tpsTpsAccelTable + table = tractionEtbTableTbl, tractionEtb, "Traction Control ETB drop", 1 + xBins = tractionControlSpeedBins, vehicleSpeedKph + yBins = tractionControlSlipBins, wheelSlipRatio + zBins = tractionControlEtbDrop + table = boostTableTbl, boostMapOpen, "Boost control duty cycle (open loop)", 1 xBins = boostRpmBins, RPMValue yBins = boostTpsBins, TPSValue @@ -5381,6 +5390,7 @@ entry = etbDutyAverage0, "ETB average duty0", float, "%.3f" entry = etbTpsErrorCounter0, "ETB TPS error counter0", int, "%d" entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" +entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" ;entry = trim1, "ETB: trim1", float, "%.3f" @@ -5397,6 +5407,7 @@ entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = etbTpsErrorCounter1, "ETB TPS error counter1", int, "%d" ;entry = etbPpsErrorCounter1, "ETB pedal error counter1", int, "%d" ;entry = etbErrorCode1, "etbErrorCode1", int, "%d" +;entry = tcEtbDrop1, "tcEtbDrop1", int, "%d" ;entry = jamTimer1, "ETB jam timer1", float, "%.3f" entry = faultCode0, "WBO: Fault code0", int, "%d" entry = heaterDuty0, "WBO: Heater duty0", int, "%d" @@ -5731,6 +5742,7 @@ menuDialog = main subMenu = hpfpCompensationTable, "HPFP Pump Compensation", {hpfpCamLobes != 0} subMenu = std_separator subMenu = fancyHardwareDialog, "Fancy Hardware" + subMenu = tractionEtbTableTbl subMenu = std_separator @@ -6348,6 +6360,7 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etbPpsErrorCounter0 liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etbErrorCode0 + graphLine = tcEtbDrop0 graphLine = jamTimer0 diff --git a/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini b/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini index 8b9137d0c4..2afb560f19 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.31.hellen-honda-k.4135989373" + signature = "rusEFI master.2023.12.31.hellen-honda-k.180927707" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.31.hellen-honda-k.4135989373" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.31.hellen-honda-k.180927707" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","INVALID","INVALID","INVALID","A15 TPS","E9 Ignition Key Voltage","INVALID","Aux Analog 3","Aux Analog 1","INVALID","A19 - MAP","INVALID","B8 - CLT","B17 IAT","Aux Analog 2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:19:04 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:18:01 UTC 2023 pageSize = 22760 page = 1 @@ -1010,7 +1010,9 @@ triggerCompCenterVolt = scalar, U08, 2668, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMin = scalar, U08, 2669, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMax = scalar, U08, 2670, "V", 0.02, 0, 0, 5.1, 2 triggerCompSensorSatRpm = scalar, U08, 2671, "RPM", 50.0, 0, 0, 12000, 0 -unusedHere = array, S08, 2672, [20], "", 1, 0, 0, 100, 0 +tractionControlSlipBins = array, U16, 2672, [6], "ratio", 0.1, 0, 0, 999, 1 +tractionControlSpeedBins = array, U08, 2684, [6], "RPM", 1, 0, 0, 250, 0 +unusedHere = array, S08, 2690, [2], "", 1, 0, 0, 100, 0 canVssNbcType = bits, U08, 2692, [0:2], "BMW_e46", "W202", "BMW E8x/E9x MK60e5", "Nissan 350", "Hyundai PB", "Honda Civic9" gppwm1_pin = bits, U16, 2696, [0:8], $output_pin_e_list gppwm1_dutyIfError = scalar, U08, 2698, "%", 1, 0, 0, 100, 0 @@ -1303,7 +1305,8 @@ triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 -mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 +tractionControlEtbDrop = array, S08, 4348, [6x6], "%", 1, 0, -100, 0, 0 +mainUnusedEnd = array, U08, 4384, [172], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -3131,6 +3134,7 @@ etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1401, "", 1, 0 jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 ; total TS size = 1404 faultCode0 = scalar, U08, 1404, "", 1, 0 @@ -3838,6 +3842,11 @@ curve = rangeMatrix, "Range Switch Input Matrix" yBins = tpsTpsAccelToRpmBins, TPSValue zBins = tpsTpsAccelTable + table = tractionEtbTableTbl, tractionEtb, "Traction Control ETB drop", 1 + xBins = tractionControlSpeedBins, vehicleSpeedKph + yBins = tractionControlSlipBins, wheelSlipRatio + zBins = tractionControlEtbDrop + table = boostTableTbl, boostMapOpen, "Boost control duty cycle (open loop)", 1 xBins = boostRpmBins, RPMValue yBins = boostTpsBins, TPSValue @@ -5381,6 +5390,7 @@ entry = etbDutyAverage0, "ETB average duty0", float, "%.3f" entry = etbTpsErrorCounter0, "ETB TPS error counter0", int, "%d" entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" +entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" ;entry = trim1, "ETB: trim1", float, "%.3f" @@ -5397,6 +5407,7 @@ entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = etbTpsErrorCounter1, "ETB TPS error counter1", int, "%d" ;entry = etbPpsErrorCounter1, "ETB pedal error counter1", int, "%d" ;entry = etbErrorCode1, "etbErrorCode1", int, "%d" +;entry = tcEtbDrop1, "tcEtbDrop1", int, "%d" ;entry = jamTimer1, "ETB jam timer1", float, "%.3f" entry = faultCode0, "WBO: Fault code0", int, "%d" entry = heaterDuty0, "WBO: Heater duty0", int, "%d" @@ -5729,6 +5740,7 @@ menuDialog = main subMenu = hpfpCompensationTable, "HPFP Pump Compensation", {hpfpCamLobes != 0} subMenu = std_separator subMenu = fancyHardwareDialog, "Fancy Hardware" + subMenu = tractionEtbTableTbl subMenu = std_separator @@ -6346,6 +6358,7 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etbPpsErrorCounter0 liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etbErrorCode0 + graphLine = tcEtbDrop0 graphLine = jamTimer0 diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index 7fd4402a30..a282006c8c 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.31.hellen-nb1.2898527322" + signature = "rusEFI master.2023.12.31.hellen-nb1.1351256316" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.31.hellen-nb1.2898527322" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.31.hellen-nb1.1351256316" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","2C - O2S","TPS1","intMAP","1G - Steering/RES2","3E - TPS","1B - Battery Sense","2H - CAM","3S - EGR BOOST IN","2A - Pressure Input","2J - CRANK","2L - MAF","3D - MAP","2E - Coolant","2B - IAT","4C - IN TEMP/PPS2","1P - AC Switch" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:19:23 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:18:19 UTC 2023 pageSize = 22088 page = 1 @@ -1010,7 +1010,9 @@ triggerCompCenterVolt = scalar, U08, 2668, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMin = scalar, U08, 2669, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMax = scalar, U08, 2670, "V", 0.02, 0, 0, 5.1, 2 triggerCompSensorSatRpm = scalar, U08, 2671, "RPM", 50.0, 0, 0, 12000, 0 -unusedHere = array, S08, 2672, [20], "", 1, 0, 0, 100, 0 +tractionControlSlipBins = array, U16, 2672, [6], "ratio", 0.1, 0, 0, 999, 1 +tractionControlSpeedBins = array, U08, 2684, [6], "RPM", 1, 0, 0, 250, 0 +unusedHere = array, S08, 2690, [2], "", 1, 0, 0, 100, 0 canVssNbcType = bits, U08, 2692, [0:2], "BMW_e46", "W202", "BMW E8x/E9x MK60e5", "Nissan 350", "Hyundai PB", "Honda Civic9" gppwm1_pin = bits, U16, 2696, [0:8], $output_pin_e_list gppwm1_dutyIfError = scalar, U08, 2698, "%", 1, 0, 0, 100, 0 @@ -1303,7 +1305,8 @@ triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 -mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 +tractionControlEtbDrop = array, S08, 4348, [6x6], "%", 1, 0, -100, 0, 0 +mainUnusedEnd = array, U08, 4384, [172], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -3131,6 +3134,7 @@ etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1401, "", 1, 0 jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 ; total TS size = 1404 faultCode0 = scalar, U08, 1404, "", 1, 0 @@ -3838,6 +3842,11 @@ curve = rangeMatrix, "Range Switch Input Matrix" yBins = tpsTpsAccelToRpmBins, TPSValue zBins = tpsTpsAccelTable + table = tractionEtbTableTbl, tractionEtb, "Traction Control ETB drop", 1 + xBins = tractionControlSpeedBins, vehicleSpeedKph + yBins = tractionControlSlipBins, wheelSlipRatio + zBins = tractionControlEtbDrop + table = boostTableTbl, boostMapOpen, "Boost control duty cycle (open loop)", 1 xBins = boostRpmBins, RPMValue yBins = boostTpsBins, TPSValue @@ -5381,6 +5390,7 @@ entry = etbDutyAverage0, "ETB average duty0", float, "%.3f" entry = etbTpsErrorCounter0, "ETB TPS error counter0", int, "%d" entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" +entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" ;entry = trim1, "ETB: trim1", float, "%.3f" @@ -5397,6 +5407,7 @@ entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = etbTpsErrorCounter1, "ETB TPS error counter1", int, "%d" ;entry = etbPpsErrorCounter1, "ETB pedal error counter1", int, "%d" ;entry = etbErrorCode1, "etbErrorCode1", int, "%d" +;entry = tcEtbDrop1, "tcEtbDrop1", int, "%d" ;entry = jamTimer1, "ETB jam timer1", float, "%.3f" entry = faultCode0, "WBO: Fault code0", int, "%d" entry = heaterDuty0, "WBO: Heater duty0", int, "%d" @@ -5731,6 +5742,7 @@ menuDialog = main subMenu = hpfpCompensationTable, "HPFP Pump Compensation", {hpfpCamLobes != 0} subMenu = std_separator subMenu = fancyHardwareDialog, "Fancy Hardware" + subMenu = tractionEtbTableTbl subMenu = std_separator @@ -6348,6 +6360,7 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etbPpsErrorCounter0 liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etbErrorCode0 + graphLine = tcEtbDrop0 graphLine = jamTimer0 diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index 8ed4c5603a..203cce0b73 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.31.hellen121nissan.3625633796" + signature = "rusEFI master.2023.12.31.hellen121nissan.609502370" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.31.hellen121nissan.3625633796" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.31.hellen121nissan.609502370" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","51 - MAF","INVALID","Aux P68","106 - PPS 1","50 - TPS 1","109 Ignition Key Voltage","INVALID","INVALID","69 - TPS 2","INVALID","Aux P66","Aux P67","73 - CLT","34 - IAT","98 - PPS 2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:19:02 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:17:58 UTC 2023 pageSize = 22088 page = 1 @@ -1010,7 +1010,9 @@ triggerCompCenterVolt = scalar, U08, 2668, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMin = scalar, U08, 2669, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMax = scalar, U08, 2670, "V", 0.02, 0, 0, 5.1, 2 triggerCompSensorSatRpm = scalar, U08, 2671, "RPM", 50.0, 0, 0, 12000, 0 -unusedHere = array, S08, 2672, [20], "", 1, 0, 0, 100, 0 +tractionControlSlipBins = array, U16, 2672, [6], "ratio", 0.1, 0, 0, 999, 1 +tractionControlSpeedBins = array, U08, 2684, [6], "RPM", 1, 0, 0, 250, 0 +unusedHere = array, S08, 2690, [2], "", 1, 0, 0, 100, 0 canVssNbcType = bits, U08, 2692, [0:2], "BMW_e46", "W202", "BMW E8x/E9x MK60e5", "Nissan 350", "Hyundai PB", "Honda Civic9" gppwm1_pin = bits, U16, 2696, [0:8], $output_pin_e_list gppwm1_dutyIfError = scalar, U08, 2698, "%", 1, 0, 0, 100, 0 @@ -1303,7 +1305,8 @@ triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 -mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 +tractionControlEtbDrop = array, S08, 4348, [6x6], "%", 1, 0, -100, 0, 0 +mainUnusedEnd = array, U08, 4384, [172], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -3131,6 +3134,7 @@ etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1401, "", 1, 0 jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 ; total TS size = 1404 faultCode0 = scalar, U08, 1404, "", 1, 0 @@ -3838,6 +3842,11 @@ curve = rangeMatrix, "Range Switch Input Matrix" yBins = tpsTpsAccelToRpmBins, TPSValue zBins = tpsTpsAccelTable + table = tractionEtbTableTbl, tractionEtb, "Traction Control ETB drop", 1 + xBins = tractionControlSpeedBins, vehicleSpeedKph + yBins = tractionControlSlipBins, wheelSlipRatio + zBins = tractionControlEtbDrop + table = boostTableTbl, boostMapOpen, "Boost control duty cycle (open loop)", 1 xBins = boostRpmBins, RPMValue yBins = boostTpsBins, TPSValue @@ -5381,6 +5390,7 @@ entry = etbDutyAverage0, "ETB average duty0", float, "%.3f" entry = etbTpsErrorCounter0, "ETB TPS error counter0", int, "%d" entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" +entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" ;entry = trim1, "ETB: trim1", float, "%.3f" @@ -5397,6 +5407,7 @@ entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = etbTpsErrorCounter1, "ETB TPS error counter1", int, "%d" ;entry = etbPpsErrorCounter1, "ETB pedal error counter1", int, "%d" ;entry = etbErrorCode1, "etbErrorCode1", int, "%d" +;entry = tcEtbDrop1, "tcEtbDrop1", int, "%d" ;entry = jamTimer1, "ETB jam timer1", float, "%.3f" entry = faultCode0, "WBO: Fault code0", int, "%d" entry = heaterDuty0, "WBO: Heater duty0", int, "%d" @@ -5729,6 +5740,7 @@ menuDialog = main subMenu = hpfpCompensationTable, "HPFP Pump Compensation", {hpfpCamLobes != 0} subMenu = std_separator subMenu = fancyHardwareDialog, "Fancy Hardware" + subMenu = tractionEtbTableTbl subMenu = std_separator @@ -6346,6 +6358,7 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etbPpsErrorCounter0 liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etbErrorCode0 + graphLine = tcEtbDrop0 graphLine = jamTimer0 diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index 919f84c431..05468dd64a 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.31.hellen121vag.2161430133" + signature = "rusEFI master.2023.12.31.hellen121vag.2090484435" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.31.hellen121vag.2161430133" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.31.hellen121vag.2090484435" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","14 - O2","INVALID","INVALID","34 In PPS1","92 - TPS 1","106 - KNOCK","86 - CAM1","87 - CAM2","84 - TPS2","INVALID","29 In Maf","101 - MAP2","93 - CLT","85 - IAT","35 In PPS2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:18:59 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:17:56 UTC 2023 pageSize = 22088 page = 1 @@ -1010,7 +1010,9 @@ triggerCompCenterVolt = scalar, U08, 2668, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMin = scalar, U08, 2669, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMax = scalar, U08, 2670, "V", 0.02, 0, 0, 5.1, 2 triggerCompSensorSatRpm = scalar, U08, 2671, "RPM", 50.0, 0, 0, 12000, 0 -unusedHere = array, S08, 2672, [20], "", 1, 0, 0, 100, 0 +tractionControlSlipBins = array, U16, 2672, [6], "ratio", 0.1, 0, 0, 999, 1 +tractionControlSpeedBins = array, U08, 2684, [6], "RPM", 1, 0, 0, 250, 0 +unusedHere = array, S08, 2690, [2], "", 1, 0, 0, 100, 0 canVssNbcType = bits, U08, 2692, [0:2], "BMW_e46", "W202", "BMW E8x/E9x MK60e5", "Nissan 350", "Hyundai PB", "Honda Civic9" gppwm1_pin = bits, U16, 2696, [0:8], $output_pin_e_list gppwm1_dutyIfError = scalar, U08, 2698, "%", 1, 0, 0, 100, 0 @@ -1303,7 +1305,8 @@ triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 -mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 +tractionControlEtbDrop = array, S08, 4348, [6x6], "%", 1, 0, -100, 0, 0 +mainUnusedEnd = array, U08, 4384, [172], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -3131,6 +3134,7 @@ etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1401, "", 1, 0 jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 ; total TS size = 1404 faultCode0 = scalar, U08, 1404, "", 1, 0 @@ -3838,6 +3842,11 @@ curve = rangeMatrix, "Range Switch Input Matrix" yBins = tpsTpsAccelToRpmBins, TPSValue zBins = tpsTpsAccelTable + table = tractionEtbTableTbl, tractionEtb, "Traction Control ETB drop", 1 + xBins = tractionControlSpeedBins, vehicleSpeedKph + yBins = tractionControlSlipBins, wheelSlipRatio + zBins = tractionControlEtbDrop + table = boostTableTbl, boostMapOpen, "Boost control duty cycle (open loop)", 1 xBins = boostRpmBins, RPMValue yBins = boostTpsBins, TPSValue @@ -5381,6 +5390,7 @@ entry = etbDutyAverage0, "ETB average duty0", float, "%.3f" entry = etbTpsErrorCounter0, "ETB TPS error counter0", int, "%d" entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" +entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" ;entry = trim1, "ETB: trim1", float, "%.3f" @@ -5397,6 +5407,7 @@ entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = etbTpsErrorCounter1, "ETB TPS error counter1", int, "%d" ;entry = etbPpsErrorCounter1, "ETB pedal error counter1", int, "%d" ;entry = etbErrorCode1, "etbErrorCode1", int, "%d" +;entry = tcEtbDrop1, "tcEtbDrop1", int, "%d" ;entry = jamTimer1, "ETB jam timer1", float, "%.3f" entry = faultCode0, "WBO: Fault code0", int, "%d" entry = heaterDuty0, "WBO: Heater duty0", int, "%d" @@ -5731,6 +5742,7 @@ menuDialog = main subMenu = hpfpCompensationTable, "HPFP Pump Compensation", {hpfpCamLobes != 0} subMenu = std_separator subMenu = fancyHardwareDialog, "Fancy Hardware" + subMenu = tractionEtbTableTbl subMenu = std_separator @@ -6348,6 +6360,7 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etbPpsErrorCounter0 liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etbErrorCode0 + graphLine = tcEtbDrop0 graphLine = jamTimer0 diff --git a/firmware/tunerstudio/generated/rusefi_hellen128.ini b/firmware/tunerstudio/generated/rusefi_hellen128.ini index 02ec6aaabd..9af68baf25 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.31.hellen128.1564473700" + signature = "rusEFI master.2023.12.31.hellen128.2708567490" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.31.hellen128.1564473700" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.31.hellen128.2708567490" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","P36_IN_O2S","P32_IN_O2S2","P40_IN_MAP3","C24 - PPS1","E31 - TPS1","Battery Sense","E40 - IN_CAM","P30_IN_AUX4","E34 - TPS2","E37 - Crank Input","E47 - MAF","E23 - MAP","E29 - Coolant Temp","E45 - IAT","C25 - PPS2","P41_IN_AUX3" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:18:56 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:17:53 UTC 2023 pageSize = 22088 page = 1 @@ -1010,7 +1010,9 @@ triggerCompCenterVolt = scalar, U08, 2668, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMin = scalar, U08, 2669, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMax = scalar, U08, 2670, "V", 0.02, 0, 0, 5.1, 2 triggerCompSensorSatRpm = scalar, U08, 2671, "RPM", 50.0, 0, 0, 12000, 0 -unusedHere = array, S08, 2672, [20], "", 1, 0, 0, 100, 0 +tractionControlSlipBins = array, U16, 2672, [6], "ratio", 0.1, 0, 0, 999, 1 +tractionControlSpeedBins = array, U08, 2684, [6], "RPM", 1, 0, 0, 250, 0 +unusedHere = array, S08, 2690, [2], "", 1, 0, 0, 100, 0 canVssNbcType = bits, U08, 2692, [0:2], "BMW_e46", "W202", "BMW E8x/E9x MK60e5", "Nissan 350", "Hyundai PB", "Honda Civic9" gppwm1_pin = bits, U16, 2696, [0:8], $output_pin_e_list gppwm1_dutyIfError = scalar, U08, 2698, "%", 1, 0, 0, 100, 0 @@ -1303,7 +1305,8 @@ triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 -mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 +tractionControlEtbDrop = array, S08, 4348, [6x6], "%", 1, 0, -100, 0, 0 +mainUnusedEnd = array, U08, 4384, [172], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -3131,6 +3134,7 @@ etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1401, "", 1, 0 jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 ; total TS size = 1404 faultCode0 = scalar, U08, 1404, "", 1, 0 @@ -3838,6 +3842,11 @@ curve = rangeMatrix, "Range Switch Input Matrix" yBins = tpsTpsAccelToRpmBins, TPSValue zBins = tpsTpsAccelTable + table = tractionEtbTableTbl, tractionEtb, "Traction Control ETB drop", 1 + xBins = tractionControlSpeedBins, vehicleSpeedKph + yBins = tractionControlSlipBins, wheelSlipRatio + zBins = tractionControlEtbDrop + table = boostTableTbl, boostMapOpen, "Boost control duty cycle (open loop)", 1 xBins = boostRpmBins, RPMValue yBins = boostTpsBins, TPSValue @@ -5381,6 +5390,7 @@ entry = etbDutyAverage0, "ETB average duty0", float, "%.3f" entry = etbTpsErrorCounter0, "ETB TPS error counter0", int, "%d" entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" +entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" ;entry = trim1, "ETB: trim1", float, "%.3f" @@ -5397,6 +5407,7 @@ entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = etbTpsErrorCounter1, "ETB TPS error counter1", int, "%d" ;entry = etbPpsErrorCounter1, "ETB pedal error counter1", int, "%d" ;entry = etbErrorCode1, "etbErrorCode1", int, "%d" +;entry = tcEtbDrop1, "tcEtbDrop1", int, "%d" ;entry = jamTimer1, "ETB jam timer1", float, "%.3f" entry = faultCode0, "WBO: Fault code0", int, "%d" entry = heaterDuty0, "WBO: Heater duty0", int, "%d" @@ -5731,6 +5742,7 @@ menuDialog = main subMenu = hpfpCompensationTable, "HPFP Pump Compensation", {hpfpCamLobes != 0} subMenu = std_separator subMenu = fancyHardwareDialog, "Fancy Hardware" + subMenu = tractionEtbTableTbl subMenu = std_separator @@ -6348,6 +6360,7 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etbPpsErrorCounter0 liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etbErrorCode0 + graphLine = tcEtbDrop0 graphLine = jamTimer0 diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index f44666d4cf..a33191cdbd 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.31.hellen154hyundai.471045162" + signature = "rusEFI master.2023.12.31.hellen154hyundai.3764197516" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.31.hellen154hyundai.471045162" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.31.hellen154hyundai.3764197516" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","K21 Ambient Temperature","K58 Oil Temp","K54 A/C pressure","PPS 1","TPS 1","K2 Ignition Key Voltage","X10 AIN2","INVALID","TPS 2","X11 AIN1","Map Sensor K31","K10 Sensor","CLT","IAT","PPS 2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:19:07 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:18:03 UTC 2023 pageSize = 22088 page = 1 @@ -1010,7 +1010,9 @@ triggerCompCenterVolt = scalar, U08, 2668, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMin = scalar, U08, 2669, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMax = scalar, U08, 2670, "V", 0.02, 0, 0, 5.1, 2 triggerCompSensorSatRpm = scalar, U08, 2671, "RPM", 50.0, 0, 0, 12000, 0 -unusedHere = array, S08, 2672, [20], "", 1, 0, 0, 100, 0 +tractionControlSlipBins = array, U16, 2672, [6], "ratio", 0.1, 0, 0, 999, 1 +tractionControlSpeedBins = array, U08, 2684, [6], "RPM", 1, 0, 0, 250, 0 +unusedHere = array, S08, 2690, [2], "", 1, 0, 0, 100, 0 canVssNbcType = bits, U08, 2692, [0:2], "BMW_e46", "W202", "BMW E8x/E9x MK60e5", "Nissan 350", "Hyundai PB", "Honda Civic9" gppwm1_pin = bits, U16, 2696, [0:8], $output_pin_e_list gppwm1_dutyIfError = scalar, U08, 2698, "%", 1, 0, 0, 100, 0 @@ -1303,7 +1305,8 @@ triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 -mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 +tractionControlEtbDrop = array, S08, 4348, [6x6], "%", 1, 0, -100, 0, 0 +mainUnusedEnd = array, U08, 4384, [172], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -3131,6 +3134,7 @@ etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1401, "", 1, 0 jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 ; total TS size = 1404 faultCode0 = scalar, U08, 1404, "", 1, 0 @@ -3838,6 +3842,11 @@ curve = rangeMatrix, "Range Switch Input Matrix" yBins = tpsTpsAccelToRpmBins, TPSValue zBins = tpsTpsAccelTable + table = tractionEtbTableTbl, tractionEtb, "Traction Control ETB drop", 1 + xBins = tractionControlSpeedBins, vehicleSpeedKph + yBins = tractionControlSlipBins, wheelSlipRatio + zBins = tractionControlEtbDrop + table = boostTableTbl, boostMapOpen, "Boost control duty cycle (open loop)", 1 xBins = boostRpmBins, RPMValue yBins = boostTpsBins, TPSValue @@ -5381,6 +5390,7 @@ entry = etbDutyAverage0, "ETB average duty0", float, "%.3f" entry = etbTpsErrorCounter0, "ETB TPS error counter0", int, "%d" entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" +entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" ;entry = trim1, "ETB: trim1", float, "%.3f" @@ -5397,6 +5407,7 @@ entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = etbTpsErrorCounter1, "ETB TPS error counter1", int, "%d" ;entry = etbPpsErrorCounter1, "ETB pedal error counter1", int, "%d" ;entry = etbErrorCode1, "etbErrorCode1", int, "%d" +;entry = tcEtbDrop1, "tcEtbDrop1", int, "%d" ;entry = jamTimer1, "ETB jam timer1", float, "%.3f" entry = faultCode0, "WBO: Fault code0", int, "%d" entry = heaterDuty0, "WBO: Heater duty0", int, "%d" @@ -5729,6 +5740,7 @@ menuDialog = main subMenu = hpfpCompensationTable, "HPFP Pump Compensation", {hpfpCamLobes != 0} subMenu = std_separator subMenu = fancyHardwareDialog, "Fancy Hardware" + subMenu = tractionEtbTableTbl subMenu = std_separator @@ -6346,6 +6358,7 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etbPpsErrorCounter0 liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etbErrorCode0 + graphLine = tcEtbDrop0 graphLine = jamTimer0 diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index 8c81faabe6..8a426b1f74 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.31.hellen72.810297103" + signature = "rusEFI master.2023.12.31.hellen72.3422727081" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.31.hellen72.810297103" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.31.hellen72.3422727081" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","5N - TPS2","3L - IGN_7 / AFR","intMAP (A15)","5P - PPS1","4V - TPS (A17)","4S/4T - Alternator voltage","3V - CAM (A19)","4J - VTCS/AUX4 (A20)","4F - AC_PRES/AUX1 (A23)","3Y - CRANK (A24)","4X - MAF (A9)","4U - MAP2/Ign8 (A10)","4P - CLT (A11)","4N - IAT (A14)","5M - PPS2 OR TEMPERATURE SENSOR","4AE - EGR/MAP4 (A22)" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:19:18 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:18:14 UTC 2023 pageSize = 22088 page = 1 @@ -1010,7 +1010,9 @@ triggerCompCenterVolt = scalar, U08, 2668, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMin = scalar, U08, 2669, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMax = scalar, U08, 2670, "V", 0.02, 0, 0, 5.1, 2 triggerCompSensorSatRpm = scalar, U08, 2671, "RPM", 50.0, 0, 0, 12000, 0 -unusedHere = array, S08, 2672, [20], "", 1, 0, 0, 100, 0 +tractionControlSlipBins = array, U16, 2672, [6], "ratio", 0.1, 0, 0, 999, 1 +tractionControlSpeedBins = array, U08, 2684, [6], "RPM", 1, 0, 0, 250, 0 +unusedHere = array, S08, 2690, [2], "", 1, 0, 0, 100, 0 canVssNbcType = bits, U08, 2692, [0:2], "BMW_e46", "W202", "BMW E8x/E9x MK60e5", "Nissan 350", "Hyundai PB", "Honda Civic9" gppwm1_pin = bits, U16, 2696, [0:8], $output_pin_e_list gppwm1_dutyIfError = scalar, U08, 2698, "%", 1, 0, 0, 100, 0 @@ -1303,7 +1305,8 @@ triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 -mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 +tractionControlEtbDrop = array, S08, 4348, [6x6], "%", 1, 0, -100, 0, 0 +mainUnusedEnd = array, U08, 4384, [172], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -3131,6 +3134,7 @@ etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1401, "", 1, 0 jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 ; total TS size = 1404 faultCode0 = scalar, U08, 1404, "", 1, 0 @@ -3838,6 +3842,11 @@ curve = rangeMatrix, "Range Switch Input Matrix" yBins = tpsTpsAccelToRpmBins, TPSValue zBins = tpsTpsAccelTable + table = tractionEtbTableTbl, tractionEtb, "Traction Control ETB drop", 1 + xBins = tractionControlSpeedBins, vehicleSpeedKph + yBins = tractionControlSlipBins, wheelSlipRatio + zBins = tractionControlEtbDrop + table = boostTableTbl, boostMapOpen, "Boost control duty cycle (open loop)", 1 xBins = boostRpmBins, RPMValue yBins = boostTpsBins, TPSValue @@ -5381,6 +5390,7 @@ entry = etbDutyAverage0, "ETB average duty0", float, "%.3f" entry = etbTpsErrorCounter0, "ETB TPS error counter0", int, "%d" entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" +entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" ;entry = trim1, "ETB: trim1", float, "%.3f" @@ -5397,6 +5407,7 @@ entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = etbTpsErrorCounter1, "ETB TPS error counter1", int, "%d" ;entry = etbPpsErrorCounter1, "ETB pedal error counter1", int, "%d" ;entry = etbErrorCode1, "etbErrorCode1", int, "%d" +;entry = tcEtbDrop1, "tcEtbDrop1", int, "%d" ;entry = jamTimer1, "ETB jam timer1", float, "%.3f" entry = faultCode0, "WBO: Fault code0", int, "%d" entry = heaterDuty0, "WBO: Heater duty0", int, "%d" @@ -5731,6 +5742,7 @@ menuDialog = main subMenu = hpfpCompensationTable, "HPFP Pump Compensation", {hpfpCamLobes != 0} subMenu = std_separator subMenu = fancyHardwareDialog, "Fancy Hardware" + subMenu = tractionEtbTableTbl subMenu = std_separator @@ -6348,6 +6360,7 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etbPpsErrorCounter0 liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etbErrorCode0 + graphLine = tcEtbDrop0 graphLine = jamTimer0 diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index 43ef1d6a0b..e210e9097b 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen81.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen81.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.31.hellen81.3577561973" + signature = "rusEFI master.2023.12.31.hellen81.695455699" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.31.hellen81.3577561973" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.31.hellen81.695455699" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","18 - IN_O2S","55 - IN_O2S2","41 - IN_MAP3","78 - IN_PPS","16 - IN_TPS","13 - IN_VIGN","79 - IN_CAM","77 - IN_AUX4","74 - IN_AUX1","15 - IN_CRANK (A24)","37 - IN_MAP1","38 - IN_MAP2","39 - IN_CLT","40 - IN_IAT","75 - IN_AUX2","76 - IN_AUX3" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:19:20 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:18:16 UTC 2023 pageSize = 22088 page = 1 @@ -1010,7 +1010,9 @@ triggerCompCenterVolt = scalar, U08, 2668, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMin = scalar, U08, 2669, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMax = scalar, U08, 2670, "V", 0.02, 0, 0, 5.1, 2 triggerCompSensorSatRpm = scalar, U08, 2671, "RPM", 50.0, 0, 0, 12000, 0 -unusedHere = array, S08, 2672, [20], "", 1, 0, 0, 100, 0 +tractionControlSlipBins = array, U16, 2672, [6], "ratio", 0.1, 0, 0, 999, 1 +tractionControlSpeedBins = array, U08, 2684, [6], "RPM", 1, 0, 0, 250, 0 +unusedHere = array, S08, 2690, [2], "", 1, 0, 0, 100, 0 canVssNbcType = bits, U08, 2692, [0:2], "BMW_e46", "W202", "BMW E8x/E9x MK60e5", "Nissan 350", "Hyundai PB", "Honda Civic9" gppwm1_pin = bits, U16, 2696, [0:8], $output_pin_e_list gppwm1_dutyIfError = scalar, U08, 2698, "%", 1, 0, 0, 100, 0 @@ -1303,7 +1305,8 @@ triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 -mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 +tractionControlEtbDrop = array, S08, 4348, [6x6], "%", 1, 0, -100, 0, 0 +mainUnusedEnd = array, U08, 4384, [172], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -3131,6 +3134,7 @@ etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1401, "", 1, 0 jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 ; total TS size = 1404 faultCode0 = scalar, U08, 1404, "", 1, 0 @@ -3838,6 +3842,11 @@ curve = rangeMatrix, "Range Switch Input Matrix" yBins = tpsTpsAccelToRpmBins, TPSValue zBins = tpsTpsAccelTable + table = tractionEtbTableTbl, tractionEtb, "Traction Control ETB drop", 1 + xBins = tractionControlSpeedBins, vehicleSpeedKph + yBins = tractionControlSlipBins, wheelSlipRatio + zBins = tractionControlEtbDrop + table = boostTableTbl, boostMapOpen, "Boost control duty cycle (open loop)", 1 xBins = boostRpmBins, RPMValue yBins = boostTpsBins, TPSValue @@ -5381,6 +5390,7 @@ entry = etbDutyAverage0, "ETB average duty0", float, "%.3f" entry = etbTpsErrorCounter0, "ETB TPS error counter0", int, "%d" entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" +entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" ;entry = trim1, "ETB: trim1", float, "%.3f" @@ -5397,6 +5407,7 @@ entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = etbTpsErrorCounter1, "ETB TPS error counter1", int, "%d" ;entry = etbPpsErrorCounter1, "ETB pedal error counter1", int, "%d" ;entry = etbErrorCode1, "etbErrorCode1", int, "%d" +;entry = tcEtbDrop1, "tcEtbDrop1", int, "%d" ;entry = jamTimer1, "ETB jam timer1", float, "%.3f" entry = faultCode0, "WBO: Fault code0", int, "%d" entry = heaterDuty0, "WBO: Heater duty0", int, "%d" @@ -5729,6 +5740,7 @@ menuDialog = main subMenu = hpfpCompensationTable, "HPFP Pump Compensation", {hpfpCamLobes != 0} subMenu = std_separator subMenu = fancyHardwareDialog, "Fancy Hardware" + subMenu = tractionEtbTableTbl subMenu = std_separator @@ -6346,6 +6358,7 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etbPpsErrorCounter0 liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etbErrorCode0 + graphLine = tcEtbDrop0 graphLine = jamTimer0 diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index 0f2bf16731..818b3a70a7 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.31.hellen88bmw.1680010929" + signature = "rusEFI master.2023.12.31.hellen88bmw.2557239831" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.31.hellen88bmw.1680010929" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.31.hellen88bmw.2557239831" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","VIN5","VIN6","INVALID","PPS1","73 - TPS","56 - Battery Sense","17 - CAM","Aux BARO","Aux TPS2","16 - CRANK","41 - MAF","Aux MAP","78 - CLT","77 - IAT","Aux PPS2","Aux TPS3" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:19:10 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:18:06 UTC 2023 pageSize = 22088 page = 1 @@ -1010,7 +1010,9 @@ triggerCompCenterVolt = scalar, U08, 2668, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMin = scalar, U08, 2669, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMax = scalar, U08, 2670, "V", 0.02, 0, 0, 5.1, 2 triggerCompSensorSatRpm = scalar, U08, 2671, "RPM", 50.0, 0, 0, 12000, 0 -unusedHere = array, S08, 2672, [20], "", 1, 0, 0, 100, 0 +tractionControlSlipBins = array, U16, 2672, [6], "ratio", 0.1, 0, 0, 999, 1 +tractionControlSpeedBins = array, U08, 2684, [6], "RPM", 1, 0, 0, 250, 0 +unusedHere = array, S08, 2690, [2], "", 1, 0, 0, 100, 0 canVssNbcType = bits, U08, 2692, [0:2], "BMW_e46", "W202", "BMW E8x/E9x MK60e5", "Nissan 350", "Hyundai PB", "Honda Civic9" gppwm1_pin = bits, U16, 2696, [0:8], $output_pin_e_list gppwm1_dutyIfError = scalar, U08, 2698, "%", 1, 0, 0, 100, 0 @@ -1303,7 +1305,8 @@ triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 -mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 +tractionControlEtbDrop = array, S08, 4348, [6x6], "%", 1, 0, -100, 0, 0 +mainUnusedEnd = array, U08, 4384, [172], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -3131,6 +3134,7 @@ etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1401, "", 1, 0 jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 ; total TS size = 1404 faultCode0 = scalar, U08, 1404, "", 1, 0 @@ -3838,6 +3842,11 @@ curve = rangeMatrix, "Range Switch Input Matrix" yBins = tpsTpsAccelToRpmBins, TPSValue zBins = tpsTpsAccelTable + table = tractionEtbTableTbl, tractionEtb, "Traction Control ETB drop", 1 + xBins = tractionControlSpeedBins, vehicleSpeedKph + yBins = tractionControlSlipBins, wheelSlipRatio + zBins = tractionControlEtbDrop + table = boostTableTbl, boostMapOpen, "Boost control duty cycle (open loop)", 1 xBins = boostRpmBins, RPMValue yBins = boostTpsBins, TPSValue @@ -5381,6 +5390,7 @@ entry = etbDutyAverage0, "ETB average duty0", float, "%.3f" entry = etbTpsErrorCounter0, "ETB TPS error counter0", int, "%d" entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" +entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" ;entry = trim1, "ETB: trim1", float, "%.3f" @@ -5397,6 +5407,7 @@ entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = etbTpsErrorCounter1, "ETB TPS error counter1", int, "%d" ;entry = etbPpsErrorCounter1, "ETB pedal error counter1", int, "%d" ;entry = etbErrorCode1, "etbErrorCode1", int, "%d" +;entry = tcEtbDrop1, "tcEtbDrop1", int, "%d" ;entry = jamTimer1, "ETB jam timer1", float, "%.3f" entry = faultCode0, "WBO: Fault code0", int, "%d" entry = heaterDuty0, "WBO: Heater duty0", int, "%d" @@ -5731,6 +5742,7 @@ menuDialog = main subMenu = hpfpCompensationTable, "HPFP Pump Compensation", {hpfpCamLobes != 0} subMenu = std_separator subMenu = fancyHardwareDialog, "Fancy Hardware" + subMenu = tractionEtbTableTbl subMenu = std_separator @@ -6348,6 +6360,7 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etbPpsErrorCounter0 liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etbErrorCode0 + graphLine = tcEtbDrop0 graphLine = jamTimer0 diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index 266a185ef6..3a3537dbd5 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.31.hellenNA6.63714671" + signature = "rusEFI master.2023.12.31.hellenNA6.4286757321" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.31.hellenNA6.63714671" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.31.hellenNA6.4286757321" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","3N - O2S","2N - Temperature Sensor","intMAP (A15)","4I - PPS1","TPS Input","1B - Battery Sense","INVALID","4G - PPS2 OR TEMPERATURE SENSOR","4H - TPS2","INVALID","3O - MAF","2M - Pressure Sensor","3Q - CLT","3P - IAT","1V - Clutch Switch","1Q AC Switch" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:19:28 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:18:24 UTC 2023 pageSize = 22088 page = 1 @@ -1010,7 +1010,9 @@ triggerCompCenterVolt = scalar, U08, 2668, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMin = scalar, U08, 2669, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMax = scalar, U08, 2670, "V", 0.02, 0, 0, 5.1, 2 triggerCompSensorSatRpm = scalar, U08, 2671, "RPM", 50.0, 0, 0, 12000, 0 -unusedHere = array, S08, 2672, [20], "", 1, 0, 0, 100, 0 +tractionControlSlipBins = array, U16, 2672, [6], "ratio", 0.1, 0, 0, 999, 1 +tractionControlSpeedBins = array, U08, 2684, [6], "RPM", 1, 0, 0, 250, 0 +unusedHere = array, S08, 2690, [2], "", 1, 0, 0, 100, 0 canVssNbcType = bits, U08, 2692, [0:2], "BMW_e46", "W202", "BMW E8x/E9x MK60e5", "Nissan 350", "Hyundai PB", "Honda Civic9" gppwm1_pin = bits, U16, 2696, [0:8], $output_pin_e_list gppwm1_dutyIfError = scalar, U08, 2698, "%", 1, 0, 0, 100, 0 @@ -1303,7 +1305,8 @@ triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 -mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 +tractionControlEtbDrop = array, S08, 4348, [6x6], "%", 1, 0, -100, 0, 0 +mainUnusedEnd = array, U08, 4384, [172], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -3131,6 +3134,7 @@ etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1401, "", 1, 0 jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 ; total TS size = 1404 faultCode0 = scalar, U08, 1404, "", 1, 0 @@ -3838,6 +3842,11 @@ curve = rangeMatrix, "Range Switch Input Matrix" yBins = tpsTpsAccelToRpmBins, TPSValue zBins = tpsTpsAccelTable + table = tractionEtbTableTbl, tractionEtb, "Traction Control ETB drop", 1 + xBins = tractionControlSpeedBins, vehicleSpeedKph + yBins = tractionControlSlipBins, wheelSlipRatio + zBins = tractionControlEtbDrop + table = boostTableTbl, boostMapOpen, "Boost control duty cycle (open loop)", 1 xBins = boostRpmBins, RPMValue yBins = boostTpsBins, TPSValue @@ -5381,6 +5390,7 @@ entry = etbDutyAverage0, "ETB average duty0", float, "%.3f" entry = etbTpsErrorCounter0, "ETB TPS error counter0", int, "%d" entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" +entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" ;entry = trim1, "ETB: trim1", float, "%.3f" @@ -5397,6 +5407,7 @@ entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = etbTpsErrorCounter1, "ETB TPS error counter1", int, "%d" ;entry = etbPpsErrorCounter1, "ETB pedal error counter1", int, "%d" ;entry = etbErrorCode1, "etbErrorCode1", int, "%d" +;entry = tcEtbDrop1, "tcEtbDrop1", int, "%d" ;entry = jamTimer1, "ETB jam timer1", float, "%.3f" entry = faultCode0, "WBO: Fault code0", int, "%d" entry = heaterDuty0, "WBO: Heater duty0", int, "%d" @@ -5731,6 +5742,7 @@ menuDialog = main subMenu = hpfpCompensationTable, "HPFP Pump Compensation", {hpfpCamLobes != 0} subMenu = std_separator subMenu = fancyHardwareDialog, "Fancy Hardware" + subMenu = tractionEtbTableTbl subMenu = std_separator @@ -6348,6 +6360,7 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etbPpsErrorCounter0 liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etbErrorCode0 + graphLine = tcEtbDrop0 graphLine = jamTimer0 diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini index 46be0d4c44..122905d885 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.31.hellenNA8_96.3350536604" + signature = "rusEFI master.2023.12.31.hellenNA8_96.1006349626" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.31.hellenNA8_96.3350536604" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.31.hellenNA8_96.1006349626" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","2C - O2S","TPS1","intMAP","PPS1","2F - TPS","3B - Battery Sense","3G - CAM","3S - EGR BOOST IN","2A - Pressure Input","3F - CRANK","2B - MAF","INVALID","2G - Coolant","2B - IAT","4C - IN TEMP/PPS2","1K - AC Switch" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:19:30 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:18:27 UTC 2023 pageSize = 22088 page = 1 @@ -1010,7 +1010,9 @@ triggerCompCenterVolt = scalar, U08, 2668, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMin = scalar, U08, 2669, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMax = scalar, U08, 2670, "V", 0.02, 0, 0, 5.1, 2 triggerCompSensorSatRpm = scalar, U08, 2671, "RPM", 50.0, 0, 0, 12000, 0 -unusedHere = array, S08, 2672, [20], "", 1, 0, 0, 100, 0 +tractionControlSlipBins = array, U16, 2672, [6], "ratio", 0.1, 0, 0, 999, 1 +tractionControlSpeedBins = array, U08, 2684, [6], "RPM", 1, 0, 0, 250, 0 +unusedHere = array, S08, 2690, [2], "", 1, 0, 0, 100, 0 canVssNbcType = bits, U08, 2692, [0:2], "BMW_e46", "W202", "BMW E8x/E9x MK60e5", "Nissan 350", "Hyundai PB", "Honda Civic9" gppwm1_pin = bits, U16, 2696, [0:8], $output_pin_e_list gppwm1_dutyIfError = scalar, U08, 2698, "%", 1, 0, 0, 100, 0 @@ -1303,7 +1305,8 @@ triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 -mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 +tractionControlEtbDrop = array, S08, 4348, [6x6], "%", 1, 0, -100, 0, 0 +mainUnusedEnd = array, U08, 4384, [172], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -3131,6 +3134,7 @@ etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1401, "", 1, 0 jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 ; total TS size = 1404 faultCode0 = scalar, U08, 1404, "", 1, 0 @@ -3838,6 +3842,11 @@ curve = rangeMatrix, "Range Switch Input Matrix" yBins = tpsTpsAccelToRpmBins, TPSValue zBins = tpsTpsAccelTable + table = tractionEtbTableTbl, tractionEtb, "Traction Control ETB drop", 1 + xBins = tractionControlSpeedBins, vehicleSpeedKph + yBins = tractionControlSlipBins, wheelSlipRatio + zBins = tractionControlEtbDrop + table = boostTableTbl, boostMapOpen, "Boost control duty cycle (open loop)", 1 xBins = boostRpmBins, RPMValue yBins = boostTpsBins, TPSValue @@ -5381,6 +5390,7 @@ entry = etbDutyAverage0, "ETB average duty0", float, "%.3f" entry = etbTpsErrorCounter0, "ETB TPS error counter0", int, "%d" entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" +entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" ;entry = trim1, "ETB: trim1", float, "%.3f" @@ -5397,6 +5407,7 @@ entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = etbTpsErrorCounter1, "ETB TPS error counter1", int, "%d" ;entry = etbPpsErrorCounter1, "ETB pedal error counter1", int, "%d" ;entry = etbErrorCode1, "etbErrorCode1", int, "%d" +;entry = tcEtbDrop1, "tcEtbDrop1", int, "%d" ;entry = jamTimer1, "ETB jam timer1", float, "%.3f" entry = faultCode0, "WBO: Fault code0", int, "%d" entry = heaterDuty0, "WBO: Heater duty0", int, "%d" @@ -5731,6 +5742,7 @@ menuDialog = main subMenu = hpfpCompensationTable, "HPFP Pump Compensation", {hpfpCamLobes != 0} subMenu = std_separator subMenu = fancyHardwareDialog, "Fancy Hardware" + subMenu = tractionEtbTableTbl subMenu = std_separator @@ -6348,6 +6360,7 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etbPpsErrorCounter0 liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etbErrorCode0 + graphLine = tcEtbDrop0 graphLine = jamTimer0 diff --git a/firmware/tunerstudio/generated/rusefi_kin.ini b/firmware/tunerstudio/generated/rusefi_kin.ini index f7b4535e89..2f28653b47 100644 --- a/firmware/tunerstudio/generated/rusefi_kin.ini +++ b/firmware/tunerstudio/generated/rusefi_kin.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.31.kin.4068217917" + signature = "rusEFI master.2023.12.31.kin.238196891" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.31.kin.4068217917" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.31.kin.238196891" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA2", "PA3", "INVALID", "PD3", "INVALID", "INVALID", "INVALID", "PB12", "PB13", "INVALID", "PE2", "INVALID", "PC14", "PC15", "PC16", "PC17" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:18:35 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:17:32 UTC 2023 pageSize = 20712 page = 1 @@ -1010,7 +1010,9 @@ triggerCompCenterVolt = scalar, U08, 2668, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMin = scalar, U08, 2669, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMax = scalar, U08, 2670, "V", 0.02, 0, 0, 5.1, 2 triggerCompSensorSatRpm = scalar, U08, 2671, "RPM", 50.0, 0, 0, 12000, 0 -unusedHere = array, S08, 2672, [20], "", 1, 0, 0, 100, 0 +tractionControlSlipBins = array, U16, 2672, [6], "ratio", 0.1, 0, 0, 999, 1 +tractionControlSpeedBins = array, U08, 2684, [6], "RPM", 1, 0, 0, 250, 0 +unusedHere = array, S08, 2690, [2], "", 1, 0, 0, 100, 0 canVssNbcType = bits, U08, 2692, [0:2], "BMW_e46", "W202", "BMW E8x/E9x MK60e5", "Nissan 350", "Hyundai PB", "Honda Civic9" gppwm1_pin = bits, U16, 2696, [0:8], $output_pin_e_list gppwm1_dutyIfError = scalar, U08, 2698, "%", 1, 0, 0, 100, 0 @@ -1303,7 +1305,8 @@ triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 -mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 +tractionControlEtbDrop = array, S08, 4348, [6x6], "%", 1, 0, -100, 0, 0 +mainUnusedEnd = array, U08, 4384, [172], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -3131,6 +3134,7 @@ etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1401, "", 1, 0 jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 ; total TS size = 1404 faultCode0 = scalar, U08, 1404, "", 1, 0 @@ -3838,6 +3842,11 @@ curve = rangeMatrix, "Range Switch Input Matrix" yBins = tpsTpsAccelToRpmBins, TPSValue zBins = tpsTpsAccelTable + table = tractionEtbTableTbl, tractionEtb, "Traction Control ETB drop", 1 + xBins = tractionControlSpeedBins, vehicleSpeedKph + yBins = tractionControlSlipBins, wheelSlipRatio + zBins = tractionControlEtbDrop + table = boostTableTbl, boostMapOpen, "Boost control duty cycle (open loop)", 1 xBins = boostRpmBins, RPMValue yBins = boostTpsBins, TPSValue @@ -5381,6 +5390,7 @@ entry = etbDutyAverage0, "ETB average duty0", float, "%.3f" entry = etbTpsErrorCounter0, "ETB TPS error counter0", int, "%d" entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" +entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" ;entry = trim1, "ETB: trim1", float, "%.3f" @@ -5397,6 +5407,7 @@ entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = etbTpsErrorCounter1, "ETB TPS error counter1", int, "%d" ;entry = etbPpsErrorCounter1, "ETB pedal error counter1", int, "%d" ;entry = etbErrorCode1, "etbErrorCode1", int, "%d" +;entry = tcEtbDrop1, "tcEtbDrop1", int, "%d" ;entry = jamTimer1, "ETB jam timer1", float, "%.3f" entry = faultCode0, "WBO: Fault code0", int, "%d" entry = heaterDuty0, "WBO: Heater duty0", int, "%d" @@ -5730,6 +5741,7 @@ menuDialog = main subMenu = hpfpCompensationTable, "HPFP Pump Compensation", {hpfpCamLobes != 0} subMenu = std_separator subMenu = fancyHardwareDialog, "Fancy Hardware" + subMenu = tractionEtbTableTbl subMenu = std_separator @@ -6347,6 +6359,7 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etbPpsErrorCounter0 liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etbErrorCode0 + graphLine = tcEtbDrop0 graphLine = jamTimer0 diff --git a/firmware/tunerstudio/generated/rusefi_m74_9.ini b/firmware/tunerstudio/generated/rusefi_m74_9.ini index 44d6bcfec3..f30c549085 100644 --- a/firmware/tunerstudio/generated/rusefi_m74_9.ini +++ b/firmware/tunerstudio/generated/rusefi_m74_9.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.31.m74_9.2971153446" + signature = "rusEFI master.2023.12.31.m74_9.1297528960" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.31.m74_9.2971153446" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.31.m74_9.1297528960" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","MAF/MAP sensor signal","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Pedal position sensor 1 signal","Pedal position sensor 2 signal","ETB position sensor 1 signal","ETB position sensor 2 signal" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:19:41 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:18:37 UTC 2023 pageSize = 22088 page = 1 @@ -1010,7 +1010,9 @@ triggerCompCenterVolt = scalar, U08, 2668, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMin = scalar, U08, 2669, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMax = scalar, U08, 2670, "V", 0.02, 0, 0, 5.1, 2 triggerCompSensorSatRpm = scalar, U08, 2671, "RPM", 50.0, 0, 0, 12000, 0 -unusedHere = array, S08, 2672, [20], "", 1, 0, 0, 100, 0 +tractionControlSlipBins = array, U16, 2672, [6], "ratio", 0.1, 0, 0, 999, 1 +tractionControlSpeedBins = array, U08, 2684, [6], "RPM", 1, 0, 0, 250, 0 +unusedHere = array, S08, 2690, [2], "", 1, 0, 0, 100, 0 canVssNbcType = bits, U08, 2692, [0:2], "BMW_e46", "W202", "BMW E8x/E9x MK60e5", "Nissan 350", "Hyundai PB", "Honda Civic9" gppwm1_pin = bits, U16, 2696, [0:8], $output_pin_e_list gppwm1_dutyIfError = scalar, U08, 2698, "%", 1, 0, 0, 100, 0 @@ -1303,7 +1305,8 @@ triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 -mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 +tractionControlEtbDrop = array, S08, 4348, [6x6], "%", 1, 0, -100, 0, 0 +mainUnusedEnd = array, U08, 4384, [172], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -3131,6 +3134,7 @@ etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1401, "", 1, 0 jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 ; total TS size = 1404 faultCode0 = scalar, U08, 1404, "", 1, 0 @@ -3838,6 +3842,11 @@ curve = rangeMatrix, "Range Switch Input Matrix" yBins = tpsTpsAccelToRpmBins, TPSValue zBins = tpsTpsAccelTable + table = tractionEtbTableTbl, tractionEtb, "Traction Control ETB drop", 1 + xBins = tractionControlSpeedBins, vehicleSpeedKph + yBins = tractionControlSlipBins, wheelSlipRatio + zBins = tractionControlEtbDrop + table = boostTableTbl, boostMapOpen, "Boost control duty cycle (open loop)", 1 xBins = boostRpmBins, RPMValue yBins = boostTpsBins, TPSValue @@ -5381,6 +5390,7 @@ entry = etbDutyAverage0, "ETB average duty0", float, "%.3f" entry = etbTpsErrorCounter0, "ETB TPS error counter0", int, "%d" entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" +entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" ;entry = trim1, "ETB: trim1", float, "%.3f" @@ -5397,6 +5407,7 @@ entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = etbTpsErrorCounter1, "ETB TPS error counter1", int, "%d" ;entry = etbPpsErrorCounter1, "ETB pedal error counter1", int, "%d" ;entry = etbErrorCode1, "etbErrorCode1", int, "%d" +;entry = tcEtbDrop1, "tcEtbDrop1", int, "%d" ;entry = jamTimer1, "ETB jam timer1", float, "%.3f" entry = faultCode0, "WBO: Fault code0", int, "%d" entry = heaterDuty0, "WBO: Heater duty0", int, "%d" @@ -5731,6 +5742,7 @@ menuDialog = main subMenu = hpfpCompensationTable, "HPFP Pump Compensation", {hpfpCamLobes != 0} subMenu = std_separator subMenu = fancyHardwareDialog, "Fancy Hardware" + subMenu = tractionEtbTableTbl subMenu = std_separator @@ -6348,6 +6360,7 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etbPpsErrorCounter0 liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etbErrorCode0 + graphLine = tcEtbDrop0 graphLine = jamTimer0 diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 65f5f7c99e..18216ad47f 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.31.mre_f4.3431517129" + signature = "rusEFI master.2023.12.31.mre_f4.818300783" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.31.mre_f4.3431517129" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.31.mre_f4.818300783" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","18 - AN temp 1","23 - AN temp 2","24 - AN temp 3 or Hall Input","22 - AN temp 4 or Hall Input","28 - AN volt 10, Aux Reuse","INVALID","26 - AN volt 2","31 - AN volt 3","36 - AN volt 8, Aux Reuse","40 - AN volt 9, Aux Reuse","27 - AN volt 1","Battery Sense","19 - AN volt 4","20 - AN volt 5","32 - AN volt 6, Aux Reuse","30 - AN volt 7" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:19:38 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:18:34 UTC 2023 pageSize = 22088 page = 1 @@ -1010,7 +1010,9 @@ triggerCompCenterVolt = scalar, U08, 2668, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMin = scalar, U08, 2669, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMax = scalar, U08, 2670, "V", 0.02, 0, 0, 5.1, 2 triggerCompSensorSatRpm = scalar, U08, 2671, "RPM", 50.0, 0, 0, 12000, 0 -unusedHere = array, S08, 2672, [20], "", 1, 0, 0, 100, 0 +tractionControlSlipBins = array, U16, 2672, [6], "ratio", 0.1, 0, 0, 999, 1 +tractionControlSpeedBins = array, U08, 2684, [6], "RPM", 1, 0, 0, 250, 0 +unusedHere = array, S08, 2690, [2], "", 1, 0, 0, 100, 0 canVssNbcType = bits, U08, 2692, [0:2], "BMW_e46", "W202", "BMW E8x/E9x MK60e5", "Nissan 350", "Hyundai PB", "Honda Civic9" gppwm1_pin = bits, U16, 2696, [0:8], $output_pin_e_list gppwm1_dutyIfError = scalar, U08, 2698, "%", 1, 0, 0, 100, 0 @@ -1303,7 +1305,8 @@ triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 -mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 +tractionControlEtbDrop = array, S08, 4348, [6x6], "%", 1, 0, -100, 0, 0 +mainUnusedEnd = array, U08, 4384, [172], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -3131,6 +3134,7 @@ etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1401, "", 1, 0 jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 ; total TS size = 1404 faultCode0 = scalar, U08, 1404, "", 1, 0 @@ -3838,6 +3842,11 @@ curve = rangeMatrix, "Range Switch Input Matrix" yBins = tpsTpsAccelToRpmBins, TPSValue zBins = tpsTpsAccelTable + table = tractionEtbTableTbl, tractionEtb, "Traction Control ETB drop", 1 + xBins = tractionControlSpeedBins, vehicleSpeedKph + yBins = tractionControlSlipBins, wheelSlipRatio + zBins = tractionControlEtbDrop + table = boostTableTbl, boostMapOpen, "Boost control duty cycle (open loop)", 1 xBins = boostRpmBins, RPMValue yBins = boostTpsBins, TPSValue @@ -5382,6 +5391,7 @@ entry = etbDutyAverage0, "ETB average duty0", float, "%.3f" entry = etbTpsErrorCounter0, "ETB TPS error counter0", int, "%d" entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" +entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" ;entry = trim1, "ETB: trim1", float, "%.3f" @@ -5398,6 +5408,7 @@ entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = etbTpsErrorCounter1, "ETB TPS error counter1", int, "%d" ;entry = etbPpsErrorCounter1, "ETB pedal error counter1", int, "%d" ;entry = etbErrorCode1, "etbErrorCode1", int, "%d" +;entry = tcEtbDrop1, "tcEtbDrop1", int, "%d" ;entry = jamTimer1, "ETB jam timer1", float, "%.3f" entry = faultCode0, "WBO: Fault code0", int, "%d" entry = heaterDuty0, "WBO: Heater duty0", int, "%d" @@ -5733,6 +5744,7 @@ menuDialog = main subMenu = hpfpCompensationTable, "HPFP Pump Compensation", {hpfpCamLobes != 0} subMenu = std_separator subMenu = fancyHardwareDialog, "Fancy Hardware" + subMenu = tractionEtbTableTbl subMenu = std_separator @@ -6350,6 +6362,7 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etbPpsErrorCounter0 liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etbErrorCode0 + graphLine = tcEtbDrop0 graphLine = jamTimer0 diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index edbda51d8d..517b98f8f7 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.31.mre_f7.3431517129" + signature = "rusEFI master.2023.12.31.mre_f7.818300783" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.31.mre_f7.3431517129" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.31.mre_f7.818300783" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","18 - AN temp 1","23 - AN temp 2","24 - AN temp 3 or Hall Input","22 - AN temp 4 or Hall Input","28 - AN volt 10, Aux Reuse","INVALID","26 - AN volt 2","31 - AN volt 3","36 - AN volt 8, Aux Reuse","40 - AN volt 9, Aux Reuse","27 - AN volt 1","Battery Sense","19 - AN volt 4","20 - AN volt 5","32 - AN volt 6, Aux Reuse","30 - AN volt 7" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:19:35 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:18:32 UTC 2023 pageSize = 22088 page = 1 @@ -1010,7 +1010,9 @@ triggerCompCenterVolt = scalar, U08, 2668, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMin = scalar, U08, 2669, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMax = scalar, U08, 2670, "V", 0.02, 0, 0, 5.1, 2 triggerCompSensorSatRpm = scalar, U08, 2671, "RPM", 50.0, 0, 0, 12000, 0 -unusedHere = array, S08, 2672, [20], "", 1, 0, 0, 100, 0 +tractionControlSlipBins = array, U16, 2672, [6], "ratio", 0.1, 0, 0, 999, 1 +tractionControlSpeedBins = array, U08, 2684, [6], "RPM", 1, 0, 0, 250, 0 +unusedHere = array, S08, 2690, [2], "", 1, 0, 0, 100, 0 canVssNbcType = bits, U08, 2692, [0:2], "BMW_e46", "W202", "BMW E8x/E9x MK60e5", "Nissan 350", "Hyundai PB", "Honda Civic9" gppwm1_pin = bits, U16, 2696, [0:8], $output_pin_e_list gppwm1_dutyIfError = scalar, U08, 2698, "%", 1, 0, 0, 100, 0 @@ -1303,7 +1305,8 @@ triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 -mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 +tractionControlEtbDrop = array, S08, 4348, [6x6], "%", 1, 0, -100, 0, 0 +mainUnusedEnd = array, U08, 4384, [172], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -3131,6 +3134,7 @@ etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1401, "", 1, 0 jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 ; total TS size = 1404 faultCode0 = scalar, U08, 1404, "", 1, 0 @@ -3838,6 +3842,11 @@ curve = rangeMatrix, "Range Switch Input Matrix" yBins = tpsTpsAccelToRpmBins, TPSValue zBins = tpsTpsAccelTable + table = tractionEtbTableTbl, tractionEtb, "Traction Control ETB drop", 1 + xBins = tractionControlSpeedBins, vehicleSpeedKph + yBins = tractionControlSlipBins, wheelSlipRatio + zBins = tractionControlEtbDrop + table = boostTableTbl, boostMapOpen, "Boost control duty cycle (open loop)", 1 xBins = boostRpmBins, RPMValue yBins = boostTpsBins, TPSValue @@ -5382,6 +5391,7 @@ entry = etbDutyAverage0, "ETB average duty0", float, "%.3f" entry = etbTpsErrorCounter0, "ETB TPS error counter0", int, "%d" entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" +entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" ;entry = trim1, "ETB: trim1", float, "%.3f" @@ -5398,6 +5408,7 @@ entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = etbTpsErrorCounter1, "ETB TPS error counter1", int, "%d" ;entry = etbPpsErrorCounter1, "ETB pedal error counter1", int, "%d" ;entry = etbErrorCode1, "etbErrorCode1", int, "%d" +;entry = tcEtbDrop1, "tcEtbDrop1", int, "%d" ;entry = jamTimer1, "ETB jam timer1", float, "%.3f" entry = faultCode0, "WBO: Fault code0", int, "%d" entry = heaterDuty0, "WBO: Heater duty0", int, "%d" @@ -5733,6 +5744,7 @@ menuDialog = main subMenu = hpfpCompensationTable, "HPFP Pump Compensation", {hpfpCamLobes != 0} subMenu = std_separator subMenu = fancyHardwareDialog, "Fancy Hardware" + subMenu = tractionEtbTableTbl subMenu = std_separator @@ -6350,6 +6362,7 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etbPpsErrorCounter0 liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etbErrorCode0 + graphLine = tcEtbDrop0 graphLine = jamTimer0 diff --git a/firmware/tunerstudio/generated/rusefi_nucleo_h743.ini b/firmware/tunerstudio/generated/rusefi_nucleo_h743.ini index 5066b2d91d..86fa95e805 100644 --- a/firmware/tunerstudio/generated/rusefi_nucleo_h743.ini +++ b/firmware/tunerstudio/generated/rusefi_nucleo_h743.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.31.nucleo_h743.2964181907" + signature = "rusEFI master.2023.12.31.nucleo_h743.1289969461" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.31.nucleo_h743.2964181907" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.31.nucleo_h743.1289969461" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:20:15 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:19:11 UTC 2023 pageSize = 22088 page = 1 @@ -1010,7 +1010,9 @@ triggerCompCenterVolt = scalar, U08, 2668, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMin = scalar, U08, 2669, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMax = scalar, U08, 2670, "V", 0.02, 0, 0, 5.1, 2 triggerCompSensorSatRpm = scalar, U08, 2671, "RPM", 50.0, 0, 0, 12000, 0 -unusedHere = array, S08, 2672, [20], "", 1, 0, 0, 100, 0 +tractionControlSlipBins = array, U16, 2672, [6], "ratio", 0.1, 0, 0, 999, 1 +tractionControlSpeedBins = array, U08, 2684, [6], "RPM", 1, 0, 0, 250, 0 +unusedHere = array, S08, 2690, [2], "", 1, 0, 0, 100, 0 canVssNbcType = bits, U08, 2692, [0:2], "BMW_e46", "W202", "BMW E8x/E9x MK60e5", "Nissan 350", "Hyundai PB", "Honda Civic9" gppwm1_pin = bits, U16, 2696, [0:8], $output_pin_e_list gppwm1_dutyIfError = scalar, U08, 2698, "%", 1, 0, 0, 100, 0 @@ -1303,7 +1305,8 @@ triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 -mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 +tractionControlEtbDrop = array, S08, 4348, [6x6], "%", 1, 0, -100, 0, 0 +mainUnusedEnd = array, U08, 4384, [172], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -3131,6 +3134,7 @@ etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1401, "", 1, 0 jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 ; total TS size = 1404 faultCode0 = scalar, U08, 1404, "", 1, 0 @@ -3838,6 +3842,11 @@ curve = rangeMatrix, "Range Switch Input Matrix" yBins = tpsTpsAccelToRpmBins, TPSValue zBins = tpsTpsAccelTable + table = tractionEtbTableTbl, tractionEtb, "Traction Control ETB drop", 1 + xBins = tractionControlSpeedBins, vehicleSpeedKph + yBins = tractionControlSlipBins, wheelSlipRatio + zBins = tractionControlEtbDrop + table = boostTableTbl, boostMapOpen, "Boost control duty cycle (open loop)", 1 xBins = boostRpmBins, RPMValue yBins = boostTpsBins, TPSValue @@ -5381,6 +5390,7 @@ entry = etbDutyAverage0, "ETB average duty0", float, "%.3f" entry = etbTpsErrorCounter0, "ETB TPS error counter0", int, "%d" entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" +entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" ;entry = trim1, "ETB: trim1", float, "%.3f" @@ -5397,6 +5407,7 @@ entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = etbTpsErrorCounter1, "ETB TPS error counter1", int, "%d" ;entry = etbPpsErrorCounter1, "ETB pedal error counter1", int, "%d" ;entry = etbErrorCode1, "etbErrorCode1", int, "%d" +;entry = tcEtbDrop1, "tcEtbDrop1", int, "%d" ;entry = jamTimer1, "ETB jam timer1", float, "%.3f" entry = faultCode0, "WBO: Fault code0", int, "%d" entry = heaterDuty0, "WBO: Heater duty0", int, "%d" @@ -5730,6 +5741,7 @@ menuDialog = main subMenu = hpfpCompensationTable, "HPFP Pump Compensation", {hpfpCamLobes != 0} subMenu = std_separator subMenu = fancyHardwareDialog, "Fancy Hardware" + subMenu = tractionEtbTableTbl subMenu = std_separator @@ -6347,6 +6359,7 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etbPpsErrorCounter0 liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etbErrorCode0 + graphLine = tcEtbDrop0 graphLine = jamTimer0 diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index dd00381e0c..3837eb9a00 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.31.prometheus_405.2151226883" + signature = "rusEFI master.2023.12.31.prometheus_405.2088211109" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.31.prometheus_405.2151226883" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.31.prometheus_405.2088211109" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:19:53 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:18:49 UTC 2023 pageSize = 22088 page = 1 @@ -1010,7 +1010,9 @@ triggerCompCenterVolt = scalar, U08, 2668, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMin = scalar, U08, 2669, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMax = scalar, U08, 2670, "V", 0.02, 0, 0, 5.1, 2 triggerCompSensorSatRpm = scalar, U08, 2671, "RPM", 50.0, 0, 0, 12000, 0 -unusedHere = array, S08, 2672, [20], "", 1, 0, 0, 100, 0 +tractionControlSlipBins = array, U16, 2672, [6], "ratio", 0.1, 0, 0, 999, 1 +tractionControlSpeedBins = array, U08, 2684, [6], "RPM", 1, 0, 0, 250, 0 +unusedHere = array, S08, 2690, [2], "", 1, 0, 0, 100, 0 canVssNbcType = bits, U08, 2692, [0:2], "BMW_e46", "W202", "BMW E8x/E9x MK60e5", "Nissan 350", "Hyundai PB", "Honda Civic9" gppwm1_pin = bits, U16, 2696, [0:8], $output_pin_e_list gppwm1_dutyIfError = scalar, U08, 2698, "%", 1, 0, 0, 100, 0 @@ -1303,7 +1305,8 @@ triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 -mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 +tractionControlEtbDrop = array, S08, 4348, [6x6], "%", 1, 0, -100, 0, 0 +mainUnusedEnd = array, U08, 4384, [172], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -3131,6 +3134,7 @@ etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1401, "", 1, 0 jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 ; total TS size = 1404 faultCode0 = scalar, U08, 1404, "", 1, 0 @@ -3838,6 +3842,11 @@ curve = rangeMatrix, "Range Switch Input Matrix" yBins = tpsTpsAccelToRpmBins, TPSValue zBins = tpsTpsAccelTable + table = tractionEtbTableTbl, tractionEtb, "Traction Control ETB drop", 1 + xBins = tractionControlSpeedBins, vehicleSpeedKph + yBins = tractionControlSlipBins, wheelSlipRatio + zBins = tractionControlEtbDrop + table = boostTableTbl, boostMapOpen, "Boost control duty cycle (open loop)", 1 xBins = boostRpmBins, RPMValue yBins = boostTpsBins, TPSValue @@ -5381,6 +5390,7 @@ entry = etbDutyAverage0, "ETB average duty0", float, "%.3f" entry = etbTpsErrorCounter0, "ETB TPS error counter0", int, "%d" entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" +entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" ;entry = trim1, "ETB: trim1", float, "%.3f" @@ -5397,6 +5407,7 @@ entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = etbTpsErrorCounter1, "ETB TPS error counter1", int, "%d" ;entry = etbPpsErrorCounter1, "ETB pedal error counter1", int, "%d" ;entry = etbErrorCode1, "etbErrorCode1", int, "%d" +;entry = tcEtbDrop1, "tcEtbDrop1", int, "%d" ;entry = jamTimer1, "ETB jam timer1", float, "%.3f" entry = faultCode0, "WBO: Fault code0", int, "%d" entry = heaterDuty0, "WBO: Heater duty0", int, "%d" @@ -5725,6 +5736,7 @@ menuDialog = main subMenu = hpfpCompensationTable, "HPFP Pump Compensation", {hpfpCamLobes != 0} subMenu = std_separator subMenu = fancyHardwareDialog, "Fancy Hardware" + subMenu = tractionEtbTableTbl subMenu = std_separator @@ -6342,6 +6354,7 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etbPpsErrorCounter0 liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etbErrorCode0 + graphLine = tcEtbDrop0 graphLine = jamTimer0 diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 08d4b80e6b..0f61ea5163 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.31.prometheus_469.2151226883" + signature = "rusEFI master.2023.12.31.prometheus_469.2088211109" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.31.prometheus_469.2151226883" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.31.prometheus_469.2088211109" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:19:51 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:18:47 UTC 2023 pageSize = 22088 page = 1 @@ -1010,7 +1010,9 @@ triggerCompCenterVolt = scalar, U08, 2668, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMin = scalar, U08, 2669, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMax = scalar, U08, 2670, "V", 0.02, 0, 0, 5.1, 2 triggerCompSensorSatRpm = scalar, U08, 2671, "RPM", 50.0, 0, 0, 12000, 0 -unusedHere = array, S08, 2672, [20], "", 1, 0, 0, 100, 0 +tractionControlSlipBins = array, U16, 2672, [6], "ratio", 0.1, 0, 0, 999, 1 +tractionControlSpeedBins = array, U08, 2684, [6], "RPM", 1, 0, 0, 250, 0 +unusedHere = array, S08, 2690, [2], "", 1, 0, 0, 100, 0 canVssNbcType = bits, U08, 2692, [0:2], "BMW_e46", "W202", "BMW E8x/E9x MK60e5", "Nissan 350", "Hyundai PB", "Honda Civic9" gppwm1_pin = bits, U16, 2696, [0:8], $output_pin_e_list gppwm1_dutyIfError = scalar, U08, 2698, "%", 1, 0, 0, 100, 0 @@ -1303,7 +1305,8 @@ triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 -mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 +tractionControlEtbDrop = array, S08, 4348, [6x6], "%", 1, 0, -100, 0, 0 +mainUnusedEnd = array, U08, 4384, [172], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -3131,6 +3134,7 @@ etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1401, "", 1, 0 jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 ; total TS size = 1404 faultCode0 = scalar, U08, 1404, "", 1, 0 @@ -3838,6 +3842,11 @@ curve = rangeMatrix, "Range Switch Input Matrix" yBins = tpsTpsAccelToRpmBins, TPSValue zBins = tpsTpsAccelTable + table = tractionEtbTableTbl, tractionEtb, "Traction Control ETB drop", 1 + xBins = tractionControlSpeedBins, vehicleSpeedKph + yBins = tractionControlSlipBins, wheelSlipRatio + zBins = tractionControlEtbDrop + table = boostTableTbl, boostMapOpen, "Boost control duty cycle (open loop)", 1 xBins = boostRpmBins, RPMValue yBins = boostTpsBins, TPSValue @@ -5381,6 +5390,7 @@ entry = etbDutyAverage0, "ETB average duty0", float, "%.3f" entry = etbTpsErrorCounter0, "ETB TPS error counter0", int, "%d" entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" +entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" ;entry = trim1, "ETB: trim1", float, "%.3f" @@ -5397,6 +5407,7 @@ entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = etbTpsErrorCounter1, "ETB TPS error counter1", int, "%d" ;entry = etbPpsErrorCounter1, "ETB pedal error counter1", int, "%d" ;entry = etbErrorCode1, "etbErrorCode1", int, "%d" +;entry = tcEtbDrop1, "tcEtbDrop1", int, "%d" ;entry = jamTimer1, "ETB jam timer1", float, "%.3f" entry = faultCode0, "WBO: Fault code0", int, "%d" entry = heaterDuty0, "WBO: Heater duty0", int, "%d" @@ -5725,6 +5736,7 @@ menuDialog = main subMenu = hpfpCompensationTable, "HPFP Pump Compensation", {hpfpCamLobes != 0} subMenu = std_separator subMenu = fancyHardwareDialog, "Fancy Hardware" + subMenu = tractionEtbTableTbl subMenu = std_separator @@ -6342,6 +6354,7 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etbPpsErrorCounter0 liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etbErrorCode0 + graphLine = tcEtbDrop0 graphLine = jamTimer0 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index cb9e40aa55..63580869c0 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.31.proteus_f4.3687605773" + signature = "rusEFI master.2023.12.31.proteus_f4.662891179" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.31.proteus_f4.3687605773" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.31.proteus_f4.662891179" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","Analog Volt 5","Analog Volt 6","Analog Volt 7","Analog Volt 8","Analog Volt 9","Analog Volt 10","Analog Volt 11","Battery Sense","Analog Temp 3","Analog Temp 4","Analog Volt 1","Analog Volt 2","Analog Volt 3","Analog Volt 4","Analog Temp 1","Analog Temp 2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:19:58 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:18:54 UTC 2023 pageSize = 26088 page = 1 @@ -1010,7 +1010,9 @@ triggerCompCenterVolt = scalar, U08, 2668, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMin = scalar, U08, 2669, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMax = scalar, U08, 2670, "V", 0.02, 0, 0, 5.1, 2 triggerCompSensorSatRpm = scalar, U08, 2671, "RPM", 50.0, 0, 0, 12000, 0 -unusedHere = array, S08, 2672, [20], "", 1, 0, 0, 100, 0 +tractionControlSlipBins = array, U16, 2672, [6], "ratio", 0.1, 0, 0, 999, 1 +tractionControlSpeedBins = array, U08, 2684, [6], "RPM", 1, 0, 0, 250, 0 +unusedHere = array, S08, 2690, [2], "", 1, 0, 0, 100, 0 canVssNbcType = bits, U08, 2692, [0:2], "BMW_e46", "W202", "BMW E8x/E9x MK60e5", "Nissan 350", "Hyundai PB", "Honda Civic9" gppwm1_pin = bits, U16, 2696, [0:8], $output_pin_e_list gppwm1_dutyIfError = scalar, U08, 2698, "%", 1, 0, 0, 100, 0 @@ -1303,7 +1305,8 @@ triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 -mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 +tractionControlEtbDrop = array, S08, 4348, [6x6], "%", 1, 0, -100, 0, 0 +mainUnusedEnd = array, U08, 4384, [172], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -3131,6 +3134,7 @@ etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1401, "", 1, 0 jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 ; total TS size = 1404 faultCode0 = scalar, U08, 1404, "", 1, 0 @@ -3838,6 +3842,11 @@ curve = rangeMatrix, "Range Switch Input Matrix" yBins = tpsTpsAccelToRpmBins, TPSValue zBins = tpsTpsAccelTable + table = tractionEtbTableTbl, tractionEtb, "Traction Control ETB drop", 1 + xBins = tractionControlSpeedBins, vehicleSpeedKph + yBins = tractionControlSlipBins, wheelSlipRatio + zBins = tractionControlEtbDrop + table = boostTableTbl, boostMapOpen, "Boost control duty cycle (open loop)", 1 xBins = boostRpmBins, RPMValue yBins = boostTpsBins, TPSValue @@ -5381,6 +5390,7 @@ entry = etbDutyAverage0, "ETB average duty0", float, "%.3f" entry = etbTpsErrorCounter0, "ETB TPS error counter0", int, "%d" entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" +entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" ;entry = trim1, "ETB: trim1", float, "%.3f" @@ -5397,6 +5407,7 @@ entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = etbTpsErrorCounter1, "ETB TPS error counter1", int, "%d" ;entry = etbPpsErrorCounter1, "ETB pedal error counter1", int, "%d" ;entry = etbErrorCode1, "etbErrorCode1", int, "%d" +;entry = tcEtbDrop1, "tcEtbDrop1", int, "%d" ;entry = jamTimer1, "ETB jam timer1", float, "%.3f" entry = faultCode0, "WBO: Fault code0", int, "%d" entry = heaterDuty0, "WBO: Heater duty0", int, "%d" @@ -5727,6 +5738,7 @@ menuDialog = main subMenu = hpfpCompensationTable, "HPFP Pump Compensation", {hpfpCamLobes != 0} subMenu = std_separator subMenu = fancyHardwareDialog, "Fancy Hardware" + subMenu = tractionEtbTableTbl subMenu = std_separator @@ -6357,6 +6369,7 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etbPpsErrorCounter0 liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etbErrorCode0 + graphLine = tcEtbDrop0 graphLine = jamTimer0 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 75671f89ed..b36ec65d0d 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.31.proteus_f7.3687605773" + signature = "rusEFI master.2023.12.31.proteus_f7.662891179" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.31.proteus_f7.3687605773" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.31.proteus_f7.662891179" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","Analog Volt 5","Analog Volt 6","Analog Volt 7","Analog Volt 8","Analog Volt 9","Analog Volt 10","Analog Volt 11","Battery Sense","Analog Temp 3","Analog Temp 4","Analog Volt 1","Analog Volt 2","Analog Volt 3","Analog Volt 4","Analog Temp 1","Analog Temp 2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:19:55 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:18:51 UTC 2023 pageSize = 26088 page = 1 @@ -1010,7 +1010,9 @@ triggerCompCenterVolt = scalar, U08, 2668, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMin = scalar, U08, 2669, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMax = scalar, U08, 2670, "V", 0.02, 0, 0, 5.1, 2 triggerCompSensorSatRpm = scalar, U08, 2671, "RPM", 50.0, 0, 0, 12000, 0 -unusedHere = array, S08, 2672, [20], "", 1, 0, 0, 100, 0 +tractionControlSlipBins = array, U16, 2672, [6], "ratio", 0.1, 0, 0, 999, 1 +tractionControlSpeedBins = array, U08, 2684, [6], "RPM", 1, 0, 0, 250, 0 +unusedHere = array, S08, 2690, [2], "", 1, 0, 0, 100, 0 canVssNbcType = bits, U08, 2692, [0:2], "BMW_e46", "W202", "BMW E8x/E9x MK60e5", "Nissan 350", "Hyundai PB", "Honda Civic9" gppwm1_pin = bits, U16, 2696, [0:8], $output_pin_e_list gppwm1_dutyIfError = scalar, U08, 2698, "%", 1, 0, 0, 100, 0 @@ -1303,7 +1305,8 @@ triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 -mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 +tractionControlEtbDrop = array, S08, 4348, [6x6], "%", 1, 0, -100, 0, 0 +mainUnusedEnd = array, U08, 4384, [172], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -3131,6 +3134,7 @@ etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1401, "", 1, 0 jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 ; total TS size = 1404 faultCode0 = scalar, U08, 1404, "", 1, 0 @@ -3838,6 +3842,11 @@ curve = rangeMatrix, "Range Switch Input Matrix" yBins = tpsTpsAccelToRpmBins, TPSValue zBins = tpsTpsAccelTable + table = tractionEtbTableTbl, tractionEtb, "Traction Control ETB drop", 1 + xBins = tractionControlSpeedBins, vehicleSpeedKph + yBins = tractionControlSlipBins, wheelSlipRatio + zBins = tractionControlEtbDrop + table = boostTableTbl, boostMapOpen, "Boost control duty cycle (open loop)", 1 xBins = boostRpmBins, RPMValue yBins = boostTpsBins, TPSValue @@ -5381,6 +5390,7 @@ entry = etbDutyAverage0, "ETB average duty0", float, "%.3f" entry = etbTpsErrorCounter0, "ETB TPS error counter0", int, "%d" entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" +entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" ;entry = trim1, "ETB: trim1", float, "%.3f" @@ -5397,6 +5407,7 @@ entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = etbTpsErrorCounter1, "ETB TPS error counter1", int, "%d" ;entry = etbPpsErrorCounter1, "ETB pedal error counter1", int, "%d" ;entry = etbErrorCode1, "etbErrorCode1", int, "%d" +;entry = tcEtbDrop1, "tcEtbDrop1", int, "%d" ;entry = jamTimer1, "ETB jam timer1", float, "%.3f" entry = faultCode0, "WBO: Fault code0", int, "%d" entry = heaterDuty0, "WBO: Heater duty0", int, "%d" @@ -5727,6 +5738,7 @@ menuDialog = main subMenu = hpfpCompensationTable, "HPFP Pump Compensation", {hpfpCamLobes != 0} subMenu = std_separator subMenu = fancyHardwareDialog, "Fancy Hardware" + subMenu = tractionEtbTableTbl subMenu = std_separator @@ -6357,6 +6369,7 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etbPpsErrorCounter0 liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etbErrorCode0 + graphLine = tcEtbDrop0 graphLine = jamTimer0 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini index 2fd184823d..a40bb08656 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.31.proteus_h7.3687605773" + signature = "rusEFI master.2023.12.31.proteus_h7.662891179" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.31.proteus_h7.3687605773" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.31.proteus_h7.662891179" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","Analog Volt 5","Analog Volt 6","Analog Volt 7","Analog Volt 8","Analog Volt 9","Analog Volt 10","Analog Volt 11","Battery Sense","Analog Temp 3","Analog Temp 4","Analog Volt 1","Analog Volt 2","Analog Volt 3","Analog Volt 4","Analog Temp 1","Analog Temp 2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:20:01 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:18:56 UTC 2023 pageSize = 26088 page = 1 @@ -1010,7 +1010,9 @@ triggerCompCenterVolt = scalar, U08, 2668, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMin = scalar, U08, 2669, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMax = scalar, U08, 2670, "V", 0.02, 0, 0, 5.1, 2 triggerCompSensorSatRpm = scalar, U08, 2671, "RPM", 50.0, 0, 0, 12000, 0 -unusedHere = array, S08, 2672, [20], "", 1, 0, 0, 100, 0 +tractionControlSlipBins = array, U16, 2672, [6], "ratio", 0.1, 0, 0, 999, 1 +tractionControlSpeedBins = array, U08, 2684, [6], "RPM", 1, 0, 0, 250, 0 +unusedHere = array, S08, 2690, [2], "", 1, 0, 0, 100, 0 canVssNbcType = bits, U08, 2692, [0:2], "BMW_e46", "W202", "BMW E8x/E9x MK60e5", "Nissan 350", "Hyundai PB", "Honda Civic9" gppwm1_pin = bits, U16, 2696, [0:8], $output_pin_e_list gppwm1_dutyIfError = scalar, U08, 2698, "%", 1, 0, 0, 100, 0 @@ -1303,7 +1305,8 @@ triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 -mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 +tractionControlEtbDrop = array, S08, 4348, [6x6], "%", 1, 0, -100, 0, 0 +mainUnusedEnd = array, U08, 4384, [172], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -3131,6 +3134,7 @@ etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1401, "", 1, 0 jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 ; total TS size = 1404 faultCode0 = scalar, U08, 1404, "", 1, 0 @@ -3838,6 +3842,11 @@ curve = rangeMatrix, "Range Switch Input Matrix" yBins = tpsTpsAccelToRpmBins, TPSValue zBins = tpsTpsAccelTable + table = tractionEtbTableTbl, tractionEtb, "Traction Control ETB drop", 1 + xBins = tractionControlSpeedBins, vehicleSpeedKph + yBins = tractionControlSlipBins, wheelSlipRatio + zBins = tractionControlEtbDrop + table = boostTableTbl, boostMapOpen, "Boost control duty cycle (open loop)", 1 xBins = boostRpmBins, RPMValue yBins = boostTpsBins, TPSValue @@ -5381,6 +5390,7 @@ entry = etbDutyAverage0, "ETB average duty0", float, "%.3f" entry = etbTpsErrorCounter0, "ETB TPS error counter0", int, "%d" entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" +entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" ;entry = trim1, "ETB: trim1", float, "%.3f" @@ -5397,6 +5407,7 @@ entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = etbTpsErrorCounter1, "ETB TPS error counter1", int, "%d" ;entry = etbPpsErrorCounter1, "ETB pedal error counter1", int, "%d" ;entry = etbErrorCode1, "etbErrorCode1", int, "%d" +;entry = tcEtbDrop1, "tcEtbDrop1", int, "%d" ;entry = jamTimer1, "ETB jam timer1", float, "%.3f" entry = faultCode0, "WBO: Fault code0", int, "%d" entry = heaterDuty0, "WBO: Heater duty0", int, "%d" @@ -5727,6 +5738,7 @@ menuDialog = main subMenu = hpfpCompensationTable, "HPFP Pump Compensation", {hpfpCamLobes != 0} subMenu = std_separator subMenu = fancyHardwareDialog, "Fancy Hardware" + subMenu = tractionEtbTableTbl subMenu = std_separator @@ -6357,6 +6369,7 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etbPpsErrorCounter0 liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etbErrorCode0 + graphLine = tcEtbDrop0 graphLine = jamTimer0 diff --git a/firmware/tunerstudio/generated/rusefi_s105.ini b/firmware/tunerstudio/generated/rusefi_s105.ini index dd620f489c..1fff4b9b36 100644 --- a/firmware/tunerstudio/generated/rusefi_s105.ini +++ b/firmware/tunerstudio/generated/rusefi_s105.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.31.s105.426427093" + signature = "rusEFI master.2023.12.31.s105.3844361843" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.31.s105.426427093" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.31.s105.3844361843" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","56 - MAP","16 - TPS","19 - Knock","39 - CLT","INVALID","opt 55 - AFR 2","opt 21 - AC Press","18 - AFR 1","13 - Ignition switch in (15)","44 - +12 sense (MR)","INVALID","na 37 - MAF","INVALID","INVALID","40 - IAT" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:19:43 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:18:39 UTC 2023 pageSize = 22088 page = 1 @@ -1010,7 +1010,9 @@ triggerCompCenterVolt = scalar, U08, 2668, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMin = scalar, U08, 2669, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMax = scalar, U08, 2670, "V", 0.02, 0, 0, 5.1, 2 triggerCompSensorSatRpm = scalar, U08, 2671, "RPM", 50.0, 0, 0, 12000, 0 -unusedHere = array, S08, 2672, [20], "", 1, 0, 0, 100, 0 +tractionControlSlipBins = array, U16, 2672, [6], "ratio", 0.1, 0, 0, 999, 1 +tractionControlSpeedBins = array, U08, 2684, [6], "RPM", 1, 0, 0, 250, 0 +unusedHere = array, S08, 2690, [2], "", 1, 0, 0, 100, 0 canVssNbcType = bits, U08, 2692, [0:2], "BMW_e46", "W202", "BMW E8x/E9x MK60e5", "Nissan 350", "Hyundai PB", "Honda Civic9" gppwm1_pin = bits, U16, 2696, [0:8], $output_pin_e_list gppwm1_dutyIfError = scalar, U08, 2698, "%", 1, 0, 0, 100, 0 @@ -1303,7 +1305,8 @@ triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 -mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 +tractionControlEtbDrop = array, S08, 4348, [6x6], "%", 1, 0, -100, 0, 0 +mainUnusedEnd = array, U08, 4384, [172], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -3131,6 +3134,7 @@ etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1401, "", 1, 0 jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 ; total TS size = 1404 faultCode0 = scalar, U08, 1404, "", 1, 0 @@ -3838,6 +3842,11 @@ curve = rangeMatrix, "Range Switch Input Matrix" yBins = tpsTpsAccelToRpmBins, TPSValue zBins = tpsTpsAccelTable + table = tractionEtbTableTbl, tractionEtb, "Traction Control ETB drop", 1 + xBins = tractionControlSpeedBins, vehicleSpeedKph + yBins = tractionControlSlipBins, wheelSlipRatio + zBins = tractionControlEtbDrop + table = boostTableTbl, boostMapOpen, "Boost control duty cycle (open loop)", 1 xBins = boostRpmBins, RPMValue yBins = boostTpsBins, TPSValue @@ -5381,6 +5390,7 @@ entry = etbDutyAverage0, "ETB average duty0", float, "%.3f" entry = etbTpsErrorCounter0, "ETB TPS error counter0", int, "%d" entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" +entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" ;entry = trim1, "ETB: trim1", float, "%.3f" @@ -5397,6 +5407,7 @@ entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = etbTpsErrorCounter1, "ETB TPS error counter1", int, "%d" ;entry = etbPpsErrorCounter1, "ETB pedal error counter1", int, "%d" ;entry = etbErrorCode1, "etbErrorCode1", int, "%d" +;entry = tcEtbDrop1, "tcEtbDrop1", int, "%d" ;entry = jamTimer1, "ETB jam timer1", float, "%.3f" entry = faultCode0, "WBO: Fault code0", int, "%d" entry = heaterDuty0, "WBO: Heater duty0", int, "%d" @@ -5731,6 +5742,7 @@ menuDialog = main subMenu = hpfpCompensationTable, "HPFP Pump Compensation", {hpfpCamLobes != 0} subMenu = std_separator subMenu = fancyHardwareDialog, "Fancy Hardware" + subMenu = tractionEtbTableTbl subMenu = std_separator @@ -6348,6 +6360,7 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etbPpsErrorCounter0 liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etbErrorCode0 + graphLine = tcEtbDrop0 graphLine = jamTimer0 diff --git a/firmware/tunerstudio/generated/rusefi_small-can-board.ini b/firmware/tunerstudio/generated/rusefi_small-can-board.ini index c2c56d5bb1..5fb300086b 100644 --- a/firmware/tunerstudio/generated/rusefi_small-can-board.ini +++ b/firmware/tunerstudio/generated/rusefi_small-can-board.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.31.small-can-board.2383159066" + signature = "rusEFI master.2023.12.31.small-can-board.1916965820" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.31.small-can-board.2383159066" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.31.small-can-board.1916965820" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","INVALID","B2 - Analog/Digital Input","B3 - Analog/Digital Input","B4 - Analog/Digital Input","B5 - Analog/Digital Input","B7 - Analog/Digital Input","C1 - Analog/Digital Input 6","INVALID","INVALID","INVALID","A2 Battery Sense","INVALID","INVALID","C2 - Analog/Digital Input 7","C4 - Analog/Digital Input 8" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:19:33 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:18:29 UTC 2023 pageSize = 22088 page = 1 @@ -1010,7 +1010,9 @@ triggerCompCenterVolt = scalar, U08, 2668, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMin = scalar, U08, 2669, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMax = scalar, U08, 2670, "V", 0.02, 0, 0, 5.1, 2 triggerCompSensorSatRpm = scalar, U08, 2671, "RPM", 50.0, 0, 0, 12000, 0 -unusedHere = array, S08, 2672, [20], "", 1, 0, 0, 100, 0 +tractionControlSlipBins = array, U16, 2672, [6], "ratio", 0.1, 0, 0, 999, 1 +tractionControlSpeedBins = array, U08, 2684, [6], "RPM", 1, 0, 0, 250, 0 +unusedHere = array, S08, 2690, [2], "", 1, 0, 0, 100, 0 canVssNbcType = bits, U08, 2692, [0:2], "BMW_e46", "W202", "BMW E8x/E9x MK60e5", "Nissan 350", "Hyundai PB", "Honda Civic9" gppwm1_pin = bits, U16, 2696, [0:8], $output_pin_e_list gppwm1_dutyIfError = scalar, U08, 2698, "%", 1, 0, 0, 100, 0 @@ -1303,7 +1305,8 @@ triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 -mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 +tractionControlEtbDrop = array, S08, 4348, [6x6], "%", 1, 0, -100, 0, 0 +mainUnusedEnd = array, U08, 4384, [172], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -3131,6 +3134,7 @@ etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1401, "", 1, 0 jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 ; total TS size = 1404 faultCode0 = scalar, U08, 1404, "", 1, 0 @@ -3838,6 +3842,11 @@ curve = rangeMatrix, "Range Switch Input Matrix" yBins = tpsTpsAccelToRpmBins, TPSValue zBins = tpsTpsAccelTable + table = tractionEtbTableTbl, tractionEtb, "Traction Control ETB drop", 1 + xBins = tractionControlSpeedBins, vehicleSpeedKph + yBins = tractionControlSlipBins, wheelSlipRatio + zBins = tractionControlEtbDrop + table = boostTableTbl, boostMapOpen, "Boost control duty cycle (open loop)", 1 xBins = boostRpmBins, RPMValue yBins = boostTpsBins, TPSValue @@ -5381,6 +5390,7 @@ entry = etbDutyAverage0, "ETB average duty0", float, "%.3f" entry = etbTpsErrorCounter0, "ETB TPS error counter0", int, "%d" entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" +entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" ;entry = trim1, "ETB: trim1", float, "%.3f" @@ -5397,6 +5407,7 @@ entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = etbTpsErrorCounter1, "ETB TPS error counter1", int, "%d" ;entry = etbPpsErrorCounter1, "ETB pedal error counter1", int, "%d" ;entry = etbErrorCode1, "etbErrorCode1", int, "%d" +;entry = tcEtbDrop1, "tcEtbDrop1", int, "%d" ;entry = jamTimer1, "ETB jam timer1", float, "%.3f" entry = faultCode0, "WBO: Fault code0", int, "%d" entry = heaterDuty0, "WBO: Heater duty0", int, "%d" @@ -5729,6 +5740,7 @@ menuDialog = main subMenu = hpfpCompensationTable, "HPFP Pump Compensation", {hpfpCamLobes != 0} subMenu = std_separator subMenu = fancyHardwareDialog, "Fancy Hardware" + subMenu = tractionEtbTableTbl subMenu = std_separator @@ -6347,6 +6359,7 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etbPpsErrorCounter0 liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etbErrorCode0 + graphLine = tcEtbDrop0 graphLine = jamTimer0 diff --git a/firmware/tunerstudio/generated/rusefi_stm32f413_nucleo.ini b/firmware/tunerstudio/generated/rusefi_stm32f413_nucleo.ini index 7e8a639e83..96804c87cb 100644 --- a/firmware/tunerstudio/generated/rusefi_stm32f413_nucleo.ini +++ b/firmware/tunerstudio/generated/rusefi_stm32f413_nucleo.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.31.stm32f413_nucleo.2964181907" + signature = "rusEFI master.2023.12.31.stm32f413_nucleo.1289969461" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.31.stm32f413_nucleo.2964181907" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.31.stm32f413_nucleo.1289969461" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:20:08 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:19:04 UTC 2023 pageSize = 22088 page = 1 @@ -1010,7 +1010,9 @@ triggerCompCenterVolt = scalar, U08, 2668, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMin = scalar, U08, 2669, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMax = scalar, U08, 2670, "V", 0.02, 0, 0, 5.1, 2 triggerCompSensorSatRpm = scalar, U08, 2671, "RPM", 50.0, 0, 0, 12000, 0 -unusedHere = array, S08, 2672, [20], "", 1, 0, 0, 100, 0 +tractionControlSlipBins = array, U16, 2672, [6], "ratio", 0.1, 0, 0, 999, 1 +tractionControlSpeedBins = array, U08, 2684, [6], "RPM", 1, 0, 0, 250, 0 +unusedHere = array, S08, 2690, [2], "", 1, 0, 0, 100, 0 canVssNbcType = bits, U08, 2692, [0:2], "BMW_e46", "W202", "BMW E8x/E9x MK60e5", "Nissan 350", "Hyundai PB", "Honda Civic9" gppwm1_pin = bits, U16, 2696, [0:8], $output_pin_e_list gppwm1_dutyIfError = scalar, U08, 2698, "%", 1, 0, 0, 100, 0 @@ -1303,7 +1305,8 @@ triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 -mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 +tractionControlEtbDrop = array, S08, 4348, [6x6], "%", 1, 0, -100, 0, 0 +mainUnusedEnd = array, U08, 4384, [172], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -3131,6 +3134,7 @@ etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1401, "", 1, 0 jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 ; total TS size = 1404 faultCode0 = scalar, U08, 1404, "", 1, 0 @@ -3838,6 +3842,11 @@ curve = rangeMatrix, "Range Switch Input Matrix" yBins = tpsTpsAccelToRpmBins, TPSValue zBins = tpsTpsAccelTable + table = tractionEtbTableTbl, tractionEtb, "Traction Control ETB drop", 1 + xBins = tractionControlSpeedBins, vehicleSpeedKph + yBins = tractionControlSlipBins, wheelSlipRatio + zBins = tractionControlEtbDrop + table = boostTableTbl, boostMapOpen, "Boost control duty cycle (open loop)", 1 xBins = boostRpmBins, RPMValue yBins = boostTpsBins, TPSValue @@ -5381,6 +5390,7 @@ entry = etbDutyAverage0, "ETB average duty0", float, "%.3f" entry = etbTpsErrorCounter0, "ETB TPS error counter0", int, "%d" entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" +entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" ;entry = trim1, "ETB: trim1", float, "%.3f" @@ -5397,6 +5407,7 @@ entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = etbTpsErrorCounter1, "ETB TPS error counter1", int, "%d" ;entry = etbPpsErrorCounter1, "ETB pedal error counter1", int, "%d" ;entry = etbErrorCode1, "etbErrorCode1", int, "%d" +;entry = tcEtbDrop1, "tcEtbDrop1", int, "%d" ;entry = jamTimer1, "ETB jam timer1", float, "%.3f" entry = faultCode0, "WBO: Fault code0", int, "%d" entry = heaterDuty0, "WBO: Heater duty0", int, "%d" @@ -5730,6 +5741,7 @@ menuDialog = main subMenu = hpfpCompensationTable, "HPFP Pump Compensation", {hpfpCamLobes != 0} subMenu = std_separator subMenu = fancyHardwareDialog, "Fancy Hardware" + subMenu = tractionEtbTableTbl subMenu = std_separator @@ -6347,6 +6359,7 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etbPpsErrorCounter0 liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etbErrorCode0 + graphLine = tcEtbDrop0 graphLine = jamTimer0 diff --git a/firmware/tunerstudio/generated/rusefi_stm32f429_nucleo.ini b/firmware/tunerstudio/generated/rusefi_stm32f429_nucleo.ini index 1738710738..977921df0c 100644 --- a/firmware/tunerstudio/generated/rusefi_stm32f429_nucleo.ini +++ b/firmware/tunerstudio/generated/rusefi_stm32f429_nucleo.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.31.stm32f429_nucleo.2964181907" + signature = "rusEFI master.2023.12.31.stm32f429_nucleo.1289969461" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.31.stm32f429_nucleo.2964181907" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.31.stm32f429_nucleo.1289969461" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:20:10 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:19:06 UTC 2023 pageSize = 22088 page = 1 @@ -1010,7 +1010,9 @@ triggerCompCenterVolt = scalar, U08, 2668, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMin = scalar, U08, 2669, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMax = scalar, U08, 2670, "V", 0.02, 0, 0, 5.1, 2 triggerCompSensorSatRpm = scalar, U08, 2671, "RPM", 50.0, 0, 0, 12000, 0 -unusedHere = array, S08, 2672, [20], "", 1, 0, 0, 100, 0 +tractionControlSlipBins = array, U16, 2672, [6], "ratio", 0.1, 0, 0, 999, 1 +tractionControlSpeedBins = array, U08, 2684, [6], "RPM", 1, 0, 0, 250, 0 +unusedHere = array, S08, 2690, [2], "", 1, 0, 0, 100, 0 canVssNbcType = bits, U08, 2692, [0:2], "BMW_e46", "W202", "BMW E8x/E9x MK60e5", "Nissan 350", "Hyundai PB", "Honda Civic9" gppwm1_pin = bits, U16, 2696, [0:8], $output_pin_e_list gppwm1_dutyIfError = scalar, U08, 2698, "%", 1, 0, 0, 100, 0 @@ -1303,7 +1305,8 @@ triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 -mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 +tractionControlEtbDrop = array, S08, 4348, [6x6], "%", 1, 0, -100, 0, 0 +mainUnusedEnd = array, U08, 4384, [172], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -3131,6 +3134,7 @@ etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1401, "", 1, 0 jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 ; total TS size = 1404 faultCode0 = scalar, U08, 1404, "", 1, 0 @@ -3838,6 +3842,11 @@ curve = rangeMatrix, "Range Switch Input Matrix" yBins = tpsTpsAccelToRpmBins, TPSValue zBins = tpsTpsAccelTable + table = tractionEtbTableTbl, tractionEtb, "Traction Control ETB drop", 1 + xBins = tractionControlSpeedBins, vehicleSpeedKph + yBins = tractionControlSlipBins, wheelSlipRatio + zBins = tractionControlEtbDrop + table = boostTableTbl, boostMapOpen, "Boost control duty cycle (open loop)", 1 xBins = boostRpmBins, RPMValue yBins = boostTpsBins, TPSValue @@ -5381,6 +5390,7 @@ entry = etbDutyAverage0, "ETB average duty0", float, "%.3f" entry = etbTpsErrorCounter0, "ETB TPS error counter0", int, "%d" entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" +entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" ;entry = trim1, "ETB: trim1", float, "%.3f" @@ -5397,6 +5407,7 @@ entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = etbTpsErrorCounter1, "ETB TPS error counter1", int, "%d" ;entry = etbPpsErrorCounter1, "ETB pedal error counter1", int, "%d" ;entry = etbErrorCode1, "etbErrorCode1", int, "%d" +;entry = tcEtbDrop1, "tcEtbDrop1", int, "%d" ;entry = jamTimer1, "ETB jam timer1", float, "%.3f" entry = faultCode0, "WBO: Fault code0", int, "%d" entry = heaterDuty0, "WBO: Heater duty0", int, "%d" @@ -5730,6 +5741,7 @@ menuDialog = main subMenu = hpfpCompensationTable, "HPFP Pump Compensation", {hpfpCamLobes != 0} subMenu = std_separator subMenu = fancyHardwareDialog, "Fancy Hardware" + subMenu = tractionEtbTableTbl subMenu = std_separator @@ -6347,6 +6359,7 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etbPpsErrorCounter0 liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etbErrorCode0 + graphLine = tcEtbDrop0 graphLine = jamTimer0 diff --git a/firmware/tunerstudio/generated/rusefi_stm32f767_nucleo.ini b/firmware/tunerstudio/generated/rusefi_stm32f767_nucleo.ini index f43bc848c0..6457f88f92 100644 --- a/firmware/tunerstudio/generated/rusefi_stm32f767_nucleo.ini +++ b/firmware/tunerstudio/generated/rusefi_stm32f767_nucleo.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.31.stm32f767_nucleo.2964181907" + signature = "rusEFI master.2023.12.31.stm32f767_nucleo.1289969461" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.31.stm32f767_nucleo.2964181907" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.31.stm32f767_nucleo.1289969461" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:20:13 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:19:08 UTC 2023 pageSize = 22088 page = 1 @@ -1010,7 +1010,9 @@ triggerCompCenterVolt = scalar, U08, 2668, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMin = scalar, U08, 2669, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMax = scalar, U08, 2670, "V", 0.02, 0, 0, 5.1, 2 triggerCompSensorSatRpm = scalar, U08, 2671, "RPM", 50.0, 0, 0, 12000, 0 -unusedHere = array, S08, 2672, [20], "", 1, 0, 0, 100, 0 +tractionControlSlipBins = array, U16, 2672, [6], "ratio", 0.1, 0, 0, 999, 1 +tractionControlSpeedBins = array, U08, 2684, [6], "RPM", 1, 0, 0, 250, 0 +unusedHere = array, S08, 2690, [2], "", 1, 0, 0, 100, 0 canVssNbcType = bits, U08, 2692, [0:2], "BMW_e46", "W202", "BMW E8x/E9x MK60e5", "Nissan 350", "Hyundai PB", "Honda Civic9" gppwm1_pin = bits, U16, 2696, [0:8], $output_pin_e_list gppwm1_dutyIfError = scalar, U08, 2698, "%", 1, 0, 0, 100, 0 @@ -1303,7 +1305,8 @@ triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 -mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 +tractionControlEtbDrop = array, S08, 4348, [6x6], "%", 1, 0, -100, 0, 0 +mainUnusedEnd = array, U08, 4384, [172], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -3131,6 +3134,7 @@ etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1401, "", 1, 0 jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 ; total TS size = 1404 faultCode0 = scalar, U08, 1404, "", 1, 0 @@ -3838,6 +3842,11 @@ curve = rangeMatrix, "Range Switch Input Matrix" yBins = tpsTpsAccelToRpmBins, TPSValue zBins = tpsTpsAccelTable + table = tractionEtbTableTbl, tractionEtb, "Traction Control ETB drop", 1 + xBins = tractionControlSpeedBins, vehicleSpeedKph + yBins = tractionControlSlipBins, wheelSlipRatio + zBins = tractionControlEtbDrop + table = boostTableTbl, boostMapOpen, "Boost control duty cycle (open loop)", 1 xBins = boostRpmBins, RPMValue yBins = boostTpsBins, TPSValue @@ -5381,6 +5390,7 @@ entry = etbDutyAverage0, "ETB average duty0", float, "%.3f" entry = etbTpsErrorCounter0, "ETB TPS error counter0", int, "%d" entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" +entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" ;entry = trim1, "ETB: trim1", float, "%.3f" @@ -5397,6 +5407,7 @@ entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = etbTpsErrorCounter1, "ETB TPS error counter1", int, "%d" ;entry = etbPpsErrorCounter1, "ETB pedal error counter1", int, "%d" ;entry = etbErrorCode1, "etbErrorCode1", int, "%d" +;entry = tcEtbDrop1, "tcEtbDrop1", int, "%d" ;entry = jamTimer1, "ETB jam timer1", float, "%.3f" entry = faultCode0, "WBO: Fault code0", int, "%d" entry = heaterDuty0, "WBO: Heater duty0", int, "%d" @@ -5730,6 +5741,7 @@ menuDialog = main subMenu = hpfpCompensationTable, "HPFP Pump Compensation", {hpfpCamLobes != 0} subMenu = std_separator subMenu = fancyHardwareDialog, "Fancy Hardware" + subMenu = tractionEtbTableTbl subMenu = std_separator @@ -6347,6 +6359,7 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etbPpsErrorCounter0 liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etbErrorCode0 + graphLine = tcEtbDrop0 graphLine = jamTimer0 diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index 69d9e45c90..241bf0d453 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.31.subaru_eg33_f7.1063516245" + signature = "rusEFI master.2023.12.31.subaru_eg33_f7.3274536179" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.31.subaru_eg33_f7.1063516245" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.31.subaru_eg33_f7.3274536179" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","AUX0_18 - MAP Ain","INVALID","INVALID","B05 - MAF Ain","INVALID","AUX0_19 - IAT Ain","A02 - VBat","INVALID","A06 - Oxyg 2 Ain","A04 - EGR t Ain","INVALID","A18 - AUX0 Ain","B02 - TPS Ain","INVALID","A03 - Coolant t Ain","A06 - Oxyg 1 Ain" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:18:38 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:17:34 UTC 2023 pageSize = 22088 page = 1 @@ -1010,7 +1010,9 @@ triggerCompCenterVolt = scalar, U08, 2668, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMin = scalar, U08, 2669, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMax = scalar, U08, 2670, "V", 0.02, 0, 0, 5.1, 2 triggerCompSensorSatRpm = scalar, U08, 2671, "RPM", 50.0, 0, 0, 12000, 0 -unusedHere = array, S08, 2672, [20], "", 1, 0, 0, 100, 0 +tractionControlSlipBins = array, U16, 2672, [6], "ratio", 0.1, 0, 0, 999, 1 +tractionControlSpeedBins = array, U08, 2684, [6], "RPM", 1, 0, 0, 250, 0 +unusedHere = array, S08, 2690, [2], "", 1, 0, 0, 100, 0 canVssNbcType = bits, U08, 2692, [0:2], "BMW_e46", "W202", "BMW E8x/E9x MK60e5", "Nissan 350", "Hyundai PB", "Honda Civic9" gppwm1_pin = bits, U16, 2696, [0:8], $output_pin_e_list gppwm1_dutyIfError = scalar, U08, 2698, "%", 1, 0, 0, 100, 0 @@ -1303,7 +1305,8 @@ triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 -mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 +tractionControlEtbDrop = array, S08, 4348, [6x6], "%", 1, 0, -100, 0, 0 +mainUnusedEnd = array, U08, 4384, [172], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -3131,6 +3134,7 @@ etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1401, "", 1, 0 jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 ; total TS size = 1404 faultCode0 = scalar, U08, 1404, "", 1, 0 @@ -3838,6 +3842,11 @@ curve = rangeMatrix, "Range Switch Input Matrix" yBins = tpsTpsAccelToRpmBins, TPSValue zBins = tpsTpsAccelTable + table = tractionEtbTableTbl, tractionEtb, "Traction Control ETB drop", 1 + xBins = tractionControlSpeedBins, vehicleSpeedKph + yBins = tractionControlSlipBins, wheelSlipRatio + zBins = tractionControlEtbDrop + table = boostTableTbl, boostMapOpen, "Boost control duty cycle (open loop)", 1 xBins = boostRpmBins, RPMValue yBins = boostTpsBins, TPSValue @@ -5381,6 +5390,7 @@ entry = etbDutyAverage0, "ETB average duty0", float, "%.3f" entry = etbTpsErrorCounter0, "ETB TPS error counter0", int, "%d" entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" +entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" ;entry = trim1, "ETB: trim1", float, "%.3f" @@ -5397,6 +5407,7 @@ entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = etbTpsErrorCounter1, "ETB TPS error counter1", int, "%d" ;entry = etbPpsErrorCounter1, "ETB pedal error counter1", int, "%d" ;entry = etbErrorCode1, "etbErrorCode1", int, "%d" +;entry = tcEtbDrop1, "tcEtbDrop1", int, "%d" ;entry = jamTimer1, "ETB jam timer1", float, "%.3f" entry = faultCode0, "WBO: Fault code0", int, "%d" entry = heaterDuty0, "WBO: Heater duty0", int, "%d" @@ -5729,6 +5740,7 @@ menuDialog = main subMenu = hpfpCompensationTable, "HPFP Pump Compensation", {hpfpCamLobes != 0} subMenu = std_separator subMenu = fancyHardwareDialog, "Fancy Hardware" + subMenu = tractionEtbTableTbl subMenu = std_separator subMenu = hipFunction, "HIP9011 settings (knock sensor) (alpha version)" @@ -6347,6 +6359,7 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etbPpsErrorCounter0 liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etbErrorCode0 + graphLine = tcEtbDrop0 graphLine = jamTimer0 diff --git a/firmware/tunerstudio/generated/rusefi_t-b-g.ini b/firmware/tunerstudio/generated/rusefi_t-b-g.ini index f53614c048..80475f4ed4 100644 --- a/firmware/tunerstudio/generated/rusefi_t-b-g.ini +++ b/firmware/tunerstudio/generated/rusefi_t-b-g.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.31.t-b-g.2964181907" + signature = "rusEFI master.2023.12.31.t-b-g.1289969461" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.31.t-b-g.2964181907" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.31.t-b-g.1289969461" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:19:46 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:18:42 UTC 2023 pageSize = 22088 page = 1 @@ -1010,7 +1010,9 @@ triggerCompCenterVolt = scalar, U08, 2668, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMin = scalar, U08, 2669, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMax = scalar, U08, 2670, "V", 0.02, 0, 0, 5.1, 2 triggerCompSensorSatRpm = scalar, U08, 2671, "RPM", 50.0, 0, 0, 12000, 0 -unusedHere = array, S08, 2672, [20], "", 1, 0, 0, 100, 0 +tractionControlSlipBins = array, U16, 2672, [6], "ratio", 0.1, 0, 0, 999, 1 +tractionControlSpeedBins = array, U08, 2684, [6], "RPM", 1, 0, 0, 250, 0 +unusedHere = array, S08, 2690, [2], "", 1, 0, 0, 100, 0 canVssNbcType = bits, U08, 2692, [0:2], "BMW_e46", "W202", "BMW E8x/E9x MK60e5", "Nissan 350", "Hyundai PB", "Honda Civic9" gppwm1_pin = bits, U16, 2696, [0:8], $output_pin_e_list gppwm1_dutyIfError = scalar, U08, 2698, "%", 1, 0, 0, 100, 0 @@ -1303,7 +1305,8 @@ triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 -mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 +tractionControlEtbDrop = array, S08, 4348, [6x6], "%", 1, 0, -100, 0, 0 +mainUnusedEnd = array, U08, 4384, [172], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -3131,6 +3134,7 @@ etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1401, "", 1, 0 jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 ; total TS size = 1404 faultCode0 = scalar, U08, 1404, "", 1, 0 @@ -3838,6 +3842,11 @@ curve = rangeMatrix, "Range Switch Input Matrix" yBins = tpsTpsAccelToRpmBins, TPSValue zBins = tpsTpsAccelTable + table = tractionEtbTableTbl, tractionEtb, "Traction Control ETB drop", 1 + xBins = tractionControlSpeedBins, vehicleSpeedKph + yBins = tractionControlSlipBins, wheelSlipRatio + zBins = tractionControlEtbDrop + table = boostTableTbl, boostMapOpen, "Boost control duty cycle (open loop)", 1 xBins = boostRpmBins, RPMValue yBins = boostTpsBins, TPSValue @@ -5381,6 +5390,7 @@ entry = etbDutyAverage0, "ETB average duty0", float, "%.3f" entry = etbTpsErrorCounter0, "ETB TPS error counter0", int, "%d" entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" +entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" ;entry = trim1, "ETB: trim1", float, "%.3f" @@ -5397,6 +5407,7 @@ entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = etbTpsErrorCounter1, "ETB TPS error counter1", int, "%d" ;entry = etbPpsErrorCounter1, "ETB pedal error counter1", int, "%d" ;entry = etbErrorCode1, "etbErrorCode1", int, "%d" +;entry = tcEtbDrop1, "tcEtbDrop1", int, "%d" ;entry = jamTimer1, "ETB jam timer1", float, "%.3f" entry = faultCode0, "WBO: Fault code0", int, "%d" entry = heaterDuty0, "WBO: Heater duty0", int, "%d" @@ -5730,6 +5741,7 @@ menuDialog = main subMenu = hpfpCompensationTable, "HPFP Pump Compensation", {hpfpCamLobes != 0} subMenu = std_separator subMenu = fancyHardwareDialog, "Fancy Hardware" + subMenu = tractionEtbTableTbl subMenu = std_separator @@ -6347,6 +6359,7 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etbPpsErrorCounter0 liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etbErrorCode0 + graphLine = tcEtbDrop0 graphLine = jamTimer0 diff --git a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini index 2b777bf56d..b277ff31a6 100644 --- a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini +++ b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.31.tdg-pdm8.973340593" + signature = "rusEFI master.2023.12.31.tdg-pdm8.3326964503" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.31.tdg-pdm8.973340593" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.31.tdg-pdm8.3326964503" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","INVALID","INVALID","INVALID","Battery Sense","INVALID","INVALID","INVALID","Sense 7","Sense 8","Sense 1","Sense 2","Sense 3","Sense 4","Sense 5","Sense 6" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:20:20 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:19:15 UTC 2023 pageSize = 22088 page = 1 @@ -1010,7 +1010,9 @@ triggerCompCenterVolt = scalar, U08, 2668, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMin = scalar, U08, 2669, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMax = scalar, U08, 2670, "V", 0.02, 0, 0, 5.1, 2 triggerCompSensorSatRpm = scalar, U08, 2671, "RPM", 50.0, 0, 0, 12000, 0 -unusedHere = array, S08, 2672, [20], "", 1, 0, 0, 100, 0 +tractionControlSlipBins = array, U16, 2672, [6], "ratio", 0.1, 0, 0, 999, 1 +tractionControlSpeedBins = array, U08, 2684, [6], "RPM", 1, 0, 0, 250, 0 +unusedHere = array, S08, 2690, [2], "", 1, 0, 0, 100, 0 canVssNbcType = bits, U08, 2692, [0:2], "BMW_e46", "W202", "BMW E8x/E9x MK60e5", "Nissan 350", "Hyundai PB", "Honda Civic9" gppwm1_pin = bits, U16, 2696, [0:8], $output_pin_e_list gppwm1_dutyIfError = scalar, U08, 2698, "%", 1, 0, 0, 100, 0 @@ -1303,7 +1305,8 @@ triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 -mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 +tractionControlEtbDrop = array, S08, 4348, [6x6], "%", 1, 0, -100, 0, 0 +mainUnusedEnd = array, U08, 4384, [172], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -3131,6 +3134,7 @@ etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1401, "", 1, 0 jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 ; total TS size = 1404 faultCode0 = scalar, U08, 1404, "", 1, 0 @@ -3838,6 +3842,11 @@ curve = rangeMatrix, "Range Switch Input Matrix" yBins = tpsTpsAccelToRpmBins, TPSValue zBins = tpsTpsAccelTable + table = tractionEtbTableTbl, tractionEtb, "Traction Control ETB drop", 1 + xBins = tractionControlSpeedBins, vehicleSpeedKph + yBins = tractionControlSlipBins, wheelSlipRatio + zBins = tractionControlEtbDrop + table = boostTableTbl, boostMapOpen, "Boost control duty cycle (open loop)", 1 xBins = boostRpmBins, RPMValue yBins = boostTpsBins, TPSValue @@ -5381,6 +5390,7 @@ entry = etbDutyAverage0, "ETB average duty0", float, "%.3f" entry = etbTpsErrorCounter0, "ETB TPS error counter0", int, "%d" entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" +entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" ;entry = trim1, "ETB: trim1", float, "%.3f" @@ -5397,6 +5407,7 @@ entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = etbTpsErrorCounter1, "ETB TPS error counter1", int, "%d" ;entry = etbPpsErrorCounter1, "ETB pedal error counter1", int, "%d" ;entry = etbErrorCode1, "etbErrorCode1", int, "%d" +;entry = tcEtbDrop1, "tcEtbDrop1", int, "%d" ;entry = jamTimer1, "ETB jam timer1", float, "%.3f" entry = faultCode0, "WBO: Fault code0", int, "%d" entry = heaterDuty0, "WBO: Heater duty0", int, "%d" @@ -5730,6 +5741,7 @@ menuDialog = main subMenu = hpfpCompensationTable, "HPFP Pump Compensation", {hpfpCamLobes != 0} subMenu = std_separator subMenu = fancyHardwareDialog, "Fancy Hardware" + subMenu = tractionEtbTableTbl subMenu = std_separator @@ -6347,6 +6359,7 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etbPpsErrorCounter0 liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etbErrorCode0 + graphLine = tcEtbDrop0 graphLine = jamTimer0 diff --git a/firmware/tunerstudio/generated/rusefi_uaefi.ini b/firmware/tunerstudio/generated/rusefi_uaefi.ini index 1e3b1811db..2f1e182bd6 100644 --- a/firmware/tunerstudio/generated/rusefi_uaefi.ini +++ b/firmware/tunerstudio/generated/rusefi_uaefi.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.31.uaefi.3641308901" + signature = "rusEFI master.2023.12.31.uaefi.625441347" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.31.uaefi.3641308901" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.31.uaefi.625441347" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","D1 AUX1","C3 AUX2","INVALID","D6 PPS1","D13 TPS1","A7 Voltage From Key","INVALID","C15 AUX3","C14 TPS2","INVALID","D9 MAP","INVALID","D16 CLT Coolant","D15 IAT","C4 PPS2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:19:12 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:18:09 UTC 2023 pageSize = 22088 page = 1 @@ -1010,7 +1010,9 @@ triggerCompCenterVolt = scalar, U08, 2668, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMin = scalar, U08, 2669, "V", 0.02, 0, 0, 5.1, 2 triggerCompHystMax = scalar, U08, 2670, "V", 0.02, 0, 0, 5.1, 2 triggerCompSensorSatRpm = scalar, U08, 2671, "RPM", 50.0, 0, 0, 12000, 0 -unusedHere = array, S08, 2672, [20], "", 1, 0, 0, 100, 0 +tractionControlSlipBins = array, U16, 2672, [6], "ratio", 0.1, 0, 0, 999, 1 +tractionControlSpeedBins = array, U08, 2684, [6], "RPM", 1, 0, 0, 250, 0 +unusedHere = array, S08, 2690, [2], "", 1, 0, 0, 100, 0 canVssNbcType = bits, U08, 2692, [0:2], "BMW_e46", "W202", "BMW E8x/E9x MK60e5", "Nissan 350", "Hyundai PB", "Honda Civic9" gppwm1_pin = bits, U16, 2696, [0:8], $output_pin_e_list gppwm1_dutyIfError = scalar, U08, 2698, "%", 1, 0, 0, 100, 0 @@ -1303,7 +1305,8 @@ triggerVVTGapOverrideTo1 = scalar, F32, 4332, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo2 = scalar, F32, 4336, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo3 = scalar, F32, 4340, "ratio", 1, 0, 0, 20, 3 triggerVVTGapOverrideTo4 = scalar, F32, 4344, "ratio", 1, 0, 0, 20, 3 -mainUnusedEnd = array, U08, 4348, [208], "units", 1, 0, 0, 1, 0 +tractionControlEtbDrop = array, S08, 4348, [6x6], "%", 1, 0, -100, 0, 0 +mainUnusedEnd = array, U08, 4384, [172], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4556, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4588, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4620, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -3131,6 +3134,7 @@ etbDutyAverage0 = scalar, F32, 1392, "per", 1,0 etbTpsErrorCounter0 = scalar, U16, 1396, "count", 1,0 etbPpsErrorCounter0 = scalar, U16, 1398, "count", 1,0 etbErrorCode0 = scalar, S08, 1400, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1401, "", 1, 0 jamTimer0 = scalar, U16, 1402, "sec", 0.01, 0 ; total TS size = 1404 faultCode0 = scalar, U08, 1404, "", 1, 0 @@ -3838,6 +3842,11 @@ curve = rangeMatrix, "Range Switch Input Matrix" yBins = tpsTpsAccelToRpmBins, TPSValue zBins = tpsTpsAccelTable + table = tractionEtbTableTbl, tractionEtb, "Traction Control ETB drop", 1 + xBins = tractionControlSpeedBins, vehicleSpeedKph + yBins = tractionControlSlipBins, wheelSlipRatio + zBins = tractionControlEtbDrop + table = boostTableTbl, boostMapOpen, "Boost control duty cycle (open loop)", 1 xBins = boostRpmBins, RPMValue yBins = boostTpsBins, TPSValue @@ -5381,6 +5390,7 @@ entry = etbDutyAverage0, "ETB average duty0", float, "%.3f" entry = etbTpsErrorCounter0, "ETB TPS error counter0", int, "%d" entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" +entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" ;entry = trim1, "ETB: trim1", float, "%.3f" @@ -5397,6 +5407,7 @@ entry = jamTimer0, "ETB jam timer0", float, "%.3f" ;entry = etbTpsErrorCounter1, "ETB TPS error counter1", int, "%d" ;entry = etbPpsErrorCounter1, "ETB pedal error counter1", int, "%d" ;entry = etbErrorCode1, "etbErrorCode1", int, "%d" +;entry = tcEtbDrop1, "tcEtbDrop1", int, "%d" ;entry = jamTimer1, "ETB jam timer1", float, "%.3f" entry = faultCode0, "WBO: Fault code0", int, "%d" entry = heaterDuty0, "WBO: Heater duty0", int, "%d" @@ -5729,6 +5740,7 @@ menuDialog = main subMenu = hpfpCompensationTable, "HPFP Pump Compensation", {hpfpCamLobes != 0} subMenu = std_separator subMenu = fancyHardwareDialog, "Fancy Hardware" + subMenu = tractionEtbTableTbl subMenu = std_separator @@ -6346,6 +6358,7 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etbPpsErrorCounter0 liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etbErrorCode0 + graphLine = tcEtbDrop0 graphLine = jamTimer0 diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/ElectronicThrottle.java b/java_console/models/src/main/java/com/rusefi/config/generated/ElectronicThrottle.java index d4ee48a7ed..9f0d3da79d 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/ElectronicThrottle.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/ElectronicThrottle.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/actuators/electronic_throttle.txt Tue Dec 26 22:46:57 UTC 2023 +// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/actuators/electronic_throttle.txt Sun Dec 31 20:17:24 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -185,7 +185,7 @@ public class ElectronicThrottle { public static final Field ETBTPSERRORCOUNTER = Field.create("ETBTPSERRORCOUNTER", 44, FieldType.INT16).setScale(1.0).setBaseOffset(1352); public static final Field ETBPPSERRORCOUNTER = Field.create("ETBPPSERRORCOUNTER", 46, FieldType.INT16).setScale(1.0).setBaseOffset(1352); public static final Field ETBERRORCODE = Field.create("ETBERRORCODE", 48, FieldType.INT8).setScale(1.0).setBaseOffset(1352); - public static final Field ALIGNMENTFILL_AT_49 = Field.create("ALIGNMENTFILL_AT_49", 49, FieldType.INT8).setScale(1.0).setBaseOffset(1352); + public static final Field TCETBDROP = Field.create("TCETBDROP", 49, FieldType.INT8).setScale(1.0).setBaseOffset(1352); public static final Field JAMTIMER = Field.create("JAMTIMER", 50, FieldType.INT16).setScale(0.01).setBaseOffset(1352); public static final Field[] VALUES = { IDLEPOSITION, @@ -203,7 +203,7 @@ public class ElectronicThrottle { ETBTPSERRORCOUNTER, ETBPPSERRORCOUNTER, ETBERRORCODE, - ALIGNMENTFILL_AT_49, + TCETBDROP, JAMTIMER, }; } 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 b6eaa84cdc..2a28dd15e8 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 config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 15:20:29 UTC 2023 +// this file was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Dec 31 20:19:24 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -417,6 +417,7 @@ public class Fields { public static final int engine_type_e_TOYOTA_2JZ_GTE_VVTi = 44; public static final int engine_type_e_VW_ABA = 32; public static final int engine_type_e_WASTEGATE_PROTEUS_TEST = 96; + public static final int ETB2_TRIM_SIZE = 6; 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; @@ -1083,6 +1084,7 @@ public class Fields { public static final int SentEtbType_FORD_TYPE_1 = 2; public static final int SentEtbType_GM_TYPE_1 = 1; public static final int SentEtbType_NONE = 0; + public static final int SIGNATURE_HASH = 1870000711; public static final String SIMULATOR_TUNE_BIN_FILE_NAME = "generated/simulator_tune_image.bin"; public static final String SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX = "generated/simulator_tune_image"; public static final String SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX = ".bin"; @@ -1127,6 +1129,7 @@ public class Fields { public static final int TPS_2_BYTE_PACKING_MULT = 100; public static final int TPS_TPS_ACCEL_CLT_CORR_TABLE = 4; public static final int TPS_TPS_ACCEL_TABLE = 8; + public static final int TRACTION_CONTROL_ETB_DROP_SIZE = 6; public static final int TransmissionControllerMode_Gm4l6x = 2; public static final int TransmissionControllerMode_None = 0; public static final int TransmissionControllerMode_SimpleTransmissionController = 1; @@ -1311,7 +1314,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 master.2023.12.31.f407-discovery.2470149857"; + public static final String TS_SIGNATURE = "rusEFI master.2023.12.31.f407-discovery.1870000711"; public static final char TS_SIMULATE_CAN = '>'; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final char TS_TEST_COMMAND = 't'; @@ -2368,7 +2371,9 @@ public class Fields { public static final Field TRIGGERCOMPHYSTMIN = Field.create("TRIGGERCOMPHYSTMIN", 2669, FieldType.INT8).setScale(0.02).setBaseOffset(0); public static final Field TRIGGERCOMPHYSTMAX = Field.create("TRIGGERCOMPHYSTMAX", 2670, FieldType.INT8).setScale(0.02).setBaseOffset(0); public static final Field TRIGGERCOMPSENSORSATRPM = Field.create("TRIGGERCOMPSENSORSATRPM", 2671, FieldType.INT8).setScale(50.0).setBaseOffset(0); - public static final Field UNUSEDHERE = Field.create("UNUSEDHERE", 2672, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field TRACTIONCONTROLSLIPBINS = Field.create("TRACTIONCONTROLSLIPBINS", 2672, FieldType.INT16).setScale(0.1).setBaseOffset(0); + public static final Field TRACTIONCONTROLSPEEDBINS = Field.create("TRACTIONCONTROLSPEEDBINS", 2684, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDHERE = Field.create("UNUSEDHERE", 2690, FieldType.INT8).setScale(1.0).setBaseOffset(0); public static final Field CANVSSNBCTYPE = Field.create("CANVSSNBCTYPE", 2692, FieldType.INT16).setScale(1.0).setBaseOffset(0); public static final Field ALIGNMENTFILL_AT_2694 = Field.create("ALIGNMENTFILL_AT_2694", 2694, FieldType.INT8).setScale(1.0).setBaseOffset(0); public static final Field GPPWM1_PIN = Field.create("GPPWM1_PIN", 2696, FieldType.INT16, output_pin_e).setScale(1.0).setBaseOffset(0); @@ -2693,7 +2698,8 @@ public class Fields { public static final Field TRIGGERVVTGAPOVERRIDETO2 = Field.create("TRIGGERVVTGAPOVERRIDETO2", 4336, FieldType.FLOAT).setBaseOffset(0); public static final Field TRIGGERVVTGAPOVERRIDETO3 = Field.create("TRIGGERVVTGAPOVERRIDETO3", 4340, FieldType.FLOAT).setBaseOffset(0); public static final Field TRIGGERVVTGAPOVERRIDETO4 = Field.create("TRIGGERVVTGAPOVERRIDETO4", 4344, FieldType.FLOAT).setBaseOffset(0); - public static final Field MAINUNUSEDEND = Field.create("MAINUNUSEDEND", 4348, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field TRACTIONCONTROLETBDROP = Field.create("TRACTIONCONTROLETBDROP", 4348, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field MAINUNUSEDEND = Field.create("MAINUNUSEDEND", 4384, FieldType.INT8).setScale(1.0).setBaseOffset(0); public static final Field ETBBIASBINS = Field.create("ETBBIASBINS", 4556, FieldType.FLOAT).setBaseOffset(0); public static final Field ETBBIASVALUES = Field.create("ETBBIASVALUES", 4588, FieldType.FLOAT).setBaseOffset(0); public static final Field IACPIDMULTTABLE = Field.create("IACPIDMULTTABLE", 4620, FieldType.INT8).setScale(0.05).setBaseOffset(0); @@ -3943,6 +3949,8 @@ public class Fields { TRIGGERCOMPHYSTMIN, TRIGGERCOMPHYSTMAX, TRIGGERCOMPSENSORSATRPM, + TRACTIONCONTROLSLIPBINS, + TRACTIONCONTROLSPEEDBINS, UNUSEDHERE, CANVSSNBCTYPE, ALIGNMENTFILL_AT_2694, @@ -4262,6 +4270,7 @@ public class Fields { TRIGGERVVTGAPOVERRIDETO2, TRIGGERVVTGAPOVERRIDETO3, TRIGGERVVTGAPOVERRIDETO4, + TRACTIONCONTROLETBDROP, MAINUNUSEDEND, ETBBIASBINS, ETBBIASVALUES,