asaril/marlin2_i2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix init of power supply pin

Browse source 
Fix #13184
This commit is contained in:
Scott Lahteine 2019-02-20 05:28:40 -06:00
parent 44c22e3935
commit 89bbc30a09
2 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Marlin/src/Marlin.cpp
View file

@ -220,9 +220,9 @@ void setup_powerhold() {
#endif #endif
#if HAS_POWER_SWITCH #if HAS_POWER_SWITCH
#if ENABLED(PS_DEFAULT_OFF) #if ENABLED(PS_DEFAULT_OFF)
PSU_OFF(); powersupply_on = true; PSU_OFF();
#else #else
PSU_ON(); powersupply_on = false; PSU_ON();
#endif #endif
#endif #endif
} }
@ -231,10 +231,8 @@ void setup_powerhold() {
* Stepper Reset (RigidBoard, et.al.) * Stepper Reset (RigidBoard, et.al.)
*/ */
#if HAS_STEPPER_RESET #if HAS_STEPPER_RESET
void disableStepperDrivers() { void disableStepperDrivers() { OUT_WRITE(STEPPER_RESET_PIN, LOW); } // Drive down to keep motor driver chips in reset
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, allowing pullups to pull the pin high
}
void enableStepperDrivers() { SET_INPUT(STEPPER_RESET_PIN); } // set to input, which allows it to be pulled high by pullups
#endif #endif
#if ENABLED(EXPERIMENTAL_I2CBUS) && I2C_SLAVE_ADDRESS > 0 #if ENABLED(EXPERIMENTAL_I2CBUS) && I2C_SLAVE_ADDRESS > 0

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

@ -42,13 +42,7 @@
#endif #endif
// Could be moved to a feature, but this is all the data // Could be moved to a feature, but this is all the data
bool powersupply_on = ( bool powersupply_on;
#if ENABLED(PS_DEFAULT_OFF)
false
#else
true
#endif
);
#if HAS_TRINAMIC #if HAS_TRINAMIC
#include "../../feature/tmc_util.h" #include "../../feature/tmc_util.h"