Custom Auto-generated Configs

[no ci]
This commit is contained in:
GitHub git update Action 2024-12-08 16:45:20 +00:00
parent 28617c4bc6
commit dc173e311e
9 changed files with 98 additions and 85 deletions

View File

@ -569,13 +569,14 @@ entry = isDisabledByLua, "AC disabled by Lua", int, "%d"
entry = acCompressorState, "AC compressor on", int, "%d"
entry = acPressureTooLow, "AC pressure too low", int, "%d"
entry = acPressureTooHigh, "AC pressure too high", int, "%d"
entry = isArmed, "isArmed", int, "%d"
entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d"
entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d"
entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d"
entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d"
entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d"
entry = isNitrousConditionSatisfied, "isNitrousConditionSatisfied", int, "%d"
entry = isNitrousArmed, "isNitrousArmed", int, "%d"
entry = isNitrousSpeedCondition, "isNitrousSpeedCondition", int, "%d"
entry = isNitrousTpsCondition, "isNitrousTpsCondition", int, "%d"
entry = isNitrousCltCondition, "isNitrousCltCondition", int, "%d"
entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d"
entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d"
entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d"
entry = isNitrousCondition, "isNitrousCondition", int, "%d"
entry = cranking0, "cranking0", int, "%d"
entry = notRunning0, "notRunning0", int, "%d"
entry = disabledWhileEngineStopped0, "disabledWhileEngineStopped0", int, "%d"

View File

@ -237,13 +237,14 @@ dialog = ac_controlDialog, "ac_control"
graphLine = acButtonState
indicatorPanel = nitrous_control_stateIndicatorPanel, 2
indicator = {isArmed}, "isArmed No", "isArmed Yes"
indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes"
indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes"
indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes"
indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes"
indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes"
indicator = {isNitrousConditionSatisfied}, "isNitrousConditionSatisfied No", "isNitrousConditionSatisfied Yes"
indicator = {isNitrousArmed}, "isNitrousArmed No", "isNitrousArmed Yes"
indicator = {isNitrousSpeedCondition}, "isNitrousSpeedCondition No", "isNitrousSpeedCondition Yes"
indicator = {isNitrousTpsCondition}, "isNitrousTpsCondition No", "isNitrousTpsCondition Yes"
indicator = {isNitrousCltCondition}, "isNitrousCltCondition No", "isNitrousCltCondition Yes"
indicator = {isNitrousMapCondition}, "isNitrousMapCondition No", "isNitrousMapCondition Yes"
indicator = {isNitrousAfrCondition}, "isNitrousAfrCondition No", "isNitrousAfrCondition Yes"
indicator = {isNitrousRpmCondition}, "isNitrousRpmCondition No", "isNitrousRpmCondition Yes"
indicator = {isNitrousCondition}, "isNitrousCondition No", "isNitrousCondition Yes"
dialog = nitrous_control_stateDialog, "nitrous_control_state"
panel = nitrous_control_stateIndicatorPanel

View File

@ -636,13 +636,14 @@ acCompressorState = bits, U32, 1172, [7:7]
acPressureTooLow = bits, U32, 1172, [8:8]
acPressureTooHigh = bits, U32, 1172, [9:9]
; total TS size = 1176
isArmed = bits, U32, 1176, [0:0]
isTpsConditionSatisfied = bits, U32, 1176, [1:1]
isCltConditionSatisfied = bits, U32, 1176, [2:2]
isMapConditionSatisfied = bits, U32, 1176, [3:3]
isAfrConditionSatisfied = bits, U32, 1176, [4:4]
isNitrousRpmConditionSatisfied = bits, U32, 1176, [5:5]
isNitrousConditionSatisfied = bits, U32, 1176, [6:6]
isNitrousArmed = bits, U32, 1176, [0:0]
isNitrousSpeedCondition = bits, U32, 1176, [1:1]
isNitrousTpsCondition = bits, U32, 1176, [2:2]
isNitrousCltCondition = bits, U32, 1176, [3:3]
isNitrousMapCondition = bits, U32, 1176, [4:4]
isNitrousAfrCondition = bits, U32, 1176, [5:5]
isNitrousRpmCondition = bits, U32, 1176, [6:6]
isNitrousCondition = bits, U32, 1176, [7:7]
; total TS size = 1180
cranking0 = bits, U32, 1180, [0:0]
notRunning0 = bits, U32, 1180, [1:1]

View File

