From 76438195f093f6041f6be7609a17da232d103ef1 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 16 May 2015 02:47:20 -0700 Subject: [PATCH] NO_TIMEOUTS and ADVANCED_OK off by default --- Marlin/Configuration_adv.h | 9 +++++---- Marlin/configurator/config/Configuration_adv.h | 9 +++++---- Marlin/example_configurations/Felix/Configuration_adv.h | 9 +++++---- .../example_configurations/Hephestos/Configuration_adv.h | 9 +++++---- Marlin/example_configurations/K8200/Configuration_adv.h | 9 +++++---- Marlin/example_configurations/SCARA/Configuration_adv.h | 9 +++++---- Marlin/example_configurations/WITBOX/Configuration_adv.h | 9 +++++---- .../delta/biv2.5/Configuration_adv.h | 9 +++++---- .../delta/generic/Configuration_adv.h | 9 +++++---- .../delta/kossel_mini/Configuration_adv.h | 9 +++++---- .../example_configurations/makibox/Configuration_adv.h | 9 +++++---- .../tvrrug/Round2/Configuration_adv.h | 9 +++++---- 12 files changed, 60 insertions(+), 48 deletions(-) diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index 44f2f96dd0..fd41e9d0dc 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -393,12 +393,13 @@ const unsigned int dropsegments=5; //everything with less than this number of st #define BUFSIZE 4 // Bad Serial-connections can miss a received command by sending an 'ok' -// Therefore some clients go after 30 seconds in a timeout. Some other clients start sending commands while receiving a 'wait'. -// This wait is only send when the buffer is empty. The timeout-length is in milliseconds. 1000 is a good value. -#define NO_TIMEOUTS 1000 +// Therefore some clients abort after 30 seconds in a timeout. +// Some other clients start sending commands while receiving a 'wait'. +// This "wait" is only sent when the buffer is empty. 1 second is a good value here. +//#define NO_TIMEOUTS 1000 // Milliseconds // Some clients will have this feature soon. This could make the NO_TIMEOUTS unnecessary. -#define ADVANCED_OK +//#define ADVANCED_OK // @section fwretract diff --git a/Marlin/configurator/config/Configuration_adv.h b/Marlin/configurator/config/Configuration_adv.h index b03d42a612..1119e51814 100644 --- a/Marlin/configurator/config/Configuration_adv.h +++ b/Marlin/configurator/config/Configuration_adv.h @@ -401,12 +401,13 @@ const unsigned int dropsegments=5; //everything with less than this number of st #define BUFSIZE 4 // Bad Serial-connections can miss a received command by sending an 'ok' -// Therefore some clients go after 30 seconds in a timeout. Some other clients start sending commands while receiving a 'wait'. -// This wait is only send when the buffer is empty. The timeout-length is in milliseconds. 1000 is a good value. -#define NO_TIMEOUTS 1000 +// Therefore some clients abort after 30 seconds in a timeout. +// Some other clients start sending commands while receiving a 'wait'. +// This "wait" is only sent when the buffer is empty. 1 second is a good value here. +//#define NO_TIMEOUTS 1000 // Milliseconds // Some clients will have this feature soon. This could make the NO_TIMEOUTS unnecessary. -#define ADVANCED_OK +//#define ADVANCED_OK // @section fwretract diff --git a/Marlin/example_configurations/Felix/Configuration_adv.h b/Marlin/example_configurations/Felix/Configuration_adv.h index 244ec0652d..678ebbe083 100644 --- a/Marlin/example_configurations/Felix/Configuration_adv.h +++ b/Marlin/example_configurations/Felix/Configuration_adv.h @@ -401,12 +401,13 @@ const unsigned int dropsegments=5; //everything with less than this number of st #define BUFSIZE 4 // Bad Serial-connections can miss a received command by sending an 'ok' -// Therefore some clients go after 30 seconds in a timeout. Some other clients start sending commands while receiving a 'wait'. -// This wait is only send when the buffer is empty. The timeout-length is in milliseconds. 1000 is a good value. -#define NO_TIMEOUTS 1000 +// Therefore some clients abort after 30 seconds in a timeout. +// Some other clients start sending commands while receiving a 'wait'. +// This "wait" is only sent when the buffer is empty. 1 second is a good value here. +//#define NO_TIMEOUTS 1000 // Milliseconds // Some clients will have this feature soon. This could make the NO_TIMEOUTS unnecessary. -#define ADVANCED_OK +//#define ADVANCED_OK // @section fwretract diff --git a/Marlin/example_configurations/Hephestos/Configuration_adv.h b/Marlin/example_configurations/Hephestos/Configuration_adv.h index 6d5102ca46..e1ec3fa6a7 100644 --- a/Marlin/example_configurations/Hephestos/Configuration_adv.h +++ b/Marlin/example_configurations/Hephestos/Configuration_adv.h @@ -401,12 +401,13 @@ const unsigned int dropsegments=5; //everything with less than this number of st #define BUFSIZE 4 // Bad Serial-connections can miss a received command by sending an 'ok' -// Therefore some clients go after 30 seconds in a timeout. Some other clients start sending commands while receiving a 'wait'. -// This wait is only send when the buffer is empty. The timeout-length is in milliseconds. 1000 is a good value. -#define NO_TIMEOUTS 1000 +// Therefore some clients abort after 30 seconds in a timeout. +// Some other clients start sending commands while receiving a 'wait'. +// This "wait" is only sent when the buffer is empty. 1 second is a good value here. +//#define NO_TIMEOUTS 1000 // Milliseconds // Some clients will have this feature soon. This could make the NO_TIMEOUTS unnecessary. -#define ADVANCED_OK +//#define ADVANCED_OK // @section fwretract diff --git a/Marlin/example_configurations/K8200/Configuration_adv.h b/Marlin/example_configurations/K8200/Configuration_adv.h index 244ec0652d..678ebbe083 100644 --- a/Marlin/example_configurations/K8200/Configuration_adv.h +++ b/Marlin/example_configurations/K8200/Configuration_adv.h @@ -401,12 +401,13 @@ const unsigned int dropsegments=5; //everything with less than this number of st #define BUFSIZE 4 // Bad Serial-connections can miss a received command by sending an 'ok' -// Therefore some clients go after 30 seconds in a timeout. Some other clients start sending commands while receiving a 'wait'. -// This wait is only send when the buffer is empty. The timeout-length is in milliseconds. 1000 is a good value. -#define NO_TIMEOUTS 1000 +// Therefore some clients abort after 30 seconds in a timeout. +// Some other clients start sending commands while receiving a 'wait'. +// This "wait" is only sent when the buffer is empty. 1 second is a good value here. +//#define NO_TIMEOUTS 1000 // Milliseconds // Some clients will have this feature soon. This could make the NO_TIMEOUTS unnecessary. -#define ADVANCED_OK +//#define ADVANCED_OK // @section fwretract diff --git a/Marlin/example_configurations/SCARA/Configuration_adv.h b/Marlin/example_configurations/SCARA/Configuration_adv.h index 60a58797cd..af4429b7e6 100644 --- a/Marlin/example_configurations/SCARA/Configuration_adv.h +++ b/Marlin/example_configurations/SCARA/Configuration_adv.h @@ -401,12 +401,13 @@ const unsigned int dropsegments=5; //everything with less than this number of st #define BUFSIZE 4 // Bad Serial-connections can miss a received command by sending an 'ok' -// Therefore some clients go after 30 seconds in a timeout. Some other clients start sending commands while receiving a 'wait'. -// This wait is only send when the buffer is empty. The timeout-length is in milliseconds. 1000 is a good value. -#define NO_TIMEOUTS 1000 +// Therefore some clients abort after 30 seconds in a timeout. +// Some other clients start sending commands while receiving a 'wait'. +// This "wait" is only sent when the buffer is empty. 1 second is a good value here. +//#define NO_TIMEOUTS 1000 // Milliseconds // Some clients will have this feature soon. This could make the NO_TIMEOUTS unnecessary. -#define ADVANCED_OK +//#define ADVANCED_OK // @section fwretract diff --git a/Marlin/example_configurations/WITBOX/Configuration_adv.h b/Marlin/example_configurations/WITBOX/Configuration_adv.h index 6382b6c1ee..da2281eaf8 100644 --- a/Marlin/example_configurations/WITBOX/Configuration_adv.h +++ b/Marlin/example_configurations/WITBOX/Configuration_adv.h @@ -401,12 +401,13 @@ const unsigned int dropsegments=5; //everything with less than this number of st #define BUFSIZE 4 // Bad Serial-connections can miss a received command by sending an 'ok' -// Therefore some clients go after 30 seconds in a timeout. Some other clients start sending commands while receiving a 'wait'. -// This wait is only send when the buffer is empty. The timeout-length is in milliseconds. 1000 is a good value. -#define NO_TIMEOUTS 1000 +// Therefore some clients abort after 30 seconds in a timeout. +// Some other clients start sending commands while receiving a 'wait'. +// This "wait" is only sent when the buffer is empty. 1 second is a good value here. +//#define NO_TIMEOUTS 1000 // Milliseconds // Some clients will have this feature soon. This could make the NO_TIMEOUTS unnecessary. -#define ADVANCED_OK +//#define ADVANCED_OK // @section fwretract diff --git a/Marlin/example_configurations/delta/biv2.5/Configuration_adv.h b/Marlin/example_configurations/delta/biv2.5/Configuration_adv.h index e5e3a11fd6..e193015cc3 100644 --- a/Marlin/example_configurations/delta/biv2.5/Configuration_adv.h +++ b/Marlin/example_configurations/delta/biv2.5/Configuration_adv.h @@ -402,12 +402,13 @@ const unsigned int dropsegments=5; //everything with less than this number of st #define BUFSIZE 4 // Bad Serial-connections can miss a received command by sending an 'ok' -// Therefore some clients go after 30 seconds in a timeout. Some other clients start sending commands while receiving a 'wait'. -// This wait is only send when the buffer is empty. The timeout-length is in milliseconds. 1000 is a good value. -#define NO_TIMEOUTS 1000 +// Therefore some clients abort after 30 seconds in a timeout. +// Some other clients start sending commands while receiving a 'wait'. +// This "wait" is only sent when the buffer is empty. 1 second is a good value here. +//#define NO_TIMEOUTS 1000 // Milliseconds // Some clients will have this feature soon. This could make the NO_TIMEOUTS unnecessary. -#define ADVANCED_OK +//#define ADVANCED_OK // @section fwretract diff --git a/Marlin/example_configurations/delta/generic/Configuration_adv.h b/Marlin/example_configurations/delta/generic/Configuration_adv.h index 4f2b114548..a003186d81 100644 --- a/Marlin/example_configurations/delta/generic/Configuration_adv.h +++ b/Marlin/example_configurations/delta/generic/Configuration_adv.h @@ -402,12 +402,13 @@ const unsigned int dropsegments=5; //everything with less than this number of st #define BUFSIZE 4 // Bad Serial-connections can miss a received command by sending an 'ok' -// Therefore some clients go after 30 seconds in a timeout. Some other clients start sending commands while receiving a 'wait'. -// This wait is only send when the buffer is empty. The timeout-length is in milliseconds. 1000 is a good value. -#define NO_TIMEOUTS 1000 +// Therefore some clients abort after 30 seconds in a timeout. +// Some other clients start sending commands while receiving a 'wait'. +// This "wait" is only sent when the buffer is empty. 1 second is a good value here. +//#define NO_TIMEOUTS 1000 // Milliseconds // Some clients will have this feature soon. This could make the NO_TIMEOUTS unnecessary. -#define ADVANCED_OK +//#define ADVANCED_OK // @section fwretract diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h b/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h index f4cb49222a..c8ac659c32 100644 --- a/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h +++ b/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h @@ -401,12 +401,13 @@ const unsigned int dropsegments=5; //everything with less than this number of st #define BUFSIZE 4 // Bad Serial-connections can miss a received command by sending an 'ok' -// Therefore some clients go after 30 seconds in a timeout. Some other clients start sending commands while receiving a 'wait'. -// This wait is only send when the buffer is empty. The timeout-length is in milliseconds. 1000 is a good value. -#define NO_TIMEOUTS 1000 +// Therefore some clients abort after 30 seconds in a timeout. +// Some other clients start sending commands while receiving a 'wait'. +// This "wait" is only sent when the buffer is empty. 1 second is a good value here. +//#define NO_TIMEOUTS 1000 // Milliseconds // Some clients will have this feature soon. This could make the NO_TIMEOUTS unnecessary. -#define ADVANCED_OK +//#define ADVANCED_OK // @section fwretract diff --git a/Marlin/example_configurations/makibox/Configuration_adv.h b/Marlin/example_configurations/makibox/Configuration_adv.h index 7d33bd9eee..b08e8bc2ff 100644 --- a/Marlin/example_configurations/makibox/Configuration_adv.h +++ b/Marlin/example_configurations/makibox/Configuration_adv.h @@ -401,12 +401,13 @@ const unsigned int dropsegments=5; //everything with less than this number of st #define BUFSIZE 4 // Bad Serial-connections can miss a received command by sending an 'ok' -// Therefore some clients go after 30 seconds in a timeout. Some other clients start sending commands while receiving a 'wait'. -// This wait is only send when the buffer is empty. The timeout-length is in milliseconds. 1000 is a good value. -#define NO_TIMEOUTS 1000 +// Therefore some clients abort after 30 seconds in a timeout. +// Some other clients start sending commands while receiving a 'wait'. +// This "wait" is only sent when the buffer is empty. 1 second is a good value here. +//#define NO_TIMEOUTS 1000 // Milliseconds // Some clients will have this feature soon. This could make the NO_TIMEOUTS unnecessary. -#define ADVANCED_OK +//#define ADVANCED_OK // @section fwretract diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h b/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h index 2747e00982..a86b3279d4 100644 --- a/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h +++ b/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h @@ -401,12 +401,13 @@ const unsigned int dropsegments=5; //everything with less than this number of st #define BUFSIZE 4 // Bad Serial-connections can miss a received command by sending an 'ok' -// Therefore some clients go after 30 seconds in a timeout. Some other clients start sending commands while receiving a 'wait'. -// This wait is only send when the buffer is empty. The timeout-length is in milliseconds. 1000 is a good value. -#define NO_TIMEOUTS 1000 +// Therefore some clients abort after 30 seconds in a timeout. +// Some other clients start sending commands while receiving a 'wait'. +// This "wait" is only sent when the buffer is empty. 1 second is a good value here. +//#define NO_TIMEOUTS 1000 // Milliseconds // Some clients will have this feature soon. This could make the NO_TIMEOUTS unnecessary. -#define ADVANCED_OK +//#define ADVANCED_OK // @section fwretract