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

🎨 Clean up stops, sdss pins

Scott Lahteine 3 years ago
parent
08155b4875
commit
dc202b3cb3
18 changed files with 84 additions and 125 deletions
Split View Show Diff Stats
  1. 2
    2
      Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h
  2. 2
    4
      Marlin/src/pins/lpc1768/pins_SELENA_COMPACT.h
  3. 5
    6
      Marlin/src/pins/ramps/pins_3DRAG.h
  4. 4
    4
      Marlin/src/pins/ramps/pins_COPYMASTER_3D.h
  5. 1
    6
      Marlin/src/pins/ramps/pins_K8600.h
  6. 3
    1
      Marlin/src/pins/ramps/pins_RAMPS.h
  7. 3
    3
      Marlin/src/pins/sam/pins_ADSK.h
  8. 0
    3
      Marlin/src/pins/sam/pins_DUE3DOM.h
  9. 11
    16
      Marlin/src/pins/sam/pins_DUE3DOM_MINI.h
  10. 3
    3
      Marlin/src/pins/sam/pins_PRINTRBOARD_G2.h
  11. 19
    21
      Marlin/src/pins/samd/pins_RAMPS_144.h
  12. 7
    19
      Marlin/src/pins/stm32f1/pins_BEAST.h
  13. 7
    24
      Marlin/src/pins/stm32f1/pins_CHITU3D.h
  14. 4
    4
      Marlin/src/pins/stm32f1/pins_MALYAN_M200.h
  15. 3
    3
      Marlin/src/pins/stm32f1/pins_MORPHEUS.h
  16. 1
    1
      Marlin/src/pins/stm32f1/pins_STM3R_MINI.h
  17. 4
    2
      Marlin/src/pins/stm32f4/pins_STEVAL_3DP001V1.h
  18. 5
    3
      Marlin/src/pins/teensy2/pins_PRINTRBOARD.h

+ 2
- 2
Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h View File 

@@ -37,8 +37,8 @@
37 37 
 //
38 38 
 // Limit Switches
39 39 
 //
40 
-#define X_MIN_PIN                          P1_24
41 
-#define Y_MIN_PIN                          P1_26
40 
+#define X_STOP_PIN                         P1_24
41 
+#define Y_STOP_PIN                         P1_26
42 42 
 #define Z_MIN_PIN                          P1_28
43 43 
 #define Z_MAX_PIN                          P1_29
44 44

+ 2
- 4
Marlin/src/pins/lpc1768/pins_SELENA_COMPACT.h View File 

@@ -40,10 +40,8 @@
40 40 
 //
41 41 
 #define X_MIN_PIN                          P1_28
42 42 
 #define X_MAX_PIN                          P1_25
43 
-#define Y_MIN_PIN                          P2_11
44 
-#define Y_MAX_PIN                          -1
45 
-#define Z_MIN_PIN                          P1_27
46 
-#define Z_MAX_PIN                          -1
43 
+#define Y_STOP_PIN                         P2_11
44 
+#define Z_STOP_PIN                         P1_27
47 45 
 #ifndef Z_MIN_PROBE_PIN
48 46 
   #define Z_MIN_PROBE_PIN                  P1_22
49 47 
 #endif

+ 5
- 6
Marlin/src/pins/ramps/pins_3DRAG.h View File 

@@ -44,6 +44,11 @@
44 44 
 #define RAMPS_D9_PIN                           8
45 45 
 #define MOSFET_D_PIN                          12
46 46
47 
+//
48 
+// Misc. Functions
49 
+//
50 
+#define SDSS                                  25
51 
+
47 52 
 #ifndef CASE_LIGHT_PIN
48 53 
   #define CASE_LIGHT_PIN                      -1  // Hardware PWM but one is not available on expansion header
49 54 
 #endif
 
@@ -66,12 +71,6 @@
66 71 
 //
67 72 
 #define HEATER_2_PIN                           6
68 73
69 
-//
70 
-// Misc. Functions
71 
-//
72 
-#undef SDSS
73 
-#define SDSS                                  25
74 
-
75 74 
 #undef SD_DETECT_PIN
