Browse Source

Fix the PR #4899 (ABL: Enable by type. Bilinear for all.) etc.

About Configuration.h:
・Fix the PR #4899 (ABL: Enable by type. Bilinear for all.)
Remove Duplicated contents

・Fix the PR #4305 (Custom boot screen feature improvement)
Revert from "during boot" to "during bootup" in all the example
Configuration.h

・Fix the PR #4207 (Clean up, simplify and generalize the Allen-key-probe
code.)
Resolve and relocate the duplicated definitions in Z_PROBE_ALLEN_KEY
section

・Follow-up the PR #4805 (Additional documentation of Configuration.h)
Add forgotten changes to all the example Configuration.h

Adjust spacing

About Configuration_adv.h:
Add missing description of SLOWDOWN for DELTA

Adjust spacing
esenapaj 8 years ago
parent
commit
92c03a44a9
40 changed files with 714 additions and 446 deletions
  1. 0
    67
      Marlin/Configuration.h
  2. 1
    1
      Marlin/Configuration_adv.h
  3. 31
    15
      Marlin/example_configurations/Cartesio/Configuration.h
  4. 1
    1
      Marlin/example_configurations/Cartesio/Configuration_adv.h
  5. 33
    17
      Marlin/example_configurations/Felix/Configuration.h
  6. 1
    1
      Marlin/example_configurations/Felix/Configuration_adv.h
  7. 31
    15
      Marlin/example_configurations/Felix/DUAL/Configuration.h
  8. 33
    17
      Marlin/example_configurations/Hephestos/Configuration.h
  9. 1
    1
      Marlin/example_configurations/Hephestos/Configuration_adv.h
  10. 33
    17
      Marlin/example_configurations/Hephestos_2/Configuration.h
  11. 1
    1
      Marlin/example_configurations/Hephestos_2/Configuration_adv.h
  12. 33
    17
      Marlin/example_configurations/K8200/Configuration.h
  13. 1
    1
      Marlin/example_configurations/K8200/Configuration_adv.h
  14. 31
    15
      Marlin/example_configurations/K8400/Configuration.h
  15. 1
    1
      Marlin/example_configurations/K8400/Configuration_adv.h
  16. 31
    15
      Marlin/example_configurations/K8400/Dual-head/Configuration.h
  17. 33
    17
      Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
  18. 33
    17
      Marlin/example_configurations/RigidBot/Configuration.h
  19. 1
    1
      Marlin/example_configurations/RigidBot/Configuration_adv.h
  20. 33
    17
      Marlin/example_configurations/SCARA/Configuration.h
  21. 1
    1
      Marlin/example_configurations/SCARA/Configuration_adv.h
  22. 33
    17
      Marlin/example_configurations/TAZ4/Configuration.h
  23. 1
    1
      Marlin/example_configurations/TAZ4/Configuration_adv.h
  24. 33
    17
      Marlin/example_configurations/WITBOX/Configuration.h
  25. 1
    1
      Marlin/example_configurations/WITBOX/Configuration_adv.h
  26. 33
    17
      Marlin/example_configurations/adafruit/ST7565/Configuration.h
  27. 38
    23
      Marlin/example_configurations/delta/biv2.5/Configuration.h
  28. 1
    1
      Marlin/example_configurations/delta/biv2.5/Configuration_adv.h
  29. 33
    18
      Marlin/example_configurations/delta/generic/Configuration.h
  30. 1
    1
      Marlin/example_configurations/delta/generic/Configuration_adv.h
  31. 33
    18
      Marlin/example_configurations/delta/kossel_mini/Configuration.h
  32. 2
    1
      Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h
  33. 37
    21
      Marlin/example_configurations/delta/kossel_pro/Configuration.h
  34. 2
    1
      Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h
  35. 33
    17
      Marlin/example_configurations/delta/kossel_xl/Configuration.h
  36. 1
    1
      Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h
  37. 33
    17
      Marlin/example_configurations/makibox/Configuration.h
  38. 1
    1
      Marlin/example_configurations/makibox/Configuration_adv.h
  39. 33
    17
      Marlin/example_configurations/tvrrug/Round2/Configuration.h
  40. 1
    1
      Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h

+ 0
- 67
Marlin/Configuration.h View File

@@ -809,73 +809,6 @@
809 809
 //#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10"
810 810
 
811 811
 
812
-/**
813
- * Select one form of Auto Bed Leveling below.
814
- *
815
- *  If you're also using the Probe for Z Homing, it's
816
- *  highly recommended to enable Z_SAFE_HOMING also!
817
- *
818
- * - 3POINT
819
- *   Probe 3 arbitrary points on the bed (that aren't collinear)
820
- *   You specify the XY coordinates of all 3 points.
821
- *   The result is a single tilted plane. Best for a flat bed.
822
- *
823
- * - LINEAR
824
- *   Probe several points in a grid.
825
- *   You specify the rectangle and the density of sample points.
826
- *   The result is a single tilted plane. Best for a flat bed.
827
- *
828
- * - BILINEAR
829
- *   Probe several points in a grid.
830
- *   You specify the rectangle and the density of sample points.
831
- *   The result is a mesh, best for large or uneven beds.
832
- */
833
-//#define AUTO_BED_LEVELING_3POINT
834
-//#define AUTO_BED_LEVELING_LINEAR
835
-//#define AUTO_BED_LEVELING_BILINEAR
836
-
837
-/**
838
- * Enable detailed logging of G28, G29, M48, etc.
839
- * Turn on with the command 'M111 S32'.
840
- * NOTE: Requires a lot of PROGMEM!
841
- */
842
-//#define DEBUG_LEVELING_FEATURE
843
-
844
-#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
845
-
846
-  // Set the number of grid points per dimension.
847
-  #define ABL_GRID_POINTS_X 3
848
-  #define ABL_GRID_POINTS_Y ABL_GRID_POINTS_X
849
-
850
-  // Set the boundaries for probing (where the probe can reach).
851
-  #define LEFT_PROBE_BED_POSITION 15
852
-  #define RIGHT_PROBE_BED_POSITION 170
853
-  #define FRONT_PROBE_BED_POSITION 20
854
-  #define BACK_PROBE_BED_POSITION 170
855
-
856
-  // The Z probe minimum outer margin (to validate G29 parameters).
857
-  #define MIN_PROBE_EDGE 10
858
-
859
-#elif ENABLED(AUTO_BED_LEVELING_3POINT)
860
-
861
-  // 3 arbitrary points to probe.
862
-  // A simple cross-product is used to estimate the plane of the bed.
863
-  #define ABL_PROBE_PT_1_X 15
864
-  #define ABL_PROBE_PT_1_Y 180
865
-  #define ABL_PROBE_PT_2_X 15
866
-  #define ABL_PROBE_PT_2_Y 20
867
-  #define ABL_PROBE_PT_3_X 170
868
-  #define ABL_PROBE_PT_3_Y 20
869
-
870
-#endif
871
-
872
-/**
873
- * Commands to execute at the end of G29 probing.
874
- * Useful to retract or move the Z probe out of the way.
875
- */
876
-//#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10"
877
-
878
-
879 812
 // @section homing
880 813
 
881 814
 // The center of the bed is at (X=0, Y=0)

+ 1
- 1
Marlin/Configuration_adv.h View File

@@ -553,7 +553,7 @@
553 553
 // The number of linear motions that can be in the plan at any give time.
554 554
 // THE BLOCK_BUFFER_SIZE NEEDS TO BE A POWER OF 2, i.g. 8,16,32 because shifts and ors are used to do the ring-buffering.
555 555
 #if ENABLED(SDSUPPORT)
556
-  #define BLOCK_BUFFER_SIZE 16   // SD,LCD,Buttons take more memory, block buffer needs to be smaller
556
+  #define BLOCK_BUFFER_SIZE 16 // SD,LCD,Buttons take more memory, block buffer needs to be smaller
557 557
 #else
558 558
   #define BLOCK_BUFFER_SIZE 16 // maximize block buffer
559 559
 #endif

+ 31
- 15
Marlin/example_configurations/Cartesio/Configuration.h View File

@@ -88,8 +88,8 @@
88 88
 // build by the user have been successfully uploaded into firmware.
89 89
 #define STRING_CONFIG_H_AUTHOR "(MaukCC, CartesioE)" // Who made the changes.
90 90
 #define SHOW_BOOTSCREEN
91
-#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during boot in line 1
92
-#define STRING_SPLASH_LINE2 WEBSITE_URL         // will be shown during boot in line 2
91
+#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during bootup in line 1
92
+#define STRING_SPLASH_LINE2 WEBSITE_URL         // will be shown during bootup in line 2
93 93
 
94 94
 //
95 95
 // *** VENDORS PLEASE READ *****************************************************
@@ -105,15 +105,24 @@
105 105
 #define SHOW_CUSTOM_BOOTSCREEN
106 106
 // @section machine
107 107
 
108
-// SERIAL_PORT selects which serial port should be used for communication with the host.
109
-// This allows the connection of wireless adapters (for instance) to non-default port pins.
110
-// Serial port 0 is still used by the Arduino bootloader regardless of this setting.
111
-// :[0,1,2,3,4,5,6,7]
108
+/**
109
+ * Select which serial port on the board will be used for communication with the host.
110
+ * This allows the connection of wireless adapters (for instance) to non-default port pins.
111
+ * Serial port 0 is always used by the Arduino bootloader regardless of this setting.
112
+ *
113
+ * :[0,1,2,3,4,5,6,7]
114
+ */
112 115
 #define SERIAL_PORT 0
113 116
 
114
-// This determines the communication speed of the printer
115
-// :[2400,9600,19200,38400,57600,115200,250000]
116 117
 #define BAUDRATE 115200
118
+/**
119
+ * This setting determines the communication speed of the printer.
120
+ *
121
+ * 250000 works in most cases, but you might try a lower speed if
122
+ * you commonly experience drop-outs during host printing.
123
+ *
124
+ * :[2400,9600,19200,38400,57600,115200,250000]
125
+ */
117 126
 
118 127
 // Enable the Bluetooth serial interface on AT90USB devices
119 128
 //#define BLUETOOTH
@@ -170,14 +179,22 @@
170 179
 //#define HOTEND_OFFSET_X {0.0, 20.00} // (in mm) for each extruder, offset of the hotend on the X axis
171 180
 //#define HOTEND_OFFSET_Y {0.0, 5.00}  // (in mm) for each extruder, offset of the hotend on the Y axis
172 181
 
173
-//// The following define selects which power supply you have. Please choose the one that matches your setup
174
-// 1 = ATX
175
-// 2 = X-Box 360 203Watts (the blue wire connected to PS_ON and the red wire to VCC)
176
-// :{1:'ATX',2:'X-Box 360'}
182
+/**
183
+ * Select your power supply here. Use 0 if you haven't connected the PS_ON_PIN
184
+ *
185
+ * 0 = No Power Switch
186
+ * 1 = ATX
187
+ * 2 = X-Box 360 203Watts (the blue wire connected to PS_ON and the red wire to VCC)
188
+ *
189
+ * :{0:'No power switch',1:'ATX',2:'X-Box 360'}
190
+ */
177 191
 #define POWER_SUPPLY 1
178 192
 
179
-// Define this to have the electronics keep the power supply off on startup. If you don't know what this is leave it.
180
-//#define PS_DEFAULT_OFF
193
+#if POWER_SUPPLY > 0
194
+  // Enable this option to leave the PSU off at startup.
195
+  // Power to steppers and heaters will need to be turned on with M80.
196
+  //#define PS_DEFAULT_OFF
197
+#endif
181 198
 
182 199
 // @section temperature
183 200
 
@@ -822,7 +839,6 @@
822 839
 #define HOMING_FEEDRATE_XY (50*60)
823 840
 #define HOMING_FEEDRATE_Z  (10*60)
824 841
 
825
-
826 842
 //=============================================================================
827 843
 //============================= Additional Features ===========================
828 844
 //=============================================================================

+ 1
- 1
Marlin/example_configurations/Cartesio/Configuration_adv.h View File

@@ -553,7 +553,7 @@
553 553
 // The number of linear motions that can be in the plan at any give time.
554 554
 // THE BLOCK_BUFFER_SIZE NEEDS TO BE A POWER OF 2, i.g. 8,16,32 because shifts and ors are used to do the ring-buffering.
555 555
 #if ENABLED(SDSUPPORT)
556
-  #define BLOCK_BUFFER_SIZE 16   // SD,LCD,Buttons take more memory, block buffer needs to be smaller
556
+  #define BLOCK_BUFFER_SIZE 16 // SD,LCD,Buttons take more memory, block buffer needs to be smaller
557 557
 #else
558 558
   #define BLOCK_BUFFER_SIZE 16 // maximize block buffer
559 559
 #endif

+ 33
- 17
Marlin/example_configurations/Felix/Configuration.h View File

@@ -88,8 +88,8 @@
88 88
 // build by the user have been successfully uploaded into firmware.
89 89
 #define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes.
90 90
 #define SHOW_BOOTSCREEN
91
-#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during boot in line 1
92
-#define STRING_SPLASH_LINE2 WEBSITE_URL         // will be shown during boot in line 2
91
+#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during bootup in line 1
92
+#define STRING_SPLASH_LINE2 WEBSITE_URL         // will be shown during bootup in line 2
93 93
 
94 94
 //
95 95
 // *** VENDORS PLEASE READ *****************************************************
@@ -105,15 +105,24 @@
105 105
 //#define SHOW_CUSTOM_BOOTSCREEN
106 106
 // @section machine
107 107
 
108
-// SERIAL_PORT selects which serial port should be used for communication with the host.
109
-// This allows the connection of wireless adapters (for instance) to non-default port pins.
110
-// Serial port 0 is still used by the Arduino bootloader regardless of this setting.
111
-// :[0,1,2,3,4,5,6,7]
108
+/**
109
+ * Select which serial port on the board will be used for communication with the host.
110
+ * This allows the connection of wireless adapters (for instance) to non-default port pins.
111
+ * Serial port 0 is always used by the Arduino bootloader regardless of this setting.
112
+ *
113
+ * :[0,1,2,3,4,5,6,7]
114
+ */
112 115
 #define SERIAL_PORT 0
113 116
 
114
-// This determines the communication speed of the printer
115
-// :[2400,9600,19200,38400,57600,115200,250000]
116 117
 #define BAUDRATE 250000
118
+/**
119
+ * This setting determines the communication speed of the printer.
120
+ *
121
+ * 250000 works in most cases, but you might try a lower speed if
122
+ * you commonly experience drop-outs during host printing.
123
+ *
124
+ * :[2400,9600,19200,38400,57600,115200,250000]
125
+ */
117 126
 
118 127
 // Enable the Bluetooth serial interface on AT90USB devices
119 128
 //#define BLUETOOTH
@@ -169,14 +178,22 @@
169 178
 //#define HOTEND_OFFSET_X {0.0, 20.00} // (in mm) for each extruder, offset of the hotend on the X axis
