Merge branch 'Twitch' of https://github.com/jancoow/InternetRadio into Twitch

displayHandler.c

@@ -126,7 +126,6 @@ void displayAlarm(char idx)
 void displayVolume()
 {
     u_char pos = getVolume();
-    ClearLcd();
     int i;
     LcdArrayLineOne("     Volume     ", 16);
 
@@ -134,9 +133,13 @@ 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(int lineNumber,char text[])

main.c

@@ -326,6 +326,8 @@ int main(void)
                 }else if(KbGetKey() == KEY_UP){
                     setCurrentDisplay(DISPLAY_Volume, 5);
                     volumeUp();
+                }else{
+                    setCurrentDisplay(DISPLAY_DateTime, 5);
                 }
             }
         }

network.c

@@ -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;
 }