Skip to content

Commit

Permalink
Custom Auto-generated Configs
Browse files Browse the repository at this point in the history
[no ci]
  • Loading branch information
actions-user committed Sep 21, 2024
1 parent df61e6d commit eb8e8dc
Show file tree
Hide file tree
Showing 7 changed files with 31 additions and 60 deletions.
2 changes: 1 addition & 1 deletion generated/console/binary/generated/output_channels.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {};
Expand Down Expand Up @@ -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
*/
Expand Down Expand Up @@ -2959,10 +2957,9 @@ struct engine_configuration_s {
*/
float tpsDecelEnleanmentMultiplier;
/**
* units: BPs
* offset 1532
*/
uint32_t auxSerialSpeed;
uint32_t unusedAuxSerialSpee;
/**
* units: voltage
* offset 1536
Expand Down
23 changes: 5 additions & 18 deletions generated/controllers/generated/rusefi_generated_XYZ.h
Original file line number Diff line number Diff line change
Expand Up @@ -1236,34 +1236,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
Expand Down Expand Up @@ -1304,7 +1292,7 @@
#define show_Proteus_presets false
#define show_test_presets false
#define show_vvt_output_pin true
#define SIGNATURE_HASH 1349726135
#define SIGNATURE_HASH 1057972626
#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"
Expand Down Expand Up @@ -1742,7 +1730,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
Expand All @@ -1754,7 +1741,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.XYZ.1349726135"
#define TS_SIGNATURE "rusEFI main.2024.09.21.XYZ.1057972626"
#define TS_SIMULATE_CAN '>'
#define TS_SIMULATE_CAN_char >
#define TS_SINGLE_WRITE_COMMAND 'W'
Expand Down
4 changes: 2 additions & 2 deletions generated/controllers/generated/signature_XYZ.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
// was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer
//

#define SIGNATURE_HASH 1349726135
#define TS_SIGNATURE "rusEFI main.2024.09.20.XYZ.1349726135"
#define SIGNATURE_HASH 1057972626
#define TS_SIGNATURE "rusEFI main.2024.09.21.XYZ.1057972626"
2 changes: 1 addition & 1 deletion generated/live_data_generated/output_channels_generated.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
47 changes: 17 additions & 30 deletions generated/tunerstudio/generated/rusefi_XYZ.ini
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@ enable2ndByteCanID = false

[MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI main.2024.09.20.XYZ.1349726135"
signature = "rusEFI main.2024.09.21.XYZ.1057972626"

[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmware version for title bar.
signature= "rusEFI main.2024.09.20.XYZ.1349726135" ; signature is expected to be 7 or more characters.
signature= "rusEFI main.2024.09.21.XYZ.1057972626" ; 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
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand All @@ -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"
Expand Down Expand Up @@ -2075,8 +2075,6 @@ boardSpecificCalibration1 = scalar, S32, 22968, "", 1, 0, 0, 100, 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."
Expand Down Expand Up @@ -2594,7 +2592,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
Expand Down Expand Up @@ -3635,15 +3633,16 @@ unusedAtTheExtraEnd92 = scalar, U08, 1851, "", 1, 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
requiresPowerCycle = lps25BaroSensorSda
requiresPowerCycle = binarySerialTxPin
requiresPowerCycle = binarySerialRxPin
requiresPowerCycle = tunerStudioSerialSpeed
requiresPowerCycle = auxSerialRxPin
requiresPowerCycle = auxSerialTxPin

requiresPowerCycle = is_enabled_spi_1
requiresPowerCycle = is_enabled_spi_2
Expand Down Expand Up @@ -8105,8 +8104,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
Expand Down Expand Up @@ -8361,15 +8358,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"
Expand Down Expand Up @@ -8985,21 +8978,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
Expand All @@ -9016,7 +9004,6 @@ dialog = lambda_monitorDialog, "lambda_monitor"
dialog = connection, "", yAxis
panel = tsPort
field = "uartConsoleSerialSpeed", uartConsoleSerialSpeed
panel = auxSerial
field = enableKline, enableKline

dialog = monitoringSettings, "rusEFI Console Settings"
Expand Down
2 changes: 1 addition & 1 deletion generated/tunerstudio/generated/signature_XYZ.txt
Original file line number Diff line number Diff line change
@@ -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.XYZ.@@SIGNATURE_HASH@@"
#define TS_SIGNATURE "rusEFI main.2024.09.21.XYZ.@@SIGNATURE_HASH@@"

0 comments on commit eb8e8dc

Please sign in to comment.