Merge branch 'master' into dev

Conflicts:
	BTD.h
	BTHID.h
	PS3BT.h
	SPP.h
	Wii.h

BTD.h

@@ -211,7 +211,7 @@ public:
          * @param  lowspeed Speed of the device.
          * @return          0 on success.
          */
-        virtual uint8_t ConfigureDevice(uint8_t parent, uint8_t port, bool lowspeed);
+        uint8_t ConfigureDevice(uint8_t parent, uint8_t port, bool lowspeed);
         /**
          * Initialize the Bluetooth dongle.
          * @param  parent   Hub number.
@@ -219,17 +219,17 @@ public:
          * @param  lowspeed Speed of the device.
          * @return          0 on success.
          */
-        virtual uint8_t Init(uint8_t parent, uint8_t port, bool lowspeed);
+        uint8_t Init(uint8_t parent, uint8_t port, bool lowspeed);
         /**
          * Release the USB device.
          * @return 0 on success.
          */
-        virtual uint8_t Release();
+        uint8_t Release();
         /**
          * Poll the USB Input endpoints and run the state machines.
          * @return 0 on success.
          */
-        virtual uint8_t Poll();
+        uint8_t Poll();
 
         /**
          * Get the device address.
@@ -252,7 +252,7 @@ public:
          * @param  klass The device's USB class.
          * @return       Returns true if the device's USB class matches this driver.
          */
