Browse Source

Clean up hasty PR

Scott Lahteine 4 years ago
parent
commit
eb7f75461a
1 changed files with 13 additions and 14 deletions
  1. 13
    14
      Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h

+ 13
- 14
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h View File

43
 //
43
 //
44
 // Note: MKS Robin board is using SPI2 interface.
44
 // Note: MKS Robin board is using SPI2 interface.
45
 //
45
 //
46
-#define SPI_DEVICE                          2
46
+#define SPI_DEVICE                             2
47
 
47
 
48
 //
48
 //
49
 // Servos
49
 // Servos
188
 // SD Card
188
 // SD Card
189
 //
189
 //
190
 #ifndef SDCARD_CONNECTION
190
 #ifndef SDCARD_CONNECTION
191
-  #define SDCARD_CONNECTION                 ONBOARD
191
+  #define SDCARD_CONNECTION              ONBOARD
192
 #endif
192
 #endif
193
 
193
 
194
 #if SD_CONNECTION_IS(LCD)
194
 #if SD_CONNECTION_IS(LCD)
211
  * to let the bootloader init the screen.
211
  * to let the bootloader init the screen.
212
  */
212
  */
213
 #if HAS_FSMC_TFT
213
 #if HAS_FSMC_TFT
214
-  #define FSMC_CS_PIN                       PD7           // NE4
215
-  #define FSMC_RS_PIN                       PD11          // A0
216
-  #define TFT_CS_PIN                        FSMC_CS_PIN
217
-  #define TFT_RS_PIN                        FSMC_RS_PIN
214
+  #define FSMC_CS_PIN                       PD7   // NE4
215
+  #define FSMC_RS_PIN                       PD11  // A0
216
+  #define TFT_CS_PIN                 FSMC_CS_PIN
217
+  #define TFT_RS_PIN                 FSMC_RS_PIN
218
 
218
 
219
   #define LCD_RESET_PIN                     PF6
219
   #define LCD_RESET_PIN                     PF6
220
   #define LCD_BACKLIGHT_PIN                 PD13
220
   #define LCD_BACKLIGHT_PIN                 PD13
221
-  #define TFT_RESET_PIN                     LCD_RESET_PIN
222
-  #define TFT_BACKLIGHT_PIN                 LCD_BACKLIGHT_PIN
221
+  #define TFT_RESET_PIN            LCD_RESET_PIN
222
+  #define TFT_BACKLIGHT_PIN    LCD_BACKLIGHT_PIN
223
 
223
 
224
   #if NEED_TOUCH_PINS
224
   #if NEED_TOUCH_PINS
225
     #define TOUCH_CS_PIN                    PA7
225
     #define TOUCH_CS_PIN                    PA7
255
     #define DOGLCD_SCK                      PB13
255
     #define DOGLCD_SCK                      PB13
256
     #define DOGLCD_MOSI                     PB15
256
     #define DOGLCD_MOSI                     PB15
257
 
257
 
258
-  #else
259
-  // !MKS_MINI_12864 && !ENDER2_STOCKDISPLAY
258
+  #else                                           // !MKS_MINI_12864 && !ENDER2_STOCKDISPLAY
260
 
259
 
261
     #define LCD_PINS_D4                     PF14
260
     #define LCD_PINS_D4                     PF14
262
     #if IS_ULTIPANEL
261
     #if IS_ULTIPANEL
265
       #define LCD_PINS_D7                   PF13
264
       #define LCD_PINS_D7                   PF13
266
 
265
 
267
       #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
266
       #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
268
-        #define BTN_ENC_EN                  LCD_PINS_D7  // Detect the presence of the encoder
267
+        #define BTN_ENC_EN           LCD_PINS_D7  // Detect the presence of the encoder
269
       #endif
268
       #endif
270
 
269
 
271
     #endif
270
     #endif
284
   #define BOARD_ST7920_DELAY_3              DELAY_NS(125)
283
   #define BOARD_ST7920_DELAY_3              DELAY_NS(125)
285
 #endif
284
 #endif
286
 
285
 
287
-#define HAS_SPI_FLASH                       1
286
+#define HAS_SPI_FLASH                          1
288
 #if HAS_SPI_FLASH
287
 #if HAS_SPI_FLASH
289
-  #define SPI_FLASH_SIZE                    0x1000000   // 16MB
290
-  #define W25QXX_CS_PIN                     PB12        // Flash chip-select
288
+  #define SPI_FLASH_SIZE               0x1000000  // 16MB
289
+  #define W25QXX_CS_PIN                     PB12  // Flash chip-select
291
   #define W25QXX_MOSI_PIN                   PB15
290
   #define W25QXX_MOSI_PIN                   PB15
292
   #define W25QXX_MISO_PIN                   PB14
291
   #define W25QXX_MISO_PIN                   PB14
293
   #define W25QXX_SCK_PIN                    PB13
292
   #define W25QXX_SCK_PIN                    PB13

Loading…
Cancel
Save