Browse Source

Tweak spacing in utf8_mapper.h

Scott Lahteine 7 years ago
parent
commit
e287e14354
2 changed files with 16 additions and 16 deletions
  1. 4
    4
      Marlin/MarlinSerial.h
  2. 12
    12
      Marlin/utf_mapper.h

+ 4
- 4
Marlin/MarlinSerial.h View File

103
   #else
103
   #else
104
     typedef uint8_t ring_buffer_pos_t;
104
     typedef uint8_t ring_buffer_pos_t;
105
   #endif
105
   #endif
106
-  
106
+
107
   #if ENABLED(SERIAL_STATS_DROPPED_RX)
107
   #if ENABLED(SERIAL_STATS_DROPPED_RX)
108
     extern uint8_t rx_dropped_bytes;
108
     extern uint8_t rx_dropped_bytes;
109
   #endif
109
   #endif
110
 
110
 
111
   #if ENABLED(SERIAL_STATS_MAX_RX_QUEUED)
111
   #if ENABLED(SERIAL_STATS_MAX_RX_QUEUED)
112
     extern ring_buffer_pos_t rx_max_enqueued;
112
     extern ring_buffer_pos_t rx_max_enqueued;
113
-  #endif  
114
-  
113
+  #endif
114
+
115
   class MarlinSerial { //: public Stream
115
   class MarlinSerial { //: public Stream
116
 
116
 
117
     public:
117
     public:
136
 
136
 
137
       #if ENABLED(SERIAL_STATS_MAX_RX_QUEUED)
137
       #if ENABLED(SERIAL_STATS_MAX_RX_QUEUED)
138
         FORCE_INLINE static ring_buffer_pos_t rxMaxEnqueued() { return rx_max_enqueued; }
138
         FORCE_INLINE static ring_buffer_pos_t rxMaxEnqueued() { return rx_max_enqueued; }
139
-      #endif  
139
+      #endif
140
 
140
 
141
     private:
141
     private:
142
       static void printNumber(unsigned long, const uint8_t);
142
       static void printNumber(unsigned long, const uint8_t);

+ 12
- 12
Marlin/utf_mapper.h View File

163
         #ifndef MAPPER_ONE_TO_ONE
163
         #ifndef MAPPER_ONE_TO_ONE
164
           HARDWARE_CHAR_OUT(pgm_read_byte_near(utf_recode + d + (utf_hi_char << 6) - 0x20));
164
           HARDWARE_CHAR_OUT(pgm_read_byte_near(utf_recode + d + (utf_hi_char << 6) - 0x20));
165
         #else
165
         #else
166
-          HARDWARE_CHAR_OUT(0x80u + (utf_hi_char << 6) + d) ;
166
+          HARDWARE_CHAR_OUT(0x80u + (utf_hi_char << 6) + d);
167
         #endif
167
         #endif
168
       }
168
       }
169
       else {
169
       else {
203
           case 0xB1u: d = 0xFDu; break;
203
           case 0xB1u: d = 0xFDu; break;
204
           default: d = '?';
204
           default: d = '?';
205
         }
205
         }
206
-        HARDWARE_CHAR_OUT(d) ;
206
+        HARDWARE_CHAR_OUT(d);
207
       }
207
       }
208
       else if (seen_c5) {
208
       else if (seen_c5) {
209
         switch(d) {
209
         switch(d) {
211
           case 0x9Fu: d = 0xFEu; break;
211
           case 0x9Fu: d = 0xFEu; break;
212
           default: d = '?';
212
           default: d = '?';
213
         }
213
         }
214
-        HARDWARE_CHAR_OUT(d) ;
214
+        HARDWARE_CHAR_OUT(d);
215
       }
215
       }
216
       else if (seen_c2) {
216
       else if (seen_c2) {
217
         d &= 0x3Fu;
217
         d &= 0x3Fu;
436
           case 0x98u ... 0x99u: d -= 20; break; //Ę i ę
436
           case 0x98u ... 0x99u: d -= 20; break; //Ę i ę
437
           default: d = '?';
437
           default: d = '?';
438
         }
438
         }
