Bläddra i källkod

Various fixups to configs, spacing, etc.

Scott Lahteine 5 år sedan
förälder
incheckning
2a61c9a939
70 ändrade filer med 211 tillägg och 265 borttagningar
  1. 2
    3
      Marlin/Configuration.h
  2. 3
    3
      Marlin/src/HAL/HAL_DUE/EepromEmulation_Due.cpp
  3. 2
    2
      Marlin/src/config/default/Configuration.h
  4. 2
    2
      Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h
  5. 2
    2
      Marlin/src/config/examples/AliExpress/CL-260/Configuration.h
  6. 6
    5
      Marlin/src/config/examples/Anet/A2/Configuration.h
  7. 6
    5
      Marlin/src/config/examples/Anet/A2plus/Configuration.h
  8. 2
    2
      Marlin/src/config/examples/Anet/A8/Configuration.h
  9. 3
    23
      Marlin/src/config/examples/Azteeg/X5GT/Configuration.h
  10. 2
    2
      Marlin/src/config/examples/BQ/Hephestos/Configuration.h
  11. 2
    2
      Marlin/src/config/examples/BQ/WITBOX/Configuration.h
  12. 2
    2
      Marlin/src/config/examples/Cartesio/Configuration.h
  13. 2
    2
      Marlin/src/config/examples/Creality/CR-10/Configuration.h
  14. 2
    2
      Marlin/src/config/examples/Creality/CR-10S/Configuration.h
  15. 2
    2
      Marlin/src/config/examples/Creality/CR-10mini/Configuration.h
  16. 2
    2
      Marlin/src/config/examples/Creality/CR-8/Configuration.h
  17. 2
    2
      Marlin/src/config/examples/Creality/Ender-2/Configuration.h
  18. 2
    2
      Marlin/src/config/examples/Creality/Ender-3/Configuration.h
  19. 2
    2
      Marlin/src/config/examples/Creality/Ender-4/Configuration.h
  20. 2
    2
      Marlin/src/config/examples/Einstart-S/Configuration.h
  21. 39
    85
      Marlin/src/config/examples/Einstart-S/Configuration_adv.h
  22. 2
    2
      Marlin/src/config/examples/Felix/Configuration.h
  23. 2
    2
      Marlin/src/config/examples/Felix/DUAL/Configuration.h
  24. 2
    2
      Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h
  25. 1
    0
      Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h
  26. 6
    5
      Marlin/src/config/examples/Formbot/T-Rex_2+/Configuration.h
  27. 2
    2
      Marlin/src/config/examples/Geeetech/GT2560/Configuration.h
  28. 2
    2
      Marlin/src/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h
  29. 2
    2
      Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration.h
  30. 2
    2
      Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration.h
  31. 2
    2
      Marlin/src/config/examples/Infitary/i3-M508/Configuration.h
  32. 2
    2
      Marlin/src/config/examples/MakerParts/Configuration.h
  33. 2
    2
      Marlin/src/config/examples/Malyan/M200/Configuration.h
  34. 2
    2
      Marlin/src/config/examples/Micromake/C1/basic/Configuration.h
  35. 2
    2
      Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h
  36. 2
    2
      Marlin/src/config/examples/Mks/Sbase/Configuration.h
  37. 2
    2
      Marlin/src/config/examples/RepRapPro/Huxley/Configuration.h
  38. 2
    2
      Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h
  39. 2
    2
      Marlin/src/config/examples/RigidBot/Configuration.h
  40. 2
    2
      Marlin/src/config/examples/SCARA/Configuration.h
  41. 2
    2
      Marlin/src/config/examples/STM32F10/Configuration.h
  42. 2
    2
      Marlin/src/config/examples/STM32F4/Configuration.h
  43. 2
    2
      Marlin/src/config/examples/Sanguinololu/Configuration.h
  44. 2
    2
      Marlin/src/config/examples/TheBorg/Configuration.h
  45. 2
    2
      Marlin/src/config/examples/TinyBoy2/Configuration.h
  46. 2
    2
      Marlin/src/config/examples/Tronxy/X1/Configuration.h
  47. 2
    2
      Marlin/src/config/examples/Tronxy/X3A/Configuration.h
  48. 2
    2
      Marlin/src/config/examples/Tronxy/XY100/Configuration.h
  49. 2
    2
      Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h
  50. 2
    2
      Marlin/src/config/examples/Velleman/K8200/Configuration.h
  51. 14
    4
      Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h
  52. 2
    2
      Marlin/src/config/examples/Velleman/K8400/Configuration.h
  53. 1
    1
      Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h
  54. 2
    2
      Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h
  55. 2
    2
      Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration.h
  56. 2
    2
      Marlin/src/config/examples/adafruit/ST7565/Configuration.h
  57. 4
    5
      Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h
  58. 1
    1
      Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h
  59. 4
    5
      Marlin/src/config/examples/delta/FLSUN/kossel/Configuration.h
  60. 4
    4
      Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h
  61. 2
    2
      Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h
  62. 4
    4
      Marlin/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h
  63. 2
    2
      Marlin/src/config/examples/makibox/Configuration.h
  64. 2
    2
      Marlin/src/config/examples/stm32f103ret6/Configuration.h
  65. 2
    2
      Marlin/src/config/examples/tvrrug/Round2/Configuration.h
  66. 2
    2
      Marlin/src/config/examples/wt150/Configuration.h
  67. 2
    1
      Marlin/src/config/examples/wt150/Configuration_adv.h
  68. 2
    2
      Marlin/src/feature/bedlevel/abl/abl.cpp
  69. 1
    1
      Marlin/src/feature/tmc_util.cpp
  70. 6
    6
      Marlin/src/gcode/bedlevel/G26.cpp

+ 2
- 3
Marlin/Configuration.h Visa fil

@@ -228,7 +228,6 @@
228 228
 //#define HOTEND_OFFSET_Y {0.0, 5.00}  // (mm) relative Y-offset for each nozzle
229 229
 //#define HOTEND_OFFSET_Z {0.0, 0.00}  // (mm) relative Z-offset for each nozzle
230 230
 
231
-
232 231
 // @section machine
233 232
 