170 179
 //#define HOTEND_OFFSET_Y {0.0, 5.00}  // (in mm) for each extruder, offset of the hotend on the Y axis
171 180
 
172
-//// The following define selects which power supply you have. Please choose the one that matches your setup
173
-// 1 = ATX
174
-// 2 = X-Box 360 203Watts (the blue wire connected to PS_ON and the red wire to VCC)
175
-// :{1:'ATX',2:'X-Box 360'}
181
+/**
182
+ * Select your power supply here. Use 0 if you haven't connected the PS_ON_PIN
183
+ *
184
+ * 0 = No Power Switch
185
+ * 1 = ATX
186
+ * 2 = X-Box 360 203Watts (the blue wire connected to PS_ON and the red wire to VCC)
187
+ *
188
+ * :{0:'No power switch',1:'ATX',2:'X-Box 360'}
189
+ */
176 190
 #define POWER_SUPPLY 1
177 191
 
178
-// Define this to have the electronics keep the power supply off on startup. If you don't know what this is leave it.
179
-#define PS_DEFAULT_OFF
192
+#if POWER_SUPPLY > 0
193
+  // Enable this option to leave the PSU off at startup.
194
+  // Power to steppers and heaters will need to be turned on with M80.
195
+  #define PS_DEFAULT_OFF
196
+#endif
180 197
 
181 198
 // @section temperature
182 199
 
@@ -805,7 +822,6 @@
805 822
 #define HOMING_FEEDRATE_XY (50*60)
806 823
 #define HOMING_FEEDRATE_Z  (4*60)
807 824
 
808
-
809 825
 //=============================================================================
810 826
 //============================= Additional Features ===========================
811 827
 //=============================================================================
@@ -833,8 +849,8 @@
833 849
 // When enabled Marlin will send a busy status message to the host
834 850
 // every couple of seconds when it can't accept commands.
835 851
 //
836
-#define HOST_KEEPALIVE_FEATURE       // Disable this if your host doesn't like keepalive messages
837
-#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
852
+#define HOST_KEEPALIVE_FEATURE        // Disable this if your host doesn't like keepalive messages
853
+#define DEFAULT_KEEPALIVE_INTERVAL 2  // Number of seconds between "busy" messages. Set with M113.
838 854
 
839 855
 //
840 856
 // M100 Free Memory Watcher

+ 1
- 1
Marlin/example_configurations/Felix/Configuration_adv.h View File

@@ -553,7 +553,7 @@
553 553
 // The number of linear motions that can be in the plan at any give time.
554 554
 // THE BLOCK_BUFFER_SIZE NEEDS TO BE A POWER OF 2, i.g. 8,16,32 because shifts and ors are used to do the ring-buffering.
555 555
 #if ENABLED(SDSUPPORT)
556
-  #define BLOCK_BUFFER_SIZE 16   // SD,LCD,Buttons take more memory, block buffer needs to be smaller
556
+  #define BLOCK_BUFFER_SIZE 16 // SD,LCD,Buttons take more memory, block buffer needs to be smaller
557 557
 #else
558 558
   #define BLOCK_BUFFER_SIZE 16 // maximize block buffer
559 559
 #endif

+ 31
- 15
Marlin/example_configurations/Felix/DUAL/Configuration.h View File

@@ -88,8 +88,8 @@
88 88
 // build by the user have been successfully uploaded into firmware.
89 89
 #define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes.
90 90
 #define SHOW_BOOTSCREEN
91
-#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during boot in line 1
92
-#define STRING_SPLASH_LINE2 WEBSITE_URL         // will be shown during boot in line 2
91
+#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during bootup in line 1
92
+#define STRING_SPLASH_LINE2 WEBSITE_URL         // will be shown during bootup in line 2
93 93
 
94 94
 //
95 95
 // *** VENDORS PLEASE READ *****************************************************
@@ -105,15 +105,24 @@
105 105
 //#define SHOW_CUSTOM_BOOTSCREEN
106 106
 // @section machine
107 107
 
108
-// SERIAL_PORT selects which serial port should be used for communication with the host.
109
-// This allows the connection of wireless adapters (for instance) to non-default port pins.
110
-// Serial port 0 is still used by the Arduino bootloader regardless of this setting.
111
-// :[0,1,2,3,4,5,6,7]
108
+/**
109
+ * Select which serial port on the board will be used for communication with the host.
110
+ * This allows the connection of wireless adapters (for instance) to non-default port pins.
111
+ * Serial port 0 is always used by the Arduino bootloader regardless of this setting.
112
+ *
113
+ * :[0,1,2,3,4,5,6,7]
114
+ */
112 115
 #define SERIAL_PORT 0
113 116
 
114
-// This determines the communication speed of the printer
115
-// :[2400,9600,19200,38400,57600,115200,250000]
116 117
 #define BAUDRATE 250000
118
+/**
119
+ * This setting determines the communication speed of the printer.
120
+ *
121
+ * 250000 works in most cases, but you might try a lower speed if
122
+ * you commonly experience drop-outs during host printing.
123
+ *
124
+ * :[2400,9600,19200,38400,57600,115200,250000]
125
+ */
117 126
 
118 127
 // Enable the Bluetooth serial interface on AT90USB devices
119 128
 //#define BLUETOOTH
@@ -169,14 +178,22 @@
169 178
 //#define HOTEND_OFFSET_X {0.0, 20.00} // (in mm) for each extruder, offset of the hotend on the X axis
170 179
 //#define HOTEND_OFFSET_Y {0.0, 5.00}  // (in mm) for each extruder, offset of the hotend on the Y axis
171 180
 
172
-//// The following define selects which power supply you have. Please choose the one that matches your setup
173
-// 1 = ATX
174
-// 2 = X-Box 360 203Watts (the blue wire connected to PS_ON and the red wire to VCC)
175
-// :{1:'ATX',2:'X-Box 360'}
181
+/**
182
+ * Select your power supply here. Use 0 if you haven't connected the PS_ON_PIN
183
+ *
184
+ * 0 = No Power Switch
185
+ * 1 = ATX
186
+ * 2 = X-Box 360 203Watts (the blue wire connected to PS_ON and the red wire to VCC)
187
+ *
188
+ * :{0:'No power switch',1:'ATX',2:'X-Box 360'}
189
+ */
176 190
 #define POWER_SUPPLY 1
177 191
 
178
-// Define this to have the electronics keep the power supply off on startup. If you don't know what this is leave it.
179
-#define PS_DEFAULT_OFF
192
+#if POWER_SUPPLY > 0
193
+  // Enable this option to leave the PSU off at startup.
194
+  // Power to steppers and heaters will need to be turned on with M80.
195
+  #define PS_DEFAULT_OFF
196
+#endif
180 197
 
181 198
 // @section temperature
182 199
 
@@ -803,7 +820,6 @@
803 820
 #define HOMING_FEEDRATE_XY (50*60)
804 821
 #define HOMING_FEEDRATE_Z  (4*60)
805 822
 
806
-
807 823
 //=============================================================================
808 824
 //============================= Additional Features ===========================
809 825
 //=============================================================================

+ 33
- 17
Marlin/example_configurations/Hephestos/Configuration.h View File

@@ -88,8 +88,8 @@
88 88
 // build by the user have been successfully uploaded into firmware.
89 89
 #define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes.
90 90
 #define SHOW_BOOTSCREEN
91
-#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during boot in line 1
92
-#define STRING_SPLASH_LINE2 WEBSITE_URL         // will be shown during boot in line 2
91
+#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during bootup in line 1
92
+#define STRING_SPLASH_LINE2 WEBSITE_URL         // will be shown during bootup in line 2
93 93
 
94 94
 //
95 95
 // *** VENDORS PLEASE READ *****************************************************
@@ -105,15 +105,24 @@
105 105
 //#define SHOW_CUSTOM_BOOTSCREEN
106 106
 // @section machine
107 107
 
108
-// SERIAL_PORT selects which serial port should be used for communication with the host.
109
-// This allows the connection of wireless adapters (for instance) to non-default port pins.
110
-// Serial port 0 is still used by the Arduino bootloader regardless of this setting.
111
-// :[0,1,2,3,4,5,6,7]
108
+/**
109
+ * Select which serial port on the board will be used for communication with the host.
110
+ * This allows the connection of wireless adapters (for instance) to non-default port pins.
111
+ * Serial port 0 is always used by the Arduino bootloader regardless of this setting.
112
+ *
113
+ * :[0,1,2,3,4,5,6,7]
114
+ */
112 115
 #define SERIAL_PORT 0
113 116
 
114
-// This determines the communication speed of the printer
115
-// :[2400,9600,19200,38400,57600,115200,250000]
116 117
 #define BAUDRATE 115200
118
+/**
119
+ * This setting determines the communication speed of the printer.
120
+ *
121
+ * 250000 works in most cases, but you might try a lower speed if
122
+ * you commonly experience drop-outs during host printing.
123
+ *
124
+ * :[2400,9600,19200,38400,57600,115200,250000]
125
+ */
117 126
 
118 127
 // Enable the Bluetooth serial interface on AT90USB devices
119 128
 //#define BLUETOOTH
@@ -172,14 +181,22 @@
172 181
 //#define HOTEND_OFFSET_X {0.0, 20.00} // (in mm) for each extruder, offset of the hotend on the X axis
173 182
 //#define HOTEND_OFFSET_Y {0.0, 5.00}  // (in mm) for each extruder, offset of the hotend on the Y axis
174 183
 
175
-//// The following define selects which power supply you have. Please choose the one that matches your setup
176
-// 1 = ATX
177
-// 2 = X-Box 360 203Watts (the blue wire connected to PS_ON and the red wire to VCC)
178
-// :{1:'ATX',2:'X-Box 360'}
184
+/**
185
+ * Select your power supply here. Use 0 if you haven't connected the PS_ON_PIN
186
+ *
187
+ * 0 = No Power Switch
188
+ * 1 = ATX
189
+ * 2 = X-Box 360 203Watts (the blue wire connected to PS_ON and the red wire to VCC)
190
+ *
191
+ * :{0:'No power switch',1:'ATX',2:'X-Box 360'}
192
+ */
179 193
 #define POWER_SUPPLY 1
180 194
 
181
-// Define this to have the electronics keep the power supply off on startup. If you don't know what this is leave it.
182
-//#define PS_DEFAULT_OFF
195
+#if POWER_SUPPLY > 0
196
+  // Enable this option to leave the PSU off at startup.
197
+  // Power to steppers and heaters will need to be turned on with M80.
198
+  //#define PS_DEFAULT_OFF
199
+#endif
183 200
 
184 201
 // @section temperature
185 202
 
@@ -814,7 +831,6 @@
814 831
 #define HOMING_FEEDRATE_XY 2000
815 832
 #define HOMING_FEEDRATE_Z  150
816 833
 
817
-
818 834
 //=============================================================================
819 835
 //============================= Additional Features ===========================
820 836
 //=============================================================================
@@ -842,8 +858,8 @@
842 858
 // When enabled Marlin will send a busy status message to the host
843 859
 // every couple of seconds when it can't accept commands.
844 860
 //
845
-#define HOST_KEEPALIVE_FEATURE       // Disable this if your host doesn't like keepalive messages
846
-#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
861
+#define HOST_KEEPALIVE_FEATURE        // Disable this if your host doesn't like keepalive messages
862
+#define DEFAULT_KEEPALIVE_INTERVAL 2  // Number of seconds between "busy" messages. Set with M113.
847 863
 
848 864
 //
849 865
 // M100 Free Memory Watcher

+ 1
- 1
Marlin/example_configurations/Hephestos/Configuration_adv.h View File

@@ -553,7 +553,7 @@
553 553
 // The number of linear motions that can be in the plan at any give time.
554 554
 // THE BLOCK_BUFFER_SIZE NEEDS TO BE A POWER OF 2, i.g. 8,16,32 because shifts and ors are used to do the ring-buffering.
555 555
 #if ENABLED(SDSUPPORT)
556
-  #define BLOCK_BUFFER_SIZE 16   // SD,LCD,Buttons take more memory, block buffer needs to be smaller
556
+  #define BLOCK_BUFFER_SIZE 16 // SD,LCD,Buttons take more memory, block buffer needs to be smaller
557 557
 #else
558 558
   #define BLOCK_BUFFER_SIZE 16 // maximize block buffer
559 559
 #endif

+ 33
- 17
Marlin/example_configurations/Hephestos_2/Configuration.h View File

@@ -88,8 +88,8 @@
88 88
 // build by the user have been successfully uploaded into firmware.
89 89
 #define STRING_CONFIG_H_AUTHOR "@jbrazio" // Who made the changes.
90 90
 #define SHOW_BOOTSCREEN
91
-#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during boot in line 1
92
-#define STRING_SPLASH_LINE2 WEBSITE_URL         // will be shown during boot in line 2
91
+#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during bootup in line 1
92
+#define STRING_SPLASH_LINE2 WEBSITE_URL         // will be shown during bootup in line 2
93 93
 
94 94
 //
95 95
 // *** VENDORS PLEASE READ *****************************************************
@@ -105,15 +105,24 @@
105 105
 #define SHOW_CUSTOM_BOOTSCREEN
106 106
 // @section machine
107 107
 
108
-// SERIAL_PORT selects which serial port should be used for communication with the host.
109
-// This allows the connection of wireless adapters (for instance) to non-default port pins.
110
-// Serial port 0 is still used by the Arduino bootloader regardless of this setting.
111
-// :[0,1,2,3,4,5,6,7]
108
+/**
109
+ * Select which serial port on the board will be used for communication with the host.
110
+ * This allows the connection of wireless adapters (for instance) to non-default port pins.
111
+ * Serial port 0 is always used by the Arduino bootloader regardless of this setting.
112
+ *
113
+ * :[0,1,2,3,4,5,6,7]
114
+ */
112 115
 #define SERIAL_PORT 0
113 116
 
114
-// This determines the communication speed of the printer
115
-// :[2400,9600,19200,38400,57600,115200,250000]
116 117
 #define BAUDRATE 250000
118
+/**
119
+ * This setting determines the communication speed of the printer.
120
+ *
121
+ * 250000 works in most cases, but you might try a lower speed if
122
+ * you commonly experience drop-outs during host printing.
123
+ *
124
+ * :[2400,9600,19200,38400,57600,115200,250000]
125
+ */
117 126
 
118 127
 // Enable the Bluetooth serial interface on AT90USB devices
119 128
 //#define BLUETOOTH
@@ -169,14 +178,22 @@
169 178
 //#define HOTEND_OFFSET_X {0.0, 20.00} // (in mm) for each extruder, offset of the hotend on the X axis
170 179
 //#define HOTEND_OFFSET_Y {0.0, 5.00}  // (in mm) for each extruder, offset of the hotend on the Y axis
171 180
 
