From 0924ad50d58644b2c1cc90c4808c5cf14323342f Mon Sep 17 00:00:00 2001
From: Robert Pelnar <robert.pelnar@seznam.cz>
Date: Mon, 16 Jul 2018 04:50:43 +0200
Subject: [PATCH] New localization vs octoprint fix - do not translate protocol
 messages

---
 Firmware/Marlin_main.cpp |  6 +++---
 Firmware/cardreader.cpp  |  8 ++++----
 Firmware/lcd.cpp         | 11 +----------
 Firmware/lcd.h           |  2 --
 Firmware/ultralcd.cpp    |  2 --
 5 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp
index 7c1f2a63..2ae120ae 100644
--- a/Firmware/Marlin_main.cpp
+++ b/Firmware/Marlin_main.cpp
@@ -4725,9 +4725,9 @@ void process_commands()
 
 #ifdef SDSUPPORT
     case 20: // M20 - list SD card
-      SERIAL_PROTOCOLLNRPGM(_i("Begin file list"));////MSG_BEGIN_FILE_LIST c=0 r=0
+      SERIAL_PROTOCOLLNRPGM(_N("Begin file list"));////MSG_BEGIN_FILE_LIST c=0 r=0
       card.ls();
-      SERIAL_PROTOCOLLNRPGM(_i("End file list"));////MSG_END_FILE_LIST c=0 r=0
+      SERIAL_PROTOCOLLNRPGM(_N("End file list"));////MSG_END_FILE_LIST c=0 r=0
       break;
     case 21: // M21 - init SD card
 
@@ -5628,7 +5628,7 @@ Sigma_Exit:
       enable_endstops(true) ;
       break;
     case 119: // M119
-    SERIAL_PROTOCOLRPGM(_i("Reporting endstop status"));////MSG_M119_REPORT c=0 r=0
+    SERIAL_PROTOCOLRPGM(_N("Reporting endstop status"));////MSG_M119_REPORT c=0 r=0
     SERIAL_PROTOCOLLN("");
       #if defined(X_MIN_PIN) && X_MIN_PIN > -1
         SERIAL_PROTOCOLRPGM(_n("x_min: "));////MSG_X_MIN c=0 r=0
diff --git a/Firmware/cardreader.cpp b/Firmware/cardreader.cpp
index 855e2f89..8814bfa8 100644
--- a/Firmware/cardreader.cpp
+++ b/Firmware/cardreader.cpp
@@ -393,13 +393,13 @@ void CardReader::openFile(char* name,bool read, bool replace_current/*=true*/)
     if (file.open(curDir, fname, O_READ)) 
     {
       filesize = file.fileSize();
-      SERIAL_PROTOCOLRPGM(_i("File opened: "));////MSG_SD_FILE_OPENED c=0 r=0
+      SERIAL_PROTOCOLRPGM(_N("File opened: "));////MSG_SD_FILE_OPENED c=0 r=0
       SERIAL_PROTOCOL(fname);
       SERIAL_PROTOCOLRPGM(_n(" Size: "));////MSG_SD_SIZE c=0 r=0
       SERIAL_PROTOCOLLN(filesize);
       sdpos = 0;
       
-      SERIAL_PROTOCOLLNRPGM(_i("File selected"));////MSG_SD_FILE_SELECTED c=0 r=0
+      SERIAL_PROTOCOLLNRPGM(_N("File selected"));////MSG_SD_FILE_SELECTED c=0 r=0
       getfilename(0, fname);
       lcd_setstatus(longFilename[0] ? longFilename : fname);
       lcd_setstatus("SD-PRINTING         ");
@@ -422,7 +422,7 @@ void CardReader::openFile(char* name,bool read, bool replace_current/*=true*/)
     else
     {
       saving = true;
-      SERIAL_PROTOCOLRPGM(_i("Writing to file: "));////MSG_SD_WRITE_TO_FILE c=0 r=0
+      SERIAL_PROTOCOLRPGM(_N("Writing to file: "));////MSG_SD_WRITE_TO_FILE c=0 r=0
       SERIAL_PROTOCOLLN(name);
       lcd_setstatus(fname);
     }
@@ -514,7 +514,7 @@ void CardReader::getStatus()
   if(sdprinting){
     SERIAL_PROTOCOL(longFilename);
     SERIAL_PROTOCOLPGM("\n");
-    SERIAL_PROTOCOLRPGM(_i("SD printing byte "));////MSG_SD_PRINTING_BYTE c=0 r=0
+    SERIAL_PROTOCOLRPGM(_N("SD printing byte "));////MSG_SD_PRINTING_BYTE c=0 r=0
     SERIAL_PROTOCOL(sdpos);
     SERIAL_PROTOCOLPGM("/");
     SERIAL_PROTOCOLLN(filesize);
diff --git a/Firmware/lcd.cpp b/Firmware/lcd.cpp
index 372428a7..2bec0925 100644
--- a/Firmware/lcd.cpp
+++ b/Firmware/lcd.cpp
@@ -246,16 +246,7 @@ void lcd_implementation_init_noclear(void)
 }
 
 
-void lcd_implementation_nodisplay(void)
-{
-    lcd.noDisplay();
-}
-void lcd_implementation_display(void)
-{
-    lcd.display();
-}
-
-void lcd_implementation_clear(void)
+	void lcd_implementation_clear(void)
 {
     lcd.clear();
 }
diff --git a/Firmware/lcd.h b/Firmware/lcd.h
index 021ed7fe..24ec13ce 100644
--- a/Firmware/lcd.h
+++ b/Firmware/lcd.h
@@ -161,8 +161,6 @@ extern void lcd_set_custom_characters_degree(void);
 
 extern void lcd_implementation_init(void);
 extern void lcd_implementation_init_noclear(void);
-extern void lcd_implementation_nodisplay(void);
-extern void lcd_implementation_display(void);
 extern void lcd_implementation_clear(void);
 
 // Arduino < 1.0.0 is missing a function to print PROGMEM strings, so we need to implement our own
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 230f0593..cb8021d4 100644
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -969,14 +969,12 @@ static void lcd_status_screen()
 
       if ((ReInitLCD % 10) == 0)
 	  {
-        //lcd_implementation_nodisplay();
         lcd_implementation_init_noclear(); //to maybe revive the LCD if static electricity killed it.
       }
 
     }
 
 
-    //lcd_implementation_display();
     lcd_implementation_status_screen();
     //lcd_implementation_clear();