From 89a04c38a385fac883f7b8ffe695ab0f0dfa8d45 Mon Sep 17 00:00:00 2001 From: GitHub git update Action Date: Sat, 21 Sep 2024 00:17:55 +0000 Subject: [PATCH] Custom Auto-generated Configs [no ci] --- .../binary/generated/output_channels.ini | 2 +- ...nfiguration_generated_structures_mega100.h | 11 ++--- .../generated/rusefi_generated_mega100.h | 23 ++------- .../controllers/generated/signature_mega100.h | 4 +- .../output_channels_generated.h | 2 +- .../tunerstudio/generated/rusefi_mega100.ini | 47 +++++++------------ .../generated/signature_mega100.txt | 2 +- 7 files changed, 31 insertions(+), 60 deletions(-) diff --git a/generated/console/binary/generated/output_channels.ini b/generated/console/binary/generated/output_channels.ini index 3a6e32b..5ca3447 100644 --- a/generated/console/binary/generated/output_channels.ini +++ b/generated/console/binary/generated/output_channels.ini @@ -28,7 +28,7 @@ dfcoActive = bits, U32, 0, [26:26] sd_active_wr = bits, U32, 0, [27:27] sd_active_rd = bits, U32, 0, [28:28] RPMValue = scalar, U16, 4, "RPM", 1, 0 -rpmAcceleration = scalar, S16, 6, "RPM acceleration", 1, 0 +rpmAcceleration = scalar, S16, 6, "RPM acceleration/Rate of Change/ROC", 1, 0 speedToRpmRatio = scalar, U16, 8, "value", 0.01, 0 unusedVehicleSpeedKph = scalar, U08, 10, "kph", 1, 0 internalMcuTemperature = scalar, S08, 11, "deg C", 1, 0 diff --git a/generated/controllers/generated/engine_configuration_generated_structures_mega100.h b/generated/controllers/generated/engine_configuration_generated_structures_mega100.h index 76a0c37..b73488a 100644 --- a/generated/controllers/generated/engine_configuration_generated_structures_mega100.h +++ b/generated/controllers/generated/engine_configuration_generated_structures_mega100.h @@ -2013,7 +2013,7 @@ struct engine_configuration_s { bool enableCanVss : 1 {}; /** offset 920 bit 8 */ - bool enableInnovateLC2 : 1 {}; + bool unusedSnableInnovateLC2 : 1 {}; /** offset 920 bit 9 */ bool showHumanReadableWarning : 1 {}; @@ -2885,15 +2885,13 @@ struct engine_configuration_s { */ int16_t iacByTpsTaper; /** - * Auxiliary sensor serial, not to be confused with secondary calibration serial * offset 1500 */ - Gpio auxSerialTxPin; + Gpio unusedAuxSeria; /** - * Auxiliary sensor serial, not to be confused with secondary calibration serial * offset 1502 */ - Gpio auxSerialRxPin; + Gpio unusedAuxSerialRx; /** * offset 1504 */ @@ -2959,10 +2957,9 @@ struct engine_configuration_s { */ float tpsDecelEnleanmentMultiplier; /** - * units: BPs * offset 1532 */ - uint32_t auxSerialSpeed; + uint32_t unusedAuxSerialSpee; /** * units: voltage * offset 1536 diff --git a/generated/controllers/generated/rusefi_generated_mega100.h b/generated/controllers/generated/rusefi_generated_mega100.h index ecd1dc4..3613d69 100644 --- a/generated/controllers/generated/rusefi_generated_mega100.h +++ b/generated/controllers/generated/rusefi_generated_mega100.h @@ -1234,34 +1234,22 @@ #define pin_output_mode_e_OM_OPENDRAIN 2 #define pin_output_mode_e_OM_OPENDRAIN_INVERTED 3 #define PRIME_CURVE_COUNT 8 -#define PROTOCOL_ACR_NAME "acr" #define PROTOCOL_ANALOG_CHART "analog_chart" -#define PROTOCOL_COIL1_SHORT_NAME "c1" +#define PROTOCOL_COIL_SHORT_PREFIX "c" #define PROTOCOL_CRANK1 "t1" #define PROTOCOL_CRANK2 "t2" #define PROTOCOL_ENGINE_SNIFFER "wave_chart" #define PROTOCOL_ES_DOWN "d" #define PROTOCOL_ES_UP "u" #define PROTOCOL_HELLO_PREFIX "***" -#define PROTOCOL_HIP_NAME "HIP" -#define PROTOCOL_HPFP_NAME "hpfp" -#define PROTOCOL_INJ1_SHORT_NAME "i1" -#define PROTOCOL_INJ1_STAGE2_SHORT_NAME "j1" +#define PROTOCOL_INJ_SHORT_PREFIX "i" +#define PROTOCOL_INJ_STAGE2_SHORT_PREFIX "j" #define PROTOCOL_KNOCK_SPECTROGRAMM "knock_spectrogram" #define PROTOCOL_MSG "msg" #define PROTOCOL_OUTPIN "outpin" #define PROTOCOL_SIGNATURE_PREFIX "rusEFI " -#define PROTOCOL_TACH_NAME "tach" #define PROTOCOL_TEST_RESPONSE_TAG "ts_p_alive" #define PROTOCOL_VERSION_TAG "rusEfiVersion" -#define PROTOCOL_VVT1_NAME "VVT1" -#define PROTOCOL_VVT2_NAME "VVT2" -#define PROTOCOL_VVT3_NAME "VVT3" -#define PROTOCOL_VVT4_NAME "VVT4" -#define PROTOCOL_WA_CHANNEL_1 "input1" -#define PROTOCOL_WA_CHANNEL_2 "input2" -#define PROTOCOL_WA_CHANNEL_3 "input3" -#define PROTOCOL_WA_CHANNEL_4 "input4" #define RANGE_INPUT_COUNT 6 #define REBOOT_COMMAND 0xbb #define SCRIPT_CURVE_16 16 @@ -1302,7 +1290,7 @@ #define show_Proteus_presets false #define show_test_presets false #define show_vvt_output_pin true -#define SIGNATURE_HASH 890822542 +#define SIGNATURE_HASH 2137807551 #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" @@ -1740,7 +1728,6 @@ #define ts_show_trigger_comparator false #define ts_show_trigger_overrides true #define ts_show_tunerstudio_port true -#define ts_show_uegoSerial true #define ts_show_vbatt true #define ts_show_vehicle_speed_sensor true #define ts_show_vehicle_weight false @@ -1752,7 +1739,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.09.20.mega100.890822542" +#define TS_SIGNATURE "rusEFI main.2024.09.21.mega100.2137807551" #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 0a9f7b3..bdb4765 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 890822542 -#define TS_SIGNATURE "rusEFI main.2024.09.20.mega100.890822542" +#define SIGNATURE_HASH 2137807551 +#define TS_SIGNATURE "rusEFI main.2024.09.21.mega100.2137807551" diff --git a/generated/live_data_generated/output_channels_generated.h b/generated/live_data_generated/output_channels_generated.h index 0fb465d..3c82837 100644 --- a/generated/live_data_generated/output_channels_generated.h +++ b/generated/live_data_generated/output_channels_generated.h @@ -160,7 +160,7 @@ struct output_channels_s { uint16_t RPMValue = (uint16_t)0; /** * dRPM - * units: RPM acceleration + * units: RPM acceleration/Rate of Change/ROC * offset 6 */ int16_t rpmAcceleration = (int16_t)0; diff --git a/generated/tunerstudio/generated/rusefi_mega100.ini b/generated/tunerstudio/generated/rusefi_mega100.ini index a200260..903dc11 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.09.20.mega100.890822542" + signature = "rusEFI main.2024.09.21.mega100.2137807551" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI main.2024.09.20.mega100.890822542" ; signature is expected to be 7 or more characters. + signature= "rusEFI main.2024.09.21.mega100.2137807551" ; 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 @@ -485,7 +485,7 @@ enableLaunchRetard = bits, U32, 920, [4:4], "false", "true" canInputBCM = bits, U32, 920, [5:5], "false", "true" consumeObdSensors = bits, U32, 920, [6:6], "false", "true" enableCanVss = bits, U32, 920, [7:7], "false", "true" -enableInnovateLC2 = bits, U32, 920, [8:8], "false", "true" +unusedSnableInnovateLC2 = bits, U32, 920, [8:8], "false", "true" showHumanReadableWarning = bits, U32, 920, [9:9], "false", "true" stftIgnoreErrorMagnitude = bits, U32, 920, [10:10], "false", "true" vvtBooleanForVerySpecialCases = bits, U32, 920, [11:11], "false", "true" @@ -775,8 +775,8 @@ invertExhaustCamVVTSignal = bits, U32, 1492, [29:29], "Rising", "Falling" enableKnockSpectrogram = bits, U32, 1492, [30:30], "false", "true" afterCrankingIACtaperDuration = scalar, S16, 1496, "cycles", 1, 0, 0, 5000, 0 iacByTpsTaper = scalar, S16, 1498, "percent", 1, 0, 0, 500, 0 -auxSerialTxPin = bits, U16, 1500, [0:8], $gpio_list -auxSerialRxPin = bits, U16, 1502, [0:8], $gpio_list +unusedAuxSeria = bits, U16, 1500, [0:8], $gpio_list +unusedAuxSerialRx = bits, U16, 1502, [0:8], $gpio_list accelerometerCsPin = bits, U16, 1504, [0:8], $gpio_list coastingFuelCutVssLow = scalar, U08, 1506, "kph", 1, 0, 0, 255, 0 coastingFuelCutVssHigh = scalar, U08, 1507, "kph", 1, 0, 0, 255, 0 @@ -790,7 +790,7 @@ fan1ExtraIdle = scalar, U08, 1519, "%", 1, 0, 0, 100, 0 uartConsoleSerialSpeed = scalar, U32, 1520, "BPs", 1, 0, 0, 1000000, 0 tpsDecelEnleanmentThreshold = scalar, F32, 1524, "roc", 1, 0, 0, 200, 1 tpsDecelEnleanmentMultiplier = scalar, F32, 1528, "coeff", 1, 0, 0, 200, 2 -auxSerialSpeed = scalar, U32, 1532, "BPs", 1, 0, 0, 1000000, 0 +unusedAuxSerialSpee = scalar, U32, 1532, "", 1, 0, 0, 100, 0 throttlePedalSecondaryUpVoltage = scalar, F32, 1536, "voltage", 1, 0, -6, 6, 2 throttlePedalSecondaryWOTVoltage = scalar, F32, 1540, "voltage", 1, 0, -6, 6, 2 canBaudRate = bits, U08, 1544, [0:2], "50kbps", "83.33kbps", "100kbps", "125kbps", "250kbps", "500kbps", "1Mbps", "INVALID" @@ -2074,8 +2074,6 @@ minimumOilPressureValues = array, U08, 22960, [8], "kPa", 10.0, 0, 0, 1000, 0 enableAemXSeriesEgt = "AEM X-Series EGT gauge kit or rusEFI EGT sensor from Wideband controller" afterCrankingIACtaperDuration = "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" iacByTpsTaper = "IAC Value added when coasting and transitioning into idle." - auxSerialTxPin = "Auxiliary sensor serial, not to be confused with secondary calibration serial" - auxSerialRxPin = "Auxiliary sensor serial, not to be confused with secondary calibration serial" coastingFuelCutVssLow = "Below this speed, disable DFCO. Use this to prevent jerkiness from fuel enable/disable in low gears." coastingFuelCutVssHigh = "Above this speed, allow DFCO. Use this to prevent jerkiness from fuel enable/disable in low gears." tpsAccelEnrichmentThreshold = "Maximum change delta of TPS percentage over the 'length'. Actual TPS change has to be above this value in order for TPS/TPS acceleration to kick in." @@ -2593,7 +2591,7 @@ dfcoActive = bits, U32, 0, [26:26] sd_active_wr = bits, U32, 0, [27:27] sd_active_rd = bits, U32, 0, [28:28] RPMValue = scalar, U16, 4, "RPM", 1, 0 -rpmAcceleration = scalar, S16, 6, "RPM acceleration", 1, 0 +rpmAcceleration = scalar, S16, 6, "RPM acceleration/Rate of Change/ROC", 1, 0 speedToRpmRatio = scalar, U16, 8, "value", 0.01, 0 unusedVehicleSpeedKph = scalar, U08, 10, "kph", 1, 0 internalMcuTemperature = scalar, S08, 11, "deg C", 1, 0 @@ -3538,6 +3536,9 @@ lambdaTimeSinceGood = scalar, U16, 1744, "sec", 0.01, 0 maintainConstantValue = throttlePedalWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue : throttlePedalWOTVoltage } maintainConstantValue = throttlePedalSecondaryWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage } + requiresPowerCycle = isSdCardEnabled + requiresPowerCycle = sdCardSpiDevice + requiresPowerCycle = sdCardCsPin requiresPowerCycle = boardUseCanTerminator requiresPowerCycle = injectorCompensationMode requiresPowerCycle = lps25BaroSensorScl @@ -3545,8 +3546,6 @@ lambdaTimeSinceGood = scalar, U16, 1744, "sec", 0.01, 0 requiresPowerCycle = binarySerialTxPin requiresPowerCycle = binarySerialRxPin requiresPowerCycle = tunerStudioSerialSpeed - requiresPowerCycle = auxSerialRxPin - requiresPowerCycle = auxSerialTxPin requiresPowerCycle = is_enabled_spi_1 requiresPowerCycle = is_enabled_spi_2 @@ -8012,8 +8011,6 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "TLE8888 Chip Select", tle8888_cs field = "TLE 8888 spi", tle8888spiDevice field = "L9779 Chip Select", l9779_cs - field = "AUX Serial TX", auxSerialTxPin - field = "AUX Serial RX", auxSerialRxPin field = "Start/Stop Button", startStopButtonPin field = "Upshift Pin", tcuUpshiftButtonPin field = "Downshift Pin", tcuDownshiftButtonPin @@ -8268,15 +8265,11 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = flipWboChannels, flipWboChannels field = "Force O2 sensor heating", forceO2Heating - dialog = uegoSerial, "Innovate LC-2 serial" - field = "Enable Innovate LC-2 Serial", enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin } - dialog = egoSettings, "", yAxis panel = uegoCan - panel = uegoSerial panel = egoSettings_IO1 - panel = egoSettings_IO2, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} - panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} + panel = egoSettings_IO2, {afr_hwChannel != 0 && enableAemXSeries == 0} + panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0} ; Engine->EGT inputs dialog = egtInputsCan, "CAN EGT sensors" @@ -8892,21 +8885,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" panel = canHw1 panel = canHw2 - dialog = auxSerial, "AUX Sensor Serial" - field = "RX pin", auxSerialRxPin - field = "TX pin", auxSerialTxPin - field = "Serial Baud Rate", auxSerialSpeed - dialog = sdCard, "SD Card Logger" field = "#rusEFI logs to SD when powered without USB connected" field = "# and USB not connected for 15 seconds" field = "#rusEFI connects SD to your PC when powered by USB" field = "Enable SD Card", isSdCardEnabled - field = "alwaysWriteSdCard", alwaysWriteSdCard - field = "CS Pin", sdCardCsPin - field = "SPI", sdCardSpiDevice - field = "SD logger rate", sdCardLogFrequency - field = "SD logger mode", sdTriggerLog + field = "alwaysWriteSdCard", alwaysWriteSdCard, { isSdCardEnabled } + field = "CS Pin", sdCardCsPin, { isSdCardEnabled } + field = "SPI", sdCardSpiDevice, { isSdCardEnabled } + field = "SD logger rate", sdCardLogFrequency, { isSdCardEnabled } + field = "SD logger mode", sdTriggerLog, { isSdCardEnabled } dialog = tle8888Dialog, "TLE8888", yAxis field = "TLE8888 SPI", tle8888spiDevice @@ -8923,7 +8911,6 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = connection, "", yAxis panel = tsPort field = "uartConsoleSerialSpeed", uartConsoleSerialSpeed - panel = auxSerial field = enableKline, enableKline dialog = monitoringSettings, "rusEFI Console Settings" diff --git a/generated/tunerstudio/generated/signature_mega100.txt b/generated/tunerstudio/generated/signature_mega100.txt index 0fd6963..8889a56 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.09.20.mega100.@@SIGNATURE_HASH@@" +#define TS_SIGNATURE "rusEFI main.2024.09.21.mega100.@@SIGNATURE_HASH@@"