172
-//// The following define selects which power supply you have. Please choose the one that matches your setup
173
-// 1 = ATX
174
-// 2 = X-Box 360 203Watts (the blue wire connected to PS_ON and the red wire to VCC)
175
-// :{1:'ATX',2:'X-Box 360'}
181
+/**
182
+ * Select your power supply here. Use 0 if you haven't connected the PS_ON_PIN
183
+ *
184
+ * 0 = No Power Switch
185
+ * 1 = ATX
186
+ * 2 = X-Box 360 203Watts (the blue wire connected to PS_ON and the red wire to VCC)
187
+ *
188
+ * :{0:'No power switch',1:'ATX',2:'X-Box 360'}
189
+ */
176 190
 #define POWER_SUPPLY 1
177 191
 
178
-// Define this to have the electronics keep the power supply off on startup. If you don't know what this is leave it.
179
-//#define PS_DEFAULT_OFF
192
+#if POWER_SUPPLY > 0
193
+  // Enable this option to leave the PSU off at startup.
194
+  // Power to steppers and heaters will need to be turned on with M80.
195
+  //#define PS_DEFAULT_OFF
196
+#endif
180 197
 
181 198
 // @section temperature
182 199
 
@@ -816,7 +833,6 @@
816 833
 #define HOMING_FEEDRATE_XY (150*60)
817 834
 #define HOMING_FEEDRATE_Z  200
818 835
 
819
-
820 836
 //=============================================================================
821 837
 //============================= Additional Features ===========================
822 838
 //=============================================================================
@@ -844,8 +860,8 @@
844 860
 // When enabled Marlin will send a busy status message to the host
845 861
 // every couple of seconds when it can't accept commands.
846 862
 //
847
-#define HOST_KEEPALIVE_FEATURE       // Disable this if your host doesn't like keepalive messages
848
-#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
863
+#define HOST_KEEPALIVE_FEATURE        // Disable this if your host doesn't like keepalive messages
864
+#define DEFAULT_KEEPALIVE_INTERVAL 2  // Number of seconds between "busy" messages. Set with M113.
849 865
 
850 866
 //
851 867
 // M100 Free Memory Watcher

+ 1
- 1
Marlin/example_configurations/Hephestos_2/Configuration_adv.h View File

@@ -553,7 +553,7 @@
553 553
 // The number of linear motions that can be in the plan at any give time.
554 554
 // THE BLOCK_BUFFER_SIZE NEEDS TO BE A POWER OF 2, i.g. 8,16,32 because shifts and ors are used to do the ring-buffering.
555 555
 #if ENABLED(SDSUPPORT)
556
-  #define BLOCK_BUFFER_SIZE 16   // SD,LCD,Buttons take more memory, block buffer needs to be smaller
556
+  #define BLOCK_BUFFER_SIZE 16 // SD,LCD,Buttons take more memory, block buffer needs to be smaller
557 557
 #else
558 558
   #define BLOCK_BUFFER_SIZE 16 // maximize block buffer
559 559
 #endif

+ 33
- 17
Marlin/example_configurations/K8200/Configuration.h View File

@@ -95,8 +95,8 @@
95 95
 // build by the user have been successfully uploaded into firmware.
96 96
 #define STRING_CONFIG_H_AUTHOR "(K8200, @CONSULitAS)" // Who made the changes.
97 97
 #define SHOW_BOOTSCREEN
98
-#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during boot in line 1
99
-#define STRING_SPLASH_LINE2 WEBSITE_URL         // will be shown during boot in line 2
98
+#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during bootup in line 1
99
+#define STRING_SPLASH_LINE2 WEBSITE_URL         // will be shown during bootup in line 2
100 100
 
101 101
 //
102 102
 // *** VENDORS PLEASE READ *****************************************************
@@ -112,15 +112,24 @@
112 112
 //#define SHOW_CUSTOM_BOOTSCREEN
113 113
 // @section machine
114 114
 
115
-// SERIAL_PORT selects which serial port should be used for communication with the host.
116
-// This allows the connection of wireless adapters (for instance) to non-default port pins.
117
-// Serial port 0 is still used by the Arduino bootloader regardless of this setting.
118
-// :[0,1,2,3,4,5,6,7]
115
+/**
116
+ * Select which serial port on the board will be used for communication with the host.
117
+ * This allows the connection of wireless adapters (for instance) to non-default port pins.
118
+ * Serial port 0 is always used by the Arduino bootloader regardless of this setting.
119
+ *
120
+ * :[0,1,2,3,4,5,6,7]
121
+ */
119 122
 #define SERIAL_PORT 0
120 123
 
121
-// This determines the communication speed of the printer
122
-// :[2400,9600,19200,38400,57600,115200,250000]
123 124
 #define BAUDRATE 250000
125
+/**
126
+ * This setting determines the communication speed of the printer.
127
+ *
128
+ * 250000 works in most cases, but you might try a lower speed if
129
+ * you commonly experience drop-outs during host printing.
130
+ *
131
+ * :[2400,9600,19200,38400,57600,115200,250000]
132
+ */
124 133
 
125 134
 // Enable the Bluetooth serial interface on AT90USB devices
126 135
 //#define BLUETOOTH
@@ -176,14 +185,22 @@
176 185
 //#define HOTEND_OFFSET_X {0.0, 20.00} // (in mm) for each extruder, offset of the hotend on the X axis
177 186
 //#define HOTEND_OFFSET_Y {0.0, 5.00}  // (in mm) for each extruder, offset of the hotend on the Y axis
178 187
 
179
-//// The following define selects which power supply you have. Please choose the one that matches your setup
180
-// 1 = ATX
181
-// 2 = X-Box 360 203Watts (the blue wire connected to PS_ON and the red wire to VCC)
182
-// :{1:'ATX',2:'X-Box 360'}
188
+/**
189
+ * Select your power supply here. Use 0 if you haven't connected the PS_ON_PIN
190
+ *
191
+ * 0 = No Power Switch
192
+ * 1 = ATX
193
+ * 2 = X-Box 360 203Watts (the blue wire connected to PS_ON and the red wire to VCC)
194
+ *
195
+ * :{0:'No power switch',1:'ATX',2:'X-Box 360'}
196
+ */
183 197
 #define POWER_SUPPLY 1
184 198
 
185
-// Define this to have the electronics keep the power supply off on startup. If you don't know what this is leave it.
186
-//#define PS_DEFAULT_OFF
199
+#if POWER_SUPPLY > 0
200
+  // Enable this option to leave the PSU off at startup.
201
+  // Power to steppers and heaters will need to be turned on with M80.
202
+  //#define PS_DEFAULT_OFF
203
+#endif
187 204
 
188 205
 // @section temperature
189 206
 
@@ -839,7 +856,6 @@
839 856
 #define HOMING_FEEDRATE_XY (50*60)
840 857
 #define HOMING_FEEDRATE_Z  (4*60)
841 858
 
842
-
843 859
 //=============================================================================
844 860
 //============================= Additional Features ===========================
845 861
 //=============================================================================
@@ -867,8 +883,8 @@
867 883
 // When enabled Marlin will send a busy status message to the host
868 884
 // every couple of seconds when it can't accept commands.
869 885
 //
870
-#define HOST_KEEPALIVE_FEATURE       // Disable this if your host doesn't like keepalive messages
871
-#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
886
+#define HOST_KEEPALIVE_FEATURE        // Disable this if your host doesn't like keepalive messages
887
+#define DEFAULT_KEEPALIVE_INTERVAL 2  // Number of seconds between "busy" messages. Set with M113.
872 888
 
873 889
 //
874 890
 // M100 Free Memory Watcher

+ 1
- 1
Marlin/example_configurations/K8200/Configuration_adv.h View File

@@ -559,7 +559,7 @@
559 559
 // The number of linear motions that can be in the plan at any give time.
560 560
 // THE BLOCK_BUFFER_SIZE NEEDS TO BE A POWER OF 2, i.g. 8,16,32 because shifts and ors are used to do the ring-buffering.
561 561
 #if ENABLED(SDSUPPORT)
562
-  #define BLOCK_BUFFER_SIZE 16   // SD,LCD,Buttons take more memory, block buffer needs to be smaller
562
+  #define BLOCK_BUFFER_SIZE 16 // SD,LCD,Buttons take more memory, block buffer needs to be smaller
563 563
 #else
564 564
   #define BLOCK_BUFFER_SIZE 32 // maximize block buffer
565 565
 #endif

+ 31
- 15
Marlin/example_configurations/K8400/Configuration.h View File

@@ -88,8 +88,8 @@
88 88
 // build by the user have been successfully uploaded into firmware.
89 89
 #define STRING_CONFIG_H_AUTHOR "(Anthony Birkett, default config)" // Who made the changes.
90 90
 #define SHOW_BOOTSCREEN
91
-#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during boot in line 1
92
-#define STRING_SPLASH_LINE2 WEBSITE_URL         // will be shown during boot in line 2
91
+#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during bootup in line 1
92
+#define STRING_SPLASH_LINE2 WEBSITE_URL         // will be shown during bootup in line 2
93 93
 
94 94
 //
95 95
 // *** VENDORS PLEASE READ *****************************************************
@@ -105,15 +105,24 @@
105 105
 //#define SHOW_CUSTOM_BOOTSCREEN
106 106
 // @section machine
107 107
 
108
-// SERIAL_PORT selects which serial port should be used for communication with the host.
109
-// This allows the connection of wireless adapters (for instance) to non-default port pins.
110
-// Serial port 0 is still used by the Arduino bootloader regardless of this setting.
111
-// :[0,1,2,3,4,5,6,7]
108
+/**
109
+ * Select which serial port on the board will be used for communication with the host.
110
+ * This allows the connection of wireless adapters (for instance) to non-default port pins.
111
+ * Serial port 0 is always used by the Arduino bootloader regardless of this setting.
112
+ *
113
+ * :[0,1,2,3,4,5,6,7]
114
+ */
112 115
 #define SERIAL_PORT 0
113 116
 
114
-// This determines the communication speed of the printer
115
-// :[2400,9600,19200,38400,57600,115200,250000]
116 117
 #define BAUDRATE 250000
118
+/**
119
+ * This setting determines the communication speed of the printer.
120
+ *
121
+ * 250000 works in most cases, but you might try a lower speed if
122
+ * you commonly experience drop-outs during host printing.
123
+ *
124
+ * :[2400,9600,19200,38400,57600,115200,250000]
125
+ */
117 126
 
118 127
 // Enable the Bluetooth serial interface on AT90USB devices
119 128
 //#define BLUETOOTH
@@ -169,14 +178,22 @@
169 178
 //#define HOTEND_OFFSET_X {0.0, 20.00} // (in mm) for each extruder, offset of the hotend on the X axis
170 179
 //#define HOTEND_OFFSET_Y {0.0, 5.00}  // (in mm) for each extruder, offset of the hotend on the Y axis
171 180
 
172
-//// The following define selects which power supply you have. Please choose the one that matches your setup
173
-// 1 = ATX
174
-// 2 = X-Box 360 203Watts (the blue wire connected to PS_ON and the red wire to VCC)
175
-// :{1:'ATX',2:'X-Box 360'}
181
+/**
182
+ * Select your power supply here. Use 0 if you haven't connected the PS_ON_PIN
183
+ *
184
+ * 0 = No Power Switch
185
+ * 1 = ATX
186
+ * 2 = X-Box 360 203Watts (the blue wire connected to PS_ON and the red wire to VCC)
187
+ *
188
+ * :{0:'No power switch',1:'ATX',2:'X-Box 360'}
189
+ */
176 190
 #define POWER_SUPPLY 1
177 191
 
178
-// Define this to have the electronics keep the power supply off on startup. If you don't know what this is leave it.
179
-//#define PS_DEFAULT_OFF
192
+#if POWER_SUPPLY > 0
193
+  // Enable this option to leave the PSU off at startup.
194
+  // Power to steppers and heaters will need to be turned on with M80.
195
+  //#define PS_DEFAULT_OFF
196
+#endif
180 197
 
181 198
 // @section temperature
182 199
 
@@ -822,7 +839,6 @@
822 839
 #define HOMING_FEEDRATE_XY (50*60)
823 840
 #define HOMING_FEEDRATE_Z  (8*60)
824 841
 
825
-
826 842
 //=============================================================================
827 843
 //============================= Additional Features ===========================
828 844
 //=============================================================================

+ 1
- 1
Marlin/example_configurations/K8400/Configuration_adv.h View File

@@ -553,7 +553,7 @@
553 553
 // The number of linear motions that can be in the plan at any give time.
554 554
 // THE BLOCK_BUFFER_SIZE NEEDS TO BE A POWER OF 2, i.g. 8,16,32 because shifts and ors are used to do the ring-buffering.
555 555
 #if ENABLED(SDSUPPORT)
556
-  #define BLOCK_BUFFER_SIZE 16   // SD,LCD,Buttons take more memory, block buffer needs to be smaller
556
+  #define BLOCK_BUFFER_SIZE 16 // SD,LCD,Buttons take more memory, block buffer needs to be smaller
557 557
 #else
558 558
   #define BLOCK_BUFFER_SIZE 16 // maximize block buffer
559 559
 #endif

+ 31
- 15
Marlin/example_configurations/K8400/Dual-head/Configuration.h View File

@@ -88,8 +88,8 @@
88 88
 // build by the user have been successfully uploaded into firmware.
89 89
 #define STRING_CONFIG_H_AUTHOR "(Anthony Birkett, default config)" // Who made the changes.
90 90
 #define SHOW_BOOTSCREEN
91
-#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during boot in line 1
92
-#define STRING_SPLASH_LINE2 WEBSITE_URL         // will be shown during boot in line 2
91
+#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during bootup in line 1
92
+#define STRING_SPLASH_LINE2 WEBSITE_URL         // will be shown during bootup in line 2
93 93
 
94 94
 //
95 95
 // *** VENDORS PLEASE READ *****************************************************
@@ -105,15 +105,24 @@
105 105
 //#define SHOW_CUSTOM_BOOTSCREEN
106 106
 // @section machine
107 107
 
108
-// SERIAL_PORT selects which serial port should be used for communication with the host.
109
-// This allows the connection of wireless adapters (for instance) to non-default port pins.
110
-// Serial port 0 is still used by the Arduino bootloader regardless of this setting.
111
-// :[0,1,2,3,4,5,6,7]
108
+/**
109
+ * Select which serial port on the board will be used for communication with the host.
110
+ * This allows the connection of wireless adapters (for instance) to non-default port pins.
111
+ * Serial port 0 is always used by the Arduino bootloader regardless of this setting.
112
+ *
113
+ * :[0,1,2,3,4,5,6,7]
114
+ */
112 115
 #define SERIAL_PORT 0
113 116
 
114
-// This determines the communication speed of the printer
115
-// :[2400,9600,19200,38400,57600,115200,250000]
116 117
 #define BAUDRATE 250000
118
+/**
119
+ * This setting determines the communication speed of the printer.
120
+ *
121
+ * 250000 works in most cases, but you might try a lower speed if
122
+ * you commonly experience drop-outs during host printing.
123
+ *
124
+ * :[2400,9600,19200,38400,57600,115200,250000]
125
+ */
117 126
 
