Browse Source

Fixed minor issues

jancoow 9 years ago
parent
commit
53e5304d46
3 changed files with 10 additions and 5 deletions
  1. 3 2
      alarm.c
  2. 3 3
      contentparser.c
  3. 4 0
      displayHandler.c

+ 3 - 2
alarm.c

@@ -160,6 +160,7 @@ void setState(int idx){
 	
 	//Check if alarm has to snooze
 	if (alarm[idx].state == 1 && compareTime(ct, snooze[idx].snoozeTime) >= 1 && alarm[idx].state < 3){
+		printf("Alarm stopt nu!");
 		alarm[idx].state = 2;
 		snooze[idx].snoozeTime = ct;
 		AddSnoozeMinutes(idx, alarm[idx].snooze);
@@ -168,8 +169,9 @@ void setState(int idx){
 	}
 	
 	if (alarm[idx].state == 2 && compareTime(ct, snooze[idx].snoozeTime) >= 1 && alarm[idx].state < 3){
+		AddSnoozeMinutes(idx, 1);
+		printf("Alarm komt nu uit snooze!!");
 		if(alarm[idx].state != 1){
-			printf("Alarm komt nu uit snooze!!");
 			bool success = connectToStream(alarm[idx].ip, alarm[idx].port, alarm[idx].url);
 			if (success == true){
 				play();
@@ -178,7 +180,6 @@ void setState(int idx){
 			}
 			alarm[idx].state = 1;
 		}
-		AddSnoozeMinutes(idx, 1);
 	}
 	
 }

+ 3 - 3
contentparser.c

@@ -47,8 +47,8 @@ void parseAlarmJson(char* content){
         u_short port = 0;
         char url[24];
         char ip[24];
-        char name[16];
-		char str2[16];
+        char name[17];
+        char str2[16];
         char st = -1;
         char oo = -1;
         memset(url, 0, 24);
@@ -77,7 +77,7 @@ void parseAlarmJson(char* content){
             }else if (jsoneq(content, &token[i], "url") == 0) {
                 getStringToken(content, &token[i + 1], url, 24);
             }else if (jsoneq(content, &token[i], "name") == 0) {
-                getStringToken(content, &token[i + 1], name, 16);
+                getStringToken(content, &token[i + 1], name, 18);
             }else if (jsoneq(content, &token[i], "oo") == 0) {
                 oo = getIntegerToken(content, &token[i + 1]);
             }else if (jsoneq(content, &token[i], "st") == 0) {

+ 4 - 0
displayHandler.c

@@ -59,6 +59,10 @@ long timerStruct(struct _tm s){
     long stime = (s.tm_hour * 3600) + (s.tm_min * 60) + s.tm_sec;
     long ctime = (ct.tm_hour * 3600) + (ct.tm_min * 60) + ct.tm_sec;
 
+    if(ctime < 0){
+        return 0;
+    }
+    
     return ctime - stime;
 }