rusefi
/
wideband
mirror of https://github.com/rusefi/wideband.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hand merge: dual ini

This commit is contained in:
Matthew Kennedy 2022-12-01 13:20:45 -08:00
parent d69505171a
commit 38b0d709b1
1 changed files with 46 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
firmware/ini/rusefi_wb_f1_dual.ini
View File

@ -64,13 +64,18 @@ enable2ndByteCanID = false
; CONFIG_DEFINITION_START
pageSize = 128
pageSize = 256
page = 1
; name = class, type, offset, [shape], units, scale, translate, min, max, digits
; First four bytes are used for internal tag. Should not be accessable from TS
CanIndexOffset = scalar, U08, 4, "", 1, 0, 0, 255, 0
test = scalar, U08, 5, "test", 50.0, 0, 0, 20000, 2
Aux0OutBins = array, F32, 5, [8], "", 1, 0, 0, 1500, 2
Aux1OutBins = array, F32, 37, [8], "", 1, 0, 0, 1500, 2
Aux0Out = array, F32, 69, [8], "V", 1, 0, 0, 5.0, 2
Aux1Out = array, F32, 101, [8], "V", 1, 0, 0, 5.0, 2
Aux0InputSel = bits, U08, 133, [0:3], "AFR 0", "AFR 1", "EGT 0", "EGT 1"
Aux1InputSel = bits, U08, 134, [0:3], "AFR 0", "AFR 1", "EGT 0", "EGT 1"
; total TS size = 1
@ -155,6 +160,12 @@ EGT1_state = scalar, U08, 120, "", 1, 0, 0, 4, 0
seconds = scalar, U32, 124, "sec", 1, 0
Aux0InputSig = { (Aux0InputSel == 0) ? AFR0_in : ((Aux0InputSel == 1) ? AFR1_in : ((Aux0InputSel == 2) ? EGT0_temp : EGT1_temp)) }
Aux1InputSig = { (Aux1InputSel == 0) ? AFR0_in : ((Aux1InputSel == 1) ? AFR1_in : ((Aux1InputSel == 2) ? EGT0_temp : EGT1_temp)) }
;Aux0InputSigMax = { (Aux0InputSel == 0) ? 25 : ((Aux0InputSel == 1) ? 25 : 1500 }
;Aux1InputSigMax = { (Aux1InputSel == 0) ? 25 : ((Aux1InputSel == 1) ? 25 : 1500 }
[PcVariables]
; Keep in sync with Max31855State enum from max31855.h
EgtStatesList = bits, U08, [0:7], "Ok", "Open Circuit", "Short to GND", "Short to VCC", "No reply"
@ -163,6 +174,23 @@ seconds = scalar, U32, 124, "sec", 1, 0
; Keep in sync with HeaterState from heater_control.h
HeaterStatesList = bits, U08, [0:7], "Preheat", "Warmup", "Close loop", "Stopped", "No supply"
[CurveEditor]
curve = auxOut0Curve, "AUX output 0 voltage"
columnLabel = "Input", "Output"
xAxis = { (Aux0InputSel < 2) ? 7 : 300 }, { (Aux0InputSel < 2) ? 25 : 1500 }, 13
yAxis = 0, 5, 6
xBins = Aux0OutBins, Aux0InputSig
yBins = Aux0Out
showTextValues = true
curve = auxOut1Curve, "AUX output 1 voltage"
columnLabel = "Input", "Output"
xAxis = { (Aux1InputSel < 2) ? 7 : 300 }, { (Aux1InputSel < 2) ? 19 : 1500 }, 13
yAxis = 0, 5, 6
xBins = Aux1OutBins, Aux1InputSig
yBins = Aux1Out
showTextValues = true
[TableEditor]
[GaugeConfigurations]
@ -211,6 +239,10 @@ EGT1_Gauge = EGT1_temp, "1: EGT", "C",
EGT1_ColdJunctionGauge = EGT1_coldJunction, "1: EGT CJ", "C", 0.0, 130.0, -55.0, -20.0, 95.0, 105.0, 2, 2
EGT1_StateGauge = EGT1_state, "1: EGT state", "", 0.0, 5.0, 0.0, 0.0, 0.5, 0.5, 2, 2
; AUX outputs
Aux0InputGauge = { (Aux0InputSel == 0) ? AFR0_Gauge : ((Aux0InputSel == 1) ? AFR1_Gauge : ((Aux0InputSel == 2) ? EGT0_Gauge : EGT1_Gauge)) }
Aux1InputGauge = { (Aux1InputSel == 0) ? AFR0_Gauge : ((Aux1InputSel == 1) ? AFR1_Gauge : ((Aux1InputSel == 2) ? EGT0_Gauge : EGT1_Gauge)) }
[FrontPage]
; Gauges are numbered left to right, top to bottom.
;
@ -258,6 +290,10 @@ menuDialog = main
menu = "&View"
subMenu = can_settings, "CAN Settings"
menu = "Outputs"
subMenu = auxOut0, "AUX analog output 0"
subMenu = auxOut1, "AUX analog output 1"
menu = "&Advanced"
menu = "&Sensors"
@ -282,4 +318,12 @@ cmd_dfu = "Z\x00\xba\x00\x00"
dialog = can_settings, "CAN Settings"
field = "CAN message ID offset", CanIndexOffset
dialog = auxOut0, "AUX analog out 0 Settings"
field = "Signal", Aux0InputSel
panel = auxOut0Curve
dialog = auxOut1, "AUX analog out 1 Settings"
field = "Signal", Aux1InputSel
panel = auxOut1Curve
[Tools]