Kaynağa Gözat

Pins, comment cleanup

Scott Lahteine 4 yıl önce
ebeveyn
işleme
d6a56b882f

+ 1
- 0
Marlin/src/inc/Conditionals_LCD.h Dosyayı Görüntüle

833
 #else
833
 #else
834
   // Clear probe pin settings when no probe is selected
834
   // Clear probe pin settings when no probe is selected
835
   #undef Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
835
   #undef Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
836
+  #undef USE_PROBE_FOR_Z_HOMING
836
 #endif
837
 #endif
837
 
838
 
838
 #if Z_HOME_DIR > 0
839
 #if Z_HOME_DIR > 0

+ 4
- 0
Marlin/src/inc/Conditionals_adv.h Dosyayı Görüntüle

382
   #define POLL_JOG
382
   #define POLL_JOG
383
 #endif
383
 #endif
384
 
384
 
385
+#ifndef HOMING_BUMP_MM
386
+  #define HOMING_BUMP_MM { 0, 0, 0 }
387
+#endif
388
+
385
 /**
389
 /**
386
  * Driver Timings (in nanoseconds)
390
  * Driver Timings (in nanoseconds)
387
  * NOTE: Driver timing order is longest-to-shortest duration.
391
  * NOTE: Driver timing order is longest-to-shortest duration.

+ 1
- 1
Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h Dosyayı Görüntüle

189
 
189
 
190
   // Reduce baud rate to improve software serial reliability
190
   // Reduce baud rate to improve software serial reliability
191
   #define TMC_BAUD_RATE                    19200
191
   #define TMC_BAUD_RATE                    19200
192
-#endif // TMC2208 || TMC2209
192
+#endif // HAS_TMC_UART
193
 
193
 
194
 //
194
 //
195
 // Temperature Sensors
195
 // Temperature Sensors

+ 6
- 4
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h Dosyayı Görüntüle

40
 //
40
 //
41
 // Release PB4 (Y_ENABLE_PIN) from JTAG NRST role
41
 // Release PB4 (Y_ENABLE_PIN) from JTAG NRST role
42
 //
42
 //
43
-
44
 #define DISABLE_DEBUG
43
 #define DISABLE_DEBUG
45
 
44
 
46
 //
45
 //
60
 #define SPI_DEVICE                             2
59
 #define SPI_DEVICE                             2
61
 
60
 
62
 //
61
 //
62
+// Servos
63
+//
64
+#define SERVO0_PIN                          PA8   // Enable BLTOUCH
65
+
66
+//
63
 // Limit Switches
67
 // Limit Switches
64
 //
68
 //
65
 #define X_DIAG_PIN                          PA15
69
 #define X_DIAG_PIN                          PA15
155
 
159
 
156
   // Reduce baud rate to improve software serial reliability
160
   // Reduce baud rate to improve software serial reliability
157
   #define TMC_BAUD_RATE                    19200
161
   #define TMC_BAUD_RATE                    19200
158
-#endif // TMC2208 || TMC2209
162
+#endif // HAS_TMC_UART
159
 
163
 
160
 //
164
 //
161
 // Temperature Sensors
165
 // Temperature Sensors
200
   #define FIL_RUNOUT_PIN                    PA4
204
   #define FIL_RUNOUT_PIN                    PA4
201
 #endif
205
 #endif
202
 
206
 
203
-#define SERVO0_PIN                          PA8   // Enable BLTOUCH
204
-
205
 //#define LED_PIN                           PB2
207
 //#define LED_PIN                           PB2
206
 
208
 
207
 //
209
 //

+ 5
- 2
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h Dosyayı Görüntüle

57
 #define SPI_DEVICE                             2
57
 #define SPI_DEVICE                             2
58
 
58
 
59
 //
59
 //
60
+// Servos
61
+//
62
+#define SERVO0_PIN                          PA8   // Enable BLTOUCH
63
+
64
+//
60
 // Limit Switches
65
 // Limit Switches
61
 //
66
 //
62
 #define X_STOP_PIN                          PA15
67
 #define X_STOP_PIN                          PA15
148
   #define FIL_RUNOUT2_PIN                   PE6
153
   #define FIL_RUNOUT2_PIN                   PE6
149
 #endif
154
 #endif
150
 
155
 
151
-#define SERVO0_PIN                          PA8   // Enable BLTOUCH support
152
-
153
 //#define LED_PIN                           PB2
156
 //#define LED_PIN                           PB2
154
 
157
 
155
 //
158
 //

+ 6
- 4
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h Dosyayı Görüntüle

43
 //
43
 //
44
 // Release PB4 (Y_ENABLE_PIN) from JTAG NRST role
44
 // Release PB4 (Y_ENABLE_PIN) from JTAG NRST role
45
 //
45
 //
46
-
47
 #define DISABLE_DEBUG
46
 #define DISABLE_DEBUG
48
 
47
 
49
 //
48
 //
63
 #define SPI_DEVICE                             2
62
 #define SPI_DEVICE                             2
64
 
63
 
65
 //
64
 //
65
+// Servos
66
+//
67
+#define SERVO0_PIN                          PA8   // Enable BLTOUCH
68
+
69
+//
66
 // Limit Switches
70
 // Limit Switches
67
 //
71
 //
68
 #define X_DIAG_PIN                          PA15
72
 #define X_DIAG_PIN                          PA15
163
 
167
 
164
   // Reduce baud rate to improve software serial reliability
168
   // Reduce baud rate to improve software serial reliability
165
   #define TMC_BAUD_RATE                    19200
169
   #define TMC_BAUD_RATE                    19200
166
-#endif // TMC2208 || TMC2209
170
+#endif // HAS_TMC_UART
167
 
171
 
168
 //
172
 //
169
 // Temperature Sensors
173
 // Temperature Sensors
218
   #define FIL_RUNOUT2_PIN                   PE6
222
   #define FIL_RUNOUT2_PIN                   PE6
219
 #endif
223
 #endif
220
 
224
 
221
-#define SERVO0_PIN                          PA8   // Enable BLTOUCH
222
-
223
 //#define LED_PIN                           PB2
225
 //#define LED_PIN                           PB2
224
 
226
 
225
 //
227
 //

+ 1
- 1
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h Dosyayı Görüntüle

48
 //
48
 //
49
 // Servos
49
 // Servos
50
 //
50
 //
51
-#define SERVO0_PIN                          PA8   // BLTOUCH
51
+#define SERVO0_PIN                          PA8   // Enable BLTOUCH
52
 
52
 
53
 //
53
 //
54
 // Limit Switches
54
 // Limit Switches

+ 17
- 10
Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h Dosyayı Görüntüle

31
 
31
 
32
 #define BOARD_INFO_NAME "MKS Robin Nano V3"
32
 #define BOARD_INFO_NAME "MKS Robin Nano V3"
33
 
33
 
34
+// USB Flash Drive support
35
+#define HAS_OTG_USB_HOST_SUPPORT
36
+
34
 // Avoid conflict with TIMER_TONE
37
 // Avoid conflict with TIMER_TONE
35
-#define STEP_TIMER 10
38
+#define STEP_TIMER                            10
36
 
39
 
37
 // Use one of these or SDCard-based Emulation will be used
40
 // Use one of these or SDCard-based Emulation will be used
38
 //#define SRAM_EEPROM_EMULATION                   // Use BackSRAM-based EEPROM emulation
41
 //#define SRAM_EEPROM_EMULATION                   // Use BackSRAM-based EEPROM emulation
42
 //
45
 //
43
 // Release PB4 (Z_DIR_PIN) from JTAG NRST role
46
 // Release PB4 (Z_DIR_PIN) from JTAG NRST role
44
 //
47
 //
48
+//#define DISABLE_DEBUG
49
+
50
+//
51
+// Servos
52
+//
53
+#define SERVO0_PIN                          PA8   // Enable BLTOUCH
45
 
54
 
46
 //
55
 //
47
 // Limit Switches
56
 // Limit Switches
98
 
107
 
99
 //
108
 //
100
 // Software SPI pins for TMC2130 stepper drivers
109
 // Software SPI pins for TMC2130 stepper drivers
110
+// This board only supports SW SPI for stepper drivers
101
 //
111
 //
102
-// This board only support SW SPI for stepper drivers
103
 #if HAS_TMC_SPI
112
 #if HAS_TMC_SPI
104
   #define TMC_USE_SW_SPI
113
   #define TMC_USE_SW_SPI
105
 #endif
114
 #endif
179
 
188
 
180
 #define POWER_LOSS_PIN                    PW_DET
189
 #define POWER_LOSS_PIN                    PW_DET
181
 #define PS_ON_PIN                         PW_OFF
190
 #define PS_ON_PIN                         PW_OFF
191
+
182
 //
192
 //
183
 // Enable MKSPWC support
193
 // Enable MKSPWC support
184
 //
194
 //
186
 //#define KILL_PIN                          PA2
196
 //#define KILL_PIN                          PA2
187
 //#define KILL_PIN_INVERTING                true
197
 //#define KILL_PIN_INVERTING                true
188
 
198
 
189
-#define SERVO0_PIN                          PA8   // Enable BLTOUCH support
190
 //#define LED_PIN                           PB2
199
 //#define LED_PIN                           PB2
191
 
200
 
192
 // Random Info
201
 // Random Info
193
-#define USB_SERIAL                         -1  //Usb Serial
194
-#define WIFI_SERIAL                         3  //USART3
195
-#define MKS_WIFI_MODULE_SERIAL              1  //USART1
196
-#define MKS_WIFI_MODULE_SPI                 2  //SPI2
202
+#define USB_SERIAL              -1  // USB Serial
203
+#define WIFI_SERIAL              3  // USART3
204
+#define MKS_WIFI_MODULE_SERIAL   1  // USART1
205
+#define MKS_WIFI_MODULE_SPI      2  // SPI2
197
 
206
 
198
 #ifndef SDCARD_CONNECTION
207
 #ifndef SDCARD_CONNECTION
199
   #define SDCARD_CONNECTION              ONBOARD
208
   #define SDCARD_CONNECTION              ONBOARD
331
     //#define MKS_LCD12864B
340
     //#define MKS_LCD12864B
332
     //#undef SHOW_BOOTSCREEN
341
     //#undef SHOW_BOOTSCREEN
333
 
342
 
334
-  #else                                           // !MKS_MINI_12864
343
+  #else // !MKS_MINI_12864
335
 
344
 
336
     #define LCD_PINS_D4                     PE14
345
     #define LCD_PINS_D4                     PE14
337
     #if ENABLED(ULTIPANEL)
346
     #if ENABLED(ULTIPANEL)
346
 
355
 
347
   #endif // !MKS_MINI_12864
356
   #endif // !MKS_MINI_12864
348
 #endif // HAS_SPI_LCD
357
 #endif // HAS_SPI_LCD
349
-
350
-#define HAS_OTG_USB_HOST_SUPPORT

+ 16
- 13
Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h Dosyayı Görüntüle

30
 #define BOARD_INFO_NAME "MKS Robin PRO V2"
30
 #define BOARD_INFO_NAME "MKS Robin PRO V2"
31
 
31
 
32
 // Avoid conflict with TIMER_TONE
32
 // Avoid conflict with TIMER_TONE
33
-#define STEP_TIMER 10
33
+#define STEP_TIMER                            10
34
 
34
 
35
 // Use one of these or SDCard-based Emulation will be used
35
 // Use one of these or SDCard-based Emulation will be used
36
 //#define SRAM_EEPROM_EMULATION                   // Use BackSRAM-based EEPROM emulation
36
 //#define SRAM_EEPROM_EMULATION                   // Use BackSRAM-based EEPROM emulation
40
 //
40
 //
41
 // Release PB4 (Y_ENABLE_PIN) from JTAG NRST role
41
 // Release PB4 (Y_ENABLE_PIN) from JTAG NRST role
42
 //
42
 //
43
+//#define DISABLE_DEBUG
43
 
44
 
44
 //
45
 //
45
 // Note: MKS Robin board is using SPI2 interface.
46
 // Note: MKS Robin board is using SPI2 interface.
47
 //#define SPI_MODULE                           2
48
 //#define SPI_MODULE                           2
48
 
49
 
49
 //
50
 //
51
+// Servos
52
+//
53
+#define SERVO0_PIN                          PA8   // Enable BLTOUCH
54
+
55
+//
50
 // Limit Switches
56
 // Limit Switches
51
 //
57
 //
52
 #define X_DIAG_PIN                          PA15
58
 #define X_DIAG_PIN                          PA15
55
 #define E0_DIAG_PIN                         PC4
61
 #define E0_DIAG_PIN                         PC4
56
 #define E1_DIAG_PIN                         PE7
62
 #define E1_DIAG_PIN                         PE7
57
 
63
 
58
-//
59
-
60
 #define X_STOP_PIN                          PA15
64
 #define X_STOP_PIN                          PA15
61
 #define Y_STOP_PIN                          PA12
65
 #define Y_STOP_PIN                          PA12
62
 #define Z_MIN_PIN                           PA11
66
 #define Z_MIN_PIN                           PA11
159
 
163
 
160
   // Reduce baud rate to improve software serial reliability
164
   // Reduce baud rate to improve software serial reliability
161
   #define TMC_BAUD_RATE                    19200
165
   #define TMC_BAUD_RATE                    19200
162
-#endif // TMC2208 || TMC2209
166
+#endif // HAS_TMC_UART
163
 
167
 
164
 //
168
 //
165
 // Temperature Sensors
169
 // Temperature Sensors
186
 //
190
 //
187
 // Misc. Functions
191
 // Misc. Functions
188
 //
192
 //
189
-// #define POWER_LOSS_PIN                      PA2   // PW_DET
190
-// #define PS_ON_PIN                           PA3   // PW_OFF
191
-// #define SUICIDE_PIN                         PB2     // Enable MKSPWC support
192
-// #define KILL_PIN                            PA2     // Enable MKSPWC support
193
-// #define KILL_PIN_INVERTING                  true     // Enable MKSPWC support
194
-#define SERVO0_PIN                          PA8   // Enable BLTOUCH support
193
+//#define POWER_LOSS_PIN                    PA2   // PW_DET
194
+//#define PS_ON_PIN                         PA3   // PW_OFF
195
+//#define SUICIDE_PIN                       PB2   // Enable MKSPWC support
196
+//#define KILL_PIN                          PA2   // Enable MKSPWC support
197
+//#define KILL_PIN_INVERTING                true  // Enable MKSPWC support
195
 //#define LED_PIN                           PB2
198
 //#define LED_PIN                           PB2
196
 
199
 
197
 #ifndef SDCARD_CONNECTION
200
 #ifndef SDCARD_CONNECTION
198
   #define SDCARD_CONNECTION              ONBOARD
201
   #define SDCARD_CONNECTION              ONBOARD
199
 #endif
202
 #endif
200
 
203
 
201
-// #define USE_NEW_SPI_API 1
204
+//#define USE_NEW_SPI_API 1
202
 
205
 
203
 //
206
 //
204
 // Onboard SD card
207
 // Onboard SD card
243
 //
246
 //
244
 // LCD / Controller
247
 // LCD / Controller
245
 #define SPI_FLASH
248
 #define SPI_FLASH
246
-#define HAS_SPI_FLASH 1
249
+#define HAS_SPI_FLASH                          1
247
 #define SPI_DEVICE                             2
250
 #define SPI_DEVICE                             2
248
 #define SPI_FLASH_SIZE                 0x1000000
251
 #define SPI_FLASH_SIZE                 0x1000000
249
 #if ENABLED(SPI_FLASH)
252
 #if ENABLED(SPI_FLASH)
316
   #define LCD_READ_ID                       0xD3
319
   #define LCD_READ_ID                       0xD3
317
   #define LCD_USE_DMA_SPI
320
   #define LCD_USE_DMA_SPI
318
 
321
 
319
-  // #define TFT_DRIVER                      ST7796
322
+  //#define TFT_DRIVER                    ST7796
320
   #define TFT_BUFFER_SIZE                  14400
323
   #define TFT_BUFFER_SIZE                  14400
321
 
324
 
322
 #elif HAS_SPI_LCD
325
 #elif HAS_SPI_LCD

+ 1
- 4
Marlin/src/pins/stm32f7/pins_NUCLEO_F767ZI.h Dosyayı Görüntüle

36
   // Decrease delays and flash wear by spreading writes across the
36
   // Decrease delays and flash wear by spreading writes across the
37
   // 128 kB sector allocated for EEPROM emulation.
37
   // 128 kB sector allocated for EEPROM emulation.
38
   // Not yet supported on F7 hardware
38
   // Not yet supported on F7 hardware
39
-  // #define FLASH_EEPROM_LEVELING
39
+  //#define FLASH_EEPROM_LEVELING
40
 #endif
40
 #endif
41
 
41
 
42
 /**
42
 /**
188
   #define LCD_PINS_RS                       PF12  // LCD_RS
188
   #define LCD_PINS_RS                       PF12  // LCD_RS
189
   #define LCD_PINS_ENABLE                   PD15  // LCD_EN
189
   #define LCD_PINS_ENABLE                   PD15  // LCD_EN
190
   #define LCD_PINS_D4                       PB13  // LCD_D4
190
   #define LCD_PINS_D4                       PB13  // LCD_D4
191
-  // #define LCD_PINS_D5
192
-  // #define LCD_PINS_D6
193
-  // #define LCD_PINS_D7
194
   #define BTN_EN1                           PF13  // BTN_EN1
191
   #define BTN_EN1                           PF13  // BTN_EN1
195
   #define BTN_EN2                           PE9   // BTN_EN2
192
   #define BTN_EN2                           PE9   // BTN_EN2
196
 
193
 

+ 1
- 1
buildroot/share/PlatformIO/variants/BIGTREE_GTR_V1/hal_conf_extra.h Dosyayı Görüntüle

44
 #undef HAL_IRDA_MODULE_ENABLED
44
 #undef HAL_IRDA_MODULE_ENABLED
45
 #undef HAL_SMARTCARD_MODULE_ENABLED
45
 #undef HAL_SMARTCARD_MODULE_ENABLED
46
 #undef HAL_WWDG_MODULE_ENABLED
46
 #undef HAL_WWDG_MODULE_ENABLED
47
-#undef HAL_HCD_MODULE_ENABLED
47
+//#undef HAL_HCD_MODULE_ENABLED
48
 #undef HAL_FMPI2C_MODULE_ENABLED
48
 #undef HAL_FMPI2C_MODULE_ENABLED
49
 #undef HAL_SPDIFRX_MODULE_ENABLED
49
 #undef HAL_SPDIFRX_MODULE_ENABLED
50
 #undef HAL_DFSDM_MODULE_ENABLED
50
 #undef HAL_DFSDM_MODULE_ENABLED

+ 1
- 1
buildroot/share/PlatformIO/variants/BIGTREE_SKR_PRO_1v1/hal_conf_extra.h Dosyayı Görüntüle

44
 #undef HAL_IRDA_MODULE_ENABLED
44
 #undef HAL_IRDA_MODULE_ENABLED
45
 #undef HAL_SMARTCARD_MODULE_ENABLED
45
 #undef HAL_SMARTCARD_MODULE_ENABLED
46
 #undef HAL_WWDG_MODULE_ENABLED
46
 #undef HAL_WWDG_MODULE_ENABLED
47
-#undef HAL_HCD_MODULE_ENABLED
47
+//#undef HAL_HCD_MODULE_ENABLED
48
 #undef HAL_FMPI2C_MODULE_ENABLED
48
 #undef HAL_FMPI2C_MODULE_ENABLED
49
 #undef HAL_SPDIFRX_MODULE_ENABLED
49
 #undef HAL_SPDIFRX_MODULE_ENABLED
50
 #undef HAL_DFSDM_MODULE_ENABLED
50
 #undef HAL_DFSDM_MODULE_ENABLED

+ 2
- 3
buildroot/tests/STM32F103VE_longer-tests Dosyayı Görüntüle

11
 exec_test $1 $2 "CLASSIC_UI U20 config" "$3"
11
 exec_test $1 $2 "CLASSIC_UI U20 config" "$3"
12
 
12
 
13
 use_example_configs Alfawise/U20
13
 use_example_configs Alfawise/U20
14
-opt_enable BAUD_RATE_GCODE
15
-opt_enable TFT_COLOR_UI
16
-opt_disable TFT_CLASSIC_UI
14
+opt_enable BAUD_RATE_GCODE TFT_COLOR_UI
15
+opt_disable TFT_CLASSIC_UI CUSTOM_STATUS_SCREEN_IMAGE
17
 exec_test $1 $2 "COLOR_UI U20 config" "$3"
16
 exec_test $1 $2 "COLOR_UI U20 config" "$3"
18
 
17
 
19
 use_example_configs Alfawise/U20-bltouch
18
 use_example_configs Alfawise/U20-bltouch

Loading…
İptal
Kaydet