Bläddra i källkod

Creality v4.5.3 (CR-6 SE, CR-6 MAX) (#20468)

Sebastiaan Dammann 4 år sedan
förälder
incheckning
686bb056a4

+ 5
- 4
Marlin/src/core/boards.h Visa fil

@@ -330,10 +330,11 @@
330 330
 #define BOARD_CREALITY_V4             4037  // Creality v4.x (STM32F103RE)
331 331
 #define BOARD_CREALITY_V427           4038  // Creality v4.2.7 (STM32F103RE)
332 332
 #define BOARD_CREALITY_V452           4039  // Creality v4.5.2 (STM32F103RE)
333
-#define BOARD_TRIGORILLA_PRO          4040  // Trigorilla Pro (STM32F103ZET6)
334
-#define BOARD_FLY_MINI                4041  // FLY MINI (STM32F103RCT6)
335
-#define BOARD_FLSUN_HISPEED           4042  // FLSUN HiSpeedV1 (STM32F103VET6)
336
-#define BOARD_BEAST                   4043  // STM32F103RET6 Libmaple-based controller
333
+#define BOARD_CREALITY_V453           4040  // Creality v4.5.3 (STM32F103RE)
334
+#define BOARD_TRIGORILLA_PRO          4041  // Trigorilla Pro (STM32F103ZET6)
335
+#define BOARD_FLY_MINI                4042  // FLY MINI (STM32F103RCT6)
336
+#define BOARD_FLSUN_HISPEED           4043  // FLSUN HiSpeedV1 (STM32F103VET6)
337
+#define BOARD_BEAST                   4044  // STM32F103RET6 Libmaple-based controller
337 338
 
338 339
 //
339 340
 // ARM Cortex-M4F

+ 2
- 0
Marlin/src/pins/pins.h Visa fil

@@ -532,6 +532,8 @@
532 532
   #include "stm32f1/pins_CREALITY_V427.h"       // STM32F1                                env:STM32F103RET6_creality
533 533
 #elif MB(CREALITY_V452)
534 534
   #include "stm32f1/pins_CREALITY_V452.h"       // STM32F1                                env:STM32F103RET6_creality
535
+#elif MB(CREALITY_V453)
536
+  #include "stm32f1/pins_CREALITY_V453.h"       // STM32F1                                env:STM32F103RET6_creality
535 537
 #elif MB(TRIGORILLA_PRO)
536 538
   #include "stm32f1/pins_TRIGORILLA_PRO.h"      // STM32F1                                env:trigorilla_pro
537 539
 #elif MB(FLY_MINI)

+ 4
- 86
Marlin/src/pins/stm32f1/pins_CREALITY_V452.h Visa fil

@@ -24,97 +24,15 @@
24 24
  * Creality v4.5.2 (STM32F103RET6) board pin assignments
25 25
  */
26 26
 
27
-#if NOT_TARGET(__STM32F1__)
28
-  #error "Oops! Select an STM32F1 board in 'Tools > Board.'"
29
-#elif HOTENDS > 1 || E_STEPPERS > 1
30
-  #error "CREALITY_V452 supports up to 1 hotends / E-steppers. Comment out this line to continue."
27
+#if HOTENDS > 1 || E_STEPPERS > 1
28
+  #error "Creality v4.5.2 only supports one hotend / E-stepper. Comment out this line to continue."
31 29
 #endif
32 30
 
33 31
 #define BOARD_NAME "Creality v4.5.2"
34
-#define DEFAULT_MACHINE_NAME "Creality3D"
35 32
 
36
-//
37
-// Release PB4 (Z_STEP_PIN) from JTAG NRST role
38
-//
39
-#define DISABLE_DEBUG
40
-
41
-#define BOARD_NO_NATIVE_USB
42
-
43
-//
44
-// EEPROM
45
-//
46
-#if NO_EEPROM_SELECTED
47
-  #define IIC_BL24CXX_EEPROM                      // EEPROM on I2C-0
48
-  //#define SDCARD_EEPROM_EMULATION
49
-#endif
50
-
51
-#if ENABLED(IIC_BL24CXX_EEPROM)
52
-  #define IIC_EEPROM_SDA                    PA11
53
-  #define IIC_EEPROM_SCL                    PA12
54
-  #define MARLIN_EEPROM_SIZE               0x800  // 2Kb (24C16)
55
-#elif ENABLED(SDCARD_EEPROM_EMULATION)
56
-  #define MARLIN_EEPROM_SIZE               0x800  // 2Kb
57
-#endif
58
-
59
-//
60
-// Limit Switches
61
-//
62
-#define X_STOP_PIN                          PC4
63
-#define Y_STOP_PIN                          PC5
64
-#define Z_STOP_PIN                          PA4
65
-
66
-#define FIL_RUNOUT_PIN                      PA7
67
-
68
-//
69
-// Probe
70
-//
71
-#define PROBE_TARE_PIN                      PA5
72
-#define PROBE_ENABLE_PIN                    PC6   // Optoswitch to Enable Z Probe
73
-
74
-//
75
-// Steppers
76
-//
77
-#define X_ENABLE_PIN                        PC3
78
-#define X_STEP_PIN                          PB8
79
-#define X_DIR_PIN                           PB7
80
-
81
-#define Y_ENABLE_PIN                        PC3
82
-#define Y_STEP_PIN                          PB6
83
-#define Y_DIR_PIN                           PB5
84
-
85
-#define Z_ENABLE_PIN                        PC3
86
-#define Z_STEP_PIN                          PB4
87
-#define Z_DIR_PIN                           PB3
88
-
89
-#define E0_ENABLE_PIN                       PC3
90
-#define E0_STEP_PIN                         PC2
91
-#define E0_DIR_PIN                          PB9
92
-
93
-//
94
-// Temperature Sensors
95
-//
96
-#define TEMP_0_PIN                          PB1   // TH1
97
-#define TEMP_BED_PIN                        PB0   // TB1
98
-
99
-//
100
-// Heaters / Fans
101
-//
102 33
 #define HEATER_0_PIN                        PA1   // HEATER1
103 34
 #define HEATER_BED_PIN                      PA2   // HOT BED
104
-
105 35
 #define FAN_PIN                             PA0   // FAN
106
-#define FAN_SOFT_PWM
107
-
108
-//
109
-// SD Card
110
-//
111
-#define SD_DETECT_PIN                       PC7
112
-#define NO_SD_HOST_DRIVE                          // SD is only seen by the printer
113
-
114
-#define SDIO_SUPPORT                              // Extra added by Creality
115
-#define SDIO_CLOCK                       6000000  // In original source code overridden by Creality in sdio.h
36
+#define PROBE_ENABLE_PIN                    PC6   // Optoswitch to Enable Z Probe
116 37
 
117
-//
118
-// Misc. Functions
119
-//
120
-#define CASE_LIGHT_PIN                      PA6
38
+#include "pins_CREALITY_V45x.h"

+ 38
- 0
Marlin/src/pins/stm32f1/pins_CREALITY_V453.h Visa fil

@@ -0,0 +1,38 @@
1
+/**
2
+ * Marlin 3D Printer Firmware
3
+ * Copyright (c) 2020 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
+
23
+/**
24
+ * Creality v4.5.3 (STM32F103RET6) board pin assignments
25
+ */
26
+
27
+#if HOTENDS > 1 || E_STEPPERS > 1
28
+  #error "Creality v4.5.3 only supports one hotend / E-stepper. Comment out this line to continue."
29
+#endif
30
+
31
+#define BOARD_NAME "Creality v4.5.3"
32
+
33
+#define HEATER_0_PIN                        PB14  // HEATER1
34
+#define HEATER_BED_PIN                      PB13  // HOT BED
35
+#define FAN_PIN                             PB15  // FAN
36
+#define PROBE_ENABLE_PIN                    PB2   // Optoswitch to Enable Z Probe
37
+
38
+#include "pins_CREALITY_V45x.h"

+ 113
- 0
Marlin/src/pins/stm32f1/pins_CREALITY_V45x.h Visa fil

@@ -0,0 +1,113 @@
1
+/**
2
+ * Marlin 3D Printer Firmware
3
+ * Copyright (c) 2020 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
+
23
+/**
24
+ * Creality v4.5.2 and v4.5.3 (STM32F103RET6) board pin assignments
25
+ */
26
+
27
+#if NOT_TARGET(__STM32F1__)
28
+  #error "Oops! Select an STM32F1 board in 'Tools > Board.'"
29
+#endif
30
+
31
+#define DEFAULT_MACHINE_NAME "Creality3D"
32
+
33
+//
34
+// Release PB4 (Z_STEP_PIN) from JTAG NRST role
35
+//
36
+#define DISABLE_DEBUG
37
+
38
+#define BOARD_NO_NATIVE_USB
39
+
40
+//
41
+// EEPROM
42
+//
43
+#if NO_EEPROM_SELECTED
44
+  #define IIC_BL24CXX_EEPROM                      // EEPROM on I2C-0
45
+  //#define SDCARD_EEPROM_EMULATION
46
+#endif
47
+
48
+#if ENABLED(IIC_BL24CXX_EEPROM)
49
+  #define IIC_EEPROM_SDA                    PA11
50
+  #define IIC_EEPROM_SCL                    PA12
51
+  #define MARLIN_EEPROM_SIZE               0x800  // 2Kb (24C16)
52
+#elif ENABLED(SDCARD_EEPROM_EMULATION)
53
+  #define MARLIN_EEPROM_SIZE               0x800  // 2Kb
54
+#endif
55
+
56
+//
57
+// Limit Switches
58
+//
59
+#define X_STOP_PIN                          PC4
60
+#define Y_STOP_PIN                          PC5
61
+#define Z_STOP_PIN                          PA4
62
+
63
+#define FIL_RUNOUT_PIN                      PA7
64
+
65
+//
66
+// Probe
67
+//
68
+#define PROBE_TARE_PIN                      PA5
69
+
70
+//
71
+// Steppers
72
+//
73
+#define X_ENABLE_PIN                        PC3
74
+#define X_STEP_PIN                          PB8
75
+#define X_DIR_PIN                           PB7
76
+
77
+#define Y_ENABLE_PIN                        PC3
78
+#define Y_STEP_PIN                          PB6
79
+#define Y_DIR_PIN                           PB5
80
+
81
+#define Z_ENABLE_PIN                        PC3
82
+#define Z_STEP_PIN                          PB4
83
+#define Z_DIR_PIN                           PB3
84
+
85
+#define E0_ENABLE_PIN                       PC3
86
+#define E0_STEP_PIN                         PC2
87
+#define E0_DIR_PIN                          PB9
88
+
89
+//
90
+// Temperature Sensors
91
+//
92
+#define TEMP_0_PIN                          PB1   // TH1
93
+#define TEMP_BED_PIN                        PB0   // TB1
94
+
95
+//
96
+// Heaters / Fans
97
+//
98
+
99
+#define FAN_SOFT_PWM
100
+
101
+//
102
+// SD Card
103
+//
104
+#define SD_DETECT_PIN                       PC7
105
+#define NO_SD_HOST_DRIVE                          // SD is only seen by the printer
106
+
107
+#define SDIO_SUPPORT                              // Extra added by Creality
108
+#define SDIO_CLOCK                       6000000  // In original source code overridden by Creality in sdio.h
109
+
110
+//
111
+// Misc. Functions
112
+//
113
+#define CASE_LIGHT_PIN                      PA6

Laddar…
Avbryt
Spara