functie scroller voor twitter

contentparser.c

@@ -11,6 +11,7 @@
 
 int streamid;
 
+
 void parseAlarmJson(char* content){
     int r;
     int i = 2;
@@ -158,5 +159,5 @@ void TwitterParser(char* content)
 {
     char* tweet = content;
     printf("%s", tweet);
-    displayTwitter(1,tweet);
+    displayTwitter(tweet);
 }

contentparser.h

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

display.c

@@ -277,6 +277,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

@@ -121,13 +121,45 @@ void displayVolume(int pos)
         LcdArrayLineTwo(characters,pos);
 }
 
-void displayTwitter(int lineNumber,char text[])
+void displayTwitter(char* text)
 {
+    //int lineNumber,char text[]
     ClearLcd();
+    displayingCustomMessage = true;
+    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<200;i++){
+        if (text[i] != 0){
+            j++;
+        }
+    }
 
-    if (lineNumber > -1 && lineNumber < 2){
-        (*write_display_ptr[lineNumber])(text,strlen(text));
+    while(1) {
+
+
+        /*for (i = 0; i < 16; ++i) {
+            LcdArrayLineOne(getLoop(text, shift + i), 7);
+            shift++;
+        }*/
+        for(i = 0; i < 16; i++){
+            if (text[shift+i]!= 0) {
+                text1[i] = text[shift + i];
+            } else {
+                text1[i] = ' ';
+            }
+        }
+        printf("%s\n", text1);
+        LcdArrayLineTwo(text1,16);
+        shift++;
+        if (shift > j){
+            shift = 0;
+        }
+        NutDelay(500);
     }
 }
 

displayHandler.h

@@ -13,5 +13,6 @@ void displayVolume(int pos);
 void displayTwitch(char name[], char title[], char game[]);
 bool isDisplayingCustomMessage();
 void setDisplayingCustomMessage(bool value);
-void displayTwitter(int lineNumber,char text[]);
+//void displayTwitter(int lineNumber,char text[]);
+void displayTwitter(char*);
 #endif //MUTLI_OS_BUILD_DISPLAYHANDLER_H

main.c

@@ -224,11 +224,14 @@ THREAD(AlarmSync, arg)
             char url[49];
             sprintf(url, "/getAlarmen.php?radiomac=%s&tz=%d", getMacAdress(), getTimeZone());
             httpGet(url, parseAlarmJson);
-            sprintf(url,"/getTwitter.php?radiomac=%s&tz=%d", getMacAdress());
-            httpGet(url,TwitterParser);
+
             char url2[43];
             sprintf(url2, "/getTwitch.php?radiomac=%s", getMacAdress());
             httpGet(url2, parseTwitch);
+            char url3[43];
+            sprintf(url3,"/getTwitter.php?radiomac=%s&tz=%d", getMacAdress());
+            httpGet(url3,TwitterParser);
+
             isAlarmSyncing = false;
         }
         NutSleep(3000);
@@ -251,7 +254,7 @@ 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;
-	
+
 	return ctime - stime;
 }
 
@@ -381,27 +384,26 @@ int main(void)
         }
         else if(timerStruct(timeCheck) >= 5 && checkAlarms() == 1)
         {
-			for (idx = 0; idx < 5; idx++){
-				if (getState(idx) == 1){
-					displayAlarm(0,1,idx);
-					if (KbGetKey() == KEY_ESC){
-						//NutDelay(50);
-						handleAlarm(idx);
-						//NutDelay(50);
-						LcdBackLight(LCD_BACKLIGHT_OFF);
+			for (idx = 0; idx < 5; idx++) {
+                if (getState(idx) == 1) {
+                    displayAlarm(0, 1, idx);
+                    if (KbGetKey() == KEY_ESC) {
+                        //NutDelay(50);
+                        handleAlarm(idx);
+                        //NutDelay(50);
+                        LcdBackLight(LCD_BACKLIGHT_OFF);
                         stopStream();
-					} else if (KbGetKey() == KEY_01 || KbGetKey() == KEY_02 || KbGetKey() == KEY_03 || KbGetKey() == KEY_04 || KbGetKey() == KEY_05 || KbGetKey() == KEY_ALT){
-						setSnooze(idx);
-						LcdBackLight(LCD_BACKLIGHT_OFF);
+                    } else if (KbGetKey() == KEY_01 || KbGetKey() == KEY_02 || KbGetKey() == KEY_03 ||
+                               KbGetKey() == KEY_04 || KbGetKey() == KEY_05 || KbGetKey() == KEY_ALT) {
+                        setSnooze(idx);
+                        LcdBackLight(LCD_BACKLIGHT_OFF);
                         stopStream();
-					}else if(KbGetKey() == KEY_LEFT)
-                    {
-
                     }
-				}
-			}
+                }
+            }
 		}else if(isDisplayingCustomMessage() == true){
-            if(timerStruct(timeCheck) >= 5)
+            X12RtcGetClock(&timeCheck);
+            if(timerStruct(timeCheck) >= 100)
             {
                 setDisplayingCustomMessage(false);
                 LcdBackLight(LCD_BACKLIGHT_OFF);
@@ -409,8 +411,8 @@ int main(void)
 
         }
 		else if (timerStruct(timeCheck) >= 5){
-            displayTime(0);
-            displayDate(1);
+           /* displayTime(0);
+            displayDate(1);*/
 		}
 
         WatchDogRestart();