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

Merge pull request #4553 from sarusani/shutdownHostLCDEntry 

Add Shutdown host to LCD Menu
This commit is contained in:
3d-gussner 2024-01-11 07:33:16 +01:00 committed by GitHub
parent 6424703d2b 2199ef8bc4
commit 8d50d29776
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
29 changed files with 163 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Firmware/messages.cpp
View File

@ -104,6 +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
@ -234,6 +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

6
Firmware/messages.h
View File

@ -106,6 +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[];
@ -238,6 +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[];

16
Firmware/ultralcd.cpp
View File

@ -5135,6 +5135,14 @@ 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
//!
//! @code{.unparsed}
@ -5329,10 +5337,16 @@ static void lcd_main_menu()
if (MMU2::mmu2.Enabled()) {
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
MENU_END();
}

6
Firmware/variants/MK25-RAMBo10a.h
View File

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

6
Firmware/variants/MK25-RAMBo13a.h
View File

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

6
Firmware/variants/MK25S-RAMBo10a.h
View File

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

6
Firmware/variants/MK25S-RAMBo13a.h
View File

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

5
Firmware/variants/MK3-E3DREVO.h
View File

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

5
Firmware/variants/MK3-E3DREVO_HF_60W.h
View File

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

5
Firmware/variants/MK3.h
View File

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

5
Firmware/variants/MK3S-E3DREVO.h
View File

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

5
Firmware/variants/MK3S-E3DREVO_HF_60W.h
View File

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

5
Firmware/variants/MK3S.h
View File

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

6
Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h
View File

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

6
Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h
View File

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

5
lang/po/Firmware.pot
View File

@ -1992,6 +1992,11 @@ msgstr ""
msgid "Show end stops"
msgstr ""
#. MSG_SHUTDOWN_HOST c=18
#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:5342
msgid "Shutdown host"
msgstr ""
#. MSG_SILENT c=7
#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4149
#: ../../Firmware/ultralcd.cpp:4188

5
lang/po/Firmware_cs.po
View File

@ -2570,6 +2570,11 @@ msgstr "Zrušit Připravena"
msgid "Reprint"
msgstr "Tisk. znovu"
#. MSG_SHUTDOWN_HOST c=18
#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:5342
msgid "Shutdown host"
msgstr "Vypnutí hostitele"
#~ msgid "Remove old filament and press the knob to start loading new filament."
#~ msgstr "Vyjmete stary filament a stisknete tlacitko pro zavedeni noveho."

5
lang/po/Firmware_de.po
View File

@ -2598,6 +2598,11 @@ msgstr "Nicht breit setzen"
msgid "Reprint"
msgstr "Druck wiederholen"
#. MSG_SHUTDOWN_HOST c=18
#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:5342
msgid "Shutdown host"
msgstr "Host runterfahren"
#~ msgid "Remove old filament and press the knob to start loading new filament."
#~ msgstr "Entferne das alte Fil. und drücke den Knopf, um das neue zu laden."

5
lang/po/Firmware_es.po
View File

@ -2593,6 +2593,11 @@ msgstr "Conjunto no listo"
msgid "Reprint"
msgstr "Volver a imprimir"
#. MSG_SHUTDOWN_HOST c=18
#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:5342
msgid "Shutdown host"
msgstr "Apagar host"
#~ msgid "Remove old filament and press the knob to start loading new filament."
#~ msgstr ""
#~ "Retira el fil. viejo y presiona el dial para comenzar a cargar el nuevo."

5
lang/po/Firmware_fr.po
View File

@ -2604,6 +2604,11 @@ msgstr "Ensemble pas prête"
msgid "Reprint"
msgstr "Ré-imprimer"
#. MSG_SHUTDOWN_HOST c=18
#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:5342
msgid "Shutdown host"
msgstr "Arrêter l'hôte"
#~ msgid "Remove old filament and press the knob to start loading new filament."
#~ msgstr ""
#~ "Retirez l'ancien fil. puis appuyez sur le bouton pour charger le nouveau."

5
lang/po/Firmware_hr.po
View File