439
-        HARDWARE_CHAR_OUT(d) ;
439
+        HARDWARE_CHAR_OUT(d);
440
       }
440
       }
441
       else if (seen_c5) {
441
       else if (seen_c5) {
442
         switch(d) {
442
         switch(d) {
445
           case 0xB9u ... 0xBCu: d -= 0x2Bu; break; //Ź - ż
445
           case 0xB9u ... 0xBCu: d -= 0x2Bu; break; //Ź - ż
446
           default: d = '?';
446
           default: d = '?';
447
         }
447
         }
448
-        HARDWARE_CHAR_OUT(d) ;
448
+        HARDWARE_CHAR_OUT(d);
449
       }
449
       }
450
       else if (seen_c3) {
450
       else if (seen_c3) {
451
         switch(d) {
451
         switch(d) {
453
           case 0xB3u: d = 0x8Bu; break; //ó
453
           case 0xB3u: d = 0x8Bu; break; //ó
454
           d = '?';
454
           d = '?';
455
         }
455
         }
456
-        HARDWARE_CHAR_OUT(d) ;
456
+        HARDWARE_CHAR_OUT(d);
457
       }
457
       }
458
 
458
 
459
     }
459
     }
514
           case 0x9Au ... 0x9Bu: d -= 10; break; // Ěě
514
           case 0x9Au ... 0x9Bu: d -= 10; break; // Ěě
515
           default: d = '?';
515
           default: d = '?';
516
         }
516
         }
517
-        HARDWARE_CHAR_OUT(d) ;
517
+        HARDWARE_CHAR_OUT(d);
518
       }
518
       }
519
       else if (seen_c5) {
519
       else if (seen_c5) {
520
         switch(d) {
520
         switch(d) {
526
           case 0xBDu ... 0xBEu: d -= 0x21u; break;  // Žž
526
           case 0xBDu ... 0xBEu: d -= 0x21u; break;  // Žž
527
           default: d = '?';
527
           default: d = '?';
528
         }
528
         }
529
-        HARDWARE_CHAR_OUT(d) ;
529
+        HARDWARE_CHAR_OUT(d);
530
       }
530
       }
531
       else if (seen_c3) {
531
       else if (seen_c3) {
532
         switch(d) {
532
         switch(d) {
544
           case 0xBDu: d = 0x8Bu; break;  // ý
544
           case 0xBDu: d = 0x8Bu; break;  // ý
545
           default: d = '?';
545
           default: d = '?';
546
         }
546
         }
547
-        HARDWARE_CHAR_OUT(d) ;
547
+        HARDWARE_CHAR_OUT(d);
548
       }
548
       }
549
 
549
 
550
     }
550
     }
610
           case 0xBDu ... 0xBEu: d -= 0x27u; break;  // Ľľ
610
           case 0xBDu ... 0xBEu: d -= 0x27u; break;  // Ľľ
611
           default: d = '?';
611
           default: d = '?';
612
         }
612
         }
613
-        HARDWARE_CHAR_OUT(d) ;
613
+        HARDWARE_CHAR_OUT(d);
614
       }
614
       }
615
       else if (seen_c5) {
615
       else if (seen_c5) {
616
         switch(d) {
616
         switch(d) {
621
           case 0xBDu ... 0xBEu: d -= 0x1Du; break;  // Žž
621
           case 0xBDu ... 0xBEu: d -= 0x1Du; break;  // Žž
622
           default: d = '?';
622
           default: d = '?';
623
         }
623
         }
624
-        HARDWARE_CHAR_OUT(d) ;
624
+        HARDWARE_CHAR_OUT(d);
625
       }
625
       }
626
       else if (seen_c3) {
626
       else if (seen_c3) {
627
         switch(d) {
627
         switch(d) {
643
           case 0xBDu: d = 0x8Fu; break;  // ý
643
           case 0xBDu: d = 0x8Fu; break;  // ý
644
           default: d = '?';
644
           default: d = '?';
645
         }
645
         }
646
-        HARDWARE_CHAR_OUT(d) ;
646
+        HARDWARE_CHAR_OUT(d);
647
       }
647
       }
648
 
648
 
649
     }
649
     }

Loading…
Cancel
Save