Przeglądaj źródła

Lang - text "ok" removed from dictionary

Robert Pelnar 6 lat temu
rodzic
commit
72d47eaeba

+ 9 - 9
Firmware/Marlin_main.cpp

@@ -627,7 +627,7 @@ void crashdet_cancel()
 		lcd_print_stop();
 		lcd_print_stop();
 	}else if(saved_printing_type == PRINTING_TYPE_USB){
 	}else if(saved_printing_type == PRINTING_TYPE_USB){
 		SERIAL_ECHOLNPGM("// action:cancel"); //for Octoprint: works the same as clicking "Abort" button in Octoprint GUI
 		SERIAL_ECHOLNPGM("// action:cancel"); //for Octoprint: works the same as clicking "Abort" button in Octoprint GUI
-		SERIAL_PROTOCOLLNRPGM(_T(MSG_OK));
+		SERIAL_PROTOCOLLNRPGM(MSG_OK);
 	}
 	}
 }
 }
 
 
@@ -1744,7 +1744,7 @@ void loop()
           if(card.logging)
           if(card.logging)
             process_commands();
             process_commands();
           else
           else
-           SERIAL_PROTOCOLLNRPGM(_T(MSG_OK));
+           SERIAL_PROTOCOLLNRPGM(MSG_OK);
         } else {
         } else {
           card.closefile();
           card.closefile();
           SERIAL_PROTOCOLLNRPGM(MSG_FILE_SAVED);
           SERIAL_PROTOCOLLNRPGM(MSG_FILE_SAVED);
@@ -6188,7 +6188,7 @@ Sigma_Exit:
           }
           }
         }
         }
         else if (servo_index >= 0) {
         else if (servo_index >= 0) {
-          SERIAL_PROTOCOL(_T(MSG_OK));
+          SERIAL_PROTOCOL(MSG_OK);
           SERIAL_PROTOCOL(" Servo ");
           SERIAL_PROTOCOL(" Servo ");
           SERIAL_PROTOCOL(servo_index);
           SERIAL_PROTOCOL(servo_index);
           SERIAL_PROTOCOL(": ");
           SERIAL_PROTOCOL(": ");
@@ -6233,7 +6233,7 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE))
         #endif
         #endif
 
 
         updatePID();
         updatePID();
-        SERIAL_PROTOCOLRPGM(_T(MSG_OK));
+        SERIAL_PROTOCOLRPGM(MSG_OK);
         SERIAL_PROTOCOL(" p:");
         SERIAL_PROTOCOL(" p:");
         SERIAL_PROTOCOL(cs.Kp);
         SERIAL_PROTOCOL(cs.Kp);
         SERIAL_PROTOCOL(" i:");
         SERIAL_PROTOCOL(" i:");
@@ -6257,7 +6257,7 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE))
         if(code_seen('D')) cs.bedKd = scalePID_d(code_value());
         if(code_seen('D')) cs.bedKd = scalePID_d(code_value());
 
 
         updatePID();
         updatePID();
-       	SERIAL_PROTOCOLRPGM(_T(MSG_OK));
+       	SERIAL_PROTOCOLRPGM(MSG_OK);
         SERIAL_PROTOCOL(" p:");
         SERIAL_PROTOCOL(" p:");
         SERIAL_PROTOCOL(cs.bedKp);
         SERIAL_PROTOCOL(cs.bedKp);
         SERIAL_PROTOCOL(" i:");
         SERIAL_PROTOCOL(" i:");
@@ -6389,7 +6389,7 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE))
         {
         {
           cs.zprobe_zoffset = -value; // compare w/ line 278 of ConfigurationStore.cpp
           cs.zprobe_zoffset = -value; // compare w/ line 278 of ConfigurationStore.cpp
           SERIAL_ECHO_START;
           SERIAL_ECHO_START;
-          SERIAL_ECHOLNRPGM(CAT4(MSG_ZPROBE_ZOFFSET, " ", _T(MSG_OK),PSTR("")));
+          SERIAL_ECHOLNRPGM(CAT4(MSG_ZPROBE_ZOFFSET, " ", MSG_OK,PSTR("")));
           SERIAL_PROTOCOLLN("");
           SERIAL_PROTOCOLLN("");
         }
         }
         else
         else
