zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

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

Browse source 
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
This commit is contained in:
InsanityAutomation 2021-10-12 23:19:05 -04:00 committed by Scott Lahteine
parent ae98d2e5ea
commit dffa56463e
6 changed files with 28 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Marlin/src/inc/Conditionals_adv.h
View file

@ -622,7 +622,9 @@
#endif #endif
// Fallback Stepper Driver types that depend on Configuration_adv.h // Fallback Stepper Driver types that depend on Configuration_adv.h
#if NONE(DUAL_X_CARRIAGE, X_DUAL_STEPPER_DRIVERS) #if EITHER(DUAL_X_CARRIAGE, X_DUAL_STEPPER_DRIVERS)
#define HAS_X2_STEPPER 1
#else
#undef X2_DRIVER_TYPE #undef X2_DRIVER_TYPE
#endif #endif
#if DISABLED(Y_DUAL_STEPPER_DRIVERS) #if DISABLED(Y_DUAL_STEPPER_DRIVERS)

2
Marlin/src/module/stepper.cpp
View file

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

4
Marlin/src/pins/pins_postprocess.h
View file

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

6
Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR2.h
View file

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

12
Marlin/src/pins/ramps/pins_FORMBOT_TREX3.h
View file

@ -100,9 +100,15 @@
#define E1_CS_PIN 44 #define E1_CS_PIN 44
#endif #endif
#if HAS_X2_STEPPER
#define X2_STEP_PIN 42
#define X2_DIR_PIN 43
#define X2_ENABLE_PIN 44
#else
#define E2_STEP_PIN 42 #define E2_STEP_PIN 42
#define E2_DIR_PIN 43 #define E2_DIR_PIN 43
#define E2_ENABLE_PIN 44 #define E2_ENABLE_PIN 44
#endif
// //
// Temperature Sensors // Temperature Sensors
@ -174,3 +180,9 @@
#define BEEPER_PIN 37 #define BEEPER_PIN 37
#endif #endif
#endif #endif
#if HAS_MARLINUI_U8GLIB
#define BOARD_ST7920_DELAY_1 125
#define BOARD_ST7920_DELAY_2 125
#define BOARD_ST7920_DELAY_3 125
#endif

2
Marlin/src/pins/sensitive_pins.h
View file

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