76 75 
 #define SD_DETECT_PIN                         53
77 76

+ 4
- 4
Marlin/src/pins/ramps/pins_COPYMASTER_3D.h View File 

@@ -23,10 +23,10 @@
23 23
24 24 
 #define BOARD_INFO_NAME "Copymaster 3D RAMPS"
25 25
26 
-#define Z_STEP_PIN        47
27 
-#define Y_MAX_PIN         14
28 
-#define FIL_RUNOUT_PIN    15
29 
-#define SD_DETECT_PIN     66
26 
+#define Z_STEP_PIN                            47
27 
+#define Y_MAX_PIN                             14
28 
+#define FIL_RUNOUT_PIN                        15
29 
+#define SD_DETECT_PIN                         66
30 30
31 31 
 //
32 32 
 // Import RAMPS 1.4 pins

+ 1
- 6
Marlin/src/pins/ramps/pins_K8600.h View File 

@@ -47,6 +47,7 @@
47 47 
 //
48 48 
 // Misc. Functions
49 49 
 //
50 
+#define SDSS                                  25
50 51 
 #define CASE_LIGHT_PIN                         7
51 52
52 53 
 //
 
@@ -88,12 +89,6 @@
88 89 
 #undef HEATER_BED_PIN
89 90
90 91 
 //
91 
-// Misc. Functions
92 
-//
93 
-#undef SDSS
94 
-#define SDSS                                  25  // 53
95 
-
96 
-//
97 92 
 // LCD / Controller
98 93 
 //
99 94 
 #if IS_ULTRA_LCD && IS_NEWPANEL

+ 3
- 1
Marlin/src/pins/ramps/pins_RAMPS.h View File 

@@ -241,7 +241,9 @@
241 241 
 //
242 242 
 // Misc. Functions
243 243 
 //
244 
-#define SDSS                         EXP2_07_PIN
244 
+#ifndef SDSS
245 
+  #define SDSS                       EXP2_07_PIN
246 
+#endif
245 247 
 #define LED_PIN                               13
246 248
247 249 
 #ifndef FILWIDTH_PIN

+ 3
- 3
Marlin/src/pins/sam/pins_ADSK.h View File 

@@ -86,9 +86,9 @@ A stepper for E0 extruder
86 86 
 //
87 87 
 // Limit Switches
88 88 
 //
89 
-#define X_MIN_PIN                              9
90 
-#define Y_MIN_PIN                             10
91 
-#define Z_MIN_PIN                             11
89 
+#define X_STOP_PIN                             9
90 
+#define Y_STOP_PIN                            10
91 
+#define Z_STOP_PIN                            11
92 92
93 93 
 #define Z_MIN_PROBE_PIN                       62  // Analog pin 8, Digital pin 62
94 94

+ 0
- 3
Marlin/src/pins/sam/pins_DUE3DOM.h View File 

@@ -128,7 +128,6 @@
128 128 
     #define BTN_EN2                           52
129 129 
     #define BTN_ENC                           48
130 130
131 
-    #define SDSS                               4
132 131 
     #define SD_DETECT_PIN                     14
133 132
134 133 
   #elif ENABLED(RADDS_DISPLAY)
 
@@ -141,8 +140,6 @@
141 140
142 141 
     #define BTN_BACK                          71
143 142
144 
-    #undef SDSS
145 
-    #define SDSS                               4
146 143 
     #define SD_DETECT_PIN                     14
147 144
148 145 
   #elif HAS_U8GLIB_I2C_OLED

+ 11
- 16
Marlin/src/pins/sam/pins_DUE3DOM_MINI.h View File 

@@ -40,12 +40,9 @@
40 40 
 //
41 41 
 // Limit Switches
42 42 
 //
43 
-#define X_MIN_PIN                             38
44 
-#define X_MAX_PIN                             -1
45 
-#define Y_MIN_PIN                             34
46 
-#define Y_MAX_PIN                             -1
47 
-#define Z_MIN_PIN                             30
48 
-#define Z_MAX_PIN                             -1
43 
+#define X_STOP_PIN                            38
44 
+#define Y_STOP_PIN                            34
45 
+#define Z_STOP_PIN                            30
49 46
50 47 
 //
