소스 검색

⚡️ Formbot ST7920 delays, intentional X2 pins (#22915)

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
InsanityAutomation 2 년 전
부모
커밋
8e4953514c
No account linked to committer's email address

+ 3
- 1
Marlin/src/inc/Conditionals_adv.h 파일 보기

@@ -624,7 +624,9 @@
624 624
 #endif
625 625
 
626 626
 // Fallback Stepper Driver types that depend on Configuration_adv.h
627
-#if NONE(DUAL_X_CARRIAGE, X_DUAL_STEPPER_DRIVERS)
627
+#if EITHER(DUAL_X_CARRIAGE, X_DUAL_STEPPER_DRIVERS)
628
+  #define HAS_X2_STEPPER 1
629
+#else
628 630
   #undef X2_DRIVER_TYPE
629 631
 #endif
630 632
 #if DISABLED(Y_DUAL_STEPPER_DRIVERS)

+ 1
- 1
Marlin/src/module/stepper.cpp 파일 보기

@@ -2614,7 +2614,7 @@ void Stepper::init() {
2614 2614
   #if HAS_X_ENABLE
2615 2615
     X_ENABLE_INIT();
2616 2616
     if (!X_ENABLE_ON) X_ENABLE_WRITE(HIGH);
2617
-    #if EITHER(DUAL_X_CARRIAGE, X_DUAL_STEPPER_DRIVERS) && HAS_X2_ENABLE
2617
+    #if BOTH(HAS_X2_STEPPER, HAS_X2_ENABLE)
2618 2618
       X2_ENABLE_INIT();
2619 2619
       if (!X_ENABLE_ON) X2_ENABLE_WRITE(HIGH);
2620 2620
     #endif

+ 2
- 2
Marlin/src/pins/pins_postprocess.h 파일 보기

@@ -579,12 +579,12 @@
579 579
 #endif
580 580
 
581 581
 // The X2 axis, if any, should be the next open extruder port
582
-#if EITHER(DUAL_X_CARRIAGE, X_DUAL_STEPPER_DRIVERS) && !defined(X2_DIAG_PIN) && !defined(X2_STEP_PIN) && !PIN_EXISTS(X2_CS_PIN)
582
+#if HAS_X2_STEPPER && !defined(X2_DIAG_PIN) && !defined(X2_STEP_PIN) && !PIN_EXISTS(X2_CS_PIN)
583 583
   #define Y2_E_INDEX INCREMENT(X2_E_INDEX)
584 584
 #else
585 585
   #define Y2_E_INDEX X2_E_INDEX
586 586
 #endif
587
-#if EITHER(DUAL_X_CARRIAGE, X_DUAL_STEPPER_DRIVERS)
587
+#if HAS_X2_STEPPER
588 588
   #ifndef X2_STEP_PIN
589 589
     #define X2_STEP_PIN   _EPIN(X2_E_INDEX, STEP)
590 590
     #define X2_DIR_PIN    _EPIN(X2_E_INDEX, DIR)

+ 6
- 0
Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR2.h 파일 보기

@@ -66,3 +66,9 @@
66 66
 #if ENABLED(CASE_LIGHT_ENABLE) && PIN_EXISTS(CASE_LIGHT) && (CASE_LIGHT_PIN == SPINDLE_LASER_ENA_PIN || CASE_LIGHT_PIN == SPINDLE_LASER_PWM_PIN)
67 67
   #error "CASE_LIGHT_PIN conflicts with a Spindle / Laser pin."
68 68
 #endif
69
+
70
+#if HAS_MARLINUI_U8GLIB
71
+  #define BOARD_ST7920_DELAY_1               125
72
+  #define BOARD_ST7920_DELAY_2               125
73
+  #define BOARD_ST7920_DELAY_3               125
74
+#endif

+ 15
- 3
Marlin/src/pins/ramps/pins_FORMBOT_TREX3.h 파일 보기

@@ -100,9 +100,15 @@
100 100
   #define E1_CS_PIN                           44
101 101
 #endif
102 102
 
103
-#define E2_STEP_PIN                           42
104
-#define E2_DIR_PIN                            43
105
-#define E2_ENABLE_PIN                         44
103
+#if HAS_X2_STEPPER
104
+  #define X2_STEP_PIN                         42
105
+  #define X2_DIR_PIN                          43
106
+  #define X2_ENABLE_PIN                       44
107
+#else
108
+  #define E2_STEP_PIN                         42
109
+  #define E2_DIR_PIN                          43
110
+  #define E2_ENABLE_PIN                       44
111
+#endif
106 112
 
107 113
 //
108 114
 // Temperature Sensors
@@ -174,3 +180,9 @@
174 180
     #define BEEPER_PIN                        37
175 181
   #endif
176 182
 #endif
183
+
184
+#if HAS_MARLINUI_U8GLIB
185
+  #define BOARD_ST7920_DELAY_1               125
186
+  #define BOARD_ST7920_DELAY_2               125
187
+  #define BOARD_ST7920_DELAY_3               125
188
+#endif

+ 1
- 1
Marlin/src/pins/sensitive_pins.h 파일 보기

@@ -632,7 +632,7 @@
632 632
 // Chip Select and Digital Micro-stepping
633 633
 //
634 634
 
635
-#if EITHER(DUAL_X_CARRIAGE, X_DUAL_STEPPER_DRIVERS)
635
+#if HAS_X2_STEPPER
636 636
   #if PIN_EXISTS(X2_CS) && AXIS_HAS_SPI(X2)
637 637
     #define _X2_CS X2_CS_PIN,
638 638
   #else

Loading…
취소
저장