wp/Marlin-Ai3M
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge upstream

Browse Source 
Merging upstream changes up to 35775395d9b5206e584b3734ab7e070e072603f8
This commit is contained in:
David Ramiro
2019-03-30 14:14:39 +01:00
parent a9274af234
commit 7e29a4d88a
18 changed files with 300 additions and 296 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/Configuration.h
View File

@@ -238,7 +238,7 @@
*
* :{ 0:'No power switch', 1:'ATX', 2:'X-Box 360' }
*/
//#define POWER_SUPPLY 1
#define POWER_SUPPLY 0
#if POWER_SUPPLY > 0
// Enable this option to leave the PSU off at startup.
@@ -1245,7 +1245,7 @@
//
#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages
#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
//#define BUSY_WHILE_HEATING // Some hosts require "busy" messages even during heating
#define BUSY_WHILE_HEATING // Some hosts require "busy" messages even during heating
//
// M100 Free Memory Watcher