Merge branch 'master' of github.com:felis/USB_Host_Shield_2.0 into xxxajk

Author: xxxajk

BTD.cpp

@@ -720,7 +720,7 @@ void BTD::HCI_task() {
                                 if(pairWithWii)
                                         Notify(PSTR("\r\nWII Wii(&Btd);"), 0x80);
                                 else
-                                        Notify(PSTR("\r\nBTHID hid(&Btd);"), 0x80);
+                                        Notify(PSTR("\r\nBTHID bthid(&Btd);"), 0x80);
 
                                 Notify(PSTR("\r\nAnd then press any button on the "), 0x80);
                                 if(pairWithWii)

PS4Parser.h

@@ -81,6 +81,14 @@ struct touchpadXY {
         } __attribute__((packed)) finger[2]; // 0 = first finger, 1 = second finger
 } __attribute__((packed));
 
+struct PS4Status {
+        uint8_t battery : 4;
+        uint8_t usb : 1;
+        uint8_t audio : 1;
+        uint8_t mic : 1;
+        uint8_t unknown : 1; // Extension port?
+} __attribute__((packed));
+
 struct PS4Data {
         /* Button and joystick values */
         uint8_t hatValue[4];
@@ -92,8 +100,11 @@ struct PS4Data {
         int16_t gyroY, gyroZ, gyroX;
         int16_t accX, accZ, accY;
 
+        uint8_t dummy2[5];
+        PS4Status status;
+        uint8_t dummy3[3];
+
         /* The rest is data for the touchpad */
-        uint8_t dummy2[9]; // Byte 5 looks like some kind of status (maybe battery status), bit 1 of byte 8 is set every time a finger is moving around the touchpad
         touchpadXY xy[3]; // It looks like it sends out three coordinates each time, this might be because the microcontroller inside the PS4 controller is much faster than the Bluetooth connection.
                           // The last data is read from the last position in the array while the oldest measurement is from the first position.
                           // The first position will also keep it's value after the finger is released, while the other two will set them to zero.
@@ -245,6 +256,38 @@ class PS4Parser {
                 }
         };
 
+        /**
+         * Return the battery level of the PS4 controller.
+         * @return The battery level in the range 0-15.
+         */
+        uint8_t getBatteryLevel() {
+                return ps4Data.status.battery;
+        };
+
+        /**
+         * Use this to check if an USB cable is connected to the PS4 controller.
+         * @return Returns true if an USB cable is connected.
+         */
+        bool getUsbStatus() {
+                return ps4Data.status.usb;
+        };
+
+        /**
+         * Use this to check if an audio jack cable is connected to the PS4 controller.
+         * @return Returns true if an audio jack cable is connected.
+         */
+        bool getAudioStatus() {
+                return ps4Data.status.audio;
+        };
+
+        /**
+         * Use this to check if a microphone is connected to the PS4 controller.
+         * @return Returns true if a microphone is connected.
+         */
+        bool getMicStatus() {
+                return ps4Data.status.mic;
+        };
+
         /** Turn both rumble and the LEDs off. */
         void setAllOff() {
                 setRumbleOff();

README.md

@@ -122,11 +122,11 @@ It enables me to see the Bluetooth communication between my Mac and any device.
 
 The PS4BT library is split up into the [PS4BT](PS4BT.h) and the [PS4USB](PS4USB.h) library. These allow you to use the Sony PS4 controller via Bluetooth and USB.
 
-The [PS4BT.ino](examples/Bluetooth/PS4BT/PS4BT.ino) and [PS4USB.ino](examples/PS4USB/PS4USB.ino) examples shows how to easily read the buttons, joysticks, touchpad and IMU on the controller via Bluetooth and USB respectively. It is also possible to control the rumble and light on the controller.
+The [PS4BT.ino](examples/Bluetooth/PS4BT/PS4BT.ino) and [PS4USB.ino](examples/PS4USB/PS4USB.ino) examples shows how to easily read the buttons, joysticks, touchpad and IMU on the controller via Bluetooth and USB respectively. It is also possible to control the rumble and light on the controller and get the battery level.
 
 Before you can use the PS4 controller via Bluetooth you will need to pair with it.
 
-Simply create the PS4BT instance like so: ```PS4BT PS4(&Btd, PAIR);``` and then hold down the PS and Share button at the same time, the PS4 controller will then start to blink rapidly indicating that it is in paring mode.
+Simply create the PS4BT instance like so: ```PS4BT PS4(&Btd, PAIR);``` and then hold down the Share button and then hold down the PS without releasing the Share button. The PS4 controller will then start to blink rapidly indicating that it is in paring mode.
 
 It should then automatically pair the dongle with your controller. This only have to be done once.
 
@@ -138,9 +138,11 @@ Also check out this excellent Wiki by Frank Zhao about the PS4 controller: <http
 
 These libraries consist of the [PS3BT](PS3BT.cpp) and [PS3USB](PS3USB.cpp). These libraries allows you to use a Dualshock 3, Navigation or a Motion controller with the USB Host Shield both via Bluetooth and USB.
 
-In order to use your Playstation controller via Bluetooth you have to set the Bluetooth address of the dongle internally to your PS3 Controller. This can be achieved by plugging the controller in via USB and letting the library set it automatically.
+In order to use your Playstation controller via Bluetooth you have to set the Bluetooth address of the dongle internally to your PS3 Controller. This can be achieved by first plugging in the Bluetooth dongle and wait a few seconds. Now plug in the controller via USB and wait until the LEDs start to flash. The library has now written the Bluetooth address of the dongle to the PS3 controller.
 
-__Note:__ To obtain the address you have to plug in the Bluetooth dongle before connecting the controller, or alternatively you could set it in code like so: [PS3BT.ino#L20](examples/Bluetooth/PS3BT/PS3BT.ino#L20).
+Finally simply plug in the Bluetooth dongle again and press PS on the PS3 controller. After a few seconds it should be connected to the dongle and ready to use.
+
+__Note:__ You will have to plug in the Bluetooth dongle before connecting the controller, as the library needs to read the address of the dongle. Alternatively you could set it in code like so: [PS3BT.ino#L20](examples/Bluetooth/PS3BT/PS3BT.ino#L20).
 
 For more information about the PS3 protocol see the official wiki: <https://github.com/felis/USB_Host_Shield_2.0/wiki/PS3-Information>.
 

XBOXRECV.cpp

@@ -514,9 +514,9 @@ void XBOXRECV::setLedRaw(uint8_t value, uint8_t controller) {
 
 void XBOXRECV::setLedOn(LEDEnum led, uint8_t controller) {
         if(led == OFF)
-                setLedRaw(0);
+                setLedRaw(0, controller);
         else if(led != ALL) // All LEDs can't be on a the same time
-                setLedRaw(pgm_read_byte(&XBOX_LEDS[(uint8_t)led]) + 4);
+                setLedRaw(pgm_read_byte(&XBOX_LEDS[(uint8_t)led]) + 4, controller);
 }
 
 void XBOXRECV::setLedBlink(LEDEnum led, uint8_t controller) {

examples/Bluetooth/PS4BT/PS4BT.ino

@@ -25,6 +25,7 @@ PS4BT PS4(&Btd, PAIR);
 //PS4BT PS4(&Btd);
 
 boolean printAngle, printTouch;
+uint8_t oldL2Value, oldR2Value;
 
 void setup() {
   Serial.begin(115200);
@@ -56,28 +57,46 @@ void loop() {
       Serial.print(F("\tR2: "));
       Serial.print(PS4.getAnalogButton(R2));
     }
+    if (PS4.getAnalogButton(L2) != oldL2Value || PS4.getAnalogButton(R2) != oldR2Value) // Only write value if it's different
+      PS4.setRumbleOn(PS4.getAnalogButton(L2), PS4.getAnalogButton(R2));
+    oldL2Value = PS4.getAnalogButton(L2);
+    oldR2Value = PS4.getAnalogButton(R2);
+
     if (PS4.getButtonClick(PS)) {
       Serial.print(F("\r\nPS"));
       PS4.disconnect();
     }
     else {
-      if (PS4.getButtonClick(TRIANGLE))
+      if (PS4.getButtonClick(TRIANGLE)) {
         Serial.print(F("\r\nTraingle"));
-      if (PS4.getButtonClick(CIRCLE))
+        PS4.setRumbleOn(RumbleLow);
+      }
+      if (PS4.getButtonClick(CIRCLE)) {
         Serial.print(F("\r\nCircle"));
-      if (PS4.getButtonClick(CROSS))
+        PS4.setRumbleOn(RumbleHigh);
+      }
+      if (PS4.getButtonClick(CROSS)) {
         Serial.print(F("\r\nCross"));
-      if (PS4.getButtonClick(SQUARE))
+        PS4.setLedFlash(10, 10); // Set it to blink rapidly
+      }
+      if (PS4.getButtonClick(SQUARE)) {
         Serial.print(F("\r\nSquare"));
+        PS4.setLedFlash(0, 0); // Turn off blinking
+      }
 
-      if (PS4.getButtonClick(UP))
+      if (PS4.getButtonClick(UP)) {
         Serial.print(F("\r\nUp"));
-      if (PS4.getButtonClick(RIGHT))
+        PS4.setLed(Red);
+      } if (PS4.getButtonClick(RIGHT)) {
         Serial.print(F("\r\nRight"));
-      if (PS4.getButtonClick(DOWN))
+        PS4.setLed(Blue);
+      } if (PS4.getButtonClick(DOWN)) {
         Serial.print(F("\r\nDown"));
-      if (PS4.getButtonClick(LEFT))
+        PS4.setLed(Yellow);
+      } if (PS4.getButtonClick(LEFT)) {
         Serial.print(F("\r\nLeft"));
+        PS4.setLed(Green);
+      }
 
       if (PS4.getButtonClick(L1))
         Serial.print(F("\r\nL1"));

examples/Bluetooth/SPP/SPP.ino

@@ -16,8 +16,8 @@ USB Usb;
 
 BTD Btd(&Usb); // You have to create the Bluetooth Dongle instance like so
 /* You can create the instance of the class in two ways */
-SPP SerialBT(&Btd); // This will set the name to the defaults: "Arduino" and the pin to "1234"
-//SPP SerialBT(&Btd, "Lauszus's Arduino","0000"); // You can also set the name and pin 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;