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 26, 2024
1 parent 047c67a commit cdd0562
Show file tree
Hide file tree
Showing 8 changed files with 23 additions and 38 deletions.
6 changes: 2 additions & 4 deletions generated/console/binary/generated/data_logs.ini
Original file line number Diff line number Diff line change
Expand Up @@ -547,8 +547,7 @@ entry = enabledForAc0, "enabledForAc0", int, "%d"
entry = hot0, "hot0", int, "%d"
entry = cold0, "cold0", int, "%d"
entry = disabledBySpeed0, "disabledBySpeed0", int, "%d"
entry = tempAlive0, "tempAlive0", int, "%d"
entry = tempCode0, "tempCode0", int, "%d"
entry = radiatorFanStatus0, "radiatorFanStatus0", int, "%d"
entry = cranking1, "cranking1", int, "%d"
entry = notRunning1, "notRunning1", int, "%d"
entry = disabledWhileEngineStopped1, "disabledWhileEngineStopped1", int, "%d"
Expand All @@ -557,8 +556,7 @@ entry = enabledForAc1, "enabledForAc1", int, "%d"
entry = hot1, "hot1", int, "%d"
entry = cold1, "cold1", int, "%d"
entry = disabledBySpeed1, "disabledBySpeed1", int, "%d"
entry = tempAlive1, "tempAlive1", int, "%d"
entry = tempCode1, "tempCode1", int, "%d"
entry = radiatorFanStatus1, "radiatorFanStatus1", int, "%d"
entry = isPrime, "isPrime", int, "%d"
entry = engineTurnedRecently, "engineTurnedRecently", int, "%d"
entry = isFuelPumpOn, "isFuelPumpOn", int, "%d"
Expand Down
6 changes: 2 additions & 4 deletions generated/console/binary/generated/fancy_content.ini
Original file line number Diff line number Diff line change
Expand Up @@ -212,8 +212,7 @@ indicatorPanel = fan_control0IndicatorPanel, 2
dialog = fan_control0Dialog, "fan_control0"
panel = fan_control0IndicatorPanel
liveGraph = fan_control0_1_Graph, "Graph", South
graphLine = tempAlive0
graphLine = tempCode0
graphLine = radiatorFanStatus0

indicatorPanel = fan_control1IndicatorPanel, 2
indicator = {cranking1}, "cranking No", "cranking Yes"
Expand All @@ -228,8 +227,7 @@ indicatorPanel = fan_control1IndicatorPanel, 2
dialog = fan_control1Dialog, "fan_control1"
panel = fan_control1IndicatorPanel
liveGraph = fan_control1_1_Graph, "Graph", South
graphLine = tempAlive1
graphLine = tempCode1
graphLine = radiatorFanStatus1

indicatorPanel = fuel_pump_controlIndicatorPanel, 2
indicator = {isPrime}, "isPrime No", "isPrime Yes"
Expand Down
6 changes: 2 additions & 4 deletions generated/console/binary/generated/output_channels.ini
Original file line number Diff line number Diff line change
Expand Up @@ -618,8 +618,7 @@ enabledForAc0 = bits, U32, 1096, [4:4]
hot0 = bits, U32, 1096, [5:5]
cold0 = bits, U32, 1096, [6:6]
disabledBySpeed0 = bits, U32, 1096, [7:7]
tempAlive0 = scalar, U08, 1100, "", 1, 0
tempCode0 = scalar, U08, 1101, "", 1, 0
radiatorFanStatus0 = scalar, U08, 1100, "", 1, 0
; total TS size = 1104
cranking1 = bits, U32, 1104, [0:0]
notRunning1 = bits, U32, 1104, [1:1]
Expand All @@ -629,8 +628,7 @@ enabledForAc1 = bits, U32, 1104, [4:4]
hot1 = bits, U32, 1104, [5:5]
cold1 = bits, U32, 1104, [6:6]
disabledBySpeed1 = bits, U32, 1104, [7:7]
tempAlive1 = scalar, U08, 1108, "", 1, 0
tempCode1 = scalar, U08, 1109, "", 1, 0
radiatorFanStatus1 = scalar, U08, 1108, "", 1, 0
; total TS size = 1112
isPrime = bits, U32, 1112, [0:0]
engineTurnedRecently = bits, U32, 1112, [1:1]
Expand Down
5 changes: 3 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 50302499
#define SIGNATURE_HASH 3046035542
#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 @@ -1598,6 +1598,7 @@
#define ts_show_air_conditioning true
#define ts_show_alternator true
#define ts_show_analog_divider true
#define ts_show_analog_ego true
#define ts_show_analog_input_settings true
#define ts_show_aux_connections true
#define ts_show_aux_sensors true
Expand Down Expand Up @@ -1749,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.25.XYZ.50302499"
#define TS_SIGNATURE "rusEFI main.2024.09.26.XYZ.3046035542"
#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 50302499
#define TS_SIGNATURE "rusEFI main.2024.09.25.XYZ.50302499"
#define SIGNATURE_HASH 3046035542
#define TS_SIGNATURE "rusEFI main.2024.09.26.XYZ.3046035542"
10 changes: 3 additions & 7 deletions generated/live_data_generated/fan_control_generated.h
Original file line number Diff line number Diff line change
Expand Up @@ -104,17 +104,13 @@ struct fan_control_s {
/**
* offset 4
*/
uint8_t tempAlive = (uint8_t)0;
/**
* offset 5
*/
uint8_t tempCode = (uint8_t)0;
uint8_t radiatorFanStatus = (uint8_t)0;
/**
* need 4 byte alignment
* units: units
* offset 6
* offset 5
*/
uint8_t alignmentFill_at_6[2];
uint8_t alignmentFill_at_5[3];
};
static_assert(sizeof(fan_control_s) == 8);

