浏览代码

🎨 Clean up stops, sdss pins

Scott Lahteine 4 年前
父节点
当前提交
dc202b3cb3

+ 2
- 2
Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h 查看文件

37
 //
37
 //
38
 // Limit Switches
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
 #define Z_MIN_PIN                          P1_28
42
 #define Z_MIN_PIN                          P1_28
43
 #define Z_MAX_PIN                          P1_29
43
 #define Z_MAX_PIN                          P1_29
44
 
44
 

+ 2
- 4
Marlin/src/pins/lpc1768/pins_SELENA_COMPACT.h 查看文件

40
 //
40
 //
41
 #define X_MIN_PIN                          P1_28
41
 #define X_MIN_PIN                          P1_28
42
 #define X_MAX_PIN                          P1_25
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
 #ifndef Z_MIN_PROBE_PIN
45
 #ifndef Z_MIN_PROBE_PIN
48
   #define Z_MIN_PROBE_PIN                  P1_22
46
   #define Z_MIN_PROBE_PIN                  P1_22
49
 #endif
47
 #endif

+ 5
- 6
Marlin/src/pins/ramps/pins_3DRAG.h 查看文件

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

+ 4
- 4
Marlin/src/pins/ramps/pins_COPYMASTER_3D.h 查看文件

23
 
23
 
24
 #define BOARD_INFO_NAME "Copymaster 3D RAMPS"
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
 // Import RAMPS 1.4 pins
32
 // Import RAMPS 1.4 pins

+ 1
- 6
Marlin/src/pins/ramps/pins_K8600.h 查看文件

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

+ 3
- 1
Marlin/src/pins/ramps/pins_RAMPS.h 查看文件

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

+ 3
- 3
Marlin/src/pins/sam/pins_ADSK.h 查看文件

86
 //
86
 //
87
 // Limit Switches
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
 #define Z_MIN_PROBE_PIN                       62  // Analog pin 8, Digital pin 62
93
 #define Z_MIN_PROBE_PIN                       62  // Analog pin 8, Digital pin 62
94
 
94
 

+ 0
- 3
Marlin/src/pins/sam/pins_DUE3DOM.h 查看文件

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

+ 11
- 16
Marlin/src/pins/sam/pins_DUE3DOM_MINI.h 查看文件

40
 //
40
 //
41
 // Limit Switches
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
 // Steppers
48
 // Steppers
120
     #define BTN_EN2                           52
117
     #define BTN_EN2                           52
121
     #define BTN_ENC                           48
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
     #define SD_DETECT_PIN                     14
124
     #define SD_DETECT_PIN                     14
125
 
125
 
126
   #elif ENABLED(RADDS_DISPLAY)
126
   #elif ENABLED(RADDS_DISPLAY)
133
 
133
 
134
     #define BTN_BACK                          71
134
     #define BTN_BACK                          71
135
 
135
 
136
-    #undef SDSS
137
-    #define SDSS                               4
138
     #define SD_DETECT_PIN                     14
136
     #define SD_DETECT_PIN                     14
139
 
137
 
140
   #elif HAS_U8GLIB_I2C_OLED
138
   #elif HAS_U8GLIB_I2C_OLED
143
     #define BTN_EN2                           52
141
     #define BTN_EN2                           52
144
     #define BTN_ENC                           48
142
     #define BTN_ENC                           48
145
     #define BEEPER_PIN                        41
143
     #define BEEPER_PIN                        41
146
-    #define LCD_SDSS                           4
144
+    #define LCD_SDSS                        SDSS
147
     #define SD_DETECT_PIN                     14
145
     #define SD_DETECT_PIN                     14
148
 
146
 
149
   #elif ENABLED(SPARK_FULL_GRAPHICS)
147
   #elif ENABLED(SPARK_FULL_GRAPHICS)
158
 
156
 
159
     #define BEEPER_PIN                        -1
157
     #define BEEPER_PIN                        -1
160
 
158
 
161
-   #elif ENABLED(MINIPANEL)
159
+  #elif ENABLED(MINIPANEL)
160
+
162
     #define BTN_EN1                           52
161
     #define BTN_EN1                           52
