From 48d20c02a1bc7a3eba8e084bb7cc3d93697dccc2 Mon Sep 17 00:00:00 2001
From: cschwinne <dev.aircoookie@gmail.com>
Date: Thu, 31 Jan 2019 00:09:44 +0100
Subject: [PATCH] Added timed macro weekday support

---
 wled00/data/settings_time.htm | Bin 15150 -> 15012 bytes
 wled00/html_settings.h        |  30 ++++++++++--------------------
 wled00/wled00.ino             |   4 ++--
 wled00/wled02_xml.ino         |   1 +
 wled00/wled03_set.ino         |   3 +++
 wled00/wled10_ntp.ino         |  11 +++++++++--
 wled00/wled18_server.ino      |   3 +++
 7 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/wled00/data/settings_time.htm b/wled00/data/settings_time.htm
index a13c76d9d79f0555233d346f92ba68a2290fafd2..a255df04987d26816df5ce8254fc04703a861d75 100644
GIT binary patch
delta 2452
zcmb_eTWb?R6h28Im4<*KK7^ty0VOtS+u${67PL?*7+;L!p$5ri+a~5lvIz-A_7@1k
z{so_X$<OeiKSl6CU;WPPZuc@1Q=u%wW@pZvbH49<b0*)X-zHyw-POo>rc|d9ez&NE
zF`y<*s7D6%$)uwFF|oP07BgeXS5$#vmhNNnES_FFpndyG{Alqz-d|gHec9)+Tb5^*
zq765KMrRcKVrwsIn@$loLwkreB3-;s@qURsOlrf<z}z-|^DJBO`w)3fU@xzfEo|yz
z(Nu0M149!V2db@#xr$=0s+jZbEI-Qwh2guEbBvXl$WT#Y?HGx3t+D`Fq8(VY;qSS4
z=O~Bbr1SvoOtefr&ob>fiTD=jc0HZ8J|K7%BL}-2-u%sbSR(2*ljbx8<IXzs-=hY;
zNABJ+K+UOpVbOxOF?MuOk2w`ku>po5tn~&kaS?~2jLQP=xUR#Yn*e5@#Gep;Kr_do
z%Q@iTmkAg?%tHxg*q;ogCvtOudO7p}W9EX-)8l1P!?^50Iw`1rd*wMip%?#|L*>eI
z*rlgZ4k}G+7PRFHy8{|`A?OasVqtfnKo)jXvraKr$%J=%`VAM>7mB4;iYnL7(uq8w
z*U(cIK`K<n$RO26LLn^Y5jqvmzX2#da^Vy0dSm?j97FDXx9#z1&<H(NblhO`l+Uxn
zT^39^Eg{NWaJQ->SYCMUEz3KLMm|=*IdlYGpG-qE3E7fa;hx_GNCW3kN4ob!p;K0*
zV}(f$f5{wG1^sAz0WUH~b#QZphWS7-EN`+FsgF~Xf3p${t0LFow&#jEYAqsIqN!iL
ze#^t~N*y@cRD<qImn@joqAj%RBE}Xr<rOTj<8UE(hM!fHE?p!P)_%Za!f~~zB_<pD
zo?q_Ls>^E#e=R(G@K11Y<Z(;P!Wl1qTwjmf*2Il6hTIwe)<)aszZtGt7Uwr^-g#I+
zi)ldfdPqEb!uu4_gO^su{+Z0Z&q%f=@@a^R&AX@kP7w9WH@j!eH_^5e$$nP&^B2KP
BSW*B0

delta 670
zcmZ|HK}!Nb7{>8uc7#x{$U-s^#6z`6rt7X!h9DjCVy8WHv?8KIE$VLPK0@$*h0Y$@
zuj1Jc;lWdf-VurzW^OP4ndkSJ%-=p%v=+tG6S1H#=YSSYn2+#)1TT2RE8_H6Mv~t5
zGBlQjw6SxWqj7PYmZcTd-2F6D{;phCae^Tt9!)XB8Af>KX@Z!E8LBwK6W=|)Mz~{q
z%70y4;1c(I_mM{qS!7An%W{Y&wN86m9(>f$r-@sUH=8!t{rmYVs#g(G6kO4wQ6Q&&
z$orOIubO2qLtadR!9T$>2&&lyPZQb(K{dP3)&$=msAd;@O$ZEvYIY&egpNT_%`S8_
Qp=%ISvkTpgFh5`a0N_)LkpKVy

diff --git a/wled00/html_settings.h b/wled00/html_settings.h
index c5ed8dbc9..375710725 100644
--- a/wled00/html_settings.h
+++ b/wled00/html_settings.h
@@ -4,7 +4,7 @@
  
 //common CSS of settings pages
 const char PAGE_settingsCss[] PROGMEM = R"=====(
-body{font-family:var(--cFn),sans-serif;text-align:center;background:var(--cCol);color:var(--tCol);line-height:200%;margin:0;background-attachment:fixed}hr{border-color:var(--dCol);filter:drop-shadow(-5px -5px 5px var(--sCol))}button{background:var(--bCol);color:var(--tCol);font-family:var(--cFn),sans-serif;border:.3ch solid var(--bCol);display:inline-block;filter:drop-shadow(-5px -5px 5px var(--sCol));font-size:20px;margin:8px;margin-top:12px}.helpB{text-align:left;position:absolute;width:60px}input{background:var(--bCol);color:var(--tCol);font-family:var(--cFn),sans-serif;border:.5ch solid var(--bCol);filter:drop-shadow(-5px -5px 5px var(--sCol))}input[type=number]{width:4em}select{background:var(--bCol);color:var(--tCol);font-family:var(--cFn),sans-serif;border:0.5ch solid var(--bCol);filter:drop-shadow( -5px -5px 5px var(--sCol) );}</style>
+body{font-family:var(--cFn),sans-serif;text-align:center;background:var(--cCol);color:var(--tCol);line-height:200%;margin:0;background-attachment:fixed}hr{border-color:var(--dCol);filter:drop-shadow(-5px -5px 5px var(--sCol))}button{background:var(--bCol);color:var(--tCol);font-family:var(--cFn),sans-serif;border:.3ch solid var(--bCol);display:inline-block;filter:drop-shadow(-5px -5px 5px var(--sCol));font-size:20px;margin:8px;margin-top:12px}.helpB{text-align:left;position:absolute;width:60px}input{background:var(--bCol);color:var(--tCol);font-family:var(--cFn),sans-serif;border:.5ch solid var(--bCol);filter:drop-shadow(-5px -5px 5px var(--sCol))}input[type=number]{width:4em}select{background:var(--bCol);color:var(--tCol);font-family:var(--cFn),sans-serif;border:0.5ch solid var(--bCol);filter:drop-shadow( -5px -5px 5px var(--sCol) );}td{padding:2px;}</style>
 )=====";
 
 
@@ -303,13 +303,16 @@ Hue status: <span class="hms"> Internal ESP Error! </span><hr>
 const char PAGE_settings_time0[] PROGMEM = R"=====(
 <!DOCTYPE html>
 <html><head><meta name="viewport" content="width=500"><title>Time Settings</title>
-<script>function H(){window.open("https://github.com/Aircoookie/WLED/wiki/Settings#time-settings");}function B(){window.open("/settings","_self");}function S(){GetV();Cs();}function gId(s){return document.getElementById(s);}function Cs(){gId("cac").style.display="none";gId("coc").style.display="block";gId("ccc").style.display="none";if (gId("ca").selected){gId("cac").style.display="block";}if (gId("cc").selected){gId("coc").style.display="none";gId("ccc").style.display="block";}if (gId("cn").selected){gId("coc").style.display="none";}}function GetV(){var d = document;
+<script>var d=document;function H(){window.open("https://github.com/Aircoookie/WLED/wiki/Settings#time-settings");}function B(){window.open("/settings","_self");}function S(){BTa();GetV();Cs();FC();}function gId(s){return d.getElementById(s);}function Cs(){gId("cac").style.display="none";gId("coc").style.display="block";gId("ccc").style.display="none";if (gId("ca").selected){gId("cac").style.display="block";}if (gId("cc").selected){gId("coc").style.display="none";gId("ccc").style.display="block";}if (gId("cn").selected){gId("coc").style.display="none";}}
+function BTa(){var ih="<tr><th>Active</th><th>Hour</th><th>Minute</th><th>Macro</th><th>M</th><th>T</th><th>W</th><th>T</th><th>F</th><th>S</th><th>S</th></tr>";for (i=0;i<8;i++){ih+="<tr><td><input name=\"W"+i+"\" id=\"W"+i+"\" type=\"number\" style=\"display:none\"><input id=\"W"+i+"0\" type=\"checkbox\"></td><td><input name=\"H"+i+"\" type=\"number\" min=\"0\" max=\"24\"></td><td><input name=\"N"+i+"\" type=\"number\" min=\"0\" max=\"59\"></td><td><input name=\"T"+i+"\" type=\"number\" min=\"0\" max=\"16\"></td>";for (j=1;j<8;j++) ih+="<td><input id=\"W"+i+j+"\" type=\"checkbox\"></td>";}gId("TMT").innerHTML=ih;}
+function FC(){for(j=0;j<8;j++){for(i=0;i<8;i++)gId("W"+i+j).checked=gId("W"+i).value>>j&1;}}
+function Wd(){a=[0,0,0,0,0,0,0,0];for(i=0;i<8;i++){m=1;for(j=0;j<8;j++){a[i]+=gId("W"+i+j).checked*m;m*=2;}gId("W"+i).value=a[i];}}function GetV(){
 )=====";
 
 const char PAGE_settings_time1[] PROGMEM = R"=====(
 </head>
 <body onload="S()">
-<form id="form_s" name="Sf" method="post">
+<form id="form_s" name="Sf" method="post" onsubmit="Wd()">
 <div class="helpB"><button type="button" onclick="H()">?</button></div>
 <button type="button" onclick="B()">Back</button><button type="submit">Save</button><hr>
 <h2>Time setup</h2>
@@ -381,23 +384,10 @@ Alexa On/Off Macros: <input name="A0" type="number" min="0" max="16" required> <
 Button Macro: <input name="MP" type="number" min="0" max="16" required> Long Press: <input name="ML" type="number" min="0" max="16" required><br>
 Countdown-Over Macro: <input name="MC" type="number" min="0" max="16" required><br>
 Timed-Light-Over Macro: <input name="MN" type="number" min="0" max="16" required><br>
-Time-Controlled Macros (Hours/Minutes &gt; Macro):<br>
-<input name="H0" type="number" min="0" max="24"> <input name="N0" type="number" min="0" max="59">
-&gt; <input name="T0" type="number" min="0" max="16"><br>
-<input name="H1" type="number" min="0" max="24"> <input name="N1" type="number" min="0" max="59">
-&gt; <input name="T1" type="number" min="0" max="16"><br>
-<input name="H2" type="number" min="0" max="24"> <input name="N2" type="number" min="0" max="59">
-&gt; <input name="T2" type="number" min="0" max="16"><br>
-<input name="H3" type="number" min="0" max="24"> <input name="N3" type="number" min="0" max="59">
-&gt; <input name="T3" type="number" min="0" max="16"><br>
-<input name="H4" type="number" min="0" max="24"> <input name="N4" type="number" min="0" max="59">
-&gt; <input name="T4" type="number" min="0" max="16"><br>
-<input name="H5" type="number" min="0" max="24"> <input name="N5" type="number" min="0" max="59">
-&gt; <input name="T5" type="number" min="0" max="16"><br>
-<input name="H6" type="number" min="0" max="24"> <input name="N6" type="number" min="0" max="59">
-&gt; <input name="T6" type="number" min="0" max="16"><br>
-<input name="H7" type="number" min="0" max="24"> <input name="N7" type="number" min="0" max="59">
-&gt; <input name="T7" type="number" min="0" max="16"><hr>
+Time-Controlled Macros:<br>
+<div style="display: inline-block">
+<table id="TMT">
+</table></div><hr>
 <button type="button" onclick="B()">Back</button><button type="submit">Save</button>
 </form>
 </body>
diff --git a/wled00/wled00.ino b/wled00/wled00.ino
index 3627152fa..ac717af3d 100644
--- a/wled00/wled00.ino
+++ b/wled00/wled00.ino
@@ -78,7 +78,7 @@
 
 
 //version code in format yymmddb (b = daily build)
-#define VERSION 1901181
+#define VERSION 1901291
 char versionString[] = "0.8.3-dev";
 
 
@@ -343,7 +343,7 @@ byte timerHours[]   = {0,0,0,0,0,0,0,0};
 byte timerMinutes[] = {0,0,0,0,0,0,0,0};
 byte timerMacro[]   = {0,0,0,0,0,0,0,0};
 byte timerWeekday[] = {255,255,255,255,255,255,255,255}; //weekdays to activate on
-//bit pattern of arr elem: 0b11111111: sat,fri,thu,wed,tue,mon,sun,validity
+//bit pattern of arr elem: 0b11111111: sun,sat,fri,thu,wed,tue,mon,validity
 
 //blynk
 bool blynkEnabled = false;
diff --git a/wled00/wled02_xml.ino b/wled00/wled02_xml.ino
index e30048562..150388f5f 100644
--- a/wled00/wled02_xml.ino
+++ b/wled00/wled02_xml.ino
@@ -341,6 +341,7 @@ void getSettingsJS(byte subPage)
       k[0] = 'H'; sappend('v',k,timerHours[i]);
       k[0] = 'N'; sappend('v',k,timerMinutes[i]);
       k[0] = 'T'; sappend('v',k,timerMacro[i]);
+      k[0] = 'W'; sappend('v',k,timerWeekday[i]);
     }
   }
 
diff --git a/wled00/wled03_set.ino b/wled00/wled03_set.ino
index df94d563a..e76b7eff1 100644
--- a/wled00/wled03_set.ino
+++ b/wled00/wled03_set.ino
@@ -273,6 +273,9 @@ void handleSettingsSet(byte subPage)
       
       k[0] = 'T'; //macros
       timerMacro[i] = server.arg(k).toInt();
+
+      k[0] = 'W'; //weekdays
+      timerWeekday[i] = server.arg(k).toInt();
     }
   }
 
diff --git a/wled00/wled10_ntp.ino b/wled00/wled10_ntp.ino
index 31f335810..4ea2c598e 100644
--- a/wled00/wled10_ntp.ino
+++ b/wled00/wled10_ntp.ino
@@ -166,6 +166,13 @@ bool checkCountdown()
   return false;
 }
 
+byte weekdayMondayFirst()
+{
+  byte wd = weekday(local) -1;
+  if (wd == 0) wd = 7;
+  return wd;
+}
+
 void checkTimers()
 {
   if (lastTimerMinute != minute(local)) //only check once a new minute begins
@@ -176,11 +183,11 @@ void checkTimers()
       if (timerMacro[i] != 0
           && (timerHours[i] == hour(local) || timerHours[i] == 24) //if hour is set to 24, activate every hour 
           && timerMinutes[i] == minute(local)
-          && timerWeekday[i] >> weekday(local) & 0x01) //timer should activate at current day of week
+          && (timerWeekday[i] & 0x01) //timer is enabled
+          && timerWeekday[i] >> weekdayMondayFirst() & 0x01) //timer should activate at current day of week
       {
         applyMacro(timerMacro[i]);
       }
     }
   }
 }
-
diff --git a/wled00/wled18_server.ino b/wled00/wled18_server.ino
index 5f067f261..dd3024e10 100644
--- a/wled00/wled18_server.ino
+++ b/wled00/wled18_server.ino
@@ -174,6 +174,9 @@ void initServer()
     if (server.method() == HTTP_OPTIONS)
     {
       server.sendHeader("Access-Control-Allow-Origin", "*");
+      server.sendHeader("Access-Control-Max-Age", "10000");
+      server.sendHeader("Access-Control-Allow-Methods", "PUT,POST,GET,OPTIONS");
+      server.sendHeader("Access-Control-Allow-Headers", "*");
       server.send(204);
       return;
     }