melch/Marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4359 from thinkyhead/rc_wrangle_movement_etc

Browse Source 
Use ENABLED(MAPPER_NON)
This commit is contained in:
Scott Lahteine 2016-07-19 18:22:55 -07:00 committed by GitHub
commit 6137a1d934
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Marlin/ultralcd.cpp
View File

@ -2469,10 +2469,10 @@ void lcd_init() {
int lcd_strlen(const char* s) { int lcd_strlen(const char* s) {
int i = 0, j = 0; int i = 0, j = 0;
while (s[i]) { while (s[i]) {
#ifdef MAPPER_NON #if ENABLED(MAPPER_NON)
j++; j++;
#else #else
if ((s[i] & 0xc0) != 0x80) j++; if ((s[i] & 0xC0u) != 0x80u) j++;
#endif #endif
i++; i++;
} }
@ -2482,10 +2482,10 @@ int lcd_strlen(const char* s) {
int lcd_strlen_P(const char* s) { int lcd_strlen_P(const char* s) {
int j = 0; int j = 0;
while (pgm_read_byte(s)) { while (pgm_read_byte(s)) {
#ifdef MAPPER_NON #if ENABLED(MAPPER_NON)
j++; j++;
#else #else
if ((pgm_read_byte(s) & 0xc0) != 0x80) j++; if ((pgm_read_byte(s) & 0xC0u) != 0x80u) j++;
#endif #endif
s++; s++;
} }