SPI library was added twice after merge - see: c39e8a180c

2024-03-22 11:31:26 +01:00 · 2015-03-03 19:08:39 +01:00 · 2015-03-03 19:08:39 +01:00 · 22d82ecd0a
commit 22d82ecd0a
parent c39e8a180c
38 changed files with 67 additions and 95 deletions
--- a/examples/Bluetooth/BTHID/BTHID.ino
+++ b/examples/Bluetooth/BTHID/BTHID.ino
@ -9,8 +9,8 @@
 #include "KeyboardParser.h"
 #include "MouseParser.h"

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

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

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

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

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

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

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

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

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

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

-#ifdef dobogusinclude // Satisfy the IDE, which needs to see the include statment in the ino too.
-#include <SPI.h>
+// Satisfy the IDE, which needs to see the include statment in the ino too.
+#ifdef dobogusinclude
 #include <spi4teensy3.h>
 #include <SPI.h>
 #endif
--- a/examples/HID/USBHIDBootKbdAndMouse/USBHIDBootKbdAndMouse.ino
+++ b/examples/HID/USBHIDBootKbdAndMouse/USBHIDBootKbdAndMouse.ino
@ -1,16 +1,12 @@
 #include <hidboot.h>
 #include <usbhub.h>
+
 // Satisfy IDE, which only needs to see the include statment in the ino.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
 #include <SPI.h>
 #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
 {
  protected:
--- a/examples/HID/USBHIDBootMouse/USBHIDBootMouse.ino
+++ b/examples/HID/USBHIDBootMouse/USBHIDBootMouse.ino
@ -1,8 +1,8 @@
 #include <hidboot.h>
 #include <usbhub.h>

-#ifdef dobogusinclude // Satisfy the IDE, which needs to see the include statment in the ino too.
-#include <SPI.h>
+// Satisfy the IDE, which needs to see the include statment in the ino too.
+#ifdef dobogusinclude
 #include <spi4teensy3.h>
 #include <SPI.h>
 #endif
--- a/examples/HID/USBHIDJoystick/USBHIDJoystick.ino
+++ b/examples/HID/USBHIDJoystick/USBHIDJoystick.ino
@ -1,6 +1,7 @@
 #include <hid.h>
 #include <hiduniversal.h>
 #include <usbhub.h>
+
 // Satisfy IDE, which only needs to see the include statment in the ino.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
@ -9,11 +10,6 @@

 #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;
 USBHub Hub(&Usb);
 HIDUniversal Hid(&Usb);
--- a/examples/HID/USBHID_desc/USBHID_desc.ino
+++ b/examples/HID/USBHID_desc/USBHID_desc.ino
@ -4,8 +4,8 @@
 #include <usbhub.h>
 #include "pgmstrings.h"

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

 #include "le3dp_rptparser.h"

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

 #include "scale_rptparser.h"

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

 #include <PS3USB.h>

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

 #include <PS4USB.h>

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

 #include <PSBuzz.h>

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

 #include "pgmstrings.h"

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

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

 #include <XBOXRECV.h>

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

 #include <XBOXUSB.h>

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

 #include "pgmstrings.h"

-#ifdef dobogusinclude // Satisfy the IDE, which needs to see the include statment in the ino too.
-#include <SPI.h>
+// Satisfy the IDE, which needs to see the include statment in the ino too.
+#ifdef dobogusinclude
 #include <spi4teensy3.h>
 #include <SPI.h>
 #endif
--- a/examples/adk/adk_barcode/adk_barcode.ino
+++ b/examples/adk/adk_barcode/adk_barcode.ino
@ -4,17 +4,13 @@
 #include <adk.h>
 #include <hidboot.h>
 #include <usbhub.h>
+
 // Satisfy IDE, which only needs to see the include statment in the ino.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
 #include <SPI.h>
 #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;
 USBHub Hub1(&Usb);
 USBHub Hub2(&Usb);
--- a/examples/adk/demokit_20/demokit_20.ino
+++ b/examples/adk/demokit_20/demokit_20.ino
@ -1,16 +1,12 @@
 #include <adk.h>
 #include <usbhub.h>
+
 // Satisfy IDE, which only needs to see the include statment in the ino.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
 #include <SPI.h>
 #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;
 USBHub hub0(&Usb);
 USBHub hub1(&Usb);
--- a/examples/adk/term_test/term_test.ino
+++ b/examples/adk/term_test/term_test.ino
@ -1,16 +1,12 @@
 #include <adk.h>
 #include <usbhub.h>
+
 // Satisfy IDE, which only needs to see the include statment in the ino.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
 #include <SPI.h>
 #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;
 //USBHub     Hub(&Usb);

--- a/examples/adk/term_time/term_time.ino
+++ b/examples/adk/term_time/term_time.ino
@ -1,16 +1,12 @@
 #include <adk.h>
 #include <usbhub.h>
+
 // Satisfy IDE, which only needs to see the include statment in the ino.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
 #include <SPI.h>
 #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;

 ADK adk(&Usb,"Circuits@Home, ltd.",
--- a/examples/board_qc/board_qc.ino
+++ b/examples/board_qc/board_qc.ino
@ -5,8 +5,8 @@
 /**/
 #include <usbhub.h>

-#ifdef dobogusinclude // Satisfy the IDE, which needs to see the include statment in the ino too.
-#include <SPI.h>
+// Satisfy the IDE, which needs to see the include statment in the ino too.
+#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
--- a/examples/ftdi/USBFTDILoopback/USBFTDILoopback.ino
+++ b/examples/ftdi/USBFTDILoopback/USBFTDILoopback.ino
@ -3,8 +3,8 @@

 #include "pgmstrings.h"

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

-#ifdef dobogusinclude // Satisfy the IDE, which needs to see the include statment in the ino too.
-#include <SPI.h>
+// Satisfy the IDE, which needs to see the include statment in the ino too.
+#ifdef dobogusinclude
 #include <spi4teensy3.h>
 #include <SPI.h>
 #endif
--- a/examples/max_LCD/max_LCD.ino
+++ b/examples/max_LCD/max_LCD.ino
@ -4,17 +4,13 @@
 // pinout: D[4-7] -> GPOUT[4-7], RS-> GPOUT[2], E ->GPOUT[3]

 #include <max_LCD.h>
+
 // Satisfy IDE, which only needs to see the include statment in the ino.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
 #include <SPI.h>
 #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;
 Max_LCD lcd(&Usb);

--- a/examples/pl2303/pl2303_gprs_terminal/pl2303_gprs_terminal.ino
+++ b/examples/pl2303/pl2303_gprs_terminal/pl2303_gprs_terminal.ino
@ -5,8 +5,8 @@
 #include <cdcacm.h>
 #include <cdcprolific.h>

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

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

 #include <TinyGPS.h>

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

-#ifdef dobogusinclude // Satisfy the IDE, which needs to see the include statment in the ino too.
-#include <SPI.h>
+// Satisfy the IDE, which needs to see the include statment in the ino too.
+#ifdef dobogusinclude
 #include <spi4teensy3.h>
 #include <SPI.h>
 #endif
--- a/examples/testusbhostFAT/testusbhostFAT.ino
+++ b/examples/testusbhostFAT/testusbhostFAT.ino