MalekSediqi 9 rokov pred
rodič
commit
8410629c53
6 zmenil súbory, kde vykonal 26 pridanie a 4 odobranie
  1. 8 1
      contentparser.c
  2. 1 0
      contentparser.h
  3. 10 0
      displayHandler.c
  4. 1 1
      displayHandler.h
  5. 5 1
      main.c
  6. 1 1
      vs10xx.c

+ 8 - 1
contentparser.c

@@ -7,7 +7,7 @@
 #include "jsmn.h"
 #include "rtc.h"
 #include "alarm.h"
-
+#include "displayHandler.h"
 void parseAlarmJson(char* content){
     int r;
     int i;
@@ -115,3 +115,10 @@ void parsetimezone(char* content)
     int timezone = atoi(content);
     printf("%d", timezone);
 }
+
+void TwitterParser(char* content)
+{
+    char tweet = atoi(content);
+    printf("%d", tweet);
+    displayTwitter(1,tweet);
+}

+ 1 - 0
contentparser.h

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

+ 10 - 0
displayHandler.c

@@ -119,5 +119,15 @@ void displayVolume(int pos)
         LcdArrayLineTwo(characters,pos);
 }
 
+void displayTwitter(int lineNumber,char text[])
+{
+    ClearLcd();
+    int i;
+
+    if (lineNumber > -1 && lineNumber < 2){
+        (*write_display_ptr[lineNumber])(text,strlen(text));
+    }
+}
+
 
 

+ 1 - 1
displayHandler.h

@@ -9,5 +9,5 @@ void displayTime(int);
 void displayDate(int);
 void displayAlarm(int line_number, int line_numberTwo, int idx);
 void displayVolume(int pos);
-
+void displayTwitter(int lineNumber,char text[]);
 #endif //MUTLI_OS_BUILD_DISPLAYHANDLER_H

+ 5 - 1
main.c

@@ -229,7 +229,9 @@ THREAD(AlarmSync, arg)
             isAlarmSyncing = 1;
             char url[43];
             sprintf(url, "%s%s", "/getAlarmen.php?radiomac=", getMacAdress());
+            sprintf(url, "%s%s", "/getTwitter.php", getMacAdress());
             httpGet(url, parseAlarmJson);
+            httpGet(url2,TwitterParser);
             isAlarmSyncing = 0;
         }
         NutSleep(3000);
@@ -389,7 +391,9 @@ int main(void)
 						setSnooze(idx);
 						LcdBackLight(LCD_BACKLIGHT_OFF);
                         stopStream();
-					}
+					}else if(KbGetKey() == KEY_LEFT)
+                    {
+                    }
 				}
 			}
 		}

+ 1 - 1
vs10xx.c

@@ -505,7 +505,7 @@ int VsPlayerKick(void)
          *  for the VS1003 we need an extra reset
          *  here before we start playing a stream...
          */
-        VsPlayerSetMode(VS_SM_RESET);
+         VsPlayerSetMode(VS_SM_RESET);
 //        NutDelay(10);
 //        LogMsg_P(LOG_DEBUG,PSTR("Kick: CLOCKF = [0x%02X]"),VsRegRead(VS_CLOCKF_REG));
 //        LogMsg_P(LOG_DEBUG,PSTR("Kick: CLOCKF = [0x%02X]"),VsRegRead(VS_CLOCKF_REG));