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 27, 2024
1 parent 877fec6 commit a7b169b
Show file tree
Hide file tree
Showing 5 changed files with 46 additions and 19 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -672,9 +672,10 @@ struct engine_configuration_s {
*/
Gpio canRxPin;
/**
* Pin that activates the reduction/cut for shifting. Sometimes shared with the Launch Control pin
* offset 36
*/
uint16_t unusedEtbExpAverageLength;
switch_input_pin_e torqueReductionTriggerPin;
/**
* units: %
* offset 38
Expand Down Expand Up @@ -963,9 +964,11 @@ struct engine_configuration_s {
*/
uint8_t mapSyncThreshold;
/**
* How many % of ignition events will be cut
* units: %
* offset 443
*/
uint8_t unusedByteHere;
int8_t torqueReductionIgnitionCut;
/**
* @@CYLINDER_BORE_TOOLTIP@@
* units: mm
Expand Down Expand Up @@ -1774,9 +1777,11 @@ struct engine_configuration_s {
*/
brain_input_pin_e flexSensorPin;
/**
* Since torque reduction pin is usually shared with launch control, most people have an RPM where behavior under that is Launch Control, over that is Flat Shift/Torque Reduction
* units: rpm
* offset 818
*/
uint16_t unused720;
uint16_t torqueReductionArmingRpm;
/**
* offset 820
*/
Expand Down Expand Up @@ -2609,9 +2614,10 @@ struct engine_configuration_s {
*/
int idleStepperTotalSteps;
/**
* Pedal position to realize that we need to reduce torque when the trigger pin is uuuh triggered
* offset 1356
*/
int unusedInt3423423;
int torqueReductionArmingApp;
/**
* Duration in ms or duty cycle depending on selected mode
* offset 1360
Expand Down Expand Up @@ -2769,9 +2775,11 @@ struct engine_configuration_s {
*/
int16_t idlePidRpmDeadZone;
/**
* For how long after the pin has been triggered will the cut/reduction stay active. After that, even if the pin is still triggered, torque is re-introduced
* units: ms
* offset 1488
*/
float unusedTargetVBatt;
float torqueReductionTime;
/**
* See Over/Undervoltage Shutdown/Retry bit in documentation
offset 1492 bit 0 */
Expand Down Expand Up @@ -2958,9 +2966,11 @@ struct engine_configuration_s {
*/
float tpsDecelEnleanmentMultiplier;
/**
* How many degrees of timing advance will be reduced during the Torque Reduction Time
* units: deg
* offset 1532
*/
uint32_t unusedAuxSerialSpee;
float torqueReductionIgnitionRetard;
/**
* units: voltage
* offset 1536
Expand Down
4 changes: 2 additions & 2 deletions generated/controllers/generated/rusefi_generated_XYZ.h
Original file line number Diff line number Diff line change
Expand Up @@ -1292,7 +1292,7 @@
#define show_Proteus_presets false
#define show_test_presets false
#define show_vvt_output_pin true
#define SIGNATURE_HASH 3046035542
#define SIGNATURE_HASH 3635637437
#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 @@ -1750,7 +1750,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.26.XYZ.3046035542"
#define TS_SIGNATURE "rusEFI main.2024.09.27.XYZ.3635637437"
#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 3046035542
#define TS_SIGNATURE "rusEFI main.2024.09.26.XYZ.3046035542"
#define SIGNATURE_HASH 3635637437
#define TS_SIGNATURE "rusEFI main.2024.09.27.XYZ.3635637437"
33 changes: 25 additions & 8 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.26.XYZ.3046035542"
signature = "rusEFI main.2024.09.27.XYZ.3635637437"

[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmware version for title bar.
signature= "rusEFI main.2024.09.26.XYZ.3046035542" ; signature is expected to be 7 or more characters.
signature= "rusEFI main.2024.09.27.XYZ.3635637437" ; 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 @@ -123,7 +123,7 @@ mainRelayPin = bits, U16, 28, [0:8], $output_pin_e_list
sdCardCsPin = bits, U16, 30, [0:8], $gpio_list
canTxPin = bits, U16, 32, [0:8], $gpio_list
canRxPin = bits, U16, 34, [0:8], $gpio_list
unusedEtbExpAverageLength = scalar, U16, 36, "", 1, 0, 0, 32000, 0
torqueReductionTriggerPin = bits, U16, 36, [0:8], $switch_input_pin_e_list
launchFuelAdderPercent = scalar, S08, 38, "%", 1, 0, 0, 100, 0
etbJamTimeout = scalar, U08, 39, "sec", 0.02, 0, 0, 5, 2
tachOutputPin = bits, U16, 40, [0:8], $output_pin_e_list
Expand Down Expand Up @@ -213,7 +213,7 @@ cylindersCount = scalar, U32, 436, "", 1, 0, 1, 12, 0
firingOrder = bits, U08, 440, [0:6], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-2-4-5-3", "1-4-2-5-3-6", "1-2", "1-2-3-4-5-6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8 Mustang", "1-6-3-2-5-4", "1-10-9-4-3-6-5-8-7_2", "1-7-5-11-3-9-6-12-2-8-4-10", "1-7-4-10-2-8-6-12-3-9-5-11", "1-4-3-2", "1-12-5-8-3-10-6-7-2-11-4-9", "1-2-7-8-4-5-6-3", "1-3-7-2-6-5-4-8 HO", "1-2-3-4-5-6-7-8-9", "INVALID", "1-2-3-4-5-6-7-8-9-10-11-12", "1-3-2", "1-2-3-4-5-6-7-8", "1-5-4-8-6-3-7-2", "1-4-3-6-2-5", "1-8-7-3-6-5-4-2", "1-6-2-4-3-5", "1-6-5-4-3-2", "1-4-5-2-3-6", "1-5-4-8-3-7-2-6 Voodoo", "1-6-5-10-2-7-3-8-4-9", "1-8-6-2-7-3-4-5 F136", "fo35", "fo36", "fo37", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
justATempTest = scalar, U08, 441, "", 1, 0, 0, 100, 0
mapSyncThreshold = scalar, U08, 442, "kPa", 1, 0, 0, 50, 0
unusedByteHere = scalar, U08, 443, "", 1, 0, 0, 100, 0
torqueReductionIgnitionCut = scalar, S08, 443, "%", 1, 0, 0, 100, 0
cylinderBore = scalar, F32, 444, "mm", 1, 0, 0, 2000, 2
fuelAlgorithm = bits, U08, 448, [0:2], "Speed Density", "MAF Air Charge", "Alpha-N", "Lua", "INVALID", "INVALID", "INVALID", "INVALID"
ALSMaxTPS = scalar, U08, 449, "%", 1, 0, 0, 10, 0
Expand Down Expand Up @@ -430,7 +430,7 @@ max31855_cs6 = bits, U16, 810, [0:8], $gpio_list
max31855_cs7 = bits, U16, 812, [0:8], $gpio_list
max31855_cs8 = bits, U16, 814, [0:8], $gpio_list
flexSensorPin = bits, U16, 816, [0:8], $brain_input_pin_e_list
unused720 = scalar, U16, 818, "", 1, 0, 0, 32000, 0
torqueReductionArmingRpm = scalar, U16, 818, "rpm", 1, 0, 0, 20000, 0
stepperDirectionPinMode = bits, U08, 820, [0:1], "default", "default inverted", "open collector", "open collector inverted"
mc33972spiDevice = bits, U08, 821, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "SPI5", "SPI6", "INVALID"
stoichRatioSecondary = scalar, U08, 822, ":1", 0.1, 0, 5, 25, 1
Expand Down Expand Up @@ -692,7 +692,7 @@ knockDetectionWindowStart = scalar, F32, 1340, "angle", 1, 0, -1000, 1000, 2
knockDetectionWindowEnd = scalar, F32, 1344, "angle", 1, 0, -1000, 1000, 2
idleStepperReactionTime = scalar, F32, 1348, "ms", 1, 0, 1, 300, 0
idleStepperTotalSteps = scalar, S32, 1352, "count", 1, 0, 5, 3000, 0
unusedInt3423423 = scalar, S32, 1356, "", 1, 0, 0, 100, 0
torqueReductionArmingApp = scalar, S32, 1356, "", 1, 0, 0, 20000, 0
tachPulseDuractionMs = scalar, F32, 1360, "", 1, 0, 0, 100, 2
wwaeTau = scalar, F32, 1364, "Seconds", 1, 0, 0, 3, 2
alternatorControl_pFactor = scalar, F32, 1368, "", 1, 0, -10000, 10000, 4
Expand Down Expand Up @@ -741,7 +741,7 @@ throttlePedalUpVoltage = scalar, F32, 1476, "voltage", 1, 0, -6, 6, 2
throttlePedalWOTVoltage = scalar, F32, 1480, "voltage", 1, 0, -6, 6, 2
startUpFuelPumpDuration = scalar, S16, 1484, "seconds", 1, 0, 0, 6000, 0
idlePidRpmDeadZone = scalar, S16, 1486, "RPM", 1, 0, 0, 800, 0
unusedTargetVBatt = scalar, F32, 1488, "", 1, 0, 0, 100, 0
torqueReductionTime = scalar, F32, 1488, "ms", 1, 0, 1, 300, 0
mc33810DisableRecoveryMode = bits, U32, 1492, [0:0], "false", "true"
mc33810Gpgd0Mode = bits, U32, 1492, [1:1], "false", "true"
mc33810Gpgd1Mode = bits, U32, 1492, [2:2], "false", "true"
Expand Down Expand Up @@ -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
unusedAuxSerialSpee = scalar, U32, 1532, "", 1, 0, 0, 100, 0
torqueReductionIgnitionRetard = scalar, F32, 1532, "deg", 1, 0, -180, 180, 2
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 @@ -1731,6 +1731,7 @@ boardSpecificCalibration1 = scalar, S32, 22968, "", 1, 0, 0, 100, 0
wastegatePositionMax = "Voltage when the wastegate is fully open.\nYou probably don't have one of these!\n1 volt = 1000 units"
idlePositionMin = "Voltage when the idle valve is closed.\nYou probably don't have one of these!"
idlePositionMax = "Voltage when the idle valve is open.\nYou probably don't have one of these!\n1 volt = 1000 units"
torqueReductionTriggerPin = "Pin that activates the reduction/cut for shifting. Sometimes shared with the Launch Control pin"
etbJamTimeout = "Time required to detect a stuck throttle."
acIdleExtraOffset = "Additional idle % while A/C is active"
manIdlePosition = "Value between 0 and 100 used in Manual mode"
Expand Down Expand Up @@ -1779,6 +1780,7 @@ boardSpecificCalibration1 = scalar, S32, 22968, "", 1, 0, 0, 100, 0
displacement = "Engine displacement in litres"
cylindersCount = "Number of cylinder the engine has."
mapSyncThreshold = "Delta kPa for MAP sync"
torqueReductionIgnitionCut = "How many % of ignition events will be cut"
cylinderBore = "Cylinder diameter in mm"
fuelAlgorithm = "This setting controls which fuel quantity control algorithm is used.\nAlpha-N means drive by TPS commonly only used for NA engines\nSpeed Density requires MAP sensor and is the default choice for may installs\nMAF air charge is a cylinder filling based method that uses a mass air flow sensor."
crankingInjectionMode = "This is the injection strategy during engine start. See Fuel/Injection settings for more detail. It is suggested to use "Simultaneous"."
Expand Down Expand Up @@ -1903,6 +1905,7 @@ boardSpecificCalibration1 = scalar, S32, 22968, "", 1, 0, 0, 100, 0
max31855_cs7 = "max31855_cs 7"
max31855_cs8 = "max31855_cs 8"
flexSensorPin = "Continental/GM flex fuel sensor, 50-150hz type"
torqueReductionArmingRpm = "Since torque reduction pin is usually shared with launch control, most people have an RPM where behavior under that is Launch Control, over that is Flat Shift/Torque Reduction"
stoichRatioSecondary = "Stoichiometric ratio for your secondary fuel. This value is used when the Flex Fuel sensor indicates E100, typically 9.0"
etbMaximumPosition = "Maximum allowed ETB position. Some throttles go past fully open, so this allows you to limit it to fully open."
sdCardLogFrequency = "Rate the ECU will log to the SD card, in hz (log lines per second)."
Expand Down Expand Up @@ -2037,6 +2040,7 @@ boardSpecificCalibration1 = scalar, S32, 22968, "", 1, 0, 0, 100, 0
camInputsDebug4 = "camInputsDebug 4"
acIdleRpmTarget = "Idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling."
warningPeriod = "set warningPeriod X"
torqueReductionArmingApp = "Pedal position to realize that we need to reduce torque when the trigger pin is uuuh triggered"
tachPulseDuractionMs = "Duration in ms or duty cycle depending on selected mode"
wwaeTau = "Length of time the deposited wall fuel takes to dissipate after the start of acceleration."
alternatorControl_offset = "Linear addition to PID logic"
Expand Down Expand Up @@ -2068,6 +2072,7 @@ boardSpecificCalibration1 = scalar, S32, 22968, "", 1, 0, 0, 100, 0
throttlePedalWOTVoltage = "Pedal in the floor"
startUpFuelPumpDuration = "on IGN voltage detection turn fuel pump on to build fuel pressure"
idlePidRpmDeadZone = "If the RPM closer to target than this value, disable closed loop idle correction to prevent oscillation"
torqueReductionTime = "For how long after the pin has been triggered will the cut/reduction stay active. After that, even if the pin is still triggered, torque is re-introduced"
mc33810DisableRecoveryMode = "See Over/Undervoltage Shutdown/Retry bit in documentation"
enableExtendedCanBroadcast = "Send out board statistics"
useAuxSpeedForSlipRatio = "Use Aux Speed 1 as one of speeds for wheel slip ratio?"
Expand All @@ -2086,6 +2091,7 @@ boardSpecificCalibration1 = scalar, S32, 22968, "", 1, 0, 0, 100, 0
uartConsoleSerialSpeed = "Band rate for primary TTL"
tpsDecelEnleanmentThreshold = "For decel we simply multiply delta of TPS and tFor decel we do not use table?!"
tpsDecelEnleanmentMultiplier = "Magic multiplier, we multiply delta of TPS and get fuel squirt duration"
torqueReductionIgnitionRetard = "How many degrees of timing advance will be reduced during the Torque Reduction Time"
throttlePedalSecondaryWOTVoltage = "Pedal in the floor"
veOverrideMode = "Override the Y axis (load) value used for the VE table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this."
afrOverrideMode = "Override the Y axis (load) value used for the AFR table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this."
Expand Down Expand Up @@ -6213,6 +6219,7 @@ menuDialog = main

menu = "&Advanced"
subMenu = smLaunchControl, "Launch Control"
subMenu = FlatShiftSettingsDialog, "Shift Torque Reduction (Flat Shift)"
subMenu = ignitionCylExtra, "Cylinder offsets", 0

subMenu = std_separator
Expand Down Expand Up @@ -9657,6 +9664,16 @@ dialog = tcuControls, "Transmission Settings"
field = "Final Ignition Cut % Before launch", finalIgnitionCutPercentBeforeLaunch, {launchSparkCutEnable == 1}
field = "Fuel Cut", launchFuelCutEnable, {launchControlEnabled == 1}

dialog = TorqueReductionSettings, "Torque Reduction"
field = "Trigger Pin", torqueReductionTriggerPin
field = "Time", torqueReductionTime, {torqueReductionTriggerPin != 0}
field = "Arming RPM", torqueReductionArmingRpm, {torqueReductionTriggerPin != 0}
field = "Arming APP", torqueReductionArmingApp, {torqueReductionTriggerPin != 0}
field = "Ignition Retard", torqueReductionIgnitionRetard, {torqueReductionTriggerPin != 0}
field = "Ignition Cut", torqueReductionIgnitionCut, {torqueReductionTriggerPin != 0}

dialog = FlatShiftSettingsDialog, "", border
panel = TorqueReductionSettings, West

dialog = smLaunchControl, "", border
panel = smLaunchControlWest, West
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.26.XYZ.@@SIGNATURE_HASH@@"
#define TS_SIGNATURE "rusEFI main.2024.09.27.XYZ.@@SIGNATURE_HASH@@"

0 comments on commit a7b169b

Please sign in to comment.