/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
39
46
// mode-specific message parameters
40
47
static signed long _message_params[ NUM_MESSAGE_BUFFERS ];
41
48
 
42
 
// text scaling factors
43
 
static int _message_scale[ NUM_MESSAGE_BUFFERS ];
44
 
 
45
49
// time last frame
46
50
static unsigned long _last_millis;
47
51
 
51
55
// recalculate message params, based on _duration
52
56
static bool _do_draw_reset;
53
57
 
54
 
// recalculate messages parameters (after message reset)
55
 
static unsigned char _message_recalc_flags;
56
 
 
57
58
 
58
59
void reset_message_param( int message_num )
59
60
{
60
 
        if( _message_modes[ message_num ] & Text::MODE_HSCROLL )
61
 
        {
62
 
                switch( _message_modes[ message_num ] & 0x1c )
63
 
                {
64
 
                case Text::MODE_ONEQUARTER:
65
 
                        _message_params[ message_num ] = -NUM_SEGMENTS / 4; break;
66
 
                case Text::MODE_ONETHIRD:
67
 
                        _message_params[ message_num ] = -NUM_SEGMENTS / 3; break;
68
 
                case Text::MODE_HALF:
69
 
                        _message_params[ message_num ] = -NUM_SEGMENTS / 2; break;
70
 
                case Text::MODE_TWOTHIRDS:
71
 
                        _message_params[ message_num ] = -NUM_SEGMENTS * 2 / 3; break;
72
 
                case Text::MODE_THREEQUARTERS:
73
 
                        _message_params[ message_num ] = -NUM_SEGMENTS * 3 / 4; break;
74
 
                case Text::MODE_ALL:
75
 
                        _message_params[ message_num ] = -NUM_SEGMENTS; break;
76
 
                }
77
 
        }
78
 
        else
79
 
        {
80
 
                switch( _message_modes[ message_num ] & 0x1c )
81
 
                {
82
 
                case Text::MODE_ONEQUARTER:
83
 
                        _message_params[ message_num ] = NUM_SEGMENTS / 4; break;
84
 
                case Text::MODE_ONETHIRD:
85
 
                        _message_params[ message_num ] = NUM_SEGMENTS / 3; break;
86
 
                case Text::MODE_HALF:
87
 
                        _message_params[ message_num ] = NUM_SEGMENTS / 2; break;
88
 
                case Text::MODE_TWOTHIRDS:
89
 
                        _message_params[ message_num ] = NUM_SEGMENTS * 2 / 3; break;
90
 
                case Text::MODE_THREEQUARTERS:
91
 
                        _message_params[ message_num ] = NUM_SEGMENTS * 3 / 4; break;
92
 
                case Text::MODE_ALL:
93
 
                        _message_params[ message_num ] = NUM_SEGMENTS; break;
94
 
                }
95
 
                _message_params[ message_num ] = -( _message_params[ message_num ] -
96
 
                        TextRenderer::get_width( _message_lens[ message_num ],
97
 
                                        _message_scale[ 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;
98
79
        }
99
80
}
100
81
 
106
87
}
107
88
 
108
89
 
109
 
void Text::reset_message( int message_num, char mode, int scale )
 
90
void Text::set_message_mode( int message_num, char mode )
110
91
{
111
92
        _message_modes[ message_num ] = mode;
112
 
        _message_recalc_flags |= 1 << message_num;
113
 
        _message_scale[ message_num ] = scale;
 
93
        reset_message_param( message_num );
114
94
}
115
95
 
116
96
 
120
100
        _duration = 0;
121
101
        _last_millis = ::millis();
122
102
        _do_draw_reset = false;
123
 
        _message_recalc_flags = 0;
124
103
 
125
104
        // reset the text renderer's output buffer
126
105
        TextRenderer::reset_buffer();
139
118
}
140
119
 
141
120
 
142
 
void Text::post_draw()
143
 
{
144
 
        _do_draw_reset = false;
145
 
}
146
 
 
147
 
 
148
121
void Text::draw( int message_num, int segment )
149
122
{
150
 
        TextRenderer::buffer_in_use();
151
 
 
152
123
        // perform a mid-frame reset, as necessary
153
 
        if( _do_draw_reset ) // && segment > NUM_SEGMENTS / 2 )
154
 
        {
155
 
                // reset message param?
156
 
                if( _message_recalc_flags & ( 1 << message_num ) ) {
157
 
                        _message_recalc_flags &= ~( 1 << message_num );
158
 
                        reset_message_param( message_num );
159
 
                }
 
124
        if( _do_draw_reset && segment > NUM_SEGMENTS / 2 ) {
 
125
                _do_draw_reset = false;
160
126
 
161
 
                // add to horizontal scroll position
162
 
                if( _message_modes[ message_num ] & MODE_HSCROLL ) {
 
127
                if( _message_modes[ message_num ] & MODE_HSCROLL )
 
128
                {
 
129
                        // add to horizontal scroll position
163
130
                        _message_params[ message_num ] +=
164
131
                                _duration * TEXT_SCROLL_SPEED / 1000;
165
132
                        long excess = _message_params[ message_num ] -
166
 
                                TextRenderer::get_width( _message_lens[ message_num ],
167
 
                                                _message_scale[ message_num ] );
 
133
                                TextRenderer::get_width( _message_lens[ message_num ] );
168
134
                        if( excess >= 0 ) {
169
135
                                reset_message_param( message_num );
170
136
                                _message_params[ message_num ] += excess;
210
176
        case MODE_BOTTOM:
211
177
                if( segment > ( NUM_SEGMENTS - width ) / 2 &&
212
178
                        segment < ( NUM_SEGMENTS - width ) / 2 + width )
213
 
                {
214
 
                        segment = width - ( segment - ( NUM_SEGMENTS - width ) / 2 );
215
 
                }               
 
179
                        segment -= ( NUM_SEGMENTS - width ) / 2;
216
180
                else
217
181
                        return;
218
182
                break;
222
186
        TextRenderer::render(
223
187
                _messages[ message_num ], _message_lens[ message_num ],
224
188
                (long)segment + _message_params[ message_num ],
225
 
                ( _message_modes[ message_num ] & 1 ) == 0, 0,
226
 
                _message_scale[ message_num ] );
 
189
                _message_modes[ message_num ] & 1 == 0, 0 );
227
190
}