From 59093107fdd99a735bf2e970952f00ee82627b8a Mon Sep 17 00:00:00 2001 From: sarusani <62053849+sarusani@users.noreply.github.com> Date: Wed, 3 Jan 2024 10:30:36 +0100 Subject: [PATCH] Add #ifdef HOST_SHUTDOWN --- Firmware/messages.cpp | 4 ++++ Firmware/messages.h | 4 ++++ Firmware/ultralcd.cpp | 4 ++++ Firmware/variants/MK25-RAMBo10a.h | 6 ++++++ Firmware/variants/MK25-RAMBo13a.h | 6 ++++++ Firmware/variants/MK25S-RAMBo10a.h | 6 ++++++ Firmware/variants/MK25S-RAMBo13a.h | 6 ++++++ Firmware/variants/MK3-E3DREVO.h | 5 +++++ Firmware/variants/MK3-E3DREVO_HF_60W.h | 5 +++++ Firmware/variants/MK3.h | 5 +++++ Firmware/variants/MK3S-E3DREVO.h | 5 +++++ Firmware/variants/MK3S-E3DREVO_HF_60W.h | 5 +++++ Firmware/variants/MK3S.h | 5 +++++ Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h | 6 ++++++ Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h | 6 ++++++ 15 files changed, 78 insertions(+) diff --git a/Firmware/messages.cpp b/Firmware/messages.cpp index f324b0a5d..3f5056018 100644 --- a/Firmware/messages.cpp +++ b/Firmware/messages.cpp @@ -104,7 +104,9 @@ const char MSG_SELFTEST_WIRINGERROR[] PROGMEM_I1 = ISTR("Wiring error"); ////MSG const char MSG_SETTINGS[] PROGMEM_I1 = ISTR("Settings"); ////MSG_SETTINGS c=18 const char MSG_SET_READY[] PROGMEM_I1 = ISTR("Set Ready"); ////MSG_SET_READY c=18 const char MSG_SET_NOT_READY[] PROGMEM_I1 = ISTR("Set not Ready"); ////MSG_SET_NOT_READY c=18 +#ifdef HOST_SHUTDOWN const char MSG_SHUTDOWN_HOST[] PROGMEM_I1 = ISTR("Shutdown host"); ////MSG_SHUTDOWN_HOST c=18 +#endif //HOST_SHUTOWN const char MSG_SELECT_LANGUAGE[] PROGMEM_I1 = ISTR("Select language"); ////MSG_SELECT_LANGUAGE c=18 const char MSG_SORTING_FILES[] PROGMEM_I1 = ISTR("Sorting files"); ////MSG_SORTING_FILES c=20 const char MSG_TOTAL[] PROGMEM_I1 = ISTR("Total"); ////MSG_TOTAL c=6 @@ -235,7 +237,9 @@ const char MSG_OCTOPRINT_READY[] PROGMEM_N1 = "// action:ready"; //// const char MSG_OCTOPRINT_NOT_READY[] PROGMEM_N1 = "// action:not_ready"; //// const char MSG_OCTOPRINT_START[] PROGMEM_N1 = "// action:start"; //// const char MSG_OCTOPRINT_UVLO_RECOVERY_READY[] PROGMEM_N1 = "// action:uvlo_recovery_ready"; //// +#ifdef HOST_SHUTDOWN const char MSG_HOST_ACTION_SHUTDOWN[] PROGMEM_N1 = "//action:shutdown"; //// +#endif //HOST_SHUTOWN const char MSG_FANCHECK_HOTEND[] PROGMEM_N1 = "Err:HOTEND FAN ERROR"; ////c=20 const char MSG_FANCHECK_PRINT[] PROGMEM_N1 = "Err:PRINT FAN ERROR"; ////c=20 const char MSG_M112_KILL[] PROGMEM_N1 = "M112 called. Emergency Stop."; ////c=20 diff --git a/Firmware/messages.h b/Firmware/messages.h index 16bb509b6..76f4e507d 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -106,7 +106,9 @@ extern const char MSG_SELFTEST_WIRINGERROR[]; extern const char MSG_SETTINGS[]; extern const char MSG_SET_READY[]; extern const char MSG_SET_NOT_READY[]; +#ifdef HOST_SHUTDOWN extern const char MSG_SHUTDOWN_HOST[]; +#endif //HOST_SHUTOWN extern const char MSG_SELECT_LANGUAGE[]; extern const char MSG_SORTING_FILES[]; extern const char MSG_TOTAL[]; @@ -239,7 +241,9 @@ extern const char MSG_OCTOPRINT_READY[]; extern const char MSG_OCTOPRINT_NOT_READY[]; extern const char MSG_OCTOPRINT_START[]; extern const char MSG_OCTOPRINT_UVLO_RECOVERY_READY[]; +#ifdef HOST_SHUTDOWN extern const char MSG_HOST_ACTION_SHUTDOWN[]; +#endif //HOST_SHUTOWN extern const char MSG_FANCHECK_HOTEND[]; extern const char MSG_FANCHECK_PRINT[]; extern const char MSG_M112_KILL[]; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 75cdbe9bf..e313073ab 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5137,11 +5137,13 @@ static void lcd_printer_ready_state_toggle() } } +#ifdef HOST_SHUTDOWN static void lcd_shutdown_menu() { SERIAL_ECHOLNRPGM(MSG_HOST_ACTION_SHUTDOWN); lcd_return_to_status(); } +#endif //HOST_SHUTOWN //! @brief Show Main Menu //! @@ -5338,9 +5340,11 @@ static void lcd_main_menu() MENU_ITEM_SUBMENU_P(_i("Fail stats MMU"), lcd_menu_fails_stats_mmu);////MSG_MMU_FAIL_STATS c=18 } +#ifdef HOST_SHUTDOWN if (!printer_active() && M79_timer_get_status()) { MENU_ITEM_FUNCTION_P(_T(MSG_SHUTDOWN_HOST), lcd_shutdown_menu); } +#endif //HOST_SHUTOWN MENU_ITEM_SUBMENU_P(_i("Support"), lcd_support_menu);////MSG_SUPPORT c=18 diff --git a/Firmware/variants/MK25-RAMBo10a.h b/Firmware/variants/MK25-RAMBo10a.h index 943b965c3..f1928db5b 100644 --- a/Firmware/variants/MK25-RAMBo10a.h +++ b/Firmware/variants/MK25-RAMBo10a.h @@ -255,6 +255,12 @@ #define TEMP_RUNAWAY_EXTRUDER_HYSTERESIS 15 #define TEMP_RUNAWAY_EXTRUDER_TIMEOUT 45 +/*------------------------------------ + HOST FEATURES + *------------------------------------*/ + +//#define HOST_SHUTDOWN //Host supports "//action:shutdown" feature + /*------------------------------------ MOTOR CURRENT SETTINGS *------------------------------------*/ diff --git a/Firmware/variants/MK25-RAMBo13a.h b/Firmware/variants/MK25-RAMBo13a.h index 35bfe89a0..743d5b218 100644 --- a/Firmware/variants/MK25-RAMBo13a.h +++ b/Firmware/variants/MK25-RAMBo13a.h @@ -256,6 +256,12 @@ #define TEMP_RUNAWAY_EXTRUDER_HYSTERESIS 15 #define TEMP_RUNAWAY_EXTRUDER_TIMEOUT 45 +/*------------------------------------ + HOST FEATURES + *------------------------------------*/ + +//#define HOST_SHUTDOWN //Host supports "//action:shutdown" feature + /*------------------------------------ MOTOR CURRENT SETTINGS *------------------------------------*/ diff --git a/Firmware/variants/MK25S-RAMBo10a.h b/Firmware/variants/MK25S-RAMBo10a.h index 94946ca45..5cadc7515 100644 --- a/Firmware/variants/MK25S-RAMBo10a.h +++ b/Firmware/variants/MK25S-RAMBo10a.h @@ -255,6 +255,12 @@ #define TEMP_RUNAWAY_EXTRUDER_HYSTERESIS 15 #define TEMP_RUNAWAY_EXTRUDER_TIMEOUT 45 +/*------------------------------------ + HOST FEATURES + *------------------------------------*/ + +//#define HOST_SHUTDOWN //Host supports "//action:shutdown" feature + /*------------------------------------ MOTOR CURRENT SETTINGS *------------------------------------*/ diff --git a/Firmware/variants/MK25S-RAMBo13a.h b/Firmware/variants/MK25S-RAMBo13a.h index b09588508..f720e9447 100644 --- a/Firmware/variants/MK25S-RAMBo13a.h +++ b/Firmware/variants/MK25S-RAMBo13a.h @@ -256,6 +256,12 @@ #define TEMP_RUNAWAY_EXTRUDER_HYSTERESIS 15 #define TEMP_RUNAWAY_EXTRUDER_TIMEOUT 45 +/*------------------------------------ + HOST FEATURES + *------------------------------------*/ + +//#define HOST_SHUTDOWN //Host supports "//action:shutdown" feature + /*------------------------------------ MOTOR CURRENT SETTINGS *------------------------------------*/ diff --git a/Firmware/variants/MK3-E3DREVO.h b/Firmware/variants/MK3-E3DREVO.h index 46237f1b8..2b76392e8 100644 --- a/Firmware/variants/MK3-E3DREVO.h +++ b/Firmware/variants/MK3-E3DREVO.h @@ -411,6 +411,11 @@ #include "thermal_model/e3d_REVO.h" #define THERMAL_MODEL_DEFAULT E3D_REVO // Default E3D REVO model parameters +/*------------------------------------ + HOST FEATURES + *------------------------------------*/ + +//#define HOST_SHUTDOWN //Host supports "//action:shutdown" feature /*------------------------------------ MOTOR CURRENT SETTINGS diff --git a/Firmware/variants/MK3-E3DREVO_HF_60W.h b/Firmware/variants/MK3-E3DREVO_HF_60W.h index 81cca3934..e120ace60 100644 --- a/Firmware/variants/MK3-E3DREVO_HF_60W.h +++ b/Firmware/variants/MK3-E3DREVO_HF_60W.h @@ -412,6 +412,11 @@ #include "thermal_model/e3d_REVO_HF_60W.h" #define THERMAL_MODEL_DEFAULT E3D_REVO_HF_60W // Default E3D REVO HF 60W model parameters +/*------------------------------------ + HOST FEATURES + *------------------------------------*/ + +//#define HOST_SHUTDOWN //Host supports "//action:shutdown" feature /*------------------------------------ MOTOR CURRENT SETTINGS diff --git a/Firmware/variants/MK3.h b/Firmware/variants/MK3.h index 393bff59f..692c832c6 100644 --- a/Firmware/variants/MK3.h +++ b/Firmware/variants/MK3.h @@ -414,6 +414,11 @@ #include "thermal_model/e3d_v6.h" #define THERMAL_MODEL_DEFAULT E3D_V6 // Default model parameters +/*------------------------------------ + HOST FEATURES + *------------------------------------*/ + +//#define HOST_SHUTDOWN //Host supports "//action:shutdown" feature /*------------------------------------ MOTOR CURRENT SETTINGS diff --git a/Firmware/variants/MK3S-E3DREVO.h b/Firmware/variants/MK3S-E3DREVO.h index 91f79408c..4d85daa68 100644 --- a/Firmware/variants/MK3S-E3DREVO.h +++ b/Firmware/variants/MK3S-E3DREVO.h @@ -415,6 +415,11 @@ #include "thermal_model/e3d_REVO.h" #define THERMAL_MODEL_DEFAULT E3D_REVO // Default E3D REVO model parameters +/*------------------------------------ + HOST FEATURES + *------------------------------------*/ + +//#define HOST_SHUTDOWN //Host supports "//action:shutdown" feature /*------------------------------------ MOTOR CURRENT SETTINGS diff --git a/Firmware/variants/MK3S-E3DREVO_HF_60W.h b/Firmware/variants/MK3S-E3DREVO_HF_60W.h index 7437c281d..081798cec 100644 --- a/Firmware/variants/MK3S-E3DREVO_HF_60W.h +++ b/Firmware/variants/MK3S-E3DREVO_HF_60W.h @@ -416,6 +416,11 @@ #include "thermal_model/e3d_REVO_HF_60W.h" #define THERMAL_MODEL_DEFAULT E3D_REVO_HF_60W // Default E3D REVO HF 60W model parameters +/*------------------------------------ + HOST FEATURES + *------------------------------------*/ + +//#define HOST_SHUTDOWN //Host supports "//action:shutdown" feature /*------------------------------------ MOTOR CURRENT SETTINGS diff --git a/Firmware/variants/MK3S.h b/Firmware/variants/MK3S.h index 4ebf2ea2e..fee1b1285 100644 --- a/Firmware/variants/MK3S.h +++ b/Firmware/variants/MK3S.h @@ -418,6 +418,11 @@ #include "thermal_model/e3d_v6.h" #define THERMAL_MODEL_DEFAULT E3D_V6 // Default model parameters +/*------------------------------------ + HOST FEATURES + *------------------------------------*/ + +//#define HOST_SHUTDOWN //Host supports "//action:shutdown" feature /*------------------------------------ MOTOR CURRENT SETTINGS diff --git a/Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h b/Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h index 928021809..959920960 100644 --- a/Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h @@ -184,6 +184,12 @@ ADDITIONAL FEATURES SETTINGS #define TEMP_RUNAWAY_EXTRUDER_HYSTERESIS 15 #define TEMP_RUNAWAY_EXTRUDER_TIMEOUT 45 +/*------------------------------------ + HOST FEATURES + *------------------------------------*/ + +//#define HOST_SHUTDOWN //Host supports "//action:shutdown" feature + /*------------------------------------ MOTOR CURRENT SETTINGS *------------------------------------*/ diff --git a/Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h b/Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h index 94ca7304a..ec4824567 100644 --- a/Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h @@ -183,6 +183,12 @@ ADDITIONAL FEATURES SETTINGS #define TEMP_RUNAWAY_EXTRUDER_HYSTERESIS 15 #define TEMP_RUNAWAY_EXTRUDER_TIMEOUT 45 +/*------------------------------------ + HOST FEATURES + *------------------------------------*/ + +//#define HOST_SHUTDOWN //Host supports "//action:shutdown" feature + /*------------------------------------ MOTOR CURRENT SETTINGS *------------------------------------*/