fixing errors

gotosleep.c

@@ -9,63 +9,70 @@
 #include "rtc.h"
 #include "alarm.h"
 #include "display.h"
-#include "httpstream.h"
 #include "mp3stream.h"
 #include "gotosleep.h"
-struct _fallSleep
-{
-	struct _tm sleepTime;
-};
+
+struct _tm sleepTime;
 struct _tm count;
 int i = 1;
 int x = 0;
+bool sleepOn = false;
 void setSleep(void)
 {
+	if (sleepOn == true)
+	{
+			killPlayerThread();
+			sleepOn = false;
+	}
+	else{
 	X12RtcGetClock(&count);
-	fallSleep.sleepTime = count;
+	sleepTime = count;
 	AddMinutes(60);
 	
 	changeChanel();
-	x = fallSleep.sleepTime.tm_min;
-	
-	return 1;
+	x = sleepTime.tm_min;
+	sleepOn = true;
+	}
 }
 void AddMinutes(int minutes){
-	if (fallSleep.sleepTime.tm_min + minutes >= 60){ //Checks if minutes is >= 60 else minute
-		fallSleep.sleepTime.tm_hour += 1;
-		fallSleep.sleepTime.tm_min = ((snooze[idx].snoozeTime.tm_min + minutes) % 60);
-		if (fallSleep.sleepTime.tm_hour >= 24){ //Checks if hours is >= 24
-			fallSleep.sleepTime.tm_hour = 0;
-			if ((fallSleep.sleepTime.tm_mday + 1) <= daysInMonth((fallSleep.sleepTime..tm_mon+1), (fallSleep.sleepTime.tm_year+1900))){ //Checks if day+1 smaller or even is to the amount of days in the month
-				fallSleep.sleepTime.tm_mday += 1;
+	if (sleepTime.tm_min + minutes >= 60){ //Checks if minutes is >= 60 else minute
+		sleepTime.tm_hour += 1;
+		sleepTime.tm_min = ((sleepTime.tm_min + minutes) % 60);
+		if (sleepTime.tm_hour >= 24){ //Checks if hours is >= 24
+			sleepTime.tm_hour = 0;
+			if ((sleepTime.tm_mday + 1) <= daysInMonth((sleepTime.tm_mon+1), (sleepTime.tm_year+1900))){ //Checks if day+1 smaller or even is to the amount of days in the month
+				sleepTime.tm_mday += 1;
 			} else { //If the days+1 is bigger than the amount of days in the month, day = 1 & month is + 1
-				fallSleep.sleepTime.tm_mday = 1;
-				if (fallSleep.sleepTime.tm_mon + 1 > 11){//If month+1 is bigger than 11 (month is 0-11) then month = 0 & year + 1
-					fallSleep.sleepTime.tm_mon = 0;
-					fallSleep.sleepTime.tm_year += 1;
+				sleepTime.tm_mday = 1;
+				if (sleepTime.tm_mon + 1 > 11){//If month+1 is bigger than 11 (month is 0-11) then month = 0 & year + 1
+					sleepTime.tm_mon = 0;
+					sleepTime.tm_year += 1;
 				} else {
-					fallSleep.sleepTime.tm_mon += 1;
+					sleepTime.tm_mon += 1;
 				}
 			}
 		}
 	} else {
-		fallSleep.sleepTime.tm_min += minutes;
+		sleepTime.tm_min += minutes;
 	}
 }
 void checkSleep(void)
 {
+	if(sleepOn == true){
 	X12RtcGetClock(&count);
-	if(compareTime(count, fallSleep.sleepTime) == 0){
-		killPlayerThread(); 
+	if(compareTime(count, sleepTime) == 0){
+		killPlayerThread();	
+		sleepOn = false;
 	}
-	if(compareTime(count, fallSleep.sleepTime) == 5 && fallSleep.sleepTime.tm_min == x){
+	if(compareTime(count, sleepTime) == 5 && sleepTime.tm_min == x){
 		volumeDown();
 		if (x >= 60){
 			x = 0;
 		}
 		x += 2;
 	}
-	return 1;
+	}
+
 }
 void changeChanel(void){
 	
@@ -83,9 +90,9 @@ void changeChanel(void){
    case 2  :
 	  killPlayerThread(); 
       connectToStream("62.195.226.247",80,"/test2.mp3");
-	  play()
+	  play();
 	  i++;
       break;
 }
-return 1;
+
 }

main.c

@@ -322,8 +322,6 @@ int main(void)
 		else if(KbGetKey() == KEY_LEFT)
         {
             NutSleep(150);
-			VOL = 20;
-			VsSetVolume(128-VOL, 128-VOL);
             X12RtcGetClock(&timeCheck);
             setSleep();
         }