51 48 
 // Steppers
 
@@ -120,7 +117,10 @@
120 117 
     #define BTN_EN2                           52
121 118 
     #define BTN_ENC                           48
122 119
123 
-    #define SDSS                               4
120 
+    #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
121 
+      #define BTN_ENC_EN             LCD_PINS_D7  // Detect the presence of the encoder
122 
+    #endif
123 
+
124 124 
     #define SD_DETECT_PIN                     14
125 125
126 126 
   #elif ENABLED(RADDS_DISPLAY)
 
@@ -133,8 +133,6 @@
133 133
134 134 
     #define BTN_BACK                          71
135 135
136 
-    #undef SDSS
137 
-    #define SDSS                               4
138 136 
     #define SD_DETECT_PIN                     14
139 137
140 138 
   #elif HAS_U8GLIB_I2C_OLED
 
@@ -143,7 +141,7 @@
143 141 
     #define BTN_EN2                           52
144 142 
     #define BTN_ENC                           48
145 143 
     #define BEEPER_PIN                        41
146 
-    #define LCD_SDSS                           4
144 
+    #define LCD_SDSS                        SDSS
147 145 
     #define SD_DETECT_PIN                     14
148 146
149 147 
   #elif ENABLED(SPARK_FULL_GRAPHICS)
 
@@ -158,20 +156,17 @@
158 156
159 157 
     #define BEEPER_PIN                        -1
160 158
161 
-   #elif ENABLED(MINIPANEL)
159 
+  #elif ENABLED(MINIPANEL)
160 
+
162 161 
     #define BTN_EN1                           52
163 162 
     #define BTN_EN2                           50
164 163 
     #define BTN_ENC                           48
165 
-    #define LCD_SDSS                           4
164 
+    #define LCD_SDSS                        SDSS
166 165 
     #define SD_DETECT_PIN                     14
167 166 
     #define BEEPER_PIN                        41
168 167 
     #define DOGLCD_A0                         46
169 168 
     #define DOGLCD_CS                         45
170 169
171 
-  #endif // SPARK_FULL_GRAPHICS
172 
-
173 
-  #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
174 
-    #define BTN_ENC_EN               LCD_PINS_D7  // Detect the presence of the encoder
175 170 
   #endif
176 171
177 172 
 #endif // HAS_WIRED_LCD

+ 3
- 3
Marlin/src/pins/sam/pins_PRINTRBOARD_G2.h View File 

@@ -40,9 +40,9 @@
40 40 
 //
41 41 
 // Limit Switches
42 42 
 //
43 
-#define X_MIN_PIN                             22  // PB26
44 
-#define Y_MAX_PIN                             18  // PA11
45 
-#define Z_MIN_PIN                             19  // PA10
43 
+#define X_STOP_PIN                            22  // PB26
44 
+#define Y_STOP_PIN                            18  // PA11
45 
+#define Z_STOP_PIN                            19  // PA10
46 46
47 47 
 //
48 48 
 // Z Probe (when not Z_MIN_PIN)

+ 19
- 21
Marlin/src/pins/samd/pins_RAMPS_144.h View File 

@@ -130,7 +130,6 @@
130 130 
 //
131 131 
 // Misc. Functions
132 132 
 //
133 
-#define SDSS                                  53
134 133 
 #define LED_PIN                               13
135 134
136 135 
 #ifndef FILWIDTH_PIN
 
@@ -252,6 +251,21 @@
252 251 
   #endif
253 252 
 #endif
254 253
254 
+//
255 
+// SD Support
256 
+//
257 
+#ifndef SDCARD_CONNECTION
258 
+  #define SDCARD_CONNECTION              ONBOARD
259 
+#endif
260 
+
261 
+#if SD_CONNECTION_IS(ONBOARD)
262 
+  #define SDSS                                83
263 
+  #undef SD_DETECT_PIN
264 
+  #define SD_DETECT_PIN                       95
265 
+#else
266 
+  #define SDSS                                53
267 
+#endif
268 
+
255 269 
 //////////////////////////
256 270 
 // LCDs and Controllers //
