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