Add support for turning day counter off

Author: clockspot

arduino-nixie/arduino-nixie.ino

@@ -158,6 +158,7 @@ void ctrlEvt(byte ctrl, byte evt); //used by input
 void updateDisplay(); //used by network
 void goToFn(byte thefn); //used by network
 int dateComp(int y, byte m, byte d, byte mt, byte dt, bool countUp); //used by network
+void findFnAndPageNumbers(); //used by network
 
 //These cpp files contain code that is conditionally included
 //based on the available hardware and settings in the config file.
@@ -480,7 +481,7 @@ void ctrlEvt(byte ctrl, byte evt){
                   case 2: //save date, set direction
                     displayBlink(); //to indicate save.
                     writeEEPROM(6,fnSetVal,false);
-                    startSet(readEEPROM(4,false),0,1,3); break;
+                    startSet(readEEPROM(4,false),1,2,3); break;
                   case 3: //save date
                     displayBlink(); //to indicate save.
                     writeEEPROM(4,fnSetVal,false);
@@ -717,7 +718,7 @@ void initEEPROM(bool hard){
   if(hard || readEEPROM(0,true)>1439) writeEEPROM(0,420,true); //0-1: alarm at 7am
   //2: alarm on, handled by init
   //3: free
-  if(hard || readEEPROM(4,false)<0 || readEEPROM(4,false)>1) writeEEPROM(4,1,false); //4: day counter direction: count up...
+  if(hard || readEEPROM(4,false)<0 || readEEPROM(4,false)>2) writeEEPROM(4,2,false); //4: day counter direction: count up...
   if(hard || readEEPROM(5,false)<1 || readEEPROM(5,false)>12) writeEEPROM(5,12,false); //5: ...December...
   if(hard || readEEPROM(6,false)<1 || readEEPROM(6,false)>31) writeEEPROM(6,31,false); //6: ...31st. (This gives the day of the year)
   if(hard) writeEEPROM(7,0,false); //7: Alt function preset
@@ -736,7 +737,7 @@ void initEEPROM(bool hard){
 void findFnAndPageNumbers(){
   //Each function, and each page in a paged function, has a number. //TODO should pull from EEPROM 8
   fnDatePages = 1; //date function always has a page for the date itself
-  if(ENABLE_DATE_COUNTER){ fnDatePages++; fnDateCounter=fnDatePages-1; }
+  if(ENABLE_DATE_COUNTER && readEEPROM(4,false)){ fnDatePages++; fnDateCounter=fnDatePages-1; }
   if(ENABLE_DATE_RISESET){ fnDatePages++; fnDateSunlast=fnDatePages-1; }
   if(false){ fnDatePages++; fnDateWeathernow=fnDatePages-1; }
   if(ENABLE_DATE_RISESET){ fnDatePages++; fnDateSunnext=fnDatePages-1; }
@@ -1361,7 +1362,7 @@ void updateDisplay(){
           }
         }
         else if(fnPg==fnDateCounter){
-          editDisplay(dateComp(rtcGetYear(),rtcGetMonth(),rtcGetDate(),readEEPROM(5,false),readEEPROM(6,false),readEEPROM(4,false)),0,3,false,true);
+          editDisplay(dateComp(rtcGetYear(),rtcGetMonth(),rtcGetDate(),readEEPROM(5,false),readEEPROM(6,false),readEEPROM(4,false)-1),0,3,false,true);
           blankDisplay(4,5,true);
         }
         //The sun and weather displays are based on a snapshot of the time of day when the function display was triggered, just in case it's triggered a few seconds before a sun event (sunrise/sunset) and the "prev/now" and "next" displays fall on either side of that event, they'll both display data from before it. If triggered just before midnight, the date could change as well – not such an issue for sun, but might be for weather - TODO create date snapshot also

arduino-nixie/network.cpp

@@ -55,7 +55,6 @@ void networkStartWiFi(){
   WiFi.end(); //if AP is going, stop it
   if(wssid==F("")) return; //don't try to connect if there's no creds
   checkForWiFiStatusChange(); //just for serial logging
-  //rtcDisplayTime(false); //display time without seconds //TODO replace this with what
   blankDisplay(0,5,false); //I'm guessing if it hangs, nixies won't be able to display anyway
   //Serial.println(); Serial.print(millis()); Serial.print(F(" Attempting to connect to SSID: ")); Serial.println(wssid);
   if(wki) WiFi.begin(wssid.c_str(), wki, wpass.c_str()); //WEP - hangs while connecting
@@ -253,7 +252,6 @@ unsigned long adminInputLast = 0; //for noticing when the admin page hasn't been
 
 void networkStartAdmin(){
   adminInputLast = millis();
-  //TODO display should handle its own code for displaying a type of stuff
   if(WiFi.status()!=WL_CONNECTED){
     networkStartAP();
     tempValDispQueue[0] = 7777; //display to user
@@ -394,13 +392,12 @@ void checkClients(){
         //Function preset ???????
         //TODO leap second support? Add NTP sync at top of hour also
 
-        client.print(F("<li><label>Day counter</label><select id='b4' onchange='if(this.value==2) document.getElementById(\"daycounterdeets\").style.display=\"none\"; else document.getElementById(\"daycounterdeets\").style.display=\"inline\"; save(this)'>")); for(char i=0; i<=2; i++){ client.print(F("<option value='")); client.print(i,DEC); client.print(F("'")); if(readEEPROM(4,false)==i) client.print(F(" selected")); client.print(F(">")); switch(i){
-          case 0: client.print(F("Count days until...")); break;
-          case 1: client.print(F("Count days since...")); break; //TODO change to have 0 be disabled - may require a reset
-          case 2: client.print(F("DEMO hide controls")); break; //TODO change to have 0 be disabled - may require a reset
-          default: break; } client.print(F("</option>")); } client.print(F("</select>")); //TODO replace inline with natural state
-        
-        client.print(F("<br/><span id='daycounterdeets' style='display: inline;'><span></span><label for='b5'>Month&nbsp;</label><input type='number' id='b5' onchange='promptsave(\"b5\")' onkeyup='promptsave(\"b5\")' onblur='unpromptsave(\"b5\"); save(this)' min='1' max='12' step='1' value='")); client.print(readEEPROM(5,false),DEC); client.print(F("' />")); client.print(F(" <a id='b5save' href='#' onclick='return false' style='display: none;'>save</a>")); //Extra span is there to prevent "first" styling on the month label
+        client.print(F("<li><label>Day counter</label><select id='b4' onchange='if(this.value==0) document.getElementById(\"daycounterdeets\").style.display=\"none\"; else document.getElementById(\"daycounterdeets\").style.display=\"inline\"; save(this)'>")); for(char i=0; i<=2; i++){ client.print(F("<option value='")); client.print(i,DEC); client.print(F("'")); if(readEEPROM(4,false)==i) client.print(F(" selected")); client.print(F(">")); switch(i){
+          case 0: client.print(F("Off")); break;
+          case 1: client.print(F("Count days until...")); break;
+          case 2: client.print(F("Count days since...")); break;
+          default: break; } client.print(F("</option>")); } client.print(F("</select>"));
+          client.print(F("<br/><span id='daycounterdeets' style='display: ")); if(readEEPROM(4,false)==0) client.print(F("none")); else client.print(F("inline")); client.print(F(";'><span></span><label for='b5'>Month&nbsp;</label><input type='number' id='b5' onchange='promptsave(\"b5\")' onkeyup='promptsave(\"b5\")' onblur='unpromptsave(\"b5\"); save(this)' min='1' max='12' step='1' value='")); client.print(readEEPROM(5,false),DEC); client.print(F("' />")); client.print(F(" <a id='b5save' href='#' onclick='return false' style='display: none;'>save</a>")); //Extra span is there to prevent "first" styling on the month label
 
         client.print(F("<br/><label for='b6'>Date&nbsp;</label><input type='number' id='b6' onchange='promptsave(\"b6\")' onkeyup='promptsave(\"b6\")' onblur='unpromptsave(\"b6\"); save(this)' min='1' max='31' step='1' value='")); client.print(readEEPROM(6,false),DEC); client.print(F("' />")); client.print(F(" <a id='b6save' href='#' onclick='return false' style='display: none;'>save</a><br/></span><span class='explain'>Appears after date. Repeats annually.</span></li>")); //TODO tip count day of year and program override to display 0 as 366 //TODO when month changes, set date max, or can you? what about 2/29? it should just do 3/1 in those cases
 
@@ -707,8 +704,10 @@ void checkClients(){
           //do special stuff for some of them
           switch(key){
             case 4: case 5: case 6: //day counter
-              //in lieu of actually switching to fnIsDate, so that only this value is seen
-              tempValDispQueue[0] = dateComp(rtcGetYear(),rtcGetMonth(),rtcGetDate(), readEEPROM(5,false),readEEPROM(6,false),readEEPROM(4,false));
+              //in lieu of actually switching to fnIsDate, so that only this value is seen - compare to ino
+              if(readEEPROM(4,false)) tempValDispQueue[0] = dateComp(rtcGetYear(),rtcGetMonth(),rtcGetDate(), readEEPROM(5,false),readEEPROM(6,false),readEEPROM(4,false)-1);
+              findFnAndPageNumbers(); //to include or exclude the day counter from the calendar function
+              break;
             case 14: //utc offset
               cueNTP(); break;
             case 17: //date format