/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-10 13:04:29 UTC
  • Revision ID: tim@ed.am-20120310130429-310w5ejo968mc6mo
cleaned-up notes

Show diffs side-by-side

added added

removed removed

src/digital_clock.cc
25
25
#include "text.h"
26
26
#include "text_renderer.h"
27
27
#include "time.h"
28
 
#include "Arduino.h"
29
 
 
30
 
 
31
 
// display flavour
 
28
 
 
29
 
 
30
// font flavour
32
31
static int _flavour = 0;
33
32
 
34
33
 
35
 
static void reset_messages()
 
34
static void set_message( bool update )
36
35
{
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
 
        }
 
36
        PString str0( Text::_messages[ 0 ], MESSAGE_LEN );
 
37
//      PString str1( Text::_messages[ 1 ], MESSAGE_LEN );
 
38
        str0.begin();
 
39
//      str1.begin();
 
40
//      switch( get_flavour() )
 
41
//      {
 
42
//      case 0:
 
43
//              str0.format( "%d:%02d:%02 %s", time.get_hours() % 12,
 
44
//                                      time.get_minutes(), time.get_seconds(),
 
45
//                                      time.get_hours() / 12 > 0? "pm" : "am" );
 
46
//              Text::set_message( 0, str0 );
 
47
//              str1.print( "-" );
 
48
//              Text::set_message( 1, str1 );
 
49
//              if( update ) {
 
50
//                      Text::reset_message( 0, Text::MODE_TOP +
 
51
//                                                               Text::MODE_ALL );
 
52
//                      Text::reset_message( 1, Text::MODE_BOTTOM +
 
53
//                                                               Text::MODE_ONEQUARTER );
 
54
//              }
 
55
//              break;
 
56
//      case 1:
 
57
                str0.format( "%d%s %s, %d", Time::get_day(),
 
58
                                        Time::get_day_suffix(),
 
59
                                        Time::get_month_name(), Time::get_year() );
 
60
                Text::set_message( 0, str0 );
 
61
//              Text::set_message( 1, str1 );
 
62
                if( !update ) {
 
63
                        Text::reset_message( 0, Text::MODE_HSCROLL | Text::MODE_TOP |
 
64
                                                                 Text::MODE_THREEQUARTERS );
 
65
//                      Text::reset_message( 1, Text::MODE_BOTTOM +
 
66
//                                                               Text::MODE_ONEQUARTER );
 
67
                }
 
68
//              break;
 
69
//      }
 
70
 
 
71
        TextRenderer::select_font( _flavour );
49
72
}
50
73
 
51
74
 
52
75
void digital_clock_press()
53
76
{
54
 
        if( ++_flavour >= 2 )
 
77
        if( ++_flavour >= 4 )
55
78
                _flavour = 0;
56
 
 
57
 
        // reset messages
58
 
        reset_messages();
59
79
}
60
80
 
61
81
 
62
82
void digital_clock_draw( int segment )
63
83
{
64
84
        Text::draw( 0, segment );
65
 
        Text::draw( 1, segment );
 
85
//      Text::draw( 1, segment );
 
86
        TextRenderer::output_buffer();
66
87
}
67
88
 
68
89
 
69
90
void digital_clock_draw_reset()
70
91
{
71
 
        PString str0( Text::_messages[ 0 ], MESSAGE_LEN );
72
 
        PString str1( Text::_messages[ 1 ], MESSAGE_LEN );
73
 
        str0.begin();
74
 
        str1.begin();
75
 
 
76
 
        switch( _flavour )
77
 
        {
78
 
        case 0:
79
 
                str0.format( "%d%c%02d %s", Time::get_hours() % 12,
80
 
                        ::millis() % 1000 < 500? ':' : '.',
81
 
                        Time::get_minutes(),
82
 
                        Time::get_hours() >= 12? "pm" : "am" );
83
 
                str1.print( "- -" );
84
 
                break;
85
 
        case 1:
86
 
                str0.format( "%d%s %s, %d", Time::get_day(),
87
 
                                Time::get_day_suffix(),
88
 
                                Time::get_month_name(), Time::get_year() );
89
 
                break;
90
 
        }
91
 
 
92
 
        Text::set_message( 0, str0 );
93
 
        Text::set_message( 1, str1 );
 
92
        // gotta update message, the time might have changed!
 
93
        set_message( true );
 
94
 
 
95
        Text::draw_reset();
94
96
}
95
97
 
96
98
 
97
99
void digital_clock_activate()
98
100
{
 
101
        leds_off();
 
102
 
 
103
        Text::reset();
 
104
        set_message( false );
 
105
 
99
106
        _flavour = 0;
100
 
 
101
 
        // reset messages
102
 
        reset_messages();
103
107
}