Browse Source

Style, spacing, typo cleanup for recent changes

Scott Lahteine 3 years ago
parent
commit
885b0d2ec5

+ 1
- 1
Marlin/src/HAL/STM32/inc/SanityCheck.h View File

53
 #endif
53
 #endif
54
 
54
 
55
 #if ANY(TFT_COLOR_UI, TFT_LVGL_UI, TFT_CLASSIC_UI) && NOT_TARGET(STM32F4xx, STM32F1xx)
55
 #if ANY(TFT_COLOR_UI, TFT_LVGL_UI, TFT_CLASSIC_UI) && NOT_TARGET(STM32F4xx, STM32F1xx)
56
-  #error "TFT_COLOR_UI, TFT_LVGL_UI and TFT_CLASSIC_U are currently only supported on STM32F4 and STM32F1 hardware."
56
+  #error "TFT_COLOR_UI, TFT_LVGL_UI and TFT_CLASSIC_UI are currently only supported on STM32F4 and STM32F1 hardware."
57
 #endif
57
 #endif

+ 1
- 2
Marlin/src/HAL/STM32/pinsDebug.h View File

141
   uint32_t ll_pin  = STM_LL_GPIO_PIN(dp);
141
   uint32_t ll_pin  = STM_LL_GPIO_PIN(dp);
142
   GPIO_TypeDef *port = get_GPIO_Port(STM_PORT(dp));
142
   GPIO_TypeDef *port = get_GPIO_Port(STM_PORT(dp));
143
   uint32_t mode = LL_GPIO_GetPinMode(port, ll_pin);
143
   uint32_t mode = LL_GPIO_GetPinMode(port, ll_pin);
144
-  switch (mode)
145
-  {
144
+  switch (mode) {
146
     case LL_GPIO_MODE_ANALOG: return MODE_PIN_ANALOG;
145
     case LL_GPIO_MODE_ANALOG: return MODE_PIN_ANALOG;
147
     case LL_GPIO_MODE_INPUT: return MODE_PIN_INPUT;
146
     case LL_GPIO_MODE_INPUT: return MODE_PIN_INPUT;
148
     case LL_GPIO_MODE_OUTPUT: return MODE_PIN_OUTPUT;
147
     case LL_GPIO_MODE_OUTPUT: return MODE_PIN_OUTPUT;

+ 14
- 21
Marlin/src/HAL/STM32/tft/tft_spi.cpp View File

40
   if ((spiInstance = (SPI_TypeDef *)pinmap_peripheral(digitalPinToPinName(TFT_SCK_PIN),  PinMap_SPI_SCLK)) == NP) return;
40
   if ((spiInstance = (SPI_TypeDef *)pinmap_peripheral(digitalPinToPinName(TFT_SCK_PIN),  PinMap_SPI_SCLK)) == NP) return;
41
   if (spiInstance != (SPI_TypeDef *)pinmap_peripheral(digitalPinToPinName(TFT_MOSI_PIN), PinMap_SPI_MOSI)) return;
41
   if (spiInstance != (SPI_TypeDef *)pinmap_peripheral(digitalPinToPinName(TFT_MOSI_PIN), PinMap_SPI_MOSI)) return;
42
 
42
 
43
-  #if PIN_EXISTS(TFT_MISO)
44
-    if (TFT_MISO_PIN != TFT_MOSI_PIN)
45
-      if (spiInstance != (SPI_TypeDef *)pinmap_peripheral(digitalPinToPinName(TFT_MISO_PIN), PinMap_SPI_MISO)) return;
43
+  #if PIN_EXISTS(TFT_MISO) && TFT_MISO_PIN != TFT_MOSI_PIN
44
+    if (spiInstance != (SPI_TypeDef *)pinmap_peripheral(digitalPinToPinName(TFT_MISO_PIN), PinMap_SPI_MISO)) return;
46
   #endif
45
   #endif
47
 
46
 
48
   SPIx.Instance                = spiInstance;
47
   SPIx.Instance                = spiInstance;
49
   SPIx.State                   = HAL_SPI_STATE_RESET;
48
   SPIx.State                   = HAL_SPI_STATE_RESET;
50
   SPIx.Init.NSS                = SPI_NSS_SOFT;
49
   SPIx.Init.NSS                = SPI_NSS_SOFT;
51
   SPIx.Init.Mode               = SPI_MODE_MASTER;
50
   SPIx.Init.Mode               = SPI_MODE_MASTER;
52
-  if (TFT_MISO_PIN == TFT_MOSI_PIN)
53
-    SPIx.Init.Direction         = SPI_DIRECTION_1LINE;
54
-  else
55
-    SPIx.Init.Direction         = SPI_DIRECTION_2LINES;
51
+  SPIx.Init.Direction          = (TFT_MISO_PIN == TFT_MOSI_PIN) ? SPI_DIRECTION_1LINE : SPI_DIRECTION_2LINES;
56
   SPIx.Init.BaudRatePrescaler  = SPI_BAUDRATEPRESCALER_2;
52
   SPIx.Init.BaudRatePrescaler  = SPI_BAUDRATEPRESCALER_2;
57
   SPIx.Init.CLKPhase           = SPI_PHASE_1EDGE;
53
   SPIx.Init.CLKPhase           = SPI_PHASE_1EDGE;
58
   SPIx.Init.CLKPolarity        = SPI_POLARITY_LOW;
54
   SPIx.Init.CLKPolarity        = SPI_POLARITY_LOW;
64
 
60
 
65
   pinmap_pinout(digitalPinToPinName(TFT_SCK_PIN), PinMap_SPI_SCLK);
61
   pinmap_pinout(digitalPinToPinName(TFT_SCK_PIN), PinMap_SPI_SCLK);
66
   pinmap_pinout(digitalPinToPinName(TFT_MOSI_PIN), PinMap_SPI_MOSI);
62
   pinmap_pinout(digitalPinToPinName(TFT_MOSI_PIN), PinMap_SPI_MOSI);
67
-  #if PIN_EXISTS(TFT_MISO)
68
-    if (TFT_MISO_PIN != TFT_MOSI_PIN)
69
-      pinmap_pinout(digitalPinToPinName(TFT_MISO_PIN), PinMap_SPI_MISO);
63
+  #if PIN_EXISTS(TFT_MISO) && TFT_MISO_PIN != TFT_MOSI_PIN
64
+    pinmap_pinout(digitalPinToPinName(TFT_MISO_PIN), PinMap_SPI_MISO);
70
   #endif
65
   #endif
71
   pin_PullConfig(get_GPIO_Port(STM_PORT(digitalPinToPinName(TFT_SCK_PIN))), STM_LL_GPIO_PIN(digitalPinToPinName(TFT_SCK_PIN)), GPIO_PULLDOWN);
66
   pin_PullConfig(get_GPIO_Port(STM_PORT(digitalPinToPinName(TFT_SCK_PIN))), STM_LL_GPIO_PIN(digitalPinToPinName(TFT_SCK_PIN)), GPIO_PULLDOWN);
72
 
67
 
119
   DMAtx.Init.MemDataAlignment = DMA_MDATAALIGN_HALFWORD;
114
   DMAtx.Init.MemDataAlignment = DMA_MDATAALIGN_HALFWORD;
120
   DMAtx.Init.Mode = DMA_NORMAL;
115
   DMAtx.Init.Mode = DMA_NORMAL;
121
   DMAtx.Init.Priority = DMA_PRIORITY_LOW;
116
   DMAtx.Init.Priority = DMA_PRIORITY_LOW;
122
-  #if defined(STM32F4xx)
117
+  #ifdef STM32F4xx
123
     DMAtx.Init.FIFOMode = DMA_FIFOMODE_DISABLE;
118
     DMAtx.Init.FIFOMode = DMA_FIFOMODE_DISABLE;
124
   #endif
119
   #endif
125
 }
120
 }
