Fixes for spi4teensy3 on 3.5/3.6. Be sure to update your spi4teensy3 library as well.

examples/Bluetooth/BTHID/BTHID.ino

@@ -12,8 +12,8 @@
 // Satisfy the IDE, which needs to see the include statment in the ino too.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
-#include <SPI.h>
 #endif
+#include <SPI.h>
 
 USB Usb;
 //USBHub Hub1(&Usb); // Some dongles have a hub inside

examples/Bluetooth/PS3BT/PS3BT.ino

@@ -10,8 +10,8 @@
 // Satisfy the IDE, which needs to see the include statment in the ino too.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
-#include <SPI.h>
 #endif
+#include <SPI.h>
 
 USB Usb;
 //USBHub Hub1(&Usb); // Some dongles have a hub inside

examples/Bluetooth/PS3Multi/PS3Multi.ino

@@ -11,8 +11,8 @@
 // Satisfy the IDE, which needs to see the include statment in the ino too.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
-#include <SPI.h>
 #endif
+#include <SPI.h>
 
 USB Usb;
 //USBHub Hub1(&Usb); // Some dongles have a hub inside

examples/Bluetooth/PS3SPP/PS3SPP.ino

@@ -16,8 +16,8 @@
 // Satisfy the IDE, which needs to see the include statment in the ino too.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
-#include <SPI.h>
 #endif
+#include <SPI.h>
 
 USB Usb;
 //USBHub Hub1(&Usb); // Some dongles have a hub inside

examples/Bluetooth/PS4BT/PS4BT.ino

@@ -10,8 +10,8 @@
 // Satisfy the IDE, which needs to see the include statment in the ino too.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
-#include <SPI.h>
 #endif
+#include <SPI.h>
 
 USB Usb;
 //USBHub Hub1(&Usb); // Some dongles have a hub inside

examples/Bluetooth/SPP/SPP.ino

@@ -10,8 +10,8 @@
 // Satisfy the IDE, which needs to see the include statment in the ino too.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
-#include <SPI.h>
 #endif
+#include <SPI.h>
 
 USB Usb;
 //USBHub Hub1(&Usb); // Some dongles have a hub inside

examples/Bluetooth/SPPMulti/SPPMulti.ino

@@ -10,8 +10,8 @@
 // Satisfy IDE, which only needs to see the include statment in the ino.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
-#include <SPI.h>
 #endif
+#include <SPI.h>
 
 USB Usb;
 //USBHub Hub1(&Usb); // Some dongles have a hub inside

examples/Bluetooth/Wii/Wii.ino

@@ -10,8 +10,8 @@
 // Satisfy the IDE, which needs to see the include statment in the ino too.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
-#include <SPI.h>
 #endif
+#include <SPI.h>
 
 USB Usb;
 //USBHub Hub1(&Usb); // Some dongles have a hub inside

examples/Bluetooth/WiiBalanceBoard/WiiBalanceBoard.ino

@@ -10,8 +10,8 @@
 // Satisfy the IDE, which needs to see the include statment in the ino too.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
-#include <SPI.h>
 #endif
+#include <SPI.h>
 
 USB Usb;
 //USBHub Hub1(&Usb); // Some dongles have a hub inside

examples/Bluetooth/WiiIRCamera/WiiIRCamera.ino

@@ -17,8 +17,8 @@ Otherwise, wire up a IR LED yourself.
 // Satisfy the IDE, which needs to see the include statment in the ino too.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
-#include <SPI.h>
 #endif
+#include <SPI.h>
 
 #ifndef WIICAMERA // Used to check if WIICAMERA is defined
 #error "Please set ENABLE_WII_IR_CAMERA to 1 in settings.h"

examples/Bluetooth/WiiMulti/WiiMulti.ino

@@ -11,8 +11,8 @@
 // Satisfy the IDE, which needs to see the include statment in the ino too.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
-#include <SPI.h>
 #endif
+#include <SPI.h>
 
 USB Usb;
 //USBHub Hub1(&Usb); // Some dongles have a hub inside

examples/Bluetooth/WiiUProController/WiiUProController.ino

@@ -10,8 +10,8 @@
 // Satisfy the IDE, which needs to see the include statment in the ino too.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
-#include <SPI.h>
 #endif
+#include <SPI.h>
 
 USB Usb;
 //USBHub Hub1(&Usb); // Some dongles have a hub inside

examples/HID/USBHIDBootKbd/USBHIDBootKbd.ino

