Diff: main.cpp

Revision:

4:75ed86b78045

Parent:

3:061cccf4093a

Child:

5:e374481e7554

--- a/main.cpp	Sat Feb 22 09:24:27 2014 +0000
+++ b/main.cpp	Sun Feb 23 00:16:54 2014 +0000
@@ -1,31 +1,26 @@
 #include "mbed.h"
 #include "I2cLCD/I2cLCD.h"
-#include "I2cRTC/I2cRTC.h"
+#include "Rtc8564/Rtc8564.h"
 #include "ViewModel/ClockViewModel.h"
+#include "Mechanism/RtcMechanism.h"
 #include "Model/Clock.h"
 
-//Serial uart(dp16, dp15);
-DigitalOut myled(LED1);
-
 int main()
 {
     I2C i2c(dp5, dp27); //sda scl
     I2cLCD lcd(i2c, dp26); //i2c reset
-    I2cRTC rtc(i2c, dp25, dp18); 
+    Rtc8564 rtc(i2c, dp25, PullUp); 
     ViewModel::ClockViewModel clockVm(lcd, dp1, dp2, dp4); // set increment decrement
-    Model::Clock clock(&clockVm, &rtc);
-    clock.addSetMode(&rtc);
+    RtcMechanism rtcMechanism;
+    Model::Clock clock(&clockVm, &rtcMechanism);
+    clock.addSetMode(&rtcMechanism);
     clock.addSetMode(&clockVm);
-    rtc.setClock(&clock);
+    rtcMechanism.setClock(&clock);
+    rtcMechanism.setRtc(&rtc);
     clockVm.setClock(&clock);
     clock.initialize();
     clockVm.initialize();
-    rtc.start();
+    rtc.initialize();
 
-    while(1) {
-        myled = 1;
-        wait(0.5);
-        myled = 0;
-        wait(0.5);
-    }
+    while(1);
 }