A somewhat unsuccessful attempt to control display cycling with millis() polling instead of delays. It gets brightness-flickery because I think the duty cycling durations are not consistent.

Author: clockspot

sixtube_lm/sixtube_lm.ino

@@ -63,7 +63,7 @@ const byte signalType = 0; //What is the signal pin connected to?
 // 0 = Piezo. When alarm and timer go off, it will output a beep pattern with tone() for signalDur seconds.
 // 1 = Relay, signal style. Same as above, but it will simply switch the pin, for e.g. a solenoid striking a bell.
 // 2 = Relay, radio style. When alarm goes off, output will stay on for signalDur seconds (e.g. clock radio or appliance timer). When timer is running, output will stay on until timer runs down (e.g. clock radio "sleep" function) – but note that if the connected device has its own switch (see below), this will only work if the device is switched on.
-const word signalDur = 180; //Per above. Use e.g. 180 secs (3min) for signalType 0/1, 7200 secs (2hr) for signalType 2. Up to 65535 secs (just over 18 hrs).
+
 const word signalBeepDur = 500; //With signalType 0/1, "beeps" happen once per second; how long is each beep in ms?
 //Particularly when driving a solenoid with signalType 1, this should be set to a comfortable activation duration for the solenoid.
 
@@ -206,7 +206,7 @@ void setup(){
   Wire.begin();
   initOutputs();
   initInputs();
-  if(readInput(mainSel)==LOW) initEEPROM();
+  //if(readInput(mainSel)==LOW) initEEPROM(); TODO why is this firing so much
 }
 
 unsigned long pollLast = 0; //every 50ms
@@ -1032,7 +1032,8 @@ byte binOutB[4] = {6,7,8,9};
 //3 pins out to anode channel switches
 byte anodes[3] = {11,12,13};
 
-int displayLast[6]={11,11,11,11,11,11}; //What is currently being displayed. We slowly fade away from this.
+int displayIn[6]={11,11,11,11,11,11};
+int displayOut[6]={11,11,11,11,11,11};
 
 //ms
 /*
@@ -1058,14 +1059,19 @@ at 4ms per digit, 4x4x3 = 48ms
 at 3ms per digit, 3x3x3 = 27ms
 at 6ms 6x6x3 = 108ms
 */
-const char fadeDur = 6; //each multiplexed pair of digits appears for this amount of time: partly next digit, partly last digit, partly dim (if applicable)
-const char dimDur = 4; //half of fadeDur for half brightness? don't go over fadeDur-2
-char fadeNextDur = 0; //Fading in displayNext values --TODO put back at 0
-char fadeLastDur = 6; //Fading out displayLast values
+
+/*
+I'm thinking this can't be done with ms polling, because at 6ms it's flickery enough to see it, and at 4ms it's not, because if we use polling, the actual lighting durations may not be as consistent as they need to be, mils() are not precise enough.  durations may not necessarily be the same every time, but I don't think the durations are the same every time. So the alternative is to use delay() 
+*/
+
+const int fadeDur = 4; //each multiplexed pair of digits appears for this amount of time: partly next digit, partly last digit, partly dim (if applicable)
+const int dimDur = 2; //half of fadeDur for half brightness? don't go over fadeDur-2
+int fadeNextDur = 0; //Fading in displayNext values
+int fadeLastDur = 0; //Fading out displayOut values
 unsigned long fadeStartLast = 0; //when the last digit fade was started
 byte cycleStage = 0; //Which stage of the multiplexing cycle we're in
 unsigned long cycleLast = 0; //when the last stage was started
-char cycleDelay = 0; //how long until the next stage starts - set from fadeNextDur and fadeLastDur
+int cycleDelay = 0; //how long until the next stage starts - set from fadeNextDur and fadeLastDur
 unsigned long setStartLast = 0; //to control flashing during start
 
 word outputCounter = 0;
