InsanityAutomation 5 роки тому
джерело
коміт
691e5c3bb8
100 змінених файлів з 797 додано та 77 видалено
  1. 7
    0
      Marlin/Configuration.h
  2. 5
    1
      Marlin/src/Marlin.cpp
  3. 93
    0
      Marlin/src/feature/bltouch.cpp
  4. 59
    0
      Marlin/src/feature/bltouch.h
  5. 5
    1
      Marlin/src/gcode/calibrate/G28.cpp
  6. 2
    2
      Marlin/src/gcode/calibrate/G34_M422.cpp
  7. 1
    13
      Marlin/src/inc/Conditionals_LCD.h
  8. 9
    0
      Marlin/src/lcd/language/language_en.h
  9. 2
    2
      Marlin/src/lcd/menu/menu.h
  10. 6
    4
      Marlin/src/lcd/menu/menu_advanced.cpp
  11. 5
    0
      Marlin/src/lcd/menu/menu_configuration.cpp
  12. 1
    1
      Marlin/src/module/configuration_store.cpp
  13. 8
    4
      Marlin/src/module/motion.cpp
  14. 6
    33
      Marlin/src/module/probe.cpp
  15. 0
    10
      Marlin/src/module/probe.h
  16. 11
    2
      Marlin/src/module/servo.h
  17. 3
    4
      buildroot/share/tests/megaatmega2560-tests
  18. 7
    0
      config/default/Configuration.h
  19. 7
    0
      config/examples/3DFabXYZ/Migbot/Configuration.h
  20. 7
    0
      config/examples/AlephObjects/TAZ4/Configuration.h
  21. 7
    0
      config/examples/AliExpress/CL-260/Configuration.h
  22. 7
    0
      config/examples/AliExpress/UM2pExt/Configuration.h
  23. 7
    0
      config/examples/Anet/A2/Configuration.h
  24. 7
    0
      config/examples/Anet/A2plus/Configuration.h
  25. 7
    0
      config/examples/Anet/A6/Configuration.h
  26. 7
    0
      config/examples/Anet/A8/Configuration.h
  27. 7
    0
      config/examples/AnyCubic/i3/Configuration.h
  28. 7
    0
      config/examples/ArmEd/Configuration.h
  29. 7
    0
      config/examples/Azteeg/X5GT/Configuration.h
  30. 7
    0
      config/examples/BIBO/TouchX/cyclops/Configuration.h
  31. 7
    0
      config/examples/BIBO/TouchX/default/Configuration.h
  32. 7
    0
      config/examples/BQ/Hephestos/Configuration.h
  33. 7
    0
      config/examples/BQ/Hephestos_2/Configuration.h
  34. 7
    0
      config/examples/BQ/WITBOX/Configuration.h
  35. 7
    0
      config/examples/Cartesio/Configuration.h
  36. 7
    0
      config/examples/Creality/CR-10/Configuration.h
  37. 7
    0
      config/examples/Creality/CR-10S/Configuration.h
  38. 7
    0
      config/examples/Creality/CR-10_5S/Configuration.h
  39. 7
    0
      config/examples/Creality/CR-10mini/Configuration.h
  40. 7
    0
      config/examples/Creality/CR-8/Configuration.h
  41. 7
    0
      config/examples/Creality/Ender-2/Configuration.h
  42. 7
    0
      config/examples/Creality/Ender-3/Configuration.h
  43. 7
    0
      config/examples/Creality/Ender-4/Configuration.h
  44. 7
    0
      config/examples/Einstart-S/Configuration.h
  45. 7
    0
      config/examples/Felix/Configuration.h
  46. 7
    0
      config/examples/Felix/DUAL/Configuration.h
  47. 7
    0
      config/examples/FlashForge/CreatorPro/Configuration.h
  48. 7
    0
      config/examples/FolgerTech/i3-2020/Configuration.h
  49. 7
    0
      config/examples/Formbot/Raptor/Configuration.h
  50. 7
    0
      config/examples/Formbot/T_Rex_2+/Configuration.h
  51. 7
    0
      config/examples/Formbot/T_Rex_3/Configuration.h
  52. 7
    0
      config/examples/Geeetech/A10M/Configuration.h
  53. 7
    0
      config/examples/Geeetech/A20M/Configuration.h
  54. 7
    0
      config/examples/Geeetech/GT2560/Configuration.h
  55. 7
    0
      config/examples/Geeetech/MeCreator2/Configuration.h
  56. 7
    0
      config/examples/Geeetech/Prusa i3 Pro B/bltouch/Configuration.h
  57. 7
    0
      config/examples/Geeetech/Prusa i3 Pro B/noprobe/Configuration.h
  58. 7
    0
      config/examples/Geeetech/Prusa i3 Pro C/Configuration.h
  59. 7
    0
      config/examples/Geeetech/Prusa i3 Pro W/Configuration.h
  60. 7
    0
      config/examples/Infitary/i3-M508/Configuration.h
  61. 7
    0
      config/examples/JGAurora/A5/Configuration.h
  62. 7
    0
      config/examples/MakerParts/Configuration.h
  63. 7
    0
      config/examples/Malyan/M150/Configuration.h
  64. 7
    0
      config/examples/Malyan/M200/Configuration.h
  65. 7
    0
      config/examples/Micromake/C1/basic/Configuration.h
  66. 7
    0
      config/examples/Micromake/C1/enhanced/Configuration.h
  67. 7
    0
      config/examples/Mks/Robin/Configuration.h
  68. 7
    0
      config/examples/Mks/Sbase/Configuration.h
  69. 7
    0
      config/examples/Printrbot/PrintrboardG2/Configuration.h
  70. 7
    0
      config/examples/RapideLite/RL200/Configuration.h
  71. 7
    0
      config/examples/RepRapPro/Huxley/Configuration.h
  72. 7
    0
      config/examples/RepRapWorld/Megatronics/Configuration.h
  73. 7
    0
      config/examples/RigidBot/Configuration.h
  74. 7
    0
      config/examples/SCARA/Configuration.h
  75. 7
    0
      config/examples/STM32F10/Configuration.h
  76. 7
    0
      config/examples/STM32F4/Configuration.h
  77. 7
    0
      config/examples/Sanguinololu/Configuration.h
  78. 7
    0
      config/examples/TheBorg/Configuration.h
  79. 7
    0
      config/examples/TinyBoy2/Configuration.h
  80. 7
    0
      config/examples/Tronxy/X1/Configuration.h
  81. 7
    0
      config/examples/Tronxy/X3A/Configuration.h
  82. 7
    0
      config/examples/Tronxy/X5S-2E/Configuration.h
  83. 7
    0
      config/examples/Tronxy/X5S/Configuration.h
  84. 7
    0
      config/examples/Tronxy/XY100/Configuration.h
  85. 7
    0
      config/examples/UltiMachine/Archim1/Configuration.h
  86. 7
    0
      config/examples/UltiMachine/Archim2/Configuration.h
  87. 7
    0
      config/examples/VORONDesign/Configuration.h
  88. 7
    0
      config/examples/Velleman/K8200/Configuration.h
  89. 7
    0
      config/examples/Velleman/K8400/Configuration.h
  90. 7
    0
      config/examples/Velleman/K8400/Dual-head/Configuration.h
  91. 7
    0
      config/examples/WASP/PowerWASP/Configuration.h
  92. 7
    0
      config/examples/Wanhao/Duplicator 6/Configuration.h
  93. 7
    0
      config/examples/adafruit/ST7565/Configuration.h
  94. 7
    0
      config/examples/delta/Anycubic/Kossel/Configuration.h
  95. 7
    0
      config/examples/delta/FLSUN/auto_calibrate/Configuration.h
  96. 7
    0
      config/examples/delta/FLSUN/kossel/Configuration.h
  97. 7
    0
      config/examples/delta/FLSUN/kossel_mini/Configuration.h
  98. 7
    0
      config/examples/delta/Geeetech/Rostock 301/Configuration.h
  99. 7
    0
      config/examples/delta/Hatchbox_Alpha/Configuration.h
  100. 0
    0
      config/examples/delta/MKS/SBASE/Configuration.h

+ 7
- 0
Marlin/Configuration.h Переглянути файл

@@ -817,6 +817,13 @@
817 817
 //#define BLTOUCH
818 818
 #if ENABLED(BLTOUCH)
819 819
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
820
+
821
+  // BLTouch V3.0 and newer smart series
822
+  //#define BLTOUCH_V3
823
+  #if ENABLED(BLTOUCH_V3)
824
+    //#define BLTOUCH_FORCE_5V_MODE
825
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
826
+  #endif
820 827
 #endif
821 828
 
822 829
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 5
- 1
Marlin/src/Marlin.cpp Переглянути файл

@@ -84,6 +84,10 @@
84 84
   #include "feature/leds/leds.h"
85 85
 #endif
86 86
 
87
+#if ENABLED(BLTOUCH)
88
+  #include "feature/bltouch.h"
89
+#endif
90
+
87 91
 #if HAS_SERVOS
88 92
   #include "module/servo.h"
89 93
 #endif
