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 Oct 10, 2024
1 parent b5edd5d commit 298900e
Show file tree
Hide file tree
Showing 5 changed files with 76 additions and 56 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -679,7 +679,7 @@ struct engine_configuration_s {
*/
int8_t launchFuelAdderPercent;
/**
* Time required to detect a stuck throttle.
* Time after which the throttle is considered jammed.
* units: sec
* offset 39
*/
Expand Down Expand Up @@ -3882,10 +3882,11 @@ struct engine_configuration_s {
*/
scaled_channel<uint16_t, 1000, 1> fordInjectorSmallPulseBreakPoint;
/**
* Threshold in ETB error (target vs. actual) above which the jam timer is started. If the timer reaches the time specified in the jam detection timeout period, the throttle is considered jammed, and engine operation limited.
* units: %
* offset 3062
*/
uint8_t jamDetectThreshold;
uint8_t etbJamDetectThreshold;
/**
* units: lobes/cam
* offset 3063
Expand Down Expand Up @@ -4069,88 +4070,101 @@ struct engine_configuration_s {
*/
output_pin_e acrPin2;
/**
* Set a minimum allowed target position to avoid slamming/driving against the hard mechanical stop in the throttle.
* units: %
* offset 3236
*/
float etbMinimumPosition;
scaled_channel<uint8_t, 10, 1> etbMinimumPosition;
/**
* offset 3240
* need 4 byte alignment
* units: units
* offset 3237
*/
uint8_t alignmentFill_at_3237[1];
/**
* offset 3238
*/
uint16_t tuneHidingKey;
/**
* offset 3242
* offset 3240
*/
vin_number_t vinNumber;
/**
* need 4 byte alignment
* units: units
* offset 3259
* offset 3257
*/
uint8_t alignmentFill_at_3259[1];
uint8_t alignmentFill_at_3257[1];
/**
* offset 3260
* offset 3258
*/
uint16_t highSpeedOffsets[HIGH_SPEED_COUNT];
/**
* offset 3324
* offset 3322
*/
fuel_pressure_sensor_mode_e fuelPressureSensorMode;
/**
* need 4 byte alignment
* units: units
* offset 3325
* offset 3323
*/
uint8_t alignmentFill_at_3325[1];
uint8_t alignmentFill_at_3323[1];
/**
* offset 3326
* offset 3324
*/
switch_input_pin_e luaDigitalInputPins[LUA_DIGITAL_INPUT_COUNT];
/**
* units: rpm
* offset 3342
* offset 3340
*/
int16_t ALSMinRPM;
/**
* units: rpm
* offset 3344
* offset 3342
*/
int16_t ALSMaxRPM;
/**
* units: sec
* offset 3346
* offset 3344
*/
int16_t ALSMaxDuration;
/**
* units: C
* offset 3348
* offset 3346
*/
int8_t ALSMinCLT;
/**
* units: C
* offset 3349
* offset 3347
*/
int8_t ALSMaxCLT;
/**
* offset 3350
* offset 3348
*/
uint8_t alsMinTimeBetween;
/**
* offset 3351
* offset 3349
*/
uint8_t alsEtbPosition;
/**
* units: %
* offset 3352
* offset 3350
*/
uint8_t acRelayAlternatorDutyAdder;
/**
* offset 3353
* offset 3351
*/
SentEtbType sentEtbType;
/**
* offset 3354
* offset 3352
*/
uint16_t customSentTpsMin;
/**
* need 4 byte alignment
* units: units
* offset 3354
*/
uint8_t alignmentFill_at_3354[2];
/**
* units: %
* offset 3356
Expand Down
7 changes: 4 additions & 3 deletions generated/controllers/generated/rusefi_generated_paralela.h
Original file line number Diff line number Diff line change
Expand Up @@ -1295,7 +1295,7 @@
#define SentEtbType_GM_TYPE_1 1
#define SentEtbType_NONE 0
#define show_vvt_output_pin true
#define SIGNATURE_HASH 1400082183
#define SIGNATURE_HASH 1247329779
#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 @@ -1490,13 +1490,14 @@
#define ts_14_command_TS_BURN_WITHOUT_FLASH 0x15
#define ts_14_command_TS_ETB_AUTOCAL_0 0x0E
#define ts_14_command_TS_ETB_AUTOCAL_1 0x11
#define ts_14_command_TS_ETB_DISABLE_JAM_DETECT 0x14
#define ts_14_command_TS_ETB_RESET 0x0B
#define ts_14_command_TS_ETB_START_AUTOTUNE 0x0C
#define ts_14_command_TS_ETB_STOP_AUTOTUNE 0x10
#define ts_14_command_TS_EXTERNAL_TRIGGER_STIMULATOR_ENABLE 0x13
#define ts_14_command_TS_GRAB_PEDAL_UP 6
#define ts_14_command_TS_GRAB_PEDAL_WOT 7
#define ts_14_command_TS_RESET_MC33810 0x14
#define ts_14_command_TS_RESET_MC33810 0x16
#define ts_14_command_TS_RESET_TLE8888 8
#define ts_14_command_TS_TRIGGER_STIMULATOR_DISABLE 0x0F
#define ts_14_command_TS_TRIGGER_STIMULATOR_ENABLE 0x0D
Expand Down Expand Up @@ -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 master.2024.10.09.paralela.1400082183"
#define TS_SIGNATURE "rusEFI master.2024.10.10.paralela.1247329779"
#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_paralela.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 1400082183
#define TS_SIGNATURE "rusEFI master.2024.10.09.paralela.1400082183"
#define SIGNATURE_HASH 1247329779
#define TS_SIGNATURE "rusEFI master.2024.10.10.paralela.1247329779"
61 changes: 33 additions & 28 deletions generated/tunerstudio/generated/rusefi_paralela.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 master.2024.10.09.paralela.1400082183"
signature = "rusEFI master.2024.10.10.paralela.1247329779"

[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmware version for title bar.
signature= "rusEFI master.2024.10.09.paralela.1400082183" ; signature is expected to be 7 or more characters.
signature= "rusEFI master.2024.10.10.paralela.1247329779" ; 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 @@ -1147,7 +1147,7 @@ dfcoDelay = scalar, U08, 3057, "sec", 0.1, 0, 0, 10, 1
acDelay = scalar, U08, 3058, "sec", 0.1, 0, 0, 10, 1
tChargeMode = bits, U08, 3059, [0:1], "RPM+TPS (Default)", "Air Mass Interpolation", "Table", "INVALID"
fordInjectorSmallPulseBreakPoint = scalar, U16, 3060, "mg", 0.001, 0, 0, 65, 3
jamDetectThreshold = scalar, U08, 3062, "%", 1, 0, 0, 50, 0
etbJamDetectThreshold = scalar, U08, 3062, "%", 1, 0, 0, 50, 0
hpfpCamLobes = scalar, U08, 3063, "lobes/cam", 1, 0, 0, 255, 0
hpfpCam = bits, U08, 3064, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2", "INVALID", "INVALID", "INVALID"
acLowRpmLimit = scalar, S08, 3065, "RPM", 10.0, 0, 0, 1200, 0
Expand Down Expand Up @@ -1201,29 +1201,29 @@ tcu_32_solenoid_pin = bits, U16, 3228, [0:8], $output_pin_e_list
tcu_32_solenoid_pin_mode = bits, U08, 3230, [0:1], "default", "default inverted", "open collector", "open collector inverted"
tcu_32_solenoid_freq = scalar, U16, 3232, "Hz", 1, 0, 0, 3000, 0
acrPin2 = bits, U16, 3234, [0:8], $output_pin_e_list
etbMinimumPosition = scalar, F32, 3236, "%", 1, 0, 0.01, 100, 2
tuneHidingKey = scalar, U16, 3240, "", 1, 0, 0, 20000, 0
vinNumber = string, ASCII, 3242, 17
highSpeedOffsets = array, U16, 3260, [32], "", 1, 0.00000,0.00,65535, 0, noMsqSave
fuelPressureSensorMode = bits, U08, 3324, [0:1], "Absolute", "Gauge", "Differential", "INVALID"
luaDigitalInputPins1 = bits, U16, 3326, [0:8], $switch_input_pin_e_list
luaDigitalInputPins2 = bits, U16, 3328, [0:8], $switch_input_pin_e_list
luaDigitalInputPins3 = bits, U16, 3330, [0:8], $switch_input_pin_e_list
luaDigitalInputPins4 = bits, U16, 3332, [0:8], $switch_input_pin_e_list
luaDigitalInputPins5 = bits, U16, 3334, [0:8], $switch_input_pin_e_list
luaDigitalInputPins6 = bits, U16, 3336, [0:8], $switch_input_pin_e_list
luaDigitalInputPins7 = bits, U16, 3338, [0:8], $switch_input_pin_e_list
luaDigitalInputPins8 = bits, U16, 3340, [0:8], $switch_input_pin_e_list
ALSMinRPM = scalar, S16, 3342, "rpm", 1, 0, 0, 20000, 0
ALSMaxRPM = scalar, S16, 3344, "rpm", 1, 0, 0, 20000, 0
ALSMaxDuration = scalar, S16, 3346, "sec", 1, 0, 0, 10, 0
ALSMinCLT = scalar, S08, 3348, "C", 1, 0, 0, 90, 0
ALSMaxCLT = scalar, S08, 3349, "C", 1, 0, 0, 105, 0
alsMinTimeBetween = scalar, U08, 3350, "", 1, 0, 0, 20000, 0
alsEtbPosition = scalar, U08, 3351, "", 1, 0, 0, 20000, 0
acRelayAlternatorDutyAdder = scalar, U08, 3352, "%", 1, 0, 0, 100, 0
sentEtbType = bits, S08, 3353, [0:1], "None", "GM type 1", "Ford type 1", "Custom"
customSentTpsMin = scalar, U16, 3354, "", 1, 0, 0, 32000, 0
etbMinimumPosition = scalar, U08, 3236, "%", 0.1, 0, 0, 10, 1
tuneHidingKey = scalar, U16, 3238, "", 1, 0, 0, 20000, 0
vinNumber = string, ASCII, 3240, 17
highSpeedOffsets = array, U16, 3258, [32], "", 1, 0.00000,0.00,65535, 0, noMsqSave
fuelPressureSensorMode = bits, U08, 3322, [0:1], "Absolute", "Gauge", "Differential", "INVALID"
luaDigitalInputPins1 = bits, U16, 3324, [0:8], $switch_input_pin_e_list
luaDigitalInputPins2 = bits, U16, 3326, [0:8], $switch_input_pin_e_list
luaDigitalInputPins3 = bits, U16, 3328, [0:8], $switch_input_pin_e_list
luaDigitalInputPins4 = bits, U16, 3330, [0:8], $switch_input_pin_e_list
luaDigitalInputPins5 = bits, U16, 3332, [0:8], $switch_input_pin_e_list
luaDigitalInputPins6 = bits, U16, 3334, [0:8], $switch_input_pin_e_list
luaDigitalInputPins7 = bits, U16, 3336, [0:8], $switch_input_pin_e_list
luaDigitalInputPins8 = bits, U16, 3338, [0:8], $switch_input_pin_e_list
ALSMinRPM = scalar, S16, 3340, "rpm", 1, 0, 0, 20000, 0
ALSMaxRPM = scalar, S16, 3342, "rpm", 1, 0, 0, 20000, 0
ALSMaxDuration = scalar, S16, 3344, "sec", 1, 0, 0, 10, 0
ALSMinCLT = scalar, S08, 3346, "C", 1, 0, 0, 90, 0
ALSMaxCLT = scalar, S08, 3347, "C", 1, 0, 0, 105, 0
alsMinTimeBetween = scalar, U08, 3348, "", 1, 0, 0, 20000, 0
alsEtbPosition = scalar, U08, 3349, "", 1, 0, 0, 20000, 0
acRelayAlternatorDutyAdder = scalar, U08, 3350, "%", 1, 0, 0, 100, 0
sentEtbType = bits, S08, 3351, [0:1], "None", "GM type 1", "Ford type 1", "Custom"
customSentTpsMin = scalar, U16, 3352, "", 1, 0, 0, 32000, 0
ALSIdleAdd = scalar, S32, 3356, "%", 1, 0, 0, 100, 2
ALSEtbAdd = scalar, S32, 3360, "%", 1, 0, 0, 100, 2
ALSSkipRatio = scalar, F32, 3364, "", 1, 0, 0, 1, 1
Expand Down Expand Up @@ -1732,7 +1732,7 @@ minimumOilPressureValues = array, U08, 25060, [8], "kPa", 10.0, 0, 0, 1000, 0
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."
etbJamTimeout = "Time after which the throttle is considered jammed."
acIdleExtraOffset = "Additional idle % while A/C is active"
manIdlePosition = "Value between 0 and 100 used in Manual mode"
multisparkMaxSparkingAngle = "This parameter sets the latest that the last multispark can occur after the main ignition event. For example, if the ignition timing is 30 degrees BTDC, and this parameter is set to 45, no multispark will ever be fired after 15 degrees ATDC."
Expand Down Expand Up @@ -2325,6 +2325,7 @@ minimumOilPressureValues = array, U08, 25060, [8], "kPa", 10.0, 0, 0, 1000, 0
maxCamPhaseResolveRpm = "Below this RPM, use camshaft information to synchronize the crank's position for full sequential operation. Use this if your cam sensor does weird things at high RPM. Set to 0 to disable, and always use cam to help sync crank."
dfcoDelay = "Delay before cutting fuel. Set to 0 to cut immediately with no delay. May cause rumbles and pops out of your exhaust..."
acDelay = "Delay before engaging the AC compressor. Set to 0 to engage immediately with no delay. Use this to prevent bogging at idle when AC engages."
etbJamDetectThreshold = "Threshold in ETB error (target vs. actual) above which the jam timer is started. If the timer reaches the time specified in the jam detection timeout period, the throttle is considered jammed, and engine operation limited."
acLowRpmLimit = "Low engine speed for A/C. Larger engines can survive lower values"
hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump"
hpfpPumpVolume = "Size of the pump chamber in cc. Typical Bosch HDP5 has a 9.0mm diameter, typical BMW N* stroke is 4.4mm."
Expand All @@ -2345,6 +2346,7 @@ minimumOilPressureValues = array, U08, 25060, [8], "kPa", 10.0, 0, 0, 1000, 0
gearRatio9 = "gearRatio 9"
gearRatio10 = "gearRatio 10"
vvtActivationDelayMs = "We need to give engine time to build oil pressure without diverting it to VVT"
etbMinimumPosition = "Set a minimum allowed target position to avoid slamming/driving against the hard mechanical stop in the throttle."
luaDigitalInputPins1 = "luaDigitalInputPins 1"
luaDigitalInputPins2 = "luaDigitalInputPins 2"
luaDigitalInputPins3 = "luaDigitalInputPins 3"
Expand Down Expand Up @@ -6432,6 +6434,7 @@ cmd_etb_autotune_stop = "Z\x00\x14\x00\x10"
cmd_etb_auto_calibrate_2 = "Z\x00\x14\x00\x11"
cmd_wideband_firmare_update = "Z\x00\x14\x00\x12"
cmd_enable_ext_stim = "Z\x00\x14\x00\x13"
cmd_etb_disable_jam_detect = "Z\x00\x14\x00\x14"
cmd_burn_without_flash = "Z\x00\x14\x00\x15"

cmd_set_wideband_idx_0 = "Z\x00\x15\x00\x00"
Expand Down Expand Up @@ -9384,8 +9387,10 @@ dialog = tcuControls, "Transmission Settings"
field = "Minimum ETB position", etbMinimumPosition
field = "Maximum ETB position", etbMaximumPosition
field = ""
field = "Jam detection error max", jamDetectThreshold
field = "Jam detection error max", etbJamDetectThreshold
field = "Jam detection timeout period", etbJamTimeout
field = "Disables jam detection for testing until the next power cycle"
commandButton = "Temporarily disable jam detection", cmd_etb_disable_jam_detect
; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility
; criteria for the same panel when used in multiple places
; todo: report bug to TS?
Expand Down
2 changes: 1 addition & 1 deletion generated/tunerstudio/generated/signature_paralela.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 [master]
#define TS_SIGNATURE "rusEFI master.2024.10.09.paralela.@@SIGNATURE_HASH@@"
#define TS_SIGNATURE "rusEFI master.2024.10.10.paralela.@@SIGNATURE_HASH@@"

0 comments on commit 298900e

Please sign in to comment.