bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Rename LCD conditionals (#19533)

Browse Source
This commit is contained in:
Scott Lahteine
2020-09-28 01:13:27 -05:00
committed by GitHub
parent 1c372df449
commit c2c6a679ea
138 changed files with 353 additions and 333 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Marlin/src/gcode/bedlevel/G26.cpp
View File

@ -359,7 +359,7 @@ inline bool turn_on_heaters() {
#if HAS_HEATED_BED
if (g26_bed_temp > 25) {
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
ui.set_status_P(GET_TEXT(MSG_G26_HEATING_BED), 99);
ui.quick_feedback();
TERN_(HAS_LCD_MENU, ui.capture());
@ -378,7 +378,7 @@ inline bool turn_on_heaters() {
#endif // HAS_HEATED_BED
// Start heating the active nozzle
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
ui.set_status_P(GET_TEXT(MSG_G26_HEATING_NOZZLE), 99);
ui.quick_feedback();
#endif
@ -391,7 +391,7 @@ inline bool turn_on_heaters() {
#endif
)) return G26_ERR;
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
ui.reset_status();
ui.quick_feedback();
#endif
@ -446,7 +446,7 @@ inline bool prime_nozzle() {
else
#endif
{
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
ui.set_status_P(GET_TEXT(MSG_G26_FIXED_LENGTH), 99);
ui.quick_feedback();
#endif

4
Marlin/src/gcode/calibrate/M48.cpp
View File

@ -144,7 +144,7 @@ void GcodeSuite::M48() {
float sample_sum = 0.0;
LOOP_L_N(n, n_samples) {
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
// Display M48 progress in the status bar
ui.status_printf_P(0, PSTR(S_FMT ": %d/%d"), GET_TEXT(MSG_M48_POINT), int(n + 1), int(n_samples));
#endif
@ -258,7 +258,7 @@ void GcodeSuite::M48() {
SERIAL_ECHOLNPGM("Finished!");
dev_report(verbose_level > 0, mean, sigma, min, max, true);
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
// Display M48 results in the status bar
char sigma_str[8];
ui.status_printf_P(0, PSTR(S_FMT ": %s"), GET_TEXT(MSG_M48_DEVIATION), dtostrf(sigma, 2, 6, sigma_str));

2
Marlin/src/gcode/feature/power_monitor/M430.cpp
View File

@ -38,7 +38,7 @@
*/
void GcodeSuite::M430() {
bool do_report = true;
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
#if ENABLED(POWER_MONITOR_CURRENT)
if (parser.seen('I')) { power_monitor.set_current_display(parser.value_bool()); do_report = false; }
#endif