To get this branch, use:
bzr branch
http://bzr.ed.am/elec/propeller-clock
« back to all changes in this revision
Viewing changes to src/propeller-clock.cc
- browse files at revision 70
- compare with another revision
- download diff
- download tarball
- view history from revision 70
- Committer: edam
- Date: 2012-03-12 15:22:57 UTC
- Revision ID: tim@ed.am-20120312152257-gb30ihjxq8jb0lss
added newline
- files added:
- arduino.mk
- test/fan-test/Makefile
- test/phantom-button-presses
- test/phantom-button-presses/Makefile
- test/rtc-test
- test/rtc-test/util
- files removed:
- src/util/Bounce.cpp
- files renamed:
- src/propeller-clock.ino => src/propeller-clock.cc
- files modified:
- .bzrignore
- test/led-test/Makefile
added
removed
src/propeller-clock.cc
1
/* -*- mode: c++; compile-command: "BOARD=pro5v make"; -*- */
1
2
/*
2
3
* propeller-clock.ino
3
4
*
27
28
28
29
* a PC fan is wired up to a 12V power supply
29
30
30
* the fan's SENSE (tachiometer) pin connected to pin 2 on the
31
arduino.
31
* the fan's SENSE (tachometer) pin connected to pin 2 on the
32
Arduino.
32
33
33
* the pins 4 to 13 on the arduino should directly drive an LED (the
34
* the pins 4 to 13 on the Arduino should directly drive an LED (the
34
35
LED on pin 4 is in the centre of the clock face and the LED on pin
35
36
13 is at the outside.
36
37
37
38
* if a longer hand (and a larger clock face) is desired, pin 4 can be
38
39
used to indirectly drive a transistor which in turn drives several
39
LEDs that turn on anf off in unison in the centre of the clock.
40
LEDs that turn on and off in unison in the centre of the clock.
40
41
41
42
* a button should be attached to pin 3 that grounds it when pressed.
42
43
43
* A DS1307 remote clock is connected via I2C on analog pins 4 and 5.
44
* A DS1307 remote clock is connected via I2C on analogue pins 4 and 5.
44
45
45
46
Implementation details:
46
47
49
50
* the timing of the drawing of the clock face is recalculated with
50
51
every rotation of the propeller.
51
52
52
* a PC fan actually sends 2 tachiometer pulses per revolution, so the
53
* a PC fan actually sends 2 tachometer pulses per revolution, so the
53
54
software skips every other one. This means that the clock may
54
55
appear upside-down if started with the propeller in the wrong
55
position. You will need to experiment to dicsover the position that
56
position. You will need to experiment to discover the position that
56
57
the propeller must be in when starting the clock.
57
58
58
59
Usage instructions:
74
75
75
76
******************************************************************************/
76
77
77
78
#include <Bounce.h>
79
#include <DS1307.h>
80
#include <Wire.h>
78
#include "config.h"
79
#include "button.h"
80
#include "time.h"
81
#include "Arduino.h"
82
#include "analogue_clock.h"
83
#include "digital_clock.h"
84
#include "test_pattern.h"
81
85
82
86
//_____________________________________________________________________________
83
87
// data
84
88
85
86
89
// when non-zero, the time (in microseconds) of a new fan pulse that
87
90
// has just occurred, which means that segment drawing needs to be
88
91
// restarted
89
static unsigned long new_pulse_at = 0;
92
static unsigned long _new_pulse_at = 0;
90
93
91
94
// the time (in microseconds) when the last fan pulse occurred
92
static unsigned long last_pulse_at = 0;
95
static unsigned long _last_pulse_at = 0;
93
96
94
97
// duration (in microseconds) that a segment should be displayed
95
static unsigned long segment_step = 0;
98
static unsigned long _segment_step = 0;
96
99
97
100
// remainder after divisor and a tally of the remainders for each segment
98
static unsigned long segment_step_sub_step = 0;
99
static unsigned long segment_step_sub = 0;
100
101
// flag to indicate that the drawing mode should be cycled to the next one
102
static bool inc_draw_mode = false;
103
104
// a bounce-managed button
105
static Bounce button( 3, 50 );
106
107
// the time
108
static int time_hours = 0;
109
static int time_minutes = 0;
110
static int time_seconds = 0;
111
112
// number of segments in a full display (rotation) is 60 (one per
113
// second) times the desired number of sub-divisions of a second
114
#define NUM_SECOND_SEGMENTS 5
115
#define NUM_SEGMENTS ( 60 * NUM_SECOND_SEGMENTS )
101
static unsigned long _segment_step_sub_step = 0;
102
static unsigned long _segment_step_sub = 0;
103
104
// the button
105
static Button _button( 3 );
106
107
// modes
108
static int _major_mode = 0;
109
static int _minor_mode = 0;
110
111
#define MAIN_MODE_IDX 0
112
113
#define ANALOGUE_CLOCK_IDX 0
114
#define DIGITAL_CLOCK_IDX 1
115
#define TEST_PATTERN_IDX 2
116
116
117
117
//_____________________________________________________________________________
118
118
// code
119
119
120
120
121
// check for button presses
122
void checkButtons()
121
// activate the current minor mode
122
void activate_minor_mode()
123
123
{
124
// update buttons
125
button.update();
126
127
// notice button presses
128
if( button.risingEdge() )
129
inc_draw_mode = true;
124
switch( _minor_mode ) {
125
case ANALOGUE_CLOCK_IDX: analogue_clock_activate(); break;
126
case DIGITAL_CLOCK_IDX: digital_clock_activate(); break;
127
}
130
128
}
131
129
132
133
// keep track of time
134
void trackTime()
130
// perform button events
131
void do_button_events()
135
132
{
136
// previous time and any carried-over milliseconds
137
static unsigned long last_time = millis();
138
static unsigned long carry = 0;
139
140
// how many milliseonds have elapsed since we last checked?
141
unsigned long next_time = millis();
142
unsigned long delta = next_time - last_time + carry;
143
144
// update the previous time and carried-over milliseconds
145
last_time = next_time;
146
carry = delta % 1000;
147
148
// add the seconds that have passed to the time
149
time_seconds += delta / 1000;
150
while( time_seconds >= 60 ) {
151
time_seconds -= 60;
152
time_minutes++;
153
if( time_minutes >= 60 ) {
154
time_minutes -= 60;
155
time_hours++;
156
if( time_hours >= 24 )
157
time_hours -= 24;
133
// loop through pending events
134
while( int event = _button.get_event() )
135
{
136
switch( event )
137
{
138
case 1:
139
// short press
140
switch( _major_mode ) {
141
case MAIN_MODE_IDX:
142
switch( _minor_mode ) {
143
case ANALOGUE_CLOCK_IDX: analogue_clock_press(); break;
144
case DIGITAL_CLOCK_IDX: digital_clock_press(); break;
145
}
146
break;
147
}
148
break;
149
150
case 2:
151
// long press
152
switch( _major_mode ) {
153
case MAIN_MODE_IDX:
154
if( ++_minor_mode >= 3 )
155
_minor_mode = 0;
156
switch( _minor_mode ) {
157
case DIGITAL_CLOCK_IDX: digital_clock_activate(); break;
158
}
159
break;
160
}
161
break;
162
163
case 3:
164
// looooong press (change major mode)
165
if( ++_major_mode > 0 )
166
_major_mode = 0;
167
switch( _major_mode ) {
168
case MAIN_MODE_IDX: _minor_mode = 0; break;
169
}
170
activate_minor_mode();
171
break;
158
172
}
159
173
}
160
174
}
161
175
162
176
163
// turn an led on/off
164
void ledOn( int num, bool on )
165
{
166
if( num < 0 || num > 9 ) return;
167
168
// convert to pin no.
169
num += 4;
170
171
// pin 4 needs to be inverted (it's driving a PNP)
172
if( num == 4 ) on = !on;
173
174
digitalWrite( num, on? HIGH : LOW );
175
}
176
177
178
// draw a segment for the test display
179
void drawNextSegment_test( bool reset )
177
// draw a display segment
178
void draw_next_segment( bool reset )
180
179
{
181
180
// keep track of segment
182
static unsigned int segment = 0;
183
if( reset ) segment = 0;
184
segment++;
185
186
// turn on inside and outside LEDs
187
ledOn( 0, true );
188
ledOn( 9, true );
189
190
// display segment number in binary across in the inside LEDs,
191
// with the LED on pin 12 showing the least-significant bit
192
for( int a = 0; a < 8; a++ )
193
ledOn( 8 - a, ( segment >> a ) & 1 );
194
}
195
196
197
// draw a segment for the time display
198
void drawNextSegment_time( bool reset )
199
{
200
static int second = 0;
201
static int segment = 0;
202
203
// handle display reset
181
#if CLOCK_FORWARD
182
static int segment = ( NUM_SEGMENTS - CLOCK_SHIFT ) % NUM_SEGMENTS;
183
if( reset ) segment = ( NUM_SEGMENTS - CLOCK_SHIFT ) % NUM_SEGMENTS;
184
#else
185
static int segment = NUM_SEGMENTS - 1 - CLOCK_SHIFT;
186
if( reset ) segment = NUM_SEGMENTS - 1 - CLOCK_SHIFT;
187
#endif
188
189
// frame reset
204
190
if( reset ) {
205
second = 0;
206
segment = 0;
207
}
208
209
// what needs to be drawn?
210
bool draw_tick = !segment && second % 5 == 0;
211
bool draw_second = !segment && second == time_seconds;
212
bool draw_minute = !segment && second == time_minutes;
213
bool draw_hour = !segment && second == time_hours;
214
215
// set the LEDs
216
ledOn( 9, true );
217
ledOn( 8, draw_tick || draw_minute );
218
for( int a = 6; a <= 7; a++ )
219
ledOn( a, draw_minute || draw_second );
220
for( int a = 0; a <= 5; a++ )
221
ledOn( a, draw_minute || draw_second || draw_hour );
222
223
// inc position
224
if( ++segment >= NUM_SECOND_SEGMENTS ) {
225
segment = 0;
226
second++;
227
}
228
}
229
230
231
// draw a display segment
232
void drawNextSegment( bool reset )
233
{
234
static int draw_mode = 0;
235
236
// handle mode switch requests
237
if( reset && inc_draw_mode ) {
238
inc_draw_mode = false;
239
draw_mode++;
240
if( draw_mode >= 2 )
241
draw_mode = 0;
242
}
243
244
// draw the segment
245
switch( draw_mode ) {
246
case 0: drawNextSegment_test( reset ); break;
247
case 1: drawNextSegment_time( reset ); break;
248
}
191
switch( _major_mode ) {
192
case MAIN_MODE_IDX:
193
switch( _minor_mode ) {
194
case ANALOGUE_CLOCK_IDX: analogue_clock_draw_reset(); break;
195
case DIGITAL_CLOCK_IDX: digital_clock_draw_reset(); break;
196
}
197
break;
198
}
199
}
200
201
// draw
202
switch( _major_mode ) {
203
case MAIN_MODE_IDX:
204
switch( _minor_mode ) {
205
case ANALOGUE_CLOCK_IDX: analogue_clock_draw( segment ); break;
206
case DIGITAL_CLOCK_IDX: digital_clock_draw( segment ); break;
207
case TEST_PATTERN_IDX: test_pattern_draw( segment ); break;
208
}
209
break;
210
}
211
212
#if CLOCK_FORWARD
213
if( ++segment >= NUM_SEGMENTS ) segment = 0;
214
#else
215
if( --segment < 0 ) segment = NUM_SEGMENTS - 1;
216
#endif
249
217
}
250
218
251
219
252
220
// calculate time constants when a new pulse has occurred
253
void calculateSegmentTimes()
221
void calculate_segment_times()
254
222
{
255
223
// check for overflows, and only recalculate times if there isn't
256
224
// one (if there is, we'll just go with the last pulse's times)
257
if( new_pulse_at > last_pulse_at )
225
if( _new_pulse_at > _last_pulse_at )
258
226
{
259
227
// new segment stepping times
260
unsigned long delta = new_pulse_at - last_pulse_at;
261
segment_step = delta / NUM_SEGMENTS;
262
segment_step_sub = 0;
263
segment_step_sub_step = delta % NUM_SEGMENTS;
228
unsigned long delta = _new_pulse_at - _last_pulse_at;
229
_segment_step = delta / NUM_SEGMENTS;
230
_segment_step_sub = 0;
231
_segment_step_sub_step = delta % NUM_SEGMENTS;
264
232
}
265
233
266
234
// now we have dealt with this pulse, save the pulse time and
267
235
// clear new_pulse_at, ready for the next pulse
268
last_pulse_at = new_pulse_at;
269
new_pulse_at = 0;
236
_last_pulse_at = _new_pulse_at;
237
_new_pulse_at = 0;
270
238
}
271
239
272
240
273
241
// wait until it is time to draw the next segment or a new pulse has
274
242
// occurred
275
void waitTillNextSegment( bool reset )
243
void wait_till_end_of_segment( bool reset )
276
244
{
277
245
static unsigned long end_time = 0;
278
246
279
247
// handle reset
280
248
if( reset )
281
end_time = last_pulse_at;
249
end_time = _last_pulse_at;
282
250
283
251
// work out the time that this segment should be displayed until
284
end_time += segment_step;
285
segment_step_sub += segment_step_sub_step;
286
if( segment_step_sub >= NUM_SEGMENTS ) {
287
segment_step_sub -= NUM_SEGMENTS;
252
end_time += _segment_step;
253
_segment_step_sub += _segment_step_sub_step;
254
if( _segment_step_sub >= NUM_SEGMENTS ) {
255
_segment_step_sub -= NUM_SEGMENTS;
288
256
end_time++;
289
257
}
290
258
291
259
// wait
292
while( micros() < end_time && !new_pulse_at );
260
while( micros() < end_time && !_new_pulse_at );
293
261
}
294
262
295
263
296
264
// ISR to handle the pulses from the fan's tachiometer
297
void fanPulseHandler()
265
void fan_pulse_handler()
298
266
{
299
267
// the fan actually sends two pulses per revolution. These pulses
300
268
// may not be exactly evenly distributed around the rotation, so
305
273
if( !ignore )
306
274
{
307
275
// set a new pulse time
308
new_pulse_at = micros();
276
_new_pulse_at = micros();
309
277
}
310
278
}
311
279
314
282
void setup()
315
283
{
316
284
// set up an interrupt handler on pin 2 to nitice fan pulses
317
attachInterrupt( 0, fanPulseHandler, RISING );
285
attachInterrupt( 0, fan_pulse_handler, RISING );
318
286
digitalWrite( 2, HIGH );
319
287
320
288
// set up output pins (4 to 13) for the led array
324
292
// set up mode-switch button on pin 3
325
293
pinMode( 3, INPUT );
326
294
digitalWrite( 3, HIGH );
327
328
// get the time from the real-time clock
329
int rtc_data[ 7 ];
330
RTC.get( rtc_data, true );
331
time_hours = rtc_data[ DS1307_HR ];
332
time_minutes = rtc_data[ DS1307_MIN ];
333
time_seconds = rtc_data[ DS1307_SEC ];
334
335
// serial comms
336
Serial.begin( 9600 );
295
static int event_times[] = { 5, 500, 4000, 0 };
296
_button.set_event_times( event_times );
297
298
// initialise RTC
299
Time::init();
300
301
// activate the minor mode
302
switch( _major_mode ) {
303
case MAIN_MODE_IDX: activate_minor_mode(); break;
304
}
337
305
}
338
306
339
307
341
309
void loop()
342
310
{
343
311
// if there has been a new pulse, we'll be resetting the display
344
bool reset = new_pulse_at? true : false;
312
bool reset = _new_pulse_at? true : false;
313
314
// update button
315
_button.update();
345
316
346
317
// only do this stuff at the start of a display cycle, to ensure
347
318
// that no state changes mid-display
348
319
if( reset )
349
320
{
350
// check buttons
351
checkButtons();
321
// calculate segment times
322
calculate_segment_times();
352
323
353
324
// keep track of time
354
trackTime();
325
Time::update();
326
327
// perform button events
328
do_button_events();
355
329
}
356
330
357
331
// draw this segment
358
drawNextSegment( reset );
359
360
// do we need to recalculate segment times?
361
if( reset )
362
calculateSegmentTimes();
332
draw_next_segment( reset );
363
333
364
334
// wait till it's time to draw the next segment
365
waitTillNextSegment( reset );
335
wait_till_end_of_segment( reset );
366
336
}
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0