parent
d38eb9414e
commit
945a9420d9
|
@ -527,6 +527,9 @@ entry = isRpmConditionSatisfied, "isRpmConditionSatisfied", int, "%d"
|
|||
entry = isAppConditionSatisfied, "isAppConditionSatisfied", int, "%d"
|
||||
entry = isFlatShiftConditionSatisfied, "isFlatShiftConditionSatisfied", int, "%d"
|
||||
entry = isArmed, "isArmed", int, "%d"
|
||||
entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d"
|
||||
entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d"
|
||||
entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d"
|
||||
entry = isAntilagCondition, "isAntilagCondition", int, "%d"
|
||||
entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d"
|
||||
entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d"
|
||||
|
|
|
@ -175,6 +175,9 @@ dialog = shift_torque_reduction_stateDialog, "shift_torque_reduction_state"
|
|||
|
||||
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"
|
||||
|
||||
dialog = nitrous_control_stateDialog, "nitrous_control_state"
|
||||
panel = nitrous_control_stateIndicatorPanel
|
||||
|
|
|
@ -591,6 +591,9 @@ isAppConditionSatisfied = bits, U32, 1124, [4:4]
|
|||
isFlatShiftConditionSatisfied = bits, U32, 1124, [5:5]
|
||||
; total TS size = 1128
|
||||
isArmed = bits, U32, 1128, [0:0]
|
||||
isTpsConditionSatisfied = bits, U32, 1128, [1:1]
|
||||
isCltConditionSatisfied = bits, U32, 1128, [2:2]
|
||||
isMapConditionSatisfied = bits, U32, 1128, [3:3]
|
||||
; total TS size = 1132
|
||||
isAntilagCondition = bits, U32, 1132, [0:0]
|
||||
ALSMinRPMCondition = bits, U32, 1132, [1:1]
|
||||
|
|
|
@ -4852,16 +4852,36 @@ struct engine_configuration_s {
|
|||
*/
|
||||
float nitrousLuaGaugeArmingValue;
|
||||
/**
|
||||
* units: units
|
||||
* offset 3944
|
||||
*/
|
||||
int nitrousMinimumTps;
|
||||
/**
|
||||
* units: deg C
|
||||
* offset 3948
|
||||
*/
|
||||
uint8_t nitrousMinimumClt;
|
||||
/**
|
||||
* need 4 byte alignment
|
||||
* units: units
|
||||
* offset 3949
|
||||
*/
|
||||
uint8_t alignmentFill_at_3949[1];
|
||||
/**
|
||||
* units: kPa
|
||||
* offset 3950
|
||||
*/
|
||||
int16_t nitrousMaximumMap;
|
||||
/**
|
||||
* units: units
|
||||
* offset 3952
|
||||
*/
|
||||
uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING];
|
||||
/**
|
||||
* need 4 byte alignment
|
||||
* units: units
|
||||
* offset 4038
|
||||
* offset 4039
|
||||
*/
|
||||
uint8_t alignmentFill_at_4038[2];
|
||||
uint8_t alignmentFill_at_4039[1];
|
||||
};
|
||||
static_assert(sizeof(engine_configuration_s) == 4040);
|
||||
|
||||
|
|
|
@ -348,7 +348,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 94
|
||||
#define END_OF_CALIBRATION_PADDING 87
|
||||
#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"
|
||||
|
@ -1326,7 +1326,7 @@
|
|||
#define SentInput_NONE 0
|
||||
#define show_tcu_gauges true
|
||||
#define show_vvt_output_pin true
|
||||
#define SIGNATURE_HASH 1128517059
|
||||
#define SIGNATURE_HASH 781490395
|
||||
#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"
|
||||
|
@ -1787,7 +1787,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.11.29.mega100.1128517059"
|
||||
#define TS_SIGNATURE "rusEFI main.2024.11.30.mega100.781490395"
|
||||
#define TS_SIMULATE_CAN '>'
|
||||
#define TS_SIMULATE_CAN_char >
|
||||
#define TS_SINGLE_WRITE_COMMAND 'W'
|
||||
|
|
|
@ -2,5 +2,5 @@
|
|||
// was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer
|
||||
//
|
||||
|
||||
#define SIGNATURE_HASH 1128517059
|
||||
#define TS_SIGNATURE "rusEFI main.2024.11.29.mega100.1128517059"
|
||||
#define SIGNATURE_HASH 781490395
|
||||
#define TS_SIGNATURE "rusEFI main.2024.11.30.mega100.781490395"
|
||||
|
|
|
@ -10,97 +10,97 @@ struct nitrous_control_state_s {
|
|||
bool isArmed : 1 {};
|
||||
/**
|
||||
offset 0 bit 1 */
|
||||
bool unusedBit_1_1 : 1 {};
|
||||
bool isTpsConditionSatisfied : 1 {};
|
||||
/**
|
||||
offset 0 bit 2 */
|
||||
bool unusedBit_1_2 : 1 {};
|
||||
bool isCltConditionSatisfied : 1 {};
|
||||
/**
|
||||
offset 0 bit 3 */
|
||||
bool unusedBit_1_3 : 1 {};
|
||||
bool isMapConditionSatisfied : 1 {};
|
||||
/**
|
||||
offset 0 bit 4 */
|
||||
bool unusedBit_1_4 : 1 {};
|
||||
bool unusedBit_4_4 : 1 {};
|
||||
/**
|
||||
offset 0 bit 5 */
|
||||
bool unusedBit_1_5 : 1 {};
|
||||
bool unusedBit_4_5 : 1 {};
|
||||
/**
|
||||
offset 0 bit 6 */
|
||||
bool unusedBit_1_6 : 1 {};
|
||||
bool unusedBit_4_6 : 1 {};
|
||||
/**
|
||||
offset 0 bit 7 */
|
||||
bool unusedBit_1_7 : 1 {};
|
||||
bool unusedBit_4_7 : 1 {};
|
||||
/**
|
||||
offset 0 bit 8 */
|
||||
bool unusedBit_1_8 : 1 {};
|
||||
bool unusedBit_4_8 : 1 {};
|
||||
/**
|
||||
offset 0 bit 9 */
|
||||
bool unusedBit_1_9 : 1 {};
|
||||
bool unusedBit_4_9 : 1 {};
|
||||
/**
|
||||
offset 0 bit 10 */
|
||||
bool unusedBit_1_10 : 1 {};
|
||||
bool unusedBit_4_10 : 1 {};
|
||||
/**
|
||||
offset 0 bit 11 */
|
||||
bool unusedBit_1_11 : 1 {};
|
||||
bool unusedBit_4_11 : 1 {};
|
||||
/**
|
||||
offset 0 bit 12 */
|
||||
bool unusedBit_1_12 : 1 {};
|
||||
bool unusedBit_4_12 : 1 {};
|
||||
/**
|
||||
offset 0 bit 13 */
|
||||
bool unusedBit_1_13 : 1 {};
|
||||
bool unusedBit_4_13 : 1 {};
|
||||
/**
|
||||
offset 0 bit 14 */
|
||||
bool unusedBit_1_14 : 1 {};
|
||||
bool unusedBit_4_14 : 1 {};
|
||||
/**
|
||||
offset 0 bit 15 */
|
||||
bool unusedBit_1_15 : 1 {};
|
||||
bool unusedBit_4_15 : 1 {};
|
||||
/**
|
||||
offset 0 bit 16 */
|
||||
bool unusedBit_1_16 : 1 {};
|
||||
bool unusedBit_4_16 : 1 {};
|
||||
/**
|
||||
offset 0 bit 17 */
|
||||
bool unusedBit_1_17 : 1 {};
|
||||
bool unusedBit_4_17 : 1 {};
|
||||
/**
|
||||
offset 0 bit 18 */
|
||||
bool unusedBit_1_18 : 1 {};
|
||||
bool unusedBit_4_18 : 1 {};
|
||||
/**
|
||||
offset 0 bit 19 */
|
||||
bool unusedBit_1_19 : 1 {};
|
||||
bool unusedBit_4_19 : 1 {};
|
||||
/**
|
||||
offset 0 bit 20 */
|
||||
bool unusedBit_1_20 : 1 {};
|
||||
bool unusedBit_4_20 : 1 {};
|
||||
/**
|
||||
offset 0 bit 21 */
|
||||
bool unusedBit_1_21 : 1 {};
|
||||
bool unusedBit_4_21 : 1 {};
|
||||
/**
|
||||
offset 0 bit 22 */
|
||||
bool unusedBit_1_22 : 1 {};
|
||||
bool unusedBit_4_22 : 1 {};
|
||||
/**
|
||||
offset 0 bit 23 */
|
||||
bool unusedBit_1_23 : 1 {};
|
||||
bool unusedBit_4_23 : 1 {};
|
||||
/**
|
||||
offset 0 bit 24 */
|
||||
bool unusedBit_1_24 : 1 {};
|
||||
bool unusedBit_4_24 : 1 {};
|
||||
/**
|
||||
offset 0 bit 25 */
|
||||
bool unusedBit_1_25 : 1 {};
|
||||
bool unusedBit_4_25 : 1 {};
|
||||
/**
|
||||
offset 0 bit 26 */
|
||||
bool unusedBit_1_26 : 1 {};
|
||||
bool unusedBit_4_26 : 1 {};
|
||||
/**
|
||||
offset 0 bit 27 */
|
||||
bool unusedBit_1_27 : 1 {};
|
||||
bool unusedBit_4_27 : 1 {};
|
||||
/**
|
||||
offset 0 bit 28 */
|
||||
bool unusedBit_1_28 : 1 {};
|
||||
bool unusedBit_4_28 : 1 {};
|
||||
/**
|
||||
offset 0 bit 29 */
|
||||
bool unusedBit_1_29 : 1 {};
|
||||
bool unusedBit_4_29 : 1 {};
|
||||
/**
|
||||
offset 0 bit 30 */
|
||||
bool unusedBit_1_30 : 1 {};
|
||||
bool unusedBit_4_30 : 1 {};
|
||||
/**
|
||||
offset 0 bit 31 */
|
||||
bool unusedBit_1_31 : 1 {};
|
||||
bool unusedBit_4_31 : 1 {};
|
||||
};
|
||||
static_assert(sizeof(nitrous_control_state_s) == 4);
|
||||
|
||||
|
|
|
@ -38,12 +38,12 @@ enable2ndByteCanID = false
|
|||
|
||||
[MegaTune]
|
||||
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
|
||||
signature = "rusEFI main.2024.11.29.mega100.1128517059"
|
||||
signature = "rusEFI main.2024.11.30.mega100.781490395"
|
||||
|
||||
[TunerStudio]
|
||||
queryCommand = "S"
|
||||
versionInfo = "V" ; firmware version for title bar.
|
||||
signature= "rusEFI main.2024.11.29.mega100.1128517059" ; signature is expected to be 7 or more characters.
|
||||
signature= "rusEFI main.2024.11.30.mega100.781490395" ; 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
|
||||
|
@ -1432,7 +1432,10 @@ nitrousControlTriggerPinMode = bits, U08, 3936, [0:1], "DEFAULT", "PULLUP", "PUL
|
|||
nitrousLuaGauge = bits, S08, 3937, [0:2], "Lua Gauge 1", "Lua Gauge 2", "Lua Gauge 3", "Lua Gauge 4", "Lua Gauge 5", "Lua Gauge 6", "Lua Gauge 7", "Lua Gauge 8"
|
||||
nitrousLuaGaugeMeaning = bits, S08, 3938, [3:3], "Lower Bound", "Upper Bound"
|
||||
nitrousLuaGaugeArmingValue = scalar, F32, 3940, "", 1, 0, -30000, 30000, 3
|
||||
unusedOftenChangesDuringFirmwareUpdate = array, U08, 3944, [94], "units", 1, 0, 0, 1, 0
|
||||
nitrousMinimumTps = scalar, S32, 3944, "", 1, 0, 0, 20000, 0
|
||||
nitrousMinimumClt = scalar, U08, 3948, "deg C", 1, 0, 0, 250, 0
|
||||
nitrousMaximumMap = scalar, S16, 3950, "kPa", 1, 0, 0, 1000, 0
|
||||
unusedOftenChangesDuringFirmwareUpdate = array, U08, 3952, [87], "units", 1, 0, 0, 1, 0
|
||||
postCrankingFactor = array, F32, 4040, [6x6], "mult", 1, 0, 1, 3, 2
|
||||
postCrankingDurationBins = array, F32, 4184, [6], "count", 1, 0, 0, 1000, 0
|
||||
postCrankingCLTBins = array, S16, 4208, [6], "C", 1, 0, -100, 250, 0
|
||||
|
@ -3223,6 +3226,9 @@ isAppConditionSatisfied = bits, U32, 1124, [4:4]
|
|||
isFlatShiftConditionSatisfied = bits, U32, 1124, [5:5]
|
||||
; total TS size = 1128
|
||||
isArmed = bits, U32, 1128, [0:0]
|
||||
isTpsConditionSatisfied = bits, U32, 1128, [1:1]
|
||||
isCltConditionSatisfied = bits, U32, 1128, [2:2]
|
||||
isMapConditionSatisfied = bits, U32, 1128, [3:3]
|
||||
; total TS size = 1132
|
||||
isAntilagCondition = bits, U32, 1132, [0:0]
|
||||
ALSMinRPMCondition = bits, U32, 1132, [1:1]
|
||||
|
@ -5808,6 +5814,9 @@ entry = isRpmConditionSatisfied, "isRpmConditionSatisfied", int, "%d"
|
|||
entry = isAppConditionSatisfied, "isAppConditionSatisfied", int, "%d"
|
||||
entry = isFlatShiftConditionSatisfied, "isFlatShiftConditionSatisfied", int, "%d"
|
||||
entry = isArmed, "isArmed", int, "%d"
|
||||
entry = isTpsConditionSatisfied, "isTpsConditionSatisfied", int, "%d"
|
||||
entry = isCltConditionSatisfied, "isCltConditionSatisfied", int, "%d"
|
||||
entry = isMapConditionSatisfied, "isMapConditionSatisfied", int, "%d"
|
||||
entry = isAntilagCondition, "isAntilagCondition", int, "%d"
|
||||
entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d"
|
||||
entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d"
|
||||
|
@ -6812,6 +6821,9 @@ dialog = shift_torque_reduction_stateDialog, "shift_torque_reduction_state"
|
|||
|
||||
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"
|
||||
|
||||
dialog = nitrous_control_stateDialog, "nitrous_control_state"
|
||||
panel = nitrous_control_stateIndicatorPanel
|
||||
|
@ -9846,10 +9858,15 @@ dialog = tcuControls, "Transmission Settings"
|
|||
panel = NitrousControlButtonDialog, {nitrousControlArmingMethod == 0}
|
||||
panel = NitrousControlLuaGaugeDialog, {nitrousControlArmingMethod == 1}
|
||||
|
||||
dialog = NitrousControlSettings, "Settings"
|
||||
field = "Minimum TPS", nitrousMinimumTps
|
||||
field = "Minimum CLT", nitrousMinimumClt
|
||||
field = "Maximum MAP", nitrousMaximumMap
|
||||
|
||||
dialog = NitrousControlSettingsDialog, "", yAxis
|
||||
field = "Enable Nitrous Control", nitrousControlEnabled
|
||||
panel = NitrousControlArmingMethodDialog, {nitrousControlEnabled == 1}
|
||||
; panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))}
|
||||
panel = NitrousControlSettings, {nitrousControlEnabled == 1 && ((nitrousControlArmingMethod == 0 && nitrousControlTriggerPin != 0) || (nitrousControlArmingMethod == 1))}
|
||||
|
||||
dialog = NitrousControlDialog
|
||||
panel = NitrousControlSettingsDialog, West
|
||||
|
|
|
@ -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.11.29.mega100.@@SIGNATURE_HASH@@"
|
||||
#define TS_SIGNATURE "rusEFI main.2024.11.30.mega100.@@SIGNATURE_HASH@@"
|
||||
|
|
Loading…
Reference in New Issue