浏览代码

Merge pull request #3720 from jbrazio/feature/host-keepalive

Removes the DISABLE from HOST_KEEPALIVE
Scott Lahteine 9 年前
父节点
当前提交
f13c4a9ec4

+ 3
- 3
Marlin/Conditionals.h 查看文件

395
   #endif
395
   #endif
396
 
396
 
397
   /**
397
   /**
398
-   * Avoid double-negatives for enabling features
398
+   * Host keep alive
399
    */
399
    */
400
-  #if DISABLED(DISABLE_HOST_KEEPALIVE)
401
-    #define HOST_KEEPALIVE_FEATURE
400
+  #ifndef DEFAULT_KEEPALIVE_INTERVAL
401
+    #define DEFAULT_KEEPALIVE_INTERVAL 2
402
   #endif
402
   #endif
403
 
403
 
404
   /**
404
   /**

+ 3
- 5
Marlin/Configuration.h 查看文件

733
 //
733
 //
734
 // Host Keepalive
734
 // Host Keepalive
735
 //
735
 //
736
-// By default Marlin will send a busy status message to the host
736
+// When enabled Marlin will send a busy status message to the host
737
 // every couple of seconds when it can't accept commands.
737
 // every couple of seconds when it can't accept commands.
738
 //
738
 //
739
-//#define DISABLE_HOST_KEEPALIVE // Enable this option if your host doesn't like keepalive messages.
740
-#if DISABLED(DISABLE_HOST_KEEPALIVE)
741
-  #define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
742
-#endif
739
+#define HOST_KEEPALIVE_FEATURE        // Disable this if your host doesn't like keepalive messages
740
+#define DEFAULT_KEEPALIVE_INTERVAL 2  // Number of seconds between "busy" messages. Set with M113.
743
 
741
 
744
 //
742
 //
745
 // M100 Free Memory Watcher
743
 // M100 Free Memory Watcher

+ 3
- 5
Marlin/example_configurations/Felix/Configuration.h 查看文件

716
 //
716
 //
717
 // Host Keepalive
717
 // Host Keepalive
718
 //
718
 //
719
-// By default Marlin will send a busy status message to the host
719
+// When enabled Marlin will send a busy status message to the host
720
 // every couple of seconds when it can't accept commands.
720
 // every couple of seconds when it can't accept commands.
721
 //
721
 //
722
-//#define DISABLE_HOST_KEEPALIVE // Enable this option if your host doesn't like keepalive messages.
723
-#if DISABLED(DISABLE_HOST_KEEPALIVE)
724
-  #define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
725
-#endif
722
+#define HOST_KEEPALIVE_FEATURE       // Disable this if your host doesn't like keepalive messages
723
+#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
726
 
724
 
727
 //
725
 //
728
 // M100 Free Memory Watcher
726
 // M100 Free Memory Watcher

+ 3
- 5
Marlin/example_configurations/Hephestos/Configuration.h 查看文件

725
 //
725
 //
726
 // Host Keepalive
726
 // Host Keepalive
727
 //
727
 //
728
-// By default Marlin will send a busy status message to the host
728
+// When enabled Marlin will send a busy status message to the host
729
 // every couple of seconds when it can't accept commands.
729
 // every couple of seconds when it can't accept commands.
730
 //
730
 //
731
-//#define DISABLE_HOST_KEEPALIVE // Enable this option if your host doesn't like keepalive messages.
732
-#if DISABLED(DISABLE_HOST_KEEPALIVE)
733
-  #define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
734
-#endif
731
+#define HOST_KEEPALIVE_FEATURE       // Disable this if your host doesn't like keepalive messages
732
+#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
735
 
733
 
736
 //
734
 //
737
 // M100 Free Memory Watcher
735
 // M100 Free Memory Watcher

+ 3
- 5
Marlin/example_configurations/Hephestos_2/Configuration.h 查看文件

727
 //
727
 //
728
 // Host Keepalive
728
 // Host Keepalive
729
 //
729
 //
730
-// By default Marlin will send a busy status message to the host
730
+// When enabled Marlin will send a busy status message to the host
731
 // every couple of seconds when it can't accept commands.
731
 // every couple of seconds when it can't accept commands.
732
 //
732
 //
733
-//#define DISABLE_HOST_KEEPALIVE // Enable this option if your host doesn't like keepalive messages.
734
-#if DISABLED(DISABLE_HOST_KEEPALIVE)
735
-  #define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
736
-#endif
733
+#define HOST_KEEPALIVE_FEATURE       // Disable this if your host doesn't like keepalive messages
734
+#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
737
 
735
 
738
 //
736
 //
739
 // M100 Free Memory Watcher
737
 // M100 Free Memory Watcher

+ 3
- 5
Marlin/example_configurations/K8200/Configuration.h 查看文件

750
 //
750
 //
751
 // Host Keepalive
751
 // Host Keepalive
752
 //
752
 //
753
-// By default Marlin will send a busy status message to the host
753
+// When enabled Marlin will send a busy status message to the host
754
 // every couple of seconds when it can't accept commands.
754
 // every couple of seconds when it can't accept commands.
755
 //
755
 //
756
-//#define DISABLE_HOST_KEEPALIVE // Enable this option if your host doesn't like keepalive messages.
757
-#if DISABLED(DISABLE_HOST_KEEPALIVE)
758
-  #define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
759
-#endif
756
+#define HOST_KEEPALIVE_FEATURE       // Disable this if your host doesn't like keepalive messages
757
+#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
760
 
758
 
761
 //
759
 //
762
 // M100 Free Memory Watcher
760
 // M100 Free Memory Watcher

+ 3
- 5
Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h 查看文件

733
 //
733
 //
734
 // Host Keepalive
734
 // Host Keepalive
735
 //
735
 //
736
-// By default Marlin will send a busy status message to the host
736
+// When enabled Marlin will send a busy status message to the host
737
 // every couple of seconds when it can't accept commands.
737
 // every couple of seconds when it can't accept commands.
738
 //
738
 //
739
-//#define DISABLE_HOST_KEEPALIVE // Enable this option if your host doesn't like keepalive messages.
740
-#if DISABLED(DISABLE_HOST_KEEPALIVE)
741
-  #define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
742
-#endif
739
+#define HOST_KEEPALIVE_FEATURE       // Disable this if your host doesn't like keepalive messages
740
+#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
743
 
741
 
744
 //
742
 //
745
 // M100 Free Memory Watcher
743
 // M100 Free Memory Watcher

+ 3
- 5
Marlin/example_configurations/RigidBot/Configuration.h 查看文件

728
 //
728
 //
729
 // Host Keepalive
729
 // Host Keepalive
730
 //
730
 //
731
-// By default Marlin will send a busy status message to the host
731
+// When enabled Marlin will send a busy status message to the host
732
 // every couple of seconds when it can't accept commands.
732
 // every couple of seconds when it can't accept commands.
733
 //
733
 //
734
-//#define DISABLE_HOST_KEEPALIVE // Enable this option if your host doesn't like keepalive messages.
735
-#if DISABLED(DISABLE_HOST_KEEPALIVE)
736
-  #define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
737
-#endif
734
+#define HOST_KEEPALIVE_FEATURE       // Disable this if your host doesn't like keepalive messages
735
+#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
738
 
736
 
739
 //
737
 //
740
 // M100 Free Memory Watcher
738
 // M100 Free Memory Watcher

+ 3
- 5
Marlin/example_configurations/SCARA/Configuration.h 查看文件

741
 //
741
 //
742
 // Host Keepalive
742
 // Host Keepalive
743
 //
743
 //
744
-// By default Marlin will send a busy status message to the host
744
+// When enabled Marlin will send a busy status message to the host
745
 // every couple of seconds when it can't accept commands.
745
 // every couple of seconds when it can't accept commands.
746
 //
746
 //
747
-//#define DISABLE_HOST_KEEPALIVE // Enable this option if your host doesn't like keepalive messages.
748
-#if DISABLED(DISABLE_HOST_KEEPALIVE)
749
-  #define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
750
-#endif
747
+#define HOST_KEEPALIVE_FEATURE       // Disable this if your host doesn't like keepalive messages
748
+#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
751
 
749
 
752
 //
750
 //
753
 // M100 Free Memory Watcher
751
 // M100 Free Memory Watcher

+ 3
- 5
Marlin/example_configurations/TAZ4/Configuration.h 查看文件

754
 //
754
 //
755
 // Host Keepalive
755
 // Host Keepalive
756
 //
756
 //
757
-// By default Marlin will send a busy status message to the host
757
+// When enabled Marlin will send a busy status message to the host
758
 // every couple of seconds when it can't accept commands.
758
 // every couple of seconds when it can't accept commands.
759
 //
759
 //
760
-//#define DISABLE_HOST_KEEPALIVE // Enable this option if your host doesn't like keepalive messages.
761
-#if DISABLED(DISABLE_HOST_KEEPALIVE)
762
-  #define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
763
-#endif
760
+#define HOST_KEEPALIVE_FEATURE       // Disable this if your host doesn't like keepalive messages
761
+#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
764
 
762
 
765
 //
763
 //
766
 // M100 Free Memory Watcher
764
 // M100 Free Memory Watcher

+ 3
- 5
Marlin/example_configurations/WITBOX/Configuration.h 查看文件

725
 //
725
 //
726
 // Host Keepalive
726
 // Host Keepalive
727
 //
727
 //
728
-// By default Marlin will send a busy status message to the host
728
+// When enabled Marlin will send a busy status message to the host
729
 // every couple of seconds when it can't accept commands.
729
 // every couple of seconds when it can't accept commands.
730
 //
730
 //
731
-//#define DISABLE_HOST_KEEPALIVE // Enable this option if your host doesn't like keepalive messages.
732
-#if DISABLED(DISABLE_HOST_KEEPALIVE)
733
-  #define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
734
-#endif
731
+#define HOST_KEEPALIVE_FEATURE       // Disable this if your host doesn't like keepalive messages
732
+#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
735
 
733
 
736
 //
734
 //
737
 // M100 Free Memory Watcher
735
 // M100 Free Memory Watcher

+ 3
- 5
Marlin/example_configurations/adafruit/ST7565/Configuration.h 查看文件

733
 //
733
 //
734
 // Host Keepalive
734
 // Host Keepalive
735
 //
735
 //
736
-// By default Marlin will send a busy status message to the host
736
+// When enabled Marlin will send a busy status message to the host
737
 // every couple of seconds when it can't accept commands.
737
 // every couple of seconds when it can't accept commands.
738
 //
738
 //
739
-//#define DISABLE_HOST_KEEPALIVE // Enable this option if your host doesn't like keepalive messages.
740
-#if DISABLED(DISABLE_HOST_KEEPALIVE)
741
-  #define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
742
-#endif
739
+#define HOST_KEEPALIVE_FEATURE       // Disable this if your host doesn't like keepalive messages
740
+#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
743
 
741
 
744
 //
742
 //
745
 // M100 Free Memory Watcher
743
 // M100 Free Memory Watcher

+ 3
- 5
Marlin/example_configurations/delta/biv2.5/Configuration.h 查看文件

862
 //
862
 //
863
 // Host Keepalive
863
 // Host Keepalive
864
 //
864
 //
865
-// By default Marlin will send a busy status message to the host
865
+// When enabled Marlin will send a busy status message to the host
866
 // every couple of seconds when it can't accept commands.
866
 // every couple of seconds when it can't accept commands.
867
 //
867
 //
868
-//#define DISABLE_HOST_KEEPALIVE // Enable this option if your host doesn't like keepalive messages.
869
-#if DISABLED(DISABLE_HOST_KEEPALIVE)
870
-  #define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
871
-#endif
868
+#define HOST_KEEPALIVE_FEATURE       // Disable this if your host doesn't like keepalive messages
869
+#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
872
 
870
 
873
 //
871
 //
874
 // M100 Free Memory Watcher
872
 // M100 Free Memory Watcher

+ 3
- 5
Marlin/example_configurations/delta/generic/Configuration.h 查看文件

862
 //
862
 //
863
 // Host Keepalive
863
 // Host Keepalive
864
 //
864
 //
865
-// By default Marlin will send a busy status message to the host
865
+// When enabled Marlin will send a busy status message to the host
866
 // every couple of seconds when it can't accept commands.
866
 // every couple of seconds when it can't accept commands.
867
 //
867
 //
868
-//#define DISABLE_HOST_KEEPALIVE // Enable this option if your host doesn't like keepalive messages.
869
-#if DISABLED(DISABLE_HOST_KEEPALIVE)
870
-  #define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
871
-#endif
868
+#define HOST_KEEPALIVE_FEATURE       // Disable this if your host doesn't like keepalive messages
869
+#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
872
 
870
 
873
 //
871
 //
874
 // M100 Free Memory Watcher
872
 // M100 Free Memory Watcher

+ 3
- 5
Marlin/example_configurations/delta/kossel_mini/Configuration.h 查看文件

866
 //
866
 //
867
 // Host Keepalive
867
 // Host Keepalive
868
 //
868
 //
869
-// By default Marlin will send a busy status message to the host
869
+// When enabled Marlin will send a busy status message to the host
870
 // every couple of seconds when it can't accept commands.
870
 // every couple of seconds when it can't accept commands.
871
 //
871
 //
872
-//#define DISABLE_HOST_KEEPALIVE // Enable this option if your host doesn't like keepalive messages.
873
-#if DISABLED(DISABLE_HOST_KEEPALIVE)
874
-  #define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
875
-#endif
872
+#define HOST_KEEPALIVE_FEATURE       // Disable this if your host doesn't like keepalive messages
873
+#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
876
 
874
 
877
 //
875
 //
878
 // M100 Free Memory Watcher
876
 // M100 Free Memory Watcher

+ 3
- 5
Marlin/example_configurations/delta/kossel_pro/Configuration.h 查看文件

859
 //
859
 //
860
 // Host Keepalive
860
 // Host Keepalive
861
 //
861
 //
862
-// By default Marlin will send a busy status message to the host
862
+// When enabled Marlin will send a busy status message to the host
863
 // every couple of seconds when it can't accept commands.
863
 // every couple of seconds when it can't accept commands.
864
 //
864
 //
865
-//#define DISABLE_HOST_KEEPALIVE // Enable this option if your host doesn't like keepalive messages.
866
-#if DISABLED(DISABLE_HOST_KEEPALIVE)
867
-  #define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
868
-#endif
865
+#define HOST_KEEPALIVE_FEATURE       // Disable this if your host doesn't like keepalive messages
866
+#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
869
 
867
 
870
 //
868
 //
871
 // M100 Free Memory Watcher
869
 // M100 Free Memory Watcher

+ 3
- 5
Marlin/example_configurations/delta/kossel_xl/Configuration.h 查看文件

867
 //
867
 //
868
 // Host Keepalive
868
 // Host Keepalive
869
 //
869
 //
870
-// By default Marlin will send a busy status message to the host
870
+// When enabled Marlin will send a busy status message to the host
871
 // every couple of seconds when it can't accept commands.
871
 // every couple of seconds when it can't accept commands.
872
 //
872
 //
873
-//#define DISABLE_HOST_KEEPALIVE // Enable this option if your host doesn't like keepalive messages.
874
-#if DISABLED(DISABLE_HOST_KEEPALIVE)
875
-  #define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
876
-#endif
873
+#define HOST_KEEPALIVE_FEATURE       // Disable this if your host doesn't like keepalive messages
874
+#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
877
 
875
 
878
 //
876
 //
879
 // M100 Free Memory Watcher
877
 // M100 Free Memory Watcher

+ 3
- 5
Marlin/example_configurations/makibox/Configuration.h 查看文件

736
 //
736
 //
737
 // Host Keepalive
737
 // Host Keepalive
738
 //
738
 //
739
-// By default Marlin will send a busy status message to the host
739
+// When enabled Marlin will send a busy status message to the host
740
 // every couple of seconds when it can't accept commands.
740
 // every couple of seconds when it can't accept commands.
741
 //
741
 //
742
-//#define DISABLE_HOST_KEEPALIVE // Enable this option if your host doesn't like keepalive messages.
743
-#if DISABLED(DISABLE_HOST_KEEPALIVE)
744
-  #define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
745
-#endif
742
+#define HOST_KEEPALIVE_FEATURE       // Disable this if your host doesn't like keepalive messages
743
+#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
746
 
744
 
747
 //
745
 //
748
 // M100 Free Memory Watcher
746
 // M100 Free Memory Watcher

+ 3
- 5
Marlin/example_configurations/tvrrug/Round2/Configuration.h 查看文件

727
 //
727
 //
728
 // Host Keepalive
728
 // Host Keepalive
729
 //
729
 //
730
-// By default Marlin will send a busy status message to the host
730
+// When enabled Marlin will send a busy status message to the host
731
 // every couple of seconds when it can't accept commands.
731
 // every couple of seconds when it can't accept commands.
732
 //
732
 //
733
-//#define DISABLE_HOST_KEEPALIVE // Enable this option if your host doesn't like keepalive messages.
734
-#if DISABLED(DISABLE_HOST_KEEPALIVE)
735
-  #define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
736
-#endif
733
+#define HOST_KEEPALIVE_FEATURE       // Disable this if your host doesn't like keepalive messages
734
+#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
737
 
735
 
738
 //
736
 //
739
 // M100 Free Memory Watcher
737
 // M100 Free Memory Watcher

正在加载...
取消
保存