To get this branch, use:
bzr branch
http://bzr.ed.am/elec/propeller-clock
« back to all changes in this revision
Viewing changes to src/propeller-clock.ino
- browse files at revision 61
- compare with another revision
- download diff
- download tarball
- view history from revision 61
- Committer: edam
- Date: 2012-02-28 17:11:15 UTC
- Revision ID: edam@waxworlds.org-20120228171115-j3k91a3v71d3wnc1
cleanu
- files added:
- src/analogue_clock_mode.cc
- files removed:
- src/util/Bounce.cpp
- files modified:
- arduino.mk
added
removed
src/propeller-clock.ino
75
75
76
76
******************************************************************************/
77
77
78
79
#include <Bounce.h>
80
#include <DS1307.h>
81
#include <Wire.h>
78
#include "config.h"
79
#include "display.h"
80
#include "button.h"
81
#include "time.h"
82
#include "switcher_major_mode.h"
83
#include "drawer.h"
82
84
83
85
//_____________________________________________________________________________
84
86
// data
99
101
static unsigned long segment_step_sub_step = 0;
100
102
static unsigned long segment_step_sub = 0;
101
103
102
// flag to indicate that the drawing mode should be cycled to the next one
103
static bool inc_draw_mode = false;
104
105
// a bounce-managed button
106
static Bounce button( 3, 50 );
107
108
// the time
109
static int time_hours = 0;
110
static int time_minutes = 0;
111
static int time_seconds = 0;
112
113
// number of segments in a full display (rotation) is 60 (one per
114
// second) times the desired number of sub-divisions of a second
115
#define NUM_SECOND_SEGMENTS 5
116
#define NUM_SEGMENTS ( 60 * NUM_SECOND_SEGMENTS )
104
// the button
105
static Button button( 3 );
106
107
// major mode
108
static int major_mode = 0;
109
110
#define MAX_MAJOR_MODES 5
111
112
// major modes
113
static MajorMode *major_modes[ MAX_MAJOR_MODES ] = { 0 };
117
114
118
115
//_____________________________________________________________________________
119
116
// code
120
117
121
118
122
// check for button presses
123
void checkButtons()
124
{
125
// update buttons
126
button.update();
127
128
// notice button presses
129
if( button.risingEdge() )
130
inc_draw_mode = true;
131
}
132
133
134
// keep track of time
135
void trackTime()
136
{
137
// previous time and any carried-over milliseconds
138
static unsigned long last_time = millis();
139
static unsigned long carry = 0;
140
141
// how many milliseonds have elapsed since we last checked?
142
unsigned long next_time = millis();
143
unsigned long delta = next_time - last_time + carry;
144
145
// update the previous time and carried-over milliseconds
146
last_time = next_time;
147
carry = delta % 1000;
148
149
// add the seconds that have passed to the time
150
time_seconds += delta / 1000;
151
while( time_seconds >= 60 ) {
152
time_seconds -= 60;
153
time_minutes++;
154
if( time_minutes >= 60 ) {
155
time_minutes -= 60;
156
time_hours++;
157
if( time_hours >= 24 )
158
time_hours -= 24;
119
// perform button events
120
void doButtonEvents()
121
{
122
// loop through pending events
123
while( int event = button.get_event() )
124
{
125
switch( event )
126
{
127
case 1:
128
// short press
129
major_modes[ major_mode ]->press();
130
break;
131
132
case 2:
133
// long press
134
major_modes[ major_mode ]->long_press();
135
break;
136
137
case 3:
138
// looooong press (change major mode)
139
do {
140
if( ++major_mode >= MAX_MAJOR_MODES )
141
major_mode = 0;
142
} while( major_modes[ major_mode ] == NULL );
143
major_modes[ major_mode ]->activate();
144
break;
145
159
146
}
160
147
}
161
148
}
162
149
163
150
164
// turn an led on/off
165
void ledOn( int num, bool on )
166
{
167
if( num < 0 || num > 9 ) return;
168
169
// convert to pin no.
170
num += 4;
171
172
// pin 4 needs to be inverted (it's driving a PNP)
173
// NOTE: PIN 4 TEMPORARILY DISABLED
174
if( num == 4 ) on = true; //!on
175
176
digitalWrite( num, on? HIGH : LOW );
177
}
178
179
180
// draw a segment for the test display
181
void drawNextSegment_test( bool reset )
182
{
183
// keep track of segment
184
static unsigned int segment = 0;
185
if( reset ) segment = 0;
186
segment++;
187
188
// turn on inside and outside LEDs
189
ledOn( 0, true );
190
ledOn( 9, true );
191
192
// display segment number in binary across in the inside LEDs,
193
// with the LED on pin 12 showing the least-significant bit
194
for( int a = 0; a < 8; a++ )
195
ledOn( 8 - a, ( segment >> a ) & 1 );
196
}
197
198
199
// draw a segment for the time display
200
void drawNextSegment_time( bool reset )
201
{
202
static int second = 0;
203
static int segment = 0;
204
205
// handle display reset
206
if( reset ) {
207
second = 0;
208
segment = 0;
209
}
210
211
// what needs to be drawn?
212
bool draw_tick = !segment && second % 5 == 0;
213
bool draw_second = !segment && second == time_seconds;
214
bool draw_minute = !segment && second == time_minutes;
215
bool draw_hour = !segment && second == time_hours;
216
217
// set the LEDs
218
ledOn( 9, true );
219
ledOn( 8, draw_tick || draw_minute );
220
for( int a = 6; a <= 7; a++ )
221
ledOn( a, draw_minute || draw_second );
222
for( int a = 0; a <= 5; a++ )
223
ledOn( a, draw_minute || draw_second || draw_hour );
224
225
// inc position
226
if( ++segment >= NUM_SECOND_SEGMENTS ) {
227
segment = 0;
228
second++;
229
}
230
}
231
232
233
151
// draw a display segment
234
152
void drawNextSegment( bool reset )
235
153
{
236
static int draw_mode = 0;
237
238
// handle mode switch requests
239
if( reset && inc_draw_mode ) {
240
inc_draw_mode = false;
241
draw_mode++;
242
if( draw_mode >= 2 )
243
draw_mode = 0;
244
}
245
246
// draw the segment
247
switch( draw_mode ) {
248
case 0: drawNextSegment_test( reset ); break;
249
case 1: drawNextSegment_time( reset ); break;
250
}
154
// keep track of segment
155
#if CLOCK_FORWARD
156
static int segment = ( NUM_SEGMENTS - CLOCK_SHIFT ) % NUM_SEGMENTS;
157
if( reset ) segment = ( NUM_SEGMENTS - CLOCK_SHIFT ) % NUM_SEGMENTS;
158
#else
159
static int segment = NUM_SEGMENTS - 1 - CLOCK_SHIFT;
160
if( reset ) segment = NUM_SEGMENTS - 1 - CLOCK_SHIFT;
161
#endif
162
163
// draw
164
Drawer &drawer = major_modes[ major_mode ]->get_drawer();
165
if( reset ) drawer.draw_reset();
166
drawer.draw( segment );
167
168
#if CLOCK_FORWARD
169
if( ++segment >= NUM_SEGMENTS ) segment = 0;
170
#else
171
if( --segment < 0 ) segment = NUM_SEGMENTS - 1;
172
#endif
251
173
}
252
174
253
175
274
196
275
197
// wait until it is time to draw the next segment or a new pulse has
276
198
// occurred
277
void waitTillNextSegment( bool reset )
199
void waitTillEndOfSegment( bool reset )
278
200
{
279
201
static unsigned long end_time = 0;
280
202
326
248
// set up mode-switch button on pin 3
327
249
pinMode( 3, INPUT );
328
250
digitalWrite( 3, HIGH );
329
330
// get the time from the real-time clock
331
int rtc_data[ 7 ];
332
RTC.get( rtc_data, true );
333
time_hours = rtc_data[ DS1307_HR ];
334
time_minutes = rtc_data[ DS1307_MIN ];
335
time_seconds = rtc_data[ DS1307_SEC ];
336
337
// serial comms
338
Serial.begin( 9600 );
251
static int event_times[] = { 5, 1000, 4000, 0 };
252
button.set_event_times( event_times );
253
254
// set up major modes
255
static SwitcherMajorMode switcher_major_mode;
256
int mode = 0;
257
major_modes[ mode++ ] = &switcher_major_mode;
258
major_modes[ 0 ]->activate();
339
259
}
340
260
341
261
345
265
// if there has been a new pulse, we'll be resetting the display
346
266
bool reset = new_pulse_at? true : false;
347
267
268
// update button
269
button.update();
270
348
271
// only do this stuff at the start of a display cycle, to ensure
349
272
// that no state changes mid-display
350
273
if( reset )
351
274
{
352
// check buttons
353
checkButtons();
275
// calculate segment times
276
calculateSegmentTimes();
354
277
355
278
// keep track of time
356
trackTime();
279
Time &time = Time::get_instance();
280
time.update();
281
282
// perform button events
283
doButtonEvents();
357
284
}
358
285
359
286
// draw this segment
360
287
drawNextSegment( reset );
361
288
362
// do we need to recalculate segment times?
363
if( reset )
364
calculateSegmentTimes();
365
366
289
// wait till it's time to draw the next segment
367
waitTillNextSegment( reset );
290
waitTillEndOfSegment( reset );
368
291
}
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0