163
     #define BTN_EN2                           50
162
     #define BTN_EN2                           50
164
     #define BTN_ENC                           48
163
     #define BTN_ENC                           48
165
-    #define LCD_SDSS                           4
164
+    #define LCD_SDSS                        SDSS
166
     #define SD_DETECT_PIN                     14
165
     #define SD_DETECT_PIN                     14
167
     #define BEEPER_PIN                        41
166
     #define BEEPER_PIN                        41
168
     #define DOGLCD_A0                         46
167
     #define DOGLCD_A0                         46
169
     #define DOGLCD_CS                         45
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
   #endif
170
   #endif
176
 
171
 
177
 #endif // HAS_WIRED_LCD
172
 #endif // HAS_WIRED_LCD

+ 3
- 3
Marlin/src/pins/sam/pins_PRINTRBOARD_G2.h 查看文件

40
 //
40
 //
41
 // Limit Switches
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
 // Z Probe (when not Z_MIN_PIN)
48
 // Z Probe (when not Z_MIN_PIN)

+ 19
- 21
Marlin/src/pins/samd/pins_RAMPS_144.h 查看文件

130
 //
130
 //
131
 // Misc. Functions
131
 // Misc. Functions
132
 //
132
 //
133
-#define SDSS                                  53
134
 #define LED_PIN                               13
133
 #define LED_PIN                               13
135
 
134
 
136
 #ifndef FILWIDTH_PIN
135
 #ifndef FILWIDTH_PIN
252
   #endif
251
   #endif
253
 #endif
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
 // LCDs and Controllers //
270
 // LCDs and Controllers //
257
 //////////////////////////
271
 //////////////////////////
356
       #else
370
       #else
357
         #define BTN_EN1                       31
371
         #define BTN_EN1                       31
358
         #define BTN_EN2                       33
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
       #endif
376
       #endif
360
 
377
 
361
       #define BTN_ENC                         35
378
       #define BTN_ENC                         35
365
       #define KILL_PIN                        41
382
       #define KILL_PIN                        41
366
 
383
 
367
       #if ENABLED(BQ_LCD_SMART_CONTROLLER)
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
       #endif
386
       #endif
371
 
387
 
372
     #elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
388
     #elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
563
     #endif
579
     #endif
564
   #endif // IS_NEWPANEL
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
 #endif // HAS_WIRED_LCD
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 查看文件

37
 //#define BOGUS_TEMPERATURE_GRACE_PERIOD    2000
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
 // Steppers
47
 // Steppers
41
 //
48
 //
42
 #define X_STEP_PIN                          PE0
49
 #define X_STEP_PIN                          PE0
43
 #define X_DIR_PIN                           PE1
50
 #define X_DIR_PIN                           PE1
44
 #define X_ENABLE_PIN                        PC0
51
 #define X_ENABLE_PIN                        PC0
45
-#define X_MIN_PIN                           PD5
46
-#define X_MAX_PIN                           -1
47
 
52
 
48
 #define Y_STEP_PIN                          PE2
53
 #define Y_STEP_PIN                          PE2
49
 #define Y_DIR_PIN                           PE3
54
 #define Y_DIR_PIN                           PE3
50
 #define Y_ENABLE_PIN                        PC1
55
 #define Y_ENABLE_PIN                        PC1
51
-#define Y_MIN_PIN                           PD6
52
-#define Y_MAX_PIN
53
 
56
 
54
 #define Z_STEP_PIN                          PE4
57
 #define Z_STEP_PIN                          PE4
55
 #define Z_DIR_PIN                           PE5
58
 #define Z_DIR_PIN                           PE5
56
 #define Z_ENABLE_PIN                        PC2
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
 #define E0_STEP_PIN                         PE6
61
 #define E0_STEP_PIN                         PE6
69
 #define E0_DIR_PIN                          PE7
62
 #define E0_DIR_PIN                          PE7
87
 #define SDSS                                PA15
80
 #define SDSS                                PA15
88
 #define LED_PIN                             PB2
81
 #define LED_PIN                             PB2
89
 
82
 
90
-#define PS_ON_PIN                           -1
91
-#define KILL_PIN                            -1
92
-
93
 //
