Browse Source

🐛 Fix env:STM32F103RE maple/unified split-up (#22019)

Followup to #21999
ellensp 3 years ago
parent
commit
67c1075e47
No account linked to committer's email address
3 changed files with 43 additions and 16 deletions
  1. 12
    12
      Marlin/src/pins/pins.h
  2. 4
    4
      ini/stm32f1-maple.ini
  3. 27
    0
      ini/stm32f1.ini

+ 12
- 12
Marlin/src/pins/pins.h View File

@@ -469,25 +469,25 @@
469 469
 //
470 470
 
471 471
 #elif MB(STM32F103RE)
472
-  #include "stm32f1/pins_STM32F1R.h"            // STM32F1                                env:STM32F103RE
472
+  #include "stm32f1/pins_STM32F1R.h"            // STM32F103RE                            env:STM32F103RE env:STM32F103RE_maple
473 473
 #elif MB(MALYAN_M200)
474
-  #include "stm32f1/pins_MALYAN_M200.h"         // STM32F1                                env:STM32F103CB_malyan
474
+  #include "stm32f1/pins_MALYAN_M200.h"         // STM32F103CB                            env:STM32F103CB_malyan
475 475
 #elif MB(STM3R_MINI)
476
-  #include "stm32f1/pins_STM3R_MINI.h"          // STM32F1                                env:STM32F103RE
476
+  #include "stm32f1/pins_STM3R_MINI.h"          // STM32F103RE?                           env:STM32F103RE env:STM32F103RE_maple
477 477
 #elif MB(GTM32_PRO_VB)
478
-  #include "stm32f1/pins_GTM32_PRO_VB.h"        // STM32F1                                env:STM32F103RE
478
+  #include "stm32f1/pins_GTM32_PRO_VB.h"        // STM32F103VE                            env:STM32F103VE env:STM32F103RE_maple
479 479
 #elif MB(GTM32_PRO_VD)
480
-  #include "stm32f1/pins_GTM32_PRO_VD.h"        // STM32F1                                env:STM32F103RE
480
+  #include "stm32f1/pins_GTM32_PRO_VD.h"        // STM32F103VE                            env:STM32F103VE env:STM32F103RE_maple
481 481
 #elif MB(GTM32_MINI)
482
-  #include "stm32f1/pins_GTM32_MINI.h"          // STM32F1                                env:STM32F103RE
482
+  #include "stm32f1/pins_GTM32_MINI.h"          // STM32F103VE                            env:STM32F103VE env:STM32F103RE_maple
483 483
 #elif MB(GTM32_MINI_A30)
484
-  #include "stm32f1/pins_GTM32_MINI_A30.h"      // STM32F1                                env:STM32F103RE
484
+  #include "stm32f1/pins_GTM32_MINI_A30.h"      // STM32F103VE                            env:STM32F103VE env:STM32F103RE_maple
485 485
 #elif MB(GTM32_REV_B)
486
-  #include "stm32f1/pins_GTM32_REV_B.h"         // STM32F1                                env:STM32F103RE
486
+  #include "stm32f1/pins_GTM32_REV_B.h"         // STM32F103VE                            env:STM32F103VE env:STM32F103RE_maple
487 487
 #elif MB(MORPHEUS)
488
-  #include "stm32f1/pins_MORPHEUS.h"            // STM32F1                                env:STM32F103RE
488
+  #include "stm32f1/pins_MORPHEUS.h"            // STM32F103RE                            env:STM32F103RE env:STM32F103RE_maple
489 489
 #elif MB(CHITU3D)
490
-  #include "stm32f1/pins_CHITU3D.h"             // STM32F1                                env:STM32F103RE
490
+  #include "stm32f1/pins_CHITU3D.h"             // STM32F103ZE                            env:STM32F103ZE env:STM32F103RE_maple
491 491
 #elif MB(MKS_ROBIN)
492 492
   #include "stm32f1/pins_MKS_ROBIN.h"           // STM32F1                                env:mks_robin env:mks_robin_maple
493 493
 #elif MB(MKS_ROBIN_MINI)
@@ -561,9 +561,9 @@
561 561
 #elif MB(FLSUN_HISPEED)
562 562
   #include "stm32f1/pins_FLSUN_HISPEED.h"       // STM32F1                                env:flsun_hispeedv1
563 563
 #elif MB(BEAST)
564
-  #include "stm32f1/pins_BEAST.h"               // STM32F1                                env:STM32F103RE
564
+  #include "stm32f1/pins_BEAST.h"               // STM32F1                                env:STM32F103VE env:STM32F103RE_maple
565 565
 #elif MB(MINGDA_MPX_ARM_MINI)
566
-  #include "stm32f1/pins_MINGDA_MPX_ARM_MINI.h" // STM32F1                                env:STM32F103RE
566
+  #include "stm32f1/pins_MINGDA_MPX_ARM_MINI.h" // STM32F1                                env:mingda_mpx_arm_mini
567 567
 
568 568
 //
569 569
 // ARM Cortex-M4F

+ 4
- 4
ini/stm32f1-maple.ini View File

@@ -131,9 +131,9 @@ lib_deps          = ${env:STM32F103RC_btt_512K_maple.lib_deps}
131 131
   USBComposite for STM32F1@0.91
132 132
 
133 133
 #
134
-# STM32F103RE with Unified STM32F1 HAL
134
+# Generic STM32F103RE environment
135 135
 #
136
-[common_STM32F103RE]
136
+[env:STM32F103RE_maple]
137 137
 platform          = ${common_stm32f1.platform}
138 138
 extends           = common_stm32f1
139 139
 board             = genericSTM32F103RE
@@ -144,7 +144,7 @@ monitor_speed     = 115200
144 144
 #
145 145
 [env:STM32F103RET6_creality_maple]
146 146
 platform             = ${common_stm32f1.platform}
147
-extends              = common_STM32F103RE
147
+extends              = env:STM32F103RE_maple
148 148
 build_flags          = ${common_stm32f1.build_flags} -DTEMP_TIMER_CHAN=4
149 149
 board_build.address  = 0x08007000
150 150
 board_build.ldscript = creality.ld
@@ -160,7 +160,7 @@ upload_protocol      = jlink
160 160
 #
161 161
 [env:STM32F103RE_btt]
162 162
 platform          = ${common_stm32f1.platform}
163
-extends           = common_STM32F103RE
163
+extends           = env:STM32F103RE_maple
164 164
 board_build.address  = 0x08007000
165 165
 board_build.ldscript = STM32F103RE_SKR_E3_DIP.ld
166 166
 extra_scripts     = ${common_stm32f1.extra_scripts}

+ 27
- 0
ini/stm32f1.ini View File

@@ -57,6 +57,33 @@ extra_scripts        = ${common.extra_scripts}
57 57
   pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
58 58
   buildroot/share/PlatformIO/scripts/stm32_bootloader.py
59 59
 
60
+#
61
+# STM32F103RE
62
+#
63
+[env:STM32F103RE]
64
+platform          = ${common_stm32.platform}
65
+extends           = common_stm32
66
+board             = genericSTM32F103RE
67
+monitor_speed     = 115200
68
+
69
+#
70
+# STM32F103VE
71
+#
72
+[env:STM32F103VE]
73
+platform          = ${common_stm32.platform}
74
+extends           = common_stm32
75
+board             = genericSTM32F103VE
76
+monitor_speed     = 115200
77
+
78
+#
79
+# STM32F103ZE
80
+#
81
+[env:STM32F103ZE]
82
+platform          = ${common_stm32.platform}
83
+extends           = common_stm32
84
+board             = genericSTM32F103ZE
85
+monitor_speed     = 115200
86
+
60 87
 [env:STM32F103RC_btt]
61 88
 platform             = ${common_stm32.platform}
62 89
 extends              = common_STM32F103RC

Loading…
Cancel
Save