118 127
 // Enable the Bluetooth serial interface on AT90USB devices
119 128
 //#define BLUETOOTH
@@ -169,14 +178,22 @@
169 178
 //#define HOTEND_OFFSET_X {0.0, 20.00} // (in mm) for each extruder, offset of the hotend on the X axis
170 179
 //#define HOTEND_OFFSET_Y {0.0, 5.00}  // (in mm) for each extruder, offset of the hotend on the Y axis
171 180
 
172
-//// The following define selects which power supply you have. Please choose the one that matches your setup
173
-// 1 = ATX
174
-// 2 = X-Box 360 203Watts (the blue wire connected to PS_ON and the red wire to VCC)
175
-// :{1:'ATX',2:'X-Box 360'}
181
+/**
182
+ * Select your power supply here. Use 0 if you haven't connected the PS_ON_PIN
183
+ *
184
+ * 0 = No Power Switch
185
+ * 1 = ATX
186
+ * 2 = X-Box 360 203Watts (the blue wire connected to PS_ON and the red wire to VCC)
187
+ *
188
+ * :{0:'No power switch',1:'ATX',2:'X-Box 360'}
189
+ */
176 190
 #define POWER_SUPPLY 1
177 191
 
178
-// Define this to have the electronics keep the power supply off on startup. If you don't know what this is leave it.
179
-//#define PS_DEFAULT_OFF
192
+#if POWER_SUPPLY > 0
193
+  // Enable this option to leave the PSU off at startup.
194
+  // Power to steppers and heaters will need to be turned on with M80.
195
+  //#define PS_DEFAULT_OFF
196
+#endif
180 197
 
181 198
 // @section temperature
182 199
 
@@ -822,7 +839,6 @@
822 839
 #define HOMING_FEEDRATE_XY (50*60)
823 840
 #define HOMING_FEEDRATE_Z  (8*60)
824 841
 
825
-
826 842
 //=============================================================================
827 843
 //============================= Additional Features ===========================
828 844
 //=============================================================================

+ 33
- 17
Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h View File

@@ -88,8 +88,8 @@
88 88
 // build by the user have been successfully uploaded into firmware.
89 89
 #define STRING_CONFIG_H_AUTHOR "RepRapWorld.com" // Who made the changes.
90 90
 #define SHOW_BOOTSCREEN
91
-#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during boot in line 1
92
-#define STRING_SPLASH_LINE2 WEBSITE_URL         // will be shown during boot in line 2
91
+#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during bootup in line 1
92
+#define STRING_SPLASH_LINE2 WEBSITE_URL         // will be shown during bootup in line 2
93 93
 
94 94
 //
95 95
 // *** VENDORS PLEASE READ *****************************************************
@@ -105,15 +105,24 @@
105 105
 //#define SHOW_CUSTOM_BOOTSCREEN
106 106
 // @section machine
107 107
 
108
-// SERIAL_PORT selects which serial port should be used for communication with the host.
109
-// This allows the connection of wireless adapters (for instance) to non-default port pins.
110
-// Serial port 0 is still used by the Arduino bootloader regardless of this setting.
111
-// :[0,1,2,3,4,5,6,7]
108
+/**
109
+ * Select which serial port on the board will be used for communication with the host.
110
+ * This allows the connection of wireless adapters (for instance) to non-default port pins.
111
+ * Serial port 0 is always used by the Arduino bootloader regardless of this setting.
112
+ *
113
+ * :[0,1,2,3,4,5,6,7]
114
+ */
112 115
 #define SERIAL_PORT 0
113 116
 
114
-// This determines the communication speed of the printer
115
-// :[2400,9600,19200,38400,57600,115200,250000]
116 117
 #define BAUDRATE 250000
118
+/**
119
+ * This setting determines the communication speed of the printer.
120
+ *
121
+ * 250000 works in most cases, but you might try a lower speed if
122
+ * you commonly experience drop-outs during host printing.
123
+ *
124
+ * :[2400,9600,19200,38400,57600,115200,250000]
125
+ */
117 126
 
118 127
 // Enable the Bluetooth serial interface on AT90USB devices
119 128
 //#define BLUETOOTH
@@ -169,14 +178,22 @@
169 178
 //#define HOTEND_OFFSET_X {0.0, 20.00} // (in mm) for each extruder, offset of the hotend on the X axis
170 179
 //#define HOTEND_OFFSET_Y {0.0, 5.00}  // (in mm) for each extruder, offset of the hotend on the Y axis
171 180
 
172
-//// The following define selects which power supply you have. Please choose the one that matches your setup
173
-// 1 = ATX
174
-// 2 = X-Box 360 203Watts (the blue wire connected to PS_ON and the red wire to VCC)
175
-// :{1:'ATX',2:'X-Box 360'}
181
+/**
182
+ * Select your power supply here. Use 0 if you haven't connected the PS_ON_PIN
183
+ *
184
+ * 0 = No Power Switch
185
+ * 1 = ATX
186
+ * 2 = X-Box 360 203Watts (the blue wire connected to PS_ON and the red wire to VCC)
187
+ *
188
+ * :{0:'No power switch',1:'ATX',2:'X-Box 360'}
189
+ */
176 190
 #define POWER_SUPPLY 1
177 191
 
178
-// Define this to have the electronics keep the power supply off on startup. If you don't know what this is leave it.
179
-//#define PS_DEFAULT_OFF
192
+#if POWER_SUPPLY > 0
193
+  // Enable this option to leave the PSU off at startup.
194
+  // Power to steppers and heaters will need to be turned on with M80.
195
+  //#define PS_DEFAULT_OFF
196
+#endif
180 197
 
181 198
 // @section temperature
182 199
 
@@ -822,7 +839,6 @@
822 839
 #define HOMING_FEEDRATE_XY (50*60)
823 840
 #define HOMING_FEEDRATE_Z  (4*60)
824 841
 
825
-
826 842
 //=============================================================================
827 843
 //============================= Additional Features ===========================
828 844
 //=============================================================================
@@ -850,8 +866,8 @@
850 866
 // When enabled Marlin will send a busy status message to the host
851 867
 // every couple of seconds when it can't accept commands.
852 868
 //
853
-#define HOST_KEEPALIVE_FEATURE       // Disable this if your host doesn't like keepalive messages
854
-#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
869
+#define HOST_KEEPALIVE_FEATURE        // Disable this if your host doesn't like keepalive messages
870
+#define DEFAULT_KEEPALIVE_INTERVAL 2  // Number of seconds between "busy" messages. Set with M113.
855 871
 
856 872
 //
857 873
 // M100 Free Memory Watcher

+ 33
- 17
Marlin/example_configurations/RigidBot/Configuration.h View File

@@ -88,8 +88,8 @@
88 88
 // build by the user have been successfully uploaded into firmware.
89 89
 #define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes.
90 90
 #define SHOW_BOOTSCREEN
91
-#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during boot in line 1
92
-#define STRING_SPLASH_LINE2 WEBSITE_URL         // will be shown during boot in line 2
91
+#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during bootup in line 1
92
+#define STRING_SPLASH_LINE2 WEBSITE_URL         // will be shown during bootup in line 2
93 93
 
94 94
 //
95 95
 // *** VENDORS PLEASE READ *****************************************************
@@ -105,15 +105,24 @@
105 105
 //#define SHOW_CUSTOM_BOOTSCREEN
106 106
 // @section machine
107 107
 
108
-// SERIAL_PORT selects which serial port should be used for communication with the host.
109
-// This allows the connection of wireless adapters (for instance) to non-default port pins.
110
-// Serial port 0 is still used by the Arduino bootloader regardless of this setting.
111
-// :[0,1,2,3,4,5,6,7]
108
+/**
109
+ * Select which serial port on the board will be used for communication with the host.
110
+ * This allows the connection of wireless adapters (for instance) to non-default port pins.
111
+ * Serial port 0 is always used by the Arduino bootloader regardless of this setting.
112
+ *
113
+ * :[0,1,2,3,4,5,6,7]
114
+ */
112 115
 #define SERIAL_PORT 0
113 116
 
114
-// This determines the communication speed of the printer
115
-// :[2400,9600,19200,38400,57600,115200,250000]
116 117
 #define BAUDRATE 115200
118
+/**
119
+ * This setting determines the communication speed of the printer.
120
+ *
121
+ * 250000 works in most cases, but you might try a lower speed if
122
+ * you commonly experience drop-outs during host printing.
123
+ *
124
+ * :[2400,9600,19200,38400,57600,115200,250000]
125
+ */
117 126
 
118 127
 // Enable the Bluetooth serial interface on AT90USB devices
119 128
 //#define BLUETOOTH
@@ -172,14 +181,22 @@
172 181
 #define HOTEND_OFFSET_X {0.0, 36.00} // (in mm) for each extruder, offset of the hotend on the X axis
173 182
 #define HOTEND_OFFSET_Y {0.0, 0.00}  // (in mm) for each extruder, offset of the hotend on the Y axis
174 183
 
175
-//// The following define selects which power supply you have. Please choose the one that matches your setup
176
-// 1 = ATX
177
-// 2 = X-Box 360 203Watts (the blue wire connected to PS_ON and the red wire to VCC)
178
-// :{1:'ATX',2:'X-Box 360'}
184
+/**
185
+ * Select your power supply here. Use 0 if you haven't connected the PS_ON_PIN
186
+ *
187
+ * 0 = No Power Switch
188
+ * 1 = ATX
189
+ * 2 = X-Box 360 203Watts (the blue wire connected to PS_ON and the red wire to VCC)
190
+ *
191
+ * :{0:'No power switch',1:'ATX',2:'X-Box 360'}
192
+ */
179 193
 #define POWER_SUPPLY 1
180 194
 
181
-// Define this to have the electronics keep the power supply off on startup. If you don't know what this is leave it.
182
-//#define PS_DEFAULT_OFF
195
+#if POWER_SUPPLY > 0
196
+  // Enable this option to leave the PSU off at startup.
197
+  // Power to steppers and heaters will need to be turned on with M80.
198
+  //#define PS_DEFAULT_OFF
199
+#endif
183 200
 
184 201
 // @section temperature
185 202
 
@@ -820,7 +837,6 @@
820 837
 #define HOMING_FEEDRATE_XY (50*60)
821 838
 #define HOMING_FEEDRATE_Z  (15*60)
822 839
 
823
-
824 840
 //=============================================================================
825 841
 //============================= Additional Features ===========================
826 842
 //=============================================================================
@@ -848,8 +864,8 @@
848 864
 // When enabled Marlin will send a busy status message to the host
849 865
 // every couple of seconds when it can't accept commands.
850 866
 //
851
-#define HOST_KEEPALIVE_FEATURE       // Disable this if your host doesn't like keepalive messages
852
-#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
867
+#define HOST_KEEPALIVE_FEATURE        // Disable this if your host doesn't like keepalive messages
868
+#define DEFAULT_KEEPALIVE_INTERVAL 2  // Number of seconds between "busy" messages. Set with M113.
853 869
 
854 870
 //
855 871
 // M100 Free Memory Watcher

+ 1
- 1
Marlin/example_configurations/RigidBot/Configuration_adv.h View File

@@ -553,7 +553,7 @@
553 553
 // The number of linear motions that can be in the plan at any give time.
554 554
 // THE BLOCK_BUFFER_SIZE NEEDS TO BE A POWER OF 2, i.g. 8,16,32 because shifts and ors are used to do the ring-buffering.
555 555
 #if ENABLED(SDSUPPORT)
556
-  #define BLOCK_BUFFER_SIZE 16   // SD,LCD,Buttons take more memory, block buffer needs to be smaller
556
+  #define BLOCK_BUFFER_SIZE 16 // SD,LCD,Buttons take more memory, block buffer needs to be smaller
557 557
 #else
558 558
   #define BLOCK_BUFFER_SIZE 16 // maximize block buffer
559 559
 #endif

+ 33
- 17
Marlin/example_configurations/SCARA/Configuration.h View File

@@ -120,8 +120,8 @@
120 120
 // build by the user have been successfully uploaded into firmware.
121 121
 #define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes.
122 122
 #define SHOW_BOOTSCREEN
123
-#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during boot in line 1
124
-#define STRING_SPLASH_LINE2 WEBSITE_URL         // will be shown during boot in line 2
123
+#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during bootup in line 1
124
+#define STRING_SPLASH_LINE2 WEBSITE_URL         // will be shown during bootup in line 2
125 125
 
126 126
 //
127 127
 // *** VENDORS PLEASE READ *****************************************************
@@ -137,15 +137,24 @@
137 137
 //#define SHOW_CUSTOM_BOOTSCREEN
138 138
 // @section machine
139 139
 
140
-// SERIAL_PORT selects which serial port should be used for communication with the host.
141
-// This allows the connection of wireless adapters (for instance) to non-default port pins.
142
-// Serial port 0 is still used by the Arduino bootloader regardless of this setting.
143
-// :[0,1,2,3,4,5,6,7]
140
+/**
141
+ * Select which serial port on the board will be used for communication with the host.
142
+ * This allows the connection of wireless adapters (for instance) to non-default port pins.
143
+ * Serial port 0 is always used by the Arduino bootloader regardless of this setting.
144
+ *
145
+ * :[0,1,2,3,4,5,6,7]
146
+ */
144 147
 #define SERIAL_PORT 0
145 148
 
146
-// This determines the communication speed of the printer
147
-// :[2400,9600,19200,38400,57600,115200,250000]
148 149
 #define BAUDRATE 250000
150
+/**
151
+ * This setting determines the communication speed of the printer.
152
+ *
153
+ * 250000 works in most cases, but you might try a lower speed if
154
+ * you commonly experience drop-outs during host printing.
155
+ *
156
+ * :[2400,9600,19200,38400,57600,115200,250000]
157
+ */
149 158
 
150 159
 // Enable the Bluetooth serial interface on AT90USB devices
151 160
 //#define BLUETOOTH
@@ -201,14 +210,22 @@
201 210
 //#define HOTEND_OFFSET_X {0.0, 20.00} // (in mm) for each extruder, offset of the hotend on the X axis
202 211
 //#define HOTEND_OFFSET_Y {0.0, 5.00}  // (in mm) for each extruder, offset of the hotend on the Y axis
203 212
 
204
-//// The following define selects which power supply you have. Please choose the one that matches your setup
205
-// 1 = ATX
206
-// 2 = X-Box 360 203Watts (the blue wire connected to PS_ON and the red wire to VCC)
207
-// :{1:'ATX',2:'X-Box 360'}
213
+/**
214
+ * Select your power supply here. Use 0 if you haven't connected the PS_ON_PIN
215
+ *
216
+ * 0 = No Power Switch
217
+ * 1 = ATX
218
+ * 2 = X-Box 360 203Watts (the blue wire connected to PS_ON and the red wire to VCC)
219
+ *
220
+ * :{0:'No power switch',1:'ATX',2:'X-Box 360'}
221
+ */
208 222
 #define POWER_SUPPLY 1
