v8a and v8b isolated tests; mods to code for v8a and v8b (untested)

clockspot · clockspot · commit 6ba149d0e492 · 2018-10-04T01:13:39.000-05:00
diff --git a/sixtube_lm/configs/v5-4tube.h b/sixtube_lm/configs/v5-4tube.h
@@ -73,4 +73,21 @@ const word scrollSpeed = 100; //ms - e.g. scroll-in-and-out date at :30 - to giv
 
 // 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
+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 = 9;
+//3 pins out to anode channel switches
+const char anode1 = 11;
+const char anode2 = 12;
+const char anode3 = 13;
diff --git a/sixtube_lm/configs/v5-6tube-red.h b/sixtube_lm/configs/v5-6tube-red.h
@@ -73,4 +73,21 @@ const word scrollSpeed = 100; //ms - e.g. scroll-in-and-out date at :30 - to giv
 
 // 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
+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 = 9;
+//3 pins out to anode channel switches
+const char anode1 = 11;
+const char anode2 = 12;
+const char anode3 = 13;
diff --git a/sixtube_lm/configs/v5-6tube-rotary.h b/sixtube_lm/configs/v5-6tube-rotary.h
@@ -73,4 +73,21 @@ const word scrollSpeed = 100; //ms - e.g. scroll-in-and-out date at :30 - to giv
 
 // 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
+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 = 9;
+//3 pins out to anode channel switches
+const char anode1 = 11;
+const char anode2 = 12;
+const char anode3 = 13;
diff --git a/sixtube_lm/configs/v5-6tube.h b/sixtube_lm/configs/v5-6tube.h
@@ -73,4 +73,21 @@ const word scrollSpeed = 100; //ms - e.g. scroll-in-and-out date at :30 - to giv
 
 // 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
+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 = 9;
+//3 pins out to anode channel switches
+const char anode1 = 11;
+const char anode2 = 12;
+const char anode3 = 13;
diff --git a/sixtube_lm/configs/v8-4tube.h b/sixtube_lm/configs/v8-4tube.h
@@ -79,4 +79,21 @@ const word scrollSpeed = 100; //ms - e.g. scroll-in-and-out date at :30 - to giv
 
 // 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
+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 = 9;
+//3 pins out to anode channel switches
+const char anode1 = 11;
+const char anode2 = 12;
+const char anode3 = 13;
diff --git a/sixtube_lm/configs/v8-6tube.h b/sixtube_lm/configs/v8-6tube.h
@@ -79,4 +79,21 @@ const word scrollSpeed = 100; //ms - e.g. scroll-in-and-out date at :30 - to giv
 
 // 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
+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 = 9;
+//3 pins out to anode channel switches
+const char anode1 = 11;
+const char anode2 = 12;
+const char anode3 = 13;
diff --git a/sixtube_lm/configs/v8a-6tube-relayswitch.h b/sixtube_lm/configs/v8a-6tube-relayswitch.h
@@ -59,9 +59,9 @@ 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
-const char ledPin = A2;
-// -1 to disable feature; A2 if equipped (UNDB v8)
+//LED circuit control with PWM
+const char ledPin = 11;
+// -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
@@ -79,4 +79,21 @@ const word scrollSpeed = 100; //ms - e.g. scroll-in-and-out date at :30 - to giv
 
 // 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
+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 = 9;
+//3 pins out to anode channel switches
+const char anode1 = 16; //A2
+const char anode2 = 12;
+const char anode3 = 13;
diff --git a/sixtube_lm/configs/v8b-6tube-relayswitch.h b/sixtube_lm/configs/v8b-6tube-relayswitch.h
@@ -59,9 +59,9 @@ 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
-const char ledPin = A2;
-// -1 to disable feature; A2 if equipped (UNDB v8)
+//LED circuit control with PWM
+const char ledPin = 11;
+// -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
@@ -79,4 +79,21 @@ const word scrollSpeed = 100; //ms - e.g. scroll-in-and-out date at :30 - to giv
 
 // 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
