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 45
- compare with another revision
- download diff
- download tarball
- view history from revision 45
- Committer: edam
- Date: 2012-02-10 21:25:33 UTC
- Revision ID: edam@waxworlds.org-20120210212533-fwi9b0isyr8my2lu
updated arduino.mk
- files added:
- src/util/Bounce.cpp
- files removed:
- src/analogue_clock_mode.cc
- files renamed:
- src/propeller-clock.cc => src/propeller-clock.ino
- files modified:
- .bzrignore
- src/Makefile
added
removed
src/propeller-clock.ino
75
75
76
76
******************************************************************************/
77
77
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"
84
#include "Arduino.h"
78
79
#include <Bounce.h>
80
#include <DS1307.h>
81
#include <Wire.h>
85
82
86
83
//_____________________________________________________________________________
87
84
// data
102
99
static unsigned long segment_step_sub_step = 0;
103
100
static unsigned long segment_step_sub = 0;
104
101
105
// the button
106
static Button button( 3 );
107
108
// major mode
109
static int major_mode = 0;
110
111
#define MAX_MAJOR_MODES 5
112
113
// major modes
114
static MajorMode *major_modes[ MAX_MAJOR_MODES ] = { 0 };
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 )
115
117
116
118
//_____________________________________________________________________________
117
119
// code
118
120
119
121
120
// perform button events
121
void doButtonEvents()
122
{
123
// loop through pending events
124
while( int event = button.get_event() )
125
{
126
switch( event )
127
{
128
case 1:
129
// short press
130
major_modes[ major_mode ]->press();
131
break;
132
133
case 2:
134
// long press
135
major_modes[ major_mode ]->long_press();
136
break;
137
138
case 3:
139
// looooong press (change major mode)
140
do {
141
if( ++major_mode >= MAX_MAJOR_MODES )
142
major_mode = 0;
143
} while( major_modes[ major_mode ] == NULL );
144
major_modes[ major_mode ]->activate();
145
break;
146
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;
147
159
}
148
160
}
149
161
}
150
162
151
163
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
152
233
// draw a display segment
153
234
void drawNextSegment( bool reset )
154
235
{
155
// keep track of segment
156
#if CLOCK_FORWARD
157
static int segment = ( NUM_SEGMENTS - CLOCK_SHIFT ) % NUM_SEGMENTS;
158
if( reset ) segment = ( NUM_SEGMENTS - CLOCK_SHIFT ) % NUM_SEGMENTS;
159
#else
160
static int segment = NUM_SEGMENTS - 1 - CLOCK_SHIFT;
161
if( reset ) segment = NUM_SEGMENTS - 1 - CLOCK_SHIFT;
162
#endif
163
164
// draw
165
Drawer &drawer = major_modes[ major_mode ]->get_drawer();
166
if( reset ) drawer.draw_reset();
167
drawer.draw( segment );
168
169
#if CLOCK_FORWARD
170
if( ++segment >= NUM_SEGMENTS ) segment = 0;
171
#else
172
if( --segment < 0 ) segment = NUM_SEGMENTS - 1;
173
#endif
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
}
174
251
}
175
252
176
253
197
274
198
275
// wait until it is time to draw the next segment or a new pulse has
199
276
// occurred
200
void waitTillEndOfSegment( bool reset )
277
void waitTillNextSegment( bool reset )
201
278
{
202
279
static unsigned long end_time = 0;
203
280
249
326
// set up mode-switch button on pin 3
250
327
pinMode( 3, INPUT );
251
328
digitalWrite( 3, HIGH );
252
static int event_times[] = { 5, 500, 4000, 0 };
253
button.set_event_times( event_times );
254
255
// set up major modes
256
static SwitcherMajorMode switcher_major_mode;
257
int mode = 0;
258
major_modes[ mode++ ] = &switcher_major_mode;
259
major_modes[ 0 ]->activate();
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 );
260
339
}
261
340
262
341
266
345
// if there has been a new pulse, we'll be resetting the display
267
346
bool reset = new_pulse_at? true : false;
268
347
269
// update button
270
button.update();
271
272
348
// only do this stuff at the start of a display cycle, to ensure
273
349
// that no state changes mid-display
274
350
if( reset )
275
351
{
276
// calculate segment times
277
calculateSegmentTimes();
352
// check buttons
353
checkButtons();
278
354
279
355
// keep track of time
280
Time &time = Time::get_instance();
281
time.update();
282
283
// perform button events
284
doButtonEvents();
356
trackTime();
285
357
}
286
358
287
359
// draw this segment
288
360
drawNextSegment( reset );
289
361
362
// do we need to recalculate segment times?
363
if( reset )
364
calculateSegmentTimes();
365
290
366
// wait till it's time to draw the next segment
291
waitTillEndOfSegment( reset );
367
waitTillNextSegment( reset );
292
368
}
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0