@ -4935,9 +4935,14 @@ struct engine_configuration_s {
*/
float nitrousIgnitionRetard;
/**
* units: units
* units: Kph
* offset 3972
*/
uint16_t nitrousMinimumVehicleSpeed;
/**
* units: units
* offset 3974
*/
uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING];
};
static_assert(sizeof(engine_configuration_s) == 4040);

View File

@ -350,7 +350,7 @@
#define ego_sensor_e_ES_Innovate_MTX_L 1
#define ego_sensor_e_ES_PLX 4
#define EGT_CHANNEL_COUNT 8
#define END_OF_CALIBRATION_PADDING 68
#define END_OF_CALIBRATION_PADDING 66
#define engine_configuration_s_size 4040
#define engine_load_mode_e_auto_enum 0="LM_SPEED_DENSITY",2="LM_ALPHA_N",3="LM_LUA",100="LM_MOCK",1="LM_REAL_MAF"
#define engine_load_mode_e_enum "Speed Density", "MAF Air Charge", "Alpha-N", "Lua"
@ -1328,7 +1328,7 @@
#define SentInput_NONE 0
#define show_tcu_gauges false
#define show_vvt_output_pin true
#define SIGNATURE_HASH 224853716
#define SIGNATURE_HASH 1878042687
#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"
@ -1789,7 +1789,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.12.07.XYZ.224853716"
#define TS_SIGNATURE "rusEFI main.2024.12.08.XYZ.1878042687"
#define TS_SIMULATE_CAN '>'
#define TS_SIMULATE_CAN_char >
#define TS_SINGLE_WRITE_COMMAND 'W'

View File

@ -2,5 +2,5 @@
// was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer
//
#define SIGNATURE_HASH 224853716
#define TS_SIGNATURE "rusEFI main.2024.12.07.XYZ.224853716"
#define SIGNATURE_HASH 1878042687
#define TS_SIGNATURE "rusEFI main.2024.12.08.XYZ.1878042687"

View File

@ -7,100 +7,100 @@
struct nitrous_control_state_s {
/**
offset 0 bit 0 */
bool isArmed : 1 {};
bool isNitrousArmed : 1 {};
/**
offset 0 bit 1 */
bool isTpsConditionSatisfied : 1 {};
bool isNitrousSpeedCondition : 1 {};
/**
offset 0 bit 2 */
bool isCltConditionSatisfied : 1 {};
bool isNitrousTpsCondition : 1 {};
/**
offset 0 bit 3 */
bool isMapConditionSatisfied : 1 {};
bool isNitrousCltCondition : 1 {};
/**
offset 0 bit 4 */
bool isAfrConditionSatisfied : 1 {};
bool isNitrousMapCondition : 1 {};
/**
offset 0 bit 5 */
bool isNitrousRpmConditionSatisfied : 1 {};
bool isNitrousAfrCondition : 1 {};
/**
offset 0 bit 6 */
bool isNitrousConditionSatisfied : 1 {};
bool isNitrousRpmCondition : 1 {};
/**
offset 0 bit 7 */
bool unusedBit_7_7 : 1 {};
bool isNitrousCondition : 1 {};
/**
offset 0 bit 8 */
bool unusedBit_7_8 : 1 {};
bool unusedBit_8_8 : 1 {};
/**
offset 0 bit 9 */
bool unusedBit_7_9 : 1 {};
bool unusedBit_8_9 : 1 {};
/**
offset 0 bit 10 */
bool unusedBit_7_10 : 1 {};
bool unusedBit_8_10 : 1 {};
/**
offset 0 bit 11 */
bool unusedBit_7_11 : 1 {};
bool unusedBit_8_11 : 1 {};
/**
offset 0 bit 12 */
bool unusedBit_7_12 : 1 {};
bool unusedBit_8_12 : 1 {};
/**
offset 0 bit 13 */
bool unusedBit_7_13 : 1 {};
bool unusedBit_8_13 : 1 {};
/**
offset 0 bit 14 */
bool unusedBit_7_14 : 1 {};
bool unusedBit_8_14 : 1 {};
/**
offset 0 bit 15 */
bool unusedBit_7_15 : 1 {};
bool unusedBit_8_15 : 1 {};
/**
offset 0 bit 16 */
bool unusedBit_7_16 : 1 {};
bool unusedBit_8_16 : 1 {};
/**
offset 0 bit 17 */
bool unusedBit_7_17 : 1 {};
bool unusedBit_8_17 : 1 {};
/**
offset 0 bit 18 */
bool unusedBit_7_18 : 1 {};
bool unusedBit_8_18 : 1 {};
/**
offset 0 bit 19 */
bool unusedBit_7_19 : 1 {};
bool unusedBit_8_19 : 1 {};
/**
offset 0 bit 20 */
bool unusedBit_7_20 : 1 {};
bool unusedBit_8_20 : 1 {};
/**
offset 0 bit 21 */
bool unusedBit_7_21 : 1 {};
bool unusedBit_8_21 : 1 {};
/**
offset 0 bit 22 */
bool unusedBit_7_22 : 1 {};
bool unusedBit_8_22 : 1 {};
/**
offset 0 bit 23 */
bool unusedBit_7_23 : 1 {};
bool unusedBit_8_23 : 1 {};
/**
offset 0 bit 24 */
bool unusedBit_7_24 : 1 {};
bool unusedBit_8_24 : 1 {};
/**
offset 0 bit 25 */
bool unusedBit_7_25 : 1 {};
bool unusedBit_8_25 : 1 {};
/**
offset 0 bit 26 */
bool unusedBit_7_26 : 1 {};
bool unusedBit_8_26 : 1 {};
/**
offset 0 bit 27 */
bool unusedBit_7_27 : 1 {};
bool unusedBit_8_27 : 1 {};
/**
offset 0 bit 28 */
bool unusedBit_7_28 : 1 {};
bool unusedBit_8_28 : 1 {};
/**
offset 0 bit 29 */
bool unusedBit_7_29 : 1 {};
bool unusedBit_8_29 : 1 {};
/**
offset 0 bit 30 */
bool unusedBit_7_30 : 1 {};
bool unusedBit_8_30 : 1 {};
/**
offset 0 bit 31 */
bool unusedBit_7_31 : 1 {};
bool unusedBit_8_31 : 1 {};
};
static_assert(sizeof(nitrous_control_state_s) == 4);

