瀏覽代碼

Prevent DUE / Spindle conflict

Fixes #17449
Scott Lahteine 5 年之前
父節點
當前提交
e222ba4c81
共有 3 個檔案被更改,包括 5 行新增5 行删除
  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 查看文件

2694
 
2694
 
2695
   /**
2695
   /**
2696
    * Speed / Power can be set ('M3 S') and displayed in terms of:
2696
    * Speed / Power can be set ('M3 S') and displayed in terms of:
2697
-   *  - PWM     (S0 - S255)
2697
+   *  - PWM255  (S0 - S255)
2698
    *  - PERCENT (S0 - S100)
2698
    *  - PERCENT (S0 - S100)
2699
    *  - RPM     (S0 - S50000)  Best for use with a spindle
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
    * Relative mode uses relative range (SPEED_POWER_MIN to SPEED_POWER_MAX) instead of normal range (0 to SPEED_POWER_MAX)
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 查看文件

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

+ 2
- 2
Marlin/src/inc/SanityCheck.h 查看文件

2784
 #if HAS_CUTTER
2784
 #if HAS_CUTTER
2785
   #ifndef CUTTER_POWER_DISPLAY
2785
   #ifndef CUTTER_POWER_DISPLAY
2786
     #error "CUTTER_POWER_DISPLAY is required with a spindle or laser. Please update your Configuration_adv.h."
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
   #endif
2789
   #endif
2790
 
2790
 
2791
   #if ENABLED(LASER_POWER_INLINE)
2791
   #if ENABLED(LASER_POWER_INLINE)

Loading…
取消
儲存