Don't use UTF-strlen() if the text is not UTF

8 years ago · 54d35230df
1 changed files with 10 additions and 2 deletions
--- a/Marlin/ultralcd.cpp
+++ b/Marlin/ultralcd.cpp
@ -2481,7 +2481,11 @@ void lcd_init() {
 int lcd_strlen(const char* s) {
  int i = 0, j = 0;
  while (s[i]) {
-    if ((s[i] & 0xc0) != 0x80) j++;
+    #ifdef MAPPER_NON
+      j++;
+    #else
+      if ((s[i] & 0xc0) != 0x80) j++;
+    #endif
    i++;
  }
  return j;
@ -2490,7 +2494,11 @@ int lcd_strlen(const char* s) {
 int lcd_strlen_P(const char* s) {
  int j = 0;
  while (pgm_read_byte(s)) {
-    if ((pgm_read_byte(s) & 0xc0) != 0x80) j++;
+    #ifdef MAPPER_NON
+      j++; 
+    #else
+      if ((pgm_read_byte(s) & 0xc0) != 0x80) j++;
+    #endif
    s++;
  }
  return j;