Browse Source

Fix some LCD/serial strings

Scott Lahteine 4 years ago
parent
commit
cab83ba840

+ 7
- 7
Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp View File

675
   //
675
   //
676
 
676
 
677
   lcd.setCursor(0, 0);
677
   lcd.setCursor(0, 0);
678
-  _draw_axis_value(X_AXIS, ftostr4sign(LOGICAL_X_POSITION(current_position[X_AXIS])), blink);  lcd.write(' ');
679
-  _draw_axis_value(Y_AXIS, ftostr4sign(LOGICAL_Y_POSITION(current_position[Y_AXIS])), blink);  lcd.write(' ');
678
+  _draw_axis_value(X_AXIS, ftostr4sign(LOGICAL_X_POSITION(current_position[X_AXIS])), blink); lcd.write(' ');
679
+  _draw_axis_value(Y_AXIS, ftostr4sign(LOGICAL_Y_POSITION(current_position[Y_AXIS])), blink); lcd.write(' ');
680
   _draw_axis_value(Z_AXIS, ftostr52sp(LOGICAL_Z_POSITION(current_position[Z_AXIS])), blink);
680
   _draw_axis_value(Z_AXIS, ftostr52sp(LOGICAL_Z_POSITION(current_position[Z_AXIS])), blink);
681
 
681
 
682
   #if HAS_LEVELING && !HAS_HEATED_BED
682
   #if HAS_LEVELING && !HAS_HEATED_BED
700
   uint8_t len = elapsed.toDigital(buffer);
700
   uint8_t len = elapsed.toDigital(buffer);
701
 
701
 
702
   lcd.setCursor((LCD_WIDTH - 1) - len, 1);
702
   lcd.setCursor((LCD_WIDTH - 1) - len, 1);
703
-  lcd.write(0x07); lcd.print(buffer); // LCD_CLOCK_CHAR
703
+  lcd.write(LCD_STR_CLOCK[0]); lcd.print(buffer);
704
 
704
 
705
   //
705
   //
706
   // Line 3 - progressbar
706
   // Line 3 - progressbar
807
     void MarlinUI::draw_hotend_status(const uint8_t row, const uint8_t extruder) {
807
     void MarlinUI::draw_hotend_status(const uint8_t row, const uint8_t extruder) {
808
       if (!PanelDetected) return;
808
       if (!PanelDetected) return;
809
       lcd.setCursor((LCD_WIDTH - 14) / 2, row + 1);
809
       lcd.setCursor((LCD_WIDTH - 14) / 2, row + 1);
810
-      lcd.write(0x02);  lcd_put_u8str_P(" E"); lcd.write('1' + extruder); lcd.write(' ');
811
-      lcd.print(i16tostr3rj(thermalManager.degHotend(extruder))); lcd.write(0x01);  lcd.write('/');
812
-      lcd.print(i16tostr3rj(thermalManager.degTargetHotend(extruder)));  lcd.write(0x01);
810
+      lcd.write(LCD_STR_THERMOMETER[0]); lcd_put_u8str_P(PSTR(" E")); lcd.write('1' + extruder); lcd.write(' ');
811
+      lcd.print(i16tostr3rj(thermalManager.degHotend(extruder)));       lcd.write(LCD_STR_DEGREE[0]); lcd.write('/');
812
+      lcd.print(i16tostr3rj(thermalManager.degTargetHotend(extruder))); lcd.write(LCD_STR_DEGREE[0]);
813
       lcd.print_line();
813
       lcd.print_line();
814
     }
814
     }
815
 
815
 
816
-  #endif // ADVANCED_PAUSE_FEATURE
816
+  #endif
817
 
817
 
818
   // Draw a static item with no left-right margin required. Centered by default.
818
   // Draw a static item with no left-right margin required. Centered by default.
819
   void MenuItem_static::draw(const uint8_t row, PGM_P const pstr, const uint8_t style/*=SS_DEFAULT*/, const char * const valstr/*=nullptr*/) {
819
   void MenuItem_static::draw(const uint8_t row, PGM_P const pstr, const uint8_t style/*=SS_DEFAULT*/, const char * const valstr/*=nullptr*/) {

+ 1
- 1
Marlin/src/lcd/extui/lib/anycubic_chiron/chiron_tft.cpp View File

364
       faultDuration++;
364
       faultDuration++;
365
       if (faultDuration >= AC_HEATER_FAULT_VALIDATION_TIME) {
365
       if (faultDuration >= AC_HEATER_FAULT_VALIDATION_TIME) {
366
         SendtoTFTLN(AC_msg_nozzle_temp_abnormal);
366
         SendtoTFTLN(AC_msg_nozzle_temp_abnormal);
367
-        SERIAL_ECHOLNPAIR_P("Bed temp abnormal! : ", temp);
367
+        SERIAL_ECHOLNPAIR("Bed temp abnormal! : ", temp);
368
         break;
368
         break;
369
       }
369
       }
370
       delay_ms(500);
370
       delay_ms(500);

Loading…
Cancel
Save