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 4, 2024
1 parent d3406db commit 5f8e704
Show file tree
Hide file tree
Showing 8 changed files with 63 additions and 38 deletions.
4 changes: 4 additions & 0 deletions generated/console/binary/generated/data_logs.ini
Original file line number Diff line number Diff line change
Expand Up @@ -499,6 +499,10 @@ entry = speedCondition, "speedCondition", int, "%d"
entry = tpsCondition, "tpsCondition", int, "%d"
entry = isTorqueReductionTriggerPinValid, "isTorqueReductionTriggerPinValid", int, "%d"
entry = torqueReductionTriggerPinState, "torqueReductionTriggerPinState", int, "%d"
entry = isTimeConditionSatisfied, "isTimeConditionSatisfied", int, "%d"
entry = isRpmConditionSatisfied, "isRpmConditionSatisfied", int, "%d"
entry = isAppConditionSatisfied, "isAppConditionSatisfied", int, "%d"
entry = isFlatShiftConditionSatisfied, "isFlatShiftConditionSatisfied", int, "%d"
entry = isAntilagCondition, "isAntilagCondition", int, "%d"
entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d"
entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d"
Expand Down
4 changes: 4 additions & 0 deletions generated/console/binary/generated/fancy_content.ini
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,10 @@ dialog = launch_control_stateDialog, "launch_control_state"
indicatorPanel = shift_torque_reduction_stateIndicatorPanel, 2
indicator = {isTorqueReductionTriggerPinValid}, "isTorqueReductionTriggerPinValid No", "isTorqueReductionTriggerPinValid Yes"
indicator = {torqueReductionTriggerPinState}, "torqueReductionTriggerPinState No", "torqueReductionTriggerPinState Yes"
indicator = {isTimeConditionSatisfied}, "isTimeConditionSatisfied No", "isTimeConditionSatisfied Yes"
indicator = {isRpmConditionSatisfied}, "isRpmConditionSatisfied No", "isRpmConditionSatisfied Yes"
indicator = {isAppConditionSatisfied}, "isAppConditionSatisfied No", "isAppConditionSatisfied Yes"
indicator = {isFlatShiftConditionSatisfied}, "isFlatShiftConditionSatisfied No", "isFlatShiftConditionSatisfied Yes"