140
 }
135
 }
141
 
136
 
142
 uint32_t TFT_SPI::ReadID(uint16_t Reg) {
137
 uint32_t TFT_SPI::ReadID(uint16_t Reg) {
143
-  #if !PIN_EXISTS(TFT_MISO)
144
-    return 0;
145
-  #else
138
+  uint32_t Data = 0;
139
+  #if PIN_EXISTS(TFT_MISO)
146
     uint32_t BaudRatePrescaler = SPIx.Init.BaudRatePrescaler;
140
     uint32_t BaudRatePrescaler = SPIx.Init.BaudRatePrescaler;
147
-    uint32_t i, Data = 0;
141
+    uint32_t i;
148
 
142
 
149
     SPIx.Init.BaudRatePrescaler = SPIx.Instance == SPI1 ? SPI_BAUDRATEPRESCALER_8 : SPI_BAUDRATEPRESCALER_4;
143
     SPIx.Init.BaudRatePrescaler = SPIx.Instance == SPI1 ? SPI_BAUDRATEPRESCALER_8 : SPI_BAUDRATEPRESCALER_4;
150
     DataTransferBegin(DATASIZE_8BIT);
144
     DataTransferBegin(DATASIZE_8BIT);
154
     __HAL_SPI_ENABLE(&SPIx);
148
     __HAL_SPI_ENABLE(&SPIx);
155
 
149
 
156
     for (i = 0; i < 4; i++) {
150
     for (i = 0; i < 4; i++) {
157
-      if (TFT_MISO_PIN != TFT_MOSI_PIN) {
151
+      #if TFT_MISO_PIN != TFT_MOSI_PIN
158
         //if (hspi->Init.Direction == SPI_DIRECTION_2LINES) {
152
         //if (hspi->Init.Direction == SPI_DIRECTION_2LINES) {
159
           while ((SPIx.Instance->SR & SPI_FLAG_TXE) != SPI_FLAG_TXE) {}
153
           while ((SPIx.Instance->SR & SPI_FLAG_TXE) != SPI_FLAG_TXE) {}
160
           SPIx.Instance->DR = 0;
154
           SPIx.Instance->DR = 0;
161
         //}
155
         //}
162
-      }
156
+      #endif
163
       while ((SPIx.Instance->SR & SPI_FLAG_RXNE) != SPI_FLAG_RXNE) {}
157
       while ((SPIx.Instance->SR & SPI_FLAG_RXNE) != SPI_FLAG_RXNE) {}
164
       Data = (Data << 8) | SPIx.Instance->DR;
158
       Data = (Data << 8) | SPIx.Instance->DR;
165
     }
159
     }
168
     DataTransferEnd();
162
     DataTransferEnd();
169
 
163
 
170
     SPIx.Init.BaudRatePrescaler   = BaudRatePrescaler;
164
     SPIx.Init.BaudRatePrescaler   = BaudRatePrescaler;
171
-
172
-    return Data >> 7;
173
   #endif
165
   #endif
166
+
167
+  return Data >> 7;
174
 }
168
 }
