Browse Source

lang - removed unused code and some service messages changed to "not translated"

Robert Pelnar 6 years ago
parent
commit
a0e4acead3
5 changed files with 4 additions and 16 deletions
  1. 2 2
      Firmware/cardreader.cpp
  2. 1 1
      Firmware/messages.c
  3. 1 1
      Firmware/stepper.cpp
  4. 0 11
      Firmware/ultralcd.cpp
  5. 0 1
      Firmware/ultralcd.h

+ 2 - 2
Firmware/cardreader.cpp

@@ -211,7 +211,7 @@ void CardReader::initsd()
   /*
   if(!workDir.openRoot(&volume))
   {
-    SERIAL_ECHOLNPGM(_T(MSG_SD_WORKDIR_FAIL));
+    SERIAL_ECHOLNPGM(MSG_SD_WORKDIR_FAIL);
   }
   */
   
@@ -221,7 +221,7 @@ void CardReader::setroot()
 {
   /*if(!workDir.openRoot(&volume))
   {
-    SERIAL_ECHOLNPGM(_T(MSG_SD_WORKDIR_FAIL));
+    SERIAL_ECHOLNPGM(MSG_SD_WORKDIR_FAIL);
   }*/
   workDir=root;
   

+ 1 - 1
Firmware/messages.c

@@ -77,7 +77,6 @@ const char MSG_RESUMING_PRINT[] PROGMEM_I1 = ISTR("Resuming print"); ////c=0 r=0
 const char MSG_REMOVE_STEEL_SHEET[] PROGMEM_I1 = ISTR("Please remove steel sheet from heatbed."); ////c=20 r=4
 const char MSG_SD_ERR_WRITE_TO_FILE[] PROGMEM_I1 = ISTR("error writing to file"); ////c=0 r=0
 const char MSG_SD_OPEN_FILE_FAIL[] PROGMEM_I1 = ISTR("open failed, File: "); ////c=0 r=0
-const char MSG_SD_WORKDIR_FAIL[] PROGMEM_I1 = ISTR("workDir open failed"); ////c=0 r=0
 const char MSG_SELFTEST_COOLING_FAN[] PROGMEM_I1 = ISTR("Front print fan?"); ////c=20 r=0
 const char MSG_SELFTEST_EXTRUDER_FAN[] PROGMEM_I1 = ISTR("Left hotend fan?"); ////c=20 r=0
 const char MSG_SELFTEST_FAILED[] PROGMEM_I1 = ISTR("Selftest failed  "); ////c=20 r=0
@@ -108,6 +107,7 @@ const char MSG_WIZARD_QUIT[] PROGMEM_I1 = ISTR("You can always resume the Wizard
 const char MSG_YES[] PROGMEM_I1 = ISTR("Yes"); ////c=0 r=0
 const char WELCOME_MSG[] PROGMEM_I1 = ISTR(CUSTOM_MENDEL_NAME " ready."); ////c=20 r=0
 //not internationalized messages
+const char MSG_SD_WORKDIR_FAIL[] PROGMEM_N1 = "workDir open failed"; ////c=0 r=0
 const char MSG_BROWNOUT_RESET[] PROGMEM_N1 = " Brown out Reset"; ////c=0 r=0
 const char MSG_EXTERNAL_RESET[] PROGMEM_N1 = " External Reset"; ////c=0 r=0
 const char MSG_FILE_SAVED[] PROGMEM_N1 = "Done saving file."; ////c=0 r=0

+ 1 - 1
Firmware/stepper.cpp

@@ -343,7 +343,7 @@ FORCE_INLINE unsigned short calc_timer(uint16_t step_rate) {
     timer = (unsigned short)pgm_read_word_near(table_address);
     timer -= (((unsigned short)pgm_read_word_near(table_address+2) * (unsigned char)(step_rate & 0x0007))>>3);
   }
-  if(timer < 100) { timer = 100; MYSERIAL.print(_i("Steprate too high: ")); MYSERIAL.println(step_rate); }//(20kHz this should never happen)////MSG_STEPPER_TOO_HIGH c=0 r=0
+  if(timer < 100) { timer = 100; MYSERIAL.print(_N("Steprate too high: ")); MYSERIAL.println(step_rate); }//(20kHz this should never happen)////MSG_STEPPER_TOO_HIGH c=0 r=0
   return timer;
 }
 

+ 0 - 11
Firmware/ultralcd.cpp

@@ -2236,17 +2236,6 @@ void lcd_unLoadFilament()
   menu_back();
 }
 
-void lcd_change_filament() {
-
-  lcd_clear();
-
-  lcd_set_cursor(0, 1);
-
-  lcd_puts_P(_i("Changing filament!"));////MSG_CHANGING_FILAMENT c=20 r=0
-
-
-}
-
 
 void lcd_wait_interact() {
 

+ 0 - 1
Firmware/ultralcd.h

@@ -27,7 +27,6 @@ void lcd_alright();
 void EEPROM_save_B(int pos, int* value);
 void EEPROM_read_B(int pos, int* value);
 void lcd_wait_interact();
-void lcd_change_filament();
 void lcd_loading_filament();
 void lcd_change_success();
 void lcd_loading_color();