Преглед на файлове

🐛 Creality v4 cleanup, pin correction (#23666)

ellensp преди 2 години
родител
ревизия
1636325b72
No account linked to committer's email address
променени са 3 файла, в които са добавени 26 реда и са изтрити 27 реда
  1. 24
    23
      Marlin/src/core/boards.h
  2. 2
    2
      Marlin/src/pins/pins.h
  3. 0
    2
      Marlin/src/pins/stm32f1/pins_CREALITY_V4.h

+ 24
- 23
Marlin/src/core/boards.h Целия файл

@@ -337,29 +337,30 @@
337 337
 #define BOARD_CHITU3D_V5              4037  // Chitu3D TronXY X5SA V5 Board
338 338
 #define BOARD_CHITU3D_V6              4038  // Chitu3D TronXY X5SA V6 Board
339 339
 #define BOARD_CHITU3D_V9              4039  // Chitu3D TronXY X5SA V9 Board
340
-#define BOARD_CREALITY_V4             4040  // Creality v4.x (STM32F103RE)
341
-#define BOARD_CREALITY_V423           4041  // Creality v4.2.3 (STM32F103RE)
342
-#define BOARD_CREALITY_V427           4042  // Creality v4.2.7 (STM32F103RE)
343
-#define BOARD_CREALITY_V4210          4043  // Creality v4.2.10 (STM32F103RE) as found in the CR-30
344
-#define BOARD_CREALITY_V431           4044  // Creality v4.3.1 (STM32F103RE)
345
-#define BOARD_CREALITY_V431_A         4045  // Creality v4.3.1a (STM32F103RE)
346
-#define BOARD_CREALITY_V431_B         4046  // Creality v4.3.1b (STM32F103RE)
347
-#define BOARD_CREALITY_V431_C         4047  // Creality v4.3.1c (STM32F103RE)
348
-#define BOARD_CREALITY_V431_D         4048  // Creality v4.3.1d (STM32F103RE)
349
-#define BOARD_CREALITY_V452           4049  // Creality v4.5.2 (STM32F103RE)
350
-#define BOARD_CREALITY_V453           4050  // Creality v4.5.3 (STM32F103RE)
351
-#define BOARD_CREALITY_V24S1          4051  // Creality v2.4.S1 (STM32F103RE) v101 as found in the Ender 7
352
-#define BOARD_CREALITY_V24S1_301      4052  // Creality v2.4.S1_301 (STM32F103RCT) as found in the Ender 3 S1
353
-#define BOARD_TRIGORILLA_PRO          4053  // Trigorilla Pro (STM32F103ZE)
354
-#define BOARD_FLY_MINI                4054  // FLYmaker FLY MINI (STM32F103RC)
355
-#define BOARD_FLSUN_HISPEED           4055  // FLSUN HiSpeedV1 (STM32F103VE)
356
-#define BOARD_BEAST                   4056  // STM32F103RE Libmaple-based controller
357
-#define BOARD_MINGDA_MPX_ARM_MINI     4057  // STM32F103ZE Mingda MD-16
358
-#define BOARD_GTM32_PRO_VD            4058  // STM32F103VE controller
359
-#define BOARD_ZONESTAR_ZM3E2          4059  // Zonestar ZM3E2    (STM32F103RC)
360
-#define BOARD_ZONESTAR_ZM3E4          4060  // Zonestar ZM3E4 V1 (STM32F103VC)
361
-#define BOARD_ZONESTAR_ZM3E4V2        4061  // Zonestar ZM3E4 V2 (STM32F103VC)
362
-#define BOARD_ERYONE_ERY32_MINI       4062  // Eryone Ery32 mini (STM32F103VE)
340
+#define BOARD_CREALITY_V4             4040  // Creality v4.x (STM32F103RC / STM32F103RE)
341
+#define BOARD_CREALITY_V422           4041  // Creality v4.2.2 (STM32F103RC / STM32F103RE)
342
+#define BOARD_CREALITY_V423           4042  // Creality v4.2.3 (STM32F103RC / STM32F103RE)
343
+#define BOARD_CREALITY_V427           4043  // Creality v4.2.7 (STM32F103RC / STM32F103RE)
344
+#define BOARD_CREALITY_V4210          4044  // Creality v4.2.10 (STM32F103RC / STM32F103RE) as found in the CR-30
345
+#define BOARD_CREALITY_V431           4045  // Creality v4.3.1 (STM32F103RC / STM32F103RE)
346
+#define BOARD_CREALITY_V431_A         4046  // Creality v4.3.1a (STM32F103RC / STM32F103RE)
347
+#define BOARD_CREALITY_V431_B         4047  // Creality v4.3.1b (STM32F103RC / STM32F103RE)
348
+#define BOARD_CREALITY_V431_C         4048  // Creality v4.3.1c (STM32F103RC / STM32F103RE)
349
+#define BOARD_CREALITY_V431_D         4049  // Creality v4.3.1d (STM32F103RC / STM32F103RE)
350
+#define BOARD_CREALITY_V452           4050  // Creality v4.5.2 (STM32F103RC / STM32F103RE)
351
+#define BOARD_CREALITY_V453           4051  // Creality v4.5.3 (STM32F103RC / STM32F103RE)
352
+#define BOARD_CREALITY_V24S1          4052  // Creality v2.4.S1 (STM32F103RC / STM32F103RE) v101 as found in the Ender 7
353
+#define BOARD_CREALITY_V24S1_301      4053  // Creality v2.4.S1_301 (STM32F103RC / STM32F103RE) as found in the Ender 3 S1
354
+#define BOARD_TRIGORILLA_PRO          4054  // Trigorilla Pro (STM32F103ZE)
355
+#define BOARD_FLY_MINI                4055  // FLYmaker FLY MINI (STM32F103RC)
356
+#define BOARD_FLSUN_HISPEED           4056  // FLSUN HiSpeedV1 (STM32F103VE)
357
+#define BOARD_BEAST                   4057  // STM32F103RE Libmaple-based controller
358
+#define BOARD_MINGDA_MPX_ARM_MINI     4058  // STM32F103ZE Mingda MD-16
359
+#define BOARD_GTM32_PRO_VD            4059  // STM32F103VE controller
360
+#define BOARD_ZONESTAR_ZM3E2          4060  // Zonestar ZM3E2    (STM32F103RC)
361
+#define BOARD_ZONESTAR_ZM3E4          4061  // Zonestar ZM3E4 V1 (STM32F103VC)
362
+#define BOARD_ZONESTAR_ZM3E4V2        4062  // Zonestar ZM3E4 V2 (STM32F103VC)
363
+#define BOARD_ERYONE_ERY32_MINI       4063  // Eryone Ery32 mini (STM32F103VE)
363 364
 
364 365
 //
365 366
 // ARM Cortex-M4F

+ 2
- 2
Marlin/src/pins/pins.h Целия файл

@@ -557,12 +557,12 @@
557 557
   #include "stm32f1/pins_CHITU3D_V6.h"          // STM32F1                                env:chitu_f103 env:chitu_f103_maple
558 558
 #elif MB(CHITU3D_V9)
559 559
   #include "stm32f1/pins_CHITU3D_V9.h"          // STM32F1                                env:chitu_f103 env:chitu_f103_maple
560
-#elif MB(CREALITY_V4)
560
+#elif MB(CREALITY_V4, CREALITY_V422)
561 561
   #include "stm32f1/pins_CREALITY_V4.h"         // STM32F1                                env:STM32F103RE_creality env:STM32F103RE_creality_xfer env:STM32F103RC_creality env:STM32F103RC_creality_xfer env:STM32F103RE_creality_maple
562 562
 #elif MB(CREALITY_V4210)
563 563
   #include "stm32f1/pins_CREALITY_V4210.h"      // STM32F1                                env:STM32F103RE_creality env:STM32F103RE_creality_xfer env:STM32F103RC_creality env:STM32F103RC_creality_xfer env:STM32F103RE_creality_maple
564 564
 #elif MB(CREALITY_V423)
565
-  #include "stm32f1/pins_CREALITY_V423.h"       // STM32F1                                env:STM32F103RE_creality env:STM32F103RE_creality_xfer
565
+  #include "stm32f1/pins_CREALITY_V423.h"       // STM32F1                                env:STM32F103RE_creality env:STM32F103RE_creality_xfer env:STM32F103RC_creality env:STM32F103RC_creality_xfer
566 566
 #elif MB(CREALITY_V427)
567 567
   #include "stm32f1/pins_CREALITY_V427.h"       // STM32F1                                env:STM32F103RE_creality env:STM32F103RE_creality_xfer env:STM32F103RC_creality env:STM32F103RC_creality_xfer env:STM32F103RE_creality_maple
568 568
 #elif MB(CREALITY_V431, CREALITY_V431_A, CREALITY_V431_B, CREALITY_V431_C, CREALITY_V431_D)

+ 0
- 2
Marlin/src/pins/stm32f1/pins_CREALITY_V4.h Целия файл

@@ -152,8 +152,6 @@
152 152
 //
153 153
 #define SD_DETECT_PIN                       PC7
154 154
 #define SDCARD_CONNECTION                ONBOARD
155
-#define ONBOARD_SPI_DEVICE                     1
156
-#define ONBOARD_SD_CS_PIN                   PA4   // SDSS
157 155
 #define SDIO_SUPPORT
158 156
 #define NO_SD_HOST_DRIVE                          // This board's SD is only seen by the printer
159 157
 

Loading…
Отказ
Запис