From 89bbc30a09b854c1fa20f63113a92c33df65e19a Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 20 Feb 2019 05:28:40 -0600
Subject: [PATCH] Fix init of power supply pin
Fix #13184
---
Marlin/src/Marlin.cpp | 10 ++++------
Marlin/src/gcode/control/M80_M81.cpp | 8 +-------
2 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/Marlin/src/Marlin.cpp b/Marlin/src/Marlin.cpp
index 4ec826f6c1..b8aaa4cfb5 100644
--- a/Marlin/src/Marlin.cpp
+++ b/Marlin/src/Marlin.cpp
@@ -220,9 +220,9 @@ void setup_powerhold() {
#endif
#if HAS_POWER_SWITCH
#if ENABLED(PS_DEFAULT_OFF)
- PSU_OFF();
+ powersupply_on = true; PSU_OFF();
#else
- PSU_ON();
+ powersupply_on = false; PSU_ON();
#endif
#endif
}
@@ -231,10 +231,8 @@ void setup_powerhold() {
* Stepper Reset (RigidBoard, et.al.)
*/
#if HAS_STEPPER_RESET
- void disableStepperDrivers() {
- OUT_WRITE(STEPPER_RESET_PIN, LOW); // drive it down to hold in reset motor driver chips
- }
- void enableStepperDrivers() { SET_INPUT(STEPPER_RESET_PIN); } // set to input, which allows it to be pulled high by pullups
+ void disableStepperDrivers() { OUT_WRITE(STEPPER_RESET_PIN, LOW); } // Drive down to keep motor driver chips in reset
+ void enableStepperDrivers() { SET_INPUT(STEPPER_RESET_PIN); } // Set to input, allowing pullups to pull the pin high
#endif
#if ENABLED(EXPERIMENTAL_I2CBUS) && I2C_SLAVE_ADDRESS > 0
diff --git a/Marlin/src/gcode/control/M80_M81.cpp b/Marlin/src/gcode/control/M80_M81.cpp
index 91a0e048af..d2d90b6518 100644
--- a/Marlin/src/gcode/control/M80_M81.cpp
+++ b/Marlin/src/gcode/control/M80_M81.cpp
@@ -42,13 +42,7 @@
#endif
// Could be moved to a feature, but this is all the data
- bool powersupply_on = (
- #if ENABLED(PS_DEFAULT_OFF)
- false
- #else
- true
- #endif
- );
+ bool powersupply_on;
#if HAS_TRINAMIC
#include "../../feature/tmc_util.h"