From 8d38b55da3f72561e56226057efd4e1b537055d6 Mon Sep 17 00:00:00 2001
From: nearwood <nearwood@localhost>
Date: Tue, 3 Feb 2015 12:11:39 -0500
Subject: [PATCH] rename files once again.

---
 ini/ms1/{megasquirt-I-20.ini => 20.ini}       |  0
 ini/ms2/{megasquirt-II_1.3.ini => 1.3.ini}    |  0
 ini/ms2/{megasquirt-II_1.31.ini => 1.31.ini}  |  0
 ini/ms2/{megasquirt-II_2.0.ini => 2.0.ini}    |  0
 ini/ms2/{megasquirt-II_2.1.ini => 2.1.ini}    |  0
 ini/ms2/{megasquirt-II_2.3.ini => 2.3.ini}    |  0
 ini/ms2/{megasquirt-II_2.5.ini => 2.5.ini}    |  0
 ini/ms2/{megasquirt-II_2.6.ini => 2.6.ini}    |  0
 ini/ms2/{megasquirt-II_2.8.ini => 2.8.ini}    |  0
 .../{megasquirt-II_2.889.ini => 2.889.ini}    |  0
 .../{megasquirt-II_2.890.ini => 2.890.ini}    |  0
 .../{megasquirt-II_2.891.ini => 2.891.ini}    |  0
 .../{megasquirt-II_2.892.ini => 2.892.ini}    |  0
 .../{megasquirt-II_2.900.ini => 2.900.ini}    |  0
 .../{megasquirt-II_2.905.ini => 2.905.ini}    |  0
 .../{megasquirt-II_2.920.ini => 2.920.ini}    |  0
 .../{megasquirt-II_3.108.ini => 3.108.ini}    |  0
 .../{megasquirt-II_3.110.ini => 3.110.ini}    |  0
 .../{megasquirt-II_3.430.ini => 3.430.ini}    |  0
 .../{megasquirt-II_3.730.ini => 3.730.ini}    |  0
 .../{megasquirt-II_3.760.ini => 3.760.ini}    |  0
 .../{megasquirt-II_3.770.ini => 3.770.ini}    |  0
 .../{megasquirt-II_3.780.ini => 3.780.ini}    |  0
 .../{megasquirt-II_3.830.ini => 3.830.ini}    |  0
 msq.php                                       | 40 ++++++++++---------
 25 files changed, 21 insertions(+), 19 deletions(-)
 rename ini/ms1/{megasquirt-I-20.ini => 20.ini} (100%)
 rename ini/ms2/{megasquirt-II_1.3.ini => 1.3.ini} (100%)
 rename ini/ms2/{megasquirt-II_1.31.ini => 1.31.ini} (100%)
 rename ini/ms2/{megasquirt-II_2.0.ini => 2.0.ini} (100%)
 rename ini/ms2/{megasquirt-II_2.1.ini => 2.1.ini} (100%)
 rename ini/ms2/{megasquirt-II_2.3.ini => 2.3.ini} (100%)
 rename ini/ms2/{megasquirt-II_2.5.ini => 2.5.ini} (100%)
 rename ini/ms2/{megasquirt-II_2.6.ini => 2.6.ini} (100%)
 rename ini/ms2/{megasquirt-II_2.8.ini => 2.8.ini} (100%)
 rename ini/ms2/{megasquirt-II_2.889.ini => 2.889.ini} (100%)
 rename ini/ms2/{megasquirt-II_2.890.ini => 2.890.ini} (100%)
 rename ini/ms2/{megasquirt-II_2.891.ini => 2.891.ini} (100%)
 rename ini/ms2/{megasquirt-II_2.892.ini => 2.892.ini} (100%)
 rename ini/ms2/{megasquirt-II_2.900.ini => 2.900.ini} (100%)
 rename ini/ms2/{megasquirt-II_2.905.ini => 2.905.ini} (100%)
 rename ini/ms2/{megasquirt-II_2.920.ini => 2.920.ini} (100%)
 rename ini/ms2/{megasquirt-II_3.108.ini => 3.108.ini} (100%)
 rename ini/ms2/{megasquirt-II_3.110.ini => 3.110.ini} (100%)
 rename ini/ms2/{megasquirt-II_3.430.ini => 3.430.ini} (100%)
 rename ini/ms2/{megasquirt-II_3.730.ini => 3.730.ini} (100%)
 rename ini/ms2/{megasquirt-II_3.760.ini => 3.760.ini} (100%)
 rename ini/ms2/{megasquirt-II_3.770.ini => 3.770.ini} (100%)
 rename ini/ms2/{megasquirt-II_3.780.ini => 3.780.ini} (100%)
 rename ini/ms2/{megasquirt-II_3.830.ini => 3.830.ini} (100%)

