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

Remove CREALITY_TOUCH

Browse source
This commit is contained in:
Scott Lahteine 2020-12-27 16:15:15 -06:00
parent 198b3ae0f8
commit d00c89946d
4 changed files with 4 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Marlin/Configuration.h
View file

@ -896,11 +896,6 @@
*/ */
//#define BLTOUCH //#define BLTOUCH
/**
* Pressure sensor with a BLTouch-like interface
*/
//#define CREALITY_TOUCH
/** /**
* Touch-MI Probe by hotends.fr * Touch-MI Probe by hotends.fr
* *

13
Marlin/src/feature/bltouch.h
View file

@ -30,16 +30,9 @@
// BLTouch commands are sent as servo angles // BLTouch commands are sent as servo angles
typedef unsigned char BLTCommand; typedef unsigned char BLTCommand;
#if ENABLED(CREALITY_TOUCH) #define STOW_ALARM true
#define STOW_ALARM false #define BLTOUCH_DEPLOY 10
#define BLTOUCH_DEPLOY 170 #define BLTOUCH_STOW 90
#define BLTOUCH_STOW 20
#else
#define STOW_ALARM true
#define BLTOUCH_DEPLOY 10
#define BLTOUCH_STOW 90
#endif
#define BLTOUCH_SW_MODE 60 #define BLTOUCH_SW_MODE 60
#define BLTOUCH_SELFTEST 120 #define BLTOUCH_SELFTEST 120
#define BLTOUCH_MODE_STORE 130 #define BLTOUCH_MODE_STORE 130

5
Marlin/src/inc/Conditionals_LCD.h
View file

@ -653,11 +653,6 @@
#define SERIAL_CATCHALL 0 #define SERIAL_CATCHALL 0
#endif #endif
// Pressure sensor with a BLTouch-like interface
#if ENABLED(CREALITY_TOUCH)
#define BLTOUCH
#endif
/** /**
* The BLTouch Probe emulates a servo probe * The BLTouch Probe emulates a servo probe
* and uses "special" angles for its state. * and uses "special" angles for its state.

3
Marlin/src/inc/SanityCheck.h
View file

@ -1255,8 +1255,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
*/ */
#if 1 < 0 \ #if 1 < 0 \
+ (DISABLED(BLTOUCH) && HAS_Z_SERVO_PROBE) \ + (DISABLED(BLTOUCH) && HAS_Z_SERVO_PROBE) \
+ (ENABLED(BLTOUCH) && DISABLED(CREALITY_TOUCH)) \ + COUNT_ENABLED(PROBE_MANUALLY, BLTOUCH, FIX_MOUNTED_PROBE, NOZZLE_AS_PROBE, TOUCH_MI_PROBE, SOLENOID_PROBE, Z_PROBE_ALLEN_KEY, Z_PROBE_SLED, RACK_AND_PINION_PROBE, SENSORLESS_PROBING)
+ COUNT_ENABLED(PROBE_MANUALLY, FIX_MOUNTED_PROBE, NOZZLE_AS_PROBE, CREALITY_TOUCH, TOUCH_MI_PROBE, SOLENOID_PROBE, Z_PROBE_ALLEN_KEY, Z_PROBE_SLED, RACK_AND_PINION_PROBE, SENSORLESS_PROBING)
#error "Please enable only one probe option: PROBE_MANUALLY, SENSORLESS_PROBING, BLTOUCH, FIX_MOUNTED_PROBE, NOZZLE_AS_PROBE, TOUCH_MI_PROBE, SOLENOID_PROBE, Z_PROBE_ALLEN_KEY, Z_PROBE_SLED, or Z Servo." #error "Please enable only one probe option: PROBE_MANUALLY, SENSORLESS_PROBING, BLTOUCH, FIX_MOUNTED_PROBE, NOZZLE_AS_PROBE, TOUCH_MI_PROBE, SOLENOID_PROBE, Z_PROBE_ALLEN_KEY, Z_PROBE_SLED, or Z Servo."
#endif #endif