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