ソースを参照

Add Zonestar/Anet LCD for SKR mini E3 (#15931)

Daniel Negut 5年前
コミット
a3229b30ec

+ 9
- 0
Marlin/src/HAL/HAL_STM32F1/HAL.cpp ファイルの表示

@@ -121,6 +121,9 @@ const uint8_t adc_pins[] = {
121 121
   #if ENABLED(FILAMENT_WIDTH_SENSOR)
122 122
     FILWIDTH_PIN,
123 123
   #endif
124
+  #if ENABLED(ADC_KEYPAD)
125
+    ADC_KEYPAD_PIN,
126
+  #endif
124 127
   #if HAS_JOY_ADC_X
125 128
     JOY_X_PIN,
126 129
   #endif
@@ -160,6 +163,9 @@ enum TEMP_PINS : char {
160 163
   #if ENABLED(FILAMENT_WIDTH_SENSOR)
161 164
     FILWIDTH,
162 165
   #endif
166
+  #if ENABLED(ADC_KEYPAD)
167
+    ADC_KEY,
168
+  #endif
163 169
   #if HAS_JOY_ADC_X
164 170
     JOY_X,
165 171
   #endif
@@ -352,6 +358,9 @@ void HAL_adc_start_conversion(const uint8_t adc_pin) {
352 358
     #if ENABLED(FILAMENT_WIDTH_SENSOR)
353 359
       case FILWIDTH_PIN: pin_index = FILWIDTH; break;
354 360
     #endif
361
+    #if ENABLED(ADC_KEYPAD)
362
+      case ADC_KEYPAD_PIN: pin_index = ADC_KEY; break;
363
+    #endif
355 364
   }
356 365
   HAL_adc_result = (HAL_adc_results[(int)pin_index] >> 2) & 0x3FF; // shift to get 10 bits only.
357 366
 }

+ 1
- 1
Marlin/src/HAL/HAL_STM32F1/timers.h ファイルの表示

@@ -70,7 +70,7 @@ typedef uint16_t hal_timer_t;
70 70
 //#define TEMP_TIMER_NUM 4  // 2->4, Timer 2 for Stepper Current PWM
71 71
 #define PULSE_TIMER_NUM STEP_TIMER_NUM
72 72
 
73
-#if MB(BIGTREE_SKR_MINI_E3, BIGTREE_SKR_E3_DIP, BTT_SKR_MINI_E3_V1_2, MKS_ROBIN_LITE)
73
+#if MB(BTT_SKR_MINI_E3_V1_0, BIGTREE_SKR_E3_DIP, BTT_SKR_MINI_E3_V1_2, MKS_ROBIN_LITE)
74 74
   // SKR Mini E3 boards use PA8 as FAN_PIN, so TIMER 1 is used for Fan PWM.
75 75
   #ifdef STM32_HIGH_DENSITY
76 76
     #define SERVO0_TIMER_NUM 8  // tone.cpp uses Timer 4

+ 3
- 3
Marlin/src/core/boards.h ファイルの表示

@@ -270,9 +270,9 @@
270 270
 #define BOARD_MKS_ROBIN_NANO          4008  // MKS Robin Nano (STM32F103VET6)
271 271
 #define BOARD_MKS_ROBIN_LITE          4009  // MKS Robin Lite/Lite2 (STM32F103RCT6)
272 272
 #define BOARD_BIGTREE_SKR_MINI_V1_1   4010  // BigTreeTech SKR Mini v1.1 (STM32F103RC)
273
-#define BOARD_BIGTREE_SKR_MINI_E3     4011  // BigTreeTech SKR Mini E3 (STM32F103RC)
274
-#define BOARD_BIGTREE_SKR_E3_DIP      4012  // BigTreeTech SKR E3 DIP V1.0 (STM32F103RC)
275
-#define BOARD_BTT_SKR_MINI_E3_V1_2    4013  // BigTreeTech SKR Mini E3 V1.2 (STM32F103RC)
273
+#define BOARD_BTT_SKR_MINI_E3_V1_0    4011  // BigTreeTech SKR Mini E3 (STM32F103RC)
274
+#define BOARD_BTT_SKR_MINI_E3_V1_2    4012  // BigTreeTech SKR Mini E3 V1.2 (STM32F103RC)
275
+#define BOARD_BIGTREE_SKR_E3_DIP      4013  // BigTreeTech SKR E3 DIP V1.0 (STM32F103RC)
276 276
 #define BOARD_JGAURORA_A5S_A1         4014  // JGAurora A5S A1 (STM32F103ZET6)
277 277
 #define BOARD_FYSETC_AIO_II           4015  // FYSETC AIO_II
278 278
 #define BOARD_FYSETC_CHEETAH          4016  // FYSETC Cheetah

+ 4
- 0
Marlin/src/inc/SanityCheck.h ファイルの表示

@@ -420,6 +420,7 @@
420 420
 #define BOARD_STM32F1R      -1005
421 421
 #define BOARD_STM32F103R    -1006
422 422
 #define BOARD_ESP32         -1007
423
+#define BOARD_BIGTREE_SKR_MINI_E3 -1008
423 424
 #if MB(MKS_13)
424 425
   #error "BOARD_MKS_13 has been renamed BOARD_MKS_GEN_13. Please update your configuration."
425 426
 #elif MB(TRIGORILLA)
@@ -436,6 +437,8 @@
436 437
   #error "BOARD_STM32F103R has been renamed BOARD_STM32F103RE. Please update your configuration."
437 438
 #elif MOTHERBOARD == BOARD_ESP32
438 439
   #error "BOARD_ESP32 has been renamed BOARD_ESPRESSIF_ESP32. Please update your configuration."
440
+#elif MOTHERBOARD == BOARD_BIGTREE_SKR_MINI_E3
441
+  #error "BOARD_BIGTREE_SKR_MINI_E3 has been renamed BOARD_BTT_SKR_MINI_E3_V1_0. Please update your configuration."
439 442
 #endif
440 443
 #undef BOARD_MKS_13
441 444
 #undef BOARD_TRIGORILLA
@@ -445,6 +448,7 @@
445 448
 #undef BOARD_STM32F1R
446 449
 #undef BOARD_STM32F103R
447 450
 #undef BOARD_ESP32
451
+#undef BOARD_BIGTREE_SKR_MINI_E3
448 452
 
449 453
 /**
450 454
  * Marlin release, version and default string

+ 104
- 0
Marlin/src/pins/lpc1768/pins_BTT_SKR.h ファイルの表示

@@ -0,0 +1,104 @@
1
+/**
2
+ * Marlin 3D Printer Firmware
3
+ * Copyright (c) 2019 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 <http://www.gnu.org/licenses/>.
20
+ *
21
+ */
22
+#pragma once
23
+
24
+#ifndef MCU_LPC1768
25
+  #error "Oops! Make sure you have the LPC1768 environment selected in your IDE."
26
+#endif
27
+
28
+// Ignore temp readings during development.
29
+//#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000
30
+
31
+//
32
+// Limit Switches
33
+//
34
+#define X_MIN_PIN          P1_29
35
+#define X_MAX_PIN          P1_28
36
+#define Y_MIN_PIN          P1_27
37
+#define Y_MAX_PIN          P1_26
38
+#define Z_MIN_PIN          P1_25
39
+#define Z_MAX_PIN          P1_24
40
+
41
+//
42
+// Steppers
43
+//
44
+
45
+#define E1_STEP_PIN        P0_01
46
+#define E1_DIR_PIN         P0_00
47
+#define E1_ENABLE_PIN      P0_10
48
+
49
+//
50
+// Temperature Sensors
51
+//  3.3V max when defined as an analog input
52
+//
53
+#define TEMP_BED_PIN       P0_23_A0   // A0 (T0) - (67) - TEMP_BED_PIN
54
+#define TEMP_0_PIN         P0_24_A1   // A1 (T1) - (68) - TEMP_0_PIN
55
+#define TEMP_1_PIN         P0_25_A2   // A2 (T2) - (69) - TEMP_1_PIN
56
+
57
+//
58
+// Heaters / Fans
59
+//
60
+#ifndef HEATER_0_PIN
61
+  #define HEATER_0_PIN     P2_07
62
+#endif
63
+#if HOTENDS == 1
64
+  #ifndef FAN1_PIN
65
+    #define FAN1_PIN       P2_04
66
+  #endif
67
+#else
68
+  #ifndef HEATER_1_PIN
69
+    #define HEATER_1_PIN   P2_04
70
+  #endif
71
+#endif
72
+#ifndef FAN_PIN
73
+  #define FAN_PIN          P2_03
74
+#endif
75
+#ifndef HEATER_BED_PIN
76
+  #define HEATER_BED_PIN   P2_05
77
+#endif
78
+
79
+//
80
+// LCD / Controller
81
+//
82
+#if HAS_SPI_LCD
83
+  #define BEEPER_PIN       P1_30   // (37) not 5V tolerant
84
+#endif
85
+
86
+//
87
+// SD Support
88
+//
89
+#define ONBOARD_SD_CS_PIN  P0_06   // Chip select for "System" SD card
90
+
91
+#if SD_CONNECTION_IS(LCD)
92
+  #define SCK_PIN          P0_15
93
+  #define MISO_PIN         P0_17
94
+  #define MOSI_PIN         P0_18
95
+#elif SD_CONNECTION_IS(ONBOARD)
96
+  #undef SD_DETECT_PIN
97
+  #define SD_DETECT_PIN    P0_27
98
+  #define SCK_PIN          P0_07
99
+  #define MISO_PIN         P0_08
100
+  #define MOSI_PIN         P0_09
101
+  #define SS_PIN           ONBOARD_SD_CS_PIN
102
+#elif SD_CONNECTION_IS(CUSTOM_CABLE)
103
+  #error "No custom SD drive cable defined for this board."
104
+#endif

Marlin/src/pins/lpc1768/pins_BIGTREE_SKR_V1.1.h → Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h ファイルの表示

@@ -21,23 +21,9 @@
21 21
  */
22 22
 #pragma once
23 23
 
24
-#ifndef MCU_LPC1768
25
-  #error "Oops! Make sure you have the LPC1768 environment selected in your IDE."
26
-#endif
27
-
28 24
 #define BOARD_INFO_NAME "BIGTREE SKR 1.1"
29 25
 
30 26
 //
31
-// Limit Switches
32
-//
33
-#define X_MIN_PIN          P1_29
34
-#define X_MAX_PIN          P1_28
35
-#define Y_MIN_PIN          P1_27
36
-#define Y_MAX_PIN          P1_26
37
-#define Z_MIN_PIN          P1_25
38
-#define Z_MAX_PIN          P1_24
39
-
40
-//
41 27
 // Steppers
42 28
 //
43 29
 #define X_STEP_PIN         P0_04
@@ -56,30 +42,6 @@
56 42
 #define E0_DIR_PIN         P2_13
57 43
 #define E0_ENABLE_PIN      P2_12
58 44
 
59
-#define E1_STEP_PIN        P0_01
60
-#define E1_DIR_PIN         P0_00
61
-#define E1_ENABLE_PIN      P0_10
62
-
63
-//
64
-// Temperature Sensors
65
-//  3.3V max when defined as an analog input
66
-//
67
-#define TEMP_BED_PIN       P0_23_A0   // Analog Input
68
-#define TEMP_0_PIN         P0_24_A1   // Analog Input
69
-#define TEMP_1_PIN         P0_25_A2   // Analog Input
70
-
71
-//
72
-// Heaters / Fans
73
-//
74
-#define HEATER_0_PIN       P2_07
75
-#if HOTENDS == 1
76
-  #define FAN1_PIN         P2_04
77
-#else
78
-  #define HEATER_1_PIN     P2_04
79
-#endif
80
-#define FAN_PIN            P2_03
81
-#define HEATER_BED_PIN     P2_05
82
-
83 45
 /**
84 46
  * LCD / Controller
85 47
  *
@@ -94,7 +56,6 @@
94 56
  */
95 57
 
96 58
 #if HAS_SPI_LCD
97
-  #define BEEPER_PIN       P1_30
98 59
   #define BTN_EN1          P3_26
99 60
   #define BTN_EN2          P3_25
100 61
   #define BTN_ENC          P2_11
@@ -125,22 +86,8 @@
125 86
   #endif
126 87
 #endif
127 88
 
128
-#define ONBOARD_SD_CS_PIN  P0_06   // Chip select for "System" SD card
129
-
130 89
 #if SD_CONNECTION_IS(LCD)
131
-  #define SCK_PIN          P0_15
132
-  #define MISO_PIN         P0_17
133
-  #define MOSI_PIN         P0_18
134 90
   #define SS_PIN           P1_23
135
-#elif SD_CONNECTION_IS(ONBOARD)
136
-  #undef SD_DETECT_PIN
137
-  #define SD_DETECT_PIN    P0_27
138
-  #define SCK_PIN          P0_07
139
-  #define MISO_PIN         P0_08
140
-  #define MOSI_PIN         P0_09
141
-  #define SS_PIN           ONBOARD_SD_CS_PIN
142
-#elif SD_CONNECTION_IS(CUSTOM_CABLE)
143
-  #error "No custom SD drive cable defined for this board."
144 91
 #endif
145 92
 
146 93
 // Trinamic driver support
@@ -270,3 +217,6 @@
270 217
   #endif // SOFTWARE_DRIVER_ENABLE
271 218
 
272 219
 #endif
220
+
221
+// Include common SKR pins
222
+#include "pins_BTT_SKR.h"

Marlin/src/pins/lpc1768/pins_BIGTREE_SKR_V1.3.h → Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h ファイルの表示

@@ -21,15 +21,8 @@
21 21
  */
22 22
 #pragma once
23 23
 
24
-#ifndef MCU_LPC1768
25
-  #error "Oops! Make sure you have the LPC1768 environment selected in your IDE."
26
-#endif
27
-
28 24
 #define BOARD_INFO_NAME "BIGTREE SKR 1.3"
29 25
 
30
-// Ignore temp readings during development.
31
-//#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000
32
-
33 26
 //
34 27
 // Servos
35 28
 //
@@ -38,16 +31,6 @@
38 31
 #endif
39 32
 
40 33
 //
41
-// Limit Switches
42
-//
43
-#define X_MIN_PIN          P1_29
44
-#define X_MAX_PIN          P1_28
45
-#define Y_MIN_PIN          P1_27
46
-#define Y_MAX_PIN          P1_26
47
-#define Z_MIN_PIN          P1_25
48
-#define Z_MAX_PIN          P1_24
49
-
50
-//
51 34
 // Z Probe (when not Z_MIN_PIN)
52 35
 //
53 36
 #ifndef Z_MIN_PROBE_PIN
@@ -92,9 +75,6 @@
92 75
   #define E0_CS_PIN        P1_08
93 76
 #endif
94 77
 
95
-#define E1_STEP_PIN        P0_01
96
-#define E1_DIR_PIN         P0_00
97
-#define E1_ENABLE_PIN      P0_10
98 78
 #ifndef E1_CS_PIN
99 79
   #define E1_CS_PIN        P1_01
100 80
 #endif
@@ -158,36 +138,6 @@
158 138
   #define TMC_BAUD_RATE 19200
159 139
 #endif
160 140
 
161
-//
162
-// Temperature Sensors
163
-//  3.3V max when defined as an analog input
164
-//
165
-#define TEMP_BED_PIN       P0_23_A0   // A0 (T0) - (67) - TEMP_BED_PIN
166
-#define TEMP_0_PIN         P0_24_A1   // A1 (T1) - (68) - TEMP_0_PIN
167
-#define TEMP_1_PIN         P0_25_A2   // A2 (T2) - (69) - TEMP_1_PIN
168
-
169
-//
170
-// Heaters / Fans
171
-//
172
-#ifndef HEATER_0_PIN
173
-  #define HEATER_0_PIN     P2_07
174
-#endif
175
-#if HOTENDS == 1
176
-  #ifndef FAN1_PIN
177
-    #define FAN1_PIN       P2_04
178
-  #endif
179
-#else
180
-  #ifndef HEATER_1_PIN
181
-    #define HEATER_1_PIN   P2_04
182
-  #endif
183
-#endif
184
-#ifndef FAN_PIN
185
-  #define FAN_PIN          P2_03
186
-#endif
187
-#ifndef HEATER_BED_PIN
188
-  #define HEATER_BED_PIN   P2_05
189
-#endif
190
-
191 141
 /**
192 142
  *              _____                                             _____
193 143
  *          NC | · · | GND                                    5V | · · | GND
@@ -199,7 +149,6 @@
199 149
  *              EXP2                                              EXP1
200 150
  */
201 151
 #if HAS_SPI_LCD
202
-  #define BEEPER_PIN       P1_30   // (37) not 5V tolerant
203 152
   #define BTN_ENC          P0_28   // (58) open-drain
204 153
 
205 154
   #if ENABLED(CR10_STOCKDISPLAY)
@@ -280,22 +229,8 @@
280 229
   #define SDCARD_CONNECTION LCD
281 230
 #endif
282 231
 
283
-#define ONBOARD_SD_CS_PIN  P0_06   // Chip select for "System" SD card
284
-
285 232
 #if SD_CONNECTION_IS(LCD)
286
-  #define SCK_PIN          P0_15
287
-  #define MISO_PIN         P0_17
288
-  #define MOSI_PIN         P0_18
289 233
   #define SS_PIN           P0_16
290
-#elif SD_CONNECTION_IS(ONBOARD)
291
-  #undef SD_DETECT_PIN
292
-  #define SD_DETECT_PIN    P0_27
293
-  #define SCK_PIN          P0_07
294
-  #define MISO_PIN         P0_08
295
-  #define MOSI_PIN         P0_09
296
-  #define SS_PIN           ONBOARD_SD_CS_PIN
297
-#elif SD_CONNECTION_IS(CUSTOM_CABLE)
298
-  #error "No custom SD drive cable defined for this board."
299 234
 #endif
300 235
 
301 236
 /**
@@ -305,3 +240,6 @@
305 240
  *   P0_27  (57) (Open collector)
306 241
  *   P0_28  (58) (Open collector)
307 242
  */
243
+
244
+// Include common SKR pins
245
+#include "pins_BTT_SKR.h"

+ 8
- 8
Marlin/src/pins/pins.h ファイルの表示

@@ -355,11 +355,11 @@
355 355
 #elif MB(SELENA_COMPACT)
356 356
   #include "lpc1768/pins_SELENA_COMPACT.h"      // LPC1768                                env:LPC1768
357 357
 #elif MB(BIGTREE_SKR_V1_1)
358
-  #include "lpc1768/pins_BIGTREE_SKR_V1.1.h"    // LPC1768                                env:LPC1768
358
+  #include "lpc1768/pins_BTT_SKR_V1_1.h"        // LPC1768                                env:LPC1768
359 359
 #elif MB(BIQU_B300_V1_0)
360 360
   #include "lpc1768/pins_BIQU_B300_V1.0.h"      // LPC1768                                env:LPC1768
361 361
 #elif MB(BIGTREE_SKR_V1_3)
362
-  #include "lpc1768/pins_BIGTREE_SKR_V1.3.h"    // LPC1768                                env:LPC1768
362
+  #include "lpc1768/pins_BTT_SKR_V1_3.h"        // LPC1768                                env:LPC1768
363 363
 #elif MB(GMARSH_X6_REV1)
364 364
   #include "lpc1768/pins_GMARSH_X6_REV1.h"      // LPC1768                                env:LPC1768
365 365
 
@@ -470,13 +470,13 @@
470 470
 #elif MB(MKS_ROBIN_LITE)
471 471
   #include "stm32/pins_MKS_ROBIN_LITE.h"        // STM32F1                                env:mks_robin_lite
472 472
 #elif MB(BIGTREE_SKR_MINI_V1_1)
473
-  #include "stm32/pins_BIGTREE_SKR_MINI_V1_1.h" // STM32F1                                env:STM32F103RC_bigtree env:STM32F103RC_bigtree_512K env:STM32F103RC_bigtree_NOUSB env:STM32F103RC_bigtree_512K_NOUSB
473
+  #include "stm32/pins_BTT_SKR_MINI_V1_1.h"     // STM32F1                                env:STM32F103RC_bigtree env:STM32F103RC_bigtree_512K env:STM32F103RC_bigtree_NOUSB env:STM32F103RC_bigtree_512K_NOUSB
474
+#elif MB(BTT_SKR_MINI_E3_V1_0)
475
+  #include "stm32/pins_BTT_SKR_MINI_E3_V1_0.h"  // STM32F1                                env:STM32F103RC_bigtree env:STM32F103RC_bigtree_512K env:STM32F103RC_bigtree_NOUSB env:STM32F103RC_bigtree_512K_NOUSB
474 476
 #elif MB(BTT_SKR_MINI_E3_V1_2)
475 477
   #include "stm32/pins_BTT_SKR_MINI_E3_V1_2.h"  // STM32F1                                env:STM32F103RC_bigtree env:STM32F103RC_bigtree_512K env:STM32F103RC_bigtree_NOUSB env:STM32F103RC_bigtree_512K_NOUSB
476
-#elif MB(BIGTREE_SKR_MINI_E3)
477
-  #include "stm32/pins_BIGTREE_SKR_MINI_E3.h"   // STM32F1                                env:STM32F103RC_bigtree env:STM32F103RC_bigtree_512K env:STM32F103RC_bigtree_NOUSB env:STM32F103RC_bigtree_512K_NOUSB
478 478
 #elif MB(BIGTREE_SKR_E3_DIP)
479
-  #include "stm32/pins_BIGTREE_SKR_E3_DIP.h"    // STM32F1                                env:STM32F103RC_bigtree env:STM32F103RC_bigtree_512K env:STM32F103RC_bigtree_NOUSB env:STM32F103RC_bigtree_512K_NOUSB
479
+  #include "stm32/pins_BTT_SKR_E3_DIP.h"        // STM32F1                                env:STM32F103RC_bigtree env:STM32F103RC_bigtree_512K env:STM32F103RC_bigtree_NOUSB env:STM32F103RC_bigtree_512K_NOUSB
480 480
 #elif MB(JGAURORA_A5S_A1)
481 481
   #include "stm32/pins_JGAURORA_A5S_A1.h"       // STM32F1                                env:jgaurora_a5s_a1
482 482
 #elif MB(FYSETC_AIO_II)
@@ -514,9 +514,9 @@
514 514
 #elif MB(STEVAL)
515 515
   #include "stm32/pins_STEVAL.h"                // STM32F4                                env:STM32F4
516 516
 #elif MB(BIGTREE_SKR_PRO_V1_1)
517
-  #include "stm32/pins_BIGTREE_SKR_PRO_V1.1.h"  // STM32F4                                env:BIGTREE_SKR_PRO
517
+  #include "stm32/pins_BTT_SKR_PRO_V1_1.h"      // STM32F4                                env:BIGTREE_SKR_PRO
518 518
 #elif MB(BIGTREE_BTT002_V1_0)
519
-  #include "stm32/pins_BIGTREE_BTT002_V1.0.h"   // STM32F4                                env:BIGTREE_BTT002
519
+  #include "stm32/pins_BTT_BTT002_V1_0.h"       // STM32F4                                env:BIGTREE_BTT002
520 520
 #elif MB(LERDGE_K)
521 521
   #include "stm32/pins_LERDGE_K.h"              // STM32F4                                env:STM32F4
522 522
 #elif MB(LERDGE_X)

Marlin/src/pins/stm32/pins_BIGTREE_BTT002_V1.0.h → Marlin/src/pins/stm32/pins_BTT_BTT002_V1_0.h ファイルの表示


Marlin/src/pins/stm32/pins_BIGTREE_SKR_E3_DIP.h → Marlin/src/pins/stm32/pins_BTT_SKR_E3_DIP.h ファイルの表示


Marlin/src/pins/stm32/pins_BIGTREE_SKR_MINI_E3.h → Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3.h ファイルの表示

@@ -25,8 +25,6 @@
25 25
   #error "Oops! Select an STM32F1 board in 'Tools > Board.'"
26 26
 #endif
27 27
 
28
-#define BOARD_INFO_NAME "BIGTREE SKR Mini E3"
29
-
30 28
 // Release PB3/PB4 (E0 STP/DIR) from JTAG pins
31 29
 #define DISABLE_JTAG
32 30
 
@@ -60,7 +58,7 @@
60 58
 // Filament Runout Sensor
61 59
 //
62 60
 #ifndef FIL_RUNOUT_PIN
63
-  #define FIL_RUNOUT_PIN   PC15
61
+  #define FIL_RUNOUT_PIN   PC15   // "E0-STOP"
64 62
 #endif
65 63
 
66 64
 //
@@ -82,17 +80,6 @@
82 80
 #define E0_STEP_PIN        PB3
83 81
 #define E0_DIR_PIN         PB4
84 82
 
85
-#if HAS_DRIVER(TMC2209)
86
-  /**
87
-   * TMC2209 stepper drivers
88
-   * Hardware serial communication ports.
89
-   */
90
-  #define X_HARDWARE_SERIAL  Serial4
91
-  #define Y_HARDWARE_SERIAL  Serial4
92
-  #define Z_HARDWARE_SERIAL  Serial4
93
-  #define E0_HARDWARE_SERIAL Serial4
94
-#endif
95
-
96 83
 //
97 84
 // Temperature Sensors
98 85
 //
@@ -125,10 +112,12 @@
125 112
  *                 EXP1
126 113
  */
127 114
 #if HAS_SPI_LCD
128
-  #define BEEPER_PIN       PB5
129
-  #define BTN_ENC          PB6
130 115
 
131 116
   #if ENABLED(CR10_STOCKDISPLAY)
117
+
118
+    #define BEEPER_PIN     PB5
119
+    #define BTN_ENC        PB6
120
+
132 121
     #define LCD_PINS_RS    PB8
133 122
 
134 123
     #define BTN_EN1        PA9
@@ -137,6 +126,16 @@
137 126
     #define LCD_PINS_ENABLE PB7
138 127
     #define LCD_PINS_D4    PB9
139 128
 
129
+  #elif ENABLED(ZONESTAR_LCD)     // ANET A8 LCD Controller - Must convert to 3.3V - CONNECTING TO 5V WILL DAMAGE THE BOARD!
130
+
131
+    #define LCD_PINS_RS    PB9
132
+    #define LCD_PINS_ENABLE PB6
133
+    #define LCD_PINS_D4    PB8
134
+    #define LCD_PINS_D5    PA10
135
+    #define LCD_PINS_D6    PA9
136
+    #define LCD_PINS_D7    PB5
137
+    #define ADC_KEYPAD_PIN PA1    // Repurpose servo pin for ADC - CONNECTING TO 5V WILL DAMAGE THE BOARD!
138
+
140 139
   #elif ENABLED(MKS_MINI_12864)
141 140
 
142 141
     /** Creality Ender-2 display pinout
@@ -149,18 +148,19 @@
149 148
      *                   -----
150 149
      *                    EXP1
151 150
      */
152
-
153
-    #define BTN_EN1      PA9
154
-    #define BTN_EN2      PA10
155
-    #define DOGLCD_CS    PB8
156
-    #define DOGLCD_A0    PB9
157
-    #define DOGLCD_SCK   PA15
158
-    #define DOGLCD_MOSI  PB7
151
+    #define BTN_EN1        PA9
152
+    #define BTN_EN2        PA10
153
+    #define DOGLCD_CS      PB8
154
+    #define DOGLCD_A0      PB9
155
+    #define DOGLCD_SCK     PA15
156
+    #define DOGLCD_MOSI    PB7
159 157
     #define FORCE_SOFT_SPI
160 158
     #define LCD_BACKLIGHT_PIN -1
161 159
 
162 160
   #else
163
-    #error "Only CR10_STOCKDISPLAY and MKS_MINI_12864 are currently supported on the BIGTREE_SKR_MINI_E3."
161
+
162
+    #error "Only CR10_STOCKDISPLAY, ZONESTAR_LCD, and MKS_MINI_12864 are currently supported on the BIGTREE_SKR_MINI_E3."
163
+
164 164
   #endif
165 165
 
166 166
 #endif // HAS_SPI_LCD
@@ -174,5 +174,5 @@
174 174
   #define SDCARD_CONNECTION ONBOARD
175 175
 #endif
176 176
 
177
-#define ON_BOARD_SPI_DEVICE 1    //SPI1
177
+#define ON_BOARD_SPI_DEVICE 1    // SPI1
178 178
 #define ONBOARD_SD_CS_PIN  PA4   // Chip select for "System" SD card

+ 37
- 0
Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3_V1_0.h ファイルの表示

@@ -0,0 +1,37 @@
1
+/**
2
+ * Marlin 3D Printer Firmware
3
+ * Copyright (c) 2019 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 <http://www.gnu.org/licenses/>.
20
+ *
21
+ */
22
+#pragma once
23
+
24
+#include "pins_BTT_SKR_MINI_E3.h"
25
+
26
+#define BOARD_INFO_NAME "BIGTREE SKR Mini E3"
27
+
28
+/**
29
+ * TMC2209 stepper drivers
30
+ * Hardware serial communication ports.
31
+ */
32
+#if HAS_DRIVER(TMC2209)
33
+  #define X_HARDWARE_SERIAL  Serial4
34
+  #define Y_HARDWARE_SERIAL  Serial4
35
+  #define Z_HARDWARE_SERIAL  Serial4
36
+  #define E0_HARDWARE_SERIAL Serial4
37
+#endif

+ 5
- 124
Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3_V1_2.h ファイルの表示

@@ -21,71 +21,16 @@
21 21
  */
22 22
 #pragma once
23 23
 
24
-#ifndef TARGET_STM32F1
25
-  #error "Oops! Select an STM32F1 board in 'Tools > Board.'"
26
-#endif
24
+#include "pins_BTT_SKR_MINI_E3.h"
27 25
 
28 26
 #define BOARD_INFO_NAME "BIGTREE SKR Mini E3 V1.2"
29 27
 
30
-// Release PB3/PB4 (E0 STP/DIR) from JTAG pins
31
-#define DISABLE_JTAG
32
-
33
-// Ignore temp readings during development.
34
-//#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000
35
-
36
-#define FLASH_EEPROM_EMULATION
37
-#define EEPROM_PAGE_SIZE     uint16(0x800) // 2KB
38
-#define EEPROM_START_ADDRESS uint32(0x8000000 + (STM32_FLASH_SIZE) * 1024 - 2 * EEPROM_PAGE_SIZE)
39
-#undef E2END
40
-#define E2END                (EEPROM_PAGE_SIZE - 1) // 2KB
41
-
42
-//
43
-// Servos
44
-//
45
-#define SERVO0_PIN         PA1
46
-
47
-//
48
-// Limit Switches
49
-//
50
-#define X_STOP_PIN         PC0
51
-#define Y_STOP_PIN         PC1
52
-#define Z_STOP_PIN         PC2
53
-
54
-//
55
-// Z Probe must be this pins
56
-//
57
-#define Z_MIN_PROBE_PIN    PC14
58
-
59
-//
60
-// Filament Runout Sensor
61
-//
62
-#ifndef FIL_RUNOUT_PIN
63
-  #define FIL_RUNOUT_PIN   PC15   // "E0-STOP"
64
-#endif
65
-
66
-//
67
-// Steppers
68
-//
69
-#define X_ENABLE_PIN       PB14
70
-#define X_STEP_PIN         PB13
71
-#define X_DIR_PIN          PB12
72
-
73
-#define Y_ENABLE_PIN       PB11
74
-#define Y_STEP_PIN         PB10
75
-#define Y_DIR_PIN          PB2
76
-
77
-#define Z_ENABLE_PIN       PB1
78
-#define Z_STEP_PIN         PB0
79
-#define Z_DIR_PIN          PC5
80
-
81
-#define E0_ENABLE_PIN      PD2
82
-#define E0_STEP_PIN        PB3
83
-#define E0_DIR_PIN         PB4
28
+#define NEOPIXEL_PIN       PC7  // LED driving pin
84 29
 
30
+/**
31
+ * TMC2208/TMC2209 stepper drivers
32
+ */
85 33
 #if HAS_TMC220x
86
-  /**
87
-   * TMC2208/TMC2209 stepper drivers
88
-   */
89 34
   //
90 35
   // Software serial
91 36
   //
@@ -104,67 +49,3 @@
104 49
   // Reduce baud rate to improve software serial reliability
105 50
   #define TMC_BAUD_RATE 19200
106 51
 #endif
107
-
108
-//
109
-// Temperature Sensors
110
-//
111
-#define TEMP_0_PIN         PA0   // Analog Input
112
-#define TEMP_BED_PIN       PC3   // Analog Input
113
-
114
-//
115
-// Heaters / Fans
116
-//
117
-#define HEATER_0_PIN       PC8   // EXTRUDER
118
-#define HEATER_BED_PIN     PC9   // BED
119
-#define FAN_PIN            PA8
120
-
121
-//
122
-// USB connect control
123
-//
124
-#define USB_CONNECT_PIN    PC13
125
-#define USB_CONNECT_INVERTING false
126
-
127
-#define NEOPIXEL_PIN       PC7  // LED driving pin
128
-
129
-#define SD_DETECT_PIN      PC4
130
-
131
-/**
132
- *                 _____
133
- *             5V | · · | GND
134
- *  (LCD_EN) PB7  | · · | PB8  (LCD_RS)
135
- *  (LCD_D4) PB9  | · · | PA10 (BTN_EN2)
136
- *          RESET | · · | PA9  (BTN_EN1)
137
- * (BTN_ENC) PB6  | · · | PB5  (BEEPER)
138
- *                 -----
139
- *                 EXP1
140
- */
141
-#if HAS_SPI_LCD
142
-  #define BEEPER_PIN       PB5
143
-  #define BTN_ENC          PB6
144
-
145
-  #if ENABLED(CR10_STOCKDISPLAY)
146
-    #define LCD_PINS_RS    PB8
147
-
148
-    #define BTN_EN1        PA9
149
-    #define BTN_EN2        PA10
150
-
151
-    #define LCD_PINS_ENABLE PB7
152
-    #define LCD_PINS_D4    PB9
153
-
154
-  #else
155
-    #error "Only CR10_STOCKDISPLAY is currently supported on the BIGTREE_SKR_MINI_E3 V1.2."
156
-  #endif
157
-
158
-#endif // HAS_SPI_LCD
159
-
160
-//
161
-// SD Support
162
-//
163
-#define HAS_ONBOARD_SD
164
-
165
-#ifndef SDCARD_CONNECTION
166
-  #define SDCARD_CONNECTION ONBOARD
167
-#endif
168
-
169
-#define ON_BOARD_SPI_DEVICE 1    //SPI1
170
-#define ONBOARD_SD_CS_PIN  PA4   // Chip select for "System" SD card

Marlin/src/pins/stm32/pins_BIGTREE_SKR_MINI_V1_1.h → Marlin/src/pins/stm32/pins_BTT_SKR_MINI_V1_1.h ファイルの表示


Marlin/src/pins/stm32/pins_BIGTREE_SKR_PRO_V1.1.h → Marlin/src/pins/stm32/pins_BTT_SKR_PRO_V1_1.h ファイルの表示


+ 1
- 1
buildroot/share/tests/STM32F103RC_bigtree_NOUSB-tests ファイルの表示

@@ -10,7 +10,7 @@ set -e
10 10
 # Build with the default configurations
11 11
 #
12 12
 restore_configs
13
-opt_set MOTHERBOARD BOARD_BIGTREE_SKR_MINI_E3
13
+opt_set MOTHERBOARD BOARD_BTT_SKR_MINI_E3_V1_0
14 14
 opt_set SERIAL_PORT 1
15 15
 opt_set SERIAL_PORT_2 -1
16 16
 exec_test $1 $2 "Bigtreetech SKR Mini E3 - Basic Configuration"

読み込み中…
キャンセル
保存