@@ -1077,96 +1083,18 @@ void initOutputs() {
 }
 
 void cycleDisplay(){
+  unsigned long mics = micros();
   unsigned long mils = millis();
 
-  //Other display code decides whether we should dim per function or time of day
-  bool dim = (displayDim==1?1:0);
-  //But if we're setting, decide here to dim for every other 500ms since we started setting
-  if(fnSetPg>0) {
-    if(setStartLast==0) setStartLast = mils;
-    dim = 1-(((mils-setStartLast)/500)%2);
-  } else {
-    if(setStartLast>0) setStartLast=0;
+  if(mics < cycleLast) { //because mics will overflow every 70 mins
+    cycleLast = 0;
+    //need some more elegant stuff here with fadeStartLast
   }
-  
-  // Loop thru and update all the arrays, and fades.
-  fadeLastDur = fadeDur-(dim?dimDur:0); //default value
-  if(readEEPROM(20,false)==0) { //fading disabled
-    for(byte i=0; i<6; i++) if(displayNext[i] != displayLast[i]) displayLast[i] = displayNext[i];
-  } else { //fading enabled
-    if(fadeStartLast==0) { //not fading - time to fade?
-      for(byte i=0; i<6; i++) if(displayNext[i] != displayLast[i]) { fadeStartLast = mils; break; }
-    }
-    if(fadeStartLast!=0) { //currently fading
-      fadeNextDur = (((mils-fadeStartLast)*(fadeDur-(dim?dimDur:0)-1))/(readEEPROM(20,false)*10))+1; //partial based on time since fadeStatLast and EEPROM overall digit fade setting
-      fadeLastDur = fadeDur - fadeNextDur;
-      if(fadeNextDur >= fadeDur) { //fade is over
-        fadeStartLast = 0;
-        fadeNextDur = 0;
-        fadeLastDur = fadeDur;
-        for(byte j=0; j<6; j++) displayLast[j] = displayNext[j];
-      } //end fade is over
-    } //end curently fading
-  } //end fading enabled
-  
-  if(displayDim>0) { //if other display code says to shut off entirely, skip this part
-    //Anode channel 0: tubes #2 (min x10) and #5 (sec x1)
-    setCathodes(displayLast[2],displayLast[5]); //Via d2b decoder chip, set cathodes to old digits
-    digitalWrite(anodes[0], HIGH); //Turn on tubes
-    delay(fadeLastDur-(dim?dimDur:0)); //Display for fade-out cycles
-    setCathodes(displayNext[2],displayNext[5]); //Switch cathodes to new digits
-    delay(fadeNextDur-(dim?dimDur:0)); //Display for fade-in cycles
-    digitalWrite(anodes[0], LOW); //Turn off tubes
-  
-    if(dim) delay(dimDur);
-  
-    //Anode channel 1: tubes #4 (sec x10) and #1 (hour x1)
-    setCathodes(displayLast[4],displayLast[1]);
-    digitalWrite(anodes[1], HIGH);
-    delay(fadeLastDur);
-    setCathodes(displayNext[4],displayNext[1]);
-    delay(fadeNextDur);
-    digitalWrite(anodes[1], LOW);
-  
-    if(dim) delay(dimDur);
-  
-    //Anode channel 2: tubes #0 (hour x10) and #3 (min x1)
-    setCathodes(displayLast[0],displayLast[3]);
-    digitalWrite(anodes[2], HIGH);
-    delay(fadeLastDur);
-    setCathodes(displayNext[0],displayNext[3]);
-    delay(fadeNextDur);
-    digitalWrite(anodes[2], LOW);
-  
-    if(dim) delay(dimDur);
-  } //end if displayDim>0
-  
-  
-  
-  // if(outputCounter<20) {
-  //   Serial.print(fadeStartLast,DEC);
-  //   Serial.print(F(" "));
-  //   Serial.print(fadeLastDur,DEC);
-  //   Serial.print(F(" "));
-  //   Serial.print(fadeNextDur,DEC);
-  //   Serial.print(F(" "));
-  //   for(byte k=0; k<6; k++) { Serial.print(displayLast[k]); Serial.print(F(",")); }
-  //   Serial.print(F(" "));
-  //   for(byte l=0; l<6; l++) { Serial.print(displayNext[l]); Serial.print(F(",")); }
-  //   Serial.println();
-  //   outputCounter++;
-  // }
-  
-} //end cycleDisplay()
-
-void cycleDisplayNew(){
-  unsigned long mils = millis();
-  
-  if(cycleLast < mils+cycleDelay) {
-    cycleLast = mils;
+  if(cycleLast+cycleDelay < mics) {
+    cycleLast = mics;
 
     //Other display code decides whether we should dim per function or time of day
-    bool dim = (displayDim==1?1:0);
+    bool dim = 0; //(displayDim==1?1:0); TODO undo
     //But if we're setting, decide here to dim for every other 500ms since we started setting
     if(fnSetPg>0) {
       if(setStartLast==0) setStartLast = mils;
@@ -1177,65 +1105,82 @@ void cycleDisplayNew(){
 
     if(displayDim>0) { //if other display code says to shut off entirely, skip this part
 
+      int fadeFullDur = 0; //readEEPROM(20,false)*10; //50 becomes 500. TODO can you cancel the fade when a change is made?
+    
       switch(cycleStage){
         case 0: //off and delay for dim, if applicable - also shift the delays
           cycleStage++;
           digitalWrite(anodes[2], LOW);
-          if(readEEPROM(20,false)>0) { //if fade enabled
+          for(byte a=0; a<6; a++) displayIn[a] = displayNext[a];
+          if(fadeFullDur>0) { //if fade enabled
             if(fadeStartLast==0) { //If we've completely faded, check to see if new differs from old, then initiate a new fade
-              for(byte i=0; i<6; i++) if(displayNext[i] != displayLast[i]) { fadeStartLast = mils; break; }
+              for(byte i=0; i<6; i++) if(displayIn[i] != displayOut[i]) { fadeStartLast = mils; break; }
             }
             if(fadeStartLast!=0) { //If we're working on fading
-              fadeNextDur = ((mils-fadeStartLast*(fadeDur-(dim?dimDur:0)-1))/(readEEPROM(20,false)*10))+1; //partial based on time since fadeStatLast and EEPROM overall digit fade setting
-              if(fadeNextDur >= fadeDur) { fadeNextDur = fadeDur; fadeStartLast = 0; for(byte j=0; j<6; j++) displayLast[j] = displayNext[j]; } //end of the fade
+                        // ( (diff*(6-1)) / 200 )+1 = 1;
+              fadeNextDur = ( ((mils-fadeStartLast)*(fadeDur-(dim?dimDur:0)-1)) / fadeFullDur )+1;
+              //partial based on time since fadeStatLast and EEPROM overall digit fade setting
+              if(fadeNextDur >= fadeDur) { fadeNextDur = fadeDur; fadeStartLast = 0; for(byte j=0; j<6; j++) displayOut[j] = displayIn[j]; } //end of the fade
               fadeLastDur = fadeDur-(dim?dimDur:0)-fadeNextDur; if(fadeLastDur > fadeDur) fadeLastDur = 0; //just in case it loops around (does this happen?)
             }
-          } else { //no fade - we don't care about any of the last stuff, always go straight to next
+          } else { //no fade - we don't care about any of the fadeLast stuff, always go straight to next
             fadeNextDur = fadeDur-(dim?dimDur:0);
           }
           if(dim) { cycleDelay = dimDur; break; } //otherwise continue
         case 1: //Anode channel 0: tubes #2 (min x10) and #5 (sec x1), outgoing digits on
           cycleStage++;
-          setCathodes(displayLast[2],displayLast[5]); //Via d2b decoder chip, set cathodes to old digits
+          setCathodes(displayOut[2],displayOut[5]); //Via d2b decoder chip, set cathodes to old digits
           digitalWrite(anodes[0], HIGH); //Turn on tubes
-          if(fadeLastDur>0) { cycleDelay = fadeLastDur; break; } //Display for fade-out cycles, if applicable //(displayLastFade[0]/(dim?4:1))
+          if(fadeLastDur>0) { cycleDelay = fadeLastDur; break; } //Display for fade-out cycles, if applicable //(displayOutFade[0]/(dim?4:1))
         case 2: //incoming digits on
           cycleStage++; 
-          setCathodes(displayNext[2],displayNext[5]); //Switch cathodes to new digits
+          setCathodes(displayIn[2],displayIn[5]); //Switch cathodes to new digits
           cycleDelay = fadeNextDur; break; //Display for fade-in cycles
         case 3: //off and pause for dim
           cycleStage++;
           digitalWrite(anodes[0], LOW); //Turn off tubes
           if(dim) { cycleDelay = dimDur; break; } //otherwise continue
-        case 4: //Anode channel 1: tubes #4 (sec x10) and #1 (hour x1), outgoing digits on
+        case 4: //Anode channel 1: tubes #1 (hour x1) and #4 (sec x10), outgoing digits on
           cycleStage++; 
-          setCathodes(displayLast[4],displayLast[1]);
+          setCathodes(displayOut[4],displayOut[1]);
           digitalWrite(anodes[1], HIGH);
           if(fadeLastDur>0) { cycleDelay = fadeLastDur; break; }
         case 5: //incoming digits on
           cycleStage++; 
-          setCathodes(displayNext[4],displayNext[1]);
+          setCathodes(displayIn[4],displayIn[1]);
           cycleDelay = fadeNextDur; break;
         case 6: //off and pause for dim
           cycleStage++;
           digitalWrite(anodes[1], LOW);
           if(dim) { cycleDelay = dimDur; break; } //otherwise continue
         case 7: //Anode channel 2: tubes #0 (hour x10) and #3 (min x1), outgoing digits on
           cycleStage++; 
-          setCathodes(displayLast[0],displayLast[3]);
+          setCathodes(displayOut[0],displayOut[3]);
           digitalWrite(anodes[2], HIGH);
           if(fadeLastDur>0) { cycleDelay = fadeLastDur; break; }
         case 8: //incoming digits on
           cycleStage=0;
-          setCathodes(displayNext[0],displayNext[3]);
+          setCathodes(displayIn[0],displayIn[3]);
           cycleDelay = fadeNextDur; break;
         default: break;
       } //end switch(cycleStage)
+      
+      // if(outputCounter < 50) {
+      //   outputCounter++;
+      //   Serial.print(outputCounter,DEC);
+      //   Serial.print(F(" "));
+      //   Serial.print(cycleLast,DEC);
+      //   Serial.print(F(" "));
+      //   Serial.print(cycleStage,DEC);
+      //   Serial.print(F(" "));
+      //   Serial.print(cycleDelay,DEC);
+      //   Serial.println();
+      // }
 
     } //end if displayDim>0
     else if(fadeLastDur>0) { //if we've just shut off the display in the middle of a fade (does this ever happen?), set things up for when display comes back
       fadeLastDur = 0; //force a full fade in to the new value...
-      for(byte k=0; k<6; k++) { displayLast[k] = 0; } //...from a blank display
+      for(byte k=0; k<6; k++) { displayOut[k] = 0; } //...from a blank display
     } //end if fadeLastDur>0
 
   } //end cycleLast cycle