ソースを参照

🔨 More HAL/STM32 targets (#22358)

ellensp 3年前
コミット
7e50d8761d
4個のファイルの変更178行の追加26行の削除
  1. 13
    13
      Marlin/src/pins/pins.h
  2. 2
    0
      Marlin/src/pins/stm32f1/pins_CHITU3D_V5.h
  3. 13
    13
      ini/stm32f1-maple.ini
  4. 150
    0
      ini/stm32f1.ini

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

@@ -486,17 +486,17 @@
486 486
 #elif MB(MKS_ROBIN)
487 487
   #include "stm32f1/pins_MKS_ROBIN.h"           // STM32F1                                env:mks_robin env:mks_robin_maple
488 488
 #elif MB(MKS_ROBIN_MINI)
489
-  #include "stm32f1/pins_MKS_ROBIN_MINI.h"      // STM32F1                                env:mks_robin_mini
489
+  #include "stm32f1/pins_MKS_ROBIN_MINI.h"      // STM32F1                                env:mks_robin_mini env:mks_robin_mini_maple
490 490
 #elif MB(MKS_ROBIN_NANO)
491 491
   #include "stm32f1/pins_MKS_ROBIN_NANO.h"      // STM32F1                                env:mks_robin_nano35 env:mks_robin_nano35_maple
492 492
 #elif MB(MKS_ROBIN_NANO_V2)
493 493
   #include "stm32f1/pins_MKS_ROBIN_NANO_V2.h"   // STM32F1                                env:mks_robin_nano35 env:mks_robin_nano35_maple
494 494
 #elif MB(MKS_ROBIN_LITE)
495
-  #include "stm32f1/pins_MKS_ROBIN_LITE.h"      // STM32F1                                env:mks_robin_lite
495
+  #include "stm32f1/pins_MKS_ROBIN_LITE.h"      // STM32F1                                env:mks_robin_lite env:mks_robin_lite_maple
496 496
 #elif MB(MKS_ROBIN_LITE3)
497
-  #include "stm32f1/pins_MKS_ROBIN_LITE3.h"     // STM32F1                                env:mks_robin_lite3
497
+  #include "stm32f1/pins_MKS_ROBIN_LITE3.h"     // STM32F1                                env:mks_robin_lite3 env:mks_robin_lite3_maple
498 498
 #elif MB(MKS_ROBIN_PRO)
499
-  #include "stm32f1/pins_MKS_ROBIN_PRO.h"       // STM32F1                                env:mks_robin_pro
499
+  #include "stm32f1/pins_MKS_ROBIN_PRO.h"       // STM32F1                                env:mks_robin_pro env:mks_robin_pro_maple
500 500
 #elif MB(MKS_ROBIN_E3)
501 501
   #include "stm32f1/pins_MKS_ROBIN_E3.h"        // STM32F1                                env:mks_robin_e3 env:mks_robin_e3_maple
502 502
 #elif MB(MKS_ROBIN_E3_V1_1)
@@ -506,7 +506,7 @@
506 506
 #elif MB(MKS_ROBIN_E3D_V1_1)
507 507
   #include "stm32f1/pins_MKS_ROBIN_E3D_V1_1.h"  // STM32F1                                env:mks_robin_e3
508 508
 #elif MB(MKS_ROBIN_E3P)
509
-  #include "stm32f1/pins_MKS_ROBIN_E3P.h"       // STM32F1                                env:mks_robin_e3p
509
+  #include "stm32f1/pins_MKS_ROBIN_E3P.h"       // STM32F1                                env:mks_robin_e3p env:mks_robin_e3p_maple
510 510
 #elif MB(BTT_SKR_MINI_V1_1)
511 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)
@@ -522,21 +522,21 @@
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)
525
-  #include "stm32f1/pins_JGAURORA_A5S_A1.h"     // STM32F1                                env:jgaurora_a5s_a1
525
+  #include "stm32f1/pins_JGAURORA_A5S_A1.h"     // STM32F1                                env:jgaurora_a5s_a1 env:jgaurora_a5s_a1_maple
526 526
 #elif MB(FYSETC_AIO_II)
