/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"
81 by Tim Marston
moved modes to a subdirectory
82
#include "modes/analogue_clock.h"
83
#include "modes/digital_clock.h"
84
#include "modes/test_pattern.h"
85
#include "modes/settings_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"
71 by Tim Marston
added time set mode, made text renderer's buffer auto reset/output
87
#include "text.h"
88
#include "text_renderer.h"
89
#include "common.h"
16 by edam
finished first revision of propeller-clock code (can display clock and test); added Bounce library
90
13 by edam
updated propeller-clock code, added GPL text and renamed fan-test
91
//_____________________________________________________________________________
92
//                                                                         data
93
94
// when non-zero, the time (in microseconds) of a new fan pulse that
95
// has just occurred, which means that segment drawing needs to be
96
// restarted
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
97
static unsigned long _new_pulse_at = 0;
11 by Dan
added initial propeller clock code
98
13 by edam
updated propeller-clock code, added GPL text and renamed fan-test
99
// the time (in microseconds) when the last fan pulse occurred
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
100
static unsigned long _last_pulse_at = 0;
13 by edam
updated propeller-clock code, added GPL text and renamed fan-test
101
102
// duration (in microseconds) that a segment should be displayed
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
103
static unsigned long _segment_step = 0;
13 by edam
updated propeller-clock code, added GPL text and renamed fan-test
104
105
// 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!
106
static unsigned long _segment_step_sub_step = 0;
107
static unsigned long _segment_step_sub = 0;
13 by edam
updated propeller-clock code, added GPL text and renamed fan-test
108
58 by edam
removed Bounce library and updated/fixed new code
109
// the button
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
110
static Button _button( 3 );
111
112
// modes
113
static int _major_mode = 0;
114
static int _minor_mode = 0;
115
86 by Tim Marston
various tweaks, a (failed) attempt to fix text reset bug and added TODO
116
#define SETTINGS_MODE_IDX 1
117
#define MAIN_MODE_IDX 0
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
118
119
#define ANALOGUE_CLOCK_IDX 0
120
#define DIGITAL_CLOCK_IDX 1
86 by Tim Marston
various tweaks, a (failed) attempt to fix text reset bug and added TODO
121
#define INFO_MODE_IDX 2
122
#define TEST_PATTERN_IDX 3
58 by edam
removed Bounce library and updated/fixed new code
123
13 by edam
updated propeller-clock code, added GPL text and renamed fan-test
124
//_____________________________________________________________________________
125
//                                                                         code
126
127
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
128
// activate the current minor mode
129
void activate_minor_mode()
130
{
74 by Tim Marston
fixed bug initialising text services on mode activation
131
	// reset text
132
	Text::reset();
133
	leds_off();
134
135
	// give the mode a chance to init
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
136
	switch( _minor_mode ) {
68 by Tim Marston
added frame reset code and inited minor mode flavours on mode activation
137
	case ANALOGUE_CLOCK_IDX: analogue_clock_activate(); break;
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
138
	case DIGITAL_CLOCK_IDX: digital_clock_activate(); break;
82 by Tim Marston
added info mode, a '/' to the fonts and cleaned up a couple of bits
139
	case INFO_MODE_IDX: info_mode_activate(); break;
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
140
	}
71 by Tim Marston
added time set mode, made text renderer's buffer auto reset/output
141
}
142
143
144
// activate major mode
145
void activate_major_mode()
146
{
74 by Tim Marston
fixed bug initialising text services on mode activation
147
	// reset text
148
	Text::reset();
149
	leds_off();
150
76 by edam
switch button to no interim presses during settings mode; added NVRAM support
151
	// reset buttons
152
	_button.set_press_mode( _major_mode != SETTINGS_MODE_IDX );
153
74 by Tim Marston
fixed bug initialising text services on mode activation
154
	// give the mode a chance to init
71 by Tim Marston
added time set mode, made text renderer's buffer auto reset/output
155
	switch( _major_mode ) {
156
	case MAIN_MODE_IDX: activate_minor_mode(); break;
157
	case SETTINGS_MODE_IDX: settings_mode_activate(); break;
158
	}
159
}
160
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
161
59 by edam
removed ulibc, fixed button, added text rendering
162
// perform button events
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
163
void do_button_events()
16 by edam
finished first revision of propeller-clock code (can display clock and test); added Bounce library
164
{
59 by edam
removed ulibc, fixed button, added text rendering
165
	// loop through pending events
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
166
	while( int event = _button.get_event() )
59 by edam
removed ulibc, fixed button, added text rendering
167
	{
168
		switch( event )
169
		{
170
		case 1:
171
			// short press
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
172
			switch( _major_mode ) {
173
			case MAIN_MODE_IDX:
174
				switch( _minor_mode ) {
175
				case ANALOGUE_CLOCK_IDX: analogue_clock_press(); break;
176
				case DIGITAL_CLOCK_IDX: digital_clock_press(); break;
82 by Tim Marston
added info mode, a '/' to the fonts and cleaned up a couple of bits
177
				case INFO_MODE_IDX: info_mode_press(); break;
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
178
				}
179
				break;
71 by Tim Marston
added time set mode, made text renderer's buffer auto reset/output
180
			case SETTINGS_MODE_IDX: settings_mode_press(); break;
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
181
			}
59 by edam
removed ulibc, fixed button, added text rendering
182
			break;
183
184
		case 2:
185
			// long press
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
186
			switch( _major_mode ) {
187
			case MAIN_MODE_IDX:
86 by Tim Marston
various tweaks, a (failed) attempt to fix text reset bug and added TODO
188
				if( ++_minor_mode >= 4 )
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
189
					_minor_mode = 0;
71 by Tim Marston
added time set mode, made text renderer's buffer auto reset/output
190
				activate_minor_mode();
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
191
				break;
71 by Tim Marston
added time set mode, made text renderer's buffer auto reset/output
192
			case SETTINGS_MODE_IDX: settings_mode_long_press(); break;
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
193
			}
59 by edam
removed ulibc, fixed button, added text rendering
194
			break;
195
196
		case 3:
197
			// looooong press (change major mode)
71 by Tim Marston
added time set mode, made text renderer's buffer auto reset/output
198
			if( ++_major_mode > 1 )
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
199
				_major_mode = 0;
71 by Tim Marston
added time set mode, made text renderer's buffer auto reset/output
200
			activate_major_mode();
59 by edam
removed ulibc, fixed button, added text rendering
201
			break;
202
		}
13 by edam
updated propeller-clock code, added GPL text and renamed fan-test
203
	}
204
}
205
206
16 by edam
finished first revision of propeller-clock code (can display clock and test); added Bounce library
207
// draw a display segment
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
208
void draw_next_segment( bool reset )
16 by edam
finished first revision of propeller-clock code (can display clock and test); added Bounce library
209
{
53 by edam
conrtol segment number from one place and reverse the order the segments are drawn (backwards clock!)
210
	// keep track of segment
211
#if CLOCK_FORWARD
54 by edam
changed 12-tick to a double tick, added CLOCK_SHIFT to align face and fixed hour-hand
212
	static int segment = ( NUM_SEGMENTS - CLOCK_SHIFT ) % NUM_SEGMENTS;
213
	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!)