209 223
 
210
-// Define this to have the electronics keep the power supply off on startup. If you don't know what this is leave it.
211
-//#define PS_DEFAULT_OFF
224
+#if POWER_SUPPLY > 0
225
+  // Enable this option to leave the PSU off at startup.
226
+  // Power to steppers and heaters will need to be turned on with M80.
227
+  //#define PS_DEFAULT_OFF
228
+#endif
212 229
 
213 230
 // @section temperature
214 231
 
@@ -837,7 +854,6 @@
837 854
 #define HOMING_FEEDRATE_XY (40*60)
838 855
 #define HOMING_FEEDRATE_Z  (10*60)
839 856
 
840
-
841 857
 //=============================================================================
842 858
 //============================= Additional Features ===========================
843 859
 //=============================================================================
@@ -865,8 +881,8 @@
865 881
 // When enabled Marlin will send a busy status message to the host
866 882
 // every couple of seconds when it can't accept commands.
867 883
 //
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.
884
+#define HOST_KEEPALIVE_FEATURE        // Disable this if your host doesn't like keepalive messages
885
+#define DEFAULT_KEEPALIVE_INTERVAL 2  // Number of seconds between "busy" messages. Set with M113.
870 886
 
871 887
 //
872 888
 // M100 Free Memory Watcher

+ 1
- 1
Marlin/example_configurations/SCARA/Configuration_adv.h View File

@@ -553,7 +553,7 @@
553 553
 // The number of linear motions that can be in the plan at any give time.
554 554
 // THE BLOCK_BUFFER_SIZE NEEDS TO BE A POWER OF 2, i.g. 8,16,32 because shifts and ors are used to do the ring-buffering.
555 555
 #if ENABLED(SDSUPPORT)
556
-  #define BLOCK_BUFFER_SIZE 16   // SD,LCD,Buttons take more memory, block buffer needs to be smaller
556
+  #define BLOCK_BUFFER_SIZE 16 // SD,LCD,Buttons take more memory, block buffer needs to be smaller
557 557
 #else
558 558
   #define BLOCK_BUFFER_SIZE 16 // maximize block buffer
559 559
 #endif

+ 33
- 17
Marlin/example_configurations/TAZ4/Configuration.h View File

@@ -88,8 +88,8 @@
88 88
 // build by the user have been successfully uploaded into firmware.
89 89
 #define STRING_CONFIG_H_AUTHOR "(Aleph Objects, Inc, TAZ  config)" // Who made the changes.
90 90
 #define SHOW_BOOTSCREEN
91
-#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during boot in line 1
92
-#define STRING_SPLASH_LINE2 WEBSITE_URL         // will be shown during boot in line 2
91
+#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during bootup in line 1
92
+#define STRING_SPLASH_LINE2 WEBSITE_URL         // will be shown during bootup in line 2
93 93
 
94 94
 //
95 95
 // *** VENDORS PLEASE READ *****************************************************
@@ -105,15 +105,24 @@
105 105
 //#define SHOW_CUSTOM_BOOTSCREEN
106 106
 // @section machine
107 107
 
108
-// SERIAL_PORT selects which serial port should be used for communication with the host.
109
-// This allows the connection of wireless adapters (for instance) to non-default port pins.
110
-// Serial port 0 is still used by the Arduino bootloader regardless of this setting.
111
-// :[0,1,2,3,4,5,6,7]
108
+/**
109
+ * Select which serial port on the board will be used for communication with the host.
110
+ * This allows the connection of wireless adapters (for instance) to non-default port pins.
111
+ * Serial port 0 is always used by the Arduino bootloader regardless of this setting.
112
+ *
113
+ * :[0,1,2,3,4,5,6,7]
114
+ */
112 115
 #define SERIAL_PORT 0
113 116
 
114
-// This determines the communication speed of the printer
115
-// :[2400,9600,19200,38400,57600,115200,250000]
116 117
 #define BAUDRATE 250000
118
+/**
119
+ * This setting determines the communication speed of the printer.
120
+ *
121
+ * 250000 works in most cases, but you might try a lower speed if
122
+ * you commonly experience drop-outs during host printing.
123
+ *
124
+ * :[2400,9600,19200,38400,57600,115200,250000]
125
+ */
117 126
 
118 127
 // Enable the Bluetooth serial interface on AT90USB devices
119 128
 //#define BLUETOOTH
@@ -169,14 +178,22 @@
169 178
 //#define HOTEND_OFFSET_X {0.0, 20.00} // (in mm) for each extruder, offset of the hotend on the X axis
170 179
 //#define HOTEND_OFFSET_Y {0.0, 5.00}  // (in mm) for each extruder, offset of the hotend on the Y axis
171 180
 
172
-//// The following define selects which power supply you have. Please choose the one that matches your setup
173
-// 1 = ATX
174
-// 2 = X-Box 360 203Watts (the blue wire connected to PS_ON and the red wire to VCC)
175
-// :{1:'ATX',2:'X-Box 360'}
181
+/**
182
+ * Select your power supply here. Use 0 if you haven't connected the PS_ON_PIN
183
+ *
184
+ * 0 = No Power Switch
185
+ * 1 = ATX
186
+ * 2 = X-Box 360 203Watts (the blue wire connected to PS_ON and the red wire to VCC)
187
+ *
188
+ * :{0:'No power switch',1:'ATX',2:'X-Box 360'}
189
+ */
176 190
 #define POWER_SUPPLY 1
177 191
 
178
-// Define this to have the electronics keep the power supply off on startup. If you don't know what this is leave it.
179
-//#define PS_DEFAULT_OFF
192
+#if POWER_SUPPLY > 0
193
+  // Enable this option to leave the PSU off at startup.
194
+  // Power to steppers and heaters will need to be turned on with M80.
195
+  //#define PS_DEFAULT_OFF
196
+#endif
180 197
 
181 198
 // @section temperature
182 199
 
@@ -843,7 +860,6 @@
843 860
 #define HOMING_FEEDRATE_XY (50*60)
844 861
 #define HOMING_FEEDRATE_Z  (8*60)
845 862
 
846
-
847 863
 //=============================================================================
848 864
 //============================= Additional Features ===========================
849 865
 //=============================================================================
@@ -871,8 +887,8 @@
871 887
 // When enabled Marlin will send a busy status message to the host
872 888
 // every couple of seconds when it can't accept commands.
873 889
 //
874
-#define HOST_KEEPALIVE_FEATURE       // Disable this if your host doesn't like keepalive messages
875
-#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
890
+#define HOST_KEEPALIVE_FEATURE        // Disable this if your host doesn't like keepalive messages
891
+#define DEFAULT_KEEPALIVE_INTERVAL 2  // Number of seconds between "busy" messages. Set with M113.
876 892
 
877 893
 //
878 894
 // M100 Free Memory Watcher

+ 1
- 1
Marlin/example_configurations/TAZ4/Configuration_adv.h View File

@@ -561,7 +561,7 @@
561 561
 // The number of linear motions that can be in the plan at any give time.
562 562
 // THE BLOCK_BUFFER_SIZE NEEDS TO BE A POWER OF 2, i.g. 8,16,32 because shifts and ors are used to do the ring-buffering.
563 563
 #if ENABLED(SDSUPPORT)
564
-  #define BLOCK_BUFFER_SIZE 16   // SD,LCD,Buttons take more memory, block buffer needs to be smaller
564
+  #define BLOCK_BUFFER_SIZE 16 // SD,LCD,Buttons take more memory, block buffer needs to be smaller
565 565
 #else
566 566
   #define BLOCK_BUFFER_SIZE 16 // maximize block buffer
567 567
 #endif

+ 33
- 17
Marlin/example_configurations/WITBOX/Configuration.h View File

@@ -88,8 +88,8 @@
88 88
 // build by the user have been successfully uploaded into firmware.
89 89
 #define STRING_CONFIG_H_AUTHOR "(bq Witbox)" // Who made the changes.
90 90
 #define SHOW_BOOTSCREEN
91
-#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during boot in line 1
92
-#define STRING_SPLASH_LINE2 WEBSITE_URL         // will be shown during boot in line 2
91
+#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during bootup in line 1
92
+#define STRING_SPLASH_LINE2 WEBSITE_URL         // will be shown during bootup in line 2
93 93
 
94 94
 //
95 95
 // *** VENDORS PLEASE READ *****************************************************
@@ -105,15 +105,24 @@
105 105
 //#define SHOW_CUSTOM_BOOTSCREEN
106 106
 // @section machine
107 107
 
108
-// SERIAL_PORT selects which serial port should be used for communication with the host.
109
-// This allows the connection of wireless adapters (for instance) to non-default port pins.
110
-// Serial port 0 is still used by the Arduino bootloader regardless of this setting.
111
-// :[0,1,2,3,4,5,6,7]
108
+/**
109
+ * Select which serial port on the board will be used for communication with the host.
110
+ * This allows the connection of wireless adapters (for instance) to non-default port pins.
111
+ * Serial port 0 is always used by the Arduino bootloader regardless of this setting.
112
+ *
113
+ * :[0,1,2,3,4,5,6,7]
114
+ */
112 115
 #define SERIAL_PORT 0
113 116
 
114
-// This determines the communication speed of the printer
115
-// :[2400,9600,19200,38400,57600,115200,250000]
116 117
 #define BAUDRATE 115200
118
+/**
119
+ * This setting determines the communication speed of the printer.
120
+ *
121
+ * 250000 works in most cases, but you might try a lower speed if
122
+ * you commonly experience drop-outs during host printing.
123
+ *
124
+ * :[2400,9600,19200,38400,57600,115200,250000]
125
+ */
117 126
 
118 127
 // Enable the Bluetooth serial interface on AT90USB devices
119 128
 //#define BLUETOOTH
@@ -172,14 +181,22 @@
172 181
 //#define HOTEND_OFFSET_X {0.0, 20.00} // (in mm) for each extruder, offset of the hotend on the X axis
173 182
 //#define HOTEND_OFFSET_Y {0.0, 5.00}  // (in mm) for each extruder, offset of the hotend on the Y axis
174 183
 
175
-//// The following define selects which power supply you have. Please choose the one that matches your setup
176
-// 1 = ATX
177
-// 2 = X-Box 360 203Watts (the blue wire connected to PS_ON and the red wire to VCC)
178
-// :{1:'ATX',2:'X-Box 360'}
184
+/**
185
+ * Select your power supply here. Use 0 if you haven't connected the PS_ON_PIN
186
+ *
187
+ * 0 = No Power Switch
188
+ * 1 = ATX
189
+ * 2 = X-Box 360 203Watts (the blue wire connected to PS_ON and the red wire to VCC)
190
+ *
191
+ * :{0:'No power switch',1:'ATX',2:'X-Box 360'}
192
+ */
179 193
 #define POWER_SUPPLY 1
180 194
 
181
-// Define this to have the electronics keep the power supply off on startup. If you don't know what this is leave it.
182
-//#define PS_DEFAULT_OFF
195
+#if POWER_SUPPLY > 0
196
+  // Enable this option to leave the PSU off at startup.
197
+  // Power to steppers and heaters will need to be turned on with M80.
198
+  //#define PS_DEFAULT_OFF
199
+#endif
183 200
 
184 201
 // @section temperature
185 202
 
@@ -814,7 +831,6 @@
814 831
 #define HOMING_FEEDRATE_XY (120*60)
815 832
 #define HOMING_FEEDRATE_Z  432
816 833
 
817
-
818 834
 //=============================================================================
819 835
 //============================= Additional Features ===========================
820 836
 //=============================================================================
@@ -842,8 +858,8 @@
842 858
 // When enabled Marlin will send a busy status message to the host
843 859
 // every couple of seconds when it can't accept commands.
844 860
 //
845
-#define HOST_KEEPALIVE_FEATURE       // Disable this if your host doesn't like keepalive messages
846
-#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
861
+#define HOST_KEEPALIVE_FEATURE        // Disable this if your host doesn't like keepalive messages
862
+#define DEFAULT_KEEPALIVE_INTERVAL 2  // Number of seconds between "busy" messages. Set with M113.
847 863
 
848 864
 //
849 865
 // M100 Free Memory Watcher

+ 1
- 1
Marlin/example_configurations/WITBOX/Configuration_adv.h View File

@@ -553,7 +553,7 @@
553 553
 // The number of linear motions that can be in the plan at any give time.
554 554
 // THE BLOCK_BUFFER_SIZE NEEDS TO BE A POWER OF 2, i.g. 8,16,32 because shifts and ors are used to do the ring-buffering.
555 555
 #if ENABLED(SDSUPPORT)
556
-  #define BLOCK_BUFFER_SIZE 16   // SD,LCD,Buttons take more memory, block buffer needs to be smaller
556
+  #define BLOCK_BUFFER_SIZE 16 // SD,LCD,Buttons take more memory, block buffer needs to be smaller
557 557
 #else
558 558
   #define BLOCK_BUFFER_SIZE 16 // maximize block buffer
559 559
 #endif

+ 33
- 17
Marlin/example_configurations/adafruit/ST7565/Configuration.h View File

@@ -88,8 +88,8 @@
88 88
 // build by the user have been successfully uploaded into firmware.
89 89
 #define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes.
90 90
 #define SHOW_BOOTSCREEN
91
-#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during boot in line 1
92
-#define STRING_SPLASH_LINE2 WEBSITE_URL         // will be shown during boot in line 2
91
+#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during bootup in line 1
92
+#define STRING_SPLASH_LINE2 WEBSITE_URL         // will be shown during bootup in line 2
93 93
 
94 94
 //
95 95
 // *** VENDORS PLEASE READ *****************************************************
@@ -105,15 +105,24 @@
105 105
 //#define SHOW_CUSTOM_BOOTSCREEN
106 106
 // @section machine
107 107
 
108
-// SERIAL_PORT selects which serial port should be used for communication with the host.
109
-// This allows the connection of wireless adapters (for instance) to non-default port pins.
110
-// Serial port 0 is still used by the Arduino bootloader regardless of this setting.
111
-// :[0,1,2,3,4,5,6,7]
108
+/**
109
+ * Select which serial port on the board will be used for communication with the host.
110
+ * This allows the connection of wireless adapters (for instance) to non-default port pins.
111
+ * Serial port 0 is always used by the Arduino bootloader regardless of this setting.
112
+ *
113
+ * :[0,1,2,3,4,5,6,7]
114
+ */
112 115
 #define SERIAL_PORT 0
113 116
 
114
-// This determines the communication speed of the printer
115
-// :[2400,9600,19200,38400,57600,115200,250000]
116 117
 #define BAUDRATE 250000
118
+/**
119
+ * This setting determines the communication speed of the printer.
120
+ *
121
+ * 250000 works in most cases, but you might try a lower speed if
122
+ * you commonly experience drop-outs during host printing.
123
+ *
124
+ * :[2400,9600,19200,38400,57600,115200,250000]
125
+ */
117 126
 
