Browse Source

Prevent DUE / Spindle conflict

Fixes #17449
Scott Lahteine 4 years ago
parent
commit
e222ba4c81
3 changed files with 5 additions and 5 deletions
  1. 2
    2
      Marlin/Configuration_adv.h
  2. 1
    1
      Marlin/src/inc/Conditionals_adv.h
  3. 2
    2
      Marlin/src/inc/SanityCheck.h

+ 2
- 2
Marlin/Configuration_adv.h View File

@@ -2694,11 +2694,11 @@
2694 2694
 
2695 2695
   /**
2696 2696
    * Speed / Power can be set ('M3 S') and displayed in terms of:
2697
-   *  - PWM     (S0 - S255)
2697
+   *  - PWM255  (S0 - S255)
2698 2698
    *  - PERCENT (S0 - S100)
2699 2699
    *  - RPM     (S0 - S50000)  Best for use with a spindle
2700 2700
    */
2701
-  #define CUTTER_POWER_DISPLAY PWM
2701
+  #define CUTTER_POWER_DISPLAY PWM255
2702 2702
 
2703 2703
   /**
2704 2704
    * Relative mode uses relative range (SPEED_POWER_MIN to SPEED_POWER_MAX) instead of normal range (0 to SPEED_POWER_MAX)

+ 1
- 1
Marlin/src/inc/Conditionals_adv.h View File

@@ -139,7 +139,7 @@
139 139
 //
140 140
 #if EITHER(SPINDLE_FEATURE, LASER_FEATURE)
141 141
   #define HAS_CUTTER 1
142
-  #define _CUTTER_DISP_PWM     1
142
+  #define _CUTTER_DISP_PWM255  1
143 143
   #define _CUTTER_DISP_PERCENT 2
144 144
   #define _CUTTER_DISP_RPM     3
145 145
   #define _CUTTER_DISP(V)      _CAT(_CUTTER_DISP_, V)

+ 2
- 2
Marlin/src/inc/SanityCheck.h View File

@@ -2784,8 +2784,8 @@ static_assert(   _ARR_TEST(3,0) && _ARR_TEST(3,1) && _ARR_TEST(3,2)
2784 2784
 #if HAS_CUTTER
2785 2785
   #ifndef CUTTER_POWER_DISPLAY
2786 2786
     #error "CUTTER_POWER_DISPLAY is required with a spindle or laser. Please update your Configuration_adv.h."
2787
-  #elif !CUTTER_DISPLAY_IS(PWM) && !CUTTER_DISPLAY_IS(PERCENT) && !CUTTER_DISPLAY_IS(RPM)
2788
-    #error "CUTTER_POWER_DISPLAY must be PWM, PERCENT, or RPM. Please update your Configuration_adv.h."
2787
+  #elif !CUTTER_DISPLAY_IS(PWM255) && !CUTTER_DISPLAY_IS(PERCENT) && !CUTTER_DISPLAY_IS(RPM)
2788
+    #error "CUTTER_POWER_DISPLAY must be PWM255, PERCENT, or RPM. Please update your Configuration_adv.h."
2789 2789
   #endif
2790 2790
 
2791 2791
   #if ENABLED(LASER_POWER_INLINE)

Loading…
Cancel
Save