瀏覽代碼

Format hex values as uppercase

Scott Lahteine 8 年之前
父節點
當前提交
ff0018e287

+ 1
- 1
Marlin/Conditionals_LCD.h 查看文件

230
     #define LCD_STR_DEGREE      "\x09"
230
     #define LCD_STR_DEGREE      "\x09"
231
 
231
 
232
     #define LCD_STR_SPECIAL_MAX '\x09'
232
     #define LCD_STR_SPECIAL_MAX '\x09'
233
-    // Maximum here is 0x1f because 0x20 is ' ' (space) and the normal charsets begin.
233
+    // Maximum here is 0x1F because 0x20 is ' ' (space) and the normal charsets begin.
234
     // Better stay below 0x10 because DISPLAY_CHARSET_HD44780_WESTERN begins here.
234
     // Better stay below 0x10 because DISPLAY_CHARSET_HD44780_WESTERN begins here.
235
 
235
 
236
     // Symbol characters
236
     // Symbol characters

+ 2
- 2
Marlin/M100_Free_Mem_Chk.cpp 查看文件

141
   //
141
   //
142
   // Round the start and end locations to produce full lines of output
142
   // Round the start and end locations to produce full lines of output
143
   //
143
   //
144
-  start = (char*)((uint16_t) start & 0xfff0);
145
-  end   = (char*)((uint16_t) end   | 0x000f);
144
+  start = (char*)((uint16_t) start & 0xFFF0);
145
+  end   = (char*)((uint16_t) end   | 0x000F);
146
   dump_free_memory(start, end);
146
   dump_free_memory(start, end);
147
 }
147
 }
148
 
148
 

+ 2
- 2
Marlin/Marlin_main.cpp 查看文件

10578
       x2 = number * 0.5f;
10578
       x2 = number * 0.5f;
10579
       y  = number;
10579
       y  = number;
10580
       i  = * ( long * ) &y;                       // evil floating point bit level hacking
10580
       i  = * ( long * ) &y;                       // evil floating point bit level hacking
10581
-      i  = 0x5f3759df - ( i >> 1 );               // what the f***?
10581
+      i  = 0x5F3759DF - ( i >> 1 );               // what the f***?
10582
       y  = * ( float * ) &i;
10582
       y  = * ( float * ) &i;
10583
       y  = y * ( threehalfs - ( x2 * y * y ) );   // 1st iteration
10583
       y  = y * ( threehalfs - ( x2 * y * y ) );   // 1st iteration
10584
       // y  = y * ( threehalfs - ( x2 * y * y ) );   // 2nd iteration, this can be removed
10584
       // y  = y * ( threehalfs - ( x2 * y * y ) );   // 2nd iteration, this can be removed
10804
    * Prepare a mesh-leveled linear move in a Cartesian setup,
10804
    * Prepare a mesh-leveled linear move in a Cartesian setup,
10805
    * splitting the move where it crosses mesh borders.
10805
    * splitting the move where it crosses mesh borders.
10806
    */
10806
    */