dialog = shift_torque_reduction_stateDialog, "shift_torque_reduction_state"
panel = shift_torque_reduction_stateIndicatorPanel
Expand Down
4 changes: 4 additions & 0 deletions generated/console/binary/generated/output_channels.ini
Original file line number Diff line number Diff line change
Expand Up @@ -567,6 +567,10 @@ tpsCondition = bits, U32, 1048, [11:11]
; total TS size = 1052
isTorqueReductionTriggerPinValid = bits, U32, 1052, [0:0]
torqueReductionTriggerPinState = bits, U32, 1052, [1:1]
isTimeConditionSatisfied = bits, U32, 1052, [2:2]
isRpmConditionSatisfied = bits, U32, 1052, [3:3]
isAppConditionSatisfied = bits, U32, 1052, [4:4]
isFlatShiftConditionSatisfied = bits, U32, 1052, [5:5]
; total TS size = 1056
isAntilagCondition = bits, U32, 1056, [0:0]
ALSMinRPMCondition = bits, U32, 1056, [1:1]
Expand Down
4 changes: 2 additions & 2 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 show_Proteus_presets false
#define show_test_presets false
#define show_vvt_output_pin true
#define SIGNATURE_HASH 806208670
#define SIGNATURE_HASH 1691258729
#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 @@ -1758,7 +1758,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.03.paralela.806208670"
#define TS_SIGNATURE "rusEFI master.2024.10.04.paralela.1691258729"
#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 806208670
#define TS_SIGNATURE "rusEFI master.2024.10.03.paralela.806208670"
#define SIGNATURE_HASH 1691258729
#define TS_SIGNATURE "rusEFI master.2024.10.04.paralela.1691258729"
Original file line number Diff line number Diff line change
Expand Up @@ -13,94 +13,94 @@ struct shift_torque_reduction_state_s {
bool torqueReductionTriggerPinState : 1 {};
/**
offset 0 bit 2 */
bool unusedBit_2_2 : 1 {};
bool isTimeConditionSatisfied : 1 {};
/**
offset 0 bit 3 */
bool unusedBit_2_3 : 1 {};
bool isRpmConditionSatisfied : 1 {};
/**
offset 0 bit 4 */
bool unusedBit_2_4 : 1 {};
bool isAppConditionSatisfied : 1 {};
/**
offset 0 bit 5 */
bool unusedBit_2_5 : 1 {};
bool isFlatShiftConditionSatisfied : 1 {};
/**
offset 0 bit 6 */
bool unusedBit_2_6 : 1 {};
bool unusedBit_6_6 : 1 {};
/**
offset 0 bit 7 */
bool unusedBit_2_7 : 1 {};
bool unusedBit_6_7 : 1 {};
/**
offset 0 bit 8 */
bool unusedBit_2_8 : 1 {};
bool unusedBit_6_8 : 1 {};
/**
offset 0 bit 9 */
bool unusedBit_2_9 : 1 {};
bool unusedBit_6_9 : 1 {};
/**
offset 0 bit 10 */
bool unusedBit_2_10 : 1 {};
bool unusedBit_6_10 : 1 {};
/**
offset 0 bit 11 */
bool unusedBit_2_11 : 1 {};
bool unusedBit_6_11 : 1 {};
/**
offset 0 bit 12 */
bool unusedBit_2_12 : 1 {};
bool unusedBit_6_12 : 1 {};
/**
offset 0 bit 13 */
bool unusedBit_2_13 : 1 {};
bool unusedBit_6_13 : 1 {};
/**
offset 0 bit 14 */
bool unusedBit_2_14 : 1 {};
bool unusedBit_6_14 : 1 {};
/**
offset 0 bit 15 */
bool unusedBit_2_15 : 1 {};
bool unusedBit_6_15 : 1 {};
/**
offset 0 bit 16 */
bool unusedBit_2_16 : 1 {};
bool unusedBit_6_16 : 1 {};
/**
offset 0 bit 17 */
bool unusedBit_2_17 : 1 {};
bool unusedBit_6_17 : 1 {};
/**
offset 0 bit 18 */
bool unusedBit_2_18 : 1 {};
bool unusedBit_6_18 : 1 {};
/**
offset 0 bit 19 */
bool unusedBit_2_19 : 1 {};
bool unusedBit_6_19 : 1 {};
/**
offset 0 bit 20 */
bool unusedBit_2_20 : 1 {};
bool unusedBit_6_20 : 1 {};
/**
offset 0 bit 21 */
bool unusedBit_2_21 : 1 {};
bool unusedBit_6_21 : 1 {};
/**
offset 0 bit 22 */
bool unusedBit_2_22 : 1 {};
bool unusedBit_6_22 : 1 {};
/**
offset 0 bit 23 */
bool unusedBit_2_23 : 1 {};
bool unusedBit_6_23 : 1 {};
/**
offset 0 bit 24 */
bool unusedBit_2_24 : 1 {};
bool unusedBit_6_24 : 1 {};
/**
offset 0 bit 25 */
bool unusedBit_2_25 : 1 {};
bool unusedBit_6_25 : 1 {};
/**
offset 0 bit 26 */
bool unusedBit_2_26 : 1 {};
bool unusedBit_6_26 : 1 {};
/**
offset 0 bit 27 */
bool unusedBit_2_27 : 1 {};
bool unusedBit_6_27 : 1 {};
/**
offset 0 bit 28 */
bool unusedBit_2_28 : 1 {};
bool unusedBit_6_28 : 1 {};
/**
offset 0 bit 29 */
bool unusedBit_2_29 : 1 {};
bool unusedBit_6_29 : 1 {};
/**
offset 0 bit 30 */
bool unusedBit_2_30 : 1 {};
bool unusedBit_6_30 : 1 {};
/**
offset 0 bit 31 */
bool unusedBit_2_31 : 1 {};
bool unusedBit_6_31 : 1 {};
};
static_assert(sizeof(shift_torque_reduction_state_s) == 4);

Expand Down
19 changes: 16 additions & 3 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.03.paralela.806208670"
signature = "rusEFI master.2024.10.04.paralela.1691258729"

