SPI library was added twice after merge - see: c39e8a180c

This commit is contained in:
Kristian Sloth Lauszus 2015-03-03 19:08:39 +01:00
parent c39e8a180c
commit 22d82ecd0a
38 changed files with 67 additions and 95 deletions

View file

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

View file

@ -7,8 +7,8 @@
#include <PS3BT.h> #include <PS3BT.h>
#include <usbhub.h> #include <usbhub.h>
#ifdef dobogusinclude // Satisfy the IDE, which needs to see the include statment in the ino too. // Satisfy the IDE, which needs to see the include statment in the ino too.
#include <SPI.h> #ifdef dobogusinclude
#include <spi4teensy3.h> #include <spi4teensy3.h>
#include <SPI.h> #include <SPI.h>
#endif #endif

View file

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

View file

@ -13,8 +13,8 @@
#include <SPP.h> #include <SPP.h>
#include <usbhub.h> #include <usbhub.h>
#ifdef dobogusinclude // Satisfy the IDE, which needs to see the include statment in the ino too. // Satisfy the IDE, which needs to see the include statment in the ino too.
#include <SPI.h> #ifdef dobogusinclude
#include <spi4teensy3.h> #include <spi4teensy3.h>
#include <SPI.h> #include <SPI.h>
#endif #endif

View file

@ -7,8 +7,8 @@
#include <PS4BT.h> #include <PS4BT.h>
#include <usbhub.h> #include <usbhub.h>
#ifdef dobogusinclude // Satisfy the IDE, which needs to see the include statment in the ino too. // Satisfy the IDE, which needs to see the include statment in the ino too.
#include <SPI.h> #ifdef dobogusinclude
#include <spi4teensy3.h> #include <spi4teensy3.h>
#include <SPI.h> #include <SPI.h>
#endif #endif

View file

@ -7,8 +7,8 @@
#include <SPP.h> #include <SPP.h>
#include <usbhub.h> #include <usbhub.h>
#ifdef dobogusinclude // Satisfy the IDE, which needs to see the include statment in the ino too. // Satisfy the IDE, which needs to see the include statment in the ino too.
#include <SPI.h> #ifdef dobogusinclude
#include <spi4teensy3.h> #include <spi4teensy3.h>
#include <SPI.h> #include <SPI.h>
#endif #endif

View file

@ -7,8 +7,8 @@
#include <Wii.h> #include <Wii.h>
#include <usbhub.h> #include <usbhub.h>
#ifdef dobogusinclude // Satisfy the IDE, which needs to see the include statment in the ino too. // Satisfy the IDE, which needs to see the include statment in the ino too.
#include <SPI.h> #ifdef dobogusinclude
#include <spi4teensy3.h> #include <spi4teensy3.h>
#include <SPI.h> #include <SPI.h>
#endif #endif

View file

@ -14,8 +14,8 @@ Otherwise, wire up a IR LED yourself.
#include <Wii.h> #include <Wii.h>
#include <usbhub.h> #include <usbhub.h>
#ifdef dobogusinclude // Satisfy the IDE, which needs to see the include statment in the ino too. // Satisfy the IDE, which needs to see the include statment in the ino too.
#include <SPI.h> #ifdef dobogusinclude
#include <spi4teensy3.h> #include <spi4teensy3.h>
#include <SPI.h> #include <SPI.h>
#endif #endif

View file

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

View file

@ -7,8 +7,8 @@
#include <Wii.h> #include <Wii.h>
#include <usbhub.h> #include <usbhub.h>
#ifdef dobogusinclude // Satisfy the IDE, which needs to see the include statment in the ino too. // Satisfy the IDE, which needs to see the include statment in the ino too.
#include <SPI.h> #ifdef dobogusinclude
#include <spi4teensy3.h> #include <spi4teensy3.h>
#include <SPI.h> #include <SPI.h>
#endif #endif

View file

@ -1,8 +1,8 @@
#include <hidboot.h> #include <hidboot.h>
#include <usbhub.h> #include <usbhub.h>
#ifdef dobogusinclude // Satisfy the IDE, which needs to see the include statment in the ino too. // Satisfy the IDE, which needs to see the include statment in the ino too.
#include <SPI.h> #ifdef dobogusinclude
#include <spi4teensy3.h> #include <spi4teensy3.h>
#include <SPI.h> #include <SPI.h>
#endif #endif

View file

