소스 검색

X_SENSORLESS includes AXIS_HAS_STALLGUARD

Scott Lahteine 5 년 전
부모
커밋
806d64e1bf

+ 3
- 0
Marlin/src/inc/Conditionals_post.h 파일 보기

@@ -977,7 +977,10 @@
977 977
   #define X_SENSORLESS  (AXIS_HAS_STALLGUARD(X)  && defined(X_STALL_SENSITIVITY))
978 978
   #define X2_SENSORLESS (AXIS_HAS_STALLGUARD(X2) && defined(X2_STALL_SENSITIVITY))
979 979
   #define Y_SENSORLESS  (AXIS_HAS_STALLGUARD(Y)  && defined(Y_STALL_SENSITIVITY))
980
+  #define Y2_SENSORLESS (AXIS_HAS_STALLGUARD(Y2) && defined(Y2_STALL_SENSITIVITY))
980 981
   #define Z_SENSORLESS  (AXIS_HAS_STALLGUARD(Z)  && defined(Z_STALL_SENSITIVITY))
982
+  #define Z2_SENSORLESS (AXIS_HAS_STALLGUARD(Z2) && defined(Z2_STALL_SENSITIVITY))
983
+  #define Z3_SENSORLESS (AXIS_HAS_STALLGUARD(Z3) && defined(Z3_STALL_SENSITIVITY))
981 984
   #if ENABLED(SPI_ENDSTOPS)
982 985
     #define X_SPI_SENSORLESS X_SENSORLESS
983 986
     #define Y_SPI_SENSORLESS Y_SENSORLESS

+ 3
- 3
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/stepper_bump_sensitivity_screen.cpp 파일 보기