175
 
169
 
176
 bool TFT_SPI::isBusy() {
170
 bool TFT_SPI::isBusy() {
183
     if (__HAL_DMA_GET_FLAG(&DMAtx, __HAL_DMA_GET_TC_FLAG_INDEX(&DMAtx)) != 0 || __HAL_DMA_GET_FLAG(&DMAtx, __HAL_DMA_GET_TE_FLAG_INDEX(&DMAtx)) != 0)
177
     if (__HAL_DMA_GET_FLAG(&DMAtx, __HAL_DMA_GET_TC_FLAG_INDEX(&DMAtx)) != 0 || __HAL_DMA_GET_FLAG(&DMAtx, __HAL_DMA_GET_TE_FLAG_INDEX(&DMAtx)) != 0)
184
       Abort();
178
       Abort();
185
   }
179
   }
186
-  else {
180
+  else
187
     Abort();
181
     Abort();
188
-  }
189
   return dmaEnabled;
182
   return dmaEnabled;
190
 }
183
 }
191
 
184
 

+ 2
- 2
Marlin/src/pins/esp32/pins_MRR_ESPE.h View File

1
 /**
1
 /**
2
  * Marlin 3D Printer Firmware
2
  * Marlin 3D Printer Firmware
3
- * Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4
  *
4
  *
5
  * Based on Sprinter and grbl.
5
  * Based on Sprinter and grbl.
6
- * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
6
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
7
  *
7
  *
8
  * This program is free software: you can redistribute it and/or modify
8
  * This program is free software: you can redistribute it and/or modify
9
  * it under the terms of the GNU General Public License as published by
9
  * it under the terms of the GNU General Public License as published by

+ 59
- 59
Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h View File

33
 // SD Connection
33
 // SD Connection
34
 //
34
 //
35
 #ifndef SDCARD_CONNECTION
35
 #ifndef SDCARD_CONNECTION
36
-  #define SDCARD_CONNECTION                  LCD
36
+  #define SDCARD_CONNECTION LCD
37
 #endif
37
 #endif
38
 
38
 
39
 //
39
 //
244
 // SD Connection
244
 // SD Connection
245
 //
245
 //
246
 #if SD_CONNECTION_IS(LCD)
246
 #if SD_CONNECTION_IS(LCD)
247
-  #define SS_PIN                           EXPA2_07_PIN
247
+  #define SS_PIN                    EXPA2_07_PIN
248
 #endif
248
 #endif
249
 
249
 
250
 /**
250
 /**
286
     *                 LCD                        LCD
286
     *                 LCD                        LCD
287
     */
287
     */
288
 
288
 
289
-    #define LCD_PINS_RS                    EXPA1_03_PIN
289
+    #define LCD_PINS_RS             EXPA1_03_PIN
290
 
290
 
291
-    #define BTN_EN1                        EXPA1_06_PIN
292
-    #define BTN_EN2                        EXPA1_04_PIN
293
-    #define BTN_ENC                        EXPA1_08_PIN
291
+    #define BTN_EN1                 EXPA1_06_PIN
292
+    #define BTN_EN2                 EXPA1_04_PIN
293
+    #define BTN_ENC                 EXPA1_08_PIN
294
 
294
 
295
-    #define LCD_PINS_ENABLE                EXPA1_05_PIN
296
-    #define LCD_PINS_D4                    EXPA1_07_PIN
295
+    #define LCD_PINS_ENABLE         EXPA1_05_PIN
296
+    #define LCD_PINS_D4             EXPA1_07_PIN
297
 
297
 
298
   #elif ENABLED(CR10_STOCKDISPLAY)
298
   #elif ENABLED(CR10_STOCKDISPLAY)
299
-    #define BTN_ENC                        EXPA1_09_PIN  // (58) open-drain
300
-    #define LCD_PINS_RS                    EXPA1_04_PIN
299
+    #define BTN_ENC                 EXPA1_09_PIN  // (58) open-drain
300
+    #define LCD_PINS_RS             EXPA1_04_PIN
301
 
301
 