@@ -4,8 +4,8 @@
 // Satisfy the IDE, which needs to see the include statment in the ino too.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
-#include <SPI.h>
 #endif
+#include <SPI.h>
 
 class KbdRptParser : public KeyboardReportParser
 {

examples/HID/USBHIDBootKbdAndMouse/USBHIDBootKbdAndMouse.ino

@@ -4,8 +4,8 @@
 // Satisfy IDE, which only needs to see the include statment in the ino.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
-#include <SPI.h>
 #endif
+#include <SPI.h>
 
 class MouseRptParser : public MouseReportParser
 {

examples/HID/USBHIDBootMouse/USBHIDBootMouse.ino

@@ -4,8 +4,8 @@
 // Satisfy the IDE, which needs to see the include statment in the ino too.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
-#include <SPI.h>
 #endif
+#include <SPI.h>
 
 class MouseRptParser : public MouseReportParser
 {

examples/HID/USBHIDJoystick/USBHIDJoystick.ino

@@ -5,8 +5,8 @@
 // Satisfy IDE, which only needs to see the include statment in the ino.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
-#include <SPI.h>
 #endif
+#include <SPI.h>
 
 #include "hidjoystickrptparser.h"
 

examples/HID/USBHIDMultimediaKbd/USBHIDMultimediaKbd.ino

@@ -4,8 +4,8 @@
 // Satisfy the IDE, which needs to see the include statment in the ino too.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
-#include <SPI.h>
 #endif
+#include <SPI.h>
 
 // Override HIDComposite to be able to select which interface we want to hook into
 class HIDSelector : public HIDComposite

examples/HID/USBHID_desc/USBHID_desc.ino

@@ -7,8 +7,8 @@
 // Satisfy the IDE, which needs to see the include statment in the ino too.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
-#include <SPI.h>
 #endif
+#include <SPI.h>
 
 class HIDUniversal2 : public HIDUniversal
 {

examples/HID/le3dp/le3dp.ino

@@ -9,8 +9,8 @@
 // Satisfy the IDE, which needs to see the include statment in the ino too.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
-#include <SPI.h>
 #endif
+#include <SPI.h>
 
 USB                                             Usb;
 USBHub                                          Hub(&Usb);

examples/HID/scale/scale.ino

@@ -10,8 +10,8 @@
 // Satisfy the IDE, which needs to see the include statment in the ino too.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
-#include <SPI.h>
 #endif
+#include <SPI.h>
 
 USB                                             Usb;
 USBHub                                          Hub(&Usb);

examples/PS3USB/PS3USB.ino

@@ -9,8 +9,8 @@
 // Satisfy the IDE, which needs to see the include statment in the ino too.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
-#include <SPI.h>
 #endif
+#include <SPI.h>
 
 USB Usb;
 /* You can create the instance of the class in two ways */

examples/PS4USB/PS4USB.ino

@@ -9,8 +9,8 @@
 // Satisfy the IDE, which needs to see the include statment in the ino too.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
-#include <SPI.h>
 #endif
+#include <SPI.h>
 
 USB Usb;
 PS4USB PS4(&Usb);

examples/PSBuzz/PSBuzz.ino

@@ -9,8 +9,8 @@
 // Satisfy the IDE, which needs to see the include statment in the ino too.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
-#include <SPI.h>
 #endif
+#include <SPI.h>
 
 USB Usb;
 PSBuzz Buzz(&Usb);

examples/USBH_MIDI/USBH_MIDI_dump/USBH_MIDI_dump.ino

@@ -16,8 +16,8 @@
 // Satisfy the IDE, which needs to see the include statment in the ino too.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
-#include <SPI.h>
 #endif
+#include <SPI.h>
 
 USB Usb;
 //USBHub Hub(&Usb);

examples/USBH_MIDI/USB_MIDI_converter/USB_MIDI_converter.ino

@@ -16,8 +16,8 @@
 // Satisfy the IDE, which needs to see the include statment in the ino too.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
-#include <SPI.h>
 #endif
+#include <SPI.h>
 
 #ifdef USBCON
 #define _MIDI_SERIAL_PORT Serial1

examples/USBH_MIDI/USB_MIDI_converter_multi/USB_MIDI_converter_multi.ino

@@ -16,8 +16,8 @@
 // Satisfy the IDE, which needs to see the include statment in the ino too.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
-#include <SPI.h>
 #endif
+#include <SPI.h>
 
 #ifdef USBCON
 #define _MIDI_SERIAL_PORT Serial1

examples/USBH_MIDI/bidirectional_converter/bidirectional_converter.ino

@@ -19,8 +19,8 @@
 // Satisfy the IDE, which needs to see the include statment in the ino too.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
-#include <SPI.h>
 #endif
+#include <SPI.h>
 
 //Arduino MIDI library v4.2 compatibility
 #ifdef MIDI_CREATE_DEFAULT_INSTANCE

examples/USBH_MIDI/eVY1_sample/eVY1_sample.ino

@@ -12,8 +12,8 @@
 // Satisfy the IDE, which needs to see the include statment in the ino too.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
-#include <SPI.h>
 #endif
+#include <SPI.h>
 
 USB Usb;
 //USBHub Hub(&Usb);

examples/USB_desc/USB_desc.ino

@@ -5,8 +5,8 @@
 // Satisfy the IDE, which needs to see the include statment in the ino too.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
-#include <SPI.h>
 #endif
+#include <SPI.h>
 
 USB     Usb;
 //USBHub  Hub1(&Usb);

examples/Xbox/XBOXOLD/XBOXOLD.ino

@@ -10,8 +10,8 @@
 // Satisfy the IDE, which needs to see the include statment in the ino too.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
-#include <SPI.h>
 #endif
+#include <SPI.h>
 
 USB Usb;
 USBHub  Hub1(&Usb); // The controller has a built in hub, so this instance is needed

examples/Xbox/XBOXONE/XBOXONE.ino

@@ -8,8 +8,8 @@
 // Satisfy the IDE, which needs to see the include statment in the ino too.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
-#include <SPI.h>
 #endif
+#include <SPI.h>
 
 USB Usb;
 XBOXONE Xbox(&Usb);

examples/Xbox/XBOXRECV/XBOXRECV.ino

@@ -10,8 +10,8 @@
 // Satisfy the IDE, which needs to see the include statment in the ino too.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
-#include <SPI.h>
 #endif
+#include <SPI.h>
 
 USB Usb;
 XBOXRECV Xbox(&Usb);

examples/Xbox/XBOXUSB/XBOXUSB.ino

@@ -9,8 +9,8 @@
 // Satisfy the IDE, which needs to see the include statment in the ino too.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
-#include <SPI.h>
 #endif
+#include <SPI.h>
 
 USB Usb;
 XBOXUSB Xbox(&Usb);

examples/acm/acm_terminal/acm_terminal.ino

@@ -6,8 +6,8 @@
 // Satisfy the IDE, which needs to see the include statment in the ino too.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
-#include <SPI.h>
 #endif
+#include <SPI.h>
 
 class ACMAsyncOper : public CDCAsyncOper
 {

examples/adk/ArduinoBlinkLED/ArduinoBlinkLED.ino

@@ -20,8 +20,8 @@
 // Satisfy IDE, which only needs to see the include statment in the ino.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
-#include <SPI.h>
 #endif
+#include <SPI.h>
 
 USB Usb;
 ADK adk(&Usb, "TKJElectronics", // Manufacturer Name

examples/adk/adk_barcode/adk_barcode.ino

@@ -8,8 +8,8 @@
 // Satisfy IDE, which only needs to see the include statment in the ino.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
-#include <SPI.h>
 #endif
+#include <SPI.h>
 
 USB Usb;
 USBHub Hub1(&Usb);

examples/adk/demokit_20/demokit_20.ino

@@ -4,8 +4,8 @@
 // Satisfy IDE, which only needs to see the include statment in the ino.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
-#include <SPI.h>
 #endif
+#include <SPI.h>
 
 USB Usb;
 USBHub hub0(&Usb);

examples/adk/term_test/term_test.ino

@@ -4,8 +4,8 @@
 // Satisfy IDE, which only needs to see the include statment in the ino.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
-#include <SPI.h>
 #endif
+#include <SPI.h>
 
 USB Usb;
 //USBHub     Hub(&Usb);

examples/adk/term_time/term_time.ino

@@ -4,8 +4,8 @@
 // Satisfy IDE, which only needs to see the include statment in the ino.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
-#include <SPI.h>
 #endif
+#include <SPI.h>
 
 USB Usb;
 

examples/board_qc/board_qc.ino

@@ -9,8 +9,8 @@
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
 #include <../../../../hardware/pic32/libraries/SPI/SPI.h> // Hack to use the SPI library
-#include <SPI.h> // Hack to use the SPI library
 #endif
+#include <SPI.h> // Hack to use the SPI library
 
 /* variables */
 uint8_t rcode;

examples/cdc_XR21B1411/XR_terminal/XR_terminal.ino

@@ -3,8 +3,8 @@
 // Satisfy IDE, which only needs to see the include statment in the ino.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
-#include <SPI.h>
 #endif
+#include <SPI.h>
 
 class ACMAsyncOper : public CDCAsyncOper
 {

examples/ftdi/USBFTDILoopback/USBFTDILoopback.ino

@@ -6,8 +6,8 @@
 // Satisfy the IDE, which needs to see the include statment in the ino too.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
-#include <SPI.h>
 #endif
+#include <SPI.h>
 
 class FTDIAsync : public FTDIAsyncOper
 {

examples/hub_demo/hub_demo.ino

@@ -4,8 +4,8 @@
 // Satisfy the IDE, which needs to see the include statment in the ino too.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
-#include <SPI.h>
 #endif
+#include <SPI.h>
 
 USB     Usb;
 USBHub  Hub1(&Usb);

examples/max_LCD/max_LCD.ino

@@ -8,8 +8,8 @@
 // Satisfy IDE, which only needs to see the include statment in the ino.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
-#include <SPI.h>
 #endif
+#include <SPI.h>
 
 USB Usb;
 Max_LCD lcd(&Usb);

examples/pl2303/pl2303_gprs_terminal/pl2303_gprs_terminal.ino

@@ -8,8 +8,8 @@
 // Satisfy the IDE, which needs to see the include statment in the ino too.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
-#include <SPI.h>
 #endif
+#include <SPI.h>
 
 class PLAsyncOper : public CDCAsyncOper
 {

examples/pl2303/pl2303_gps/pl2303_gps.ino

@@ -9,8 +9,8 @@
 // Satisfy the IDE, which needs to see the include statment in the ino too.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
-#include <SPI.h>
 #endif
+#include <SPI.h>
 
 class PLAsyncOper : public CDCAsyncOper {
 public:

examples/pl2303/pl2303_tinygps/pl2303_tinygps.ino

@@ -15,8 +15,8 @@
 // Satisfy the IDE, which needs to see the include statment in the ino too.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
-#include <SPI.h>
 #endif
+#include <SPI.h>
 
 /* This sample code demonstrates the normal use of a TinyGPS object.
     Modified to be used with USB Host Shield Library r2.0

examples/pl2303/pl2303_xbee_terminal/pl2303_xbee_terminal.ino

@@ -9,8 +9,8 @@
 // Satisfy the IDE, which needs to see the include statment in the ino too.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
-#include <SPI.h>
 #endif
+#include <SPI.h>
 
 class PLAsyncOper : public CDCAsyncOper
 {

examples/testusbhostFAT/testusbhostFAT.ino

@@ -58,11 +58,11 @@
 #if defined(CORE_TEENSY) && !defined(_AVR_)
 #include <xmem.h>
 #include <spi4teensy3.h>
+#include <SPI.h>
 #endif
 
 #if defined(__AVR__)
 #include <xmem.h>
-#include <SPI.h>
 #elif defined(ARDUINO_ARCH_SAM)
 #include <SPI.h>
 #endif

settings.h

@@ -71,8 +71,8 @@ e-mail   :  support@circuitsathome.com
 #define USE_SPI4TEENSY3 1
 #endif
 
-// Disabled on the Teensy LC, Teensy 3.5, and Teensy 3.6 as it is incompatible for now
+// Disabled on the Teensy LC, as it is incompatible for now
-#if defined(__MKL26Z64__) || defined(__MK64FX512__) || defined(__MK66FX1M0__)
+#if defined(__MKL26Z64__)
 #undef USE_SPI4TEENSY3
 #define USE_SPI4TEENSY3 0
 #endif
@@ -129,7 +129,7 @@ e-mail   :  support@circuitsathome.com
 #define EXT_RAM 0
 #endif
 
-#if defined(CORE_TEENSY) && (defined(__MK20DX128__) || defined(__MK20DX256__) || defined(__MK64FX512__) || defined(__MK66FX1M0__) || defined(__MKL26Z64__))
+#if defined(CORE_TEENSY) && defined(KINETISK)
 #define USING_SPI4TEENSY3 USE_SPI4TEENSY3
 #else
 #define USING_SPI4TEENSY3 0