Bläddra i källkod

Fix BLTOUCH string and SERVO_DELAY

Scott Lahteine 8 år sedan
förälder
incheckning
145d9005d1
2 ändrade filer med 5 tillägg och 3 borttagningar
  1. 4
    2
      Marlin/Conditionals_LCD.h
  2. 1
    1
      Marlin/ultralcd.cpp

+ 4
- 2
Marlin/Conditionals_LCD.h Visa fil

@@ -328,13 +328,15 @@
328 328
       #define NUM_SERVOS (Z_ENDSTOP_SERVO_NR + 1)
329 329
     #endif
330 330
     #undef DEACTIVATE_SERVOS_AFTER_MOVE
331
+    #undef SERVO_DELAY
332
+    #define SERVO_DELAY 50
331 333
     #undef Z_SERVO_ANGLES
332 334
     #define Z_SERVO_ANGLES { BLTOUCH_DEPLOY, BLTOUCH_STOW }
333 335
 
334 336
     #define BLTOUCH_DEPLOY    10
335
-    #define BLTOUCH_STOW   90
337
+    #define BLTOUCH_STOW      90
336 338
     #define BLTOUCH_SELFTEST 120
337
-    #define BLTOUCH_RELEASE  160
339
+    #define BLTOUCH_RESET    160
338 340
     #define _TEST_BLTOUCH(P) (READ(P##_PIN) != P##_ENDSTOP_INVERTING)
339 341
 
340 342
     #if ENABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN)

+ 1
- 1
Marlin/ultralcd.cpp Visa fil

@@ -1253,7 +1253,7 @@ void kill_screen(const char* lcd_msg) {
1253 1253
     // BLTouch Self-Test and Reset
1254 1254
     //
1255 1255
     #if ENABLED(BLTOUCH)
1256
-      MENU_ITEM(gcode, MSG_BLTOUCH_TEST, PSTR("M280 P" STRINGIFY(Z_ENDSTOP_SERVO_NR) " S" STRINGIFY(BLTOUCH_SELFTEST)));
1256
+      MENU_ITEM(gcode, MSG_BLTOUCH_SELFTEST, PSTR("M280 P" STRINGIFY(Z_ENDSTOP_SERVO_NR) " S" STRINGIFY(BLTOUCH_SELFTEST)));
1257 1257
       if (!endstops.z_probe_enabled && TEST_BLTOUCH())
1258 1258
         MENU_ITEM(gcode, MSG_BLTOUCH_RESET, PSTR("M280 P" STRINGIFY(Z_ENDSTOP_SERVO_NR) " S" STRINGIFY(BLTOUCH_RESET)));
1259 1259
     #endif

Laddar…
Avbryt
Spara