257 271 
 //////////////////////////
 
@@ -356,6 +370,9 @@
356 370 
       #else
357 371 
         #define BTN_EN1                       31
358 372 
         #define BTN_EN2                       33
373 
+        #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
374 
+          #define BTN_ENC_EN         LCD_PINS_D7  // Detect the presence of the encoder
375 
+        #endif
359 376 
       #endif
360 377
361 378 
       #define BTN_ENC                         35
 
@@ -365,8 +382,7 @@
365 382 
       #define KILL_PIN                        41
366 383
367 384 
       #if ENABLED(BQ_LCD_SMART_CONTROLLER)
368 
-        // TO TEST
369 
-        //#define LCD_BACKLIGHT_PIN           39
385 
+        //#define LCD_BACKLIGHT_PIN           39  // TO TEST
370 386 
       #endif
371 387
372 388 
     #elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
 
@@ -563,22 +579,4 @@
563 579 
     #endif
564 580 
   #endif // IS_NEWPANEL
565 581
566 
-  #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
567 
-    #define BTN_ENC_EN               LCD_PINS_D7  // Detect the presence of the encoder
568 
-  #endif
569 
-
570 582 
 #endif // HAS_WIRED_LCD
571 
-
572 
-//
573 
-// SD Support
574 
-//
575 
-#ifndef SDCARD_CONNECTION
576 
-  #define SDCARD_CONNECTION              ONBOARD
577 
-#endif
578 
-
579 
-#if SD_CONNECTION_IS(ONBOARD)
580 
-  #undef SDSS
581 
-  #define SDSS                                83
582 
-  #undef SD_DETECT_PIN
583 
-  #define SD_DETECT_PIN                       95
584 
-#endif

+ 7
- 19
Marlin/src/pins/stm32f1/pins_BEAST.h View File 

@@ -37,33 +37,26 @@
37 37 
 //#define BOGUS_TEMPERATURE_GRACE_PERIOD    2000
38 38
39 39 
 //
40 
+// Limit Switches
41 
+//
42 
+#define X_STOP_PIN                          PD5
43 
+#define Y_STOP_PIN                          PD6
44 
+#define Z_STOP_PIN                          PD7
45 
+
46 
+//
40 47 
 // Steppers
41 48 
 //
42 49 
 #define X_STEP_PIN                          PE0
43 50 
 #define X_DIR_PIN                           PE1
44 51 
 #define X_ENABLE_PIN                        PC0
45 
-#define X_MIN_PIN                           PD5
46 
-#define X_MAX_PIN                           -1
47 52
48 53 
 #define Y_STEP_PIN                          PE2
49 54 
 #define Y_DIR_PIN                           PE3
50 55 
 #define Y_ENABLE_PIN                        PC1
51 
-#define Y_MIN_PIN                           PD6
52 
-#define Y_MAX_PIN
53 56
54 57 
 #define Z_STEP_PIN                          PE4
55 58 
 #define Z_DIR_PIN                           PE5
56 59 
 #define Z_ENABLE_PIN                        PC2
57 
-#define Z_MIN_PIN                           PD7
58 
-#define Z_MAX_PIN                           -1
59 
-
60 
-#define Y2_STEP_PIN                         -1
61 
-#define Y2_DIR_PIN                          -1
62 
-#define Y2_ENABLE_PIN                       -1
63 
-
64 
-#define Z2_STEP_PIN                         -1
65 
-#define Z2_DIR_PIN                          -1
66 
-#define Z2_ENABLE_PIN                       -1
67 60
68 61 
 #define E0_STEP_PIN                         PE6
69 62 
 #define E0_DIR_PIN                          PE7
 
@@ -87,9 +80,6 @@
87 80 
 #define SDSS                                PA15
88 81 
 #define LED_PIN                             PB2
89 82
90 
-#define PS_ON_PIN                           -1
91 
-#define KILL_PIN                            -1
92 
-
93 83 
 //
94 84 
 // Heaters / Fans
95 85 
 //
 
@@ -98,8 +88,6 @@
98 88 
 #define HEATER_2_PIN                        PD14
