/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 01:01:54 UTC
  • Revision ID: tim@ed.am-20120310010154-lv041mt4275k5jxo
removed most OOP/inheritance crap, saved loads of space!

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