/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 19:37:33 UTC
  • Revision ID: tim@ed.am-20120321193733-29euxt0t0h9dwsj3
added .dep directories to bzrignore

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/digital_clock.cc
28
28
#include "Arduino.h"
29
29
 
30
30
 
31
 
// display flavour
 
31
// font flavour
32
32
static int _flavour = 0;
33
33
 
34
34
 
37
37
        switch( _flavour )
38
38
        {
39
39
        case 0:
40
 
                Text::reset_message( 0, Text::MODE_TOP | Text::MODE_ALL,
41
 
                                Text::SCALE_FAT);
 
40
                Text::reset_message( 0, Text::MODE_TOP + Text::MODE_ALL );
 
41
                Text::reset_message( 1, Text::MODE_BOTTOM + Text::MODE_ONEQUARTER );
42
42
                break;
43
43
        case 1:
44
44
                Text::reset_message( 0, Text::MODE_HSCROLL | Text::MODE_TOP |
45
45
                                Text::MODE_THREEQUARTERS );
 
46
                Text::reset_message( 1, Text::MODE_BOTTOM + Text::MODE_ONEQUARTER );
46
47
                break;
47
48
        }
48
49
}
67
68
 
68
69
void digital_clock_draw_reset()
69
70
{
70
 
        PString str0( Text::_messages[ 0 ], MESSAGE_LEN * 4 );
 
71
        PString str0( Text::_messages[ 0 ], MESSAGE_LEN );
 
72
        PString str1( Text::_messages[ 1 ], MESSAGE_LEN );
71
73
        str0.begin();
 
74
        str1.begin();
72
75
 
73
76
        switch( _flavour )
74
77
        {
75
 
        case 0:
76
 
                str0.format( "%d%c%02d %s", Time::get_hours() % 12,
77
 
                        ::millis() % 1000 < 500? ':' : '.',
78
 
                        Time::get_minutes(),
79
 
                        Time::get_hours() >= 12? "pm" : "am" );
 
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" );
 
84
                }
 
85
                str1.print( "- -" );
80
86
                break;
81
87
        case 1:
82
88
                str0.format( "%d%s %s, %d", Time::get_day(),
83
89
                                Time::get_day_suffix(),
84
90
                                Time::get_month_name(), Time::get_year() );
 
91
                Text::set_message( 1, str1 );
85
92
                break;
86
93
        }
87
94
 
88
95
        Text::set_message( 0, str0 );
 
96
        Text::set_message( 1, str1 );
89
97
}
90
98
 
91
99