@@ -1049,7 +1053,7 @@ void setup() {
1049 1053
   #endif
1050 1054
 
1051 1055
   #if ENABLED(BLTOUCH)
1052
-    bltouch_init();
1056
+    bltouch.init();
1053 1057
   #endif
1054 1058
 
1055 1059
   #if ENABLED(I2C_POSITION_ENCODERS)

+ 93
- 0
Marlin/src/feature/bltouch.cpp Переглянути файл

@@ -0,0 +1,93 @@
1
+/**
2
+ * Marlin 3D Printer Firmware
3
+ * Copyright (C) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4
+ *
5
+ * Based on Sprinter and grbl.
6
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
7
+ *
8
+ * This program is free software: you can redistribute it and/or modify
9
+ * it under the terms of the GNU General Public License as published by
10
+ * the Free Software Foundation, either version 3 of the License, or
11
+ * (at your option) any later version.
12
+ *
13
+ * This program is distributed in the hope that it will be useful,
14
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
15
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
16
+ * GNU General Public License for more details.
17
+ *
18
+ * You should have received a copy of the GNU General Public License
19
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
20
+ *
21
+ */
22
+
23
+#include "../inc/MarlinConfig.h"
24
+
25
+#if ENABLED(BLTOUCH)
26
+
27
+#include "bltouch.h"
28
+
29
+BLTouch bltouch;
30
+
31
+#include "../module/servo.h"
32
+
33
+void stop();
34
+
35
+#define DEBUG_OUT ENABLED(DEBUG_LEVELING_FEATURE)
36
+#include "../core/debug_out.h"
37
+
38
+void BLTouch::command(const BLTCommand cmd) {
39
+  MOVE_SERVO(Z_PROBE_SERVO_NR, cmd);
40
+  safe_delay(BLTOUCH_DELAY);
41
+}
42
+
43
+void BLTouch::init() {
44
+  reset();                            // Clear all BLTouch error conditions
45
+  stow();
46
+}
47
+
48
+bool BLTouch::triggered() {
49
+  return (
50
+    #if ENABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN)
51
+      READ(Z_MIN_PIN) != Z_MIN_ENDSTOP_INVERTING
52
+    #else
53
+      READ(Z_MIN_PROBE_PIN) != Z_MIN_PROBE_ENDSTOP_INVERTING
54
+    #endif
55
+  );
56
+}
57
+
58
+bool BLTouch::set_deployed(const bool in_deploy) {
59
+  if (in_deploy && triggered()) {     // If BLTouch says it's triggered
60
+    reset();                          //  try to reset it.
61
+    _deploy(); _stow();               // Deploy and stow to clear the "triggered" condition.
62
+    safe_delay(1500);                 // Wait for internal self-test to complete.
63
+                                      //  (Measured completion time was 0.65 seconds
64
+                                      //   after reset, deploy, and stow sequence)
65
+    if (triggered()) {                // If it still claims to be triggered...
66
+      SERIAL_ERROR_MSG(MSG_STOP_BLTOUCH);
67
+      stop();                         // punt!
68
+      return true;
69
+    }
70
+  }
71
+
72
+  #if ENABLED(BLTOUCH_V3)
73
+    #if ENABLED(BLTOUCH_FORCE_5V_MODE)
74
+      set_5V_mode();                  // Assume 5V DC logic level if endstop pullup resistors are enabled
75
+    #else
76
+      set_OD_mode();
77
+    #endif
78
+  #endif
79
+
80
+  if (in_deploy) {
81
+    _deploy();
82
+    #if ENABLED(BLTOUCH_V3)
83
+      set_SW_mode();                  // Ensure Switch mode is activated for BLTouch V3. Ignored on V2.
84
+    #endif
85
+  }
86
+  else _stow();
87
+
88
+  if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("bltouch.set_deployed(", in_deploy, ")");
89
+
90
+  return false;
91
+}
92
+
93
+#endif // BLTOUCH

+ 59
- 0
Marlin/src/feature/bltouch.h Переглянути файл

@@ -0,0 +1,59 @@
1
+/**
2
+ * Marlin 3D Printer Firmware
3
+ * Copyright (C) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4
+ *
5
+ * Based on Sprinter and grbl.
6
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
7
+ *
8
+ * This program is free software: you can redistribute it and/or modify
9
+ * it under the terms of the GNU General Public License as published by
10
+ * the Free Software Foundation, either version 3 of the License, or
11
+ * (at your option) any later version.
12
+ *
13
+ * This program is distributed in the hope that it will be useful,
14
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
15
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
16
+ * GNU General Public License for more details.
17
+ *
18
+ * You should have received a copy of the GNU General Public License
19
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
20
+ *
21
+ */
22
+#pragma once
23
+
24
+#include "../inc/MarlinConfigPre.h"
25
+
26
+// BLTouch commands are sent as servo angles
27
+typedef unsigned char BLTCommand;
28
+
29
+#define BLTOUCH_DEPLOY    10
30
+#define BLTOUCH_SW_MODE   60
31
+#define BLTOUCH_STOW      90
32
+#define BLTOUCH_SELFTEST 120
33
+#define BLTOUCH_5V_MODE  140
34
+#define BLTOUCH_OD_MODE  150
35
+#define BLTOUCH_RESET    160
36
+
37
+class BLTouch {
38
+public:
39
+  static void init();
40
+  static void command(const BLTCommand cmd);
41
+  static bool triggered();
42
+
43
+  FORCE_INLINE static void reset()       { command(BLTOUCH_RESET); }
44
+  FORCE_INLINE static void set_5V_mode() { command(BLTOUCH_5V_MODE); }
45
+  FORCE_INLINE static void set_OD_mode() { command(BLTOUCH_OD_MODE); }
46
+  FORCE_INLINE static void set_SW_mode() { command(BLTOUCH_SW_MODE); }
47
+
48
+  FORCE_INLINE static bool deploy() { return set_deployed(true); }
49
+  FORCE_INLINE static bool stow()   { return set_deployed(false); }
50
+
51
+private:
52
+  FORCE_INLINE static void _deploy()     { command(BLTOUCH_DEPLOY); }
53
+  FORCE_INLINE static void _stow()       { command(BLTOUCH_STOW); }
54
+  static bool set_deployed(const bool deploy);
55
+};
56
+
57
+#define BLTOUCH_ANGLES { BLTOUCH_DEPLOY, BLTOUCH_STOW }
58
+
59
+extern BLTouch bltouch;

+ 5
- 1
Marlin/src/gcode/calibrate/G28.cpp Переглянути файл

@@ -43,6 +43,10 @@
43 43
   #include "../../module/probe.h"
44 44
 #endif
45 45
 
46
+#if ENABLED(BLTOUCH)
47
+  #include "../../feature/bltouch.h"
48
+#endif
49
+
46 50
 #include "../../lcd/ultralcd.h"
47 51
 
48 52
 #if HAS_DRIVER(L6470)                         // set L6470 absolute position registers to counts
@@ -235,7 +239,7 @@ void GcodeSuite::G28(const bool always_home_all) {
235 239
   #endif
236 240
 
237 241
   #if ENABLED(BLTOUCH)
238
-    bltouch_init();
242
+    bltouch.init();
239 243
   #endif
240 244
 
241 245
   // Always home with tool 0 active

+ 2
- 2
Marlin/src/gcode/calibrate/G34_M422.cpp Переглянути файл

@@ -108,8 +108,8 @@ void GcodeSuite::G34() {
108 108
     #endif
109 109
 
110 110
     #if ENABLED(BLTOUCH)
111
-      bltouch_command(BLTOUCH_RESET);
112
-      set_bltouch_deployed(false);
111
+      bltouch.reset();
112
+      bltouch.stow();
113 113
     #endif
114 114
 
115 115
     // Always home with tool 0 active

+ 1
- 13
Marlin/src/inc/Conditionals_LCD.h Переглянути файл

@@ -460,25 +460,13 @@
460 460
   #ifndef BLTOUCH_DELAY
461 461
     #define BLTOUCH_DELAY 375
462 462
   #endif
463
-  #undef Z_SERVO_ANGLES
464
-  #define Z_SERVO_ANGLES { BLTOUCH_DEPLOY, BLTOUCH_STOW }
465
-
466
-  #define BLTOUCH_DEPLOY    10
467
-  #define BLTOUCH_STOW      90
468
-  #define BLTOUCH_SELFTEST 120
469
-  #define BLTOUCH_RESET    160
470
-  #define _TEST_BLTOUCH(P) (READ(P##_PIN) != P##_ENDSTOP_INVERTING)
471 463
 
472 464
   // Always disable probe pin inverting for BLTouch
473 465
   #undef Z_MIN_PROBE_ENDSTOP_INVERTING
474 466
   #define Z_MIN_PROBE_ENDSTOP_INVERTING false
475
-
476 467
   #if ENABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN)
477 468
     #undef Z_MIN_ENDSTOP_INVERTING
478
-    #define Z_MIN_ENDSTOP_INVERTING Z_MIN_PROBE_ENDSTOP_INVERTING
479
-    #define TEST_BLTOUCH() _TEST_BLTOUCH(Z_MIN)
480
-  #else
481
-    #define TEST_BLTOUCH() _TEST_BLTOUCH(Z_MIN_PROBE)
469
+    #define Z_MIN_ENDSTOP_INVERTING false
482 470
   #endif
483 471
 #endif
484 472
 

+ 9
- 0
Marlin/src/lcd/language/language_en.h Переглянути файл

@@ -867,6 +867,15 @@
867 867
 #ifndef MSG_BLTOUCH_DEPLOY
868 868
   #define MSG_BLTOUCH_DEPLOY                  _UxGT("Deploy BLTouch")
869 869
 #endif
870
+#ifndef MSG_BLTOUCH_SW_MODE
871
+  #define MSG_BLTOUCH_SW_MODE                 _UxGT("SW Deploy BLTouch")
872
+#endif
873
+#ifndef MSG_BLTOUCH_5V_MODE
874
+  #define MSG_BLTOUCH_5V_MODE                 _UxGT("BLTouch 5V Mode")
875
+#endif
876
+#ifndef MSG_BLTOUCH_OD_MODE
877
+  #define MSG_BLTOUCH_OD_MODE                 _UxGT("BLTouch OD Mode")
878
+#endif
870 879
 #ifndef MSG_BLTOUCH_STOW
871 880
   #define MSG_BLTOUCH_STOW                    _UxGT("Stow BLTouch")
872 881
 #endif

+ 2
- 2
Marlin/src/lcd/menu/menu.h Переглянути файл

@@ -296,11 +296,11 @@ class MenuItem_bool {
296 296
   ++_thisItemNr; \
297 297
 } while(0)
298 298
 
299
-#define MENU_ITEM_ADDON_START(X) \
299
+#define MENU_ITEM_ADDON_START(X) do{ \
300 300
   if (ui.should_draw() && _menuLineNr == _thisItemNr - 1) { \
301 301
     SETCURSOR(X, _lcdLineNr)
302 302
 
303
-#define MENU_ITEM_ADDON_END() } (0)
303
+#define MENU_ITEM_ADDON_END() } }while(0)
304 304
 
305 305
 #define STATIC_ITEM(LABEL, ...) STATIC_ITEM_P(PSTR(LABEL), ## __VA_ARGS__)
306 306
 

+ 6
- 4
Marlin/src/lcd/menu/menu_advanced.cpp Переглянути файл

@@ -37,9 +37,11 @@
37 37
 
38 38
 #if HAS_BED_PROBE
39 39
   #include "../../module/probe.h"
40
-  #if ENABLED(BLTOUCH)
41
-    #include "../../module/endstops.h"
42
-  #endif
40
+#endif
41
+
42
+#if ENABLED(BLTOUCH)
43
+  #include "../../module/endstops.h"
44
+  #include "../../feature/bltouch.h"
43 45
 #endif
44 46
 
45 47
 #if ENABLED(PIDTEMP)
@@ -694,7 +696,7 @@ void menu_advanced_settings() {
694 696
   //
695 697
   #if ENABLED(BLTOUCH)
696 698
     MENU_ITEM(gcode, MSG_BLTOUCH_SELFTEST, PSTR("M280 P" STRINGIFY(Z_PROBE_SERVO_NR) " S" STRINGIFY(BLTOUCH_SELFTEST)));
697
-    if (!endstops.z_probe_enabled && TEST_BLTOUCH())
699
+    if (!endstops.z_probe_enabled && bltouch.triggered())
698 700
       MENU_ITEM(gcode, MSG_BLTOUCH_RESET, PSTR("M280 P" STRINGIFY(Z_PROBE_SERVO_NR) " S" STRINGIFY(BLTOUCH_RESET)));
699 701
   #endif
700 702
 

+ 5
- 0
Marlin/src/lcd/menu/menu_configuration.cpp Переглянути файл

@@ -161,6 +161,11 @@ static void lcd_factory_settings() {
161 161
     MENU_ITEM(gcode, MSG_BLTOUCH_SELFTEST, PSTR("M280 P" STRINGIFY(Z_PROBE_SERVO_NR) " S" STRINGIFY(BLTOUCH_SELFTEST)));
162 162
     MENU_ITEM(gcode, MSG_BLTOUCH_DEPLOY, PSTR("M280 P" STRINGIFY(Z_PROBE_SERVO_NR) " S" STRINGIFY(BLTOUCH_DEPLOY)));
163 163
     MENU_ITEM(gcode, MSG_BLTOUCH_STOW, PSTR("M280 P" STRINGIFY(Z_PROBE_SERVO_NR) " S" STRINGIFY(BLTOUCH_STOW)));
164
+    #if ENABLED(BLTOUCH_V3)
165
+      MENU_ITEM(gcode, MSG_BLTOUCH_SW_MODE, PSTR("M280 P" STRINGIFY(Z_PROBE_SERVO_NR) " S" STRINGIFY(BLTOUCH_SW_MODE)));
166
+      MENU_ITEM(gcode, MSG_BLTOUCH_5V_MODE, PSTR("M280 P" STRINGIFY(Z_PROBE_SERVO_NR) " S" STRINGIFY(BLTOUCH_5V_MODE)));
167
+      MENU_ITEM(gcode, MSG_BLTOUCH_OD_MODE, PSTR("M280 P" STRINGIFY(Z_PROBE_SERVO_NR) " S" STRINGIFY(BLTOUCH_OD_MODE)));
168
+    #endif
164 169
     END_MENU();
165 170
   }
166 171
 

+ 1
- 1
Marlin/src/module/configuration_store.cpp Переглянути файл

@@ -2578,7 +2578,7 @@ void MarlinSettings::reset() {
2578 2578
             #endif
2579 2579
           #elif ENABLED(SWITCHING_NOZZLE)
2580 2580
             case SWITCHING_NOZZLE_SERVO_NR:
2581
-          #elif defined(Z_SERVO_ANGLES) && defined(Z_PROBE_SERVO_NR)
2581
+          #elif (ENABLED(BLTOUCH) && defined(BLTOUCH_ANGLES)) || (defined(Z_SERVO_ANGLES) && defined(Z_PROBE_SERVO_NR))
2582 2582
             case Z_PROBE_SERVO_NR:
2583 2583
           #endif
2584 2584
             CONFIG_ECHO_START();

+ 8
- 4
Marlin/src/module/motion.cpp Переглянути файл

@@ -47,6 +47,10 @@
47 47
   #include "../feature/bedlevel/bedlevel.h"
48 48
 #endif
49 49
 
50
+#if ENABLED(BLTOUCH)
51
+  #include "../feature/bltouch.h"
52
+#endif
53
+
50 54
 #if EITHER(ULTRA_LCD, EXTENSIBLE_UI)
51 55
   #include "../lcd/ultralcd.h"
52 56
 #endif
@@ -1400,7 +1404,7 @@ void homeaxis(const AxisEnum axis) {
1400 1404
 
1401 1405
   #if HOMING_Z_WITH_PROBE && ENABLED(BLTOUCH)
1402 1406
     // BLTOUCH needs to be deployed every time
1403
-    if (axis == Z_AXIS && set_bltouch_deployed(true)) return;
1407
+    if (axis == Z_AXIS && bltouch.deploy()) return;
1404 1408
   #endif
1405 1409
 
1406 1410
   do_homing_move(axis, 1.5f * max_length(
@@ -1414,7 +1418,7 @@ void homeaxis(const AxisEnum axis) {
1414 1418
 
1415 1419
   #if HOMING_Z_WITH_PROBE && ENABLED(BLTOUCH)
1416 1420
     // BLTOUCH needs to be stowed after trigger to rearm itself
1417
-    if (axis == Z_AXIS) set_bltouch_deployed(false);
1421
+    if (axis == Z_AXIS) bltouch.stow();
1418 1422
   #endif
1419 1423
 
1420 1424
   // When homing Z with probe respect probe clearance
@@ -1440,14 +1444,14 @@ void homeaxis(const AxisEnum axis) {
1440 1444
 
1441 1445
     #if HOMING_Z_WITH_PROBE && ENABLED(BLTOUCH)
1442 1446
       // BLTOUCH needs to be deployed every time
1443
-      if (axis == Z_AXIS && set_bltouch_deployed(true)) return;
1447
+      if (axis == Z_AXIS && bltouch.deploy()) return;
1444 1448
     #endif
1445 1449
 
1446 1450
     do_homing_move(axis, 2 * bump, get_homing_bump_feedrate(axis));
1447 1451
 
1448 1452
     #if HOMING_Z_WITH_PROBE && ENABLED(BLTOUCH)
1449 1453
       // BLTOUCH needs to be stowed after trigger to rearm itself
1450
-      if (axis == Z_AXIS) set_bltouch_deployed(false);
1454
+      if (axis == Z_AXIS) bltouch.stow();
1451 1455
     #endif
1452 1456
   }
1453 1457
 

+ 6
- 33
Marlin/src/module/probe.cpp Переглянути файл

@@ -56,6 +56,10 @@
56 56
 
57 57
 float zprobe_zoffset; // Initialized by settings.load()
58 58
 
59
+#if ENABLED(BLTOUCH)
60
+  #include "../feature/bltouch.h"
61
+#endif
62
+
59 63
 #if HAS_Z_SERVO_PROBE
60 64
   #include "servo.h"
61 65
 #endif
@@ -289,37 +293,6 @@ float zprobe_zoffset; // Initialized by settings.load()
289 293
   }
290 294
 #endif // QUIET_PROBING
291 295
 
292
-#if ENABLED(BLTOUCH)
293
-
294
-  void bltouch_command(const int angle) {
295
-    MOVE_SERVO(Z_PROBE_SERVO_NR, angle);  // Give the BL-Touch the command and wait
296
-    safe_delay(BLTOUCH_DELAY);
297
-  }
298
-
299
-  bool set_bltouch_deployed(const bool deploy) {
300
-    if (deploy && TEST_BLTOUCH()) {      // If BL-Touch says it's triggered
301
-      bltouch_command(BLTOUCH_RESET);    //  try to reset it.
302
-      bltouch_command(BLTOUCH_DEPLOY);   // Also needs to deploy and stow to
303
-      bltouch_command(BLTOUCH_STOW);     //  clear the triggered condition.
304
-      safe_delay(1500);                  // Wait for internal self-test to complete.
305
-                                         //  (Measured completion time was 0.65 seconds
306
-                                         //   after reset, deploy, and stow sequence)
307
-      if (TEST_BLTOUCH()) {              // If it still claims to be triggered...
308
-        SERIAL_ERROR_MSG(MSG_STOP_BLTOUCH);
309
-        stop();                          // punt!
310
-        return true;
311
-      }
312
-    }
313
-
314
-    bltouch_command(deploy ? BLTOUCH_DEPLOY : BLTOUCH_STOW);
315
-
316
-    if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("set_bltouch_deployed(", deploy, ")");
317
-
318
-    return false;
319
-  }
320
-
321
-#endif // BLTOUCH
322
-
323 296
 /**
324 297
  * Raise Z to a minimum height to make room for a probe to move
325 298
  */
@@ -530,7 +503,7 @@ static bool do_probe_move(const float z, const float fr_mm_s) {
530 503
 
531 504
   // Deploy BLTouch at the start of any probe
532 505
   #if ENABLED(BLTOUCH)
533
-    if (set_bltouch_deployed(true)) return true;
506
+    if (bltouch.deploy()) return true;
534 507
   #endif
535 508
 
536 509
   // Disable stealthChop if used. Enable diag1 pin on driver.
@@ -582,7 +555,7 @@ static bool do_probe_move(const float z, const float fr_mm_s) {
582 555
 
583 556
   // Retract BLTouch immediately after a probe if it was triggered
584 557
   #if ENABLED(BLTOUCH)
585
-    if (probe_triggered && set_bltouch_deployed(false)) return true;
558
+    if (probe_triggered && bltouch.stow()) return true;
586 559
   #endif
587 560
 
588 561
   // Clear endstop flags

+ 0
- 10
Marlin/src/module/probe.h Переглянути файл

@@ -57,13 +57,3 @@
57 57
 #if QUIET_PROBING
58 58
   void probing_pause(const bool p);
59 59
 #endif
60
-
61
-#if ENABLED(BLTOUCH)
62
-  void bltouch_command(int angle);
63
-  bool set_bltouch_deployed(const bool deploy);
64
-  FORCE_INLINE void bltouch_init() {
65
-    // Make sure any BLTouch error condition is cleared
66
-    bltouch_command(BLTOUCH_RESET);
67
-    set_bltouch_deployed(false);
68
-  }
69
-#endif

+ 11
- 2
Marlin/src/module/servo.h Переглянути файл

@@ -44,9 +44,18 @@
44 44
   #elif ENABLED(SWITCHING_NOZZLE)
45 45
     #define SADATA    SWITCHING_NOZZLE_SERVO_ANGLES
46 46
     #define ASRC(N,E) (SWITCHING_NOZZLE_SERVO_NR == N ? asrc[E] : 0)
47
-  #elif defined(Z_SERVO_ANGLES) && defined(Z_PROBE_SERVO_NR)
48
-    #define SADATA    Z_SERVO_ANGLES
47
+  #elif defined(Z_PROBE_SERVO_NR)
49 48
     #define ASRC(N,E) (Z_PROBE_SERVO_NR == N ? asrc[E] : 0)
49
+    #if ENABLED(BLTOUCH)
50
+      #include "../feature/bltouch.h"
51
+    #endif
52
+    #ifdef BLTOUCH_ANGLES
53
+      #define SADATA  BLTOUCH_ANGLES
54
+    #elif defined(Z_SERVO_ANGLES)
55
+      #define SADATA  Z_SERVO_ANGLES
56
+    #else
57
+      #error "Servo angles are needed!"
58
+    #endif
50 59
   #endif
51 60
 
52 61
   #if ENABLED(EDITABLE_SERVO_ANGLES)

+ 3
- 4
buildroot/share/tests/megaatmega2560-tests Переглянути файл

@@ -264,7 +264,6 @@ exec_test $1 $2 "Many less common options"
264 264
 # Test a full-featured CR-10S config
265 265
 #
266 266
 use_example_configs Creality/CR-10S
267
-opt_enable SHOW_CUSTOM_BOOTSCREEN
268 267
 exec_test $1 $2 "Full-featured CR-10S config"
269 268
 #
270 269
 # BQ Hephestos 2
@@ -272,10 +271,10 @@ exec_test $1 $2 "Full-featured CR-10S config"
272 271
 #use_example_configs Hephestos_2
273 272
 #exec_test $1 $2 "Stuff"
274 273
 #
275
-# Delta Config (generic) + ABL bilinear + PROBE_MANUALLY
274
+# Delta Config (generic) + ABL bilinear + BLTOUCH
276 275
 use_example_configs delta/generic
277
-opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER DELTA_CALIBRATION_MENU AUTO_BED_LEVELING_BILINEAR PROBE_MANUALLY
278
-exec_test $1 $2 "Delta Config (generic) + ABL bilinear + PROBE_MANUALLY"
276
+opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER DELTA_CALIBRATION_MENU AUTO_BED_LEVELING_BILINEAR BLTOUCH BLTOUCH_V3
277
+exec_test $1 $2 "Delta Config (generic) + ABL bilinear + BLTOUCH"
279 278
 #
280 279
 # Delta Config (generic) + UBL + ALLEN_KEY + OLED_PANEL_TINYBOY2 + EEPROM_SETTINGS
281 280
 #

+ 7
- 0
config/default/Configuration.h Переглянути файл

@@ -817,6 +817,13 @@
817 817
 //#define BLTOUCH
818 818
 #if ENABLED(BLTOUCH)
819 819
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
820
+
821
+  // BLTouch V3.0 and newer smart series
822
+  //#define BLTOUCH_V3
823
+  #if ENABLED(BLTOUCH_V3)
824
+    //#define BLTOUCH_FORCE_5V_MODE
825
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
826
+  #endif
820 827
 #endif
821 828
 
822 829
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/3DFabXYZ/Migbot/Configuration.h Переглянути файл

@@ -823,6 +823,13 @@
823 823
 //#define BLTOUCH
824 824
 #if ENABLED(BLTOUCH)
825 825
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
826
+
827
+  // BLTouch V3.0 and newer smart series
828
+  //#define BLTOUCH_V3
829
+  #if ENABLED(BLTOUCH_V3)
830
+    //#define BLTOUCH_FORCE_5V_MODE
831
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
832
+  #endif
826 833
 #endif
827 834
 
828 835
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/AlephObjects/TAZ4/Configuration.h Переглянути файл

@@ -837,6 +837,13 @@
837 837
 //#define BLTOUCH
838 838
 #if ENABLED(BLTOUCH)
839 839
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
840
+
841
+  // BLTouch V3.0 and newer smart series
842
+  //#define BLTOUCH_V3
843
+  #if ENABLED(BLTOUCH_V3)
844
+    //#define BLTOUCH_FORCE_5V_MODE
845
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
846
+  #endif
840 847
 #endif
841 848
 
842 849
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/AliExpress/CL-260/Configuration.h Переглянути файл

@@ -817,6 +817,13 @@
817 817
 //#define BLTOUCH
818 818
 #if ENABLED(BLTOUCH)
819 819
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
820
+
821
+  // BLTouch V3.0 and newer smart series
822
+  //#define BLTOUCH_V3
823
+  #if ENABLED(BLTOUCH_V3)
824
+    //#define BLTOUCH_FORCE_5V_MODE
825
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
826
+  #endif
820 827
 #endif
821 828
 
822 829
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/AliExpress/UM2pExt/Configuration.h Переглянути файл

@@ -828,6 +828,13 @@
828 828
 //#define BLTOUCH
829 829
 #if ENABLED(BLTOUCH)
830 830
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
831
+
832
+  // BLTouch V3.0 and newer smart series
833
+  //#define BLTOUCH_V3
834
+  #if ENABLED(BLTOUCH_V3)
835
+    //#define BLTOUCH_FORCE_5V_MODE
836
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
837
+  #endif
831 838
 #endif
832 839
 
833 840
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/Anet/A2/Configuration.h Переглянути файл

@@ -817,6 +817,13 @@
817 817
 //#define BLTOUCH
818 818
 #if ENABLED(BLTOUCH)
819 819
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
820
+
821
+  // BLTouch V3.0 and newer smart series
822
+  //#define BLTOUCH_V3
823
+  #if ENABLED(BLTOUCH_V3)
824
+    //#define BLTOUCH_FORCE_5V_MODE
825
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
826
+  #endif
820 827
 #endif
821 828
 
822 829
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/Anet/A2plus/Configuration.h Переглянути файл

@@ -817,6 +817,13 @@
817 817
 //#define BLTOUCH
818 818
 #if ENABLED(BLTOUCH)
819 819
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
820
+
821
+  // BLTouch V3.0 and newer smart series
822
+  //#define BLTOUCH_V3
823
+  #if ENABLED(BLTOUCH_V3)
824
+    //#define BLTOUCH_FORCE_5V_MODE
825
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
826
+  #endif
820 827
 #endif
821 828
 
822 829
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/Anet/A6/Configuration.h Переглянути файл

@@ -864,6 +864,13 @@
864 864
 //#define BLTOUCH
865 865
 #if ENABLED(BLTOUCH)
866 866
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
867
+
868
+  // BLTouch V3.0 and newer smart series
869
+  //#define BLTOUCH_V3
870
+  #if ENABLED(BLTOUCH_V3)
871
+    //#define BLTOUCH_FORCE_5V_MODE
872
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
873
+  #endif
867 874
 #endif
868 875
 
869 876
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/Anet/A8/Configuration.h Переглянути файл

@@ -830,6 +830,13 @@
830 830
 //#define BLTOUCH
831 831
 #if ENABLED(BLTOUCH)
832 832
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
833
+
834
+  // BLTouch V3.0 and newer smart series
835
+  //#define BLTOUCH_V3
836
+  #if ENABLED(BLTOUCH_V3)
837
+    //#define BLTOUCH_FORCE_5V_MODE
838
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
839
+  #endif
833 840
 #endif
834 841
 
835 842
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/AnyCubic/i3/Configuration.h Переглянути файл

@@ -827,6 +827,13 @@
827 827
 #define BLTOUCH
828 828
 #if ENABLED(BLTOUCH)
829 829
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
830
+
831
+  // BLTouch V3.0 and newer smart series
832
+  //#define BLTOUCH_V3
833
+  #if ENABLED(BLTOUCH_V3)
834
+    //#define BLTOUCH_FORCE_5V_MODE
835
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
836
+  #endif
830 837
 #endif
831 838
 
832 839
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/ArmEd/Configuration.h Переглянути файл

@@ -818,6 +818,13 @@
818 818
 //#define BLTOUCH
819 819
 #if ENABLED(BLTOUCH)
820 820
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
821
+
822
+  // BLTouch V3.0 and newer smart series
823
+  //#define BLTOUCH_V3
824
+  #if ENABLED(BLTOUCH_V3)
825
+    //#define BLTOUCH_FORCE_5V_MODE
826
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
827
+  #endif
821 828
 #endif
822 829
 
823 830
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/Azteeg/X5GT/Configuration.h Переглянути файл

@@ -817,6 +817,13 @@
817 817
 //#define BLTOUCH
818 818
 #if ENABLED(BLTOUCH)
819 819
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
820
+
821
+  // BLTouch V3.0 and newer smart series
822
+  //#define BLTOUCH_V3
823
+  #if ENABLED(BLTOUCH_V3)
824
+    //#define BLTOUCH_FORCE_5V_MODE
825
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
826
+  #endif
820 827
 #endif
821 828
 
822 829
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/BIBO/TouchX/cyclops/Configuration.h Переглянути файл

@@ -817,6 +817,13 @@
817 817
 //#define BLTOUCH
818 818
 #if ENABLED(BLTOUCH)
819 819
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
820
+
821
+  // BLTouch V3.0 and newer smart series
822
+  //#define BLTOUCH_V3
823
+  #if ENABLED(BLTOUCH_V3)
824
+    //#define BLTOUCH_FORCE_5V_MODE
825
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
826
+  #endif
820 827
 #endif
821 828
 
822 829
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/BIBO/TouchX/default/Configuration.h Переглянути файл

@@ -817,6 +817,13 @@
817 817
 //#define BLTOUCH
818 818
 #if ENABLED(BLTOUCH)
819 819
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
820
+
821
+  // BLTouch V3.0 and newer smart series
822
+  //#define BLTOUCH_V3
823
+  #if ENABLED(BLTOUCH_V3)
824
+    //#define BLTOUCH_FORCE_5V_MODE
825
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
826
+  #endif
820 827
 #endif
821 828
 
822 829
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/BQ/Hephestos/Configuration.h Переглянути файл

@@ -805,6 +805,13 @@
805 805
 //#define BLTOUCH
806 806
 #if ENABLED(BLTOUCH)
807 807
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
808
+
809
+  // BLTouch V3.0 and newer smart series
810
+  //#define BLTOUCH_V3
811
+  #if ENABLED(BLTOUCH_V3)
812
+    //#define BLTOUCH_FORCE_5V_MODE
813
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
814
+  #endif
808 815
 #endif
809 816
 
810 817
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/BQ/Hephestos_2/Configuration.h Переглянути файл

@@ -818,6 +818,13 @@
818 818
 //#define BLTOUCH
819 819
 #if ENABLED(BLTOUCH)
820 820
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
821
+
822
+  // BLTouch V3.0 and newer smart series
823
+  //#define BLTOUCH_V3
824
+  #if ENABLED(BLTOUCH_V3)
825
+    //#define BLTOUCH_FORCE_5V_MODE
826
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
827
+  #endif
821 828
 #endif
822 829
 
823 830
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/BQ/WITBOX/Configuration.h Переглянути файл

@@ -805,6 +805,13 @@
805 805
 //#define BLTOUCH
806 806
 #if ENABLED(BLTOUCH)
807 807
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
808
+
809
+  // BLTouch V3.0 and newer smart series
810
+  //#define BLTOUCH_V3
811
+  #if ENABLED(BLTOUCH_V3)
812
+    //#define BLTOUCH_FORCE_5V_MODE
813
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
814
+  #endif
808 815
 #endif
809 816
 
810 817
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/Cartesio/Configuration.h Переглянути файл

@@ -816,6 +816,13 @@
816 816
 //#define BLTOUCH
817 817
 #if ENABLED(BLTOUCH)
818 818
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
819
+
820
+  // BLTouch V3.0 and newer smart series
821
+  //#define BLTOUCH_V3
822
+  #if ENABLED(BLTOUCH_V3)
823
+    //#define BLTOUCH_FORCE_5V_MODE
824
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
825
+  #endif
819 826
 #endif
820 827
 
821 828
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/Creality/CR-10/Configuration.h Переглянути файл

@@ -827,6 +827,13 @@
827 827
 //#define BLTOUCH
828 828
 #if ENABLED(BLTOUCH)
829 829
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
830
+
831
+  // BLTouch V3.0 and newer smart series
832
+  //#define BLTOUCH_V3
833
+  #if ENABLED(BLTOUCH_V3)
834
+    //#define BLTOUCH_FORCE_5V_MODE
835
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
836
+  #endif
830 837
 #endif
831 838
 
832 839
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/Creality/CR-10S/Configuration.h Переглянути файл

@@ -817,6 +817,13 @@
817 817
 //#define BLTOUCH
818 818
 #if ENABLED(BLTOUCH)
819 819
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
820
+
821
+  // BLTouch V3.0 and newer smart series
822
+  //#define BLTOUCH_V3
823
+  #if ENABLED(BLTOUCH_V3)
824
+    //#define BLTOUCH_FORCE_5V_MODE
825
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
826
+  #endif
820 827
 #endif
821 828
 
822 829
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/Creality/CR-10_5S/Configuration.h Переглянути файл

@@ -818,6 +818,13 @@
818 818
 //#define BLTOUCH
819 819
 #if ENABLED(BLTOUCH)
820 820
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
821
+
822
+  // BLTouch V3.0 and newer smart series
823
+  //#define BLTOUCH_V3
824
+  #if ENABLED(BLTOUCH_V3)
825
+    //#define BLTOUCH_FORCE_5V_MODE
826
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
827
+  #endif
821 828
 #endif
822 829
 
823 830
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/Creality/CR-10mini/Configuration.h Переглянути файл

@@ -836,6 +836,13 @@
836 836
 //#define BLTOUCH
837 837
 #if ENABLED(BLTOUCH)
838 838
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
839
+
840
+  // BLTouch V3.0 and newer smart series
841
+  //#define BLTOUCH_V3
842
+  #if ENABLED(BLTOUCH_V3)
843
+    //#define BLTOUCH_FORCE_5V_MODE
844
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
845
+  #endif
839 846
 #endif
840 847
 
841 848
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/Creality/CR-8/Configuration.h Переглянути файл

@@ -827,6 +827,13 @@
827 827
 //#define BLTOUCH
828 828
 #if ENABLED(BLTOUCH)
829 829
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
830
+
831
+  // BLTouch V3.0 and newer smart series
832
+  //#define BLTOUCH_V3
833
+  #if ENABLED(BLTOUCH_V3)
834
+    //#define BLTOUCH_FORCE_5V_MODE
835
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
836
+  #endif
830 837
 #endif
831 838
 
832 839
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/Creality/Ender-2/Configuration.h Переглянути файл

@@ -821,6 +821,13 @@
821 821
 //#define BLTOUCH
822 822
 #if ENABLED(BLTOUCH)
823 823
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
824
+
825
+  // BLTouch V3.0 and newer smart series
826
+  //#define BLTOUCH_V3
827
+  #if ENABLED(BLTOUCH_V3)
828
+    //#define BLTOUCH_FORCE_5V_MODE
829
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
830
+  #endif
824 831
 #endif
825 832
 
826 833
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/Creality/Ender-3/Configuration.h Переглянути файл

@@ -821,6 +821,13 @@
821 821
 //#define BLTOUCH
822 822
 #if ENABLED(BLTOUCH)
823 823
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
824
+
825
+  // BLTouch V3.0 and newer smart series
826
+  //#define BLTOUCH_V3
827
+  #if ENABLED(BLTOUCH_V3)
828
+    //#define BLTOUCH_FORCE_5V_MODE
829
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
830
+  #endif
824 831
 #endif
825 832
 
826 833
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/Creality/Ender-4/Configuration.h Переглянути файл

@@ -827,6 +827,13 @@
827 827
 //#define BLTOUCH
828 828
 #if ENABLED(BLTOUCH)
829 829
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
830
+
831
+  // BLTouch V3.0 and newer smart series
832
+  //#define BLTOUCH_V3
833
+  #if ENABLED(BLTOUCH_V3)
834
+    //#define BLTOUCH_FORCE_5V_MODE
835
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
836
+  #endif
830 837
 #endif
831 838
 
832 839
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/Einstart-S/Configuration.h Переглянути файл

@@ -828,6 +828,13 @@
828 828
 //#define BLTOUCH
829 829
 #if ENABLED(BLTOUCH)
830 830
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
831
+
832
+  // BLTouch V3.0 and newer smart series
833
+  //#define BLTOUCH_V3
834
+  #if ENABLED(BLTOUCH_V3)
835
+    //#define BLTOUCH_FORCE_5V_MODE
836
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
837
+  #endif
831 838
 #endif
832 839
 
833 840
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/Felix/Configuration.h Переглянути файл

@@ -799,6 +799,13 @@
799 799
 //#define BLTOUCH
800 800
 #if ENABLED(BLTOUCH)
801 801
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
802
+
803
+  // BLTouch V3.0 and newer smart series
804
+  //#define BLTOUCH_V3
805
+  #if ENABLED(BLTOUCH_V3)
806
+    //#define BLTOUCH_FORCE_5V_MODE
807
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
808
+  #endif
802 809
 #endif
803 810
 
804 811
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/Felix/DUAL/Configuration.h Переглянути файл

@@ -799,6 +799,13 @@
799 799
 //#define BLTOUCH
800 800
 #if ENABLED(BLTOUCH)
801 801
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
802
+
803
+  // BLTouch V3.0 and newer smart series
804
+  //#define BLTOUCH_V3
805
+  #if ENABLED(BLTOUCH_V3)
806
+    //#define BLTOUCH_FORCE_5V_MODE
807
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
808
+  #endif
802 809
 #endif
803 810
 
804 811
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/FlashForge/CreatorPro/Configuration.h Переглянути файл

@@ -809,6 +809,13 @@
809 809
 //#define BLTOUCH
810 810
 #if ENABLED(BLTOUCH)
811 811
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
812
+
813
+  // BLTouch V3.0 and newer smart series
814
+  //#define BLTOUCH_V3
815
+  #if ENABLED(BLTOUCH_V3)
816
+    //#define BLTOUCH_FORCE_5V_MODE
817
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
818
+  #endif
812 819
 #endif
813 820
 
814 821
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/FolgerTech/i3-2020/Configuration.h Переглянути файл

@@ -823,6 +823,13 @@
823 823
 //#define BLTOUCH
824 824
 #if ENABLED(BLTOUCH)
825 825
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
826
+
827
+  // BLTouch V3.0 and newer smart series
828
+  //#define BLTOUCH_V3
829
+  #if ENABLED(BLTOUCH_V3)
830
+    //#define BLTOUCH_FORCE_5V_MODE
831
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
832
+  #endif
826 833
 #endif
827 834
 
828 835
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/Formbot/Raptor/Configuration.h Переглянути файл

@@ -900,6 +900,13 @@
900 900
 #define BLTOUCH
901 901
 #if ENABLED(BLTOUCH)
902 902
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
903
+
904
+  // BLTouch V3.0 and newer smart series
905
+  //#define BLTOUCH_V3
906
+  #if ENABLED(BLTOUCH_V3)
907
+    //#define BLTOUCH_FORCE_5V_MODE
908
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
909
+  #endif
903 910
 #endif
904 911
 
905 912
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/Formbot/T_Rex_2+/Configuration.h Переглянути файл

@@ -846,6 +846,13 @@
846 846
 #define BLTOUCH
847 847
 #if ENABLED(BLTOUCH)
848 848
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
849
+
850
+  // BLTouch V3.0 and newer smart series
851
+  //#define BLTOUCH_V3
852
+  #if ENABLED(BLTOUCH_V3)
853
+    //#define BLTOUCH_FORCE_5V_MODE
854
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
855
+  #endif
849 856
 #endif
850 857
 
851 858
 

+ 7
- 0
config/examples/Formbot/T_Rex_3/Configuration.h Переглянути файл

@@ -833,6 +833,13 @@
833 833
 #define BLTOUCH
834 834
 #if ENABLED(BLTOUCH)
835 835
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
836
+
837
+  // BLTouch V3.0 and newer smart series
838
+  //#define BLTOUCH_V3
839
+  #if ENABLED(BLTOUCH_V3)
840
+    //#define BLTOUCH_FORCE_5V_MODE
841
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
842
+  #endif
836 843
 #endif
837 844
 
838 845
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/Geeetech/A10M/Configuration.h Переглянути файл

@@ -800,6 +800,13 @@
800 800
 //#define BLTOUCH
801 801
 #if ENABLED(BLTOUCH)
802 802
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
803
+
804
+  // BLTouch V3.0 and newer smart series
805
+  //#define BLTOUCH_V3
806
+  #if ENABLED(BLTOUCH_V3)
807
+    //#define BLTOUCH_FORCE_5V_MODE
808
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
809
+  #endif
803 810
 #endif
804 811
 
805 812
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/Geeetech/A20M/Configuration.h Переглянути файл

@@ -800,6 +800,13 @@
800 800
 //#define BLTOUCH
801 801
 #if ENABLED(BLTOUCH)
802 802
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
803
+
804
+  // BLTouch V3.0 and newer smart series
805
+  //#define BLTOUCH_V3
806
+  #if ENABLED(BLTOUCH_V3)
807
+    //#define BLTOUCH_FORCE_5V_MODE
808
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
809
+  #endif
803 810
 #endif
804 811
 
805 812
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/Geeetech/GT2560/Configuration.h Переглянути файл

@@ -832,6 +832,13 @@
832 832
 //#define BLTOUCH
833 833
 #if ENABLED(BLTOUCH)
834 834
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
835
+
836
+  // BLTouch V3.0 and newer smart series
837
+  //#define BLTOUCH_V3
838
+  #if ENABLED(BLTOUCH_V3)
839
+    //#define BLTOUCH_FORCE_5V_MODE
840
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
841
+  #endif
835 842
 #endif
836 843
 
837 844
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/Geeetech/MeCreator2/Configuration.h Переглянути файл

@@ -824,6 +824,13 @@
824 824
 //#define BLTOUCH
825 825
 #if ENABLED(BLTOUCH)
826 826
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
827
+
828
+  // BLTouch V3.0 and newer smart series
829
+  //#define BLTOUCH_V3
830
+  #if ENABLED(BLTOUCH_V3)
831
+    //#define BLTOUCH_FORCE_5V_MODE
832
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
833
+  #endif
827 834
 #endif
828 835
 
829 836
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/Geeetech/Prusa i3 Pro B/bltouch/Configuration.h Переглянути файл

@@ -833,6 +833,13 @@
833 833
 #define BLTOUCH
834 834
 #if ENABLED(BLTOUCH)
835 835
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
836
+
837
+  // BLTouch V3.0 and newer smart series
838
+  //#define BLTOUCH_V3
839
+  #if ENABLED(BLTOUCH_V3)
840
+    //#define BLTOUCH_FORCE_5V_MODE
841
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
842
+  #endif
836 843
 #endif
837 844
 
838 845
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/Geeetech/Prusa i3 Pro B/noprobe/Configuration.h Переглянути файл

@@ -832,6 +832,13 @@
832 832
 //#define BLTOUCH
833 833
 #if ENABLED(BLTOUCH)
834 834
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
835
+
836
+  // BLTouch V3.0 and newer smart series
837
+  //#define BLTOUCH_V3
838
+  #if ENABLED(BLTOUCH_V3)
839
+    //#define BLTOUCH_FORCE_5V_MODE
840
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
841
+  #endif
835 842
 #endif
836 843
 
837 844
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/Geeetech/Prusa i3 Pro C/Configuration.h Переглянути файл

@@ -817,6 +817,13 @@
817 817
 //#define BLTOUCH
818 818
 #if ENABLED(BLTOUCH)
819 819
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
820
+
821
+  // BLTouch V3.0 and newer smart series
822
+  //#define BLTOUCH_V3
823
+  #if ENABLED(BLTOUCH_V3)
824
+    //#define BLTOUCH_FORCE_5V_MODE
825
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
826
+  #endif
820 827
 #endif
821 828
 
822 829
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/Geeetech/Prusa i3 Pro W/Configuration.h Переглянути файл

@@ -817,6 +817,13 @@
817 817
 //#define BLTOUCH
818 818
 #if ENABLED(BLTOUCH)
819 819
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
820
+
821
+  // BLTouch V3.0 and newer smart series
822
+  //#define BLTOUCH_V3
823
+  #if ENABLED(BLTOUCH_V3)
824
+    //#define BLTOUCH_FORCE_5V_MODE
825
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
826
+  #endif
820 827
 #endif
821 828
 
822 829
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/Infitary/i3-M508/Configuration.h Переглянути файл

@@ -821,6 +821,13 @@
821 821
 //#define BLTOUCH
822 822
 #if ENABLED(BLTOUCH)
823 823
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
824
+
825
+  // BLTouch V3.0 and newer smart series
826
+  //#define BLTOUCH_V3
827
+  #if ENABLED(BLTOUCH_V3)
828
+    //#define BLTOUCH_FORCE_5V_MODE
829
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
830
+  #endif
824 831
 #endif
825 832
 
826 833
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/JGAurora/A5/Configuration.h Переглянути файл

@@ -829,6 +829,13 @@
829 829
 //#define BLTOUCH
830 830
 #if ENABLED(BLTOUCH)
831 831
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
832
+
833
+  // BLTouch V3.0 and newer smart series
834
+  //#define BLTOUCH_V3
835
+  #if ENABLED(BLTOUCH_V3)
836
+    //#define BLTOUCH_FORCE_5V_MODE
837
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
838
+  #endif
832 839
 #endif
833 840
 
834 841
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/MakerParts/Configuration.h Переглянути файл

@@ -837,6 +837,13 @@
837 837
 //#define BLTOUCH
838 838
 #if ENABLED(BLTOUCH)
839 839
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
840
+
841
+  // BLTouch V3.0 and newer smart series
842
+  //#define BLTOUCH_V3
843
+  #if ENABLED(BLTOUCH_V3)
844
+    //#define BLTOUCH_FORCE_5V_MODE
845
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
846
+  #endif
840 847
 #endif
841 848
 
842 849
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/Malyan/M150/Configuration.h Переглянути файл

@@ -837,6 +837,13 @@
837 837
 //#define BLTOUCH
838 838
 #if ENABLED(BLTOUCH)
839 839
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
840
+
841
+  // BLTouch V3.0 and newer smart series
842
+  //#define BLTOUCH_V3
843
+  #if ENABLED(BLTOUCH_V3)
844
+    //#define BLTOUCH_FORCE_5V_MODE
845
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
846
+  #endif
840 847
 #endif
841 848
 
842 849
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/Malyan/M200/Configuration.h Переглянути файл

@@ -816,6 +816,13 @@
816 816
 //#define BLTOUCH
817 817
 #if ENABLED(BLTOUCH)
818 818
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
819
+
820
+  // BLTouch V3.0 and newer smart series
821
+  //#define BLTOUCH_V3
822
+  #if ENABLED(BLTOUCH_V3)
823
+    //#define BLTOUCH_FORCE_5V_MODE
824
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
825
+  #endif
819 826
 #endif
820 827
 
821 828
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/Micromake/C1/basic/Configuration.h Переглянути файл

@@ -821,6 +821,13 @@
821 821
 //#define BLTOUCH
822 822
 #if ENABLED(BLTOUCH)
823 823
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
824
+
825
+  // BLTouch V3.0 and newer smart series
826
+  //#define BLTOUCH_V3
827
+  #if ENABLED(BLTOUCH_V3)
828
+    //#define BLTOUCH_FORCE_5V_MODE
829
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
830
+  #endif
824 831
 #endif
825 832
 
826 833
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/Micromake/C1/enhanced/Configuration.h Переглянути файл

@@ -821,6 +821,13 @@
821 821
 //#define BLTOUCH
822 822
 #if ENABLED(BLTOUCH)
823 823
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
824
+
825
+  // BLTouch V3.0 and newer smart series
826
+  //#define BLTOUCH_V3
827
+  #if ENABLED(BLTOUCH_V3)
828
+    //#define BLTOUCH_FORCE_5V_MODE
829
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
830
+  #endif
824 831
 #endif
825 832
 
826 833
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/Mks/Robin/Configuration.h Переглянути файл

@@ -818,6 +818,13 @@
818 818
 //#define BLTOUCH
819 819
 #if ENABLED(BLTOUCH)
820 820
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
821
+
822
+  // BLTouch V3.0 and newer smart series
823
+  //#define BLTOUCH_V3
824
+  #if ENABLED(BLTOUCH_V3)
825
+    //#define BLTOUCH_FORCE_5V_MODE
826
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
827
+  #endif
821 828
 #endif
822 829
 
823 830
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/Mks/Sbase/Configuration.h Переглянути файл

@@ -817,6 +817,13 @@
817 817
 //#define BLTOUCH
818 818
 #if ENABLED(BLTOUCH)
819 819
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
820
+
821
+  // BLTouch V3.0 and newer smart series
822
+  //#define BLTOUCH_V3
823
+  #if ENABLED(BLTOUCH_V3)
824
+    //#define BLTOUCH_FORCE_5V_MODE
825
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
826
+  #endif
820 827
 #endif
821 828
 
822 829
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/Printrbot/PrintrboardG2/Configuration.h Переглянути файл

@@ -825,6 +825,13 @@
825 825
 //#define BLTOUCH
826 826
 #if ENABLED(BLTOUCH)
827 827
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
828
+
829
+  // BLTouch V3.0 and newer smart series
830
+  //#define BLTOUCH_V3
831
+  #if ENABLED(BLTOUCH_V3)
832
+    //#define BLTOUCH_FORCE_5V_MODE
833
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
834
+  #endif
828 835
 #endif
829 836
 
830 837
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/RapideLite/RL200/Configuration.h Переглянути файл

@@ -817,6 +817,13 @@
817 817
 //#define BLTOUCH
818 818
 #if ENABLED(BLTOUCH)
819 819
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
820
+
821
+  // BLTouch V3.0 and newer smart series
822
+  //#define BLTOUCH_V3
823
+  #if ENABLED(BLTOUCH_V3)
824
+    //#define BLTOUCH_FORCE_5V_MODE
825
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
826
+  #endif
820 827
 #endif
821 828
 
822 829
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/RepRapPro/Huxley/Configuration.h Переглянути файл

@@ -857,6 +857,13 @@ Black rubber belt(MXL), 18 - tooth aluminium pulley : 87.489 step per mm (Huxley
857 857
 //#define BLTOUCH
858 858
 #if ENABLED(BLTOUCH)
859 859
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
860
+
861
+  // BLTouch V3.0 and newer smart series
862
+  //#define BLTOUCH_V3
863
+  #if ENABLED(BLTOUCH_V3)
864
+    //#define BLTOUCH_FORCE_5V_MODE
865
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
866
+  #endif
860 867
 #endif
861 868
 
862 869
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/RepRapWorld/Megatronics/Configuration.h Переглянути файл

@@ -817,6 +817,13 @@
817 817
 //#define BLTOUCH
818 818
 #if ENABLED(BLTOUCH)
819 819
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
820
+
821
+  // BLTouch V3.0 and newer smart series
822
+  //#define BLTOUCH_V3
823
+  #if ENABLED(BLTOUCH_V3)
824
+    //#define BLTOUCH_FORCE_5V_MODE
825
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
826
+  #endif
820 827
 #endif
821 828
 
822 829
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/RigidBot/Configuration.h Переглянути файл

@@ -815,6 +815,13 @@
815 815
 //#define BLTOUCH
816 816
 #if ENABLED(BLTOUCH)
817 817
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
818
+
819
+  // BLTouch V3.0 and newer smart series
820
+  //#define BLTOUCH_V3
821
+  #if ENABLED(BLTOUCH_V3)
822
+    //#define BLTOUCH_FORCE_5V_MODE
823
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
824
+  #endif
818 825
 #endif
819 826
 
820 827
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/SCARA/Configuration.h Переглянути файл

@@ -830,6 +830,13 @@
830 830
 //#define BLTOUCH
831 831
 #if ENABLED(BLTOUCH)
832 832
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
833
+
834
+  // BLTouch V3.0 and newer smart series
835
+  //#define BLTOUCH_V3
836
+  #if ENABLED(BLTOUCH_V3)
837
+    //#define BLTOUCH_FORCE_5V_MODE
838
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
839
+  #endif
833 840
 #endif
834 841
 
835 842
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/STM32F10/Configuration.h Переглянути файл

@@ -819,6 +819,13 @@
819 819
 //#define BLTOUCH
820 820
 #if ENABLED(BLTOUCH)
821 821
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
822
+
823
+  // BLTouch V3.0 and newer smart series
824
+  //#define BLTOUCH_V3
825
+  #if ENABLED(BLTOUCH_V3)
826
+    //#define BLTOUCH_FORCE_5V_MODE
827
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
828
+  #endif
822 829
 #endif
823 830
 
824 831
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/STM32F4/Configuration.h Переглянути файл

@@ -817,6 +817,13 @@
817 817
 //#define BLTOUCH
818 818
 #if ENABLED(BLTOUCH)
819 819
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
820
+
821
+  // BLTouch V3.0 and newer smart series
822
+  //#define BLTOUCH_V3
823
+  #if ENABLED(BLTOUCH_V3)
824
+    //#define BLTOUCH_FORCE_5V_MODE
825
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
826
+  #endif
820 827
 #endif
821 828
 
822 829
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/Sanguinololu/Configuration.h Переглянути файл

@@ -848,6 +848,13 @@
848 848
 //#define BLTOUCH
849 849
 #if ENABLED(BLTOUCH)
850 850
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
851
+
852
+  // BLTouch V3.0 and newer smart series
853
+  //#define BLTOUCH_V3
854
+  #if ENABLED(BLTOUCH_V3)
855
+    //#define BLTOUCH_FORCE_5V_MODE
856
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
857
+  #endif
851 858
 #endif
852 859
 
853 860
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/TheBorg/Configuration.h Переглянути файл

@@ -817,6 +817,13 @@
817 817
 //#define BLTOUCH
818 818
 #if ENABLED(BLTOUCH)
819 819
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
820
+
821
+  // BLTouch V3.0 and newer smart series
822
+  //#define BLTOUCH_V3
823
+  #if ENABLED(BLTOUCH_V3)
824
+    //#define BLTOUCH_FORCE_5V_MODE
825
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
826
+  #endif
820 827
 #endif
821 828
 
822 829
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/TinyBoy2/Configuration.h Переглянути файл

@@ -868,6 +868,13 @@
868 868
 //#define BLTOUCH
869 869
 #if ENABLED(BLTOUCH)
870 870
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
871
+
872
+  // BLTouch V3.0 and newer smart series
873
+  //#define BLTOUCH_V3
874
+  #if ENABLED(BLTOUCH_V3)
875
+    //#define BLTOUCH_FORCE_5V_MODE
876
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
877
+  #endif
871 878
 #endif
872 879
 
873 880
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/Tronxy/X1/Configuration.h Переглянути файл

@@ -817,6 +817,13 @@
817 817
 //#define BLTOUCH
818 818
 #if ENABLED(BLTOUCH)
819 819
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
820
+
821
+  // BLTouch V3.0 and newer smart series
822
+  //#define BLTOUCH_V3
823
+  #if ENABLED(BLTOUCH_V3)
824
+    //#define BLTOUCH_FORCE_5V_MODE
825
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
826
+  #endif
820 827
 #endif
821 828
 
822 829
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/Tronxy/X3A/Configuration.h Переглянути файл

@@ -817,6 +817,13 @@
817 817
 //#define BLTOUCH
818 818
 #if ENABLED(BLTOUCH)
819 819
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
820
+
821
+  // BLTouch V3.0 and newer smart series
822
+  //#define BLTOUCH_V3
823
+  #if ENABLED(BLTOUCH_V3)
824
+    //#define BLTOUCH_FORCE_5V_MODE
825
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
826
+  #endif
820 827
 #endif
821 828
 
822 829
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/Tronxy/X5S-2E/Configuration.h Переглянути файл

@@ -838,6 +838,13 @@
838 838
 //#define BLTOUCH
839 839
 #if ENABLED(BLTOUCH)
840 840
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
841
+
842
+  // BLTouch V3.0 and newer smart series
843
+  //#define BLTOUCH_V3
844
+  #if ENABLED(BLTOUCH_V3)
845
+    //#define BLTOUCH_FORCE_5V_MODE
846
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
847
+  #endif
841 848
 #endif
842 849
 
843 850
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/Tronxy/X5S/Configuration.h Переглянути файл

@@ -816,6 +816,13 @@
816 816
 //#define BLTOUCH
817 817
 #if ENABLED(BLTOUCH)
818 818
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
819
+
820
+  // BLTouch V3.0 and newer smart series
821
+  //#define BLTOUCH_V3
822
+  #if ENABLED(BLTOUCH_V3)
823
+    //#define BLTOUCH_FORCE_5V_MODE
824
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
825
+  #endif
819 826
 #endif
820 827
 
821 828
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/Tronxy/XY100/Configuration.h Переглянути файл

@@ -828,6 +828,13 @@
828 828
 //#define BLTOUCH
829 829
 #if ENABLED(BLTOUCH)
830 830
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
831
+
832
+  // BLTouch V3.0 and newer smart series
833
+  //#define BLTOUCH_V3
834
+  #if ENABLED(BLTOUCH_V3)
835
+    //#define BLTOUCH_FORCE_5V_MODE
836
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
837
+  #endif
831 838
 #endif
832 839
 
833 840
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/UltiMachine/Archim1/Configuration.h Переглянути файл

@@ -817,6 +817,13 @@
817 817
 //#define BLTOUCH
818 818
 #if ENABLED(BLTOUCH)
819 819
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
820
+
821
+  // BLTouch V3.0 and newer smart series
822
+  //#define BLTOUCH_V3
823
+  #if ENABLED(BLTOUCH_V3)
824
+    //#define BLTOUCH_FORCE_5V_MODE
825
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
826
+  #endif
820 827
 #endif
821 828
 
822 829
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/UltiMachine/Archim2/Configuration.h Переглянути файл

@@ -817,6 +817,13 @@
817 817
 //#define BLTOUCH
818 818
 #if ENABLED(BLTOUCH)
819 819
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
820
+
821
+  // BLTouch V3.0 and newer smart series
822
+  //#define BLTOUCH_V3
823
+  #if ENABLED(BLTOUCH_V3)
824
+    //#define BLTOUCH_FORCE_5V_MODE
825
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
826
+  #endif
820 827
 #endif
821 828
 
822 829
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/VORONDesign/Configuration.h Переглянути файл

@@ -826,6 +826,13 @@
826 826
 //#define BLTOUCH
827 827
 #if ENABLED(BLTOUCH)
828 828
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
829
+
830
+  // BLTouch V3.0 and newer smart series
831
+  //#define BLTOUCH_V3
832
+  #if ENABLED(BLTOUCH_V3)
833
+    //#define BLTOUCH_FORCE_5V_MODE
834
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
835
+  #endif
829 836
 #endif
830 837
 
831 838
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/Velleman/K8200/Configuration.h Переглянути файл

@@ -846,6 +846,13 @@
846 846
 //#define BLTOUCH
847 847
 #if ENABLED(BLTOUCH)
848 848
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
849
+
850
+  // BLTouch V3.0 and newer smart series
851
+  //#define BLTOUCH_V3
852
+  #if ENABLED(BLTOUCH_V3)
853
+    //#define BLTOUCH_FORCE_5V_MODE
854
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
855
+  #endif
849 856
 #endif
850 857
 
851 858
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/Velleman/K8400/Configuration.h Переглянути файл

@@ -817,6 +817,13 @@
817 817
 //#define BLTOUCH
818 818
 #if ENABLED(BLTOUCH)
819 819
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
820
+
821
+  // BLTouch V3.0 and newer smart series
822
+  //#define BLTOUCH_V3
823
+  #if ENABLED(BLTOUCH_V3)
824
+    //#define BLTOUCH_FORCE_5V_MODE
825
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
826
+  #endif
820 827
 #endif
821 828
 
822 829
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/Velleman/K8400/Dual-head/Configuration.h Переглянути файл

@@ -817,6 +817,13 @@
817 817
 //#define BLTOUCH
818 818
 #if ENABLED(BLTOUCH)
819 819
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
820
+
821
+  // BLTouch V3.0 and newer smart series
822
+  //#define BLTOUCH_V3
823
+  #if ENABLED(BLTOUCH_V3)
824
+    //#define BLTOUCH_FORCE_5V_MODE
825
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
826
+  #endif
820 827
 #endif
821 828
 
822 829
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/WASP/PowerWASP/Configuration.h Переглянути файл

@@ -836,6 +836,13 @@
836 836
 //#define BLTOUCH
837 837
 #if ENABLED(BLTOUCH)
838 838
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
839
+
840
+  // BLTouch V3.0 and newer smart series
841
+  //#define BLTOUCH_V3
842
+  #if ENABLED(BLTOUCH_V3)
843
+    //#define BLTOUCH_FORCE_5V_MODE
844
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
845
+  #endif
839 846
 #endif
840 847
 
841 848
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/Wanhao/Duplicator 6/Configuration.h Переглянути файл

@@ -827,6 +827,13 @@
827 827
 //#define BLTOUCH
828 828
 #if ENABLED(BLTOUCH)
829 829
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
830
+
831
+  // BLTouch V3.0 and newer smart series
832
+  //#define BLTOUCH_V3
833
+  #if ENABLED(BLTOUCH_V3)
834
+    //#define BLTOUCH_FORCE_5V_MODE
835
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
836
+  #endif
830 837
 #endif
831 838
 
832 839
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/adafruit/ST7565/Configuration.h Переглянути файл

@@ -817,6 +817,13 @@
817 817
 //#define BLTOUCH
818 818
 #if ENABLED(BLTOUCH)
819 819
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
820
+
821
+  // BLTouch V3.0 and newer smart series
822
+  //#define BLTOUCH_V3
823
+  #if ENABLED(BLTOUCH_V3)
824
+    //#define BLTOUCH_FORCE_5V_MODE
825
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
826
+  #endif
820 827
 #endif
821 828
 
822 829
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/delta/Anycubic/Kossel/Configuration.h Переглянути файл

@@ -953,6 +953,13 @@
953 953
 //#define BLTOUCH
954 954
 #if ENABLED(BLTOUCH)
955 955
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
956
+
957
+  // BLTouch V3.0 and newer smart series
958
+  //#define BLTOUCH_V3
959
+  #if ENABLED(BLTOUCH_V3)
960
+    //#define BLTOUCH_FORCE_5V_MODE
961
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
962
+  #endif
956 963
 #endif
957 964
 
958 965
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/delta/FLSUN/auto_calibrate/Configuration.h Переглянути файл

@@ -899,6 +899,13 @@
899 899
 //#define BLTOUCH
900 900
 #if ENABLED(BLTOUCH)
901 901
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
902
+
903
+  // BLTouch V3.0 and newer smart series
904
+  //#define BLTOUCH_V3
905
+  #if ENABLED(BLTOUCH_V3)
906
+    //#define BLTOUCH_FORCE_5V_MODE
907
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
908
+  #endif
902 909
 #endif
903 910
 
904 911
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/delta/FLSUN/kossel/Configuration.h Переглянути файл

@@ -899,6 +899,13 @@
899 899
 //#define BLTOUCH
900 900
 #if ENABLED(BLTOUCH)
901 901
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
902
+
903
+  // BLTouch V3.0 and newer smart series
904
+  //#define BLTOUCH_V3
905
+  #if ENABLED(BLTOUCH_V3)
906
+    //#define BLTOUCH_FORCE_5V_MODE
907
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
908
+  #endif
902 909
 #endif
903 910
 
904 911
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/delta/FLSUN/kossel_mini/Configuration.h Переглянути файл

@@ -899,6 +899,13 @@
899 899
 //#define BLTOUCH
900 900
 #if ENABLED(BLTOUCH)
901 901
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
902
+
903
+  // BLTouch V3.0 and newer smart series
904
+  //#define BLTOUCH_V3
905
+  #if ENABLED(BLTOUCH_V3)
906
+    //#define BLTOUCH_FORCE_5V_MODE
907
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
908
+  #endif
902 909
 #endif
903 910
 
904 911
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/delta/Geeetech/Rostock 301/Configuration.h Переглянути файл

@@ -889,6 +889,13 @@
889 889
 //#define BLTOUCH
890 890
 #if ENABLED(BLTOUCH)
891 891
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
892
+
893
+  // BLTouch V3.0 and newer smart series
894
+  //#define BLTOUCH_V3
895
+  #if ENABLED(BLTOUCH_V3)
896
+    //#define BLTOUCH_FORCE_5V_MODE
897
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
898
+  #endif
892 899
 #endif
893 900
 
894 901
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 7
- 0
config/examples/delta/Hatchbox_Alpha/Configuration.h Переглянути файл

@@ -904,6 +904,13 @@
904 904
 //#define BLTOUCH
905 905
 #if ENABLED(BLTOUCH)
906 906
   //#define BLTOUCH_DELAY 375   // (ms) Enable and increase if needed
907
+
908
+  // BLTouch V3.0 and newer smart series
909
+  //#define BLTOUCH_V3
910
+  #if ENABLED(BLTOUCH_V3)
911
+    //#define BLTOUCH_FORCE_5V_MODE
912
+    //#define BLTOUCH_FORCE_OPEN_DRAIN_MODE
913
+  #endif
907 914
 #endif
908 915
 
909 916
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)

+ 0
- 0
config/examples/delta/MKS/SBASE/Configuration.h Переглянути файл


Деякі файли не було показано, через те що забагато файлів було змінено

Завантаження…
Відмінити
Зберегти