From 76667674108d62e537ace90416b9d065606f2745 Mon Sep 17 00:00:00 2001 From: InsanityAutomation Date: Thu, 2 Jul 2020 17:21:13 -0400 Subject: [PATCH 1/2] Tweaks --- Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h b/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h index 0428c17e21a7..823a57ecb27c 100644 --- a/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h +++ b/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h @@ -61,7 +61,6 @@ #undef LCD_PINS_D5 #undef LCD_PINS_D6 #undef LCD_PINS_D7 -#undef FIL_RUNOUT_PIN // Uses Beeper/LED Pin Pulled to GND #define LCD_SDSS 31 // Smart Controller SD card reader (rather than the Melzi) #define LCD_PINS_RS 28 // ST9720 CS @@ -69,8 +68,16 @@ #define LCD_PINS_D4 30 // ST9720 CLK #if ENABLED(BLTOUCH) + #undef FIL_RUNOUT_PIN // Uses Beeper/LED Pin Pulled to GND #define SERVO0_PIN 27 #undef BEEPER_PIN +#elif ENABLED(FILAMENT_RUNOUT_SENSOR) + #ifndef FIL_RUNOUT_PIN + #define FIL_RUNOUT_PIN 27 + #endif + #if (FIL_RUNOUT_PIN == BEEPER_PIN) + #undef BEEPER_PIN + #endif #endif #if ENABLED(MINIPANEL) From 82287b21dfb5236704d7902d3941991a9e4972b3 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Thu, 2 Jul 2020 19:31:27 -0500 Subject: [PATCH 2/2] Update pins_MELZI_CREALITY.h --- Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h b/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h index 823a57ecb27c..95466b327d7d 100644 --- a/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h +++ b/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h @@ -68,14 +68,13 @@ #define LCD_PINS_D4 30 // ST9720 CLK #if ENABLED(BLTOUCH) - #undef FIL_RUNOUT_PIN // Uses Beeper/LED Pin Pulled to GND #define SERVO0_PIN 27 #undef BEEPER_PIN #elif ENABLED(FILAMENT_RUNOUT_SENSOR) #ifndef FIL_RUNOUT_PIN - #define FIL_RUNOUT_PIN 27 + #define FIL_RUNOUT_PIN 27 #endif - #if (FIL_RUNOUT_PIN == BEEPER_PIN) + #if FIL_RUNOUT_PIN == BEEPER_PIN #undef BEEPER_PIN #endif #endif