99 89
100 90 
 #define HEATER_BED_PIN                      PB9   // BED
101 
-#define HEATER_BED2_PIN                     -1    // BED2
102 
-#define HEATER_BED3_PIN                     -1    // BED3
103 91
104 92 
 #ifndef FAN_PIN
105 93 
   #define FAN_PIN                           PB10

+ 7
- 24
Marlin/src/pins/stm32f1/pins_CHITU3D.h View File 

@@ -39,46 +39,31 @@
39 39 
 //#define BOGUS_TEMPERATURE_GRACE_PERIOD    2000
40 40
41 41 
 //
42 
+// Limit Switches
43 
+//
44 
+#define X_STOP_PIN                          PG10
45 
+#define Y_STOP_PIN                          PA12
46 
+#define Z_STOP_PIN                          PA14
47 
+
48 
+//
42 49 
 // Steppers
43 50 
 //
44 51 
 #define X_STEP_PIN                          PE5
45 52 
 #define X_DIR_PIN                           PE6
46 53 
 #define X_ENABLE_PIN                        PC13
47 
-#define X_MIN_PIN                           PG10
48 
-#define X_MAX_PIN                           -1
49 54
50 55 
 #define Y_STEP_PIN                          PE2
51 56 
 #define Y_DIR_PIN                           PE3
52 57 
 #define Y_ENABLE_PIN                        PE4
53 
-#define Y_MIN_PIN                           PA12
54 
-#define Y_MAX_PIN
55 58
56 59 
 #define Z_STEP_PIN                          PB9
57 60 
 #define Z_DIR_PIN                           PE0
58 61 
 #define Z_ENABLE_PIN                        PE1
59 
-#define Z_MIN_PIN                           PA14
60 
-#define Z_MAX_PIN                           -1
61 
-
62 
-#define Y2_STEP_PIN                         -1
63 
-#define Y2_DIR_PIN                          -1
64 
-#define Y2_ENABLE_PIN                       -1
65 
-
66 
-#define Z2_STEP_PIN                         -1
67 
-#define Z2_DIR_PIN                          -1
68 
-#define Z2_ENABLE_PIN                       -1
69 62
70 63 
 #define E0_STEP_PIN                         PB4
71 64 
 #define E0_DIR_PIN                          PB5
72 65 
 #define E0_ENABLE_PIN                       PB8
73 66
74 
-#define E1_STEP_PIN                         -1
75 
-#define E1_DIR_PIN                          -1
76 
-#define E1_ENABLE_PIN                       -1
77 
-
78 
-#define E2_STEP_PIN                         -1
79 
-#define E2_DIR_PIN                          -1
80 
-#define E2_ENABLE_PIN                       -1
81 
-
82 67 
 //
83 68 
 // Misc. Functions
84 69 
 //
 
@@ -114,8 +99,6 @@
114 99 
 //
115 100 
 #define TEMP_BED_PIN                        PA0   // Analog Input
116 101 
 #define TEMP_0_PIN                          PA1   // Analog Input
117 
-#define TEMP_1_PIN                          -1    // Analog Input
118 
-#define TEMP_2_PIN                          -1    // Analog Input
119 102
120 103 
 //
121 104 
 // LCD Pins

+ 4
- 4
Marlin/src/pins/stm32f1/pins_MALYAN_M200.h View File 

@@ -41,7 +41,7 @@
41 41 
   #define FLASH_EEPROM_EMULATION
42 42 
 #endif
43 43
44 
-#define SDSS                           SD_SS_PIN
44 
+#define SDSS                           SD_SS_PIN  // Also in HAL/STM32F1/spi_pins.h
45 45
46 46 
 // Based on PWM timer usage, we have to use these timers and soft PWM for the fans
47 47 
 // On STM32F103:
 
@@ -53,9 +53,9 @@
53 53 
 //
54 54 
 // Limit Switches
55 55 
 //
56 
-#define X_MIN_PIN                           PB4
57 
-#define Y_MIN_PIN                           PA15
58 
-#define Z_MIN_PIN                           PB5
56 
+#define X_STOP_PIN                          PB4
57 
+#define Y_STOP_PIN                          PA15
58 
+#define Z_STOP_PIN                          PB5
59 59
60 60 
 //
