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 Nov 4, 2024
1 parent 2cbf05f commit cbdce3d
Show file tree
Hide file tree
Showing 8 changed files with 27 additions and 15 deletions.
1 change: 1 addition & 0 deletions generated/console/binary/generated/data_logs.ini
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ entry = isUsbConnected, "isUsbConnected", int, "%d"
entry = dfcoActive, "dfcoActive", int, "%d"
entry = sd_active_wr, "SD card writing", int, "%d"
entry = sd_active_rd, "SD card reading", int, "%d"
entry = isMapValid, "MAP from sensor seems valid", int, "%d"
entry = RPMValue, "RPM", int, "%d"
entry = rpmAcceleration, "dRPM", int, "%d"
entry = speedToRpmRatio, "Gearbox Ratio", float, "%.3f"
Expand Down
1 change: 1 addition & 0 deletions generated/console/binary/generated/output_channels.ini
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ isUsbConnected = bits, U32, 0, [25:25]
dfcoActive = bits, U32, 0, [26:26]
sd_active_wr = bits, U32, 0, [27:27]
sd_active_rd = bits, U32, 0, [28:28]
isMapValid = bits, U32, 0, [29:29]
RPMValue = scalar, U16, 4, "RPM", 1, 0
rpmAcceleration = scalar, S16, 6, "RPM acceleration/Rate of Change/ROC", 1, 0
speedToRpmRatio = scalar, U16, 8, "value", 0.01, 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2804,6 +2804,7 @@ struct engine_configuration_s {
offset 1492 bit 5 */
bool enableExtendedCanBroadcast : 1 {};
/**
* global_can_data performance hack
offset 1492 bit 6 */
bool luaCanRxWorkaround : 1 {};
/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1297,7 +1297,7 @@
#define SentEtbType_NONE 0
#define show_tcu_gauges false
#define show_vvt_output_pin true
#define SIGNATURE_HASH 4095973998
#define SIGNATURE_HASH 755259175
#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 main.2024.11.03.hellen-f4-community.4095973998"
#define TS_SIGNATURE "rusEFI main.2024.11.04.hellen-f4-community.755259175"
#define TS_SIMULATE_CAN '>'
#define TS_SIMULATE_CAN_char >
#define TS_SINGLE_WRITE_COMMAND 'W'
Expand Down
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 4095973998
#define TS_SIGNATURE "rusEFI main.2024.11.03.hellen-f4-community.4095973998"
#define SIGNATURE_HASH 755259175
#define TS_SIGNATURE "rusEFI main.2024.11.04.hellen-f4-community.755259175"
7 changes: 4 additions & 3 deletions generated/live_data_generated/output_channels_generated.h
Original file line number Diff line number Diff line change
Expand Up @@ -144,14 +144,15 @@ struct output_channels_s {
offset 0 bit 28 */
bool sd_active_rd : 1 {};
/**
* MAP from sensor seems valid
offset 0 bit 29 */
bool unusedBit_29_29 : 1 {};
bool isMapValid : 1 {};
/**
offset 0 bit 30 */
bool unusedBit_29_30 : 1 {};
bool unusedBit_30_30 : 1 {};
/**
offset 0 bit 31 */
bool unusedBit_29_31 : 1 {};
bool unusedBit_30_31 : 1 {};
/**
* @@GAUGE_NAME_RPM@@
* units: RPM
Expand Down
22 changes: 15 additions & 7 deletions generated/tunerstudio/generated/rusefi_hellen-f4-community.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.11.03.hellen-f4-community.4095973998"
signature = "rusEFI main.2024.11.04.hellen-f4-community.755259175"

[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmware version for title bar.
signature= "rusEFI main.2024.11.03.hellen-f4-community.4095973998" ; signature is expected to be 7 or more characters.
signature= "rusEFI main.2024.11.04.hellen-f4-community.755259175" ; 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 @@ -2085,6 +2085,7 @@ minimumOilPressureValues = array, U08, 22960, [8], "kPa", 10.0, 0, 0, 1000, 0
torqueReductionTime = "For how long after the pin has been triggered will the cut/reduction stay active. After that, even if the pin is still triggered, torque is re-introduced"
mc33810DisableRecoveryMode = "See Over/Undervoltage Shutdown/Retry bit in documentation"
enableExtendedCanBroadcast = "Send out board statistics"
luaCanRxWorkaround = "global_can_data performance hack"
useAuxSpeedForSlipRatio = "Use Aux Speed 1 as one of speeds for wheel slip ratio?"
useVssAsSecondWheelSpeed = "VSS and Aux Speed 1 or Aux Speed 1 with Aux Speed 2?"
enableAemXSeriesEgt = "AEM X-Series EGT gauge kit or rusEFI EGT sensor from Wideband controller"
Expand Down Expand Up @@ -2618,6 +2619,7 @@ isUsbConnected = bits, U32, 0, [25:25]
dfcoActive = bits, U32, 0, [26:26]
sd_active_wr = bits, U32, 0, [27:27]
sd_active_rd = bits, U32, 0, [28:28]
isMapValid = bits, U32, 0, [29:29]
RPMValue = scalar, U16, 4, "RPM", 1, 0
rpmAcceleration = scalar, S16, 6, "RPM acceleration/Rate of Change/ROC", 1, 0
speedToRpmRatio = scalar, U16, 8, "value", 0.01, 0
Expand Down Expand Up @@ -5253,6 +5255,7 @@ entry = isUsbConnected, "isUsbConnected", int, "%d"
entry = dfcoActive, "dfcoActive", int, "%d"
entry = sd_active_wr, "SD card writing", int, "%d"
entry = sd_active_rd, "SD card reading", int, "%d"
entry = isMapValid, "MAP from sensor seems valid", int, "%d"
entry = RPMValue, "RPM", int, "%d"
entry = rpmAcceleration, "dRPM", int, "%d"
entry = speedToRpmRatio, "Gearbox Ratio", float, "%.3f"
Expand Down Expand Up @@ -8292,9 +8295,13 @@ dialog = lambda_monitorDialog, "lambda_monitor"
field = "MAP value high point", map_sensor_highValue, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
field = "MAP voltage high value", mapHighValueVoltage, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }

indicatorPanel = mapValidIndicators, 1
indicator = {isMapValid}, "BAD Map Input", "Happy MAP Input"

dialog = mapCommon, "MAP common settings"
field = "Low value threshold", mapErrorDetectionTooLow
field = "High value threshold", mapErrorDetectionTooHigh
panel = mapValidIndicators
field = ""
field = "Measure Map Only In One Cylinder", measureMapOnlyInOneCylinder
field = "Cylinder count to sample MAP", mapMinBufferLength
Expand Down Expand Up @@ -8352,13 +8359,14 @@ dialog = lambda_monitorDialog, "lambda_monitor"
dialog = egoSettings_IO2, "O2 Sensor 2 I/O"
field = "Input channel", afr_hwChannel2

indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 }
indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) }
indicator = { faultCode0 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black
indicator = { faultCode0 == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black

indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 }
indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) }
indicator = { faultCode1 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black

indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode0 != 7 }
indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode0 != 7 && faultCode0 != 8 }
indicator = { faultCode0 == 0 || faultCode0 == 7 }, "Failed", "Ready/Ok", red, black, green, black
indicator = { faultCode0 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black
indicator = { faultCode0 == 1 }, "Communication ok", "Timeout reading", green, black, red, black
Expand All @@ -8367,7 +8375,7 @@ dialog = lambda_monitorDialog, "lambda_monitor"
indicator = { faultCode0 == 5 }, "No underheat", "Underheat", green, black, red, black
indicator = { faultCode0 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black

indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode1 != 7 }
indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode1 != 7 && faultCode0 != 8 }
indicator = { faultCode1 == 0 || faultCode1 == 7 }, "Failed", "Ready/Ok", red, black, green, black
indicator = { faultCode1 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black
indicator = { faultCode1 == 1 }, "Communication ok", "Timeout reading", green, black, red, black
Expand Down Expand Up @@ -9732,7 +9740,7 @@ dialog = tcuControls, "Transmission Settings"
field = dacOutputPins1, dacOutputPins1
field = dacOutputPins2, dacOutputPins2

field = luaCanRxWorkaround, luaCanRxWorkaround
field = "luaCanRxWorkaround CAN performance hack", luaCanRxWorkaround
field = "Read RPM matching VSS profile", canInputBCM
field = auxSpeed1Multiplier, auxSpeed1Multiplier
field = magicNumberAvailableForDevTricks, magicNumberAvailableForDevTricks
Expand Down
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.11.03.hellen-f4-community.@@SIGNATURE_HASH@@"
#define TS_SIGNATURE "rusEFI main.2024.11.04.hellen-f4-community.@@SIGNATURE_HASH@@"

0 comments on commit cbdce3d

Please sign in to comment.