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 73
- compare with another revision
- download diff
- download tarball
- view history from revision 73
- Committer: Tim Marston
- Date: 2012-03-21 19:37:33 UTC
- Revision ID: tim@ed.am-20120321193733-29euxt0t0h9dwsj3
added .dep directories to bzrignore
- files added:
- arduino.mk
- test/fan-test
- test/fan-test/Makefile
- test/led-test
- test/led-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
- test/fan-test.pde => test/fan-test/fan-test.ino
- files modified:
- .bzrignore
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"
85
#include "settings_mode.h"
86
#include "text.h"
87
#include "text_renderer.h"
88
#include "common.h"
81
89
82
90
//_____________________________________________________________________________
83
91
// data
84
92
85
86
93
// when non-zero, the time (in microseconds) of a new fan pulse that
87
94
// has just occurred, which means that segment drawing needs to be
88
95
// restarted
89
static unsigned long new_pulse_at = 0;
96
static unsigned long _new_pulse_at = 0;
90
97
91
98
// the time (in microseconds) when the last fan pulse occurred
92
static unsigned long last_pulse_at = 0;
99
static unsigned long _last_pulse_at = 0;
93
100
94
101
// duration (in microseconds) that a segment should be displayed
95
static unsigned long segment_step = 0;
102
static unsigned long _segment_step = 0;
96
103
97
104
// 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, 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 )
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
116
121
117
122
//_____________________________________________________________________________
118
123
// code
119
124
120
125
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;
126
// activate the current minor mode
127
void activate_minor_mode()
128
{
129
switch( _minor_mode ) {
130
case ANALOGUE_CLOCK_IDX: analogue_clock_activate(); break;
131
case DIGITAL_CLOCK_IDX: digital_clock_activate(); break;
132
}
133
134
// reset text
135
Text::reset();
136
leds_off();
137
}
138
139
140
// activate major mode
141
void activate_major_mode()
142
{
143
switch( _major_mode ) {
144
case MAIN_MODE_IDX: activate_minor_mode(); break;
145
case SETTINGS_MODE_IDX: settings_mode_activate(); break;
146
}
147
148
// reset text
149
Text::reset();
150
leds_off();
151
}
152
153
154
// perform button events
155
void do_button_events()
156
{
157
// loop through pending events
158
while( int event = _button.get_event() )
159
{
160
switch( event )
161
{
162
case 1:
163
// short press
164
switch( _major_mode ) {
165
case MAIN_MODE_IDX:
166
switch( _minor_mode ) {
167
case ANALOGUE_CLOCK_IDX: analogue_clock_press(); break;
168
case DIGITAL_CLOCK_IDX: digital_clock_press(); break;
169
}
170
break;
171
case SETTINGS_MODE_IDX: settings_mode_press(); break;
172
}
173
break;
174
175
case 2:
176
// long press
177
switch( _major_mode ) {
178
case MAIN_MODE_IDX:
179
if( ++_minor_mode >= 3 )
180
_minor_mode = 0;
181
activate_minor_mode();
182
break;
183
case SETTINGS_MODE_IDX: settings_mode_long_press(); break;
184
}
185
break;
186
187
case 3:
188
// looooong press (change major mode)
189
if( ++_major_mode > 1 )
190
_major_mode = 0;
191
activate_major_mode();
192
break;
158
193
}
159
194
}
160
195
}
161
196
162
197
163
// draw a segment for the test display
164
void drawNextSegment_test( bool reset )
198
// draw a display segment
199
void draw_next_segment( bool reset )
165
200
{
166
201
// keep track of segment
167
static unsigned int segment = 0;
168
if( reset ) segment = 0;
169
segment++;
170
171
// turn on inside and outside LEDs
172
digitalWrite( 4, HIGH );
173
digitalWrite( 13, HIGH );
174
175
// display segment number in binary across in the inside LEDs,
176
// with the LED on pin 12 showing the least-significant bit
177
for( int a = 0; a < 8; a++ )
178
digitalWrite( 12 - a, ( ( segment >> a ) & 1 )? HIGH : LOW );
179
}
180
181
182
// draw a segment for the time display
183
void drawNextSegment_time( bool reset )
184
{
185
static unsigned int second = 0;
186
static unsigned int segment = 0;
187
188
// handle display reset
202
#if CLOCK_FORWARD
203
static int segment = ( NUM_SEGMENTS - CLOCK_SHIFT ) % NUM_SEGMENTS;
204
if( reset ) segment = ( NUM_SEGMENTS - CLOCK_SHIFT ) % NUM_SEGMENTS;
205
#else
206
static int segment = NUM_SEGMENTS - 1 - CLOCK_SHIFT;
207
if( reset ) segment = NUM_SEGMENTS - 1 - CLOCK_SHIFT;
208
#endif
209
210
// reset the text renderer
211
TextRenderer::reset_buffer();
212
213
// frame reset
189
214
if( reset ) {
190
second = 0;
191
segment = 0;
192
}
193
194
// what needs to be drawn?
195
bool draw_tick = !segment && second % 5 == 0;
196
bool draw_second = !segment && second == time_seconds;
197
bool draw_minute = !segment && second == time_minutes;
198
bool draw_hour = !segment && second == time_hours;
199
200
// set the LEDs
201
digitalWrite( 13, HIGH );
202
digitalWrite( 12, draw_tick || draw_minute );
203
for( int a = 10; a <= 11; a++ )
204
digitalWrite( a, draw_minute || draw_second );
205
for( int a = 4; a <= 9; a++ )
206
digitalWrite( 10, draw_minute | draw_second || draw_hour );
207
208
// inc position
209
if( ++segment >= NUM_SECOND_SEGMENTS ) {
210
segment = 0;
211
second++;
212
}
213
}
214
215
216
// draw a display segment
217
void drawNextSegment( bool reset )
218
{
219
static int draw_mode = 0;
220
221
// handle mode switch requests
222
if( reset && inc_draw_mode ) {
223
inc_draw_mode = false;
224
draw_mode++;
225
if( draw_mode >= 2 )
226
draw_mode = 0;
227
}
228
229
// draw the segment
230
switch( draw_mode ) {
231
case 0: drawNextSegment_test( reset ); break;
232
case 1: drawNextSegment_time( reset ); break;
233
}
215
switch( _major_mode ) {
216
case MAIN_MODE_IDX:
217
switch( _minor_mode ) {
218
case ANALOGUE_CLOCK_IDX: analogue_clock_draw_reset(); break;
219
case DIGITAL_CLOCK_IDX: digital_clock_draw_reset(); break;
220
}
221
break;
222
case SETTINGS_MODE_IDX: settings_mode_draw_reset(); break;
223
}
224
225
// tell the text services we're starting a new frame
226
Text::draw_reset();
227
}
228
229
// draw
230
switch( _major_mode ) {
231
case MAIN_MODE_IDX:
232
switch( _minor_mode ) {
233
case ANALOGUE_CLOCK_IDX: analogue_clock_draw( segment ); break;
234
case DIGITAL_CLOCK_IDX: digital_clock_draw( segment ); break;
235
case TEST_PATTERN_IDX: test_pattern_draw( segment ); break;
236
}
237
break;
238
case SETTINGS_MODE_IDX: settings_mode_draw( segment ); break;
239
}
240
241
// draw any text that was rendered
242
TextRenderer::output_buffer();
243
244
#if CLOCK_FORWARD
245
if( ++segment >= NUM_SEGMENTS ) segment = 0;
246
#else
247
if( --segment < 0 ) segment = NUM_SEGMENTS - 1;
248
#endif
234
249
}
235
250
236
251
237
252
// calculate time constants when a new pulse has occurred
238
void calculateSegmentTimes()
253
void calculate_segment_times()
239
254
{
240
255
// check for overflows, and only recalculate times if there isn't
241
256
// one (if there is, we'll just go with the last pulse's times)
242
if( new_pulse_at > last_pulse_at )
257
if( _new_pulse_at > _last_pulse_at )
243
258
{
244
259
// new segment stepping times
245
unsigned long delta = new_pulse_at - last_pulse_at;
246
segment_step = delta / NUM_SEGMENTS;
247
segment_step_sub = 0;
248
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;
249
264
}
250
265
251
266
// now we have dealt with this pulse, save the pulse time and
252
267
// clear new_pulse_at, ready for the next pulse
253
last_pulse_at = new_pulse_at;
254
new_pulse_at = 0;
268
_last_pulse_at = _new_pulse_at;
269
_new_pulse_at = 0;
255
270
}
256
271
257
272
258
273
// wait until it is time to draw the next segment or a new pulse has
259
274
// occurred
260
void waitTillNextSegment( bool reset )
275
void wait_till_end_of_segment( bool reset )
261
276
{
262
277
static unsigned long end_time = 0;
263
278
264
279
// handle reset
265
280
if( reset )
266
end_time = last_pulse_at;
281
end_time = _last_pulse_at;
267
282
268
283
// work out the time that this segment should be displayed until
269
end_time += segment_step;
270
segment_step_sub += segment_step_sub_step;
271
if( segment_step_sub >= NUM_SEGMENTS ) {
272
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;
273
288
end_time++;
274
289
}
275
290
276
291
// wait
277
while( micros() < end_time && !new_pulse_at );
292
while( micros() < end_time && !_new_pulse_at );
278
293
}
279
294
280
295
281
296
// ISR to handle the pulses from the fan's tachiometer
282
void fanPulseHandler()
297
void fan_pulse_handler()
283
298
{
284
299
// the fan actually sends two pulses per revolution. These pulses
285
300
// may not be exactly evenly distributed around the rotation, so
290
305
if( !ignore )
291
306
{
292
307
// set a new pulse time
293
new_pulse_at = micros();
308
_new_pulse_at = micros();
294
309
}
295
310
}
296
311
299
314
void setup()
300
315
{
301
316
// set up an interrupt handler on pin 2 to nitice fan pulses
302
attachInterrupt( 0, fanPulseHandler, RISING );
317
attachInterrupt( 0, fan_pulse_handler, RISING );
303
318
digitalWrite( 2, HIGH );
304
319
305
320
// set up output pins (4 to 13) for the led array
308
323
309
324
// set up mode-switch button on pin 3
310
325
pinMode( 3, INPUT );
311
312
// get the time from the real-time clock
313
int rtc_data[ 7 ];
314
RTC.get( rtc_data, true );
315
time_hours = rtc_data[ DS1307_HR ];
316
time_minutes = rtc_data[ DS1307_MIN ];
317
time_seconds = rtc_data[ DS1307_SEC ];
318
319
// serial comms
320
Serial.begin( 9600 );
326
digitalWrite( 3, HIGH );
327
static int event_times[] = { 5, 500, 4000, 0 };
328
_button.set_event_times( event_times );
329
330
// initialise RTC
331
Time::init();
332
333
// activate the minor mode
334
activate_major_mode();
321
335
}
322
336
323
337
325
339
void loop()
326
340
{
327
341
// if there has been a new pulse, we'll be resetting the display
328
bool reset = new_pulse_at? true : false;
342
bool reset = _new_pulse_at? true : false;
343
344
// update button
345
_button.update();
329
346
330
347
// only do this stuff at the start of a display cycle, to ensure
331
348
// that no state changes mid-display
332
349
if( reset )
333
350
{
334
// check buttons
335
checkButtons();
351
// calculate segment times
352
calculate_segment_times();
336
353
337
354
// keep track of time
338
trackTime();
355
Time::update();
356
357
// perform button events
358
do_button_events();
339
359
}
340
360
341
361
// draw this segment
342
drawNextSegment( reset );
343
344
// do we need to recalculate segment times?
345
if( reset )
346
calculateSegmentTimes();
362
draw_next_segment( reset );
347
363
348
364
// wait till it's time to draw the next segment
349
waitTillNextSegment( reset );
365
wait_till_end_of_segment( reset );
350
366
}
Loggerhead is a web-based interface for Bazaar branches
Version: 1.18.2, Revision: 480