@@ -35,21 +35,21 @@ void StepperBumpSensitivityScreen::onRedraw(draw_mode_t what) {
35 35
   w.precision(0, BaseNumericAdjustmentScreen::DEFAULT_LOWEST);
36 36
   w.heading(                     GET_TEXTF(HOME_SENSE));
37 37
   w.color(x_axis)  .adjuster( 2, GET_TEXTF(AXIS_X),  getTMCBumpSensitivity(X),
38
-  #if X_SENSORLESS && AXIS_HAS_STALLGUARD(X)
38
+  #if X_SENSORLESS
39 39
     true
40 40
   #else
41 41
     false
42 42
   #endif
43 43
   );
44 44
   w.color(y_axis)  .adjuster( 4, GET_TEXTF(AXIS_Y),  getTMCBumpSensitivity(Y),
45
-   #if Y_SENSORLESS && AXIS_HAS_STALLGUARD(Y)
45
+   #if Y_SENSORLESS
46 46
      true
47 47
    #else
48 48
      false
49 49
    #endif
50 50
   );
51 51
   w.color(z_axis)  .adjuster( 6, GET_TEXTF(AXIS_Z),  getTMCBumpSensitivity(Z),
52
-   #if Z_SENSORLESS && AXIS_HAS_STALLGUARD(Z)
52
+   #if Z_SENSORLESS
53 53
      true
54 54
    #else
55 55
      false

+ 13
- 15
Marlin/src/lcd/extensible_ui/ui_api.cpp 파일 보기

@@ -516,13 +516,13 @@ namespace ExtUI {
516 516
 
517 517
     int getTMCBumpSensitivity(const axis_t axis) {
518 518
       switch (axis) {
519
-        #if X_SENSORLESS && AXIS_HAS_STALLGUARD(X)
519
+        #if X_SENSORLESS
520 520
           case X: return stepperX.homing_threshold();
521 521
         #endif
522
-        #if Y_SENSORLESS && AXIS_HAS_STALLGUARD(Y)
522
+        #if Y_SENSORLESS
523 523
           case Y: return stepperY.homing_threshold();
524 524
         #endif
525
-        #if Z_SENSORLESS && AXIS_HAS_STALLGUARD(Z)
525
+        #if Z_SENSORLESS
526 526
           case Z: return stepperZ.homing_threshold();
527 527
         #endif
528 528
         default: return 0;
@@ -531,18 +531,16 @@ namespace ExtUI {
531 531
 
532 532
     void setTMCBumpSensitivity(const float value, const axis_t axis) {
533 533
       switch (axis) {
534
-        #if X_SENSORLESS && AXIS_HAS_STALLGUARD(X)
535
-          case X: stepperX.homing_threshold(value); break;
536
-        #else
537
-          UNUSED(value);
538
-        #endif
539
-        #if Y_SENSORLESS && AXIS_HAS_STALLGUARD(Y)
540
-          case Y: stepperY.homing_threshold(value); break;
541
-        #else
542
-          UNUSED(value);
543
-        #endif
544
-        #if Z_SENSORLESS && AXIS_HAS_STALLGUARD(Z)
545
-          case Z: stepperZ.homing_threshold(value); break;
534
+        #if X_SENSORLESS || Y_SENSORLESS || Z_SENSORLESS
535
+          #if X_SENSORLESS
536
+            case X: stepperX.homing_threshold(value); break;
537
+          #endif
538
+          #if Y_SENSORLESS
539
+            case Y: stepperY.homing_threshold(value); break;
540
+          #endif
541
+          #if Z_SENSORLESS
542
+            case Z: stepperZ.homing_threshold(value); break;
543
+          #endif
546 544
         #else
547 545
           UNUSED(value);
548 546
         #endif

+ 5
- 9
Marlin/src/module/configuration_store.cpp 파일 보기

@@ -3246,27 +3246,23 @@ void MarlinSettings::reset() {
3246 3246
           SERIAL_EOL();
3247 3247
         #endif
3248 3248
 
3249
-        #define HAS_X2_SENSORLESS (defined(X_STALL_SENSITIVITY) && AXIS_HAS_STALLGUARD(X2))
3250
-        #define HAS_Y2_SENSORLESS (defined(Y_STALL_SENSITIVITY) && AXIS_HAS_STALLGUARD(Y2))
3251
-        #define HAS_Z2_SENSORLESS (defined(Z_STALL_SENSITIVITY) && AXIS_HAS_STALLGUARD(Z2))
3252
-        #define HAS_Z3_SENSORLESS (defined(Z_STALL_SENSITIVITY) && AXIS_HAS_STALLGUARD(Z3))
3253
-        #if HAS_X2_SENSORLESS || HAS_Y2_SENSORLESS || HAS_Z2_SENSORLESS
3249
+        #if X2_SENSORLESS || Y2_SENSORLESS || Z2_SENSORLESS
3254 3250
           CONFIG_ECHO_START();
3255 3251
           say_M914();
3256 3252
           SERIAL_ECHOPGM(" I1");
3257
-          #if HAS_X2_SENSORLESS
3253
+          #if X2_SENSORLESS
3258 3254
             SERIAL_ECHOPAIR(" X", stepperX2.homing_threshold());
3259 3255
           #endif
3260
-          #if HAS_Y2_SENSORLESS
3256
+          #if Y2_SENSORLESS
3261 3257
             SERIAL_ECHOPAIR(" Y", stepperY2.homing_threshold());
3262 3258
           #endif
3263
-          #if HAS_Z2_SENSORLESS
3259
+          #if Z2_SENSORLESS
3264 3260
             SERIAL_ECHOPAIR(" Z", stepperZ2.homing_threshold());
3265 3261
           #endif
3266 3262
           SERIAL_EOL();
3267 3263
         #endif
3268 3264
 
3269
-        #if HAS_Z3_SENSORLESS
3265
+        #if Z3_SENSORLESS
3270 3266
           CONFIG_ECHO_START();
3271 3267
           say_M914();
3272 3268
           SERIAL_ECHOLNPAIR(" I2 Z", stepperZ3.homing_threshold());

Loading…
취소
저장