214
#else
54 by edam
changed 12-tick to a double tick, added CLOCK_SHIFT to align face and fixed hour-hand
215
	static int segment = NUM_SEGMENTS - 1 - CLOCK_SHIFT;
216
	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!)
217
#endif
218
71 by Tim Marston
added time set mode, made text renderer's buffer auto reset/output
219
	// reset the text renderer
220
	TextRenderer::reset_buffer();
221
68 by Tim Marston
added frame reset code and inited minor mode flavours on mode activation
222
	// frame reset
223
	if( reset ) {
224
		switch( _major_mode ) {
225
		case MAIN_MODE_IDX:
226
			switch( _minor_mode ) {
227
			case ANALOGUE_CLOCK_IDX: analogue_clock_draw_reset(); break;
228
			case DIGITAL_CLOCK_IDX: digital_clock_draw_reset(); break;
82 by Tim Marston
added info mode, a '/' to the fonts and cleaned up a couple of bits
229
			case INFO_MODE_IDX: info_mode_draw_reset(); break;
68 by Tim Marston
added frame reset code and inited minor mode flavours on mode activation
230
			}
231
			break;
71 by Tim Marston
added time set mode, made text renderer's buffer auto reset/output
232
		case SETTINGS_MODE_IDX: settings_mode_draw_reset(); break;
68 by Tim Marston
added frame reset code and inited minor mode flavours on mode activation
233
		}
71 by Tim Marston
added time set mode, made text renderer's buffer auto reset/output
234
235
		// tell the text services we're starting a new frame
236
		Text::draw_reset();
68 by Tim Marston
added frame reset code and inited minor mode flavours on mode activation
237
	}
