From 6e9e48eef855dddde36eb3cb685f19782898ac7e Mon Sep 17 00:00:00 2001 From: GitHub git update Action Date: Mon, 4 Nov 2024 00:30:13 +0000 Subject: [PATCH] Custom Auto-generated Configs [no ci] --- .../console/binary/generated/data_logs.ini | 1 + .../binary/generated/output_channels.ini | 1 + ...e_configuration_generated_structures_XYZ.h | 1 + .../generated/rusefi_generated_XYZ.h | 4 ++-- .../controllers/generated/signature_XYZ.h | 4 ++-- .../output_channels_generated.h | 7 +++--- .../tunerstudio/generated/rusefi_XYZ.ini | 22 +++++++++++++------ .../tunerstudio/generated/signature_XYZ.txt | 2 +- 8 files changed, 27 insertions(+), 15 deletions(-) diff --git a/generated/console/binary/generated/data_logs.ini b/generated/console/binary/generated/data_logs.ini index dd72685..375162f 100644 --- a/generated/console/binary/generated/data_logs.ini +++ b/generated/console/binary/generated/data_logs.ini @@ -27,6 +27,7 @@ entry = isUsbConnected, "isUsbConnected", int, "%d" entry = dfcoActive, "dfcoActive", int, "%d" entry = sd_active_wr, "SD card writing", int, "%d" entry = sd_active_rd, "SD card reading", int, "%d" +entry = isMapValid, "MAP from sensor seems valid", int, "%d" entry = RPMValue, "RPM", int, "%d" entry = rpmAcceleration, "dRPM", int, "%d" entry = speedToRpmRatio, "Gearbox Ratio", float, "%.3f" diff --git a/generated/console/binary/generated/output_channels.ini b/generated/console/binary/generated/output_channels.ini index c9dd40b..8c623b5 100644 --- a/generated/console/binary/generated/output_channels.ini +++ b/generated/console/binary/generated/output_channels.ini @@ -27,6 +27,7 @@ isUsbConnected = bits, U32, 0, [25:25] dfcoActive = bits, U32, 0, [26:26] sd_active_wr = bits, U32, 0, [27:27] sd_active_rd = bits, U32, 0, [28:28] +isMapValid = bits, U32, 0, [29:29] RPMValue = scalar, U16, 4, "RPM", 1, 0 rpmAcceleration = scalar, S16, 6, "RPM acceleration/Rate of Change/ROC", 1, 0 speedToRpmRatio = scalar, U16, 8, "value", 0.01, 0 diff --git a/generated/controllers/generated/engine_configuration_generated_structures_XYZ.h b/generated/controllers/generated/engine_configuration_generated_structures_XYZ.h index fb54578..cc454f7 100644 --- a/generated/controllers/generated/engine_configuration_generated_structures_XYZ.h +++ b/generated/controllers/generated/engine_configuration_generated_structures_XYZ.h @@ -2804,6 +2804,7 @@ struct engine_configuration_s { offset 1492 bit 5 */ bool enableExtendedCanBroadcast : 1 {}; /** + * global_can_data performance hack offset 1492 bit 6 */ bool luaCanRxWorkaround : 1 {}; /** diff --git a/generated/controllers/generated/rusefi_generated_XYZ.h b/generated/controllers/generated/rusefi_generated_XYZ.h index 9df18fd..42db53e 100644 --- a/generated/controllers/generated/rusefi_generated_XYZ.h +++ b/generated/controllers/generated/rusefi_generated_XYZ.h @@ -1295,7 +1295,7 @@ #define SentEtbType_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 161268908 +#define SIGNATURE_HASH 3501918693 #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" @@ -1756,7 +1756,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.03.XYZ.161268908" +#define TS_SIGNATURE "rusEFI main.2024.11.04.XYZ.3501918693" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/generated/controllers/generated/signature_XYZ.h b/generated/controllers/generated/signature_XYZ.h index dbb09d2..90649f7 100644 --- a/generated/controllers/generated/signature_XYZ.h +++ b/generated/controllers/generated/signature_XYZ.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 161268908 -#define TS_SIGNATURE "rusEFI main.2024.11.03.XYZ.161268908" +#define SIGNATURE_HASH 3501918693 +#define TS_SIGNATURE "rusEFI main.2024.11.04.XYZ.3501918693" diff --git a/generated/live_data_generated/output_channels_generated.h b/generated/live_data_generated/output_channels_generated.h index 7e7e06d..e64424d 100644 --- a/generated/live_data_generated/output_channels_generated.h +++ b/generated/live_data_generated/output_channels_generated.h @@ -144,14 +144,15 @@ struct output_channels_s { offset 0 bit 28 */ bool sd_active_rd : 1 {}; /** + * MAP from sensor seems valid offset 0 bit 29 */ - bool unusedBit_29_29 : 1 {}; + bool isMapValid : 1 {}; /** offset 0 bit 30 */ - bool unusedBit_29_30 : 1 {}; + bool unusedBit_30_30 : 1 {}; /** offset 0 bit 31 */ - bool unusedBit_29_31 : 1 {}; + bool unusedBit_30_31 : 1 {}; /** * @@GAUGE_NAME_RPM@@ * units: RPM diff --git a/generated/tunerstudio/generated/rusefi_XYZ.ini b/generated/tunerstudio/generated/rusefi_XYZ.ini index 12a1c84..0dde830 100644 --- a/generated/tunerstudio/generated/rusefi_XYZ.ini +++ b/generated/tunerstudio/generated/rusefi_XYZ.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI main.2024.11.03.XYZ.161268908" + signature = "rusEFI main.2024.11.04.XYZ.3501918693" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI main.2024.11.03.XYZ.161268908" ; signature is expected to be 7 or more characters. + signature= "rusEFI main.2024.11.04.XYZ.3501918693" ; 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 @@ -2085,6 +2085,7 @@ minimumOilPressureValues = array, U08, 22960, [8], "kPa", 10.0, 0, 0, 1000, 0 torqueReductionTime = "For how long after the pin has been triggered will the cut/reduction stay active. After that, even if the pin is still triggered, torque is re-introduced" mc33810DisableRecoveryMode = "See Over/Undervoltage Shutdown/Retry bit in documentation" enableExtendedCanBroadcast = "Send out board statistics" + luaCanRxWorkaround = "global_can_data performance hack" useAuxSpeedForSlipRatio = "Use Aux Speed 1 as one of speeds for wheel slip ratio?" useVssAsSecondWheelSpeed = "VSS and Aux Speed 1 or Aux Speed 1 with Aux Speed 2?" enableAemXSeriesEgt = "AEM X-Series EGT gauge kit or rusEFI EGT sensor from Wideband controller" @@ -2618,6 +2619,7 @@ isUsbConnected = bits, U32, 0, [25:25] dfcoActive = bits, U32, 0, [26:26] sd_active_wr = bits, U32, 0, [27:27] sd_active_rd = bits, U32, 0, [28:28] +isMapValid = bits, U32, 0, [29:29] RPMValue = scalar, U16, 4, "RPM", 1, 0 rpmAcceleration = scalar, S16, 6, "RPM acceleration/Rate of Change/ROC", 1, 0 speedToRpmRatio = scalar, U16, 8, "value", 0.01, 0 @@ -5255,6 +5257,7 @@ entry = isUsbConnected, "isUsbConnected", int, "%d" entry = dfcoActive, "dfcoActive", int, "%d" entry = sd_active_wr, "SD card writing", int, "%d" entry = sd_active_rd, "SD card reading", int, "%d" +entry = isMapValid, "MAP from sensor seems valid", int, "%d" entry = RPMValue, "RPM", int, "%d" entry = rpmAcceleration, "dRPM", int, "%d" entry = speedToRpmRatio, "Gearbox Ratio", float, "%.3f" @@ -8294,9 +8297,13 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "MAP value high point", map_sensor_highValue, { map_sensor_hwChannel != 0 && map_sensor_type == 0 } field = "MAP voltage high value", mapHighValueVoltage, { map_sensor_hwChannel != 0 && map_sensor_type == 0 } + indicatorPanel = mapValidIndicators, 1 + indicator = {isMapValid}, "BAD Map Input", "Happy MAP Input" + dialog = mapCommon, "MAP common settings" field = "Low value threshold", mapErrorDetectionTooLow field = "High value threshold", mapErrorDetectionTooHigh + panel = mapValidIndicators field = "" field = "Measure Map Only In One Cylinder", measureMapOnlyInOneCylinder field = "Cylinder count to sample MAP", mapMinBufferLength @@ -8354,13 +8361,14 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 } + indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } indicator = { faultCode0 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicator = { faultCode0 == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black - indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 } + indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } indicator = { faultCode1 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode0 != 7 } + indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode0 != 7 && faultCode0 != 8 } indicator = { faultCode0 == 0 || faultCode0 == 7 }, "Failed", "Ready/Ok", red, black, green, black indicator = { faultCode0 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black indicator = { faultCode0 == 1 }, "Communication ok", "Timeout reading", green, black, red, black @@ -8369,7 +8377,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" indicator = { faultCode0 == 5 }, "No underheat", "Underheat", green, black, red, black indicator = { faultCode0 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black - indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode1 != 7 } + indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode1 != 7 && faultCode0 != 8 } indicator = { faultCode1 == 0 || faultCode1 == 7 }, "Failed", "Ready/Ok", red, black, green, black indicator = { faultCode1 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black indicator = { faultCode1 == 1 }, "Communication ok", "Timeout reading", green, black, red, black @@ -9734,7 +9742,7 @@ dialog = tcuControls, "Transmission Settings" field = dacOutputPins1, dacOutputPins1 field = dacOutputPins2, dacOutputPins2 - field = luaCanRxWorkaround, luaCanRxWorkaround + field = "luaCanRxWorkaround CAN performance hack", luaCanRxWorkaround field = "Read RPM matching VSS profile", canInputBCM field = auxSpeed1Multiplier, auxSpeed1Multiplier field = magicNumberAvailableForDevTricks, magicNumberAvailableForDevTricks diff --git a/generated/tunerstudio/generated/signature_XYZ.txt b/generated/tunerstudio/generated/signature_XYZ.txt index ef13b3c..576ca04 100644 --- a/generated/tunerstudio/generated/signature_XYZ.txt +++ b/generated/tunerstudio/generated/signature_XYZ.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.03.XYZ.@@SIGNATURE_HASH@@" +#define TS_SIGNATURE "rusEFI main.2024.11.04.XYZ.@@SIGNATURE_HASH@@"