thomas
/
marlin
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Clean up some pins

Scott Lahteine 3 years ago
parent
7afd274d0c
commit
c7ecfe28e7
4 changed files with 28 additions and 32 deletions
Split View Show Diff Stats
  1. 5
    5
      Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h
  2. 6
    6
      Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
  3. 16
    20
      Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h
  4. 1
    1
      Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h

+ 5
- 5
Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h View File 

@@ -48,20 +48,20 @@
48 48 
 //
49 49 
 // Limit Switches
50 50 
 //
51 
-#define X_STOP_PIN                          PC1   // "X-STOP"
52 
-#define Y_STOP_PIN                          PC0   // "Y-STOP"
53 
-#define Z_STOP_PIN                          PC15  // "Z-STOP"
51 
+#define X_STOP_PIN                          PC1   // X-STOP
52 
+#define Y_STOP_PIN                          PC0   // Y-STOP
53 
+#define Z_STOP_PIN                          PC15  // Z-STOP
54 54
55 55 
 //
56 56 
 // Z Probe must be this pin
57 57 
 //
58 
-#define Z_MIN_PROBE_PIN                     PC14  // "PROBE"
58 
+#define Z_MIN_PROBE_PIN                     PC14  // PROBE
59 59
60 60 
 //
61 61 
 // Filament Runout Sensor
62 62 
 //
63 63 
 #ifndef FIL_RUNOUT_PIN
64 
-  #define FIL_RUNOUT_PIN                    PC2   // "E0-STOP"
64 
+  #define FIL_RUNOUT_PIN                    PC2   // E0-STOP
65 65 
 #endif
66 66
67 67 
 //

+ 6
- 6
Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h View File 

@@ -41,25 +41,25 @@
41 41 
 //
42 42 
 // Servos
43 43 
 //
44 
-#define SERVO0_PIN                          PA1   // "SERVOS"
44 
+#define SERVO0_PIN                          PA1   // SERVOS
45 45
46 46 
 //
47 47 
 // Limit Switches
48 48 
 //
49 
-#define X_STOP_PIN                          PC0   // "X-STOP"
50 
-#define Y_STOP_PIN                          PC1   // "Y-STOP"
51 
-#define Z_STOP_PIN                          PC2   // "Z-STOP"
49 
+#define X_STOP_PIN                          PC0   // X-STOP
50 
+#define Y_STOP_PIN                          PC1   // Y-STOP
51 
+#define Z_STOP_PIN                          PC2   // Z-STOP
52 52
53 53 
 //
54 54 
 // Z Probe must be this pin
55 55 
 //
56 
-#define Z_MIN_PROBE_PIN                     PC14  // "PROBE"
56 
+#define Z_MIN_PROBE_PIN                     PC14  // PROBE
57 57
58 58 
 //
59 59 
 // Filament Runout Sensor
60 60 
 //
61 61 
 #ifndef FIL_RUNOUT_PIN
62 
-  #define FIL_RUNOUT_PIN                    PC15  // "E0-STOP"
62 
+  #define FIL_RUNOUT_PIN                    PC15  // E0-STOP
63 63 
 #endif
64 64
65 65 
 //

+ 16
- 20
Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h View File 

@@ -117,11 +117,7 @@
117 117 
  * Several wiring options are provided below, defaulting to
118 118 
  * to the most compatible.
119 119 
  */
120 
-
121 
-//
122 
-// Drivers
123 
-//
124 
-#if HAS_TMC220x
120 
+#if HAS_TMC_UART
125 121 
   // SoftwareSerial with one pin per driver
126 122 
   // Compatible with TMC2208 and TMC2209 drivers
127 123 
   #define X_SERIAL_TX_PIN                   PA10  // RXD1
 
@@ -140,20 +136,20 @@
140 136 
     #define DEFAULT_PWM_MOTOR_CURRENT { 800, 800, 800 }
141 137 
   #endif
142 138
143 
-/**
144 
- * MKS Robin_Wifi or another ESP8266 module
145 
- *
146 
- *      __ESP(M1)__       -J1-
147 
- *  GND| 15 | | 08 |+3v3  (22)  RXD1      (PA10)
148 
- *     | 16 | | 07 |MOSI  (21)  TXD1      (PA9)   Active LOW, probably OK to leave floating
149 
- *  IO2| 17 | | 06 |MISO  (19)  IO1       (PC7)   Leave as unused (ESP3D software configures this with a pullup so OK to leave as floating)
150 
- *  IO0| 18 | | 05 |CLK   (18)  IO0       (PA8)   Must be HIGH (ESP3D software configures this with a pullup so OK to leave as floating)
151 
- *  IO1| 19 | | 03 |EN    (03)  WIFI_EN           Must be HIGH for module to run
152 
- *     | nc | | nc |      (01)  WIFI_CTRL (PA5)
153 
- *   RX| 21 | | nc |
154 
- *   TX| 22 | | 01 |RST
155 
- *       ￣￣ AE￣￣
156 
- */
139 
+  /**
140 
+   * MKS Robin_Wifi or another ESP8266 module
141 
+   *
142 
+   *      __ESP(M1)__       -J1-
143 
+   *  GND| 15 | | 08 |+3v3  (22)  RXD1      (PA10)
144 
+   *     | 16 | | 07 |MOSI  (21)  TXD1      (PA9)   Active LOW, probably OK to leave floating
145 
+   *  IO2| 17 | | 06 |MISO  (19)  IO1       (PC7)   Leave as unused (ESP3D software configures this with a pullup so OK to leave as floating)
146 
+   *  IO0| 18 | | 05 |CLK   (18)  IO0       (PA8)   Must be HIGH (ESP3D software configures this with a pullup so OK to leave as floating)
147 
+   *  IO1| 19 | | 03 |EN    (03)  WIFI_EN           Must be HIGH for module to run
148 
+   *     | nc | | nc |      (01)  WIFI_CTRL (PA5)
149 
+   *   RX| 21 | | nc |
150 
+   *   TX| 22 | | 01 |RST
151 
+   *       ￣￣ AE￣￣
152 
+   */
157 153 
   // Module ESP-WIFI
158 154 
   #define ESP_WIFI_MODULE_COM                  2  // Must also set either SERIAL_PORT or SERIAL_PORT_2 to this
159 155 
   #define ESP_WIFI_MODULE_BAUDRATE      BAUDRATE  // Must use same BAUDRATE as SERIAL_PORT & SERIAL_PORT_2
 
@@ -303,7 +299,7 @@
303 299 
     #define TFT_MARLINUI_COLOR            0xC7B6  // Green
304 300 
     #define TFT_BTARROWS_COLOR            0xDEE6  // Yellow
305 301 
     #define TFT_BTOKMENU_COLOR            0x145F  // Cyan
306 
-  #endif
302 
+  #endif
307 303 
   #define TFT_BUFFER_SIZE                  14400
308 304 
 #elif HAS_GRAPHICAL_TFT
309 305 
   #define TFT_RESET_PIN                     PC6

+ 1
- 1
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h View File 

@@ -82,7 +82,7 @@
82 82 
 #define E0_DIR_PIN                          PB3
83 83 
 #define E0_ENABLE_PIN                       PB5
84 84
85 
-#if HAS_TMC220x
85 
+#if HAS_TMC_UART
86 86 
   /**
87 87 
    * TMC2208/TMC2209 stepper drivers
88 88 
    *

Write Preview
Loading…
Cancel
Save