/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

Lines of Context:
src/modes/digital_clock.cc
1
1
/*
2
 
 * digital_clock_mode.cc
 
2
 * digital_clock.cc
3
3
 *
4
4
 * Copyright (C) 2011 Tim Marston <tim@ed.am> and Dan Marston.
5
5
 *
20
20
 * You should have received a copy of the GNU Lesser General Public License
21
21
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
22
22
 */
23
 
#include "digital_clock_mode.h"
 
23
#include "digital_clock.h"
24
24
#include "common.h"
25
25
#include "text.h"
26
26
#include "text_renderer.h"
28
28
#include "Arduino.h"
29
29
 
30
30
 
31
 
void DigitalClockMode::draw( int segment )
 
31
// display flavour
 
32
static int _flavour = 0;
 
33
 
 
34
 
 
35
static void reset_messages()
 
36
{
 
37
        switch( _flavour )
 
38
        {
 
39
        case 0:
 
40
                Text::reset_message( 0, Text::MODE_TOP | Text::MODE_ALL,
 
41
                                Text::SCALE_FAT);
 
42
                break;
 
43
        case 1:
 
44
                Text::reset_message( 0, Text::MODE_HSCROLL | Text::MODE_TOP |
 
45
                                Text::MODE_THREEQUARTERS );
 
46
                break;
 
47
        }
 
48
}
 
49
 
 
50
 
 
51
void digital_clock_press()
 
52
{
 
53
        if( ++_flavour >= 2 )
 
54
                _flavour = 0;
 
55
 
 
56
        // reset messages
 
57
        reset_messages();
 
58
}
 
59
 
 
60
 
 
61
void digital_clock_draw( int segment )
32
62
{
33
63
        Text::draw( 0, segment );
34
64
        Text::draw( 1, segment );
35
65
}
36
66
 
37
67
 
38
 
void DigitalClockMode::draw_reset()
 
68
void digital_clock_draw_reset()
39
69
{
40
70
        PString str0( Text::_messages[ 0 ], MESSAGE_LEN * 4 );
41
71
        str0.begin();
59
89
}
60
90
 
61
91
 
62
 
void DigitalClockMode::activate()
 
92
void digital_clock_activate()
63
93
{
64
94
        _flavour = 0;
65
95
 
66
 
        reset_messages();
67
 
}
68
 
 
69
 
 
70
 
void DigitalClockMode::press()
71
 
{
72
 
        if( ++_flavour >= 2 )
73
 
                _flavour = 0;
74
 
 
75
 
        reset_messages();
76
 
}
77
 
 
78
 
 
79
 
void DigitalClockMode::reset_messages()
80
 
{
81
 
        switch( _flavour )
82
 
        {
83
 
        case 0:
84
 
                Text::reset_message( 0, Text::MODE_TOP | Text::MODE_ALL,
85
 
                                Text::SCALE_FAT);
86
 
                break;
87
 
        case 1:
88
 
                Text::reset_message( 0, Text::MODE_HSCROLL | Text::MODE_TOP |
89
 
                                Text::MODE_THREEQUARTERS );
90
 
                break;
91
 
        }
 
96
        // reset messages
 
97
        reset_messages();
92
98
}