Browse Source

Merge pull request #630 from dumle29/Marlin_v1

PS_ON configurable boot state
pull/1/head
ErikZalm 11 years ago
parent
commit
4382068f92
  1. 3
      Marlin/Configuration.h
  2. 4
      Marlin/Marlin_main.cpp

3
Marlin/Configuration.h

@ -79,6 +79,9 @@
#define POWER_SUPPLY 1 #define POWER_SUPPLY 1
// Define this to have the electronics keep the powersupply off on startup. If you don't know what this is leave it.
// #define PS_DEFAULT_OFF
//=========================================================================== //===========================================================================
//=============================Thermal Settings ============================ //=============================Thermal Settings ============================
//=========================================================================== //===========================================================================

4
Marlin/Marlin_main.cpp

@ -366,8 +366,12 @@ void setup_powerhold()
#endif #endif
#if defined(PS_ON_PIN) && PS_ON_PIN > -1 #if defined(PS_ON_PIN) && PS_ON_PIN > -1
SET_OUTPUT(PS_ON_PIN); SET_OUTPUT(PS_ON_PIN);
#if defined(PS_DEFAULT_OFF)
WRITE(PS_ON_PIN, PS_ON_ASLEEP);
#else
WRITE(PS_ON_PIN, PS_ON_AWAKE); WRITE(PS_ON_PIN, PS_ON_AWAKE);
#endif #endif
#endif
} }
void suicide() void suicide()

Loading…
Cancel
Save