/elec/propeller-clock

To get this branch, use:
bzr branch http://bzr.ed.am/elec/propeller-clock
88 by Tim Marston
updated emacs compile command and readjusted clock shift
1
/* -*- mode: c++; compile-command: "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"
87 by edam
switched back to using classes for modes
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"
82 by Tim Marston
added info mode, a '/' to the fonts and cleaned up a couple of bits
86
#include "modes/info_mode.h"
87 by edam
switched back to using classes for modes
87
#include "modes/test_pattern_mode.h"
71 by Tim Marston
added time set mode, made text renderer's buffer auto reset/output
88
#include "text.h"
89
#include "text_renderer.h"
90
#include "common.h"
16 by edam
finished first revision of propeller-clock code (can display clock and test); added Bounce library
91
13 by edam
updated propeller-clock code, added GPL text and renamed fan-test
92
//_____________________________________________________________________________
93
//                                                                         data
94
95
// when non-zero, the time (in microseconds) of a new fan pulse that
96
// has just occurred, which means that segment drawing needs to be
97
// restarted
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
98
static unsigned long _new_pulse_at = 0;
11 by Dan
added initial propeller clock code
99
13 by edam
updated propeller-clock code, added GPL text and renamed fan-test
100
// the time (in microseconds) when the last fan pulse occurred
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
101
static unsigned long _last_pulse_at = 0;
13 by edam
updated propeller-clock code, added GPL text and renamed fan-test
102
103
// duration (in microseconds) that a segment should be displayed
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
104
static unsigned long _segment_step = 0;
13 by edam
updated propeller-clock code, added GPL text and renamed fan-test
105
106
// 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!
107
static unsigned long _segment_step_sub_step = 0;
108
static unsigned long _segment_step_sub = 0;
13 by edam
updated propeller-clock code, added GPL text and renamed fan-test
109
58 by edam
removed Bounce library and updated/fixed new code
110
// the button
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
111
static Button _button( 3 );
112
87 by edam
switched back to using classes for modes
113
// major modes
114
static MajorMode *_modes[ 3 ];
115
116
// current major mode
117
static int _mode = 0;
58 by edam
removed Bounce library and updated/fixed new code
118
91 by Tim Marston
fixed text glitch; extended all modes; added screen flip super-long press;
119
// interupt handler's "ignore every other" flag
120
static bool _pulse_ignore = true;
121
13 by edam
updated propeller-clock code, added GPL text and renamed fan-test
122
//_____________________________________________________________________________
123
//                                                                         code
124
59 by edam
removed ulibc, fixed button, added text rendering
125
// perform button events
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
126
void do_button_events()
16 by edam
finished first revision of propeller-clock code (can display clock and test); added Bounce library
127
{
59 by edam
removed ulibc, fixed button, added text rendering
128
	// loop through pending events
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
129
	while( int event = _button.get_event() )
59 by edam
removed ulibc, fixed button, added text rendering
130
	{
131
		switch( event )
132
		{
133
		case 1:
134
			// short press
87 by edam
switched back to using classes for modes
135
			_modes[ _mode ]->press();
59 by edam
removed ulibc, fixed button, added text rendering
136
			break;
137
		case 2:
138
			// long press
87 by edam
switched back to using classes for modes
139
			_modes[ _mode ]->long_press();
59 by edam
removed ulibc, fixed button, added text rendering
140
			break;
141
		case 3:
142
			// looooong press (change major mode)
87 by edam
switched back to using classes for modes
143
			_modes[ _mode ]->deactivate();
144
			if( !_modes[ ++_mode ] ) _mode = 0;
145
			_modes[ _mode ]->activate();
59 by edam
removed ulibc, fixed button, added text rendering
146
			break;
91 by Tim Marston
fixed text glitch; extended all modes; added screen flip super-long press;
147
		case 4:
148
			// switch display upside-down
149
			_pulse_ignore = !_pulse_ignore;
150
			break;
59 by edam
removed ulibc, fixed button, added text rendering
151
		}
13 by edam
updated propeller-clock code, added GPL text and renamed fan-test
152
	}
153
}
154
155
16 by edam
finished first revision of propeller-clock code (can display clock and test); added Bounce library
156
// draw a display segment
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
157
void draw_next_segment( bool reset )
16 by edam
finished first revision of propeller-clock code (can display clock and test); added Bounce library
158
{
53 by edam
conrtol segment number from one place and reverse the order the segments are drawn (backwards clock!)
159
	// keep track of segment
91 by Tim Marston
fixed text glitch; extended all modes; added screen flip super-long press;
160
	static int segment = 0;
53 by edam
conrtol segment number from one place and reverse the order the segments are drawn (backwards clock!)
161
#if CLOCK_FORWARD
54 by edam
changed 12-tick to a double tick, added CLOCK_SHIFT to align face and fixed hour-hand
162
	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!)
163
#else
54 by edam
changed 12-tick to a double tick, added CLOCK_SHIFT to align face and fixed hour-hand
164
	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!)
165
#endif
166
87 by edam
switched back to using classes for modes
167
	// reset the text renderer's buffer
71 by Tim Marston
added time set mode, made text renderer's buffer auto reset/output
168
	TextRenderer::reset_buffer();
169
87 by edam
switched back to using classes for modes
170
	if( reset )
171
	{
172
		_modes[ _mode ]->draw_reset();
71 by Tim Marston
added time set mode, made text renderer's buffer auto reset/output
173
174
		// tell the text services we're starting a new frame
175
		Text::draw_reset();
68 by Tim Marston
added frame reset code and inited minor mode flavours on mode activation
176
	}
177
56 by edam
updated software to include drawing abstraction infrastructure
178
	// draw
87 by edam
switched back to using classes for modes
179
	_modes[ _mode ]->draw( segment );
180
90 by Tim Marston
text messages are now individually enabled and draw()n automatically
181
	// draw text
182
	Text::draw( segment );
53 by edam
conrtol segment number from one place and reverse the order the segments are drawn (backwards clock!)
183
87 by edam
switched back to using classes for modes
184
	// draw text rednerer's buffer
71 by Tim Marston
added time set mode, made text renderer's buffer auto reset/output
185
	TextRenderer::output_buffer();
186
53 by edam
conrtol segment number from one place and reverse the order the segments are drawn (backwards clock!)
187
#if CLOCK_FORWARD
54 by edam
changed 12-tick to a double tick, added CLOCK_SHIFT to align face and fixed hour-hand
188
	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!)
189
#else
54 by edam
changed 12-tick to a double tick, added CLOCK_SHIFT to align face and fixed hour-hand
190
	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!)
191
#endif
13 by edam
updated propeller-clock code, added GPL text and renamed fan-test
192
}
193
194
195
// calculate time constants when a new pulse has occurred
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
196
void calculate_segment_times()
13 by edam
updated propeller-clock code, added GPL text and renamed fan-test
197
{
198
	// check for overflows, and only recalculate times if there isn't
199
	// 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!
200
	if( _new_pulse_at > _last_pulse_at )
13 by edam
updated propeller-clock code, added GPL text and renamed fan-test
201
	{
202
		// new segment stepping times
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
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;
13 by edam
updated propeller-clock code, added GPL text and renamed fan-test
207
	}
208
209
	// now we have dealt with this pulse, save the pulse time and
210
	// clear new_pulse_at, ready for the next pulse
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
211
	_last_pulse_at = _new_pulse_at;
212
	_new_pulse_at = 0;
13 by edam
updated propeller-clock code, added GPL text and renamed fan-test
213
}
214
215
216
// wait until it is time to draw the next segment or a new pulse has
217
// occurred
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
218
void wait_till_end_of_segment( bool reset )
13 by edam
updated propeller-clock code, added GPL text and renamed fan-test
219
{
220
	static unsigned long end_time = 0;
221
222
	// handle reset
223
	if( reset )
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
224
		end_time = _last_pulse_at;
13 by edam
updated propeller-clock code, added GPL text and renamed fan-test
225
226
	// work out the time that this segment should be displayed until
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
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;
13 by edam
updated propeller-clock code, added GPL text and renamed fan-test
231
		end_time++;
232
	}
233
234
	// wait
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
235
	while( micros() < end_time && !_new_pulse_at );
13 by edam
updated propeller-clock code, added GPL text and renamed fan-test
236
}
237
238
82 by Tim Marston
added info mode, a '/' to the fonts and cleaned up a couple of bits
239
// ISR to handle the pulses from the fan's tachometer
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
240
void fan_pulse_handler()
16 by edam
finished first revision of propeller-clock code (can display clock and test); added Bounce library
241
{
242
	// the fan actually sends two pulses per revolution. These pulses
243
	// may not be exactly evenly distributed around the rotation, so
244
	// we can't recalculate times on every pulse. Instead, we ignore
245
	// every other pulse so timings are based on a complete rotation.
91 by Tim Marston
fixed text glitch; extended all modes; added screen flip super-long press;
246
	_pulse_ignore = !_pulse_ignore;
247
	if( !_pulse_ignore )
16 by edam
finished first revision of propeller-clock code (can display clock and test); added Bounce library
248
	{
249
		// set a new pulse time
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
250
		_new_pulse_at = micros();
16 by edam
finished first revision of propeller-clock code (can display clock and test); added Bounce library
251
	}
252
}
253
254
13 by edam
updated propeller-clock code, added GPL text and renamed fan-test
255
// main setup
256
void setup()
257
{
82 by Tim Marston
added info mode, a '/' to the fonts and cleaned up a couple of bits
258
	// set up an interrupt handler on pin 2 to notice fan pulses
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
259
	attachInterrupt( 0, fan_pulse_handler, RISING );
13 by edam
updated propeller-clock code, added GPL text and renamed fan-test
260
	digitalWrite( 2, HIGH );
261
  
262
	// set up output pins (4 to 13) for the led array
263
	for( int a = 4; a < 14; a++ )
264
		pinMode( a, OUTPUT );
265
16 by edam
finished first revision of propeller-clock code (can display clock and test); added Bounce library
266
	// set up mode-switch button on pin 3
267
	pinMode( 3, INPUT );
42 by edam
lengthened button debounce time and turned on the pull-up resistor (oops!)
268
	digitalWrite( 3, HIGH );
91 by Tim Marston
fixed text glitch; extended all modes; added screen flip super-long press;
269
	static int event_times[] = { 10, 500, 2000, 4000, 0 };
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
270
	_button.set_event_times( event_times );
58 by edam
removed Bounce library and updated/fixed new code
271
68 by Tim Marston
added frame reset code and inited minor mode flavours on mode activation
272
	// initialise RTC
91 by Tim Marston
fixed text glitch; extended all modes; added screen flip super-long press;
273
	Time::load_time();
66 by Tim Marston
removed time singleton, not cause it saved much space, but cause i don't want singletons in this project!
274
76 by edam
switch button to no interim presses during settings mode; added NVRAM support
275
	// init text renderer
276
	TextRenderer::init();
277
87 by edam
switched back to using classes for modes
278
	// reset text
279
	Text::reset();
280
	leds_off();
281
282
	static SwitcherMajorMode switcher;
89 by Tim Marston
moved rount Time a bit, and passed _button to SettingsMajorMode so that it can
283
	static SettingsMajorMode settings( _button );
87 by edam
switched back to using classes for modes
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();
13 by edam
updated propeller-clock code, added GPL text and renamed fan-test
293
}
294
295
296
// main loop
11 by Dan
added initial propeller clock code
297
void loop()
298
{
13 by edam
updated propeller-clock code, added GPL text and renamed fan-test
299
	// 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!
300
	bool reset = _new_pulse_at? true : false;
13 by edam
updated propeller-clock code, added GPL text and renamed fan-test
301
59 by edam
removed ulibc, fixed button, added text rendering
302
	// update button
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
303
	_button.update();
59 by edam
removed ulibc, fixed button, added text rendering
304
16 by edam
finished first revision of propeller-clock code (can display clock and test); added Bounce library
305
	// only do this stuff at the start of a display cycle, to ensure
306
	// that no state changes mid-display
307
	if( reset )
308
	{
59 by edam
removed ulibc, fixed button, added text rendering
309
		// calculate segment times
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
310
		calculate_segment_times();
16 by edam
finished first revision of propeller-clock code (can display clock and test); added Bounce library
311
312
		// 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!
313
		Time::update();
59 by edam
removed ulibc, fixed button, added text rendering
314
315
		// perform button events
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
316
		do_button_events();
16 by edam
finished first revision of propeller-clock code (can display clock and test); added Bounce library
317
	}
318
13 by edam
updated propeller-clock code, added GPL text and renamed fan-test
319
	// draw this segment
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
320
	draw_next_segment( reset );
13 by edam
updated propeller-clock code, added GPL text and renamed fan-test
321
322
	// wait till it's time to draw the next segment
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
323
	wait_till_end_of_segment( reset );
11 by Dan
added initial propeller clock code
324
}