+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 = 9;
+//3 pins out to anode channel switches
+const char anode1 = 16; //A2
+const char anode2 = 12;
+const char anode3 = 13;
diff --git a/sixtube_lm/sixtube_lm.ino b/sixtube_lm/sixtube_lm.ino
@@ -1004,10 +1004,10 @@ void startScroll() { //To scroll a value in, call this after calling editDisplay
 //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]
-byte binOutA[4] = {2,3,4,5};
-byte binOutB[4] = {6,7,8,9};
+byte binOutA[4] = {outA1,outA2,outA3,outA4};
+byte binOutB[4] = {outB1,outB2,outB3,outB4};
 //3 pins out to anode channel switches
-byte anodes[3] = {11,12,13};
+byte anodes[3] = {anode1,anode2,anode3};
 
 const int fadeDur = 5; //ms - each multiplexed pair of digits appears for this amount of time per cycle
 const int dimDur = 4; //ms - portion of fadeDur that is left dark during dim times
diff --git a/v8a_mod_test/v8a_mod_test.ino b/v8a_mod_test/v8a_mod_test.ino
@@ -0,0 +1,113 @@
+//For testing mods to the v8.0 board, style A, with LED PWM
+
+const byte btnSel = A1; //was A1
+const byte btnAlt = A0; //was A0
+const byte btnUp = A6; //was A2
+const byte btnDn = A7; //was A3
+const byte pinLED = 11; //was A6
+const byte pinRelay = A3; //was A7
+byte binOutA[4] = {2,3,4,5};
+byte binOutB[4] = {6,7,8,9};
+byte anodes[3] = {16,12,13}; //first was 11
+
+byte btnCur = 0; //Momentary button currently in use - only one allowed at a time
+
+byte ledStateNow = 0;
+byte ledStateTarget = 0;
+
+void setup(){
+  Serial.begin(9600);
+  //0 and 1: set as digital input
+  pinMode(A0, INPUT_PULLUP);
+  pinMode(A1, INPUT_PULLUP);
+  //2 and 3: set as digital output
+  pinMode(A2, OUTPUT);
+  pinMode(A3, OUTPUT);
+  //4 and 5: for I2C
+  //6 and 7: input, but analog pins with hardware pullup resistors, so nothing to do
+  analogWrite(pinLED,0); //0 = LEDs off
+  digitalWrite(pinRelay,1); //1 = connected device off
+  
+  //Set up just enough tube output to confirm the changed first anode is working
+  for(byte i=0; i<4; i++) { pinMode(binOutA[i],OUTPUT); pinMode(binOutB[i],OUTPUT); digitalWrite(binOutA[i],LOW); digitalWrite(binOutB[i],LOW); }
+  for(byte i=0; i<3; i++) { pinMode(anodes[i],OUTPUT); digitalWrite(anodes[i],LOW); }
+  digitalWrite(anodes[0],HIGH); //the one we want to test
+
+  Serial.println();
+  Serial.println(F("Ready for input."));
+  Serial.println(F("Display should now read 0 on 3rd and 6th tubes."));
+  Serial.println(F("SEL should change them to a 1; ALT should change them to 2."));
+  Serial.println(F("UP should fade the LEDs in and out."));
+  Serial.println(F("DOWN should toggle the relay."));
+}
+
+void loop(){
+  checkInputs();
+  if(ledStateNow != ledStateTarget) {
+    if(ledStateNow > ledStateTarget) { ledStateNow -= 5; }
+    else if(ledStateNow < ledStateTarget) { ledStateNow += 5; }
+    // Serial.print(ledStateNow,DEC);
+    // Serial.print(F(" => "));
+    // Serial.println(ledStateTarget,DEC);
+    analogWrite(pinLED,ledStateNow);
+  }
+  delay(5); //in case of switch bounce?
+}
+
+void checkInputs(){
+  checkBtn(btnSel);
+  checkBtn(btnAlt);
+  checkBtn(btnUp);
+  checkBtn(btnDn);
+}
+bool readInput(byte pin){
+  if(pin==A6 || pin==A7) return analogRead(pin)<100?0:1; //analog-only pins
+  else return digitalRead(pin);
+}
+void checkBtn(byte btn){
+  //Changes in momentary buttons, LOW = pressed.
+  //When a button event has occurred, will call ctrlEvt
+  bool bnow = readInput(btn);
+  //If the button has just been pressed, and no other buttons are in use...
+  if(btnCur==0 && bnow==LOW) {
+    btnCur = btn;
+    Serial.println();
+    bool newState = LOW;
+    switch(btn) {
+      case btnSel:
+        Serial.println(F("btnSel pressed"));
+        digitalWrite(binOutA[0],HIGH);
+        digitalWrite(binOutA[1],LOW);
+        digitalWrite(binOutB[0],HIGH);
+        digitalWrite(binOutB[1],LOW);
+        break;
+      case btnAlt:
+        Serial.println(F("btnAlt pressed"));
+        digitalWrite(binOutA[0],LOW);
+        digitalWrite(binOutA[1],HIGH);
+        digitalWrite(binOutB[0],LOW);
+        digitalWrite(binOutB[1],HIGH);
+        break;
+      case btnUp:
+        Serial.println(F("btnUp pressed"));
+        ledStateTarget = (ledStateTarget==0?255:0);
+        Serial.println();
+        if(ledStateTarget==0) Serial.println(F("LED switched off. LED PWM pin should fade to open circuit."));
+        else Serial.println(F("LED switched on. LED PWM pin should fade to closed circuit."));
+        break;
+      case btnDn:
+        Serial.println(F("btnDn pressed"));
+        newState = !digitalRead(pinRelay);
+        digitalWrite(pinRelay, newState);
+        Serial.println();
+        if(newState) Serial.println(F("Relay switched on. Relay pins should measure open circuit now (connected device off)."));
+        else Serial.println(F("Relay switched off. Relay pins should measure closed circuit now (connected device on)."));
+        break;
+      default: break;
+    } //end button printing switch
+  } //end if button presed
+  //If the button has just been released...
+  if(btnCur==btn && bnow==HIGH) {
+    btnCur = 0;
+  }
+}
diff --git a/v8b_mod_test/v8b_mod_test.ino b/v8b_mod_test/v8b_mod_test.ino
diff --git a/v8mod_test/v8mod_test.ino b/v8mod_test/v8mod_test.ino
