MPCNC/Firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update powersupply_on in power_on/off (#10014)

Browse Source 
Fix #10004
This commit is contained in:
Scott Lahteine 2018-03-08 18:56:41 -06:00 committed by GitHub
parent 9c667b5436
commit e5e3c3ff35
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/Marlin.h
View File

@ -453,6 +453,12 @@ void report_current_position();
extern int lpq_len; extern int lpq_len;
#endif #endif
#if HAS_POWER_SWITCH
extern bool powersupply_on;
#define PSU_PIN_ON() do{ OUT_WRITE(PS_ON_PIN, PS_ON_AWAKE); powersupply_on = true; }while(0)
#define PSU_PIN_OFF() do{ OUT_WRITE(PS_ON_PIN, PS_ON_ASLEEP); powersupply_on = false; }while(0)
#endif
// Handling multiple extruders pins // Handling multiple extruders pins
extern uint8_t active_extruder; extern uint8_t active_extruder;

19
Marlin/Marlin_main.cpp
View File

@ -524,15 +524,6 @@ millis_t previous_cmd_ms = 0;
static millis_t max_inactive_time = 0; static millis_t max_inactive_time = 0;
static millis_t stepper_inactive_time = (DEFAULT_STEPPER_DEACTIVE_TIME) * 1000UL; static millis_t stepper_inactive_time = (DEFAULT_STEPPER_DEACTIVE_TIME) * 1000UL;
// Auto Power Control
#if ENABLED(AUTO_POWER_CONTROL)
#define PSU_ON() powerManager.power_on()
#define PSU_OFF() powerManager.power_off()
#else
#define PSU_ON() OUT_WRITE(PS_ON_PIN, PS_ON_AWAKE)
#define PSU_OFF() OUT_WRITE(PS_ON_PIN, PS_ON_ASLEEP)
#endif
// Buzzer - I2C on the LCD or a BEEPER_PIN // Buzzer - I2C on the LCD or a BEEPER_PIN
#if ENABLED(LCD_USE_I2C_BUZZER) #if ENABLED(LCD_USE_I2C_BUZZER)
#define BUZZ(d,f) lcd_buzz(d, f) #define BUZZ(d,f) lcd_buzz(d, f)
@ -606,6 +597,13 @@ uint8_t target_extruder;
true true
#endif #endif
; ;
#if ENABLED(AUTO_POWER_CONTROL)
#define PSU_ON() powerManager.power_on()
#define PSU_OFF() powerManager.power_off()
#else
#define PSU_ON() PSU_PIN_ON()
#define PSU_OFF() PSU_PIN_OFF()
#endif
#endif #endif
#if ENABLED(DELTA) #if ENABLED(DELTA)
@ -8284,8 +8282,6 @@ inline void gcode_M140() {
tmc2130_init(); // Settings only stick when the driver has power tmc2130_init(); // Settings only stick when the driver has power
#endif #endif
powersupply_on = true;
#if ENABLED(ULTIPANEL) #if ENABLED(ULTIPANEL)
LCD_MESSAGEPGM(WELCOME_MSG); LCD_MESSAGEPGM(WELCOME_MSG);
#endif #endif
@ -8322,7 +8318,6 @@ inline void gcode_M81() {
suicide(); suicide();
#elif HAS_POWER_SWITCH #elif HAS_POWER_SWITCH
PSU_OFF(); PSU_OFF();
powersupply_on = false;
#endif #endif
#if ENABLED(ULTIPANEL) #if ENABLED(ULTIPANEL)

2
Marlin/planner.cpp
View File

@ -883,7 +883,7 @@ void Planner::_buffer_steps(const int32_t (&target)[XYZE]
#if ENABLED(AUTO_POWER_CONTROL) #if ENABLED(AUTO_POWER_CONTROL)
if (block->steps[X_AXIS] || block->steps[Y_AXIS] || block->steps[Z_AXIS]) if (block->steps[X_AXIS] || block->steps[Y_AXIS] || block->steps[Z_AXIS])
powerManager.power_on(); powerManager.power_on();
#endif #endif
//enable active axes //enable active axes

4
Marlin/power.cpp
View File

@ -86,11 +86,11 @@ void Power::check() {
void Power::power_on() { void Power::power_on() {
lastPowerOn = millis(); lastPowerOn = millis();
OUT_WRITE(PS_ON_PIN, PS_ON_AWAKE); PSU_PIN_ON();
} }
void Power::power_off() { void Power::power_off() {
OUT_WRITE(PS_ON_PIN, PS_ON_ASLEEP); PSU_PIN_OFF();
} }
#endif // AUTO_POWER_CONTROL #endif // AUTO_POWER_CONTROL