Extended condition macros (#13419)
Allow `ENABLED`, `DISABLED`, `PIN_EXISTS`, and `BUTTON_EXISTS` to take multiple arguments. Also add: - Alias `ANY(...)` for `!DISABLED(...)` - Alias `ANY_PIN(...)` for `PIN_EXISTS(a) || PIN_EXISTS(b) ...` - Alias `EITHER(A,B)` for `ANY(...)` - Alias `ALL(...)` and `BOTH(A,B)` for `ENABLED(...)` - `NONE(...)` for `DISABLED(...)`
This commit is contained in:
		@@ -238,7 +238,7 @@
 | 
			
		||||
 */
 | 
			
		||||
//#define MAGNETIC_PARKING_EXTRUDER
 | 
			
		||||
 | 
			
		||||
#if ENABLED(PARKING_EXTRUDER) || ENABLED(MAGNETIC_PARKING_EXTRUDER)
 | 
			
		||||
#if EITHER(PARKING_EXTRUDER, MAGNETIC_PARKING_EXTRUDER)
 | 
			
		||||
 | 
			
		||||
  #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
 | 
			
		||||
  #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // (mm) Distance to move beyond the parking point to grab the extruder
 | 
			
		||||
@@ -1035,7 +1035,7 @@
 | 
			
		||||
  #define MAX_SOFTWARE_ENDSTOP_Z
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#if ENABLED(MIN_SOFTWARE_ENDSTOPS) || ENABLED(MAX_SOFTWARE_ENDSTOPS)
 | 
			
		||||
#if EITHER(MIN_SOFTWARE_ENDSTOPS, MAX_SOFTWARE_ENDSTOPS)
 | 
			
		||||
  //#define SOFT_ENDSTOPS_MENU_ITEM  // Enable/Disable software endstops from the LCD
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
@@ -1128,7 +1128,7 @@
 | 
			
		||||
 */
 | 
			
		||||
//#define DEBUG_LEVELING_FEATURE
 | 
			
		||||
 | 
			
		||||
#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL)
 | 
			
		||||
#if ANY(MESH_BED_LEVELING, AUTO_BED_LEVELING_BILINEAR, AUTO_BED_LEVELING_UBL)
 | 
			
		||||
  // Gradually reduce leveling correction until a set height is reached,
 | 
			
		||||
  // at which point movement will be level to the machine's XY plane.
 | 
			
		||||
  // The height can be set with M420 Z<height>
 | 
			
		||||
@@ -1154,7 +1154,7 @@
 | 
			
		||||
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
 | 
			
		||||
#if EITHER(AUTO_BED_LEVELING_LINEAR, AUTO_BED_LEVELING_BILINEAR)
 | 
			
		||||
 | 
			
		||||
  // Set the number of grid points per dimension.
 | 
			
		||||
  #define GRID_MAX_POINTS_X 3
 | 
			
		||||
@@ -1223,7 +1223,7 @@
 | 
			
		||||
 * Points to probe for all 3-point Leveling procedures.
 | 
			
		||||
 * Override if the automatically selected points are inadequate.
 | 
			
		||||
 */
 | 
			
		||||
#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
 | 
			
		||||
#if EITHER(AUTO_BED_LEVELING_3POINT, AUTO_BED_LEVELING_UBL)
 | 
			
		||||
  //#define PROBE_PT_1_X 15
 | 
			
		||||
  //#define PROBE_PT_1_Y 180
 | 
			
		||||
  //#define PROBE_PT_2_X 15
 | 
			
		||||
@@ -2057,7 +2057,7 @@
 | 
			
		||||
//#define RGB_LED
 | 
			
		||||
//#define RGBW_LED
 | 
			
		||||
 | 
			
		||||
#if ENABLED(RGB_LED) || ENABLED(RGBW_LED)
 | 
			
		||||
#if EITHER(RGB_LED, RGBW_LED)
 | 
			
		||||
  #define RGB_LED_R_PIN 34
 | 
			
		||||
  #define RGB_LED_G_PIN 43
 | 
			
		||||
  #define RGB_LED_B_PIN 35
 | 
			
		||||
@@ -2086,7 +2086,7 @@
 | 
			
		||||
 *  - Change to green once print has finished
 | 
			
		||||
 *  - Turn off after the print has finished and the user has pushed a button
 | 
			
		||||
 */
 | 
			
		||||
#if ENABLED(BLINKM) || ENABLED(RGB_LED) || ENABLED(RGBW_LED) || ENABLED(PCA9632) || ENABLED(PCA9533)|| ENABLED(NEOPIXEL_LED)
 | 
			
		||||
#if ANY(BLINKM, RGB_LED, RGBW_LED, PCA9632, PCA9533, NEOPIXEL_LED)
 | 
			
		||||
  #define PRINTER_EVENT_LEDS
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user