Expand Down
22 changes: 8 additions & 14 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.25.XYZ.50302499"
signature = "rusEFI main.2024.09.26.XYZ.3046035542"

[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmware version for title bar.
signature= "rusEFI main.2024.09.25.XYZ.50302499" ; signature is expected to be 7 or more characters.
signature= "rusEFI main.2024.09.26.XYZ.3046035542" ; 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 @@ -3182,8 +3182,7 @@ enabledForAc0 = bits, U32, 1096, [4:4]
hot0 = bits, U32, 1096, [5:5]
cold0 = bits, U32, 1096, [6:6]
disabledBySpeed0 = bits, U32, 1096, [7:7]
tempAlive0 = scalar, U08, 1100, "", 1, 0
tempCode0 = scalar, U08, 1101, "", 1, 0
radiatorFanStatus0 = scalar, U08, 1100, "", 1, 0
; total TS size = 1104
cranking1 = bits, U32, 1104, [0:0]
notRunning1 = bits, U32, 1104, [1:1]
Expand All @@ -3193,8 +3192,7 @@ enabledForAc1 = bits, U32, 1104, [4:4]
hot1 = bits, U32, 1104, [5:5]
cold1 = bits, U32, 1104, [6:6]
disabledBySpeed1 = bits, U32, 1104, [7:7]
tempAlive1 = scalar, U08, 1108, "", 1, 0
tempCode1 = scalar, U08, 1109, "", 1, 0
radiatorFanStatus1 = scalar, U08, 1108, "", 1, 0
; total TS size = 1112
isPrime = bits, U32, 1112, [0:0]
engineTurnedRecently = bits, U32, 1112, [1:1]
Expand Down Expand Up @@ -5799,8 +5797,7 @@ entry = enabledForAc0, "enabledForAc0", int, "%d"
entry = hot0, "hot0", int, "%d"
entry = cold0, "cold0", int, "%d"
entry = disabledBySpeed0, "disabledBySpeed0", int, "%d"
entry = tempAlive0, "tempAlive0", int, "%d"
entry = tempCode0, "tempCode0", int, "%d"
entry = radiatorFanStatus0, "radiatorFanStatus0", int, "%d"
entry = cranking1, "cranking1", int, "%d"
entry = notRunning1, "notRunning1", int, "%d"
entry = disabledWhileEngineStopped1, "disabledWhileEngineStopped1", int, "%d"
Expand All @@ -5809,8 +5806,7 @@ entry = enabledForAc1, "enabledForAc1", int, "%d"
entry = hot1, "hot1", int, "%d"
entry = cold1, "cold1", int, "%d"
entry = disabledBySpeed1, "disabledBySpeed1", int, "%d"
entry = tempAlive1, "tempAlive1", int, "%d"
entry = tempCode1, "tempCode1", int, "%d"
entry = radiatorFanStatus1, "radiatorFanStatus1", int, "%d"
entry = isPrime, "isPrime", int, "%d"
entry = engineTurnedRecently, "engineTurnedRecently", int, "%d"
entry = isFuelPumpOn, "isFuelPumpOn", int, "%d"
Expand Down Expand Up @@ -6796,8 +6792,7 @@ indicatorPanel = fan_control0IndicatorPanel, 2
dialog = fan_control0Dialog, "fan_control0"
panel = fan_control0IndicatorPanel
liveGraph = fan_control0_1_Graph, "Graph", South
graphLine = tempAlive0
graphLine = tempCode0
graphLine = radiatorFanStatus0

indicatorPanel = fan_control1IndicatorPanel, 2
indicator = {cranking1}, "cranking No", "cranking Yes"
Expand All @@ -6812,8 +6807,7 @@ indicatorPanel = fan_control1IndicatorPanel, 2
dialog = fan_control1Dialog, "fan_control1"
panel = fan_control1IndicatorPanel
liveGraph = fan_control1_1_Graph, "Graph", South
graphLine = tempAlive1
graphLine = tempCode1
graphLine = radiatorFanStatus1

indicatorPanel = fuel_pump_controlIndicatorPanel, 2
indicator = {isPrime}, "isPrime No", "isPrime Yes"
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.25.XYZ.@@SIGNATURE_HASH@@"
#define TS_SIGNATURE "rusEFI main.2024.09.26.XYZ.@@SIGNATURE_HASH@@"

0 comments on commit cdd0562

Please sign in to comment.