10807
-  void mesh_line_to_destination(float fr_mm_s, uint8_t x_splits = 0xff, uint8_t y_splits = 0xff) {
10807
+  void mesh_line_to_destination(float fr_mm_s, uint8_t x_splits = 0xFF, uint8_t y_splits = 0xFF) {
10808
     int cx1 = mbl.cell_index_x(RAW_CURRENT_POSITION(X)),
10808
     int cx1 = mbl.cell_index_x(RAW_CURRENT_POSITION(X)),
10809
         cy1 = mbl.cell_index_y(RAW_CURRENT_POSITION(Y)),
10809
         cy1 = mbl.cell_index_y(RAW_CURRENT_POSITION(Y)),
10810
         cx2 = mbl.cell_index_x(RAW_X_POSITION(destination[X_AXIS])),
10810
         cx2 = mbl.cell_index_x(RAW_X_POSITION(destination[X_AXIS])),

+ 2
- 2
Marlin/Sd2Card.cpp 查看文件

664
 bool Sd2Card::writeData(uint8_t token, const uint8_t* src) {
664
 bool Sd2Card::writeData(uint8_t token, const uint8_t* src) {
665
   spiSendBlock(token, src);
665
   spiSendBlock(token, src);
666
 
666
 
667
-  spiSend(0xff);  // dummy crc
668
-  spiSend(0xff);  // dummy crc
667
+  spiSend(0xFF);  // dummy crc
668
+  spiSend(0xFF);  // dummy crc
669
 
669
 
670
   status_ = spiRec();
670
   status_ = spiRec();
671
   if ((status_ & DATA_RES_MASK) != DATA_RES_ACCEPTED) {
671
   if ((status_ & DATA_RES_MASK) != DATA_RES_ACCEPTED) {

+ 1
- 1
Marlin/digipot_mcp4018.cpp 查看文件

30
 
30
 
31
 // Settings for the I2C based DIGIPOT (MCP4018) based on WT150
31
 // Settings for the I2C based DIGIPOT (MCP4018) based on WT150
32
 
32
 
33
-#define DIGIPOT_I2C_ADDRESS             0x2f
33
+#define DIGIPOT_I2C_ADDRESS             0x2F
34
 
34
 
35
 #define DIGIPOT_A4988_Rsx               0.250
35
 #define DIGIPOT_A4988_Rsx               0.250
36
 #define DIGIPOT_A4988_Vrefmax           5.0
36
 #define DIGIPOT_A4988_Vrefmax           5.0

+ 2
- 2
Marlin/digipot_mcp4451.cpp 查看文件

60
   }
60
   }
61
 
61
 
62
   // Initial setup
62
   // Initial setup
63
-  i2c_send(addr, 0x40, 0xff);
64
-  i2c_send(addr, 0xA0, 0xff);
63
+  i2c_send(addr, 0x40, 0xFF);
64
+  i2c_send(addr, 0xA0, 0xFF);
65
 
65
 
66
   // Set actual wiper value
66
   // Set actual wiper value
67
   byte addresses[4] = { 0x00, 0x10, 0x60, 0x70 };
67
   byte addresses[4] = { 0x00, 0x10, 0x60, 0x70 };

+ 62
- 62
Marlin/example_configurations/Cartesio/_Bootscreen.h 查看文件

37
 
37
 
38
 const unsigned char custom_start_bmp[512] PROGMEM = {
38
 const unsigned char custom_start_bmp[512] PROGMEM = {
39
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
39
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
40
-  0x00, 0x00, 0x00, 0x07, 0xc0, 0x00, 0x00, 0x00,
41
-  0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00,
42
-  0x00, 0x00, 0x03, 0xff, 0xff, 0xc0, 0x00, 0x00,
43
-  0x00, 0x00, 0x1f, 0xff, 0xff, 0xf0, 0x00, 0x00,
44
-  0x00, 0x00, 0x7f, 0xff, 0xff, 0xfc, 0x00, 0x00,
45
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00,
46
-  0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00,
47
-  0x00, 0x07, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00,
48
-  0x00, 0x00, 0x00, 0x07, 0xc0, 0x00, 0x00, 0x00,
49
-  0x00, 0x00, 0x00, 0x07, 0xc0, 0x00, 0x00, 0x00,
50
-  0x00, 0x00, 0x00, 0x07, 0xc0, 0x00, 0x00, 0x00,
51
-  0x00, 0x0f, 0x07, 0x87, 0xff, 0xff, 0xe0, 0x00,
52
-  0x00, 0x1f, 0x8f, 0xc7, 0xff, 0xff, 0xf1, 0x00,
53
-  0x01, 0x1f, 0x8f, 0xc7, 0xff, 0xff, 0xf1, 0x80,
54
-  0x03, 0x1f, 0x8f, 0xc7, 0xff, 0xff, 0xf1, 0x80,
55
-  0x07, 0x1f, 0x8f, 0xc7, 0xff, 0xff, 0xe1, 0xc0,
56
-  0x07, 0x1f, 0x8f, 0xc7, 0xc0, 0x00, 0x01, 0xe0,
57
-  0x0f, 0x1f, 0x8f, 0xc7, 0xc0, 0x00, 0x01, 0xe0,
58
-  0x0f, 0x1f, 0x8f, 0xc7, 0xc0, 0x00, 0x01, 0xf0,
59
-  0x1f, 0x1f, 0x8f, 0xc7, 0xc0, 0x00, 0x01, 0xf0,
60
-  0x1f, 0x1f, 0x8f, 0xc7, 0xff, 0xff, 0xe1, 0xf0,
61
-  0x3f, 0x1f, 0x8f, 0xc7, 0xff, 0xff, 0xf1, 0xf8,
62
-  0x3f, 0x1f, 0x8f, 0xc7, 0xff, 0xff, 0xf1, 0xf8,
63
-  0x3f, 0x1f, 0x8f, 0xc7, 0xff, 0xff, 0xf1, 0xf8,
64
-  0x3f, 0x1f, 0x8f, 0xc7, 0xff, 0xff, 0xe1, 0xf8,
65
-  0x7f, 0x1f, 0x8f, 0xc7, 0xc0, 0x00, 0x01, 0xfc,
66
-  0x7f, 0x1f, 0x8f, 0xc7, 0xc0, 0x00, 0x01, 0xfc,
67
-  0x7f, 0x1f, 0x8f, 0xc7, 0xc0, 0x00, 0x01, 0xfc,
68
-  0x7f, 0x1f, 0x8f, 0xc7, 0xc0, 0x00, 0x01, 0xfc,
69
-  0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc,
70
-  0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc,
71
-  0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc,
72
-  0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc,
73
-  0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc,
74
-  0x7f, 0x00, 0x00, 0x07, 0xc7, 0xe3, 0xf1, 0xfc,
75
-  0x7f, 0x00, 0x00, 0x07, 0xc7, 0xe3, 0xf1, 0xfc,
76
-  0x7f, 0x00, 0x00, 0x07, 0xc7, 0xe3, 0xf1, 0xfc,
77
-  0x3f, 0x0f, 0xff, 0xff, 0xc7, 0xe3, 0xf1, 0xf8,
78
-  0x3f, 0x1f, 0xff, 0xff, 0xc7, 0xe3, 0xf1, 0xf8,
79
-  0x3f, 0x1f, 0xff, 0xff, 0xc7, 0xe3, 0xf1, 0xf8,
80
-  0x3f, 0x1f, 0xff, 0xff, 0xc7, 0xe3, 0xf1, 0xf8,
81
-  0x1f, 0x1f, 0xff, 0xff, 0xc7, 0xe3, 0xf1, 0xf0,
82
-  0x1f, 0x0f, 0xff, 0xff, 0xc7, 0xe3, 0xf1, 0xf0,
83
-  0x1f, 0x00, 0x00, 0x07, 0xc7, 0xe3, 0xf1, 0xe0,
84
-  0x0f, 0x00, 0x00, 0x07, 0xc7, 0xe3, 0xf1, 0xe0,
85
-  0x0f, 0x00, 0x00, 0x07, 0xc7, 0xe3, 0xf1, 0xc0,
86
-  0x07, 0x0f, 0xff, 0xff, 0xc7, 0xe3, 0xf1, 0xc0,
87
-  0x03, 0x1f, 0xff, 0xff, 0xc7, 0xe3, 0xf1, 0x80,
88
-  0x03, 0x1f, 0xff, 0xff, 0xc7, 0xe3, 0xf1, 0x00,
89
-  0x01, 0x1f, 0xff, 0xff, 0xc7, 0xe3, 0xf0, 0x00,
90
-  0x00, 0x1f, 0xff, 0xff, 0xc7, 0xe3, 0xf0, 0x00,
91
-  0x00, 0x0f, 0xff, 0xff, 0xc3, 0xc1, 0xe0, 0x00,
92
-  0x00, 0x00, 0x00, 0x07, 0xc0, 0x00, 0x00, 0x00,
93
-  0x00, 0x00, 0x00, 0x07, 0xc0, 0x00, 0x00, 0x00,
94
-  0x00, 0x00, 0x00, 0x07, 0xc0, 0x00, 0x00, 0x00,
95
-  0x00, 0x07, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00,
96
-  0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00,
97
-  0x00, 0x01, 0xff, 0xff, 0xff, 0xfe, 0x00, 0x00,
98
-  0x00, 0x00, 0x7f, 0xff, 0xff, 0xfc, 0x00, 0x00,
99
-  0x00, 0x00, 0x1f, 0xff, 0xff, 0xf0, 0x00, 0x00,
100
-  0x00, 0x00, 0x07, 0xff, 0xff, 0x80, 0x00, 0x00,
101
-  0x00, 0x00, 0x00, 0x7f, 0xf8, 0x00, 0x00, 0x00,
40
+  0x00, 0x00, 0x00, 0x07, 0xC0, 0x00, 0x00, 0x00,
41
+  0x00, 0x00, 0x00, 0x3F, 0xFC, 0x00, 0x00, 0x00,
42
+  0x00, 0x00, 0x03, 0xFF, 0xFF, 0xC0, 0x00, 0x00,
43
+  0x00, 0x00, 0x1F, 0xFF, 0xFF, 0xF0, 0x00, 0x00,
44
+  0x00, 0x00, 0x7F, 0xFF, 0xFF, 0xFC, 0x00, 0x00,
45
+  0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00,
46
+  0x00, 0x03, 0xFF, 0xFF, 0xFF, 0xFF, 0x80, 0x00,
47
+  0x00, 0x07, 0xFF, 0xFF, 0xFF, 0xFF, 0xC0, 0x00,
48
+  0x00, 0x00, 0x00, 0x07, 0xC0, 0x00, 0x00, 0x00,
49
+  0x00, 0x00, 0x00, 0x07, 0xC0, 0x00, 0x00, 0x00,
50
+  0x00, 0x00, 0x00, 0x07, 0xC0, 0x00, 0x00, 0x00,
51
+  0x00, 0x0F, 0x07, 0x87, 0xFF, 0xFF, 0xE0, 0x00,
52
+  0x00, 0x1F, 0x8F, 0xC7, 0xFF, 0xFF, 0xF1, 0x00,
53
+  0x01, 0x1F, 0x8F, 0xC7, 0xFF, 0xFF, 0xF1, 0x80,
54
+  0x03, 0x1F, 0x8F, 0xC7, 0xFF, 0xFF, 0xF1, 0x80,
55
+  0x07, 0x1F, 0x8F, 0xC7, 0xFF, 0xFF, 0xE1, 0xC0,
56
+  0x07, 0x1F, 0x8F, 0xC7, 0xC0, 0x00, 0x01, 0xE0,
57
+  0x0F, 0x1F, 0x8F, 0xC7, 0xC0, 0x00, 0x01, 0xE0,
58
+  0x0F, 0x1F, 0x8F, 0xC7, 0xC0, 0x00, 0x01, 0xF0,
59
+  0x1F, 0x1F, 0x8F, 0xC7, 0xC0, 0x00, 0x01, 0xF0,
60
+  0x1F, 0x1F, 0x8F, 0xC7, 0xFF, 0xFF, 0xE1, 0xF0,
61
+  0x3F, 0x1F, 0x8F, 0xC7, 0xFF, 0xFF, 0xF1, 0xF8,
62
+  0x3F, 0x1F, 0x8F, 0xC7, 0xFF, 0xFF, 0xF1, 0xF8,
63
+  0x3F, 0x1F, 0x8F, 0xC7, 0xFF, 0xFF, 0xF1, 0xF8,
64
+  0x3F, 0x1F, 0x8F, 0xC7, 0xFF, 0xFF, 0xE1, 0xF8,
65
+  0x7F, 0x1F, 0x8F, 0xC7, 0xC0, 0x00, 0x01, 0xFC,
66
+  0x7F, 0x1F, 0x8F, 0xC7, 0xC0, 0x00, 0x01, 0xFC,
67
+  0x7F, 0x1F, 0x8F, 0xC7, 0xC0, 0x00, 0x01, 0xFC,
68
+  0x7F, 0x1F, 0x8F, 0xC7, 0xC0, 0x00, 0x01, 0xFC,
69
+  0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC,
70
+  0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC,
71
+  0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC,
72
+  0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC,
73
+  0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC,
74
+  0x7F, 0x00, 0x00, 0x07, 0xC7, 0xE3, 0xF1, 0xFC,
75
+  0x7F, 0x00, 0x00, 0x07, 0xC7, 0xE3, 0xF1, 0xFC,
76
+  0x7F, 0x00, 0x00, 0x07, 0xC7, 0xE3, 0xF1, 0xFC,
77
+  0x3F, 0x0F, 0xFF, 0xFF, 0xC7, 0xE3, 0xF1, 0xF8,
78
+  0x3F, 0x1F, 0xFF, 0xFF, 0xC7, 0xE3, 0xF1, 0xF8,
79
+  0x3F, 0x1F, 0xFF, 0xFF, 0xC7, 0xE3, 0xF1, 0xF8,
80
+  0x3F, 0x1F, 0xFF, 0xFF, 0xC7, 0xE3, 0xF1, 0xF8,
81
+  0x1F, 0x1F, 0xFF, 0xFF, 0xC7, 0xE3, 0xF1, 0xF0,
82
+  0x1F, 0x0F, 0xFF, 0xFF, 0xC7, 0xE3, 0xF1, 0xF0,
83
+  0x1F, 0x00, 0x00, 0x07, 0xC7, 0xE3, 0xF1, 0xE0,
84
+  0x0F, 0x00, 0x00, 0x07, 0xC7, 0xE3, 0xF1, 0xE0,
85
+  0x0F, 0x00, 0x00, 0x07, 0xC7, 0xE3, 0xF1, 0xC0,
86
+  0x07, 0x0F, 0xFF, 0xFF, 0xC7, 0xE3, 0xF1, 0xC0,
87
+  0x03, 0x1F, 0xFF, 0xFF, 0xC7, 0xE3, 0xF1, 0x80,
88
+  0x03, 0x1F, 0xFF, 0xFF, 0xC7, 0xE3, 0xF1, 0x00,
89
+  0x01, 0x1F, 0xFF, 0xFF, 0xC7, 0xE3, 0xF0, 0x00,
90
+  0x00, 0x1F, 0xFF, 0xFF, 0xC7, 0xE3, 0xF0, 0x00,
91
+  0x00, 0x0F, 0xFF, 0xFF, 0xC3, 0xC1, 0xE0, 0x00,
92
+  0x00, 0x00, 0x00, 0x07, 0xC0, 0x00, 0x00, 0x00,
93
+  0x00, 0x00, 0x00, 0x07, 0xC0, 0x00, 0x00, 0x00,
94
+  0x00, 0x00, 0x00, 0x07, 0xC0, 0x00, 0x00, 0x00,
95
+  0x00, 0x07, 0xFF, 0xFF, 0xFF, 0xFF, 0xC0, 0x00,
96
+  0x00, 0x03, 0xFF, 0xFF, 0xFF, 0xFF, 0x80, 0x00,
97
+  0x00, 0x01, 0xFF, 0xFF, 0xFF, 0xFE, 0x00, 0x00,
98
+  0x00, 0x00, 0x7F, 0xFF, 0xFF, 0xFC, 0x00, 0x00,
99
+  0x00, 0x00, 0x1F, 0xFF, 0xFF, 0xF0, 0x00, 0x00,
100
+  0x00, 0x00, 0x07, 0xFF, 0xFF, 0x80, 0x00, 0x00,
101
+  0x00, 0x00, 0x00, 0x7F, 0xF8, 0x00, 0x00, 0x00,
102
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
102
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
103
 };
103
 };

+ 50
- 50
Marlin/example_configurations/Hephestos_2/_Bootscreen.h 查看文件

36
 #define CUSTOM_BOOTSCREEN_BMPHEIGHT 64
36
 #define CUSTOM_BOOTSCREEN_BMPHEIGHT 64
37
 
37
 
38
 const unsigned char custom_start_bmp[512] PROGMEM = {
38
 const unsigned char custom_start_bmp[512] PROGMEM = {
39
-  0x00, 0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00,
40
-  0x00, 0x00, 0x00, 0x1f, 0xf8, 0x00, 0x00, 0x00,
41
-  0x00, 0x00, 0x00, 0x1f, 0xf8, 0x00, 0x00, 0x00,
42
-  0x00, 0x00, 0x00, 0x1f, 0xf8, 0x00, 0x00, 0x00,
43
-  0x00, 0x00, 0x00, 0x1f, 0xf8, 0x00, 0x00, 0x00,
44
-  0x00, 0x00, 0x00, 0x1f, 0xf8, 0x00, 0x00, 0x00,
45
-  0x00, 0x03, 0xc0, 0x0f, 0xf0, 0x07, 0x80, 0x00,
46
-  0x00, 0x07, 0xe0, 0x07, 0xe0, 0x0f, 0xc0, 0x00,
47
-  0x00, 0x0f, 0xf0, 0x03, 0xc0, 0x1f, 0xe0, 0x00,
48
-  0x00, 0x1f, 0xf8, 0x00, 0x00, 0x3f, 0xf0, 0x00,
49
-  0x00, 0x1f, 0xf8, 0x00, 0x00, 0x3f, 0xf0, 0x00,
50
-  0x00, 0x1f, 0xf8, 0x00, 0x00, 0x3f, 0xf0, 0x00,
51
-  0x00, 0x1f, 0xf8, 0x00, 0x00, 0x3f, 0xf0, 0x00,
52
-  0x00, 0x1f, 0xf8, 0x00, 0x00, 0x3f, 0xf0, 0x00,
53
-  0x00, 0x0f, 0xf0, 0x00, 0x00, 0x1f, 0xe0, 0x00,
54
-  0x00, 0x07, 0xe0, 0x00, 0x00, 0x0f, 0xc0, 0x00,
55
-  0x00, 0x03, 0xc0, 0x00, 0x00, 0x07, 0x80, 0x00,
39
+  0x00, 0x00, 0x00, 0x0F, 0xF0, 0x00, 0x00, 0x00,
40
+  0x00, 0x00, 0x00, 0x1F, 0xF8, 0x00, 0x00, 0x00,
41
+  0x00, 0x00, 0x00, 0x1F, 0xF8, 0x00, 0x00, 0x00,
42
+  0x00, 0x00, 0x00, 0x1F, 0xF8, 0x00, 0x00, 0x00,
43
+  0x00, 0x00, 0x00, 0x1F, 0xF8, 0x00, 0x00, 0x00,
44
+  0x00, 0x00, 0x00, 0x1F, 0xF8, 0x00, 0x00, 0x00,
45
+  0x00, 0x03, 0xC0, 0x0F, 0xF0, 0x07, 0x80, 0x00,
46
+  0x00, 0x07, 0xE0, 0x07, 0xE0, 0x0F, 0xC0, 0x00,
47
+  0x00, 0x0F, 0xF0, 0x03, 0xC0, 0x1F, 0xE0, 0x00,
48
+  0x00, 0x1F, 0xF8, 0x00, 0x00, 0x3F, 0xF0, 0x00,
49
+  0x00, 0x1F, 0xF8, 0x00, 0x00, 0x3F, 0xF0, 0x00,
50
+  0x00, 0x1F, 0xF8, 0x00, 0x00, 0x3F, 0xF0, 0x00,
51
+  0x00, 0x1F, 0xF8, 0x00, 0x00, 0x3F, 0xF0, 0x00,
52
+  0x00, 0x1F, 0xF8, 0x00, 0x00, 0x3F, 0xF0, 0x00,
53
+  0x00, 0x0F, 0xF0, 0x00, 0x00, 0x1F, 0xE0, 0x00,
54
+  0x00, 0x07, 0xE0, 0x00, 0x00, 0x0F, 0xC0, 0x00,
55
+  0x00, 0x03, 0xC0, 0x00, 0x00, 0x07, 0x80, 0x00,
56
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
56
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
57
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0,
58
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xf8,
59
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xfc,
60
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xfc,
61
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xfc,
62
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xfc,
63
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xfc,
64
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xfc,
65
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xfc,
66
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xf8,
67
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0,
57
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF0,
58
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xF8,
59
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xFC,
60
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xFC,
61
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xFC,
62
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xFC,
63
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xFC,
64
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xFC,
65
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xFC,
66
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xF8,
67
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF0,
68
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
68
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
69
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
69
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
70
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
70
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
73
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
73
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
74
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
74
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
75
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
75
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
76
-  0x1e, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00,
77
-  0x3f, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00,
78
-  0x7f, 0x80, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00,
79
-  0xff, 0xc0, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00,
80
-  0xff, 0xc0, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00,
81
-  0xff, 0xc0, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00,
82
-  0xff, 0xc0, 0x00, 0x00, 0xf7, 0xc0, 0x1f, 0x80,
83
-  0xff, 0xc0, 0x00, 0x00, 0xff, 0xf0, 0x7f, 0xc0,
84
-  0x7f, 0x80, 0x00, 0x00, 0xff, 0xf8, 0xff, 0xe0,
85
-  0x3f, 0x00, 0x00, 0x00, 0xfc, 0xf8, 0xf0, 0xf8,
86
-  0x1e, 0x00, 0x00, 0x00, 0xf8, 0x7d, 0xe0, 0x78,
87
-  0x00, 0x00, 0x00, 0x00, 0xf0, 0x3d, 0xe0, 0x78,
88
-  0x00, 0x00, 0x00, 0x00, 0xf0, 0x3d, 0xe0, 0x78,
89
-  0x00, 0x00, 0x00, 0x00, 0xf0, 0x3d, 0xe0, 0x78,
90
-  0x00, 0x00, 0x00, 0x00, 0xf0, 0x3d, 0xe0, 0x78,
91
-  0x00, 0x00, 0x00, 0x00, 0xf0, 0x3d, 0xe0, 0x78,
92
-  0x00, 0x00, 0x00, 0x00, 0xf0, 0x3d, 0xe0, 0x78,
93
-  0x00, 0x00, 0x00, 0x00, 0xf8, 0x79, 0xf0, 0xf8,
94
-  0x00, 0x00, 0x00, 0x00, 0xff, 0xf8, 0xff, 0xf8,
95
-  0x00, 0x00, 0x00, 0x00, 0x3f, 0xf0, 0x7f, 0xf8,
96
-  0x00, 0x00, 0x00, 0x00, 0x0f, 0xe0, 0x3f, 0xf8,
97
-  0x00, 0x00, 0x00, 0x00, 0x03, 0x80, 0x0e, 0x78,
76
+  0x1E, 0x00, 0x00, 0x00, 0xF0, 0x00, 0x00, 0x00,
77
+  0x3F, 0x00, 0x00, 0x00, 0xF0, 0x00, 0x00, 0x00,
78
+  0x7F, 0x80, 0x00, 0x00, 0xF0, 0x00, 0x00, 0x00,
79
+  0xFF, 0xC0, 0x00, 0x00, 0xF0, 0x00, 0x00, 0x00,
80
+  0xFF, 0xC0, 0x00, 0x00, 0xF0, 0x00, 0x00, 0x00,
81
+  0xFF, 0xC0, 0x00, 0x00, 0xF0, 0x00, 0x00, 0x00,
82
+  0xFF, 0xC0, 0x00, 0x00, 0xF7, 0xC0, 0x1F, 0x80,
83
+  0xFF, 0xC0, 0x00, 0x00, 0xFF, 0xF0, 0x7F, 0xC0,
84
+  0x7F, 0x80, 0x00, 0x00, 0xFF, 0xF8, 0xFF, 0xE0,
85
+  0x3F, 0x00, 0x00, 0x00, 0xFC, 0xF8, 0xF0, 0xF8,
86
+  0x1E, 0x00, 0x00, 0x00, 0xF8, 0x7D, 0xE0, 0x78,
87
+  0x00, 0x00, 0x00, 0x00, 0xF0, 0x3D, 0xE0, 0x78,
88
+  0x00, 0x00, 0x00, 0x00, 0xF0, 0x3D, 0xE0, 0x78,
89
+  0x00, 0x00, 0x00, 0x00, 0xF0, 0x3D, 0xE0, 0x78,
90
+  0x00, 0x00, 0x00, 0x00, 0xF0, 0x3D, 0xE0, 0x78,
91
+  0x00, 0x00, 0x00, 0x00, 0xF0, 0x3D, 0xE0, 0x78,
92
+  0x00, 0x00, 0x00, 0x00, 0xF0, 0x3D, 0xE0, 0x78,
93
+  0x00, 0x00, 0x00, 0x00, 0xF8, 0x79, 0xF0, 0xF8,
94
+  0x00, 0x00, 0x00, 0x00, 0xFF, 0xF8, 0xFF, 0xF8,
95
+  0x00, 0x00, 0x00, 0x00, 0x3F, 0xF0, 0x7F, 0xF8,
96
+  0x00, 0x00, 0x00, 0x00, 0x0F, 0xE0, 0x3F, 0xF8,
97
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x80, 0x0E, 0x78,
98
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78,
98
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78,
99
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78,
99
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78,
100
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78,
100
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78,

+ 1
- 1
Marlin/planner.h 查看文件

402
         // Doesn't matter because block_buffer_runtime_us is already too small an estimation.
402
         // Doesn't matter because block_buffer_runtime_us is already too small an estimation.
403
         bbru >>= 10;
403
         bbru >>= 10;
404
         // limit to about a minute.
404
         // limit to about a minute.
405
-        NOMORE(bbru, 0xfffful);
405
+        NOMORE(bbru, 0xFFFFul);
406
         return bbru;
406
         return bbru;
407
       }
407
       }
408
 
408
 

+ 2
- 2
Marlin/stepper.h 查看文件

302
       step_rate -= F_CPU / 500000; // Correct for minimal speed
302
       step_rate -= F_CPU / 500000; // Correct for minimal speed
303
       if (step_rate >= (8 * 256)) { // higher step rate
303
       if (step_rate >= (8 * 256)) { // higher step rate
304
         unsigned short table_address = (unsigned short)&speed_lookuptable_fast[(unsigned char)(step_rate >> 8)][0];
304
         unsigned short table_address = (unsigned short)&speed_lookuptable_fast[(unsigned char)(step_rate >> 8)][0];
305
-        unsigned char tmp_step_rate = (step_rate & 0x00ff);
305
+        unsigned char tmp_step_rate = (step_rate & 0x00FF);
306
         unsigned short gain = (unsigned short)pgm_read_word_near(table_address + 2);
306
         unsigned short gain = (unsigned short)pgm_read_word_near(table_address + 2);
307
         MultiU16X8toH16(timer, tmp_step_rate, gain);
307
         MultiU16X8toH16(timer, tmp_step_rate, gain);
308
         timer = (unsigned short)pgm_read_word_near(table_address) - timer;
308
         timer = (unsigned short)pgm_read_word_near(table_address) - timer;
309
       }
309
       }
310
       else { // lower step rates
310
       else { // lower step rates
311
         unsigned short table_address = (unsigned short)&speed_lookuptable_slow[0][0];
311
         unsigned short table_address = (unsigned short)&speed_lookuptable_slow[0][0];
312
-        table_address += ((step_rate) >> 1) & 0xfffc;
312
+        table_address += ((step_rate) >> 1) & 0xFFFC;
313
         timer = (unsigned short)pgm_read_word_near(table_address);
313
         timer = (unsigned short)pgm_read_word_near(table_address);
314
         timer -= (((unsigned short)pgm_read_word_near(table_address + 2) * (unsigned char)(step_rate & 0x0007)) >> 3);
314
         timer -= (((unsigned short)pgm_read_word_near(table_address + 2) * (unsigned char)(step_rate & 0x0007)) >> 3);
315
       }
315
       }

+ 1
- 1
Marlin/temperature.cpp 查看文件

1396
       max6675_temp >>= MAX6675_DISCARD_BITS;
1396
       max6675_temp >>= MAX6675_DISCARD_BITS;
1397
       #if ENABLED(MAX6675_IS_MAX31855)
1397
       #if ENABLED(MAX6675_IS_MAX31855)
1398
         // Support negative temperature
1398
         // Support negative temperature
1399
-        if (max6675_temp & 0x00002000) max6675_temp |= 0xffffc000;
1399
+        if (max6675_temp & 0x00002000) max6675_temp |= 0xFFFFC000;
1400
       #endif
1400
       #endif
1401
 
1401
 
1402
     return (int)max6675_temp;
1402
     return (int)max6675_temp;

+ 4
- 4
Marlin/ultralcd_st7920_u8glib_rrd.h 查看文件

107
 
107
 
108
 #define ST7920_CS()              { WRITE(ST7920_CS_PIN,1); U8G_DELAY(); }
108
 #define ST7920_CS()              { WRITE(ST7920_CS_PIN,1); U8G_DELAY(); }
109
 #define ST7920_NCS()             { WRITE(ST7920_CS_PIN,0); }
109
 #define ST7920_NCS()             { WRITE(ST7920_CS_PIN,0); }
110
-#define ST7920_SET_CMD()         { ST7920_SWSPI_SND_8BIT(0xf8); U8G_DELAY(); }
111
-#define ST7920_SET_DAT()         { ST7920_SWSPI_SND_8BIT(0xfa); U8G_DELAY(); }
112
-#define ST7920_WRITE_BYTE(a)     { ST7920_SWSPI_SND_8BIT((uint8_t)((a)&0xf0u)); ST7920_SWSPI_SND_8BIT((uint8_t)((a)<<4u)); U8G_DELAY(); }
113
-#define ST7920_WRITE_BYTES(p,l)  { for (uint8_t i = l + 1; --i;) { ST7920_SWSPI_SND_8BIT(*p&0xf0); ST7920_SWSPI_SND_8BIT(*p<<4); p++; } U8G_DELAY(); }
110
+#define ST7920_SET_CMD()         { ST7920_SWSPI_SND_8BIT(0xF8); U8G_DELAY(); }
111
+#define ST7920_SET_DAT()         { ST7920_SWSPI_SND_8BIT(0xFA); U8G_DELAY(); }
112
+#define ST7920_WRITE_BYTE(a)     { ST7920_SWSPI_SND_8BIT((uint8_t)((a)&0xF0u)); ST7920_SWSPI_SND_8BIT((uint8_t)((a)<<4u)); U8G_DELAY(); }
113
+#define ST7920_WRITE_BYTES(p,l)  { for (uint8_t i = l + 1; --i;) { ST7920_SWSPI_SND_8BIT(*p&0xF0); ST7920_SWSPI_SND_8BIT(*p<<4); p++; } U8G_DELAY(); }
114
 
114
 
115
 uint8_t u8g_dev_rrd_st7920_128x64_fn(u8g_t *u8g, u8g_dev_t *dev, uint8_t msg, void *arg) {
115
 uint8_t u8g_dev_rrd_st7920_128x64_fn(u8g_t *u8g, u8g_dev_t *dev, uint8_t msg, void *arg) {
116
   uint8_t i, y;
116
   uint8_t i, y;

+ 71
- 71
Marlin/utf_mapper.h 查看文件

44
     #if ENABLED(MAPPER_C2C3)
44
     #if ENABLED(MAPPER_C2C3)
45
       const PROGMEM uint8_t utf_recode[] =
45
       const PROGMEM uint8_t utf_recode[] =
46
            { // 0    1    2    3    4    5    6    7    8    9    a    b    c    d    e    f          This is fair for symbols
46
            { // 0    1    2    3    4    5    6    7    8    9    a    b    c    d    e    f          This is fair for symbols
47
-               0x20,0x3f,0xec,0xed,0x3f,0x5c,0x7c,0x3f,0x22,0x63,0x61,0x7f,0x3f,0x3f,0x52,0xb0,  // c2a
47
+               0x20,0x3F,0xEC,0xED,0x3F,0x5C,0x7C,0x3F,0x22,0x63,0x61,0x7F,0x3F,0x3F,0x52,0xB0,  // c2a
48
              //' '        ¢    £         ­     l         "    c    a    «              R
48
              //' '        ¢    £         ­     l         "    c    a    «              R
49
-               0xdf,0x3f,0x32,0x33,0x27,0xe4,0xf1,0xa5,0x2c,0x31,0xdf,0x7e,0x3f,0x3f,0x3f,0x3f,  // c2b but relatively bad for letters.
49
+               0xDF,0x3F,0x32,0x33,0x27,0xE4,0xF1,0xA5,0x2C,0x31,0xDF,0x7E,0x3F,0x3F,0x3F,0x3F,  // c2b but relatively bad for letters.
50
              // °         2    3    `    N    p    .    ,    1    °    »
50
              // °         2    3    `    N    p    .    ,    1    °    »
51
-               0x3f,0x3f,0x3f,0x3f,0xe1,0x3f,0x3f,0x3f,0x3f,0x3f,0x3f,0x3f,0x3f,0x3f,0x3f,0x3f,  // c38
51
+               0x3F,0x3F,0x3F,0x3F,0xE1,0x3F,0x3F,0x3F,0x3F,0x3F,0x3F,0x3F,0x3F,0x3F,0x3F,0x3F,  // c38
52
              //                     ä
52
              //                     ä
53
-               0x3f,0x3f,0x3f,0x3f,0x3f,0x3f,0xef,0x78,0x3f,0x3f,0x3f,0x3f,0xf5,0x3f,0x3f,0xe2,  // c39 missing characters display as '?'
53
+               0x3F,0x3F,0x3F,0x3F,0x3F,0x3F,0xEF,0x78,0x3F,0x3F,0x3F,0x3F,0xF5,0x3F,0x3F,0xE2,  // c39 missing characters display as '?'
54
              //                               ö    x                        ü              ß
54
              //                               ö    x                        ü              ß
55
-               0x3f,0x3f,0x3f,0x3f,0xe1,0x3f,0x3f,0x3f,0x3f,0x3f,0x3f,0x3f,0x3f,0x3f,0x3f,0x3f,  // c3a
55
+               0x3F,0x3F,0x3F,0x3F,0xE1,0x3F,0x3F,0x3F,0x3F,0x3F,0x3F,0x3F,0x3F,0x3F,0x3F,0x3F,  // c3a
56
              //                     ä
56
              //                     ä
57
-               0x3f,0xee,0x3f,0x3f,0x3f,0x3f,0xef,0xfd,0x3f,0x3f,0x3f,0x3f,0xf5,0x3f,0x3f,0x3f   // c3b
57
+               0x3F,0xEE,0x3F,0x3F,0x3F,0x3F,0xEF,0xFD,0x3F,0x3F,0x3F,0x3F,0xF5,0x3F,0x3F,0x3F   // c3b
58
              //      n                        ö    ÷                        ü
58
              //      n                        ö    ÷                        ü
59
            };
59
            };
60
     #elif ENABLED(MAPPER_E382E383)
60
     #elif ENABLED(MAPPER_E382E383)
61
       const PROGMEM uint8_t utf_recode[] =
61
       const PROGMEM uint8_t utf_recode[] =
62
            { // 0    1    2    3    4    5    6    7    8    9    a    b    c    d    e    f
62
            { // 0    1    2    3    4    5    6    7    8    9    a    b    c    d    e    f
63
-               0x3d,0xb1,0xb1,0xa8,0xb2,0xa9,0xb3,0xaa,0xb4,0xab,0xb5,0xb6,0xb6,0xb7,0xb7,0xb8,  // e382a Please test and correct
63
+               0x3D,0xB1,0xB1,0xA8,0xB2,0xA9,0xB3,0xAA,0xB4,0xAB,0xB5,0xB6,0xB6,0xB7,0xB7,0xB8,  // e382a Please test and correct
64
              // =    ア    ア    ィ    イ    ゥ    ウ    ェ    エ    ォ    オ   ガ    ガ    キ   キ    ク
64
              // =    ア    ア    ィ    イ    ゥ    ウ    ェ    エ    ォ    オ   ガ    ガ    キ   キ    ク
65
-               0xb8,0xb9,0xb9,0xba,0xba,0xbb,0xbb,0xbc,0xbc,0xbd,0xbd,0xbe,0xbe,0xbf,0xbf,0xc0,  // e382b
65
+               0xB8,0xB9,0xB9,0xBA,0xBA,0xBB,0xBB,0xBC,0xBC,0xBD,0xBD,0xBE,0xBE,0xBF,0xBF,0xC0,  // e382b
66
              // ク    ケ    ケ   コ    コ    サ    サ    シ    シ   ス    ス    セ    セ    ソ   ソ    タ
66
              // ク    ケ    ケ   コ    コ    サ    サ    シ    シ   ス    ス    セ    セ    ソ   ソ    タ
67
-               0xc0,0xc1,0xc1,0xc2,0xc2,0xc2,0xc3,0xc3,0xc4,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,  // e3838
67
+               0xC0,0xC1,0xC1,0xC2,0xC2,0xC2,0xC3,0xC3,0xC4,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,  // e3838
68
              // タ    チ    チ    ッ    ッ    ッ    テ   テ    ト    ト    ナ    ニ    ヌ    ネ   ノ    ハ
68
              // タ    チ    チ    ッ    ッ    ッ    テ   テ    ト    ト    ナ    ニ    ヌ    ネ   ノ    ハ
69
-               0xca,0xca,0xcb,0xcb,0xcb,0xcc,0xcc,0xcc,0xcd,0xcd,0xcd,0xce,0xce,0xce,0xcf,0xd0,  // e3839
69
+               0xCA,0xCA,0xCB,0xCB,0xCB,0xCC,0xCC,0xCC,0xCD,0xCD,0xCD,0xCE,0xCE,0xCE,0xCF,0xD0,  // e3839
70
              // ハ    ハ    ヒ   ヒ    ヒ     フ    フ   フ    ヘ    ヘ    ヘ    ホ    ホ    ホ   マ    ミ
70
              // ハ    ハ    ヒ   ヒ    ヒ     フ    フ   フ    ヘ    ヘ    ヘ    ホ    ホ    ホ   マ    ミ
71
-               0xd1,0xd2,0xd3,0xd4,0xd4,0xd5,0xd5,0xae,0xd6,0xd7,0xd8,0xd9,0xda,0xdb,0xdc,0xdc,  // e383a
71
+               0xD1,0xD2,0xD3,0xD4,0xD4,0xD5,0xD5,0xAE,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDC,  // e383a
72
              // ム    メ    モ    ャ   ャ    ユ    ユ    ョ    ヨ    ラ    リ    ル    レ    ロ   ワ    ワ
72
              // ム    メ    モ    ャ   ャ    ユ    ユ    ョ    ヨ    ラ    リ    ル    レ    ロ   ワ    ワ
73
-               0xec,0xa7,0xa6,0xdd,0xcc,0x3f,0x3f,0x3f,0x3f,0x3f,0xa6,0xa5,0xb0,0xa4,0xa4,0x3f   // e383b
73
+               0xEC,0xA7,0xA6,0xDD,0xCC,0x3F,0x3F,0x3F,0x3F,0x3F,0xA6,0xA5,0xB0,0xA4,0xA4,0x3F   // e383b
74
              // ヰ    ヱ    ヲ    ン    フ    ?    ?   ?    ?    ?    ヲ    ・    ー    ヽ    ヽ   ?
74
              // ヰ    ヱ    ヲ    ン    フ    ?    ?   ?    ?    ?    ヲ    ・    ー    ヽ    ヽ   ?
75
            };
75
            };
76
     #elif ENABLED(MAPPER_D0D1)
76
     #elif ENABLED(MAPPER_D0D1)
81
     #if ENABLED(MAPPER_C2C3)
81
     #if ENABLED(MAPPER_C2C3)
82
       const PROGMEM uint8_t utf_recode[] =
82
       const PROGMEM uint8_t utf_recode[] =
83
            { // 0    1    2    3    4    5    6    7    8    9    a    b    c    d    e    f   This is relative complete.
83
            { // 0    1    2    3    4    5    6    7    8    9    a    b    c    d    e    f   This is relative complete.
84
-               0x20,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0x22,0xa9,0xaa,0xab,0x3f,0x3f,0xae,0x3f,  // c2a ¡¢£¤¥¦§¨©ª«¬­®¯
84
+               0x20,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0x22,0xA9,0xAA,0xAB,0x3F,0x3F,0xAE,0x3F,  // c2a ¡¢£¤¥¦§¨©ª«¬­®¯
85
              //' '   ¡    ¢    £    ¤    ¥    ¦    §    "    ©    ª    «    ?    ?    ®    ?
85
              //' '   ¡    ¢    £    ¤    ¥    ¦    §    "    ©    ª    «    ?    ?    ®    ?
86
-               0xb0,0xb1,0xb2,0xb3,0x27,0xb5,0xb6,0xb7,0x2c,0xb9,0xba,0xbb,0xbc,0xbd,0xbe,0xbf,  // c2b °±²³´µ¶·¸¹º»¼½¾¿
86
+               0xB0,0xB1,0xB2,0xB3,0x27,0xB5,0xB6,0xB7,0x2C,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF,  // c2b °±²³´µ¶·¸¹º»¼½¾¿
87
              // °    ±    ³    ²    ?    µ    ¶    ·    ,    ¹    º    »    ¼    ½    ¾    ¿
87
              // °    ±    ³    ²    ?    µ    ¶    ·    ,    ¹    º    »    ¼    ½    ¾    ¿
88
-               0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,  // c38 ÀÁÃÄÅÆÇÈÉÊËÌÍÎÏ
88
+               0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,  // c38 ÀÁÃÄÅÆÇÈÉÊËÌÍÎÏ
89
              // À    Á    Â    Ã    Ä    Å    Æ    Ç    È    É    Ê    Ë    Ì    Í    Î    Ï
89
              // À    Á    Â    Ã    Ä    Å    Æ    Ç    È    É    Ê    Ë    Ì    Í    Î    Ï
90
-               0xd0,0xd1,0xd2,0xd3,0xd4,0xd5,0xd6,0xd7,0xd8,0xd9,0xda,0xdb,0xdc,0xdd,0xde,0xdf,  // c39 ÐÑÓÔÕÖרÙÚÛÜÝÞß
90
+               0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF,  // c39 ÐÑÓÔÕÖרÙÚÛÜÝÞß
91
              // Ð    Ñ    Ò    Ó    Ô    Õ    Ö    ×    Ø    Ù    Ú    Û    Ü    Ý    Þ    ß
91
              // Ð    Ñ    Ò    Ó    Ô    Õ    Ö    ×    Ø    Ù    Ú    Û    Ü    Ý    Þ    ß
92
-               0xe0,0xe1,0xe2,0xe3,0xe4,0xe5,0xe6,0xe7,0xe8,0xe9,0xea,0xeb,0xec,0xed,0xee,0xef,  // c3a àáãäåæçèéêëìíîï
92
+               0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,  // c3a àáãäåæçèéêëìíîï
93
              // à    á    â    ã    ä    å    æ    ç    è    é    ê    ë    ì    í    î    ï
93
              // à    á    â    ã    ä    å    æ    ç    è    é    ê    ë    ì    í    î    ï
94
-               0xf0,0xf1,0xf2,0xf3,0xf4,0xf5,0xf6,0xf7,0xf8,0xf9,0xfa,0xfb,0xfc,0xfd,0xfe,0xff   // c3b ðñóôõö÷øùúûüýþÿ
94
+               0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF   // c3b ðñóôõö÷øùúûüýþÿ
95
              // ð    ñ    ò    ó    ô    õ    ö    ÷    ø    ù    ú    û    ü    ý    þ    ÿ
95
              // ð    ñ    ò    ó    ô    õ    ö    ÷    ø    ù    ú    û    ü    ý    þ    ÿ
96
            };
96
            };
97
     #elif ENABLED(MAPPER_D0D1)
97
     #elif ENABLED(MAPPER_D0D1)
98
       #define MAPPER_D0D1_MOD
98
       #define MAPPER_D0D1_MOD
99
       const PROGMEM uint8_t utf_recode[] =
99
       const PROGMEM uint8_t utf_recode[] =
100
            {//0    1    2    3    4    5    6    7    8    9    a    b    c    d    e    f
100
            {//0    1    2    3    4    5    6    7    8    9    a    b    c    d    e    f
101
-               0x41,0x80,0x42,0x92,0x81,0x45,0x82,0x83,0x84,0x85,0x4b,0x86,0x4d,0x48,0x4f,0x87,  // d0a
101
+               0x41,0x80,0x42,0x92,0x81,0x45,0x82,0x83,0x84,0x85,0x4B,0x86,0x4D,0x48,0x4F,0x87,  // d0a
102
              // A    Б    B    Г    Д    E    Ж    З    И    Й    K    Л    M    H    O    П
102
              // A    Б    B    Г    Д    E    Ж    З    И    Й    K    Л    M    H    O    П
103
-               0x50,0x43,0x54,0x88,0xd8,0x58,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x62,0x8f,0xac,0xad,  // d0b
103
+               0x50,0x43,0x54,0x88,0xD8,0x58,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x62,0x8F,0xAC,0xAD,  // d0b
104
              // P    C    T    У    Ф    X    Ч    ч    Ш    Щ    Ъ    Ы    b    Э    Ю    Я
104
              // P    C    T    У    Ф    X    Ч    ч    Ш    Щ    Ъ    Ы    b    Э    Ю    Я
105
-               0x61,0x36,0x42,0x92,0x81,0x65,0x82,0xb3,0x84,0x85,0x6b,0x86,0x4d,0x48,0x6f,0x87,  // d18
105
+               0x61,0x36,0x42,0x92,0x81,0x65,0x82,0xB3,0x84,0x85,0x6B,0x86,0x4D,0x48,0x6F,0x87,  // d18
106
              // a    6    B    Г    Д    e    Ж    ³    И    Й    k    Л    M    H    o    П
106
              // a    6    B    Г    Д    e    Ж    ³    И    Й    k    Л    M    H    o    П
107
-               0x70,0x63,0x54,0x79,0xd8,0x78,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x62,0x8f,0xac,0xad   // d19
107
+               0x70,0x63,0x54,0x79,0xD8,0x78,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x62,0x8F,0xAC,0xAD   // d19
108
              // p    c    T    y    Ф    x    Ч    ч    Ш    Щ    Ъ    Ы    b    Э    Ю    Я
108
              // p    c    T    y    Ф    x    Ч    ч    Ш    Щ    Ъ    Ы    b    Э    Ю    Я
109
             };
109
             };
110
     #elif ENABLED(MAPPER_E382E383)
110
     #elif ENABLED(MAPPER_E382E383)
115
     #if ENABLED(MAPPER_D0D1)
115
     #if ENABLED(MAPPER_D0D1)
116
       #define MAPPER_D0D1_MOD
116
       #define MAPPER_D0D1_MOD
117
       // it is a Russian alphabet translation
117
       // it is a Russian alphabet translation
118
-      // except 0401 --> 0xa2 = Ё, 0451 --> 0xb5 = ё
118
+      // except 0401 --> 0xA2 = Ё, 0451 --> 0xB5 = ё
119
       const PROGMEM uint8_t utf_recode[] =
119
       const PROGMEM uint8_t utf_recode[] =
120
-               { 0x41,0xa0,0x42,0xa1,0xe0,0x45,0xa3,0xa4,   // unicode U+0400 to U+047f
120
+               { 0x41,0xA0,0x42,0xA1,0xE0,0x45,0xA3,0xA4,   // unicode U+0400 to U+047f
121
                // A   Б->Ё  B    Г    Д    E    Ж    З      // 0  Ѐ Ё Ђ Ѓ Є Ѕ І Ї
121
                // A   Б->Ё  B    Г    Д    E    Ж    З      // 0  Ѐ Ё Ђ Ѓ Є Ѕ І Ї
122
-                 0xa5,0xa6,0x4b,0xa7,0x4d,0x48,0x4f,0xa8,   //    Ј Љ Њ Ћ Ќ Ѝ Ў Џ
122
+                 0xA5,0xA6,0x4B,0xA7,0x4D,0x48,0x4F,0xA8,   //    Ј Љ Њ Ћ Ќ Ѝ Ў Џ
123
                // И    Й    K    Л    M    H    O    П      // 1  А Б В Г Д Е Ж З
123
                // И    Й    K    Л    M    H    O    П      // 1  А Б В Г Д Е Ж З
124
-                 0x50,0x43,0x54,0xa9,0xaa,0x58,0xe1,0xab,   //    И Й К Л М Н О П
124
+                 0x50,0x43,0x54,0xA9,0xAA,0x58,0xE1,0xAB,   //    И Й К Л М Н О П
125
                // P    C    T    У    Ф    X    Ч    ч      // 2  Р С Т У Ф Х Г Ч
125
                // P    C    T    У    Ф    X    Ч    ч      // 2  Р С Т У Ф Х Г Ч
126
-                 0xac,0xe2,0xad,0xae,0x62,0xaf,0xb0,0xb1,   //    Ш Щ Ъ Ы Ь Э Ю Я
126
+                 0xAC,0xE2,0xAD,0xAE,0x62,0xAF,0xB0,0xB1,   //    Ш Щ Ъ Ы Ь Э Ю Я
127
                // Ш    Щ    Ъ    Ы    b    Э    Ю    Я      // 3  а б в г д е ж з
127
                // Ш    Щ    Ъ    Ы    b    Э    Ю    Я      // 3  а б в г д е ж з
128
-                 0x61,0xb2,0xb3,0xb4,0xe3,0x65,0xb6,0xb7,   //    и й к л м н о п
128
+                 0x61,0xB2,0xB3,0xB4,0xE3,0x65,0xB6,0xB7,   //    и й к л м н о п
129
                // a   б->ё  в    г    д    e    ж    з      // 4  р с т у ф х ц ч
129
                // a   б->ё  в    г    д    e    ж    з      // 4  р с т у ф х ц ч
130
-                 0xb8,0xb9,0xba,0xbb,0xbc,0xbd,0x6f,0xbe,   //    ш щ ъ ы ь э ю я
130
+                 0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0x6F,0xBE,   //    ш щ ъ ы ь э ю я
131
                // и    й    к    л    м    н    o    п      // 5  ѐ ё ђ ѓ є ѕ і ї
131
                // и    й    к    л    м    н    o    п      // 5  ѐ ё ђ ѓ є ѕ і ї
132
-                 0x70,0x63,0xbf,0x79,0xe4,0x78,0xe5,0xc0,   //    ј љ њ ћ ќ ѝ ў џ
132
+                 0x70,0x63,0xBF,0x79,0xE4,0x78,0xE5,0xC0,   //    ј љ њ ћ ќ ѝ ў џ
133
                // p    c    т    y    ф    x    ц    ч      // 6  Ѡ ѡ Ѣ ѣ Ѥ ѥ Ѧ ѧ
133
                // p    c    т    y    ф    x    ц    ч      // 6  Ѡ ѡ Ѣ ѣ Ѥ ѥ Ѧ ѧ
134
-                 0xc1,0xe6,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7    //    Ѫ ѩ Ѫ ѫ Ѭ ѭ Ѯ ѯ
134
+                 0xC1,0xE6,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7    //    Ѫ ѩ Ѫ ѫ Ѭ ѭ Ѯ ѯ
135
                // ш    щ    ъ    ы    ь    э    ю      я      // 7  Ѱ ѱ Ѳ ѳ Ѵ ѵ Ѷ ѷ
135
                // ш    щ    ъ    ы    ь    э    ю      я      // 7  Ѱ ѱ Ѳ ѳ Ѵ ѵ Ѷ ѷ
136
              };                                             //    ѻ ѹ Ѻ ѻ Ѽ ѽ Ѿ ѿ
136
              };                                             //    ѻ ѹ Ѻ ѻ Ѽ ѽ Ѿ ѿ
137
     #elif ENABLED(MAPPER_C2C3)
137
     #elif ENABLED(MAPPER_C2C3)
151
     static bool seen_c2 = false;
151
     static bool seen_c2 = false;
152
     uint8_t d = c;
152
     uint8_t d = c;
153
     if ( d >= 0x80u ) { // UTF-8 handling
153
     if ( d >= 0x80u ) { // UTF-8 handling
154
-      if ( (d >= 0xc0u) && (!seen_c2) ) {
155
-        utf_hi_char = d - 0xc2u;
154
+      if ( (d >= 0xC0u) && (!seen_c2) ) {
155
+        utf_hi_char = d - 0xC2u;
156
         seen_c2 = true;
156
         seen_c2 = true;
157
         return 0;
157
         return 0;
158
       }
158
       }
159
       else if (seen_c2) {
159
       else if (seen_c2) {
160
-        d &= 0x3fu;
160
+        d &= 0x3Fu;
161
         #ifndef MAPPER_ONE_TO_ONE
161
         #ifndef MAPPER_ONE_TO_ONE
162
           HARDWARE_CHAR_OUT((char)pgm_read_byte_near(utf_recode + d + (utf_hi_char << 6) - 0x20));
162
           HARDWARE_CHAR_OUT((char)pgm_read_byte_near(utf_recode + d + (utf_hi_char << 6) - 0x20));
163
         #else
163
         #else
181
 
181
 
182
   char charset_mapper(const char c) {
182
   char charset_mapper(const char c) {
183
     static uint8_t utf_hi_char; // UTF-8 high part
183
     static uint8_t utf_hi_char; // UTF-8 high part
184
-    static bool seen_c2 = false;
185
-    static bool seen_c4 = false;
186
-    static bool seen_c5 = false;
184
+    static bool seen_c2 = false,
185
+                seen_c4 = false,
186
+                seen_c5 = false;
187
     uint8_t d = c;
187
     uint8_t d = c;
188
     if ( d >= 0x80u ) { // UTF-8 handling
188
     if ( d >= 0x80u ) { // UTF-8 handling
189
-           if ( d == 0xc4u ) {seen_c4 = true; return 0;}
190
-      else if ( d == 0xc5u ) {seen_c5 = true; return 0;}
191
-      else if ( (d >= 0xc0u) && (!seen_c2) ) {
192
-        utf_hi_char = d - 0xc2u;
189
+           if ( d == 0xC4u ) {seen_c4 = true; return 0;}
190
+      else if ( d == 0xC5u ) {seen_c5 = true; return 0;}
191
+      else if ( (d >= 0xC0u) && (!seen_c2) ) {
192
+        utf_hi_char = d - 0xC2u;
193
         seen_c2 = true;
193
         seen_c2 = true;
194
         return 0;
194
         return 0;
195
       }
195
       }
196
       else if (seen_c4) {
196
       else if (seen_c4) {
197
         switch(d) {
197
         switch(d) {
198
-          case 0x9eu: d = 0xd0u; break;
199
-          case 0x9fu: d = 0xf0u; break;
200
-          case 0xb0u: d = 0xddu; break;
201
-          case 0xb1u: d = 0xfdu; break;
198
+          case 0x9Eu: d = 0xD0u; break;
199
+          case 0x9Fu: d = 0xF0u; break;
200
+          case 0xB0u: d = 0xDDu; break;
201
+          case 0xB1u: d = 0xFDu; break;
202
           default: d = '?';
202
           default: d = '?';
203
         }
203
         }
204
         HARDWARE_CHAR_OUT((char)d) ;
204
         HARDWARE_CHAR_OUT((char)d) ;
205
       }
205
       }
206
       else if (seen_c5) {
206
       else if (seen_c5) {
207
         switch(d) {
207
         switch(d) {
208
-          case 0x9eu: d = 0xdeu; break;
209
-          case 0x9fu: d = 0xfeu; break;
208
+          case 0x9Eu: d = 0xDEu; break;
209
+          case 0x9Fu: d = 0xFEu; break;
210
           default: d = '?';
210
           default: d = '?';
211
         }
211
         }
212
         HARDWARE_CHAR_OUT((char)d) ;
212
         HARDWARE_CHAR_OUT((char)d) ;
213
       }
213
       }
214
       else if (seen_c2) {
214
       else if (seen_c2) {
215
-        d &= 0x3fu;
215
+        d &= 0x3Fu;
216
         #ifndef MAPPER_ONE_TO_ONE
216
         #ifndef MAPPER_ONE_TO_ONE
217
           HARDWARE_CHAR_OUT((char)pgm_read_byte_near(utf_recode + d + (utf_hi_char << 6) - 0x20));
217
           HARDWARE_CHAR_OUT((char)pgm_read_byte_near(utf_recode + d + (utf_hi_char << 6) - 0x20));
218
         #else
218
         #else
237
     static bool seen_ce = false;
237
     static bool seen_ce = false;
238
     uint8_t d = c;
238
     uint8_t d = c;
239
     if ( d >= 0x80 ) { // UTF-8 handling
239
     if ( d >= 0x80 ) { // UTF-8 handling
240
-      if ( (d >= 0xc0) && (!seen_ce) ) {
241
-        utf_hi_char = d - 0xce;
240
+      if ( (d >= 0xC0) && (!seen_ce) ) {
241
+        utf_hi_char = d - 0xCE;
242
         seen_ce = true;
242
         seen_ce = true;
243
         return 0;
243
         return 0;
244
       }
244
       }
245
       else if (seen_ce) {
245
       else if (seen_ce) {
246
-        d &= 0x3f;
246
+        d &= 0x3F;
247
         #ifndef MAPPER_ONE_TO_ONE
247
         #ifndef MAPPER_ONE_TO_ONE
248
           HARDWARE_CHAR_OUT((char)pgm_read_byte_near(utf_recode + d + (utf_hi_char << 6) - 0x20));
248
           HARDWARE_CHAR_OUT((char)pgm_read_byte_near(utf_recode + d + (utf_hi_char << 6) - 0x20));
249
         #else
249
         #else
255
       }
255
       }
256
     }
256
     }
257
     else {
257
     else {
258
-      HARDWARE_CHAR_OUT((char) c );
258
+      HARDWARE_CHAR_OUT((char)c);
259
     }
259
     }
260
     seen_ce = false;
260
     seen_ce = false;
261
     return 1;
261
     return 1;
267
     static uint8_t utf_hi_char; // UTF-8 high part
267
     static uint8_t utf_hi_char; // UTF-8 high part
268
     static bool seen_ce = false;
268
     static bool seen_ce = false;
269
     uint8_t d = c;
269
     uint8_t d = c;
270
-    if ( d >= 0x80 ) { // UTF-8 handling
271
-      if ( (d >= 0xc0) && (!seen_ce) ) {
272
-        utf_hi_char = d - 0xce;
270
+    if (d >= 0x80) { // UTF-8 handling
271
+      if (d >= 0xC0 && !seen_ce) {
272
+        utf_hi_char = d - 0xCE;
273
         seen_ce = true;
273
         seen_ce = true;
274
         return 0;
274
         return 0;
275
       }
275
       }
276
       else if (seen_ce) {
276
       else if (seen_ce) {
277
-        d &= 0x3f;
277
+        d &= 0x3F;
278
         #ifndef MAPPER_ONE_TO_ONE
278
         #ifndef MAPPER_ONE_TO_ONE
279
           HARDWARE_CHAR_OUT((char)pgm_read_byte_near(utf_recode + d + (utf_hi_char << 6) - 0x20));
279
           HARDWARE_CHAR_OUT((char)pgm_read_byte_near(utf_recode + d + (utf_hi_char << 6) - 0x20));
280
         #else
280
         #else
296
 
296
 
297
   char charset_mapper(const char c) {
297
   char charset_mapper(const char c) {
298
     // it is a Russian alphabet translation
298
     // it is a Russian alphabet translation
299
-    // except 0401 --> 0xa2 = Ё, 0451 --> 0xb5 = ё
299
+    // except 0401 --> 0xA2 = Ё, 0451 --> 0xB5 = ё
300
     static uint8_t utf_hi_char; // UTF-8 high part
300
     static uint8_t utf_hi_char; // UTF-8 high part
301
     static bool seen_d5 = false;
301
     static bool seen_d5 = false;
302
     uint8_t d = c;
302
     uint8_t d = c;
303
     if (d >= 0x80) { // UTF-8 handling
303
     if (d >= 0x80) { // UTF-8 handling
304
-      if (d >= 0xd0 && !seen_d5) {
305
-        utf_hi_char = d - 0xd0;
304
+      if (d >= 0xD0 && !seen_d5) {
305
+        utf_hi_char = d - 0xD0;
306
         seen_d5 = true;
306
         seen_d5 = true;
307
         return 0;
307
         return 0;
308
       }
308
       }
309
       else if (seen_d5) {
309
       else if (seen_d5) {
310
-        d &= 0x3f;
310
+        d &= 0x3F;
311
         if (!utf_hi_char && d == 1) {
311
         if (!utf_hi_char && d == 1) {
312
-          HARDWARE_CHAR_OUT((char) 0xa2); // Ё
312
+          HARDWARE_CHAR_OUT((char) 0xA2); // Ё
313
         }
313
         }
314
         else if (utf_hi_char == 1 && d == 0x11) {
314
         else if (utf_hi_char == 1 && d == 0x11) {
315
-          HARDWARE_CHAR_OUT((char)0xb5); // ё
315
+          HARDWARE_CHAR_OUT((char)0xB5); // ё
316
         }
316
         }
317
         else {
317
         else {
318
           HARDWARE_CHAR_OUT((char)pgm_read_byte_near(utf_recode + d + (utf_hi_char << 6) - 0x10));
318
           HARDWARE_CHAR_OUT((char)pgm_read_byte_near(utf_recode + d + (utf_hi_char << 6) - 0x10));
336
     static bool seen_d5 = false;
336
     static bool seen_d5 = false;
337
     uint8_t d = c;
337
     uint8_t d = c;
338
     if (d >= 0x80u) { // UTF-8 handling
338
     if (d >= 0x80u) { // UTF-8 handling
339
-      if (d >= 0xd0u && !seen_d5) {
340
-        utf_hi_char = d - 0xd0u;
339
+      if (d >= 0xD0u && !seen_d5) {
340
+        utf_hi_char = d - 0xD0u;
341
         seen_d5 = true;
341
         seen_d5 = true;
342
         return 0;
342
         return 0;
343
       }
343
       }
344
       else if (seen_d5) {
344
       else if (seen_d5) {
345
-        d &= 0x3fu;
345
+        d &= 0x3Fu;
346
         #ifndef MAPPER_ONE_TO_ONE
346
         #ifndef MAPPER_ONE_TO_ONE
347
           HARDWARE_CHAR_OUT((char)pgm_read_byte_near(utf_recode + d + (utf_hi_char << 6) - 0x20));
347
           HARDWARE_CHAR_OUT((char)pgm_read_byte_near(utf_recode + d + (utf_hi_char << 6) - 0x20));
348
         #else
348
         #else
349
-          HARDWARE_CHAR_OUT((char)(0xa0u + (utf_hi_char << 6) + d)) ;
349
+          HARDWARE_CHAR_OUT((char)(0xA0u + (utf_hi_char << 6) + d)) ;
350
         #endif
350
         #endif
351
       }
351
       }
352
       else {
352
       else {
364
 
364
 
365
   char charset_mapper(const char c) {
365
   char charset_mapper(const char c) {
366
     static uint8_t utf_hi_char; // UTF-8 high part
366
     static uint8_t utf_hi_char; // UTF-8 high part
367
-    static bool seen_e3 = false;
368
-    static bool seen_82_83 = false;
367
+    static bool seen_e3 = false,
368
+                seen_82_83 = false;
369
     uint8_t d = c;
369
     uint8_t d = c;
370
     if (d >= 0x80) { // UTF-8 handling
370
     if (d >= 0x80) { // UTF-8 handling
371
-      if (d == 0xe3 && !seen_e3) {
371
+      if (d == 0xE3 && !seen_e3) {
372
         seen_e3 = true;
372
         seen_e3 = true;
373
-        return 0;      // eat 0xe3
373
+        return 0;      // eat 0xE3
374
       }
374
       }
375
       else if (d >= 0x82 && seen_e3 && !seen_82_83) {
375
       else if (d >= 0x82 && seen_e3 && !seen_82_83) {
376
         utf_hi_char = d - 0x82;
376
         utf_hi_char = d - 0x82;
378
         return 0;
378
         return 0;
379
       }
379
       }
380
       else if (seen_e3 && seen_82_83) {
380
       else if (seen_e3 && seen_82_83) {
381
-        d &= 0x3f;
381
+        d &= 0x3F;
382
         #ifndef MAPPER_ONE_TO_ONE
382
         #ifndef MAPPER_ONE_TO_ONE
383
           HARDWARE_CHAR_OUT((char)pgm_read_byte_near(utf_recode + d + (utf_hi_char << 6) - 0x20));
383
           HARDWARE_CHAR_OUT((char)pgm_read_byte_near(utf_recode + d + (utf_hi_char << 6) - 0x20));
384
         #else
384
         #else

Loading…
取消
儲存