Skip to content

Commit

Permalink
Merge branch 'release/v4.17.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
valeros committed Jul 31, 2022
2 parents 7cb5ce1 + 8ff8e1b commit 2064757
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 3 deletions.
8 changes: 7 additions & 1 deletion boards/teensy40.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,13 @@
"mcu": "imxrt1062",
"zephyr": {
"variant": "teensy40"
}
},
"hwids": [
[
"0x16C0",
"0x0483"
]
]
},
"connectivity": [
"can"
Expand Down
1 change: 1 addition & 0 deletions builder/frameworks/arduino.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
"USB_FLIGHTSIM_JOYSTICK",
"USB_EVERYTHING",
"USB_DISABLED",
"USB_MTPDISK_SERIAL"
)
if not set(env.get("CPPDEFINES", [])) & set(BUILTIN_USB_FLAGS):
env.Append(CPPDEFINES=["USB_SERIAL"])
Expand Down
4 changes: 2 additions & 2 deletions platform.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"type": "git",
"url": "https://github.com/platformio/platform-teensy.git"
},
"version": "4.16.0",
"version": "4.17.0",
"frameworks": {
"arduino": {
"package": "framework-arduinoteensy",
Expand Down Expand Up @@ -52,7 +52,7 @@
"type": "framework",
"optional": true,
"owner": "platformio",
"version": "~1.156.0"
"version": "~1.157.0"
},
"framework-mbed": {
"type": "framework",
Expand Down

0 comments on commit 2064757

Please sign in to comment.