MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Fix some LCD/serial strings

Browse Source
This commit is contained in:
Scott Lahteine 2020-11-14 18:27:16 -06:00
parent 7f7c27be30
commit 90f647b6be
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp
View File

@ -675,8 +675,8 @@ void MarlinUI::draw_status_screen() {
// //
lcd.setCursor(0, 0); lcd.setCursor(0, 0);
_draw_axis_value(X_AXIS, ftostr4sign(LOGICAL_X_POSITION(current_position[X_AXIS])), blink); lcd.write(' '); _draw_axis_value(X_AXIS, ftostr4sign(LOGICAL_X_POSITION(current_position[X_AXIS])), blink); lcd.write(' ');
_draw_axis_value(Y_AXIS, ftostr4sign(LOGICAL_Y_POSITION(current_position[Y_AXIS])), blink); lcd.write(' '); _draw_axis_value(Y_AXIS, ftostr4sign(LOGICAL_Y_POSITION(current_position[Y_AXIS])), blink); lcd.write(' ');
_draw_axis_value(Z_AXIS, ftostr52sp(LOGICAL_Z_POSITION(current_position[Z_AXIS])), blink); _draw_axis_value(Z_AXIS, ftostr52sp(LOGICAL_Z_POSITION(current_position[Z_AXIS])), blink);
#if HAS_LEVELING && !HAS_HEATED_BED #if HAS_LEVELING && !HAS_HEATED_BED
@ -700,7 +700,7 @@ void MarlinUI::draw_status_screen() {
uint8_t len = elapsed.toDigital(buffer); uint8_t len = elapsed.toDigital(buffer);
lcd.setCursor((LCD_WIDTH - 1) - len, 1); lcd.setCursor((LCD_WIDTH - 1) - len, 1);
lcd.write(0x07); lcd.print(buffer); // LCD_CLOCK_CHAR lcd.write(LCD_STR_CLOCK[0]); lcd.print(buffer);
// //
// Line 3 - progressbar // Line 3 - progressbar
@ -807,13 +807,13 @@ void MarlinUI::draw_status_screen() {
void MarlinUI::draw_hotend_status(const uint8_t row, const uint8_t extruder) { void MarlinUI::draw_hotend_status(const uint8_t row, const uint8_t extruder) {
if (!PanelDetected) return; if (!PanelDetected) return;
lcd.setCursor((LCD_WIDTH - 14) / 2, row + 1); lcd.setCursor((LCD_WIDTH - 14) / 2, row + 1);
lcd.write(0x02); lcd_put_u8str_P(" E"); lcd.write('1' + extruder); lcd.write(' '); lcd.write(LCD_STR_THERMOMETER[0]); lcd_put_u8str_P(PSTR(" E")); lcd.write('1' + extruder); lcd.write(' ');
lcd.print(i16tostr3rj(thermalManager.degHotend(extruder))); lcd.write(0x01); lcd.write('/'); lcd.print(i16tostr3rj(thermalManager.degHotend(extruder))); lcd.write(LCD_STR_DEGREE[0]); lcd.write('/');
lcd.print(i16tostr3rj(thermalManager.degTargetHotend(extruder))); lcd.write(0x01); lcd.print(i16tostr3rj(thermalManager.degTargetHotend(extruder))); lcd.write(LCD_STR_DEGREE[0]);
lcd.print_line(); lcd.print_line();
} }
#endif // ADVANCED_PAUSE_FEATURE #endif
// Draw a static item with no left-right margin required. Centered by default. // Draw a static item with no left-right margin required. Centered by default.
void MenuItem_static::draw(const uint8_t row, PGM_P const pstr, const uint8_t style/*=SS_DEFAULT*/, const char * const valstr/*=nullptr*/) { void MenuItem_static::draw(const uint8_t row, PGM_P const pstr, const uint8_t style/*=SS_DEFAULT*/, const char * const valstr/*=nullptr*/) {

2
Marlin/src/lcd/extui/lib/anycubic_chiron/chiron_tft.cpp
View File

@ -364,7 +364,7 @@ namespace Anycubic {
faultDuration++; faultDuration++;
if (faultDuration >= AC_HEATER_FAULT_VALIDATION_TIME) { if (faultDuration >= AC_HEATER_FAULT_VALIDATION_TIME) {
SendtoTFTLN(AC_msg_nozzle_temp_abnormal); SendtoTFTLN(AC_msg_nozzle_temp_abnormal);
SERIAL_ECHOLNPAIR_P("Bed temp abnormal! : ", temp); SERIAL_ECHOLNPAIR("Bed temp abnormal! : ", temp);
break; break;
} }
delay_ms(500); delay_ms(500);