@@ -6543,7 +6543,7 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE))
 			manage_inactivity();
 			manage_inactivity();
 			lcd_update(0);
 			lcd_update(0);
 		}
 		}
-		LCD_MESSAGERPGM(_T(MSG_OK));
+		LCD_MESSAGERPGM(MSG_OK);
 
 
 		break;
 		break;
 	}
 	}
@@ -7079,7 +7079,7 @@ void FlushSerialRequestResend()
 {
 {
   //char cmdbuffer[bufindr][100]="Resend:";
   //char cmdbuffer[bufindr][100]="Resend:";
   MYSERIAL.flush();
   MYSERIAL.flush();
-  printf_P(_N("%S: %ld\n%S\n"), _i("Resend"), gcode_LastN + 1, _T(MSG_OK));
+  printf_P(_N("%S: %ld\n%S\n"), _i("Resend"), gcode_LastN + 1, MSG_OK);
 }
 }
 
 
 // Confirm the execution of a command, if sent from a serial line.
 // Confirm the execution of a command, if sent from a serial line.
@@ -7088,7 +7088,7 @@ void ClearToSend()
 {
 {
     previous_millis_cmd = millis();
     previous_millis_cmd = millis();
 	if ((CMDBUFFER_CURRENT_TYPE == CMDBUFFER_CURRENT_TYPE_USB) || (CMDBUFFER_CURRENT_TYPE == CMDBUFFER_CURRENT_TYPE_USB_WITH_LINENR)) 
 	if ((CMDBUFFER_CURRENT_TYPE == CMDBUFFER_CURRENT_TYPE_USB) || (CMDBUFFER_CURRENT_TYPE == CMDBUFFER_CURRENT_TYPE_USB_WITH_LINENR)) 
-		SERIAL_PROTOCOLLNRPGM(_T(MSG_OK));
+		SERIAL_PROTOCOLLNRPGM(MSG_OK);
 }
 }
 
 
 #if MOTHERBOARD == BOARD_RAMBO_MINI_1_0 || MOTHERBOARD == BOARD_RAMBO_MINI_1_3
 #if MOTHERBOARD == BOARD_RAMBO_MINI_1_0 || MOTHERBOARD == BOARD_RAMBO_MINI_1_3

+ 1 - 1
Firmware/messages.c

@@ -60,7 +60,6 @@ const char MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2[] PROGMEM_I1 = ISTR(" of 9");
 const char MSG_MENU_CALIBRATION[] PROGMEM_I1 = ISTR("Calibration"); ////c=0 r=0
 const char MSG_MENU_CALIBRATION[] PROGMEM_I1 = ISTR("Calibration"); ////c=0 r=0
 const char MSG_NO[] PROGMEM_I1 = ISTR("No"); ////c=0 r=0
 const char MSG_NO[] PROGMEM_I1 = ISTR("No"); ////c=0 r=0
 const char MSG_NOZZLE[] PROGMEM_I1 = ISTR("Nozzle"); ////c=0 r=0
 const char MSG_NOZZLE[] PROGMEM_I1 = ISTR("Nozzle"); ////c=0 r=0
-const char MSG_OK[] PROGMEM_I1 = ISTR("ok"); ////c=0 r=0
 const char MSG_PAPER[] PROGMEM_I1 = ISTR("Place a sheet of paper under the nozzle during the calibration of first 4 points. If the nozzle catches the paper, power off the printer immediately."); ////c=20 r=8
 const char MSG_PAPER[] PROGMEM_I1 = ISTR("Place a sheet of paper under the nozzle during the calibration of first 4 points. If the nozzle catches the paper, power off the printer immediately."); ////c=20 r=8
 const char MSG_PLACE_STEEL_SHEET[] PROGMEM_I1 = ISTR("Please place steel sheet on heatbed."); ////c=20 r=4
 const char MSG_PLACE_STEEL_SHEET[] PROGMEM_I1 = ISTR("Please place steel sheet on heatbed."); ////c=20 r=4
 const char MSG_PLEASE_WAIT[] PROGMEM_I1 = ISTR("Please wait"); ////c=20 r=0
 const char MSG_PLEASE_WAIT[] PROGMEM_I1 = ISTR("Please wait"); ////c=20 r=0