@ -2587,6 +2587,11 @@ msgstr "Set nije spreman"
msgid "Reprint"
msgstr "Ponovno tiskanje"
#. MSG_SHUTDOWN_HOST c=18
#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:5342
msgid "Shutdown host"
msgstr "Iskljuciti host"
#~ msgid "Remove old filament and press the knob to start loading new filament."
#~ msgstr "Uklonite stari fil. i pritisnite gumb za pocetak stavljanja novog."

5
lang/po/Firmware_hu.po
View File

@ -2592,6 +2592,11 @@ msgstr "Készen nem áll"
msgid "Reprint"
msgstr "Újranyomtatás"
#. MSG_SHUTDOWN_HOST c=18
#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:5342
msgid "Shutdown host"
msgstr "Gazdagép leállítás"
#~ msgid "Remove old filament and press the knob to start loading new filament."
#~ msgstr "Vedd ki a regi fil., majd nyomd meg a gombot az uj fil. betoltesehez."

5
lang/po/Firmware_it.po
View File

@ -2593,6 +2593,11 @@ msgstr "Imposta non pronta"
msgid "Reprint"
msgstr "Ristampa"
#. MSG_SHUTDOWN_HOST c=18
#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:5342
msgid "Shutdown host"
msgstr "Spegnere l'host"
#~ msgid "Remove old filament and press the knob to start loading new filament."
#~ msgstr "Rimuovi il fil. precedente e premi la manopola per caricare il nuovo."

5
lang/po/Firmware_nl.po
View File

@ -2595,6 +2595,11 @@ msgstr "Niet gereed zetten"
msgid "Reprint"
msgstr "Herhaal druk"
#. MSG_SHUTDOWN_HOST c=18
#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:5342
msgid "Shutdown host"
msgstr "Host uitschakelen"
#~ msgid "Remove old filament and press the knob to start loading new filament."
#~ msgstr ""
#~ "Verwijder de oude filament en druk op de knop om nieuwe filament te laden."

5
lang/po/Firmware_no.po
View File

@ -2569,6 +2569,11 @@ msgstr "Sett ikke klar"
msgid "Reprint"
msgstr "Gjenta print"
#. MSG_SHUTDOWN_HOST c=18
#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:5342
msgid "Shutdown host"
msgstr "Slå av vert"
#~ msgid "Remove old filament and press the knob to start loading new filament."
#~ msgstr "Ta bort det gamle filamentet og trykk valghjulet for å laste et nytt."

5
lang/po/Firmware_pl.po
View File

@ -2587,6 +2587,11 @@ msgstr "Cofnij gotowość"
msgid "Reprint"
msgstr "Przedruk"
#. MSG_SHUTDOWN_HOST c=18
#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:5342
msgid "Shutdown host"
msgstr "Zamknięcie hosta"
#~ msgid "Remove old filament and press the knob to start loading new filament."
#~ msgstr "Wyciągnij poprzedni filament i naciśnij pokrętło aby załadować nowy."

5
lang/po/Firmware_ro.po
View File

@ -2593,6 +2593,11 @@ msgstr "Print. nu pregătit"
msgid "Reprint"
msgstr "Repetă print"
#. MSG_SHUTDOWN_HOST c=18
#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:5342
msgid "Shutdown host"
msgstr "Oprește gazda"
#~ msgid "Remove old filament and press the knob to start loading new filament."
#~ msgstr "Scoateți fil. vechi și apăsați butonul pentru a încărca unul nou."

5
lang/po/Firmware_sk.po
View File

@ -2575,6 +2575,11 @@ msgstr "Nie je pripravené"
msgid "Reprint"
msgstr "Vytlačiť znova"
#. MSG_SHUTDOWN_HOST c=18
#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:5342
msgid "Shutdown host"
msgstr "Vypnutie hostiteľa"
#~ msgid "Remove old filament and press the knob to start loading new filament."
#~ msgstr "Vyberte starý filament a stlačte tlačidlo pre zavedenie nového."

5
lang/po/Firmware_sv.po
View File

@ -2582,6 +2582,11 @@ msgstr "Set inte klart"
msgid "Reprint"
msgstr "Upprepa trycket"
#. MSG_SHUTDOWN_HOST c=18
#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:5342
msgid "Shutdown host"
msgstr "Stänga av värd"
#~ msgid "Remove old filament and press the knob to start loading new filament."
#~ msgstr "Ta bort det gamla fil. och tryck på knappen för att börja ladda nytt."