/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/modes/digital_clock_mode.cc

  • 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

Show diffs side-by-side

added added

removed removed

src/modes/digital_clock_mode.cc
28
28
#include "Arduino.h"
29
29
 
30
30
 
31
 
void DigitalClockMode::draw( int segment )
32
 
{
33
 
        Text::draw( 0, segment );
34
 
        Text::draw( 1, segment );
35
 
}
36
 
 
37
 
 
38
31
void DigitalClockMode::draw_reset()
39
32
{
40
 
        PString str0( Text::_messages[ 0 ], MESSAGE_LEN * 4 );
41
 
        str0.begin();
42
 
 
43
33
        switch( _flavour )
44
34
        {
45
 
        case 0:
46
 
                str0.format( "%d%c%02d %s", Time::get_hours() % 12,
47
 
                        ::millis() % 1000 < 500? ':' : '.',
48
 
                        Time::get_minutes(),
49
 
                        Time::get_hours() >= 12? "pm" : "am" );
50
 
                break;
51
 
        case 1:
52
 
                str0.format( "%d%s %s, %d", Time::get_day(),
53
 
                                Time::get_day_suffix(),
54
 
                                Time::get_month_name(), Time::get_year() );
 
35
        case 0: {
 
36
                        PString str0( Text::_messages[ 0 ], MESSAGE_LEN * 2 );
 
37
                        str0.format( "%d%c%02d %s", Time::get_hours() % 12,
 
38
                                        ::millis() % 1000 < 500? ':' : ' ',
 
39
                                        Time::get_minutes(),
 
40
                                        Time::get_hours() >= 12? "pm" : "am" );
 
41
                        Text::set_message_text( 0, str0 );
 
42
                }
 
43
                break;
 
44
        case 1: {
 
45
                        PString str0( Text::_messages[ 0 ], MESSAGE_LEN * 2 );
 
46
                        str0.format( "%d%s %s, %d", Time::get_day(),
 
47
                                        Time::get_day_suffix(),
 
48
                                        Time::get_month_name(), Time::get_year() );
 
49
                        Text::set_message_text( 0, str0 );
 
50
                }
 
51
                break;
 
52
        case 2: {
 
53
                        PString str0( Text::_messages[ 0 ], MESSAGE_LEN * 2 );
 
54
                        PString str1( Text::_messages[ 2 ], MESSAGE_LEN * 2 );
 
55
                        str0.format( "%d%c%02d %s", Time::get_hours() % 12,
 
56
                                        ::millis() % 1000 < 500? ':' : ' ',
 
57
                                        Time::get_minutes(),
 
58
                                        Time::get_hours() >= 12? "pm" : "am" );
 
59
                        str1.format( "%d.%02d.%d", Time::get_day(),
 
60
                                        Time::get_month(), Time::get_year() );
 
61
                        Text::set_message_text( 0, str0 );
 
62
                        Text::set_message_text( 2, str1 );
 
63
                }
55
64
                break;
56
65
        }
57
 
 
58
 
        Text::set_message( 0, str0 );
59
66
}
60
67
 
61
68
 
69
76
 
70
77
void DigitalClockMode::press()
71
78
{
72
 
        if( ++_flavour >= 2 )
 
79
        if( ++_flavour >= 3 )
73
80
                _flavour = 0;
74
81
 
75
82
        reset_messages();
78
85
 
79
86
void DigitalClockMode::reset_messages()
80
87
{
 
88
        Text::reset();
 
89
 
81
90
        switch( _flavour )
82
91
        {
83
92
        case 0:
84
 
                Text::reset_message( 0, Text::MODE_TOP | Text::MODE_ALL,
85
 
                                Text::SCALE_FAT);
 
93
                Text::set_up_message( 0, Text::MODE_TOP | Text::MODE_ALL );
86
94
                break;
87
95
        case 1:
88
 
                Text::reset_message( 0, Text::MODE_HSCROLL | Text::MODE_TOP |
 
96
                Text::set_up_message( 0, Text::MODE_HSCROLL | Text::MODE_TOP |
89
97
                                Text::MODE_THREEQUARTERS );
90
98
                break;
 
99
        case 2:
 
100
                Text::set_up_message( 0, Text::MODE_TOP | Text::MODE_HALF,
 
101
                                Text::SCALE_SMALL );
 
102
                Text::set_up_message( 2, Text::MODE_BOTTOM | Text::MODE_HALF,
 
103
                                Text::SCALE_SMALL );
 
104
                break;
91
105
        }
92
106
}