Skip to content

Commit 2064757

Browse files
committed
Merge branch 'release/v4.17.0'
2 parents 7cb5ce1 + 8ff8e1b commit 2064757

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

boards/teensy40.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,13 @@
1010
"mcu": "imxrt1062",
1111
"zephyr": {
1212
"variant": "teensy40"
13-
}
13+
},
14+
"hwids": [
15+
[
16+
"0x16C0",
17+
"0x0483"
18+
]
19+
]
1420
},
1521
"connectivity": [
1622
"can"

builder/frameworks/arduino.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@
6161
"USB_FLIGHTSIM_JOYSTICK",
6262
"USB_EVERYTHING",
6363
"USB_DISABLED",
64+
"USB_MTPDISK_SERIAL"
6465
)
6566
if not set(env.get("CPPDEFINES", [])) & set(BUILTIN_USB_FLAGS):
6667
env.Append(CPPDEFINES=["USB_SERIAL"])

platform.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"type": "git",
2020
"url": "https://github.com/platformio/platform-teensy.git"
2121
},
22-
"version": "4.16.0",
22+
"version": "4.17.0",
2323
"frameworks": {
2424
"arduino": {
2525
"package": "framework-arduinoteensy",
@@ -52,7 +52,7 @@
5252
"type": "framework",
5353
"optional": true,
5454
"owner": "platformio",
55-
"version": "~1.156.0"
55+
"version": "~1.157.0"
5656
},
5757
"framework-mbed": {
5858
"type": "framework",

0 commit comments

Comments
 (0)