/elec/propeller-clock

To get this branch, use:
bzr branch http://bzr.ed.am/elec/propeller-clock
43 by edam
added phantom button press test and temporarily disabled pin 4 (that drives the PNP transistor)
1
/* -*- mode: c++; compile-command: "BOARD=pro5v make"; -*- */
13 by edam
updated propeller-clock code, added GPL text and renamed fan-test
2
/*
27 by edam
updated propeller clock code for arduino-1.0 and fixed a compiler error
3
 * propeller-clock.ino
13 by edam
updated propeller-clock code, added GPL text and renamed fan-test
4
 *
27 by edam
updated propeller clock code for arduino-1.0 and fixed a compiler error
5
 * Copyright (C) 2011 Tim Marston <tim@ed.am> and Dan Marston.
13 by edam
updated propeller-clock code, added GPL text and renamed fan-test
6
 *
7
 * This file is part of propeller-clock (hereafter referred to as "this
29 by edam
corrected URL and removed scematic from src
8
 * program"). See http://ed.am/dev/software/arduino/propeller-clock for more
13 by edam
updated propeller-clock code, added GPL text and renamed fan-test
9
 * information.
10
 *
11
 * This program is free software: you can redistribute it and/or modify
12
 * it under the terms of the GNU Lesser General Public License as published
13
 * by the Free Software Foundation, either version 3 of the License, or
14
 * (at your option) any later version.
15
 *
16
 * This program is distributed in the hope that it will be useful,
17
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
18
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
19
 * GNU Lesser General Public License for more details.
20
 *
21
 * You should have received a copy of the GNU Lesser General Public License
22
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
23
 */
