(root)/elec/propeller-clock
» Revision
13
(compared to revision 77)
: propeller-clock/propeller-clock.pde
To get this branch, use:
bzr branch
http://bzr.ed.am/elec/propeller-clock
« back to all changes in this revision
Viewing changes to propeller-clock/propeller-clock.pde
- browse files at revision 13
- compare with another revision
- download diff
- download tarball
- view history from revision 13
- Committer: edam
- Date: 2011-11-17 13:05:46 UTC
- Revision ID: edam@waxworlds.org-20111117130546-by4v2vm98emidlrk
updated propeller-clock code, added GPL text and renamed fan-test
- files added:
- propeller-clock.sch
- files removed:
- .bzrignore
- project
- src/util
- 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 renamed:
- src/Makefile => Makefile
- notes => Notes
- test/ => fan-test/
- test/fan-test/fan-test.ino => fan-test/fan-test.pde
- src/ => propeller-clock/
- src/propeller-clock.cc => propeller-clock/propeller-clock.pde
- files modified:
- electronics-information
added
removed
propeller-clock/propeller-clock.pde
1
/* -*- mode: c++; compile-command: "BOARD=pro5v make"; -*- */
2
1
/*
3
* propeller-clock.ino
2
* propeller-clock.pde
4
3
*
5
* Copyright (C) 2011 Tim Marston <tim@ed.am> and Dan Marston.
4
* Copyright (C) 2011 Tim Marston <edam@waxworlds.org>
6
5
*
7
6
* This file is part of propeller-clock (hereafter referred to as "this
8
* program"). See http://ed.am/dev/software/arduino/propeller-clock for more
7
* program"). See http://ed.am/software/arduino/propeller-clock for more
9
8
* information.
10
9
*
11
10
* This program is free software: you can redistribute it and/or modify
22
21
* along with this program. If not, see <http://www.gnu.org/licenses/>.
23
22
*/
24
23
25
/******************************************************************************
26
27
Set up:
28
29
* a PC fan is wired up to a 12V power supply
30
31
* the fan's SENSE (tachometer) pin connected to pin 2 on the
32
Arduino.
33
34
* the pins 4 to 13 on the Arduino should directly drive an LED (the
35
LED on pin 4 is in the centre of the clock face and the LED on pin
36
13 is at the outside.
37
38
* if a longer hand (and a larger clock face) is desired, pin 4 can be
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.
41
42
* a button should be attached to pin 3 that grounds it when pressed.
43
44
* A DS1307 remote clock is connected via I2C on analogue pins 4 and 5.
45
46
Implementation details:
47
48
* for a schematic, see ../project/propeller-clock.sch.
49
50
* the timing of the drawing of the clock face is recalculated with
51
every rotation of the propeller.
52
53
* a PC fan actually sends 2 tachometer pulses per revolution, so the
54
software skips every other one. This means that the clock may
55
appear upside-down if started with the propeller in the wrong
56
position. You will need to experiment to discover the position that
57
the propeller must be in when starting the clock.
58
59
Usage instructions:
60
61
* pressing the button cycles between variations of the current
62
display mode.
63
64
* pressing and holding the button for a second cycles between display
65
modes (e.g., analogue and digital).
66
67
* pressing and holding the button for 5 seconds enters "time set"
68
mode. In this mode, the following applies:
69
- the field that is being set flashes
70
- pressing the button increments the field currently being set
71
- pressing and holding the button for a second cycles through the
72
fields that can be set
73
- pressing and holding the button for 5 seconds sets the time and
74
exits "time set" mode
75
76
******************************************************************************/
77
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"
89
90
24
//_____________________________________________________________________________
91
25
// data
92
26
27
93
28
// when non-zero, the time (in microseconds) of a new fan pulse that
94
29
// has just occurred, which means that segment drawing needs to be
95
30
// restarted
96
static unsigned long _new_pulse_at = 0;
31
static unsigned long new_pulse_at = 0;
97
32
98
33
// the time (in microseconds) when the last fan pulse occurred
99
static unsigned long _last_pulse_at = 0;
34
static unsigned long last_pulse_at = 0;
100
35
101
36
// duration (in microseconds) that a segment should be displayed
102
static unsigned long _segment_step = 0;
37
static unsigned long segment_step = 0;
103
38
104
39
// remainder after divisor and a tally of the remainders for each segment
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
40
static unsigned long segment_step_sub_step = 0;
41
static unsigned long segment_step_sub = 0;
42
43
// display mode
44
static
45
121
46
122
47
//_____________________________________________________________________________
123
48
// code
124
49
125
50
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
// reset buttons
149
_button.set_press_mode( _major_mode != SETTINGS_MODE_IDX );
150
151
// give the mode a chance to init
152
switch( _major_mode ) {
153
case MAIN_MODE_IDX: activate_minor_mode(); break;
154
case SETTINGS_MODE_IDX: settings_mode_activate(); break;
155
}
156
}
157
158
159
// perform button events
160
void do_button_events()
161
{
162
// loop through pending events
163
while( int event = _button.get_event() )
51
// ISR to handle the pulses from the fan's tachiometer
52
void fanPulseHandler()
53
{
54
// the fan actually sends two pulses per revolution. These pulses
55
// may not be exactly evenly distributed around the rotation, so
56
// we can't recalculate times on every pulse. Instead, we ignore
57
// every other pulse so timings are based on a complete rotation.
58
static bool ignore = true;
59
ignore = !ignore;
60
if( !ignore )
164
61
{
165
switch( event )
166
{
167
case 1:
168
// short press
169
switch( _major_mode ) {
170
case MAIN_MODE_IDX:
171
switch( _minor_mode ) {
172
case ANALOGUE_CLOCK_IDX: analogue_clock_press(); break;
173
case DIGITAL_CLOCK_IDX: digital_clock_press(); break;
174
}
175
break;
176
case SETTINGS_MODE_IDX: settings_mode_press(); break;
177
}
178
break;
179
180
case 2:
181
// long press
182
switch( _major_mode ) {
183
case MAIN_MODE_IDX:
184
if( ++_minor_mode >= 3 )
185
_minor_mode = 0;
186
activate_minor_mode();
187
break;
188
case SETTINGS_MODE_IDX: settings_mode_long_press(); break;
189
}
190
break;
191
192
case 3:
193
// looooong press (change major mode)
194
if( ++_major_mode > 1 )
195
_major_mode = 0;
196
activate_major_mode();
197
break;
198
}
62
// set a new pulse time
63
new_pulse_at = micros();
199
64
}
200
65
}
201
66
202
67
203
// draw a display segment
204
void draw_next_segment( bool reset )
68
// draw a particular segment
69
void drawNextSegment( bool reset )
205
70
{
206
// keep track of segment
207
#if CLOCK_FORWARD
208
static int segment = ( NUM_SEGMENTS - CLOCK_SHIFT ) % NUM_SEGMENTS;
209
if( reset ) segment = ( NUM_SEGMENTS - CLOCK_SHIFT ) % NUM_SEGMENTS;
210
#else
211
static int segment = NUM_SEGMENTS - 1 - CLOCK_SHIFT;
212
if( reset ) segment = NUM_SEGMENTS - 1 - CLOCK_SHIFT;
213
#endif
214
215
// reset the text renderer
216
TextRenderer::reset_buffer();
217
218
// frame reset
219
if( reset ) {
220
switch( _major_mode ) {
221
case MAIN_MODE_IDX:
222
switch( _minor_mode ) {
223
case ANALOGUE_CLOCK_IDX: analogue_clock_draw_reset(); break;
224
case DIGITAL_CLOCK_IDX: digital_clock_draw_reset(); break;
225
}
226
break;
227
case SETTINGS_MODE_IDX: settings_mode_draw_reset(); break;
228
}
229
230
// tell the text services we're starting a new frame
231
Text::draw_reset();
232
}
233
234
// draw
235
switch( _major_mode ) {
236
case MAIN_MODE_IDX:
237
switch( _minor_mode ) {
238
case ANALOGUE_CLOCK_IDX: analogue_clock_draw( segment ); break;
239
case DIGITAL_CLOCK_IDX: digital_clock_draw( segment ); break;
240
case TEST_PATTERN_IDX: test_pattern_draw( segment ); break;
241
}
242
break;
243
case SETTINGS_MODE_IDX: settings_mode_draw( segment ); break;
244
}
245
246
// draw any text that was rendered
247
TextRenderer::output_buffer();
248
249
#if CLOCK_FORWARD
250
if( ++segment >= NUM_SEGMENTS ) segment = 0;
251
#else
252
if( --segment < 0 ) segment = NUM_SEGMENTS - 1;
253
#endif
71
static unsigned int segment = 0;
72
if( reset ) segment = 0;
73
segment++;
74
75
for( int a = 0; a < 10; a++ )
76
digitalWrite( a + 4, ( ( segment >> a ) & 1 )? HIGH : LOW );
254
77
}
255
78
256
79
257
80
// calculate time constants when a new pulse has occurred
258
void calculate_segment_times()
81
void calculateSegmentTimes()
259
82
{
260
83
// check for overflows, and only recalculate times if there isn't
261
84
// one (if there is, we'll just go with the last pulse's times)
262
if( _new_pulse_at > _last_pulse_at )
85
if( new_pulse_at > last_pulse_at )
263
86
{
264
87
// new segment stepping times
265
unsigned long delta = _new_pulse_at - _last_pulse_at;
266
_segment_step = delta / NUM_SEGMENTS;
267
_segment_step_sub = 0;
268
_segment_step_sub_step = delta % NUM_SEGMENTS;
88
unsigned long delta = new_pulse_at - last_pulse_at;
89
segment_step = delta / NUM_SEGMENTS;
90
segment_step_sub = 0;
91
segment_step_sub_step = delta % NUM_SEGMENTS;
269
92
}
270
93
271
94
// now we have dealt with this pulse, save the pulse time and
272
95
// clear new_pulse_at, ready for the next pulse
273
_last_pulse_at = _new_pulse_at;
274
_new_pulse_at = 0;
96
last_pulse_at = new_pulse_at;
97
new_pulse_at = 0;
275
98
}
276
99
277
100
278
101
// wait until it is time to draw the next segment or a new pulse has
279
102
// occurred
280
void wait_till_end_of_segment( bool reset )
103
void waitTillNextSegment( bool reset )
281
104
{
282
105
static unsigned long end_time = 0;
283
106
284
107
// handle reset
285
108
if( reset )
286
end_time = _last_pulse_at;
109
end_time = last_pulse_at;
287
110
288
111
// work out the time that this segment should be displayed until
289
end_time += _segment_step;
290
_segment_step_sub += _segment_step_sub_step;
291
if( _segment_step_sub >= NUM_SEGMENTS ) {
292
_segment_step_sub -= NUM_SEGMENTS;
112
end_time += segment_step;
113
semgment_step_sub += semgment_step_sub_step;
114
if( semgment_step_sub >= NUM_SEGMENTS ) {
115
semgment_step_sub -= NUM_SEGMENTS;
293
116
end_time++;
294
117
}
295
118
296
119
// wait
297
while( micros() < end_time && !_new_pulse_at );
298
}
299
300
301
// ISR to handle the pulses from the fan's tachiometer
302
void fan_pulse_handler()
303
{
304
// the fan actually sends two pulses per revolution. These pulses
305
// may not be exactly evenly distributed around the rotation, so
306
// we can't recalculate times on every pulse. Instead, we ignore
307
// every other pulse so timings are based on a complete rotation.
308
static bool ignore = true;
309
ignore = !ignore;
310
if( !ignore )
311
{
312
// set a new pulse time
313
_new_pulse_at = micros();
314
}
120
while( micros() < end_time && !new_pulse_at );
315
121
}
316
122
317
123
319
125
void setup()
320
126
{
321
127
// set up an interrupt handler on pin 2 to nitice fan pulses
322
attachInterrupt( 0, fan_pulse_handler, RISING );
128
attachInterrupt( 0, fanPulseHandler, RISING );
323
129
digitalWrite( 2, HIGH );
324
130
325
131
// set up output pins (4 to 13) for the led array
326
132
for( int a = 4; a < 14; a++ )
327
133
pinMode( a, OUTPUT );
328
134
329
// set up mode-switch button on pin 3
330
pinMode( 3, INPUT );
331
digitalWrite( 3, HIGH );
332
static int event_times[] = { 5, 500, 4000, 0 };
333
_button.set_event_times( event_times );
334
335
// initialise RTC
336
Time::init();
337
338
// init text renderer
339
TextRenderer::init();
340
341
// activate the minor mode
342
activate_major_mode();
135
// serial comms
136
Serial.begin( 9600 );
343
137
}
344
138
345
139
347
141
void loop()
348
142
{
349
143
// if there has been a new pulse, we'll be resetting the display
350
bool reset = _new_pulse_at? true : false;
351
352
// update button
353
_button.update();
354
355
// only do this stuff at the start of a display cycle, to ensure
356
// that no state changes mid-display
357
if( reset )
358
{
359
// calculate segment times
360
calculate_segment_times();
361
362
// keep track of time
363
Time::update();
364
365
// perform button events
366
do_button_events();
367
}
144
bool reset = new_pulse_at? true : false;
368
145
369
146
// draw this segment
370
draw_next_segment( reset );
147
drawNextSegment( reset );
148
149
// do we need to recalculate segment times?
150
if( reset )
151
calculateSegmentTimes();
371
152
372
153
// wait till it's time to draw the next segment
373
wait_till_end_of_segment( reset );
154
waitTillNextSegment( reset );
374
155
}
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0