238
56 by edam
updated software to include drawing abstraction infrastructure
239
	// draw
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
240
	switch( _major_mode ) {
241
	case MAIN_MODE_IDX:
242
		switch( _minor_mode ) {
243
		case ANALOGUE_CLOCK_IDX: analogue_clock_draw( segment ); break;
244
		case DIGITAL_CLOCK_IDX: digital_clock_draw( segment ); break;
245
		case TEST_PATTERN_IDX: test_pattern_draw( segment ); break;
82 by Tim Marston
added info mode, a '/' to the fonts and cleaned up a couple of bits
246
		case INFO_MODE_IDX: info_mode_draw( segment ); break;
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
247
		}
248
		break;
71 by Tim Marston
added time set mode, made text renderer's buffer auto reset/output
249
	case SETTINGS_MODE_IDX: settings_mode_draw( segment ); break;
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
250
	}
86 by Tim Marston
various tweaks, a (failed) attempt to fix text reset bug and added TODO
251
	Text::post_draw();
53 by edam
conrtol segment number from one place and reverse the order the segments are drawn (backwards clock!)
252
71 by Tim Marston
added time set mode, made text renderer's buffer auto reset/output
253
	// draw any text that was rendered
254
	TextRenderer::output_buffer();
255
53 by edam
conrtol segment number from one place and reverse the order the segments are drawn (backwards clock!)
256
#if CLOCK_FORWARD
54 by edam
changed 12-tick to a double tick, added CLOCK_SHIFT to align face and fixed hour-hand
257
	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!)
258
#else
54 by edam
changed 12-tick to a double tick, added CLOCK_SHIFT to align face and fixed hour-hand
259
	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!)
