/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-05-18 14:55:12 UTC
  • Revision ID: tim@ed.am-20120518145512-4dg4ble01d47a8z5
moved rount Time a bit, and passed _button to SettingsMajorMode so that it can
come in and out of send_interim mode

Show diffs side-by-side

added added

removed removed

Lines of Context:
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
 *
265
265
        _button.set_event_times( event_times );
266
266
 
267
267
        // initialise RTC
268
 
        Time::init();
 
268
//      Time::load_time();
269
269
 
270
270
        // init text renderer
271
271
        TextRenderer::init();
275
275
        leds_off();
276
276
 
277
277
        static SwitcherMajorMode switcher;
278
 
        static SettingsMajorMode settings;
 
278
        static SettingsMajorMode settings( _button );
279
279
 
280
280
        // add major modes
281
281
        int mode = 0;