[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmware version for title bar.
signature= "rusEFI master.2024.10.03.paralela.806208670" ; signature is expected to be 7 or more characters.
signature= "rusEFI master.2024.10.04.paralela.1691258729" ; 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 @@ -3139,6 +3139,10 @@ tpsCondition = bits, U32, 1048, [11:11]
; total TS size = 1052
isTorqueReductionTriggerPinValid = bits, U32, 1052, [0:0]
torqueReductionTriggerPinState = bits, U32, 1052, [1:1]
isTimeConditionSatisfied = bits, U32, 1052, [2:2]
isRpmConditionSatisfied = bits, U32, 1052, [3:3]
isAppConditionSatisfied = bits, U32, 1052, [4:4]
isFlatShiftConditionSatisfied = bits, U32, 1052, [5:5]
; total TS size = 1056
isAntilagCondition = bits, U32, 1056, [0:0]
ALSMinRPMCondition = bits, U32, 1056, [1:1]
Expand Down Expand Up @@ -5663,6 +5667,10 @@ entry = speedCondition, "speedCondition", int, "%d"
entry = tpsCondition, "tpsCondition", int, "%d"
entry = isTorqueReductionTriggerPinValid, "isTorqueReductionTriggerPinValid", int, "%d"
entry = torqueReductionTriggerPinState, "torqueReductionTriggerPinState", int, "%d"
entry = isTimeConditionSatisfied, "isTimeConditionSatisfied", int, "%d"
entry = isRpmConditionSatisfied, "isRpmConditionSatisfied", int, "%d"
entry = isAppConditionSatisfied, "isAppConditionSatisfied", int, "%d"
entry = isFlatShiftConditionSatisfied, "isFlatShiftConditionSatisfied", int, "%d"
entry = isAntilagCondition, "isAntilagCondition", int, "%d"
entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d"
entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d"
Expand Down Expand Up @@ -6419,7 +6427,7 @@ cmd_write_config = "Z\x00\x14\x00\x0a"
cmd_etb_autotune = "Z\x00\x14\x00\x0C"
cmd_enable_self_stim = "Z\x00\x14\x00\x0D"
cmd_etb_auto_calibrate = "Z\x00\x14\x00\x0E"
cmd_disable_self_stim = "Z\x00\x14\x00\x0F"
cmd_disable_self_stim = "Z\x00\x14\x00\x0e"
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"
Expand Down Expand Up @@ -6638,6 +6646,10 @@ dialog = launch_control_stateDialog, "launch_control_state"
indicatorPanel = shift_torque_reduction_stateIndicatorPanel, 2
indicator = {isTorqueReductionTriggerPinValid}, "isTorqueReductionTriggerPinValid No", "isTorqueReductionTriggerPinValid Yes"
indicator = {torqueReductionTriggerPinState}, "torqueReductionTriggerPinState No", "torqueReductionTriggerPinState Yes"
indicator = {isTimeConditionSatisfied}, "isTimeConditionSatisfied No", "isTimeConditionSatisfied Yes"
indicator = {isRpmConditionSatisfied}, "isRpmConditionSatisfied No", "isRpmConditionSatisfied Yes"
indicator = {isAppConditionSatisfied}, "isAppConditionSatisfied No", "isAppConditionSatisfied Yes"
indicator = {isFlatShiftConditionSatisfied}, "isFlatShiftConditionSatisfied No", "isFlatShiftConditionSatisfied Yes"

dialog = shift_torque_reduction_stateDialog, "shift_torque_reduction_state"
panel = shift_torque_reduction_stateIndicatorPanel
Expand Down Expand Up @@ -9432,6 +9444,7 @@ dialog = tcuControls, "Transmission Settings"

dialog = etbAutotune, "PID Autotune"
field = "First step: calibrate TPS and hit 'Burn'"
field = "should first OPEN, then CLOSE"
commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, { (etbFunctions1 == 1 || etbFunctions2 == 1) && tps1_1AdcChannel != 0 && calibrationMode == 0}
commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, { (etbFunctions1 == 2 || etbFunctions2 == 2) && tps2_1AdcChannel != 0 && calibrationMode == 0}
field = "Second step"
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.03.paralela.@@SIGNATURE_HASH@@"
#define TS_SIGNATURE "rusEFI master.2024.10.04.paralela.@@SIGNATURE_HASH@@"

0 comments on commit 5f8e704

Please sign in to comment.