302
-    #define BTN_EN1                        EXPA1_08_PIN
303
-    #define BTN_EN2                        EXPA1_06_PIN
302
+    #define BTN_EN1                 EXPA1_08_PIN
303
+    #define BTN_EN2                 EXPA1_06_PIN
304
 
304
 
305
-    #define LCD_PINS_ENABLE                EXPA1_03_PIN
306
-    #define LCD_PINS_D4                    EXPA1_05_PIN
305
+    #define LCD_PINS_ENABLE         EXPA1_03_PIN
306
+    #define LCD_PINS_D4             EXPA1_05_PIN
307
 
307
 
308
   #elif ENABLED(ENDER2_STOCKDISPLAY)
308
   #elif ENABLED(ENDER2_STOCKDISPLAY)
309
 
309
 
318
      *                    EXP1
318
      *                    EXP1
319
      */
319
      */
320
 
320
 
321
-    #define BTN_EN1                        EXPA1_08_PIN
322
-    #define BTN_EN2                        EXPA1_06_PIN
323
-    #define BTN_ENC                        EXPA1_09_PIN
321
+    #define BTN_EN1                 EXPA1_08_PIN
322
+    #define BTN_EN2                 EXPA1_06_PIN
323
+    #define BTN_ENC                 EXPA1_09_PIN
324
 
324
 
325
-    #define DOGLCD_CS                      EXPA1_04_PIN
326
-    #define DOGLCD_A0                      EXPA1_05_PIN
327
-    #define DOGLCD_SCK                     EXPA1_10_PIN
328
-    #define DOGLCD_MOSI                    EXPA1_03_PIN
325
+    #define DOGLCD_CS               EXPA1_04_PIN
326
+    #define DOGLCD_A0               EXPA1_05_PIN
327
+    #define DOGLCD_SCK              EXPA1_10_PIN
328
+    #define DOGLCD_MOSI             EXPA1_03_PIN
329
     #define FORCE_SOFT_SPI
329
     #define FORCE_SOFT_SPI
330
     #define LCD_BACKLIGHT_PIN              -1
330
     #define LCD_BACKLIGHT_PIN              -1
331
 
331
 
332
   #elif HAS_SPI_TFT                               // Config for Classic UI (emulated DOGM) and Color UI
332
   #elif HAS_SPI_TFT                               // Config for Classic UI (emulated DOGM) and Color UI
333
-    #define TFT_CS_PIN                     EXPA1_04_PIN
334
-    #define TFT_A0_PIN                     EXPA1_03_PIN
335
-    #define TFT_DC_PIN                     EXPA1_03_PIN
336
-    #define TFT_MISO_PIN                   EXPA2_10_PIN
337
-    #define TFT_BACKLIGHT_PIN              EXPA1_08_PIN
338
-    #define TFT_RESET_PIN                  EXPA1_07_PIN
333
+    #define TFT_CS_PIN              EXPA1_04_PIN
334
+    #define TFT_A0_PIN              EXPA1_03_PIN
335
+    #define TFT_DC_PIN              EXPA1_03_PIN
336
+    #define TFT_MISO_PIN            EXPA2_10_PIN
337
+    #define TFT_BACKLIGHT_PIN       EXPA1_08_PIN
338
+    #define TFT_RESET_PIN           EXPA1_07_PIN
339
 
339
 
340
     #define LCD_USE_DMA_SPI
340
     #define LCD_USE_DMA_SPI
341
 
341
 
342
-    #define TOUCH_INT_PIN                  EXPA1_05_PIN
343
-    #define TOUCH_CS_PIN                   EXPA1_06_PIN
342
+    #define TOUCH_INT_PIN           EXPA1_05_PIN
343
+    #define TOUCH_CS_PIN            EXPA1_06_PIN
344
     #define TOUCH_BUTTONS_HW_SPI
344
     #define TOUCH_BUTTONS_HW_SPI
345
     #define TOUCH_BUTTONS_HW_SPI_DEVICE        1
345
     #define TOUCH_BUTTONS_HW_SPI_DEVICE        1
346
 
346
 
347
     // SPI 1
347
     // SPI 1
348
-    #define SCK_PIN                        EXPA2_09_PIN
349
-    #define MISO_PIN                       EXPA2_10_PIN
350
-    #define MOSI_PIN                       EXPA2_05_PIN
348
+    #define SCK_PIN                 EXPA2_09_PIN
349
+    #define MISO_PIN                EXPA2_10_PIN
350
+    #define MOSI_PIN                EXPA2_05_PIN
351
 
351
 
352
     // Disable any LCD related PINs config
352
     // Disable any LCD related PINs config
353
     #define LCD_PINS_ENABLE                -1
353
     #define LCD_PINS_ENABLE                -1
358
   #elif IS_TFTGLCD_PANEL
358
   #elif IS_TFTGLCD_PANEL
359
 
359
 
360
     #if ENABLED(TFTGLCD_PANEL_SPI)
360
     #if ENABLED(TFTGLCD_PANEL_SPI)
