Work around Arduino IDE bug

See: https://github.com/arduino/Arduino/pull/1726
2024-03-22 11:31:26 +01:00 · 2014-08-02 18:57:37 -04:00 · 2014-08-02 18:57:37 -04:00 · 7d3154bce7
commit 7d3154bce7
parent b46ead88e8
40 changed files with 130 additions and 62 deletions
--- a/examples/Bluetooth/BTHID/BTHID.ino
+++ b/examples/Bluetooth/BTHID/BTHID.ino
@ -8,8 +8,9 @@
 #include <usbhub.h>
 #include "KeyboardParser.h"
 #include "MouseParser.h"
-// Satisfy IDE, which only needs to see the include statment in the ino.
-#ifdef dobogusinclude
+
+#ifdef dobogusinclude // Satisfy the IDE, which needs to see the include statment in the ino too.
+#include <SPI.h>
 #include <spi4teensy3.h>
 #endif

--- a/examples/Bluetooth/PS3BT/PS3BT.ino
+++ b/examples/Bluetooth/PS3BT/PS3BT.ino
@ -6,8 +6,9 @@

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

--- a/examples/Bluetooth/PS3Multi/PS3Multi.ino
+++ b/examples/Bluetooth/PS3Multi/PS3Multi.ino
@ -7,8 +7,9 @@

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

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

--- a/examples/Bluetooth/PS4BT/PS4BT.ino
+++ b/examples/Bluetooth/PS4BT/PS4BT.ino
@ -7,8 +7,8 @@
 #include <PS4BT.h>
 #include <usbhub.h>

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

--- a/examples/Bluetooth/SPP/SPP.ino
+++ b/examples/Bluetooth/SPP/SPP.ino
@ -6,8 +6,9 @@

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

--- a/examples/Bluetooth/SPPMulti/SPPMulti.ino
+++ b/examples/Bluetooth/SPPMulti/SPPMulti.ino
@ -6,8 +6,9 @@

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

--- a/examples/Bluetooth/Wii/Wii.ino
+++ b/examples/Bluetooth/Wii/Wii.ino
@ -6,8 +6,9 @@

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

--- a/examples/Bluetooth/WiiIRCamera/WiiIRCamera.ino
+++ b/examples/Bluetooth/WiiIRCamera/WiiIRCamera.ino
@ -13,8 +13,9 @@ Otherwise, wire up a IR LED yourself.

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

--- a/examples/Bluetooth/WiiMulti/WiiMulti.ino
+++ b/examples/Bluetooth/WiiMulti/WiiMulti.ino
@ -7,8 +7,9 @@

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

--- a/examples/Bluetooth/WiiUProController/WiiUProController.ino
+++ b/examples/Bluetooth/WiiUProController/WiiUProController.ino
@ -6,8 +6,9 @@

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

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

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

--- a/examples/HID/USBHIDJoystick/USBHIDJoystick.ino
+++ b/examples/HID/USBHIDJoystick/USBHIDJoystick.ino
@ -4,6 +4,11 @@

 #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
@ -3,8 +3,9 @@
 #include <hidescriptorparser.h>
 #include <usbhub.h>
 #include "pgmstrings.h"
-// Satisfy IDE, which only needs to see the include statment in the ino.
-#ifdef dobogusinclude
+
+#ifdef dobogusinclude // Satisfy the IDE, which needs to see the include statment in the ino too.
+#include <SPI.h>
 #include <spi4teensy3.h>
 #endif

--- a/examples/HID/le3dp/le3dp.ino
+++ b/examples/HID/le3dp/le3dp.ino
@ -5,8 +5,9 @@
 #include <usbhub.h>

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

--- a/examples/HID/scale/scale.ino
+++ b/examples/HID/scale/scale.ino
@ -6,8 +6,9 @@
 #include <usbhub.h>

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

--- a/examples/PS3USB/PS3USB.ino
+++ b/examples/PS3USB/PS3USB.ino
@ -5,8 +5,9 @@
 */

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

--- a/examples/PS4USB/PS4USB.ino
+++ b/examples/PS4USB/PS4USB.ino
@ -6,8 +6,8 @@

 #include <PS4USB.h>

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

--- a/examples/PSBuzz/PSBuzz.ino
+++ b/examples/PSBuzz/PSBuzz.ino
@ -6,8 +6,8 @@

 #include <PSBuzz.h>

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

--- a/examples/USB_desc/USB_desc.ino
+++ b/examples/USB_desc/USB_desc.ino
@ -1,8 +1,9 @@
 #include <usbhub.h>

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

