diff --git a/generated/console/binary/output_channels_generated.h b/generated/console/binary/output_channels_generated.h index a80ac5f..baf680b 100644 --- a/generated/console/binary/output_channels_generated.h +++ b/generated/console/binary/output_channels_generated.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) console/binary/output_channels.txt Tue Mar 05 17:17:33 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) console/binary/output_channels.txt Wed Mar 13 01:50:40 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -596,7 +596,7 @@ struct output_channels_s { * units: deg C * offset 200 */ - uint16_t egt[EGT_CHANNEL_COUNT]; + scaled_channel egt[EGT_CHANNEL_COUNT]; /** * units: V * offset 216 @@ -1277,4 +1277,4 @@ struct output_channels_s { static_assert(sizeof(output_channels_s) == 796); // end -// this section was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) console/binary/output_channels.txt Tue Mar 05 17:17:33 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) console/binary/output_channels.txt Wed Mar 13 01:50:40 UTC 2024 diff --git a/generated/controllers/algo/engine_state_generated.h b/generated/controllers/algo/engine_state_generated.h index af56ff0..aae24d4 100644 --- a/generated/controllers/algo/engine_state_generated.h +++ b/generated/controllers/algo/engine_state_generated.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/algo/engine_state.txt Tue Mar 05 17:17:34 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/algo/engine_state.txt Wed Mar 13 01:50:40 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -335,68 +335,60 @@ struct engine_state_s { /** * offset 60 */ - float egtValue1 = (float)0; + float luaSoftSparkSkip = (float)0; /** * offset 64 */ - float egtValue2 = (float)0; - /** - * offset 68 - */ - float luaSoftSparkSkip = (float)0; - /** - * offset 72 - */ float luaHardSparkSkip = (float)0; /** - * offset 76 + * offset 68 */ float tractionControlSparkSkip = (float)0; /** * User-defined RPM hard limit * units: rpm - * offset 80 + * offset 72 */ int16_t desiredRpmLimit = (int16_t)0; /** * need 4 byte alignment * units: units - * offset 82 + * offset 74 */ - uint8_t alignmentFill_at_82[2]; + uint8_t alignmentFill_at_74[2]; /** * Fuel: Injection counter - * offset 84 + * offset 76 */ uint32_t fuelInjectionCounter = (uint32_t)0; /** * Ign: Spark counter - * offset 88 + * offset 80 */ uint32_t globalSparkCounter = (uint32_t)0; /** * @@GAUGE_NAME_FUEL_LOAD@@ - * offset 92 + * offset 84 */ float fuelingLoad = (float)0; /** * @@GAUGE_NAME_IGNITION_LOAD@@ - * offset 96 + * offset 88 */ float ignitionLoad = (float)0; /** * units: % - * offset 100 + * offset 92 */ scaled_channel veTableYAxis = (uint16_t)0; /** * need 4 byte alignment * units: units - * offset 102 + * offset 94 */ - uint8_t alignmentFill_at_102[2]; + uint8_t alignmentFill_at_94[2]; }; -static_assert(sizeof(engine_state_s) == 104); +static_assert(sizeof(engine_state_s) == 96); // end -// this section was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/algo/engine_state.txt Tue Mar 05 17:17:34 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/algo/engine_state.txt Wed Mar 13 01:50:40 UTC 2024 diff --git a/generated/controllers/generated/engine_configuration_generated_structures_XXX.h b/generated/controllers/generated/engine_configuration_generated_structures_XXX.h index f5d5b34..d1db995 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-all.jar based on (unknown script) integration/rusefi_config.txt Thu Mar 07 17:17:28 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Wed Mar 13 01:50:37 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -822,7 +822,7 @@ struct engine_configuration_s { * units: deg * offset 420 */ - int launchTimingRetard; + float launchTimingRetard; /** * value '6' for 8MHz hw osc * read hip9011 datasheet for details @@ -3649,7 +3649,7 @@ struct engine_configuration_s { /** * offset 2284 */ - float etbDutyThreshold; + float unused645646; /** * This sets the RPM above which fuel cut is active. * units: rpm @@ -4314,7 +4314,7 @@ struct engine_configuration_s { /** * offset 4120 */ - float etbDutyShutdownThreshold; + float unused3124141; /** * offset 4124 */ @@ -4483,11 +4483,11 @@ struct engine_configuration_s { */ scaled_channel boostCutPressureHyst; /** - * Boost duty cycle added by gear + * Boost duty cycle modified by gear * units: % * offset 4201 */ - scaled_channel gearBasedOpenLoopBoostAdder[TCU_GEAR_COUNT]; + scaled_channel gearBasedOpenLoopBoostAdder[TCU_GEAR_COUNT]; /** * need 4 byte alignment * units: units @@ -5634,4 +5634,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22236); // end -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Thu Mar 07 17:17:28 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Wed Mar 13 01:50:37 UTC 2024 diff --git a/generated/controllers/generated/rusefi_generated_XXX.h b/generated/controllers/generated/rusefi_generated_XXX.h index 2a560b4..6f11657 100644 --- a/generated/controllers/generated/rusefi_generated_XXX.h +++ b/generated/controllers/generated/rusefi_generated_XXX.h @@ -1090,6 +1090,7 @@ #define PACK_MULT_AFR 1000 #define PACK_MULT_AFR_CFG 10 #define PACK_MULT_ANGLE 50 +#define PACK_MULT_EGTEMPERATURE 4 #define PACK_MULT_FLEX 2 #define PACK_MULT_FUEL_FLOW 200 #define PACK_MULT_FUEL_MASS 100 @@ -1186,7 +1187,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 1018699323 +#define SIGNATURE_HASH 1625932051 #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" @@ -1263,7 +1264,7 @@ #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",72="TT_3_TOOTH_CRANK",77="TT_60DEG_TOOTH",75="TT_60_2_2_F3R",20="TT_60_2_VW",80="TT_6_TOOTH_CRANK",21="TT_BENELLI_TRE",30="TT_CHRYSLER_NGC_36_2_2",6="TT_DAIHATSU_3_CYL",81="TT_DAIHATSU_4_CYL",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",82="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", "Daihatsu 3 cylinder", "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 Cam", "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", "6/0", "Daihatsu 4 cylinder", "trg82", "trg83" +#define trigger_type_e_enum "custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "INVALID", "GM_7X", "Daihatsu 3 cylinder", "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 Cam", "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", "12crank/24cam", "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", "6/0", "Daihatsu 4 cylinder", "trg82", "trg83" #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 @@ -1472,12 +1473,15 @@ #define TS_RESPONSE_UNRECOGNIZED_COMMAND 0x83 #define TS_SET_LOGGER_SWITCH 'l' #define TS_SET_LOGGER_SWITCH_char l +#define ts_show_air_conditioning true #define ts_show_analog_divider true #define ts_show_auxserial_pins true #define ts_show_can2 true #define ts_show_can_pins true +#define ts_show_check_engine true #define ts_show_clt_iat_pullup true #define ts_show_communityCommsLedPid false +#define ts_show_compression_ratio false #define ts_show_cylinder_10 true #define ts_show_cylinder_11 true #define ts_show_cylinder_12 true @@ -1489,23 +1493,40 @@ #define ts_show_cylinder_7 true #define ts_show_cylinder_8 true #define ts_show_cylinder_9 true +#define ts_show_cylinder_bank true +#define ts_show_debug_mode false #define ts_show_egt true #define ts_show_etb true #define ts_show_etb_pins false +#define ts_show_fancy_hardware false +#define ts_show_firing_order true +#define ts_show_forced_induction true +#define ts_show_fuel_pump true +#define ts_show_fuel_relay_pin true +#define ts_show_fuel_strategy true #define ts_show_full_pinout true +#define ts_show_gdi false #define ts_show_hardware_simulator true +#define ts_show_hd true #define ts_show_hip9011 false +#define ts_show_idle_hardware true #define ts_show_ign_key_analog_input false #define ts_show_ign_key_switch false #define ts_show_ignitionPinMode true #define ts_show_inj_diag false +#define ts_show_injection_mode true #define ts_show_injectionPinMode false +#define ts_show_k_line false #define ts_show_l9779 false +#define ts_show_maf true #define ts_show_main_relay true #define ts_show_main_relay_microRusEFI_message false #define ts_show_mc33810 false +#define ts_show_number_of_cylinders true +#define ts_show_odd_fire true #define ts_show_onboard_accelerometer false #define ts_show_output_diag false +#define ts_show_rotary true #define ts_show_sd_card true #define ts_show_sd_pins true #define ts_show_software_knock false @@ -1513,24 +1534,28 @@ #define ts_show_spi2_enable true #define ts_show_spi2_pins true #define ts_show_spi3_pins true +#define ts_show_starter_disable true +#define ts_show_status_leds true +#define ts_show_tcu false #define ts_show_tle8888 false #define ts_show_tps2 true #define ts_show_tps_sent false #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true #define ts_show_vbatt true +#define ts_show_vehicle_weight false #define ts_show_vr_threshold_2 false #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI default.2024.03.07.XXX.1018699323" +#define TS_SIGNATURE "rusEFI default.2024.03.13.XXX.1625932051" #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 1468 +#define TS_TOTAL_OUTPUT_SIZE 1460 #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 b79e122..933ea77 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-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1018699323 -#define TS_SIGNATURE "rusEFI default.2024.03.07.XXX.1018699323" +#define SIGNATURE_HASH 1625932051 +#define TS_SIGNATURE "rusEFI default.2024.03.13.XXX.1625932051" diff --git a/generated/tunerstudio/generated/rusefi_XXX.ini b/generated/tunerstudio/generated/rusefi_XXX.ini index 6dc73c9..2576df7 100644 --- a/generated/tunerstudio/generated/rusefi_XXX.ini +++ b/generated/tunerstudio/generated/rusefi_XXX.ini @@ -31,18 +31,19 @@ enable2ndByteCanID = false ; setting group defined in the settingGroups.xml of the TunerStudio config ; folder. If is is an undefined referenceName, it will be added. ; keyword = referenceName, DisplayName - settingGroup = connectivityProfile, "Protocol Profile" - settingOption = CONN_SLOW, "Slower / Wireless" - settingOption = CONN_FAST, "High Speed / USB" +; see https://github.com/rusefi/rusefi/issues/6170 issue +; settingGroup = connectivityProfile, "Protocol Profile" +; settingOption = CONN_SLOW, "Slower / Wireless" +; settingOption = CONN_FAST, "High Speed / USB" [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI default.2024.03.07.XXX.1018699323" + signature = "rusEFI default.2024.03.13.XXX.1625932051" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI default.2024.03.07.XXX.1018699323" ; signature is expected to be 7 or more characters. + signature= "rusEFI default.2024.03.13.XXX.1625932051" ; 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 @@ -51,10 +52,10 @@ enable2ndByteCanID = false ; Optimize comms for fast rusEFI ECUs noCommReadDelay = true; defaultRuntimeRecordPerSec = 100; -#if CONN_SLOW -#else +;#if CONN_SLOW +;#else maxUnusedRuntimeRange = 1000; -#endif +;#endif ; Set default IP/port to our IP/port defaultIpAddress = localhost @@ -98,7 +99,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-all.jar based on (unknown script) integration/rusefi_config.txt Thu Mar 07 17:17:28 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Wed Mar 13 01:50:37 UTC 2024 pageSize = 22236 page = 1 @@ -186,7 +187,7 @@ iat_resistance_2 = scalar, F32, 404, "Ohm", 1, 0, 0, 1000000, 1 iat_resistance_3 = scalar, F32, 408, "Ohm", 1, 0, 0, 1000000, 1 iat_bias_resistor = scalar, F32, 412, "Ohm", 1, 0, 0, 200000, 1 iat_adcChannel = bits, U08, 416, [0:5], $adc_channel_e_list -launchTimingRetard = scalar, S32, 420, "deg", 1, 0, -180, 180, 2 +launchTimingRetard = scalar, F32, 420, "deg", 1, 0, -180, 180, 2 hip9011PrescalerAndSDO = scalar, S32, 424, "integer", 1, 0, 0, 32, 0 knockBandCustom = scalar, F32, 428, "kHz", 1, 0, 0, 20, 2 displacement = scalar, U16, 432, "L", 0.001, 0, 0, 65, 3 @@ -229,7 +230,7 @@ fuelLevelSensor = bits, U08, 518, [0:5], $adc_channel_e_list tps2_1AdcChannel = bits, U08, 519, [0:5], $adc_channel_e_list idle_derivativeFilterLoss = scalar, F32, 520, "x", 1, 0, -1000000, 1000000, 4 trailingSparkAngle = scalar, S32, 524, "angle", 1, 0, 0, 720, 0 -trigger_type = bits, U32, 528, [0:6], "custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "INVALID", "GM_7X", "Daihatsu 3 cylinder", "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 Cam", "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", "6/0", "Daihatsu 4 cylinder", "trg82", "trg83", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +trigger_type = bits, U32, 528, [0:6], "custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "INVALID", "GM_7X", "Daihatsu 3 cylinder", "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 Cam", "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", "12crank/24cam", "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", "6/0", "Daihatsu 4 cylinder", "trg82", "trg83", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" trigger_customTotalToothCount = scalar, S32, 532, "number", 1, 0, 1, 300, 0 trigger_customSkippedToothCount = scalar, S32, 536, "number", 1, 0, 0, 300, 0 airByRpmTaper = scalar, F32, 540, "%", 1, 0, 0, 50, 1 @@ -954,7 +955,7 @@ sentInputPins1 = bits, U16, 2278, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", launchFuelAdderPercent = scalar, S08, 2280, "%", 1, 0, 0, 100, 0 etbJamTimeout = scalar, U08, 2281, "sec", 0.02, 0, 0, 5, 2 etbExpAverageLength = scalar, U16, 2282, "", 1, 0, 0, 32000, 0 -etbDutyThreshold = scalar, F32, 2284, "", 1, 0, 0, 100, 0 +unused645646 = scalar, F32, 2284, "", 1, 0, 0, 100, 0 coastingFuelCutRpmHigh = scalar, S16, 2288, "rpm", 1, 0, 0, 5000, 0 coastingFuelCutRpmLow = scalar, S16, 2290, "rpm", 1, 0, 0, 5000, 0 coastingFuelCutTps = scalar, S16, 2292, "%", 1, 0, 0, 20, 0 @@ -1214,7 +1215,7 @@ etbMinimumPosition = scalar, F32, 4032, "%", 1, 0, 0.01, 100, 2 tuneHidingKey = scalar, U16, 4036, "", 1, 0, 0, 20000, 0 vinNumber = string, ASCII, 4038, 17 highSpeedOffsets = array, U16, 4056, [32], "", 1, 0.00000,0.00,65535, 0, noMsqSave -etbDutyShutdownThreshold = scalar, F32, 4120, "", 1, 0, 0, 100, 0 +unused3124141 = scalar, F32, 4120, "", 1, 0, 0, 100, 0 fuelPressureSensorMode = bits, U08, 4124, [0:1], "Absolute", "Gauge", "Differential", "INVALID" luaDigitalInputPins1 = bits, U16, 4126, [0:7], $switch_input_pin_e_list luaDigitalInputPins2 = bits, U16, 4128, [0:7], $switch_input_pin_e_list @@ -1262,7 +1263,7 @@ rpmSoftLimitFuelAdded = scalar, U08, 4196, "%", 0.2, 0, 0, 50, 1 rpmHardLimitHyst = scalar, U08, 4197, "RPM", 10.0, 0, 0, 2500, 0 benchTestOffTime = scalar, U16, 4198, "ms", 0.1, 0, 0, 2000, 1 boostCutPressureHyst = scalar, U08, 4200, "kPa (absolute)", 0.5, 0, 0, 125, 1 -gearBasedOpenLoopBoostAdder = array, U08, 4201, [10], "%", 0.5, 0, 0, 100, 1 +gearBasedOpenLoopBoostAdder = array, S08, 4201, [10], "%", 0.5, 0, -63, 63, 1 benchTestCount = scalar, U32, 4212, "", 1, 0, 0, 10000000, 0 iacByTpsHoldTime = scalar, U08, 4216, "seconds", 0.1, 0, 0, 25, 1 iacByTpsDecayTime = scalar, U08, 4217, "seconds", 0.1, 0, 0, 25, 1 @@ -2304,7 +2305,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 rpmHardLimitHyst = "Hysterisis: if the hard limit is 7200rpm and rpmHardLimitHyst is 200rpm, then when the ECU sees 7200rpm, fuel/ign will cut, and stay cut until 7000rpm (7200-200) is reached" benchTestOffTime = "Time between bench test pulses" boostCutPressureHyst = "Hysterisis: if hard cut is 240kpa, and boostCutPressureHyst is 20, when the ECU sees 240kpa, fuel/ign will cut, and stay cut until 240-20=220kpa is reached" - gearBasedOpenLoopBoostAdder = "Boost duty cycle added by gear" + gearBasedOpenLoopBoostAdder = "Boost duty cycle modified by gear" benchTestCount = "How many test bench pulses do you want" iacByTpsHoldTime = "How long initial IAC adder is held before starting to decay." iacByTpsDecayTime = "How long it takes to remove initial IAC adder to return to normal idle." @@ -2470,16 +2471,16 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1468 + ochBlockSize = 1460 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 scatteredOffsetArray = highSpeedOffsets -#if CONN_SLOW - scatteredGetEnabled = { 1 } -#else +;#if CONN_SLOW +; scatteredGetEnabled = { 1 } +;#else scatteredGetEnabled = { 0 } -#endif +;#endif ; ; see TunerStudioOutputChannels struct @@ -2596,14 +2597,14 @@ debugIntField2 = scalar, U32, 188, "val", 1, 0 debugIntField3 = scalar, U32, 192, "val", 1, 0 debugIntField4 = scalar, S16, 196, "val", 1, 0 debugIntField5 = scalar, S16, 198, "val", 1, 0 -egt1 = scalar, U16, 200, "deg C", 1, 0 -egt2 = scalar, U16, 202, "deg C", 1, 0 -egt3 = scalar, U16, 204, "deg C", 1, 0 -egt4 = scalar, U16, 206, "deg C", 1, 0 -egt5 = scalar, U16, 208, "deg C", 1, 0 -egt6 = scalar, U16, 210, "deg C", 1, 0 -egt7 = scalar, U16, 212, "deg C", 1, 0 -egt8 = scalar, U16, 214, "deg C", 1, 0 +egt1 = scalar, S16, 200, "deg C", 0.25, 0 +egt2 = scalar, S16, 202, "deg C", 0.25, 0 +egt3 = scalar, S16, 204, "deg C", 0.25, 0 +egt4 = scalar, S16, 206, "deg C", 0.25, 0 +egt5 = scalar, S16, 208, "deg C", 0.25, 0 +egt6 = scalar, S16, 210, "deg C", 0.25, 0 +egt7 = scalar, S16, 212, "deg C", 0.25, 0 +egt8 = scalar, S16, 214, "deg C", 0.25, 0 rawTps1Primary = scalar, S16, 216, "V", 0.001, 0 rawPpsPrimary = scalar, S16, 218, "V", 0.001, 0 rawClt = scalar, S16, 220, "V", 0.001, 0 @@ -3140,140 +3141,138 @@ luaDigitalState1 = bits, U32, 1108, [5:5] luaDigitalState2 = bits, U32, 1108, [6:6] luaDigitalState3 = bits, U32, 1108, [7:7] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 -egtValue1 = scalar, F32, 1116, "", 1, 0 -egtValue2 = scalar, F32, 1120, "", 1, 0 -luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 -luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 -tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 -desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 -globalSparkCounter = scalar, U32, 1144, "", 1, 0 -fuelingLoad = scalar, F32, 1148, "", 1, 0 -ignitionLoad = scalar, F32, 1152, "", 1, 0 -veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 -; total TS size = 1160 -tpsFrom = scalar, F32, 1160 -tpsTo = scalar, F32, 1164 -deltaTps = scalar, F32, 1168 -extraFuel = scalar, F32, 1172, "", 1, 0 -valueFromTable = scalar, F32, 1176, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1180, [0:0] -isBelowDecelThreshold = bits, U32, 1180, [1:1] -isTimeToResetAccumulator = bits, U32, 1180, [2:2] -isFractionalEnrichment = bits, U32, 1180, [3:3] -belowEpsilon = bits, U32, 1180, [4:4] -tooShort = bits, U32, 1180, [5:5] -fractionalInjFuel = scalar, F32, 1184, "", 1, 0 -accumulatedValue = scalar, F32, 1188, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 -cycleCnt = scalar, S32, 1204, "", 1, 0 -; total TS size = 1208 -hwEventCounters1 = scalar, U32, 1208, "", 1, 0 -hwEventCounters2 = scalar, U32, 1212, "", 1, 0 -hwEventCounters3 = scalar, U32, 1216, "", 1, 0 -hwEventCounters4 = scalar, U32, 1220, "", 1, 0 -hwEventCounters5 = scalar, U32, 1224, "", 1, 0 -hwEventCounters6 = scalar, U32, 1228, "", 1, 0 -vvtCamCounter = scalar, U32, 1232, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1264, [0:0] -; total TS size = 1268 -crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +luaSoftSparkSkip = scalar, F32, 1116, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1120, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1124, "", 1, 0 +desiredRpmLimit = scalar, S16, 1128, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1132, "", 1, 0 +globalSparkCounter = scalar, U32, 1136, "", 1, 0 +fuelingLoad = scalar, F32, 1140, "", 1, 0 +ignitionLoad = scalar, F32, 1144, "", 1, 0 +veTableYAxis = scalar, U16, 1148, "%", 0.01, 0 +; total TS size = 1152 +tpsFrom = scalar, F32, 1152 +tpsTo = scalar, F32, 1156 +deltaTps = scalar, F32, 1160 +extraFuel = scalar, F32, 1164, "", 1, 0 +valueFromTable = scalar, F32, 1168, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1172, [0:0] +isBelowDecelThreshold = bits, U32, 1172, [1:1] +isTimeToResetAccumulator = bits, U32, 1172, [2:2] +isFractionalEnrichment = bits, U32, 1172, [3:3] +belowEpsilon = bits, U32, 1172, [4:4] +tooShort = bits, U32, 1172, [5:5] +fractionalInjFuel = scalar, F32, 1176, "", 1, 0 +accumulatedValue = scalar, F32, 1180, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1184, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1188, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1192, "", 1, 0 +cycleCnt = scalar, S32, 1196, "", 1, 0 +; total TS size = 1200 +hwEventCounters1 = scalar, U32, 1200, "", 1, 0 +hwEventCounters2 = scalar, U32, 1204, "", 1, 0 +hwEventCounters3 = scalar, U32, 1208, "", 1, 0 +hwEventCounters4 = scalar, U32, 1212, "", 1, 0 +hwEventCounters5 = scalar, U32, 1216, "", 1, 0 +hwEventCounters6 = scalar, U32, 1220, "", 1, 0 +vvtCamCounter = scalar, U32, 1224, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1228, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1232, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1236, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1237, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1240, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1244, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1248, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1252, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1256, [0:0] +; total TS size = 1260 +crankSynchronizationCounter0 = scalar, U32, 1260, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1264, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1268, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1272, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1292, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1296, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1297, "", 1, 0 +; total TS size = 1300 +camResyncCounter = scalar, U08, 1300, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1304, [0:0] ; total TS size = 1308 -camResyncCounter = scalar, U08, 1308, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +wallFuelCorrection = scalar, F32, 1308, "", 1, 0 +wallFuel = scalar, F32, 1312, "", 1, 0 ; total TS size = 1316 -wallFuelCorrection = scalar, F32, 1316, "", 1, 0 -wallFuel = scalar, F32, 1320, "", 1, 0 -; total TS size = 1324 -idleState = bits, S32, 1324, [0:2], "not important" -currentIdlePosition = scalar, F32, 1328 -baseIdlePosition = scalar, F32, 1332 -idleClosedLoop = scalar, F32, 1336 -iacByTpsTaper = scalar, F32, 1340 -throttlePedalUpState = scalar, S32, 1344, "", 1, 0 -mightResetPid = bits, U32, 1348, [0:0] -shouldResetPid = bits, U32, 1348, [1:1] -wasResetPid = bits, U32, 1348, [2:2] -mustResetPid = bits, U32, 1348, [3:3] -isCranking = bits, U32, 1348, [4:4] -isIacTableForCoasting = bits, U32, 1348, [5:5] -notIdling = bits, U32, 1348, [6:6] -needReset = bits, U32, 1348, [7:7] -isInDeadZone = bits, U32, 1348, [8:8] -isBlipping = bits, U32, 1348, [9:9] -useClosedLoop = bits, U32, 1348, [10:10] -badTps = bits, U32, 1348, [11:11] -looksLikeRunning = bits, U32, 1348, [12:12] -looksLikeCoasting = bits, U32, 1348, [13:13] -looksLikeCrankToIdle = bits, U32, 1348, [14:14] -isIdleCoasting = bits, U32, 1348, [15:15] -isIdleClosedLoop = bits, U32, 1348, [16:16] -idleTarget = scalar, S32, 1352, "", 1, 0 -targetRpmByClt = scalar, S32, 1356, "", 1, 0 -targetRpmAc = scalar, S32, 1360, "", 1, 0 -iacByRpmTaper = scalar, F32, 1364 -luaAdd = scalar, F32, 1368 -; total TS size = 1372 -idlePosition0 = scalar, F32, 1372, "per", 1,0 -trim0 = scalar, F32, 1376, "", 1, 0 -luaAdjustment0 = scalar, F32, 1380, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 -etbFeedForward0 = scalar, F32, 1388 -etbIntegralError0 = scalar, F32, 1392, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1404, [0:0] -jamDetected0 = bits, U32, 1404, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 -etbErrorCode0 = scalar, S08, 1420, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 -jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 -; total TS size = 1424 -faultCode0 = scalar, U08, 1424, "", 1, 0 -heaterDuty0 = scalar, U08, 1425, "%", 1, 0 -pumpDuty0 = scalar, U08, 1426, "%", 1, 0 -tempC0 = scalar, U16, 1428, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 -esr0 = scalar, U16, 1432, "ohm", 1, 0 -; total TS size = 1436 -dcOutput0 = scalar, F32, 1436, "per", 1,0 -isEnabled0_int = scalar, U08, 1440, "per", 1,0 -isEnabled0 = bits, U32, 1444, [0:0] +idleState = bits, S32, 1316, [0:2], "not important" +currentIdlePosition = scalar, F32, 1320 +baseIdlePosition = scalar, F32, 1324 +idleClosedLoop = scalar, F32, 1328 +iacByTpsTaper = scalar, F32, 1332 +throttlePedalUpState = scalar, S32, 1336, "", 1, 0 +mightResetPid = bits, U32, 1340, [0:0] +shouldResetPid = bits, U32, 1340, [1:1] +wasResetPid = bits, U32, 1340, [2:2] +mustResetPid = bits, U32, 1340, [3:3] +isCranking = bits, U32, 1340, [4:4] +isIacTableForCoasting = bits, U32, 1340, [5:5] +notIdling = bits, U32, 1340, [6:6] +needReset = bits, U32, 1340, [7:7] +isInDeadZone = bits, U32, 1340, [8:8] +isBlipping = bits, U32, 1340, [9:9] +useClosedLoop = bits, U32, 1340, [10:10] +badTps = bits, U32, 1340, [11:11] +looksLikeRunning = bits, U32, 1340, [12:12] +looksLikeCoasting = bits, U32, 1340, [13:13] +looksLikeCrankToIdle = bits, U32, 1340, [14:14] +isIdleCoasting = bits, U32, 1340, [15:15] +isIdleClosedLoop = bits, U32, 1340, [16:16] +idleTarget = scalar, S32, 1344, "", 1, 0 +targetRpmByClt = scalar, S32, 1348, "", 1, 0 +targetRpmAc = scalar, S32, 1352, "", 1, 0 +iacByRpmTaper = scalar, F32, 1356 +luaAdd = scalar, F32, 1360 +; total TS size = 1364 +idlePosition0 = scalar, F32, 1364, "per", 1,0 +trim0 = scalar, F32, 1368, "", 1, 0 +luaAdjustment0 = scalar, F32, 1372, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1376, "per", 1,0 +etbFeedForward0 = scalar, F32, 1380 +etbIntegralError0 = scalar, F32, 1384, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1388, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1392, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1396, [0:0] +jamDetected0 = bits, U32, 1396, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1400, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1404, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1408, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1410, "count", 1,0 +etbErrorCode0 = scalar, S08, 1412, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1413, "", 1, 0 +jamTimer0 = scalar, U16, 1414, "sec", 0.01, 0 +; total TS size = 1416 +faultCode0 = scalar, U08, 1416, "", 1, 0 +heaterDuty0 = scalar, U08, 1417, "%", 1, 0 +pumpDuty0 = scalar, U08, 1418, "%", 1, 0 +tempC0 = scalar, U16, 1420, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1422, "V", 0.001, 0 +esr0 = scalar, U16, 1424, "ohm", 1, 0 +; total TS size = 1428 +dcOutput0 = scalar, F32, 1428, "per", 1,0 +isEnabled0_int = scalar, U08, 1432, "per", 1,0 +isEnabled0 = bits, U32, 1436, [0:0] +; total TS size = 1440 +value0 = scalar, U16, 1440, "value", 1,0 +value1 = scalar, U16, 1442, "value", 1,0 +errorRate = scalar, F32, 1444, "ratio", 1,0 ; total TS size = 1448 -value0 = scalar, U16, 1448, "value", 1,0 -value1 = scalar, U16, 1450, "value", 1,0 -errorRate = scalar, F32, 1452, "ratio", 1,0 -; total TS size = 1456 -vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +vvtTarget = scalar, U16, 1448, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1450, "%", 0.5, 0 +; total TS size = 1452 +lambdaCurrentlyGood = bits, U32, 1452, [0:0] +lambdaMonitorCut = bits, U32, 1452, [1:1] +lambdaTimeSinceGood = scalar, U16, 1456, "sec", 0.01, 0 ; total TS size = 1460 -lambdaCurrentlyGood = bits, U32, 1460, [0:0] -lambdaMonitorCut = bits, U32, 1460, [1:1] -lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 -; total TS size = 1468 time = { timeNow } @@ -3938,7 +3937,7 @@ curve = rangeMatrix, "Range Switch Input Matrix" yBins = throttleEstimateEffectiveAreaValues gauge = TPSGauge - curve = boostOpenLoopGearAdderCurve, "Boost Open Loop gear-based adder" + curve = boostOpenLoopGearAdderCurve, "Boost Open Loop gear-based modifier" columnLabel = "Gear", "duty cycle" xAxis = 0, 100, 11 yAxis = 0, 100, 5 @@ -4595,13 +4594,21 @@ gaugeCategory = Sensors - Extra 2 accelerationLonGauge = accelerationLon, "Accel: Longitudinal", "acc", -2, 2, -2, -1, 1, 2, 3, 1 accelerationVertGauge = accelerationVert, "Accel: Vertical", "acc", 0, 1.5, 0.5, 0.6, 1.4, 1.5, 3, 1 gyroYawGauge = gyroYaw, "Gyro: Yaw rate", "acc", -100, 100, -100, -100, 100, 100, 3, 1 - egt1Gauge = egt1, "EGT#1", "C", 0, 2000 - egt2Gauge = egt2, "EGT#2", "C", 0, 2000 rpmAccelerationGa = rpmAcceleration, "rpm delta", "RPM/s", -2000, 2000, -2000, 2000, -2000, 2000, 0, 0 wastegatePosGauge = wastegatePositionSensor, "Wastegate position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 auxSpeed1Gauge = auxSpeed1, "Aux Freq Input1", "hz", 0, 30000, 0, 0, 30000, 30000, 0, 0 auxSpeed2Gauge = auxSpeed2, "Aux Freq Input2", "hz", 0, 30000, 0, 0, 30000, 30000, 0, 0 +gaugeCategory = Sensors - EGT + egt1Gauge = egt1, "EGT#1", "C", -100, 1400, 100, 200, 900, 1000, 2, 1 + egt2Gauge = egt2, "EGT#2", "C", -100, 1400, 100, 200, 900, 1000, 2, 1 + egt3Gauge = egt3, "EGT#3", "C", -100, 1400, 100, 200, 900, 1000, 2, 1 + egt4Gauge = egt4, "EGT#4", "C", -100, 1400, 100, 200, 900, 1000, 2, 1 + egt5Gauge = egt5, "EGT#5", "C", -100, 1400, 100, 200, 900, 1000, 2, 1 + egt6Gauge = egt6, "EGT#6", "C", -100, 1400, 100, 200, 900, 1000, 2, 1 + egt7Gauge = egt7, "EGT#7", "C", -100, 1400, 100, 200, 900, 1000, 2, 1 + egt8Gauge = egt8, "EGT#8", "C", -100, 1400, 100, 200, 900, 1000, 2, 1 + gaugeCategory = VVT vvtPositionB1IGauge = vvtPositionB1I, "VVT: bank 1 intake", "deg", -60, 60, -60, -60, 60, 60, 1, 1 vvtPositionB1EGauge = vvtPositionB1E, "VVT: bank 1 exhaust", "deg", -60, 60, -60, -60, 60, 60, 1, 1 @@ -4964,14 +4971,14 @@ entry = debugIntField2, "debugIntField2", int, "%d" entry = debugIntField3, "debugIntField3", int, "%d" entry = debugIntField4, "debugIntField4", int, "%d" entry = debugIntField5, "debugIntField5", int, "%d" -entry = egt1, "EGT 1", int, "%d" -entry = egt2, "EGT 2", int, "%d" -entry = egt3, "EGT 3", int, "%d" -entry = egt4, "EGT 4", int, "%d" -entry = egt5, "EGT 5", int, "%d" -entry = egt6, "EGT 6", int, "%d" -entry = egt7, "EGT 7", int, "%d" -entry = egt8, "EGT 8", int, "%d" +entry = egt1, "EGT 1", float, "%.3f" +entry = egt2, "EGT 2", float, "%.3f" +entry = egt3, "EGT 3", float, "%.3f" +entry = egt4, "EGT 4", float, "%.3f" +entry = egt5, "EGT 5", float, "%.3f" +entry = egt6, "EGT 6", float, "%.3f" +entry = egt7, "EGT 7", float, "%.3f" +entry = egt8, "EGT 8", float, "%.3f" entry = rawTps1Primary, "rawTps1Primary", float, "%.3f" entry = rawPpsPrimary, "rawPpsPrimary", float, "%.3f" entry = rawClt, "rawClt", float, "%.3f" @@ -5412,8 +5419,6 @@ entry = luaDigitalState1, "luaDigitalState1", int, "%d" entry = luaDigitalState2, "luaDigitalState2", int, "%d" entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" -entry = egtValue1, "egtValue1", float, "%.3f" -entry = egtValue2, "egtValue2", float, "%.3f" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" @@ -5823,16 +5828,6 @@ menuDialog = main groupChildMenu = scriptCurve5Settings, "Script Curve #5" groupChildMenu = scriptCurve6Settings, "Script Curve #6" - subMenu = std_separator - subMenu = tcuControls, "Transmission Settings (alpha)" - subMenu = gearControls, "Gear Selection Settings (alpha)" - subMenu = inputSpeedSensor, "Input Speed Sensor (alpha)" - subMenu = tcuSolenoidTableTbl, "Shift Solenoids (alpha)" - subMenu = tccCurves, "TCC Lock/Unlock Speed (alpha)" - subMenu = pcPerGearDialog, "Line Pressure Per Gear (alpha)" - subMenu = pcPerShiftDialog, "Line Pressure Per Shift (alpha)" - subMenu = 32Dialog, "3-2 Shift Solenoid Percent by Speed (alpha)" - subMenu = rangeMatrixDialog, "Range Selector Input Matrix (alpha)" menu = "&Sensors" # Base analog input settings @@ -5905,17 +5900,11 @@ menuDialog = main subMenu = allPins1, "Full pinout 1/3" subMenu = allPins2, "Full pinout 2/3" subMenu = allPins3_1_and_2 "Full pinout 3/3" - subMenu = std_separator - # EXPERIMENTAL FEATURES - subMenu = mc33Dialog, "PT2001 control" - subMenu = hpfpCamDialog, "HPFP Cam Configuration" - subMenu = hpfpPumpDialog, "HPFP Pump Configuration", {hpfpCamLobes != 0} - subMenu = hpfpTargetTable, "HPFP Target Pressure", {hpfpCamLobes != 0} - subMenu = hpfpCompensationTable, "HPFP Pump Compensation", {hpfpCamLobes != 0} + + subMenu = std_separator - subMenu = fancyHardwareDialog, "Fancy Hardware" subMenu = tractionEtbTableTbl, "Traction Control ETB Drop" subMenu = tractionTimingTableTbl, "Traction Control Timing Adjustment" subMenu = tractionIgnitionSkipDialog, "Traction Control Skip Ignition" @@ -5927,7 +5916,6 @@ menuDialog = main subMenu = lambdaProtection, "Lambda Protection", 0, { isInjectionEnabled } subMenu = std_separator - subMenu = kLineDialog, "K-Line" subMenu = parkingLot, "Experimental/Broken" subMenu = parkingLot2, "Experimental 2" subMenu = harleyAcr, "HD" @@ -6396,19 +6384,16 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter - graphLine = egtValue1 - graphLine = egtValue2 - liveGraph = engine_state_6_Graph, "Graph", South graphLine = luaSoftSparkSkip graphLine = luaHardSparkSkip + liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad - liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 @@ -6712,14 +6697,12 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Number of cylinders", cylindersCount field = "Displacement", displacement field = "Firing order", firingOrder - field = "Vehicle weight", vehicleWeight dialog = engineMetadata, "Engine Metadata" field = "#These metadata are used by rusEFI Online" field = "Engine Make", engineMake field = "Manufacturer Engine Code", engineCode field = "Vehicle Name", vehicleName - field = "Compression Ratio", compressionRatio field = "Forced Induction?", isForcedInduction dialog = trigger_primary, "Primary Trigger" @@ -8354,7 +8337,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = " Threshold", sensorSnifferRpmThreshold field = "Engine Sniffer Threshold", engineSnifferRpmThreshold - dialog = generalSettings, "Fuel" + dialog = fuelStrategyPanel, "Fuel" field = "!https://rusefi.com/s/fuel" field = "Fuel strategy", fuelAlgorithm @@ -8405,8 +8388,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" topicHelp = "baseHelp" panel = baseEngineConfig panel = engineMetadata - panel = generalSettings - panel = debugging + panel = fuelStrategyPanel dialog = crankingFuel, "Fuel" field = "Injection mode", crankingInjectionMode @@ -8971,8 +8953,6 @@ dialog = tcuControls, "Transmission Settings" field = "Trailing Pin 4", trailingCoilPins4 dialog = fancyHardwareDialog, "Fancy Boards" - field = "etbDutyThreshold", etbDutyThreshold - field = "etbDutyShutdownThreshold", etbDutyShutdownThreshold dialog = parkingLot2, "Experimental 2" field = dacOutputPins1, dacOutputPins1