361
-      #define TFTGLCD_CS                   EXPA2_08_PIN
361
+      #define TFTGLCD_CS            EXPA2_08_PIN
362
     #endif
362
     #endif
363
 
363
 
364
-    #define SD_DETECT_PIN                  EXPA2_04_PIN
364
+    #define SD_DETECT_PIN           EXPA2_04_PIN
365
 
365
 
366
   #else
366
   #else
367
 
367
 
368
-    #define BTN_ENC                        EXPA1_09_PIN  // (58) open-drain
369
-    #define LCD_PINS_RS                    EXPA1_07_PIN
368
+    #define BTN_ENC                 EXPA1_09_PIN  // (58) open-drain
369
+    #define LCD_PINS_RS             EXPA1_07_PIN
370
 
370
 
371
-    #define BTN_EN1                        EXPA2_08_PIN  // (31) J3-2 & AUX-4
372
-    #define BTN_EN2                        EXPA2_06_PIN  // (33) J3-4 & AUX-4
371
+    #define BTN_EN1                 EXPA2_08_PIN  // (31) J3-2 & AUX-4
372
+    #define BTN_EN2                 EXPA2_06_PIN  // (33) J3-4 & AUX-4
373
 
373
 
374
-    #define LCD_PINS_ENABLE                EXPA1_08_PIN
375
-    #define LCD_PINS_D4                    EXPA1_06_PIN
374
+    #define LCD_PINS_ENABLE         EXPA1_08_PIN
375
+    #define LCD_PINS_D4             EXPA1_06_PIN
376
 
376
 
377
-    #define LCD_SDSS                       EXPA2_07_PIN  // (16) J3-7 & AUX-4
377
+    #define LCD_SDSS                EXPA2_07_PIN  // (16) J3-7 & AUX-4
378
 
378
 
379
     #if SD_CONNECTION_IS(LCD)
379
     #if SD_CONNECTION_IS(LCD)
380
-      #define SD_DETECT_PIN                EXPA2_04_PIN  // (49) (NOT 5V tolerant)
380
+      #define SD_DETECT_PIN         EXPA2_04_PIN  // (49) (NOT 5V tolerant)
381
     #endif
381
     #endif
382
 
382
 
383
     #if ENABLED(FYSETC_MINI_12864)
383
     #if ENABLED(FYSETC_MINI_12864)
384
-      #define DOGLCD_CS                    EXPA1_08_PIN
385
-      #define DOGLCD_A0                    EXPA1_07_PIN
386
-      #define DOGLCD_SCK                   EXPA2_09_PIN
387
-      #define DOGLCD_MOSI                  EXPA2_05_PIN
384
+      #define DOGLCD_CS             EXPA1_08_PIN
385
+      #define DOGLCD_A0             EXPA1_07_PIN
386
+      #define DOGLCD_SCK            EXPA2_09_PIN
387
+      #define DOGLCD_MOSI           EXPA2_05_PIN
388
 
388
 
389
       #define LCD_BACKLIGHT_PIN            -1
389
       #define LCD_BACKLIGHT_PIN            -1
390
 
390
 
391
       #define FORCE_SOFT_SPI                      // Use this if default of hardware SPI causes display problems
391
       #define FORCE_SOFT_SPI                      // Use this if default of hardware SPI causes display problems
392
                                                   //   results in LCD soft SPI mode 3, SD soft SPI mode 0
392
                                                   //   results in LCD soft SPI mode 3, SD soft SPI mode 0
393
 
393
 
394
-      #define LCD_RESET_PIN                EXPA1_06_PIN  // Must be high or open for LCD to operate normally.
394
+      #define LCD_RESET_PIN         EXPA1_06_PIN  // Must be high or open for LCD to operate normally.
395
 
395
 
396
       #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
396
       #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
397
         #ifndef RGB_LED_R_PIN
397
         #ifndef RGB_LED_R_PIN
398
-          #define RGB_LED_R_PIN            EXPA1_05_PIN
398
+          #define RGB_LED_R_PIN     EXPA1_05_PIN
399
         #endif
399
         #endif
400
         #ifndef RGB_LED_G_PIN
400
         #ifndef RGB_LED_G_PIN
401
-          #define RGB_LED_G_PIN            EXPA1_04_PIN
401
+          #define RGB_LED_G_PIN     EXPA1_04_PIN
402
         #endif
402
         #endif
403
         #ifndef RGB_LED_B_PIN
403
         #ifndef RGB_LED_B_PIN
404
-          #define RGB_LED_B_PIN            EXPA1_03_PIN
404
+          #define RGB_LED_B_PIN     EXPA1_03_PIN
405
         #endif
405
         #endif
406
       #elif ENABLED(FYSETC_MINI_12864_2_1)
406
       #elif ENABLED(FYSETC_MINI_12864_2_1)
407
-        #define NEOPIXEL_PIN               EXPA1_05_PIN
407
+        #define NEOPIXEL_PIN        EXPA1_05_PIN
408
       #endif
408
       #endif
409
 
409
 
