bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Fix up PSU_CONTROL checks

Browse Source
This commit is contained in:
Scott Lahteine
2019-10-22 15:43:37 -05:00
parent 62b875f918
commit af214ff121
11 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/src/gcode/control/M80_M81.cpp
View File

@ -35,7 +35,7 @@
#include "../../Marlin.h"
#endif
#if HAS_POWER_SWITCH
#if ENABLED(PSU_CONTROL)
#if ENABLED(AUTO_POWER_CONTROL)
#include "../../feature/power.h"
@ -81,7 +81,7 @@
#endif
}
#endif // HAS_POWER_SWITCH
#endif // ENABLED(PSU_CONTROL)
/**
* M81: Turn off Power, including Power Supply, if there is one.
@ -105,7 +105,7 @@ void GcodeSuite::M81() {
#if HAS_SUICIDE
suicide();
#elif HAS_POWER_SWITCH
#elif ENABLED(PSU_CONTROL)
PSU_OFF();
#endif

2
Marlin/src/gcode/gcode.cpp
View File

@ -471,7 +471,7 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
#endif
#endif // BARICUDA
#if HAS_POWER_SWITCH
#if ENABLED(PSU_CONTROL)
case 80: M80(); break; // M80: Turn on Power Supply
#endif
case 81: M81(); break; // M81: Turn off Power, including Power Supply, if possible

2
Marlin/src/gcode/gcode.h
View File

@ -548,7 +548,7 @@ private:
static void M78();
#endif
#if HAS_POWER_SWITCH
#if ENABLED(PSU_CONTROL)
static void M80();
#endif

2
Marlin/src/gcode/host/M115.cpp
View File

@ -112,7 +112,7 @@ void GcodeSuite::M115() {
// SOFTWARE_POWER (M80, M81)
cap_line(PSTR("SOFTWARE_POWER")
#if HAS_POWER_SWITCH
#if ENABLED(PSU_CONTROL)
, true
#endif
);