Diff: main.cpp

Revision:

5:ffa456512437

Parent:

4:b131ff1e047c

Child:

6:9ea3943e9e24

--- a/main.cpp	Tue Sep 02 09:42:41 2014 +0000
+++ b/main.cpp	Thu Mar 05 14:03:28 2015 +0000
@@ -91,8 +91,8 @@
 }
 
 //Layout Coordinates
-#define TYPE_ICON_X         10 //5
-#define TYPE_ICON_Y         60 //10
+#define TYPE_ICON_X         0 //5
+#define TYPE_ICON_Y         0 //10
 #define UNREAD_ICON_X       60 //96
 #define UNREAD_ICON_Y       60 //14
 #define PRIMARY_TEXT_X      10 //5
@@ -111,7 +111,7 @@
         //Draw type icon...
         switch(notifications[visible_notification_index].type) {
             case NOTIFICATION_TYPE_ALARM:
-                fb.bitBlit(Alarm, 32, 32, TYPE_ICON_X, TYPE_ICON_Y);
+                fb.bitBlit(Alarm, 96, 96, TYPE_ICON_X, TYPE_ICON_Y);
                 break;
                 
             case NOTIFICATION_TYPE_CALL:
@@ -133,7 +133,7 @@
                 
         //Unread notification
         if(isUnread(notifications[visible_notification_index])){
-            fb.bitBlit(Unread, 16, 24, UNREAD_ICON_X, UNREAD_ICON_Y);
+//            fb.bitBlit(Unread, 16, 24, UNREAD_ICON_X, UNREAD_ICON_Y);
         }
         //Text fields...
         fb.printString(lookupFontFace("Lucida 8pt", 8), PRIMARY_TEXT_X, PRIMARY_TEXT_Y, BLACK, notifications[visible_notification_index].primary_text);
@@ -260,9 +260,9 @@
     notifications[0].state = NOTIFICATION_STATE_UNREAD;
     //strcpy(notifications[0].primary_text,"Wake Up");
     //strcpy(notifications[0].secondary_text, "07:00");
-    strcpy(notifications[0].primary_text,"Test");
-    strcpy(notifications[0].secondary_text, "1");
-    
+//    strcpy(notifications[0].primary_text,"Test");
+//    strcpy(notifications[0].secondary_text, "1");
+//    
     notifications[1].type = NOTIFICATION_TYPE_CALL;
     notifications[1].state = NOTIFICATION_STATE_UNREAD;
     //strcpy(notifications[1].primary_text,"Eric Gowland");
@@ -304,8 +304,8 @@
     //Init Data
     initNotificationData();
     //Attach interrupt handlers...
-    buttonOne.attach(buttonOnePressed, IRQ_RISE, BUTTON_INTERRUPT_DEBOUNCE_TIME_MS);
-    buttonTwo.attach(buttonTwoPressed, IRQ_RISE, BUTTON_INTERRUPT_DEBOUNCE_TIME_MS);
+//    buttonOne.attach(buttonOnePressed, IRQ_RISE, BUTTON_INTERRUPT_DEBOUNCE_TIME_MS);
+//    buttonTwo.attach(buttonTwoPressed, IRQ_RISE, BUTTON_INTERRUPT_DEBOUNCE_TIME_MS);
     //Request display update...
     requestDisplayUpdate();
     while(1) {