From 9aa9416583399e9a2ba630d248959bebe45cf3e1 Mon Sep 17 00:00:00 2001
From: Josh Stewart <josh@noisymime.org>
Date: Sun, 27 Sep 2015 22:51:10 +1000
Subject: [PATCH] Interface work for boost and vvt control

---
 reference/speeduino.ini | 34 ++++++++++++++++++++++++++++------
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/reference/speeduino.ini b/reference/speeduino.ini
index 0ec6cfdd..af55fab4 100644
--- a/reference/speeduino.ini
+++ b/reference/speeduino.ini
@@ -434,19 +434,17 @@ page = 8
       subMenu = triggerSettings,    "&Trigger Setup"
       ;subMenu = OLED,               "OLED Setup"
       subMenu = airdensity_curve,   "IAT Density"
-      subMenu = fanSettings,        "Fan"
+      
 
    menu = "&Tuning"
       subMenu = std_realtime,       "&Realtime Display"
       subMenu = accelEnrichments,   "&Acceleration Wizard"
       subMenu = egoControl,         "AFR/O2", 3
-      subMenu = boostControl,       "Boost control",    8
       subMenu = RevLimiterS,        "Rev Limits",       2
       subMenu = veTable1Tbl,         "&VE Table",       0
       subMenu = sparkTbl,           "&Spark Table",    2
       subMenu = afrTable1Tbl,        "A&FR Table",       5
 
-
    menu = "&Spark"
       subMenu = sparkSettings,   "&Spark Settings"
       subMenu = sparkTbl,        "Spark Table", 2
@@ -467,6 +465,17 @@ page = 8
         subMenu = iacPwmCrank_curve,    "Idle - PWM Cranking Duty Cycle", 7, { iacAlgorithm == 2 || iacAlgorithm == 3 }
         subMenu = iacStep_curve,         "Idle - Stepper Motor", 7, { iacAlgorithm == 4 || iacAlgorithm == 5 }
         subMenu = iacStepCrank_curve,    "Idle - Stepper Motor Cranking", 7, { iacAlgorithm == 4 || iacAlgorithm == 5 }
+        
+    menu = "&Accessories"
+        subMenu = fanSettings,          "Thermo Fan"
+        subMenu = std_separator
+        subMenu = boostSettings,        "Boost Control"
+        subMenu = boostTbl,             "Boost duty cycle", 8,  { boostEnabled }
+        subMenu = std_separator
+        subMenu = vvtSettings,          "VVT Control"
+        subMenu = vvtTbl,               "VVT duty cycle", 8,  { vvtEnabled }
+        
+        
       
   menuDialog = main
    menu = "T&ools"
@@ -690,8 +699,14 @@ page = 8
              settingOption = "MPXH5700", mapMin=0,  mapMax=700
              settingOption = "MPXH6400", mapMin=3,  mapMax=416
              
-    dialog = boostControl, "Boost Control"
-        panel = boostTbl
+    dialog = boostSettings, "Boost Control"
+        field = "Boost Control Enabled",    boostEnabled
+        field = "Boost solenoid freq.",     boostFreq
+        
+    dialog = vvtSettings, "VVT Control"
+        field = "VVT Control Enabled",    vvtEnabled
+        field = "VVT solenoid freq.",     vvtFreq
+        
       
 
 ; -------------------------------------------------------------
@@ -874,12 +889,19 @@ help = helpEnrichments, "Enrichments Help"
       upDownLabel = "RICHER", "LEANER"
       gridOrient  = 250,   0, 340
       
-   table = boostTbl,    boostMap,    "Boost control Table", 8
+    table = boostTbl,    boostMap,    "Boost control Table", 8
       xBins = rpmBinsBoost, rpm
       yBins = tpsBinsBoost, throttle
       zBins = boostTable
       gridHeight  = 3.0
       upDownLabel = "HIGHER", "LOWER"
+      
+    table = vvtTbl,    vvtMap,    "VVT control Table", 8
+      xBins = rpmBinsVVT, rpm
+      yBins = tpsBinsVVT, throttle
+      zBins = vvtTable
+      gridHeight  = 3.0
+      upDownLabel = "HIGHER", "LOWER"
 
 ;-------------------------------------------------------------------------------