@@ -122,3 +121,4 @@ const char MSG_TMC_OVERTEMP[] PROGMEM_N1 = "TMC DRIVER OVERTEMP"; ////c=0 r=0
 const char MSG_Enqueing[] PROGMEM_N1 = "enqueing \""; ////c=0 r=0
 const char MSG_Enqueing[] PROGMEM_N1 = "enqueing \""; ////c=0 r=0
 const char MSG_ENDSTOPS_HIT[] PROGMEM_N1 = "endstops hit: "; ////c=0 r=0
 const char MSG_ENDSTOPS_HIT[] PROGMEM_N1 = "endstops hit: "; ////c=0 r=0
 const char MSG_SD_ERR_WRITE_TO_FILE[] PROGMEM_N1 = "error writing to file"; ////c=0 r=0
 const char MSG_SD_ERR_WRITE_TO_FILE[] PROGMEM_N1 = "error writing to file"; ////c=0 r=0
+const char MSG_OK[] PROGMEM_N1 = "ok"; ////c=0 r=0

+ 1 - 1
Firmware/messages.h

@@ -61,7 +61,6 @@ extern const char MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2[];
 extern const char MSG_MENU_CALIBRATION[];
 extern const char MSG_MENU_CALIBRATION[];
 extern const char MSG_NO[];
 extern const char MSG_NO[];
 extern const char MSG_NOZZLE[];
 extern const char MSG_NOZZLE[];
-extern const char MSG_OK[];
 extern const char MSG_PAPER[];
 extern const char MSG_PAPER[];
 extern const char MSG_PLACE_STEEL_SHEET[];
 extern const char MSG_PLACE_STEEL_SHEET[];
 extern const char MSG_PLEASE_WAIT[];
 extern const char MSG_PLEASE_WAIT[];
@@ -123,6 +122,7 @@ extern const char MSG_TMC_OVERTEMP[];
 extern const char MSG_Enqueing[];
 extern const char MSG_Enqueing[];
 extern const char MSG_ENDSTOPS_HIT[];
 extern const char MSG_ENDSTOPS_HIT[];
 extern const char MSG_SD_ERR_WRITE_TO_FILE[];
 extern const char MSG_SD_ERR_WRITE_TO_FILE[];
+extern const char MSG_OK[];
 
 
 #if defined(__cplusplus)
 #if defined(__cplusplus)
 }
 }

+ 0 - 3
lang/lang_en.txt

@@ -553,9 +553,6 @@
 #MSG_NOZZLE c=0 r=0
 #MSG_NOZZLE c=0 r=0
 "Nozzle"
 "Nozzle"
 
 
-#MSG_OK c=0 r=0
-"ok"
-
 #MSG_DEFAULT_SETTINGS_LOADED c=20 r=4
 #MSG_DEFAULT_SETTINGS_LOADED c=20 r=4
 "Old settings found. Default PID, Esteps etc. will be set."
 "Old settings found. Default PID, Esteps etc. will be set."
 
 

+ 0 - 4
lang/lang_en_cz.txt

@@ -738,10 +738,6 @@
 "Nozzle"
 "Nozzle"
 "Tryska"
 "Tryska"
 
 
-#MSG_OK c=0 r=0
-"ok"
-"\x00"
-
 #MSG_DEFAULT_SETTINGS_LOADED c=20 r=4
 #MSG_DEFAULT_SETTINGS_LOADED c=20 r=4
 "Old settings found. Default PID, Esteps etc. will be set."
 "Old settings found. Default PID, Esteps etc. will be set."
 "Neplatne hodnoty nastaveni. Bude pouzito vychozi PID, Esteps atd."
 "Neplatne hodnoty nastaveni. Bude pouzito vychozi PID, Esteps atd."

