Diff: main.cpp

Revision:

13:3796bde6ba8f

Parent:

12:c270870bdd23

Child:

15:4b394c64b461

--- a/main.cpp	Tue Aug 28 15:41:51 2012 +0000
+++ b/main.cpp	Mon Sep 17 00:34:51 2012 +0000
@@ -35,6 +35,7 @@
  * v16 - Comms menu, OSC, ArtNet - April'12
  * v17 - RJ45 - May'12
  * v18 - DMX - July'12
+ * v19 - TVOne mixing comms further optimised - August'12
  * vxx - TODO: Keying values load from USB mass storage
  * vxx - TODO: Set keying values from controller, requires a guided, step-through process for user
  * vxx - TODO: Defaults load/save from USB mass storage
@@ -57,6 +58,8 @@
 
 #include <sstream>
 
+#define kSPKDFSoftwareVersion "beta.19"
+
 // MBED PINS
 
 #define kMBED_AIN_XFADE     p20
@@ -104,7 +107,8 @@
 #define kDMXOutChannelXFade 0
 #define kDMXOutChannelFadeUp 1
 
-#define kSPKDFSettingsFilename "SPKDF-Settings.txt"
+// 8.3 format filename only, no subdirs
+#define kSPKDFSettingsFilename "SPKDF.ini"
 
 //// DEBUG
 
@@ -310,12 +314,16 @@
     // Splash screen
     screen.imageToBuffer(spkDisplayLogo);
     screen.textToBuffer("SPK:D-Fuser",0);
-    screen.textToBuffer("SW beta.18",1);
+    screen.textToBuffer(string("SW ") + kSPKDFSoftwareVersion,1);
     screen.sendBuffer();
     
     // Load saved settings
-    settings.load(kSPKDFSettingsFilename);
-    
+/* CRAZY, see note in spk_settings.h   
+    if (settings.load(kSPKDFSettingsFilename)) 
+    {screen.textToBuffer("Settings Read",2); screen.sendBuffer();}
+    else 
+    {screen.textToBuffer("Settings NOT Read",2); screen.sendBuffer();}
+*/    
     // Set menu structure
     mixModeMenu.title = "Mix Mode";
     mixModeMenu.addMenuItem("Blend", blend, 0);