--- a/examples/Xbox/XBOXOLD/XBOXOLD.ino
+++ b/examples/Xbox/XBOXOLD/XBOXOLD.ino
@ -6,8 +6,9 @@

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

--- a/examples/Xbox/XBOXRECV/XBOXRECV.ino
+++ b/examples/Xbox/XBOXRECV/XBOXRECV.ino
@ -6,8 +6,9 @@
 */

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

--- a/examples/Xbox/XBOXUSB/XBOXUSB.ino
+++ b/examples/Xbox/XBOXUSB/XBOXUSB.ino
@ -5,8 +5,9 @@
 */

 #include <XBOXUSB.h>
-// Satisfy IDE, which only needs to see the include statment in the ino.
-#ifdef dobogusinclude
+
+#ifdef dobogusinclude // Satisfy the IDE, which needs to see the include statment in the ino too.
+#include <SPI.h>
 #include <spi4teensy3.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"

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

--- a/examples/adk/ArduinoBlinkLED/ArduinoBlinkLED.ino
+++ b/examples/adk/ArduinoBlinkLED/ArduinoBlinkLED.ino
@ -2,6 +2,11 @@
 // The code for the Android application is heavily based on this guide: http://allaboutee.com/2011/12/31/arduino-adk-board-blink-an-led-with-your-phone-code-and-explanation/ by Miguel
 #include <adk.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;
 ADK adk(&Usb, "TKJElectronics", // Manufacturer Name
              "ArduinoBlinkLED", // Model Name
--- a/examples/adk/adk_barcode/adk_barcode.ino
+++ b/examples/adk/adk_barcode/adk_barcode.ino
@ -5,6 +5,11 @@
 #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>
+#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,6 +1,11 @@
 #include <adk.h>
 #include <usbhub.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 hub0(&Usb);
 USBHub hub1(&Usb);
--- a/examples/adk/term_test/term_test.ino
+++ b/examples/adk/term_test/term_test.ino
@ -1,6 +1,11 @@
 #include <adk.h>
 #include <usbhub.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);

--- a/examples/adk/term_time/term_time.ino
+++ b/examples/adk/term_time/term_time.ino
@ -1,6 +1,11 @@
 #include <adk.h>
 #include <usbhub.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;

 ADK adk(&Usb,"Circuits@Home, ltd.",
--- a/examples/board_qc/board_qc.ino
+++ b/examples/board_qc/board_qc.ino
@ -4,8 +4,9 @@
 /* otherwise press any key after getting GPIO error to complete the test */
 /**/
 #include <usbhub.h>
-// Satisfy IDE, which only needs to see the include statment in the ino.
-#ifdef dobogusinclude
+
+#ifdef dobogusinclude // Satisfy the IDE, which needs to see the include statment in the ino too.
+#include <SPI.h>
 #include <spi4teensy3.h>
 #endif

--- a/examples/ftdi/USBFTDILoopback/USBFTDILoopback.ino
+++ b/examples/ftdi/USBFTDILoopback/USBFTDILoopback.ino
@ -2,8 +2,9 @@
 #include <usbhub.h>

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

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

--- a/examples/max_LCD/max_LCD.ino
+++ b/examples/max_LCD/max_LCD.ino
@ -5,6 +5,11 @@

 #include <max_LCD.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;
 Max_LCD lcd(&Usb);

--- a/examples/pl2303/pl2303_gprs_terminal/pl2303_gprs_terminal.ino
+++ b/examples/pl2303/pl2303_gprs_terminal/pl2303_gprs_terminal.ino
@ -4,8 +4,9 @@
 /* CDC support */
 #include <cdcacm.h>
 #include <cdcprolific.h>
-// Satisfy IDE, which only needs to see the include statment in the ino.
-#ifdef dobogusinclude
+
+#ifdef dobogusinclude // Satisfy the IDE, which needs to see the include statment in the ino too.
+#include <SPI.h>
 #include <spi4teensy3.h>
 #endif

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

--- a/examples/pl2303/pl2303_tinygps/pl2303_tinygps.ino
+++ b/examples/pl2303/pl2303_tinygps/pl2303_tinygps.ino
@ -11,8 +11,9 @@
 #include <cdcprolific.h>

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

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

--- a/examples/testusbhostFAT/testusbhostFAT.ino
+++ b/examples/testusbhostFAT/testusbhostFAT.ino
@ -59,6 +59,7 @@
 #if WANT_HUB_TEST
 #include <usbhub.h>
 #endif
+#include <SPI.h>
 #include <masstorage.h>
 #include <Storage.h>
 #include <PCpartition/PCPartition.h>