527
-  #include "stm32f1/pins_FYSETC_AIO_II.h"       // STM32F1                                env:STM32F103RC_fysetc
527
+  #include "stm32f1/pins_FYSETC_AIO_II.h"       // STM32F1                                env:STM32F103RC_fysetc env:STM32F103RC_fysetc_maple
528 528
 #elif MB(FYSETC_CHEETAH)
529
-  #include "stm32f1/pins_FYSETC_CHEETAH.h"      // STM32F1                                env:STM32F103RC_fysetc
529
+  #include "stm32f1/pins_FYSETC_CHEETAH.h"      // STM32F1                                env:STM32F103RC_fysetc env:STM32F103RC_fysetc_maple
530 530
 #elif MB(FYSETC_CHEETAH_V12)
531
-  #include "stm32f1/pins_FYSETC_CHEETAH_V12.h"  // STM32F1                                env:STM32F103RC_fysetc
531
+  #include "stm32f1/pins_FYSETC_CHEETAH_V12.h"  // STM32F1                                env:STM32F103RC_fysetc env:STM32F103RC_fysetc_maple
532 532
 #elif MB(LONGER3D_LK)
533
-  #include "stm32f1/pins_LONGER3D_LK.h"         // STM32F1                                env:STM32F103VE_longer
533
+  #include "stm32f1/pins_LONGER3D_LK.h"         // STM32F1                                env:STM32F103VE_longer env:STM32F103VE_longer_maple
534 534
 #elif MB(CCROBOT_MEEB_3DP)
535 535
   #include "stm32f1/pins_CCROBOT_MEEB_3DP.h"    // STM32F1                                env:STM32F103RC_meeb
536 536
 #elif MB(CHITU3D_V5)
537
-  #include "stm32f1/pins_CHITU3D_V5.h"          // STM32F1                                env:chitu_f103 env:chitu_v5_gpio_init
537
+  #include "stm32f1/pins_CHITU3D_V5.h"          // STM32F1                                env:chitu_f103 env:chitu_f103_maple env:chitu_v5_gpio_init env:chitu_v5_gpio_init_maple
538 538
 #elif MB(CHITU3D_V6)
539
-  #include "stm32f1/pins_CHITU3D_V6.h"          // STM32F1                                env:chitu_f103
539
+  #include "stm32f1/pins_CHITU3D_V6.h"          // STM32F1                                env:chitu_f103 env:chitu_f103_maple
540 540
 #elif MB(CREALITY_V4)
541 541
   #include "stm32f1/pins_CREALITY_V4.h"         // STM32F1                                env:STM32F103RET6_creality env:STM32F103RET6_creality_maple
542 542
 #elif MB(CREALITY_V4210)
@@ -550,7 +550,7 @@
550 550
 #elif MB(CREALITY_V453)
551 551
   #include "stm32f1/pins_CREALITY_V453.h"       // STM32F1                                env:STM32F103RET6_creality env:STM32F103RET6_creality_maple
552 552
 #elif MB(TRIGORILLA_PRO)
553
-  #include "stm32f1/pins_TRIGORILLA_PRO.h"      // STM32F1                                env:trigorilla_pro
553
+  #include "stm32f1/pins_TRIGORILLA_PRO.h"      // STM32F1                                env:trigorilla_pro env:trigorilla_pro_maple
554 554
 #elif MB(FLY_MINI)
555 555
   #include "stm32f1/pins_FLY_MINI.h"            // STM32F1                                env:FLY_MINI env:FLY_MINI_maple
556 556
 #elif MB(FLSUN_HISPEED)

+ 2
- 0
Marlin/src/pins/stm32f1/pins_CHITU3D_V5.h ファイルの表示

@@ -134,6 +134,8 @@
134 134
   #define FSMC_DMA_DEV                      DMA2
135 135
   #define FSMC_DMA_CHANNEL               DMA_CH5
136 136
 
137
+  #define TFT_CS_PIN                 FSMC_CS_PIN
138
+  #define TFT_RS_PIN                 FSMC_RS_PIN
137 139
 #endif
138 140
 
139 141
 #if ENABLED(TFT_LVGL_UI)

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

@@ -74,7 +74,7 @@ upload_protocol   = dfu
74 74
 #
75 75
 # FYSETC STM32F103RC