234 233
 /**
@@ -1041,9 +1040,9 @@
1041 1040
 
1042 1041
   // Set the boundaries for probing (where the probe can reach).
1043 1042
   //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
1044
-  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
1043
+  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
1045 1044
   //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
1046
-  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
1045
+  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
1047 1046
 
1048 1047
   // Probe along the Y axis, advancing X after each column
1049 1048
   //#define PROBE_Y_FIRST

+ 3
- 3
Marlin/src/HAL/HAL_DUE/EepromEmulation_Due.cpp Visa fil

@@ -310,9 +310,9 @@ static bool ee_PageErase(uint16_t page) {
310 310
 
311 311
   #ifdef EE_EMU_DEBUG
312 312
     SERIAL_ECHO_START();
313
-    SERIAL_ECHOLNPAIR("EEPROM PageErase  ",page);
314
-    SERIAL_ECHOLNPAIR(" in FLASH address ",(uint32_t)addrflash);
315
-    SERIAL_ECHOLNPAIR(" base address     ",(uint32_t)getFlashStorage(0));
313
+    SERIAL_ECHOLNPAIR("EEPROM PageErase  ", page);
314
+    SERIAL_ECHOLNPAIR(" in FLASH address ", (uint32_t)addrflash);
315
+    SERIAL_ECHOLNPAIR(" base address     ", (uint32_t)getFlashStorage(0));
316 316
     SERIAL_FLUSH();
317 317
   #endif
318 318
 

+ 2
- 2
Marlin/src/config/default/Configuration.h Visa fil

@@ -1040,9 +1040,9 @@
1040 1040
 
1041 1041
   // Set the boundaries for probing (where the probe can reach).
1042 1042
   //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
1043
-  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
1043
+  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
1044 1044
   //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
1045
-  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
1045
+  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
1046 1046
 
1047 1047
   // Probe along the Y axis, advancing X after each column
1048 1048
   //#define PROBE_Y_FIRST

+ 2
- 2
Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h Visa fil

@@ -1060,9 +1060,9 @@
1060 1060
 
1061 1061
   // Set the boundaries for probing (where the probe can reach).
1062 1062
   //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
1063
-  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
1063
+  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
1064 1064
   //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
1065
-  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
1065
+  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
1066 1066
 
1067 1067
   // Probe along the Y axis, advancing X after each column
1068 1068
   //#define PROBE_Y_FIRST

+ 2
- 2
Marlin/src/config/examples/AliExpress/CL-260/Configuration.h Visa fil

@@ -1040,9 +1040,9 @@
1040 1040
 
1041 1041
   // Set the boundaries for probing (where the probe can reach).
1042 1042
   //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
1043
-  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
1043
+  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
1044 1044
   //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
1045
-  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
1045
+  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
1046 1046
 
1047 1047
   // Probe along the Y axis, advancing X after each column
1048 1048
   //#define PROBE_Y_FIRST

+ 6
- 5
Marlin/src/config/examples/Anet/A2/Configuration.h Visa fil

@@ -1040,9 +1040,9 @@
1040 1040
 
1041 1041
   // Set the boundaries for probing (where the probe can reach).
1042 1042
   //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
1043
-  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
1043
+  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
1044 1044
   //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
1045
-  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
1045
+  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
1046 1046
 
1047 1047
   // Probe along the Y axis, advancing X after each column
1048 1048
   //#define PROBE_Y_FIRST
@@ -1948,9 +1948,10 @@
1948 1948
 // If the servo can't reach the requested position, increase it.
1949 1949
 #define SERVO_DELAY { 300 }
1950 1950
 
1951
-// Servo deactivation
1952
-//
1953
-// With this option servos are powered only during movement, then turned off to prevent jitter.
1951
+// Only power servos during movement, otherwise leave off to prevent jitter
1954 1952
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1955 1953
 
1954
+// Allow servo angle to be edited and saved to EEPROM
1955
+//#define EDITABLE_SERVO_ANGLES
1956
+
1956 1957
 #endif // CONFIGURATION_H

+ 6
- 5
Marlin/src/config/examples/Anet/A2plus/Configuration.h Visa fil

@@ -1040,9 +1040,9 @@
1040 1040
 
1041 1041
   // Set the boundaries for probing (where the probe can reach).
1042 1042
   //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
1043
-  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
1043
+  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
1044 1044
   //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
1045
-  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
1045
+  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
1046 1046
 
1047 1047
   // Probe along the Y axis, advancing X after each column
1048 1048
   //#define PROBE_Y_FIRST
@@ -1948,9 +1948,10 @@
1948 1948
 // If the servo can't reach the requested position, increase it.
1949 1949
 #define SERVO_DELAY { 300 }
1950 1950
 
1951
-// Servo deactivation
1952
-//
1953
-// With this option servos are powered only during movement, then turned off to prevent jitter.
1951
+// Only power servos during movement, otherwise leave off to prevent jitter
1954 1952
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
1955 1953
 
1954
+// Allow servo angle to be edited and saved to EEPROM
1955
+//#define EDITABLE_SERVO_ANGLES
1956
+
1956 1957
 #endif // CONFIGURATION_H

+ 2
- 2
Marlin/src/config/examples/Anet/A8/Configuration.h Visa fil

@@ -1047,9 +1047,9 @@
1047 1047
 
1048 1048
   // Set the boundaries for probing (where the probe can reach).
1049 1049
   //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
1050
-  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
1050
+  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
1051 1051
   //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
1052
-  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
1052
+  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
1053 1053
 
1054 1054
   // Probe along the Y axis, advancing X after each column
1055 1055
   //#define PROBE_Y_FIRST

+ 3
- 23
Marlin/src/config/examples/Azteeg/X5GT/Configuration.h Visa fil

@@ -1040,9 +1040,9 @@
1040 1040
 
1041 1041
   // Set the boundaries for probing (where the probe can reach).
1042 1042
   //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
1043
-  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
1043
+  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
1044 1044
   //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
1045
-  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
1045
+  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
1046 1046
 
1047 1047
   // Probe along the Y axis, advancing X after each column
1048 1048
   //#define PROBE_Y_FIRST
@@ -1568,26 +1568,6 @@
1568 1568
 //#define PANEL_ONE
1569 1569
 
1570 1570
 //
1571
-// MaKr3d Makr-Panel with graphic controller and SD support.
1572
-// http://reprap.org/wiki/MaKr3d_MaKrPanel
1573
-//
1574
-//#define MAKRPANEL
1575
-
1576
-//
1577
-// Activate one of these if you have a Panucatt Devices
1578
-// Viki 2.0 or mini Viki with Graphic LCD
1579
-// http://panucatt.com
1580
-//
1581
-#define VIKI2
1582
-//#define miniVIKI
1583
-
1584
-//
1585
-// Adafruit ST7565 Full Graphic Controller.
1586
-// https://github.com/eboston/Adafruit-ST7565-Full-Graphic-Controller/
1587
-//
1588
-//#define ELB_FULL_GRAPHIC_CONTROLLER
1589
-
1590
-//
1591 1571
 // GADGETS3D G3D LCD/SD Controller
1592 1572
 // http://reprap.org/wiki/RAMPS_1.3/1.4_GADGETS3D_Shield_with_Panel
1593 1573
 //
@@ -1709,7 +1689,7 @@
1709 1689
 // Viki 2.0 or mini Viki with Graphic LCD
1710 1690
 // http://panucatt.com
1711 1691
 //
1712
-//#define VIKI2
1692
+#define VIKI2
1713 1693
 //#define miniVIKI
1714 1694
 
1715 1695
 //

+ 2
- 2
Marlin/src/config/examples/BQ/Hephestos/Configuration.h Visa fil

@@ -1028,9 +1028,9 @@
1028 1028
 
1029 1029
   // Set the boundaries for probing (where the probe can reach).
1030 1030
   //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
1031
-  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
1031
+  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
1032 1032
   //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
1033
-  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
1033
+  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
1034 1034
 
1035 1035
   // Probe along the Y axis, advancing X after each column
1036 1036
   //#define PROBE_Y_FIRST

+ 2
- 2
Marlin/src/config/examples/BQ/WITBOX/Configuration.h Visa fil

@@ -1028,9 +1028,9 @@
1028 1028
 
1029 1029
   // Set the boundaries for probing (where the probe can reach).
1030 1030
   //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
1031
-  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
1031
+  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
1032 1032
   //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
1033
-  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
1033
+  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
1034 1034
 
1035 1035
   // Probe along the Y axis, advancing X after each column
1036 1036
   //#define PROBE_Y_FIRST

+ 2
- 2
Marlin/src/config/examples/Cartesio/Configuration.h Visa fil

@@ -1039,9 +1039,9 @@
1039 1039
 
1040 1040
   // Set the boundaries for probing (where the probe can reach).
1041 1041
   //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
1042
-  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
1042
+  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
1043 1043
   //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
1044
-  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
1044
+  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
1045 1045
 
1046 1046
   // Probe along the Y axis, advancing X after each column
1047 1047
   //#define PROBE_Y_FIRST

+ 2
- 2
Marlin/src/config/examples/Creality/CR-10/Configuration.h Visa fil

@@ -1050,9 +1050,9 @@
1050 1050
 
1051 1051
   // Set the boundaries for probing (where the probe can reach).
1052 1052
   //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
1053
-  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
1053
+  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
1054 1054
   //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
1055
-  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
1055
+  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
1056 1056
 
1057 1057
   // Probe along the Y axis, advancing X after each column
1058 1058
   //#define PROBE_Y_FIRST

+ 2
- 2
Marlin/src/config/examples/Creality/CR-10S/Configuration.h Visa fil

@@ -1045,9 +1045,9 @@
1045 1045
 
1046 1046
   // Set the boundaries for probing (where the probe can reach).
1047 1047
   //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
1048
-  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
1048
+  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
1049 1049
   //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
1050
-  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
1050
+  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
1051 1051
 
1052 1052
   // Probe along the Y axis, advancing X after each column
1053 1053
   //#define PROBE_Y_FIRST

+ 2
- 2
Marlin/src/config/examples/Creality/CR-10mini/Configuration.h Visa fil

@@ -1059,9 +1059,9 @@
1059 1059
 
1060 1060
   // Set the boundaries for probing (where the probe can reach).
1061 1061
   //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
1062
-  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
1062
+  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
1063 1063
   //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
1064
-  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
1064
+  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
1065 1065
 
1066 1066
   // Probe along the Y axis, advancing X after each column
1067 1067
   //#define PROBE_Y_FIRST

+ 2
- 2
Marlin/src/config/examples/Creality/CR-8/Configuration.h Visa fil

@@ -1050,9 +1050,9 @@
1050 1050
 
1051 1051
   // Set the boundaries for probing (where the probe can reach).
1052 1052
   //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
1053
-  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
1053
+  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
1054 1054
   //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
1055
-  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
1055
+  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
1056 1056
 
1057 1057
   // Probe along the Y axis, advancing X after each column
1058 1058
   //#define PROBE_Y_FIRST

+ 2
- 2
Marlin/src/config/examples/Creality/Ender-2/Configuration.h Visa fil

@@ -1044,9 +1044,9 @@
1044 1044
 
1045 1045
   // Set the boundaries for probing (where the probe can reach).
1046 1046
   //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
1047
-  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
1047
+  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
1048 1048
   //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
1049
-  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
1049
+  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
1050 1050
 
1051 1051
   // Probe along the Y axis, advancing X after each column
1052 1052
   //#define PROBE_Y_FIRST

+ 2
- 2
Marlin/src/config/examples/Creality/Ender-3/Configuration.h Visa fil

@@ -1044,9 +1044,9 @@
1044 1044
 
1045 1045
   // Set the boundaries for probing (where the probe can reach).
1046 1046
   //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
1047
-  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
1047
+  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
1048 1048
   //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
1049
-  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
1049
+  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
1050 1050
 
1051 1051
   // Probe along the Y axis, advancing X after each column
1052 1052
   //#define PROBE_Y_FIRST

+ 2
- 2
Marlin/src/config/examples/Creality/Ender-4/Configuration.h Visa fil

@@ -1050,9 +1050,9 @@
1050 1050
 
1051 1051
   // Set the boundaries for probing (where the probe can reach).
1052 1052
   //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
1053
-  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
1053
+  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
1054 1054
   //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
1055
-  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
1055
+  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
1056 1056
 
1057 1057
   // Probe along the Y axis, advancing X after each column
1058 1058
   //#define PROBE_Y_FIRST

+ 2
- 2
Marlin/src/config/examples/Einstart-S/Configuration.h Visa fil

@@ -1050,9 +1050,9 @@
1050 1050
 
1051 1051
   // Set the boundaries for probing (where the probe can reach).
1052 1052
   //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
1053
-  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
1053
+  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
1054 1054
   //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
1055
-  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
1055
+  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
1056 1056
 
1057 1057
   // Probe along the Y axis, advancing X after each column
1058 1058
   //#define PROBE_Y_FIRST

+ 39
- 85
Marlin/src/config/examples/Einstart-S/Configuration_adv.h Visa fil

@@ -596,6 +596,10 @@
596 596
    * point in the file.
597 597
    */
