76
76
******************************************************************************/
78
80
#include "config.h"
82
#include "analogue_clock.h"
83
#include "digital_clock.h"
84
#include "test_pattern.h"
82
#include "mode_switcher.h"
86
85
//_____________________________________________________________________________
89
89
// when non-zero, the time (in microseconds) of a new fan pulse that
90
90
// has just occurred, which means that segment drawing needs to be
92
static unsigned long _new_pulse_at = 0;
92
static unsigned long new_pulse_at = 0;
94
94
// the time (in microseconds) when the last fan pulse occurred
95
static unsigned long _last_pulse_at = 0;
95
static unsigned long last_pulse_at = 0;
97
97
// duration (in microseconds) that a segment should be displayed
98
static unsigned long _segment_step = 0;
98
static unsigned long segment_step = 0;
100
100
// remainder after divisor and a tally of the remainders for each segment
101
static unsigned long _segment_step_sub_step = 0;
102
static unsigned long _segment_step_sub = 0;
105
static Button _button( 3 );
108
static int _major_mode = 0;
109
static int _minor_mode = 0;
111
#define MAIN_MODE_IDX 0
113
#define ANALOGUE_CLOCK_IDX 0
114
#define DIGITAL_CLOCK_IDX 1
115
#define TEST_PATTERN_IDX 2
101
static unsigned long segment_step_sub_step = 0;
102
static unsigned long segment_step_sub = 0;
104
// flag to indicate that the drawing mode should be cycled to the next one
105
static bool inc_draw_mode = false;
107
// a bounce-managed button
108
static Button button( 3 );
117
110
//_____________________________________________________________________________
121
// activate the current minor mode
122
void activate_minor_mode()
114
// check for button presses
124
switch( _minor_mode ) {
125
case DIGITAL_CLOCK_IDX: digital_clock_activate(); break;
118
int event = button.update();
123
inc_draw_mode = true;
129
// perform button events
130
void do_button_events()
129
// turn an led on/off
130
void ledOn( int num, bool on )
132
// loop through pending events
133
while( int event = _button.get_event() )
139
switch( _major_mode ) {
141
switch( _minor_mode ) {
142
case ANALOGUE_CLOCK_IDX: analogue_clock_press(); break;
143
case DIGITAL_CLOCK_IDX: digital_clock_press(); break;
151
switch( _major_mode ) {
153
if( ++_minor_mode >= 3 )
155
switch( _minor_mode ) {
156
case DIGITAL_CLOCK_IDX: digital_clock_activate(); break;
163
// looooong press (change major mode)
164
if( ++_major_mode > 0 )
166
switch( _major_mode ) {
167
case MAIN_MODE_IDX: _minor_mode = 0; break;
169
activate_minor_mode();
132
if( num < 0 || num > 9 ) return;
134
// convert to pin no.
137
// pin 4 needs to be inverted (it's driving a PNP)
138
if( num == 4 ) on = !on;
140
digitalWrite( num, on? HIGH : LOW );
176
144
// draw a display segment
177
void draw_next_segment( bool reset )
145
void drawNextSegment( bool reset )
147
static ModeSwitcher mode_switcher;
148
static bool init = false;
152
mode_switcher.activate();
179
155
// keep track of segment
180
156
#if CLOCK_FORWARD
181
157
static int segment = ( NUM_SEGMENTS - CLOCK_SHIFT ) % NUM_SEGMENTS;
207
177
// calculate time constants when a new pulse has occurred
208
void calculate_segment_times()
178
void calculateSegmentTimes()
210
180
// check for overflows, and only recalculate times if there isn't
211
181
// one (if there is, we'll just go with the last pulse's times)
212
if( _new_pulse_at > _last_pulse_at )
182
if( new_pulse_at > last_pulse_at )
214
184
// new segment stepping times
215
unsigned long delta = _new_pulse_at - _last_pulse_at;
216
_segment_step = delta / NUM_SEGMENTS;
217
_segment_step_sub = 0;
218
_segment_step_sub_step = delta % NUM_SEGMENTS;
185
unsigned long delta = new_pulse_at - last_pulse_at;
186
segment_step = delta / NUM_SEGMENTS;
187
segment_step_sub = 0;
188
segment_step_sub_step = delta % NUM_SEGMENTS;
221
191
// now we have dealt with this pulse, save the pulse time and
222
192
// clear new_pulse_at, ready for the next pulse
223
_last_pulse_at = _new_pulse_at;
193
last_pulse_at = new_pulse_at;
228
198
// wait until it is time to draw the next segment or a new pulse has
230
void wait_till_end_of_segment( bool reset )
200
void waitTillNextSegment( bool reset )
232
202
static unsigned long end_time = 0;
236
end_time = _last_pulse_at;
206
end_time = last_pulse_at;
238
208
// work out the time that this segment should be displayed until
239
end_time += _segment_step;
240
_segment_step_sub += _segment_step_sub_step;
241
if( _segment_step_sub >= NUM_SEGMENTS ) {
242
_segment_step_sub -= NUM_SEGMENTS;
209
end_time += segment_step;
210
segment_step_sub += segment_step_sub_step;
211
if( segment_step_sub >= NUM_SEGMENTS ) {
212
segment_step_sub -= NUM_SEGMENTS;
247
while( micros() < end_time && !_new_pulse_at );
217
while( micros() < end_time && !new_pulse_at );
251
221
// ISR to handle the pulses from the fan's tachiometer
252
void fan_pulse_handler()
222
void fanPulseHandler()
254
224
// the fan actually sends two pulses per revolution. These pulses
255
225
// may not be exactly evenly distributed around the rotation, so
279
249
// set up mode-switch button on pin 3
280
250
pinMode( 3, INPUT );
281
251
digitalWrite( 3, HIGH );
282
static int event_times[] = { 5, 500, 4000, 0 };
283
_button.set_event_times( event_times );
252
button.add_event_at( 5, 1 );
253
button.add_event_at( 1000, 2 );
254
button.add_event_at( 4000, 3 );
285
// activate the minor mode
286
switch( _major_mode ) {
287
case MAIN_MODE_IDX: activate_minor_mode(); break;
257
Serial.begin( 9600 );
295
264
// if there has been a new pulse, we'll be resetting the display
296
bool reset = _new_pulse_at? true : false;
265
bool reset = new_pulse_at? true : false;
301
267
// only do this stuff at the start of a display cycle, to ensure
302
268
// that no state changes mid-display
305
// calculate segment times
306
calculate_segment_times();
308
274
// keep track of time
309
275
Time &time = Time::get_instance();
312
// perform button events
316
279
// draw this segment
317
draw_next_segment( reset );
280
drawNextSegment( reset );
282
// do we need to recalculate segment times?
284
calculateSegmentTimes();
319
286
// wait till it's time to draw the next segment
320
wait_till_end_of_segment( reset );
287
waitTillNextSegment( reset );
added
removed
src/propeller-clock.ino
