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

  • Committer: edam
  • Date: 2012-02-29 21:56:32 UTC
  • Revision ID: edam@waxworlds.org-20120229215632-kypb9491vx7bicef
moved some stuf round, created a re-usable pool of message buffers, genericised "modes" for messages

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/text.cc
25
25
#include "config.h"
26
26
#include "Arduino.h"
27
27
#include <avr/pgmspace.h>
 
28
#include "display.h"
 
29
 
 
30
 
 
31
// the proportion of the display to use (in segments)
 
32
#define BIG_SEGMENTS ( NUM_SEGMENTS * 2 / 3 )
 
33
#define SMALL_SEGMENTS ( NUM_SEGMENTS - BIG_TEXT_SEGMENTS )
 
34
#define HALF_SEGMENTS ( NUM_SEGMENTS / 2 )
28
35
 
29
36
 
30
37
// the buffer for the message
48
55
// recalculate message params, based on _duration
49
56
static bool _do_draw_reset;
50
57
 
51
 
// recalculate messages parameters (after message reset)
52
 
static unsigned char _message_recalc_flags;
53
 
 
54
58
 
55
59
void reset_message_param( int message_num )
56
60
{
57
 
        if( _message_modes[ message_num ] & Text::MODE_HSCROLL )
58
 
        {
59
 
                switch( _message_modes[ message_num ] & 0x1c )
60
 
                {
61
 
                case Text::MODE_ONEQUARTER:
62
 
                        _message_params[ message_num ] = -NUM_SEGMENTS / 4; break;
63
 
                case Text::MODE_ONETHIRD:
64
 
                        _message_params[ message_num ] = -NUM_SEGMENTS / 3; break;
65
 
                case Text::MODE_HALF:
66
 
                        _message_params[ message_num ] = -NUM_SEGMENTS / 2; break;
67
 
                case Text::MODE_TWOTHIRDS:
68
 
                        _message_params[ message_num ] = -NUM_SEGMENTS * 2 / 3; break;
69
 
                case Text::MODE_THREEQUARTERS:
70
 
                        _message_params[ message_num ] = -NUM_SEGMENTS * 3 / 4; break;
71
 
                case Text::MODE_ALL:
72
 
                        _message_params[ message_num ] = -NUM_SEGMENTS; break;
73
 
                }
74
 
        }
75
 
        else
76
 
        {
77
 
                switch( _message_modes[ message_num ] & 0x1c )
78
 
                {
79
 
                case Text::MODE_ONEQUARTER:
80
 
                        _message_params[ message_num ] = NUM_SEGMENTS / 4; break;
81
 
                case Text::MODE_ONETHIRD:
82
 
                        _message_params[ message_num ] = NUM_SEGMENTS / 3; break;
83
 
                case Text::MODE_HALF:
84
 
                        _message_params[ message_num ] = NUM_SEGMENTS / 2; break;
85
 
                case Text::MODE_TWOTHIRDS:
86
 
                        _message_params[ message_num ] = NUM_SEGMENTS * 2 / 3; break;
87
 
                case Text::MODE_THREEQUARTERS:
88
 
                        _message_params[ message_num ] = NUM_SEGMENTS * 3 / 4; break;
89
 
                case Text::MODE_ALL:
90
 
                        _message_params[ message_num ] = NUM_SEGMENTS; break;
91
 
                }
92
 
                _message_params[ message_num ] = -( _message_params[ message_num ] -
93
 
                        TextRenderer::get_width( _message_lens[ message_num ] ) ) / 2;
 
61
        switch( _message_modes[ message_num ] )
 
62
        {
 
63
        case 'S':
 
64
                _message_params[ message_num ] = -BIG_SEGMENTS;
 
65
                break;
 
66
        case 's':
 
67
                _message_params[ message_num ] = -HALF_SEGMENTS;
 
68
                break;
 
69
        case 'B':
 
70
        case 'T':
 
71
                _message_params[ message_num ] = -( BIG_SEGMENTS -
 
72
                        TextRenderer::get_width( _message_lens[ message_num ] ) ) / 2;
 
73
                break;
 
74
        case 'b':
 
75
        case 't':
 
76
                _message_params[ message_num ] = -( HALF_SEGMENTS -
 
77
                        TextRenderer::get_width( _message_lens[ message_num ] ) ) / 2;
 
78
                break;
94
79
        }
95
80
}
96
81
 
102
87
}
103
88
 
104
89
 
105
 
void Text::reset_message( int message_num, char mode )
 
90
void Text::set_message_mode( int message_num, char mode )
106
91
{
107
92
        _message_modes[ message_num ] = mode;
108
 
        _message_recalc_flags |= 1 << message_num;
 
93
        reset_message_param( message_num );
109
94
}
110
95
 
111
96
 
115
100
        _duration = 0;
116
101
        _last_millis = ::millis();
117
102
        _do_draw_reset = false;
118
 
        _message_recalc_flags = 0;
119
103
 
120
104
        // reset the text renderer's output buffer
121
105
        TextRenderer::reset_buffer();
136
120
 
137
121
void Text::draw( int message_num, int segment )
138
122
{
139
 
        TextRenderer::buffer_in_use();
140
 
 
141
123
        // perform a mid-frame reset, as necessary
142
124
        if( _do_draw_reset && segment > NUM_SEGMENTS / 2 ) {
143
125
                _do_draw_reset = false;
144
126
 
145
 
                // reset message param?
146
 
                if( _message_recalc_flags & ( 1 << message_num ) ) {
147
 
                        _message_recalc_flags &= ~( 1 << message_num );
148
 
                        reset_message_param( message_num );
149
 
                }
150
 
 
151
 
                // add to horizontal scroll position
152
 
                if( _message_modes[ message_num ] & MODE_HSCROLL ) {
 
127
                if( _message_modes[ message_num ] & MODE_HSCROLL )
 
128
                {
 
129
                        // add to horizontal scroll position
153
130
                        _message_params[ message_num ] +=
154
131
                                _duration * TEXT_SCROLL_SPEED / 1000;
155
132
                        long excess = _message_params[ message_num ] -
199
176
        case MODE_BOTTOM:
200
177
                if( segment > ( NUM_SEGMENTS - width ) / 2 &&
201
178
                        segment < ( NUM_SEGMENTS - width ) / 2 + width )
202
 
                {
203
 
                        segment = width - ( segment - ( NUM_SEGMENTS - width ) / 2 );
204
 
                }               
 
179
                        segment -= ( NUM_SEGMENTS - width ) / 2;
205
180
                else
206
181
                        return;
207
182
                break;
211
186
        TextRenderer::render(
212
187
                _messages[ message_num ], _message_lens[ message_num ],
213
188
                (long)segment + _message_params[ message_num ],
214
 
                ( _message_modes[ message_num ] & 1 ) == 0, 0 );
 
189
                _message_modes[ message_num ] & 1 == 0, 0 );
215
190
}