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