-        virtual boolean DEVCLASSOK(uint8_t klass) {
+        virtual bool DEVCLASSOK(uint8_t klass) {
                 return (klass == USB_CLASS_WIRELESS_CTRL);
         };
 
@@ -263,7 +263,7 @@ public:
          * @param  pid The device's PID.
          * @return     Returns true if the device's VID and PID matches this driver.
          */
-        virtual boolean VIDPIDOK(uint16_t vid, uint16_t pid) {
+        virtual bool VIDPIDOK(uint16_t vid, uint16_t pid) {
                 if(vid == IOGEAR_GBU521_VID && pid == IOGEAR_GBU521_PID)
                         return true;
                 if(my_bdaddr[0] != 0x00 || my_bdaddr[1] != 0x00 || my_bdaddr[2] != 0x00 || my_bdaddr[3] != 0x00 || my_bdaddr[4] != 0x00 || my_bdaddr[5] != 0x00) { // Check if Bluetooth address is set
@@ -283,7 +283,7 @@ public:
          * @param proto Interface Protocol.
          * @param ep    Endpoint Descriptor.
          */
-        virtual void EndpointXtract(uint8_t conf, uint8_t iface, uint8_t alt, uint8_t proto, const USB_ENDPOINT_DESCRIPTOR *ep);
+        void EndpointXtract(uint8_t conf, uint8_t iface, uint8_t alt, uint8_t proto, const USB_ENDPOINT_DESCRIPTOR *ep);
         /**@}*/
 
         /** Disconnects both the L2CAP Channel and the HCI Connection for all Bluetooth services. */

BTHID.h

@@ -38,7 +38,7 @@ public:
 
         /** @name BluetoothService implementation */
         /** Used this to disconnect the devices. */
-        virtual void disconnect();
+        void disconnect();
         /**@}*/
 
         /**
@@ -94,17 +94,17 @@ protected:
          * Used to pass acldata to the services.
          * @param ACLData Incoming acldata.
          */
-        virtual void ACLData(uint8_t* ACLData);
+        void ACLData(uint8_t* ACLData);
         /** Used to run part of the state machine. */
-        virtual void Run();
+        void Run();
         /** Use this to reset the service. */
-        virtual void Reset();
+        void Reset();
         /**
          * Called when a device is successfully initialized.
          * Use attachOnInit(void (*funcOnInit)(void)) to call your own function.
          * This is useful for instance if you want to set the LEDs in a specific way.
          */
-        virtual void onInit() {
+        void onInit() {
                 if(pFuncOnInit)
                         pFuncOnInit(); // Call the user function
                 OnInitBTHID();

PS3BT.h

@@ -42,7 +42,7 @@ public:
 
         /** @name BluetoothService implementation */
         /** Used this to disconnect any of the controllers. */
-        virtual void disconnect();
+        void disconnect();
         /**@}*/
 
         /** @name PS3 Controller functions */
@@ -189,17 +189,17 @@ protected:
          * Used to pass acldata to the services.
          * @param ACLData Incoming acldata.
          */
-        virtual void ACLData(uint8_t* ACLData);
+        void ACLData(uint8_t* ACLData);
         /** Used to run part of the state machine. */
-        virtual void Run();
+        void Run();
         /** Use this to reset the service. */
-        virtual void Reset();
+        void Reset();
         /**
          * Called when the controller is successfully initialized.
          * Use attachOnInit(void (*funcOnInit)(void)) to call your own function.
          * This is useful for instance if you want to set the LEDs in a specific way.
          */
-        virtual void onInit();
+        void onInit();
         /**@}*/
 
 private:

PS3USB.h

@@ -65,17 +65,17 @@ public:
          * @param  lowspeed Speed of the device.
          * @return          0 on success.
          */
-        virtual uint8_t Init(uint8_t parent, uint8_t port, bool lowspeed);
+        uint8_t Init(uint8_t parent, uint8_t port, bool lowspeed);
         /**
          * Release the USB device.
          * @return 0 on success.
          */
-        virtual uint8_t Release();
+        uint8_t Release();
         /**
          * Poll the USB Input endpoins and run the state machines.
          * @return 0 on success.
          */
-        virtual uint8_t Poll();
+        uint8_t Poll();
 
         /**
          * Get the device address.
@@ -99,7 +99,7 @@ public:
          * @param  pid The device's PID.
          * @return     Returns true if the device's VID and PID matches this driver.
          */
-        virtual boolean VIDPIDOK(uint16_t vid, uint16_t pid) {
+        virtual bool VIDPIDOK(uint16_t vid, uint16_t pid) {
                 return (vid == PS3_VID && (pid == PS3_PID || pid == PS3NAVIGATION_PID || pid == PS3MOVE_PID));
         };
         /**@}*/

PS4USB.h

@@ -119,7 +119,7 @@ protected:
          * @param  pid The device's PID.
          * @return     Returns true if the device's VID and PID matches this driver.
          */
-        virtual boolean VIDPIDOK(uint16_t vid, uint16_t pid) {
+        virtual bool VIDPIDOK(uint16_t vid, uint16_t pid) {
                 return (vid == PS4_VID && pid == PS4_PID);
         };
         /**@}*/

PSBuzz.h

@@ -143,14 +143,14 @@ protected:
          * @param len       The length of the incoming data.
          * @param buf       Pointer to the data buffer.
          */
-        virtual void ParseHIDData(HID *hid, bool is_rpt_id, uint8_t len, uint8_t *buf);
+        void ParseHIDData(HID *hid, bool is_rpt_id, uint8_t len, uint8_t *buf);
 
         /**
          * Called when a device is successfully initialized.
          * Use attachOnInit(void (*funcOnInit)(void)) to call your own function.
          * This is useful for instance if you want to set the LEDs in a specific way.
          */
-        virtual uint8_t OnInitSuccessful();
+        uint8_t OnInitSuccessful();
         /**@}*/
 
         /** Used to reset the different buffers to their default values */
@@ -169,7 +169,7 @@ protected:
          * @param  pid The device's PID.
          * @return     Returns true if the device's VID and PID matches this driver.
          */
-        virtual boolean VIDPIDOK(uint16_t vid, uint16_t pid) {
+        virtual bool VIDPIDOK(uint16_t vid, uint16_t pid) {
                 return (vid == PSBUZZ_VID && pid == PSBUZZ_PID);
         };
         /**@}*/

README.md

@@ -71,7 +71,7 @@ Now quit the Arduino IDE and reopen it.
 
 Now you should be able to go open all the examples codes by navigating to "File>Examples>USB\_Host\_Shield\_20" and then select the example you will like to open.
 
-For more information visit the following site: <http://arduino.cc/en/Guide/Libraries>.
+For more information visit the following sites: <http://arduino.cc/en/Guide/Libraries> and <https://learn.adafruit.com/adafruit-all-about-arduino-libraries-install-use>.
 
 # How to use the library
 
@@ -99,6 +99,8 @@ Currently the following boards are supported by the library:
 * Balanduino
 * Sanguino
 * Black Widdow
+* RedBearLab nRF51822
+    * If you are using the RedBearLab nRF51822, then you must include the RedBearLab SPI library like so: ```#include <SPI.h>``` in your .ino file.
 
 The following boards need to be activated manually in [settings.h](settings.h):
 
@@ -283,6 +285,8 @@ More information about the controller can be found at the following sites:
 
 The shield is using SPI for communicating with the MAX3421E USB host controller. It uses the SCK, MISO and MOSI pins via the ICSP on your board.
 
+Note this means that it uses pin 13, 12, 11 on an Arduino Uno, so these pins can not be used for anything else!
+
 Furthermore it uses one pin as SS and one INT pin. These are by default located on pin 10 and 9 respectively. They can easily be reconfigured in case you need to use them for something else by cutting the jumper on the shield and then solder a wire from the pad to the new pin.
 
 After that you need modify the following entry in [UsbCore.h](UsbCore.h):

SPP.h

@@ -70,7 +70,7 @@ public:
 
         /** @name BluetoothService implementation */
         /** Used this to disconnect the virtual serial port. */
-        virtual void disconnect();
+        void disconnect();
         /**@}*/
 
         /**
@@ -88,22 +88,22 @@ public:
          * Get number of bytes waiting to be read.
          * @return Return the number of bytes ready to be read.
          */
-        virtual int available(void);
+        int available(void);
 
         /** Send out all bytes in the buffer. */
-        virtual void flush(void) {
+        void flush(void) {
                 send();
         };
         /**
          * Used to read the next value in the buffer without advancing to the next one.
          * @return Return the byte. Will return -1 if no bytes are available.
          */
-        virtual int peek(void);
+        int peek(void);
         /**
          * Used to read the buffer.
          * @return Return the byte. Will return -1 if no bytes are available.
          */
-        virtual int read(void);
+        int read(void);
 
 #if defined(ARDUINO) && ARDUINO >=100
         /**
@@ -111,14 +111,14 @@ public:
          * @param  data The byte to write.
          * @return      Return the number of bytes written.
          */
-        virtual size_t write(uint8_t data);
+        size_t write(uint8_t data);
         /**
          * Writes the bytes to send to a buffer. The message is send when either send() or after Usb.Task() is called.
          * @param  data The data array to send.
          * @param  size Size of the data.
          * @return      Return the number of bytes written.
          */
-        virtual size_t write(const uint8_t* data, size_t size);
+        size_t write(const uint8_t* data, size_t size);
         /** Pull in write(const char *str) from Print */
         using Print::write;
 #else
@@ -126,13 +126,13 @@ public:
          * Writes the byte to send to a buffer. The message is send when either send() or after Usb.Task() is called.
          * @param  data The byte to write.
          */
-        virtual void write(uint8_t data);
+        void write(uint8_t data);
         /**
          * Writes the bytes to send to a buffer. The message is send when either send() or after Usb.Task() is called.
          * @param data The data array to send.
          * @param size Size of the data.
          */
-        virtual void write(const uint8_t* data, size_t size);
+        void write(const uint8_t* data, size_t size);
 #endif
 
         /** Discard all the bytes in the buffer. */
@@ -151,17 +151,17 @@ protected:
          * Used to pass acldata to the services.
          * @param ACLData Incoming acldata.
          */
-        virtual void ACLData(uint8_t* ACLData);
+        void ACLData(uint8_t* ACLData);
         /** Used to establish the connection automatically. */
-        virtual void Run();
+        void Run();
         /** Use this to reset the service. */
-        virtual void Reset();
+        void Reset();
         /**
          * Called when a device is successfully initialized.
          * Use attachOnInit(void (*funcOnInit)(void)) to call your own function.
          * This is useful for instance if you want to set the LEDs in a specific way.
          */
-        virtual void onInit();
+        void onInit();
         /**@}*/
 
 private:

UsbCore.h

@@ -143,15 +143,15 @@ public:
                 return;
         } // Note used for hubs only!
 
-        virtual boolean VIDPIDOK(uint16_t vid, uint16_t pid) {
+        virtual bool VIDPIDOK(uint16_t vid, uint16_t pid) {
                 return false;
         }
 
-        virtual boolean DEVCLASSOK(uint8_t klass) {
+        virtual bool DEVCLASSOK(uint8_t klass) {
                 return false;
         }
 
-        virtual boolean DEVSUBCLASSOK(uint8_t subklass) {
+        virtual bool DEVSUBCLASSOK(uint8_t subklass) {
                 return true;
         }
 
@@ -241,8 +241,8 @@ public:
         uint8_t setAddr(uint8_t oldaddr, uint8_t ep, uint8_t newaddr);
         uint8_t setConf(uint8_t addr, uint8_t ep, uint8_t conf_value);
         /**/
-        uint8_t ctrlData(uint8_t addr, uint8_t ep, uint16_t nbytes, uint8_t* dataptr, boolean direction);
+        uint8_t ctrlData(uint8_t addr, uint8_t ep, uint16_t nbytes, uint8_t* dataptr, bool direction);
-        uint8_t ctrlStatus(uint8_t ep, boolean direction, uint16_t nak_limit);
+        uint8_t ctrlStatus(uint8_t ep, bool direction, uint16_t nak_limit);
         uint8_t inTransfer(uint8_t addr, uint8_t ep, uint16_t *nbytesptr, uint8_t* data);
         uint8_t outTransfer(uint8_t addr, uint8_t ep, uint16_t nbytes, uint8_t* data);
         uint8_t dispatchPkt(uint8_t token, uint8_t ep, uint16_t nak_limit);

Wii.h

@@ -56,7 +56,7 @@ public:
 
         /** @name BluetoothService implementation */
         /** Used this to disconnect any of the controllers. */
-        virtual void disconnect();
+        void disconnect();
         /**@}*/
 
         /** @name Wii Controller functions */
@@ -381,17 +381,17 @@ protected:
          * Used to pass acldata to the services.
          * @param ACLData Incoming acldata.
          */
-        virtual void ACLData(uint8_t* ACLData);
+        void ACLData(uint8_t* ACLData);
         /** Used to run part of the state machine. */
-        virtual void Run();
+        void Run();
         /** Use this to reset the service. */
-        virtual void Reset();
+        void Reset();
         /**
          * Called when the controller is successfully initialized.
          * Use attachOnInit(void (*funcOnInit)(void)) to call your own function.
          * This is useful for instance if you want to set the LEDs in a specific way.
          */
-        virtual void onInit();
+        void onInit();
         /**@}*/
 
 private:

XBOXOLD.h

@@ -59,17 +59,17 @@ public:
          * @param  lowspeed Speed of the device.
          * @return          0 on success.
          */
-        virtual uint8_t Init(uint8_t parent, uint8_t port, bool lowspeed);
+        uint8_t Init(uint8_t parent, uint8_t port, bool lowspeed);
         /**
          * Release the USB device.
          * @return 0 on success.
          */
-        virtual uint8_t Release();
+        uint8_t Release();
         /**
          * Poll the USB Input endpoins and run the state machines.
          * @return 0 on success.
          */
-        virtual uint8_t Poll();
+        uint8_t Poll();
 
         /**
          * Get the device address.
@@ -93,7 +93,7 @@ public:
          * @param  pid The device's PID.
          * @return     Returns true if the device's VID and PID matches this driver.
          */
-        virtual boolean VIDPIDOK(uint16_t vid, uint16_t pid) {
+        virtual bool VIDPIDOK(uint16_t vid, uint16_t pid) {
                 return ((vid == XBOX_VID || vid == MADCATZ_VID || vid == JOYTECH_VID) && (pid == XBOX_OLD_PID1 || pid == XBOX_OLD_PID2 || pid == XBOX_OLD_PID3 || pid == XBOX_OLD_PID4));
         };
         /**@}*/

XBOXRECV.h

@@ -68,7 +68,7 @@ public:
          * @param  lowspeed Speed of the device.
          * @return          0 on success.
          */
-        virtual uint8_t ConfigureDevice(uint8_t parent, uint8_t port, bool lowspeed);
+        uint8_t ConfigureDevice(uint8_t parent, uint8_t port, bool lowspeed);
         /**
          * Initialize the Xbox wireless receiver.
          * @param  parent   Hub number.
@@ -76,17 +76,17 @@ public:
          * @param  lowspeed Speed of the device.
          * @return          0 on success.
          */
-        virtual uint8_t Init(uint8_t parent, uint8_t port, bool lowspeed);
+        uint8_t Init(uint8_t parent, uint8_t port, bool lowspeed);
         /**
          * Release the USB device.
          * @return 0 on success.
          */
-        virtual uint8_t Release();
+        uint8_t Release();
         /**
          * Poll the USB Input endpoins and run the state machines.
          * @return 0 on success.
          */
-        virtual uint8_t Poll();
+        uint8_t Poll();
 
         /**
          * Get the device address.
@@ -110,7 +110,7 @@ public:
          * @param  pid The device's PID.
          * @return     Returns true if the device's VID and PID matches this driver.
          */
-        virtual boolean VIDPIDOK(uint16_t vid, uint16_t pid) {
+        virtual bool VIDPIDOK(uint16_t vid, uint16_t pid) {
                 return ((vid == XBOX_VID || vid == MADCATZ_VID || vid == JOYTECH_VID) && (pid == XBOX_WIRELESS_RECEIVER_PID || pid == XBOX_WIRELESS_RECEIVER_THIRD_PARTY_PID));
         };
         /**@}*/

XBOXUSB.cpp

@@ -105,7 +105,7 @@ uint8_t XBOXUSB::Init(uint8_t parent, uint8_t port, bool lowspeed) {
                 Notify(PSTR("\r\nThis library only supports Xbox 360 controllers via USB"), 0x80);
 #endif
                 goto FailUnknownDevice;
-        } else if(PID != XBOX_WIRED_PID && PID != MADCATZ_WIRED_PID && PID != GAMESTOP_WIRED_PID && PID != AFTERGLOW_WIRED_PID) // Check PID
+        } else if(PID != XBOX_WIRED_PID && PID != MADCATZ_WIRED_PID && PID != GAMESTOP_WIRED_PID && PID != AFTERGLOW_WIRED_PID && PID != JOYTECH_WIRED_PID) // Check PID
                 goto FailUnknownDevice;
 
         // Allocate new address according to device class

XBOXUSB.h

@@ -41,6 +41,7 @@
 #define XBOX_WIRELESS_RECEIVER_PID              0x0719 // Microsoft Wireless Gaming Receiver
 #define XBOX_WIRELESS_RECEIVER_THIRD_PARTY_PID  0x0291 // Third party Wireless Gaming Receiver
 #define MADCATZ_WIRED_PID                       0xF016 // Mad Catz wired controller
+#define JOYTECH_WIRED_PID                       0xBEEF // For Joytech wired controller
 #define GAMESTOP_WIRED_PID                      0x0401 // Gamestop wired controller
 #define AFTERGLOW_WIRED_PID                     0x0213 // Afterglow wired controller - it uses the same VID as a Gamestop controller
 
@@ -65,17 +66,17 @@ public:
          * @param  lowspeed Speed of the device.
          * @return          0 on success.
          */
-        virtual uint8_t Init(uint8_t parent, uint8_t port, bool lowspeed);
+        uint8_t Init(uint8_t parent, uint8_t port, bool lowspeed);
         /**
          * Release the USB device.
          * @return 0 on success.
          */
-        virtual uint8_t Release();
+        uint8_t Release();
         /**
          * Poll the USB Input endpoins and run the state machines.
          * @return 0 on success.
          */
-        virtual uint8_t Poll();
+        uint8_t Poll();
 
         /**
          * Get the device address.
@@ -99,8 +100,8 @@ public:
          * @param  pid The device's PID.
          * @return     Returns true if the device's VID and PID matches this driver.
          */
-        virtual boolean VIDPIDOK(uint16_t vid, uint16_t pid) {
+        virtual bool VIDPIDOK(uint16_t vid, uint16_t pid) {
-                return ((vid == XBOX_VID || vid == MADCATZ_VID || vid == JOYTECH_VID || vid == GAMESTOP_VID) && (pid == XBOX_WIRED_PID || pid == MADCATZ_WIRED_PID || pid == GAMESTOP_WIRED_PID || pid == AFTERGLOW_WIRED_PID));
+                return ((vid == XBOX_VID || vid == MADCATZ_VID || vid == JOYTECH_VID || vid == GAMESTOP_VID) && (pid == XBOX_WIRED_PID || pid == MADCATZ_WIRED_PID || pid == GAMESTOP_WIRED_PID || pid == AFTERGLOW_WIRED_PID || pid == JOYTECH_WIRED_PID));
         };
         /**@}*/
 

adk.h

@@ -96,9 +96,9 @@ public:
 
 
         // USBDeviceConfig implementation
-        virtual uint8_t ConfigureDevice(uint8_t parent, uint8_t port, bool lowspeed);
+        uint8_t ConfigureDevice(uint8_t parent, uint8_t port, bool lowspeed);
-        virtual uint8_t Init(uint8_t parent, uint8_t port, bool lowspeed);
+        uint8_t Init(uint8_t parent, uint8_t port, bool lowspeed);
-        virtual uint8_t Release();
+        uint8_t Release();
 
         virtual uint8_t Poll() {
                 return 0;
@@ -112,12 +112,12 @@ public:
                 return ready;
         };
 
-        virtual boolean VIDPIDOK(uint16_t vid, uint16_t pid) {
+        virtual bool VIDPIDOK(uint16_t vid, uint16_t pid) {
                 return (vid == ADK_VID && (pid == ADK_PID || pid == ADB_PID));
         };
 
         //UsbConfigXtracter implementation
-        virtual void EndpointXtract(uint8_t conf, uint8_t iface, uint8_t alt, uint8_t proto, const USB_ENDPOINT_DESCRIPTOR *ep);
+        void EndpointXtract(uint8_t conf, uint8_t iface, uint8_t alt, uint8_t proto, const USB_ENDPOINT_DESCRIPTOR *ep);
 }; //class ADK : public USBDeviceConfig ...
 
 /* get ADK protocol version */

avrpins.h

@@ -961,6 +961,58 @@ MAKE_PIN(P78, PIOB, PIO_PB23); // Unconnected
 
 #undef MAKE_PIN
 
+#elif defined(RBL_NRF51822)
+
+#define MAKE_PIN(className, pin) \
+class className { \
+public: \
+    static void Set() { \
+        nrf_gpio_pin_set(pin); \
+    } \
+    static void Clear() { \
+        nrf_gpio_pin_clear(pin); \
+    } \
+    static void SetDirRead() { \
+        nrf_gpio_cfg_input(pin, NRF_GPIO_PIN_NOPULL); \
+    } \
+    static void SetDirWrite() { \
+        nrf_gpio_cfg_output(pin); \
+    } \
+    static uint8_t IsSet() { \
+        return (uint8_t)nrf_gpio_pin_read(pin); \
+    } \
+};
+
+// See: pin_transform.c in RBL nRF51822 SDK
+MAKE_PIN(P0, Pin_nRF51822_to_Arduino(D0));
+MAKE_PIN(P1, Pin_nRF51822_to_Arduino(D1));
+MAKE_PIN(P2, Pin_nRF51822_to_Arduino(D2));
+MAKE_PIN(P3, Pin_nRF51822_to_Arduino(D3));
+MAKE_PIN(P4, Pin_nRF51822_to_Arduino(D4));
+MAKE_PIN(P5, Pin_nRF51822_to_Arduino(D5));
+MAKE_PIN(P6, Pin_nRF51822_to_Arduino(D6));
+MAKE_PIN(P7, Pin_nRF51822_to_Arduino(D7));
+MAKE_PIN(P8, Pin_nRF51822_to_Arduino(D8));
+MAKE_PIN(P9, Pin_nRF51822_to_Arduino(D9)); // INT
+MAKE_PIN(P10, Pin_nRF51822_to_Arduino(D10)); // SS
+MAKE_PIN(P11, Pin_nRF51822_to_Arduino(D11));
+MAKE_PIN(P12, Pin_nRF51822_to_Arduino(D12));
+MAKE_PIN(P13, Pin_nRF51822_to_Arduino(D13));
+MAKE_PIN(P14, Pin_nRF51822_to_Arduino(D14));
+MAKE_PIN(P15, Pin_nRF51822_to_Arduino(D15));
+MAKE_PIN(P17, Pin_nRF51822_to_Arduino(D17)); // MISO
+MAKE_PIN(P18, Pin_nRF51822_to_Arduino(D18)); // MOSI
+MAKE_PIN(P16, Pin_nRF51822_to_Arduino(D16)); // CLK
+MAKE_PIN(P19, Pin_nRF51822_to_Arduino(D19));
+MAKE_PIN(P20, Pin_nRF51822_to_Arduino(D20));
+MAKE_PIN(P21, Pin_nRF51822_to_Arduino(D21));
+MAKE_PIN(P22, Pin_nRF51822_to_Arduino(D22));
+MAKE_PIN(P23, Pin_nRF51822_to_Arduino(D23));
+MAKE_PIN(P24, Pin_nRF51822_to_Arduino(D24));
+
+#undef MAKE_PIN
+
+
 #else
 #error "Please define board in avrpins.h"
 
@@ -968,4 +1020,49 @@ MAKE_PIN(P78, PIOB, PIO_PB23); // Unconnected
 
 #endif // __arm__
 
+#if defined(__MIPSEL__)
+// MIPSEL (MIPS architecture using a little endian byte order)
+
+// MIPS size_t = 4
+#define pgm_read_pointer(p) pgm_read_dword(p)
+
+#define MAKE_PIN(className, pin) \
+class className { \
+public: \
+  static void Set() { \
+    digitalWrite(pin, HIGH);\
+  } \
+  static void Clear() { \
+    digitalWrite(pin, LOW); \
+  } \
+  static void SetDirRead() { \
+    pinMode(pin, INPUT); \
+  } \
+  static void SetDirWrite() { \
+    pinMode(pin, OUTPUT); \
+  } \
+  static uint8_t IsSet() { \
+    return digitalRead(pin); \
+  } \
+};
+
+// 0 .. 13 - Digital pins
+MAKE_PIN(P0, 0); // RX
+MAKE_PIN(P1, 1); // TX
+MAKE_PIN(P2, 2); //
+MAKE_PIN(P3, 3); //
+MAKE_PIN(P4, 4); //
+MAKE_PIN(P5, 5); //
+MAKE_PIN(P6, 6); //
+MAKE_PIN(P7, 7); //
+MAKE_PIN(P8, 8); //
+MAKE_PIN(P9, 9); //
+MAKE_PIN(P10, 10); //
+MAKE_PIN(P11, 11); //
+MAKE_PIN(P12, 12); //
+MAKE_PIN(P13, 13); //
+
+#undef MAKE_PIN
+#endif
+
 #endif //_avrpins_h_

cdcacm.h

@@ -127,7 +127,9 @@ class ACM;
 
 class CDCAsyncOper {
 public:
-        virtual uint8_t OnInit(ACM *pacm) = 0;
+
+        virtual uint8_t OnInit(ACM *pacm) {
+        };
         //virtual void OnDataRcvd(ACM *pacm, uint8_t nbytes, uint8_t *dataptr) = 0;
         //virtual void OnDisconnected(ACM *pacm) = 0;
 };
@@ -173,9 +175,9 @@ public:
         uint8_t SndData(uint16_t nbytes, uint8_t *dataptr);
 
         // USBDeviceConfig implementation
-        virtual uint8_t Init(uint8_t parent, uint8_t port, bool lowspeed);
+        uint8_t Init(uint8_t parent, uint8_t port, bool lowspeed);
-        virtual uint8_t Release();
+        uint8_t Release();
-        virtual uint8_t Poll();
+        uint8_t Poll();
 
         virtual uint8_t GetAddress() {
                 return bAddress;
@@ -186,7 +188,7 @@ public:
         };
 
         // UsbConfigXtracter implementation
-        virtual void EndpointXtract(uint8_t conf, uint8_t iface, uint8_t alt, uint8_t proto, const USB_ENDPOINT_DESCRIPTOR *ep);
+        void EndpointXtract(uint8_t conf, uint8_t iface, uint8_t alt, uint8_t proto, const USB_ENDPOINT_DESCRIPTOR *ep);
 };
 
 #endif // __CDCACM_H__

cdcftdi.h

@@ -78,8 +78,12 @@ class FTDI;
 
 class FTDIAsyncOper {
 public:
-        virtual uint8_t OnInit(FTDI *pftdi) = 0;
+
-        virtual uint8_t OnRelease(FTDI *pftdi) = 0;
+        virtual uint8_t OnInit(FTDI *pftdi) {
+        };
+
+        virtual uint8_t OnRelease(FTDI *pftdi) {
+        };
 };
 
 
@@ -119,18 +123,18 @@ public:
         uint8_t SndData(uint16_t nbytes, uint8_t *dataptr);
 
         // USBDeviceConfig implementation
-        virtual uint8_t Init(uint8_t parent, uint8_t port, bool lowspeed);
+        uint8_t Init(uint8_t parent, uint8_t port, bool lowspeed);
-        virtual uint8_t Release();
+        uint8_t Release();
-        virtual uint8_t Poll();
+        uint8_t Poll();
 
         virtual uint8_t GetAddress() {
                 return bAddress;
         };
 
         // UsbConfigXtracter implementation
-        virtual void EndpointXtract(uint8_t conf, uint8_t iface, uint8_t alt, uint8_t proto, const USB_ENDPOINT_DESCRIPTOR *ep);
+        void EndpointXtract(uint8_t conf, uint8_t iface, uint8_t alt, uint8_t proto, const USB_ENDPOINT_DESCRIPTOR *ep);
 
-        virtual boolean VIDPIDOK(uint16_t vid, uint16_t pid) {
+        virtual bool VIDPIDOK(uint16_t vid, uint16_t pid) {
                 return (vid == FTDI_VID && pid == FTDI_PID);
         }
 

cdcprolific.h

@@ -57,14 +57,6 @@ e-mail   :  support@circuitsathome.com
 #define kCONTROL_DTR                            0x01
 #define kCONTROL_RTS                            0x02
 
-enum tXO_State {
-        kXOnSent = -2,
-        kXOffSent = -1,
-        kXO_Idle = 0,
-        kXOffNeeded = 1,
-        kXOnNeeded = 2
-};
-
 #define kStateTransientMask                     0x74
 #define kBreakError                             0x04
 #define kFrameError                             0x10
@@ -104,6 +96,17 @@ enum tXO_State {
 #define RESET_DOWNSTREAM_DATA_PIPE              0x08
 #define RESET_UPSTREAM_DATA_PIPE                0x09
 
+
+#define PL_MAX_ENDPOINTS                        4
+
+enum tXO_State {
+        kXOnSent = -2,
+        kXOffSent = -1,
+        kXO_Idle = 0,
+        kXOffNeeded = 1,
+        kXOnNeeded = 2
+};
+
 enum pl2303_type {
         unknown,
         type_1, /* don't know the difference between type 0 and */
@@ -113,8 +116,6 @@ enum pl2303_type {
 };
 
 
-#define PL_MAX_ENDPOINTS					4
-
 class PL2303 : public ACM {
         uint16_t wPLType; // Type of chip
 
@@ -122,7 +123,7 @@ public:
         PL2303(USB *pusb, CDCAsyncOper *pasync);
 
         // USBDeviceConfig implementation
-        virtual uint8_t Init(uint8_t parent, uint8_t port, bool lowspeed);
+        uint8_t Init(uint8_t parent, uint8_t port, bool lowspeed);
         //virtual uint8_t Release();
         //virtual uint8_t Poll();
         //virtual uint8_t GetAddress() { return bAddress; };

confdescparser.h

@@ -24,7 +24,9 @@ class UsbConfigXtracter {
 public:
         //virtual void ConfigXtract(const USB_CONFIGURATION_DESCRIPTOR *conf) = 0;
         //virtual void InterfaceXtract(uint8_t conf, const USB_INTERFACE_DESCRIPTOR *iface) = 0;
-        virtual void EndpointXtract(uint8_t conf, uint8_t iface, uint8_t alt, uint8_t proto, const USB_ENDPOINT_DESCRIPTOR *ep) = 0;
+
+        virtual void EndpointXtract(uint8_t conf, uint8_t iface, uint8_t alt, uint8_t proto, const USB_ENDPOINT_DESCRIPTOR *ep) {
+        };
 };
 
 #define CP_MASK_COMPARE_CLASS			1
@@ -63,7 +65,7 @@ public:
                 UseOr = true;
         }
         ConfigDescParser(UsbConfigXtracter *xtractor);
-        virtual void Parse(const uint16_t len, const uint8_t *pbuf, const uint16_t &offset);
+        void Parse(const uint16_t len, const uint8_t *pbuf, const uint16_t &offset);
 };
 
 template <const uint8_t CLASS_ID, const uint8_t SUBCLASS_ID, const uint8_t PROTOCOL_ID, const uint8_t MASK>

examples/Bluetooth/BTHID/BTHID.ino

@@ -11,6 +11,7 @@
 // Satisfy IDE, which only needs to see the include statment in the ino.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
+#include <SPI.h>
 #endif
 
 USB Usb;
@@ -30,7 +31,9 @@ MouseRptParser mousePrs;
 
 void setup() {
   Serial.begin(115200);
+#if !defined(__MIPSEL__)
   while (!Serial); // Wait for serial port to connect - used on Leonardo, Teensy and other boards with built-in USB CDC serial connection
+#endif
   if (Usb.Init() == -1) {
     Serial.print(F("\r\nOSC did not start"));
     while (1); // Halt

examples/Bluetooth/PS3BT/PS3BT.ino

@@ -9,6 +9,7 @@
 // Satisfy IDE, which only needs to see the include statment in the ino.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
+#include <SPI.h>
 #endif
 
 USB Usb;
@@ -19,12 +20,14 @@ BTD Btd(&Usb); // You have to create the Bluetooth Dongle instance like so
 PS3BT PS3(&Btd); // This will just create the instance
 //PS3BT PS3(&Btd, 0x00, 0x15, 0x83, 0x3D, 0x0A, 0x57); // This will also store the bluetooth address - this can be obtained from the dongle when running the sketch
 
-boolean printTemperature;
+bool printTemperature;
-boolean printAngle;
+bool printAngle;
 
 void setup() {
   Serial.begin(115200);
+#if !defined(__MIPSEL__)
   while (!Serial); // Wait for serial port to connect - used on Leonardo, Teensy and other boards with built-in USB CDC serial connection
+#endif
   if (Usb.Init() == -1) {
     Serial.print(F("\r\nOSC did not start"));
     while (1); //halt

examples/Bluetooth/PS3Multi/PS3Multi.ino

@@ -10,6 +10,7 @@
 // Satisfy IDE, which only needs to see the include statment in the ino.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
+#include <SPI.h>
 #endif
 
 USB Usb;
@@ -18,8 +19,8 @@ USB Usb;
 BTD Btd(&Usb); // You have to create the Bluetooth Dongle instance like so
 PS3BT *PS3[2]; // We will use this pointer to store the two instance, you can easily make it larger if you like, but it will use a lot of RAM!
 const uint8_t length = sizeof(PS3) / sizeof(PS3[0]); // Get the lenght of the array
-boolean printAngle[length];
+bool printAngle[length];
-boolean oldControllerState[length];
+bool oldControllerState[length];
 
 void setup() {
   for (uint8_t i = 0; i < length; i++) {
@@ -28,7 +29,9 @@ void setup() {
   }
 
   Serial.begin(115200);
+#if !defined(__MIPSEL__)
   while (!Serial); // Wait for serial port to connect - used on Leonardo, Teensy and other boards with built-in USB CDC serial connection
+#endif
   if (Usb.Init() == -1) {
     Serial.print(F("\r\nOSC did not start"));
     while (1); //halt

examples/Bluetooth/PS3SPP/PS3SPP.ino

@@ -15,6 +15,7 @@
 // Satisfy IDE, which only needs to see the include statment in the ino.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
+#include <SPI.h>
 #endif
 
 USB Usb;
@@ -28,12 +29,14 @@ SPP SerialBT(&Btd); // This will set the name to the defaults: "Arduino" and the
 PS3BT PS3(&Btd); // This will just create the instance
 //PS3BT PS3(&Btd, 0x00, 0x15, 0x83, 0x3D, 0x0A, 0x57); // This will also store the bluetooth address - this can be obtained from the dongle when running the sketch
 
-boolean firstMessage = true;
+bool firstMessage = true;
 String output = ""; // We will store the data in this string
 
 void setup() {
   Serial.begin(115200); // This wil lprint the debugging from the libraries
+#if !defined(__MIPSEL__)
   while (!Serial); // Wait for serial port to connect - used on Leonardo, Teensy and other boards with built-in USB CDC serial connection
+#endif
   if (Usb.Init() == -1) {
     Serial.print(F("\r\nOSC did not start"));
     while (1); //halt

examples/Bluetooth/PS4BT/PS4BT.ino

@@ -10,6 +10,7 @@
 // Satisfy IDE, which only needs to see the include statment in the ino.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
+#include <SPI.h>
 #endif
 
 USB Usb;
@@ -24,12 +25,14 @@ PS4BT PS4(&Btd, PAIR);
 // After that you can simply create the instance like so and then press the PS button on the device
 //PS4BT PS4(&Btd);
 
-boolean printAngle, printTouch;
+bool printAngle, printTouch;
 uint8_t oldL2Value, oldR2Value;
 
 void setup() {
   Serial.begin(115200);
+#if !defined(__MIPSEL__)
   while (!Serial); // Wait for serial port to connect - used on Leonardo, Teensy and other boards with built-in USB CDC serial connection
+#endif
   if (Usb.Init() == -1) {
     Serial.print(F("\r\nOSC did not start"));
     while (1); // Halt

examples/Bluetooth/SPP/SPP.ino

@@ -9,6 +9,7 @@
 // Satisfy IDE, which only needs to see the include statment in the ino.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
+#include <SPI.h>
 #endif
 
 USB Usb;
@@ -19,11 +20,13 @@ BTD Btd(&Usb); // You have to create the Bluetooth Dongle instance like so
 SPP SerialBT(&Btd); // This will set the name to the defaults: "Arduino" and the pin to "0000"
 //SPP SerialBT(&Btd, "Lauszus's Arduino", "1234"); // You can also set the name and pin like so
 
-boolean firstMessage = true;
+bool firstMessage = true;
 
 void setup() {
   Serial.begin(115200);
+#if !defined(__MIPSEL__)
   while (!Serial); // Wait for serial port to connect - used on Leonardo, Teensy and other boards with built-in USB CDC serial connection
+#endif
   if (Usb.Init() == -1) {
     Serial.print(F("\r\nOSC did not start"));
     while (1); //halt

examples/Bluetooth/SPPMulti/SPPMulti.ino

@@ -6,9 +6,10 @@
 
 #include <SPP.h>
 #include <usbhub.h>
-// Satisfy IDE, which only needs to see the include statement in the ino.
+// Satisfy IDE, which only needs to see the include statment in the ino.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
+#include <SPI.h>
 #endif
 
 USB Usb;
@@ -19,14 +20,16 @@ BTD Btd(&Usb); // You have to create the Bluetooth Dongle instance like so
 const uint8_t length = 2; // Set the number of instances here
 SPP *SerialBT[length]; // We will use this pointer to store the instances, you can easily make it larger if you like, but it will use a lot of RAM!
 
-boolean firstMessage[length] = { true }; // Set all to true
+bool firstMessage[length] = { true }; // Set all to true
 
 void setup() {
   for (uint8_t i = 0; i < length; i++)
     SerialBT[i] = new SPP(&Btd); // This will set the name to the default: "Arduino" and the pin to "0000" for all connections
 
   Serial.begin(115200);
+#if !defined(__MIPSEL__)
   while (!Serial); // Wait for serial port to connect - used on Leonardo, Teensy and other boards with built-in USB CDC serial connection
+#endif
   if (Usb.Init() == -1) {
     Serial.print(F("\r\nOSC did not start"));
     while (1); // Halt

examples/Bluetooth/Wii/Wii.ino

@@ -9,6 +9,7 @@
 // Satisfy IDE, which only needs to see the include statment in the ino.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
+#include <SPI.h>
 #endif
 
 USB Usb;
@@ -23,7 +24,9 @@ bool printAngle;
 
 void setup() {
   Serial.begin(115200);
+#if !defined(__MIPSEL__)
   while (!Serial); // Wait for serial port to connect - used on Leonardo, Teensy and other boards with built-in USB CDC serial connection
+#endif
   if (Usb.Init() == -1) {
     Serial.print(F("\r\nOSC did not start"));
     while (1); //halt

examples/Bluetooth/WiiIRCamera/WiiIRCamera.ino

@@ -16,6 +16,7 @@ Otherwise, wire up a IR LED yourself.
 // Satisfy IDE, which only needs to see the include statment in the ino.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
+#include <SPI.h>
 #endif
 
 #ifndef WIICAMERA // Used to check if WIICAMERA is defined
@@ -35,7 +36,9 @@ uint8_t printObjects;
 
 void setup() {
   Serial.begin(115200);
+#if !defined(__MIPSEL__)
   while (!Serial); // Wait for serial port to connect - used on Leonardo, Teensy and other boards with built-in USB CDC serial connection
+#endif
   if (Usb.Init() == -1) {
     Serial.print(F("\r\nOSC did not start"));
     while (1); //halt

examples/Bluetooth/WiiMulti/WiiMulti.ino

@@ -10,6 +10,7 @@
 // Satisfy IDE, which only needs to see the include statment in the ino.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
+#include <SPI.h>
 #endif
 
 USB Usb;
@@ -18,8 +19,8 @@ USB Usb;
 BTD Btd(&Usb); // You have to create the Bluetooth Dongle instance like so
 WII *Wii[2]; // We will use this pointer to store the two instance, you can easily make it larger if you like, but it will use a lot of RAM!
 const uint8_t length = sizeof(Wii) / sizeof(Wii[0]); // Get the lenght of the array
-boolean printAngle[length];
+bool printAngle[length];
-boolean oldControllerState[length];
+bool oldControllerState[length];
 
 void setup() {
   for (uint8_t i = 0; i < length; i++) {
@@ -28,7 +29,9 @@ void setup() {
   }
 
   Serial.begin(115200);
+#if !defined(__MIPSEL__)
   while (!Serial); // Wait for serial port to connect - used on Leonardo, Teensy and other boards with built-in USB CDC serial connection
+#endif
   if (Usb.Init() == -1) {
     Serial.print(F("\r\nOSC did not start"));
     while (1); //halt

examples/Bluetooth/WiiUProController/WiiUProController.ino

@@ -9,6 +9,7 @@
 // Satisfy IDE, which only needs to see the include statment in the ino.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
+#include <SPI.h>
 #endif
 
 USB Usb;
@@ -21,7 +22,9 @@ WII Wii(&Btd, PAIR); // This will start an inquiry and then pair with your Wiimo
 
 void setup() {
   Serial.begin(115200);
+#if !defined(__MIPSEL__)
   while (!Serial); // Wait for serial port to connect - used on Leonardo, Teensy and other boards with built-in USB CDC serial connection
+#endif
   if (Usb.Init() == -1) {
     Serial.print(F("\r\nOSC did not start"));
     while (1); //halt

examples/HID/USBHIDBootKbd/USBHIDBootKbd.ino

@@ -3,6 +3,7 @@
 // Satisfy IDE, which only needs to see the include statment in the ino.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
+#include <SPI.h>
 #endif
 
 class KbdRptParser : public KeyboardReportParser
@@ -10,11 +11,11 @@ class KbdRptParser : public KeyboardReportParser
     void PrintKey(uint8_t mod, uint8_t key);
 
   protected:
-        virtual void OnControlKeysChanged(uint8_t before, uint8_t after);
+    void OnControlKeysChanged(uint8_t before, uint8_t after);
 
-	virtual void OnKeyDown	(uint8_t mod, uint8_t key);
+    void OnKeyDown	(uint8_t mod, uint8_t key);
-	virtual void OnKeyUp	(uint8_t mod, uint8_t key);
+    void OnKeyUp	(uint8_t mod, uint8_t key);
-	virtual void OnKeyPressed(uint8_t key);
+    void OnKeyPressed(uint8_t key);
 };
 
 void KbdRptParser::PrintKey(uint8_t m, uint8_t key)
@@ -105,7 +106,9 @@ KbdRptParser Prs;
 void setup()
 {
   Serial.begin( 115200 );
+#if !defined(__MIPSEL__)
   while (!Serial); // Wait for serial port to connect - used on Leonardo, Teensy and other boards with built-in USB CDC serial connection
+#endif
   Serial.println("Start");
 
   if (Usb.Init() == -1)

examples/HID/USBHIDBootKbdAndMouse/USBHIDBootKbdAndMouse.ino

@@ -1,16 +1,21 @@
 #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
 
 class MouseRptParser : public MouseReportParser
 {
   protected:
-	virtual void OnMouseMove	(MOUSEINFO *mi);
+    void OnMouseMove(MOUSEINFO *mi);
-	virtual void OnLeftButtonUp	(MOUSEINFO *mi);
+    void OnLeftButtonUp(MOUSEINFO *mi);
-	virtual void OnLeftButtonDown	(MOUSEINFO *mi);
+    void OnLeftButtonDown(MOUSEINFO *mi);
-	virtual void OnRightButtonUp	(MOUSEINFO *mi);
+    void OnRightButtonUp(MOUSEINFO *mi);
-	virtual void OnRightButtonDown	(MOUSEINFO *mi);
+    void OnRightButtonDown(MOUSEINFO *mi);
-	virtual void OnMiddleButtonUp	(MOUSEINFO *mi);
+    void OnMiddleButtonUp(MOUSEINFO *mi);
-	virtual void OnMiddleButtonDown	(MOUSEINFO *mi);
+    void OnMiddleButtonDown(MOUSEINFO *mi);
 };
 void MouseRptParser::OnMouseMove(MOUSEINFO *mi)
 {
@@ -49,11 +54,10 @@ class KbdRptParser : public KeyboardReportParser
     void PrintKey(uint8_t mod, uint8_t key);
 
   protected:
-        virtual void OnControlKeysChanged(uint8_t before, uint8_t after);
+    void OnControlKeysChanged(uint8_t before, uint8_t after);
-
+    void OnKeyDown	(uint8_t mod, uint8_t key);
-	virtual void OnKeyDown	(uint8_t mod, uint8_t key);
+    void OnKeyUp	(uint8_t mod, uint8_t key);
-	virtual void OnKeyUp	(uint8_t mod, uint8_t key);
+    void OnKeyPressed(uint8_t key);
-	virtual void OnKeyPressed(uint8_t key);
 };
 
 void KbdRptParser::PrintKey(uint8_t m, uint8_t key)
@@ -148,7 +152,9 @@ MouseRptParser MousePrs;
 void setup()
 {
   Serial.begin( 115200 );
+#if !defined(__MIPSEL__)
   while (!Serial); // Wait for serial port to connect - used on Leonardo, Teensy and other boards with built-in USB CDC serial connection
+#endif
   Serial.println("Start");
 
   if (Usb.Init() == -1)

examples/HID/USBHIDBootMouse/USBHIDBootMouse.ino

@@ -3,18 +3,19 @@
 // Satisfy IDE, which only needs to see the include statment in the ino.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
+#include <SPI.h>
 #endif
 
 class MouseRptParser : public MouseReportParser
 {
 protected:
-	virtual void OnMouseMove	(MOUSEINFO *mi);
+	void OnMouseMove	(MOUSEINFO *mi);
-	virtual void OnLeftButtonUp	(MOUSEINFO *mi);
+	void OnLeftButtonUp	(MOUSEINFO *mi);
-	virtual void OnLeftButtonDown	(MOUSEINFO *mi);
+	void OnLeftButtonDown	(MOUSEINFO *mi);
-	virtual void OnRightButtonUp	(MOUSEINFO *mi);
+	void OnRightButtonUp	(MOUSEINFO *mi);
-	virtual void OnRightButtonDown	(MOUSEINFO *mi);
+	void OnRightButtonDown	(MOUSEINFO *mi);
-	virtual void OnMiddleButtonUp	(MOUSEINFO *mi);
+	void OnMiddleButtonUp	(MOUSEINFO *mi);
-	virtual void OnMiddleButtonDown	(MOUSEINFO *mi);
+	void OnMiddleButtonDown	(MOUSEINFO *mi);
 };
 void MouseRptParser::OnMouseMove(MOUSEINFO *mi)
 {
@@ -59,7 +60,9 @@ MouseRptParser                               Prs;
 void setup()
 {
     Serial.begin( 115200 );
+#if !defined(__MIPSEL__)
     while (!Serial); // Wait for serial port to connect - used on Leonardo, Teensy and other boards with built-in USB CDC serial connection
+#endif
     Serial.println("Start");
 
     if (Usb.Init() == -1)

examples/HID/USBHIDJoystick/USBHIDJoystick.ino

@@ -1,6 +1,11 @@
 #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>
+#include <SPI.h>
+#endif
 
 #include "hidjoystickrptparser.h"
 
@@ -12,7 +17,9 @@ JoystickReportParser Joy(&JoyEvents);
 
 void setup() {
         Serial.begin(115200);
+#if !defined(__MIPSEL__)
         while (!Serial); // Wait for serial port to connect - used on Leonardo, Teensy and other boards with built-in USB CDC serial connection
+#endif
         Serial.println("Start");
 
         if (Usb.Init() == -1)

examples/HID/USBHID_desc/USBHID_desc.ino

@@ -6,6 +6,7 @@
 // Satisfy IDE, which only needs to see the include statment in the ino.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
+#include <SPI.h>
 #endif
 
 class HIDUniversal2 : public HIDUniversal
@@ -14,7 +15,7 @@ public:
     HIDUniversal2(USB *usb) : HIDUniversal(usb) {};
 
 protected:
-    virtual uint8_t OnInitSuccessful();
+    uint8_t OnInitSuccessful();
 };
 
 uint8_t HIDUniversal2::OnInitSuccessful()
@@ -54,7 +55,9 @@ UniversalReportParser Uni;
 void setup()
 {
   Serial.begin( 115200 );
+#if !defined(__MIPSEL__)
   while (!Serial); // Wait for serial port to connect - used on Leonardo, Teensy and other boards with built-in USB CDC serial connection
+#endif
   Serial.println("Start");
 
   if (Usb.Init() == -1)

examples/HID/le3dp/le3dp.ino

@@ -8,6 +8,7 @@
 // Satisfy IDE, which only needs to see the include statment in the ino.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
+#include <SPI.h>
 #endif
 
 USB                                             Usb;
@@ -19,7 +20,9 @@ JoystickReportParser                            Joy(&JoyEvents);
 void setup()
 {
   Serial.begin( 115200 );
+#if !defined(__MIPSEL__)
   while (!Serial); // Wait for serial port to connect - used on Leonardo, Teensy and other boards with built-in USB CDC serial connection
+#endif
   Serial.println("Start");
 
   if (Usb.Init() == -1)

examples/HID/scale/scale.ino

@@ -9,6 +9,7 @@
 // Satisfy IDE, which only needs to see the include statment in the ino.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
+#include <SPI.h>
 #endif
 
 USB                                             Usb;
@@ -21,7 +22,9 @@ ScaleReportParser                            Scale(&ScaleEvents);
 void setup()
 {
   Serial.begin( 115200 );
+#if !defined(__MIPSEL__)
   while (!Serial); // Wait for serial port to connect - used on Leonardo, Teensy and other boards with built-in USB CDC serial connection
+#endif
   Serial.println("Start");
 
   if (Usb.Init() == -1)

examples/HID/scale/scale_rptparser.h

@@ -1,7 +1,7 @@
 #if !defined(__SCALERPTPARSER_H__)
 #define __SCALERPTPARSER_H__
 
-#include <Max_LCD.h>
+#include <max_LCD.h>
 #include <hid.h>
 
 /* Scale status constants */

examples/PS3USB/PS3USB.ino

@@ -8,6 +8,7 @@
 // Satisfy IDE, which only needs to see the include statment in the ino.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
+#include <SPI.h>
 #endif
 
 USB Usb;
@@ -15,12 +16,14 @@ USB Usb;
 PS3USB PS3(&Usb); // This will just create the instance
 //PS3USB PS3(&Usb,0x00,0x15,0x83,0x3D,0x0A,0x57); // This will also store the bluetooth address - this can be obtained from the dongle when running the sketch
 
-boolean printAngle;
+bool printAngle;
 uint8_t state = 0;
 
 void setup() {
   Serial.begin(115200);
+#if !defined(__MIPSEL__)
   while (!Serial); // Wait for serial port to connect - used on Leonardo, Teensy and other boards with built-in USB CDC serial connection
+#endif
   if (Usb.Init() == -1) {
     Serial.print(F("\r\nOSC did not start"));
     while (1); //halt

examples/PS4USB/PS4USB.ino

@@ -9,17 +9,20 @@
 // Satisfy IDE, which only needs to see the include statment in the ino.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
+#include <SPI.h>
 #endif
 
 USB Usb;
 PS4USB PS4(&Usb);
 
-boolean printAngle, printTouch;
+bool printAngle, printTouch;
 uint8_t oldL2Value, oldR2Value;
 
 void setup() {
   Serial.begin(115200);
+#if !defined(__MIPSEL__)
   while (!Serial); // Wait for serial port to connect - used on Leonardo, Teensy and other boards with built-in USB CDC serial connection
+#endif
   if (Usb.Init() == -1) {
     Serial.print(F("\r\nOSC did not start"));
     while (1); // Halt

examples/PSBuzz/PSBuzz.ino

@@ -9,6 +9,7 @@
 // Satisfy IDE, which only needs to see the include statment in the ino.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
+#include <SPI.h>
 #endif
 
 USB Usb;
@@ -16,7 +17,9 @@ PSBuzz Buzz(&Usb);
 
 void setup() {
   Serial.begin(115200);
+#if !defined(__MIPSEL__)
   while (!Serial); // Wait for serial port to connect - used on Leonardo, Teensy and other boards with built-in USB CDC serial connection
+#endif
   if (Usb.Init() == -1) {
     Serial.print(F("\r\nOSC did not start"));
     while (1); // Halt

examples/USB_desc/USB_desc.ino

@@ -4,6 +4,7 @@
 // Satisfy IDE, which only needs to see the include statment in the ino.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
+#include <SPI.h>
 #endif
 
 USB     Usb;
@@ -49,7 +50,9 @@ void PrintAddress(uint8_t addr)
 void setup()
 {
   Serial.begin( 115200 );
+#if !defined(__MIPSEL__)
   while (!Serial); // Wait for serial port to connect - used on Leonardo, Teensy and other boards with built-in USB CDC serial connection
+#endif
   Serial.println("Start");
 
   if (Usb.Init() == -1)
@@ -336,7 +339,7 @@ void printunkdescr( uint8_t* descr_ptr )
 
 
 /* Print a string from Program Memory directly to save RAM */
-void printProgStr(const prog_char str[])
+void printProgStr(prog_char str[])
 {
   char c;
   if(!str) return;

examples/Xbox/XBOXOLD/XBOXOLD.ino

@@ -9,6 +9,7 @@
 // Satisfy IDE, which only needs to see the include statment in the ino.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
+#include <SPI.h>
 #endif
 
 USB Usb;
@@ -17,7 +18,9 @@ XBOXOLD Xbox(&Usb);
 
 void setup() {
   Serial.begin(115200);
+#if !defined(__MIPSEL__)
   while (!Serial); // Wait for serial port to connect - used on Leonardo, Teensy and other boards with built-in USB CDC serial connection
+#endif
   if (Usb.Init() == -1) {
     Serial.print(F("\r\nOSC did not start"));
     while (1); // halt

examples/Xbox/XBOXRECV/XBOXRECV.ino

@@ -9,6 +9,7 @@
 // Satisfy IDE, which only needs to see the include statment in the ino.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
+#include <SPI.h>
 #endif
 
 USB Usb;
@@ -16,7 +17,9 @@ XBOXRECV Xbox(&Usb);
 
 void setup() {
   Serial.begin(115200);
+#if !defined(__MIPSEL__)
   while (!Serial); // Wait for serial port to connect - used on Leonardo, Teensy and other boards with built-in USB CDC serial connection
+#endif
   if (Usb.Init() == -1) {
     Serial.print(F("\r\nOSC did not start"));
     while (1); //halt

examples/Xbox/XBOXUSB/XBOXUSB.ino

@@ -8,6 +8,7 @@
 // Satisfy IDE, which only needs to see the include statment in the ino.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
+#include <SPI.h>
 #endif
 
 USB Usb;
@@ -15,7 +16,9 @@ XBOXUSB Xbox(&Usb);
 
 void setup() {
   Serial.begin(115200);
+#if !defined(__MIPSEL__)
   while (!Serial); // Wait for serial port to connect - used on Leonardo, Teensy and other boards with built-in USB CDC serial connection
+#endif
   if (Usb.Init() == -1) {
     Serial.print(F("\r\nOSC did not start"));
     while (1); //halt

examples/acm/acm_terminal/acm_terminal.ino

@@ -6,12 +6,13 @@
 // Satisfy IDE, which only needs to see the include statment in the ino.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
+#include <SPI.h>
 #endif
 
 class ACMAsyncOper : public CDCAsyncOper
 {
 public:
-    virtual uint8_t OnInit(ACM *pacm);
+    uint8_t OnInit(ACM *pacm);
 };
 
 uint8_t ACMAsyncOper::OnInit(ACM *pacm)
@@ -48,7 +49,9 @@ ACM           Acm(&Usb, &AsyncOper);
 void setup()
 {
   Serial.begin( 115200 );
+#if !defined(__MIPSEL__)
   while (!Serial); // Wait for serial port to connect - used on Leonardo, Teensy and other boards with built-in USB CDC serial connection
+#endif
   Serial.println("Start");
 
   if (Usb.Init() == -1)

examples/adk/ArduinoBlinkLED/ArduinoBlinkLED.ino

@@ -2,6 +2,27 @@
 // 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>
 
+//
+// CAUTION! WARNING! ATTENTION! VORSICHT! ADVARSEL! ¡CUIDADO! ВНИМАНИЕ!
+//
+// Pin 13 is occupied by the SCK pin on various Arduino boards,
+// including Uno, Duemilanove, etc., so use a different pin for those boards.
+//
+// CAUTION! WARNING! ATTENTION! VORSICHT! ADVARSEL! ¡CUIDADO! ВНИМАНИЕ!
+//
+#if defined(LED_BUILTIN)
+#define LED LED_BUILTIN // Use built in LED
+#else
+#define LED 9 // Set to something here that makes sense for your board.
+#endif
+
+
+// Satisfy IDE, which only needs to see the include statment in the ino.
+#ifdef dobogusinclude
+#include <spi4teensy3.h>
+#include <SPI.h>
+#endif
+
 USB Usb;
 ADK adk(&Usb, "TKJElectronics", // Manufacturer Name
               "ArduinoBlinkLED", // Model Name
@@ -10,14 +31,14 @@ ADK adk(&Usb, "TKJElectronics", // Manufacturer Name
               "http://www.tkjelectronics.dk/uploads/ArduinoBlinkLED.apk", // URL (web page to visit if no installed apps support the accessory)
               "123456789"); // Serial Number (optional)
 
-#define LED LED_BUILTIN // Use built in LED  - note that pin 13 is occupied by the SCK pin on a normal Arduino (Uno, Duemilanove etc.), so use a different pin
-
 uint32_t timer;
-boolean connected;
+bool connected;
 
 void setup() {
   Serial.begin(115200);
+#if !defined(__MIPSEL__)
   while (!Serial); // Wait for serial port to connect - used on Leonardo, Teensy and other boards with built-in USB CDC serial connection
+#endif
   if (Usb.Init() == -1) {
     Serial.print("\r\nOSCOKIRQ failed to assert");
     while (1); // halt

examples/adk/adk_barcode/adk_barcode.ino

@@ -4,6 +4,11 @@
 #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
 
 USB Usb;
 USBHub Hub1(&Usb);
@@ -22,8 +27,8 @@ class KbdRptParser : public KeyboardReportParser
 {
 
 protected:
-	virtual void OnKeyDown	(uint8_t mod, uint8_t key);
+	void OnKeyDown	(uint8_t mod, uint8_t key);
-	virtual void OnKeyPressed(uint8_t key);
+	void OnKeyPressed(uint8_t key);
 };
 
 void KbdRptParser::OnKeyDown(uint8_t mod, uint8_t key)
@@ -64,7 +69,9 @@ KbdRptParser Prs;
 void setup()
 {
   Serial.begin(115200);
+#if !defined(__MIPSEL__)
   while (!Serial); // Wait for serial port to connect - used on Leonardo, Teensy and other boards with built-in USB CDC serial connection
+#endif
   Serial.println("\r\nADK demo start");
 
   if (Usb.Init() == -1) {

examples/adk/demokit_20/demokit_20.ino

@@ -1,5 +1,10 @@
 #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
 
 USB Usb;
 USBHub hub0(&Usb);
@@ -16,9 +21,6 @@ uint8_t  b, b1;
 #define  LED1_RED       3
 #define  BUTTON1        2
 
-void setup();
-void loop();
-
 void init_buttons()
 {
 	pinMode(BUTTON1, INPUT);
@@ -37,7 +39,9 @@ void init_leds()
 void setup()
 {
 	Serial.begin(115200);
+#if !defined(__MIPSEL__)
   while (!Serial); // Wait for serial port to connect - used on Leonardo, Teensy and other boards with built-in USB CDC serial connection
+#endif
 	Serial.println("\r\nADK demo start");
 
         if (Usb.Init() == -1) {

examples/adk/term_test/term_test.ino

@@ -1,5 +1,10 @@
 #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
 
 USB Usb;
 //USBHub     Hub(&Usb);
@@ -14,7 +19,9 @@ ADK adk(&Usb,"Circuits@Home, ltd.",
 void setup()
 {
 	Serial.begin(115200);
+#if !defined(__MIPSEL__)
   while (!Serial); // Wait for serial port to connect - used on Leonardo, Teensy and other boards with built-in USB CDC serial connection
+#endif
 	Serial.println("\r\nADK demo start");
 
         if (Usb.Init() == -1) {

examples/adk/term_time/term_time.ino

@@ -1,5 +1,10 @@
 #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
 
 USB Usb;
 
@@ -13,7 +18,9 @@ ADK adk(&Usb,"Circuits@Home, ltd.",
 void setup()
 {
 	Serial.begin(115200);
+#if !defined(__MIPSEL__)
   while (!Serial); // Wait for serial port to connect - used on Leonardo, Teensy and other boards with built-in USB CDC serial connection
+#endif
 	Serial.println("\r\nADK demo start");
 
         if (Usb.Init() == -1) {

examples/board_qc/board_qc.ino

@@ -7,6 +7,8 @@
 // Satisfy IDE, which only needs to see the include statment in the ino.
 #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
 
 /* variables */
@@ -23,7 +25,9 @@ USB Usb;
 void setup() {
         laststate = 0;
         Serial.begin(115200);
+#if !defined(__MIPSEL__)
         while(!Serial); // Wait for serial port to connect - used on Leonardo, Teensy and other boards with built-in USB CDC serial connection
+#endif
         E_Notify(PSTR("\r\nCircuits At Home 2011"), 0x80);
         E_Notify(PSTR("\r\nUSB Host Shield Quality Control Routine"), 0x80);
         /* SPI quick test - check revision register */

examples/ftdi/USBFTDILoopback/USBFTDILoopback.ino

@@ -5,12 +5,13 @@
 // Satisfy IDE, which only needs to see the include statment in the ino.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
+#include <SPI.h>
 #endif
 
 class FTDIAsync : public FTDIAsyncOper
 {
 public:
-    virtual uint8_t OnInit(FTDI *pftdi);
+    uint8_t OnInit(FTDI *pftdi);
 };
 
 uint8_t FTDIAsync::OnInit(FTDI *pftdi)
@@ -42,7 +43,9 @@ uint32_t next_time;
 void setup()
 {
   Serial.begin( 115200 );
+#if !defined(__MIPSEL__)
   while (!Serial); // Wait for serial port to connect - used on Leonardo, Teensy and other boards with built-in USB CDC serial connection
+#endif
   Serial.println("Start");
 
   if (Usb.Init() == -1)

examples/hub_demo/hub_demo.ino

@@ -3,6 +3,7 @@
 // Satisfy IDE, which only needs to see the include statment in the ino.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
+#include <SPI.h>
 #endif
 
 USB     Usb;
@@ -45,7 +46,9 @@ void PrintAddress(uint8_t addr)
 void setup()
 {
   Serial.begin( 115200 );
+#if !defined(__MIPSEL__)
   while (!Serial); // Wait for serial port to connect - used on Leonardo, Teensy and other boards with built-in USB CDC serial connection
+#endif
   Serial.println("Start");
 
   if (Usb.Init() == -1)
@@ -332,7 +335,7 @@ void printunkdescr( uint8_t* descr_ptr )
 
 
 /* Print a string from Program Memory directly to save RAM */
-void printProgStr(const prog_char str[])
+void printProgStr(prog_char str[])
 {
   char c;
   if(!str) return;

examples/max_LCD/max_LCD.ino

@@ -4,6 +4,11 @@
 // 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
 
 USB Usb;
 Max_LCD lcd(&Usb);

examples/pl2303/pl2303_gprs_terminal/pl2303_gprs_terminal.ino

@@ -7,12 +7,13 @@
 // Satisfy IDE, which only needs to see the include statment in the ino.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
+#include <SPI.h>
 #endif
 
 class PLAsyncOper : public CDCAsyncOper
 {
 public:
-    virtual uint8_t OnInit(ACM *pacm);
+    uint8_t OnInit(ACM *pacm);
 };
 
 uint8_t PLAsyncOper::OnInit(ACM *pacm)
@@ -50,7 +51,9 @@ PL2303       Pl(&Usb, &AsyncOper);
 void setup()
 {
   Serial.begin( 115200 );
+#if !defined(__MIPSEL__)
   while (!Serial); // Wait for serial port to connect - used on Leonardo, Teensy and other boards with built-in USB CDC serial connection
+#endif
   Serial.println("Start");
 
   if (Usb.Init() == -1)

examples/pl2303/pl2303_gps/pl2303_gps.ino

@@ -8,11 +8,12 @@
 // Satisfy IDE, which only needs to see the include statment in the ino.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
+#include <SPI.h>
 #endif
 
 class PLAsyncOper : public CDCAsyncOper {
 public:
-        virtual uint8_t OnInit(ACM *pacm);
+        uint8_t OnInit(ACM *pacm);
 };
 
 uint8_t PLAsyncOper::OnInit(ACM *pacm) {
@@ -49,7 +50,9 @@ uint32_t read_delay;
 
 void setup() {
         Serial.begin(115200);
+#if !defined(__MIPSEL__)
         while (!Serial); // Wait for serial port to connect - used on Leonardo, Teensy and other boards with built-in USB CDC serial connection
+#endif
         Serial.println("Start");
 
         if(Usb.Init() == -1)

examples/pl2303/pl2303_tinygps/pl2303_tinygps.ino

@@ -14,6 +14,7 @@
 // Satisfy IDE, which only needs to see the include statment in the ino.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
+#include <SPI.h>
 #endif
 
 /* This sample code demonstrates the normal use of a TinyGPS object.
@@ -24,7 +25,7 @@
 class PLAsyncOper : public CDCAsyncOper
 {
 public:
-    virtual uint8_t OnInit(ACM *pacm);
+    uint8_t OnInit(ACM *pacm);
 };
 
 uint8_t PLAsyncOper::OnInit(ACM *pacm)
@@ -68,7 +69,9 @@ void setup()
 {
 
   Serial.begin(115200);
+#if !defined(__MIPSEL__)
   while (!Serial); // Wait for serial port to connect - used on Leonardo, Teensy and other boards with built-in USB CDC serial connection
+#endif
 
   Serial.print("Testing TinyGPS library v. "); Serial.println(TinyGPS::library_version());
   Serial.println("by Mikal Hart");

examples/pl2303/pl2303_xbee_terminal/pl2303_xbee_terminal.ino

@@ -8,12 +8,13 @@
 // Satisfy IDE, which only needs to see the include statment in the ino.
 #ifdef dobogusinclude
 #include <spi4teensy3.h>
+#include <SPI.h>
 #endif
 
 class PLAsyncOper : public CDCAsyncOper
 {
 public:
-    virtual uint8_t OnInit(ACM *pacm);
+    uint8_t OnInit(ACM *pacm);
 };
 
 uint8_t PLAsyncOper::OnInit(ACM *pacm)
@@ -50,7 +51,9 @@ PL2303       Pl(&Usb, &AsyncOper);
 void setup()
 {
   Serial.begin( 115200 );
+#if !defined(__MIPSEL__)
   while (!Serial); // Wait for serial port to connect - used on Leonardo, Teensy and other boards with built-in USB CDC serial connection
+#endif
   Serial.println("Start");
 
   if (Usb.Init() == -1)

examples/testusbhostFAT/Arduino_Makefile_master

@@ -1 +1 @@
-Subproject commit 1edd5f46188a6c4b68d6f9120fa72359a12e38f1
+Subproject commit 94c560c854c7a1dfc35e9de9db05de1b202de6c6

examples/testusbhostFAT/RTClib

@@ -1 +1 @@
-Subproject commit b119b97e1484a08aebcf24e070113d78c82fb023
+Subproject commit c30fcdf1f112de581de7b145a97630539e5cff44

examples/testusbhostFAT/generic_storage

@@ -1 +1 @@
-Subproject commit 72b5bf467a1c2479ba7354ee4d864e382c167425
+Subproject commit 9233df8bc2cd0c16d363c8e298398b6eaefad257

examples/testusbhostFAT/testusbhostFAT.ino

@@ -80,14 +80,14 @@ USB Usb;
 
 volatile uint8_t current_state = 1;
 volatile uint8_t last_state = 0;
-volatile boolean fatready = false;
+volatile bool fatready = false;
-volatile boolean partsready = false;
+volatile bool partsready = false;
-volatile boolean notified = false;
+volatile bool notified = false;
-volatile boolean runtest = false;
+volatile bool runtest = false;
-volatile boolean usbon = false;
+volatile bool usbon = false;
 volatile uint32_t usbon_time;
-volatile boolean change = false;
+volatile bool change = false;
-volatile boolean reportlvl = false;
+volatile bool reportlvl = false;
 int cpart = 0;
 PCPartition *PT;
 
@@ -178,7 +178,7 @@ extern "C" {
 #endif
 
 void setup() {
-        boolean serr = false;
+        bool serr = false;
         for(int i = 0; i < _VOLUMES; i++) {
                 Fats[i] = NULL;
                 sto[i].private_data = new pvt_t;
@@ -454,14 +454,14 @@ void loop() {
                 }
                 // This is horrible, and needs to be moved elsewhere!
                 for(int B = 0; B < MAX_USB_MS_DRIVERS; B++) {
-                        if(!partsready && (UHS_USB_BulkOnly[B]->GetAddress() != NULL)) {
+                        if(!partsready && (UHS_USB_Storage[B]->GetAddress() != NULL)) {
 
                                 // Build a list.
-                                int ML = UHS_USB_BulkOnly[B]->GetbMaxLUN();
+                                int ML = UHS_USB_Storage[B]->GetbMaxLUN();
                                 //printf("MAXLUN = %i\r\n", ML);
                                 ML++;
                                 for(int i = 0; i < ML; i++) {
-                                        if(UHS_USB_BulkOnly[B]->LUNIsGood(i)) {
+                                        if(UHS_USB_Storage[B]->LUNIsGood(i)) {
                                                 partsready = true;
                                                 ((pvt_t *)(sto[i].private_data))->lun = i;
                                                 ((pvt_t *)(sto[i].private_data))->B = B;
@@ -470,8 +470,8 @@ void loop() {
                                                 sto[i].Status = *UHS_USB_BulkOnly_Status;
                                                 sto[i].Initialize = *UHS_USB_BulkOnly_Initialize;
                                                 sto[i].Commit = *UHS_USB_BulkOnly_Commit;
-                                                sto[i].TotalSectors = UHS_USB_BulkOnly[B]->GetCapacity(i);
+                                                sto[i].TotalSectors = UHS_USB_Storage[B]->GetCapacity(i);
-                                                sto[i].SectorSize = UHS_USB_BulkOnly[B]->GetSectorSize(i);
+                                                sto[i].SectorSize = UHS_USB_Storage[B]->GetSectorSize(i);
                                                 printf_P(PSTR("LUN:\t\t%u\r\n"), i);
                                                 printf_P(PSTR("Total Sectors:\t%08lx\t%lu\r\n"), sto[i].TotalSectors, sto[i].TotalSectors);
                                                 printf_P(PSTR("Sector Size:\t%04x\t\t%u\r\n"), sto[i].SectorSize, sto[i].SectorSize);
@@ -524,7 +524,7 @@ void loop() {
                         if(Fats[0] != NULL) {
                                 struct Pvt * p;
                                 p = ((struct Pvt *)(Fats[0]->storage->private_data));
-                                if(!UHS_USB_BulkOnly[p->B]->LUNIsGood(p->lun)) {
+                                if(!UHS_USB_Storage[p->B]->LUNIsGood(p->lun)) {
                                         // media change
 #if !defined(CORE_TEENSY) && defined(__AVR__)
                                         fadeAmount = 80;

examples/testusbhostFAT/xmem2

@@ -1 +1 @@
-Subproject commit 3b5455a20526208ad84215dcb40a51c8e000b507
+Subproject commit 77b033420485f7d3d35430c0e8d4d844aa894834

hexdump.h

@@ -36,7 +36,7 @@ public:
                 byteTotal = 0;
         };
 
-        virtual void Parse(const LEN_TYPE len, const uint8_t *pbuf, const OFFSET_TYPE &offset);
+        void Parse(const LEN_TYPE len, const uint8_t *pbuf, const OFFSET_TYPE &offset);
 };
 
 template <class BASE_CLASS, class LEN_TYPE, class OFFSET_TYPE>

hid.h

@@ -156,7 +156,7 @@ protected:
         void PrintEndpointDescriptor(const USB_ENDPOINT_DESCRIPTOR* ep_ptr);
         void PrintHidDescriptor(const USB_HID_DESCRIPTOR *pDesc);
 
-        virtual HIDReportParser* GetReportParser(uint8_t id);
+        virtual HIDReportParser* GetReportParser(uint8_t id) {};
 
 public:
 
@@ -166,7 +166,8 @@ public:
         const USB* GetUsb() {
                 return pUsb;
         };
-        virtual bool SetReportParser(uint8_t id, HIDReportParser *prs);
+
+        virtual bool SetReportParser(uint8_t id, HIDReportParser *prs) {};
 
         uint8_t SetProtocol(uint8_t iface, uint8_t protocol);
         uint8_t GetProtocol(uint8_t iface, uint8_t* dataptr);

hidboot.cpp

@@ -157,27 +157,6 @@ void KeyboardReportParser::Parse(HID *hid, bool is_rpt_id, uint8_t len, uint8_t
                 prevState.bInfo[i] = buf[i];
 };
 
-uint8_t KeyboardReportParser::HandleLockingKeys(HID *hid, uint8_t key) {
-        uint8_t old_keys = kbdLockingKeys.bLeds;
-
-        switch (key) {
-                case UHS_HID_BOOT_KEY_NUM_LOCK:
-                        kbdLockingKeys.kbdLeds.bmNumLock = ~kbdLockingKeys.kbdLeds.bmNumLock;
-                        break;
-                case UHS_HID_BOOT_KEY_CAPS_LOCK:
-                        kbdLockingKeys.kbdLeds.bmCapsLock = ~kbdLockingKeys.kbdLeds.bmCapsLock;
-                        break;
-                case UHS_HID_BOOT_KEY_SCROLL_LOCK:
-                        kbdLockingKeys.kbdLeds.bmScrollLock = ~kbdLockingKeys.kbdLeds.bmScrollLock;
-                        break;
-        }
-
-        if (old_keys != kbdLockingKeys.bLeds && hid)
-                return (hid->SetReport(0, 0/*hid->GetIface()*/, 2, 0, 1, &kbdLockingKeys.bLeds));
-
-        return 0;
-}
-
 const uint8_t KeyboardReportParser::numKeys[10] PROGMEM = {'!', '@', '#', '$', '%', '^', '&', '*', '(', ')'};
 const uint8_t KeyboardReportParser::symKeysUp[12] PROGMEM = {'_', '+', '{', '}', '|', '~', ':', '"', '~', '<', '>', '?'};
 const uint8_t KeyboardReportParser::symKeysLo[12] PROGMEM = {'-', '=', '[', ']', '\\', ' ', ';', '\'', '`', ',', '.', '/'};

hidboot.h

@@ -56,7 +56,7 @@ class MouseReportParser : public HIDReportParser {
         } prevState;
 
 public:
-        virtual void Parse(HID *hid, bool is_rpt_id, uint8_t len, uint8_t *buf);
+        void Parse(HID *hid, bool is_rpt_id, uint8_t len, uint8_t *buf);
 
 protected:
 
@@ -144,10 +144,30 @@ public:
                 kbdLockingKeys.bLeds = 0;
         };
 
-        virtual void Parse(HID *hid, bool is_rpt_id, uint8_t len, uint8_t *buf);
+        void Parse(HID *hid, bool is_rpt_id, uint8_t len, uint8_t *buf);
 
 protected:
-        virtual uint8_t HandleLockingKeys(HID* hid, uint8_t key);
+
+        virtual uint8_t HandleLockingKeys(HID* hid, uint8_t key) {
+                uint8_t old_keys = kbdLockingKeys.bLeds;
+
+                switch(key) {
+                        case UHS_HID_BOOT_KEY_NUM_LOCK:
+                                kbdLockingKeys.kbdLeds.bmNumLock = ~kbdLockingKeys.kbdLeds.bmNumLock;
+                                break;
+                        case UHS_HID_BOOT_KEY_CAPS_LOCK:
+                                kbdLockingKeys.kbdLeds.bmCapsLock = ~kbdLockingKeys.kbdLeds.bmCapsLock;
+                                break;
+                        case UHS_HID_BOOT_KEY_SCROLL_LOCK:
+                                kbdLockingKeys.kbdLeds.bmScrollLock = ~kbdLockingKeys.kbdLeds.bmScrollLock;
+                                break;
+                }
+
+                if(old_keys != kbdLockingKeys.bLeds && hid)
+                        return (hid->SetReport(0, 0/*hid->GetIface()*/, 2, 0, 1, &kbdLockingKeys.bLeds));
+
+                return 0;
+        };
 
         virtual void OnControlKeysChanged(uint8_t before, uint8_t after) {
         };
@@ -204,22 +224,27 @@ public:
         };
 
         // USBDeviceConfig implementation
-        virtual uint8_t Init(uint8_t parent, uint8_t port, bool lowspeed);
+        uint8_t Init(uint8_t parent, uint8_t port, bool lowspeed);
-        virtual uint8_t Release();
+        uint8_t Release();
-        virtual uint8_t Poll();
+        uint8_t Poll();
 
         virtual uint8_t GetAddress() {
                 return bAddress;
         };
 
+        virtual bool isReady() {
+                return bPollEnable;
+        };
+
         // UsbConfigXtracter implementation
+        // Method should be defined here if virtual.
         virtual void EndpointXtract(uint8_t conf, uint8_t iface, uint8_t alt, uint8_t proto, const USB_ENDPOINT_DESCRIPTOR *ep);
 
-        virtual boolean DEVCLASSOK(uint8_t klass) {
+        virtual bool DEVCLASSOK(uint8_t klass) {
                 return (klass == USB_CLASS_HID);
         }
 
-        virtual boolean DEVSUBCLASSOK(uint8_t subklass) {
+        virtual bool DEVSUBCLASSOK(uint8_t subklass) {
                 return (subklass == BOOT_PROTOCOL);
         }
 };

hidescriptorparser.h

@@ -111,6 +111,7 @@ protected:
 
         uint16_t totalSize; // Report size in bits
 
+        // Method should be defined here if virtual.
         virtual uint8_t ParseItem(uint8_t **pp, uint16_t *pcntdn);
 
         UsagePageFunc pfUsage;
@@ -132,7 +133,7 @@ public:
                 theSkipper.Initialize(&theBuffer);
         };
 
-        virtual void Parse(const uint16_t len, const uint8_t *pbuf, const uint16_t &offset);
+        void Parse(const uint16_t len, const uint8_t *pbuf, const uint16_t &offset);
 
         enum {
                 enErrorSuccess = 0
@@ -156,6 +157,7 @@ class ReportDescParser2 : public ReportDescParserBase {
         uint8_t bLen; // Report length
 
 protected:
+        // Method should be defined here if virtual.
         virtual uint8_t ParseItem(uint8_t **pp, uint16_t *pcntdn);
 
 public:
@@ -167,6 +169,7 @@ public:
 
 class UniversalReportParser : public HIDReportParser {
 public:
+        // Method should be defined here if virtual.
         virtual void Parse(HID *hid, bool is_rpt_id, uint8_t len, uint8_t *buf);
 };
 

hiduniversal.cpp

@@ -418,3 +418,9 @@ uint8_t HIDUniversal::Poll() {
         }
         return rcode;
 }
+
+
+//Send a report to interrupt out endpoint. This is NOT SetReport() request!
+uint8_t HIDUniversal::SndRpt(uint16_t nbytes, uint8_t *dataptr) {
+        return pUsb->outTransfer(bAddress, epInfo[epInterruptOutIndex].epAddr, nbytes, dataptr);
+}

hiduniversal.h

@@ -69,7 +69,7 @@ protected:
         uint16_t PID, VID; // PID and VID of connected device
 
         // HID implementation
-        virtual HIDReportParser* GetReportParser(uint8_t id);
+        HIDReportParser* GetReportParser(uint8_t id);
 
         virtual uint8_t OnInitSuccessful() {
                 return 0;
@@ -83,12 +83,12 @@ public:
         HIDUniversal(USB *p);
 
         // HID implementation
-        virtual bool SetReportParser(uint8_t id, HIDReportParser *prs);
+        bool SetReportParser(uint8_t id, HIDReportParser *prs);
 
         // USBDeviceConfig implementation
-        virtual uint8_t Init(uint8_t parent, uint8_t port, bool lowspeed);
+        uint8_t Init(uint8_t parent, uint8_t port, bool lowspeed);
-        virtual uint8_t Release();
+        uint8_t Release();
-        virtual uint8_t Poll();
+        uint8_t Poll();
 
         virtual uint8_t GetAddress() {
                 return bAddress;
@@ -99,7 +99,10 @@ public:
         };
 
         // UsbConfigXtracter implementation
-        virtual void EndpointXtract(uint8_t conf, uint8_t iface, uint8_t alt, uint8_t proto, const USB_ENDPOINT_DESCRIPTOR *ep);
+        void EndpointXtract(uint8_t conf, uint8_t iface, uint8_t alt, uint8_t proto, const USB_ENDPOINT_DESCRIPTOR *ep);
+
+        // Send report - do not mix with SetReport()!
+        uint8_t SndRpt(uint16_t nbytes, uint8_t *dataptr);
 };
 
 #endif // __HIDUNIVERSAL_H__

library.json

@@ -0,0 +1,46 @@
+{
+  "name": "USB-Host-Shield-20",
+  "keywords": "usb, host, ftdi, adk, acm, pl2303, hid, bluetooth, spp, ps3, ps4, buzz, xbox, wii, mass storage",
+  "description": "Revision 2.0 of MAX3421E-based USB Host Shield Library",
+  "authors":
+  [
+    {
+      "name": "Oleg Mazurov",
+      "email": "mazurov@circuitsathome.com",
+      "url": "http://www.circuitsathome.com",
+      "maintainer": true
+    },
+    {
+      "name": "Alexei Glushchenko",
+      "email": "alex-gl@mail.ru"
+    },
+    {
+      "name": "Kristian Lauszus",
+      "email": "kristianl@tkjelectronics.com",
+      "url": "http://tkjelectronics.com",
+      "maintainer": true
+    },
+    {
+      "name": "Andrew Kroll",
+      "email": "xxxajk@gmail.com",
+      "maintainer": true
+    }
+  ],
+  "repository":
+  {
+    "type": "git",
+    "url": "https://github.com/felis/USB_Host_Shield_2.0.git"
+  },
+  "examples":
+  [
+  	"examples/*/*.ino",
+  	"examples/*/*/*.ino"
+  ],
+  "frameworks": "arduino",
+  "platforms":
+  [
+    "atmelavr",
+    "teensy",
+    "atmelsam"
+  ]
+}

masstorage.cpp

@@ -67,7 +67,7 @@ bool BulkOnly::LUNIsGood(uint8_t lun) {
  * @param lun Logical Unit Number
  * @return cached status of write protect switch
  */
-boolean BulkOnly::WriteProtected(uint8_t lun) {
+bool BulkOnly::WriteProtected(uint8_t lun) {
         return WriteOk[lun];
 }
 
@@ -599,7 +599,7 @@ uint8_t BulkOnly::Release() {
  * @param lun Logical Unit Number
  * @return true if LUN is ready for use.
  */
-boolean BulkOnly::CheckLUN(uint8_t lun) {
+bool BulkOnly::CheckLUN(uint8_t lun) {
         uint8_t rcode;
         Capacity capacity;
         for(uint8_t i = 0; i < 8; i++) capacity.data[i] = 0;
@@ -1020,11 +1020,11 @@ uint8_t BulkOnly::Transaction(CommandBlockWrapper *pcbw, uint16_t buf_size, void
         printf("Transfersize %i\r\n", bytes);
         delay(1000);
 
-        boolean callback = (flags & MASS_TRANS_FLG_CALLBACK) == MASS_TRANS_FLG_CALLBACK;
+        bool callback = (flags & MASS_TRANS_FLG_CALLBACK) == MASS_TRANS_FLG_CALLBACK;
 #else
         uint16_t bytes = buf_size;
 #endif
-        boolean write = (pcbw->bmCBWFlags & MASS_CMD_DIR_IN) != MASS_CMD_DIR_IN;
+        bool write = (pcbw->bmCBWFlags & MASS_CMD_DIR_IN) != MASS_CMD_DIR_IN;
         uint8_t ret = 0;
         uint8_t usberr;
         CommandStatusWrapper csw; // up here, we allocate ahead to save cpu cycles.

masstorage.h

@@ -507,7 +507,7 @@ public:
                 return bTheLUN; // Active LUN
         }
 
-        boolean WriteProtected(uint8_t lun);
+        bool WriteProtected(uint8_t lun);
         uint8_t MediaCTL(uint8_t lun, uint8_t ctl);
         uint8_t Read(uint8_t lun, uint32_t addr, uint16_t bsize, uint8_t blocks, uint8_t *buf);
         uint8_t Read(uint8_t lun, uint32_t addr, uint16_t bsize, uint8_t blocks, USBReadParser *prs);
@@ -519,20 +519,20 @@ public:
         uint16_t GetSectorSize(uint8_t lun);
 
         // USBDeviceConfig implementation
-        virtual uint8_t Init(uint8_t parent, uint8_t port, bool lowspeed);
+        uint8_t Init(uint8_t parent, uint8_t port, bool lowspeed);
-        virtual uint8_t ConfigureDevice(uint8_t parent, uint8_t port, bool lowspeed);
+        uint8_t ConfigureDevice(uint8_t parent, uint8_t port, bool lowspeed);
 
-        virtual uint8_t Release();
+        uint8_t Release();
-        virtual uint8_t Poll();
+        uint8_t Poll();
 
         virtual uint8_t GetAddress() {
                 return bAddress;
         };
 
         // UsbConfigXtracter implementation
-        virtual void EndpointXtract(uint8_t conf, uint8_t iface, uint8_t alt, uint8_t proto, const USB_ENDPOINT_DESCRIPTOR *ep);
+        void EndpointXtract(uint8_t conf, uint8_t iface, uint8_t alt, uint8_t proto, const USB_ENDPOINT_DESCRIPTOR *ep);
 
-        virtual boolean DEVCLASSOK(uint8_t klass) {
+        virtual bool DEVCLASSOK(uint8_t klass) {
                 return (klass == USB_CLASS_MASS_STORAGE);
         }
 
@@ -551,7 +551,7 @@ private:
         uint8_t ReadCapacity10(uint8_t lun, uint8_t *buf);
         void ClearAllEP();
         void CheckMedia();
-        boolean CheckLUN(uint8_t lun);
+        bool CheckLUN(uint8_t lun);
         uint8_t Page3F(uint8_t lun);
         bool IsValidCBW(uint8_t size, uint8_t *pcbw);
         bool IsMeaningfulCBW(uint8_t size, uint8_t *pcbw);

max_LCD.h

@@ -88,10 +88,10 @@ public:
         void command(uint8_t);
 
 #if defined(ARDUINO) && ARDUINO >=100
-        virtual size_t write(uint8_t);
+        size_t write(uint8_t);
         using Print::write;
 #else
-        virtual void write(uint8_t);
+        void write(uint8_t);
 #endif
 
 private:

settings.h

@@ -78,15 +78,7 @@ e-mail   :  support@circuitsathome.com
 // No user serviceable parts below this line.
 // DO NOT change anything below here unless you are a developer!
 
-#if defined(ARDUINO) && ARDUINO >=100
+#include "version_helper.h"
-#include <Arduino.h>
-#else
-#include <WProgram.h>
-#include <pins_arduino.h>
-#include <avr/pgmspace.h>
-#include <avr/io.h>
-#define F(str) (str)
-#endif
 
 #if defined(__GNUC__) && defined(__AVR__)
 #ifndef GCC_VERSION
@@ -137,8 +129,10 @@ e-mail   :  support@circuitsathome.com
 #define USING_SPI4TEENSY3 0
 #endif
 
-#if defined(ARDUINO_SAM_DUE) && defined(__SAM3X8E__)
+#if (defined(ARDUINO_SAM_DUE) && defined(__SAM3X8E__)) || defined(RBL_NRF51822)
-#include <SPI.h> // Use the Arduino SPI library for the Arduino Due
+#include <SPI.h> // Use the Arduino SPI library for the Arduino Due and RedBearLab nRF51822
+#endif
+#if defined(__PIC32MX__) || defined(__PIC32MZ__)
+#include <../../../../hardware/pic32/libraries/SPI/SPI.h> // Hack to use the SPI library
 #endif
-
 #endif	/* SETTINGS_H */

usbhost.h

@@ -27,6 +27,7 @@ e-mail   :  support@circuitsathome.com
 #include <sys/types.h>
 #endif
 
+
 /* SPI initialization */
 template< typename SPI_CLK, typename SPI_MOSI, typename SPI_MISO, typename SPI_SS > class SPi {
 public:
@@ -39,12 +40,23 @@ public:
                 SPI_SS::SetDirWrite();
                 SPI_SS::Set();
         }
-#elif defined(ARDUINO_SAM_DUE) && defined(__SAM3X8E__)
+#elif !defined(SPDR)
         static void init() {
                 SPI_SS::SetDirWrite();
                 SPI_SS::Set();
                 SPI.begin();
+#if defined(__MIPSEL__)
+                SPI.setClockDivider(1);
+#else
                 SPI.setClockDivider(4); // Set speed to 84MHz/4=21MHz - the MAX3421E can handle up to 26MHz
+#endif
+        }
+#elif defined(RBL_NRF51822)
+        static void init() {
+                SPI_SS::SetDirWrite();
+                SPI_SS::Set();
+                SPI.begin();
+                // SPI.setFrequency(SPI_FREQUENCY_8M);
         }
 #else
         static void init() {
@@ -74,6 +86,10 @@ typedef SPi< Pb7, Pb5, Pb6, Pb4 > spi;
 typedef SPi< P13, P11, P12, P10 > spi;
 #elif defined(ARDUINO_SAM_DUE) && defined(__SAM3X8E__)
 typedef SPi< P76, P75, P74, P10 > spi;
+#elif defined(RBL_NRF51822)
+typedef SPi< P16, P18, P17, P10 > spi;
+#elif defined(__MIPSEL__)
+typedef SPi< P13, P11, P12, P10 > spi;
 #else
 #error "No SPI entry in usbhost.h"
 #endif
@@ -135,7 +151,7 @@ void MAX3421e< SPI_SS, INTR >::regWr(uint8_t reg, uint8_t data) {
         c[0] = reg | 0x02;
         c[1] = data;
         spi4teensy3::send(c, 2);
-#elif defined(ARDUINO_SAM_DUE) && defined(__SAM3X8E__)
+#elif !defined(SPDR)
         SPI.transfer(reg | 0x02);
         SPI.transfer(data);
 #else
@@ -159,7 +175,7 @@ uint8_t* MAX3421e< SPI_SS, INTR >::bytesWr(uint8_t reg, uint8_t nbytes, uint8_t*
         spi4teensy3::send(reg | 0x02);
         spi4teensy3::send(data_p, nbytes);
         data_p += nbytes;
-#elif defined(ARDUINO_SAM_DUE) && defined(__SAM3X8E__)
+#elif !defined(SPDR)
         SPI.transfer(reg | 0x02);
         while(nbytes) {
                 SPI.transfer(*data_p);
@@ -201,7 +217,7 @@ uint8_t MAX3421e< SPI_SS, INTR >::regRd(uint8_t reg) {
         spi4teensy3::send(reg);
         uint8_t rv = spi4teensy3::receive();
         SPI_SS::Set();
-#elif defined(ARDUINO_SAM_DUE) && defined(__SAM3X8E__)
+#elif !defined(SPDR)
         SPI.transfer(reg);
         uint8_t rv = SPI.transfer(0);
         SPI_SS::Set();
@@ -227,7 +243,7 @@ uint8_t* MAX3421e< SPI_SS, INTR >::bytesRd(uint8_t reg, uint8_t nbytes, uint8_t*
         spi4teensy3::send(reg);
         spi4teensy3::receive(data_p, nbytes);
         data_p += nbytes;
-#elif defined(ARDUINO_SAM_DUE) && defined(__SAM3X8E__)
+#elif !defined(SPDR)
         SPI.transfer(reg);
         while(nbytes) {
             *data_p++ = SPI.transfer(0);

usbhub.h

@@ -191,16 +191,16 @@ public:
 
         void PrintHubStatus();
 
-        virtual uint8_t Init(uint8_t parent, uint8_t port, bool lowspeed);
+        uint8_t Init(uint8_t parent, uint8_t port, bool lowspeed);
-        virtual uint8_t Release();
+        uint8_t Release();
-        virtual uint8_t Poll();
+        uint8_t Poll();
-        virtual void ResetHubPort(uint8_t port);
+        void ResetHubPort(uint8_t port);
 
         virtual uint8_t GetAddress() {
                 return bAddress;
         };
 
-        virtual boolean DEVCLASSOK(uint8_t klass) {
+        virtual bool DEVCLASSOK(uint8_t klass) {
                 return (klass == 0x09);
         }
 

version_helper.h

@@ -0,0 +1,222 @@
+/* Copyright (C) 2011 Circuits At Home, LTD. All rights reserved.
+
+This software may be distributed and modified under the terms of the GNU
+General Public License version 2 (GPL2) as published by the Free Software
+Foundation and appearing in the file GPL2.TXT included in the packaging of
+this file. Please note that GPL2 Section 2[b] requires that all works based
+on this software must also be made publicly available under the terms of
+the GPL2 ("Copyleft").
+
+Contact information
+-------------------
+
+Circuits At Home, LTD
+Web      :  http://www.circuitsathome.com
+e-mail   :  support@circuitsathome.com
+ */
+
+/*
+ * Universal Arduino(tm) "IDE" fixups.
+ * Includes fixes for versions as low as 0023, used by Digilent.
+ */
+
+#if defined(ARDUINO) && ARDUINO >=100
+#include <Arduino.h>
+#else
+#include <WProgram.h>
+#include <pins_arduino.h>
+#ifdef __AVR__
+#include <avr/pgmspace.h>
+#include <avr/io.h>
+#else
+#endif
+#endif
+
+#ifndef __PGMSPACE_H_
+#define __PGMSPACE_H_ 1
+
+#include <inttypes.h>
+
+#ifndef PROGMEM
+#define PROGMEM
+#endif
+#ifndef PGM_P
+#define PGM_P  const char *
+#endif
+#ifndef PSTR
+#define PSTR(str) (str)
+#endif
+#ifndef F
+#define F(str) (str)
+#endif
+#ifndef _SFR_BYTE
+#define _SFR_BYTE(n) (n)
+#endif
+
+#ifndef prog_void
+typedef void prog_void;
+#endif
+#ifndef prog_char
+typedef char prog_char;
+#endif
+#ifndef prog_uchar
+typedef unsigned char prog_uchar;
+#endif
+#ifndef prog_int8_t
+typedef int8_t prog_int8_t;
+#endif
+#ifndef prog_uint8_t
+typedef uint8_t prog_uint8_t;
+#endif
+#ifndef prog_int16_t
+typedef int16_t prog_int16_t;
+#endif
+#ifndef prog_uint16_t
+typedef uint16_t prog_uint16_t;
+#endif
+#ifndef prog_int32_t
+typedef int32_t prog_int32_t;
+#endif
+#ifndef prog_uint32_t
+typedef uint32_t prog_uint32_t;
+#endif
+
+#ifndef memchr_P
+#define memchr_P(str, c, len) memchr((str), (c), (len))
+#endif
+#ifndef memcmp_P
+#define memcmp_P(a, b, n) memcmp((a), (b), (n))
+#endif
+#ifndef memcpy_P
+#define memcpy_P(dest, src, num) memcpy((dest), (src), (num))
+#endif
+#ifndef memmem_P
+#define memmem_P(a, alen, b, blen) memmem((a), (alen), (b), (blen))
+#endif
+#ifndef memrchr_P
+#define memrchr_P(str, val, len) memrchr((str), (val), (len))
+#endif
+#ifndef strcat_P
+#define strcat_P(dest, src) strcat((dest), (src))
+#endif
+#ifndef strchr_P
+#define strchr_P(str, c) strchr((str), (c))
+#endif
+#ifndef strchrnul_P
+#define strchrnul_P(str, c) strchrnul((str), (c))
+#endif
+#ifndef strcmp_P
+#define strcmp_P(a, b) strcmp((a), (b))
+#endif
+#ifndef strcpy_P
+#define strcpy_P(dest, src) strcpy((dest), (src))
+#endif
+#ifndef strcasecmp_P
+#define strcasecmp_P(a, b) strcasecmp((a), (b))
+#endif
+#ifndef strcasestr_P
+#define strcasestr_P(a, b) strcasestr((a), (b))
+#endif
+#ifndef strlcat_P
+#define strlcat_P(dest, src, len) strlcat((dest), (src), (len))
+#endif
+#ifndef strlcpy_P
+#define strlcpy_P(dest, src, len) strlcpy((dest), (src), (len))
+#endif
+#ifndef strlen_P
+#define strlen_P(s) strlen((const char *)(s))
+#endif
+#ifndef strnlen_P
+#define strnlen_P(str, len) strnlen((str), (len))
+#endif
+#ifndef strncmp_P
+#define strncmp_P(a, b, n) strncmp((a), (b), (n))
+#endif
+#ifndef strncasecmp_P
+#define strncasecmp_P(a, b, n) strncasecmp((a), (b), (n))
+#endif
+#ifndef strncat_P
+#define strncat_P(a, b, n) strncat((a), (b), (n))
+#endif
+#ifndef strncpy_P
+#define strncpy_P(a, b, n) strncmp((a), (b), (n))
+#endif
+#ifndef strpbrk_P
+#define strpbrk_P(str, chrs) strpbrk((str), (chrs))
+#endif
+#ifndef strrchr_P
+#define strrchr_P(str, c) strrchr((str), (c))
+#endif
+#ifndef strsep_P
+#define strsep_P(strp, delim) strsep((strp), (delim))
+#endif
+#ifndef strspn_P
+#define strspn_P(str, chrs) strspn((str), (chrs))
+#endif
+#ifndef strstr_P
+#define strstr_P(a, b) strstr((a), (b))
+#endif
+#ifndef sprintf_P
+#define sprintf_P(s, ...) sprintf((s), __VA_ARGS__)
+#endif
+#ifndef vfprintf_P
+#define vfprintf_P(s, ...) vfprintf((s), __VA_ARGS__)
+#endif
+#ifndef printf_P
+#define printf_P(...) printf(__VA_ARGS__)
+#endif
+#ifndef snprintf_P
+#define snprintf_P(s, n, ...) ((s), (n), __VA_ARGS__)
+#endif
+#ifndef vsprintf_P
+#define vsprintf_P(s, ...) ((s),__VA_ARGS__)
+#endif
+#ifndef vsnprintf_P
+#define vsnprintf_P(s, n, ...) ((s), (n),__VA_ARGS__)
+#endif
+#ifndef fprintf_P
+#define fprintf_P(s, ...) ((s), __VA_ARGS__)
+#endif
+
+#ifndef pgm_read_byte
+#define pgm_read_byte(addr) (*(const unsigned char *)(addr))
+#endif
+#ifndef pgm_read_word
+#define pgm_read_word(addr) (*(const unsigned short *)(addr))
+#endif
+#ifndef pgm_read_dword
+#define pgm_read_dword(addr) (*(const unsigned long *)(addr))
+#endif
+#ifndef pgm_read_float
+#define pgm_read_float(addr) (*(const float *)(addr))
+#endif
+
+#ifndef pgm_read_byte_near
+#define pgm_read_byte_near(addr) pgm_read_byte(addr)
+#endif
+#ifndef pgm_read_word_near
+#define pgm_read_word_near(addr) pgm_read_word(addr)
+#endif
+#ifndef pgm_read_dword_near
+#define pgm_read_dword_near(addr) pgm_read_dword(addr)
+#endif
+#ifndef pgm_read_float_near
+#define pgm_read_float_near(addr) pgm_read_float(addr)
+#endif
+#ifndef pgm_read_byte_far
+#define pgm_read_byte_far(addr) pgm_read_byte(addr)
+#endif
+#ifndef pgm_read_word_far
+#define pgm_read_word_far(addr) pgm_read_word(addr)
+#endif
+#ifndef pgm_read_dword_far
+#define pgm_read_dword_far(addr) pgm_read_dword(addr)
+#endif
+#ifndef pgm_read_float_far
+#define pgm_read_float_far(addr) pgm_read_float(addr)
+#endif
+
+#ifndef pgm_read_pointer
+#define pgm_read_pointer
+#endif
+#endif