Skip to content

Commit 5a389c1

Browse files
committed
Merge branch 'release/v5.3.0'
2 parents 475669f + 55e3d6b commit 5a389c1

File tree

5 files changed

+6
-8
lines changed

5 files changed

+6
-8
lines changed

boards/bluepill_f103c8.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"build": {
33
"core": "stm32",
44
"cpu": "cortex-m3",
5-
"extra_flags": "-DSTM32F1 -DSTM32F103xB",
5+
"extra_flags": "-DSTM32F1 -DSTM32F103xB -DARDUINO_BLUEPILL_F103C8",
66
"f_cpu": "72000000L",
77
"hwids": [
88
[

boards/bluepill_f103c8_128k.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"build": {
33
"core": "stm32",
44
"cpu": "cortex-m3",
5-
"extra_flags": "-DSTM32F1 -DSTM32F103xB",
5+
"extra_flags": "-DSTM32F1 -DSTM32F103xB -DARDUINO_BLUEPILL_F103C8",
66
"f_cpu": "72000000L",
77
"hwids": [
88
[

examples/arduino-mxchip-azureiot/platformio.ini

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,4 @@ platform = ststm32
1212
framework = arduino
1313
board = mxchip_az3166
1414
monitor_speed = 115200
15-
lib_deps =
16-
ArduinoJson
15+
lib_deps = ArduinoJson@^5

platform.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"type": "git",
1313
"url": "https://github.com/platformio/platform-ststm32.git"
1414
},
15-
"version": "5.2.0",
15+
"version": "5.3.0",
1616
"packageRepositories": [
1717
"https://dl.bintray.com/platformio/dl-packages/manifest.json",
1818
"http://dl.platformio.org/packages/manifest.json"
@@ -46,12 +46,12 @@
4646
"packages": {
4747
"toolchain-gccarmnoneeabi": {
4848
"type": "toolchain",
49-
"version": ">=1.60301.0"
49+
"version": ">=1.60301.0,<1.80000.0"
5050
},
5151
"framework-mbed": {
5252
"type": "framework",
5353
"optional": true,
54-
"version": "~5.51104.190214"
54+
"version": "~5.51105.190304"
5555
},
5656
"framework-cmsis": {
5757
"type": "framework",

platform.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ def configure_default_packages(self, variables, targets):
2929
self.frameworks['arduino']['package'] = "framework-arduinoststm32-maple"
3030
self.packages["framework-arduinoststm32-maple"]["optional"] = False
3131
self.packages["framework-arduinoststm32"]["optional"] = True
32-
self.packages['toolchain-gccarmnoneeabi']['version'] = "<1.80000.0"
3332

3433
if board == "mxchip_az3166":
3534
self.frameworks['arduino'][

0 commit comments

Comments
 (0)