Skip to content

Commit fe139f7

Browse files
committed
Merge branch 'release/v19.3.0'
2 parents 1ce325a + 5d4253a commit fe139f7

File tree

3 files changed

+15
-5
lines changed

3 files changed

+15
-5
lines changed

examples/zephyr-subsys-usb-hid-mouse/zephyr/app.overlay

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
/ {
88
hid_dev_0: hid_dev_0 {
99
compatible = "zephyr,hid-device";
10-
interface-name = "HID0";
11-
protocol-code = "keyboard";
12-
in-report-size = <64>;
10+
label = "HID0";
11+
protocol-code = "none";
1312
in-polling-period-us = <1000>;
13+
in-report-size = <64>;
1414
};
1515
};

platform.json

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"type": "git",
1919
"url": "https://github.com/platformio/platform-ststm32.git"
2020
},
21-
"version": "19.2.0",
21+
"version": "19.3.0",
2222
"frameworks": {
2323
"mbed": {
2424
"package": "framework-mbed",
@@ -298,14 +298,20 @@
298298
"type": "framework",
299299
"optional": true,
300300
"owner": "platformio",
301-
"version": "~3.40100.0"
301+
"version": "~3.40200.0"
302302
},
303303
"tool-stm32flash": {
304304
"type": "uploader",
305305
"optional": true,
306306
"owner": "platformio",
307307
"version": "~0.7.0"
308308
},
309+
"tool-stm32duino": {
310+
"type": "uploader",
311+
"optional": true,
312+
"owner": "platformio",
313+
"version": "~1.0.1"
314+
},
309315
"tool-openocd": {
310316
"type": "uploader",
311317
"optional": true,

platform.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,11 @@ def configure_default_packages(self, variables, targets):
7676
if board.startswith(("portenta", "opta", "nicla", "giga")):
7777
dfu_package = "tool-dfuutil-arduino"
7878
self.packages.pop("tool-dfuutil")
79+
self.packages.pop("tool-stm32duino")
80+
elif build_mcu.startswith("stm32f103"):
81+
dfu_package = "tool-stm32duino"
7982
else:
83+
self.packages.pop("tool-stm32duino")
8084
self.packages.pop("tool-dfuutil-arduino")
8185
self.packages[dfu_package]["optional"] = False
8286

0 commit comments

Comments
 (0)