Merge remote-tracking branch 'refs/remotes/origin/developer' into GoToSleep

.idea/InternetRadio.iml

@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="CPP_MODULE" version="4">
   <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/CMakeLists.txt" isTestSource="false" />
-    </content>
+    <content url="file://$MODULE_DIR$" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module-library">
       <library name="Header Search Paths">

Twitter.h

@@ -0,0 +1,16 @@
+//
+// Created by malek on 30-3-2016.
+//
+
+#ifndef INTERNETRADIO_TWITTER_H
+#define INTERNETRADIO_TWITTER_H
+
+#endif //INTERNETRADIO_TWITTER_H
+
+struct TwitterFeed TweetFeed;
+int Scroller;
+
+struct TwitterFeed{
+
+    char tweet[140];
+};

alarm.c

@@ -32,8 +32,9 @@ int checkAlarms(){
 			alarm[i].state = 0;
 		}else{
 			setState(i);
+			eenmaligAlarmCheck(i);
 		}
-		if (alarm[i].state == 1){
+		if (alarm[i].state == 1 || alarm[i].state == 4){
 			check = 1;
 		}
 	}
@@ -61,7 +62,7 @@ struct _alarm* getAlarm(int idx){
 char getRunningAlarmID(){
 	char idx;
 	for (idx = 0; idx < 5; idx++) {
-		if (getState(idx) == 1) {
+		if (getState(idx) == 1 || getState(idx) == 4) {
 			return idx;
 		}
 	}
@@ -80,9 +81,11 @@ void setSnooze(int idx){
 	struct _tm ct;
 	X12RtcGetClock(&ct);
 	
-	alarm[idx].state = 2;
-	snooze[idx].snoozeTime = ct;
-	snooze[idx].snoozeTime.tm_min += alarm[idx].snooze;
+	if (alarm[idx].state < 3){
+		alarm[idx].state = 2;
+		snooze[idx].snoozeTime = ct;
+		snooze[idx].snoozeTime.tm_min += alarm[idx].snooze;
+	}
 }
 
 int daysInMonth(int m, int y) {
@@ -129,12 +132,13 @@ void setState(int idx){
 	struct _tm ct;
 	X12RtcGetClock(&ct);
 	
-	if (alarm[idx].state == 0){
+	//Set snooze time for snooze alarm
+	if (alarm[idx].state == 0  && alarm[idx].state < 3){
 		snooze[idx].snoozeTime = alarm[idx].time;
 		AddSnoozeMinutes(idx,1);
 	}
 	
-	if (compareTime(ct, alarm[idx].time) >= 1 && alarm[idx].time.tm_year != 0 && alarm[idx].state != 2){
+	if (compareTime(ct, alarm[idx].time) >= 1 && alarm[idx].time.tm_year != 0 && alarm[idx].state != 2 && alarm[idx].state < 3){
 		if(alarm[idx].state != 1) {
 			alarm[idx].state = 1;
 			printf("\n\nAlarm gaat nu af!\n\n");
@@ -145,15 +149,17 @@ void setState(int idx){
 				printf("ConnectToStream failed. Aborting.\n\n");
 			}
 		}
-	} else if (alarm[idx].state != 2){
+	} else if (alarm[idx].state != 2 && alarm[idx].state < 3 ){
 		alarm[idx].state = 0;
 	}
 	
-	if (compareTime(alarm[idx].time,snooze[idx].snoozeTime) >= 1){
+	//Check if alarm has to snooze
+	if (compareTime(alarm[idx].time,snooze[idx].snoozeTime) >= 1 && alarm[idx].state < 3){
 		alarm[idx].state = 2;
 	}
 	
-	if (alarm[idx].state == 1 && compareTime(ct, snooze[idx].snoozeTime) >= 1){
+	//Check if alarm has to snooze
+	if (alarm[idx].state == 1 && compareTime(ct, snooze[idx].snoozeTime) >= 1 && alarm[idx].state < 3){
 		alarm[idx].state = 2;
 		snooze[idx].snoozeTime = ct;
 		AddSnoozeMinutes(idx, alarm[idx].snooze);
@@ -161,7 +167,7 @@ void setState(int idx){
 		killPlayerThread();
 	}
 	
-	if (alarm[idx].state == 2 && compareTime(ct, snooze[idx].snoozeTime) >= 1){
+	if (alarm[idx].state == 2 && compareTime(ct, snooze[idx].snoozeTime) >= 1 && alarm[idx].state < 3){
 		if(alarm[idx].state != 1){
 			printf("Alarm komt nu uit snooze!!");
 			bool success = connectToStream(alarm[idx].ip, alarm[idx].port, alarm[idx].url);
@@ -174,6 +180,7 @@ void setState(int idx){
 		}
 		AddSnoozeMinutes(idx, 1);
 	}
+	
 }
 
 
@@ -191,6 +198,39 @@ void setAlarm(struct _tm time, char* name, char* ip, u_short port, char* url, in
 	alarm[idx].state = 0;
 }
 
+void eenmaligAlarm(struct _tm time, char* name, char* ip, u_short port, char* url, int snooze, int id, int idx){
+	alarm[idx].time = time;
+	
+	strncpy(alarm[idx].name, name, sizeof(alarm[idx].name));
+	strncpy(alarm[idx].ip, ip, sizeof(alarm[idx].ip));
+	alarm[idx].port = port;
+	strncpy(alarm[idx].url, url, sizeof(alarm[idx].url));
+
+	alarm[idx].id = id;
+	alarm[idx].state = 3;
+}
+
+
+//Checks if there is an alarm that has to go off
+void eenmaligAlarmCheck(int idx){
+	struct _tm ct;
+	X12RtcGetClock(&ct);
+	
+	//Check if alarm goes off, compares the RTC time to the alarm time
+	if (compareTime(ct, alarm[idx].time) >= 1 && alarm[idx].time.tm_year != 0 && alarm[idx].state == 3){
+		alarm[idx].state = 4;
+		snooze[idx].snoozeTime = ct;
+		AddSnoozeMinutes(idx,2);
+	}
+	
+	//Delete alarm after 30 minutes, compares the RTC time to the snooze
+	if (compareTime(ct, snooze[idx].snoozeTime) >= 1 && alarm[idx].state == 4){
+		deleteAlarm(idx);
+		LcdBackLight(LCD_BACKLIGHT_OFF);
+		killPlayerThread();
+	}
+}
+
 
 void deleteAlarm(int idx){
 	struct _tm tm;
@@ -203,10 +243,13 @@ void deleteAlarm(int idx){
 }
 
 void handleAlarm(int idx){
-	alarm[idx].state = 0;
-	alarm[idx].time.tm_mday += 1;
+	if (alarm[idx].state < 3){
+		alarm[idx].state = 0;
+		alarm[idx].time.tm_mday += 1;
+	} else if (alarm[idx].state == 4){
+		deleteAlarm(idx);
+	}
 	killPlayerThread();
-	printf("state is %d \n",alarm[idx].state);
 }
 
 int compareTime(tm t1,tm t2){

alarm.h

@@ -19,6 +19,8 @@ int checkAlarms(void);
 void setAlarm(struct _tm time, char* name, char* ip, u_short port, char* url, int snooze, int id, int idx);
 int alarmExist(int id);
 void deleteAlarm(int idx);
+void eenmaligAlarmCheck(int idx);
+void eenmaligAlarm(struct _tm time, char* name, char* ip, u_short port, char* url, int snooze, int id, int idx);
 int compareTime(tm t1, tm t2);
 void setState(int idx);
 int getState(int idx);

contentparser.c

@@ -8,13 +8,22 @@
 #include "mp3stream.h"
 #include "rtc.h"
 #include "alarm.h"
+#include "displayHandler.h"
 #include "vs10xx.h"
+#include "twitch.h"
+#include "Twitter.h"
+int streamid;
 
 void parseAlarmJson(char* content){
     int r;
-    int i;
+    int i = 2;
+	
+	int startidx = 0;
+	int charAmount = 0;
+
     int usedAlarms[maxAlarms()];
     int j;
+    
     jsmn_parser p;
     jsmntok_t token[160]; /* We expect no more than 128 tokens */
 
@@ -39,6 +48,7 @@ void parseAlarmJson(char* content){
         char url[24];
         char ip[24];
         char name[16];
+		char str2[16];
         char st = -1;
         char oo = -1;
         memset(url, 0, 24);
@@ -63,16 +73,15 @@ void parseAlarmJson(char* content){
             }else if (jsoneq(content, &token[i], "port") == 0) {
                 port = getIntegerToken(content, &token[i + 1]);
             }else if (jsoneq(content, &token[i], "ip") == 0) {
-                getStringToken(content, &token[i + 1], ip);
+                getStringToken(content, &token[i + 1], ip, 24);
             }else if (jsoneq(content, &token[i], "url") == 0) {
-                getStringToken(content, &token[i + 1], url);
+                getStringToken(content, &token[i + 1], url, 24);
             }else if (jsoneq(content, &token[i], "name") == 0) {
-                getStringToken(content, &token[i + 1], name);
+                getStringToken(content, &token[i + 1], name, 16);
             }else if (jsoneq(content, &token[i], "oo") == 0) {
                 oo = getIntegerToken(content, &token[i + 1]);
             }else if (jsoneq(content, &token[i], "st") == 0) {
                 st = getIntegerToken(content, &token[i + 1]);
-                i+=2;
             }
         }
 
@@ -83,11 +92,39 @@ void parseAlarmJson(char* content){
             printf("Alarm date is: %02d.%02d.%02d\n", time.tm_mday, (time.tm_mon + 1), (time.tm_year + 1900));
             printf("Alarm stream data is: %s:%d%s\n", ip, port, url);
             printf("Alarm id and name and st is: %d %s %d\n\n", id, name, st);
+			
+			charAmount = 0;
+			for (i = 0; i < 16;i++){
+				if (name[i] != 0){
+					charAmount = charAmount + 1;
+				}
+			}
+			
+			startidx = (8-(charAmount/2));
+			
+			charAmount = 0;
+			for(i = 0; i < 16; i++){
+				if (i >= startidx){
+					if (name[charAmount] != 0){
+						str2[i] = name[charAmount];
+					} else {
+						str2[i] = ' ';
+					}	
+					charAmount++;
+				} else {
+					str2[i] = ' ';
+				}
+			}
+			
 
             //zoek naar een vrije plaats in de alarm array
             for(j = 0; j < maxAlarms(); j++){
                 if(usedAlarms[j] == 0){ //Dit is een lege plaats, hier kunnen we ons nieuwe alarm plaatsen
-                    setAlarm(time, name, ip, port, url, st, id, j);
+					if (oo == 1){
+						eenmaligAlarm(time,str2,ip,port,url,st,id,j);
+					} else {
+						setAlarm(time, str2, ip, port, url, st, id, j);
+					}
                     usedAlarms[j] = 1;
                     j = 10;             //Uit de for loop
                 }
@@ -133,8 +170,8 @@ void parseCommandQue(char* content){
                 u_short port = getIntegerToken(content, &token[i + 9]);
                 char url[24];
                 char ip[24];
-                getStringToken(content, &token[i + 7], url);
-                getStringToken(content, &token[i + 5], ip);
+                getStringToken(content, &token[i + 7], url, 24);
+                getStringToken(content, &token[i + 5], ip, 24);
                 bool success = connectToStream(ip, port, url);
                 if (success == true){
                     play();
@@ -149,6 +186,71 @@ void parseCommandQue(char* content){
 
 void parsetimezone(char* content)
 {
-    int timezone = atoi(content);
+    int timezone = atoi(content); //parsing string to int (only works when everything is int)
     setTimeZone(timezone);
 }
+
+void parseTwitch(char* content) {
+    if (!strcmp("null", content)) {
+        printf("Nobody is streaming");
+        return;
+    }
+    int r;
+    int i;
+    jsmn_parser p;
+    jsmntok_t token[20]; /* We expect no more than 20 tokens */
+
+    jsmn_init(&p);
+    r = jsmn_parse(&p, content, strlen(content), token, sizeof(token) / sizeof(token[0]));
+    if (r <= 0) {
+        printf("Failed to parse JSON: %d \n", r);
+        return;
+    } else {
+        printf("Aantal tokens found: %d \n", r);
+    }
+
+    char name[20];
+    char title[20];
+    char game[20];
+    int date;
+    memset(name, 0, 20);
+    memset(title, 0, 20);
+    memset(game, 0, 20);
+
+    for (i = 1; i < r; i++) {
+        if (jsoneq(content, &token[i], "Name") == 0) {
+            getStringToken(content, &token[i + 1], name, 20);
+            i++;
+        }
+        else if (jsoneq(content, &token[i], "Title") == 0) {
+            getStringToken(content, &token[i + 1], title, 20);
+            i++;
+        }
+        else if (jsoneq(content, &token[i], "Game") == 0) {
+            getStringToken(content, &token[i + 1], game, 20);
+            i++;
+        }
+        else if (jsoneq(content, &token[i], "Date") == 0) {
+            date = getIntegerToken(content, &token[i + 1]);
+            i++;
+        }
+    }
+    printf("%d", date);
+    if(streamid != date)
+    {
+        strcpy(data.title, title);
+        strcpy(data.game, game);
+        strcpy(data.name, name);
+        printf("%s - %s - %s", name, title, game);
+        streamid = date;
+        setCurrentDisplay(DISPLAY_Twitch, 100);
+    }
+}
+
+void TwitterParser(char* content)
+{
+    char tweet[140];
+    memset(tweet, 0, 140);
+    strcpy(TweetFeed.tweet,content);
+    printf("%s", TweetFeed.tweet);
+}

contentparser.h

@@ -7,5 +7,6 @@
 void parseAlarmJson(char* content);
 void parseCommandQue(char* content);
 void parsetimezone(char* content);
-
+void parseTwitch(char* content);
+void TwitterParser(char* content);
 #endif //CONTENTPARSER_H

display.c

@@ -217,6 +217,10 @@ void LcdArrayLineTwo(char *data, int size){
 		LcdChar(data[i]);
 	}
 }
+char getLoop(char *text,int offset)
+{
+    return text[offset % strlen(text)];
+}
 
 void setXCursorPos(int leftRight,int count)
 {

display.h

@@ -58,6 +58,7 @@ extern void ClearLcd(void);
 extern void LcdArrayLineOne(char*, int);
 extern void LcdArrayLineTwo(char*, int);
 extern void setXCursorPos(int,int);
+extern char getLoop(char*,int);
 #endif /* _Display_H */
 /*  ����  End Of File  �������� �������������������������������������������� */
 

displayHandler.c

@@ -13,6 +13,8 @@
 #include "rtc.h"
 #include "alarm.h"
 #include "network.h"
+#include "twitch.h"
+#include "Twitter.h"
 
 struct _tm lastDisplayTime;
 viewDisplays currentViewDisplay;
@@ -41,6 +43,10 @@ void refreshScreen(){
         displayVolume();
     }else if(currentViewDisplay == DISPLAY_Alarm){
         displayAlarm(getRunningAlarmID());
+    }else if(currentViewDisplay == DISPLAY_Twitch){
+        displayTwitch(data.name, data.title, data.game);
+    }else if(currentViewDisplay == DISPLAY_Twitter){
+        displayTwitter(TweetFeed.tweet);
     }
 }
 
@@ -85,45 +91,25 @@ void displayAlarm(char idx)
         currentViewDisplay = DISPLAY_DateTime;
     }
 	int i;
-	int j;
-	int startidx;
+
     char str[16];
     struct _alarm *am = getAlarm(idx);
 
     sprintf(str, "    %02d:%02d:%02d    ", am->time.tm_hour, am->time.tm_min, am->time.tm_sec);
     (*write_display_ptr[0])(str, 16);
 
-	j = 0;
     char str2[16];
 	for (i = 0; i < 16;i++){
-		if (am->name[i] != 0){
-			j = j + 1;
-		}
+		str2[i] = am->name[i];
 	}
+		
 
-	if (j != 16){
-		startidx = (8-(j/2));
-	}
-	j = 0;
-	for(i = 0; i < 16; i++){
-		if (i >= startidx){
-			if (am->name[j] != 0){
-				str2[i] = am->name[j];
-			} else {
-				str2[i] = ' ';
-			}
-			j++;
-		} else {
-			str2[i] = ' ';
-		}
-	}
     (*write_display_ptr[1])(str2, 16);
 }
 
 void displayVolume()
 {
     u_char pos = getVolume();
-    ClearLcd();
     int i;
     LcdArrayLineOne("     Volume     ", 16);
 
@@ -131,10 +117,52 @@ void displayVolume()
 
     for(i = 0; i < 17; i++)
     {
-        characters[i] = 0xFF;
+        if(i < pos) {
+            characters[i] = 0xFF;
+        }else {
+            characters[i] = ' ';
+        }
     }
-    LcdArrayLineTwo(characters,pos);
+    LcdArrayLineTwo(characters,16);
 }
 
+void displayTwitter(char* text)
+{
+    //int lineNumber,char text[]
+    ClearLcd();
+    LcdBackLight(LCD_BACKLIGHT_ON);
+    LcdArrayLineOne("     Twitter    ", 16);
+    int j = 0;
+    int i;
+    char text1[16];
+    //char text2[140] = text;
+   // int shift = 0;
+    //char *text = "Twitter";
+    for(i = 0; i<140;i++){
+        if (text[i] != 0){
+            j++;
+        }
+    }
 
+        for(i = 0; i < 16; i++){
+            if (text[Scroller+i]!= 0) {
+                text1[i] = text[Scroller + i];
+            } else {
+                text1[i] = ' ';
+            }
+        }
+        LcdArrayLineTwo(text1,16);
+        Scroller++;
+        if (Scroller > j){
+            Scroller = 0;
+        }
+        NutDelay(500);
+}
 
+void displayTwitch(char name[], char title[], char game[])
+    {
+    ClearLcd();
+    LcdArrayLineOne(name, strlen(name));
+    LcdArrayLineTwo("Streaming", 9);
+    LcdBackLight(LCD_BACKLIGHT_ON);
+}

displayHandler.h

@@ -4,6 +4,7 @@
 
 #ifndef MUTLI_OS_BUILD_DISPLAYHANDLER_H
 #define MUTLI_OS_BUILD_DISPLAYHANDLER_H
+#include "ntp.h"
 
 #include <time.h>
 #include "alarm.h"
@@ -20,5 +21,7 @@ void refreshScreen(void);
 void displayDateTime(void);
 void displayAlarm(char idx);
 void displayVolume();
+void displayTwitter(char text[]);
+void displayTwitch(char name[], char title[], char game[]);
 
 #endif //MUTLI_OS_BUILD_DISPLAYHANDLER_H

jsmn.c

@@ -1,6 +1,7 @@
 #include "jsmn.h"
 #include <stdio.h>
 #include <string.h>
+#include <assert.h>
 
 /**
  * Allocates a fresh unused token from the token pull.
@@ -334,6 +335,12 @@ int getIntegerToken(const char *json, jsmntok_t *tok){
 /**
  * Get the value of the token in a char[] format.
  */
-void getStringToken(const char *json, jsmntok_t *tok, char *res){
-	sprintf(res, "%.*s", tok->end - tok->start, json + tok->start);
+void getStringToken(const char *json, jsmntok_t *tok, char *res, char maxlength){
+	if((tok->end - tok->start) < maxlength - 1){
+		sprintf(res, "%.*s", tok->end - tok->start, json + tok->start);
+	}else{
+		printf("ERROR: String to large! output string length: %d - Input string length: %d - String: %.*s \n", maxlength - 1, (tok->end - tok->start), tok->end - tok->start, json + tok->start);
+		res[0] = '\0';
+	};
+
 }

jsmn.h

@@ -75,7 +75,7 @@ int getIntegerToken(const char *json, jsmntok_t *tok);
 /**
  * Get the value of the token in a string format.
  */
-void getStringToken(const char *json, jsmntok_t *tok, char* res);
+void getStringToken(const char *json, jsmntok_t *tok, char* res, char maxlength);
 
 /**
  * Run JSON parser. It parses a JSON data string into and array of tokens, each describing

main.c

@@ -220,7 +220,8 @@ THREAD(AlarmSync, arg)
     }
 
     NtpSync();
-
+    int dayCounter;
+    dayCounter = 0;
     for(;;)
     {
 
@@ -231,12 +232,25 @@ THREAD(AlarmSync, arg)
             char url[49];
             sprintf(url, "/getAlarmen.php?radiomac=%s&tz=%d", getMacAdress(), getTimeZone());
             httpGet(url, parseAlarmJson);
-            isAlarmSyncing = false;
 
+            char url2[43];
+            sprintf(url2, "/getTwitch.php?radiomac=%s", getMacAdress());
+            httpGet(url2, parseTwitch);
+            char url3[43];
+            sprintf(url3,"/getTwitter.php?radiomac=%s", getMacAdress());
+            httpGet(url3,TwitterParser);
+
+            isAlarmSyncing = false;
             //Command que (Telegram) sync
             sprintf(url, "%s%s", "/getCommands.php?radiomac=", getMacAdress());
             httpGet(url, parseCommandQue);
         }
+        if(dayCounter > 28800 && (hasNetworkConnection() == true))
+        {
+            NtpSync();
+            dayCounter = 0;
+        }
+        dayCounter++;
         NutSleep(3000);
     }
     NutThreadExit();
@@ -275,12 +289,11 @@ int main(void)
 
     VsPlayerInit();
 
-     NtpInit();
+    NtpInit();
 
     NutThreadCreate("BackgroundThread", StartupInit, NULL, 1024);
     NutThreadCreate("BackgroundThread", AlarmSync, NULL, 2500);
     NutThreadCreate("BackgroundThread", AlarmCheck, NULL, 256);
-    /** Quick fix for turning off the display after 10 seconds boot */
 
 	KbInit();
 
@@ -299,7 +312,7 @@ int main(void)
 
     X12RtcGetClock(&timeCheck);
 
-    for (;;)
+ 	for (;;)
     {
         //Key detecten
         if(KbGetKey() != KEY_UNDEFINED){
@@ -323,6 +336,10 @@ int main(void)
                 }else if(KbGetKey() == KEY_UP){
                     setCurrentDisplay(DISPLAY_Volume, 5);
                     volumeUp();
+                }else if(KbGetKey() == KEY_LEFT){
+                    setCurrentDisplay(DISPLAY_Twitter,20);
+                }else{
+                    setCurrentDisplay(DISPLAY_DateTime, 5);
                 }
                 if(KbGetKey() == KEY_01){
                     setSleep();

network.c

@@ -54,7 +54,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");
 
@@ -66,7 +66,7 @@ void httpGet(char address[], void (*parser)(char*)){
     int t = 0;
 
     if(content == 0){
-        printf("Can't calloc memory\n");
+        printf("Can't malloc memory\n");
     }else if (NutTcpConnect(sock, inet_addr("62.195.226.247"), 80)) {
         printf("Can't connect to server\n");
     }else if (NutTcpSetSockOpt(sock, SO_RCVTIMEO, &rx_to, sizeof(rx_to))){
@@ -99,8 +99,8 @@ void httpGet(char address[], void (*parser)(char*)){
         content[t] = '\0';
         printf("\nContent size: %d, Content: %s \n", t, content);
         parser(content);
-        free(content);
     }
+    free(content);
     NutTcpCloseSocket(sock);
     isReceiving = false;
 }

twitch.c

@@ -0,0 +1,18 @@
+//
+// Created by aares on 30-3-2016.
+//
+
+#include "twitch.h"
+
+int streamid = 0;
+struct streamdata data;
+
+void setID(int id)
+{
+    streamid = id;
+}
+
+int getID()
+{
+    return streamid;
+}

twitch.h

@@ -0,0 +1,20 @@
+//
+// Created by aares on 30-3-2016.
+//
+
+#ifndef INTERNETRADIO_TWITCH_H
+#define INTERNETRADIO_TWITCH_H
+
+#endif //INTERNETRADIO_TWITCH_H
+
+void setID(int id);
+int getID(void);
+int streamid;
+struct streamdata data;
+
+struct streamdata
+{
+    char title[20];
+    char name[20];
+    char game[20];
+};