sandriek 9 年之前
父节点
当前提交
b6f51974e6
共有 2 个文件被更改,包括 8 次插入4 次删除
  1. 4 2
      gotosleep.c
  2. 4 2
      main.c

+ 4 - 2
gotosleep.c

@@ -22,14 +22,16 @@ void setSleep()
 	fallSleep.sleepTime = count;
 	fallSleep.sleepTime.tm_hour += 1;
 	playStream("62.195.226.247",80,"/test.mp3");
-
 	return 1;
 }
 void checkSleep()
 {
 	X12RtcGetClock(&count);
-	if(compareTime(count, fallSleep.sleepTime) >= 4){
+	if(compareTime(count, fallSleep.sleepTime) == 6){
 		stopStream();
 	}
+	if(compareTime(count, fallSleep.sleepTime) == 4){
+		/*change volume 1 of 2 naar beneden per minuut zodat hij langzaam zachter gaat*/
+	}
 	return 1;
 }

+ 4 - 2
main.c

@@ -377,12 +377,14 @@ int main(void)
 		else if(KbGetKey() == KEY_LEFT /*the key I can use or you guys want to use, for now KEY_LEFT*/)
         {
             NutSleep(150);
+			VOL = 40;
+			VsSetVolume(128-VOL, 128-VOL);
             X12RtcGetClock(&timeCheck);
             setSleep();
         }
         else if(timerStruct(timeCheck) >= 5 && checkAlarms() == 1)
         {
-			checkSleep();
+
 			for (idx = 0; idx < 5; idx++){
 				if (getState(idx) == 1){
 					displayAlarm(0,1,idx);
@@ -404,7 +406,7 @@ int main(void)
             displayTime(0);
             displayDate(1);
 		}
-
+		checkSleep();
         VOL2 = VOL;
         WatchDogRestart();
     }