Diff: main.cpp

Revision:

25:24654d08a99a

Parent:

23:94d2f0d62247

Child:

26:0cfd95d8f270

--- a/main.cpp	Wed Oct 08 16:42:17 2014 +0000
+++ b/main.cpp	Thu Oct 09 08:03:20 2014 +0000
@@ -1,6 +1,8 @@
 #include "mbed.h"
 
-#include "Adafruit_RGBLCDShield.h"
+#include "lcdadafruit.h"
+#include "lcd2004.h"
+#include "keyreadernull.h"
 #include "RTclock.h"
 
 #include "DateModule.h"
@@ -18,12 +20,10 @@
     // Share the I2C across multiple devices
     I2C cI2C(I2C_SDA, I2C_SCL);    // D3, D6
     cI2C.frequency(400000);    // I2C can handle two different frequencies - switch to high speed if asked
-    
-    MCP23017 cMCP23017(cI2C, 0x20 << 1);
-    //MCP23017 cMCP23017(cI2C, 0x27 << 1, true);
-    
-    Adafruit_RGBLCDShield cLCD(cMCP23017);
-    //Adafruit_RGBLCDShield cLCD(cMCP23017,1<<0,1<<1, 1<< 2, 1<<4, 1<<5, 1<<6, 1<<7);
+        
+    //LCDadafruit cLCD(cI2C);
+    LCD2004 cLCD(cI2C);
+    KeyReaderNull cKeys(cI2C);
     
     RTclock cClock(cI2C, 0x68 << 1, RTclock::eDS3231);
 
@@ -33,16 +33,16 @@
     // Set up display modules    
     Module * aModules[] =
     {
+        new TitleModule(cLCD,cClock),        
         new TempModule(cLCD,cI2C,0x18 << 1),
         new TimeModule(cLCD,cClock),
         new DateModule(cLCD,cClock),        
         new SyncModule(cLCD,cClock),
-        new TitleModule(cLCD),
     };
 
     // Set up the menu manager
-    MenuManager cMenuManager(aModules,_countof(aModules),cLCD,16,2);
-    //MenuManager cMenuManager(aModules,_countof(aModules),cLCD,20,4);
+    // MenuManager cMenuManager(aModules,_countof(aModules),cLCD,cKeys,16,2);
+    MenuManager cMenuManager(aModules,_countof(aModules),cLCD,cKeys);
 
     // Start menu manager loop    
     cMenuManager.loop();