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
- browse files at revision 93
- compare with another revision
- download diff
- download tarball
- view history from revision 93
- Committer: Tim Marston
- Date: 2013-03-31 17:07:36 UTC
- Revision ID: tim@ed.am-20130331170736-hphm2hg0y6l7w6z1
made rtc-test's DS1307 library a symlink to the main one in src/util
- files added:
- src/TODO
- src/modes
- test/rtc-test
- test/rtc-test/Makefile
- test/rtc-test/util
- test/rtc-test/util/DS1307.cpp
- test/rtc-test/util/DS1307.h
- files removed:
- src/drawer.cc
- files renamed:
- src/display.cc => src/common.cc
- src/display.h => src/common.h
- src/analogue_clock_mode.cc => src/modes/analogue_clock_mode.cc
- src/analogue_clock_mode.h => src/modes/analogue_clock_mode.h
- src/digital_clock_mode.cc => src/modes/digital_clock_mode.cc
- src/digital_clock_mode.h => src/modes/digital_clock_mode.h
- src/test_mode.cc => src/modes/test_pattern_mode.cc
- src/test_mode.h => src/modes/test_pattern_mode.h
- src/propeller-clock.ino => src/propeller-clock.cc
- files modified:
- .bzrignore
added
removed
src/text.cc
25
25
#include "config.h"
26
26
#include "Arduino.h"
27
27
#include <avr/pgmspace.h>
28
#include "display.h"
29
28
30
29
31
30
// the buffer for the message
38
37
static char _message_modes[ NUM_MESSAGE_BUFFERS ];
39
38
40
39
// mode-specific message parameters
41
static signed long _message_params[ NUM_MESSAGE_BUFFERS ];
40
static signed long _message_pos[ NUM_MESSAGE_BUFFERS ];
41
42
// text scaling factors
43
static char _message_scale[ NUM_MESSAGE_BUFFERS ];
42
44
43
45
// time last frame
44
46
static unsigned long _last_millis;
50
52
static bool _do_draw_reset;
51
53
52
54
53
void reset_message_param( int message_num )
55
#define MASK_MODE_SIZE 0x07
56
#define MASK_MODE_POS 0x40
57
58
void reset_message_pos( int message_num )
54
59
{
55
60
if( _message_modes[ message_num ] & Text::MODE_HSCROLL )
56
61
{
57
switch( _message_modes[ message_num ] & 0x1c )
62
switch( _message_modes[ message_num ] & MASK_MODE_SIZE )
58
63
{
59
64
case Text::MODE_ONEQUARTER:
60
_message_params[ message_num ] = -NUM_SEGMENTS / 4; break;
65
_message_pos[ message_num ] = -NUM_SEGMENTS / 4; break;
61
66
case Text::MODE_ONETHIRD:
62
_message_params[ message_num ] = -NUM_SEGMENTS / 3; break;
67
_message_pos[ message_num ] = -NUM_SEGMENTS / 3; break;
63
68
case Text::MODE_HALF:
64
_message_params[ message_num ] = -NUM_SEGMENTS / 2; break;
69
_message_pos[ message_num ] = -NUM_SEGMENTS / 2; break;
65
70
case Text::MODE_TWOTHIRDS:
66
_message_params[ message_num ] = -NUM_SEGMENTS * 2 / 3; break;
71
_message_pos[ message_num ] = -NUM_SEGMENTS * 2 / 3; break;
67
72
case Text::MODE_THREEQUARTERS:
68
_message_params[ message_num ] = -NUM_SEGMENTS * 3 / 4; break;
73
_message_pos[ message_num ] = -NUM_SEGMENTS * 3 / 4; break;
69
74
case Text::MODE_ALL:
70
_message_params[ message_num ] = -NUM_SEGMENTS; break;
75
_message_pos[ message_num ] = -NUM_SEGMENTS; break;
71
76
}
72
77
}
73
78
else
74
79
{
75
switch( _message_modes[ message_num ] & 0x1c )
80
switch( _message_modes[ message_num ] & MASK_MODE_SIZE )
76
81
{
77
82
case Text::MODE_ONEQUARTER:
78
_message_params[ message_num ] = NUM_SEGMENTS / 4; break;
83
_message_pos[ message_num ] = NUM_SEGMENTS / 4; break;
79
84
case Text::MODE_ONETHIRD:
80
_message_params[ message_num ] = NUM_SEGMENTS / 3; break;
85
_message_pos[ message_num ] = NUM_SEGMENTS / 3; break;
81
86
case Text::MODE_HALF:
82
_message_params[ message_num ] = NUM_SEGMENTS / 2; break;
87
_message_pos[ message_num ] = NUM_SEGMENTS / 2; break;
83
88
case Text::MODE_TWOTHIRDS:
84
_message_params[ message_num ] = NUM_SEGMENTS * 2 / 3; break;
89
_message_pos[ message_num ] = NUM_SEGMENTS * 2 / 3; break;
85
90
case Text::MODE_THREEQUARTERS:
86
_message_params[ message_num ] = NUM_SEGMENTS * 3 / 4; break;
91
_message_pos[ message_num ] = NUM_SEGMENTS * 3 / 4; break;
87
92
case Text::MODE_ALL:
88
_message_params[ message_num ] = NUM_SEGMENTS; break;
93
_message_pos[ message_num ] = NUM_SEGMENTS; break;
89
94
}
90
_message_params[ message_num ] = -( _message_params[ message_num ] -
91
TextRenderer::get_width( _message_lens[ message_num ] ) ) / 2;
95
_message_pos[ message_num ] = -( _message_pos[ message_num ] -
96
TextRenderer::get_width( _message_lens[ message_num ],
97
_message_scale[ message_num ] ) ) / 2;
92
98
}
93
99
}
94
100
95
101
96
void Text::set_message( int message_num, PString &pstring )
97
{
98
// update message
99
_message_lens[ message_num ] = pstring.length();
100
}
101
102
103
void Text::reset_message( int message_num, char mode )
104
{
105
_message_modes[ message_num ] = mode;
106
reset_message_param( message_num );
107
}
108
109
110
102
void Text::reset()
111
103
{
112
104
// reset renderer
113
105
_duration = 0;
114
106
_last_millis = ::millis();
115
_do_draw_reset = false;
107
108
// clear all message modes (disable messages)
109
for( int a = 0; a < NUM_MESSAGE_BUFFERS; a++ )
110
_message_modes[ a ] = 0;
116
111
117
112
// reset the text renderer's output buffer
118
113
TextRenderer::reset_buffer();
119
114
}
120
115
121
116
117
void Text::set_up_message( int message_num, char mode, char scale )
118
{
119
_message_modes[ message_num ] = mode;
120
_message_scale[ message_num ] = scale;
121
122
// horizontal scrolling messages need their position reset at start of mode
123
if( _message_modes[ message_num ] & MODE_HSCROLL )
124
reset_message_pos( message_num );
125
}
126
127
128
void Text::set_message_text( int message_num, PString &pstring )
129
{
130
// update message
131
_message_lens[ message_num ] = pstring.length();
132
133
// non-horizontal scrolling modes need their position reset whenever the
134
// text changes
135
if( !( _message_modes[ message_num ] & MODE_HSCROLL ) )
136
reset_message_pos( message_num );
137
}
138
139
122
140
void Text::draw_reset()
123
141
{
124
142
// how many milliseconds have elapsed since last frame?
127
145
_duration = millis - _last_millis;
128
146
_last_millis = millis;
129
147
148
// we'll need to recalculate params for the frame, but we want to do it when
149
// we're not in the middle of a text display (to avoid tearing).
130
150
_do_draw_reset = true;
131
151
}
132
152
133
153
134
void Text::draw( int message_num, int segment )
154
static void draw_message( int message_num, int segment )
135
155
{
136
// perform a mid-frame reset, as necessary
137
if( _do_draw_reset && segment > NUM_SEGMENTS / 2 ) {
138
_do_draw_reset = false;
139
140
if( _message_modes[ message_num ] & MODE_HSCROLL )
141
{
142
// add to horizontal scroll position
143
_message_params[ message_num ] +=
144
_duration * TEXT_SCROLL_SPEED / 1000;
145
long excess = _message_params[ message_num ] -
146
TextRenderer::get_width( _message_lens[ message_num ] );
147
if( excess >= 0 ) {
148
reset_message_param( message_num );
149
_message_params[ message_num ] += excess;
150
}
151
}
152
}
156
TextRenderer::buffer_in_use();
153
157
154
158
// calculate the width
155
159
int width;
156
switch( _message_modes[ message_num ] & 0x1c )
160
switch( _message_modes[ message_num ] & MASK_MODE_SIZE )
157
161
{
158
case MODE_ONEQUARTER:
162
case Text::MODE_ONEQUARTER:
159
163
width = NUM_SEGMENTS / 4;
160
164
break;
161
case MODE_ONETHIRD:
165
case Text::MODE_ONETHIRD:
162
166
width = NUM_SEGMENTS / 3;
163
167
break;
164
case MODE_HALF:
168
case Text::MODE_HALF:
165
169
width = NUM_SEGMENTS / 2;
166
170
break;
167
case MODE_TWOTHIRDS:
171
case Text::MODE_TWOTHIRDS:
168
172
width = NUM_SEGMENTS * 2 / 3;
169
173
break;
170
case MODE_THREEQUARTERS:
174
case Text::MODE_THREEQUARTERS:
171
175
width = NUM_SEGMENTS * 3 / 4;
172
176
break;
173
case MODE_ALL:
177
case Text::MODE_ALL:
174
178
width = NUM_SEGMENTS;
175
179
break;
176
180
}
177
181
178
182
// convert segment to display-space
179
switch( _message_modes[ message_num ] & 0x03 )
183
switch( _message_modes[ message_num ] & MASK_MODE_POS )
180
184
{
181
case MODE_TOP:
185
case Text::MODE_TOP:
182
186
if( segment < width / 2 )
183
187
segment += width / 2;
184
188
else if( segment >= NUM_SEGMENTS - width / 2 )
186
190
else
187
191
return;
188
192
break;
189
case MODE_BOTTOM:
193
case Text::MODE_BOTTOM:
190
194
if( segment > ( NUM_SEGMENTS - width ) / 2 &&
191
195
segment < ( NUM_SEGMENTS - width ) / 2 + width )
192
196
{
199
203
200
204
// render
201
205
TextRenderer::render(
202
_messages[ message_num ], _message_lens[ message_num ],
203
(long)segment + _message_params[ message_num ],
204
( _message_modes[ message_num ] & 1 ) == 0, 0 );
205
}
206
Text::_messages[ message_num ], _message_lens[ message_num ],
207
(long)segment + _message_pos[ message_num ],
208
( _message_modes[ message_num ] & MASK_MODE_POS ) == Text::MODE_BOTTOM,
209
0, _message_scale[ message_num ] );
210
}
211
212
213
void Text::draw( int segment )
214
{
215
// perform a mid-frame reset, as necessary
216
if( _do_draw_reset && segment == NUM_SEGMENTS / 2 ) {
217
_do_draw_reset = false;
218
219
// go through the messages looking for an active one
220
for( int a = 0; a < NUM_MESSAGE_BUFFERS; a++ )
221
if( _message_modes[ a ] & MASK_MODE_SIZE )
222
{
223
// add to horizontal scroll position
224
if( _message_modes[ a ] & Text::MODE_HSCROLL ) {
225
_message_pos[ a ] +=
226
_duration * TEXT_SCROLL_SPEED / 1000;
227
long excess = _message_pos[ a ] -
228
TextRenderer::get_width( _message_lens[ a ],
229
_message_scale[ a ] );
230
if( excess >= 0 ) {
231
reset_message_pos( a );
232
_message_pos[ a ] += excess;
233
}
234
}
235
}
236
}
237
238
// draw any active messages
239
for( int a = 0; a < NUM_MESSAGE_BUFFERS; a++ )
240
if( _message_modes[ a ] & MASK_MODE_SIZE )
241
draw_message( a, segment );
242
}
243
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0