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

  • Committer: Tim Marston
  • Date: 2012-05-17 22:49:36 UTC
  • Revision ID: tim@ed.am-20120517224936-0wgyem932dlq5bs4
various tweaks, a (failed) attempt to fix text reset bug and added TODO

Show diffs side-by-side

added added

removed removed

src/modes/digital_clock.cc
28
28
#include "Arduino.h"
29
29
 
30
30
 
31
 
// font flavour
 
31
// display 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::reset_message( 1, Text::MODE_BOTTOM + Text::MODE_ONEQUARTER );
 
40
                Text::reset_message( 0, Text::MODE_TOP | Text::MODE_ALL,
 
41
                                Text::SCALE_FAT);
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 );
47
46
                break;
48
47
        }
49
48
}
68
67
 
69
68
void digital_clock_draw_reset()
70
69
{
71
 
        PString str0( Text::_messages[ 0 ], MESSAGE_LEN );
72
 
        PString str1( Text::_messages[ 1 ], MESSAGE_LEN );
 
70
        PString str0( Text::_messages[ 0 ], MESSAGE_LEN * 4 );
73
71
        str0.begin();
74
 
        str1.begin();
75
72
 
76
73
        switch( _flavour )
77
74
        {
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( "- -" );
 
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" );
86
80
                break;
87
81
        case 1:
88
82
                str0.format( "%d%s %s, %d", Time::get_day(),
89
83
                                Time::get_day_suffix(),
90
84
                                Time::get_month_name(), Time::get_year() );
91
 
                Text::set_message( 1, str1 );
92
85
                break;
93
86
        }
94
87
 
95
88
        Text::set_message( 0, str0 );
96
 
        Text::set_message( 1, str1 );
97
89
}
98
90
 
99
91