118 127
 // Enable the Bluetooth serial interface on AT90USB devices
119 128
 //#define BLUETOOTH
@@ -169,14 +178,22 @@
169 178
 //#define HOTEND_OFFSET_X {0.0, 20.00} // (in mm) for each extruder, offset of the hotend on the X axis
170 179
 //#define HOTEND_OFFSET_Y {0.0, 5.00}  // (in mm) for each extruder, offset of the hotend on the Y axis
171 180
 
172
-//// The following define selects which power supply you have. Please choose the one that matches your setup
173
-// 1 = ATX
174
-// 2 = X-Box 360 203Watts (the blue wire connected to PS_ON and the red wire to VCC)
175
-// :{1:'ATX',2:'X-Box 360'}
181
+/**
182
+ * Select your power supply here. Use 0 if you haven't connected the PS_ON_PIN
183
+ *
184
+ * 0 = No Power Switch
185
+ * 1 = ATX
186
+ * 2 = X-Box 360 203Watts (the blue wire connected to PS_ON and the red wire to VCC)
187
+ *
188
+ * :{0:'No power switch',1:'ATX',2:'X-Box 360'}
189
+ */
176 190
 #define POWER_SUPPLY 1
177 191
 
178
-// Define this to have the electronics keep the power supply off on startup. If you don't know what this is leave it.
179
-//#define PS_DEFAULT_OFF
192
+#if POWER_SUPPLY > 0
193
+  // Enable this option to leave the PSU off at startup.
194
+  // Power to steppers and heaters will need to be turned on with M80.
195
+  //#define PS_DEFAULT_OFF
196
+#endif
180 197
 
181 198
 // @section temperature
182 199
 
@@ -822,7 +839,6 @@
822 839
 #define HOMING_FEEDRATE_XY (50*60)
823 840
 #define HOMING_FEEDRATE_Z  (4*60)
824 841
 
825
-
826 842
 //=============================================================================
827 843
 //============================= Additional Features ===========================
828 844
 //=============================================================================
@@ -850,8 +866,8 @@
850 866
 // When enabled Marlin will send a busy status message to the host
851 867
 // every couple of seconds when it can't accept commands.
852 868
 //
853
-#define HOST_KEEPALIVE_FEATURE       // Disable this if your host doesn't like keepalive messages
854
-#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
869
+#define HOST_KEEPALIVE_FEATURE        // Disable this if your host doesn't like keepalive messages
870
+#define DEFAULT_KEEPALIVE_INTERVAL 2  // Number of seconds between "busy" messages. Set with M113.
855 871
 
856 872
 //
857 873
 // M100 Free Memory Watcher

+ 38
- 23
Marlin/example_configurations/delta/biv2.5/Configuration.h View File

@@ -88,8 +88,8 @@
88 88
 // build by the user have been successfully uploaded into firmware.
89 89
 #define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes.
90 90
 #define SHOW_BOOTSCREEN
91
-#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during boot in line 1
92
-#define STRING_SPLASH_LINE2 WEBSITE_URL         // will be shown during boot in line 2
91
+#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during bootup in line 1
92
+#define STRING_SPLASH_LINE2 WEBSITE_URL         // will be shown during bootup in line 2
93 93
 
94 94
 //
95 95
 // *** VENDORS PLEASE READ *****************************************************
@@ -105,15 +105,24 @@
105 105
 //#define SHOW_CUSTOM_BOOTSCREEN
106 106
 // @section machine
107 107
 
108
-// SERIAL_PORT selects which serial port should be used for communication with the host.
109
-// This allows the connection of wireless adapters (for instance) to non-default port pins.
110
-// Serial port 0 is still used by the Arduino bootloader regardless of this setting.
111
-// :[0,1,2,3,4,5,6,7]
108
+/**
109
+ * Select which serial port on the board will be used for communication with the host.
110
+ * This allows the connection of wireless adapters (for instance) to non-default port pins.
111
+ * Serial port 0 is always used by the Arduino bootloader regardless of this setting.
112
+ *
113
+ * :[0,1,2,3,4,5,6,7]
114
+ */
112 115
 #define SERIAL_PORT 0
113 116
 
114
-// This determines the communication speed of the printer
115
-// :[2400,9600,19200,38400,57600,115200,250000]
116 117
 #define BAUDRATE 250000
118
+/**
119
+ * This setting determines the communication speed of the printer.
120
+ *
121
+ * 250000 works in most cases, but you might try a lower speed if
122
+ * you commonly experience drop-outs during host printing.
123
+ *
124
+ * :[2400,9600,19200,38400,57600,115200,250000]
125
+ */
117 126
 
118 127
 // Enable the Bluetooth serial interface on AT90USB devices
119 128
 //#define BLUETOOTH
@@ -169,14 +178,22 @@
169 178
 //#define HOTEND_OFFSET_X {0.0, 20.00} // (in mm) for each extruder, offset of the hotend on the X axis
170 179
 //#define HOTEND_OFFSET_Y {0.0, 5.00}  // (in mm) for each extruder, offset of the hotend on the Y axis
171 180
 
172
-//// The following define selects which power supply you have. Please choose the one that matches your setup
173
-// 1 = ATX
174
-// 2 = X-Box 360 203Watts (the blue wire connected to PS_ON and the red wire to VCC)
175
-// :{1:'ATX',2:'X-Box 360'}
181
+/**
182
+ * Select your power supply here. Use 0 if you haven't connected the PS_ON_PIN
183
+ *
184
+ * 0 = No Power Switch
185
+ * 1 = ATX
186
+ * 2 = X-Box 360 203Watts (the blue wire connected to PS_ON and the red wire to VCC)
187
+ *
188
+ * :{0:'No power switch',1:'ATX',2:'X-Box 360'}
189
+ */
176 190
 #define POWER_SUPPLY 1
177 191
 
178
-// Define this to have the electronics keep the power supply off on startup. If you don't know what this is leave it.
179
-//#define PS_DEFAULT_OFF
192
+#if POWER_SUPPLY > 0
193
+  // Enable this option to leave the PSU off at startup.
194
+  // Power to steppers and heaters will need to be turned on with M80.
195
+  //#define PS_DEFAULT_OFF
196
+#endif
180 197
 
181 198
 // @section temperature
182 199
 
@@ -614,16 +631,16 @@
614 631
   #define Z_PROBE_ALLEN_KEY_DEPLOY_2_Z 100.0
615 632
   #define Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE XY_PROBE_SPEED
616 633
 
617
-  #define Z_PROBE_ALLEN_KEY_DEPLOY_3_X Z_PROBE_ALLEN_KEY_DEPLOY_2_X * 0.75
618
-  #define Z_PROBE_ALLEN_KEY_DEPLOY_3_Y Z_PROBE_ALLEN_KEY_DEPLOY_2_Y * 0.75
619
-  #define Z_PROBE_ALLEN_KEY_DEPLOY_3_Z Z_PROBE_ALLEN_KEY_DEPLOY_2_Z
620
-  #define Z_PROBE_ALLEN_KEY_DEPLOY_3_FEEDRATE XY_PROBE_SPEED
621
-
622 634
   #define Z_PROBE_ALLEN_KEY_DEPLOY_3_X 45.00 // Move right to trigger deploy pin
623 635
   #define Z_PROBE_ALLEN_KEY_DEPLOY_3_Y -125.00
624 636
   #define Z_PROBE_ALLEN_KEY_DEPLOY_3_Z 100.0
625 637
   #define Z_PROBE_ALLEN_KEY_DEPLOY_3_FEEDRATE (XY_PROBE_SPEED)/2
626 638
 
639
+  #define Z_PROBE_ALLEN_KEY_DEPLOY_4_X Z_PROBE_ALLEN_KEY_DEPLOY_3_X * 0.75
640
+  #define Z_PROBE_ALLEN_KEY_DEPLOY_4_Y Z_PROBE_ALLEN_KEY_DEPLOY_3_Y * 0.75
641
+  #define Z_PROBE_ALLEN_KEY_DEPLOY_4_Z Z_PROBE_ALLEN_KEY_DEPLOY_3_Z
642
+  #define Z_PROBE_ALLEN_KEY_DEPLOY_4_FEEDRATE XY_PROBE_SPEED
643
+
627 644
   #define Z_PROBE_ALLEN_KEY_STOW_1_X 36.00 // Line up with bed retaining clip
628 645
   #define Z_PROBE_ALLEN_KEY_STOW_1_Y -122.00
629 646
   #define Z_PROBE_ALLEN_KEY_STOW_1_Z 75.0
@@ -910,11 +927,9 @@
910 927
   #define Z_SAFE_HOMING_Y_POINT ((Y_MIN_POS + Y_MAX_POS) / 2)    // Y point for Z homing when homing all axis (G28).
911 928
 #endif
912 929
 
913
-
914 930
 // Delta only homes to Z
915 931
 #define HOMING_FEEDRATE_Z  (200*30)
916 932
 
917
-
918 933
 //=============================================================================
919 934
 //============================= Additional Features ===========================
920 935
 //=============================================================================
@@ -942,8 +957,8 @@
942 957
 // When enabled Marlin will send a busy status message to the host
943 958
 // every couple of seconds when it can't accept commands.
944 959
 //
945
-#define HOST_KEEPALIVE_FEATURE       // Disable this if your host doesn't like keepalive messages
946
-#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
960
+#define HOST_KEEPALIVE_FEATURE        // Disable this if your host doesn't like keepalive messages
961
+#define DEFAULT_KEEPALIVE_INTERVAL 2  // Number of seconds between "busy" messages. Set with M113.
947 962
 
948 963
 //
949 964
 // M100 Free Memory Watcher

+ 1
- 1
Marlin/example_configurations/delta/biv2.5/Configuration_adv.h View File

@@ -555,7 +555,7 @@
555 555
 // The number of linear motions that can be in the plan at any give time.
556 556
 // THE BLOCK_BUFFER_SIZE NEEDS TO BE A POWER OF 2, i.g. 8,16,32 because shifts and ors are used to do the ring-buffering.
557 557
 #if ENABLED(SDSUPPORT)
558
-  #define BLOCK_BUFFER_SIZE 16   // SD,LCD,Buttons take more memory, block buffer needs to be smaller
558
+  #define BLOCK_BUFFER_SIZE 16 // SD,LCD,Buttons take more memory, block buffer needs to be smaller
559 559
 #else
560 560
   #define BLOCK_BUFFER_SIZE 16 // maximize block buffer
561 561
 #endif

+ 33
- 18
Marlin/example_configurations/delta/generic/Configuration.h View File

@@ -88,8 +88,8 @@
88 88
 // build by the user have been successfully uploaded into firmware.
89 89
 #define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes.
90 90
 #define SHOW_BOOTSCREEN
91
-#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during boot in line 1
92
-#define STRING_SPLASH_LINE2 WEBSITE_URL         // will be shown during boot in line 2
91
+#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during bootup in line 1
92
+#define STRING_SPLASH_LINE2 WEBSITE_URL         // will be shown during bootup in line 2
93 93
 
94 94
 //
95 95
 // *** VENDORS PLEASE READ *****************************************************
@@ -105,15 +105,24 @@
105 105
 //#define SHOW_CUSTOM_BOOTSCREEN
106 106
 // @section machine
107 107
 
108
-// SERIAL_PORT selects which serial port should be used for communication with the host.
109
-// This allows the connection of wireless adapters (for instance) to non-default port pins.
110
-// Serial port 0 is still used by the Arduino bootloader regardless of this setting.
111
-// :[0,1,2,3,4,5,6,7]
108
+/**
109
+ * Select which serial port on the board will be used for communication with the host.
110
+ * This allows the connection of wireless adapters (for instance) to non-default port pins.
111
+ * Serial port 0 is always used by the Arduino bootloader regardless of this setting.
112
+ *
113
+ * :[0,1,2,3,4,5,6,7]
114
+ */
112 115
 #define SERIAL_PORT 0
113 116
 
114
-// This determines the communication speed of the printer
115
-// :[2400,9600,19200,38400,57600,115200,250000]
116 117
 #define BAUDRATE 250000
118
+/**
119
+ * This setting determines the communication speed of the printer.
120
+ *
121
+ * 250000 works in most cases, but you might try a lower speed if
122
+ * you commonly experience drop-outs during host printing.
123
+ *
124
+ * :[2400,9600,19200,38400,57600,115200,250000]
125
+ */
117 126
 
118 127
 // Enable the Bluetooth serial interface on AT90USB devices
119 128
 //#define BLUETOOTH
@@ -169,14 +178,22 @@
169 178
 //#define HOTEND_OFFSET_X {0.0, 20.00} // (in mm) for each extruder, offset of the hotend on the X axis
170 179
 //#define HOTEND_OFFSET_Y {0.0, 5.00}  // (in mm) for each extruder, offset of the hotend on the Y axis
171 180
 
172
-//// The following define selects which power supply you have. Please choose the one that matches your setup
173
-// 1 = ATX
174
-// 2 = X-Box 360 203Watts (the blue wire connected to PS_ON and the red wire to VCC)
175
-// :{1:'ATX',2:'X-Box 360'}
181
+/**
182
+ * Select your power supply here. Use 0 if you haven't connected the PS_ON_PIN
183
+ *
184
+ * 0 = No Power Switch
185
+ * 1 = ATX
186
+ * 2 = X-Box 360 203Watts (the blue wire connected to PS_ON and the red wire to VCC)
187
+ *
188
+ * :{0:'No power switch',1:'ATX',2:'X-Box 360'}
189
+ */
176 190
 #define POWER_SUPPLY 1
177 191
 
178
-// Define this to have the electronics keep the power supply off on startup. If you don't know what this is leave it.
179
-//#define PS_DEFAULT_OFF
192
+#if POWER_SUPPLY > 0
193
+  // Enable this option to leave the PSU off at startup.
194
+  // Power to steppers and heaters will need to be turned on with M80.
195
+  //#define PS_DEFAULT_OFF
196
+#endif
180 197
 
181 198
 // @section temperature
182 199
 
@@ -904,11 +921,9 @@
904 921
   #define Z_SAFE_HOMING_Y_POINT ((Y_MIN_POS + Y_MAX_POS) / 2)    // Y point for Z homing when homing all axis (G28).
905 922
 #endif
906 923
 
907
-
908 924
 // Delta only homes to Z
909 925
 #define HOMING_FEEDRATE_Z  (200*60)
910 926
 
911
-
912 927
 //=============================================================================
913 928
 //============================= Additional Features ===========================
914 929
 //=============================================================================
@@ -936,8 +951,8 @@
936 951
 // When enabled Marlin will send a busy status message to the host
937 952
 // every couple of seconds when it can't accept commands.
938 953
 //
