zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

🐛 Fix conditional M81 suicide (#23549)

Browse source
This commit is contained in:
John Lagonikas 2022-01-19 10:13:47 +02:00 committed by Scott Lahteine
parent 6f82d1befb
commit 7b4f5108ac
8 changed files with 27 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/src/core/language.h
View file

@ -105,6 +105,7 @@
#define STR_ENQUEUEING "enqueueing \"" #define STR_ENQUEUEING "enqueueing \""
#define STR_POWERUP "PowerUp" #define STR_POWERUP "PowerUp"
#define STR_POWEROFF "PowerOff"
#define STR_EXTERNAL_RESET " External Reset" #define STR_EXTERNAL_RESET " External Reset"
#define STR_BROWNOUT_RESET " Brown out Reset" #define STR_BROWNOUT_RESET " Brown out Reset"
#define STR_WATCHDOG_RESET " Watchdog Reset" #define STR_WATCHDOG_RESET " Watchdog Reset"
@ -306,6 +307,7 @@
#define STR_Z_PROBE_OFFSET "Z-Probe Offset" #define STR_Z_PROBE_OFFSET "Z-Probe Offset"
#define STR_TEMPERATURE_UNITS "Temperature Units" #define STR_TEMPERATURE_UNITS "Temperature Units"
#define STR_USER_THERMISTORS "User thermistors" #define STR_USER_THERMISTORS "User thermistors"
#define STR_DELAYED_POWEROFF "Delayed poweroff"
// //
// Endstop Names used by Endstops::report_states // Endstop Names used by Endstops::report_states

10
Marlin/src/feature/power.cpp
View file

@ -24,7 +24,9 @@
* power.cpp - power control * power.cpp - power control
*/ */
#include "../inc/MarlinConfig.h" #include "../inc/MarlinConfigPre.h"
#if EITHER(PSU_CONTROL, AUTO_POWER_CONTROL)
#include "power.h" #include "power.h"
#include "../module/planner.h" #include "../module/planner.h"
@ -40,8 +42,6 @@
#include "../gcode/gcode.h" #include "../gcode/gcode.h"
#endif #endif
#if EITHER(PSU_CONTROL, AUTO_POWER_CONTROL)
Power powerManager; Power powerManager;
bool Power::psu_on; bool Power::psu_on;
@ -97,6 +97,10 @@ void Power::power_on() {
* Processes any PSU_POWEROFF_GCODE and makes a PS_OFF_SOUND if enabled. * Processes any PSU_POWEROFF_GCODE and makes a PS_OFF_SOUND if enabled.
*/ */
void Power::power_off() { void Power::power_off() {
SERIAL_ECHOLNPGM(STR_POWEROFF);
TERN_(HAS_SUICIDE, suicide());
if (!psu_on) return; if (!psu_on) return;
#ifdef PSU_POWEROFF_GCODE #ifdef PSU_POWEROFF_GCODE

5
Marlin/src/gcode/control/M80_M81.cpp
View file

@ -107,7 +107,10 @@ void GcodeSuite::M81() {
} }
#endif #endif
if (delayed_power_off) return; if (delayed_power_off) {
SERIAL_ECHOLNPGM(STR_DELAYED_POWEROFF);
return;
}
#if HAS_SUICIDE #if HAS_SUICIDE
suicide(); suicide();

4
Marlin/src/libs/MAX31865.cpp
View file

@ -300,14 +300,14 @@ uint16_t MAX31865::readRaw() {
enableBias(); enableBias();
nextEventStamp = millis() + 11; // wait at least 11msec before enabling 1shot nextEventStamp = millis() + 11; // wait at least 11msec before enabling 1shot
nextEvent = SETUP_1_SHOT_MODE; nextEvent = SETUP_1_SHOT_MODE;
DEBUG_ECHOLN("MAX31865 bias voltage enabled"); DEBUG_ECHOLNPGM("MAX31865 bias voltage enabled");
break; break;
case SETUP_1_SHOT_MODE: case SETUP_1_SHOT_MODE:
oneShot(); oneShot();
nextEventStamp = millis() + 65; // wait at least 65msec before reading RTD register nextEventStamp = millis() + 65; // wait at least 65msec before reading RTD register
nextEvent = READ_RTD_REG; nextEvent = READ_RTD_REG;
DEBUG_ECHOLN("MAX31865 1 shot mode enabled"); DEBUG_ECHOLNPGM("MAX31865 1 shot mode enabled");
break; break;
case READ_RTD_REG: { case READ_RTD_REG: {

4
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
View file

@ -193,7 +193,9 @@
// //
#if ENABLED(MKS_PWC) #if ENABLED(MKS_PWC)
#if ENABLED(TFT_LVGL_UI) #if ENABLED(TFT_LVGL_UI)
#undef PSU_CONTROL #if ENABLED(PSU_CONTROL)
#error "PSU_CONTROL is incompatible with MKS_PWC plus TFT_LVGL_UI."
#endif
#undef MKS_PWC #undef MKS_PWC
#define SUICIDE_PIN PB2 #define SUICIDE_PIN PB2
#define SUICIDE_PIN_STATE LOW #define SUICIDE_PIN_STATE LOW

4
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_common.h
View file

@ -118,7 +118,9 @@
// //
#if ENABLED(MKS_PWC) #if ENABLED(MKS_PWC)
#if ENABLED(TFT_LVGL_UI) #if ENABLED(TFT_LVGL_UI)
#undef PSU_CONTROL #if ENABLED(PSU_CONTROL)
#error "PSU_CONTROL is incompatible with MKS_PWC plus TFT_LVGL_UI."
#endif
#undef MKS_PWC #undef MKS_PWC
#define SUICIDE_PIN PB2 #define SUICIDE_PIN PB2
#define SUICIDE_PIN_STATE LOW #define SUICIDE_PIN_STATE LOW

4
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
View file

@ -185,7 +185,9 @@
// //
#if ENABLED(MKS_PWC) #if ENABLED(MKS_PWC)
#if ENABLED(TFT_LVGL_UI) #if ENABLED(TFT_LVGL_UI)
#undef PSU_CONTROL #if ENABLED(PSU_CONTROL)
#error "PSU_CONTROL is incompatible with MKS_PWC plus TFT_LVGL_UI."
#endif
#undef MKS_PWC #undef MKS_PWC
#define SUICIDE_PIN PG11 #define SUICIDE_PIN PG11
#define SUICIDE_PIN_STATE LOW #define SUICIDE_PIN_STATE LOW

4
Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h
View file

@ -165,7 +165,9 @@
// //
#if ENABLED(MKS_PWC) #if ENABLED(MKS_PWC)
#if ENABLED(TFT_LVGL_UI) #if ENABLED(TFT_LVGL_UI)
#undef PSU_CONTROL #if ENABLED(PSU_CONTROL)
#error "PSU_CONTROL is incompatible with MKS_PWC plus TFT_LVGL_UI."
#endif
#undef MKS_PWC #undef MKS_PWC
#define SUICIDE_PIN PB2 #define SUICIDE_PIN PB2
#define SUICIDE_PIN_STATE LOW #define SUICIDE_PIN_STATE LOW