@ -1,16 +1,12 @@
#include <hidboot.h> #include <hidboot.h>
#include <usbhub.h> #include <usbhub.h>
// Satisfy IDE, which only needs to see the include statment in the ino. // Satisfy IDE, which only needs to see the include statment in the ino.
#ifdef dobogusinclude #ifdef dobogusinclude
#include <spi4teensy3.h> #include <spi4teensy3.h>
#include <SPI.h> #include <SPI.h>
#endif #endif
#ifdef dobogusinclude // Satisfy the IDE, which needs to see the include statment in the ino too.
#include <SPI.h>
#include <spi4teensy3.h>
#endif
class MouseRptParser : public MouseReportParser class MouseRptParser : public MouseReportParser
{ {
protected: protected:

View file

@ -1,8 +1,8 @@
#include <hidboot.h> #include <hidboot.h>
#include <usbhub.h> #include <usbhub.h>
#ifdef dobogusinclude // Satisfy the IDE, which needs to see the include statment in the ino too. // Satisfy the IDE, which needs to see the include statment in the ino too.
#include <SPI.h> #ifdef dobogusinclude
#include <spi4teensy3.h> #include <spi4teensy3.h>
#include <SPI.h> #include <SPI.h>
#endif #endif

View file

@ -1,6 +1,7 @@
#include <hid.h> #include <hid.h>
#include <hiduniversal.h> #include <hiduniversal.h>
#include <usbhub.h> #include <usbhub.h>
// Satisfy IDE, which only needs to see the include statment in the ino. // Satisfy IDE, which only needs to see the include statment in the ino.
#ifdef dobogusinclude #ifdef dobogusinclude
#include <spi4teensy3.h> #include <spi4teensy3.h>
@ -9,11 +10,6 @@
#include "hidjoystickrptparser.h" #include "hidjoystickrptparser.h"
#ifdef dobogusinclude // Satisfy the IDE, which needs to see the include statment in the ino too.
#include <SPI.h>
#include <spi4teensy3.h>
#endif
USB Usb; USB Usb;
USBHub Hub(&Usb); USBHub Hub(&Usb);
HIDUniversal Hid(&Usb); HIDUniversal Hid(&Usb);

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -7,8 +7,8 @@
#include <XBOXOLD.h> #include <XBOXOLD.h>
#include <usbhub.h> #include <usbhub.h>
#ifdef dobogusinclude // Satisfy the IDE, which needs to see the include statment in the ino too. // Satisfy the IDE, which needs to see the include statment in the ino too.
#include <SPI.h> #ifdef dobogusinclude
#include <spi4teensy3.h> #include <spi4teensy3.h>
#include <SPI.h> #include <SPI.h>
#endif #endif

View file

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

View file

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

View file

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

View file

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

View file

@ -1,16 +1,12 @@
#include <adk.h> #include <adk.h>
#include <usbhub.h> #include <usbhub.h>
// Satisfy IDE, which only needs to see the include statment in the ino. // Satisfy IDE, which only needs to see the include statment in the ino.
#ifdef dobogusinclude #ifdef dobogusinclude
#include <spi4teensy3.h> #include <spi4teensy3.h>
#include <SPI.h> #include <SPI.h>
#endif #endif
#ifdef dobogusinclude // Satisfy the IDE, which needs to see the include statment in the ino too.
#include <SPI.h>
#include <spi4teensy3.h>
#endif
USB Usb; USB Usb;
USBHub hub0(&Usb); USBHub hub0(&Usb);
USBHub hub1(&Usb); USBHub hub1(&Usb);

View file

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

View file

@ -1,16 +1,12 @@
#include <adk.h> #include <adk.h>
#include <usbhub.h> #include <usbhub.h>
// Satisfy IDE, which only needs to see the include statment in the ino. // Satisfy IDE, which only needs to see the include statment in the ino.
#ifdef dobogusinclude #ifdef dobogusinclude
#include <spi4teensy3.h> #include <spi4teensy3.h>
#include <SPI.h> #include <SPI.h>
#endif #endif
#ifdef dobogusinclude // Satisfy the IDE, which needs to see the include statment in the ino too.
#include <SPI.h>
#include <spi4teensy3.h>
#endif
USB Usb; USB Usb;
ADK adk(&Usb,"Circuits@Home, ltd.", ADK adk(&Usb,"Circuits@Home, ltd.",

View file

@ -5,8 +5,8 @@
/**/ /**/
#include <usbhub.h> #include <usbhub.h>
#ifdef dobogusinclude // Satisfy the IDE, which needs to see the include statment in the ino too. // Satisfy the IDE, which needs to see the include statment in the ino too.
#include <SPI.h> #ifdef dobogusinclude
#include <spi4teensy3.h> #include <spi4teensy3.h>
#include <../../../../hardware/pic32/libraries/SPI/SPI.h> // Hack to use the SPI library #include <../../../../hardware/pic32/libraries/SPI/SPI.h> // Hack to use the SPI library
#include <SPI.h> // Hack to use the SPI library #include <SPI.h> // Hack to use the SPI library

View file

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

View file

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

View file

@ -4,17 +4,13 @@
// pinout: D[4-7] -> GPOUT[4-7], RS-> GPOUT[2], E ->GPOUT[3] // pinout: D[4-7] -> GPOUT[4-7], RS-> GPOUT[2], E ->GPOUT[3]
#include <max_LCD.h> #include <max_LCD.h>
// Satisfy IDE, which only needs to see the include statment in the ino. // Satisfy IDE, which only needs to see the include statment in the ino.
#ifdef dobogusinclude #ifdef dobogusinclude
#include <spi4teensy3.h> #include <spi4teensy3.h>
#include <SPI.h> #include <SPI.h>
#endif #endif
#ifdef dobogusinclude // Satisfy the IDE, which needs to see the include statment in the ino too.
#include <SPI.h>
#include <spi4teensy3.h>
#endif
USB Usb; USB Usb;
Max_LCD lcd(&Usb); Max_LCD lcd(&Usb);

View file

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

View file

@ -6,8 +6,8 @@
#include <cdcacm.h> #include <cdcacm.h>
#include <cdcprolific.h> #include <cdcprolific.h>
#ifdef dobogusinclude // Satisfy the IDE, which needs to see the include statment in the ino too. // Satisfy the IDE, which needs to see the include statment in the ino too.
#include <SPI.h> #ifdef dobogusinclude
#include <spi4teensy3.h> #include <spi4teensy3.h>
#include <SPI.h> #include <SPI.h>
#endif #endif

View file

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

View file

@ -6,8 +6,8 @@
#include <cdcacm.h> #include <cdcacm.h>
#include <cdcprolific.h> #include <cdcprolific.h>
#ifdef dobogusinclude // Satisfy the IDE, which needs to see the include statment in the ino too. // Satisfy the IDE, which needs to see the include statment in the ino too.
#include <SPI.h> #ifdef dobogusinclude
#include <spi4teensy3.h> #include <spi4teensy3.h>
#include <SPI.h> #include <SPI.h>
#endif #endif

0
examples/testusbhostFAT/testusbhostFAT.ino Normal file → Executable file
View file