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/TODO
- 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
1
/* -*- mode: c++; compile-command: "make"; -*- */
1
/* -*- mode: c++; compile-command: "BOARD=pro5v make"; -*- */
2
2
/*
3
3
* propeller-clock.ino
4
4
*
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/switcher_major_mode.h"
83
#include "modes/settings_major_mode.h"
84
#include "modes/analogue_clock_mode.h"
85
#include "modes/digital_clock_mode.h"
86
#include "modes/info_mode.h"
87
#include "modes/test_pattern_mode.h"
88
#include "text.h"
89
#include "text_renderer.h"
90
#include "common.h"
78
79
#include <Bounce.h>
80
#include <DS1307.h>
81
#include <Wire.h>
91
82
92
83
//_____________________________________________________________________________
93
84
// data
94
85
86
95
87
// when non-zero, the time (in microseconds) of a new fan pulse that
96
88
// has just occurred, which means that segment drawing needs to be
97
89
// restarted
98
static unsigned long _new_pulse_at = 0;
90
static unsigned long new_pulse_at = 0;
99
91
100
92
// the time (in microseconds) when the last fan pulse occurred
101
static unsigned long _last_pulse_at = 0;
93
static unsigned long last_pulse_at = 0;
102
94
103
95
// duration (in microseconds) that a segment should be displayed
104
static unsigned long _segment_step = 0;
96
static unsigned long segment_step = 0;
105
97
106
98
// remainder after divisor and a tally of the remainders for each segment
107
static unsigned long _segment_step_sub_step = 0;
108
static unsigned long _segment_step_sub = 0;
109
110
// the button
111
static Button _button( 3 );
112
113
// major modes
114
static MajorMode *_modes[ 3 ];
115
116
// current major mode
117
static int _mode = 0;
118
119
// interupt handler's "ignore every other" flag
120
static bool _pulse_ignore = true;
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
121
120
122
121
//_____________________________________________________________________________
123
122
// code
124
123
125
// perform button events
126
void do_button_events()
127
{
128
// loop through pending events
129
while( int event = _button.get_event() )
130
{
131
switch( event )
132
{
133
case 1:
134
// short press
135
_modes[ _mode ]->press();
136
break;
137
case 2:
138
// long press
139
_modes[ _mode ]->long_press();
140
break;
141
case 3:
142
// looooong press (change major mode)
143
_modes[ _mode ]->deactivate();
144
if( !_modes[ ++_mode ] ) _mode = 0;
145
_modes[ _mode ]->activate();
146
break;
147
case 4:
148
// switch display upside-down
149
_pulse_ignore = !_pulse_ignore;
150
break;
124
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;
151
162
}
152
163
}
153
164
}
154
165
155
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
156
219
// draw a display segment
157
void draw_next_segment( bool reset )
220
void drawNextSegment( bool reset )
158
221
{
222
static int draw_mode = 0;
223
159
224
// keep track of segment
225
#if CLOCK_FORWARD
160
226
static int segment = 0;
161
#if CLOCK_FORWARD
162
if( reset ) segment = ( NUM_SEGMENTS - CLOCK_SHIFT ) % NUM_SEGMENTS;
227
if( reset ) segment = 0;
163
228
#else
164
if( reset ) segment = NUM_SEGMENTS - 1 - CLOCK_SHIFT;
229
static int segment = NUM_SEGMENTS - 1;
230
if( reset ) segment = NUM_SEGMENTS - 1;
165
231
#endif
166
232
167
// reset the text renderer's buffer
168
TextRenderer::reset_buffer();
169
170
if( reset )
171
{
172
_modes[ _mode ]->draw_reset();
173
174
// tell the text services we're starting a new frame
175
Text::draw_reset();
176
}
177
178
// draw
179
_modes[ _mode ]->draw( segment );
180
181
// draw text
182
Text::draw( segment );
183
184
// draw text rednerer's buffer
185
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
}
186
246
187
247
#if CLOCK_FORWARD
188
if( ++segment >= NUM_SEGMENTS ) segment = 0;
248
segment++;
189
249
#else
190
if( --segment < 0 ) segment = NUM_SEGMENTS - 1;
250
segment--;
191
251
#endif
192
252
}
193
253
194
254
195
255
// calculate time constants when a new pulse has occurred
196
void calculate_segment_times()
256
void calculateSegmentTimes()
197
257
{
198
258
// check for overflows, and only recalculate times if there isn't
199
259
// one (if there is, we'll just go with the last pulse's times)
200
if( _new_pulse_at > _last_pulse_at )
260
if( new_pulse_at > last_pulse_at )
201
261
{
202
262
// new segment stepping times
203
unsigned long delta = _new_pulse_at - _last_pulse_at;
204
_segment_step = delta / NUM_SEGMENTS;
205
_segment_step_sub = 0;
206
_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;
207
267
}
208
268
209
269
// now we have dealt with this pulse, save the pulse time and
210
270
// clear new_pulse_at, ready for the next pulse
211
_last_pulse_at = _new_pulse_at;
212
_new_pulse_at = 0;
271
last_pulse_at = new_pulse_at;
272
new_pulse_at = 0;
213
273
}
214
274
215
275
216
276
// wait until it is time to draw the next segment or a new pulse has
217
277
// occurred
218
void wait_till_end_of_segment( bool reset )
278
void waitTillNextSegment( bool reset )
219
279
{
220
280
static unsigned long end_time = 0;
221
281
222
282
// handle reset
223
283
if( reset )
224
end_time = _last_pulse_at;
284
end_time = last_pulse_at;
225
285
226
286
// work out the time that this segment should be displayed until
227
end_time += _segment_step;
228
_segment_step_sub += _segment_step_sub_step;
229
if( _segment_step_sub >= NUM_SEGMENTS ) {
230
_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;
231
291
end_time++;
232
292
}
233
293
234
294
// wait
235
while( micros() < end_time && !_new_pulse_at );
295
while( micros() < end_time && !new_pulse_at );
236
296
}
237
297
238
298
239
// ISR to handle the pulses from the fan's tachometer
240
void fan_pulse_handler()
299
// ISR to handle the pulses from the fan's tachiometer
300
void fanPulseHandler()
241
301
{
242
302
// the fan actually sends two pulses per revolution. These pulses
243
303
// may not be exactly evenly distributed around the rotation, so
244
304
// we can't recalculate times on every pulse. Instead, we ignore
245
305
// every other pulse so timings are based on a complete rotation.
246
_pulse_ignore = !_pulse_ignore;
247
if( !_pulse_ignore )
306
static bool ignore = true;
307
ignore = !ignore;
308
if( !ignore )
248
309
{
249
310
// set a new pulse time
250
_new_pulse_at = micros();
311
new_pulse_at = micros();
251
312
}
252
313
}
253
314
255
316
// main setup
256
317
void setup()
257
318
{
258
// set up an interrupt handler on pin 2 to notice fan pulses
259
attachInterrupt( 0, fan_pulse_handler, RISING );
319
// set up an interrupt handler on pin 2 to nitice fan pulses
320
attachInterrupt( 0, fanPulseHandler, RISING );
260
321
digitalWrite( 2, HIGH );
261
322
262
323
// set up output pins (4 to 13) for the led array
266
327
// set up mode-switch button on pin 3
267
328
pinMode( 3, INPUT );
268
329
digitalWrite( 3, HIGH );
269
static int event_times[] = { 10, 500, 2000, 4000, 0 };
270
_button.set_event_times( event_times );
271
272
// initialise RTC
273
Time::load_time();
274
275
// init text renderer
276
TextRenderer::init();
277
278
// reset text
279
Text::reset();
280
leds_off();
281
282
static SwitcherMajorMode switcher;
283
static SettingsMajorMode settings( _button );
284
285
// add major modes
286
int mode = 0;
287
_modes[ mode++ ] = &switcher;
288
_modes[ mode++ ] = &settings;
289
_modes[ mode ] = 0;
290
291
// activate the current major mode
292
_modes[ _mode ]->activate();
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 );
293
340
}
294
341
295
342
297
344
void loop()
298
345
{
299
346
// if there has been a new pulse, we'll be resetting the display
300
bool reset = _new_pulse_at? true : false;
301
302
// update button
303
_button.update();
347
bool reset = new_pulse_at? true : false;
304
348
305
349
// only do this stuff at the start of a display cycle, to ensure
306
350
// that no state changes mid-display
307
351
if( reset )
308
352
{
309
// calculate segment times
310
calculate_segment_times();
353
// check buttons
354
checkButtons();
311
355
312
356
// keep track of time
313
Time::update();
314
315
// perform button events
316
do_button_events();
357
trackTime();
317
358
}
318
359
319
360
// draw this segment
320
draw_next_segment( reset );
361
drawNextSegment( reset );
362
363
// do we need to recalculate segment times?
364
if( reset )
365
calculateSegmentTimes();
321
366
322
367
// wait till it's time to draw the next segment
323
wait_till_end_of_segment( reset );
368
waitTillNextSegment( reset );
324
369
}
Loggerhead is a web-based interface for Bazaar branches
Version: 1.18.2, Revision: 480