Bläddra i källkod

Merge pull request #2089 from thinkyhead/timeout_default

NO_TIMEOUTS and ADVANCED_OK off by default
Scott Lahteine 10 år sedan
förälder
incheckning
ef62463d20

+ 5
- 4
Marlin/Configuration_adv.h Visa fil

@@ -393,12 +393,13 @@ const unsigned int dropsegments=5; //everything with less than this number of st
393 393
 #define BUFSIZE 4
394 394
 
395 395
 // Bad Serial-connections can miss a received command by sending an 'ok'
396
-// Therefore some clients go after 30 seconds in a timeout. Some other clients start sending commands while receiving a 'wait'.
397
-// This wait is only send when the buffer is empty. The timeout-length is in milliseconds. 1000 is a good value.
398
-#define NO_TIMEOUTS 1000
396
+// Therefore some clients abort after 30 seconds in a timeout.
397
+// Some other clients start sending commands while receiving a 'wait'.
398
+// This "wait" is only sent when the buffer is empty. 1 second is a good value here.
399
+//#define NO_TIMEOUTS 1000 // Milliseconds
399 400
 
400 401
 // Some clients will have this feature soon. This could make the NO_TIMEOUTS unnecessary.
401
-#define ADVANCED_OK
402
+//#define ADVANCED_OK
402 403
 
403 404
 // @section fwretract
404 405
 

+ 5
- 4
Marlin/configurator/config/Configuration_adv.h Visa fil

@@ -401,12 +401,13 @@ const unsigned int dropsegments=5; //everything with less than this number of st
401 401
 #define BUFSIZE 4
402 402
 
403 403
 // Bad Serial-connections can miss a received command by sending an 'ok'
404
-// Therefore some clients go after 30 seconds in a timeout. Some other clients start sending commands while receiving a 'wait'.
405
-// This wait is only send when the buffer is empty. The timeout-length is in milliseconds. 1000 is a good value.
406
-#define NO_TIMEOUTS 1000
404
+// Therefore some clients abort after 30 seconds in a timeout.
405
+// Some other clients start sending commands while receiving a 'wait'.
406
+// This "wait" is only sent when the buffer is empty. 1 second is a good value here.
407
+//#define NO_TIMEOUTS 1000 // Milliseconds
407 408
 
408 409
 // Some clients will have this feature soon. This could make the NO_TIMEOUTS unnecessary.
409
-#define ADVANCED_OK
410
+//#define ADVANCED_OK
410 411
 
411 412
 // @section fwretract
412 413
 

+ 5
- 4
Marlin/example_configurations/Felix/Configuration_adv.h Visa fil

@@ -401,12 +401,13 @@ const unsigned int dropsegments=5; //everything with less than this number of st
401 401
 #define BUFSIZE 4
402 402
 
403 403
 // Bad Serial-connections can miss a received command by sending an 'ok'
404
-// Therefore some clients go after 30 seconds in a timeout. Some other clients start sending commands while receiving a 'wait'.
405
-// This wait is only send when the buffer is empty. The timeout-length is in milliseconds. 1000 is a good value.
406
-#define NO_TIMEOUTS 1000
404
+// Therefore some clients abort after 30 seconds in a timeout.
405
+// Some other clients start sending commands while receiving a 'wait'.
406
+// This "wait" is only sent when the buffer is empty. 1 second is a good value here.
407
+//#define NO_TIMEOUTS 1000 // Milliseconds
407 408
 
408 409
 // Some clients will have this feature soon. This could make the NO_TIMEOUTS unnecessary.
409
-#define ADVANCED_OK
410
+//#define ADVANCED_OK
410 411
 
411 412
 // @section fwretract
412 413
 

+ 5
- 4
Marlin/example_configurations/Hephestos/Configuration_adv.h Visa fil

@@ -401,12 +401,13 @@ const unsigned int dropsegments=5; //everything with less than this number of st
401 401
 #define BUFSIZE 4
402 402
 
403 403
 // Bad Serial-connections can miss a received command by sending an 'ok'
404
-// Therefore some clients go after 30 seconds in a timeout. Some other clients start sending commands while receiving a 'wait'.
405
-// This wait is only send when the buffer is empty. The timeout-length is in milliseconds. 1000 is a good value.
406
-#define NO_TIMEOUTS 1000
404
+// Therefore some clients abort after 30 seconds in a timeout.
405
+// Some other clients start sending commands while receiving a 'wait'.
406
+// This "wait" is only sent when the buffer is empty. 1 second is a good value here.
407
+//#define NO_TIMEOUTS 1000 // Milliseconds
407 408
 
408 409
 // Some clients will have this feature soon. This could make the NO_TIMEOUTS unnecessary.