76 76
 #
77
-[env:STM32F103RC_fysetc]
77
+[env:STM32F103RC_fysetc_maple]
78 78
 platform          = ${common_stm32f1.platform}
79 79
 extends           = common_STM32F103RC_maple
80 80
 extra_scripts     = ${common_stm32f1.extra_scripts}
@@ -173,7 +173,7 @@ upload_protocol = serial
173 173
 #
174 174
 # Longer 3D board in Alfawise U20 (STM32F103VET6)
175 175
 #
176
-[env:STM32F103VE_longer]
176
+[env:STM32F103VE_longer_maple]
177 177
 platform      = ${common_stm32f1.platform}
178 178
 extends       = common_stm32f1
179 179
 board         = genericSTM32F103VE
@@ -190,7 +190,7 @@ build_unflags = ${common_stm32f1.build_unflags}
190 190
 #
191 191
 # MKS Robin Mini (STM32F103VET6)
192 192
 #
193
-[env:mks_robin_mini]
193
+[env:mks_robin_mini_maple]
194 194
 platform      = ${common_stm32f1.platform}
195 195
 extends       = common_stm32f1
196 196
 board         = genericSTM32F103VE
@@ -228,7 +228,7 @@ build_flags   = ${common_stm32f1.build_flags}
228 228
 #
229 229
 # MKS Robin Pro (STM32F103ZET6)
230 230
 #
231
-[env:mks_robin_pro]
231
+[env:mks_robin_pro_maple]
232 232
 platform      = ${common_stm32f1.platform}
233 233
 extends       = env:mks_robin_maple
234 234
 extra_scripts = ${common_stm32f1.extra_scripts}
@@ -237,7 +237,7 @@ extra_scripts = ${common_stm32f1.extra_scripts}
237 237
 #
238 238
 # TRIGORILLA PRO (STM32F103ZET6)
239 239
 #
240
-[env:trigorilla_pro]
240
+[env:trigorilla_pro_maple]
241 241
 platform      = ${common_stm32f1.platform}
242 242
 extends       = env:mks_robin_maple
243 243
 extra_scripts = ${common_stm32f1.extra_scripts}
@@ -259,7 +259,7 @@ build_flags   = ${common_stm32f1.build_flags}
259 259
 # MKS Robin E3p (STM32F103VET6)
260 260
 #  - LVGL UI
261 261
 #
262
-[env:mks_robin_e3p]
262
+[env:mks_robin_e3p_maple]
263 263
 platform        = ${common_stm32f1.platform}
264 264
 extends         = common_stm32f1
265 265
 board           = genericSTM32F103VE
@@ -273,7 +273,7 @@ upload_protocol = jlink
273 273
 #
274 274
 # MKS Robin Lite/Lite2 (STM32F103RCT6)
275 275
 #
276
-[env:mks_robin_lite]
276
+[env:mks_robin_lite_maple]
277 277
 platform      = ${common_stm32f1.platform}
278 278
 extends       = common_stm32f1
279 279
 board         = genericSTM32F103RC
@@ -283,7 +283,7 @@ extra_scripts = ${common_stm32f1.extra_scripts}
283 283
 #
284 284
 # MKS ROBIN LITE3 (STM32F103RCT6)
285 285
 #
286
-[env:mks_robin_lite3]
286
+[env:mks_robin_lite3_maple]
287 287
 platform      = ${common_stm32f1.platform}
288 288
 extends       = common_stm32f1
289 289
 board         = genericSTM32F103RC
@@ -293,7 +293,7 @@ extra_scripts = ${common_stm32f1.extra_scripts}
293 293
 #
294 294
 # JGAurora A5S A1 (STM32F103ZET6)
295 295
 #
296
-[env:jgaurora_a5s_a1]
296
+[env:jgaurora_a5s_a1_maple]
297 297
 platform      = ${common_stm32f1.platform}
298 298
 extends       = common_stm32f1
299 299
 board         = genericSTM32F103ZE
@@ -321,7 +321,7 @@ lib_ignore    = ${common_stm32f1.lib_ignore}
321 321
 #
322 322
 # Chitu boards like Tronxy X5s (STM32F103ZET6)
323 323
 #
