josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixup MK3_MMU2 branch after rebase onto MK3

This commit is contained in:
D.R.racer 2022-09-16 11:08:03 +02:00
parent 16713aa25a
commit 2d98cae8bd
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Firmware/Marlin_main.cpp
View File

@ -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;
}

2
Firmware/messages.cpp
View File

@ -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

2
Firmware/messages.h
View File

@ -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[];