598 598
   //#define POWER_LOSS_RECOVERY
599
+  #if ENABLED(POWER_LOSS_RECOVERY)
600
+    //#define POWER_LOSS_PIN   44     // Pin to detect power loss
601
+    //#define POWER_LOSS_STATE HIGH   // State of pin indicating power loss
602
+  #endif
599 603
 
600 604
   /**
601 605
    * Sort SD file listings in alphabetical order.
@@ -840,13 +844,16 @@
840 844
 
841 845
 /**
842 846
  * Minimum delay after setting the stepper DIR (in ns)
843
- *    0 : No delay (Expect at least 10µS since one Stepper ISR must transpire)
844
- *   20 : Minimum for TMC2xxx drivers
845
- *  200 : Minimum for A4988 drivers
846
- *  500 : Minimum for LV8729 drivers (guess, no info in datasheet)
847
- *  650 : Minimum for DRV8825 drivers
848
- * 1500 : Minimum for TB6600 drivers (guess, no info in datasheet)
849
- *15000 : Minimum for TB6560 drivers (guess, no info in datasheet)
847
+ *     0 : No delay (Expect at least 10µS since one Stepper ISR must transpire)
848
+ *    20 : Minimum for TMC2xxx drivers
849
+ *   200 : Minimum for A4988 drivers
850
+ *   400 : Minimum for A5984 drivers
851
+ *   500 : Minimum for LV8729 drivers (guess, no info in datasheet)
852
+ *   650 : Minimum for DRV8825 drivers
853
+ *  1500 : Minimum for TB6600 drivers (guess, no info in datasheet)
854
+ * 15000 : Minimum for TB6560 drivers (guess, no info in datasheet)
855
+ *
856
+ * Override the default value based on the driver type set in Configuration.h.
850 857
  */
851 858
 #define MINIMUM_STEPPER_DIR_DELAY 0
852 859
 
@@ -857,6 +864,8 @@
857 864
  *   2 : Minimum for DRV8825 stepper drivers
858 865
  *   3 : Minimum for TB6600 stepper drivers
859 866
  *  30 : Minimum for TB6560 stepper drivers
867
+ *
868
+ * Override the default value based on the driver type set in Configuration.h.
860 869
  */
861 870
 #define MINIMUM_STEPPER_PULSE 2
862 871
 
@@ -869,6 +878,8 @@
869 878
  *  150000 : Maximum for TB6600 stepper driver
870 879
  *  130000 : Maximum for LV8729 stepper driver
871 880
  *   15000 : Maximum for TB6560 stepper driver
881
+ *
882
+ * Override the default value based on the driver type set in Configuration.h.
872 883
  */
873 884
 #define MAXIMUM_STEPPER_RATE 250000
874 885
 
@@ -1038,23 +1049,12 @@
1038 1049
 // @section tmc
1039 1050
 
1040 1051
 /**
1041
- * Enable this section if you have TMC26X motor drivers.
1042
- * You will need to import the TMC26XStepper library into the Arduino IDE for this
1043
- * (https://github.com/trinamic/TMC26XStepper.git)
1052
+ * TMC26X Stepper Driver options
1053
+ *
1054
+ * The TMC26XStepper library is required for this stepper driver.
1055
+ * https://github.com/trinamic/TMC26XStepper
1044 1056
  */
1045
-//#define HAVE_TMC26X
1046
-#if ENABLED(HAVE_TMC26X)  // Choose your axes here. This is mandatory!
1047
-  //#define X_IS_TMC26X
1048
-  //#define X2_IS_TMC26X
1049
-  //#define Y_IS_TMC26X
1050
-  //#define Y2_IS_TMC26X
1051
-  //#define Z_IS_TMC26X
1052
-  //#define Z2_IS_TMC26X
1053
-  //#define E0_IS_TMC26X
1054
-  //#define E1_IS_TMC26X
1055
-  //#define E2_IS_TMC26X
1056
-  //#define E3_IS_TMC26X
1057
-  //#define E4_IS_TMC26X
1057
+#if HAS_DRIVER(TMC26X)
1058 1058
 
1059 1059
   #define X_MAX_CURRENT     1000 // in mA
1060 1060
   #define X_SENSE_RESISTOR    91 // in mOhms
@@ -1100,62 +1100,29 @@
1100 1100
   #define E4_SENSE_RESISTOR   91
1101 1101
   #define E4_MICROSTEPS       16
1102 1102
 
1103
-#endif
1103
+#endif // TMC26X
1104 1104
 
1105 1105
 // @section tmc_smart
1106 1106
 
