From 2d98cae8bd7e91268f3f4903d2bf2e3565d4725f Mon Sep 17 00:00:00 2001 From: "D.R.racer" Date: Fri, 16 Sep 2022 11:08:03 +0200 Subject: [PATCH] Fixup MK3_MMU2 branch after rebase onto MK3 --- Firmware/Marlin_main.cpp | 2 +- Firmware/messages.cpp | 2 +- Firmware/messages.h | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index b1e7028c6..d7dfcb280 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -558,7 +558,7 @@ bool __attribute__((noinline)) printer_active() { || (custom_message_type == CustomMsg::TempCal) || saved_printing || (lcd_commands_type == LcdCommands::Layer1Cal) - || mmu_print_saved + || MMU2::mmu2.MMU_PRINT_SAVED() || homing_flag || mesh_bed_leveling_flag; } diff --git a/Firmware/messages.cpp b/Firmware/messages.cpp index 0bdfa685e..f6f37635d 100644 --- a/Firmware/messages.cpp +++ b/Firmware/messages.cpp @@ -161,7 +161,7 @@ const char MSG_DIM[] PROGMEM_I1 = ISTR("Dim"); ////MSG_DIM c=6 const char MSG_AUTO[] PROGMEM_I1 = ISTR("Auto"); ////MSG_AUTO c=6 const char MSG_FS_V_03_OR_OLDER[] PROGMEM_I1 = ISTR("FS v0.3 or older"); ////MSG_FS_V_03_OR_OLDER c=18 const char MSG_FS_V_04_OR_NEWER[] PROGMEM_I1 = ISTR("FS v0.4 or newer"); ////MSG_FS_V_04_OR_NEWER c=18 -#ifdef IR_SENSOR_ANALOG +#if (FILAMENT_SENSOR_TYPE == FSENSOR_IR_ANALOG) // Beware - the space at the beginning is necessary since it is reused in LCD menu items which are to be with a space const char MSG_IR_04_OR_NEWER[] PROGMEM_I1 = ISTR(" 0.4 or newer");////MSG_IR_04_OR_NEWER c=18 const char MSG_IR_03_OR_OLDER[] PROGMEM_I1 = ISTR(" 0.3 or older");////MSG_IR_03_OR_OLDER c=18 diff --git a/Firmware/messages.h b/Firmware/messages.h index 214e3a43a..a4f0c9345 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -172,9 +172,11 @@ extern const char MSG_DIM[]; extern const char MSG_AUTO[]; extern const char MSG_FS_V_03_OR_OLDER[]; extern const char MSG_FS_V_04_OR_NEWER[]; +#if (FILAMENT_SENSOR_TYPE == FSENSOR_IR_ANALOG) extern const char MSG_IR_04_OR_NEWER[]; extern const char MSG_IR_03_OR_OLDER[]; extern const char MSG_IR_UNKNOWN[]; +#endif extern const char MSG_PAUSED_THERMAL_ERROR[]; #ifdef TEMP_MODEL extern const char MSG_THERMAL_ANOMALY[];