Skip to content

Commit

Permalink
Merge branch 'release/v13.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
valeros committed Apr 30, 2021
2 parents 43deb31 + 8a5a3f4 commit ebd5cec
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 24 deletions.
9 changes: 3 additions & 6 deletions boards/blackpill_f401cc.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@
"product_line": "STM32F401xC",
"variant": "Generic_F401Cx"
},
"connectivity": [
"can"
],
"debug": {
"jlink_device": "STM32F401CC",
"openocd_target": "stm32f4x",
Expand All @@ -22,7 +19,7 @@
"stm32cube",
"libopencm3"
],
"name": "BlackPill F401CC",
"name": "WeAct Studio BlackPill V2.0 (STM32F401CC)",
"upload": {
"maximum_ram_size": 65536,
"maximum_size": 262144,
Expand All @@ -36,6 +33,6 @@
"dfu"
]
},
"url": "https://www.st.com/en/microcontrollers-microprocessors/stm32f401cc.html",
"vendor": "ST"
"url": "https://github.com/WeActTC/MiniSTM32F4x1",
"vendor": "WeAct Studio"
}
17 changes: 9 additions & 8 deletions boards/blackpill_f401ce.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
"f_cpu": "84000000L",
"mcu": "stm32f401ceu6",
"product_line": "STM32F401xE",
"variant": "Generic_F401Cx"
"variant": "Generic_F401Cx",
"zephyr": {
"variant": "blackpill_f401ce"
}
},
"connectivity": [
"can"
],
"debug": {
"jlink_device": "STM32F401CE",
"openocd_target": "stm32f4x",
Expand All @@ -20,9 +20,10 @@
"arduino",
"cmsis",
"stm32cube",
"libopencm3"
"libopencm3",
"zephyr"
],
"name": "BlackPill F401CE",
"name": "WeAct Studio BlackPill V3.0 (STM32F401CE)",
"upload": {
"maximum_ram_size": 98304,
"maximum_size": 524288,
Expand All @@ -36,6 +37,6 @@
"dfu"
]
},
"url": "https://www.st.com/en/microcontrollers-microprocessors/stm32f401ce.html",
"vendor": "ST"
"url": "https://github.com/WeActTC/MiniSTM32F4x1",
"vendor": "WeAct Studio"
}
14 changes: 7 additions & 7 deletions boards/blackpill_f411ce.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
"f_cpu": "100000000L",
"mcu": "stm32f411ceu6",
"product_line": "STM32F411xE",
"variant": "Generic_F411Cx"
"variant": "Generic_F411Cx",
"zephyr": {
"variant": "blackpill_f411ce"
}
},
"connectivity": [
"can"
],
"debug": {
"jlink_device": "STM32F411CE",
"openocd_target": "stm32f4x",
Expand All @@ -23,7 +23,7 @@
"libopencm3",
"zephyr"
],
"name": "WeAct BlackPill V2.0 (BlackPill F411CE)",
"name": "WeAct Studio BlackPill V2.0 (STM32F411CE)",
"upload": {
"maximum_ram_size": 131072,
"maximum_size": 524288,
Expand All @@ -37,6 +37,6 @@
"dfu"
]
},
"url": "https://github.com/mcauser/WEACT_F411CEU6",
"vendor": "WeAct"
"url": "https://github.com/WeActTC/MiniSTM32F4x1",
"vendor": "WeAct Studio"
}
2 changes: 1 addition & 1 deletion builder/frameworks/arduino/mbed-core
4 changes: 2 additions & 2 deletions platform.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"type": "git",
"url": "https://github.com/platformio/platform-ststm32.git"
},
"version": "12.1.1",
"version": "13.0.0",
"frameworks": {
"mbed": {
"package": "framework-mbed",
Expand Down Expand Up @@ -213,7 +213,7 @@
"type": "framework",
"optional": true,
"owner": "platformio",
"version": "~1.3.2"
"version": "~2.0.0"
},
"framework-stm32cubef0": {
"type": "framework",
Expand Down

0 comments on commit ebd5cec

Please sign in to comment.