409
-#define ADVANCED_OK
410
+//#define ADVANCED_OK
410 411
 
411 412
 // @section fwretract
412 413
 

+ 5
- 4
Marlin/example_configurations/K8200/Configuration_adv.h Visa fil

@@ -401,12 +401,13 @@ const unsigned int dropsegments=5; //everything with less than this number of st
401 401
 #define BUFSIZE 4
402 402
 
403 403
 // Bad Serial-connections can miss a received command by sending an 'ok'
404
-// Therefore some clients go after 30 seconds in a timeout. Some other clients start sending commands while receiving a 'wait'.
405
-// This wait is only send when the buffer is empty. The timeout-length is in milliseconds. 1000 is a good value.
406
-#define NO_TIMEOUTS 1000
404
+// Therefore some clients abort after 30 seconds in a timeout.
405
+// Some other clients start sending commands while receiving a 'wait'.
406
+// This "wait" is only sent when the buffer is empty. 1 second is a good value here.
407
+//#define NO_TIMEOUTS 1000 // Milliseconds
407 408
 
408 409
 // Some clients will have this feature soon. This could make the NO_TIMEOUTS unnecessary.
409
-#define ADVANCED_OK
410
+//#define ADVANCED_OK
410 411
 
411 412
 // @section fwretract
412 413
 

+ 5
- 4
Marlin/example_configurations/SCARA/Configuration_adv.h Visa fil

@@ -401,12 +401,13 @@ const unsigned int dropsegments=5; //everything with less than this number of st
401 401
 #define BUFSIZE 4
402 402
 
403 403
 // Bad Serial-connections can miss a received command by sending an 'ok'
404
-// Therefore some clients go after 30 seconds in a timeout. Some other clients start sending commands while receiving a 'wait'.
405
-// This wait is only send when the buffer is empty. The timeout-length is in milliseconds. 1000 is a good value.
406
-#define NO_TIMEOUTS 1000
404
+// Therefore some clients abort after 30 seconds in a timeout.
405
+// Some other clients start sending commands while receiving a 'wait'.
406
+// This "wait" is only sent when the buffer is empty. 1 second is a good value here.
407
+//#define NO_TIMEOUTS 1000 // Milliseconds
407 408
 
408 409
 // Some clients will have this feature soon. This could make the NO_TIMEOUTS unnecessary.
409
-#define ADVANCED_OK
410
+//#define ADVANCED_OK
410 411
 
411 412
 // @section fwretract
412 413
 

+ 5
- 4
Marlin/example_configurations/WITBOX/Configuration_adv.h Visa fil

@@ -401,12 +401,13 @@ const unsigned int dropsegments=5; //everything with less than this number of st
401 401
 #define BUFSIZE 4
402 402
 
403 403
 // Bad Serial-connections can miss a received command by sending an 'ok'
404
-// Therefore some clients go after 30 seconds in a timeout. Some other clients start sending commands while receiving a 'wait'.
405
-// This wait is only send when the buffer is empty. The timeout-length is in milliseconds. 1000 is a good value.
406
-#define NO_TIMEOUTS 1000
404
+// Therefore some clients abort after 30 seconds in a timeout.
405
+// Some other clients start sending commands while receiving a 'wait'.
406
+// This "wait" is only sent when the buffer is empty. 1 second is a good value here.
407
+//#define NO_TIMEOUTS 1000 // Milliseconds
407 408
 
408 409
 // Some clients will have this feature soon. This could make the NO_TIMEOUTS unnecessary.
409
-#define ADVANCED_OK
410
+//#define ADVANCED_OK
410 411
 
411 412
 // @section fwretract
412 413
 

+ 5
- 4
Marlin/example_configurations/delta/biv2.5/Configuration_adv.h Visa fil

@@ -402,12 +402,13 @@ const unsigned int dropsegments=5; //everything with less than this number of st
402 402
 #define BUFSIZE 4
403 403
 
404 404
 // Bad Serial-connections can miss a received command by sending an 'ok'
405
-// Therefore some clients go after 30 seconds in a timeout. Some other clients start sending commands while receiving a 'wait'.
406
-// This wait is only send when the buffer is empty. The timeout-length is in milliseconds. 1000 is a good value.
407
-#define NO_TIMEOUTS 1000
405
+// Therefore some clients abort after 30 seconds in a timeout.
406
+// Some other clients start sending commands while receiving a 'wait'.
407
+// This "wait" is only sent when the buffer is empty. 1 second is a good value here.
408
+//#define NO_TIMEOUTS 1000 // Milliseconds
408 409
 
409 410
 // Some clients will have this feature soon. This could make the NO_TIMEOUTS unnecessary.
