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.cc
- browse files at revision 93
- compare with another revision
- download diff
- download tarball
- view history from revision 93
- Committer: Tim Marston
- Date: 2013-03-31 17:07:36 UTC
- Revision ID: tim@ed.am-20130331170736-hphm2hg0y6l7w6z1
made rtc-test's DS1307 library a symlink to the main one in src/util
- files added:
- src/modes/major_mode.cc
- files renamed:
- src/modes/analogue_clock.cc => src/modes/analogue_clock_mode.cc
- src/modes/analogue_clock.h => src/modes/analogue_clock_mode.h
- src/modes/digital_clock.cc => src/modes/digital_clock_mode.cc
- src/modes/digital_clock.h => src/modes/digital_clock_mode.h
- src/modes/settings_mode.cc => src/modes/settings_major_mode.cc
- src/modes/settings_mode.h => src/modes/settings_major_mode.h
- src/modes/test_pattern.cc => src/modes/test_pattern_mode.cc
- src/modes/test_pattern.h => src/modes/test_pattern_mode.h
- files modified:
- project/propeller-clock.sch
- test/rtc-test/util/DS1307.cpp
- test/rtc-test/util/DS1307.h
added
removed
src/propeller-clock.cc
1
/* -*- mode: c++; compile-command: "BOARD=pro5v make"; -*- */
1
/* -*- mode: c++; compile-command: "make"; -*- */
2
2
/*
3
3
* propeller-clock.ino
4
4
*
79
79
#include "button.h"
80
80
#include "time.h"
81
81
#include "Arduino.h"
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
#include "modes/switcher_major_mode.h"
83
#include "modes/settings_major_mode.h"
84
#include "modes/analogue_clock_mode.h"
85
#include "modes/digital_clock_mode.h"
86
86
#include "modes/info_mode.h"
87
#include "modes/test_pattern_mode.h"
87
88
#include "text.h"
88
89
#include "text_renderer.h"
89
90
#include "common.h"
109
110
// the button
110
111
static Button _button( 3 );
111
112
112
// modes
113
static int _major_mode = 0;
114
static int _minor_mode = 0;
115
116
#define SETTINGS_MODE_IDX 1
117
#define MAIN_MODE_IDX 0
118
119
#define ANALOGUE_CLOCK_IDX 0
120
#define DIGITAL_CLOCK_IDX 1
121
#define INFO_MODE_IDX 2
122
#define TEST_PATTERN_IDX 3
113
// major modes
114
static MajorMode *_modes[ 3 ];
115
116
// current major mode
117
static int _mode = 0;
118
119
// interupt handler's "ignore every other" flag
120
static bool _pulse_ignore = true;
123
121
124
122
//_____________________________________________________________________________
125
123
// code
126
124
127
128
// activate the current minor mode
129
void activate_minor_mode()
130
{
131
// reset text
132
Text::reset();
133
leds_off();
134
135
// give the mode a chance to init
136
switch( _minor_mode ) {
137
case ANALOGUE_CLOCK_IDX: analogue_clock_activate(); break;
138
case DIGITAL_CLOCK_IDX: digital_clock_activate(); break;
139
case INFO_MODE_IDX: info_mode_activate(); break;
140
}
141
}
142
143
144
// activate major mode
145
void activate_major_mode()
146
{
147
// reset text
148
Text::reset();
149
leds_off();
150
151
// reset buttons
152
_button.set_press_mode( _major_mode != SETTINGS_MODE_IDX );
153
154
// give the mode a chance to init
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
161
162
125
// perform button events
163
126
void do_button_events()
164
127
{
169
132
{
170
133
case 1:
171
134
// short press
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;
177
case INFO_MODE_IDX: info_mode_press(); break;
178
}
179
break;
180
case SETTINGS_MODE_IDX: settings_mode_press(); break;
181
}
135
_modes[ _mode ]->press();
182
136
break;
183
184
137
case 2:
185
138
// long press
186
switch( _major_mode ) {
187
case MAIN_MODE_IDX:
188
if( ++_minor_mode >= 4 )
189
_minor_mode = 0;
190
activate_minor_mode();
191
break;
192
case SETTINGS_MODE_IDX: settings_mode_long_press(); break;
193
}
139
_modes[ _mode ]->long_press();
194
140
break;
195
196
141
case 3:
197
142
// looooong press (change major mode)
198
if( ++_major_mode > 1 )
199
_major_mode = 0;
200
activate_major_mode();
143
_modes[ _mode ]->deactivate();
144
if( !_modes[ ++_mode ] ) _mode = 0;
145
_modes[ _mode ]->activate();
146
break;
147
case 4:
148
// switch display upside-down
149
_pulse_ignore = !_pulse_ignore;
201
150
break;
202
151
}
203
152
}
208
157
void draw_next_segment( bool reset )
209
158
{
210
159
// keep track of segment
160
static int segment = 0;
211
161
#if CLOCK_FORWARD
212
static int segment = ( NUM_SEGMENTS - CLOCK_SHIFT ) % NUM_SEGMENTS;
213
162
if( reset ) segment = ( NUM_SEGMENTS - CLOCK_SHIFT ) % NUM_SEGMENTS;
214
163
#else
215
static int segment = NUM_SEGMENTS - 1 - CLOCK_SHIFT;
216
164
if( reset ) segment = NUM_SEGMENTS - 1 - CLOCK_SHIFT;
217
165
#endif
218
166
219
// reset the text renderer
167
// reset the text renderer's buffer
220
168
TextRenderer::reset_buffer();
221
169
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;
229
case INFO_MODE_IDX: info_mode_draw_reset(); break;
230
}
231
break;
232
case SETTINGS_MODE_IDX: settings_mode_draw_reset(); break;
233
}
170
if( reset )
171
{
172
_modes[ _mode ]->draw_reset();
234
173
235
174
// tell the text services we're starting a new frame
236
175
Text::draw_reset();
237
176
}
238
177
239
178
// draw
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;
246
case INFO_MODE_IDX: info_mode_draw( segment ); break;
247
}
248
break;
249
case SETTINGS_MODE_IDX: settings_mode_draw( segment ); break;
250
}
251
Text::post_draw();
252
253
// draw any text that was rendered
179
_modes[ _mode ]->draw( segment );
180
181
// draw text
182
Text::draw( segment );
183
184
// draw text rednerer's buffer
254
185
TextRenderer::output_buffer();
255
186
256
187
#if CLOCK_FORWARD
312
243
// may not be exactly evenly distributed around the rotation, so
313
244
// we can't recalculate times on every pulse. Instead, we ignore
314
245
// every other pulse so timings are based on a complete rotation.
315
static bool ignore = true;
316
ignore = !ignore;
317
if( !ignore )
246
_pulse_ignore = !_pulse_ignore;
247
if( !_pulse_ignore )
318
248
{
319
249
// set a new pulse time
320
250
_new_pulse_at = micros();
336
266
// set up mode-switch button on pin 3
337
267
pinMode( 3, INPUT );
338
268
digitalWrite( 3, HIGH );
339
static int event_times[] = { 5, 500, 4000, 0 };
269
static int event_times[] = { 10, 500, 2000, 4000, 0 };
340
270
_button.set_event_times( event_times );
341
271
342
272
// initialise RTC
343
Time::init();
273
Time::load_time();
344
274
345
275
// init text renderer
346
276
TextRenderer::init();
347
277
348
// activate the minor mode
349
activate_major_mode();
278
// reset text
279
Text::reset();
280
leds_off();
281
282
static SwitcherMajorMode switcher;
283
static SettingsMajorMode settings( _button );
284
285
// add major modes
286
int mode = 0;
287
_modes[ mode++ ] = &switcher;
288
_modes[ mode++ ] = &settings;
289
_modes[ mode ] = 0;
290
291
// activate the current major mode
292
_modes[ _mode ]->activate();
350
293
}
351
294
352
295
Loggerhead is a web-based interface for Bazaar branches
Version: 1.18.2, Revision: 480