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 56
- compare with another revision
- download diff
- download tarball
- view history from revision 56
- Committer: edam
- Date: 2012-02-25 01:31:17 UTC
- Revision ID: tim@ed.am-20120225013117-53ed8yahoreoms76
updated software to include drawing abstraction infrastructure
- files added:
- arduino.mk
- test/fan-test
- test/fan-test/Makefile
- test/led-test
- test/led-test/Makefile
- test/phantom-button-presses
- test/phantom-button-presses/Makefile
- files removed:
- src/propeller-clock.sch
- files renamed:
- Notes => notes
- src/propeller-clock.pde => src/propeller-clock.ino
- src/utility/ => src/util/
- test/fan-test.pde => test/fan-test/fan-test.ino
- files modified:
- .bzrignore
- src/Makefile
added
removed
src/propeller-clock.ino
1
/* -*- mode: c++; compile-command: "BOARD=pro5v make"; -*- */
1
2
/*
2
* propeller-clock.pde
3
* propeller-clock.ino
3
4
*
4
* Copyright (C) 2011 Tim Marston <edam@waxworlds.org>
5
* Copyright (C) 2011 Tim Marston <tim@ed.am> and Dan Marston.
5
6
*
6
7
* This file is part of propeller-clock (hereafter referred to as "this
7
* program"). See http://ed.am/software/arduino/propeller-clock for more
8
* program"). See http://ed.am/dev/software/arduino/propeller-clock for more
8
9
* information.
9
10
*
10
11
* This program is free software: you can redistribute it and/or modify
35
36
13 is at the outside.
36
37
37
38
* if a longer hand (and a larger clock face) is desired, pin 4 can be
38
used to indirectly drive (via a MOSFET) multiple LEDs which turn on
39
and off in unison in the centre of the clock.
39
used to indirectly drive a transistor which in turn drives several
40
LEDs that turn on anf off in unison in the centre of the clock.
40
41
41
42
* a button should be attached to pin 3 that grounds it when pressed.
42
43
44
* A DS1307 remote clock is connected via I2C on analog pins 4 and 5.
45
43
46
Implementation details:
44
47
45
* for a schematic, see project/propeller-clock.sch.
48
* for a schematic, see ../project/propeller-clock.sch.
46
49
47
50
* the timing of the drawing of the clock face is recalculated with
48
51
every rotation of the propeller.
67
70
- pressing the button increments the field currently being set
68
71
- pressing and holding the button for a second cycles through the
69
72
fields that can be set
70
- press and holding the button for 5 seconds to finish
73
- pressing and holding the button for 5 seconds sets the time and
74
exits "time set" mode
71
75
72
76
******************************************************************************/
73
77
74
78
75
#include <Bounce.h>
79
#include <button.h>
80
#include "config.h"
81
#include "time.h"
82
#include "mode_switcher.h"
83
#include "drawer.h"
76
84
77
85
//_____________________________________________________________________________
78
86
// data
97
105
static bool inc_draw_mode = false;
98
106
99
107
// a bounce-managed button
100
static Bounce button( 3, 5 );
101
102
// the time
103
static int time_hours = 0;
104
static int time_minutes = 0;
105
static int time_seconds = 0;
106
107
// number of segments in a full display (rotation) is 60 (one per
108
// second) times the desired number of sub-divisions of a second
109
#define NUM_SECOND_SEGMENTS 5
110
#define NUM_SEGMENTS ( 60 * NUM_SECOND_SEGMENTS )
108
static Button button( 3 );
111
109
112
110
//_____________________________________________________________________________
113
111
// code
117
115
void checkButtons()
118
116
{
119
117
// update buttons
120
button.update();
118
int event = button.update();
121
119
122
// notice button presses
123
if( button.risingEdge() )
120
// handle any events
121
switch( event ) {
122
case 1:
124
123
inc_draw_mode = true;
125
}
126
127
128
// keep track of time
129
void trackTime()
130
{
131
// previous time and any carried-over milliseconds
132
static unsigned long last_time = millis();
133
static unsigned long carry = 0;
134
135
// how many milliseonds have elapsed since we last checked?
136
unsigned long next_time = millis();
137
unsigned long delta = next_time - last_time + carry;
138
139
// update the previous time and carried-over milliseconds
140
last_time = next_time;
141
carry = delta % 1000;
142
143
// add the seconds that have passed to the time
144
time_seconds += delta / 1000;
145
while( time_seconds >= 60 ) {
146
time_seconds -= 60;
147
time_minutes++;
148
if( time_minutes >= 60 ) {
149
time_minutes -= 60;
150
time_hours++;
151
if( time_hours >= 24 )
152
time_hours -= 24;
153
}
154
}
155
}
156
157
158
// draw a segment for the test display
159
void drawNextSegment_test( bool reset )
160
{
161
// keep track of segment
162
static unsigned int segment = 0;
163
if( reset ) segment = 0;
164
segment++;
165
166
// turn on inside and outside LEDs
167
digitalWrite( 4, HIGH );
168
digitalWrite( 13, HIGH );
169
170
// display segment number in binary across in the inside LEDs,
171
// with the LED on pin 12 showing the least-significant bit
172
for( int a = 0; a < 8; a++ )
173
digitalWrite( 12 - a, ( ( segment >> a ) & 1 )? HIGH : LOW );
174
}
175
176
177
// draw a segment for the time display
178
void drawNextSegment_time( bool reset )
179
{
180
static unsigned int second = 0;
181
static unsigned int segment = 0;
182
183
// handle display reset
184
if( reset ) {
185
second = 0;
186
segment = 0;
187
}
188
189
// what needs to be drawn?
190
bool draw_tick = !segment && second % 5 == 0;
191
bool draw_second = !segment && second == time_seconds;
192
bool draw_minute = !segment && second == time_minute;
193
bool draw_hour = !segment && second == time_hour;
194
195
// set the LEDs
196
digitalWrite( 13, HIGH );
197
digitalWrite( 12, draw_tick || draw_minute );
198
for( int a = 10; a <= 11; a++ )
199
digitalWrite( a, draw_minute || draw_second );
200
for( int a = 4; a <= 9; a++ )
201
digitalWrite( 10, draw_minute | draw_second || draw_hour );
202
203
// inc position
204
if( ++segment >= NUM_SECOND_SEGMENTS ) {
205
segment = 0;
206
second++;
207
}
124
break;
125
}
126
}
127
128
129
// turn an led on/off
130
void ledOn( int num, bool on )
131
{
132
if( num < 0 || num > 9 ) return;
133
134
// convert to pin no.
135
num += 4;
136
137
// pin 4 needs to be inverted (it's driving a PNP)
138
if( num == 4 ) on = !on;
139
140
digitalWrite( num, on? HIGH : LOW );
208
141
}
209
142
210
143
211
144
// draw a display segment
212
145
void drawNextSegment( bool reset )
213
146
{
214
static int draw_mode = 0;
215
216
// handle mode switch requests
217
if( reset && inc_draw_mode ) {
218
inc_draw_mode = false;
219
draw_mode++;
220
if( draw_mode >= 2 )
221
draw_mode = 0;
222
}
223
224
// draw the segment
225
switch( draw_mode ) {
226
case 0: drawNextSegment_test( reset ); break;
227
case 1: drawNextSegment_time( reset ); break;
228
}
147
static ModeSwitcher mode_switcher;
148
static bool init = false;
149
150
if( !init ) {
151
init = true;
152
mode_switcher.activate();
153
}
154
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 = mode_switcher.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
229
174
}
230
175
231
176
303
248
304
249
// set up mode-switch button on pin 3
305
250
pinMode( 3, INPUT );
251
digitalWrite( 3, HIGH );
252
button.add_event_at( 5, 1 );
253
button.add_event_at( 1000, 2 );
254
button.add_event_at( 4000, 3 );
306
255
307
256
// serial comms
308
257
Serial.begin( 9600 );
323
272
checkButtons();
324
273
325
274
// keep track of time
326
trackTime();
275
Time &time = Time::get_instance();
276
time.update();
327
277
}
328
278
329
279
// draw this segment
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0