Selaa lähdekoodia

Fixed something

Aareschluchtje 9 vuotta sitten
vanhempi
commit
3d3fa11452
3 muutettua tiedostoa jossa 15 lisäystä ja 14 poistoa
  1. 12 12
      main.c
  2. 1 0
      network.c
  3. 2 2
      network.h

+ 12 - 12
main.c

@@ -179,6 +179,7 @@ static void SysControlMainBeat(u_char OnOff)
 /* global variable definitions                                             */
 /*-------------------------------------------------------------------------*/
 int isAlarmSyncing;
+int initialized;
 /*-------------------------------------------------------------------------*/
 /* local variable definitions                                              */
 /*-------------------------------------------------------------------------*/
@@ -188,15 +189,10 @@ int isAlarmSyncing;
 /*-------------------------------------------------------------------------*/
 THREAD(StartupInit, arg)
 {
-    isAlarmSyncing = 1;
     NetworkInit();
 
     NtpSync();
 
-    char* content = httpGet("/getAlarmen.php?radioid=DE370");
-    parseAlarmJson(content);
-    free(content);
-    isAlarmSyncing = 0;
     initialized = 1;
     NutThreadExit();
 }
@@ -206,11 +202,14 @@ THREAD(Alarmsync, arg)
 {
     for(;;)
     {
-        isAlarmSyncing = 1;
-        char* content = httpGet("/getAlarmen.php?radioid=DE370");
-        parseAlarmJson(content);
-        free(content);
-        isAlarmSyncing = 1;
+        if(initialized && (hasNetworkConnection() == true))
+        {
+            isAlarmSyncing = 1;
+            char* content = httpGet("/getAlarmen.php?radioid=DE370");
+            parseAlarmJson(content);
+            free(content);
+            isAlarmSyncing = 0;
+        }
         NutSleep(30000);
     }
     NutThreadExit();
@@ -236,6 +235,7 @@ int checkOffPressed(){
 
 int main(void)
 {
+    initialized = 0;
 	time_t start;
 	int running = 0;
 
@@ -262,8 +262,8 @@ int main(void)
     LcdBackLight(LCD_BACKLIGHT_ON);
     NtpInit();
 
-    NutThreadCreate("BackgroundThread", StartupInit, NULL, 1500);
-
+    NutThreadCreate("BackgroundThread", StartupInit, NULL, 1024);
+    NutThreadCreate("BackgroundThread", Alarmsync, NULL, 1024);
     /** Quick fix for turning off the display after 10 seconds boot */
     start = time(0);
     running = 1;

+ 1 - 0
network.c

@@ -44,6 +44,7 @@ void NetworkInit() {
     }else {
         printf("Ik heb een internet connectie. Ip is: %s \n\n", inet_ntoa(confnet.cdn_ip_addr));
     }
+    NutSleep(2000);
     hasNetwork = true;
 }
 

+ 2 - 2
network.h

@@ -5,8 +5,8 @@
 #ifndef _Network_H
 #define _Network_H
 
-bool hasNetworkConnection(void);
-bool NetworkIsReceiving(void);
+//bool hasNetworkConnection(void);
+//bool NetworkIsReceiving(void);
 extern void NetworkInit(void);
 char* httpGet(char address[]);
 void parseAlarmJson(char* content);