Skip to content

Commit ddc1d04

Browse files
committed
ibid
1 parent f652c2e commit ddc1d04

File tree

3 files changed

+164
-1
lines changed

3 files changed

+164
-1
lines changed

sixtube_lm/configs/v8-6tube.h

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
const byte displaySize = 6; //number of tubes in display module. Small display adjustments are made for 4-tube clocks
2+
3+
// available clock functions, and unique IDs (between 0 and 200)
4+
const byte fnIsTime = 0;
5+
const byte fnIsDate = 1;
6+
const byte fnIsAlarm = 2;
7+
const byte fnIsTimer = 3;
8+
const byte fnIsDayCount = 4;
9+
const byte fnIsTemp = 5;
10+
const byte fnIsTubeTester = 6; //cycles all digits on all tubes 1/second, similar to anti-cathode-poisoning cleaner
11+
// functions enabled in this clock, in their display order. Only fnIsTime is required
12+
const byte fnsEnabled[] = {fnIsTime, fnIsDate, fnIsAlarm, fnIsTimer, fnIsDayCount}; //, fnIsTemp, fnIsTubeTester
13+
// To control which of these display persistently vs. switch back to Time after a few seconds, search "Temporary-display mode timeout"
14+
15+
// These are the RLB board connections to Arduino analog input pins.
16+
// S1/PL13 = Reset
17+
// S2/PL5 = A1
18+
// S3/PL6 = A0
19+
// S4/PL7 = A6
20+
// S5/PL8 = A3
21+
// S6/PL9 = A2
22+
// S7/PL14 = A7
23+
// 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.
24+
25+
// What input is associated with each control?
26+
const byte mainSel = A1; //main select button - must be equipped
27+
const byte mainAdjUp = A2; //main up/down buttons or rotary encoder - must be equipped
28+
const byte mainAdjDn = A3;
29+
const byte altSel = A0; //alt select button - if unequipped, set to 0
30+
31+
// What type of adj controls are equipped?
32+
// 1 = momentary buttons. 2 = quadrature rotary encoder.
33+
const byte mainAdjType = 1;
34+
35+
// In normal running mode, what do the controls do?
36+
// -1 = nothing/switch, -2 = cycle through functions, fn in fnsEnabled[] = go to that function
37+
// If using soft alarm/power switch per below, the control(s) set to -1 will do the switching.
38+
const char mainSelFn = -2;
39+
const char mainAdjFn = -1;
40+
const byte altSelFn = fnIsAlarm; //go straight to alarm
41+
42+
//What are the signal pin(s) connected to?
43+
const char piezoPin = 10;
44+
const char relayPin = -1;
45+
// -1 to disable feature (no relay item equipped); A3 if equipped (UNDB v8)
46+
const byte relayMode = 0; //If relay is equipped, what does it do?
47+
// 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.
48+
// 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.
49+
const word signalDur = 180; //sec - when pulsed signal is going, pulses are sent once/sec for this period (e.g. 180 = 3min)
50+
const word switchDur = 7200; //sec - when alarm triggers switched relay, it's switched on for this period (e.g. 7200 = 2hr)
51+
const word piezoPulse = 500; //ms - used with piezo via tone()
52+
const word relayPulse = 200; //ms - used with pulsed relay
53+
54+
//Soft power switches
55+
const byte enableSoftAlarmSwitch = 1;
56+
// 1 = yes. Alarm can be switched on and off when clock is displaying the alarm time (fnIsAlarm).
57+
// 0 = no. Alarm will be permanently on. Use with switched relay if the appliance has its own switch on this relay circuit.
58+
const byte enableSoftPowerSwitch = 1; //works with switched relay only
59+
// 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).
60+
// 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.
61+
62+
//LED circuit control
63+
const char ledPin = -1;
64+
// -1 to disable feature; A2 if equipped (UNDB v8)
65+
66+
//When display is dim/off, a press will light the tubes for how long?
67+
const byte unoffDur = 10; //sec
68+
69+
// How long (in ms) are the button hold durations?
70+
const word btnShortHold = 1000; //for setting the displayed feataure
71+
const word btnLongHold = 3000; //for for entering options menu
72+
const byte velThreshold = 150; //ms
73+
// When an adj up/down input (btn or rot) follows another in less than this time, value will change more (10 vs 1).
74+
// Recommend ~150 for rotaries. If you want to use this feature with buttons, extend to ~400.
75+
76+
// What is the "frame rate" of the tube cleaning and display scrolling? up to 65535 ms
77+
const word cleanSpeed = 200; //ms
78+
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
79+
80+
// What are the timeouts for setting and temporarily-displayed functions? up to 65535 sec
81+
const unsigned long timeoutSet = 120; //sec
82+
const unsigned long timeoutTempFn = 5; //sec

sixtube_lm/configs/v8-6tube-relayswitch.h renamed to sixtube_lm/configs/v8a-6tube-relayswitch.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ const byte altSel = A0; //alt select button - if unequipped, set to 0
3030

