Remco minor changes

contentparser.c

@@ -7,6 +7,7 @@
 #include "jsmn.h"
 #include "rtc.h"
 #include "alarm.h"
+#include "displayHandler.h"
 
 void parseAlarmJson(char* content){
     int r;
@@ -105,12 +106,13 @@ void parsetimezone(char* content)
 
 void parseTwitch(char* content)
 {
-    if(strcmp("null", content))
+    if(!strcmp("null", content))
     {
+        printf("Nobody is streaming");
         return;
     }
     int r;
-    int i = 2;
+    int i = 1;
     jsmn_parser p;
     jsmntok_t token[20]; /* We expect no more than 20 tokens */
 
@@ -127,19 +129,24 @@ void parseTwitch(char* content)
     char title[30];
     char game[20];
 
-    for(i; i < r; i+=2)
+    for(i; i < r; i++)
     {
         if(jsoneq(content, &token[i], "Name"))
         {
             getStringToken(content, &token[i+1], name);
+            printf("%s", name);
+            i++;
         }
         else if(jsoneq(content, &token[i], "Title"))
         {
             getStringToken(content, &token[i+1], title);
+            i++;
         }
         else if(jsoneq(content, &token[i], "Game"))
         {
             getStringToken(content, &token[i+1], game);
+            i++;
         }
     }
+    displayTwitch(name, title, game);
 }

displayHandler.c

@@ -19,6 +19,8 @@
 #define MONTH_OFFSET 1
 #define YEAR_OFFSET 1900
 
+bool displayingCustomMessage = false;
+
 void (*write_display_ptr[2])(char*, int) = {LcdArrayLineOne, LcdArrayLineTwo};
 
 void displayTime(int line_number){
@@ -122,8 +124,17 @@ void displayVolume(int pos)
 
 void displayTwitch(char name[], char title[], char game[])
 {
+    displayingCustomMessage = true;
     ClearLcd();
     LcdArrayLineOne(name, strlen(name));
     LcdArrayLineTwo("Streaming", 9);
     LcdBackLight(LCD_BACKLIGHT_ON);
+}
+
+bool isDisplayingCustomMessage(){
+    return displayingCustomMessage;
+}
+
+void setDisplayingCustomMessage(bool value){
+    displayingCustomMessage = value;
 }

displayHandler.h

@@ -4,10 +4,14 @@
 
 #ifndef MUTLI_OS_BUILD_DISPLAYHANDLER_H
 #define MUTLI_OS_BUILD_DISPLAYHANDLER_H
+#include "ntp.h"
 
 void displayTime(int);
 void displayDate(int);
 void displayAlarm(int line_number, int line_numberTwo, int idx);
 void displayVolume(int pos);
+void displayTwitch(char name[], char title[], char game[]);
+bool isDisplayingCustomMessage();
+void setDisplayingCustomMessage(bool value);
 
 #endif //MUTLI_OS_BUILD_DISPLAYHANDLER_H

main.c

@@ -348,6 +348,11 @@ int main(void)
             LcdBackLight(LCD_BACKLIGHT_ON);
 		}
 
+        //If escape is pressed, stop displaying custom message
+        if(KbGetKey() == KEY_ESC){
+            setDisplayingCustomMessage(false);
+        }
+
 		//Check if background LED is on, and compare to timer
 		if (running == 1){
 			if (timerStruct(start) >= 10 || running > 1){
@@ -395,7 +400,9 @@ int main(void)
 					}
 				}
 			}
-		}
+		}else if(isDisplayingCustomMessage() == true){
+
+        }
 		else if (timerStruct(timeCheck) >= 5){
             displayTime(0);
             displayDate(1);

network.c

@@ -51,7 +51,7 @@ char* getMacAdress(){
 }
 
 void httpGet(char address[], void (*parser)(char*)){
-    u_long rx_to = 3000;
+    u_long rx_to = 10000;
     isReceiving = true;
     printf("\n\n #-- HTTP get -- #\n");