andrey
/
Marlin_FB4S
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Permit Stall Sensitivity of 0 (#17722)

vanilla_fb_2.0.x
Neil van Geffen 5 years ago
committed by GitHub
parent
37176ed2b9
commit
c56b66543d
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 42 additions and 42 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 44
      Marlin/src/HAL/STM32/SoftwareSerial.cpp
  2. 2
      Marlin/src/core/multi_language.h
  3. 6
      Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
  4. 6
      Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
  5. 6
      Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
  6. 10
      Marlin/src/pins/pins.h
  7. 6
      Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_V1_1.h
  8. 2
      buildroot/share/PlatformIO/variants/STEVAL_F401VE/variant.cpp
  9. 2
      buildroot/share/PlatformIO/variants/STEVAL_F401VE/variant.h

44
Marlin/src/HAL/STM32/SoftwareSerial.cpp
View File

@ -47,49 +47,49 @@
// The order is based on (lack of) features and compare channels, we choose the simplest available // The order is based on (lack of) features and compare channels, we choose the simplest available
// because we only need an update interrupt // because we only need an update interrupt
#if !defined(TIMER_SERIAL) #if !defined(TIMER_SERIAL)
#if defined (TIM18_BASE) #if defined(TIM18_BASE)
#define TIMER_SERIAL TIM18 #define TIMER_SERIAL TIM18
#elif defined (TIM7_BASE) #elif defined(TIM7_BASE)
#define TIMER_SERIAL TIM7 #define TIMER_SERIAL TIM7
#elif defined (TIM6_BASE) #elif defined(TIM6_BASE)
#define TIMER_SERIAL TIM6 #define TIMER_SERIAL TIM6
#elif defined (TIM22_BASE) #elif defined(TIM22_BASE)
#define TIMER_SERIAL TIM22 #define TIMER_SERIAL TIM22
#elif defined (TIM21_BASE) #elif defined(TIM21_BASE)
#define TIMER_SERIAL TIM21 #define TIMER_SERIAL TIM21
#elif defined (TIM17_BASE) #elif defined(TIM17_BASE)
#define TIMER_SERIAL TIM17 #define TIMER_SERIAL TIM17
#elif defined (TIM16_BASE) #elif defined(TIM16_BASE)
#define TIMER_SERIAL TIM16 #define TIMER_SERIAL TIM16
#elif defined (TIM15_BASE) #elif defined(TIM15_BASE)
#define TIMER_SERIAL TIM15 #define TIMER_SERIAL TIM15
#elif defined (TIM14_BASE) #elif defined(TIM14_BASE)
#define TIMER_SERIAL TIM14 #define TIMER_SERIAL TIM14
#elif defined (TIM13_BASE) #elif defined(TIM13_BASE)
#define TIMER_SERIAL TIM13 #define TIMER_SERIAL TIM13
#elif defined (TIM11_BASE) #elif defined(TIM11_BASE)
#define TIMER_SERIAL TIM11 #define TIMER_SERIAL TIM11
#elif defined (TIM10_BASE) #elif defined(TIM10_BASE)
#define TIMER_SERIAL TIM10 #define TIMER_SERIAL TIM10
#elif defined (TIM12_BASE) #elif defined(TIM12_BASE)
#define TIMER_SERIAL TIM12 #define TIMER_SERIAL TIM12
#elif defined (TIM19_BASE) #elif defined(TIM19_BASE)
#define TIMER_SERIAL TIM19 #define TIMER_SERIAL TIM19
#elif defined (TIM9_BASE) #elif defined(TIM9_BASE)
#define TIMER_SERIAL TIM9 #define TIMER_SERIAL TIM9
#elif defined (TIM5_BASE) #elif defined(TIM5_BASE)
#define TIMER_SERIAL TIM5 #define TIMER_SERIAL TIM5
#elif defined (TIM4_BASE) #elif defined(TIM4_BASE)
#define TIMER_SERIAL TIM4 #define TIMER_SERIAL TIM4
#elif defined (TIM3_BASE) #elif defined(TIM3_BASE)
#define TIMER_SERIAL TIM3 #define TIMER_SERIAL TIM3
#elif defined (TIM2_BASE) #elif defined(TIM2_BASE)
#define TIMER_SERIAL TIM2 #define TIMER_SERIAL TIM2
#elif defined (TIM20_BASE) #elif defined(TIM20_BASE)
#define TIMER_SERIAL TIM20 #define TIMER_SERIAL TIM20
#elif defined (TIM8_BASE) #elif defined(TIM8_BASE)
#define TIMER_SERIAL TIM8 #define TIMER_SERIAL TIM8
#elif defined (TIM1_BASE) #elif defined(TIM1_BASE)
#define TIMER_SERIAL TIM1 #define TIMER_SERIAL TIM1
#else #else
#error No suitable timer found for SoftwareSerial, define TIMER_SERIAL in variant.h #error No suitable timer found for SoftwareSerial, define TIMER_SERIAL in variant.h

2
Marlin/src/core/multi_language.h
View File

@ -22,7 +22,7 @@
typedef const char Language_Str[]; typedef const char Language_Str[];
#if defined(LCD_LANGUAGE_5) #ifdef LCD_LANGUAGE_5
#define NUM_LANGUAGES 5 #define NUM_LANGUAGES 5
#elif defined(LCD_LANGUAGE_4) #elif defined(LCD_LANGUAGE_4)
#define NUM_LANGUAGES 4 #define NUM_LANGUAGES 4

6
Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
View File

@ -43,7 +43,7 @@
// //
// Limit Switches // Limit Switches
// //
#if X_STALL_SENSITIVITY #ifdef X_STALL_SENSITIVITY
#define X_STOP_PIN X_DIAG_PIN #define X_STOP_PIN X_DIAG_PIN
#if X_HOME_DIR < 0 #if X_HOME_DIR < 0
#define X_MAX_PIN P1_28 // X+ #define X_MAX_PIN P1_28 // X+
@ -55,7 +55,7 @@
#define X_MAX_PIN P1_28 // X+ #define X_MAX_PIN P1_28 // X+
#endif #endif
#if Y_STALL_SENSITIVITY #ifdef Y_STALL_SENSITIVITY
#define Y_STOP_PIN Y_DIAG_PIN #define Y_STOP_PIN Y_DIAG_PIN
#if Y_HOME_DIR < 0 #if Y_HOME_DIR < 0
#define Y_MAX_PIN P1_26 // Y+ #define Y_MAX_PIN P1_26 // Y+
@ -67,7 +67,7 @@
#define Y_MAX_PIN P1_26 // Y+ #define Y_MAX_PIN P1_26 // Y+
#endif #endif
#if Z_STALL_SENSITIVITY #ifdef Z_STALL_SENSITIVITY
#define Z_STOP_PIN Z_DIAG_PIN #define Z_STOP_PIN Z_DIAG_PIN
#if Z_HOME_DIR < 0 #if Z_HOME_DIR < 0
#define Z_MAX_PIN P1_24 // Z+ #define Z_MAX_PIN P1_24 // Z+

6
Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
View File

@ -57,7 +57,7 @@
// //
// Limit Switches // Limit Switches
// //
#if X_STALL_SENSITIVITY #ifdef X_STALL_SENSITIVITY
#define X_STOP_PIN X_DIAG_PIN #define X_STOP_PIN X_DIAG_PIN
#if X_HOME_DIR < 0 #if X_HOME_DIR < 0
#define X_MAX_PIN P1_26 // E0DET #define X_MAX_PIN P1_26 // E0DET
@ -68,7 +68,7 @@
#define X_STOP_PIN P1_29 // X-STOP #define X_STOP_PIN P1_29 // X-STOP
#endif #endif
#if Y_STALL_SENSITIVITY #ifdef Y_STALL_SENSITIVITY
#define Y_STOP_PIN Y_DIAG_PIN #define Y_STOP_PIN Y_DIAG_PIN
#if Y_HOME_DIR < 0 #if Y_HOME_DIR < 0
#define Y_MAX_PIN P1_25 // E1DET #define Y_MAX_PIN P1_25 // E1DET
@ -79,7 +79,7 @@
#define Y_STOP_PIN P1_28 // Y-STOP #define Y_STOP_PIN P1_28 // Y-STOP
#endif #endif
#if Z_STALL_SENSITIVITY #ifdef Z_STALL_SENSITIVITY
#define Z_STOP_PIN Z_DIAG_PIN #define Z_STOP_PIN Z_DIAG_PIN
#if Z_HOME_DIR < 0 #if Z_HOME_DIR < 0
#define Z_MAX_PIN P1_00 // PWRDET #define Z_MAX_PIN P1_00 // PWRDET

6
Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
View File

@ -58,7 +58,7 @@
// //
// Limit Switches // Limit Switches
// //
#if X_STALL_SENSITIVITY #ifdef X_STALL_SENSITIVITY
#define X_STOP_PIN X_DIAG_PIN #define X_STOP_PIN X_DIAG_PIN
#if X_HOME_DIR < 0 #if X_HOME_DIR < 0
#define X_MAX_PIN P1_28 // X+ #define X_MAX_PIN P1_28 // X+
@ -70,7 +70,7 @@
#define X_MAX_PIN P1_28 // X+ #define X_MAX_PIN P1_28 // X+
#endif #endif
#if Y_STALL_SENSITIVITY #ifdef Y_STALL_SENSITIVITY
#define Y_STOP_PIN Y_DIAG_PIN #define Y_STOP_PIN Y_DIAG_PIN
#if Y_HOME_DIR < 0 #if Y_HOME_DIR < 0
#define Y_MAX_PIN P1_26 // Y+ #define Y_MAX_PIN P1_26 // Y+
@ -82,7 +82,7 @@
#define Y_MAX_PIN P1_26 // Y+ #define Y_MAX_PIN P1_26 // Y+
#endif #endif
#if Z_STALL_SENSITIVITY #ifdef Z_STALL_SENSITIVITY
#define Z_STOP_PIN Z_DIAG_PIN #define Z_STOP_PIN Z_DIAG_PIN
#if Z_HOME_DIR < 0 #if Z_HOME_DIR < 0
#define Z_MAX_PIN P1_24 // Z+ #define Z_MAX_PIN P1_24 // Z+

10
Marlin/src/pins/pins.h
View File

@ -1225,7 +1225,7 @@
// //
// Auto-assign pins for stallGuard sensorless homing // Auto-assign pins for stallGuard sensorless homing
// //
#if X2_STALL_SENSITIVITY && ENABLED(X_DUAL_ENDSTOPS) && _PEXI(X2_E_INDEX, DIAG) #if defined(X2_STALL_SENSITIVITY) && ENABLED(X_DUAL_ENDSTOPS) && _PEXI(X2_E_INDEX, DIAG)
#define X2_DIAG_PIN _EPIN(X2_E_INDEX, DIAG) #define X2_DIAG_PIN _EPIN(X2_E_INDEX, DIAG)
#if DIAG_REMAPPED(X2, X_MIN) // If already remapped in the pins file... #if DIAG_REMAPPED(X2, X_MIN) // If already remapped in the pins file...
#define X2_USE_ENDSTOP _XMIN_ #define X2_USE_ENDSTOP _XMIN_
@ -1294,7 +1294,7 @@
#define Y2_SERIAL_RX_PIN _EPIN(Y2_E_INDEX, SERIAL_RX) #define Y2_SERIAL_RX_PIN _EPIN(Y2_E_INDEX, SERIAL_RX)
#endif #endif
#endif #endif
#if Y2_STALL_SENSITIVITY && ENABLED(Y_DUAL_ENDSTOPS) && _PEXI(Y2_E_INDEX, DIAG) #if defined(Y2_STALL_SENSITIVITY) && ENABLED(Y_DUAL_ENDSTOPS) && _PEXI(Y2_E_INDEX, DIAG)
#define Y2_DIAG_PIN _EPIN(Y2_E_INDEX, DIAG) #define Y2_DIAG_PIN _EPIN(Y2_E_INDEX, DIAG)
#if DIAG_REMAPPED(Y2, X_MIN) #if DIAG_REMAPPED(Y2, X_MIN)
#define Y2_USE_ENDSTOP _XMIN_ #define Y2_USE_ENDSTOP _XMIN_
@ -1362,7 +1362,7 @@
#define Z2_SERIAL_RX_PIN _EPIN(Z2_E_INDEX, SERIAL_RX) #define Z2_SERIAL_RX_PIN _EPIN(Z2_E_INDEX, SERIAL_RX)
#endif #endif
#endif #endif
#if Z2_STALL_SENSITIVITY && ENABLED(Z_MULTI_ENDSTOPS) && NUM_Z_STEPPER_DRIVERS >= 2 && _PEXI(Z2_E_INDEX, DIAG) #if defined(Z2_STALL_SENSITIVITY) && ENABLED(Z_MULTI_ENDSTOPS) && NUM_Z_STEPPER_DRIVERS >= 2 && _PEXI(Z2_E_INDEX, DIAG)
#define Z2_DIAG_PIN _EPIN(Z2_E_INDEX, DIAG) #define Z2_DIAG_PIN _EPIN(Z2_E_INDEX, DIAG)
#if DIAG_REMAPPED(Z2, X_MIN) #if DIAG_REMAPPED(Z2, X_MIN)
#define Z2_USE_ENDSTOP _XMIN_ #define Z2_USE_ENDSTOP _XMIN_
@ -1431,7 +1431,7 @@
#define Z3_SERIAL_RX_PIN _EPIN(Z3_E_INDEX, SERIAL_RX) #define Z3_SERIAL_RX_PIN _EPIN(Z3_E_INDEX, SERIAL_RX)
#endif #endif
#endif #endif
#if Z3_STALL_SENSITIVITY && ENABLED(Z_MULTI_ENDSTOPS) && NUM_Z_STEPPER_DRIVERS >= 3 && _PEXI(Z3_E_INDEX, DIAG) #if defined(Z3_STALL_SENSITIVITY) && ENABLED(Z_MULTI_ENDSTOPS) && NUM_Z_STEPPER_DRIVERS >= 3 && _PEXI(Z3_E_INDEX, DIAG)
#define Z3_DIAG_PIN _EPIN(Z3_E_INDEX, DIAG) #define Z3_DIAG_PIN _EPIN(Z3_E_INDEX, DIAG)
#if DIAG_REMAPPED(Z3, X_MIN) #if DIAG_REMAPPED(Z3, X_MIN)
#define Z3_USE_ENDSTOP _XMIN_ #define Z3_USE_ENDSTOP _XMIN_
@ -1498,7 +1498,7 @@
#define Z4_SERIAL_RX_PIN _EPIN(Z4_E_INDEX, SERIAL_RX) #define Z4_SERIAL_RX_PIN _EPIN(Z4_E_INDEX, SERIAL_RX)
#endif #endif
#endif #endif
#if Z4_STALL_SENSITIVITY && ENABLED(Z_MULTI_ENDSTOPS) && NUM_Z_STEPPER_DRIVERS >= 4 && _PEXI(Z4_E_INDEX, DIAG) #if defined(Z4_STALL_SENSITIVITY) && ENABLED(Z_MULTI_ENDSTOPS) && NUM_Z_STEPPER_DRIVERS >= 4 && _PEXI(Z4_E_INDEX, DIAG)
#define Z4_DIAG_PIN _EPIN(Z4_E_INDEX, DIAG) #define Z4_DIAG_PIN _EPIN(Z4_E_INDEX, DIAG)
#if DIAG_REMAPPED(Z4, X_MIN) #if DIAG_REMAPPED(Z4, X_MIN)
#define Z4_USE_ENDSTOP _XMIN_ #define Z4_USE_ENDSTOP _XMIN_

6
Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_V1_1.h
View File

@ -51,7 +51,7 @@
// //
// Limit Switches // Limit Switches
// //
#if X_STALL_SENSITIVITY #ifdef X_STALL_SENSITIVITY
#define X_STOP_PIN X_DIAG_PIN #define X_STOP_PIN X_DIAG_PIN
#if X_HOME_DIR < 0 #if X_HOME_DIR < 0
#define X_MAX_PIN PE15 // E0 #define X_MAX_PIN PE15 // E0
@ -63,7 +63,7 @@
#define X_MAX_PIN PE15 // E0 #define X_MAX_PIN PE15 // E0
#endif #endif
#if Y_STALL_SENSITIVITY #ifdef Y_STALL_SENSITIVITY
#define Y_STOP_PIN Y_DIAG_PIN #define Y_STOP_PIN Y_DIAG_PIN
#if Y_HOME_DIR < 0 #if Y_HOME_DIR < 0
#define Y_MAX_PIN PE10 // E1 #define Y_MAX_PIN PE10 // E1
@ -75,7 +75,7 @@
#define Y_MAX_PIN PE10 // E1 #define Y_MAX_PIN PE10 // E1
#endif #endif
#if Z_STALL_SENSITIVITY #ifdef Z_STALL_SENSITIVITY
#define Z_STOP_PIN Z_DIAG_PIN #define Z_STOP_PIN Z_DIAG_PIN
#if Z_HOME_DIR < 0 #if Z_HOME_DIR < 0
#define Z_MAX_PIN PG5 // E2 #define Z_MAX_PIN PG5 // E2

2
buildroot/share/PlatformIO/variants/STEVAL_F401VE/variant.cpp
View File

@ -34,7 +34,7 @@
extern "C" { extern "C" {
#endif #endif
#if defined(ARDUINO_STEVAL) #ifdef ARDUINO_STEVAL
// Pin number // Pin number
// This array allows to wrap Arduino pin number(Dx or x) // This array allows to wrap Arduino pin number(Dx or x)
// to STM32 PinName (PX_n) // to STM32 PinName (PX_n)

2
buildroot/share/PlatformIO/variants/STEVAL_F401VE/variant.h
View File

@ -41,7 +41,7 @@ extern "C" {
/*---------------------------------------------------------------------------- /*----------------------------------------------------------------------------
* Pins * Pins
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
#if defined(ARDUINO_STEVAL) #ifdef ARDUINO_STEVAL
/*---------------------------------------------------------------------------- /*----------------------------------------------------------------------------

Write Preview
Loading…
Cancel
Save