specchioriflesso/USB_Host_Shield_2.0
1
Fork 0
mirror of https://github.com/felis/USB_Host_Shield_2.0.git synced 2024-03-22 11:31:26 +01:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Andrew J. Kroll 2017-08-14 03:39:38 -04:00
parent fb47645ea7
commit 13950453c9
50 changed files with 52 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
examples/Bluetooth/BTHID/BTHID.ino
View file

@ -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

2
examples/Bluetooth/PS3BT/PS3BT.ino
View file

@ -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

2
examples/Bluetooth/PS3Multi/PS3Multi.ino
View file

@ -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

2
examples/Bluetooth/PS3SPP/PS3SPP.ino
View file

@ -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

2
examples/Bluetooth/PS4BT/PS4BT.ino
View file

@ -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

2
examples/Bluetooth/SPP/SPP.ino
View file

@ -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

2
examples/Bluetooth/SPPMulti/SPPMulti.ino
View file

@ -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

2
examples/Bluetooth/Wii/Wii.ino
View file

@ -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

2
examples/Bluetooth/WiiBalanceBoard/WiiBalanceBoard.ino
View file

@ -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

2
examples/Bluetooth/WiiIRCamera/WiiIRCamera.ino
View file

@ -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"

2
examples/Bluetooth/WiiMulti/WiiMulti.ino
View file

@ -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

2
examples/Bluetooth/WiiUProController/WiiUProController.ino
View file

@ -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

2
examples/HID/USBHIDBootKbd/USBHIDBootKbd.ino
View file

@ -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
{

2
examples/HID/USBHIDBootKbdAndMouse/USBHIDBootKbdAndMouse.ino
View file

@ -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
{

2
examples/HID/USBHIDBootMouse/USBHIDBootMouse.ino
View file

@ -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
{

2
examples/HID/USBHIDJoystick/USBHIDJoystick.ino
View file

@ -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"

2
examples/HID/USBHIDMultimediaKbd/USBHIDMultimediaKbd.ino
View file

@ -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

2
examples/HID/USBHID_desc/USBHID_desc.ino
View file

@ -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
{

2
examples/HID/le3dp/le3dp.ino
View file

@ -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);

2
examples/HID/scale/scale.ino
View file

@ -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);

2
examples/PS3USB/PS3USB.ino
View file

@ -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 */

2
examples/PS4USB/PS4USB.ino
View file

@ -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);

2
examples/PSBuzz/PSBuzz.ino
View file

@ -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);

2
examples/USBH_MIDI/USBH_MIDI_dump/USBH_MIDI_dump.ino
View file

@ -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);

2
examples/USBH_MIDI/USB_MIDI_converter/USB_MIDI_converter.ino
View file

@ -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

2
examples/USBH_MIDI/USB_MIDI_converter_multi/USB_MIDI_converter_multi.ino
View file

@ -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

2
examples/USBH_MIDI/bidirectional_converter/bidirectional_converter.ino
View file

@ -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

2
examples/USBH_MIDI/eVY1_sample/eVY1_sample.ino
View file

@ -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);

2
examples/USB_desc/USB_desc.ino
View file

@ -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);

2
examples/Xbox/XBOXOLD/XBOXOLD.ino
View file

@ -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

2
examples/Xbox/XBOXONE/XBOXONE.ino
View file

@ -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);

2
examples/Xbox/XBOXRECV/XBOXRECV.ino
View file

@ -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);

2
examples/Xbox/XBOXUSB/XBOXUSB.ino
View file

@ -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);

2
examples/acm/acm_terminal/acm_terminal.ino
View file

@ -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
{

2
examples/adk/ArduinoBlinkLED/ArduinoBlinkLED.ino
View file

@ -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

2
examples/adk/adk_barcode/adk_barcode.ino
View file

@ -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);

2
examples/adk/demokit_20/demokit_20.ino
View file

@ -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);

2
examples/adk/term_test/term_test.ino
View file

@ -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);

2
examples/adk/term_time/term_time.ino
View file

@ -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;

2
examples/board_qc/board_qc.ino
View file

@ -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;

2
examples/cdc_XR21B1411/XR_terminal/XR_terminal.ino
View file

@ -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
{

2
examples/ftdi/USBFTDILoopback/USBFTDILoopback.ino
View file

@ -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
{

2
examples/hub_demo/hub_demo.ino
View file

@ -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);

2
examples/max_LCD/max_LCD.ino
View file

@ -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);

2
examples/pl2303/pl2303_gprs_terminal/pl2303_gprs_terminal.ino
View file

@ -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
{

2
examples/pl2303/pl2303_gps/pl2303_gps.ino
View file

@ -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:

2
examples/pl2303/pl2303_tinygps/pl2303_tinygps.ino
View file

@ -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

2
examples/pl2303/pl2303_xbee_terminal/pl2303_xbee_terminal.ino
View file

@ -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
{

2
examples/testusbhostFAT/testusbhostFAT.ino
View file

@ -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

6
settings.h
View file

@ -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
#if defined(__MKL26Z64__) || defined(__MK64FX512__) || defined(__MK66FX1M0__)
// Disabled on the Teensy LC, as it is incompatible for now
#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