/elec/propeller-clock

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

  • Committer: Tim Marston
  • Date: 2012-03-21 20:35:28 UTC
  • Revision ID: tim@ed.am-20120321203528-wfhpych1tub75rgj
fixed bug initialising text services on mode activation

Show diffs side-by-side

added added

removed removed

src/propeller-clock.cc
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 "analogue_clock.h"
 
83
#include "digital_clock.h"
 
84
#include "test_pattern.h"
 
85
#include "settings_mode.h"
86
86
#include "text.h"
87
87
#include "text_renderer.h"
88
88
#include "common.h"
145
145
        Text::reset();
146
146
        leds_off();
147
147
 
148
 
        // reset buttons
149
 
        _button.set_press_mode( _major_mode != SETTINGS_MODE_IDX );
150
 
 
151
148
        // give the mode a chance to init
152
149
        switch( _major_mode ) {
153
150
        case MAIN_MODE_IDX: activate_minor_mode(); break;
335
332
        // initialise RTC
336
333
        Time::init();
337
334
 
338
 
        // init text renderer
339
 
        TextRenderer::init();
340
 
 
341
335
        // activate the minor mode
342
336
        activate_major_mode();
343
337
}