View File

@ -38,12 +38,12 @@ enable2ndByteCanID = false
[MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI main.2024.12.07.XYZ.224853716"
signature = "rusEFI main.2024.12.08.XYZ.1878042687"
[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmware version for title bar.
signature= "rusEFI main.2024.12.07.XYZ.224853716" ; signature is expected to be 7 or more characters.
signature= "rusEFI main.2024.12.08.XYZ.1878042687" ; 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
@ -1445,7 +1445,8 @@ nitrousRelayPin = bits, U16, 3962, [0:8], $output_pin_e_list
nitrousRelayPinMode = bits, U08, 3964, [0:1], "default", "default inverted", "open collector", "open collector inverted"
nitrousFuelAdderPercent = scalar, S08, 3965, "%", 1, 0, 0, 100, 0
nitrousIgnitionRetard = scalar, F32, 3968, "deg", 1, 0, -180, 180, 2
unusedOftenChangesDuringFirmwareUpdate = array, U08, 3972, [68], "units", 1, 0, 0, 1, 0
nitrousMinimumVehicleSpeed = scalar, U16, 3972, "Kph", 1, 0, 0, 300, 0
unusedOftenChangesDuringFirmwareUpdate = array, U08, 3974, [66], "units", 1, 0, 0, 1, 0
postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2
postCrankingDurationBins = array, U16, 4184, [6], "count", 1, 0, 0, 64000, 0
postCrankingCLTBins = array, S16, 4196, [6], "C", 1, 0, -100, 250, 0
@ -3285,13 +3286,14 @@ acCompressorState = bits, U32, 1172, [7:7]
acPressureTooLow = bits, U32, 1172, [8:8]
acPressureTooHigh = bits, U32, 1172, [9:9]
; total TS size = 1176
isArmed = bits, U32, 1176, [0:0]
isTpsConditionSatisfied = bits, U32, 1176, [1:1]
isCltConditionSatisfied = bits, U32, 1176, [2:2]
isMapConditionSatisfied = bits, U32, 1176, [3:3]
isAfrConditionSatisfied = bits, U32, 1176, [4:4]
isNitrousRpmConditionSatisfied = bits, U32, 1176, [5:5]
isNitrousConditionSatisfied = bits, U32, 1176, [6:6]
isNitrousArmed = bits, U32, 1176, [0:0]
isNitrousSpeedCondition = bits, U32, 1176, [1:1]
isNitrousTpsCondition = bits, U32, 1176, [2:2]
isNitrousCltCondition = bits, U32, 1176, [3:3]
isNitrousMapCondition = bits, U32, 1176, [4:4]
isNitrousAfrCondition = bits, U32, 1176, [5:5]
isNitrousRpmCondition = bits, U32, 1176, [6:6]
isNitrousCondition = bits, U32, 1176, [7:7]
; total TS size = 1180
cranking0 = bits, U32, 1180, [0:0]
notRunning0 = bits, U32, 1180, [1:1]
@ -5958,13 +5960,14 @@ entry = isDisabledByLua, "AC disabled by Lua", int, "%d"
entry = acCompressorState, "AC compressor on", int, "%d"
entry = acPressureTooLow, "AC pressure too low", int, "%d"
entry = acPressureTooHigh, "AC pressure too high", int, "%d"
entry = isArmed, "isArmed", int, "%d"
entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d"
entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d"
entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d"
entry = isAfrConditionSatisfied, "isAfrConditionSatisfied", int, "%d"
entry = isNitrousRpmConditionSatisfied, "isNitrousRpmConditionSatisfied", int, "%d"
entry = isNitrousConditionSatisfied, "isNitrousConditionSatisfied", int, "%d"
entry = isNitrousArmed, "isNitrousArmed", int, "%d"
entry = isNitrousSpeedCondition, "isNitrousSpeedCondition", int, "%d"
entry = isNitrousTpsCondition, "isNitrousTpsCondition", int, "%d"
entry = isNitrousCltCondition, "isNitrousCltCondition", int, "%d"
entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d"
entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d"
entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d"
entry = isNitrousCondition, "isNitrousCondition", int, "%d"
entry = cranking0, "cranking0", int, "%d"
entry = notRunning0, "notRunning0", int, "%d"
entry = disabledWhileEngineStopped0, "disabledWhileEngineStopped0", int, "%d"
@ -6959,13 +6962,14 @@ dialog = ac_controlDialog, "ac_control"
graphLine = acButtonState
indicatorPanel = nitrous_control_stateIndicatorPanel, 2
indicator = {isArmed}, "isArmed No", "isArmed Yes"
indicator = {isTpsConditionSatisfied}, "isTpsConditionSatisfied No", "isTpsConditionSatisfied Yes"
indicator = {isCltConditionSatisfied}, "isCltConditionSatisfied No", "isCltConditionSatisfied Yes"
indicator = {isMapConditionSatisfied}, "isMapConditionSatisfied No", "isMapConditionSatisfied Yes"
indicator = {isAfrConditionSatisfied}, "isAfrConditionSatisfied No", "isAfrConditionSatisfied Yes"
indicator = {isNitrousRpmConditionSatisfied}, "isNitrousRpmConditionSatisfied No", "isNitrousRpmConditionSatisfied Yes"
indicator = {isNitrousConditionSatisfied}, "isNitrousConditionSatisfied No", "isNitrousConditionSatisfied Yes"
indicator = {isNitrousArmed}, "isNitrousArmed No", "isNitrousArmed Yes"
indicator = {isNitrousSpeedCondition}, "isNitrousSpeedCondition No", "isNitrousSpeedCondition Yes"
indicator = {isNitrousTpsCondition}, "isNitrousTpsCondition No", "isNitrousTpsCondition Yes"
indicator = {isNitrousCltCondition}, "isNitrousCltCondition No", "isNitrousCltCondition Yes"
indicator = {isNitrousMapCondition}, "isNitrousMapCondition No", "isNitrousMapCondition Yes"
indicator = {isNitrousAfrCondition}, "isNitrousAfrCondition No", "isNitrousAfrCondition Yes"
indicator = {isNitrousRpmCondition}, "isNitrousRpmCondition No", "isNitrousRpmCondition Yes"
indicator = {isNitrousCondition}, "isNitrousCondition No", "isNitrousCondition Yes"
dialog = nitrous_control_stateDialog, "nitrous_control_state"
panel = nitrous_control_stateIndicatorPanel
@ -9923,6 +9927,7 @@ dialog = tcuControls, "Transmission Settings"
dialog = NitrousControlSettings, "Settings"
field = "Nitrous Relay", nitrousRelayPin
field = "Nitrous Relay Mode", nitrousRelayPinMode
field = "Minimum Vehicle Speed", nitrousMinimumVehicleSpeed
field = "Minimum TPS", nitrousMinimumTps
field = "Minimum CLT", nitrousMinimumClt
field = "Maximum MAP", nitrousMaximumMap
@ -9938,7 +9943,7 @@ dialog = tcuControls, "Transmission Settings"
panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1}
panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))}
dialog = NitrousControlDialog
dialog = NitrousControlDialog, "", border
panel = NitrousControlSettingsDialog, West
panel = nitrous_control_stateDialog, East

View File

@ -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.12.07.XYZ.@@SIGNATURE_HASH@@"
#define TS_SIGNATURE "rusEFI main.2024.12.08.XYZ.@@SIGNATURE_HASH@@"