From d99d76e7131b4e4228cdf4c0cfea79c03cc2f213 Mon Sep 17 00:00:00 2001 From: GitHub git update Action Date: Thu, 27 Mar 2025 00:19:26 +0000 Subject: [PATCH] Custom Auto-generated Configs [no ci] --- ...nfiguration_generated_structures_mega100.h | 10 +++++++-- .../generated/rusefi_generated_mega100.h | 6 ++--- .../controllers/generated/signature_mega100.h | 4 ++-- .../knock_controller_generated.h | 2 +- .../tunerstudio/generated/rusefi_mega100.ini | 22 ++++++++++++++----- .../generated/signature_mega100.txt | 2 +- 6 files changed, 31 insertions(+), 15 deletions(-) diff --git a/generated/controllers/generated/engine_configuration_generated_structures_mega100.h b/generated/controllers/generated/engine_configuration_generated_structures_mega100.h index fd16af2..ce8327e 100644 --- a/generated/controllers/generated/engine_configuration_generated_structures_mega100.h +++ b/generated/controllers/generated/engine_configuration_generated_structures_mega100.h @@ -2030,7 +2030,7 @@ struct engine_configuration_s { */ uint8_t alignmentFill_at_898[2] = {}; /** - * Ramp the idle target down from the entry threshold over 3 seconds when returning to idle. Helps prevent overshooting (below) the idle target while returning to idle from coasting. + * Ramp the idle target down from the entry threshold over N seconds when returning to idle. Helps prevent overshooting (below) the idle target while returning to idle from coasting. offset 900 bit 0 */ bool idleReturnTargetRamp : 1 {}; /** @@ -4982,9 +4982,15 @@ struct engine_configuration_s { */ int8_t airmassToTimingValues[8] = {}; /** - * units: units + * idle return target ramp duration + * units: seconds * offset 3934 */ + scaled_channel idleReturnTargetRampDuration; + /** + * units: units + * offset 3935 + */ uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING] = {}; }; static_assert(sizeof(engine_configuration_s) == 3988); diff --git a/generated/controllers/generated/rusefi_generated_mega100.h b/generated/controllers/generated/rusefi_generated_mega100.h index 9db0fd9..dfd617c 100644 --- a/generated/controllers/generated/rusefi_generated_mega100.h +++ b/generated/controllers/generated/rusefi_generated_mega100.h @@ -385,7 +385,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 54 +#define END_OF_CALIBRATION_PADDING 53 #define engine_configuration_s_size 3988 #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" @@ -1379,7 +1379,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges true #define show_vvt_output_pin true -#define SIGNATURE_HASH 3308454359 +#define SIGNATURE_HASH 1530392887 #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" @@ -1878,7 +1878,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.2025.03.26.mega100.3308454359" +#define TS_SIGNATURE "rusEFI main.2025.03.27.mega100.1530392887" #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 9f3b6be..e37302f 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 3308454359 -#define TS_SIGNATURE "rusEFI main.2025.03.26.mega100.3308454359" +#define SIGNATURE_HASH 1530392887 +#define TS_SIGNATURE "rusEFI main.2025.03.27.mega100.1530392887" diff --git a/generated/live_data_generated/knock_controller_generated.h b/generated/live_data_generated/knock_controller_generated.h index d3cc108..e27ff6c 100644 --- a/generated/live_data_generated/knock_controller_generated.h +++ b/generated/live_data_generated/knock_controller_generated.h @@ -16,7 +16,7 @@ struct knock_controller_s { * units: dBv * offset 4 */ - int8_t m_knockCyl[12] = {}; + int8_t m_knockCyl[MAX_CYLINDER_COUNT] = {}; /** * @@GAUGE_NAME_KNOCK_RETARD@@ * units: deg diff --git a/generated/tunerstudio/generated/rusefi_mega100.ini b/generated/tunerstudio/generated/rusefi_mega100.ini index 4c1d797..06956c5 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.2025.03.26.mega100.3308454359" + signature = "rusEFI main.2025.03.27.mega100.1530392887" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI main.2025.03.26.mega100.3308454359" ; signature is expected to be 7 or more characters. + signature= "rusEFI main.2025.03.27.mega100.1530392887" ; 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 @@ -122,7 +122,7 @@ sdCardCsPin = bits, U16, 30, [0:8], $gpio_list canTxPin = bits, U16, 32, [0:8], $gpio_list canRxPin = bits, U16, 34, [0:8], $gpio_list torqueReductionTriggerPin = bits, U16, 36, [0:8], $switch_input_pin_e_list -launchFuelAdderPercent = scalar, S08, 38, "%", 1, 0, 0, 100, 0 +launchFuelAdderPercent = scalar, S08, 38, "%", 1, 0, -100, 100, 0 etbJamTimeout = scalar, U08, 39, "sec", 0.02, 0, 0, 5, 2 tachOutputPin = bits, U16, 40, [0:8], $output_pin_e_list tachOutputPinMode = bits, U08, 42, [0:1], "default", "default inverted", "open collector", "open collector inverted" @@ -1449,7 +1449,8 @@ idleFlowEstimateFlow = array, U16, 3894, [8], "kg/h", 0.01, 0, 0, 200, 2 idleFlowEstimatePosition = array, U08, 3910, [8], "%", 0.5, 0, 0, 100, 1 airmassToTimingBins = array, S08, 3918, [8], "mg", 1, 0, -100, 100, 0 airmassToTimingValues = array, S08, 3926, [8], "deg", 1, 0, -30, 30, 0 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 3934, [54], "units", 1, 0, 0, 1, 0 +idleReturnTargetRampDuration = scalar, U08, 3934, "seconds", 0.1, 0, 0.1, 15, 1 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 3935, [53], "units", 1, 0, 0, 1, 0 tmfTable = array, F32, 3988, [2x2], "", 1, 0, 0, 255, 2 tmfRatioBins = array, F32, 4004, [2], "", 1, 0, 0, 65000, 1 tmfOpeningBins = array, F32, 4012, [2], "", 1, 0, 0, 65000, 1 @@ -2028,7 +2029,7 @@ maximumOilPressureValues = array, U08, 23600, [4], "kPa", 10.0, 0, 0, 2000, 0 scriptSetting7 = "scriptSetting 7" scriptSetting8 = "scriptSetting 8" cdmInputPin = "Saab Combustion Detection Module knock signal input pin\nalso known as Saab Ion Sensing Module" - idleReturnTargetRamp = "Ramp the idle target down from the entry threshold over 3 seconds when returning to idle. Helps prevent overshooting (below) the idle target while returning to idle from coasting." + idleReturnTargetRamp = "Ramp the idle target down from the entry threshold over N seconds when returning to idle. Helps prevent overshooting (below) the idle target while returning to idle from coasting." useHbridgesToDriveIdleStepper = "If enabled we use two H-bridges to drive stepper idle air valve" consumeObdSensors = "This property is useful if using rusEFI as TCM or BCM only" enableCanVss = "Read VSS from OEM CAN bus according to selected CAN vehicle configuration." @@ -2571,6 +2572,7 @@ maximumOilPressureValues = array, U08, 23600, [4], "kPa", 10.0, 0, 0, 2000, 0 fuelLevelHighThresholdVoltage = "Error above specified value" sparkHardwareLatencyCorrection = "Compensates for trigger delay due to belt stretch, or other electromechanical issues. beware that raising this value advances ignition timing!" maxOilPressureTimeout = "Delay before cutting fuel due to extra high oil pressure. Use this to ignore short pressure blips and sensor noise." + idleReturnTargetRampDuration = "idle return target ramp duration" etbBiasBins = "target TPS value, 0 to 100%\nTODO: use int8 data date once we template interpolation method" etbBiasValues = "PWM bias, open loop component of PID closed loop control" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -8094,7 +8096,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" panel = dwellCorrection panel = dwellVoltageCorrection - dialog = auxTempSensor1Sensor, "aux1 Thermistor Settings" + dialog = auxTempSensor1_thermistor, "aux1 Thermistor Settings" field = "Input channel", auxTempSensor1_adcChannel field = "Pullup resistor", auxTempSensor1_bias_resistor, {auxTempSensor1_adcChannel != 0} @@ -8110,6 +8112,13 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Highest temperature", auxTempSensor1_tempC_3, {auxTempSensor1_adcChannel != 0} field = "Resistance @ HT", auxTempSensor1_resistance_3, {auxTempSensor1_adcChannel != 0} + dialog = auxTempSensor1Gauges + gauge = rawAuxTemp1Gauge + + dialog = auxTempSensor1Sensor, "aux1 Thermistor Settings", border + panel = auxTempSensor1_thermistor, West + panel = auxTempSensor1Gauges, East + dialog = auxTempSensor2Sensor, "aux2 Thermistor Settings" field = "Input channel", auxTempSensor2_adcChannel field = "Pullup resistor", auxTempSensor2_bias_resistor, {auxTempSensor2_adcChannel != 0} @@ -8973,6 +8982,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Use idle VE table", useSeparateVeForIdle field = "Override Idle VE table load axis", idleVeOverrideMode, { useSeparateVeForIdle == 1 } field = "Ramp target on return to idle", idleReturnTargetRamp, { idleMode == 0 } + field = "Ramp target duration", idleReturnTargetRampDuration, { idleMode == 0 && idleReturnTargetRamp } field = "Use idle tables for cranking taper", useSeparateIdleTablesForCrankingTaper field = "Use coasting idle table", useIacTableForCoasting field = "Dashpot coasting-to-idle Initial idle Adder", iacByTpsTaper diff --git a/generated/tunerstudio/generated/signature_mega100.txt b/generated/tunerstudio/generated/signature_mega100.txt index 1d3d133..f85efa2 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.2025.03.26.mega100.@@SIGNATURE_HASH@@" +#define TS_SIGNATURE "rusEFI main.2025.03.27.mega100.@@SIGNATURE_HASH@@"