From ffd9778e32919f35857a234392bd737cc7c50473 Mon Sep 17 00:00:00 2001 From: John Shaver Date: Wed, 12 Dec 2018 19:28:49 -0800 Subject: [PATCH] tried to dix the nap logic --- runSchedule.js | 47 +++++++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 22 deletions(-) diff --git a/runSchedule.js b/runSchedule.js index b77427c..39c128f 100644 --- a/runSchedule.js +++ b/runSchedule.js @@ -24,7 +24,7 @@ let state = { updateColorState(); -let updateStateInterval = setInterval(updateColorState, 1000); +let updateColorStateInterval = setInterval(updateColorState, 1000); let renderInterval = setInterval(render, 50); @@ -41,27 +41,30 @@ function startNap(level, tick) { function updateColorState() { let newColor = state.color; switch(state.napTime) { - case true: - if(Date.now() < state.napEnd) { - newColor = "red"; - break; - } else { - state = { ...state, - napTime: false, - napEnd: 0, - }; - } - case false: - let time = getTime(); - let timing = timings.find(x => x.start <= time && x.end > time); - newColor = timing.color - } - if(newColor !== state.color) { - state = { ...state, - color: timing.color - }; - } - + case true: + console.log("Nap time until :", state.napEnd); + if(Date.now() < state.napEnd) { + newColor = "red"; + break; + } else { + state = { ...state, + napTime: false, + napEnd: 0, + }; + } + case false: + console.log("NO NAP!"); + let time = getTime(); + let timing = timings.find(x => x.start <= time && x.end > time); + newColor = timing.color + } + if(newColor !== state.color) { + console.log("setting color to", newcolor); + + state = { ...state, + color: newColor, + }; + } } function render() {