939
-#define HOST_KEEPALIVE_FEATURE       // Disable this if your host doesn't like keepalive messages
940
-#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
954
+#define HOST_KEEPALIVE_FEATURE        // Disable this if your host doesn't like keepalive messages
955
+#define DEFAULT_KEEPALIVE_INTERVAL 2  // Number of seconds between "busy" messages. Set with M113.
941 956
 
942 957
 //
943 958
 // M100 Free Memory Watcher

+ 1
- 1
Marlin/example_configurations/delta/generic/Configuration_adv.h View File

@@ -555,7 +555,7 @@
555 555
 // The number of linear motions that can be in the plan at any give time.
556 556
 // THE BLOCK_BUFFER_SIZE NEEDS TO BE A POWER OF 2, i.g. 8,16,32 because shifts and ors are used to do the ring-buffering.
557 557
 #if ENABLED(SDSUPPORT)
558
-  #define BLOCK_BUFFER_SIZE 16   // SD,LCD,Buttons take more memory, block buffer needs to be smaller
558
+  #define BLOCK_BUFFER_SIZE 16 // SD,LCD,Buttons take more memory, block buffer needs to be smaller
559 559
 #else
560 560
   #define BLOCK_BUFFER_SIZE 16 // maximize block buffer
561 561
 #endif

+ 33
- 18
Marlin/example_configurations/delta/kossel_mini/Configuration.h View File

@@ -88,8 +88,8 @@
88 88
 // build by the user have been successfully uploaded into firmware.
89 89
 #define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes.
90 90
 #define SHOW_BOOTSCREEN
91
-#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during boot in line 1
92
-#define STRING_SPLASH_LINE2 WEBSITE_URL         // will be shown during boot in line 2
91
+#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during bootup in line 1
92
+#define STRING_SPLASH_LINE2 WEBSITE_URL         // will be shown during bootup in line 2
93 93
 
94 94
 //
95 95
 // *** VENDORS PLEASE READ *****************************************************
@@ -105,15 +105,24 @@
105 105
 //#define SHOW_CUSTOM_BOOTSCREEN
106 106
 // @section machine
107 107
 
108
-// SERIAL_PORT selects which serial port should be used for communication with the host.
109
-// This allows the connection of wireless adapters (for instance) to non-default port pins.
110
-// Serial port 0 is still used by the Arduino bootloader regardless of this setting.
111
-// :[0,1,2,3,4,5,6,7]
108
+/**
109
+ * Select which serial port on the board will be used for communication with the host.
110
+ * This allows the connection of wireless adapters (for instance) to non-default port pins.
111
+ * Serial port 0 is always used by the Arduino bootloader regardless of this setting.
112
+ *
113
+ * :[0,1,2,3,4,5,6,7]
114
+ */
112 115
 #define SERIAL_PORT 0
113 116
 
114
-// This determines the communication speed of the printer
115
-// :[2400,9600,19200,38400,57600,115200,250000]
116 117
 #define BAUDRATE 250000
118
+/**
119
+ * This setting determines the communication speed of the printer.
120
+ *
121
+ * 250000 works in most cases, but you might try a lower speed if
122
+ * you commonly experience drop-outs during host printing.
123
+ *
124
+ * :[2400,9600,19200,38400,57600,115200,250000]
125
+ */
117 126
 
118 127
 // Enable the Bluetooth serial interface on AT90USB devices
119 128
 //#define BLUETOOTH
@@ -169,14 +178,22 @@
169 178
 //#define HOTEND_OFFSET_X {0.0, 20.00} // (in mm) for each extruder, offset of the hotend on the X axis
170 179
 //#define HOTEND_OFFSET_Y {0.0, 5.00}  // (in mm) for each extruder, offset of the hotend on the Y axis
171 180
 
172
-//// The following define selects which power supply you have. Please choose the one that matches your setup
173
-// 1 = ATX
174
-// 2 = X-Box 360 203Watts (the blue wire connected to PS_ON and the red wire to VCC)
175
-// :{1:'ATX',2:'X-Box 360'}
181
+/**
182
+ * Select your power supply here. Use 0 if you haven't connected the PS_ON_PIN
183
+ *
184
+ * 0 = No Power Switch
185
+ * 1 = ATX
186
+ * 2 = X-Box 360 203Watts (the blue wire connected to PS_ON and the red wire to VCC)
187
+ *
188
+ * :{0:'No power switch',1:'ATX',2:'X-Box 360'}
189
+ */
176 190
 #define POWER_SUPPLY 1
177 191
 
178
-// Define this to have the electronics keep the power supply off on startup. If you don't know what this is leave it.
179
-//#define PS_DEFAULT_OFF
192
+#if POWER_SUPPLY > 0
193
+  // Enable this option to leave the PSU off at startup.
194
+  // Power to steppers and heaters will need to be turned on with M80.
195
+  //#define PS_DEFAULT_OFF
196
+#endif
180 197
 
181 198
 // @section temperature
182 199
 
@@ -907,11 +924,9 @@
907 924
   #define Z_SAFE_HOMING_Y_POINT ((Y_MIN_POS + Y_MAX_POS) / 2)    // Y point for Z homing when homing all axis (G28).
908 925
 #endif
909 926
 
910
-
911 927
 // Delta only homes to Z
912 928
 #define HOMING_FEEDRATE_Z  (200*60)
913 929
 
914
-
915 930
 //=============================================================================
916 931
 //============================= Additional Features ===========================
917 932
 //=============================================================================
@@ -939,8 +954,8 @@
939 954
 // When enabled Marlin will send a busy status message to the host
940 955
 // every couple of seconds when it can't accept commands.
941 956
 //
942
-#define HOST_KEEPALIVE_FEATURE       // Disable this if your host doesn't like keepalive messages
943
-#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
957
+#define HOST_KEEPALIVE_FEATURE        // Disable this if your host doesn't like keepalive messages
958
+#define DEFAULT_KEEPALIVE_INTERVAL 2  // Number of seconds between "busy" messages. Set with M113.
944 959
 
945 960
 //
946 961
 // M100 Free Memory Watcher

+ 2
- 1
Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h View File

@@ -364,6 +364,7 @@
364 364
 #define DEFAULT_MINSEGMENTTIME        20000
365 365
 
366 366
 // If defined the movements slow down when the look ahead buffer is only half full
367
+// (don't use SLOWDOWN with DELTA because DELTA generates hundreds of segments per second)
367 368
 //#define SLOWDOWN
368 369
 
369 370
 // Frequency limit
@@ -554,7 +555,7 @@
554 555
 // The number of linear motions that can be in the plan at any give time.
555 556
 // THE BLOCK_BUFFER_SIZE NEEDS TO BE A POWER OF 2, i.g. 8,16,32 because shifts and ors are used to do the ring-buffering.
556 557
 #if ENABLED(SDSUPPORT)
557
-  #define BLOCK_BUFFER_SIZE 16   // SD,LCD,Buttons take more memory, block buffer needs to be smaller
558
+  #define BLOCK_BUFFER_SIZE 16 // SD,LCD,Buttons take more memory, block buffer needs to be smaller
558 559
 #else
559 560
   #define BLOCK_BUFFER_SIZE 16 // maximize block buffer
560 561
 #endif

+ 37
- 21
Marlin/example_configurations/delta/kossel_pro/Configuration.h View File

@@ -94,8 +94,8 @@
94 94
 // build by the user have been successfully uploaded into firmware.
95 95
 #define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes.
96 96
 #define SHOW_BOOTSCREEN
97
-#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during boot in line 1
98
-#define STRING_SPLASH_LINE2 WEBSITE_URL         // will be shown during boot in line 2
97
+#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during bootup in line 1
98
+#define STRING_SPLASH_LINE2 WEBSITE_URL         // will be shown during bootup in line 2
99 99
 
100 100
 //
101 101
 // *** VENDORS PLEASE READ *****************************************************
@@ -111,15 +111,24 @@
111 111
 //#define SHOW_CUSTOM_BOOTSCREEN
112 112
 // @section machine
113 113
 
114
-// SERIAL_PORT selects which serial port should be used for communication with the host.
115
-// This allows the connection of wireless adapters (for instance) to non-default port pins.
116
-// Serial port 0 is still used by the Arduino bootloader regardless of this setting.
117
-// :[0,1,2,3,4,5,6,7]
114
+/**
115
+ * Select which serial port on the board will be used for communication with the host.
116
+ * This allows the connection of wireless adapters (for instance) to non-default port pins.
117
+ * Serial port 0 is always used by the Arduino bootloader regardless of this setting.
118
+ *
119
+ * :[0,1,2,3,4,5,6,7]
120
+ */
118 121
 #define SERIAL_PORT 0
119 122
 
120
-// This determines the communication speed of the printer
121
-// :[2400,9600,19200,38400,57600,115200,250000]
122 123
 #define BAUDRATE 115200
124
+/**
125
+ * This setting determines the communication speed of the printer.
126
+ *
127
+ * 250000 works in most cases, but you might try a lower speed if
128
+ * you commonly experience drop-outs during host printing.
129
+ *
130
+ * :[2400,9600,19200,38400,57600,115200,250000]
131
+ */
123 132
 
124 133
 // Enable the Bluetooth serial interface on AT90USB devices
125 134
 //#define BLUETOOTH
@@ -175,14 +184,22 @@
175 184
 //#define HOTEND_OFFSET_X {0.0, 20.00} // (in mm) for each extruder, offset of the hotend on the X axis
176 185
 //#define HOTEND_OFFSET_Y {0.0, 5.00}  // (in mm) for each extruder, offset of the hotend on the Y axis
177 186
 
178
-//// The following define selects which power supply you have. Please choose the one that matches your setup
179
-// 1 = ATX
180
-// 2 = X-Box 360 203Watts (the blue wire connected to PS_ON and the red wire to VCC)
181
-// :{1:'ATX',2:'X-Box 360'}
187
+/**
188
+ * Select your power supply here. Use 0 if you haven't connected the PS_ON_PIN
189
+ *
190
+ * 0 = No Power Switch
191
+ * 1 = ATX
192
+ * 2 = X-Box 360 203Watts (the blue wire connected to PS_ON and the red wire to VCC)
193
+ *
194
+ * :{0:'No power switch',1:'ATX',2:'X-Box 360'}
195
+ */
182 196
 #define POWER_SUPPLY 1
183 197
 
184
-// Define this to have the electronics keep the power supply off on startup. If you don't know what this is leave it.
185
-//#define PS_DEFAULT_OFF
198
+#if POWER_SUPPLY > 0
199
+  // Enable this option to leave the PSU off at startup.
200
+  // Power to steppers and heaters will need to be turned on with M80.
201
+  //#define PS_DEFAULT_OFF
202
+#endif
186 203
 
187 204
 // @section temperature
188 205
 
@@ -617,10 +634,10 @@
617 634
   #define Z_PROBE_ALLEN_KEY_DEPLOY_3_Z Z_PROBE_ALLEN_KEY_DEPLOY_2_Z
618 635
   #define Z_PROBE_ALLEN_KEY_DEPLOY_3_FEEDRATE XY_PROBE_SPEED
619 636
 
620
-  #define Z_PROBE_ALLEN_KEY_DEPLOY_3_X 45.00 // Move right to trigger deploy pin
621
-  #define Z_PROBE_ALLEN_KEY_DEPLOY_3_Y -125.00
622
-  #define Z_PROBE_ALLEN_KEY_DEPLOY_3_Z Z_PROBE_ALLEN_KEY_DEPLOY_2_Z
623
-  #define Z_PROBE_ALLEN_KEY_DEPLOY_3_FEEDRATE (XY_PROBE_SPEED)/2
637
+  #define Z_PROBE_ALLEN_KEY_DEPLOY_4_X 45.00 // Move right to trigger deploy pin
638
+  #define Z_PROBE_ALLEN_KEY_DEPLOY_4_Y -125.00
639
+  #define Z_PROBE_ALLEN_KEY_DEPLOY_4_Z Z_PROBE_ALLEN_KEY_DEPLOY_3_Z
640
+  #define Z_PROBE_ALLEN_KEY_DEPLOY_4_FEEDRATE (XY_PROBE_SPEED)/2
624 641
 
625 642
   #define Z_PROBE_ALLEN_KEY_STOW_1_X 36.00 // Line up with bed retaining clip
626 643
   #define Z_PROBE_ALLEN_KEY_STOW_1_Y -125.00
@@ -908,7 +925,6 @@
908 925
   #define Z_SAFE_HOMING_Y_POINT ((Y_MIN_POS + Y_MAX_POS) / 2)    // Y point for Z homing when homing all axis (G28).
909 926
 #endif
910 927
 
911
-
912 928
 // Delta only homes to Z
913 929
 #define HOMING_FEEDRATE_Z  (200*60)
914 930
 
@@ -939,8 +955,8 @@
939 955
 // When enabled Marlin will send a busy status message to the host
940 956
 // every couple of seconds when it can't accept commands.
941 957
 //
942
-#define HOST_KEEPALIVE_FEATURE       // Disable this if your host doesn't like keepalive messages
943
-#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
958
+#define HOST_KEEPALIVE_FEATURE        // Disable this if your host doesn't like keepalive messages
959
+#define DEFAULT_KEEPALIVE_INTERVAL 2  // Number of seconds between "busy" messages. Set with M113.
944 960
 
945 961
 //
946 962
 // M100 Free Memory Watcher

+ 2
- 1
Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h View File

@@ -369,6 +369,7 @@
369 369
 #define DEFAULT_MINSEGMENTTIME        20000
370 370
 
371 371
 // If defined the movements slow down when the look ahead buffer is only half full
372
+// (don't use SLOWDOWN with DELTA because DELTA generates hundreds of segments per second)
372 373
 //#define SLOWDOWN
373 374
 
374 375
 // Frequency limit
@@ -559,7 +560,7 @@
559 560
 // The number of linear motions that can be in the plan at any give time.
560 561
 // THE BLOCK_BUFFER_SIZE NEEDS TO BE A POWER OF 2, i.g. 8,16,32 because shifts and ors are used to do the ring-buffering.
561 562
 #if ENABLED(SDSUPPORT)
562
-  #define BLOCK_BUFFER_SIZE 16   // SD,LCD,Buttons take more memory, block buffer needs to be smaller
563
+  #define BLOCK_BUFFER_SIZE 16 // SD,LCD,Buttons take more memory, block buffer needs to be smaller
563 564
 #else
564 565
   #define BLOCK_BUFFER_SIZE 16 // maximize block buffer
565 566
 #endif

+ 33
- 17
Marlin/example_configurations/delta/kossel_xl/Configuration.h View File

@@ -81,8 +81,8 @@
81 81
 // build by the user have been successfully uploaded into firmware.
82 82
 #define STRING_CONFIG_H_AUTHOR "(oxivanisher)" // Who made the changes.
83 83
 #define SHOW_BOOTSCREEN
84
-#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during boot in line 1
85
-#define STRING_SPLASH_LINE2 WEBSITE_URL         // will be shown during boot in line 2
84
+#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during bootup in line 1
85
+#define STRING_SPLASH_LINE2 WEBSITE_URL         // will be shown during bootup in line 2
86 86
 
