|
@@ -4,9 +4,9 @@
|
4
|
4
|
#include "language.h"
|
5
|
5
|
|
6
|
6
|
#ifdef DOGLCD
|
7
|
|
- #define HARDWAERE_CHAR_OUT u8g.print
|
|
7
|
+ #define HARDWARE_CHAR_OUT u8g.print
|
8
|
8
|
#else
|
9
|
|
- #define HARDWAERE_CHAR_OUT lcd.write
|
|
9
|
+ #define HARDWARE_CHAR_OUT lcd.write
|
10
|
10
|
#endif
|
11
|
11
|
|
12
|
12
|
#if !(defined( SIMULATE_ROMFONT )) && defined( DOGLCD )
|
|
@@ -90,7 +90,7 @@
|
90
|
90
|
#error( "Katakana on a western display makes no sense. There are no matching symbols." );
|
91
|
91
|
#endif
|
92
|
92
|
|
93
|
|
- #elif defined( DISPLAY_CHARSET_HD44780_CYRILIC )
|
|
93
|
+ #elif defined( DISPLAY_CHARSET_HD44780_CYRILLIC )
|
94
|
94
|
#if defined( MAPPER_D0D1 )
|
95
|
95
|
#define MAPPER_D0D1_MOD
|
96
|
96
|
// it is a Russian alphabet translation
|
|
@@ -120,12 +120,12 @@
|
120
|
120
|
#endif
|
121
|
121
|
#else
|
122
|
122
|
#error("Something went wrong in the selection of DISPLAY_CHARSET_HD44780's");
|
123
|
|
- #endif // DISPLAY_CHARSET_HD44780_CYRILIC
|
|
123
|
+ #endif // DISPLAY_CHARSET_HD44780_CYRILLIC
|
124
|
124
|
#endif // SIMULATE_ROMFONT
|
125
|
125
|
|
126
|
126
|
#if defined( MAPPER_NON )
|
127
|
127
|
char charset_mapper(char c){
|
128
|
|
- HARDWAERE_CHAR_OUT( c );
|
|
128
|
+ HARDWARE_CHAR_OUT( c );
|
129
|
129
|
return 1;
|
130
|
130
|
}
|
131
|
131
|
#elif defined( MAPPER_C2C3 )
|
|
@@ -142,17 +142,17 @@
|
142
|
142
|
else if (seen_c2){
|
143
|
143
|
d &= 0x3f;
|
144
|
144
|
#ifndef MAPPER_ONE_TO_ONE
|
145
|
|
- HARDWAERE_CHAR_OUT( (char) pgm_read_byte_near( utf_recode + d + ( utf_hi_char << 6 ) - 0x20 ) );
|
|
145
|
+ HARDWARE_CHAR_OUT( (char) pgm_read_byte_near( utf_recode + d + ( utf_hi_char << 6 ) - 0x20 ) );
|
146
|
146
|
#else
|
147
|
|
- HARDWAERE_CHAR_OUT( (char) (0x80 + ( utf_hi_char << 6 ) + d) ) ;
|
|
147
|
+ HARDWARE_CHAR_OUT( (char) (0x80 + ( utf_hi_char << 6 ) + d) ) ;
|
148
|
148
|
#endif
|
149
|
149
|
}
|
150
|
150
|
else {
|
151
|
|
- HARDWAERE_CHAR_OUT('?');
|
|
151
|
+ HARDWARE_CHAR_OUT('?');
|
152
|
152
|
}
|
153
|
153
|
}
|
154
|
154
|
else {
|
155
|
|
- HARDWAERE_CHAR_OUT((char) c );
|
|
155
|
+ HARDWARE_CHAR_OUT((char) c );
|
156
|
156
|
}
|
157
|
157
|
seen_c2 = false;
|
158
|
158
|
return 1;
|
|
@@ -172,18 +172,18 @@
|
172
|
172
|
} else if (seen_d5) {
|
173
|
173
|
d &= 0x3f;
|
174
|
174
|
if ( !utf_hi_char && ( d == 1 )) {
|
175
|
|
- HARDWAERE_CHAR_OUT((char) 0xa2 ); // Ё
|
|
175
|
+ HARDWARE_CHAR_OUT((char) 0xa2 ); // Ё
|
176
|
176
|
} else if ((utf_hi_char == 1) && (d == 0x11)) {
|
177
|
|
- HARDWAERE_CHAR_OUT((char) 0xb5 ); // ё
|
|
177
|
+ HARDWARE_CHAR_OUT((char) 0xb5 ); // ё
|
178
|
178
|
} else {
|
179
|
|
- HARDWAERE_CHAR_OUT((char) pgm_read_byte_near( utf_recode + d + ( utf_hi_char << 6 ) - 0x10 ) );
|
|
179
|
+ HARDWARE_CHAR_OUT((char) pgm_read_byte_near( utf_recode + d + ( utf_hi_char << 6 ) - 0x10 ) );
|
180
|
180
|
}
|
181
|
181
|
}
|
182
|
182
|
else {
|
183
|
|
- HARDWAERE_CHAR_OUT('?');
|
|
183
|
+ HARDWARE_CHAR_OUT('?');
|
184
|
184
|
}
|
185
|
185
|
} else {
|
186
|
|
- HARDWAERE_CHAR_OUT((char) c );
|
|
186
|
+ HARDWARE_CHAR_OUT((char) c );
|
187
|
187
|
}
|
188
|
188
|
seen_d5 = false;
|
189
|
189
|
return 1;
|
|
@@ -201,15 +201,15 @@
|
201
|
201
|
} else if (seen_d5) {
|
202
|
202
|
d &= 0x3fu;
|
203
|
203
|
#ifndef MAPPER_ONE_TO_ONE
|
204
|
|
- HARDWAERE_CHAR_OUT( (char) pgm_read_byte_near( utf_recode + d + ( utf_hi_char << 6 ) - 0x20 ) );
|
|
204
|
+ HARDWARE_CHAR_OUT( (char) pgm_read_byte_near( utf_recode + d + ( utf_hi_char << 6 ) - 0x20 ) );
|
205
|
205
|
#else
|
206
|
|
- HARDWAERE_CHAR_OUT( (char) (0xa0u + ( utf_hi_char << 6 ) + d ) ) ;
|
|
206
|
+ HARDWARE_CHAR_OUT( (char) (0xa0u + ( utf_hi_char << 6 ) + d ) ) ;
|
207
|
207
|
#endif
|
208
|
208
|
} else {
|
209
|
|
- HARDWAERE_CHAR_OUT('?');
|
|
209
|
+ HARDWARE_CHAR_OUT('?');
|
210
|
210
|
}
|
211
|
211
|
} else {
|
212
|
|
- HARDWAERE_CHAR_OUT((char) c );
|
|
212
|
+ HARDWARE_CHAR_OUT((char) c );
|
213
|
213
|
}
|
214
|
214
|
seen_d5 = false;
|
215
|
215
|
return 1;
|
|
@@ -231,15 +231,15 @@
|
231
|
231
|
} else if ((seen_e3 == true) && (seen_82_83 == true)){
|
232
|
232
|
d &= 0x3f;
|
233
|
233
|
#ifndef MAPPER_ONE_TO_ONE
|
234
|
|
- HARDWAERE_CHAR_OUT( (char) pgm_read_byte_near( utf_recode + d + ( utf_hi_char << 6 ) - 0x20 ) );
|
|
234
|
+ HARDWARE_CHAR_OUT( (char) pgm_read_byte_near( utf_recode + d + ( utf_hi_char << 6 ) - 0x20 ) );
|
235
|
235
|
#else
|
236
|
|
- HARDWAERE_CHAR_OUT( (char) (0x80 + ( utf_hi_char << 6 ) + d ) ) ;
|
|
236
|
+ HARDWARE_CHAR_OUT( (char) (0x80 + ( utf_hi_char << 6 ) + d ) ) ;
|
237
|
237
|
#endif
|
238
|
238
|
} else {
|
239
|
|
- HARDWAERE_CHAR_OUT((char) '?' );
|
|
239
|
+ HARDWARE_CHAR_OUT((char) '?' );
|
240
|
240
|
}
|
241
|
241
|
} else {
|
242
|
|
- HARDWAERE_CHAR_OUT((char) c );
|
|
242
|
+ HARDWARE_CHAR_OUT((char) c );
|
243
|
243
|
}
|
244
|
244
|
seen_e3 = false;
|
245
|
245
|
seen_82_83 = false;
|