From a5f4aa29fe0e5da481e09f08f2ec8a9c8e7558c0 Mon Sep 17 00:00:00 2001 From: GitHub git update Action Date: Mon, 21 Oct 2024 00:29:41 +0000 Subject: [PATCH] Custom Auto-generated Configs [no ci] --- .../console/binary/generated/data_logs.ini | 2 +- ...e_configuration_generated_structures_XYZ.h | 58 ++++++++++--------- .../generated/rusefi_generated_XYZ.h | 7 ++- .../controllers/generated/signature_XYZ.h | 4 +- .../tunerstudio/generated/rusefi_XYZ.ini | 19 +++--- .../tunerstudio/generated/signature_XYZ.txt | 2 +- 6 files changed, 50 insertions(+), 42 deletions(-) diff --git a/generated/console/binary/generated/data_logs.ini b/generated/console/binary/generated/data_logs.ini index a5f3dbb..9f6c414 100644 --- a/generated/console/binary/generated/data_logs.ini +++ b/generated/console/binary/generated/data_logs.ini @@ -462,7 +462,7 @@ entry = m_knockThreshold, "Knock: Threshold", float, "%.3f" entry = m_knockCount, "Knock: Count", int, "%d" entry = m_maximumRetard, "Knock: Max retard", float, "%.3f" entry = m_knockFrequency, "knock: frequency", int, "%d" -entry = tcuCurrentGear, "Current Gear", int, "%d" +entry = tcuCurrentGear, "TCU: Current Gear", int, "%d" entry = tcRatio, "TCU: Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "lastShiftTime", float, "%.3f" entry = tcu_currentRange, "TCU: Current Range", int, "%d" diff --git a/generated/controllers/generated/engine_configuration_generated_structures_XYZ.h b/generated/controllers/generated/engine_configuration_generated_structures_XYZ.h index 67383ef..147074e 100644 --- a/generated/controllers/generated/engine_configuration_generated_structures_XYZ.h +++ b/generated/controllers/generated/engine_configuration_generated_structures_XYZ.h @@ -927,9 +927,15 @@ struct engine_configuration_s { */ int hip9011PrescalerAndSDO; /** + * iTerm min value * offset 428 */ - float unusedFloatHere; + int16_t alternator_iTermMin; + /** + * iTerm max value + * offset 430 + */ + int16_t alternator_iTermMax; /** * @@DISPLACEMENT_TOOLTIP@@ * units: L @@ -2877,7 +2883,7 @@ struct engine_configuration_s { bool enableKnockSpectrogram : 1 {}; /** offset 1492 bit 31 */ - bool unusedBit_516_31 : 1 {}; + bool unusedBit_517_31 : 1 {}; /** * This is the duration in cycles that the IAC will take to reach its normal idle position, it can be used to hold the idle higher for a few seconds after cranking to improve startup.\Should be 100 once tune is better * units: cycles @@ -3052,76 +3058,76 @@ struct engine_configuration_s { bool can2ListenMode : 1 {}; /** offset 1552 bit 8 */ - bool unusedBit_552_8 : 1 {}; + bool unusedBit_553_8 : 1 {}; /** offset 1552 bit 9 */ - bool unusedBit_552_9 : 1 {}; + bool unusedBit_553_9 : 1 {}; /** offset 1552 bit 10 */ - bool unusedBit_552_10 : 1 {}; + bool unusedBit_553_10 : 1 {}; /** offset 1552 bit 11 */ - bool unusedBit_552_11 : 1 {}; + bool unusedBit_553_11 : 1 {}; /** offset 1552 bit 12 */ - bool unusedBit_552_12 : 1 {}; + bool unusedBit_553_12 : 1 {}; /** offset 1552 bit 13 */ - bool unusedBit_552_13 : 1 {}; + bool unusedBit_553_13 : 1 {}; /** offset 1552 bit 14 */ - bool unusedBit_552_14 : 1 {}; + bool unusedBit_553_14 : 1 {}; /** offset 1552 bit 15 */ - bool unusedBit_552_15 : 1 {}; + bool unusedBit_553_15 : 1 {}; /** offset 1552 bit 16 */ - bool unusedBit_552_16 : 1 {}; + bool unusedBit_553_16 : 1 {}; /** offset 1552 bit 17 */ - bool unusedBit_552_17 : 1 {}; + bool unusedBit_553_17 : 1 {}; /** offset 1552 bit 18 */ - bool unusedBit_552_18 : 1 {}; + bool unusedBit_553_18 : 1 {}; /** offset 1552 bit 19 */ - bool unusedBit_552_19 : 1 {}; + bool unusedBit_553_19 : 1 {}; /** offset 1552 bit 20 */ - bool unusedBit_552_20 : 1 {}; + bool unusedBit_553_20 : 1 {}; /** offset 1552 bit 21 */ - bool unusedBit_552_21 : 1 {}; + bool unusedBit_553_21 : 1 {}; /** offset 1552 bit 22 */ - bool unusedBit_552_22 : 1 {}; + bool unusedBit_553_22 : 1 {}; /** offset 1552 bit 23 */ - bool unusedBit_552_23 : 1 {}; + bool unusedBit_553_23 : 1 {}; /** offset 1552 bit 24 */ - bool unusedBit_552_24 : 1 {}; + bool unusedBit_553_24 : 1 {}; /** offset 1552 bit 25 */ - bool unusedBit_552_25 : 1 {}; + bool unusedBit_553_25 : 1 {}; /** offset 1552 bit 26 */ - bool unusedBit_552_26 : 1 {}; + bool unusedBit_553_26 : 1 {}; /** offset 1552 bit 27 */ - bool unusedBit_552_27 : 1 {}; + bool unusedBit_553_27 : 1 {}; /** offset 1552 bit 28 */ - bool unusedBit_552_28 : 1 {}; + bool unusedBit_553_28 : 1 {}; /** offset 1552 bit 29 */ - bool unusedBit_552_29 : 1 {}; + bool unusedBit_553_29 : 1 {}; /** offset 1552 bit 30 */ - bool unusedBit_552_30 : 1 {}; + bool unusedBit_553_30 : 1 {}; /** offset 1552 bit 31 */ - bool unusedBit_552_31 : 1 {}; + bool unusedBit_553_31 : 1 {}; /** * offset 1556 */ diff --git a/generated/controllers/generated/rusefi_generated_XYZ.h b/generated/controllers/generated/rusefi_generated_XYZ.h index 2dac921..b62e8b4 100644 --- a/generated/controllers/generated/rusefi_generated_XYZ.h +++ b/generated/controllers/generated/rusefi_generated_XYZ.h @@ -551,7 +551,7 @@ #define GAUGE_NAME_CAN_WRITE_OK "CAN: Tx OK" #define GAUGE_NAME_CLT "CLT" #define GAUGE_NAME_CPU_TEMP "CPU Temperature" -#define GAUGE_NAME_CURRENT_GEAR "Current Gear" +#define GAUGE_NAME_CURRENT_GEAR "TCU: Current Gear" #define GAUGE_NAME_DEBUG_F1 "debug f1" #define GAUGE_NAME_DEBUG_F2 "debug f2: iTerm" #define GAUGE_NAME_DEBUG_F3 "debug f3: prevError" @@ -1293,8 +1293,9 @@ #define SentEtbType_FORD_TYPE_1 2 #define SentEtbType_GM_TYPE_1 1 #define SentEtbType_NONE 0 +#define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 475077877 +#define SIGNATURE_HASH 1737781756 #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" @@ -1758,7 +1759,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.10.20.XYZ.475077877" +#define TS_SIGNATURE "rusEFI main.2024.10.21.XYZ.1737781756" #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 cae2942..3c1ffdd 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 475077877 -#define TS_SIGNATURE "rusEFI main.2024.10.20.XYZ.475077877" +#define SIGNATURE_HASH 1737781756 +#define TS_SIGNATURE "rusEFI main.2024.10.21.XYZ.1737781756" diff --git a/generated/tunerstudio/generated/rusefi_XYZ.ini b/generated/tunerstudio/generated/rusefi_XYZ.ini index 7f024a8..94836f2 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.10.20.XYZ.475077877" + signature = "rusEFI main.2024.10.21.XYZ.1737781756" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI main.2024.10.20.XYZ.475077877" ; signature is expected to be 7 or more characters. + signature= "rusEFI main.2024.10.21.XYZ.1737781756" ; 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 @@ -206,7 +206,8 @@ 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, F32, 420, "deg", 1, 0, -180, 180, 2 hip9011PrescalerAndSDO = scalar, S32, 424, "integer", 1, 0, 0, 32, 0 -unusedFloatHere = scalar, F32, 428, "", 1, 0, 0, 100, 0 +alternator_iTermMin = scalar, S16, 428, "", 1, 0, -30000, 30000, 0 +alternator_iTermMax = scalar, S16, 430, "", 1, 0, -30000, 30000, 0 displacement = scalar, U16, 432, "L", 0.001, 0, 0, 65, 3 triggerSimulatorRpm = scalar, U16, 434, "RPM", 1, 0, 0, 30000, 0 cylindersCount = scalar, U32, 436, "", 1, 0, 1, 12, 0 @@ -1777,6 +1778,8 @@ minimumOilPressureValues = array, U08, 22960, [8], "kPa", 10.0, 0, 0, 1000, 0 iat_tempC_1 = "these values are in Celcius" iat_bias_resistor = "Pull-up resistor value on your board" hip9011PrescalerAndSDO = "value '6' for 8MHz hw osc\nread hip9011 datasheet for details\ntodo split into two bit fields" + alternator_iTermMin = "iTerm min value" + alternator_iTermMax = "iTerm max value" displacement = "Engine displacement in litres" cylindersCount = "Number of cylinder the engine has." mapSyncThreshold = "Delta kPa for MAP sync" @@ -5007,12 +5010,8 @@ gaugeCategory = Sensors - Raw issEdgeCounterGauge = issEdgeCounter, "Raw ISS", "counter", 0, 5, 0, 0, 5, 5, 0, 0 gaugeCategory = Transmission - desiredGearGauge = tcuDesiredGear, "TCU: Desired Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 - currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 10, 0, 0, 10, 10, 0, 0 speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 - ISSGauge = ISSValue, "TCU: Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 - tcRatioGauge = tcRatio, "TCU: Torque Converter Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 shiftTimeGauge = lastShiftTime, "Last Shift Time", "S", 0, 2, 0, 0, 2, 2, 4, 4 idealEngineTorqueGauge = idealEngineTorque, "idealEngineTorque", "", 0, 100, 0, 0, 100, 100, 4, 4 pressureControlGauge = pressureControlDuty, "EPC Duty Cycle", "%", 0, 100, 0, 0, 100, 100, 0, 0 @@ -5634,7 +5633,7 @@ entry = m_knockThreshold, "Knock: Threshold", float, "%.3f" entry = m_knockCount, "Knock: Count", int, "%d" entry = m_maximumRetard, "Knock: Max retard", float, "%.3f" entry = m_knockFrequency, "knock: frequency", int, "%d" -entry = tcuCurrentGear, "Current Gear", int, "%d" +entry = tcuCurrentGear, "TCU: Current Gear", int, "%d" entry = tcRatio, "TCU: Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "lastShiftTime", float, "%.3f" entry = tcu_currentRange, "TCU: Current Range", int, "%d" @@ -8544,7 +8543,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Start/Stop Button input", startStopButtonPin field = "Start/Stop Button input mode", startStopButtonMode field = "Start Button", startRequestPinInverted - field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} + field = "Starter Control", starterControlPin field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} field = "Suppress On Start Up (Ms)", startButtonSuppressOnStartUpMs, {startStopButtonPin != 0} commandButton = "Test Starter Relay", cmd_test_starter_relay @@ -8801,6 +8800,8 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "P factor", alternatorControl_pFactor, {isAlternatorControlEnabled == 1} field = "I factor", alternatorControl_iFactor, {isAlternatorControlEnabled == 1} field = "D factor", alternatorControl_dFactor, {isAlternatorControlEnabled == 1} + field = "iTerm min", alternator_iTermMin, {isAlternatorControlEnabled == 1} + field = "iTerm max", alternator_iTermMax, {isAlternatorControlEnabled == 1} field = "Min", alternatorControl_minValue, {isAlternatorControlEnabled == 1} field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1} field = "#% duty = Pterm + Iterm + Dterm + offset%" diff --git a/generated/tunerstudio/generated/signature_XYZ.txt b/generated/tunerstudio/generated/signature_XYZ.txt index 816a6e6..57b8614 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.10.20.XYZ.@@SIGNATURE_HASH@@" +#define TS_SIGNATURE "rusEFI main.2024.10.21.XYZ.@@SIGNATURE_HASH@@"