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

Prevent DUE / Spindle conflict

Browse source 
Fixes #17449
This commit is contained in:
Scott Lahteine 2020-04-22 18:45:45 -05:00
parent 19873f04d4
commit e222ba4c81
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Marlin/Configuration_adv.h
View file

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

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

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

4
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)
#if HAS_CUTTER #if HAS_CUTTER
#ifndef CUTTER_POWER_DISPLAY #ifndef CUTTER_POWER_DISPLAY
#error "CUTTER_POWER_DISPLAY is required with a spindle or laser. Please update your Configuration_adv.h." #error "CUTTER_POWER_DISPLAY is required with a spindle or laser. Please update your Configuration_adv.h."
#elif !CUTTER_DISPLAY_IS(PWM) && !CUTTER_DISPLAY_IS(PERCENT) && !CUTTER_DISPLAY_IS(RPM) #elif !CUTTER_DISPLAY_IS(PWM255) && !CUTTER_DISPLAY_IS(PERCENT) && !CUTTER_DISPLAY_IS(RPM)
#error "CUTTER_POWER_DISPLAY must be PWM, PERCENT, or RPM. Please update your Configuration_adv.h." #error "CUTTER_POWER_DISPLAY must be PWM255, PERCENT, or RPM. Please update your Configuration_adv.h."
#endif #endif
#if ENABLED(LASER_POWER_INLINE) #if ENABLED(LASER_POWER_INLINE)