Diff: main.cpp

Revision:

5:e374481e7554

Parent:

4:75ed86b78045

Child:

6:e7073adacdc8

--- a/main.cpp	Sun Feb 23 00:16:54 2014 +0000
+++ b/main.cpp	Fri Feb 28 14:04:16 2014 +0000
@@ -5,12 +5,26 @@
 #include "Mechanism/RtcMechanism.h"
 #include "Model/Clock.h"
 
+extern "C" void HardFault_Handler()
+{
+    puts("Hard Fault!");
+    while(1);
+}
+
+void no_memory ()
+{
+    puts("panic: can't allocate to memory!");
+    exit(-1);
+}
+
 int main()
 {
+    set_new_handler(no_memory);
+
     I2C i2c(dp5, dp27); //sda scl
     I2cLCD lcd(i2c, dp26); //i2c reset
-    Rtc8564 rtc(i2c, dp25, PullUp); 
-    ViewModel::ClockViewModel clockVm(lcd, dp1, dp2, dp4); // set increment decrement
+    Rtc8564 rtc(i2c, dp25, PullUp);
+    ViewModel::ClockViewModel clockVm(lcd, dp28, dp24, dp17, dp1, dp2); // set increment decrement sound1 sound2
     RtcMechanism rtcMechanism;
     Model::Clock clock(&clockVm, &rtcMechanism);
     clock.addSetMode(&rtcMechanism);