ソースを参照

🔨 Envs for BTT SKR Mini with RET6 (512K) (#22050)

Keith Bennett 4年前
コミット
673bccef3e
コミッターのメールアドレスに関連付けられたアカウントが存在しません
4個のファイルの変更16行の追加57行の削除
  1. 1
    1
      Marlin/src/core/boards.h
  2. 6
    6
      Marlin/src/pins/pins.h
  3. 2
    24
      ini/stm32f1-maple.ini
  4. 7
    26
      ini/stm32f1.ini

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

@@ -321,7 +321,7 @@
321 321
 #define BOARD_BTT_SKR_MINI_V1_1       4023  // BigTreeTech SKR Mini v1.1 (STM32F103RC)
322 322
 #define BOARD_BTT_SKR_MINI_E3_V1_0    4024  // BigTreeTech SKR Mini E3 (STM32F103RC)
323 323
 #define BOARD_BTT_SKR_MINI_E3_V1_2    4025  // BigTreeTech SKR Mini E3 V1.2 (STM32F103RC)
324
-#define BOARD_BTT_SKR_MINI_E3_V2_0    4026  // BigTreeTech SKR Mini E3 V2.0 (STM32F103RC)
324
+#define BOARD_BTT_SKR_MINI_E3_V2_0    4026  // BigTreeTech SKR Mini E3 V2.0 (STM32F103RC / STM32F103RE)
325 325
 #define BOARD_BTT_SKR_MINI_MZ_V1_0    4027  // BigTreeTech SKR Mini MZ V1.0 (STM32F103RC)
326 326
 #define BOARD_BTT_SKR_E3_DIP          4028  // BigTreeTech SKR E3 DIP V1.0 (STM32F103RC / STM32F103RE)
327 327
 #define BOARD_BTT_SKR_CR6             4029  // BigTreeTech SKR CR6 v1.0 (STM32F103RE)

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

@@ -508,17 +508,17 @@
508 508
 #elif MB(MKS_ROBIN_E3P)
509 509
   #include "stm32f1/pins_MKS_ROBIN_E3P.h"       // STM32F1                                env:mks_robin_e3p
510 510
 #elif MB(BTT_SKR_MINI_V1_1)
511
-  #include "stm32f1/pins_BTT_SKR_MINI_V1_1.h"   // STM32F1                                env:STM32F103RC_btt env:STM32F103RC_btt_512K env:STM32F103RC_btt_maple env:STM32F103RC_btt_512K_maple env:STM32F103RC_btt_USB_maple env:STM32F103RC_btt_512K_USB_maple
511
+  #include "stm32f1/pins_BTT_SKR_MINI_V1_1.h"   // STM32F1                                env:STM32F103RC_btt env:STM32F103RC_btt_USB env:STM32F103RC_btt_maple env:STM32F103RC_btt_USB_maple
512 512
 #elif MB(BTT_SKR_MINI_E3_V1_0)
513
-  #include "stm32f1/pins_BTT_SKR_MINI_E3_V1_0.h"  // STM32F1                              env:STM32F103RC_btt env:STM32F103RC_btt_512K env:STM32F103RC_btt_maple env:STM32F103RC_btt_512K_maple env:STM32F103RC_btt_USB_maple env:STM32F103RC_btt_512K_USB_maple
513
+  #include "stm32f1/pins_BTT_SKR_MINI_E3_V1_0.h"  // STM32F1                              env:STM32F103RC_btt env:STM32F103RC_btt_USB env:STM32F103RC_btt_maple env:STM32F103RC_btt_USB_maple
514 514
 #elif MB(BTT_SKR_MINI_E3_V1_2)
515
-  #include "stm32f1/pins_BTT_SKR_MINI_E3_V1_2.h"  // STM32F1                              env:STM32F103RC_btt env:STM32F103RC_btt_512K env:STM32F103RC_btt_maple env:STM32F103RC_btt_512K_maple env:STM32F103RC_btt_USB_maple env:STM32F103RC_btt_512K_USB_maple
515
+  #include "stm32f1/pins_BTT_SKR_MINI_E3_V1_2.h"  // STM32F1                              env:STM32F103RC_btt env:STM32F103RC_btt_USB env:STM32F103RC_btt_maple env:STM32F103RC_btt_USB_maple
516 516
 #elif MB(BTT_SKR_MINI_E3_V2_0)
517
-  #include "stm32f1/pins_BTT_SKR_MINI_E3_V2_0.h"  // STM32F1                              env:STM32F103RC_btt env:STM32F103RC_btt_512K env:STM32F103RC_btt_maple env:STM32F103RC_btt_512K_maple env:STM32F103RC_btt_USB_maple env:STM32F103RC_btt_512K_USB_maple
517
+  #include "stm32f1/pins_BTT_SKR_MINI_E3_V2_0.h"  // STM32F1                              env:STM32F103RC_btt env:STM32F103RC_btt_USB env:STM32F103RE_btt env:STM32F103RE_btt_USB env:STM32F103RC_btt_maple env:STM32F103RC_btt_USB_maple env:STM32F103RE_btt_maple env:STM32F103RE_btt_USB_maple
518 518
 #elif MB(BTT_SKR_MINI_MZ_V1_0)
519
-  #include "stm32f1/pins_BTT_SKR_MINI_MZ_V1_0.h"  // STM32F1                              env:STM32F103RC_btt env:STM32F103RC_btt_512K env:STM32F103RC_btt_maple env:STM32F103RC_btt_512K_maple env:STM32F103RC_btt_USB_maple env:STM32F103RC_btt_512K_USB_maple
519
+  #include "stm32f1/pins_BTT_SKR_MINI_MZ_V1_0.h"  // STM32F1                              env:STM32F103RC_btt env:STM32F103RC_btt_USB env:STM32F103RC_btt_maple env:STM32F103RC_btt_USB_maple
520 520
 #elif MB(BTT_SKR_E3_DIP)
521
-  #include "stm32f1/pins_BTT_SKR_E3_DIP.h"      // STM32F1                                env:STM32F103RE_btt env:STM32F103RE_btt_USB env:STM32F103RE_btt_maple env:STM32F103RE_btt_USB_maple env:STM32F103RC_btt env:STM32F103RC_btt_512K
521
+  #include "stm32f1/pins_BTT_SKR_E3_DIP.h"      // STM32F1                                env:STM32F103RC_btt env:STM32F103RC_btt_USB env:STM32F103RE_btt env:STM32F103RE_btt_USB env:STM32F103RC_btt_maple env:STM32F103RC_btt_USB_maple env:STM32F103RE_btt_maple env:STM32F103RE_btt_USB_maple
522 522
 #elif MB(BTT_SKR_CR6)
523 523
   #include "stm32f1/pins_BTT_SKR_CR6.h"         // STM32F1                                env:STM32F103RE_btt env:STM32F103RE_btt_USB env:STM32F103RE_btt_maple env:STM32F103RE_btt_USB_maple
524 524
 #elif MB(JGAURORA_A5S_A1)

+ 2
- 24
ini/stm32f1-maple.ini ファイルの表示

@@ -85,19 +85,11 @@ debug_tool        = stlink
85 85
 upload_protocol   = serial
86 86
 
87 87
 #
88
-# BigTree SKR Mini V1.1 / SKR mini E3 / SKR E3 DIP (STM32F103RCT6 ARM Cortex-M3)
88
+# BigTree SKR Mini V1.1 / SKR Mini E3 & MZ (STM32F103RCT6 ARM Cortex-M3)
89 89
 #
90 90
 #   STM32F103RC_btt_maple ............. RCT6 with 256K
91 91
 #   STM32F103RC_btt_USB_maple ......... RCT6 with 256K (USB mass storage)
92
-#   STM32F103RC_btt_512K_maple ........ RCT6 with 512K
93
-#   STM32F103RC_btt_512K_USB_maple .... RCT6 with 512K (USB mass storage)
94 92
 #
95
-# WARNING! If you have an SKR Mini v1.1 or an SKR Mini E3 1.0 / 1.2 / 2.0 / DIP
96
-# and experience a printer freeze, re-flash Marlin using the regular (non-512K)
97
-# build option. 256K chips may be re-branded 512K chips, but this means the
98
-# upper 256K is sketchy, and failure is very likely.
99
-#
100
-
101 93
 [env:STM32F103RC_btt_maple]
102 94
 platform             = ${common_stm32f1.platform}
103 95
 extends              = common_STM32F103RC_maple
@@ -116,20 +108,6 @@ build_flags       = ${env:STM32F103RC_btt_maple.build_flags} -DUSE_USB_COMPOSITE
116 108
 lib_deps          = ${env:STM32F103RC_btt_maple.lib_deps}
117 109
   USBComposite for STM32F1@0.91
118 110
 
119
-[env:STM32F103RC_btt_512K_maple]
120
-platform                  = ${common_stm32f1.platform}
121
-extends                   = env:STM32F103RC_btt_maple
122
-board_build.ldscript      = STM32F103RE_SKR_MINI_512K.ld
123
-board_upload.maximum_size = 524288
124
-build_flags               = ${env:STM32F103RC_btt_maple.build_flags} -DSTM32_FLASH_SIZE=512
125
-
126
-[env:STM32F103RC_btt_512K_USB_maple]
127
-platform          = ${common_stm32f1.platform}
128
-extends           = env:STM32F103RC_btt_512K_maple
129
-build_flags       = ${env:STM32F103RC_btt_512K_maple.build_flags} -DUSE_USB_COMPOSITE
130
-lib_deps          = ${env:STM32F103RC_btt_512K_maple.lib_deps}
131
-  USBComposite for STM32F1@0.91
132
-
133 111
 #
134 112
 # Generic STM32F103RE environment
135 113
 #
@@ -155,7 +133,7 @@ debug_tool           = jlink
155 133
 upload_protocol      = jlink
156 134
 
157 135
 #
158
-# BigTree SKR Mini E3 DIP / SKR CR6 (STM32F103RET6 ARM Cortex-M3)
136
+# BigTree SKR Mini E3 V2.0 & DIP / SKR CR6 (STM32F103RET6 ARM Cortex-M3)
159 137
 #
160 138
 #   STM32F103RE_btt_maple ............. RET6
161 139
 #   STM32F103RE_btt_USB_maple ......... RET6 (USB mass storage)

+ 7
- 26
ini/stm32f1.ini ファイルの表示

@@ -34,19 +34,6 @@ src_filter    = ${common.default_src_filter} +<src/HAL/STM32> +<src/HAL/shared/b
34 34
 extra_scripts = ${common.extra_scripts}
35 35
   pre:buildroot/share/PlatformIO/scripts/stm32_serialbuffer.py
36 36
 
37
-#
38
-# BigTree SKR Mini V1.1 / SKR mini E3 / SKR E3 DIP (STM32F103RCT6 ARM Cortex-M3)
39
-#
40
-#   STM32F103RC_btt ............. RCT6 with 256K
41
-#   STM32F103RC_btt_USB ......... RCT6 with 256K (USB mass storage)
42
-#   STM32F103RC_btt_512K ........ RCT6 with 512K
43
-#   STM32F103RC_btt_512K_USB .... RCT6 with 512K (USB mass storage)
44
-#
45
-# WARNING! If you have an SKR Mini v1.1 or an SKR Mini E3 1.0 / 1.2 / 2.0 / DIP
46
-# and experience a printer freeze, re-flash Marlin using the regular (non-512K)
47
-# build option. 256K chips may be re-branded 512K chips, but this means the
48
-# upper 256K is sketchy, and failure is very likely.
49
-#
50 37
 [common_STM32F103RC]
51 38
 platform             = ${common_stm32.platform}
52 39
 extends              = common_stm32
@@ -86,6 +73,12 @@ extends           = common_stm32
86 73
 board             = genericSTM32F103ZE
87 74
 monitor_speed     = 115200
88 75
 
76
+#
77
+# BigTree SKR Mini V1.1 / SKR Mini E3 & MZ (STM32F103RCT6 ARM Cortex-M3)
78
+#
79
+#   STM32F103RC_btt ............. RCT6 with 256K
80
+#   STM32F103RC_btt_USB ......... RCT6 with 256K (USB mass storage)
81
+#
89 82
 [env:STM32F103RC_btt]
90 83
 platform             = ${common_stm32.platform}
91 84
 extends              = common_STM32F103RC
@@ -108,18 +101,6 @@ build_flags       = ${env:STM32F103RC_btt.build_flags} ${env:stm32_flash_drive.b
108 101
   -DUSE_USB_HS_IN_FS
109 102
   -DUSBD_USE_CDC_MSC
110 103
 
111
-[env:STM32F103RC_btt_512K]
112
-platform          = ${common_stm32.platform}
113
-extends           = env:STM32F103RC_btt
114
-board_upload.maximum_size = 524288
115
-build_flags       = ${env:STM32F103RC_btt.build_flags} -DLD_MAX_DATA_SIZE=524288 -DSTM32_FLASH_SIZE=512
116
-
117
-[env:STM32F103RC_btt_512K_USB]
118
-platform          = ${common_stm32.platform}
119
-extends           = env:STM32F103RC_btt_USB
120
-board_upload.maximum_size = 524288
121
-build_flags       = ${env:STM32F103RC_btt_USB.build_flags} -DLD_MAX_DATA_SIZE=524288 -DSTM32_FLASH_SIZE=512
122
-
123 104
 #
124 105
 # MKS Robin (STM32F103ZET6)
125 106
 # Uses HAL STM32 to support Marlin UI for TFT screen with optional touch panel
@@ -185,7 +166,7 @@ debug_tool           = jlink
185 166
 upload_protocol      = jlink
186 167
 
187 168
 #
188
-# BigTree SKR Mini E3 DIP / SKR CR6 (STM32F103RET6 ARM Cortex-M3)
169
+# BigTree SKR Mini E3 V2.0 & DIP / SKR CR6 (STM32F103RET6 ARM Cortex-M3)
189 170
 #
190 171
 #   STM32F103RE_btt ............. RET6
191 172
 #   STM32F103RE_btt_USB ......... RET6 (USB mass storage)

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