João Brázio
9 years ago
No known key found for this signature in database
GPG Key ID: F62CFD37DFFDB540
20 changed files with
56 additions and
90 deletions
-
Marlin/Conditionals.h
-
Marlin/Configuration.h
-
Marlin/Marlin_main.cpp
-
Marlin/example_configurations/Felix/Configuration.h
-
Marlin/example_configurations/Hephestos/Configuration.h
-
Marlin/example_configurations/Hephestos_2/Configuration.h
-
Marlin/example_configurations/K8200/Configuration.h
-
Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
-
Marlin/example_configurations/RigidBot/Configuration.h
-
Marlin/example_configurations/SCARA/Configuration.h
-
Marlin/example_configurations/TAZ4/Configuration.h
-
Marlin/example_configurations/WITBOX/Configuration.h
-
Marlin/example_configurations/adafruit/ST7565/Configuration.h
-
Marlin/example_configurations/delta/biv2.5/Configuration.h
-
Marlin/example_configurations/delta/generic/Configuration.h
-
Marlin/example_configurations/delta/kossel_mini/Configuration.h
-
Marlin/example_configurations/delta/kossel_pro/Configuration.h
-
Marlin/example_configurations/delta/kossel_xl/Configuration.h
-
Marlin/example_configurations/makibox/Configuration.h
-
Marlin/example_configurations/tvrrug/Round2/Configuration.h
|
|
@ -397,8 +397,8 @@ |
|
|
|
/**
|
|
|
|
* Host keep alive |
|
|
|
*/ |
|
|
|
#ifndef HOST_KEEPALIVE_INTERVAL |
|
|
|
#define HOST_KEEPALIVE_INTERVAL 2 |
|
|
|
#ifndef DEFAULT_KEEPALIVE_INTERVAL |
|
|
|
#define DEFAULT_KEEPALIVE_INTERVAL 2 |
|
|
|
#endif |
|
|
|
|
|
|
|
/**
|
|
|
|
|
|
@ -736,8 +736,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l |
|
|
|
// When enabled Marlin will send a busy status message to the host
|
|
|
|
// every couple of seconds when it can't accept commands.
|
|
|
|
//
|
|
|
|
#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages
|
|
|
|
#define HOST_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
|
|
|
|
#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.
|
|
|
|
|
|
|
|
//
|
|
|
|
// M100 Free Memory Watcher
|
|
|
|
|
|
@ -488,7 +488,7 @@ static bool send_ok[BUFSIZE]; |
|
|
|
|
|
|
|
static MarlinBusyState busy_state = NOT_BUSY; |
|
|
|
static millis_t next_busy_signal_ms = 0; |
|
|
|
uint8_t host_keepalive_interval = HOST_KEEPALIVE_INTERVAL; |
|
|
|
uint8_t host_keepalive_interval = DEFAULT_KEEPALIVE_INTERVAL; |
|
|
|
#define KEEPALIVE_STATE(n) do{ busy_state = n; }while(0) |
|
|
|
#else |
|
|
|
#define host_keepalive() ; |
|
|
|
|
|
@ -716,13 +716,11 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l |
|
|
|
//
|
|
|
|
// Host Keepalive
|
|
|
|
//
|
|
|
|
// By default Marlin will send a busy status message to the host
|
|
|
|
// When enabled Marlin will send a busy status message to the host
|
|
|
|
// every couple of seconds when it can't accept commands.
|
|
|
|
//
|
|
|
|
//#define DISABLE_HOST_KEEPALIVE // Enable this option if your host doesn't like keepalive messages.
|
|
|
|
#if DISABLED(DISABLE_HOST_KEEPALIVE) |
|
|
|
#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
|
|
|
|
#endif |
|
|
|
#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.
|
|
|
|
|
|
|
|
//
|
|
|
|
// M100 Free Memory Watcher
|
|
|
|
|
|
@ -725,13 +725,11 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo |
|
|
|
//
|
|
|
|
// Host Keepalive
|
|
|
|
//
|
|
|
|
// By default Marlin will send a busy status message to the host
|
|
|
|
// When enabled Marlin will send a busy status message to the host
|
|
|
|
// every couple of seconds when it can't accept commands.
|
|
|
|
//
|
|
|
|
//#define DISABLE_HOST_KEEPALIVE // Enable this option if your host doesn't like keepalive messages.
|
|
|
|
#if DISABLED(DISABLE_HOST_KEEPALIVE) |
|
|
|
#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
|
|
|
|
#endif |
|
|
|
#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.
|
|
|
|
|
|
|
|
//
|
|
|
|
// M100 Free Memory Watcher
|
|
|
|
|
|
@ -727,13 +727,11 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l |
|
|
|
//
|
|
|
|
// Host Keepalive
|
|
|
|
//
|
|
|
|
// By default Marlin will send a busy status message to the host
|
|
|
|
// When enabled Marlin will send a busy status message to the host
|
|
|
|
// every couple of seconds when it can't accept commands.
|
|
|
|
//
|
|
|
|
//#define DISABLE_HOST_KEEPALIVE // Enable this option if your host doesn't like keepalive messages.
|
|
|
|
#if DISABLED(DISABLE_HOST_KEEPALIVE) |
|
|
|
#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
|
|
|
|
#endif |
|
|
|
#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.
|
|
|
|
|
|
|
|
//
|
|
|
|
// M100 Free Memory Watcher
|
|
|
|
|
|
@ -750,13 +750,11 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l |
|
|
|
//
|
|
|
|
// Host Keepalive
|
|
|
|
//
|
|
|
|
// By default Marlin will send a busy status message to the host
|
|
|
|
// When enabled Marlin will send a busy status message to the host
|
|
|
|
// every couple of seconds when it can't accept commands.
|
|
|
|
//
|
|
|
|
//#define DISABLE_HOST_KEEPALIVE // Enable this option if your host doesn't like keepalive messages.
|
|
|
|
#if DISABLED(DISABLE_HOST_KEEPALIVE) |
|
|
|
#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
|
|
|
|
#endif |
|
|
|
#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.
|
|
|
|
|
|
|
|
//
|
|
|
|
// M100 Free Memory Watcher
|
|
|
|
|
|
@ -733,13 +733,11 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l |
|
|
|
//
|
|
|
|
// Host Keepalive
|
|
|
|
//
|
|
|
|
// By default Marlin will send a busy status message to the host
|
|
|
|
// When enabled Marlin will send a busy status message to the host
|
|
|
|
// every couple of seconds when it can't accept commands.
|
|
|
|
//
|
|
|
|
//#define DISABLE_HOST_KEEPALIVE // Enable this option if your host doesn't like keepalive messages.
|
|
|
|
#if DISABLED(DISABLE_HOST_KEEPALIVE) |
|
|
|
#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
|
|
|
|
#endif |
|
|
|
#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.
|
|
|
|
|
|
|
|
//
|
|
|
|
// M100 Free Memory Watcher
|
|
|
|
|
|
@ -728,13 +728,11 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l |
|
|
|
//
|
|
|
|
// Host Keepalive
|
|
|
|
//
|
|
|
|
// By default Marlin will send a busy status message to the host
|
|
|
|
// When enabled Marlin will send a busy status message to the host
|
|
|
|
// every couple of seconds when it can't accept commands.
|
|
|
|
//
|
|
|
|
//#define DISABLE_HOST_KEEPALIVE // Enable this option if your host doesn't like keepalive messages.
|
|
|
|
#if DISABLED(DISABLE_HOST_KEEPALIVE) |
|
|
|
#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
|
|
|
|
#endif |
|
|
|
#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.
|
|
|
|
|
|
|
|
//
|
|
|
|
// M100 Free Memory Watcher
|
|
|
|
|
|
@ -741,13 +741,11 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l |
|
|
|
//
|
|
|
|
// Host Keepalive
|
|
|
|
//
|
|
|
|
// By default Marlin will send a busy status message to the host
|
|
|
|
// When enabled Marlin will send a busy status message to the host
|
|
|
|
// every couple of seconds when it can't accept commands.
|
|
|
|
//
|
|
|
|
//#define DISABLE_HOST_KEEPALIVE // Enable this option if your host doesn't like keepalive messages.
|
|
|
|
#if DISABLED(DISABLE_HOST_KEEPALIVE) |
|
|
|
#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
|
|
|
|
#endif |
|
|
|
#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.
|
|
|
|
|
|
|
|
//
|
|
|
|
// M100 Free Memory Watcher
|
|
|
|
|
|
@ -754,13 +754,11 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l |
|
|
|
//
|
|
|
|
// Host Keepalive
|
|
|
|
//
|
|
|
|
// By default Marlin will send a busy status message to the host
|
|
|
|
// When enabled Marlin will send a busy status message to the host
|
|
|
|
// every couple of seconds when it can't accept commands.
|
|
|
|
//
|
|
|
|
//#define DISABLE_HOST_KEEPALIVE // Enable this option if your host doesn't like keepalive messages.
|
|
|
|
#if DISABLED(DISABLE_HOST_KEEPALIVE) |
|
|
|
#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
|
|
|
|
#endif |
|
|
|
#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.
|
|
|
|
|
|
|
|
//
|
|
|
|
// M100 Free Memory Watcher
|
|
|
|
|
|
@ -725,13 +725,11 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo |
|
|
|
//
|
|
|
|
// Host Keepalive
|
|
|
|
//
|
|
|
|
// By default Marlin will send a busy status message to the host
|
|
|
|
// When enabled Marlin will send a busy status message to the host
|
|
|
|
// every couple of seconds when it can't accept commands.
|
|
|
|
//
|
|
|
|
//#define DISABLE_HOST_KEEPALIVE // Enable this option if your host doesn't like keepalive messages.
|
|
|
|
#if DISABLED(DISABLE_HOST_KEEPALIVE) |
|
|
|
#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
|
|
|
|
#endif |
|
|
|
#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.
|
|
|
|
|
|
|
|
//
|
|
|
|
// M100 Free Memory Watcher
|
|
|
|
|
|
@ -733,13 +733,11 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l |
|
|
|
//
|
|
|
|
// Host Keepalive
|
|
|
|
//
|
|
|
|
// By default Marlin will send a busy status message to the host
|
|
|
|
// When enabled Marlin will send a busy status message to the host
|
|
|
|
// every couple of seconds when it can't accept commands.
|
|
|
|
//
|
|
|
|
//#define DISABLE_HOST_KEEPALIVE // Enable this option if your host doesn't like keepalive messages.
|
|
|
|
#if DISABLED(DISABLE_HOST_KEEPALIVE) |
|
|
|
#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
|
|
|
|
#endif |
|
|
|
#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.
|
|
|
|
|
|
|
|
//
|
|
|
|
// M100 Free Memory Watcher
|
|
|
|
|
|
@ -862,13 +862,11 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo |
|
|
|
//
|
|
|
|
// Host Keepalive
|
|
|
|
//
|
|
|
|
// By default Marlin will send a busy status message to the host
|
|
|
|
// When enabled Marlin will send a busy status message to the host
|
|
|
|
// every couple of seconds when it can't accept commands.
|
|
|
|
//
|
|
|
|
//#define DISABLE_HOST_KEEPALIVE // Enable this option if your host doesn't like keepalive messages.
|
|
|
|
#if DISABLED(DISABLE_HOST_KEEPALIVE) |
|
|
|
#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
|
|
|
|
#endif |
|
|
|
#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.
|
|
|
|
|
|
|
|
//
|
|
|
|
// M100 Free Memory Watcher
|
|
|
|
|
|
@ -862,13 +862,11 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo |
|
|
|
//
|
|
|
|
// Host Keepalive
|
|
|
|
//
|
|
|
|
// By default Marlin will send a busy status message to the host
|
|
|
|
// When enabled Marlin will send a busy status message to the host
|
|
|
|
// every couple of seconds when it can't accept commands.
|
|
|
|
//
|
|
|
|
//#define DISABLE_HOST_KEEPALIVE // Enable this option if your host doesn't like keepalive messages.
|
|
|
|
#if DISABLED(DISABLE_HOST_KEEPALIVE) |
|
|
|
#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
|
|
|
|
#endif |
|
|
|
#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.
|
|
|
|
|
|
|
|
//
|
|
|
|
// M100 Free Memory Watcher
|
|
|
|
|
|
@ -866,13 +866,11 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l |
|
|
|
//
|
|
|
|
// Host Keepalive
|
|
|
|
//
|
|
|
|
// By default Marlin will send a busy status message to the host
|
|
|
|
// When enabled Marlin will send a busy status message to the host
|
|
|
|
// every couple of seconds when it can't accept commands.
|
|
|
|
//
|
|
|
|
//#define DISABLE_HOST_KEEPALIVE // Enable this option if your host doesn't like keepalive messages.
|
|
|
|
#if DISABLED(DISABLE_HOST_KEEPALIVE) |
|
|
|
#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
|
|
|
|
#endif |
|
|
|
#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.
|
|
|
|
|
|
|
|
//
|
|
|
|
// M100 Free Memory Watcher
|
|
|
|
|
|
@ -859,13 +859,11 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l |
|
|
|
//
|
|
|
|
// Host Keepalive
|
|
|
|
//
|
|
|
|
// By default Marlin will send a busy status message to the host
|
|
|
|
// When enabled Marlin will send a busy status message to the host
|
|
|
|
// every couple of seconds when it can't accept commands.
|
|
|
|
//
|
|
|
|
//#define DISABLE_HOST_KEEPALIVE // Enable this option if your host doesn't like keepalive messages.
|
|
|
|
#if DISABLED(DISABLE_HOST_KEEPALIVE) |
|
|
|
#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
|
|
|
|
#endif |
|
|
|
#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.
|
|
|
|
|
|
|
|
//
|
|
|
|
// M100 Free Memory Watcher
|
|
|
|
|
|
@ -867,13 +867,11 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l |
|
|
|
//
|
|
|
|
// Host Keepalive
|
|
|
|
//
|
|
|
|
// By default Marlin will send a busy status message to the host
|
|
|
|
// When enabled Marlin will send a busy status message to the host
|
|
|
|
// every couple of seconds when it can't accept commands.
|
|
|
|
//
|
|
|
|
//#define DISABLE_HOST_KEEPALIVE // Enable this option if your host doesn't like keepalive messages.
|
|
|
|
#if DISABLED(DISABLE_HOST_KEEPALIVE) |
|
|
|
#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
|
|
|
|
#endif |
|
|
|
#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.
|
|
|
|
|
|
|
|
//
|
|
|
|
// M100 Free Memory Watcher
|
|
|
|
|
|
@ -736,13 +736,11 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l |
|
|
|
//
|
|
|
|
// Host Keepalive
|
|
|
|
//
|
|
|
|
// By default Marlin will send a busy status message to the host
|
|
|
|
// When enabled Marlin will send a busy status message to the host
|
|
|
|
// every couple of seconds when it can't accept commands.
|
|
|
|
//
|
|
|
|
//#define DISABLE_HOST_KEEPALIVE // Enable this option if your host doesn't like keepalive messages.
|
|
|
|
#if DISABLED(DISABLE_HOST_KEEPALIVE) |
|
|
|
#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
|
|
|
|
#endif |
|
|
|
#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.
|
|
|
|
|
|
|
|
//
|
|
|
|
// M100 Free Memory Watcher
|
|
|
|
|
|
@ -727,13 +727,11 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo |
|
|
|
//
|
|
|
|
// Host Keepalive
|
|
|
|
//
|
|
|
|
// By default Marlin will send a busy status message to the host
|
|
|
|
// When enabled Marlin will send a busy status message to the host
|
|
|
|
// every couple of seconds when it can't accept commands.
|
|
|
|
//
|
|
|
|
//#define DISABLE_HOST_KEEPALIVE // Enable this option if your host doesn't like keepalive messages.
|
|
|
|
#if DISABLED(DISABLE_HOST_KEEPALIVE) |
|
|
|
#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
|
|
|
|
#endif |
|
|
|
#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.
|
|
|
|
|
|
|
|
//
|
|
|
|
// M100 Free Memory Watcher
|
|
|
|