87 87
 //
88 88
 // *** VENDORS PLEASE READ *****************************************************
@@ -98,15 +98,24 @@
98 98
 //#define SHOW_CUSTOM_BOOTSCREEN
99 99
 // @section machine
100 100
 
101
-// SERIAL_PORT selects which serial port should be used for communication with the host.
102
-// This allows the connection of wireless adapters (for instance) to non-default port pins.
103
-// Serial port 0 is still used by the Arduino bootloader regardless of this setting.
104
-// :[0,1,2,3,4,5,6,7]
101
+/**
102
+ * Select which serial port on the board will be used for communication with the host.
103
+ * This allows the connection of wireless adapters (for instance) to non-default port pins.
104
+ * Serial port 0 is always used by the Arduino bootloader regardless of this setting.
105
+ *
106
+ * :[0,1,2,3,4,5,6,7]
107
+ */
105 108
 #define SERIAL_PORT 0
106 109
 
107
-// This determines the communication speed of the printer
108
-// :[2400,9600,19200,38400,57600,115200,250000]
109 110
 #define BAUDRATE 250000
111
+/**
112
+ * This setting determines the communication speed of the printer.
113
+ *
114
+ * 250000 works in most cases, but you might try a lower speed if
115
+ * you commonly experience drop-outs during host printing.
116
+ *
117
+ * :[2400,9600,19200,38400,57600,115200,250000]
118
+ */
110 119
 
111 120
 // Enable the Bluetooth serial interface on AT90USB devices
112 121
 //#define BLUETOOTH
@@ -162,14 +171,22 @@
162 171
 //#define HOTEND_OFFSET_X {0.0, 20.00} // (in mm) for each extruder, offset of the hotend on the X axis
163 172
 //#define HOTEND_OFFSET_Y {0.0, 5.00}  // (in mm) for each extruder, offset of the hotend on the Y axis
164 173
 
165
-//// The following define selects which power supply you have. Please choose the one that matches your setup
166
-// 1 = ATX
167
-// 2 = X-Box 360 203Watts (the blue wire connected to PS_ON and the red wire to VCC)
168
-// :{1:'ATX',2:'X-Box 360'}
174
+/**
175
+ * Select your power supply here. Use 0 if you haven't connected the PS_ON_PIN
176
+ *
177
+ * 0 = No Power Switch
178
+ * 1 = ATX
179
+ * 2 = X-Box 360 203Watts (the blue wire connected to PS_ON and the red wire to VCC)
180
+ *
181
+ * :{0:'No power switch',1:'ATX',2:'X-Box 360'}
182
+ */
169 183
 #define POWER_SUPPLY 2
170 184
 
171
-// Define this to have the electronics keep the power supply off on startup. If you don't know what this is leave it.
172
-#define PS_DEFAULT_OFF
185
+#if POWER_SUPPLY > 0
186
+  // Enable this option to leave the PSU off at startup.
187
+  // Power to steppers and heaters will need to be turned on with M80.
188
+  #define PS_DEFAULT_OFF
189
+#endif
173 190
 
174 191
 // @section temperature
175 192
 
@@ -913,7 +930,6 @@
913 930
 // Delta only homes to Z
914 931
 #define HOMING_FEEDRATE_Z  (60*60)
915 932
 
916
-
917 933
 //=============================================================================
918 934
 //============================= Additional Features ===========================
919 935
 //=============================================================================
@@ -941,8 +957,8 @@
941 957
 // When enabled Marlin will send a busy status message to the host
942 958
 // every couple of seconds when it can't accept commands.
943 959
 //
944
-#define HOST_KEEPALIVE_FEATURE       // Disable this if your host doesn't like keepalive messages
945
-#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
960
+#define HOST_KEEPALIVE_FEATURE        // Disable this if your host doesn't like keepalive messages
961
+#define DEFAULT_KEEPALIVE_INTERVAL 2  // Number of seconds between "busy" messages. Set with M113.
946 962
 
947 963
 //
948 964
 // M100 Free Memory Watcher

+ 1
- 1
Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h View File

@@ -555,7 +555,7 @@
555 555
 // The number of linear motions that can be in the plan at any give time.
556 556
 // THE BLOCK_BUFFER_SIZE NEEDS TO BE A POWER OF 2, i.g. 8,16,32 because shifts and ors are used to do the ring-buffering.
557 557
 #if ENABLED(SDSUPPORT)
558
-  #define BLOCK_BUFFER_SIZE 16   // SD,LCD,Buttons take more memory, block buffer needs to be smaller
558
+  #define BLOCK_BUFFER_SIZE 16 // SD,LCD,Buttons take more memory, block buffer needs to be smaller
559 559
 #else
560 560
   #define BLOCK_BUFFER_SIZE 16 // maximize block buffer
561 561
 #endif

+ 33
- 17
Marlin/example_configurations/makibox/Configuration.h View File

@@ -88,8 +88,8 @@
88 88
 // build by the user have been successfully uploaded into firmware.
89 89
 #define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes.
90 90
 #define SHOW_BOOTSCREEN
91
-#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during boot in line 1
92
-#define STRING_SPLASH_LINE2 WEBSITE_URL         // will be shown during boot in line 2
91
+#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during bootup in line 1
92
+#define STRING_SPLASH_LINE2 WEBSITE_URL         // will be shown during bootup in line 2
93 93
 
94 94
 //
95 95
 // *** VENDORS PLEASE READ *****************************************************
@@ -105,15 +105,24 @@
105 105
 //#define SHOW_CUSTOM_BOOTSCREEN
106 106
 // @section machine
107 107
 
108
-// SERIAL_PORT selects which serial port should be used for communication with the host.
109
-// This allows the connection of wireless adapters (for instance) to non-default port pins.
110
-// Serial port 0 is still used by the Arduino bootloader regardless of this setting.
111
-// :[0,1,2,3,4,5,6,7]
108
+/**
109
+ * Select which serial port on the board will be used for communication with the host.
110
+ * This allows the connection of wireless adapters (for instance) to non-default port pins.
111
+ * Serial port 0 is always used by the Arduino bootloader regardless of this setting.
112
+ *
113
+ * :[0,1,2,3,4,5,6,7]
114
+ */
112 115
 #define SERIAL_PORT 0
113 116
 
114
-// This determines the communication speed of the printer
115
-// :[2400,9600,19200,38400,57600,115200,250000]
116 117
 #define BAUDRATE 250000
118
+/**
119
+ * This setting determines the communication speed of the printer.
120
+ *
121
+ * 250000 works in most cases, but you might try a lower speed if
122
+ * you commonly experience drop-outs during host printing.
123
+ *
124
+ * :[2400,9600,19200,38400,57600,115200,250000]
125
+ */
117 126
 
118 127
 // Enable the Bluetooth serial interface on AT90USB devices
119 128
 //#define BLUETOOTH
@@ -169,14 +178,22 @@
169 178
 //#define HOTEND_OFFSET_X {0.0, 20.00} // (in mm) for each extruder, offset of the hotend on the X axis
170 179
 //#define HOTEND_OFFSET_Y {0.0, 5.00}  // (in mm) for each extruder, offset of the hotend on the Y axis
171 180
 
172
-//// The following define selects which power supply you have. Please choose the one that matches your setup
173
-// 1 = ATX
174
-// 2 = X-Box 360 203Watts (the blue wire connected to PS_ON and the red wire to VCC)
175
-// :{1:'ATX',2:'X-Box 360'}
181
+/**
182
+ * Select your power supply here. Use 0 if you haven't connected the PS_ON_PIN
183
+ *
184
+ * 0 = No Power Switch
185
+ * 1 = ATX
186
+ * 2 = X-Box 360 203Watts (the blue wire connected to PS_ON and the red wire to VCC)
187
+ *
188
+ * :{0:'No power switch',1:'ATX',2:'X-Box 360'}
189
+ */
176 190
 #define POWER_SUPPLY 1
177 191
 
178
-// Define this to have the electronics keep the power supply off on startup. If you don't know what this is leave it.
179
-//#define PS_DEFAULT_OFF
192
+#if POWER_SUPPLY > 0
193
+  // Enable this option to leave the PSU off at startup.
194
+  // Power to steppers and heaters will need to be turned on with M80.
195
+  //#define PS_DEFAULT_OFF
196
+#endif
180 197
 
181 198
 // @section temperature
182 199
 
@@ -825,7 +842,6 @@
825 842
 #define HOMING_FEEDRATE_XY 1500
826 843
 #define HOMING_FEEDRATE_Z  (2*60)
827 844
 
828
-
829 845
 //=============================================================================
830 846
 //============================= Additional Features ===========================
831 847
 //=============================================================================
@@ -853,8 +869,8 @@
853 869
 // When enabled Marlin will send a busy status message to the host
854 870
 // every couple of seconds when it can't accept commands.
855 871
 //
856
-#define HOST_KEEPALIVE_FEATURE       // Disable this if your host doesn't like keepalive messages
857
-#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
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.
858 874
 
859 875
 //
860 876
 // M100 Free Memory Watcher

+ 1
- 1
Marlin/example_configurations/makibox/Configuration_adv.h View File

@@ -553,7 +553,7 @@
553 553
 // The number of linear motions that can be in the plan at any give time.
554 554
 // THE BLOCK_BUFFER_SIZE NEEDS TO BE A POWER OF 2, i.g. 8,16,32 because shifts and ors are used to do the ring-buffering.
555 555
 #if ENABLED(SDSUPPORT)
556
-  #define BLOCK_BUFFER_SIZE 16   // SD,LCD,Buttons take more memory, block buffer needs to be smaller
556
+  #define BLOCK_BUFFER_SIZE 16 // SD,LCD,Buttons take more memory, block buffer needs to be smaller
557 557
 #else
558 558
   #define BLOCK_BUFFER_SIZE 16 // maximize block buffer
559 559
 #endif

+ 33
- 17
Marlin/example_configurations/tvrrug/Round2/Configuration.h View File

@@ -88,8 +88,8 @@
88 88
 // build by the user have been successfully uploaded into firmware.
89 89
 #define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes.
90 90
 #define SHOW_BOOTSCREEN
91
-#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during boot in line 1
92
-#define STRING_SPLASH_LINE2 WEBSITE_URL         // will be shown during boot in line 2
91
+#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during bootup in line 1
92
+#define STRING_SPLASH_LINE2 WEBSITE_URL         // will be shown during bootup in line 2
93 93
 
94 94
 //
95 95
 // *** VENDORS PLEASE READ *****************************************************
@@ -105,15 +105,24 @@
105 105
 //#define SHOW_CUSTOM_BOOTSCREEN
106 106
 // @section machine
107 107
 
108
-// SERIAL_PORT selects which serial port should be used for communication with the host.
109
-// This allows the connection of wireless adapters (for instance) to non-default port pins.
110
-// Serial port 0 is still used by the Arduino bootloader regardless of this setting.
111
-// :[0,1,2,3,4,5,6,7]
108
+/**
109
+ * Select which serial port on the board will be used for communication with the host.
110
+ * This allows the connection of wireless adapters (for instance) to non-default port pins.
111
+ * Serial port 0 is always used by the Arduino bootloader regardless of this setting.
112
+ *
113
+ * :[0,1,2,3,4,5,6,7]
114
+ */
112 115
 #define SERIAL_PORT 0
113 116
 
114
-// This determines the communication speed of the printer
115
-// :[2400,9600,19200,38400,57600,115200,250000]
116 117
 #define BAUDRATE 250000
118
+/**
119
+ * This setting determines the communication speed of the printer.
120
+ *
121
+ * 250000 works in most cases, but you might try a lower speed if
122
+ * you commonly experience drop-outs during host printing.
123
+ *
124
+ * :[2400,9600,19200,38400,57600,115200,250000]
125
+ */
117 126
 
118 127
 // Enable the Bluetooth serial interface on AT90USB devices
119 128
 //#define BLUETOOTH
@@ -169,14 +178,22 @@
169 178
 //#define HOTEND_OFFSET_X {0.0, 20.00} // (in mm) for each extruder, offset of the hotend on the X axis
170 179
 //#define HOTEND_OFFSET_Y {0.0, 5.00}  // (in mm) for each extruder, offset of the hotend on the Y axis
171 180
 
172
-//// The following define selects which power supply you have. Please choose the one that matches your setup
173
-// 1 = ATX
174
-// 2 = X-Box 360 203Watts (the blue wire connected to PS_ON and the red wire to VCC)
175
-// :{1:'ATX',2:'X-Box 360'}
181
+/**
182
+ * Select your power supply here. Use 0 if you haven't connected the PS_ON_PIN
183
+ *
184
+ * 0 = No Power Switch
185
+ * 1 = ATX
186
+ * 2 = X-Box 360 203Watts (the blue wire connected to PS_ON and the red wire to VCC)
187
+ *
188
+ * :{0:'No power switch',1:'ATX',2:'X-Box 360'}
189
+ */
176 190
 #define POWER_SUPPLY 1
177 191
 
178
-// Define this to have the electronics keep the power supply off on startup. If you don't know what this is leave it.
179
-//#define PS_DEFAULT_OFF
192
+#if POWER_SUPPLY > 0
193
+  // Enable this option to leave the PSU off at startup.
194
+  // Power to steppers and heaters will need to be turned on with M80.
195
+  //#define PS_DEFAULT_OFF
196
+#endif
180 197
 
181 198
 // @section temperature
182 199
 
@@ -818,7 +835,6 @@
818 835
 #define HOMING_FEEDRATE_XY (50*60)
819 836
 #define HOMING_FEEDRATE_Z  (4*60)
820 837
 
821
-
822 838
 //=============================================================================
823 839
 //============================= Additional Features ===========================
824 840
 //=============================================================================
@@ -846,8 +862,8 @@
846 862
 // When enabled Marlin will send a busy status message to the host
847 863
 // every couple of seconds when it can't accept commands.
848 864
 //
849
-#define HOST_KEEPALIVE_FEATURE       // Disable this if your host doesn't like keepalive messages
850
-#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
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.
851 867
 
852 868
 //
853 869
 // M100 Free Memory Watcher

+ 1
- 1
Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h View File

@@ -553,7 +553,7 @@
553 553
 // The number of linear motions that can be in the plan at any give time.
554 554
 // THE BLOCK_BUFFER_SIZE NEEDS TO BE A POWER OF 2, i.g. 8,16,32 because shifts and ors are used to do the ring-buffering.
555 555
 #if ENABLED(SDSUPPORT)
556
-  #define BLOCK_BUFFER_SIZE 16   // SD,LCD,Buttons take more memory, block buffer needs to be smaller
556
+  #define BLOCK_BUFFER_SIZE 16 // SD,LCD,Buttons take more memory, block buffer needs to be smaller
557 557
 #else
558 558
   #define BLOCK_BUFFER_SIZE 16 // maximize block buffer
559 559
 #endif

Loading…
Cancel
Save