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

Prevent delay when power is already on

Browse Source 
Fix #10410
This commit is contained in:
Scott Lahteine 2018-04-17 04:31:26 -05:00
parent f1dfc80332
commit 444b6d6d83
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Marlin/power.cpp
View File

@ -86,16 +86,18 @@ void Power::check() {
void Power::power_on() { void Power::power_on() {
lastPowerOn = millis(); lastPowerOn = millis();
PSU_PIN_ON(); if (!powersupply_on) {
PSU_PIN_ON();
#if HAS_TRINAMIC #if HAS_TRINAMIC
delay(100); // Wait for power to settle delay(100); // Wait for power to settle
restore_stepper_drivers(); restore_stepper_drivers();
#endif #endif
}
} }
void Power::power_off() { void Power::power_off() {
PSU_PIN_OFF(); if (powersupply_on) PSU_PIN_OFF();
} }
#endif // AUTO_POWER_CONTROL #endif // AUTO_POWER_CONTROL

4
Marlin/ultralcd.cpp
View File

@ -168,10 +168,6 @@ uint16_t max_display_update_time = 0;
#define TALL_FONT_CORRECTION 0 #define TALL_FONT_CORRECTION 0
#endif #endif
#if HAS_POWER_SWITCH
extern bool powersupply_on;
#endif
bool no_reentry = false; bool no_reentry = false;
constexpr int8_t menu_bottom = LCD_HEIGHT - (TALL_FONT_CORRECTION); constexpr int8_t menu_bottom = LCD_HEIGHT - (TALL_FONT_CORRECTION);