Pārlūkot izejas kodu

Fix DUET_SMART_EFFECTOR

Scott Lahteine 3 gadus atpakaļ
vecāks
revīzija
6036a0df6b

+ 1
- 1
Marlin/src/MarlinCore.cpp Parādīt failu

@@ -922,7 +922,7 @@ void setup() {
922 922
     SETUP_RUN(L64xxManager.init());  // Set up SPI, init drivers
923 923
   #endif
924 924
 
925
-  #if ENABLED(SMART_EFFECTOR) && PIN_EXISTS(SMART_EFFECTOR_MOD)
925
+  #if ENABLED(DUET_SMART_EFFECTOR) && PIN_EXISTS(SMART_EFFECTOR_MOD)
926 926
     OUT_WRITE(SMART_EFFECTOR_MOD_PIN, LOW);   // Put Smart Effector into NORMAL mode
927 927
   #endif
928 928
 

+ 9
- 10
Marlin/src/gcode/config/M672.cpp Parādīt failu

@@ -22,21 +22,13 @@
22 22
 
23 23
 #include "../../inc/MarlinConfig.h"
24 24
 
25
-#if ENABLED(SMART_EFFECTOR) && PIN_EXISTS(SMART_EFFECTOR_MOD)
25
+#if ENABLED(DUET_SMART_EFFECTOR) && PIN_EXISTS(SMART_EFFECTOR_MOD)
26 26
 
27 27
 #include "../gcode.h"
28 28
 #include "../../HAL/shared/Delay.h"
29 29
 #include "../parser.h"
30 30
 
31 31
 /**
32
- * M672 - Set/reset Duet Smart Effector sensitivity
33
- *
34
- *  One of these is required:
35
- *    S<sensitivity> - 0-255
36
- *    R              - Flag to reset sensitivity to default
37
- */
38
-
39
-/**
40 32
  * The Marlin format for the M672 command is different than shown in the Duet Smart Effector
41 33
  * documentation https://duet3d.dozuki.com/Wiki/Smart_effector_and_carriage_adapters_for_delta_printer
42 34
  *
@@ -77,6 +69,13 @@ void M672_send(uint8_t b) {    // bit rate requirement: 1KHz +/- 30%
77 69
   }
78 70
 }
79 71
 
72
+/**
73
+ * M672 - Set/reset Duet Smart Effector sensitivity
74
+ *
75
+ *  One of these is required:
76
+ *    S<sensitivity> - 0-255
77
+ *    R              - Flag to reset sensitivity to default
78
+ */
80 79
 void GcodeSuite::M672() {
81 80
   if (parser.seen('R')) {
82 81
     M672_send(M672_ERASEBYTE);
@@ -96,4 +95,4 @@ void GcodeSuite::M672() {
96 95
   OUT_WRITE(SMART_EFFECTOR_MOD_PIN, LOW);  // Keep Smart Effector in NORMAL mode
97 96
 }
98 97
 
99
-#endif // SMART_EFFECTOR && SMART_EFFECTOR_MOD_PIN
98
+#endif // DUET_SMART_EFFECTOR && SMART_EFFECTOR_MOD_PIN

+ 1
- 1
Marlin/src/gcode/gcode.cpp Parādīt failu

@@ -790,7 +790,7 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
790 790
         case 666: M666(); break;                                  // M666: Set delta or multiple endstop adjustment
791 791
       #endif
792 792
 
793
-      #if ENABLED(SMART_EFFECTOR) && PIN_EXISTS(SMART_EFFECTOR_MOD)
793
+      #if ENABLED(DUET_SMART_EFFECTOR) && PIN_EXISTS(SMART_EFFECTOR_MOD)
794 794
         case 672: M672(); break;                                  // M672: Set/clear Duet Smart Effector sensitivity
795 795
       #endif
796 796
 

+ 2
- 2
Marlin/src/gcode/gcode.h Parādīt failu

@@ -236,7 +236,7 @@
236 236
  * M605 - Set Dual X-Carriage movement mode: "M605 S<mode> [X<x_offset>] [R<temp_offset>]". (Requires DUAL_X_CARRIAGE)
237 237
  * M665 - Set delta configurations: "M665 H<delta height> L<diagonal rod> R<delta radius> S<segments/s> B<calibration radius> X<Alpha angle trim> Y<Beta angle trim> Z<Gamma angle trim> (Requires DELTA)
238 238
  * M666 - Set/get offsets for delta (Requires DELTA) or dual endstops. (Requires [XYZ]_DUAL_ENDSTOPS)
239
- * M672 - Set/Reset Duet Smart Effector's sensitivity. (Requires SMART_EFFECTOR and SMART_EFFECTOR_MOD_PIN)
239
+ * M672 - Set/Reset Duet Smart Effector's sensitivity. (Requires DUET_SMART_EFFECTOR and SMART_EFFECTOR_MOD_PIN)
240 240
  * M701 - Load filament (Requires FILAMENT_LOAD_UNLOAD_GCODES)
241 241
  * M702 - Unload filament (Requires FILAMENT_LOAD_UNLOAD_GCODES)
242 242
  * M810-M819 - Define/execute a G-code macro (Requires GCODE_MACROS)
@@ -792,7 +792,7 @@ private:
792 792
     static void M666();
793 793
   #endif
794 794
 
795
-  #if ENABLED(SMART_EFFECTOR) && PIN_EXISTS(SMART_EFFECTOR_MOD)
795
+  #if ENABLED(DUET_SMART_EFFECTOR) && PIN_EXISTS(SMART_EFFECTOR_MOD)
796 796
     static void M672();
797 797
   #endif
798 798
 

Notiek ielāde…
Atcelt
Saglabāt