Skip to content

Commit 8a9194a

Browse files
authored
Teensyduino 1.56 Compatibility (#25)
* Teensyduino 1.56 Compatibility * Update CI software versions * Update Teensyduino version in README
1 parent 7b1deb6 commit 8a9194a

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ name: build
33
on: [push, pull_request, workflow_dispatch]
44

55
env:
6-
IDE_VERSION: 1.8.16
7-
TEENSY_VERSION: 155
6+
IDE_VERSION: 1.8.19
7+
TEENSY_VERSION: 156
88
IDE_LOCATION: /usr/local/share/arduino
99

1010
jobs:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ This is meant to be used in conjunction with the [ArduinoXInput library](https:/
66

77
## Installation
88

9-
You must have both [Arduino](https://www.arduino.cc/en/main/software) and [Teensyduino](https://www.pjrc.com/teensy/td_download.html) installed before proceeding. Double-check that your installed Teensyduino version matches the files provided in this repository. This repository is currently using version [**1.55**](https://www.pjrc.com/teensy/td_155). If you don't know your Teensyduino version, compile a blank sketch with a Teensy board selected and the Teensy Loader will open. In the Teensy Loader window select `Help -> About` and it will tell you the version number. If your version does not match you will have to reinstall or update the Teensyduino software.
9+
You must have both [Arduino](https://www.arduino.cc/en/main/software) and [Teensyduino](https://www.pjrc.com/teensy/td_download.html) installed before proceeding. Double-check that your installed Teensyduino version matches the files provided in this repository. This repository is currently using version [**1.56**](https://www.pjrc.com/teensy/td_156). If you don't know your Teensyduino version, compile a blank sketch with a Teensy board selected and the Teensy Loader will open. In the Teensy Loader window select `Help -> About` and it will tell you the version number. If your version does not match you will have to reinstall or update the Teensyduino software.
1010

1111
Navigate to your Arduino installation directory and open up the 'hardware' folder. It is recommended that you make a backup of this folder before proceeding in case something goes wrong or if you want to revert the installation.
1212

teensy/avr/boards.txt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ teensy41.build.flags.common=-g -Wall -ffunction-sections -fdata-sections -nostdl
3535
teensy41.build.flags.dep=-MMD
3636
teensy41.build.flags.optimize=-Os
3737
teensy41.build.flags.cpu=-mthumb -mcpu=cortex-m7 -mfloat-abi=hard -mfpu=fpv5-d16
38-
teensy41.build.flags.defs=-D__IMXRT1062__ -DTEENSYDUINO=155
38+
teensy41.build.flags.defs=-D__IMXRT1062__ -DTEENSYDUINO=156
3939
teensy41.build.flags.cpp=-std=gnu++14 -fno-exceptions -fpermissive -fno-rtti -fno-threadsafe-statics -felide-constructors -Wno-error=narrowing
4040
teensy41.build.flags.c=
4141
teensy41.build.flags.S=-x assembler-with-cpp
@@ -235,7 +235,7 @@ teensyMM.build.flags.common=-g -Wall -ffunction-sections -fdata-sections -nostdl
235235
teensyMM.build.flags.dep=-MMD
236236
teensyMM.build.flags.optimize=-Os
237237
teensyMM.build.flags.cpu=-mthumb -mcpu=cortex-m7 -mfloat-abi=hard -mfpu=fpv5-d16
238-
teensyMM.build.flags.defs=-D__IMXRT1062__ -DTEENSYDUINO=155
238+
teensyMM.build.flags.defs=-D__IMXRT1062__ -DTEENSYDUINO=156
239239
teensyMM.build.flags.cpp=-std=gnu++14 -fno-exceptions -fpermissive -fno-rtti -fno-threadsafe-statics -felide-constructors -Wno-error=narrowing
240240
teensyMM.build.flags.c=
241241
teensyMM.build.flags.S=-x assembler-with-cpp
@@ -435,7 +435,7 @@ teensy40.build.flags.common=-g -Wall -ffunction-sections -fdata-sections -nostdl
435435
teensy40.build.flags.dep=-MMD
436436
teensy40.build.flags.optimize=-Os
437437
teensy40.build.flags.cpu=-mthumb -mcpu=cortex-m7 -mfloat-abi=hard -mfpu=fpv5-d16
438-
teensy40.build.flags.defs=-D__IMXRT1062__ -DTEENSYDUINO=155
438+
teensy40.build.flags.defs=-D__IMXRT1062__ -DTEENSYDUINO=156
439439
teensy40.build.flags.cpp=-std=gnu++14 -fno-exceptions -fpermissive -fno-rtti -fno-threadsafe-statics -felide-constructors -Wno-error=narrowing
440440
teensy40.build.flags.c=
441441
teensy40.build.flags.S=-x assembler-with-cpp
@@ -631,7 +631,7 @@ teensy36.build.flags.common=-g -Wall -ffunction-sections -fdata-sections -nostdl
631631
teensy36.build.flags.dep=-MMD
632632
teensy36.build.flags.optimize=-Os
633633
teensy36.build.flags.cpu=-mthumb -mcpu=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 -fsingle-precision-constant
634-
teensy36.build.flags.defs=-D__MK66FX1M0__ -DTEENSYDUINO=155
634+
teensy36.build.flags.defs=-D__MK66FX1M0__ -DTEENSYDUINO=156
635635
teensy36.build.flags.cpp=-fno-exceptions -fpermissive -felide-constructors -std=gnu++14 -Wno-error=narrowing -fno-rtti
636636
teensy36.build.flags.c=
637637
teensy36.build.flags.S=-x assembler-with-cpp
@@ -843,7 +843,7 @@ teensy35.build.flags.common=-g -Wall -ffunction-sections -fdata-sections -nostdl
843843
teensy35.build.flags.dep=-MMD
844844
teensy35.build.flags.optimize=-Os
845845
teensy35.build.flags.cpu=-mthumb -mcpu=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 -fsingle-precision-constant
846-
teensy35.build.flags.defs=-D__MK64FX512__ -DTEENSYDUINO=155
846+
teensy35.build.flags.defs=-D__MK64FX512__ -DTEENSYDUINO=156
847847
teensy35.build.flags.cpp=-fno-exceptions -fpermissive -felide-constructors -std=gnu++14 -Wno-error=narrowing -fno-rtti
848848
teensy35.build.flags.c=
849849
teensy35.build.flags.S=-x assembler-with-cpp
@@ -1045,7 +1045,7 @@ teensy31.build.flags.common=-g -Wall -ffunction-sections -fdata-sections -nostdl
10451045
teensy31.build.flags.dep=-MMD
10461046
teensy31.build.flags.optimize=-Os
10471047
teensy31.build.flags.cpu=-mthumb -mcpu=cortex-m4 -fsingle-precision-constant
1048-
teensy31.build.flags.defs=-D__MK20DX256__ -DTEENSYDUINO=155
1048+
teensy31.build.flags.defs=-D__MK20DX256__ -DTEENSYDUINO=156
10491049
teensy31.build.flags.cpp=-fno-exceptions -fpermissive -felide-constructors -std=gnu++14 -Wno-error=narrowing -fno-rtti
10501050
teensy31.build.flags.c=
10511051
teensy31.build.flags.S=-x assembler-with-cpp
@@ -1258,7 +1258,7 @@ teensy30.build.flags.common=-g -Wall -ffunction-sections -fdata-sections -nostdl
12581258
teensy30.build.flags.dep=-MMD
12591259
teensy30.build.flags.optimize=-Os
12601260
teensy30.build.flags.cpu=-mthumb -mcpu=cortex-m4 -fsingle-precision-constant
1261-
teensy30.build.flags.defs=-D__MK20DX128__ -DTEENSYDUINO=155
1261+
teensy30.build.flags.defs=-D__MK20DX128__ -DTEENSYDUINO=156
12621262
teensy30.build.flags.cpp=-fno-exceptions -fpermissive -felide-constructors -std=gnu++14 -Wno-error=narrowing -fno-rtti
12631263
teensy30.build.flags.c=
12641264
teensy30.build.flags.S=-x assembler-with-cpp
@@ -1417,7 +1417,7 @@ teensyLC.build.command.size=arm-none-eabi-size
14171417
teensyLC.build.flags.common=-g -Wall -ffunction-sections -fdata-sections -nostdlib -mno-unaligned-access
14181418
teensyLC.build.flags.dep=-MMD
14191419
teensyLC.build.flags.cpu=-mthumb -mcpu=cortex-m0plus -fsingle-precision-constant
1420-
teensyLC.build.flags.defs=-D__MKL26Z64__ -DTEENSYDUINO=155
1420+
teensyLC.build.flags.defs=-D__MKL26Z64__ -DTEENSYDUINO=156
14211421
teensyLC.build.flags.cpp=-fno-exceptions -fpermissive -felide-constructors -std=gnu++14 -Wno-error=narrowing -fno-rtti
14221422
teensyLC.build.flags.c=
14231423
teensyLC.build.flags.S=-x assembler-with-cpp
@@ -1575,7 +1575,7 @@ teensypp2.build.flags.common=-g -Wall -ffunction-sections -fdata-sections
15751575
teensypp2.build.flags.dep=-MMD
15761576
teensypp2.build.flags.optimize=-Os
15771577
teensypp2.build.flags.cpu=-mmcu=at90usb1286
1578-
teensypp2.build.flags.defs=-DTEENSYDUINO=155 -DARDUINO_ARCH_AVR
1578+
teensypp2.build.flags.defs=-DTEENSYDUINO=156 -DARDUINO_ARCH_AVR
15791579
teensypp2.build.flags.cpp=-fno-exceptions -fpermissive -felide-constructors -std=gnu++11
15801580
teensypp2.build.flags.c=
15811581
teensypp2.build.flags.S=-x assembler-with-cpp
@@ -1692,7 +1692,7 @@ teensy2.build.flags.common=-g -Wall -ffunction-sections -fdata-sections
16921692
teensy2.build.flags.dep=-MMD
16931693
teensy2.build.flags.optimize=-Os
16941694
teensy2.build.flags.cpu=-mmcu=atmega32u4
1695-
teensy2.build.flags.defs=-DTEENSYDUINO=155 -DARDUINO_ARCH_AVR
1695+
teensy2.build.flags.defs=-DTEENSYDUINO=156 -DARDUINO_ARCH_AVR
16961696
teensy2.build.flags.cpp=-fno-exceptions -fpermissive -felide-constructors -std=gnu++11
16971697
teensy2.build.flags.c=
16981698
teensy2.build.flags.S=-x assembler-with-cpp

teensy/avr/cores/teensy3/usb_desc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1281,7 +1281,7 @@ static uint8_t config_descriptor[CONFIG_DESC_SIZE] = {
12811281
0x06, // bInterfaceClass (0x06 = still image)
12821282
0x01, // bInterfaceSubClass
12831283
0x01, // bInterfaceProtocol
1284-
0, // iInterface
1284+
4, // iInterface
12851285
// endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13
12861286
7, // bLength
12871287
5, // bDescriptorType

0 commit comments

Comments
 (0)