diff --git a/ini/ms1/megasquirt-I-20.ini b/ini/ms1/20.ini
similarity index 100%
rename from ini/ms1/megasquirt-I-20.ini
rename to ini/ms1/20.ini
diff --git a/ini/ms2/megasquirt-II_1.3.ini b/ini/ms2/1.3.ini
similarity index 100%
rename from ini/ms2/megasquirt-II_1.3.ini
rename to ini/ms2/1.3.ini
diff --git a/ini/ms2/megasquirt-II_1.31.ini b/ini/ms2/1.31.ini
similarity index 100%
rename from ini/ms2/megasquirt-II_1.31.ini
rename to ini/ms2/1.31.ini
diff --git a/ini/ms2/megasquirt-II_2.0.ini b/ini/ms2/2.0.ini
similarity index 100%
rename from ini/ms2/megasquirt-II_2.0.ini
rename to ini/ms2/2.0.ini
diff --git a/ini/ms2/megasquirt-II_2.1.ini b/ini/ms2/2.1.ini
similarity index 100%
rename from ini/ms2/megasquirt-II_2.1.ini
rename to ini/ms2/2.1.ini
diff --git a/ini/ms2/megasquirt-II_2.3.ini b/ini/ms2/2.3.ini
similarity index 100%
rename from ini/ms2/megasquirt-II_2.3.ini
rename to ini/ms2/2.3.ini
diff --git a/ini/ms2/megasquirt-II_2.5.ini b/ini/ms2/2.5.ini
similarity index 100%
rename from ini/ms2/megasquirt-II_2.5.ini
rename to ini/ms2/2.5.ini
diff --git a/ini/ms2/megasquirt-II_2.6.ini b/ini/ms2/2.6.ini
similarity index 100%
rename from ini/ms2/megasquirt-II_2.6.ini
rename to ini/ms2/2.6.ini
diff --git a/ini/ms2/megasquirt-II_2.8.ini b/ini/ms2/2.8.ini
similarity index 100%
rename from ini/ms2/megasquirt-II_2.8.ini
rename to ini/ms2/2.8.ini
diff --git a/ini/ms2/megasquirt-II_2.889.ini b/ini/ms2/2.889.ini
similarity index 100%
rename from ini/ms2/megasquirt-II_2.889.ini
rename to ini/ms2/2.889.ini
diff --git a/ini/ms2/megasquirt-II_2.890.ini b/ini/ms2/2.890.ini
similarity index 100%
rename from ini/ms2/megasquirt-II_2.890.ini
rename to ini/ms2/2.890.ini
diff --git a/ini/ms2/megasquirt-II_2.891.ini b/ini/ms2/2.891.ini
similarity index 100%
rename from ini/ms2/megasquirt-II_2.891.ini
rename to ini/ms2/2.891.ini
diff --git a/ini/ms2/megasquirt-II_2.892.ini b/ini/ms2/2.892.ini
similarity index 100%
rename from ini/ms2/megasquirt-II_2.892.ini
rename to ini/ms2/2.892.ini
diff --git a/ini/ms2/megasquirt-II_2.900.ini b/ini/ms2/2.900.ini
similarity index 100%
rename from ini/ms2/megasquirt-II_2.900.ini
rename to ini/ms2/2.900.ini
diff --git a/ini/ms2/megasquirt-II_2.905.ini b/ini/ms2/2.905.ini
similarity index 100%
rename from ini/ms2/megasquirt-II_2.905.ini
rename to ini/ms2/2.905.ini
diff --git a/ini/ms2/megasquirt-II_2.920.ini b/ini/ms2/2.920.ini
similarity index 100%
rename from ini/ms2/megasquirt-II_2.920.ini
rename to ini/ms2/2.920.ini
diff --git a/ini/ms2/megasquirt-II_3.108.ini b/ini/ms2/3.108.ini
similarity index 100%
rename from ini/ms2/megasquirt-II_3.108.ini
rename to ini/ms2/3.108.ini
diff --git a/ini/ms2/megasquirt-II_3.110.ini b/ini/ms2/3.110.ini
similarity index 100%
rename from ini/ms2/megasquirt-II_3.110.ini
rename to ini/ms2/3.110.ini
diff --git a/ini/ms2/megasquirt-II_3.430.ini b/ini/ms2/3.430.ini
similarity index 100%
rename from ini/ms2/megasquirt-II_3.430.ini
rename to ini/ms2/3.430.ini
diff --git a/ini/ms2/megasquirt-II_3.730.ini b/ini/ms2/3.730.ini
similarity index 100%
rename from ini/ms2/megasquirt-II_3.730.ini
rename to ini/ms2/3.730.ini
diff --git a/ini/ms2/megasquirt-II_3.760.ini b/ini/ms2/3.760.ini
similarity index 100%
rename from ini/ms2/megasquirt-II_3.760.ini
rename to ini/ms2/3.760.ini
diff --git a/ini/ms2/megasquirt-II_3.770.ini b/ini/ms2/3.770.ini
similarity index 100%
rename from ini/ms2/megasquirt-II_3.770.ini
rename to ini/ms2/3.770.ini
diff --git a/ini/ms2/megasquirt-II_3.780.ini b/ini/ms2/3.780.ini
similarity index 100%
rename from ini/ms2/megasquirt-II_3.780.ini
rename to ini/ms2/3.780.ini
diff --git a/ini/ms2/megasquirt-II_3.830.ini b/ini/ms2/3.830.ini
similarity index 100%
rename from ini/ms2/megasquirt-II_3.830.ini
rename to ini/ms2/3.830.ini
diff --git a/msq.php b/msq.php
index 7b956f1..d0b5e12 100644
--- a/msq.php
+++ b/msq.php
@@ -1,7 +1,7 @@
 <?php
 require "parse.ini.php";
 