410
     #else                                         // !FYSETC_MINI_12864
410
     #else                                         // !FYSETC_MINI_12864
411
 
411
 
412
       #if ENABLED(MKS_MINI_12864)
412
       #if ENABLED(MKS_MINI_12864)
413
-        #define DOGLCD_CS                  EXPA1_05_PIN
414
-        #define DOGLCD_A0                  EXPA1_04_PIN
415
-        #define DOGLCD_SCK                 EXPA2_09_PIN
416
-        #define DOGLCD_MOSI                EXPA2_05_PIN
413
+        #define DOGLCD_CS           EXPA1_05_PIN
414
+        #define DOGLCD_A0           EXPA1_04_PIN
415
+        #define DOGLCD_SCK          EXPA2_09_PIN
416
+        #define DOGLCD_MOSI         EXPA2_05_PIN
417
         #define FORCE_SOFT_SPI
417
         #define FORCE_SOFT_SPI
418
       #endif
418
       #endif
419
 
419
 
420
       #if IS_ULTIPANEL
420
       #if IS_ULTIPANEL
421
-        #define LCD_PINS_D5                EXPA1_05_PIN
422
-        #define LCD_PINS_D6                EXPA1_04_PIN
423
-        #define LCD_PINS_D7                EXPA1_03_PIN
421
+        #define LCD_PINS_D5         EXPA1_05_PIN
422
+        #define LCD_PINS_D6         EXPA1_04_PIN
423
+        #define LCD_PINS_D7         EXPA1_03_PIN
424
 
424
 
425
         #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
425
         #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
426
-          #define BTN_ENC_EN               EXPA1_03_PIN  // Detect the presence of the encoder
426
+          #define BTN_ENC_EN        EXPA1_03_PIN  // Detect the presence of the encoder
427
         #endif
427
         #endif
428
 
428
 
429
       #endif
429
       #endif

+ 40
- 36
Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h View File

33
 // https://github.com/bigtreetech/BTT-Expansion-module/tree/master/BTT%20EXP-MOT
33
 // https://github.com/bigtreetech/BTT-Expansion-module/tree/master/BTT%20EXP-MOT
34
 //#define HAS_BTT_EXP_MOT 1
34
 //#define HAS_BTT_EXP_MOT 1
35
 
35
 
36
-#if BOTH(HAS_WIRED_LCD,HAS_BTT_EXP_MOT)
37
-  #if EITHER(CR10_STOCKDISPLAY,ENDER2_STOCKDISPLAY)
36
+#if BOTH(HAS_WIRED_LCD, HAS_BTT_EXP_MOT)
37
+  #if EITHER(CR10_STOCKDISPLAY, ENDER2_STOCKDISPLAY)
38
     #define EXP_MOT_USE_EXP2_ONLY
38
     #define EXP_MOT_USE_EXP2_ONLY
39
   #else
39
   #else
40
     #error "Having a LCD that uses both EXP1/EXP2 and a expanion motor module on EXP1/EXP2 is not possible."
40
     #error "Having a LCD that uses both EXP1/EXP2 and a expanion motor module on EXP1/EXP2 is not possible."
129
 #endif
129
 #endif
130
 
130
 
131
 #if HAS_BTT_EXP_MOT
131
 #if HAS_BTT_EXP_MOT
132
-/*               _____                                      _____
133
- *           NC | · · | GND                             NC | · · | GND
134
- *           NC | · · | 1.31 (M1EN)            (M2EN) 1.23 | · · | 1.22 (M3EN)
135
- * (M1STP) 0.18 | · ·   3.25 (M1DIR)           (M1RX) 1.21 | · ·   1.20 (M1DIAG)
136
- * (M2DIR) 0.16 | · · | 3.26 (M2STP)           (M2RX) 1.19 | · · | 1.18 (M2DIAG)
137
- * (M3DIR) 0.15 | · · | 0.17 (M3STP)           (M3RX) 0.28 | · · | 1.30 (M3DIAG)
138
- *               -----                                      -----
139
- *               EXP2                                       EXP1
140
- *
141
- * NB In EXP_MOT_USE_EXP2_ONLY mode EXP1 is not used and M2EN and M3EN need to be jumpered to M1EN
142
- */
132
+
133
+  /**              _____                                      _____
134
+   *           NC | · · | GND                             NC | · · | GND
135
+   *           NC | · · | 1.31 (M1EN)            (M2EN) 1.23 | · · | 1.22 (M3EN)
136
+   * (M1STP) 0.18 | · ·   3.25 (M1DIR)           (M1RX) 1.21 | · ·   1.20 (M1DIAG)
137
+   * (M2DIR) 0.16 | · · | 3.26 (M2STP)           (M2RX) 1.19 | · · | 1.18 (M2DIAG)
138
+   * (M3DIR) 0.15 | · · | 0.17 (M3STP)           (M3RX) 0.28 | · · | 1.30 (M3DIAG)
139
+   *               -----                                      -----
140
+   *               EXP2                                       EXP1
141
+   *
142
+   * NB In EXP_MOT_USE_EXP2_ONLY mode EXP1 is not used and M2EN and M3EN need to be jumpered to M1EN
143
+   */
143
 
