diff --git a/generated/controllers/generated/engine_configuration_generated_structures_XXX.h b/generated/controllers/generated/engine_configuration_generated_structures_XXX.h index d64e492..b111478 100644 --- a/generated/controllers/generated/engine_configuration_generated_structures_XXX.h +++ b/generated/controllers/generated/engine_configuration_generated_structures_XXX.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Dec 20 00:46:01 EST 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Jan 02 17:17:03 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3076,11 +3076,9 @@ struct engine_configuration_s { */ uint8_t camDecoder2jzPosition; /** - * need 4 byte alignment - units * offset 1577 */ - uint8_t alignmentFill_at_1577[1]; + uint8_t mc33810maxDwellTimer; /** * Duration of each test pulse ms @@ -3764,9 +3762,19 @@ struct engine_configuration_s { */ scaled_channel triggerCompSensorSatRpm; /** + ratio * offset 2672 */ - pid_s idleRpmPid2; + 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 */ @@ -4470,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); @@ -5208,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 @@ -5385,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 Wed Dec 20 00:46:01 EST 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Jan 02 17:17:03 UTC 2024 diff --git a/generated/controllers/generated/rusefi_generated_XXX.h b/generated/controllers/generated/rusefi_generated_XXX.h index 6d0ae4d..6e3c0bb 100644 --- a/generated/controllers/generated/rusefi_generated_XXX.h +++ b/generated/controllers/generated/rusefi_generated_XXX.h @@ -331,7 +331,7 @@ #define ENGINE_NOISE_CURVE_SIZE 16 #define ENGINE_SNIFFER_UNIT_US 10 #define engine_type_e_ALPHAX_8CHAN_SBC 97 -#define engine_type_e_auto_enum 0="DEFAULT_FRANKENSO",97="ALPHAX_8CHAN_SBC",24="BMW_M73_M",50="BMW_M73_MRE",51="BMW_M73_MRE_SLAVE",35="CAMARO_4",65="CITROEN_TU3JP",38="DISCOVERY_PDM",2="DODGE_NEON_1995",46="DODGE_NEON_2003_CRANK",64="DODGE_RAM",61="EEPROM_BENCH_ENGINE",58="ETB_BENCH_ENGINE",3="FORD_ASPIRE_1996",11="FORD_COYOTE",14="FORD_ESCORT_GT",7="FORD_INLINE_6_1995",40="FRANKENSO_BMW_M73_F",47="FRANKENSO_MAZDA_MIATA_2003",56="FRANKENSO_MAZDA_MIATA_NA8",41="FRANKENSO_MIATA_NA6_MAP",49="FRANKENSO_QA_ENGINE",59="FRANKENSO_TEST_33810",15="FUEL_BENCH",8="GY6_139QMB",84="HELLEN_121_NISSAN_4_CYL",72="HELLEN_121_NISSAN_6_CYL",85="HELLEN_121_NISSAN_8_CYL",87="HELLEN_121_NISSAN_ALMERA_N16",71="HELLEN_121_VAG_4_CYL",77="HELLEN_121_VAG_5_CYL",81="HELLEN_121_VAG_8_CYL",78="HELLEN_121_VAG_V6_CYL",79="HELLEN_121_VAG_VR6_CYL",36="HELLEN_128_MERCEDES_4_CYL",88="HELLEN_128_MERCEDES_6_CYL",89="HELLEN_128_MERCEDES_8_CYL",82="HELLEN_154_HYUNDAI_COUPE_BK1",95="HELLEN_154_HYUNDAI_COUPE_BK2",76="HELLEN_154_VAG",75="HELLEN_2CHAN_STIM_QC",74="HELLEN_4CHAN_STIM_QC",57="HELLEN_HONDA_BCM",34="HELLEN_NA6",10="HELLEN_NA8_96",80="HELLEN_NA94",83="HELLEN_NB1",94="HELLEN_NB1_36",69="HELLEN_NB2",86="HELLEN_NB2_36",43="HONDA_600",90="HONDA_K",104="HYUNDAI_PB",60="L9779_BENCH_ENGINE",54="MAVERICK_X3",55="MAZDA_MIATA_2003_BOARD_TEST",33="ME17_9_MISC",21="MIATA_1996",1="MIATA_PROTEUS_TCU",99="MINIMAL_PINS",12="MITSUBISHI_3A92",16="MITSUBISHI_4G93",31="MRE_BOARD_NEW_TEST",23="MRE_BODY_CONTROL",68="MRE_M111",20="MRE_MIATA_94_MAP",66="MRE_MIATA_NA6_MAP",4="MRE_SECONDARY_CAN",37="MRE_SUBARU_EJ18",62="MRE_VW_B6",5="NISSAN_PRIMERA",30="PROTEUS_ANALOG_PWM_TEST",63="PROTEUS_BMW_M73",9="PROTEUS_E65_6H_MAN_IN_THE_MIDDLE",27="PROTEUS_GM_LS_4",6="PROTEUS_HARLEY",91="PROTEUS_HONDA_OBD2A",25="PROTEUS_LUA_DEMO",17="PROTEUS_M111",67="PROTEUS_MIATA_NB2",93="PROTEUS_N73",103="PROTEUS_NISSAN_VQ35",42="PROTEUS_QC_TEST_BOARD",98="PROTEUS_SBC",73="PROTEUS_STIM_QC",39="PROTEUS_VW_B6",29="SACHS",92="SIMULATOR_CONFIG",70="SUBARUEG33_DEFAULTS",22="SUBARU_2003_WRX",100="TEST_100",101="TEST_101",102="TEST_102",18="TEST_33816",28="TEST_CRANK_ENGINE",48="TEST_DC_WASTEGATE_DISCOVERY",26="TEST_ENGINE",45="TEST_ENGINE_VVT",52="TEST_ISSUE_366_BOTH",53="TEST_ISSUE_366_RISE",19="TEST_ROTARY",13="TOYOTA_1NZ_FE",44="TOYOTA_2JZ_GTE_VVTi",32="VW_ABA",96="WASTEGATE_PROTEUS_TEST" +#define engine_type_e_auto_enum 0="DEFAULT_FRANKENSO",97="ALPHAX_8CHAN_SBC",24="BMW_M73_M",50="BMW_M73_MRE",51="BMW_M73_MRE_SLAVE",35="CAMARO_4",65="CITROEN_TU3JP",38="DISCOVERY_PDM",2="DODGE_NEON_1995",46="DODGE_NEON_2003_CRANK",64="DODGE_RAM",61="EEPROM_BENCH_ENGINE",58="ETB_BENCH_ENGINE",3="FORD_ASPIRE_1996",11="FORD_COYOTE",14="FORD_ESCORT_GT",7="FORD_INLINE_6_1995",40="FRANKENSO_BMW_M73_F",47="FRANKENSO_MAZDA_MIATA_2003",56="FRANKENSO_MAZDA_MIATA_NA8",41="FRANKENSO_MIATA_NA6_MAP",49="FRANKENSO_QA_ENGINE",59="FRANKENSO_TEST_33810",15="FUEL_BENCH",8="GY6_139QMB",6="HARLEY",84="HELLEN_121_NISSAN_4_CYL",72="HELLEN_121_NISSAN_6_CYL",85="HELLEN_121_NISSAN_8_CYL",87="HELLEN_121_NISSAN_ALMERA_N16",71="HELLEN_121_VAG_4_CYL",77="HELLEN_121_VAG_5_CYL",81="HELLEN_121_VAG_8_CYL",78="HELLEN_121_VAG_V6_CYL",79="HELLEN_121_VAG_VR6_CYL",36="HELLEN_128_MERCEDES_4_CYL",88="HELLEN_128_MERCEDES_6_CYL",89="HELLEN_128_MERCEDES_8_CYL",82="HELLEN_154_HYUNDAI_COUPE_BK1",95="HELLEN_154_HYUNDAI_COUPE_BK2",76="HELLEN_154_VAG",75="HELLEN_2CHAN_STIM_QC",74="HELLEN_4CHAN_STIM_QC",57="HELLEN_HONDA_BCM",34="HELLEN_NA6",10="HELLEN_NA8_96",80="HELLEN_NA94",83="HELLEN_NB1",94="HELLEN_NB1_36",69="HELLEN_NB2",86="HELLEN_NB2_36",43="HONDA_600",90="HONDA_K",104="HYUNDAI_PB",60="L9779_BENCH_ENGINE",54="MAVERICK_X3",55="MAZDA_MIATA_2003_BOARD_TEST",33="ME17_9_MISC",21="MIATA_1996",1="MIATA_PROTEUS_TCU",99="MINIMAL_PINS",12="MITSUBISHI_3A92",16="MITSUBISHI_4G93",31="MRE_BOARD_NEW_TEST",23="MRE_BODY_CONTROL",68="MRE_M111",20="MRE_MIATA_94_MAP",66="MRE_MIATA_NA6_MAP",4="MRE_SECONDARY_CAN",37="MRE_SUBARU_EJ18",62="MRE_VW_B6",5="NISSAN_PRIMERA",30="PROTEUS_ANALOG_PWM_TEST",63="PROTEUS_BMW_M73",9="PROTEUS_E65_6H_MAN_IN_THE_MIDDLE",27="PROTEUS_GM_LS_4",91="PROTEUS_HONDA_OBD2A",25="PROTEUS_LUA_DEMO",17="PROTEUS_M111",67="PROTEUS_MIATA_NB2",93="PROTEUS_N73",103="PROTEUS_NISSAN_VQ35",42="PROTEUS_QC_TEST_BOARD",98="PROTEUS_SBC",73="PROTEUS_STIM_QC",39="PROTEUS_VW_B6",29="SACHS",92="SIMULATOR_CONFIG",70="SUBARUEG33_DEFAULTS",22="SUBARU_2003_WRX",100="TEST_100",101="TEST_101",102="TEST_102",18="TEST_33816",28="TEST_CRANK_ENGINE",48="TEST_DC_WASTEGATE_DISCOVERY",26="TEST_ENGINE",45="TEST_ENGINE_VVT",52="TEST_ISSUE_366_BOTH",53="TEST_ISSUE_366_RISE",19="TEST_ROTARY",13="TOYOTA_1NZ_FE",44="TOYOTA_2JZ_GTE_VVTi",32="VW_ABA",96="WASTEGATE_PROTEUS_TEST" #define engine_type_e_BMW_M73_M 24 #define engine_type_e_BMW_M73_MRE 50 #define engine_type_e_BMW_M73_MRE_SLAVE 51 @@ -356,6 +356,7 @@ #define engine_type_e_FRANKENSO_TEST_33810 59 #define engine_type_e_FUEL_BENCH 15 #define engine_type_e_GY6_139QMB 8 +#define engine_type_e_HARLEY 6 #define engine_type_e_HELLEN_121_NISSAN_4_CYL 84 #define engine_type_e_HELLEN_121_NISSAN_6_CYL 72 #define engine_type_e_HELLEN_121_NISSAN_8_CYL 85 @@ -406,7 +407,6 @@ #define engine_type_e_PROTEUS_BMW_M73 63 #define engine_type_e_PROTEUS_E65_6H_MAN_IN_THE_MIDDLE 9 #define engine_type_e_PROTEUS_GM_LS_4 27 -#define engine_type_e_PROTEUS_HARLEY 6 #define engine_type_e_PROTEUS_HONDA_OBD2A 91 #define engine_type_e_PROTEUS_LUA_DEMO 25 #define engine_type_e_PROTEUS_M111 17 @@ -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 @@ -526,7 +527,7 @@ #define GAUGE_NAME_FUEL_RUNNING "Fuel: running" #define GAUGE_NAME_FUEL_TEMPERATURE "Fuel Temperature" #define GAUGE_NAME_FUEL_TPS_EXTRA "Fuel: TPS AE add fuel ms" -#define GAUGE_NAME_FUEL_TPS_ROC "fuel: TPS change" +#define GAUGE_NAME_FUEL_TPS_ROC "Fuel: TPS change" #define GAUGE_NAME_FUEL_TRIM "Fuel: fuel trim" #define GAUGE_NAME_FUEL_TRIM_2 "Fuel: fuel trim 2" #define GAUGE_NAME_FUEL_VE "Fuel: VE" @@ -1141,9 +1142,11 @@ #define SentEtbType_FORD_TYPE_1 2 #define SentEtbType_GM_TYPE_1 1 #define SentEtbType_NONE 0 -#define show_Frankenso_presets true -#define show_test_presets true -#define SIGNATURE_HASH 2653519680 +#define show_Frankenso_presets false +#define show_microRusEFI_presets false +#define show_Proteus_presets false +#define show_test_presets false +#define SIGNATURE_HASH 160115348 #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" @@ -1197,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 @@ -1216,8 +1220,8 @@ #define TRIGGER_KNOWN_OPERATION_MODE "knownOperationMode" #define TRIGGER_SIMULATOR_PIN_COUNT 2 #define TRIGGER_SYNC_EDGE "syncEdge" -#define trigger_type_e_auto_enum 0="TT_TOOTHED_WHEEL",38="TT_12_TOOTH_CRANK",50="TT_1_16",25="TT_2JZ_3_34_SIMULATION_ONLY",70="TT_36_2_1",71="TT_36_2_1_1",23="TT_36_2_2_2",31="TT_3_1_CAM",77="TT_60DEG_TOOTH",75="TT_60_2_2_F3R",20="TT_60_2_VW",21="TT_BENELLI_TRE",30="TT_CHRYSLER_NGC_36_2_2",6="TT_DAIHATSU",2="TT_DODGE_NEON_1995",39="TT_DODGE_NEON_1995_ONLY_CRANK",14="TT_DODGE_NEON_2003_CAM",32="TT_DODGE_NEON_2003_CRANK",19="TT_DODGE_RAM",22="TT_DODGE_STRATUS",41="TT_FIAT_IAW_P8",1="TT_FORD_ASPIRE",42="TT_FORD_ST170",65="TT_FORD_TFI_PIP",27="TT_GM_24x",74="TT_GM_24x_2",54="TT_GM_60_2_2_2",5="TT_GM_7X",18="TT_HALF_MOON",28="TT_HONDA_CBR_600",67="TT_HONDA_K_CAM_4_1",46="TT_HONDA_K_CRANK_12_1",37="TT_JEEP_18_2_2_2",40="TT_JEEP_4_CYL",57="TT_KAWA_KX450F",15="TT_MAZDA_DOHC_1_4",3="TT_MAZDA_MIATA_NA",35="TT_MAZDA_MIATA_VVT_TEST",7="TT_MAZDA_SOHC_4",10="TT_MERCEDES_2_SEGMENT",33="TT_MIATA_VVT",34="TT_MITSU_4G63_CAM",76="TT_MITSU_4G63_CRANK",29="TT_MITSU_4G9x_CAM",11="TT_NARROW_SINGLE_TOOTH",52="TT_NISSAN_MR18_CAM_VVT",68="TT_NISSAN_MR18_CRANK",61="TT_NISSAN_QR25",24="TT_NISSAN_SR20VE",60="TT_NISSAN_VQ30",58="TT_NISSAN_VQ35",16="TT_ONE_PLUS_ONE",44="TT_RENIX_44_2_2",45="TT_RENIX_66_2_2_2",26="TT_ROVER_K",55="TT_SKODA_FAVORIT",36="TT_SUBARU_7_6",51="TT_SUBARU_7_WITHOUT_6",12="TT_SUBARU_EZ30",49="TT_SUBARU_SVX",64="TT_SUBARU_SVX_CAM_VVT",63="TT_SUBARU_SVX_CRANK_1",66="TT_SUZUKI_G13B",69="TT_TOOTHED_WHEEL_32_2",9="TT_TOOTHED_WHEEL_36_1",48="TT_TOOTHED_WHEEL_36_2",8="TT_TOOTHED_WHEEL_60_2",53="TT_TRI_TACH",80="TT_UNUSED",56="TT_VVT_BARRA_3_PLUS_1",47="TT_VVT_BOSCH_QUICK_START",4="TT_VVT_FORD_COYOTE",13="TT_VVT_MAZDA_SKYACTIV",43="TT_VVT_MIATA_NB",62="TT_VVT_MITSUBISHI_3A92",78="TT_VVT_MITSUBISHI_4G69",79="TT_VVT_MITSU_6G72",59="TT_VVT_NISSAN_VQ35",17="TT_VVT_TOYOTA_3_TOOTH",73="TT_VVT_TOYOTA_4_1",72="UNUSED72" -#define trigger_type_e_enum "custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "INVALID", "GM_7X", "Cooper R50", "Mazda SOHC 4", "60/2", "36/1", "Mercedes Two Segment", "Single Tooth", "EZ30", "INVALID", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "INVALID", "Half Moon", "Dodge Ram 1+16", "60/2 VW", "Benelli Tre", "Dodge Stratus", "36_2_2_2", "Nissan Primera", "dev 2JZ 3/34 simulator", "Rover K", "GM 24x 5 degree", "Honda CBR 600", "Mitsubishi 4G92/93/94 Cam 29", "Honda CBR 600 custom", "3/1 skipped", "Dodge Neon 2003 crank", "Miata NB", "Mitsubishi 4G63 Cam 34", "INVALID", "Subaru 7+6", "Jeep 18-2-2-2", "12 tooth crank", "Dodge Neon 1995 crank only", "Jeep XJ 4 cyl", "FiatIAQ_P8", "Mazda Z5", "INVALID", "Renix 44-2-2", "Renix 66-2-2-2", "Honda K 12+1", "INVALID", "36/2", "Subaru SVX", "1+16", "Subaru 7 without 6", "INVALID", "TriTach", "GM 60/2/2/2", "Skoda Favorit", "Barra 3+1 Cam", "Kawa KX450F", "Nissan VQ35", "INVALID", "Nissan VQ30", "Nissan QR25", "INVALID", "Subaru SVX Crank 1", "Subaru SVX Cam VVT", "Ford PIP", "Suzuki G13B", "Honda K 4+1", "Nissan MR18 Crank", "32/2", "36-2-1", "36-2-1-1", "INVALID", "INVALID", "GM 24x 3 degree", "60-2-2 F3R", "Mitsu 4G63 Crank", "x2 30 Deg camshaft BTDC", "INVALID", "Mitsu 6G72 Cam", "trg80", "trg81" +#define trigger_type_e_auto_enum 0="TT_TOOTHED_WHEEL",38="TT_12_TOOTH_CRANK",50="TT_1_16",25="TT_2JZ_3_34_SIMULATION_ONLY",70="TT_36_2_1",71="TT_36_2_1_1",23="TT_36_2_2_2",31="TT_3_1_CAM",72="TT_3_TOOTH_CRANK",77="TT_60DEG_TOOTH",75="TT_60_2_2_F3R",20="TT_60_2_VW",21="TT_BENELLI_TRE",30="TT_CHRYSLER_NGC_36_2_2",6="TT_DAIHATSU",2="TT_DODGE_NEON_1995",39="TT_DODGE_NEON_1995_ONLY_CRANK",14="TT_DODGE_NEON_2003_CAM",32="TT_DODGE_NEON_2003_CRANK",19="TT_DODGE_RAM",22="TT_DODGE_STRATUS",41="TT_FIAT_IAW_P8",1="TT_FORD_ASPIRE",42="TT_FORD_ST170",65="TT_FORD_TFI_PIP",27="TT_GM_24x",74="TT_GM_24x_2",54="TT_GM_60_2_2_2",5="TT_GM_7X",18="TT_HALF_MOON",28="TT_HONDA_CBR_600",67="TT_HONDA_K_CAM_4_1",46="TT_HONDA_K_CRANK_12_1",37="TT_JEEP_18_2_2_2",40="TT_JEEP_4_CYL",57="TT_KAWA_KX450F",15="TT_MAZDA_DOHC_1_4",3="TT_MAZDA_MIATA_NA",35="TT_MAZDA_MIATA_VVT_TEST",7="TT_MAZDA_SOHC_4",10="TT_MERCEDES_2_SEGMENT",33="TT_MIATA_VVT",34="TT_MITSU_4G63_CAM",76="TT_MITSU_4G63_CRANK",29="TT_MITSU_4G9x_CAM",11="TT_NARROW_SINGLE_TOOTH",52="TT_NISSAN_MR18_CAM_VVT",68="TT_NISSAN_MR18_CRANK",61="TT_NISSAN_QR25",24="TT_NISSAN_SR20VE",60="TT_NISSAN_VQ30",58="TT_NISSAN_VQ35",16="TT_ONE_PLUS_ONE",44="TT_RENIX_44_2_2",45="TT_RENIX_66_2_2_2",26="TT_ROVER_K",55="TT_SKODA_FAVORIT",36="TT_SUBARU_7_6",51="TT_SUBARU_7_WITHOUT_6",12="TT_SUBARU_EZ30",49="TT_SUBARU_SVX",64="TT_SUBARU_SVX_CAM_VVT",63="TT_SUBARU_SVX_CRANK_1",66="TT_SUZUKI_G13B",69="TT_TOOTHED_WHEEL_32_2",9="TT_TOOTHED_WHEEL_36_1",48="TT_TOOTHED_WHEEL_36_2",8="TT_TOOTHED_WHEEL_60_2",53="TT_TRI_TACH",80="TT_UNUSED",56="TT_VVT_BARRA_3_PLUS_1",47="TT_VVT_BOSCH_QUICK_START",4="TT_VVT_FORD_COYOTE",13="TT_VVT_MAZDA_SKYACTIV",43="TT_VVT_MIATA_NB",62="TT_VVT_MITSUBISHI_3A92",78="TT_VVT_MITSUBISHI_4G69",79="TT_VVT_MITSU_6G72",59="TT_VVT_NISSAN_VQ35",17="TT_VVT_TOYOTA_3_TOOTH",73="TT_VVT_TOYOTA_4_1" +#define trigger_type_e_enum "custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "INVALID", "GM_7X", "Cooper R50", "Mazda SOHC 4", "60/2", "36/1", "Mercedes Two Segment", "Single Tooth", "EZ30", "INVALID", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "INVALID", "Half Moon", "Dodge Ram 1+16", "60/2 VW", "Benelli Tre", "Dodge Stratus", "36_2_2_2", "Nissan Primera", "dev 2JZ 3/34 simulator", "Rover K", "GM 24x 5 degree", "Honda CBR 600", "Mitsubishi 4G92/93/94 Cam 29", "Honda CBR 600 custom", "3/1 skipped", "Dodge Neon 2003 crank", "Miata NB", "Mitsubishi 4G63 Cam 34", "INVALID", "Subaru 7+6", "Jeep 18-2-2-2", "12 tooth crank", "Dodge Neon 1995 crank only", "Jeep XJ 4 cyl", "FiatIAQ_P8", "Mazda Z5", "INVALID", "Renix 44-2-2", "Renix 66-2-2-2", "Honda K 12+1", "INVALID", "36/2", "Subaru SVX", "1+16", "Subaru 7 without 6", "INVALID", "TriTach", "GM 60/2/2/2", "Skoda Favorit", "Barra 3+1 Cam", "Kawa KX450F", "Nissan VQ35", "INVALID", "Nissan VQ30", "Nissan QR25", "INVALID", "Subaru SVX Crank 1", "Subaru SVX Cam VVT", "Ford PIP", "Suzuki G13B", "Honda K 4+1", "Nissan MR18 Crank", "32/2", "36-2-1", "36-2-1-1", "3/0", "INVALID", "GM 24x 3 degree", "60-2-2 F3R", "Mitsu 4G63 Crank", "x2 30 Deg camshaft BTDC", "INVALID", "Mitsu 6G72 Cam", "trg80", "trg81" #define trigger_type_e_TT_12_TOOTH_CRANK 38 #define trigger_type_e_TT_1_16 50 #define trigger_type_e_TT_2JZ_3_34_SIMULATION_ONLY 25 @@ -1225,6 +1229,7 @@ #define trigger_type_e_TT_36_2_1_1 71 #define trigger_type_e_TT_36_2_2_2 23 #define trigger_type_e_TT_3_1_CAM 31 +#define trigger_type_e_TT_3_TOOTH_CRANK 72 #define trigger_type_e_TT_60_2_2_F3R 75 #define trigger_type_e_TT_60_2_VW 20 #define trigger_type_e_TT_60DEG_TOOTH 77 @@ -1298,7 +1303,6 @@ #define trigger_type_e_TT_VVT_NISSAN_VQ35 59 #define trigger_type_e_TT_VVT_TOYOTA_3_TOOTH 17 #define trigger_type_e_TT_VVT_TOYOTA_4_1 73 -#define trigger_type_e_UNUSED72 72 #define TRIGGER_TYPE_WITH_SECOND_WHEEL trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64 #define TRIGGER_TYPE_WITHOUT_KNOWN_LOCATION trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73 #define TRIGGER_WITH_SYNC "isSynchronizationNeeded" @@ -1442,14 +1446,14 @@ #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 default.2024.01.01.XXX.2653519680" +#define TS_SIGNATURE "rusEFI default.2024.01.02.XXX.160115348" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1444 +#define TS_TOTAL_OUTPUT_SIZE 1448 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/generated/controllers/generated/signature_XXX.h b/generated/controllers/generated/signature_XXX.h index 3e32bf2..d461cb9 100644 --- a/generated/controllers/generated/signature_XXX.h +++ b/generated/controllers/generated/signature_XXX.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2653519680 -#define TS_SIGNATURE "rusEFI default.2024.01.01.XXX.2653519680" +#define SIGNATURE_HASH 160115348 +#define TS_SIGNATURE "rusEFI default.2024.01.02.XXX.160115348" diff --git a/generated/tunerstudio/generated/rusefi_XXX.ini b/generated/tunerstudio/generated/rusefi_XXX.ini index 9866049..bf54942 100644 --- a/generated/tunerstudio/generated/rusefi_XXX.ini +++ b/generated/tunerstudio/generated/rusefi_XXX.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI default.2024.01.01.XXX.2653519680" + signature = "rusEFI default.2024.01.02.XXX.160115348" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI default.2024.01.01.XXX.2653519680" ; signature is expected to be 7 or more characters. + signature= "rusEFI default.2024.01.02.XXX.160115348" ; 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,11 +92,11 @@ 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 Mon Jan 01 22:03:31 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Tue Jan 02 17:17:03 UTC 2024 pageSize = 22088 page = 1 -engineType = bits, U16, 0, [0:6], 0="DEFAULT_FRANKENSO",97="ALPHAX_8CHAN_SBC",24="BMW_M73_M",50="BMW_M73_MRE",51="BMW_M73_MRE_SLAVE",35="CAMARO_4",65="CITROEN_TU3JP",38="DISCOVERY_PDM",2="DODGE_NEON_1995",46="DODGE_NEON_2003_CRANK",64="DODGE_RAM",61="EEPROM_BENCH_ENGINE",58="ETB_BENCH_ENGINE",3="FORD_ASPIRE_1996",11="FORD_COYOTE",14="FORD_ESCORT_GT",7="FORD_INLINE_6_1995",40="FRANKENSO_BMW_M73_F",47="FRANKENSO_MAZDA_MIATA_2003",56="FRANKENSO_MAZDA_MIATA_NA8",41="FRANKENSO_MIATA_NA6_MAP",49="FRANKENSO_QA_ENGINE",59="FRANKENSO_TEST_33810",15="FUEL_BENCH",8="GY6_139QMB",84="HELLEN_121_NISSAN_4_CYL",72="HELLEN_121_NISSAN_6_CYL",85="HELLEN_121_NISSAN_8_CYL",87="HELLEN_121_NISSAN_ALMERA_N16",71="HELLEN_121_VAG_4_CYL",77="HELLEN_121_VAG_5_CYL",81="HELLEN_121_VAG_8_CYL",78="HELLEN_121_VAG_V6_CYL",79="HELLEN_121_VAG_VR6_CYL",36="HELLEN_128_MERCEDES_4_CYL",88="HELLEN_128_MERCEDES_6_CYL",89="HELLEN_128_MERCEDES_8_CYL",82="HELLEN_154_HYUNDAI_COUPE_BK1",95="HELLEN_154_HYUNDAI_COUPE_BK2",76="HELLEN_154_VAG",75="HELLEN_2CHAN_STIM_QC",74="HELLEN_4CHAN_STIM_QC",57="HELLEN_HONDA_BCM",34="HELLEN_NA6",10="HELLEN_NA8_96",80="HELLEN_NA94",83="HELLEN_NB1",94="HELLEN_NB1_36",69="HELLEN_NB2",86="HELLEN_NB2_36",43="HONDA_600",90="HONDA_K",104="HYUNDAI_PB",60="L9779_BENCH_ENGINE",54="MAVERICK_X3",55="MAZDA_MIATA_2003_BOARD_TEST",33="ME17_9_MISC",21="MIATA_1996",1="MIATA_PROTEUS_TCU",99="MINIMAL_PINS",12="MITSUBISHI_3A92",16="MITSUBISHI_4G93",31="MRE_BOARD_NEW_TEST",23="MRE_BODY_CONTROL",68="MRE_M111",20="MRE_MIATA_94_MAP",66="MRE_MIATA_NA6_MAP",4="MRE_SECONDARY_CAN",37="MRE_SUBARU_EJ18",62="MRE_VW_B6",5="NISSAN_PRIMERA",30="PROTEUS_ANALOG_PWM_TEST",63="PROTEUS_BMW_M73",9="PROTEUS_E65_6H_MAN_IN_THE_MIDDLE",27="PROTEUS_GM_LS_4",6="PROTEUS_HARLEY",91="PROTEUS_HONDA_OBD2A",25="PROTEUS_LUA_DEMO",17="PROTEUS_M111",67="PROTEUS_MIATA_NB2",93="PROTEUS_N73",103="PROTEUS_NISSAN_VQ35",42="PROTEUS_QC_TEST_BOARD",98="PROTEUS_SBC",73="PROTEUS_STIM_QC",39="PROTEUS_VW_B6",29="SACHS",92="SIMULATOR_CONFIG",70="SUBARUEG33_DEFAULTS",22="SUBARU_2003_WRX",100="TEST_100",101="TEST_101",102="TEST_102",18="TEST_33816",28="TEST_CRANK_ENGINE",48="TEST_DC_WASTEGATE_DISCOVERY",26="TEST_ENGINE",45="TEST_ENGINE_VVT",52="TEST_ISSUE_366_BOTH",53="TEST_ISSUE_366_RISE",19="TEST_ROTARY",13="TOYOTA_1NZ_FE",44="TOYOTA_2JZ_GTE_VVTi",32="VW_ABA",96="WASTEGATE_PROTEUS_TEST" +engineType = bits, U16, 0, [0:6], 0="DEFAULT_FRANKENSO",97="ALPHAX_8CHAN_SBC",24="BMW_M73_M",50="BMW_M73_MRE",51="BMW_M73_MRE_SLAVE",35="CAMARO_4",65="CITROEN_TU3JP",38="DISCOVERY_PDM",2="DODGE_NEON_1995",46="DODGE_NEON_2003_CRANK",64="DODGE_RAM",61="EEPROM_BENCH_ENGINE",58="ETB_BENCH_ENGINE",3="FORD_ASPIRE_1996",11="FORD_COYOTE",14="FORD_ESCORT_GT",7="FORD_INLINE_6_1995",40="FRANKENSO_BMW_M73_F",47="FRANKENSO_MAZDA_MIATA_2003",56="FRANKENSO_MAZDA_MIATA_NA8",41="FRANKENSO_MIATA_NA6_MAP",49="FRANKENSO_QA_ENGINE",59="FRANKENSO_TEST_33810",15="FUEL_BENCH",8="GY6_139QMB",6="HARLEY",84="HELLEN_121_NISSAN_4_CYL",72="HELLEN_121_NISSAN_6_CYL",85="HELLEN_121_NISSAN_8_CYL",87="HELLEN_121_NISSAN_ALMERA_N16",71="HELLEN_121_VAG_4_CYL",77="HELLEN_121_VAG_5_CYL",81="HELLEN_121_VAG_8_CYL",78="HELLEN_121_VAG_V6_CYL",79="HELLEN_121_VAG_VR6_CYL",36="HELLEN_128_MERCEDES_4_CYL",88="HELLEN_128_MERCEDES_6_CYL",89="HELLEN_128_MERCEDES_8_CYL",82="HELLEN_154_HYUNDAI_COUPE_BK1",95="HELLEN_154_HYUNDAI_COUPE_BK2",76="HELLEN_154_VAG",75="HELLEN_2CHAN_STIM_QC",74="HELLEN_4CHAN_STIM_QC",57="HELLEN_HONDA_BCM",34="HELLEN_NA6",10="HELLEN_NA8_96",80="HELLEN_NA94",83="HELLEN_NB1",94="HELLEN_NB1_36",69="HELLEN_NB2",86="HELLEN_NB2_36",43="HONDA_600",90="HONDA_K",104="HYUNDAI_PB",60="L9779_BENCH_ENGINE",54="MAVERICK_X3",55="MAZDA_MIATA_2003_BOARD_TEST",33="ME17_9_MISC",21="MIATA_1996",1="MIATA_PROTEUS_TCU",99="MINIMAL_PINS",12="MITSUBISHI_3A92",16="MITSUBISHI_4G93",31="MRE_BOARD_NEW_TEST",23="MRE_BODY_CONTROL",68="MRE_M111",20="MRE_MIATA_94_MAP",66="MRE_MIATA_NA6_MAP",4="MRE_SECONDARY_CAN",37="MRE_SUBARU_EJ18",62="MRE_VW_B6",5="NISSAN_PRIMERA",30="PROTEUS_ANALOG_PWM_TEST",63="PROTEUS_BMW_M73",9="PROTEUS_E65_6H_MAN_IN_THE_MIDDLE",27="PROTEUS_GM_LS_4",91="PROTEUS_HONDA_OBD2A",25="PROTEUS_LUA_DEMO",17="PROTEUS_M111",67="PROTEUS_MIATA_NB2",93="PROTEUS_N73",103="PROTEUS_NISSAN_VQ35",42="PROTEUS_QC_TEST_BOARD",98="PROTEUS_SBC",73="PROTEUS_STIM_QC",39="PROTEUS_VW_B6",29="SACHS",92="SIMULATOR_CONFIG",70="SUBARUEG33_DEFAULTS",22="SUBARU_2003_WRX",100="TEST_100",101="TEST_101",102="TEST_102",18="TEST_33816",28="TEST_CRANK_ENGINE",48="TEST_DC_WASTEGATE_DISCOVERY",26="TEST_ENGINE",45="TEST_ENGINE_VVT",52="TEST_ISSUE_366_BOTH",53="TEST_ISSUE_366_RISE",19="TEST_ROTARY",13="TOYOTA_1NZ_FE",44="TOYOTA_2JZ_GTE_VVTi",32="VW_ABA",96="WASTEGATE_PROTEUS_TEST" startButtonSuppressOnStartUpMs = scalar, U16, 2, "", 1, 0, 0, 32000, 0 sensorSnifferRpmThreshold = scalar, U16, 4, "RPM", 1, 0, 0, 10000, 0 launchRpm = scalar, U16, 6, "rpm", 1, 0, 0, 20000, 0 @@ -216,7 +216,7 @@ fuelLevelSensor = bits, U08, 450, [0:5], $adc_channel_e_list tps2_1AdcChannel = bits, U08, 451, [0:5], $adc_channel_e_list idle_derivativeFilterLoss = scalar, F32, 452, "x", 1, 0, -1000000, 1000000, 4 trailingSparkAngle = scalar, S32, 456, "angle", 1, 0, 0, 720, 0 -trigger_type = bits, U32, 460, [0:6], "custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "INVALID", "GM_7X", "Cooper R50", "Mazda SOHC 4", "60/2", "36/1", "Mercedes Two Segment", "Single Tooth", "EZ30", "INVALID", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "INVALID", "Half Moon", "Dodge Ram 1+16", "60/2 VW", "Benelli Tre", "Dodge Stratus", "36_2_2_2", "Nissan Primera", "dev 2JZ 3/34 simulator", "Rover K", "GM 24x 5 degree", "Honda CBR 600", "Mitsubishi 4G92/93/94 Cam 29", "Honda CBR 600 custom", "3/1 skipped", "Dodge Neon 2003 crank", "Miata NB", "Mitsubishi 4G63 Cam 34", "INVALID", "Subaru 7+6", "Jeep 18-2-2-2", "12 tooth crank", "Dodge Neon 1995 crank only", "Jeep XJ 4 cyl", "FiatIAQ_P8", "Mazda Z5", "INVALID", "Renix 44-2-2", "Renix 66-2-2-2", "Honda K 12+1", "INVALID", "36/2", "Subaru SVX", "1+16", "Subaru 7 without 6", "INVALID", "TriTach", "GM 60/2/2/2", "Skoda Favorit", "Barra 3+1 Cam", "Kawa KX450F", "Nissan VQ35", "INVALID", "Nissan VQ30", "Nissan QR25", "INVALID", "Subaru SVX Crank 1", "Subaru SVX Cam VVT", "Ford PIP", "Suzuki G13B", "Honda K 4+1", "Nissan MR18 Crank", "32/2", "36-2-1", "36-2-1-1", "INVALID", "INVALID", "GM 24x 3 degree", "60-2-2 F3R", "Mitsu 4G63 Crank", "x2 30 Deg camshaft BTDC", "INVALID", "Mitsu 6G72 Cam", "trg80", "trg81" +trigger_type = bits, U32, 460, [0:6], "custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "INVALID", "GM_7X", "Cooper R50", "Mazda SOHC 4", "60/2", "36/1", "Mercedes Two Segment", "Single Tooth", "EZ30", "INVALID", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "INVALID", "Half Moon", "Dodge Ram 1+16", "60/2 VW", "Benelli Tre", "Dodge Stratus", "36_2_2_2", "Nissan Primera", "dev 2JZ 3/34 simulator", "Rover K", "GM 24x 5 degree", "Honda CBR 600", "Mitsubishi 4G92/93/94 Cam 29", "Honda CBR 600 custom", "3/1 skipped", "Dodge Neon 2003 crank", "Miata NB", "Mitsubishi 4G63 Cam 34", "INVALID", "Subaru 7+6", "Jeep 18-2-2-2", "12 tooth crank", "Dodge Neon 1995 crank only", "Jeep XJ 4 cyl", "FiatIAQ_P8", "Mazda Z5", "INVALID", "Renix 44-2-2", "Renix 66-2-2-2", "Honda K 12+1", "INVALID", "36/2", "Subaru SVX", "1+16", "Subaru 7 without 6", "INVALID", "TriTach", "GM 60/2/2/2", "Skoda Favorit", "Barra 3+1 Cam", "Kawa KX450F", "Nissan VQ35", "INVALID", "Nissan VQ30", "Nissan QR25", "INVALID", "Subaru SVX Crank 1", "Subaru SVX Cam VVT", "Ford PIP", "Suzuki G13B", "Honda K 4+1", "Nissan MR18 Crank", "32/2", "36-2-1", "36-2-1-1", "3/0", "INVALID", "GM 24x 3 degree", "60-2-2 F3R", "Mitsu 4G63 Crank", "x2 30 Deg camshaft BTDC", "INVALID", "Mitsu 6G72 Cam", "trg80", "trg81" trigger_customTotalToothCount = scalar, S32, 464, "number", 1, 0, 1, 300, 0 trigger_customSkippedToothCount = scalar, S32, 468, "number", 1, 0, 0, 300, 0 airByRpmTaper = scalar, F32, 472, "%", 1, 0, 0, 50, 1 @@ -474,7 +474,7 @@ stftIgnoreErrorMagnitude = bits, U32, 916, [10:10], "false", "true" vvtBooleanForVerySpecialCases = bits, U32, 916, [11:11], "false", "true" enableSoftwareKnock = bits, U32, 916, [12:12], "false", "true" verboseVVTDecoding = bits, U32, 916, [13:13], "false", "true" -invertCamVVTSignal = bits, U32, 916, [14:14], "false", "true" +invertCamVVTSignal = bits, U32, 916, [14:14], "Rising", "Falling" alphaNUseIat = bits, U32, 916, [15:15], "false", "true" knockBankCyl1 = bits, U32, 916, [16:16], "Channel 1", "Channel 2" knockBankCyl2 = bits, U32, 916, [17:17], "Channel 1", "Channel 2" @@ -607,8 +607,8 @@ useLinearIatSensor = bits, U32, 1316, [10:10], "false", "true" boardUse2stepPullDown = bits, U32, 1316, [11:11], "With Pull Up", "With Pull Down" tachPulseDurationAsDutyCycle = bits, U32, 1316, [12:12], "Constant time", "Duty cycle" isAlternatorControlEnabled = bits, U32, 1316, [13:13], "false", "true" -invertPrimaryTriggerSignal = bits, U32, 1316, [14:14], "false", "true" -invertSecondaryTriggerSignal = bits, U32, 1316, [15:15], "false", "true" +invertPrimaryTriggerSignal = bits, U32, 1316, [14:14], "Rising", "Falling" +invertSecondaryTriggerSignal = bits, U32, 1316, [15:15], "Rising", "Falling" cutFuelOnHardLimit = bits, U32, 1316, [16:16], "no", "yes" cutSparkOnHardLimit = bits, U32, 1316, [17:17], "no", "yes" launchFuelCutEnable = bits, U32, 1316, [18:18], "false", "true" @@ -765,6 +765,7 @@ kLineDoHondaSend = bits, U32, 1572, [5:5], "false", "true" can1ListenMode = bits, U32, 1572, [6:6], "false", "true" can2ListenMode = bits, U32, 1572, [7:7], "false", "true" camDecoder2jzPosition = scalar, U08, 1576, "", 1, 0, 0, 100, 0 +mc33810maxDwellTimer = scalar, U08, 1577, "", 1, 0, 0, 100, 0 benchTestOnTime = scalar, U16, 1578, "ms", 0.01, 0, 0, 500, 2 lambdaProtectionRestoreTps = scalar, U08, 1580, "%", 1, 0, 0, 100, 0 lambdaProtectionRestoreLoad = scalar, U08, 1581, "%", 10.0, 0, 0, 1000, 0 @@ -1009,13 +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 -idleRpmPid2_pFactor = scalar, F32, 2672, "", 1, 0, -10000, 10000, 4 -idleRpmPid2_iFactor = scalar, F32, 2676, "", 1, 0, -10000, 10000, 4 -idleRpmPid2_dFactor = scalar, F32, 2680, "", 1, 0, -10000, 10000, 4 -idleRpmPid2_offset = scalar, S16, 2684, "", 1, 0, -1000, 1000, 0 -idleRpmPid2_periodMs = scalar, S16, 2686, "ms", 1, 0, 0, 3000, 0 -idleRpmPid2_minValue = scalar, S16, 2688, "", 1, 0, -30000, 30000, 0 -idleRpmPid2_maxValue = scalar, S16, 2690, "", 1, 0, -30000, 30000, 0 +tractionControlSlipBins = array, U16, 2672, [6], "ratio", 0.01, 0, 0, 999, 2 +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 @@ -1308,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 @@ -2093,10 +2091,6 @@ lambdaMaxDeviationRpmBins = array, U16, 22078, [4], "RPM", 1, 0, 0, 18000, 0 triggerCompHystMin = "Trigger comparator hysteresis voltage (Min)" triggerCompHystMax = "Trigger comparator hysteresis voltage (Max)" triggerCompSensorSatRpm = "VR-sensor saturation RPM" - idleRpmPid2_offset = "Linear addition to PID logic" - idleRpmPid2_periodMs = "PID dTime" - idleRpmPid2_minValue = "Output Min Duty Cycle" - idleRpmPid2_maxValue = "Output Max Duty Cycle" gppwm1_pin = "Select a pin to use for PWM or on-off output." gppwm1_dutyIfError = "If an error (with a sensor, etc) is detected, this value is used instead of reading from the table.\nThis should be a safe value for whatever hardware is connected to prevent damage." gppwm1_pwmFrequency = "Select a frequency to run PWM at.\nSet this to 0hz to enable on-off mode." @@ -2373,7 +2367,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22078, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1444 + ochBlockSize = 1448 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2745,126 +2739,123 @@ engineRunTime = scalar, U16, 672, "sec", 1,0 distanceTraveled = scalar, U16, 674, "km", 0.1,0 afrGasolineScale = scalar, U16, 676, "AFR", 0.001, 0 afr2GasolineScale = scalar, U16, 678, "AFR", 0.001, 0 -unusedAtTheEnd1 = scalar, U08, 680, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 681, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 682, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 683, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 684, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 685, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 686, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 687, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 688, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 689, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 690, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 691, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 692, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 693, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 694, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 695, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 696, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 697, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 698, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 699, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 700, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 701, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 702, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 703, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 704, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 705, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 706, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 707, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 708, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 709, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 710, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 711, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 712, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 713, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 714, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 715, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 716, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 717, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 718, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 719, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 720, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 721, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 722, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 723, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 724, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 725, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 726, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 727, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 728, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 729, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 730, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 731, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 732, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 733, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 734, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 735, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 736, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 737, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 738, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 739, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 740, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 741, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 742, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 743, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 744, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 745, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 746, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 747, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 748, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 749, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 750, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 751, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 752, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 753, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 754, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 755, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 756, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 757, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 758, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 759, "", 1, 0 -unusedAtTheEnd81 = scalar, U08, 760, "", 1, 0 -unusedAtTheEnd82 = scalar, U08, 761, "", 1, 0 -unusedAtTheEnd83 = scalar, U08, 762, "", 1, 0 -unusedAtTheEnd84 = scalar, U08, 763, "", 1, 0 -unusedAtTheEnd85 = scalar, U08, 764, "", 1, 0 -unusedAtTheEnd86 = scalar, U08, 765, "", 1, 0 -unusedAtTheEnd87 = scalar, U08, 766, "", 1, 0 -unusedAtTheEnd88 = scalar, U08, 767, "", 1, 0 -unusedAtTheEnd89 = scalar, U08, 768, "", 1, 0 -unusedAtTheEnd90 = scalar, U08, 769, "", 1, 0 -unusedAtTheEnd91 = scalar, U08, 770, "", 1, 0 -unusedAtTheEnd92 = scalar, U08, 771, "", 1, 0 -unusedAtTheEnd93 = scalar, U08, 772, "", 1, 0 -unusedAtTheEnd94 = scalar, U08, 773, "", 1, 0 -unusedAtTheEnd95 = scalar, U08, 774, "", 1, 0 -unusedAtTheEnd96 = scalar, U08, 775, "", 1, 0 -unusedAtTheEnd97 = scalar, U08, 776, "", 1, 0 -unusedAtTheEnd98 = scalar, U08, 777, "", 1, 0 -unusedAtTheEnd99 = scalar, U08, 778, "", 1, 0 -unusedAtTheEnd100 = scalar, U08, 779, "", 1, 0 -unusedAtTheEnd101 = scalar, U08, 780, "", 1, 0 -unusedAtTheEnd102 = scalar, U08, 781, "", 1, 0 -unusedAtTheEnd103 = scalar, U08, 782, "", 1, 0 -unusedAtTheEnd104 = scalar, U08, 783, "", 1, 0 -unusedAtTheEnd105 = scalar, U08, 784, "", 1, 0 -unusedAtTheEnd106 = scalar, U08, 785, "", 1, 0 -unusedAtTheEnd107 = scalar, U08, 786, "", 1, 0 -unusedAtTheEnd108 = scalar, U08, 787, "", 1, 0 -unusedAtTheEnd109 = scalar, U08, 788, "", 1, 0 -unusedAtTheEnd110 = scalar, U08, 789, "", 1, 0 -unusedAtTheEnd111 = scalar, U08, 790, "", 1, 0 -unusedAtTheEnd112 = scalar, U08, 791, "", 1, 0 -unusedAtTheEnd113 = scalar, U08, 792, "", 1, 0 -unusedAtTheEnd114 = scalar, U08, 793, "", 1, 0 -unusedAtTheEnd115 = scalar, U08, 794, "", 1, 0 -unusedAtTheEnd116 = scalar, U08, 795, "", 1, 0 -unusedAtTheEnd117 = scalar, U08, 796, "", 1, 0 -unusedAtTheEnd118 = scalar, U08, 797, "", 1, 0 -unusedAtTheEnd119 = scalar, U08, 798, "", 1, 0 -unusedAtTheEnd120 = scalar, U08, 799, "", 1, 0 +wheelSlipRatio = scalar, F32, 680, "", 1, 0 +unusedAtTheEnd1 = scalar, U08, 684, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 685, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 686, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 687, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 688, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 689, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 690, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 691, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 692, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 693, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 694, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 695, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 696, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 697, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 698, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 699, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 700, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 701, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 702, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 703, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 704, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 705, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 706, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 707, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 708, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 709, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 710, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 711, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 712, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 713, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 714, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 715, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 716, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 717, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 718, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 719, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 720, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 721, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 722, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 723, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 724, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 725, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 726, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 727, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 728, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 729, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 730, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 731, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 732, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 733, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 734, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 735, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 736, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 737, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 738, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 739, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 740, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 741, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 742, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 743, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 744, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 745, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 746, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 747, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 748, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 749, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 750, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 751, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 752, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 753, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 754, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 755, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 756, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 757, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 758, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 759, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 760, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 761, "", 1, 0 +unusedAtTheEnd79 = scalar, U08, 762, "", 1, 0 +unusedAtTheEnd80 = scalar, U08, 763, "", 1, 0 +unusedAtTheEnd81 = scalar, U08, 764, "", 1, 0 +unusedAtTheEnd82 = scalar, U08, 765, "", 1, 0 +unusedAtTheEnd83 = scalar, U08, 766, "", 1, 0 +unusedAtTheEnd84 = scalar, U08, 767, "", 1, 0 +unusedAtTheEnd85 = scalar, U08, 768, "", 1, 0 +unusedAtTheEnd86 = scalar, U08, 769, "", 1, 0 +unusedAtTheEnd87 = scalar, U08, 770, "", 1, 0 +unusedAtTheEnd88 = scalar, U08, 771, "", 1, 0 +unusedAtTheEnd89 = scalar, U08, 772, "", 1, 0 +unusedAtTheEnd90 = scalar, U08, 773, "", 1, 0 +unusedAtTheEnd91 = scalar, U08, 774, "", 1, 0 +unusedAtTheEnd92 = scalar, U08, 775, "", 1, 0 +unusedAtTheEnd93 = scalar, U08, 776, "", 1, 0 +unusedAtTheEnd94 = scalar, U08, 777, "", 1, 0 +unusedAtTheEnd95 = scalar, U08, 778, "", 1, 0 +unusedAtTheEnd96 = scalar, U08, 779, "", 1, 0 +unusedAtTheEnd97 = scalar, U08, 780, "", 1, 0 +unusedAtTheEnd98 = scalar, U08, 781, "", 1, 0 +unusedAtTheEnd99 = scalar, U08, 782, "", 1, 0 +unusedAtTheEnd100 = scalar, U08, 783, "", 1, 0 +unusedAtTheEnd101 = scalar, U08, 784, "", 1, 0 +unusedAtTheEnd102 = scalar, U08, 785, "", 1, 0 +unusedAtTheEnd103 = scalar, U08, 786, "", 1, 0 +unusedAtTheEnd104 = scalar, U08, 787, "", 1, 0 +unusedAtTheEnd105 = scalar, U08, 788, "", 1, 0 +unusedAtTheEnd106 = scalar, U08, 789, "", 1, 0 +unusedAtTheEnd107 = scalar, U08, 790, "", 1, 0 +unusedAtTheEnd108 = scalar, U08, 791, "", 1, 0 +unusedAtTheEnd109 = scalar, U08, 792, "", 1, 0 +unusedAtTheEnd110 = scalar, U08, 793, "", 1, 0 +unusedAtTheEnd111 = scalar, U08, 794, "", 1, 0 +unusedAtTheEnd112 = scalar, U08, 795, "", 1, 0 +unusedAtTheEnd113 = scalar, U08, 796, "", 1, 0 +unusedAtTheEnd114 = scalar, U08, 797, "", 1, 0 +unusedAtTheEnd115 = scalar, U08, 798, "", 1, 0 +unusedAtTheEnd116 = scalar, U08, 799, "", 1, 0 ; total TS size = 800 totalFuelCorrection = scalar, F32, 800, "mult", 1,0 running_postCrankingFuelCorrection = scalar, F32, 804, "", 1, 0 @@ -3025,145 +3016,149 @@ clutchUpState = scalar, S08, 1090, "", 1, 0 clutchDownState = scalar, S08, 1091, "", 1, 0 brakePedalState = scalar, S08, 1092, "", 1, 0 startStopState = scalar, S08, 1093, "", 1, 0 -startStopPhysicalState = bits, U32, 1096, [0:0] -acrStateDup = bits, U32, 1096, [1:1] -acrEngineMovedRecently = bits, U32, 1096, [2:2] -heaterControlEnabled = bits, U32, 1096, [3:3] -luaDigitalState0 = bits, U32, 1096, [4:4] -luaDigitalState1 = bits, U32, 1096, [5:5] -luaDigitalState2 = bits, U32, 1096, [6:6] -luaDigitalState3 = bits, U32, 1096, [7:7] -startStopStateToggleCounter = scalar, U32, 1100, "", 1, 0 -egtValue1 = scalar, F32, 1104, "", 1, 0 -egtValue2 = scalar, F32, 1108, "", 1, 0 -desiredRpmLimit = scalar, S16, 1112, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1116, "", 1, 0 -sparkCounter = scalar, U32, 1120, "", 1, 0 -fuelingLoad = scalar, F32, 1124, "", 1, 0 -ignitionLoad = scalar, F32, 1128, "", 1, 0 -veTableYAxis = scalar, U16, 1132, "%", 0.01, 0 -; total TS size = 1136 -tpsFrom = scalar, F32, 1136 -tpsTo = scalar, F32, 1140 -deltaTps = scalar, F32, 1144 -extraFuel = scalar, F32, 1148, "", 1, 0 -valueFromTable = scalar, F32, 1152, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1156, [0:0] -isBelowDecelThreshold = bits, U32, 1156, [1:1] -isTimeToResetAccumulator = bits, U32, 1156, [2:2] -isFractionalEnrichment = bits, U32, 1156, [3:3] -belowEpsilon = bits, U32, 1156, [4:4] -tooShort = bits, U32, 1156, [5:5] -fractionalInjFuel = scalar, F32, 1160, "", 1, 0 -accumulatedValue = scalar, F32, 1164, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1168, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1172, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1176, "", 1, 0 -cycleCnt = scalar, S32, 1180, "", 1, 0 -; total TS size = 1184 -hwEventCounters1 = scalar, U32, 1184, "", 1, 0 -hwEventCounters2 = scalar, U32, 1188, "", 1, 0 -hwEventCounters3 = scalar, U32, 1192, "", 1, 0 -hwEventCounters4 = scalar, U32, 1196, "", 1, 0 -hwEventCounters5 = scalar, U32, 1200, "", 1, 0 -hwEventCounters6 = scalar, U32, 1204, "", 1, 0 -vvtCamCounter = scalar, U32, 1208, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1212, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1216, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1220, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1221, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1224, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1228, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1232, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1236, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1240, [0:0] -; total TS size = 1244 -crankSynchronizationCounter0 = scalar, U32, 1244, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1248, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1252, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1256, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1260, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1276, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1280, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1281, "", 1, 0 -; total TS size = 1284 -camResyncCounter = scalar, U08, 1284, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1288, [0:0] -; total TS size = 1292 -wallFuelCorrection = scalar, F32, 1292, "", 1, 0 -wallFuel = scalar, F32, 1296, "", 1, 0 -; total TS size = 1300 -idleState = bits, S32, 1300, [0:2], "not important" -currentIdlePosition = scalar, F32, 1304 -baseIdlePosition = scalar, F32, 1308 -idleClosedLoop = scalar, F32, 1312 -iacByTpsTaper = scalar, F32, 1316 -throttlePedalUpState = scalar, S32, 1320, "", 1, 0 -mightResetPid = bits, U32, 1324, [0:0] -shouldResetPid = bits, U32, 1324, [1:1] -wasResetPid = bits, U32, 1324, [2:2] -mustResetPid = bits, U32, 1324, [3:3] -isCranking = bits, U32, 1324, [4:4] -isIacTableForCoasting = bits, U32, 1324, [5:5] -notIdling = bits, U32, 1324, [6:6] -needReset = bits, U32, 1324, [7:7] -isInDeadZone = bits, U32, 1324, [8:8] -isBlipping = bits, U32, 1324, [9:9] -useClosedLoop = bits, U32, 1324, [10:10] -badTps = bits, U32, 1324, [11:11] -looksLikeRunning = bits, U32, 1324, [12:12] -looksLikeCoasting = bits, U32, 1324, [13:13] -looksLikeCrankToIdle = bits, U32, 1324, [14:14] -isIdleCoasting = bits, U32, 1324, [15:15] -isIdleClosedLoop = bits, U32, 1324, [16:16] -idleTarget = scalar, S32, 1328, "", 1, 0 -targetRpmByClt = scalar, S32, 1332, "", 1, 0 -targetRpmAc = scalar, S32, 1336, "", 1, 0 -iacByRpmTaper = scalar, F32, 1340 -luaAdd = scalar, F32, 1344 -; total TS size = 1348 -idlePosition0 = scalar, F32, 1348, "per", 1,0 -trim0 = scalar, F32, 1352, "", 1, 0 -luaAdjustment0 = scalar, F32, 1356, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1360, "per", 1,0 -etbFeedForward0 = scalar, F32, 1364 -etbIntegralError0 = scalar, F32, 1368, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1372, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1376, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1380, [0:0] -jamDetected0 = bits, U32, 1380, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1384, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1388, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1392, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1394, "count", 1,0 -etbErrorCode0 = scalar, S08, 1396, "", 1, 0 -jamTimer0 = scalar, U16, 1398, "sec", 0.01, 0 -; total TS size = 1400 -faultCode0 = scalar, U08, 1400, "", 1, 0 -heaterDuty0 = scalar, U08, 1401, "%", 1, 0 -pumpDuty0 = scalar, U08, 1402, "%", 1, 0 -tempC0 = scalar, U16, 1404, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1406, "V", 0.001, 0 -esr0 = scalar, U16, 1408, "ohm", 1, 0 -; total TS size = 1412 -dcOutput0 = scalar, F32, 1412, "per", 1,0 -isEnabled0_int = scalar, U08, 1416, "per", 1,0 -isEnabled0 = bits, U32, 1420, [0:0] -; total TS size = 1424 -value0 = scalar, U16, 1424, "value", 1,0 -value1 = scalar, U16, 1426, "value", 1,0 -errorRate = scalar, F32, 1428, "ratio", 1,0 -; total TS size = 1432 -vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +smartChipState = scalar, S08, 1094, "", 1, 0 +smartChipRestartCounter = scalar, S08, 1095, "", 1, 0 +smartChipAliveCounter = scalar, S08, 1096, "", 1, 0 +startStopPhysicalState = bits, U32, 1100, [0:0] +acrStateDup = bits, U32, 1100, [1:1] +acrEngineMovedRecently = bits, U32, 1100, [2:2] +heaterControlEnabled = bits, U32, 1100, [3:3] +luaDigitalState0 = bits, U32, 1100, [4:4] +luaDigitalState1 = bits, U32, 1100, [5:5] +luaDigitalState2 = bits, U32, 1100, [6:6] +luaDigitalState3 = bits, U32, 1100, [7:7] +startStopStateToggleCounter = scalar, U32, 1104, "", 1, 0 +egtValue1 = scalar, F32, 1108, "", 1, 0 +egtValue2 = scalar, F32, 1112, "", 1, 0 +desiredRpmLimit = scalar, S16, 1116, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1120, "", 1, 0 +sparkCounter = scalar, U32, 1124, "", 1, 0 +fuelingLoad = scalar, F32, 1128, "", 1, 0 +ignitionLoad = scalar, F32, 1132, "", 1, 0 +veTableYAxis = scalar, U16, 1136, "%", 0.01, 0 +; total TS size = 1140 +tpsFrom = scalar, F32, 1140 +tpsTo = scalar, F32, 1144 +deltaTps = scalar, F32, 1148 +extraFuel = scalar, F32, 1152, "", 1, 0 +valueFromTable = scalar, F32, 1156, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1160, [0:0] +isBelowDecelThreshold = bits, U32, 1160, [1:1] +isTimeToResetAccumulator = bits, U32, 1160, [2:2] +isFractionalEnrichment = bits, U32, 1160, [3:3] +belowEpsilon = bits, U32, 1160, [4:4] +tooShort = bits, U32, 1160, [5:5] +fractionalInjFuel = scalar, F32, 1164, "", 1, 0 +accumulatedValue = scalar, F32, 1168, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1172, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1176, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1180, "", 1, 0 +cycleCnt = scalar, S32, 1184, "", 1, 0 +; total TS size = 1188 +hwEventCounters1 = scalar, U32, 1188, "", 1, 0 +hwEventCounters2 = scalar, U32, 1192, "", 1, 0 +hwEventCounters3 = scalar, U32, 1196, "", 1, 0 +hwEventCounters4 = scalar, U32, 1200, "", 1, 0 +hwEventCounters5 = scalar, U32, 1204, "", 1, 0 +hwEventCounters6 = scalar, U32, 1208, "", 1, 0 +vvtCamCounter = scalar, U32, 1212, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1216, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1220, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1224, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1225, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1228, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1232, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1236, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1240, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1244, [0:0] +; total TS size = 1248 +crankSynchronizationCounter0 = scalar, U32, 1248, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1252, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1256, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1260, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1264, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1280, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1284, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1285, "", 1, 0 +; total TS size = 1288 +camResyncCounter = scalar, U08, 1288, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1292, [0:0] +; total TS size = 1296 +wallFuelCorrection = scalar, F32, 1296, "", 1, 0 +wallFuel = scalar, F32, 1300, "", 1, 0 +; total TS size = 1304 +idleState = bits, S32, 1304, [0:2], "not important" +currentIdlePosition = scalar, F32, 1308 +baseIdlePosition = scalar, F32, 1312 +idleClosedLoop = scalar, F32, 1316 +iacByTpsTaper = scalar, F32, 1320 +throttlePedalUpState = scalar, S32, 1324, "", 1, 0 +mightResetPid = bits, U32, 1328, [0:0] +shouldResetPid = bits, U32, 1328, [1:1] +wasResetPid = bits, U32, 1328, [2:2] +mustResetPid = bits, U32, 1328, [3:3] +isCranking = bits, U32, 1328, [4:4] +isIacTableForCoasting = bits, U32, 1328, [5:5] +notIdling = bits, U32, 1328, [6:6] +needReset = bits, U32, 1328, [7:7] +isInDeadZone = bits, U32, 1328, [8:8] +isBlipping = bits, U32, 1328, [9:9] +useClosedLoop = bits, U32, 1328, [10:10] +badTps = bits, U32, 1328, [11:11] +looksLikeRunning = bits, U32, 1328, [12:12] +looksLikeCoasting = bits, U32, 1328, [13:13] +looksLikeCrankToIdle = bits, U32, 1328, [14:14] +isIdleCoasting = bits, U32, 1328, [15:15] +isIdleClosedLoop = bits, U32, 1328, [16:16] +idleTarget = scalar, S32, 1332, "", 1, 0 +targetRpmByClt = scalar, S32, 1336, "", 1, 0 +targetRpmAc = scalar, S32, 1340, "", 1, 0 +iacByRpmTaper = scalar, F32, 1344 +luaAdd = scalar, F32, 1348 +; total TS size = 1352 +idlePosition0 = scalar, F32, 1352, "per", 1,0 +trim0 = scalar, F32, 1356, "", 1, 0 +luaAdjustment0 = scalar, F32, 1360, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1364, "per", 1,0 +etbFeedForward0 = scalar, F32, 1368 +etbIntegralError0 = scalar, F32, 1372, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1376, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1380, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1384, [0:0] +jamDetected0 = bits, U32, 1384, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1388, "per", 1,0 +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 +heaterDuty0 = scalar, U08, 1405, "%", 1, 0 +pumpDuty0 = scalar, U08, 1406, "%", 1, 0 +tempC0 = scalar, U16, 1408, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1410, "V", 0.001, 0 +esr0 = scalar, U16, 1412, "ohm", 1, 0 +; total TS size = 1416 +dcOutput0 = scalar, F32, 1416, "per", 1,0 +isEnabled0_int = scalar, U08, 1420, "per", 1,0 +isEnabled0 = bits, U32, 1424, [0:0] +; total TS size = 1428 +value0 = scalar, U16, 1428, "value", 1,0 +value1 = scalar, U16, 1430, "value", 1,0 +errorRate = scalar, F32, 1432, "ratio", 1,0 ; total TS size = 1436 -lambdaCurrentlyGood = bits, U32, 1436, [0:0] -lambdaMonitorCut = bits, U32, 1436, [1:1] -lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 -; total TS size = 1444 +vvtTarget = scalar, U16, 1436, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1438, "%", 0.5, 0 +; total TS size = 1440 +lambdaCurrentlyGood = bits, U32, 1440, [0:0] +lambdaMonitorCut = bits, U32, 1440, [1:1] +lambdaTimeSinceGood = scalar, U16, 1444, "sec", 0.01, 0 +; total TS size = 1448 time = { timeNow } @@ -3847,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 @@ -4331,14 +4331,14 @@ gaugeCategory = Trigger triggerStateIndexGauge = triggerStateIndex0,"triggerStateIndex", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 vvtSyncGapRatioGauge = vvtSyncGapRatio0,"vvtSyncGapRatio", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 vvtStateIndexGauge = vvtStateIndex0,"vvtStateIndex", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 - triggerPrimaryFallGauge = triggerPrimaryFall,"triggerPrimaryFall", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 - triggerPrimaryRiseGauge = triggerPrimaryRise,"triggerPrimaryRise", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 - triggerSecondaryFallGauge = triggerSecondaryFall,"triggerSecondaryFall", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 - triggerSecondaryRiseGauge = triggerSecondaryRise,"triggerSecondaryRise", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 - triggerVvtFallGauge = triggerVvtFall,"triggerVvtFall", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 - triggerVvtRiseGauge = triggerVvtRise,"triggerVvtRise", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 - triggerVvt2FallGauge = triggerVvt2Fall,"triggerVvt2Fall", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 - triggerVvt2RiseGauge = triggerVvt2Rise,"triggerVvt2Rise", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 + triggerPrimaryFallCounterGauge = triggerPrimaryFall,"triggerPrimaryFall", "", 0,10000.0, 0,10000.0, 0,10000.0, 3,3 + triggerPrimaryRiseCounterGauge = triggerPrimaryRise,"triggerPrimaryRise", "", 0,10000.0, 0,10000.0, 0,10000.0, 3,3 + triggerSecondaryFallCounterGauge = triggerSecondaryFall,"triggerSecondaryFall", "", 0,10000.0, 0,10000.0, 0,10000.0, 3,3 + triggerSecondaryRiseCounterGauge = triggerSecondaryRise,"triggerSecondaryRise", "", 0,10000.0, 0,10000.0, 0,10000.0, 3,3 + triggerVvtFallCounterGauge = triggerVvtFall,"triggerVvtFall", "", 0,10000.0, 0,10000.0, 0,10000.0, 3,3 + triggerVvtRiseCounterGauge = triggerVvtRise,"triggerVvtRise", "", 0,10000.0, 0,10000.0, 0,10000.0, 3,3 + triggerVvt2FallCounterGauge = triggerVvt2Fall,"triggerVvt2Fall", "", 0,10000.0, 0,10000.0, 0,10000.0, 3,3 + triggerVvt2RiseCounterGauge = triggerVvt2Rise,"triggerVvt2Rise", "", 0,10000.0, 0,10000.0, 0,10000.0, 3,3 currentEnginePhaseGauge = currentEngineDecodedPhase, "Engine Phase", "deg", 0, 720, 0, 0, 720, 720, 0, 0 gaugeCategory = Test Bench @@ -4447,6 +4447,7 @@ gaugeCategory = Sensors - Basic ;Name Var Title Units Lo Hi LoD LoW HiW HiD vd ld gaugeCategory = Sensors - Extra 1 VSSGauge = vehicleSpeedKph, "Vehicle Speed", "kmh", 0, 200, 0, 1, 3, 4, 1, 1 + wheelSlipRatioGauge = wheelSlipRatio, "Wheel Slip Ratio", "", 0, 200, 0, 1, 3, 4, 3, 3 turboSpeedGauge = turboSpeed, "Turbocharger Speed", "hz", 0, 200, 0, 1, 3, 4, 1, 1 baroPressureGauge = baroPressure, "Barometric pressure", "kPa", 0, 1024, 0, 0, 0, 0, 0, 0 internalMcuTemperatureGauge = internalMcuTemperature, "ECU temperature", "C", 0, 100, 0, 0, 75, 100, 0, 0 @@ -5080,6 +5081,7 @@ entry = engineRunTime, "engineRunTime", int, "%d" entry = distanceTraveled, "distanceTraveled", float, "%.3f" entry = afrGasolineScale, "Air/Fuel Ratio (Gas Scale)", float, "%.3f" entry = afr2GasolineScale, "Air/Fuel Ratio 2 (Gas Scale)", float, "%.3f" +entry = wheelSlipRatio, "wheelSlipRatio", float, "%.3f" entry = totalFuelCorrection, "Fuel: Total correction", float, "%.3f" entry = running_postCrankingFuelCorrection, "Fuel: Post cranking mult", float, "%.3f" entry = running_intakeTemperatureCoefficient, "Fuel: IAT correction", float, "%.3f" @@ -5138,8 +5140,8 @@ entry = m_pressureTarget_kPa, "GDI: target pressure", float, "%.3f" entry = nextLobe, "GDI: nextLobe", float, "%.3f" entry = di_nextStart, "GDI: next start", float, "%.3f" entry = m_deadtime, "Fuel: injector lag", float, "%.3f" -entry = pressureDelta, "fuel: Injector pressure delta", float, "%.3f" -entry = pressureRatio, "fuel: Injector pressure ratio", float, "%.3f" +entry = pressureDelta, "Fuel: Injector pressure delta", float, "%.3f" +entry = pressureRatio, "Fuel: Injector pressure ratio", float, "%.3f" entry = retardThresholdRpm, "retardThresholdRpm", int, "%d" entry = combinedConditions, "combinedConditions", int, "%d" entry = launchActivatePinState, "launchActivatePinState", int, "%d" @@ -5233,6 +5235,9 @@ entry = clutchUpState, "Clutch: up", int, "%d" entry = clutchDownState, "Clutch: down", int, "%d" entry = brakePedalState, "Brake switch", int, "%d" entry = startStopState, "startStopState", int, "%d" +entry = smartChipState, "smartChipState", int, "%d" +entry = smartChipRestartCounter, "smartChipRestartCounter", int, "%d" +entry = smartChipAliveCounter, "smartChipAliveCounter", int, "%d" entry = startStopPhysicalState, "startStopPhysicalState", int, "%d" entry = acrStateDup, "acrStateDup", int, "%d" entry = acrEngineMovedRecently, "acrEngineMovedRecently", int, "%d" @@ -5257,10 +5262,10 @@ entry = extraFuel, "extraFuel", float, "%.3f" entry = valueFromTable, "valueFromTable", float, "%.3f" entry = isAboveAccelThreshold, "Fuel: TPS AE Active", int, "%d" entry = isBelowDecelThreshold, "isBelowDecelThreshold", int, "%d" -entry = isTimeToResetAccumulator, "Accel: reset time", int, "%d" +entry = isTimeToResetAccumulator, "Fuel: TPS AE: reset time", int, "%d" entry = isFractionalEnrichment, "isFractionalEnrichment", int, "%d" -entry = belowEpsilon, "Accel: below threshold", int, "%d" -entry = tooShort, "Accel: too short", int, "%d" +entry = belowEpsilon, "Fuel: TPS AE: below threshold", int, "%d" +entry = tooShort, "Fuel: TPS AE: too short", int, "%d" entry = fractionalInjFuel, "fractionalInjFuel", float, "%.3f" entry = accumulatedValue, "accumulatedValue", float, "%.3f" entry = maxExtraPerCycle, "maxExtraPerCycle", float, "%.3f" @@ -5385,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" @@ -5401,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" @@ -5734,6 +5741,7 @@ menuDialog = main subMenu = hpfpCompensationTable, "HPFP Pump Compensation", {hpfpCamLobes != 0} subMenu = std_separator subMenu = fancyHardwareDialog, "Fancy Hardware" + subMenu = tractionEtbTableTbl, "Traction Control ETB Drop" subMenu = std_separator @@ -6195,15 +6203,19 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_4_Graph, "Graph", South graphLine = brakePedalState graphLine = startStopState + graphLine = smartChipState + graphLine = smartChipRestartCounter + liveGraph = engine_state_5_Graph, "Graph", South + graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter graphLine = egtValue1 - liveGraph = engine_state_5_Graph, "Graph", South graphLine = egtValue2 + liveGraph = engine_state_6_Graph, "Graph", South graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = sparkCounter - liveGraph = engine_state_6_Graph, "Graph", South graphLine = fuelingLoad + liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad graphLine = veTableYAxis @@ -6347,6 +6359,7 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etbPpsErrorCounter0 liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etbErrorCode0 + graphLine = tcEtbDrop0 graphLine = jamTimer0 @@ -6541,9 +6554,9 @@ dialog = lambda_monitorDialog, "lambda_monitor" ; not crank trigger and ((vague trigger and cam choice) or not vague trigger) field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) ) } field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 2 || trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 21 || trigger_type == 26 || trigger_type == 27 || trigger_type == 33 || trigger_type == 38 || trigger_type == 39 || trigger_type == 44 || trigger_type == 45 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 58 || trigger_type == 61 || trigger_type == 62 || trigger_type == 68 || trigger_type == 70 || trigger_type == 71 || trigger_type == 72 || trigger_type == 74 || trigger_type == 75 || trigger_type == 76 || trigger_type == 77) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 11 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 || trigger_type == 73) ) )) } - field = "Invert Primary", invertPrimaryTriggerSignal + field = "Primary Edge", invertPrimaryTriggerSignal field = "Secondary channel", triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) } - field = "Invert Secondary", invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } + field = "Secondary Edge", invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 3 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 25 || trigger_type == 28 || trigger_type == 31 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } dialog = trigger_cams, "Cam Inputs" field = "!https://rusefi.com/s/vvt" @@ -6559,7 +6572,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Cam sensor bank 1 exhaust", camInputs2, { camInputs2 != 0 || (vvtMode2 != 0 && camInputs1 != 0 ) } field = "Cam sensor bank 2 intake", camInputs3, { camInputs3 != 0 || (vvtMode1 != 0 && camInputs1 != 0 ) } field = "Cam sensor bank 2 exhaust", camInputs4, { camInputs4 != 0 || (vvtMode2 != 0 && camInputs2 != 0 ) } - field = "Invert cam inputs", invertCamVVTSignal, { camInputs1 != 0 } + field = "Cam Edge Select", invertCamVVTSignal, { camInputs1 != 0 } field = "" field = "#Set offset so VVT indicates 0 degrees in default position" field = "VVT offset bank 1 intake", vvtOffsets1, { camInputs1 != 0 } @@ -8577,8 +8590,6 @@ dialog = tcuControls, "Transmission Settings" dialog = engineTypeDialog, "Popular vehicles" field = "!These buttons send a command to rusEFI controller to apply preset values" field = "!Once you send the command, please reconnect to rusEFI controller in order to read fresh values" - commandButton = "Frankenso Miata NA6 Stage 1", cmd_set_engine_type_Frankenso_Miata_NA6_MAP - commandButton = "Frankenso Miata NB2 MAP", cmd_set_engine_type_Frankenso_Miata_NB2 ; commandButton = "Mitsubishi 3A92", cmd_set_engine_type_MITSUBISHI_3A92 ; commandButton = "Mitsubishi 4G93", cmd_set_engine_type_MITSUBISHI_4G93 @@ -8594,8 +8605,6 @@ dialog = tcuControls, "Transmission Settings" - commandButton = "ETB test bench", cmd_set_engine_type_etb_test - commandButton = "TLE8888 test bench", cmd_set_engine_type_8888_test commandButton = "Reset firmware settings", cmd_set_engine_type_default ; Board->ECU stimulator @@ -8707,6 +8716,7 @@ dialog = tcuControls, "Transmission Settings" field = dacOutputPins2, dacOutputPins2 field = "Read RPM matching VSS profile", canInputBCM field = useSpiImu, useSpiImu + field = mc33810maxDwellTimer, mc33810maxDwellTimer dialog = harleyAcr, "Harley Automatic Compression Release" field = "Pin", acrPin