Browse Source

Fix rumba32 environments

Followup to #18116
Scott Lahteine 5 years ago
parent
commit
d7561c4b98
1 changed files with 24 additions and 15 deletions
  1. 24
    15
      platformio.ini

+ 24
- 15
platformio.ini View File

36
   SlowSoftI2CMaster=https://github.com/mikeshub/SlowSoftI2CMaster/archive/master.zip
36
   SlowSoftI2CMaster=https://github.com/mikeshub/SlowSoftI2CMaster/archive/master.zip
37
 
37
 
38
 # Common traits for environments using HAL/STM32
38
 # Common traits for environments using HAL/STM32
39
-[common_stm32]
39
+[base_stm32]
40
 platform      = ststm32@<6.2.0
40
 platform      = ststm32@<6.2.0
41
 platform_packages = framework-arduinoststm32@>=4.10700,<4.10800
41
 platform_packages = framework-arduinoststm32@>=4.10700,<4.10800
42
 lib_deps      = ${common.lib_deps}
42
 lib_deps      = ${common.lib_deps}
43
 lib_ignore    = SoftwareSerial
43
 lib_ignore    = SoftwareSerial
44
 build_flags   = ${common.build_flags}
44
 build_flags   = ${common.build_flags}
45
   -IMarlin/src/HAL/STM32 -std=gnu++14
45
   -IMarlin/src/HAL/STM32 -std=gnu++14
46
-  -DUSBCON -DUSBD_USE_CDC -DUSBD_VID=0x0483
46
+  -DUSBCON -DUSBD_USE_CDC
47
 build_unflags = -std=gnu++11
47
 build_unflags = -std=gnu++11
48
 src_filter    = ${common.default_src_filter} +<src/HAL/STM32>
48
 src_filter    = ${common.default_src_filter} +<src/HAL/STM32>
49
 
49
 
50
+[common_stm32]
51
+platform      = ${base_stm32.platform}
52
+extends       = base_stm32
53
+build_flags   = ${base_stm32.build_flags} -DUSBD_VID=0x0483
54
+
50
 # Common traits for environments using HAL/STM32F1
55
 # Common traits for environments using HAL/STM32F1
51
 [common_stm32f1]
56
 [common_stm32f1]
52
 platform      = ${common_stm32.platform}
57
 platform      = ${common_stm32.platform}
768
 #
773
 #
769
 # RUMBA32
774
 # RUMBA32
770
 #
775
 #
771
-[env:rumba32_f446ve]
772
-platform      = ${common_stm32.platform}
773
-extends       = common_stm32
776
+
777
+[common_rumba32]
778
+platform      = ${base_stm32.platform}
779
+extends       = base_stm32
774
 board         = rumba32_f446ve
780
 board         = rumba32_f446ve
775
-build_flags   = ${common_stm32.build_flags} -Os
776
-  -DSTM32F4xx -DARDUINO_RUMBA32_F446VE -DARDUINO_ARCH_STM32 "-DBOARD_NAME=\"RUMBA32_F446VE\""
777
-  -DSTM32F446xx "-DUSB_PRODUCT=\"RUMBA32_F446VE\""
778
-  -DHAL_PCD_MODULE_ENABLED
779
-  -DDISABLE_GENERIC_SERIALUSB
780
-  -DHAL_UART_MODULE_ENABLED
781
-monitor_speed = 500000
782
 upload_protocol = dfu
781
 upload_protocol = dfu
782
+monitor_speed = 500000
783
+
784
+#
785
+# RUMBA32 F446VE
786
+#
787
+
788
+[env:rumba32_f446ve]
789
+platform      = ${common_rumba32.platform}
790
+extends       = common_rumba32
791
+build_flags   = ${base_stm32.build_flags} -DUSBD_VID=0x0483
783
 
792
 
784
 #
793
 #
785
 # MKS RUMBA32 (adds TMC2208/2209 UART interface and AUX-1)
794
 # MKS RUMBA32 (adds TMC2208/2209 UART interface and AUX-1)
786
 #
795
 #
787
 [env:rumba32_mks]
796
 [env:rumba32_mks]
788
-platform      = ${common_stm32.platform}
789
-extends       = env:rumba32_f446ve
790
-build_flags   = ${rumba32_f446ve.build_flags} -UUSBD_VID -DUSBD_VID=0x8000
797
+platform      = ${common_rumba32.platform}
798
+extends       = common_rumba32
799
+build_flags   = ${base_stm32.build_flags} -DUSBD_VID=0x8000
791
 
800
 
792
 #
801
 #
793
 # Just print the dependency tree
802
 # Just print the dependency tree

Loading…
Cancel
Save