/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/digital_clock.cc

  • Committer: Tim Marston
  • Date: 2012-03-21 21:24:17 UTC
  • Revision ID: tim@ed.am-20120321212417-dnba5l1oheddeyxw
fixed time centring and display in settings mode

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/digital_clock.cc
1
1
/*
2
 
 * digital_clock_mode.cc
 
2
 * digital_clock.cc
3
3
 *
4
4
 * Copyright (C) 2011 Tim Marston <tim@ed.am> and Dan Marston.
5
5
 *
20
20
 * You should have received a copy of the GNU Lesser General Public License
21
21
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
22
22
 */
23
 
#include "digital_clock_mode.h"
24
 
#include "display.h"
 
23
#include "digital_clock.h"
 
24
#include "common.h"
25
25
#include "text.h"
26
26
#include "text_renderer.h"
27
27
#include "time.h"
28
 
 
29
 
 
30
 
DigitalClockMode::DigitalClockMode()
31
 
        :
32
 
        MinorMode( 4 )
33
 
{
34
 
}
35
 
 
36
 
 
37
 
void DigitalClockMode::press()
38
 
{
39
 
        MinorMode::press();
40
 
 
41
 
//      set_message( false );
42
 
}
43
 
 
44
 
 
45
 
void DigitalClockMode::draw( int segment )
 
28
#include "Arduino.h"
 
29
 
 
30
 
 
31
// font flavour
 
32
static int _flavour = 0;
 
33
 
 
34
 
 
35
static void reset_messages()
 
36
{
 
37
        switch( _flavour )
 
38
        {
 
39
        case 0:
 
40
                Text::reset_message( 0, Text::MODE_TOP + Text::MODE_ALL );
 
41
                Text::reset_message( 1, Text::MODE_BOTTOM + Text::MODE_ONEQUARTER );
 
42
                break;
 
43
        case 1:
 
44
                Text::reset_message( 0, Text::MODE_HSCROLL | Text::MODE_TOP |
 
45
                                Text::MODE_THREEQUARTERS );
 
46
                Text::reset_message( 1, Text::MODE_BOTTOM + Text::MODE_ONEQUARTER );
 
47
                break;
 
48
        }
 
49
}
 
50
 
 
51
 
 
52
void digital_clock_press()
 
53
{
 
54
        if( ++_flavour >= 2 )
 
55
                _flavour = 0;
 
56
 
 
57
        // reset messages
 
58
        reset_messages();
 
59
}
 
60
 
 
61
 
 
62
void digital_clock_draw( int segment )
46
63
{
47
64
        Text::draw( 0, segment );
48
 
//      Text::draw( 1, segment );
49
 
        TextRenderer::output_buffer();
50
 
}
51
 
 
52
 
 
53
 
void DigitalClockMode::draw_reset()
54
 
{
55
 
        // gotta update message, the time might have changed!
56
 
        set_message( true );
57
 
 
58
 
        Text::draw_reset();
59
 
}
60
 
 
61
 
 
62
 
void DigitalClockMode::activate()
63
 
{
64
 
        MinorMode::activate();
65
 
 
66
 
        Display::leds_off();
67
 
 
68
 
        Text::reset();
69
 
        set_message( false );
70
 
}
71
 
 
72
 
 
73
 
void DigitalClockMode::set_message( bool update )
74
 
{
75
 
        Time &time = Time::get_instance();
76
 
 
 
65
        Text::draw( 1, segment );
 
66
}
 
67
 
 
68
 
 
69
void digital_clock_draw_reset()
 
70
{
77
71
        PString str0( Text::_messages[ 0 ], MESSAGE_LEN );
78
 
//      PString str1( Text::_messages[ 1 ], MESSAGE_LEN );
 
72
        PString str1( Text::_messages[ 1 ], MESSAGE_LEN );
79
73
        str0.begin();
80
 
//      str1.begin();
81
 
//      switch( get_flavour() )
82
 
//      {
83
 
//      case 0:
84
 
//              str0.format( "%d:%02d:%02 %s", time.get_hours() % 12,
85
 
//                                      time.get_minutes(), time.get_seconds(),
86
 
//                                      time.get_hours() / 12 > 0? "pm" : "am" );
87
 
//              Text::set_message( 0, str0 );
88
 
//              str1.print( "-" );
89
 
//              Text::set_message( 1, str1 );
90
 
//              if( update ) {
91
 
//                      Text::reset_message( 0, Text::MODE_TOP +
92
 
//                                                               Text::MODE_ALL );
93
 
//                      Text::reset_message( 1, Text::MODE_BOTTOM +
94
 
//                                                               Text::MODE_ONEQUARTER );
95
 
//              }
96
 
//              break;
97
 
//      case 1:
98
 
                str0.format( "%d%s %s, %d", time.get_day(),
99
 
                                        time.get_day_suffix(),
100
 
                                        time.get_month_name(), time.get_year() );
101
 
                Text::set_message( 0, str0 );
102
 
//              Text::set_message( 1, str1 );
103
 
                if( !update ) {
104
 
                        Text::reset_message( 0, Text::MODE_HSCROLL | Text::MODE_TOP |
105
 
                                                                 Text::MODE_THREEQUARTERS );
106
 
//                      Text::reset_message( 1, Text::MODE_BOTTOM +
107
 
//                                                               Text::MODE_ONEQUARTER );
 
74
        str1.begin();
 
75
 
 
76
        switch( _flavour )
 
77
        {
 
78
        case 0: {
 
79
                        char colon = ::millis() % 1000 < 500? ':' : ' ';
 
80
                        str0.format( "%d%c%02d %s", Time::get_hours() % 12,
 
81
                                        ::millis() % 1000 < 500? ':' : '.',
 
82
                                        Time::get_minutes(),
 
83
                                        Time::get_hours() >= 12? "pm" : "am" );
108
84
                }
109
 
//              break;
110
 
//      }
111
 
 
112
 
        TextRenderer::select_font( get_flavour() );
 
85
                str1.print( "- -" );
 
86
                break;
 
87
        case 1:
 
88
                str0.format( "%d%s %s, %d", Time::get_day(),
 
89
                                Time::get_day_suffix(),
 
90
                                Time::get_month_name(), Time::get_year() );
 
91
                Text::set_message( 1, str1 );
 
92
                break;
 
93
        }
 
94
 
 
95
        Text::set_message( 0, str0 );
 
96
        Text::set_message( 1, str1 );
 
97
}
 
98
 
 
99
 
 
100
void digital_clock_activate()
 
101
{
 
102
        _flavour = 0;
 
103
 
 
104
        // reset messages
 
105
        reset_messages();
113
106
}