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 74
- compare with another revision
- download diff
- download tarball
- view history from revision 74
- Committer: Tim Marston
- Date: 2012-03-21 20:35:28 UTC
- Revision ID: tim@ed.am-20120321203528-wfhpych1tub75rgj
fixed bug initialising text services on mode activation
- files added:
- src/analogue_clock.cc
- test/rtc-test
- 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
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 "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"
82
89
83
90
//_____________________________________________________________________________
84
91
// data
85
92
86
87
93
// when non-zero, the time (in microseconds) of a new fan pulse that
88
94
// has just occurred, which means that segment drawing needs to be
89
95
// restarted
90
static unsigned long new_pulse_at = 0;
96
static unsigned long _new_pulse_at = 0;
91
97
92
98
// the time (in microseconds) when the last fan pulse occurred
93
static unsigned long last_pulse_at = 0;
99
static unsigned long _last_pulse_at = 0;
94
100
95
101
// duration (in microseconds) that a segment should be displayed
96
static unsigned long segment_step = 0;
102
static unsigned long _segment_step = 0;
97
103
98
104
// 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
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
120
121
121
122
//_____________________________________________________________________________
122
123
// code
123
124
124
125
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;
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;
162
195
}
163
196
}
164
197
}
165
198
166
199
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
200
// draw a display segment
220
void drawNextSegment( bool reset )
201
void draw_next_segment( bool reset )
221
202
{
222
static int draw_mode = 0;
223
224
203
// keep track of segment
225
204
#if CLOCK_FORWARD
226
static int segment = 0;
227
if( reset ) segment = 0;
205
static int segment = ( NUM_SEGMENTS - CLOCK_SHIFT ) % NUM_SEGMENTS;
206
if( reset ) segment = ( NUM_SEGMENTS - CLOCK_SHIFT ) % NUM_SEGMENTS;
228
207
#else
229
static int segment = NUM_SEGMENTS - 1;
230
if( reset ) segment = NUM_SEGMENTS - 1;
208
static int segment = NUM_SEGMENTS - 1 - CLOCK_SHIFT;
209
if( reset ) segment = NUM_SEGMENTS - 1 - CLOCK_SHIFT;
231
210
#endif
232
211
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
}
212
// reset the text renderer
213
TextRenderer::reset_buffer();
214
215
// frame reset
216
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();
246
245
247
246
#if CLOCK_FORWARD
248
segment++;
247
if( ++segment >= NUM_SEGMENTS ) segment = 0;
249
248
#else
250
segment--;
249
if( --segment < 0 ) segment = NUM_SEGMENTS - 1;
251
250
#endif
252
251
}
253
252
254
253
255
254
// calculate time constants when a new pulse has occurred
256
void calculateSegmentTimes()
255
void calculate_segment_times()
257
256
{
258
257
// check for overflows, and only recalculate times if there isn't
259
258
// one (if there is, we'll just go with the last pulse's times)
260
if( new_pulse_at > last_pulse_at )
259
if( _new_pulse_at > _last_pulse_at )
261
260
{
262
261
// 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;
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;
267
266
}
268
267
269
268
// now we have dealt with this pulse, save the pulse time and
270
269
// clear new_pulse_at, ready for the next pulse
271
last_pulse_at = new_pulse_at;
272
new_pulse_at = 0;
270
_last_pulse_at = _new_pulse_at;
271
_new_pulse_at = 0;
273
272
}
274
273
275
274
276
275
// wait until it is time to draw the next segment or a new pulse has
277
276
// occurred
278
void waitTillNextSegment( bool reset )
277
void wait_till_end_of_segment( bool reset )
279
278
{
280
279
static unsigned long end_time = 0;
281
280
282
281
// handle reset
283
282
if( reset )
284
end_time = last_pulse_at;
283
end_time = _last_pulse_at;
285
284
286
285
// 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;
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;
291
290
end_time++;
292
291
}
293
292
294
293
// wait
295
while( micros() < end_time && !new_pulse_at );
294
while( micros() < end_time && !_new_pulse_at );
296
295
}
297
296
298
297
299
298
// ISR to handle the pulses from the fan's tachiometer
300
void fanPulseHandler()
299
void fan_pulse_handler()
301
300
{
302
301
// the fan actually sends two pulses per revolution. These pulses
303
302
// may not be exactly evenly distributed around the rotation, so
308
307
if( !ignore )
309
308
{
310
309
// set a new pulse time
311
new_pulse_at = micros();
310
_new_pulse_at = micros();
312
311
}
313
312
}
314
313
317
316
void setup()
318
317
{
319
318
// set up an interrupt handler on pin 2 to nitice fan pulses
320
attachInterrupt( 0, fanPulseHandler, RISING );
319
attachInterrupt( 0, fan_pulse_handler, RISING );
321
320
digitalWrite( 2, HIGH );
322
321
323
322
// set up output pins (4 to 13) for the led array
327
326
// set up mode-switch button on pin 3
328
327
pinMode( 3, INPUT );
329
328
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 );
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();
340
337
}
341
338
342
339
344
341
void loop()
345
342
{
346
343
// if there has been a new pulse, we'll be resetting the display
347
bool reset = new_pulse_at? true : false;
344
bool reset = _new_pulse_at? true : false;
345
346
// update button
347
_button.update();
348
348
349
349
// only do this stuff at the start of a display cycle, to ensure
350
350
// that no state changes mid-display
351
351
if( reset )
352
352
{
353
// check buttons
354
checkButtons();
353
// calculate segment times
354
calculate_segment_times();
355
355
356
356
// keep track of time
357
trackTime();
357
Time::update();
358
359
// perform button events
360
do_button_events();
358
361
}
359
362
360
363
// draw this segment
361
drawNextSegment( reset );
362
363
// do we need to recalculate segment times?
364
if( reset )
365
calculateSegmentTimes();
364
draw_next_segment( reset );
366
365
367
366
// wait till it's time to draw the next segment
368
waitTillNextSegment( reset );
367
wait_till_end_of_segment( reset );
369
368
}
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0