+ 0 - 4
lang/lang_en_de.txt

@@ -738,10 +738,6 @@
 "Nozzle"
 "Nozzle"
 "Duese"
 "Duese"
 
 
-#MSG_OK c=0 r=0
-"ok"
-"\x00"
-
 #MSG_DEFAULT_SETTINGS_LOADED c=20 r=4
 #MSG_DEFAULT_SETTINGS_LOADED c=20 r=4
 "Old settings found. Default PID, Esteps etc. will be set."
 "Old settings found. Default PID, Esteps etc. will be set."
 "Alte Einstellungen gefunden. Standard PID, E-Steps u.s.w. werden gesetzt."
 "Alte Einstellungen gefunden. Standard PID, E-Steps u.s.w. werden gesetzt."

+ 0 - 4
lang/lang_en_es.txt

@@ -738,10 +738,6 @@
 "Nozzle"
 "Nozzle"
 "Boquilla"
 "Boquilla"
 
 
-#MSG_OK c=0 r=0
-"ok"
-"\x00"
-
 #MSG_DEFAULT_SETTINGS_LOADED c=20 r=4
 #MSG_DEFAULT_SETTINGS_LOADED c=20 r=4
 "Old settings found. Default PID, Esteps etc. will be set."
 "Old settings found. Default PID, Esteps etc. will be set."
 "Se han encontrado ajustes anteriores. Se ajustara el PID, los pasos del extrusor, etc"
 "Se han encontrado ajustes anteriores. Se ajustara el PID, los pasos del extrusor, etc"

+ 0 - 4
lang/lang_en_fr.txt

@@ -738,10 +738,6 @@
 "Nozzle"
 "Nozzle"
 "Buse"
 "Buse"
 
 
-#MSG_OK c=0 r=0
-"ok"
-"\x00"
-
 #MSG_DEFAULT_SETTINGS_LOADED c=20 r=4
 #MSG_DEFAULT_SETTINGS_LOADED c=20 r=4
 "Old settings found. Default PID, Esteps etc. will be set."
 "Old settings found. Default PID, Esteps etc. will be set."
 "Anciens reglages trouves. Le PID, les Esteps etc. par defaut seront pris."
 "Anciens reglages trouves. Le PID, les Esteps etc. par defaut seront pris."

+ 0 - 4
lang/lang_en_it.txt

@@ -738,10 +738,6 @@
 "Nozzle"
 "Nozzle"
 "Ugello"
 "Ugello"
 
 
-#MSG_OK c=0 r=0
-"ok"
-"\x00"
-
 #MSG_DEFAULT_SETTINGS_LOADED c=20 r=4
 #MSG_DEFAULT_SETTINGS_LOADED c=20 r=4
 "Old settings found. Default PID, Esteps etc. will be set."
 "Old settings found. Default PID, Esteps etc. will be set."
 "Sono state trovate impostazioni vecchie. I valori di default di PID, Esteps etc. saranno impostati"
 "Sono state trovate impostazioni vecchie. I valori di default di PID, Esteps etc. saranno impostati"

+ 0 - 4
lang/lang_en_pl.txt

@@ -738,10 +738,6 @@
 "Nozzle"
 "Nozzle"
 "Dysza"
 "Dysza"
 
 
-#MSG_OK c=0 r=0
-"ok"
-"\x00"
-
 #MSG_DEFAULT_SETTINGS_LOADED c=20 r=4
 #MSG_DEFAULT_SETTINGS_LOADED c=20 r=4
 "Old settings found. Default PID, Esteps etc. will be set."
 "Old settings found. Default PID, Esteps etc. will be set."
 "Znaleziono stare ustawienia. Zostana przywrocone domyslne ust. PID, Esteps, itp."
 "Znaleziono stare ustawienia. Zostana przywrocone domyslne ust. PID, Esteps, itp."