144
 
144
   // M1 on Driver Expansion Module
145
   // M1 on Driver Expansion Module
145
-  #define E2_STEP_PIN                      EXPA2_05_PIN
146
-  #define E2_DIR_PIN                       EXPA2_06_PIN
147
-  #define E2_ENABLE_PIN                    EXPA2_04_PIN
146
+  #define E2_STEP_PIN               EXPA2_05_PIN
147
+  #define E2_DIR_PIN                EXPA2_06_PIN
148
+  #define E2_ENABLE_PIN             EXPA2_04_PIN
148
   #ifndef EXP_MOT_USE_EXP2_ONLY
149
   #ifndef EXP_MOT_USE_EXP2_ONLY
149
-    #define E2_DIAG_PIN                    EXPA1_06_PIN
150
-    #define E2_CS_PIN                      EXPA1_05_PIN
150
+    #define E2_DIAG_PIN             EXPA1_06_PIN
151
+    #define E2_CS_PIN               EXPA1_05_PIN
151
     #if HAS_TMC_UART
152
     #if HAS_TMC_UART
152
-      #define E2_SERIAL_TX_PIN             EXPA1_05_PIN
153
-      #define E2_SERIAL_RX_PIN             EXPA1_05_PIN
153
+      #define E2_SERIAL_TX_PIN      EXPA1_05_PIN
154
+      #define E2_SERIAL_RX_PIN      EXPA1_05_PIN
154
     #endif
155
     #endif
155
   #endif
156
   #endif
157
+
156
   // M2 on Driver Expansion Module
158
   // M2 on Driver Expansion Module
157
-  #define E3_STEP_PIN                      EXPA2_08_PIN
158
-  #define E3_DIR_PIN                       EXPA2_07_PIN
159
+  #define E3_STEP_PIN               EXPA2_08_PIN
160
+  #define E3_DIR_PIN                EXPA2_07_PIN
159
   #ifndef EXP_MOT_USE_EXP2_ONLY
161
   #ifndef EXP_MOT_USE_EXP2_ONLY
160
-    #define E3_ENABLE_PIN                  EXPA1_03_PIN
161
-    #define E3_DIAG_PIN                    EXPA1_08_PIN
162
-    #define E3_CS_PIN                      EXPA1_07_PIN
162
+    #define E3_ENABLE_PIN           EXPA1_03_PIN
163
+    #define E3_DIAG_PIN             EXPA1_08_PIN
164
+    #define E3_CS_PIN               EXPA1_07_PIN
163
     #if HAS_TMC_UART
165
     #if HAS_TMC_UART
164
-      #define E3_SERIAL_TX_PIN             EXPA1_07_PIN
165
-      #define E3_SERIAL_RX_PIN             EXPA1_07_PIN
166
+      #define E3_SERIAL_TX_PIN      EXPA1_07_PIN
167
+      #define E3_SERIAL_RX_PIN      EXPA1_07_PIN
166
     #endif
168
     #endif
167
   #else
169
   #else
168
-    #define E3_ENABLE_PIN                  EXPA2_04_PIN
170
+    #define E3_ENABLE_PIN           EXPA2_04_PIN
169
   #endif
171
   #endif
172
+
170
   // M3 on Driver Expansion Module
173
   // M3 on Driver Expansion Module
171
-  #define E4_STEP_PIN                      EXPA2_10_PIN
172
-  #define E4_DIR_PIN                       EXPA2_09_PIN
174
+  #define E4_STEP_PIN               EXPA2_10_PIN
175
+  #define E4_DIR_PIN                EXPA2_09_PIN
173
   #ifndef EXP_MOT_USE_EXP2_ONLY
176
   #ifndef EXP_MOT_USE_EXP2_ONLY
174
-    #define E4_ENABLE_PIN                  EXPA1_04_PIN
175
-    #define E4_DIAG_PIN                    EXPA1_10_PIN
176
-    #define E4_CS_PIN                      EXPA1_09_PIN
177
+    #define E4_ENABLE_PIN           EXPA1_04_PIN
178
+    #define E4_DIAG_PIN             EXPA1_10_PIN
179
+    #define E4_CS_PIN               EXPA1_09_PIN
177
     #if HAS_TMC_UART
180
     #if HAS_TMC_UART
178
-      #define E4_SERIAL_TX_PIN             EXPA1_09_PIN
179
-      #define E4_SERIAL_RX_PIN             EXPA1_09_PIN
181
+      #define E4_SERIAL_TX_PIN      EXPA1_09_PIN
182
+      #define E4_SERIAL_RX_PIN      EXPA1_09_PIN
180
     #endif
183
     #endif
181
   #else
184
   #else
182
-    #define E4_ENABLE_PIN                  EXPA2_04_PIN
185
+    #define E4_ENABLE_PIN           EXPA2_04_PIN
183
   #endif