1107 1107
 /**
1108
- * Enable this for SilentStepStick Trinamic TMC2130 SPI-configurable stepper drivers.
1109
- *
1110
- * You'll also need the TMC2130Stepper Arduino library
1111
- * (https://github.com/teemuatlut/TMC2130Stepper).
1112
- *
1113 1108
  * To use TMC2130 stepper drivers in SPI mode connect your SPI pins to
1114 1109
  * the hardware SPI interface on your board and define the required CS pins
1115 1110
  * in your `pins_MYBOARD.h` file. (e.g., RAMPS 1.4 uses AUX3 pins `X_CS_PIN 53`, `Y_CS_PIN 49`, etc.).
1116 1111
  * You may also use software SPI if you wish to use general purpose IO pins.
1117
- */
1118
-//#define HAVE_TMC2130
1119
-#if ENABLED(HAVE_TMC2130)  // Choose your axes here. This is mandatory!
1120
-  //#define X_IS_TMC2130
1121
-  //#define X2_IS_TMC2130
1122
-  //#define Y_IS_TMC2130
1123
-  //#define Y2_IS_TMC2130
1124
-  //#define Z_IS_TMC2130
1125
-  //#define Z2_IS_TMC2130
1126
-  //#define E0_IS_TMC2130
1127
-  //#define E1_IS_TMC2130
1128
-  //#define E2_IS_TMC2130
1129
-  //#define E3_IS_TMC2130
1130
-  //#define E4_IS_TMC2130
1131
-#endif
1132
-
1133
-/**
1134
- * Enable this for SilentStepStick Trinamic TMC2208 UART-configurable stepper drivers.
1135
- * Connect #_SERIAL_TX_PIN to the driver side PDN_UART pin with a 1K resistor.
1112
+ *
1113
+ * The TMC2130Stepper library is required for this stepper driver.
1114
+ * https://github.com/teemuatlut/TMC2130Stepper
1115
+ *
1116
+ * To use TMC2208 stepper UART-configurable stepper drivers
1117
+ * connect #_SERIAL_TX_PIN to the driver side PDN_UART pin with a 1K resistor.
1136 1118
  * To use the reading capabilities, also connect #_SERIAL_RX_PIN
1137 1119
  * to PDN_UART without a resistor.
1138 1120
  * The drivers can also be used with hardware serial.
1139 1121
  *
1140
- * You'll also need the TMC2208Stepper Arduino library
1141
- * (https://github.com/teemuatlut/TMC2208Stepper).
1122
+ * The TMC2208Stepper library is required for this stepper driver.
1123
+ * https://github.com/teemuatlut/TMC2208Stepper
1142 1124
  */
1143
-//#define HAVE_TMC2208
1144
-#if ENABLED(HAVE_TMC2208)  // Choose your axes here. This is mandatory!
1145
-  //#define X_IS_TMC2208
1146
-  //#define X2_IS_TMC2208
1147
-  //#define Y_IS_TMC2208
1148
-  //#define Y2_IS_TMC2208
1149
-  //#define Z_IS_TMC2208
1150
-  //#define Z2_IS_TMC2208
1151
-  //#define E0_IS_TMC2208
1152
-  //#define E1_IS_TMC2208
1153
-  //#define E2_IS_TMC2208
1154
-  //#define E3_IS_TMC2208
1155
-  //#define E4_IS_TMC2208
1156
-#endif
1157
-
1158
-#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208)
1125
+#if HAS_TRINAMIC
1159 1126
 
1160 1127
   #define R_SENSE           0.11  // R_sense resistor for SilentStepStick2130
1161 1128
   #define HOLD_MULTIPLIER    0.5  // Scales down the holding current from run current
@@ -1310,25 +1277,12 @@
1310 1277
 // @section L6470
1311 1278
 
1312 1279
 /**
1313
- * Enable this section if you have L6470 motor drivers.
1314
- * You need to import the L6470 library into the Arduino IDE for this.
1315
- * (https://github.com/ameyer/Arduino-L6470)
1280
+ * L6470 Stepper Driver options
1281
+ *
1282
+ * The Arduino-L6470 library is required for this stepper driver.
1283
+ * https://github.com/ameyer/Arduino-L6470
1316 1284
  */
1317
-
1318
-//#define HAVE_L6470DRIVER
1319
-#if ENABLED(HAVE_L6470DRIVER)
1320
-
1321
-  //#define X_IS_L6470
1322
-  //#define X2_IS_L6470
1323
-  //#define Y_IS_L6470
1324
-  //#define Y2_IS_L6470
1325
-  //#define Z_IS_L6470
1326
-  //#define Z2_IS_L6470
1327
-  //#define E0_IS_L6470
1328
-  //#define E1_IS_L6470
1329
-  //#define E2_IS_L6470
1330
-  //#define E3_IS_L6470
1331
-  //#define E4_IS_L6470
1285
+#if HAS_DRIVER(L6470)
1332 1286
 
1333 1287
   #define X_MICROSTEPS      16 // number of microsteps
1334 1288
   #define X_OVERCURRENT   2000 // maxc current in mA. If the current goes over this value, the driver will switch off
@@ -1374,7 +1328,7 @@
1374 1328
   #define E4_OVERCURRENT  2000
1375 1329
   #define E4_STALLCURRENT 1500
1376 1330
 
1377
-#endif
1331
+#endif // L6470
1378 1332
 
