diff --git a/generated/console/binary/generated/data_logs.ini b/generated/console/binary/generated/data_logs.ini index aa3b537..dd72685 100644 --- a/generated/console/binary/generated/data_logs.ini +++ b/generated/console/binary/generated/data_logs.ini @@ -414,6 +414,8 @@ entry = rawAuxTemp1, "rawAuxTemp1", float, "%.3f" entry = rawAuxTemp2, "rawAuxTemp2", float, "%.3f" entry = rawAmbientTemp, "rawAmbientTemp", float, "%.3f" entry = rtcUnixEpochTime, "rtcUnixEpochTime", int, "%d" +entry = sparkCutReasonBlinker, "sparkCutReasonBlinker", int, "%d" +entry = fuelCutReasonBlinker, "fuelCutReasonBlinker", int, "%d" entry = totalFuelCorrection, "Fuel: Total correction", float, "%.3f" entry = running_postCrankingFuelCorrection, "Fuel: Post cranking mult", float, "%.3f" entry = running_intakeTemperatureCoefficient, "Fuel: IAT correction", float, "%.3f" @@ -770,6 +772,7 @@ entry = jamDetected0, "jamDetected0", int, "%d" entry = etbTpsErrorCounter0, "ETB TPS error counter0", int, "%d" entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" +entry = etbErrorCodeBlinker0, "etbErrorCodeBlinker0", int, "%d" entry = tcEtbDrop0, "ETB traction control0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" entry = adjustedEtbTarget0, "ETB with adjustments0", int, "%d" @@ -786,6 +789,7 @@ entry = jamDetected1, "jamDetected1", int, "%d" entry = etbTpsErrorCounter1, "ETB TPS error counter1", int, "%d" entry = etbPpsErrorCounter1, "ETB pedal error counter1", int, "%d" entry = etbErrorCode1, "etbErrorCode1", int, "%d" +entry = etbErrorCodeBlinker1, "etbErrorCodeBlinker1", int, "%d" entry = tcEtbDrop1, "ETB traction control1", int, "%d" entry = jamTimer1, "ETB jam timer1", float, "%.3f" entry = adjustedEtbTarget1, "ETB with adjustments1", int, "%d" diff --git a/generated/console/binary/generated/fancy_content.ini b/generated/console/binary/generated/fancy_content.ini index cf96796..2d33091 100644 --- a/generated/console/binary/generated/fancy_content.ini +++ b/generated/console/binary/generated/fancy_content.ini @@ -547,8 +547,9 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etbTpsErrorCounter0 graphLine = etbPpsErrorCounter0 graphLine = etbErrorCode0 - graphLine = tcEtbDrop0 + graphLine = etbErrorCodeBlinker0 liveGraph = electronic_throttle0_4_Graph, "Graph", South + graphLine = tcEtbDrop0 graphLine = jamTimer0 graphLine = adjustedEtbTarget0 @@ -572,8 +573,9 @@ dialog = electronic_throttle1Dialog, "electronic_throttle1" graphLine = etbTpsErrorCounter1 graphLine = etbPpsErrorCounter1 graphLine = etbErrorCode1 - graphLine = tcEtbDrop1 + graphLine = etbErrorCodeBlinker1 liveGraph = electronic_throttle1_4_Graph, "Graph", South + graphLine = tcEtbDrop1 graphLine = jamTimer1 graphLine = adjustedEtbTarget1 diff --git a/generated/console/binary/generated/output_channels.ini b/generated/console/binary/generated/output_channels.ini index 852ce1a..c9dd40b 100644 --- a/generated/console/binary/generated/output_channels.ini +++ b/generated/console/binary/generated/output_channels.ini @@ -416,62 +416,60 @@ rawAuxTemp1 = scalar, S16, 782, "V", 0.001, 0 rawAuxTemp2 = scalar, S16, 784, "V", 0.001, 0 rawAmbientTemp = scalar, S16, 786, "V", 0.001, 0 rtcUnixEpochTime = scalar, U32, 788, "", 1, 0 -unusedAtTheEnd1 = scalar, U08, 792, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 793, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 794, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 795, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 796, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 797, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 798, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 799, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 800, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 801, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 802, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 803, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 804, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 805, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 806, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 807, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 808, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 809, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 810, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 811, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 812, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 813, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 814, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 815, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 816, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 817, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 818, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 819, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 820, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 821, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 822, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 823, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 824, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 825, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 826, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 827, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 828, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 829, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 830, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 831, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 832, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 833, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 834, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 835, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 836, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 837, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 838, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 839, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 840, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 841, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 842, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 843, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 844, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 845, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 846, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 847, "", 1, 0 +sparkCutReasonBlinker = scalar, S08, 792, "", 1, 0 +fuelCutReasonBlinker = scalar, S08, 793, "", 1, 0 +unusedAtTheEnd1 = scalar, U08, 794, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 795, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 796, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 797, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 798, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 799, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 800, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 801, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 802, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 803, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 804, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 805, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 806, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 807, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 808, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 809, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 810, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 811, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 812, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 813, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 814, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 815, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 816, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 817, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 818, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 819, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 820, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 821, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 822, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 823, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 824, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 825, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 826, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 827, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 828, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 829, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 830, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 831, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 832, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 833, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 834, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 835, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 836, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 837, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 838, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 839, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 840, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 841, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 842, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 843, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 844, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 845, "", 1, 0 ; total TS size = 848 totalFuelCorrection = scalar, F32, 848, "mult", 1,0 running_postCrankingFuelCorrection = scalar, F32, 852, "", 1, 0 @@ -857,9 +855,10 @@ jamDetected0 = bits, U32, 1704, [1:1] etbTpsErrorCounter0 = scalar, U16, 1708, "count", 1,0 etbPpsErrorCounter0 = scalar, U16, 1710, "count", 1,0 etbErrorCode0 = scalar, S08, 1712, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1713, "%", 1, 0 -jamTimer0 = scalar, U16, 1714, "sec", 0.01, 0 -adjustedEtbTarget0 = scalar, S08, 1716, "%", 1, 0 +etbErrorCodeBlinker0 = scalar, S08, 1713, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1714, "%", 1, 0 +jamTimer0 = scalar, U16, 1716, "sec", 0.01, 0 +adjustedEtbTarget0 = scalar, S08, 1718, "%", 1, 0 ; total TS size = 1720 targetWithIdlePosition1 = scalar, F32, 1720, "per", 1,0 trim1 = scalar, F32, 1724, "", 1, 0 @@ -874,9 +873,10 @@ jamDetected1 = bits, U32, 1752, [1:1] etbTpsErrorCounter1 = scalar, U16, 1756, "count", 1,0 etbPpsErrorCounter1 = scalar, U16, 1758, "count", 1,0 etbErrorCode1 = scalar, S08, 1760, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1761, "%", 1, 0 -jamTimer1 = scalar, U16, 1762, "sec", 0.01, 0 -adjustedEtbTarget1 = scalar, S08, 1764, "%", 1, 0 +etbErrorCodeBlinker1 = scalar, S08, 1761, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1762, "%", 1, 0 +jamTimer1 = scalar, U16, 1764, "sec", 0.01, 0 +adjustedEtbTarget1 = scalar, S08, 1766, "%", 1, 0 ; total TS size = 1768 faultCode0 = scalar, U08, 1768, "", 1, 0 heaterDuty0 = scalar, U08, 1769, "%", 1, 0 diff --git a/generated/console/binary_log/log_fields_generated.h b/generated/console/binary_log/log_fields_generated.h index bea664d..0537973 100644 --- a/generated/console/binary_log/log_fields_generated.h +++ b/generated/console/binary_log/log_fields_generated.h @@ -335,6 +335,8 @@ static const LogField fields[] = { {engine->outputChannels.rawAuxTemp2, "rawAuxTemp2", "V", 3}, {engine->outputChannels.rawAmbientTemp, "rawAmbientTemp", "V", 3}, {engine->outputChannels.rtcUnixEpochTime, "rtcUnixEpochTime", "", 0}, + {engine->outputChannels.sparkCutReasonBlinker, "sparkCutReasonBlinker", "", 0}, + {engine->outputChannels.fuelCutReasonBlinker, "fuelCutReasonBlinker", "", 0}, #if EFI_ENGINE_CONTROL {engine->fuelComputer.totalFuelCorrection, "Fuel: Total correction", "mult", 2, "Fuel: math"}, #endif diff --git a/generated/controllers/generated/engine_configuration_generated_structures_mega100.h b/generated/controllers/generated/engine_configuration_generated_structures_mega100.h index 97adb83..fb54578 100644 --- a/generated/controllers/generated/engine_configuration_generated_structures_mega100.h +++ b/generated/controllers/generated/engine_configuration_generated_structures_mega100.h @@ -2383,7 +2383,7 @@ struct engine_configuration_s { bool torqueReductionTriggerPinInverted : 1 {}; /** offset 1304 bit 22 */ - bool unusedFancy14 : 1 {}; + bool limitTorqueReductionTime : 1 {}; /** offset 1304 bit 23 */ bool unusedFancy7 : 1 {}; @@ -4626,7 +4626,7 @@ struct engine_configuration_s { scaled_channel knockFuelTrimAggression; /** * After a knock event, reapply fuel at this rate. - * units: deg/s + * units: 1%/s * offset 3898 */ scaled_channel knockFuelTrimReapplyRate; diff --git a/generated/controllers/generated/rusefi_generated_mega100.h b/generated/controllers/generated/rusefi_generated_mega100.h index e403bbd..98de78d 100644 --- a/generated/controllers/generated/rusefi_generated_mega100.h +++ b/generated/controllers/generated/rusefi_generated_mega100.h @@ -1168,7 +1168,7 @@ #define MAP_UPPER_LIMIT 255 #define MAP_WINDOW_SIZE 8 #define MAX_CYLINDER_COUNT 12 -#define MAX_TPS_PPS_DISCREPANCY 5 +#define MAX_TPS_PPS_DISCREPANCY 10 #define mc33810maxDwellTimer_e_auto_enum 0="DWELL_2MS",3="DWELL_16MS",4="DWELL_32MS",1="DWELL_4MS",5="DWELL_64MS",2="DWELL_8MS" #define mc33810maxDwellTimer_e_DWELL_16MS 3 #define mc33810maxDwellTimer_e_DWELL_2MS 0 @@ -1293,7 +1293,7 @@ #define SentEtbType_NONE 0 #define show_tcu_gauges true #define show_vvt_output_pin true -#define SIGNATURE_HASH 2567730252 +#define SIGNATURE_HASH 2793772934 #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" @@ -1754,7 +1754,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI main.2024.11.01.mega100.2567730252" +#define TS_SIGNATURE "rusEFI main.2024.11.02.mega100.2793772934" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/generated/controllers/generated/signature_mega100.h b/generated/controllers/generated/signature_mega100.h index 8c8d755..7bda420 100644 --- a/generated/controllers/generated/signature_mega100.h +++ b/generated/controllers/generated/signature_mega100.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 2567730252 -#define TS_SIGNATURE "rusEFI main.2024.11.01.mega100.2567730252" +#define SIGNATURE_HASH 2793772934 +#define TS_SIGNATURE "rusEFI main.2024.11.02.mega100.2793772934" diff --git a/generated/live_data_generated/electronic_throttle_generated.h b/generated/live_data_generated/electronic_throttle_generated.h index 9a339ae..60e2355 100644 --- a/generated/live_data_generated/electronic_throttle_generated.h +++ b/generated/live_data_generated/electronic_throttle_generated.h @@ -159,30 +159,40 @@ struct electronic_throttle_s { * offset 40 */ int8_t etbErrorCode = (int8_t)0; + /** + * offset 41 + */ + int8_t etbErrorCodeBlinker = (int8_t)0; /** * ETB traction control * units: % - * offset 41 + * offset 42 */ int8_t tcEtbDrop = (int8_t)0; + /** + * need 4 byte alignment + * units: units + * offset 43 + */ + uint8_t alignmentFill_at_43[1]; /** * ETB jam timer * units: sec - * offset 42 + * offset 44 */ scaled_channel jamTimer = (uint16_t)0; /** * ETB with adjustments * units: % - * offset 44 + * offset 46 */ int8_t adjustedEtbTarget = (int8_t)0; /** * need 4 byte alignment * units: units - * offset 45 + * offset 47 */ - uint8_t alignmentFill_at_45[3]; + uint8_t alignmentFill_at_47[1]; }; static_assert(sizeof(electronic_throttle_s) == 48); diff --git a/generated/live_data_generated/output_channels_generated.h b/generated/live_data_generated/output_channels_generated.h index 3c82837..7e7e06d 100644 --- a/generated/live_data_generated/output_channels_generated.h +++ b/generated/live_data_generated/output_channels_generated.h @@ -1387,7 +1387,21 @@ struct output_channels_s { /** * offset 792 */ - uint8_t unusedAtTheEnd[56]; + int8_t sparkCutReasonBlinker = (int8_t)0; + /** + * offset 793 + */ + int8_t fuelCutReasonBlinker = (int8_t)0; + /** + * offset 794 + */ + uint8_t unusedAtTheEnd[52]; + /** + * need 4 byte alignment + * units: units + * offset 846 + */ + uint8_t alignmentFill_at_846[2]; }; static_assert(sizeof(output_channels_s) == 848); diff --git a/generated/tunerstudio/generated/rusefi_mega100.ini b/generated/tunerstudio/generated/rusefi_mega100.ini index d0ad50c..6e4a906 100644 --- a/generated/tunerstudio/generated/rusefi_mega100.ini +++ b/generated/tunerstudio/generated/rusefi_mega100.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI main.2024.11.01.mega100.2567730252" + signature = "rusEFI main.2024.11.02.mega100.2793772934" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI main.2024.11.01.mega100.2567730252" ; signature is expected to be 7 or more characters. + signature= "rusEFI main.2024.11.02.mega100.2793772934" ; 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 @@ -269,7 +269,7 @@ afr_value1 = scalar, F32, 568, "AFR", 1, 0, 0, 1000, 2 afr_v2 = scalar, F32, 572, "volts", 1, 0, 0, 10, 2 afr_value2 = scalar, F32, 576, "AFR", 1, 0, 0, 1000, 2 throttlePedalPositionAdcChannel = bits, U08, 580, [0:5], $adc_channel_e_list -etbSplit = scalar, U08, 581, "%", 0.1, 0, 0, 5, 1 +etbSplit = scalar, U08, 581, "%", 0.1, 0, 0, 10, 1 tle6240_cs = bits, U16, 582, [0:8], $gpio_list tle6240_csPinMode = bits, U08, 584, [0:1], "default", "default inverted", "open collector", "open collector inverted" mc33810_csPinMode = bits, U08, 585, [0:1], "default", "default inverted", "open collector", "open collector inverted" @@ -634,7 +634,7 @@ launchFuelCutEnable = bits, U32, 1304, [18:18], "false", "true" launchSparkCutEnable = bits, U32, 1304, [19:19], "false", "true" torqueReductionEnabled = bits, U32, 1304, [20:20], "false", "true" torqueReductionTriggerPinInverted = bits, U32, 1304, [21:21], "false", "true" -unusedFancy14 = bits, U32, 1304, [22:22], "false", "true" +limitTorqueReductionTime = bits, U32, 1304, [22:22], "false", "true" unusedFancy7 = bits, U32, 1304, [23:23], "false", "true" unusedFancy8 = bits, U32, 1304, [24:24], "false", "true" unusedFancy9 = bits, U32, 1304, [25:25], "false", "true" @@ -742,7 +742,7 @@ throttlePedalUpVoltage = scalar, F32, 1476, "voltage", 1, 0, -6, 6, 2 throttlePedalWOTVoltage = scalar, F32, 1480, "voltage", 1, 0, -6, 6, 2 startUpFuelPumpDuration = scalar, S16, 1484, "seconds", 1, 0, 0, 6000, 0 idlePidRpmDeadZone = scalar, S16, 1486, "RPM", 1, 0, 0, 800, 0 -torqueReductionTime = scalar, F32, 1488, "ms", 1, 0, 1, 300, 0 +torqueReductionTime = scalar, F32, 1488, "ms", 1, 0, 1, 2000, 0 mc33810DisableRecoveryMode = bits, U32, 1492, [0:0], "false", "true" mc33810Gpgd0Mode = bits, U32, 1492, [1:1], "false", "true" mc33810Gpgd1Mode = bits, U32, 1492, [2:2], "false", "true" @@ -1397,7 +1397,7 @@ auxLinear4_v2 = scalar, F32, 3888, "volts", 1, 0, 0, 10, 2 auxLinear4_value2 = scalar, F32, 3892, "", 1, 0, -100000, 1000000, 2 knockSuppressMinTps = scalar, U08, 3896, "%", 1, 0, 0, 100, 1 knockFuelTrimAggression = scalar, U08, 3897, "%", 0.1, 0, 0, 20, 1 -knockFuelTrimReapplyRate = scalar, U08, 3898, "deg/s", 0.1, 0, 0, 10, 1 +knockFuelTrimReapplyRate = scalar, U08, 3898, "1%/s", 0.1, 0, 0, 10, 1 knockFuelTrim = scalar, U08, 3899, "%", 1, 0, 0, 30, 1 knockSpectrumSensitivity = scalar, F32, 3900, "sense", 1, 0, 0, 1, 2 knockFrequency = scalar, F32, 3904, "Hz", 1, 0, 0, 20000, 2 @@ -3007,62 +3007,60 @@ rawAuxTemp1 = scalar, S16, 782, "V", 0.001, 0 rawAuxTemp2 = scalar, S16, 784, "V", 0.001, 0 rawAmbientTemp = scalar, S16, 786, "V", 0.001, 0 rtcUnixEpochTime = scalar, U32, 788, "", 1, 0 -unusedAtTheEnd1 = scalar, U08, 792, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 793, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 794, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 795, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 796, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 797, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 798, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 799, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 800, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 801, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 802, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 803, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 804, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 805, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 806, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 807, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 808, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 809, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 810, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 811, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 812, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 813, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 814, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 815, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 816, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 817, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 818, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 819, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 820, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 821, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 822, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 823, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 824, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 825, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 826, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 827, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 828, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 829, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 830, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 831, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 832, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 833, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 834, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 835, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 836, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 837, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 838, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 839, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 840, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 841, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 842, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 843, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 844, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 845, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 846, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 847, "", 1, 0 +sparkCutReasonBlinker = scalar, S08, 792, "", 1, 0 +fuelCutReasonBlinker = scalar, S08, 793, "", 1, 0 +unusedAtTheEnd1 = scalar, U08, 794, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 795, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 796, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 797, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 798, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 799, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 800, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 801, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 802, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 803, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 804, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 805, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 806, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 807, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 808, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 809, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 810, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 811, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 812, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 813, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 814, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 815, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 816, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 817, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 818, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 819, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 820, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 821, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 822, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 823, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 824, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 825, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 826, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 827, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 828, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 829, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 830, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 831, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 832, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 833, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 834, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 835, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 836, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 837, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 838, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 839, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 840, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 841, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 842, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 843, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 844, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 845, "", 1, 0 ; total TS size = 848 totalFuelCorrection = scalar, F32, 848, "mult", 1,0 running_postCrankingFuelCorrection = scalar, F32, 852, "", 1, 0 @@ -3448,9 +3446,10 @@ jamDetected0 = bits, U32, 1704, [1:1] etbTpsErrorCounter0 = scalar, U16, 1708, "count", 1,0 etbPpsErrorCounter0 = scalar, U16, 1710, "count", 1,0 etbErrorCode0 = scalar, S08, 1712, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1713, "%", 1, 0 -jamTimer0 = scalar, U16, 1714, "sec", 0.01, 0 -adjustedEtbTarget0 = scalar, S08, 1716, "%", 1, 0 +etbErrorCodeBlinker0 = scalar, S08, 1713, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1714, "%", 1, 0 +jamTimer0 = scalar, U16, 1716, "sec", 0.01, 0 +adjustedEtbTarget0 = scalar, S08, 1718, "%", 1, 0 ; total TS size = 1720 targetWithIdlePosition1 = scalar, F32, 1720, "per", 1,0 trim1 = scalar, F32, 1724, "", 1, 0 @@ -3465,9 +3464,10 @@ jamDetected1 = bits, U32, 1752, [1:1] etbTpsErrorCounter1 = scalar, U16, 1756, "count", 1,0 etbPpsErrorCounter1 = scalar, U16, 1758, "count", 1,0 etbErrorCode1 = scalar, S08, 1760, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1761, "%", 1, 0 -jamTimer1 = scalar, U16, 1762, "sec", 0.01, 0 -adjustedEtbTarget1 = scalar, S08, 1764, "%", 1, 0 +etbErrorCodeBlinker1 = scalar, S08, 1761, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1762, "%", 1, 0 +jamTimer1 = scalar, U16, 1764, "sec", 0.01, 0 +adjustedEtbTarget1 = scalar, S08, 1766, "%", 1, 0 ; total TS size = 1768 faultCode0 = scalar, U08, 1768, "", 1, 0 heaterDuty0 = scalar, U08, 1769, "%", 1, 0 @@ -5170,9 +5170,9 @@ gaugeCategory = GPPWM Outputs indicator = { isWarnNow }, "No warnings", "Warning", white, black, yellow, black indicator = { checkEngine }, "No Check Engine", "Check Engine", white, black, red, black indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black - indicator = { fuelCutReason != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black - indicator = { sparkCutReason != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black - indicator = { etbErrorCode0 != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etbErrorCode0)}, white, black, yellow, black + indicator = { fuelCutReasonBlinker != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black + indicator = { sparkCutReasonBlinker != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black + indicator = { etbErrorCodeBlinker0 != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etbErrorCode0)}, white, black, yellow, black ; minor info indicator = { isFanOn }, "Fan off", "Fan on", white, black, green, black @@ -5647,6 +5647,8 @@ entry = rawAuxTemp1, "rawAuxTemp1", float, "%.3f" entry = rawAuxTemp2, "rawAuxTemp2", float, "%.3f" entry = rawAmbientTemp, "rawAmbientTemp", float, "%.3f" entry = rtcUnixEpochTime, "rtcUnixEpochTime", int, "%d" +entry = sparkCutReasonBlinker, "sparkCutReasonBlinker", int, "%d" +entry = fuelCutReasonBlinker, "fuelCutReasonBlinker", int, "%d" entry = totalFuelCorrection, "Fuel: Total correction", float, "%.3f" entry = running_postCrankingFuelCorrection, "Fuel: Post cranking mult", float, "%.3f" entry = running_intakeTemperatureCoefficient, "Fuel: IAT correction", float, "%.3f" @@ -6003,6 +6005,7 @@ entry = jamDetected0, "jamDetected0", int, "%d" entry = etbTpsErrorCounter0, "ETB TPS error counter0", int, "%d" entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" +entry = etbErrorCodeBlinker0, "etbErrorCodeBlinker0", int, "%d" entry = tcEtbDrop0, "ETB traction control0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" entry = adjustedEtbTarget0, "ETB with adjustments0", int, "%d" @@ -6019,6 +6022,7 @@ entry = jamDetected1, "jamDetected1", int, "%d" entry = etbTpsErrorCounter1, "ETB TPS error counter1", int, "%d" entry = etbPpsErrorCounter1, "ETB pedal error counter1", int, "%d" entry = etbErrorCode1, "etbErrorCode1", int, "%d" +entry = etbErrorCodeBlinker1, "etbErrorCodeBlinker1", int, "%d" entry = tcEtbDrop1, "ETB traction control1", int, "%d" entry = jamTimer1, "ETB jam timer1", float, "%.3f" entry = adjustedEtbTarget1, "ETB with adjustments1", int, "%d" @@ -7120,8 +7124,9 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etbTpsErrorCounter0 graphLine = etbPpsErrorCounter0 graphLine = etbErrorCode0 - graphLine = tcEtbDrop0 + graphLine = etbErrorCodeBlinker0 liveGraph = electronic_throttle0_4_Graph, "Graph", South + graphLine = tcEtbDrop0 graphLine = jamTimer0 graphLine = adjustedEtbTarget0 @@ -7145,8 +7150,9 @@ dialog = electronic_throttle1Dialog, "electronic_throttle1" graphLine = etbTpsErrorCounter1 graphLine = etbPpsErrorCounter1 graphLine = etbErrorCode1 - graphLine = tcEtbDrop1 + graphLine = etbErrorCodeBlinker1 liveGraph = electronic_throttle1_4_Graph, "Graph", South + graphLine = tcEtbDrop1 graphLine = jamTimer1 graphLine = adjustedEtbTarget1 @@ -9541,8 +9547,8 @@ dialog = tcuControls, "Transmission Settings" field = "Minimum ETB position", etbMinimumPosition field = "Maximum ETB position", etbMaximumPosition field = "" - field = "Jam detection error max", etbJamDetectThreshold - field = "Jam detection timeout period", etbJamTimeout + field = "Jam detection error max", etbJamDetectThreshold, { etbJamDetectThreshold == 0 || etbJamTimeout != 0 } + field = "Jam detection timeout period", etbJamTimeout, { etbJamDetectThreshold != 0 } field = "Disables jam detection for testing until the next power cycle" commandButton = "Temporarily disable jam detection", cmd_etb_disable_jam_detect ; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility @@ -9710,7 +9716,8 @@ dialog = tcuControls, "Transmission Settings" panel = LaunchButtonDialog, {torqueReductionActivationMode == 1} dialog = TorqueReductionSettings, "Settings" - field = "Torque Reduction Time", torqueReductionTime + field = "Limit Torque Reduction Time", limitTorqueReductionTime + field = "Torque Reduction Time", torqueReductionTime, {limitTorqueReductionTime != 0} field = "Torque Reduction Arming RPM", torqueReductionArmingRpm field = "Torque Reduction Arming APP", torqueReductionArmingApp field = "Torque Reduction Ignition Retard", torqueReductionIgnitionRetard diff --git a/generated/tunerstudio/generated/signature_mega100.txt b/generated/tunerstudio/generated/signature_mega100.txt index d64bd79..e8b5306 100644 --- a/generated/tunerstudio/generated/signature_mega100.txt +++ b/generated/tunerstudio/generated/signature_mega100.txt @@ -1,4 +1,4 @@ ! Generated by gen_signature.sh ! SIGNATURE_HASH is a built-in variable generated by config_definition-all.jar ! gen_signature.sh Using env variable branch [main] -#define TS_SIGNATURE "rusEFI main.2024.11.01.mega100.@@SIGNATURE_HASH@@" +#define TS_SIGNATURE "rusEFI main.2024.11.02.mega100.@@SIGNATURE_HASH@@"