commit

alarm.c

@@ -138,6 +138,7 @@ void setState(int idx){
 		snooze[idx].snoozeTime = ct;
 		AddSnoozeMinutes(idx, alarm[idx].snooze);
 		LcdBackLight(LCD_BACKLIGHT_OFF);
+		stopStream();
 	}
 	
 	if (alarm[idx].state == 2 && compareTime(ct, snooze[idx].snoozeTime) >= 1){

httpstream.c

@@ -52,6 +52,7 @@ void playStream(char *ipaddr, u_short port, char *radiourl){
     if(isStreaming != true){
         isStreaming = true;
         ConnectStation(sock, inet_addr(ipaddr), port, radiourl, &metaint);
+        VsPlayerKick();
         NutThreadCreate("Stream", Stream, NULL, 1024);
     }
 }

main.c

@@ -271,7 +271,7 @@ int checkOffPressed(){
 int main(void)
 {
 	initialized = 0;
-    int VOL2;
+    int VOL2 = 127;
     struct _tm timeCheck;
 	struct _tm start;
 	int idx = 0;
@@ -361,7 +361,7 @@ int main(void)
              X12RtcGetClock(&timeCheck);
             if(VOL > 8){
                 VOL -= 8;
-                VsSetVolume (128-VOL, 128-VOL);
+                VsSetVolume (127-VOL, 127-VOL);
                 displayVolume(VOL/8);
             }
         }

network.c

@@ -50,6 +50,7 @@ char* getMacAdress(){
 }
 
 char* httpGet(char address[]){
+    u_long rx_to = 3000;
     isReceiving = true;
     printf("\n\n #-- HTTP get -- #\n");
 
@@ -64,6 +65,8 @@ char* httpGet(char address[]){
         printf("Can't calloc 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))){
+
     }else{
         FILE *stream;
         stream = _fdopen((int) sock, "r+b");

vs10xx.c

@@ -787,6 +787,12 @@ u_short VsMemoryTest(void)
 int VsSetVolume(u_char left, u_char right)
 {
     u_char ief;
+    if(left < 0){
+        left = 0;
+    }
+    if(right < 0){
+        right = 0;
+    }
 
     ief = VsPlayerInterrupts(0);