24
16 by edam
finished first revision of propeller-clock code (can display clock and test); added Bounce library
25
/******************************************************************************
26
23 by edam
renamed code directories and updated the comments in the code
27
Set up:
28
29
 * a PC fan is wired up to a 12V power supply
30
68 by Tim Marston
added frame reset code and inited minor mode flavours on mode activation
31
 * the fan's SENSE (tachometer) pin connected to pin 2 on the
32
   Arduino.
23 by edam
renamed code directories and updated the comments in the code
33
68 by Tim Marston
added frame reset code and inited minor mode flavours on mode activation
34
 * the pins 4 to 13 on the Arduino should directly drive an LED (the
23 by edam
renamed code directories and updated the comments in the code
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
35 by edam
initialise from real-time clock; updated Makefile
39
   used to indirectly drive a transistor which in turn drives several
68 by Tim Marston
added frame reset code and inited minor mode flavours on mode activation
40
   LEDs that turn on and off in unison in the centre of the clock.
23 by edam
renamed code directories and updated the comments in the code
41
42
 * a button should be attached to pin 3 that grounds it when pressed.
43
68 by Tim Marston
added frame reset code and inited minor mode flavours on mode activation
44
 * A DS1307 remote clock is connected via I2C on analogue pins 4 and 5.
35 by edam
initialise from real-time clock; updated Makefile
45
23 by edam
renamed code directories and updated the comments in the code
46
Implementation details:
47
35 by edam
initialise from real-time clock; updated Makefile
48
 * for a schematic, see ../project/propeller-clock.sch.
23 by edam
renamed code directories and updated the comments in the code
49
50
 * the timing of the drawing of the clock face is recalculated with
51
   every rotation of the propeller.
52
    
68 by Tim Marston
added frame reset code and inited minor mode flavours on mode activation
53
 * a PC fan actually sends 2 tachometer pulses per revolution, so the
23 by edam
renamed code directories and updated the comments in the code
54
   software skips every other one. This means that the clock may
55
   appear upside-down if started with the propeller in the wrong
68 by Tim Marston
added frame reset code and inited minor mode flavours on mode activation
56
   position. You will need to experiment to discover the position that
23 by edam
renamed code directories and updated the comments in the code
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
35 by edam
initialise from real-time clock; updated Makefile
73
    - pressing and holding the button for 5 seconds sets the time and
74
      exits "time set" mode
16 by edam
finished first revision of propeller-clock code (can display clock and test); added Bounce library
75
76
******************************************************************************/
77
59 by edam
removed ulibc, fixed button, added text rendering
78
#include "config.h"
58 by edam
removed Bounce library and updated/fixed new code
79
#include "button.h"
56 by edam
updated software to include drawing abstraction infrastructure
80
#include "time.h"
64 by Tim Marston
added support for eclipse project and converted to a manual Makefile
81
#include "Arduino.h"
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
82
#include "analogue_clock.h"
83
#include "digital_clock.h"
84
#include "test_pattern.h"
16 by edam
finished first revision of propeller-clock code (can display clock and test); added Bounce library
85
13 by edam
updated propeller-clock code, added GPL text and renamed fan-test
86
//_____________________________________________________________________________
87
//                                                                         data
88
89
// when non-zero, the time (in microseconds) of a new fan pulse that
90
// has just occurred, which means that segment drawing needs to be
91
// restarted
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
92
static unsigned long _new_pulse_at = 0;
11 by Dan
added initial propeller clock code
93
13 by edam
updated propeller-clock code, added GPL text and renamed fan-test
94
// the time (in microseconds) when the last fan pulse occurred
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
95
static unsigned long _last_pulse_at = 0;
13 by edam
updated propeller-clock code, added GPL text and renamed fan-test
96
97
// duration (in microseconds) that a segment should be displayed
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
98
static unsigned long _segment_step = 0;
13 by edam
updated propeller-clock code, added GPL text and renamed fan-test
99
100
// remainder after divisor and a tally of the remainders for each segment
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
101
static unsigned long _segment_step_sub_step = 0;
102
static unsigned long _segment_step_sub = 0;
13 by edam
updated propeller-clock code, added GPL text and renamed fan-test
103
58 by edam
removed Bounce library and updated/fixed new code
104
// the button
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
105
static Button _button( 3 );
106
107
// modes
108
static int _major_mode = 0;
109
static int _minor_mode = 0;
110
111
#define MAIN_MODE_IDX 0
112
113
#define ANALOGUE_CLOCK_IDX 0
114
#define DIGITAL_CLOCK_IDX 1
115
#define TEST_PATTERN_IDX 2
58 by edam
removed Bounce library and updated/fixed new code
116
13 by edam
updated propeller-clock code, added GPL text and renamed fan-test
117
//_____________________________________________________________________________
118
//                                                                         code
119
120
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
121
// activate the current minor mode
122
void activate_minor_mode()
123
{
124
	switch( _minor_mode ) {
68 by Tim Marston
added frame reset code and inited minor mode flavours on mode activation
125
	case ANALOGUE_CLOCK_IDX: analogue_clock_activate(); break;
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
126
	case DIGITAL_CLOCK_IDX: digital_clock_activate(); break;
127
	}
128
}
129
59 by edam
removed ulibc, fixed button, added text rendering
130
// perform button events
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
131
void do_button_events()
16 by edam
finished first revision of propeller-clock code (can display clock and test); added Bounce library
132
{
59 by edam
removed ulibc, fixed button, added text rendering
133
	// loop through pending events
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
134
	while( int event = _button.get_event() )
59 by edam
removed ulibc, fixed button, added text rendering
135
	{
136
		switch( event )
137
		{
138
		case 1:
139
			// short press
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
140
			switch( _major_mode ) {
141
			case MAIN_MODE_IDX:
142
				switch( _minor_mode ) {
143
				case ANALOGUE_CLOCK_IDX: analogue_clock_press(); break;
144
				case DIGITAL_CLOCK_IDX: digital_clock_press(); break;
145
				}
146
				break;
147
			}
59 by edam
removed ulibc, fixed button, added text rendering
148
			break;
149
150
		case 2:
151
			// long press
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
152
			switch( _major_mode ) {
153
			case MAIN_MODE_IDX:
154
				if( ++_minor_mode >= 3 )
155
					_minor_mode = 0;
156
				switch( _minor_mode ) {
157
				case DIGITAL_CLOCK_IDX: digital_clock_activate(); break;
158
				}
159
				break;
160
			}
59 by edam
removed ulibc, fixed button, added text rendering
161
			break;
162
163
		case 3:
164
			// looooong press (change major mode)
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
165
			if( ++_major_mode > 0 )
166
				_major_mode = 0;
167
			switch( _major_mode ) {
168
			case MAIN_MODE_IDX: _minor_mode = 0; break;
169
			}
170
			activate_minor_mode();
59 by edam
removed ulibc, fixed button, added text rendering
171
			break;
172
		}
13 by edam
updated propeller-clock code, added GPL text and renamed fan-test
173
	}
174
}
175
176
16 by edam
finished first revision of propeller-clock code (can display clock and test); added Bounce library
177
// draw a display segment
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
178
void draw_next_segment( bool reset )
16 by edam
finished first revision of propeller-clock code (can display clock and test); added Bounce library
179
{
53 by edam
conrtol segment number from one place and reverse the order the segments are drawn (backwards clock!)
180
	// keep track of segment
181
#if CLOCK_FORWARD
54 by edam
changed 12-tick to a double tick, added CLOCK_SHIFT to align face and fixed hour-hand
182
	static int segment = ( NUM_SEGMENTS - CLOCK_SHIFT ) % NUM_SEGMENTS;
183
	if( reset ) segment = ( NUM_SEGMENTS - CLOCK_SHIFT ) % NUM_SEGMENTS;
53 by edam
conrtol segment number from one place and reverse the order the segments are drawn (backwards clock!)
184
#else
54 by edam
changed 12-tick to a double tick, added CLOCK_SHIFT to align face and fixed hour-hand
185
	static int segment = NUM_SEGMENTS - 1 - CLOCK_SHIFT;
186
	if( reset ) segment = NUM_SEGMENTS - 1 - CLOCK_SHIFT;
53 by edam
conrtol segment number from one place and reverse the order the segments are drawn (backwards clock!)
187
#endif
188
68 by Tim Marston
added frame reset code and inited minor mode flavours on mode activation
189
	// frame reset
190
	if( reset ) {
191
		switch( _major_mode ) {
192
		case MAIN_MODE_IDX:
193
			switch( _minor_mode ) {
194
			case ANALOGUE_CLOCK_IDX: analogue_clock_draw_reset(); break;
195
			case DIGITAL_CLOCK_IDX: digital_clock_draw_reset(); break;
196
			}
197
			break;
198
		}
199
	}
200
56 by edam
updated software to include drawing abstraction infrastructure
201
	// draw
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
202
	switch( _major_mode ) {
203
	case MAIN_MODE_IDX:
204
		switch( _minor_mode ) {
205
		case ANALOGUE_CLOCK_IDX: analogue_clock_draw( segment ); break;
206
		case DIGITAL_CLOCK_IDX: digital_clock_draw( segment ); break;
207
		case TEST_PATTERN_IDX: test_pattern_draw( segment ); break;
208
		}
209
		break;
210
	}
53 by edam
conrtol segment number from one place and reverse the order the segments are drawn (backwards clock!)
211
212
#if CLOCK_FORWARD
54 by edam
changed 12-tick to a double tick, added CLOCK_SHIFT to align face and fixed hour-hand
213
	if( ++segment >= NUM_SEGMENTS ) segment = 0;
53 by edam
conrtol segment number from one place and reverse the order the segments are drawn (backwards clock!)
214
#else
54 by edam
changed 12-tick to a double tick, added CLOCK_SHIFT to align face and fixed hour-hand
215
	if( --segment < 0 ) segment = NUM_SEGMENTS - 1;
53 by edam
conrtol segment number from one place and reverse the order the segments are drawn (backwards clock!)
216
#endif
13 by edam
updated propeller-clock code, added GPL text and renamed fan-test
217
}
218
219
220
// calculate time constants when a new pulse has occurred
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
221
void calculate_segment_times()
13 by edam
updated propeller-clock code, added GPL text and renamed fan-test
222
{
223
	// check for overflows, and only recalculate times if there isn't
224
	// one (if there is, we'll just go with the last pulse's times)
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
225
	if( _new_pulse_at > _last_pulse_at )
13 by edam
updated propeller-clock code, added GPL text and renamed fan-test
226
	{
227
		// new segment stepping times
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
228
		unsigned long delta = _new_pulse_at - _last_pulse_at;
229
		_segment_step = delta / NUM_SEGMENTS;
230
		_segment_step_sub = 0;
231
		_segment_step_sub_step = delta % NUM_SEGMENTS;
13 by edam
updated propeller-clock code, added GPL text and renamed fan-test
232
	}
233
234
	// now we have dealt with this pulse, save the pulse time and
235
	// clear new_pulse_at, ready for the next pulse
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
236
	_last_pulse_at = _new_pulse_at;
237
	_new_pulse_at = 0;
13 by edam
updated propeller-clock code, added GPL text and renamed fan-test
238
}
239
240
241
// wait until it is time to draw the next segment or a new pulse has
242
// occurred
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
243
void wait_till_end_of_segment( bool reset )
13 by edam
updated propeller-clock code, added GPL text and renamed fan-test
244
{
245
	static unsigned long end_time = 0;
246
247
	// handle reset
248
	if( reset )
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
249
		end_time = _last_pulse_at;
13 by edam
updated propeller-clock code, added GPL text and renamed fan-test
250
251
	// work out the time that this segment should be displayed until
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
252
	end_time += _segment_step;
253
	_segment_step_sub += _segment_step_sub_step;
254
	if( _segment_step_sub >= NUM_SEGMENTS ) {
255
		_segment_step_sub -= NUM_SEGMENTS;
13 by edam
updated propeller-clock code, added GPL text and renamed fan-test
256
		end_time++;
257
	}
258
259
	// wait
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
260
	while( micros() < end_time && !_new_pulse_at );
13 by edam
updated propeller-clock code, added GPL text and renamed fan-test
261
}
262
263
16 by edam
finished first revision of propeller-clock code (can display clock and test); added Bounce library
264
// ISR to handle the pulses from the fan's tachiometer
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
265
void fan_pulse_handler()
16 by edam
finished first revision of propeller-clock code (can display clock and test); added Bounce library
266
{
267
	// the fan actually sends two pulses per revolution. These pulses
268
	// may not be exactly evenly distributed around the rotation, so
269
	// we can't recalculate times on every pulse. Instead, we ignore
270
	// every other pulse so timings are based on a complete rotation.
271
	static bool ignore = true;
272
	ignore = !ignore;
273
	if( !ignore )
274
	{
275
		// set a new pulse time
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
276
		_new_pulse_at = micros();
16 by edam
finished first revision of propeller-clock code (can display clock and test); added Bounce library
277
	}
278
}
279
280
13 by edam
updated propeller-clock code, added GPL text and renamed fan-test
281
// main setup
282
void setup()
283
{
284
	// set up an interrupt handler on pin 2 to nitice fan pulses
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
285
	attachInterrupt( 0, fan_pulse_handler, RISING );
13 by edam
updated propeller-clock code, added GPL text and renamed fan-test
286
	digitalWrite( 2, HIGH );
287
  
288
	// set up output pins (4 to 13) for the led array
289
	for( int a = 4; a < 14; a++ )
290
		pinMode( a, OUTPUT );
291
16 by edam
finished first revision of propeller-clock code (can display clock and test); added Bounce library
292
	// set up mode-switch button on pin 3
293
	pinMode( 3, INPUT );
42 by edam
lengthened button debounce time and turned on the pull-up resistor (oops!)
294
	digitalWrite( 3, HIGH );
62 by edam
moved some stuf round, created a re-usable pool of message buffers, genericised "modes" for messages
295
	static int event_times[] = { 5, 500, 4000, 0 };
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
296
	_button.set_event_times( event_times );
58 by edam
removed Bounce library and updated/fixed new code
297
68 by Tim Marston
added frame reset code and inited minor mode flavours on mode activation
298
	// initialise RTC
66 by Tim Marston
removed time singleton, not cause it saved much space, but cause i don't want singletons in this project!
299
	Time::init();
300
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
301
	// activate the minor mode
302
	switch( _major_mode ) {
303
	case MAIN_MODE_IDX: activate_minor_mode(); break;
304
	}
13 by edam
updated propeller-clock code, added GPL text and renamed fan-test
305
}
306
307
308
// main loop
11 by Dan
added initial propeller clock code
309
void loop()
310
{
13 by edam
updated propeller-clock code, added GPL text and renamed fan-test
311
	// if there has been a new pulse, we'll be resetting the display
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
312
	bool reset = _new_pulse_at? true : false;
13 by edam
updated propeller-clock code, added GPL text and renamed fan-test
313
59 by edam
removed ulibc, fixed button, added text rendering
314
	// update button
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
315
	_button.update();
59 by edam
removed ulibc, fixed button, added text rendering
316
16 by edam
finished first revision of propeller-clock code (can display clock and test); added Bounce library
317
	// only do this stuff at the start of a display cycle, to ensure
318
	// that no state changes mid-display
319
	if( reset )
320
	{
59 by edam
removed ulibc, fixed button, added text rendering
321
		// calculate segment times
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
322
		calculate_segment_times();
16 by edam
finished first revision of propeller-clock code (can display clock and test); added Bounce library
323
324
		// keep track of time
66 by Tim Marston
removed time singleton, not cause it saved much space, but cause i don't want singletons in this project!
325
		Time::update();
59 by edam
removed ulibc, fixed button, added text rendering
326
327
		// perform button events
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
328
		do_button_events();
16 by edam
finished first revision of propeller-clock code (can display clock and test); added Bounce library
329
	}
330
13 by edam
updated propeller-clock code, added GPL text and renamed fan-test
331
	// draw this segment
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
332
	draw_next_segment( reset );
13 by edam
updated propeller-clock code, added GPL text and renamed fan-test
333
334
	// wait till it's time to draw the next segment
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
335
	wait_till_end_of_segment( reset );
11 by Dan
added initial propeller clock code
336
}