From 26e68bfb72bd0754888a50fc697513b9b22b2a6d Mon Sep 17 00:00:00 2001
From: Josh Stewart <josh@noisymime.org>
Date: Tue, 23 Dec 2014 18:19:08 +1100
Subject: [PATCH] Fix O2 gauge

---
 reference/speeduino 0.1.ini | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/reference/speeduino 0.1.ini b/reference/speeduino 0.1.ini
index 4cc720da..e7efa32a 100644
--- a/reference/speeduino 0.1.ini	
+++ b/reference/speeduino 0.1.ini	
@@ -574,15 +574,15 @@ help = helpEnrichments, "Enrichments Help"
    tpsADCGauge       = tpsADC,        "TPS ADC",            "",        0,   255,     -1,    -1,  256,  256, 0, 0
    #batVoltGauge      = batteryVoltage,        "BAT V",              "",        0,   255,     -1,    -1,  256,  256, 0, 0
 
-   #if NARROW_BAND_EGO
-      egoGauge       = egoVoltage,    "Exhaust Gas Oxygen", "volts",   0,   1.0,    0.2,   0.3,  0.6,  0.8, 2, 2
-   #else
-      egoGauge       = egoVoltage,    "Exhaust Gas Oxygen", "volts", 0.5,   4.5,    0.0,   0.0,  5.0,  5.0, 2, 2
-   #endif
-   lambdaGauge       = lambda,        "Lambda",             "",      0.5,   1.5,    0.5,   0.7,    2,  1.1, 2, 2
+   ;#if NARROW_BAND_EGO
+   ;   egoGauge       = egoVoltage,    "Exhaust Gas Oxygen", "volts",   0,   1.0,    0.2,   0.3,  0.6,  0.8, 2, 2
+   ;#else
+   ;   egoGauge       = egoVoltage,    "Exhaust Gas Oxygen", "volts", 0.5,   4.5,    0.0,   0.0,  5.0,  5.0, 2, 2
+   ;#endif
+   ;lambdaGauge       = lambda,        "Lambda",             "",      0.5,   1.5,    0.5,   0.7,    2,  1.1, 2, 2
 
    accelEnrichGauge  = accDecEnrich,  "Accel Enrich",       "%",      50,   150,     -1,    -1,  999,  999, 0, 0
-   afrGauge          = afr,           "Air:Fuel Ratio",     "",       10,  19.4,     12,    13,   15,   16, 2, 2
+   afrGauge          = afr,           "Air:Fuel Ratio",     "",        7,    25,     12,    13,   15,   16, 2, 2
    clockGauge        = secl,          "Clock",              "Seconds", 0,   255,     10,    10,  245,  245, 0, 0
    deadGauge         = deadValue,     "---",                "",        0,     1,     -1,    -1,    2,    2, 0, 0
    dutyCycleGauge    = dutyCycle,     "Duty Cycle",         "%",       0,   100,     -1,    -1,   85,   90, 1, 1
@@ -767,7 +767,8 @@ help = helpEnrichments, "Enrichments Help"
 #endif
    tpsADC           = scalar, U08,  7, "ADC",    1.000, 0.000
    batteryVoltage   = scalar, U08,  8, "V",      0.100, 0.000
-   egoADC           = scalar, U08,  9, "ADC",    1.000, 0.000
+   #egoADC           = scalar, U08,  9, "ADC",    1.000, 0.000
+   afr              = scalar, U08,  9, "O2",     0.100, 0.000
    egoCorrection    = scalar, U08, 10, "%",      1.000, 0.000
    airCorrection    = scalar, U08, 11, "%",      1.000, 0.000
    warmupEnrich     = scalar, U08, 12, "%",      1.000, 0.000
@@ -792,13 +793,13 @@ help = helpEnrichments, "Enrichments Help"
    #batteryVoltage   = { batADC / 255.0 * 30.0                        } ; Current MS power supply voltage.
    coolant          = { coolantRaw - 40                               } ; Coolant sensor temperature in user units.
    #mat              = { tempCvt(table(matADC, "matfactor.inc")-40)   } ; Manifold temperature in user units.
-   egoVoltage       = { egoADC / 255.0 * 5.0                         } ; EGO sensor voltage.
+   ; egoVoltage       = { egoADC / 255.0 * 5.0                         } ; EGO sensor voltage.
    rpm              = { rpm100*100                                   } ; True RPM.
    time             = { timeNow                                      } ; "timeNow" is a parameterless built-in function.
    ;loopsPerSecond   = { loopsPerSecond10*10                          } ; True number of mainloops per second
 
    afrtarget        = { 0 }
-#include "lambdaSensors.ini"
+; #include "lambdaSensors.ini"
 
 #if MPX4250
    barometer        = { table(baroADC, "kpafactor4250.inc")          }
@@ -865,7 +866,7 @@ help = helpEnrichments, "Enrichments Help"
    entry = rpm100,          "RPM100",         int,    "%d"
    entry = map,             "MAP",         int,    "%d"
    entry = tpsADC,          "TPS",         int,    "%d"
-   entry = egoVoltage,      "O2",          float,  "%.3f"
+   entry = afr,             "O2",          float,  "%.3f"
    entry = mat,             "MAT",         float,  "%.1f"
    entry = coolant,         "CLT",         float,  "%.1f"
    entry = engine,          "Engine",      int,    "%d"