3131
// What type of adj controls are equipped?
3232
// 1 = momentary buttons. 2 = quadrature rotary encoder.
33-
// If using rotary encoder, make sure it is connected to A0/A1 which can support digital input, not A6/A7.
3433
const byte mainAdjType = 1;
3534

3635
// In normal running mode, what do the controls do?
Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
const byte displaySize = 6; //number of tubes in display module. Small display adjustments are made for 4-tube clocks
2+
3+
// available clock functions, and unique IDs (between 0 and 200)
4+
const byte fnIsTime = 0;
5+
const byte fnIsDate = 1;
6+
const byte fnIsAlarm = 2;
7+
const byte fnIsTimer = 3;
8+
const byte fnIsDayCount = 4;
9+
const byte fnIsTemp = 5;
10+
const byte fnIsTubeTester = 6; //cycles all digits on all tubes 1/second, similar to anti-cathode-poisoning cleaner
11+
// functions enabled in this clock, in their display order. Only fnIsTime is required
12+
const byte fnsEnabled[] = {fnIsTime, fnIsDate, fnIsAlarm, fnIsTimer, fnIsDayCount}; //, fnIsTemp, fnIsTubeTester
13+
// To control which of these display persistently vs. switch back to Time after a few seconds, search "Temporary-display mode timeout"
14+
15+
// These are the RLB board connections to Arduino analog input pins.
16+
// S1/PL13 = Reset
17+
// S2/PL5 = A1
18+
// S3/PL6 = A0
19+
// S4/PL7 = A6
20+
// S5/PL8 = A3
21+
// S6/PL9 = A2
22+
// S7/PL14 = A7
23+
// 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.
24+
25+
// What input is associated with each control?
26+
const byte mainSel = A6; //main select button - must be equipped
27+
const byte mainAdjUp = A0; //main up/down buttons or rotary encoder - must be equipped
28+
const byte mainAdjDn = A1;
29+
const byte altSel = A7; //alt select button - if unequipped, set to 0
30+
31+
// What type of adj controls are equipped?
32+
// 1 = momentary buttons. 2 = quadrature rotary encoder.
33+
const byte mainAdjType = 1;
34+
35+
// In normal running mode, what do the controls do?
36+
// -1 = nothing/switch, -2 = cycle through functions, fn in fnsEnabled[] = go to that function
37+
// If using soft alarm/power switch per below, the control(s) set to -1 will do the switching.
38+
const char mainSelFn = -2;
39+
const char mainAdjFn = -1;
40+
const byte altSelFn = fnIsAlarm; //go straight to alarm
41+
42+
//What are the signal pin(s) connected to?
43+
const char piezoPin = 10;
44+
const char relayPin = A3;
45+
// -1 to disable feature (no relay item equipped); A3 if equipped (UNDB v8)
46+
const byte relayMode = 0; //If relay is equipped, what does it do?
47+
// 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.
48+
// 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.
49+
const word signalDur = 180; //sec - when pulsed signal is going, pulses are sent once/sec for this period (e.g. 180 = 3min)
50+
const word switchDur = 7200; //sec - when alarm triggers switched relay, it's switched on for this period (e.g. 7200 = 2hr)
51+
const word piezoPulse = 500; //ms - used with piezo via tone()
52+
const word relayPulse = 200; //ms - used with pulsed relay
53+
54+
//Soft power switches
55+
const byte enableSoftAlarmSwitch = 1;
56+
// 1 = yes. Alarm can be switched on and off when clock is displaying the alarm time (fnIsAlarm).
57+
// 0 = no. Alarm will be permanently on. Use with switched relay if the appliance has its own switch on this relay circuit.
58+
const byte enableSoftPowerSwitch = 1; //works with switched relay only
59+
// 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).
60+
// 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.
61+
62+
//LED circuit control
63+
const char ledPin = A2;
64+
// -1 to disable feature; A2 if equipped (UNDB v8)
65+
66+
//When display is dim/off, a press will light the tubes for how long?
67+
const byte unoffDur = 10; //sec
68+
69+
// How long (in ms) are the button hold durations?
70+
const word btnShortHold = 1000; //for setting the displayed feataure
71+
const word btnLongHold = 3000; //for for entering options menu
72+
const byte velThreshold = 150; //ms
73+
// When an adj up/down input (btn or rot) follows another in less than this time, value will change more (10 vs 1).
74+
// Recommend ~150 for rotaries. If you want to use this feature with buttons, extend to ~400.
75+
76+
// What is the "frame rate" of the tube cleaning and display scrolling? up to 65535 ms
77+
const word cleanSpeed = 200; //ms
78+
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
79+
80+
// What are the timeouts for setting and temporarily-displayed functions? up to 65535 sec
81+
const unsigned long timeoutSet = 120; //sec
82+
const unsigned long timeoutTempFn = 5; //sec

0 commit comments

Comments
 (0)