From b2b7c583eb418d008c275d9279efdda0cc15ad09 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Fri, 12 Jul 2019 23:06:56 -0500
Subject: [PATCH] Pins cleanup
---
Marlin/src/pins/stm32/pins_BEAST.h | 4 -
Marlin/src/pins/stm32/pins_CHITU3D.h | 4 -
Marlin/src/pins/stm32/pins_STM32F1R.h | 3 -
Marlin/src/pins/stm32/pins_STM3R_MINI.h | 157 ++++++++++++------------
4 files changed, 77 insertions(+), 91 deletions(-)
diff --git a/Marlin/src/pins/stm32/pins_BEAST.h b/Marlin/src/pins/stm32/pins_BEAST.h
index f2c51ac146..e6fc5f769a 100644
--- a/Marlin/src/pins/stm32/pins_BEAST.h
+++ b/Marlin/src/pins/stm32/pins_BEAST.h
@@ -284,7 +284,3 @@
#endif // NEWPANEL
#endif // HAS_SPI_LCD
-
-#define U_MIN_PIN -1
-#define V_MIN_PIN -1
-#define W_MIN_PIN -1
diff --git a/Marlin/src/pins/stm32/pins_CHITU3D.h b/Marlin/src/pins/stm32/pins_CHITU3D.h
index 3ae9ccc205..03a194ad6d 100644
--- a/Marlin/src/pins/stm32/pins_CHITU3D.h
+++ b/Marlin/src/pins/stm32/pins_CHITU3D.h
@@ -282,7 +282,3 @@
#endif // NEWPANEL
#endif // HAS_SPI_LCD
-
-#define U_MIN_PIN -1
-#define V_MIN_PIN -1
-#define W_MIN_PIN -1
diff --git a/Marlin/src/pins/stm32/pins_STM32F1R.h b/Marlin/src/pins/stm32/pins_STM32F1R.h
index 9a709cb464..7b3e910479 100644
--- a/Marlin/src/pins/stm32/pins_STM32F1R.h
+++ b/Marlin/src/pins/stm32/pins_STM32F1R.h
@@ -38,9 +38,6 @@
//
// Limit Switches
//
-#define U_MIN_PIN -1
-#define V_MIN_PIN -1
-#define W_MIN_PIN -1
#define X_STOP_PIN PB3
#define Y_STOP_PIN PB4
#define Z_STOP_PIN PB5
diff --git a/Marlin/src/pins/stm32/pins_STM3R_MINI.h b/Marlin/src/pins/stm32/pins_STM3R_MINI.h
index b4b181986c..a633f4a736 100644
--- a/Marlin/src/pins/stm32/pins_STM3R_MINI.h
+++ b/Marlin/src/pins/stm32/pins_STM3R_MINI.h
@@ -41,9 +41,6 @@
//
// Limit Switches
//
-#define U_MIN_PIN -1
-#define V_MIN_PIN -1
-#define W_MIN_PIN -1
#define X_STOP_PIN PD0
#define Y_STOP_PIN PD1
#define Z_STOP_PIN PD4
@@ -118,31 +115,31 @@
#if HAS_SPI_LCD
#if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
- #define LCD_PINS_RS 49 // CS chip select /SS chip slave select
- #define LCD_PINS_ENABLE 51 // SID (MOSI)
- #define LCD_PINS_D4 52 // SCK (CLK) clock
+ #define LCD_PINS_RS 49 // CS chip select /SS chip slave select
+ #define LCD_PINS_ENABLE 51 // SID (MOSI)
+ #define LCD_PINS_D4 52 // SCK (CLK) clock
#elif BOTH(NEWPANEL, PANEL_ONE)
- #define LCD_PINS_RS PB8
- #define LCD_PINS_ENABLE PD2
- #define LCD_PINS_D4 PB12
- #define LCD_PINS_D5 PB13
- #define LCD_PINS_D6 PB14
- #define LCD_PINS_D7 PB15
+ #define LCD_PINS_RS PB8
+ #define LCD_PINS_ENABLE PD2
+ #define LCD_PINS_D4 PB12
+ #define LCD_PINS_D5 PB13
+ #define LCD_PINS_D6 PB14
+ #define LCD_PINS_D7 PB15
#else
- #define LCD_PINS_RS PB8
- #define LCD_PINS_ENABLE PD2
- #define LCD_PINS_D4 PB12
- #define LCD_PINS_D5 PB13
- #define LCD_PINS_D6 PB14
- #define LCD_PINS_D7 PB15
+ #define LCD_PINS_RS PB8
+ #define LCD_PINS_ENABLE PD2ins
+ #define LCD_PINS_D4 PB12
+ #define LCD_PINS_D5 PB13
+ #define LCD_PINS_D6 PB14
+ #define LCD_PINS_D7 PB15
#if DISABLED(NEWPANEL)
- #define BEEPER_PIN 33
+ #define BEEPER_PIN 33
// Buttons are attached to a shift register
// Not wired yet
- //#define SHIFT_CLK 38
- //#define SHIFT_LD 42
- //#define SHIFT_OUT 40
- //#define SHIFT_EN 17
+ //#define SHIFT_CLK 38
+ //#define SHIFT_LD 42
+ //#define SHIFT_OUT 40
+ //#define SHIFT_EN 17
#endif
#endif
@@ -165,111 +162,111 @@
#elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
- #define BTN_EN1 64
- #define BTN_EN2 59
- #define BTN_ENC 63
- #define SD_DETECT_PIN 42
+ #define BTN_EN1 64
+ #define BTN_EN2 59
+ #define BTN_ENC 63
+ #define SD_DETECT_PIN 42
#elif ENABLED(LCD_I2C_PANELOLU2)
- #define BTN_EN1 47
- #define BTN_EN2 43
- #define BTN_ENC 32
- #define LCD_SDSS 53
- #define SD_DETECT_PIN -1
- #define KILL_PIN 41
+ #define BTN_EN1 47
+ #define BTN_EN2 43
+ #define BTN_ENC 32
+ #define LCD_SDSS 53
+ #define SD_DETECT_PIN -1
+ #define KILL_PIN 41
#elif ENABLED(LCD_I2C_VIKI)
- #define BTN_EN1 22 // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
- #define BTN_EN2 7 // 22/7 are unused on RAMPS_14. 22 is unused and 7 the SERVO0_PIN on RAMPS_13.
+ #define BTN_EN1 22 // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
+ #define BTN_EN2 7 // 22/7 are unused on RAMPS_14. 22 is unused and 7 the SERVO0_PIN on RAMPS_13.
- #define BTN_ENC -1
- #define LCD_SDSS 53
- #define SD_DETECT_PIN 49
+ #define BTN_ENC -1
+ #define LCD_SDSS 53
+ #define SD_DETECT_PIN 49
#elif ANY(VIKI2, miniVIKI)
- #define BEEPER_PIN 33
+ #define BEEPER_PIN 33
// Pins for DOGM SPI LCD Support
- #define DOGLCD_A0 44
- #define DOGLCD_CS 45
+ #define DOGLCD_A0 44
+ #define DOGLCD_CS 45
#define LCD_SCREEN_ROT_180
- #define BTN_EN1 22
- #define BTN_EN2 7
- #define BTN_ENC 39
+ #define BTN_EN1 22
+ #define BTN_EN2 7
+ #define BTN_ENC 39
- #define SDSS 53
- #define SD_DETECT_PIN -1 // Pin 49 for display sd interface, 72 for easy adapter board
+ #define SDSS 53
+ #define SD_DETECT_PIN -1 // Pin 49 for display sd interface, 72 for easy adapter board
- #define KILL_PIN 31
+ #define KILL_PIN 31
#define STAT_LED_RED_PIN 32
#define STAT_LED_BLUE_PIN 35
#elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
- #define BTN_EN1 35
- #define BTN_EN2 37
- #define BTN_ENC 31
- #define SD_DETECT_PIN 49
- #define LCD_SDSS 53
- #define KILL_PIN 41
- #define BEEPER_PIN 23
- #define DOGLCD_CS 29
- #define DOGLCD_A0 27
+ #define BTN_EN1 35
+ #define BTN_EN2 37
+ #define BTN_ENC 31
+ #define SD_DETECT_PIN 49
+ #define LCD_SDSS 53
+ #define KILL_PIN 41
+ #define BEEPER_PIN 23
+ #define DOGLCD_CS 29
+ #define DOGLCD_A0 27
#define LCD_BACKLIGHT_PIN 33
#elif ENABLED(MINIPANEL)
- #define BEEPER_PIN 42
+ #define BEEPER_PIN 42
// Pins for DOGM SPI LCD Support
- #define DOGLCD_A0 44
- #define DOGLCD_CS 66
+ #define DOGLCD_A0 44
+ #define DOGLCD_CS 66
#define LCD_BACKLIGHT_PIN 65 // backlight LED on A11/D65
- #define SDSS 53
+ #define SDSS 53
- #define KILL_PIN 64
+ #define KILL_PIN 64
// GLCD features
// Uncomment screen orientation
//#define LCD_SCREEN_ROT_90
//#define LCD_SCREEN_ROT_180
//#define LCD_SCREEN_ROT_270
// The encoder and click button
- #define BTN_EN1 40
- #define BTN_EN2 63
- #define BTN_ENC 59
+ #define BTN_EN1 40
+ #define BTN_EN2 63
+ #define BTN_ENC 59
// not connected to a pin
- #define SD_DETECT_PIN 49
+ #define SD_DETECT_PIN 49
#else
// Beeper on AUX-4
- #define BEEPER_PIN 33
+ #define BEEPER_PIN 33
// buttons are directly attached to AUX-2
#if ENABLED(REPRAPWORLD_KEYPAD)
- #define BTN_EN1 64
- #define BTN_EN2 59
- #define BTN_ENC 63
- #define SHIFT_OUT 40
- #define SHIFT_CLK 44
- #define SHIFT_LD 42
+ #define BTN_EN1 64
+ #define BTN_EN2 59
+ #define BTN_ENC 63
+ #define SHIFT_OUT 40
+ #define SHIFT_CLK 44
+ #define SHIFT_LD 42
#elif ENABLED(PANEL_ONE)
- #define BTN_EN1 59 // AUX2 PIN 3
- #define BTN_EN2 63 // AUX2 PIN 4
- #define BTN_ENC 49 // AUX3 PIN 7
+ #define BTN_EN1 59 // AUX2 PIN 3
+ #define BTN_EN2 63 // AUX2 PIN 4
+ #define BTN_ENC 49 // AUX3 PIN 7
#else
- #define BTN_EN1 37
- #define BTN_EN2 35
- #define BTN_ENC 31
+ #define BTN_EN1 37
+ #define BTN_EN2 35
+ #define BTN_ENC 31
#endif
#if ENABLED(G3D_PANEL)
- #define SD_DETECT_PIN 49
- #define KILL_PIN 41
+ #define SD_DETECT_PIN 49
+ #define KILL_PIN 41
#else
//#define SD_DETECT_PIN -1 // Ramps doesn't use this
#endif