1379 1333
 /**
1380 1334
  * TWI/I2C BUS

+ 2
- 2
Marlin/src/config/examples/Felix/Configuration.h Visa fil

@@ -1022,9 +1022,9 @@
1022 1022
 
1023 1023
   // Set the boundaries for probing (where the probe can reach).
1024 1024
   //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
1025
-  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
1025
+  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
1026 1026
   //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
1027
-  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
1027
+  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
1028 1028
 
1029 1029
   // Probe along the Y axis, advancing X after each column
1030 1030
   //#define PROBE_Y_FIRST

+ 2
- 2
Marlin/src/config/examples/Felix/DUAL/Configuration.h Visa fil

@@ -1022,9 +1022,9 @@
1022 1022
 
1023 1023
   // Set the boundaries for probing (where the probe can reach).
1024 1024
   //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
1025
-  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
1025
+  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
1026 1026
   //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
1027
-  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
1027
+  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
1028 1028
 
1029 1029
   // Probe along the Y axis, advancing X after each column
1030 1030
   //#define PROBE_Y_FIRST

+ 2
- 2
Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h Visa fil

@@ -1046,9 +1046,9 @@
1046 1046
 
1047 1047
   // Set the boundaries for probing (where the probe can reach).
1048 1048
   //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
1049
-  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
1049
+  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
1050 1050
   //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
1051
-  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
1051
+  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
1052 1052
 
1053 1053
   // Probe along the Y axis, advancing X after each column
1054 1054
   //#define PROBE_Y_FIRST

+ 1
- 0
Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h Visa fil

@@ -1656,6 +1656,7 @@
1656 1656
   #define MAX7219_NUMBER_UNITS 2   // Number of Max7219 units in chain.
1657 1657
   #define MAX7219_ROTATE     -90   // Rotate the display clockwise (in multiples of +/- 90°)
1658 1658
                                    // connector at:  right=0   bottom=-90  top=90  left=180
1659
+
1659 1660
   /**
1660 1661
    * Sample debug features
1661 1662
    * If you add more debug displays, be careful to avoid conflicts!

+ 6
- 5
Marlin/src/config/examples/Formbot/T-Rex_2+/Configuration.h Visa fil

@@ -1100,9 +1100,9 @@
1100 1100
 
1101 1101
   // Set the boundaries for probing (where the probe can reach).
1102 1102
   //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
1103
-  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
1103
+  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
1104 1104
   //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
1105
-  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
1105
+  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
1106 1106
 
1107 1107
   // Probe along the Y axis, advancing X after each column
1108 1108
   //#define PROBE_Y_FIRST
@@ -2011,9 +2011,10 @@
2011 2011
 // If the servo can't reach the requested position, increase it.
2012 2012
 #define SERVO_DELAY { 300 }
2013 2013
 
2014
-// Servo deactivation
2015
-//
2016
-// With this option servos are powered only during movement, then turned off to prevent jitter.
2014
+// Only power servos during movement, otherwise leave off to prevent jitter
2017 2015
 //#define DEACTIVATE_SERVOS_AFTER_MOVE
2018 2016
 
2017
+// Allow servo angle to be edited and saved to EEPROM
2018
+//#define EDITABLE_SERVO_ANGLES
2019
+
2019 2020
 #endif // CONFIGURATION_H

+ 2
- 2
Marlin/src/config/examples/Geeetech/GT2560/Configuration.h Visa fil

@@ -1055,9 +1055,9 @@
1055 1055
 
1056 1056
   // Set the boundaries for probing (where the probe can reach).
1057 1057
   //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
1058
-  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
1058
+  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
1059 1059
   //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
1060
-  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
1060
+  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
1061 1061
 
1062 1062
   // Probe along the Y axis, advancing X after each column
1063 1063
   //#define PROBE_Y_FIRST

+ 2
- 2
Marlin/src/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h Visa fil

@@ -1040,9 +1040,9 @@
1040 1040
 
1041 1041
   // Set the boundaries for probing (where the probe can reach).
1042 1042
   //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
1043
-  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
1043
+  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
1044 1044
   //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
1045
-  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
1045
+  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
1046 1046
 
1047 1047
   // Probe along the Y axis, advancing X after each column
1048 1048
   //#define PROBE_Y_FIRST

+ 2
- 2
Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration.h Visa fil

@@ -1040,9 +1040,9 @@
1040 1040
 
1041 1041
   // Set the boundaries for probing (where the probe can reach).
1042 1042
   //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
1043
-  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
1043
+  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
1044 1044
   //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
1045
-  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
1045
+  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
1046 1046
 
1047 1047
   // Probe along the Y axis, advancing X after each column
1048 1048
   //#define PROBE_Y_FIRST

+ 2
- 2
Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration.h Visa fil

@@ -1040,9 +1040,9 @@
1040 1040
 
1041 1041
   // Set the boundaries for probing (where the probe can reach).
1042 1042
   //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
1043
-  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
1043
+  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
1044 1044
   //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
1045
-  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
1045
+  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
1046 1046
 
1047 1047
   // Probe along the Y axis, advancing X after each column
1048 1048
   //#define PROBE_Y_FIRST

+ 2
- 2
Marlin/src/config/examples/Infitary/i3-M508/Configuration.h Visa fil

@@ -1044,9 +1044,9 @@
1044 1044
 
1045 1045
   // Set the boundaries for probing (where the probe can reach).
1046 1046
   //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
1047
-  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
1047
+  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
1048 1048
   //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
1049
-  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
1049
+  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
1050 1050
 
1051 1051
   // Probe along the Y axis, advancing X after each column
1052 1052
   //#define PROBE_Y_FIRST

+ 2
- 2
Marlin/src/config/examples/MakerParts/Configuration.h Visa fil

@@ -1060,9 +1060,9 @@
1060 1060
 
1061 1061
   // Set the boundaries for probing (where the probe can reach).
1062 1062
   //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
1063
-  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
1063
+  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
1064 1064
   //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
1065
-  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
1065
+  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
1066 1066
 
1067 1067
   // Probe along the Y axis, advancing X after each column
1068 1068
   //#define PROBE_Y_FIRST

+ 2
- 2
Marlin/src/config/examples/Malyan/M200/Configuration.h Visa fil

@@ -1039,9 +1039,9 @@
1039 1039
 
1040 1040
   // Set the boundaries for probing (where the probe can reach).
1041 1041
   //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
1042
-  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
1042
+  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
1043 1043
   //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
1044
-  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
1044
+  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
1045 1045
 
1046 1046
   // Probe along the Y axis, advancing X after each column
1047 1047
   //#define PROBE_Y_FIRST

+ 2
- 2
Marlin/src/config/examples/Micromake/C1/basic/Configuration.h Visa fil

@@ -1044,9 +1044,9 @@
1044 1044
 
1045 1045
   // Set the boundaries for probing (where the probe can reach).
1046 1046
   //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
1047
-  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
1047
+  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
1048 1048
   //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
1049
-  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
1049
+  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
1050 1050
 
1051 1051
   // Probe along the Y axis, advancing X after each column
1052 1052
   //#define PROBE_Y_FIRST

+ 2
- 2
Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h Visa fil

@@ -1044,9 +1044,9 @@
1044 1044
 
1045 1045
   // Set the boundaries for probing (where the probe can reach).
1046 1046
   //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
1047
-  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
1047
+  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
1048 1048
   //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
1049
-  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
1049
+  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
1050 1050
 
1051 1051
   // Probe along the Y axis, advancing X after each column
1052 1052
   //#define PROBE_Y_FIRST

+ 2
- 2
Marlin/src/config/examples/Mks/Sbase/Configuration.h Visa fil

@@ -1040,9 +1040,9 @@
1040 1040
 
1041 1041
   // Set the boundaries for probing (where the probe can reach).
1042 1042
   //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
1043
-  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
1043
+  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
1044 1044
   //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
1045
-  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
1045
+  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
1046 1046
 
1047 1047
   // Probe along the Y axis, advancing X after each column
1048 1048
   //#define PROBE_Y_FIRST

+ 2
- 2
Marlin/src/config/examples/RepRapPro/Huxley/Configuration.h Visa fil

@@ -1089,9 +1089,9 @@ Black rubber belt(MXL), 18 - tooth aluminium pulley : 87.489 step per mm (Huxley
1089 1089
 
1090 1090
   // Set the boundaries for probing (where the probe can reach).
1091 1091
   //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
1092
-  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
1092
+  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
1093 1093
   //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
1094
-  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
1094
+  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
1095 1095
 
1096 1096
   // Probe along the Y axis, advancing X after each column
1097 1097
   //#define PROBE_Y_FIRST

+ 2
- 2
Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h Visa fil

@@ -1040,9 +1040,9 @@
1040 1040
 
1041 1041
   // Set the boundaries for probing (where the probe can reach).
1042 1042
   //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
1043
-  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
1043
+  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
1044 1044
   //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
1045
-  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
1045
+  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
1046 1046
 
1047 1047
   // Probe along the Y axis, advancing X after each column
1048 1048
   //#define PROBE_Y_FIRST

+ 2
- 2
Marlin/src/config/examples/RigidBot/Configuration.h Visa fil

@@ -1038,9 +1038,9 @@
1038 1038
 
1039 1039
   // Set the boundaries for probing (where the probe can reach).
1040 1040
   //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
1041
-  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
1041
+  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
1042 1042
   //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
1043
-  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
1043
+  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
1044 1044
 
1045 1045
   // Probe along the Y axis, advancing X after each column
1046 1046
   //#define PROBE_Y_FIRST

+ 2
- 2
Marlin/src/config/examples/SCARA/Configuration.h Visa fil

@@ -1053,9 +1053,9 @@
1053 1053
 
1054 1054
   // Set the boundaries for probing (where the probe can reach).
1055 1055
   //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
1056
-  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
1056
+  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
1057 1057
   //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
1058
-  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
1058
+  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
1059 1059
 
1060 1060
   // Probe along the Y axis, advancing X after each column
1061 1061
   //#define PROBE_Y_FIRST

+ 2
- 2
Marlin/src/config/examples/STM32F10/Configuration.h Visa fil

@@ -1042,9 +1042,9 @@
1042 1042
 
1043 1043
   // Set the boundaries for probing (where the probe can reach).
1044 1044
   //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
1045
-  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
1045
+  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
1046 1046
   //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
1047
-  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
1047
+  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
1048 1048
 
1049 1049
   // Probe along the Y axis, advancing X after each column
1050 1050
   //#define PROBE_Y_FIRST

+ 2
- 2
Marlin/src/config/examples/STM32F4/Configuration.h Visa fil

@@ -1040,9 +1040,9 @@
1040 1040
 
1041 1041
   // Set the boundaries for probing (where the probe can reach).
1042 1042
   //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
1043
-  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
1043
+  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
1044 1044
   //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
1045
-  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
1045
+  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
1046 1046
 
1047 1047
   // Probe along the Y axis, advancing X after each column
1048 1048
   //#define PROBE_Y_FIRST

+ 2
- 2
Marlin/src/config/examples/Sanguinololu/Configuration.h Visa fil

@@ -1071,9 +1071,9 @@
1071 1071
 
1072 1072
   // Set the boundaries for probing (where the probe can reach).
1073 1073
   //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
1074
-  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
1074
+  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
1075 1075
   //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
1076
-  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
1076
+  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
1077 1077
 
1078 1078
   // Probe along the Y axis, advancing X after each column
1079 1079
   //#define PROBE_Y_FIRST

+ 2
- 2
Marlin/src/config/examples/TheBorg/Configuration.h Visa fil

@@ -1040,9 +1040,9 @@
1040 1040
 
1041 1041
   // Set the boundaries for probing (where the probe can reach).
1042 1042
   //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
1043
-  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
1043
+  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
1044 1044
   //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
1045
-  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
1045
+  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
1046 1046
 
1047 1047
   // Probe along the Y axis, advancing X after each column
1048 1048
   //#define PROBE_Y_FIRST

+ 2
- 2
Marlin/src/config/examples/TinyBoy2/Configuration.h Visa fil

@@ -1096,9 +1096,9 @@
1096 1096
 
1097 1097
   // Set the boundaries for probing (where the probe can reach).
1098 1098
   //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
1099
-  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
1099
+  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
1100 1100
   //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
1101
-  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
1101
+  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
1102 1102
 
1103 1103
   // Probe along the Y axis, advancing X after each column
1104 1104
   //#define PROBE_Y_FIRST

+ 2
- 2
Marlin/src/config/examples/Tronxy/X1/Configuration.h Visa fil

@@ -1040,9 +1040,9 @@
1040 1040
 
1041 1041
   // Set the boundaries for probing (where the probe can reach).
1042 1042
   //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
1043
-  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
1043
+  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
1044 1044
   //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
1045
-  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
1045
+  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
1046 1046
 
1047 1047
   // Probe along the Y axis, advancing X after each column
1048 1048
   //#define PROBE_Y_FIRST

+ 2
- 2
Marlin/src/config/examples/Tronxy/X3A/Configuration.h Visa fil

@@ -1044,9 +1044,9 @@
1044 1044
 
1045 1045
   // Set the boundaries for probing (where the probe can reach).
1046 1046
   //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
1047
-  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
1047
+  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
1048 1048
   //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
1049
-  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
1049
+  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
1050 1050
 
1051 1051
   // Probe along the Y axis, advancing X after each column
1052 1052
   //#define PROBE_Y_FIRST

+ 2
- 2
Marlin/src/config/examples/Tronxy/XY100/Configuration.h Visa fil

@@ -1051,9 +1051,9 @@
1051 1051
 
1052 1052
   // Set the boundaries for probing (where the probe can reach).
1053 1053
   //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
1054
-  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
1054
+  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
1055 1055
   //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
1056
-  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
1056
+  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
1057 1057
 
1058 1058
   // Probe along the Y axis, advancing X after each column
1059 1059
   //#define PROBE_Y_FIRST

+ 2
- 2
Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h Visa fil

@@ -1040,9 +1040,9 @@
1040 1040
 
1041 1041
   // Set the boundaries for probing (where the probe can reach).
1042 1042
   //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
1043
-  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
1043
+  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
1044 1044
   //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
1045
-  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
1045
+  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
1046 1046
 
1047 1047
   // Probe along the Y axis, advancing X after each column
1048 1048
   //#define PROBE_Y_FIRST

+ 2
- 2
Marlin/src/config/examples/Velleman/K8200/Configuration.h Visa fil

@@ -1070,9 +1070,9 @@
1070 1070
 
1071 1071
   // Set the boundaries for probing (where the probe can reach).
1072 1072
   //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
1073
-  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
1073
+  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
1074 1074
   //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
1075
-  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
1075
+  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
1076 1076
 
1077 1077
   // Probe along the Y axis, advancing X after each column
1078 1078
   //#define PROBE_Y_FIRST

+ 14
- 4
Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h Visa fil

@@ -221,10 +221,20 @@
221 221
 // before setting a PWM value. (Does not work with software PWM for fan on Sanguinololu)
222 222
 #define FAN_KICKSTART_TIME 500
223 223
 
224
-// This defines the minimal speed for the main fan, run in PWM mode
225
-// to enable uncomment and set minimal PWM speed for reliable running (1-255)
226
-// if fan speed is [1 - (FAN_MIN_PWM-1)] it is set to FAN_MIN_PWM
227
-#define FAN_MIN_PWM 50
224
+/**
225
+ * PWM Fan Scaling
226
+ *
227
+ * Define the min/max speeds for PWM fans (as set with M106).
228
+ *
229
+ * With these options the M106 0-255 value range is scaled to a subset
230
+ * to ensure that the fan has enough power to spin, or to run lower
231
+ * current fans with higher current. (e.g., 5V/12V fans with 12V/24V)
232
+ * Value 0 always turns off the fan.
233
+ *
234
+ * Define one or both of these to override the default 0-255 range.
235
+ */
236
+//#define FAN_MIN_PWM 50
237
+//#define FAN_MAX_PWM 128
228 238
 