324
-[env:chitu_f103]
324
+[env:chitu_f103_maple]
325 325
 platform      = ${common_stm32f1.platform}
326 326
 extends       = common_stm32f1
327 327
 board         = marlin_CHITU_F103
@@ -338,10 +338,10 @@ build_unflags = ${common_stm32f1.build_unflags}
338 338
 # Some Chitu V5 boards have a problem with GPIO init.
339 339
 # Use this target if G28 or G29 are always failing.
340 340
 #
341
-[env:chitu_v5_gpio_init]
341
+[env:chitu_v5_gpio_init_maple]
342 342
 platform      = ${common_stm32f1.platform}
343
-extends       = env:chitu_f103
344
-build_flags   = ${env:chitu_f103.build_flags} -DCHITU_V5_Z_MIN_BUGFIX
343
+extends       = env:chitu_f103_maple
344
+build_flags   = ${env:chitu_f103_maple.build_flags} -DCHITU_V5_Z_MIN_BUGFIX
345 345
 
346 346
 #
347 347
 # FLYmaker FLY Mini (STM32F103RCT6)

+ 150
- 0
ini/stm32f1.ini ファイルの表示

@@ -260,3 +260,153 @@ board_build.variant  = MARLIN_F103Rx
260 260
 board_build.offset   = 0x5000
261 261
 board_upload.offset_address = 0x08005000
262 262
 extra_scripts        = ${stm32f1_variant.extra_scripts}
