millis() rollover fixes; reintroduce anti-poisoning options

README.md

@@ -53,7 +53,7 @@ Later UNDBs (v8 with mods, or v9+) are equipped with controllable LEDs, as well
 | 6 | Auto DST | Add 1h for daylight saving time between these dates (at 2am):<br/>0 = off<br/>1 = second Sunday in March to first Sunday in November (US/CA)<br/>2 = last Sunday in March to last Sunday in October (UK/EU)<br/>3 = first Sunday in April to last Sunday in October (MX)<br/>4 = last Sunday in September to first Sunday in April (NZ)<br/>5 = first Sunday in October to first Sunday in April (AU)<br/>6 = third Sunday in October to third Sunday in February (BZ) |
 | 7 | LED behavior | 0 = always off<br/>1 = always on<br/>2 = on, but follow night/away modes if enabled<br/>3 = off, but on when alarm/timer sounds</br>4 = off, but on with switched relay (if equipped)<br/>(Clocks with LED control only, UNDB v8+) |
 | 8 | Temperature format | 0 = Celsius<br/>1 = Fahrenheit<br/>(Clocks with temperature function enabled only) |
-| 9 | Anti-cathode poisoning | Briefly cycles all digits to prevent [cathode poisoning](http://www.tube-tester.com/sites/nixie/different/cathode%20poisoning/cathode-poisoning.htm) |
+| 9 | Anti-cathode poisoning | Briefly cycles all digits to prevent [cathode poisoning](http://www.tube-tester.com/sites/nixie/different/cathode%20poisoning/cathode-poisoning.htm)<br/>0 = once a day, at "Night ends at" time (or alarm time if applicable)<br/>1 = at midnight<br/>2 = at the top of every hour<br/>3 = at the top of every minute |
 |  | **Alarm** |  |
 | 10 | Alarm days | 0 = every day<br/>1 = work week only (per settings below)<br/>2 = weekend only |
 | 11 | Alarm signal | 0 = beeper<br/>1 = relay (if in switch mode, will stay on for 2 hours)<br/>(Clocks with both beeper and relay only) |

sixtube_lm/configs/v8c-6tube-relayswitch-pwm-top.h

@@ -1,4 +1,4 @@
-//v8 with B style modification, and flipped Sel and Alt buttons so Sel is in the front when buttons are mounted display-side with IN-8-A display
+//v8 with C style modification and flipped Sel and Alt buttons so Sel is in the front when buttons are mounted display-side with IN-8-A display
 
 const byte displaySize = 6; //number of tubes in display module. Small display adjustments are made for 4-tube clocks
 

sixtube_lm/configs/v8c-6tube-relayswitch-pwm.h

@@ -0,0 +1,94 @@
+//v8 with C style modification
+
+const byte displaySize = 6; //number of tubes in display module. Small display adjustments are made for 4-tube clocks
+
+// available clock functions, and unique IDs (between 0 and 200)
+const byte fnIsTime = 0;
+const byte fnIsDate = 1;
+const byte fnIsAlarm = 2;
+const byte fnIsTimer = 3;
+const byte fnIsDayCount = 4;
+const byte fnIsTemp = 5;
+const byte fnIsTubeTester = 6; //cycles all digits on all tubes 1/second, similar to anti-cathode-poisoning cleaner
+// functions enabled in this clock, in their display order. Only fnIsTime is required
+const byte fnsEnabled[] = {fnIsTime, fnIsDate, fnIsAlarm, fnIsTimer, fnIsDayCount}; //, fnIsTemp, fnIsTubeTester
+// To control which of these display persistently vs. switch back to Time after a few seconds, search "Temporary-display mode timeout"
+
+// These are the RLB board connections to Arduino analog input pins.
+// S1/PL13 = Reset
+// S2/PL5 = A1
+// S3/PL6 = A0
+// S4/PL7 = A6
+// S5/PL8 = A3
+// S6/PL9 = A2
+// S7/PL14 = A7
+// A6-A7 are analog-only pins that aren't quite as responsive and require a physical pullup resistor (1K to +5V), and can't be used with rotary encoders because they don't support pin change interrupts.
+
+// What input is associated with each control?
+const byte mainSel = A6;
+const byte mainAdjUp = A0;
+const byte mainAdjDn = A1;
+const byte altSel = A7; //if not equipped, set to 0
+
+// What type of adj controls are equipped?
+// 1 = momentary buttons. 2 = quadrature rotary encoder.
+const byte mainAdjType = 1;
+
+//What are the signal pin(s) connected to?
+const char piezoPin = 10;
+const char relayPin = A3;
+// -1 to disable feature (no relay item equipped); A3 if equipped (UNDB v8)
+const byte relayMode = 0; //If relay is equipped, what does it do?
+// 0 = switched mode: the relay will be switched to control an appliance like a radio or light fixture. If used with timer, it will switch on while timer is running (like a "sleep" function). If used with alarm, it will switch on when alarm trips; specify duration of this in switchDur.
+// 1 = pulsed mode: the relay will be pulsed, like the beeper is, to control an intermittent signaling device like a solenoid or indicator lamp. Specify pulse duration in relayPulse.
+const word signalDur = 180; //sec - when pulsed signal is going, pulses are sent once/sec for this period (e.g. 180 = 3min)
+const word switchDur = 7200; //sec - when alarm triggers switched relay, it's switched on for this period (e.g. 7200 = 2hr)
+const word piezoPulse = 500; //ms - used with piezo via tone()
+const word relayPulse = 200; //ms - used with pulsed relay
+
+//Soft power switches
+const byte enableSoftAlarmSwitch = 1;
+// 1 = yes. Alarm can be switched on and off when clock is displaying the alarm time (fnIsAlarm).
+// 0 = no. Alarm will be permanently on. Use with switched relay if the appliance has its own switch on this relay circuit.
+const byte enableSoftPowerSwitch = 1; //works with switched relay only
+// 1 = yes. Relay can be switched on and off directly when clock is displaying time of day (fnIsTime). This is useful if  connecting an appliance (e.g. radio) that doesn't have its own switch, or if replacing the clock unit in a clock radio where the clock does all the switching (e.g. Telechron).
+// 0 = no. Use if the connected appliance has its own power switch (independent of this relay circuit) or does not need to be manually switched.
+
+//LED circuit control with PWM
+const char ledPin = 9;
+// -1 to disable feature; 11 if equipped (UNDB v8 modded)
+
+//When display is dim/off, a press will light the tubes for how long?
+const byte unoffDur = 10; //sec
+
+// How long (in ms) are the button hold durations?
+const word btnShortHold = 1000; //for setting the displayed feataure
+const word btnLongHold = 3000; //for for entering options menu
+const byte velThreshold = 150; //ms
+// When an adj up/down input (btn or rot) follows another in less than this time, value will change more (10 vs 1).
+// Recommend ~150 for rotaries. If you want to use this feature with buttons, extend to ~400.
+
+// What is the "frame rate" of the tube cleaning and display scrolling? up to 65535 ms
+const word cleanSpeed = 200; //ms
+const word scrollSpeed = 100; //ms - e.g. scroll-in-and-out date at :30 - to give the illusion of a slow scroll that doesn't pause, use (timeoutTempFn*1000)/(displaySize+1) - e.g. 714 for displaySize=6 and timeoutTempFn=5
+
+// What are the timeouts for setting and temporarily-displayed functions? up to 65535 sec
+const unsigned long timeoutSet = 120; //sec
+const unsigned long timeoutTempFn = 5; //sec
+
+//This clock is 2x3 multiplexed: two tubes powered at a time.
+//The anode channel determines which two tubes are powered,
+//and the two SN74141 cathode driver chips determine which digits are lit.
+//4 pins out to each SN74141, representing a binary number with values [1,2,4,8]
+const char outA1 = 2;
+const char outA2 = 3;
+const char outA3 = 4;
+const char outA4 = 5;
+const char outB1 = 6;
+const char outB2 = 7;
+const char outB3 = 8;
+const char outB4 = 16; //A2 - was 9 before PWM fix pt2
+//3 pins out to anode channel switches
+const char anode1 = 11;
+const char anode2 = 12;
+const char anode3 = 13;