Skip to content

Commit c823698

Browse files
authored
Teensyduino 1.53 Compatibility (#20)
* Teensyduino 1.53 Compatibility * Update Travis software versions * Update Teensyduino version in README (1.53)
1 parent 5224d13 commit c823698

File tree

5 files changed

+23
-30
lines changed

5 files changed

+23
-30
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
language: C
22
env:
33
global:
4-
- IDE_VERSION=1.8.12
5-
- TEENSY_VERSION=152
4+
- IDE_VERSION=1.8.13
5+
- TEENSY_VERSION=153
66
- IDE_LOCATION=/usr/local/share/arduino
77
- BOARDS_DESTINATION=$IDE_LOCATION/hardware
88

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.52**](https://www.pjrc.com/teensy/td_152). 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.53**](https://www.pjrc.com/teensy/td_153). 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: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ teensy41.build.flags.common=-g -Wall -ffunction-sections -fdata-sections -nostdl
2727
teensy41.build.flags.dep=-MMD
2828
teensy41.build.flags.optimize=-Os
2929
teensy41.build.flags.cpu=-mthumb -mcpu=cortex-m7 -mfloat-abi=hard -mfpu=fpv5-d16
30-
teensy41.build.flags.defs=-D__IMXRT1062__ -DTEENSYDUINO=152
30+
teensy41.build.flags.defs=-D__IMXRT1062__ -DTEENSYDUINO=153
3131
teensy41.build.flags.cpp=-std=gnu++14 -fno-exceptions -fpermissive -fno-rtti -fno-threadsafe-statics -felide-constructors -Wno-error=narrowing
3232
teensy41.build.flags.c=
3333
teensy41.build.flags.S=-x assembler-with-cpp
@@ -226,7 +226,7 @@ teensy40.build.flags.common=-g -Wall -ffunction-sections -fdata-sections -nostdl
226226
teensy40.build.flags.dep=-MMD
227227
teensy40.build.flags.optimize=-Os
228228
teensy40.build.flags.cpu=-mthumb -mcpu=cortex-m7 -mfloat-abi=hard -mfpu=fpv5-d16
229-
teensy40.build.flags.defs=-D__IMXRT1062__ -DTEENSYDUINO=152
229+
teensy40.build.flags.defs=-D__IMXRT1062__ -DTEENSYDUINO=153
230230
teensy40.build.flags.cpp=-std=gnu++14 -fno-exceptions -fpermissive -fno-rtti -fno-threadsafe-statics -felide-constructors -Wno-error=narrowing
231231
teensy40.build.flags.c=
232232
teensy40.build.flags.S=-x assembler-with-cpp
@@ -422,12 +422,12 @@ teensy36.build.flags.common=-g -Wall -ffunction-sections -fdata-sections -nostdl
422422
teensy36.build.flags.dep=-MMD
423423
teensy36.build.flags.optimize=-Os
424424
teensy36.build.flags.cpu=-mthumb -mcpu=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 -fsingle-precision-constant
425-
teensy36.build.flags.defs=-D__MK66FX1M0__ -DTEENSYDUINO=152
425+
teensy36.build.flags.defs=-D__MK66FX1M0__ -DTEENSYDUINO=153
426426
teensy36.build.flags.cpp=-fno-exceptions -fpermissive -felide-constructors -std=gnu++14 -Wno-error=narrowing -fno-rtti
427427
teensy36.build.flags.c=
428428
teensy36.build.flags.S=-x assembler-with-cpp
429-
teensy36.build.flags.ld=-Wl,--gc-sections,--relax,--defsym=__rtc_localtime={extra.time.local} "-T{build.core.path}/mk66fx1m0.ld" -lstdc++
430-
teensy36.build.flags.libs=-larm_cortexM4lf_math -lm
429+
teensy36.build.flags.ld=-Wl,--gc-sections,--relax,--defsym=__rtc_localtime={extra.time.local} "-T{build.core.path}/mk66fx1m0.ld"
430+
teensy36.build.flags.libs=-larm_cortexM4lf_math -lm -lstdc++
431431
teensy36.serial.restart_cmd=false
432432
teensy36.menu.usb.serial=Serial
433433
teensy36.menu.usb.serial.build.usbtype=USB_SERIAL
@@ -634,12 +634,12 @@ teensy35.build.flags.common=-g -Wall -ffunction-sections -fdata-sections -nostdl
634634
teensy35.build.flags.dep=-MMD
635635
teensy35.build.flags.optimize=-Os
636636
teensy35.build.flags.cpu=-mthumb -mcpu=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 -fsingle-precision-constant
637-
teensy35.build.flags.defs=-D__MK64FX512__ -DTEENSYDUINO=152
637+
teensy35.build.flags.defs=-D__MK64FX512__ -DTEENSYDUINO=153
638638
teensy35.build.flags.cpp=-fno-exceptions -fpermissive -felide-constructors -std=gnu++14 -Wno-error=narrowing -fno-rtti
639639
teensy35.build.flags.c=
640640
teensy35.build.flags.S=-x assembler-with-cpp
641-
teensy35.build.flags.ld=-Wl,--gc-sections,--relax,--defsym=__rtc_localtime={extra.time.local} "-T{build.core.path}/mk64fx512.ld" -lstdc++
642-
teensy35.build.flags.libs=-larm_cortexM4lf_math -lm
641+
teensy35.build.flags.ld=-Wl,--gc-sections,--relax,--defsym=__rtc_localtime={extra.time.local} "-T{build.core.path}/mk64fx512.ld"
642+
teensy35.build.flags.libs=-larm_cortexM4lf_math -lm -lstdc++
643643
teensy35.serial.restart_cmd=false
644644
teensy35.menu.usb.serial=Serial
645645
teensy35.menu.usb.serial.build.usbtype=USB_SERIAL
@@ -836,12 +836,12 @@ teensy31.build.flags.common=-g -Wall -ffunction-sections -fdata-sections -nostdl
836836
teensy31.build.flags.dep=-MMD
837837
teensy31.build.flags.optimize=-Os
838838
teensy31.build.flags.cpu=-mthumb -mcpu=cortex-m4 -fsingle-precision-constant
839-
teensy31.build.flags.defs=-D__MK20DX256__ -DTEENSYDUINO=152
839+
teensy31.build.flags.defs=-D__MK20DX256__ -DTEENSYDUINO=153
840840
teensy31.build.flags.cpp=-fno-exceptions -fpermissive -felide-constructors -std=gnu++14 -Wno-error=narrowing -fno-rtti
841841
teensy31.build.flags.c=
842842
teensy31.build.flags.S=-x assembler-with-cpp
843-
teensy31.build.flags.ld=-Wl,--gc-sections,--relax,--defsym=__rtc_localtime={extra.time.local} "-T{build.core.path}/mk20dx256.ld" -lstdc++
844-
teensy31.build.flags.libs=-larm_cortexM4l_math -lm
843+
teensy31.build.flags.ld=-Wl,--gc-sections,--relax,--defsym=__rtc_localtime={extra.time.local} "-T{build.core.path}/mk20dx256.ld"
844+
teensy31.build.flags.libs=-larm_cortexM4l_math -lm -lstdc++
845845
teensy31.serial.restart_cmd=false
846846
teensy31.menu.usb.serial=Serial
847847
teensy31.menu.usb.serial.build.usbtype=USB_SERIAL
@@ -1049,13 +1049,13 @@ teensy30.build.flags.common=-g -Wall -ffunction-sections -fdata-sections -nostdl
10491049
teensy30.build.flags.dep=-MMD
10501050
teensy30.build.flags.optimize=-Os
10511051
teensy30.build.flags.cpu=-mthumb -mcpu=cortex-m4 -fsingle-precision-constant
1052-
teensy30.build.flags.defs=-D__MK20DX128__ -DTEENSYDUINO=152
1052+
teensy30.build.flags.defs=-D__MK20DX128__ -DTEENSYDUINO=153
10531053
teensy30.build.flags.cpp=-fno-exceptions -fpermissive -felide-constructors -std=gnu++14 -Wno-error=narrowing -fno-rtti
10541054
teensy30.build.flags.c=
10551055
teensy30.build.flags.S=-x assembler-with-cpp
1056-
teensy30.build.flags.ld=-Wl,--gc-sections,--relax,--defsym=__rtc_localtime={extra.time.local} "-T{build.core.path}/mk20dx128.ld" -lstdc++
1056+
teensy30.build.flags.ld=-Wl,--gc-sections,--relax,--defsym=__rtc_localtime={extra.time.local} "-T{build.core.path}/mk20dx128.ld"
10571057
teensy30.build.flags.ldspecs=--specs=nano.specs
1058-
teensy30.build.flags.libs=-larm_cortexM4l_math -lm
1058+
teensy30.build.flags.libs=-larm_cortexM4l_math -lm -lstdc++
10591059
teensy30.serial.restart_cmd=false
10601060

10611061
teensy30.menu.usb.serial=Serial
@@ -1208,12 +1208,12 @@ teensyLC.build.command.size=arm-none-eabi-size
12081208
teensyLC.build.flags.common=-g -Wall -ffunction-sections -fdata-sections -nostdlib
12091209
teensyLC.build.flags.dep=-MMD
12101210
teensyLC.build.flags.cpu=-mthumb -mcpu=cortex-m0plus -fsingle-precision-constant
1211-
teensyLC.build.flags.defs=-D__MKL26Z64__ -DTEENSYDUINO=152
1211+
teensyLC.build.flags.defs=-D__MKL26Z64__ -DTEENSYDUINO=153
12121212
teensyLC.build.flags.cpp=-fno-exceptions -fpermissive -felide-constructors -std=gnu++14 -Wno-error=narrowing -fno-rtti
12131213
teensyLC.build.flags.c=
12141214
teensyLC.build.flags.S=-x assembler-with-cpp
1215-
teensyLC.build.flags.ld=-Wl,--gc-sections,--relax,--defsym=__rtc_localtime={extra.time.local} "-T{build.core.path}/mkl26z64.ld" -lstdc++
1216-
teensyLC.build.flags.libs=-larm_cortexM0l_math -lm
1215+
teensyLC.build.flags.ld=-Wl,--gc-sections,--relax,--defsym=__rtc_localtime={extra.time.local} "-T{build.core.path}/mkl26z64.ld"
1216+
teensyLC.build.flags.libs=-larm_cortexM0l_math -lm -lstdc++
12171217
teensyLC.serial.restart_cmd=false
12181218
teensyLC.menu.usb.serial=Serial
12191219
teensyLC.menu.usb.serial.build.usbtype=USB_SERIAL
@@ -1366,7 +1366,7 @@ teensypp2.build.flags.common=-g -Wall -ffunction-sections -fdata-sections
13661366
teensypp2.build.flags.dep=-MMD
13671367
teensypp2.build.flags.optimize=-Os
13681368
teensypp2.build.flags.cpu=-mmcu=at90usb1286
1369-
teensypp2.build.flags.defs=-DTEENSYDUINO=152 -DARDUINO_ARCH_AVR
1369+
teensypp2.build.flags.defs=-DTEENSYDUINO=153 -DARDUINO_ARCH_AVR
13701370
teensypp2.build.flags.cpp=-fno-exceptions -fpermissive -felide-constructors -std=gnu++11
13711371
teensypp2.build.flags.c=
13721372
teensypp2.build.flags.S=-x assembler-with-cpp
@@ -1483,7 +1483,7 @@ teensy2.build.flags.common=-g -Wall -ffunction-sections -fdata-sections
14831483
teensy2.build.flags.dep=-MMD
14841484
teensy2.build.flags.optimize=-Os
14851485
teensy2.build.flags.cpu=-mmcu=atmega32u4
1486-
teensy2.build.flags.defs=-DTEENSYDUINO=152 -DARDUINO_ARCH_AVR
1486+
teensy2.build.flags.defs=-DTEENSYDUINO=153 -DARDUINO_ARCH_AVR
14871487
teensy2.build.flags.cpp=-fno-exceptions -fpermissive -felide-constructors -std=gnu++11
14881488
teensy2.build.flags.c=
14891489
teensy2.build.flags.S=-x assembler-with-cpp

teensy/avr/cores/teensy3/usb_dev.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1176,7 +1176,7 @@ void usb_init(void)
11761176

11771177
usb_init_serialnumber();
11781178

1179-
for (i=0; i <= NUM_ENDPOINTS*4; i++) {
1179+
for (i=0; i < (NUM_ENDPOINTS+1)*4; i++) {
11801180
table[i].desc = 0;
11811181
table[i].addr = 0;
11821182
}

teensy/avr/cores/teensy3/usb_inst.cpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,3 @@ usb_seremu_class Serial;
101101
#endif
102102

103103
#endif // F_CPU
104-
105-
void serialEvent() __attribute__((weak));
106-
void serialEvent() {}
107-
void serialEventUSB1() __attribute__((weak));
108-
void serialEventUSB1() {}
109-
void serialEventUSB2() __attribute__((weak));
110-
void serialEventUSB2() {}

0 commit comments

Comments
 (0)