83
 //
94
 // Heaters / Fans
84
 // Heaters / Fans
95
 //
85
 //
98
 #define HEATER_2_PIN                        PD14
88
 #define HEATER_2_PIN                        PD14
99
 
89
 
100
 #define HEATER_BED_PIN                      PB9   // BED
90
 #define HEATER_BED_PIN                      PB9   // BED
101
-#define HEATER_BED2_PIN                     -1    // BED2
102
-#define HEATER_BED3_PIN                     -1    // BED3
103
 
91
 
104
 #ifndef FAN_PIN
92
 #ifndef FAN_PIN
105
   #define FAN_PIN                           PB10
93
   #define FAN_PIN                           PB10

+ 7
- 24
Marlin/src/pins/stm32f1/pins_CHITU3D.h 查看文件

39
 //#define BOGUS_TEMPERATURE_GRACE_PERIOD    2000
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
 // Steppers
49
 // Steppers
43
 //
50
 //
44
 #define X_STEP_PIN                          PE5
51
 #define X_STEP_PIN                          PE5
45
 #define X_DIR_PIN                           PE6
52
 #define X_DIR_PIN                           PE6
46
 #define X_ENABLE_PIN                        PC13
53
 #define X_ENABLE_PIN                        PC13
47
-#define X_MIN_PIN                           PG10
48
-#define X_MAX_PIN                           -1
49
 
54
 
50
 #define Y_STEP_PIN                          PE2
55
 #define Y_STEP_PIN                          PE2
51
 #define Y_DIR_PIN                           PE3
56
 #define Y_DIR_PIN                           PE3
52
 #define Y_ENABLE_PIN                        PE4
57
 #define Y_ENABLE_PIN                        PE4
53
-#define Y_MIN_PIN                           PA12
54
-#define Y_MAX_PIN
55
 
58
 
56
 #define Z_STEP_PIN                          PB9
59
 #define Z_STEP_PIN                          PB9
57
 #define Z_DIR_PIN                           PE0
60
 #define Z_DIR_PIN                           PE0
58
 #define Z_ENABLE_PIN                        PE1
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
 #define E0_STEP_PIN                         PB4
63
 #define E0_STEP_PIN                         PB4
71
 #define E0_DIR_PIN                          PB5
64
 #define E0_DIR_PIN                          PB5
72
 #define E0_ENABLE_PIN                       PB8
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
 // Misc. Functions
68
 // Misc. Functions
84
 //
69
 //
114
 //
99
 //
115
 #define TEMP_BED_PIN                        PA0   // Analog Input
100
 #define TEMP_BED_PIN                        PA0   // Analog Input
116
 #define TEMP_0_PIN                          PA1   // Analog Input
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
 // LCD Pins
104
 // LCD Pins

+ 4
- 4
Marlin/src/pins/stm32f1/pins_MALYAN_M200.h 查看文件

41
   #define FLASH_EEPROM_EMULATION
41
   #define FLASH_EEPROM_EMULATION
42
 #endif
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
 // Based on PWM timer usage, we have to use these timers and soft PWM for the fans
46
 // Based on PWM timer usage, we have to use these timers and soft PWM for the fans
47
 // On STM32F103:
47
 // On STM32F103:
53
 //
53
 //
54
 // Limit Switches
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
 // Steppers
61
 // Steppers

+ 3
- 3
Marlin/src/pins/stm32f1/pins_MORPHEUS.h 查看文件

39
 //
39
 //
40
 // Limit Switches
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
 // Z Probe (when not Z_MIN_PIN)
47
 // Z Probe (when not Z_MIN_PIN)

+ 1
- 1
Marlin/src/pins/stm32f1/pins_STM3R_MINI.h 查看文件

24
 #include "env_validate.h"
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
 #define BOARD_INFO_NAME      "STM3R Mini"
30
 #define BOARD_INFO_NAME      "STM3R Mini"

+ 4
- 2
Marlin/src/pins/stm32f4/pins_STEVAL_3DP001V1.h 查看文件

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

+ 5
- 3
Marlin/src/pins/teensy2/pins_PRINTRBOARD.h 查看文件

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

正在加载...
取消
保存