Add more pressure gauge options (PSI, inhg)

This commit is contained in:
Josh Stewart 2017-01-16 14:41:40 +11:00
parent 9aad63ec7c
commit 6b368e998d
2 changed files with 14 additions and 4 deletions

View File

@ -232,7 +232,7 @@ void sendValues(int packetlength, byte portNum)
response[13] = lowByte(currentStatus.RPM); //rpm HB
response[14] = highByte(currentStatus.RPM); //rpm LB
response[15] = currentStatus.TAEamount; //acceleration enrichment (%)
response[16] = 0x00; //Barometer correction (%)
response[16] = currentStatus.baro; //Barometer value
response[17] = currentStatus.corrections; //Total GammaE (%)
response[18] = currentStatus.VE; //Current VE 1 (%)
response[19] = currentStatus.afrTarget;

View File

@ -1385,7 +1385,11 @@ menuDialog = main
warmupEnrichGauge = warmupEnrich, "Warmup Enrichment", "%", 100, 200, 130, 140, 140, 150, 0, 0
gaugeCategory = "Sensor inputs"
mapGauge = map, "Engine MAP", "kPa", 0, 255, 0, 20, 200, 245, 0, 0
mapGauge = map, "Engine MAP", "kPa", 0, 255, 0, 20, 200, 245, 0, 0
mapGauge_psi = map_psi, "Engine MAP (PSI)", "PSI", -15, 100, 0, 20, 200, 245, 0, 0
mapGauge_bar = map_bar, "Engine MAP (BAR)", "Bar", -1, 3, -1, -1, 5, 5, 2, 2
mapGauge_vacBoost = map_vacboost, "Engine MAP (in-Hg/PSI)", "in-Hg/PSI", -30, 30, -30, -30, 30, 30, 1, 1
#if CELSIUS
cltGauge = coolant, "Coolant Temp", "TEMP", -40, 215, -15, 0, 95, 105, 0, 0
iatGauge = iat, "Inlet Air Temp", "TEMP", -40, 215, -15, 0, 95, 100, 0, 0
@ -1558,7 +1562,7 @@ menuDialog = main
warmupEnrich = scalar, U08, 12, "%", 1.000, 0.000
rpm = scalar, U16, 13, "rpm", 1.000, 0.000
accelEnrich = scalar, U08, 15, "%", 1.000, 0.000
baroCorrection = scalar, U08, 16, "%", 1.000, 0.000
baro = scalar, U08, 16, "%", 1.000, 0.000
gammaEnrich = scalar, U08, 17, "%", 1.000, 0.000
veCurr = scalar, U08, 18, "%", 1.000, 0.000
afrTarget = scalar, U08, 19, "O2", 0.100, 0.000
@ -1612,6 +1616,12 @@ menuDialog = main
lambda = { afr / stoich }
MAPxRPM = { rpm * map }
;Manifold pressure in weirdo units
map_bar = { (map - baro) / 101.33 }
map_psi = { (map - baro) * 0.145038 }
map_inhg = { (baro - map) * 0.2953007 } ;in-Hg
map_vacboost = { map < baro ? -map_inhg : map_psi }
#if EXPANDED_CLT_TEMP
clt_exp = { 1 }
#else
@ -1672,7 +1682,7 @@ menuDialog = main
entry = egoCorrection, "Gego", int, "%d"
entry = airCorrection, "Gair", int, "%d"
entry = warmupEnrich, "Gwarm", int, "%d"
entry = baroCorrection, "Gbaro", int, "%d"
;entry = baroCorrection, "Gbaro", int, "%d"
entry = gammaEnrich, "Gammae", int, "%d"
entry = accelEnrich, "TPSacc", int, "%d"
entry = veCurr, "VE", int, "%d"