410
-#define ADVANCED_OK
411
+//#define ADVANCED_OK
411 412
 
412 413
 // @section fwretract
413 414
 

+ 5
- 4
Marlin/example_configurations/delta/generic/Configuration_adv.h Visa fil

@@ -402,12 +402,13 @@ const unsigned int dropsegments=5; //everything with less than this number of st
402 402
 #define BUFSIZE 4
403 403
 
404 404
 // Bad Serial-connections can miss a received command by sending an 'ok'
405
-// Therefore some clients go after 30 seconds in a timeout. Some other clients start sending commands while receiving a 'wait'.
406
-// This wait is only send when the buffer is empty. The timeout-length is in milliseconds. 1000 is a good value.
407
-#define NO_TIMEOUTS 1000
405
+// Therefore some clients abort after 30 seconds in a timeout.
406
+// Some other clients start sending commands while receiving a 'wait'.
407
+// This "wait" is only sent when the buffer is empty. 1 second is a good value here.
408
+//#define NO_TIMEOUTS 1000 // Milliseconds
408 409
 
409 410
 // Some clients will have this feature soon. This could make the NO_TIMEOUTS unnecessary.
410
-#define ADVANCED_OK
411
+//#define ADVANCED_OK
411 412
 
412 413
 // @section fwretract
413 414
 

+ 5
- 4
Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h Visa fil

@@ -401,12 +401,13 @@ const unsigned int dropsegments=5; //everything with less than this number of st
401 401
 #define BUFSIZE 4
402 402
 
403 403
 // Bad Serial-connections can miss a received command by sending an 'ok'
404
-// Therefore some clients go after 30 seconds in a timeout. Some other clients start sending commands while receiving a 'wait'.
405
-// This wait is only send when the buffer is empty. The timeout-length is in milliseconds. 1000 is a good value.
406
-#define NO_TIMEOUTS 1000
404
+// Therefore some clients abort after 30 seconds in a timeout.
405
+// Some other clients start sending commands while receiving a 'wait'.
406
+// This "wait" is only sent when the buffer is empty. 1 second is a good value here.
407
+//#define NO_TIMEOUTS 1000 // Milliseconds
407 408
 
408 409
 // Some clients will have this feature soon. This could make the NO_TIMEOUTS unnecessary.
409
-#define ADVANCED_OK
410
+//#define ADVANCED_OK
410 411
 
411 412
 // @section fwretract
412 413
 

+ 5
- 4
Marlin/example_configurations/makibox/Configuration_adv.h Visa fil

@@ -401,12 +401,13 @@ const unsigned int dropsegments=5; //everything with less than this number of st
401 401
 #define BUFSIZE 4
402 402
 
403 403
 // Bad Serial-connections can miss a received command by sending an 'ok'
404
-// Therefore some clients go after 30 seconds in a timeout. Some other clients start sending commands while receiving a 'wait'.
405
-// This wait is only send when the buffer is empty. The timeout-length is in milliseconds. 1000 is a good value.
406
-#define NO_TIMEOUTS 1000
404
+// Therefore some clients abort after 30 seconds in a timeout.
405
+// Some other clients start sending commands while receiving a 'wait'.
406
+// This "wait" is only sent when the buffer is empty. 1 second is a good value here.
407
+//#define NO_TIMEOUTS 1000 // Milliseconds
407 408
 
408 409
 // Some clients will have this feature soon. This could make the NO_TIMEOUTS unnecessary.
409
-#define ADVANCED_OK
410
+//#define ADVANCED_OK
410 411
 
411 412
 // @section fwretract
412 413
 

+ 5
- 4
Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h Visa fil

@@ -401,12 +401,13 @@ const unsigned int dropsegments=5; //everything with less than this number of st
401 401
 #define BUFSIZE 4
402 402
 
403 403
 // Bad Serial-connections can miss a received command by sending an 'ok'
404
-// Therefore some clients go after 30 seconds in a timeout. Some other clients start sending commands while receiving a 'wait'.
405
-// This wait is only send when the buffer is empty. The timeout-length is in milliseconds. 1000 is a good value.
406
-#define NO_TIMEOUTS 1000
404
+// Therefore some clients abort after 30 seconds in a timeout.
405
+// Some other clients start sending commands while receiving a 'wait'.
406
+// This "wait" is only sent when the buffer is empty. 1 second is a good value here.
407
+//#define NO_TIMEOUTS 1000 // Milliseconds
407 408
 
408 409
 // Some clients will have this feature soon. This could make the NO_TIMEOUTS unnecessary.
409
-#define ADVANCED_OK
410
+//#define ADVANCED_OK
410 411
 
411 412
 // @section fwretract
412 413
 

Laddar…
Avbryt
Spara