-$result = parse_ms_ini("ini/ms2/test.ini", TRUE);
+//$result = parse_ms_ini("ini/ms2/test.ini", TRUE);
 
 //TODO Find better name
 define("LARGE_HOT", 0x1);
@@ -24,39 +24,41 @@ function parseSchema($signature)
 	if ($msVersion == "MS2Extra") $fwVersion = $sig[1];
 	else $fwVersion = $sig[2];
 	
-	if (DEBUG) echo "<div class=\"debug\">$msVersion/$fwVersion</div>"; 
+	if (DEBUG) echo "<div class=\"debug\">$msVersion/$fwVersion</div>";
 	
 	//Look for a matching INI file
 	switch ($msVersion)
 	{
 		case "MS1":
-			$msDir = "ms1";
-			$msFilePrefix = "megasquirt-I.";
+			$msDir = "ms1/";
+			$msFilePrefix = "ms1-";
 			break;
 		case "MSII":
-			$msDir = "ms2";
-			$msFilePrefix = "megasquirt-II.";
+			$msDir = "ms2/";
+			$msFilePrefix = "ms2-";
 			break;
 		case "MS2Extra":
-			$msDir = "ms2extra";
-			$msFilePrefix = "megasquirt-I.";
+			$msDir = "ms2extra/";
+			$msFilePrefix = "ms2e-";
 			break;
 		case "MS3":
-			$msDir = "ms3";
-			$msFilePrefix = "megasquirt-I.";
+			$msDir = "ms3/";
+			$msFilePrefix = "ms3-";
 			break;
 	}
 	
+	$iniFile = "ini/" . $msDir . $msFilePrefix . $fwVersion;
+	if (DEBUG) echo "<div class=\"debug\">Attempting to open: $iniFile</div>";
+	$msqMap = parse_ms_ini($iniFile, TRUE);
 	
-	
-		//~ if (DEBUG) echo '<div class="debug">Using default (1.3) Schema</div>';
-		//~ $msqMap = array(//xmlName => pretty name, [xAxisXmlName, yAxisXmlName]
-			//~ 'veTable1' => array('name' => 'VE Table 1', 'x' => 'frpm_table1', 'y' => 'fmap_table1', 'units' => '%', 'hot' => 'descending'),
-			//~ 'advanceTable1' => array('name' => 'Timing Advance', 'x' => 'srpm_table1', 'y' => 'smap_table1', 'units' => 'degrees', 'hot' => 'ascending'),
-			//~ 'afrTable1' => array('name' => 'AFR Targets', 'x' => 'arpm_table1', 'y' => 'amap_table1', 'hot' => 'ascending'),
-			//~ 'egoType' => array('name' => 'O2 Sensor Type'),
-			//~ 'nCylinders' => array('name' => 'Cylinders')
-		//~ );
+	//~ if (DEBUG) echo '<div class="debug">Using default (1.3) Schema</div>';
+	//~ $msqMap = array(//xmlName => pretty name, [xAxisXmlName, yAxisXmlName]
+		//~ 'veTable1' => array('name' => 'VE Table 1', 'x' => 'frpm_table1', 'y' => 'fmap_table1', 'units' => '%', 'hot' => 'descending'),
+		//~ 'advanceTable1' => array('name' => 'Timing Advance', 'x' => 'srpm_table1', 'y' => 'smap_table1', 'units' => 'degrees', 'hot' => 'ascending'),
+		//~ 'afrTable1' => array('name' => 'AFR Targets', 'x' => 'arpm_table1', 'y' => 'amap_table1', 'hot' => 'ascending'),
+		//~ 'egoType' => array('name' => 'O2 Sensor Type'),
+		//~ 'nCylinders' => array('name' => 'Cylinders')
+	//~ );
 	
 	return $msqMap;
 }