Diff: main.cpp

Revision:

20:93c70a1869ee

Parent:

19:72c02acb601d

Child:

21:c44cfd3259c0

diff -r 72c02acb601d -r 93c70a1869ee main.cpp
--- a/main.cpp	Thu Aug 14 12:06:47 2014 +0000
+++ b/main.cpp	Sat Aug 30 16:30:27 2014 +0000
@@ -16,9 +16,12 @@
 int main()
 {    
     MCP23017 cMCP23017 = MCP23017(I2C_SDA, I2C_SCL, 0x40, true);
-    Adafruit_RGBLCDShield cLCD(cMCP23017);
+    //MCP23017 cMCP23017 = MCP23017(I2C_SDA, I2C_SCL, 0x4E, true);
     
-    RTclock cClock(I2C_SDA, I2C_SCL);
+    Adafruit_RGBLCDShield cLCD(cMCP23017);
+    //Adafruit_RGBLCDShield cLCD(cMCP23017,1<<0,1<<1, 1<< 2, 1<<4, 1<<5, 1<<6, 1<<7);
+    
+    RTclock cClock(I2C_SDA, I2C_SCL, RTclock::eDS3231);
     //RTclock cClock(D3, D6);
 
     // Spin up RTC
@@ -27,15 +30,16 @@
     // Set up display modules    
     Module * aModules[] =
     {
-        new TitleModule(cLCD),
+        new TempModule(cLCD),
         new TimeModule(cLCD,cClock),
-        new DateModule(cLCD,cClock),
-        new TempModule(cLCD),
+        new DateModule(cLCD,cClock),        
         new SyncModule(cLCD,cClock),
+        new TitleModule(cLCD),
     };
 
     // Set up the menu manager
-    MenuManager cMenuManager(aModules,_countof(aModules),cLCD);
+    MenuManager cMenuManager(aModules,_countof(aModules),cLCD,16,2);
+    //MenuManager cMenuManager(aModules,_countof(aModules),cLCD,20,4);
 
     // Start menu manager loop    
     cMenuManager.loop();