MPCNC/Firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #7864 from thinkyhead/bf1_mapper_c2c3c4_sk

Browse Source 
Tweak spacing in utf8_mapper.h
This commit is contained in:
Scott Lahteine 2017-10-06 15:19:13 -05:00 committed by GitHub
commit 2f0164b995
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Marlin/MarlinSerial.h
View File

@ -103,15 +103,15 @@
#else #else
typedef uint8_t ring_buffer_pos_t; typedef uint8_t ring_buffer_pos_t;
#endif #endif
#if ENABLED(SERIAL_STATS_DROPPED_RX) #if ENABLED(SERIAL_STATS_DROPPED_RX)
extern uint8_t rx_dropped_bytes; extern uint8_t rx_dropped_bytes;
#endif #endif
#if ENABLED(SERIAL_STATS_MAX_RX_QUEUED) #if ENABLED(SERIAL_STATS_MAX_RX_QUEUED)
extern ring_buffer_pos_t rx_max_enqueued; extern ring_buffer_pos_t rx_max_enqueued;
#endif #endif
class MarlinSerial { //: public Stream class MarlinSerial { //: public Stream
public: public:
@ -136,7 +136,7 @@
#if ENABLED(SERIAL_STATS_MAX_RX_QUEUED) #if ENABLED(SERIAL_STATS_MAX_RX_QUEUED)
FORCE_INLINE static ring_buffer_pos_t rxMaxEnqueued() { return rx_max_enqueued; } FORCE_INLINE static ring_buffer_pos_t rxMaxEnqueued() { return rx_max_enqueued; }
#endif #endif
private: private:
static void printNumber(unsigned long, const uint8_t); static void printNumber(unsigned long, const uint8_t);

24
Marlin/utf_mapper.h
View File

@ -163,7 +163,7 @@
#ifndef MAPPER_ONE_TO_ONE #ifndef MAPPER_ONE_TO_ONE
HARDWARE_CHAR_OUT(pgm_read_byte_near(utf_recode + d + (utf_hi_char << 6) - 0x20)); HARDWARE_CHAR_OUT(pgm_read_byte_near(utf_recode + d + (utf_hi_char << 6) - 0x20));
#else #else
HARDWARE_CHAR_OUT(0x80u + (utf_hi_char << 6) + d) ; HARDWARE_CHAR_OUT(0x80u + (utf_hi_char << 6) + d);
#endif #endif
} }
else { else {
@ -203,7 +203,7 @@
case 0xB1u: d = 0xFDu; break; case 0xB1u: d = 0xFDu; break;
default: d = '?'; default: d = '?';
} }
HARDWARE_CHAR_OUT(d) ; HARDWARE_CHAR_OUT(d);
} }
else if (seen_c5) { else if (seen_c5) {
switch(d) { switch(d) {
@ -211,7 +211,7 @@
case 0x9Fu: d = 0xFEu; break; case 0x9Fu: d = 0xFEu; break;
default: d = '?'; default: d = '?';
} }
HARDWARE_CHAR_OUT(d) ; HARDWARE_CHAR_OUT(d);
} }
else if (seen_c2) { else if (seen_c2) {
d &= 0x3Fu; d &= 0x3Fu;
@ -436,7 +436,7 @@
case 0x98u ... 0x99u: d -= 20; break; //Ę i ę case 0x98u ... 0x99u: d -= 20; break; //Ę i ę
default: d = '?'; default: d = '?';
} }
HARDWARE_CHAR_OUT(d) ; HARDWARE_CHAR_OUT(d);
} }
else if (seen_c5) { else if (seen_c5) {
switch(d) { switch(d) {
@ -445,7 +445,7 @@
case 0xB9u ... 0xBCu: d -= 0x2Bu; break; //Ź - ż case 0xB9u ... 0xBCu: d -= 0x2Bu; break; //Ź - ż
default: d = '?'; default: d = '?';
} }
HARDWARE_CHAR_OUT(d) ; HARDWARE_CHAR_OUT(d);
} }
else if (seen_c3) { else if (seen_c3) {
switch(d) { switch(d) {
@ -453,7 +453,7 @@
case 0xB3u: d = 0x8Bu; break; //ó case 0xB3u: d = 0x8Bu; break; //ó
d = '?'; d = '?';
} }
HARDWARE_CHAR_OUT(d) ; HARDWARE_CHAR_OUT(d);
} }
} }
@ -514,7 +514,7 @@
case 0x9Au ... 0x9Bu: d -= 10; break; // Ěě case 0x9Au ... 0x9Bu: d -= 10; break; // Ěě
default: d = '?'; default: d = '?';
} }
HARDWARE_CHAR_OUT(d) ; HARDWARE_CHAR_OUT(d);
} }
else if (seen_c5) { else if (seen_c5) {
switch(d) { switch(d) {
@ -526,7 +526,7 @@
case 0xBDu ... 0xBEu: d -= 0x21u; break; // Žž case 0xBDu ... 0xBEu: d -= 0x21u; break; // Žž
default: d = '?'; default: d = '?';
} }
HARDWARE_CHAR_OUT(d) ; HARDWARE_CHAR_OUT(d);
} }
else if (seen_c3) { else if (seen_c3) {
switch(d) { switch(d) {
@ -544,7 +544,7 @@
case 0xBDu: d = 0x8Bu; break; // ý case 0xBDu: d = 0x8Bu; break; // ý
default: d = '?'; default: d = '?';
} }
HARDWARE_CHAR_OUT(d) ; HARDWARE_CHAR_OUT(d);
} }
} }
@ -610,7 +610,7 @@
case 0xBDu ... 0xBEu: d -= 0x27u; break; // Ľľ case 0xBDu ... 0xBEu: d -= 0x27u; break; // Ľľ
default: d = '?'; default: d = '?';
} }
HARDWARE_CHAR_OUT(d) ; HARDWARE_CHAR_OUT(d);
} }
else if (seen_c5) { else if (seen_c5) {
switch(d) { switch(d) {
@ -621,7 +621,7 @@
case 0xBDu ... 0xBEu: d -= 0x1Du; break; // Žž case 0xBDu ... 0xBEu: d -= 0x1Du; break; // Žž
default: d = '?'; default: d = '?';
} }
HARDWARE_CHAR_OUT(d) ; HARDWARE_CHAR_OUT(d);
} }
else if (seen_c3) { else if (seen_c3) {
switch(d) { switch(d) {
@ -643,7 +643,7 @@
case 0xBDu: d = 0x8Fu; break; // ý case 0xBDu: d = 0x8Fu; break; // ý
default: d = '?'; default: d = '?';
} }
HARDWARE_CHAR_OUT(d) ; HARDWARE_CHAR_OUT(d);
} }
} }