186
   #endif
187
+
184
 #endif // HAS_BTT_EXP_MOT
188
 #endif // HAS_BTT_EXP_MOT

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

1
 /**
1
 /**
2
  * Marlin 3D Printer Firmware
2
  * Marlin 3D Printer Firmware
3
- * Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4
  *
4
  *
5
  * Based on Sprinter and grbl.
5
  * Based on Sprinter and grbl.
6
- * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
6
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
7
  *
7
  *
8
  * This program is free software: you can redistribute it and/or modify
8
  * This program is free software: you can redistribute it and/or modify
9
  * it under the terms of the GNU General Public License as published by
9
  * it under the terms of the GNU General Public License as published by

+ 2
- 2
Marlin/src/pins/sanguino/pins_ZMIB_V2.h View File

1
 /**
1
 /**
2
  * Marlin 3D Printer Firmware
2
  * Marlin 3D Printer Firmware
3
- * Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4
  *
4
  *
5
  * Based on Sprinter and grbl.
5
  * Based on Sprinter and grbl.
6
- * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
6
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
7
  *
7
  *
8
  * This program is free software: you can redistribute it and/or modify
8
  * This program is free software: you can redistribute it and/or modify
9
  * it under the terms of the GNU General Public License as published by
9
  * it under the terms of the GNU General Public License as published by

+ 2
- 2
Marlin/src/pins/stm32f1/pins_CREALITY_V4.h View File

1
 /**
1
 /**
2
  * Marlin 3D Printer Firmware
2
  * Marlin 3D Printer Firmware
3
- * Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4
  *
4
  *
5
  * Based on Sprinter and grbl.
5
  * Based on Sprinter and grbl.
6
- * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
6
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
7
  *
7
  *
8
  * This program is free software: you can redistribute it and/or modify
8
  * This program is free software: you can redistribute it and/or modify
9
  * it under the terms of the GNU General Public License as published by
9
  * it under the terms of the GNU General Public License as published by

+ 2
- 2
Marlin/src/pins/stm32f1/pins_CREALITY_V427.h View File

1
 /**
1
 /**
2
  * Marlin 3D Printer Firmware
2
  * Marlin 3D Printer Firmware
3
- * Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4
  *
4
  *
5
  * Based on Sprinter and grbl.
5
  * Based on Sprinter and grbl.
6
- * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
6
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
7
  *
7
  *
8
  * This program is free software: you can redistribute it and/or modify
8
  * This program is free software: you can redistribute it and/or modify
9
  * it under the terms of the GNU General Public License as published by
9
  * it under the terms of the GNU General Public License as published by

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

1
 /**
1
 /**
2
  * Marlin 3D Printer Firmware
2
  * Marlin 3D Printer Firmware
3
- * Copyright (C) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4
  *
4
  *
5
  * Based on Sprinter and grbl.
5
  * Based on Sprinter and grbl.
6
- * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
6
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
7
  *
7
  *
8
  * This program is free software: you can redistribute it and/or modify
8
  * This program is free software: you can redistribute it and/or modify
9
  * it under the terms of the GNU General Public License as published by
9
  * it under the terms of the GNU General Public License as published by
16
  * GNU General Public License for more details.
16
  * GNU General Public License for more details.
17
  *
17
  *
18
  * You should have received a copy of the GNU General Public License
18
  * You should have received a copy of the GNU General Public License
19
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
19
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
20
  *
20
  *
21
  */
21
  */
22
 
22
 

+ 1
- 1
Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h View File

16
  * GNU General Public License for more details.
16
  * GNU General Public License for more details.
17
  *
17
  *
18
  * You should have received a copy of the GNU General Public License
18
  * You should have received a copy of the GNU General Public License
19
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
19
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
20
  *
20
  *
21
  */
21
  */
22
 #pragma once
22
 #pragma once

+ 4
- 4
platformio.ini View File

1355
 # MKS Robin Pro V2
1355
 # MKS Robin Pro V2
1356
 #
1356
 #
1357
 [env:mks_robin_pro2]
1357
 [env:mks_robin_pro2]
1358
-platform      = ${common_stm32.platform}
1359
-extends       = common_stm32
1360
-build_flags   = ${common_stm32.build_flags} -DHAL_HCD_MODULE_ENABLED  -DUSBHOST -DARDUINO_BLACK_F407VE
1361
-board         = genericSTM32F407VET6
1358
+platform             = ${common_stm32.platform}
1359
+extends              = common_stm32
1360
+build_flags          = ${common_stm32.build_flags} -DHAL_HCD_MODULE_ENABLED  -DUSBHOST -DARDUINO_BLACK_F407VE
1361
+board                = genericSTM32F407VET6
1362
 board_build.core     = stm32
1362
 board_build.core     = stm32
1363
 board_build.variant  = MARLIN_F407VE
1363
 board_build.variant  = MARLIN_F407VE
1364
 board_build.ldscript = ldscript.ld
1364
 board_build.ldscript = ldscript.ld

Loading…
Cancel
Save