263
+
264
+#
265
+# MKS Robin Mini (STM32F103VET6)
266
+#
267
+[env:mks_robin_mini]
268
+platform            = ${common_stm32.platform}
269
+extends             = common_stm32
270
+board               = genericSTM32F103VE
271
+board_build.core    = stm32
272
+board_build.variant = MARLIN_F103Vx
273
+board_build.offset  = 0x7000
274
+board_build.encrypt = Robin_mini.bin
275
+build_flags         = ${common_stm32.build_flags} -DMCU_STM32F103VE
276
+board_upload.offset_address = 0x08007000
277
+extra_scripts       = ${stm32f1_variant.extra_scripts}
278
+
279
+#
280
+# MKS Robin Lite/Lite2 (STM32F103RCT6)
281
+#
282
+[env:mks_robin_lite]
283
+platform            = ${common_stm32.platform}
284
+extends             = common_stm32
285
+board               = genericSTM32F103RC
286
+board_build.core    = stm32
287
+board_build.variant = MARLIN_F103Rx
288
+board_build.offset  = 0x5000
289
+board_build.encrypt = mksLite.bin
290
+build_flags         = ${common_stm32.build_flags}
291
+board_upload.offset_address = 0x08005000
292
+extra_scripts       = ${stm32f1_variant.extra_scripts}
293
+
294
+#
295
+# MKS ROBIN LITE3 (STM32F103RCT6)
296
+#
297
+[env:mks_robin_lite3]
298
+platform            = ${common_stm32.platform}
299
+extends             = common_stm32
300
+board               = genericSTM32F103RC
301
+board_build.core    = stm32
302
+board_build.variant = MARLIN_F103Rx
303
+board_build.offset  = 0x5000
304
+board_build.encrypt = mksLite3.bin
305
+build_flags         = ${common_stm32.build_flags}
306
+board_upload.offset_address = 0x08005000
307
+extra_scripts       = ${stm32f1_variant.extra_scripts}
308
+
309
+#
310
+# MKS Robin Pro (STM32F103ZET6)
311
+#
312
+[env:mks_robin_pro]
313
+platform            = ${common_stm32.platform}
314
+extends             = env:mks_robin
315
+board_build.encrypt = Robin_pro.bin
316
+
317
+#
318
+# MKS Robin E3p (STM32F103VET6)
319
+#  - LVGL UI
320
+#
321
+[env:mks_robin_e3p]
322
+platform            = ${common_stm32.platform}
323
+extends             = common_stm32
324
+board               = genericSTM32F103VE
325
+board_build.core    = stm32
326
+board_build.variant = MARLIN_F103Vx
327
+board_build.offset  = 0x7000
328
+board_build.encrypt = Robin_e3p.bin
329
+build_flags         = ${common_stm32.build_flags} -DMCU_STM32F103VE -DSS_TIMER=4
330
+board_upload.offset_address = 0x08007000
331
+extra_scripts       = ${stm32f1_variant.extra_scripts}
332
+debug_tool          = jlink
333
+upload_protocol     = jlink
334
+
335
+#
336
+# JGAurora A5S A1 (STM32F103ZET6)
337
+#
338
+[env:jgaurora_a5s_a1]
339
+platform            = ${common_stm32.platform}
340
+extends             = common_stm32
341
+board               = genericSTM32F103ZE
342
+board_build.core    = stm32
343
+board_build.variant = MARLIN_F103Zx
344
+board_build.offset  = 0xA000
345
+board_build.rename  = firmware_for_sd_upload.bin
346
+build_flags         = ${common_stm32.build_flags} -DSTM32F1xx -DSTM32_XL_DENSITY
347
+board_build.address = 0x0800A000
348
+extra_scripts       = ${stm32f1_variant.extra_scripts}
349
+  buildroot/share/PlatformIO/scripts/jgaurora_a5s_a1_with_bootloader.py
350
+
351
+#
352
+# FYSETC STM32F103RC
353
+#
354
+[env:STM32F103RC_fysetc]
355
+platform        = ${common_stm32.platform}
356
+extends         = common_STM32F103RC
357
+extra_scripts   = ${stm32f1_variant.extra_scripts}
358
+  buildroot/share/PlatformIO/scripts/STM32F103RC_fysetc.py
359
+build_flags     = ${common_stm32.build_flags} -DDEBUG_LEVEL=0
360
+lib_ldf_mode    = chain
361
+debug_tool      = stlink
362
+upload_protocol = serial
363
+
364
+#
365
+# Longer 3D board in Alfawise U20 (STM32F103VET6)
366
+#
367
+[env:STM32F103VE_longer]
368
+platform            = ${common_stm32.platform}
369
+extends             = common_stm32
370
+board               = genericSTM32F103VE
371
+board_build.core    = stm32
372
+board_build.variant = MARLIN_F103Zx
373
+board_build.offset  = 0x1000
374
+board_build.address = 0x08010000
375
+build_flags         = ${common_stm32.build_flags}
376
+  -DMCU_STM32F103VE -DSTM32F1xx -USERIAL_USB -DU20 -DTS_V12
377
+build_unflags       = ${common_stm32.build_unflags}
378
+  -DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG=1 -DERROR_LED_PORT=GPIOE -DERROR_LED_PIN=6
379
+extra_scripts       = ${stm32f1_variant.extra_scripts}
380
+  buildroot/share/PlatformIO/scripts/STM32F103VE_longer.py
381
+
382
+#
383
+# TRIGORILLA PRO (STM32F103ZET6)
384
+#
385
+[env:trigorilla_pro]
386
+platform      = ${common_stm32.platform}
387
+extends       = env:mks_robin
388
+extra_scripts = ${common_stm32.extra_scripts}
389
+
390
+#
391
+# Chitu boards like Tronxy X5s (STM32F103ZET6)
392
+#
393
+[env:chitu_f103]
394
+platform             = ${common_stm32.platform}
395
+extends              = common_stm32
396
+board                = genericSTM32F103ZE
397
+board_build.core     = stm32
398
+board_build.variant  = MARLIN_F103Zx
399
+extra_scripts        = ${stm32f1_variant.extra_scripts}
400
+  buildroot/share/PlatformIO/scripts/chitu_crypt.py
401
+build_flags          = ${common_stm32.build_flags} -DSTM32_XL_DENSITY
402
+build_unflags        = ${common_stm32.build_unflags}
403
+  -DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG= -DERROR_LED_PORT=GPIOE -DERROR_LED_PIN=6
404
+
405
+#
406
+# Some Chitu V5 boards have a problem with GPIO init.
407
+# Use this target if G28 or G29 are always failing.
408
+#
409
+[env:chitu_v5_gpio_init]
410
+platform      = ${common_stm32.platform}
411
+extends       = env:chitu_f103
412
+build_flags   = ${env:chitu_f103.build_flags} -DCHITU_V5_Z_MIN_BUGFIX

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