229 239
 // @section extruder
230 240
 

+ 2
- 2
Marlin/src/config/examples/Velleman/K8400/Configuration.h Visa fil

@@ -1040,9 +1040,9 @@
1040 1040
 
1041 1041
   // Set the boundaries for probing (where the probe can reach).
1042 1042
   //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
1043
-  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
1043
+  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
1044 1044
   //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
1045
-  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
1045
+  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
1046 1046
 
1047 1047
   // Probe along the Y axis, advancing X after each column
1048 1048
   //#define PROBE_Y_FIRST

+ 1
- 1
Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h Visa fil

@@ -1647,7 +1647,7 @@
1647 1647
   #define MAX7219_INIT_TEST    2   // Do a test pattern at initialization (Set to 2 for spiral)
1648 1648
   #define MAX7219_NUMBER_UNITS 1   // Number of Max7219 units in chain.
1649 1649
   #define MAX7219_ROTATE       0   // Rotate the display clockwise (in multiples of +/- 90°)
1650
-                                   // connector at:  right=0   bottom=-90  top=90  left=18
1650
+                                   // connector at:  right=0   bottom=-90  top=90  left=180
1651 1651
 
1652 1652
   /**
1653 1653
    * Sample debug features

+ 2
- 2
Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h Visa fil

@@ -1040,9 +1040,9 @@
1040 1040
 
1041 1041
   // Set the boundaries for probing (where the probe can reach).
1042 1042
   //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
1043
-  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
1043
+  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
1044 1044
   //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
1045
-  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
1045
+  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
1046 1046
 
1047 1047
   // Probe along the Y axis, advancing X after each column
1048 1048
   //#define PROBE_Y_FIRST

+ 2
- 2
Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration.h Visa fil

@@ -1050,9 +1050,9 @@
1050 1050
 
1051 1051
   // Set the boundaries for probing (where the probe can reach).
1052 1052
   //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
1053
-  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
1053
+  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
1054 1054
   //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
1055
-  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
1055
+  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
1056 1056
 
1057 1057
   // Probe along the Y axis, advancing X after each column
1058 1058
   //#define PROBE_Y_FIRST

+ 2
- 2
Marlin/src/config/examples/adafruit/ST7565/Configuration.h Visa fil

@@ -1040,9 +1040,9 @@
1040 1040
 
1041 1041
   // Set the boundaries for probing (where the probe can reach).
1042 1042
   //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
1043
-  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
1043
+  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
1044 1044
   //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
1045
-  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
1045
+  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
1046 1046
 
1047 1047
   // Probe along the Y axis, advancing X after each column
1048 1048
   //#define PROBE_Y_FIRST

+ 4
- 5
Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h Visa fil

@@ -1175,10 +1175,10 @@
1175 1175
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1176 1176
 
1177 1177
   // Set the boundaries for probing (where the probe can reach).
1178
-  //#define LEFT_PROBE_BED_POSITION -(DELTA_PRINTABLE_RADIUS - MIN_PROBE_EDGE)
1179
-  //#define RIGHT_PROBE_BED_POSITION (DELTA_PRINTABLE_RADIUS - MIN_PROBE_EDGE)
1180
-  //#define FRONT_PROBE_BED_POSITION -(DELTA_PRINTABLE_RADIUS - MIN_PROBE_EDGE)
1181
-  //#define BACK_PROBE_BED_POSITION (DELTA_PRINTABLE_RADIUS - MIN_PROBE_EDGE)
1178
+  //#define LEFT_PROBE_BED_POSITION -(DELTA_PRINTABLE_RADIUS - (MIN_PROBE_EDGE))
1179
+  //#define RIGHT_PROBE_BED_POSITION (DELTA_PRINTABLE_RADIUS - (MIN_PROBE_EDGE))
1180
+  //#define FRONT_PROBE_BED_POSITION -(DELTA_PRINTABLE_RADIUS - (MIN_PROBE_EDGE))
1181
+  //#define BACK_PROBE_BED_POSITION (DELTA_PRINTABLE_RADIUS - (MIN_PROBE_EDGE))
1182 1182
 
1183 1183
   // Probe along the Y axis, advancing X after each column
1184 1184
   //#define PROBE_Y_FIRST
@@ -1647,7 +1647,6 @@
1647 1647
 //
1648 1648
 // Add individual axis homing items (Home X, Home Y, and Home Z) to the LCD menu.
1649 1649
 //
1650
-// INDIVIDUAL_AXIS_HOMING_MENU is incompatible with DELTA kinematics.
1651 1650
 //#define INDIVIDUAL_AXIS_HOMING_MENU
1652 1651
 
1653 1652
 //

+ 1
- 1
Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h Visa fil

@@ -752,7 +752,7 @@
752 752
 #if ENABLED(BABYSTEPPING)
753 753
   //#define BABYSTEP_XY              // Also enable X/Y Babystepping. Not supported on DELTA!
754 754
   #define BABYSTEP_INVERT_Z false    // Change if Z babysteps should go the other way
755
-  #define BABYSTEP_MULTIPLICATOR   1 // Babysteps are very small. Increase for faster motion.
755
+  #define BABYSTEP_MULTIPLICATOR 1   // Babysteps are very small. Increase for faster motion.
756 756
   //#define BABYSTEP_ZPROBE_OFFSET   // Enable to combine M851 and Babystepping
757 757
   //#define DOUBLECLICK_FOR_Z_BABYSTEPPING // Double-click on the Status Screen for Z Babystepping.
758 758
   #define DOUBLECLICK_MAX_INTERVAL 1250 // Maximum interval between clicks, in milliseconds.

+ 4
- 5
Marlin/src/config/examples/delta/FLSUN/kossel/Configuration.h Visa fil

@@ -1174,10 +1174,10 @@
1174 1174
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1175 1175
 
1176 1176
   // Set the boundaries for probing (where the probe can reach).
1177
-  //#define LEFT_PROBE_BED_POSITION -(DELTA_PRINTABLE_RADIUS - MIN_PROBE_EDGE)
1178
-  //#define RIGHT_PROBE_BED_POSITION (DELTA_PRINTABLE_RADIUS - MIN_PROBE_EDGE)
1179
-  //#define FRONT_PROBE_BED_POSITION -(DELTA_PRINTABLE_RADIUS - MIN_PROBE_EDGE)
1180
-  //#define BACK_PROBE_BED_POSITION (DELTA_PRINTABLE_RADIUS - MIN_PROBE_EDGE)
1177
+  //#define LEFT_PROBE_BED_POSITION -(DELTA_PRINTABLE_RADIUS - (MIN_PROBE_EDGE))
1178
+  //#define RIGHT_PROBE_BED_POSITION (DELTA_PRINTABLE_RADIUS - (MIN_PROBE_EDGE))
1179
+  //#define FRONT_PROBE_BED_POSITION -(DELTA_PRINTABLE_RADIUS - (MIN_PROBE_EDGE))
1180
+  //#define BACK_PROBE_BED_POSITION (DELTA_PRINTABLE_RADIUS - (MIN_PROBE_EDGE))
1181 1181
 
1182 1182
   // Probe along the Y axis, advancing X after each column
1183 1183
   //#define PROBE_Y_FIRST
@@ -1646,7 +1646,6 @@
1646 1646
 //
1647 1647
 // Add individual axis homing items (Home X, Home Y, and Home Z) to the LCD menu.
1648 1648
 //
1649
-// INDIVIDUAL_AXIS_HOMING_MENU is incompatible with DELTA kinematics.
1650 1649
 //#define INDIVIDUAL_AXIS_HOMING_MENU
1651 1650
 
1652 1651
 //

+ 4
- 4
Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h Visa fil

@@ -1174,10 +1174,10 @@
1174 1174
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1175 1175
 
1176 1176
   // Set the boundaries for probing (where the probe can reach).
1177
-  //#define LEFT_PROBE_BED_POSITION -(DELTA_PRINTABLE_RADIUS - MIN_PROBE_EDGE)
1178
-  //#define RIGHT_PROBE_BED_POSITION (DELTA_PRINTABLE_RADIUS - MIN_PROBE_EDGE)
1179
-  //#define FRONT_PROBE_BED_POSITION -(DELTA_PRINTABLE_RADIUS - MIN_PROBE_EDGE)
1180
-  //#define BACK_PROBE_BED_POSITION (DELTA_PRINTABLE_RADIUS - MIN_PROBE_EDGE)
1177
+  //#define LEFT_PROBE_BED_POSITION -(DELTA_PRINTABLE_RADIUS - (MIN_PROBE_EDGE))
1178
+  //#define RIGHT_PROBE_BED_POSITION (DELTA_PRINTABLE_RADIUS - (MIN_PROBE_EDGE))
1179
+  //#define FRONT_PROBE_BED_POSITION -(DELTA_PRINTABLE_RADIUS - (MIN_PROBE_EDGE))
1180
+  //#define BACK_PROBE_BED_POSITION (DELTA_PRINTABLE_RADIUS - (MIN_PROBE_EDGE))
1181 1181
 
1182 1182
   // Probe along the Y axis, advancing X after each column
1183 1183
   //#define PROBE_Y_FIRST

+ 2
- 2
Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h Visa fil

@@ -1054,9 +1054,9 @@
1054 1054
 
1055 1055
   // Set the boundaries for probing (where the probe can reach).
1056 1056
   //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
1057
-  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
1057
+  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
1058 1058
   //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
1059
-  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
1059
+  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
1060 1060
 
1061 1061
   // Probe along the Y axis, advancing X after each column
1062 1062
   //#define PROBE_Y_FIRST

+ 4
- 4
Marlin/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h Visa fil

@@ -1637,16 +1637,16 @@
1637 1637
  * Add support for a low-cost 8x8 LED Matrix based on the Max7219 chip as a realtime status display.
1638 1638
  * Requires 3 signal wires. Some useful debug options are included to demonstrate its usage.
1639 1639
  */