61 61 
 // Steppers

+ 3
- 3
Marlin/src/pins/stm32f1/pins_MORPHEUS.h View File 

@@ -39,9 +39,9 @@
39 39 
 //
40 40 
 // Limit Switches
41 41 
 //
42 
-#define X_MIN_PIN                           PB14
43 
-#define Y_MIN_PIN                           PB13
44 
-#define Z_MIN_PIN                           PB12
42 
+#define X_STOP_PIN                          PB14
43 
+#define Y_STOP_PIN                          PB13
44 
+#define Z_STOP_PIN                          PB12
45 45
46 46 
 //
47 47 
 // Z Probe (when not Z_MIN_PIN)

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

@@ -24,7 +24,7 @@
24 24 
 #include "env_validate.h"
25 25
26 26 
 /**
27 
- * 21017 Victor Perez Marlin for stm32f1 test
27 
+ * 10 Dec 2017 Victor Perez Marlin for stm32f1 test
28 28 
  */
29 29
30 30 
 #define BOARD_INFO_NAME      "STM3R Mini"

+ 4
- 2
Marlin/src/pins/stm32f4/pins_STEVAL_3DP001V1.h View File 

@@ -173,7 +173,6 @@
173 173 
 //
174 174 
 // Misc functions
175 175 
 //
176 
-#define SDSS                                  16  // PA4    SPI_CS
177 176 
 #define LED_PIN                               -1  // 9 // PE1 green LED   Heart beat
178 177 
 #define PS_ON_PIN                             -1
179 178 
 #define KILL_PIN                              -1
 
@@ -245,7 +244,6 @@
245 244
246 245 
   #ifndef SDIO_SUPPORT
247 246 
     #define SOFTWARE_SPI                          // Use soft SPI for onboard SD
248 
-    #undef SDSS
249 247 
     #define SDSS                     SDIO_D3_PIN
250 248 
     #define SD_SCK_PIN               SDIO_CK_PIN
251 249 
     #define SD_MISO_PIN              SDIO_D0_PIN
 
@@ -253,6 +251,10 @@
253 251 
   #endif
254 252 
 #endif
255 253
254 
+#ifndef SDSS
255 
+  #define SDSS                                16  // PA4    SPI_CS
256 
+#endif
257 
+
256 258 
 // OTG
257 259 
 // 30   // PA11  OTG_DM
258 260 
 // 31   // PA12  OTG_DP

+ 5
- 3
Marlin/src/pins/teensy2/pins_PRINTRBOARD.h View File 

@@ -116,7 +116,6 @@
116 116 
 //
117 117 
 // Misc. Functions
118 118 
 //
119 
-#define SDSS                                  26  // B6 SDCS
120 119 
 #define FILWIDTH_PIN                           2  // Analog Input
121 120
122 121 
 //
 
@@ -142,7 +141,6 @@
142 141 
     #define BTN_EN2                            3  // D3 RX1   JP2-7
143 142 
     #define BTN_ENC                           45  // F7 TDI   JP2-12
144 143
145 
-    #undef SDSS
146 144 
     #define SDSS                              43  // F5 TMS   JP2-8
147 145
148 146 
     #define STAT_LED_RED_PIN                  12  // C2    JP11-14
 
@@ -153,7 +151,7 @@
153 151 
     #define BTN_EN1                            3  // D3 RX1   JP2-7
154 152 
     #define BTN_EN2                            2  // D2 TX1   JP2-5
155 153 
     #define BTN_ENC                           41  // F3       JP2-4
156 
-    #undef SDSS
154 
+
157 155 
     #define SDSS                              38  // F0       B-THERM connector - use SD card on Panelolu2
158 156
159 157 
   #else
 
@@ -165,3 +163,7 @@
165 163 
   #endif
166 164
167 165 
 #endif // IS_ULTRA_LCD && IS_NEWPANEL
166 
+
167 
+#ifndef SDSS
168 
+  #define SDSS                                26  // B6 SDCS
169 
+#endif

Write Preview
Loading…
Cancel
Save