From 80cb13003ea0400b800c3c06498fa2223ee6fdf8 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Thu, 5 Dec 2024 09:13:26 +0100 Subject: [PATCH] Show filename after SD print finished --- Firmware/cmdqueue.cpp | 2 ++ Firmware/ultralcd.cpp | 6 +++++- Firmware/variants/MK25-RAMBo10a.h | 7 +++++++ Firmware/variants/MK25-RAMBo13a.h | 7 +++++++ Firmware/variants/MK25S-RAMBo10a.h | 7 +++++++ Firmware/variants/MK25S-RAMBo13a.h | 7 +++++++ Firmware/variants/MK3-E3DREVO.h | 7 +++++++ Firmware/variants/MK3-E3DREVO_HF_60W.h | 7 +++++++ Firmware/variants/MK3.h | 7 +++++++ Firmware/variants/MK3S-E3DREVO.h | 7 +++++++ Firmware/variants/MK3S-E3DREVO_HF_60W.h | 7 +++++++ Firmware/variants/MK3S.h | 7 +++++++ Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h | 7 +++++++ Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h | 7 +++++++ 14 files changed, 91 insertions(+), 1 deletion(-) diff --git a/Firmware/cmdqueue.cpp b/Firmware/cmdqueue.cpp index 6121eca40..b3800b8c2 100755 --- a/Firmware/cmdqueue.cpp +++ b/Firmware/cmdqueue.cpp @@ -670,7 +670,9 @@ void get_command() sprintf_P(time, PSTR("%i hours %i minutes"),hours, minutes); SERIAL_ECHO_START; SERIAL_ECHOLN(time); +#ifndef SHOW_FILENAME_AFTER_FINISH lcd_setstatus(time); +#endif //SHOW_FILENAME_AFTER_FINISH card.printingHasFinished(); card.checkautostart(true); diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 7bf6133db..463163196 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -542,10 +542,14 @@ void lcdui_print_status_line(void) { break; } } - else if ((IS_SD_PRINTING) && + else if (((IS_SD_PRINTING) && (custom_message_type == CustomMsg::Status) && (lcd_status_message_level <= LCD_STATUS_INFO) && lcd_status_message_timeout.expired_cont(LCD_STATUS_INFO_TIMEOUT)) +#ifdef SHOW_FILENAME_AFTER_FINISH + || (GetPrinterState() == PrinterState::SDPrintingFinished) +#endif //SHOW_FILENAME_AFTER_FINISH + ) { // If printing from SD, show what we are printing const char* longFilenameOLD = (card.longFilename[0] ? card.longFilename : card.filename); diff --git a/Firmware/variants/MK25-RAMBo10a.h b/Firmware/variants/MK25-RAMBo10a.h index 77cced0be..891d88385 100644 --- a/Firmware/variants/MK25-RAMBo10a.h +++ b/Firmware/variants/MK25-RAMBo10a.h @@ -520,4 +520,11 @@ #define DEFAULT_MIN_ARC_SEGMENTS 20 // The enforced minimum segments in a full circle of the same radius. Set to 0 to disable #define DEFAULT_ARC_SEGMENTS_PER_SEC 0 // Use feedrate to choose segment length. Set to 0 to disable +/*------------------------------------ + COMMUNITY FEATURES + *------------------------------------*/ + +//Show filename instead of print time after SD card print finished +//#define SHOW_FILENAME_AFTER_FINISH + #endif //__CONFIGURATION_PRUSA_H diff --git a/Firmware/variants/MK25-RAMBo13a.h b/Firmware/variants/MK25-RAMBo13a.h index 9f081885f..a94097c41 100644 --- a/Firmware/variants/MK25-RAMBo13a.h +++ b/Firmware/variants/MK25-RAMBo13a.h @@ -524,4 +524,11 @@ #define DEFAULT_MIN_ARC_SEGMENTS 20 // The enforced minimum segments in a full circle of the same radius. Set to 0 to disable #define DEFAULT_ARC_SEGMENTS_PER_SEC 0 // Use feedrate to choose segment length. Set to 0 to disable +/*------------------------------------ + COMMUNITY FEATURES + *------------------------------------*/ + +//Show filename instead of print time after SD card print finished +//#define SHOW_FILENAME_AFTER_FINISH + #endif //__CONFIGURATION_PRUSA_H diff --git a/Firmware/variants/MK25S-RAMBo10a.h b/Firmware/variants/MK25S-RAMBo10a.h index b047cb00d..6e0484468 100644 --- a/Firmware/variants/MK25S-RAMBo10a.h +++ b/Firmware/variants/MK25S-RAMBo10a.h @@ -528,4 +528,11 @@ #define DEFAULT_MIN_ARC_SEGMENTS 20 // The enforced minimum segments in a full circle of the same radius. Set to 0 to disable #define DEFAULT_ARC_SEGMENTS_PER_SEC 0 // Use feedrate to choose segment length. Set to 0 to disable +/*------------------------------------ + COMMUNITY FEATURES + *------------------------------------*/ + +//Show filename instead of print time after SD card print finished +//#define SHOW_FILENAME_AFTER_FINISH + #endif //__CONFIGURATION_PRUSA_H diff --git a/Firmware/variants/MK25S-RAMBo13a.h b/Firmware/variants/MK25S-RAMBo13a.h index 9ef7f3bd7..1ae556fdb 100644 --- a/Firmware/variants/MK25S-RAMBo13a.h +++ b/Firmware/variants/MK25S-RAMBo13a.h @@ -529,4 +529,11 @@ #define DEFAULT_MIN_ARC_SEGMENTS 20 // The enforced minimum segments in a full circle of the same radius. Set to 0 to disable #define DEFAULT_ARC_SEGMENTS_PER_SEC 0 // Use feedrate to choose segment length. Set to 0 to disable +/*------------------------------------ + COMMUNITY FEATURES + *------------------------------------*/ + +//Show filename instead of print time after SD card print finished +//#define SHOW_FILENAME_AFTER_FINISH + #endif //__CONFIGURATION_PRUSA_H diff --git a/Firmware/variants/MK3-E3DREVO.h b/Firmware/variants/MK3-E3DREVO.h index 9232f8462..4d81d5bb7 100644 --- a/Firmware/variants/MK3-E3DREVO.h +++ b/Firmware/variants/MK3-E3DREVO.h @@ -687,4 +687,11 @@ #define DEFAULT_MIN_ARC_SEGMENTS 20 // The enforced minimum segments in a full circle of the same radius. Set to 0 to disable #define DEFAULT_ARC_SEGMENTS_PER_SEC 0 // Use feedrate to choose segment length. Set to 0 to disable +/*------------------------------------ + COMMUNITY FEATURES + *------------------------------------*/ + +//Show filename instead of print time after SD card print finished +//#define SHOW_FILENAME_AFTER_FINISH + #endif //__CONFIGURATION_PRUSA_H diff --git a/Firmware/variants/MK3-E3DREVO_HF_60W.h b/Firmware/variants/MK3-E3DREVO_HF_60W.h index ace4553d5..9c10541b6 100644 --- a/Firmware/variants/MK3-E3DREVO_HF_60W.h +++ b/Firmware/variants/MK3-E3DREVO_HF_60W.h @@ -688,4 +688,11 @@ #define DEFAULT_MIN_ARC_SEGMENTS 20 // The enforced minimum segments in a full circle of the same radius. Set to 0 to disable #define DEFAULT_ARC_SEGMENTS_PER_SEC 0 // Use feedrate to choose segment length. Set to 0 to disable +/*------------------------------------ + COMMUNITY FEATURES + *------------------------------------*/ + +//Show filename instead of print time after SD card print finished +//#define SHOW_FILENAME_AFTER_FINISH + #endif //__CONFIGURATION_PRUSA_H diff --git a/Firmware/variants/MK3.h b/Firmware/variants/MK3.h index 8b0651f25..6b759993e 100644 --- a/Firmware/variants/MK3.h +++ b/Firmware/variants/MK3.h @@ -690,4 +690,11 @@ #define DEFAULT_MIN_ARC_SEGMENTS 20 // The enforced minimum segments in a full circle of the same radius. Set to 0 to disable #define DEFAULT_ARC_SEGMENTS_PER_SEC 0 // Use feedrate to choose segment length. Set to 0 to disable +/*------------------------------------ + COMMUNITY FEATURES + *------------------------------------*/ + +//Show filename instead of print time after SD card print finished +//#define SHOW_FILENAME_AFTER_FINISH + #endif //__CONFIGURATION_PRUSA_H diff --git a/Firmware/variants/MK3S-E3DREVO.h b/Firmware/variants/MK3S-E3DREVO.h index 70aef3d4d..b6e98348f 100644 --- a/Firmware/variants/MK3S-E3DREVO.h +++ b/Firmware/variants/MK3S-E3DREVO.h @@ -699,4 +699,11 @@ #define DEFAULT_MIN_ARC_SEGMENTS 20 // The enforced minimum segments in a full circle of the same radius. Set to 0 to disable #define DEFAULT_ARC_SEGMENTS_PER_SEC 0 // Use feedrate to choose segment length. Set to 0 to disable +/*------------------------------------ + COMMUNITY FEATURES + *------------------------------------*/ + +//Show filename instead of print time after SD card print finished +//#define SHOW_FILENAME_AFTER_FINISH + #endif //__CONFIGURATION_PRUSA_H diff --git a/Firmware/variants/MK3S-E3DREVO_HF_60W.h b/Firmware/variants/MK3S-E3DREVO_HF_60W.h index cf576d82d..048c94faa 100644 --- a/Firmware/variants/MK3S-E3DREVO_HF_60W.h +++ b/Firmware/variants/MK3S-E3DREVO_HF_60W.h @@ -700,4 +700,11 @@ #define DEFAULT_MIN_ARC_SEGMENTS 20 // The enforced minimum segments in a full circle of the same radius. Set to 0 to disable #define DEFAULT_ARC_SEGMENTS_PER_SEC 0 // Use feedrate to choose segment length. Set to 0 to disable +/*------------------------------------ + COMMUNITY FEATURES + *------------------------------------*/ + +//Show filename instead of print time after SD card print finished +//#define SHOW_FILENAME_AFTER_FINISH + #endif //__CONFIGURATION_PRUSA_H diff --git a/Firmware/variants/MK3S.h b/Firmware/variants/MK3S.h index 6d2027671..962e74eff 100644 --- a/Firmware/variants/MK3S.h +++ b/Firmware/variants/MK3S.h @@ -702,4 +702,11 @@ #define DEFAULT_MIN_ARC_SEGMENTS 20 // The enforced minimum segments in a full circle of the same radius. Set to 0 to disable #define DEFAULT_ARC_SEGMENTS_PER_SEC 0 // Use feedrate to choose segment length. Set to 0 to disable +/*------------------------------------ + COMMUNITY FEATURES + *------------------------------------*/ + +//Show filename instead of print time after SD card print finished +//#define SHOW_FILENAME_AFTER_FINISH + #endif //__CONFIGURATION_PRUSA_H diff --git a/Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h b/Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h index b9c970b37..3f4d12a87 100644 --- a/Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h @@ -430,4 +430,11 @@ THERMISTORS SETTINGS #define DEFAULT_MIN_ARC_SEGMENTS 20 // The enforced minimum segments in a full circle of the same radius. Set to 0 to disable #define DEFAULT_ARC_SEGMENTS_PER_SEC 0 // Use feedrate to choose segment length. Set to 0 to disable +/*------------------------------------ + COMMUNITY FEATURES + *------------------------------------*/ + +//Show filename instead of print time after SD card print finished +//#define SHOW_FILENAME_AFTER_FINISH + #endif //__CONFIGURATION_PRUSA_H diff --git a/Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h b/Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h index b89d95f9b..19183943a 100644 --- a/Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h @@ -429,4 +429,11 @@ THERMISTORS SETTINGS #define DEFAULT_MIN_ARC_SEGMENTS 20 // The enforced minimum segments in a full circle of the same radius. Set to 0 to disable #define DEFAULT_ARC_SEGMENTS_PER_SEC 0 // Use feedrate to choose segment length. Set to 0 to disable +/*------------------------------------ + COMMUNITY FEATURES + *------------------------------------*/ + +//Show filename instead of print time after SD card print finished +//#define SHOW_FILENAME_AFTER_FINISH + #endif //__CONFIGURATION_PRUSA_H