Pārlūkot izejas kodu

Limited max alarms to 2. Fixed alarm 00:00:00 problem.

jancoow 9 gadi atpakaļ
vecāks
revīzija
da1b643fec
3 mainītis faili ar 5 papildinājumiem un 5 dzēšanām
  1. 2 1
      alarm.c
  2. 0 1
      main.c
  3. 3 3
      network.c

+ 2 - 1
alarm.c

@@ -9,7 +9,7 @@
 #include "rtc.h"
 #include "alarm.h"
 
-#define n 5
+#define n 2
 
 
 struct _snooze
@@ -110,6 +110,7 @@ void setAlarm(struct _tm time, char* name, char* ip, u_short port, char* url, in
 
 void deleteAlarm(int idx){
 	struct _tm tm;
+	tm.tm_year = 0;
 	alarm[idx].time = tm;
 	alarm[idx].port = 0;
 	alarm[idx].snooze = 5;

+ 0 - 1
main.c

@@ -384,6 +384,5 @@ int main(void)
         VOL2 = VOL;
         WatchDogRestart();
     }
-
     return(0);
 }

+ 3 - 3
network.c

@@ -127,7 +127,7 @@ void parseAlarmJson(char* content){
 
 
 
-    int start = 0;
+    int start = 1;
     int usedAlarms[maxAlarms()];
     int j;
     for(j = 0; j < maxAlarms(); j++){
@@ -141,7 +141,7 @@ void parseAlarmJson(char* content){
         char ip[24];
         char name[16];
         int id;
-        for (i = i; !((i + start) % 22 == 0); i++) {
+        for (i = i; !((i + start) % 23 == 0); i++) {
             if (jsoneq(content, &token[i], "YYYY") == 0) {
                 time.tm_year= getIntegerToken(content, &token[i + 1]) - 1900;
                 i++;
@@ -177,7 +177,7 @@ void parseAlarmJson(char* content){
                 i++;
             }
         }
-        start = 1;
+        start = 0;
 
         int idx = alarmExist(id);
         if(idx == -1){