1640
-#define MAX7219_DEBUG
1640
+//#define MAX7219_DEBUG
1641 1641
 #if ENABLED(MAX7219_DEBUG)
1642 1642
   #define MAX7219_CLK_PIN   64
1643 1643
   #define MAX7219_DIN_PIN   57
1644 1644
   #define MAX7219_LOAD_PIN  44
1645 1645
 
1646
-  #define MAX7219_GCODE            // Add the M7219 G-code to control the LED matrix
1646
+  //#define MAX7219_GCODE          // Add the M7219 G-code to control the LED matrix
1647 1647
   #define MAX7219_INIT_TEST    2   // Do a test pattern at initialization (Set to 2 for spiral)
1648
-  #define MAX7219_NUMBER_UNITS 2   // Number of Max7219 units in chain.
1649
-  #define MAX7219_ROTATE     180   // Rotate the display clockwise (in multiples of +/- 90°)
1648
+  #define MAX7219_NUMBER_UNITS 1   // Number of Max7219 units in chain.
1649
+  #define MAX7219_ROTATE       0   // Rotate the display clockwise (in multiples of +/- 90°)
1650 1650
                                    // connector at:  right=0   bottom=-90  top=90  left=180
1651 1651
 
1652 1652
   /**

+ 2
- 2
Marlin/src/config/examples/makibox/Configuration.h Visa fil

@@ -1043,9 +1043,9 @@
1043 1043
 
1044 1044
   // Set the boundaries for probing (where the probe can reach).
1045 1045
   //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
1046
-  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
1046
+  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
1047 1047
   //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
1048
-  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
1048
+  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
1049 1049
 
1050 1050
   // Probe along the Y axis, advancing X after each column
1051 1051
   //#define PROBE_Y_FIRST

+ 2
- 2
Marlin/src/config/examples/stm32f103ret6/Configuration.h Visa fil

@@ -1042,9 +1042,9 @@
1042 1042
 
1043 1043
   // Set the boundaries for probing (where the probe can reach).
1044 1044
   //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
1045
-  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
1045
+  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
1046 1046
   //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
1047
-  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
1047
+  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
1048 1048
 
1049 1049
   // Probe along the Y axis, advancing X after each column
1050 1050
   //#define PROBE_Y_FIRST

+ 2
- 2
Marlin/src/config/examples/tvrrug/Round2/Configuration.h Visa fil

@@ -1035,9 +1035,9 @@
1035 1035
 
1036 1036
   // Set the boundaries for probing (where the probe can reach).
1037 1037
   //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
1038
-  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
1038
+  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
1039 1039
   //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
1040
-  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
1040
+  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
1041 1041
 
1042 1042
   // Probe along the Y axis, advancing X after each column
1043 1043
   //#define PROBE_Y_FIRST

+ 2
- 2
Marlin/src/config/examples/wt150/Configuration.h Visa fil

@@ -1045,9 +1045,9 @@
1045 1045
 
1046 1046
   // Set the boundaries for probing (where the probe can reach).
1047 1047
   //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
1048
-  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
1048
+  //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
1049 1049
   //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
1050
-  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
1050
+  //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
1051 1051
 
1052 1052
   // Probe along the Y axis, advancing X after each column
1053 1053
   //#define PROBE_Y_FIRST

+ 2
- 1
Marlin/src/config/examples/wt150/Configuration_adv.h Visa fil

@@ -1648,7 +1648,8 @@
1648 1648
   #define MAX7219_INIT_TEST    2   // Do a test pattern at initialization (Set to 2 for spiral)
1649 1649
   #define MAX7219_NUMBER_UNITS 1   // Number of Max7219 units in chain.
1650 1650
   #define MAX7219_ROTATE       0   // Rotate the display clockwise (in multiples of +/- 90°)
1651
-                                   // connector at:  right=0   bottom=-90  top=90  left=18
1651
+                                   // connector at:  right=0   bottom=-90  top=90  left=180
1652
+
1652 1653
   /**
1653 1654
    * Sample debug features
1654 1655
    * If you add more debug displays, be careful to avoid conflicts!

+ 2
- 2
Marlin/src/feature/bedlevel/abl/abl.cpp Visa fil

@@ -286,7 +286,7 @@ float bilinear_z_offset(const float raw[XYZ]) {
286 286
   if (last_x != rx) {
287 287
     last_x = rx;
288 288
     ratio_x = rx * ABL_BG_FACTOR(X_AXIS);
289
-    const float gx = constrain(FLOOR(ratio_x), 0, ABL_BG_POINTS_X - FAR_EDGE_OR_BOX);
289
+    const float gx = constrain(FLOOR(ratio_x), 0, ABL_BG_POINTS_X - (FAR_EDGE_OR_BOX));
290 290
     ratio_x -= gx;      // Subtract whole to get the ratio within the grid box
291 291
 
292 292
     #if DISABLED(EXTRAPOLATE_BEYOND_GRID)
@@ -303,7 +303,7 @@ float bilinear_z_offset(const float raw[XYZ]) {
303 303
     if (last_y != ry) {
304 304
       last_y = ry;
305 305
       ratio_y = ry * ABL_BG_FACTOR(Y_AXIS);
306
-      const float gy = constrain(FLOOR(ratio_y), 0, ABL_BG_POINTS_Y - FAR_EDGE_OR_BOX);
306
+      const float gy = constrain(FLOOR(ratio_y), 0, ABL_BG_POINTS_Y - (FAR_EDGE_OR_BOX));
307 307
       ratio_y -= gy;
308 308
 
309 309
       #if DISABLED(EXTRAPOLATE_BEYOND_GRID)

+ 1
- 1
Marlin/src/feature/tmc_util.cpp Visa fil

@@ -130,7 +130,7 @@ bool report_tmc_status = false;
130 130
     #if CURRENT_STEP_DOWN > 0
131 131
       // Decrease current if is_otpw is true and driver is enabled and there's been more than 4 warnings
132 132
       if (data.is_otpw && st.isEnabled() && otpw_cnt > 4) {
133
-        st.setCurrent(st.getCurrent() - CURRENT_STEP_DOWN, R_SENSE, HOLD_MULTIPLIER);
133
+        st.setCurrent(st.getCurrent() - (CURRENT_STEP_DOWN), R_SENSE, HOLD_MULTIPLIER);
134 134
         #if ENABLED(REPORT_CURRENT_CHANGE)
135 135
           _tmc_say_axis(axis);
136 136
           SERIAL_ECHOLNPAIR(" current decreased to ", st.getCurrent());

+ 6
- 6
Marlin/src/gcode/bedlevel/G26.cpp Visa fil

@@ -777,25 +777,25 @@ void GcodeSuite::G26() {
777 777
         if (xi == 0) {                             // left edge
778 778
           sx = f ? circle_x + INTERSECTION_CIRCLE_RADIUS : circle_x;
779 779
           ex = b ? circle_x + INTERSECTION_CIRCLE_RADIUS : circle_x;
780
-          sy = f ? circle_y : circle_y - INTERSECTION_CIRCLE_RADIUS;
780
+          sy = f ? circle_y : circle_y - (INTERSECTION_CIRCLE_RADIUS);
781 781
           ey = b ? circle_y : circle_y + INTERSECTION_CIRCLE_RADIUS;
782 782
           arc_length = (f || b) ? ARC_LENGTH(1) : ARC_LENGTH(2);
783 783
         }
784 784
         else if (r) {                             // right edge
785
-          sx = b ? circle_x - INTERSECTION_CIRCLE_RADIUS : circle_x;
786
-          ex = f ? circle_x - INTERSECTION_CIRCLE_RADIUS : circle_x;
785
+          sx = b ? circle_x - (INTERSECTION_CIRCLE_RADIUS) : circle_x;
786
+          ex = f ? circle_x - (INTERSECTION_CIRCLE_RADIUS) : circle_x;
787 787
           sy = b ? circle_y : circle_y + INTERSECTION_CIRCLE_RADIUS;
788
-          ey = f ? circle_y : circle_y - INTERSECTION_CIRCLE_RADIUS;
788
+          ey = f ? circle_y : circle_y - (INTERSECTION_CIRCLE_RADIUS);
789 789
           arc_length = (f || b) ? ARC_LENGTH(1) : ARC_LENGTH(2);
790 790
         }
791 791
         else if (f) {
792 792
           sx = circle_x + INTERSECTION_CIRCLE_RADIUS;
793
-          ex = circle_x - INTERSECTION_CIRCLE_RADIUS;
793
+          ex = circle_x - (INTERSECTION_CIRCLE_RADIUS);
794 794
           sy = ey = circle_y;
795 795
           arc_length = ARC_LENGTH(2);
796 796
         }
797 797
         else if (b) {
798
-          sx = circle_x - INTERSECTION_CIRCLE_RADIUS;
798
+          sx = circle_x - (INTERSECTION_CIRCLE_RADIUS);
799 799
           ex = circle_x + INTERSECTION_CIRCLE_RADIUS;
800 800
           sy = ey = circle_y;
801 801
           arc_length = ARC_LENGTH(2);

Laddar…
Avbryt
Spara