Skip to content

Commit 13f2187

Browse files
authored
Merge pull request #9 from dmadison/145
Teensyduino 1.45 Compatibility
2 parents 5ea1339 + d6887bd commit 13f2187

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

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.44**](https://www.pjrc.com/teensy/td_144). 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.45**](https://www.pjrc.com/teensy/td_145). 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: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ teensy36.build.flags.common=-g -Wall -ffunction-sections -fdata-sections -nostdl
2323
teensy36.build.flags.dep=-MMD
2424
teensy36.build.flags.optimize=-Os
2525
teensy36.build.flags.cpu=-mthumb -mcpu=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 -fsingle-precision-constant
26-
teensy36.build.flags.defs=-D__MK66FX1M0__ -DTEENSYDUINO=144
26+
teensy36.build.flags.defs=-D__MK66FX1M0__ -DTEENSYDUINO=145
2727
teensy36.build.flags.cpp=-fno-exceptions -felide-constructors -std=gnu++14 -Wno-error=narrowing -fno-rtti
2828
teensy36.build.flags.c=
2929
teensy36.build.flags.S=-x assembler-with-cpp
@@ -103,6 +103,8 @@ teensy36.menu.speed.2=2 MHz (No USB)
103103
teensy36.menu.speed.192=192 MHz (overclock)
104104
teensy36.menu.speed.216=216 MHz (overclock)
105105
teensy36.menu.speed.240=240 MHz (overclock)
106+
#teensy36.menu.speed.256=256 MHz (overclock)
107+
#teensy36.menu.speed.256.build.fcpu=256000000
106108
teensy36.menu.speed.240.build.fcpu=240000000
107109
teensy36.menu.speed.216.build.fcpu=216000000
108110
teensy36.menu.speed.192.build.fcpu=192000000
@@ -228,7 +230,7 @@ teensy35.build.flags.common=-g -Wall -ffunction-sections -fdata-sections -nostdl
228230
teensy35.build.flags.dep=-MMD
229231
teensy35.build.flags.optimize=-Os
230232
teensy35.build.flags.cpu=-mthumb -mcpu=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 -fsingle-precision-constant
231-
teensy35.build.flags.defs=-D__MK64FX512__ -DTEENSYDUINO=144
233+
teensy35.build.flags.defs=-D__MK64FX512__ -DTEENSYDUINO=145
232234
teensy35.build.flags.cpp=-fno-exceptions -felide-constructors -std=gnu++14 -Wno-error=narrowing -fno-rtti
233235
teensy35.build.flags.c=
234236
teensy35.build.flags.S=-x assembler-with-cpp
@@ -425,7 +427,7 @@ teensy31.build.flags.common=-g -Wall -ffunction-sections -fdata-sections -nostdl
425427
teensy31.build.flags.dep=-MMD
426428
teensy31.build.flags.optimize=-Os
427429
teensy31.build.flags.cpu=-mthumb -mcpu=cortex-m4 -fsingle-precision-constant
428-
teensy31.build.flags.defs=-D__MK20DX256__ -DTEENSYDUINO=144
430+
teensy31.build.flags.defs=-D__MK20DX256__ -DTEENSYDUINO=145
429431
teensy31.build.flags.cpp=-fno-exceptions -felide-constructors -std=gnu++14 -Wno-error=narrowing -fno-rtti
430432
teensy31.build.flags.c=
431433
teensy31.build.flags.S=-x assembler-with-cpp
@@ -633,7 +635,7 @@ teensy30.build.flags.common=-g -Wall -ffunction-sections -fdata-sections -nostdl
633635
teensy30.build.flags.dep=-MMD
634636
teensy30.build.flags.optimize=-Os
635637
teensy30.build.flags.cpu=-mthumb -mcpu=cortex-m4 -fsingle-precision-constant
636-
teensy30.build.flags.defs=-D__MK20DX128__ -DTEENSYDUINO=144
638+
teensy30.build.flags.defs=-D__MK20DX128__ -DTEENSYDUINO=145
637639
teensy30.build.flags.cpp=-fno-exceptions -felide-constructors -std=gnu++14 -Wno-error=narrowing -fno-rtti
638640
teensy30.build.flags.c=
639641
teensy30.build.flags.S=-x assembler-with-cpp
@@ -791,7 +793,7 @@ teensyLC.build.command.size=arm-none-eabi-size
791793
teensyLC.build.flags.common=-g -Wall -ffunction-sections -fdata-sections -nostdlib
792794
teensyLC.build.flags.dep=-MMD
793795
teensyLC.build.flags.cpu=-mthumb -mcpu=cortex-m0plus -fsingle-precision-constant
794-
teensyLC.build.flags.defs=-D__MKL26Z64__ -DTEENSYDUINO=144
796+
teensyLC.build.flags.defs=-D__MKL26Z64__ -DTEENSYDUINO=145
795797
teensyLC.build.flags.cpp=-fno-exceptions -felide-constructors -std=gnu++14 -Wno-error=narrowing -fno-rtti
796798
teensyLC.build.flags.c=
797799
teensyLC.build.flags.S=-x assembler-with-cpp
@@ -944,7 +946,7 @@ teensypp2.build.flags.common=-g -Wall -ffunction-sections -fdata-sections
944946
teensypp2.build.flags.dep=-MMD
945947
teensypp2.build.flags.optimize=-Os
946948
teensypp2.build.flags.cpu=-mmcu=at90usb1286
947-
teensypp2.build.flags.defs=-DTEENSYDUINO=144 -DARDUINO_ARCH_AVR
949+
teensypp2.build.flags.defs=-DTEENSYDUINO=145 -DARDUINO_ARCH_AVR
948950
teensypp2.build.flags.cpp=-fno-exceptions -felide-constructors -std=gnu++11
949951
teensypp2.build.flags.c=
950952
teensypp2.build.flags.S=-x assembler-with-cpp
@@ -1060,7 +1062,7 @@ teensy2.build.flags.common=-g -Wall -ffunction-sections -fdata-sections
10601062
teensy2.build.flags.dep=-MMD
10611063
teensy2.build.flags.optimize=-Os
10621064
teensy2.build.flags.cpu=-mmcu=atmega32u4
1063-
teensy2.build.flags.defs=-DTEENSYDUINO=144 -DARDUINO_ARCH_AVR
1065+
teensy2.build.flags.defs=-DTEENSYDUINO=145 -DARDUINO_ARCH_AVR
10641066
teensy2.build.flags.cpp=-fno-exceptions -felide-constructors -std=gnu++11
10651067
teensy2.build.flags.c=
10661068
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
@@ -1136,7 +1136,7 @@ void usb_init(void)
11361136
#ifdef HAS_KINETIS_MPU
11371137
MPU_RGDAAC0 |= 0x03000000;
11381138
#endif
1139-
#if F_CPU == 180000000 || F_CPU == 216000000
1139+
#if F_CPU == 180000000 || F_CPU == 216000000 || F_CPU == 256000000
11401140
// if using IRC48M, turn on the USB clock recovery hardware
11411141
USB0_CLK_RECOVER_IRC_EN = USB_CLK_RECOVER_IRC_EN_IRC_EN | USB_CLK_RECOVER_IRC_EN_REG_EN;
11421142
USB0_CLK_RECOVER_CTRL = USB_CLK_RECOVER_CTRL_CLOCK_RECOVER_EN |

0 commit comments

Comments
 (0)