From e3c783e0022e91e8b841125e4d49c86288259e90 Mon Sep 17 00:00:00 2001 From: GitHub git update Action Date: Wed, 19 Jun 2024 16:45:26 +0000 Subject: [PATCH] Auto-generated Configs [no ci] --- ...e_configuration_generated_structures_XYZ.h | 28 ++++++----- .../generated/rusefi_generated_XYZ.h | 6 +-- .../controllers/generated/signature_XYZ.h | 4 +- .../tunerstudio/generated/rusefi_XYZ.ini | 50 ++++++++++++------- 4 files changed, 54 insertions(+), 34 deletions(-) diff --git a/generated/controllers/generated/engine_configuration_generated_structures_XYZ.h b/generated/controllers/generated/engine_configuration_generated_structures_XYZ.h index 3f03d87..5365309 100644 --- a/generated/controllers/generated/engine_configuration_generated_structures_XYZ.h +++ b/generated/controllers/generated/engine_configuration_generated_structures_XYZ.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 Tue Jun 18 16:41:42 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Wed Jun 19 16:42:32 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4573,9 +4573,21 @@ struct engine_configuration_s { */ linear_sensor_s acPressure; /** - * units: units + * value of A/C pressure in kPa before that compressor is disengaged + * units: kPa * offset 4032 */ + uint16_t minAcPressure; + /** + * value of A/C pressure in kPa after that compressor is disengaged + * units: kPa + * offset 4034 + */ + uint16_t maxAcPressure; + /** + * units: units + * offset 4036 + */ uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING]; /** * need 4 byte alignment @@ -4831,15 +4843,7 @@ struct persistent_config_s { /** * offset 5324 */ - uint16_t minAcPressure; - /** - * offset 5326 - */ - uint16_t maxAcPressure; - /** - * offset 5328 - */ - uint8_t unusedGapHere[12]; + uint8_t unusedGapHere[16]; /** * offset 5340 */ @@ -5665,4 +5669,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22756); // end -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Jun 18 16:41:42 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Wed Jun 19 16:42:32 UTC 2024 diff --git a/generated/controllers/generated/rusefi_generated_XYZ.h b/generated/controllers/generated/rusefi_generated_XYZ.h index df4c142..f2080d2 100644 --- a/generated/controllers/generated/rusefi_generated_XYZ.h +++ b/generated/controllers/generated/rusefi_generated_XYZ.h @@ -328,7 +328,7 @@ #define ego_sensor_e_ES_Innovate_MTX_L 1 #define ego_sensor_e_ES_PLX 4 #define EGT_CHANNEL_COUNT 8 -#define END_OF_CALIBRATION_PADDING 178 +#define END_OF_CALIBRATION_PADDING 174 #define engine_configuration_s_size 4212 #define engine_load_mode_e_auto_enum 0="LM_SPEED_DENSITY",2="LM_ALPHA_N",3="LM_LUA",100="LM_MOCK",1="LM_REAL_MAF" #define engine_load_mode_e_enum "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -1273,7 +1273,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2288153665 +#define SIGNATURE_HASH 3170759969 #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" @@ -1666,7 +1666,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI main.2024.06.18.XYZ.2288153665" +#define TS_SIGNATURE "rusEFI main.2024.06.19.XYZ.3170759969" #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 4fd6a4d..7b89692 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 2288153665 -#define TS_SIGNATURE "rusEFI main.2024.06.18.XYZ.2288153665" +#define SIGNATURE_HASH 3170759969 +#define TS_SIGNATURE "rusEFI main.2024.06.19.XYZ.3170759969" diff --git a/generated/tunerstudio/generated/rusefi_XYZ.ini b/generated/tunerstudio/generated/rusefi_XYZ.ini index 93f07a0..7b8d9f4 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.06.18.XYZ.2288153665" + signature = "rusEFI main.2024.06.19.XYZ.3170759969" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI main.2024.06.18.XYZ.2288153665" ; signature is expected to be 7 or more characters. + signature= "rusEFI main.2024.06.19.XYZ.3170759969" ; 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 @@ -100,7 +100,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 Tue Jun 18 16:42:38 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Wed Jun 19 16:43:29 UTC 2024 pageSize = 22756 page = 1 @@ -1382,7 +1382,9 @@ acPressure_v1 = scalar, F32, 4016, "volts", 1, 0, 0, 10, 2 acPressure_value1 = scalar, F32, 4020, "", 1, 0, -100000, 1000000, 2 acPressure_v2 = scalar, F32, 4024, "volts", 1, 0, 0, 10, 2 acPressure_value2 = scalar, F32, 4028, "", 1, 0, -100000, 1000000, 2 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 4032, [178], "units", 1, 0, 0, 1, 0 +minAcPressure = scalar, U16, 4032, "kPa", 1, 0, 0, 500, 3 +maxAcPressure = scalar, U16, 4034, "kPa", 1, 0, 0, 500, 3 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 4036, [174], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4212, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4244, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4276, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -1416,9 +1418,7 @@ crankingAdvance = array, S16, 5164, [4], "deg", 0.01, 0, -20, 90, 2 iacCoastingRpmBins = array, U08, 5172, [16], "RPM", 100.0, 0, 0, 25000, 0 iacCoasting = array, U08, 5188, [16], "%", 0.5, 0, 0, 100, 1 warning_message = string, ASCII, 5204, 120 -minAcPressure = scalar, U16, 5324, "", 1, 0, 0, 32000, 0 -maxAcPressure = scalar, U16, 5326, "", 1, 0, 0, 32000, 0 -unusedGapHere = array, U08, 5328, [12], "", 1, 0, 0, 100, 0 +unusedGapHere = array, U08, 5324, [16], "", 1, 0, 0, 100, 0 boostTableOpenLoop = array, U08, 5340, [8x8], "", 0.5, 0, 0, 100, 1 boostRpmBins = array, U08, 5404, [8], "RPM", 100.0, 0, 0, 25000, 0 boostTableClosedLoop = array, U08, 5412, [8x8], "", 2.0, 0, 0, 3000, 0 @@ -2415,6 +2415,8 @@ boardSpecificCalibration1 = scalar, S32, 22752, "", 1, 0, 0, 100, 0 tcu_rangeAnalogInput6 = "tcu_rangeAnalogInput 6" mc33810Nomi = "Nominal coil charge current, 0.25A step" mc33810Maxi = "Maximum coil charge current, 1A step" + minAcPressure = "value of A/C pressure in kPa before that compressor is disengaged" + maxAcPressure = "value of A/C pressure in kPa after that compressor is disengaged" etbBiasBins = "target TPS value, 0 to 100%\nTODO: use int8 data date once we template interpolation method" etbBiasValues = "PWM bias, 0 to 100%" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -3144,6 +3146,8 @@ engineTooHot = bits, U32, 1076, [4:4] tpsTooHigh = bits, U32, 1076, [5:5] isDisabledByLua = bits, U32, 1076, [6:6] acCompressorState = bits, U32, 1076, [7:7] +acPressureTooLow = bits, U32, 1076, [8:8] +acPressureTooHigh = bits, U32, 1076, [9:9] latest_usage_ac_control = scalar, S32, 1080, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 1084, "", 1, 0 ; total TS size = 1088 @@ -3354,7 +3358,7 @@ targetRpmAc = scalar, S32, 1576, "", 1, 0 iacByRpmTaper = scalar, F32, 1580 luaAdd = scalar, F32, 1584 ; total TS size = 1588 -idlePosition0 = scalar, F32, 1588, "per", 1,0 +targetWithIdlePosition0 = scalar, F32, 1588, "per", 1,0 trim0 = scalar, F32, 1592, "", 1, 0 luaAdjustment0 = scalar, F32, 1596, "per", 1,0 m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 @@ -3372,7 +3376,7 @@ etbErrorCode0 = scalar, S08, 1636, "", 1, 0 tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 ; total TS size = 1640 -idlePosition1 = scalar, F32, 1640, "per", 1,0 +targetWithIdlePosition1 = scalar, F32, 1640, "per", 1,0 trim1 = scalar, F32, 1644, "", 1, 0 luaAdjustment1 = scalar, F32, 1648, "per", 1,0 m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 @@ -4707,14 +4711,14 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -idlePosition0Gauge = idlePosition0,"ETB: idlePosition0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange0Gauge = etbDutyRateOfChange0,"ETB duty rate of change0", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 etbDutyAverage0Gauge = etbDutyAverage0,"ETB average duty0", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -idlePosition1Gauge = idlePosition1,"ETB: idlePosition1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange1Gauge = etbDutyRateOfChange1,"ETB duty rate of change1", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 @@ -5668,6 +5672,8 @@ entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" +entry = acPressureTooLow, "AC pressure too low", int, "%d" +entry = acPressureTooHigh, "AC pressure too high", int, "%d" entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking0, "cranking0", int, "%d" @@ -5862,13 +5868,13 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = idlePosition0, "ETB: idlePosition0", float, "%.3f" +entry = targetWithIdlePosition0, "ETB: target with idle0", float, "%.3f" entry = trim0, "ETB: trim0", float, "%.3f" entry = luaAdjustment0, "ETB: luaAdjustment0", float, "%.3f" entry = m_wastegatePosition0, "DC: wastegatePosition0", float, "%.3f" entry = etbFeedForward0, "etbFeedForward0", float, "%.3f" entry = etbIntegralError0, "etbIntegralError0", float, "%.3f" -entry = etbCurrentTarget0, "etbCurrentTarget0", float, "%.3f" +entry = etbCurrentTarget0, "ETB: target for current pedal0", float, "%.3f" entry = etbCurrentAdjustedTarget0, "etbCurrentAdjustedTarget0", float, "%.3f" entry = etbRevLimitActive0, "etbRevLimitActive0", int, "%d" entry = jamDetected0, "jamDetected0", int, "%d" @@ -5879,13 +5885,13 @@ 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 = targetWithIdlePosition1, "ETB: target with idle1", float, "%.3f" entry = trim1, "ETB: trim1", float, "%.3f" entry = luaAdjustment1, "ETB: luaAdjustment1", float, "%.3f" entry = m_wastegatePosition1, "DC: wastegatePosition1", float, "%.3f" entry = etbFeedForward1, "etbFeedForward1", float, "%.3f" entry = etbIntegralError1, "etbIntegralError1", float, "%.3f" -entry = etbCurrentTarget1, "etbCurrentTarget1", float, "%.3f" +entry = etbCurrentTarget1, "ETB: target for current pedal1", float, "%.3f" entry = etbCurrentAdjustedTarget1, "etbCurrentAdjustedTarget1", float, "%.3f" entry = etbRevLimitActive1, "etbRevLimitActive1", int, "%d" entry = jamDetected1, "jamDetected1", int, "%d" @@ -6192,6 +6198,7 @@ menuDialog = main subMenu = compressorDischargeTemperature, "Compressor discharge temp" subMenu = egtInputs, "EGT" subMenu = wastegateIdlePos, "Wastegate and idle position sensors" + subMenu = acPressureSensor, "A/C Pressure Sensor" subMenu = std_separator subMenu = auxLinearSensors, "Aux Sensors" @@ -6647,6 +6654,8 @@ indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {tpsTooHigh}, "tpsTooHigh No", "tpsTooHigh Yes" indicator = {isDisabledByLua}, "isDisabledByLua No", "isDisabledByLua Yes" indicator = {acCompressorState}, "acCompressorState No", "acCompressorState Yes" + indicator = {acPressureTooLow}, "acPressureTooLow No", "acPressureTooLow Yes" + indicator = {acPressureTooHigh}, "acPressureTooHigh No", "acPressureTooHigh Yes" dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel @@ -6954,7 +6963,7 @@ indicatorPanel = electronic_throttle0IndicatorPanel, 2 dialog = electronic_throttle0Dialog, "electronic_throttle0" panel = electronic_throttle0IndicatorPanel liveGraph = electronic_throttle0_1_Graph, "Graph", South - graphLine = idlePosition0 + graphLine = targetWithIdlePosition0 graphLine = trim0 graphLine = luaAdjustment0 graphLine = m_wastegatePosition0 @@ -6980,7 +6989,7 @@ indicatorPanel = electronic_throttle1IndicatorPanel, 2 dialog = electronic_throttle1Dialog, "electronic_throttle1" panel = electronic_throttle1IndicatorPanel liveGraph = electronic_throttle1_1_Graph, "Graph", South - graphLine = idlePosition1 + graphLine = targetWithIdlePosition1 graphLine = trim1 graphLine = luaAdjustment1 graphLine = m_wastegatePosition1 @@ -8113,6 +8122,13 @@ dialog = lambda_monitorDialog, "lambda_monitor" panel = fuelp_settings, West panel = fuelPressureGauges, East + dialog = acPressureSensor, "A/C Pressure Sensor" + field = "Input", acPressure_hwChannel + field = "Low voltage", acPressure_v1, {acPressure_hwChannel != 0} + field = "Low value", acPressure_value1, {acPressure_hwChannel != 0} + field = "High voltage", acPressure_v2, {acPressure_hwChannel != 0} + field = "High value", acPressure_value2, {acPressure_hwChannel != 0} + dialog = auxLinearSensor1, "Aux Linear Sensor #1" field = "Input", auxLinear1_hwChannel field = "Low voltage", auxLinear1_v1, {auxLinear1_hwChannel != 0}