浏览代码

📌 Distinct BOARD_CREALITY_V422 (#23674)

Bruno Henrique de Paula 2 年前
父节点
当前提交
d99d0c8a10
没有帐户链接到提交者的电子邮件

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

@@ -559,10 +559,12 @@
559 559
   #include "stm32f1/pins_CHITU3D_V6.h"          // STM32F1                                env:chitu_f103 env:chitu_f103_maple
560 560
 #elif MB(CHITU3D_V9)
561 561
   #include "stm32f1/pins_CHITU3D_V9.h"          // STM32F1                                env:chitu_f103 env:chitu_f103_maple
562
-#elif MB(CREALITY_V4, CREALITY_V422)
562
+#elif MB(CREALITY_V4)
563 563
   #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
564 564
 #elif MB(CREALITY_V4210)
565 565
   #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
566
+#elif MB(CREALITY_V422)
567
+  #include "stm32f1/pins_CREALITY_V422.h"       // STM32F1                                env:STM32F103RE_creality env:STM32F103RE_creality_xfer env:STM32F103RC_creality env:STM32F103RC_creality_xfer env:STM32F103RE_creality_maple
566 568
 #elif MB(CREALITY_V423)
567 569
   #include "stm32f1/pins_CREALITY_V423.h"       // STM32F1                                env:STM32F103RE_creality env:STM32F103RE_creality_xfer env:STM32F103RC_creality env:STM32F103RC_creality_xfer
568 570
 #elif MB(CREALITY_V427)

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

@@ -22,7 +22,7 @@
22 22
 #pragma once
23 23
 
24 24
 /**
25
- * Creality v2.4.S1 (STM32F103RE) v101 as found in the Ender 7 board pin assignments
25
+ * Creality v2.4.S1 (STM32F103RE / STM32F103RC) v101 as found in the Ender 7 board pin assignments
26 26
  */
27 27
 
28 28
 #define BOARD_INFO_NAME      "Creality v2.4.S1 V101"

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

@@ -22,7 +22,7 @@
22 22
 #pragma once
23 23
 
24 24
 /**
25
- * Creality V24S1_301 (STM32F103RCT) board pin assignments as found on Ender 3 S1
25
+ * Creality V24S1_301 (STM32F103RE / STM32F103RC) board pin assignments as found on Ender 3 S1
26 26
  */
27 27
 
28 28
 #include "env_validate.h"

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

@@ -22,7 +22,7 @@
22 22
 #pragma once
23 23
 
24 24
 /**
25
- * Creality 4.2.x (STM32F103RET6) board pin assignments
25
+ * Creality 4.2.x (STM32F103RE / STM32F103RC) board pin assignments
26 26
  */
27 27
 
28 28
 #include "env_validate.h"

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

@@ -22,7 +22,7 @@
22 22
 #pragma once
23 23
 
24 24
 /**
25
- * CREALITY 4.2.10 (STM32F103) board pin assignments
25
+ * CREALITY 4.2.10 (STM32F103RE / STM32F103RC) board pin assignments
26 26
  */
27 27
 
28 28
 #include "env_validate.h"

+ 31
- 0
Marlin/src/pins/stm32f1/pins_CREALITY_V422.h 查看文件

@@ -0,0 +1,31 @@
1
+/**
2
+ * Marlin 3D Printer Firmware
3
+ * Copyright (c) 2022 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4
+ *
5
+ * Based on Sprinter and grbl.
6
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
7
+ *
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
10
+ * the Free Software Foundation, either version 3 of the License, or
11
+ * (at your option) any later version.
12
+ *
13
+ * This program is distributed in the hope that it will be useful,
14
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
15
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
16
+ * GNU General Public License for more details.
17
+ *
18
+ * You should have received a copy of the GNU General Public License
19
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
20
+ *
21
+ */
22
+#pragma once
23
+
24
+/**
25
+ * CREALITY v4.2.2 (STM32F103RE / STM32F103RC) board pin assignments
26
+ */
27
+
28
+#define BOARD_INFO_NAME      "Creality v4.2.2"
29
+#define DEFAULT_MACHINE_NAME "Creality3D"
30
+
31
+#include "pins_CREALITY_V4.h"

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

@@ -22,7 +22,7 @@
22 22
 #pragma once
23 23
 
24 24
 /**
25
- * CREALITY v4.2.3 (STM32F103) board pin assignments
25
+ * CREALITY v4.2.3 (STM32F103RE / STM32F103RC) board pin assignments
26 26
  */
27 27
 
28 28
 #define BOARD_INFO_NAME      "Creality v4.2.3"

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

@@ -22,7 +22,7 @@
22 22
 #pragma once
23 23
 
24 24
 /**
25
- * CREALITY v4.2.7 (STM32F103) board pin assignments
25
+ * CREALITY v4.2.7 (STM32F103RE / STM32F103RC) board pin assignments
26 26
  */
27 27
 
28 28
 #define BOARD_INFO_NAME      "Creality v4.2.7"

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

@@ -22,7 +22,7 @@
22 22
 #pragma once
23 23
 
24 24
 /**
25
- * CREALITY v4.3.1 (STM32F103) board pin assignments
25
+ * CREALITY v4.3.1 (STM32F103RE / STM32F103RC) board pin assignments
26 26
  */
27 27
 
28 28
 #define BOARD_INFO_NAME      "Creality v4.3.1"

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

@@ -22,7 +22,7 @@
22 22
 #pragma once
23 23
 
24 24
 /**
25
- * Creality v4.5.2 (STM32F103RET6) board pin assignments
25
+ * Creality v4.5.2 (STM32F103RE / STM32F103RC) board pin assignments
26 26
  */
27 27
 
28 28
 #if HAS_MULTI_HOTEND || E_STEPPERS > 1

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

@@ -22,7 +22,7 @@
22 22
 #pragma once
23 23
 
24 24
 /**
25
- * Creality v4.5.3 (STM32F103RET6) board pin assignments
25
+ * Creality v4.5.3 (STM32F103RE / STM32F103RC) board pin assignments
26 26
  */
27 27
 
28 28
 #if HAS_MULTI_HOTEND || E_STEPPERS > 1

+ 6
- 4
buildroot/share/scripts/upload.py 查看文件

@@ -153,11 +153,13 @@ def Upload(source, target, env):
153 153
 
154 154
     # Set local upload params based on board type to change script behavior
155 155
     # "upload_delete_old_bins": delete all *.bin files in the root of SD Card
156
-    upload_delete_old_bins = marlin_motherboard in ['BOARD_CREALITY_V4',   'BOARD_CREALITY_V4210', 'BOARD_CREALITY_V423', 'BOARD_CREALITY_V427',
157
-                                                    'BOARD_CREALITY_V431', 'BOARD_CREALITY_V452',  'BOARD_CREALITY_V453', 'BOARD_CREALITY_V24S1']
156
+    upload_delete_old_bins = marlin_motherboard in ['BOARD_CREALITY_V4',   'BOARD_CREALITY_V4210', 'BOARD_CREALITY_V422', 'BOARD_CREALITY_V423',
157
+                                                    'BOARD_CREALITY_V427', 'BOARD_CREALITY_V431', 'BOARD_CREALITY_V452',  'BOARD_CREALITY_V453',
158
+                                                    'BOARD_CREALITY_V24S1']
158 159
     # "upload_random_name": generate a random 8.3 firmware filename to upload
159
-    upload_random_filename = marlin_motherboard in ['BOARD_CREALITY_V4',   'BOARD_CREALITY_V4210', 'BOARD_CREALITY_V423', 'BOARD_CREALITY_V427',
160
-                                                    'BOARD_CREALITY_V431', 'BOARD_CREALITY_V452',  'BOARD_CREALITY_V453', 'BOARD_CREALITY_V24S1'] and not marlin_long_filename_host_support
160
+    upload_random_filename = marlin_motherboard in ['BOARD_CREALITY_V4',   'BOARD_CREALITY_V4210', 'BOARD_CREALITY_V422', 'BOARD_CREALITY_V423',
161
+                                                    'BOARD_CREALITY_V427', 'BOARD_CREALITY_V431', 'BOARD_CREALITY_V452',  'BOARD_CREALITY_V453',
162
+                                                    'BOARD_CREALITY_V24S1'] and not marlin_long_filename_host_support
161 163
 
162 164
     try:
163 165
 

正在加载...
取消
保存