260
#endif
13 by edam
updated propeller-clock code, added GPL text and renamed fan-test
261
}
262
263
264
// calculate time constants when a new pulse has occurred
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
265
void calculate_segment_times()
13 by edam
updated propeller-clock code, added GPL text and renamed fan-test
266
{
267
	// check for overflows, and only recalculate times if there isn't
268
	// 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!
269
	if( _new_pulse_at > _last_pulse_at )
13 by edam
updated propeller-clock code, added GPL text and renamed fan-test
270
	{
271
		// new segment stepping times
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
272
		unsigned long delta = _new_pulse_at - _last_pulse_at;
273
		_segment_step = delta / NUM_SEGMENTS;
274
		_segment_step_sub = 0;
275
		_segment_step_sub_step = delta % NUM_SEGMENTS;
13 by edam
updated propeller-clock code, added GPL text and renamed fan-test
276
	}
277
278
	// now we have dealt with this pulse, save the pulse time and
279
	// clear new_pulse_at, ready for the next pulse
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
280
	_last_pulse_at = _new_pulse_at;
281
	_new_pulse_at = 0;
13 by edam
updated propeller-clock code, added GPL text and renamed fan-test
282
}
283
284
285
// wait until it is time to draw the next segment or a new pulse has
286
// occurred
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
287
void wait_till_end_of_segment( bool reset )
13 by edam
updated propeller-clock code, added GPL text and renamed fan-test
288
{
289
	static unsigned long end_time = 0;
290
291
	// handle reset
292
	if( reset )
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
293
		end_time = _last_pulse_at;
13 by edam
updated propeller-clock code, added GPL text and renamed fan-test
294
295
	// work out the time that this segment should be displayed until
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
296
	end_time += _segment_step;
297
	_segment_step_sub += _segment_step_sub_step;
298
	if( _segment_step_sub >= NUM_SEGMENTS ) {
299
		_segment_step_sub -= NUM_SEGMENTS;
13 by edam
updated propeller-clock code, added GPL text and renamed fan-test
300
		end_time++;
301
	}
302
303
	// wait
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
304
	while( micros() < end_time && !_new_pulse_at );
13 by edam
updated propeller-clock code, added GPL text and renamed fan-test
305
}
306
307
82 by Tim Marston
added info mode, a '/' to the fonts and cleaned up a couple of bits
308
// ISR to handle the pulses from the fan's tachometer
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
309
void fan_pulse_handler()
16 by edam
finished first revision of propeller-clock code (can display clock and test); added Bounce library
310
{
311
	// the fan actually sends two pulses per revolution. These pulses
312
	// may not be exactly evenly distributed around the rotation, so
313
	// we can't recalculate times on every pulse. Instead, we ignore
314
	// every other pulse so timings are based on a complete rotation.
315
	static bool ignore = true;
316
	ignore = !ignore;
317
	if( !ignore )
318
	{
319
		// set a new pulse time
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
320
		_new_pulse_at = micros();
16 by edam
finished first revision of propeller-clock code (can display clock and test); added Bounce library
321
	}
322
}
323
324
13 by edam
updated propeller-clock code, added GPL text and renamed fan-test
325
// main setup
326
void setup()
327
{
82 by Tim Marston
added info mode, a '/' to the fonts and cleaned up a couple of bits
328
	// 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!
329
	attachInterrupt( 0, fan_pulse_handler, RISING );
13 by edam
updated propeller-clock code, added GPL text and renamed fan-test
330
	digitalWrite( 2, HIGH );
331
  
332
	// set up output pins (4 to 13) for the led array
333
	for( int a = 4; a < 14; a++ )
334
		pinMode( a, OUTPUT );
335
16 by edam
finished first revision of propeller-clock code (can display clock and test); added Bounce library
336
	// set up mode-switch button on pin 3
337
	pinMode( 3, INPUT );
42 by edam
lengthened button debounce time and turned on the pull-up resistor (oops!)
338
	digitalWrite( 3, HIGH );
62 by edam
moved some stuf round, created a re-usable pool of message buffers, genericised "modes" for messages
339
	static int event_times[] = { 5, 500, 4000, 0 };
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
340
	_button.set_event_times( event_times );
58 by edam
removed Bounce library and updated/fixed new code
341
68 by Tim Marston
added frame reset code and inited minor mode flavours on mode activation
342
	// 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!
343
	Time::init();
344
76 by edam
switch button to no interim presses during settings mode; added NVRAM support
345
	// init text renderer
346
	TextRenderer::init();
347
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
348
	// activate the minor mode
71 by Tim Marston
added time set mode, made text renderer's buffer auto reset/output
349
	activate_major_mode();
13 by edam
updated propeller-clock code, added GPL text and renamed fan-test
350
}
351
352
353
// main loop
11 by Dan
added initial propeller clock code
354
void loop()
355
{
13 by edam
updated propeller-clock code, added GPL text and renamed fan-test
356
	// 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!
357
	bool reset = _new_pulse_at? true : false;
13 by edam
updated propeller-clock code, added GPL text and renamed fan-test
358
59 by edam
removed ulibc, fixed button, added text rendering
359
	// update button
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
360
	_button.update();
59 by edam
removed ulibc, fixed button, added text rendering
361
16 by edam
finished first revision of propeller-clock code (can display clock and test); added Bounce library
362
	// only do this stuff at the start of a display cycle, to ensure
363
	// that no state changes mid-display
364
	if( reset )
365
	{
59 by edam
removed ulibc, fixed button, added text rendering
366
		// calculate segment times
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
367
		calculate_segment_times();
16 by edam
finished first revision of propeller-clock code (can display clock and test); added Bounce library
368
369
		// 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!
370
		Time::update();
59 by edam
removed ulibc, fixed button, added text rendering
371
372
		// perform button events
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
373
		do_button_events();
16 by edam
finished first revision of propeller-clock code (can display clock and test); added Bounce library
374
	}
375
13 by edam
updated propeller-clock code, added GPL text and renamed fan-test
376
	// draw this segment
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
377
	draw_next_segment( reset );
13 by edam
updated propeller-clock code, added GPL text and renamed fan-test
378
379
	// wait till it's time to draw the next segment
65 by Tim Marston
removed most OOP/inheritance crap, saved loads of space!
380
	wait_till_end_of_segment( reset );
11 by Dan
added initial propeller clock code
381
}