specchioriflesso/USB_Host_Shield_2.0
1
Fork 0
mirror of https://github.com/felis/USB_Host_Shield_2.0.git synced 2024-03-22 11:31:26 +01:00
Code Issues Projects Releases Packages Wiki Activity

Updated some comments and some other minor things

Browse source
This commit is contained in:
Kristian Lauszus 2014-01-19 16:58:29 +01:00
parent 06b859bb7f
commit e781d6c554
5 changed files with 111 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
BTHID.h
View file

@ -25,7 +25,7 @@
#define MOUSE_PARSER_ID 1 #define MOUSE_PARSER_ID 1
#define NUM_PARSERS 2 #define NUM_PARSERS 2
/** This BluetoothService class implements support for the HID keyboard and mice. */ /** This BluetoothService class implements support for Bluetooth HID devices. */
class BTHID : public BluetoothService { class BTHID : public BluetoothService {
public: public:
/** /**

32
PS4BT.h
View file

@ -29,13 +29,30 @@ class PS4BT : public BTHID, public PS4Parser {
public: public:
/** /**
* Constructor for the PS4BT class. * Constructor for the PS4BT class.
* @param p Pointer to the BTHID class instance. * @param p Pointer to the BTD class instance.
*/ */
PS4BT(BTD *p, bool pair = false, const char *pin = "0000") : PS4BT(BTD *p, bool pair = false, const char *pin = "0000") :
BTHID(p, pair, pin) { BTHID(p, pair, pin) {
PS4Parser::Reset(); PS4Parser::Reset();
}; };
/**
* Used to check if a PS4 controller is connected.
* @return Returns true if it is connected.
*/
bool connected() {
return BTHID::connected;
};
/**
* Used to call your own function when the device is successfully initialized.
* @param funcOnInit Function to call.
*/
void attachOnInit(void (*funcOnInit)(void)) {
pFuncOnInit = funcOnInit;
};
protected:
/** @name BTHID implementation */ /** @name BTHID implementation */
/** /**
* Used to parse Bluetooth HID data. * Used to parse Bluetooth HID data.
@ -63,19 +80,6 @@ public:
}; };
/**@}*/ /**@}*/
/** True if a device is connected */
bool connected() {
return BTHID::connected;
};
/**
* Used to call your own function when the device is successfully initialized.
* @param funcOnInit Function to call.
*/
void attachOnInit(void (*funcOnInit)(void)) {
pFuncOnInit = funcOnInit;
};
private: private:
void (*pFuncOnInit)(void); // Pointer to function called in onInit() void (*pFuncOnInit)(void); // Pointer to function called in onInit()
}; };

27
PS4Parser.cpp
View file

@ -61,10 +61,10 @@ bool PS4Parser::getButtonClick(ButtonEnum b) {
return click; return click;
} }
uint8_t PS4Parser::getAnalogButton(ButtonEnum a) { uint8_t PS4Parser::getAnalogButton(ButtonEnum b) {
if (a == L2) // These are the only analog buttons on the controller if (b == L2) // These are the only analog buttons on the controller
return ps4Data.trigger[0]; return ps4Data.trigger[0];
else if (a == R2) else if (b == R2)
return ps4Data.trigger[1]; return ps4Data.trigger[1];
return 0; return 0;
} }
@ -75,7 +75,21 @@ uint8_t PS4Parser::getAnalogHat(AnalogHatEnum a) {
void PS4Parser::Parse(uint8_t len, uint8_t *buf) { void PS4Parser::Parse(uint8_t len, uint8_t *buf) {
if (len > 0 && buf) { if (len > 0 && buf) {
#ifdef PRINTREPORT
for (uint8_t i = 0; i < len; i++) {
D_PrintHex<uint8_t > (buf[i], 0x80);
Notify(PSTR(" "), 0x80);
}
Notify(PSTR("\r\n"), 0x80);
#endif
memcpy(&ps4Data, buf, min(len, sizeof(ps4Data))); memcpy(&ps4Data, buf, min(len, sizeof(ps4Data)));
if (ps4Data.reportId != 0x01) {
#ifdef DEBUG_USB_HOST
Notify(PSTR("\r\nUnknown report id"), 0x80);
#endif
return;
}
for (uint8_t i = 0; i < sizeof(ps4Data.btn); i++) { for (uint8_t i = 0; i < sizeof(ps4Data.btn); i++) {
if (ps4Data.btn.val[i] != oldButtonState.val[i]) { // Check if anything has changed if (ps4Data.btn.val[i] != oldButtonState.val[i]) { // Check if anything has changed
@ -98,12 +112,5 @@ void PS4Parser::Parse(uint8_t len, uint8_t *buf) {
} }
} }
} }
#ifdef PRINTREPORT
for (uint8_t i = 0; i < len; i++) {
D_PrintHex<uint8_t > (buf[i], 0x80);
Notify(PSTR(" "), 0x80);
}
Notify(PSTR("\r\n"), 0x80);
#endif
} }
} }

67
PS4Parser.h
View file

@ -18,7 +18,7 @@
#ifndef _ps4parser_h_ #ifndef _ps4parser_h_
#define _ps4parser_h_ #define _ps4parser_h_
#include "hid.h" #include "Usb.h"
#include "controllerEnums.h" #include "controllerEnums.h"
/** Buttons on the controller */ /** Buttons on the controller */
@ -87,7 +87,7 @@ struct touchpadXY {
struct PS4Data { struct PS4Data {
/* Button and joystick values */ /* Button and joystick values */
uint8_t report_id; // Always 0x01 uint8_t reportId; // Always 0x01
uint8_t hatValue[4]; uint8_t hatValue[4];
PS4Buttons btn; PS4Buttons btn;
uint8_t trigger[2]; uint8_t trigger[2];
@ -95,12 +95,12 @@ struct PS4Data {
// I still need to figure out how to make the PS4 controller send out the rest of the data via Bluetooth // I still need to figure out how to make the PS4 controller send out the rest of the data via Bluetooth
/* Gyro and accelerometer values */ /* Gyro and accelerometer values */
uint8_t dummy[3]; // First two looks random, while the third one might be some kind of status uint8_t dummy[3]; // First two looks random, while the third one might be some kind of status - it increments once in a while
int16_t gyroY, gyroZ, gyroX; int16_t gyroY, gyroZ, gyroX;
int16_t accX, accZ, accY; int16_t accX, accZ, accY;
/* The rest is data for the touchpad */ /* 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 9 is set every time a finger is moving around 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 is possible because the microcontroller inside the PS4 controller is much faster than the Bluetooth connection. touchpadXY xy[3]; // It looks like it sends out three coordinates each time, this is possible 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 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. // The first position will also keep it's value after the finger is released, while the other two will set them to zero.
@ -152,7 +152,7 @@ public:
* ::TRIANGLE, ::CIRCLE, ::CROSS, ::SQUARE, and ::T. * ::TRIANGLE, ::CIRCLE, ::CROSS, ::SQUARE, and ::T.
* @return Analog value in the range of 0-255. * @return Analog value in the range of 0-255.
*/ */
uint8_t getAnalogButton(ButtonEnum a); uint8_t getAnalogButton(ButtonEnum b);
/** /**
* Used to read the analog joystick. * Used to read the analog joystick.
@ -163,22 +163,59 @@ public:
/**@}*/ /**@}*/
/** @name Only available via USB at the moment */ /** @name Only available via USB at the moment */
/**
* Get the x-coordinate of the touchpad. Position 0 is in the top left.
* @param finger 0 = first finger, 1 = second finger. If omitted, then 0 will be used.
* @param xyId The controller sends out three packets with the same structure.
* The third one will contain the last measure, but if you read from the controller then there is only be data in the first one.
* For that reason it will be set to 0 if the argument is omitted.
* @return Returns the x-coordinate of the finger.
*/
uint16_t getX(uint8_t finger = 0, uint8_t xyId = 0) { uint16_t getX(uint8_t finger = 0, uint8_t xyId = 0) {
return ps4Data.xy[xyId].finger[finger].x; return ps4Data.xy[xyId].finger[finger].x;
}; };
/**
* Get the y-coordinate of the touchpad. Position 0 is in the top left.
* @param finger 0 = first finger, 1 = second finger. If omitted, then 0 will be used.
* @param xyId The controller sends out three packets with the same structure.
* The third one will contain the last measure, but if you read from the controller then there is only be data in the first one.
* For that reason it will be set to 0 if the argument is omitted.
* @return Returns the y-coordinate of the finger.
*/
uint16_t getY(uint8_t finger = 0, uint8_t xyId = 0) { uint16_t getY(uint8_t finger = 0, uint8_t xyId = 0) {
return ps4Data.xy[xyId].finger[finger].y; return ps4Data.xy[xyId].finger[finger].y;
}; };
uint8_t isTouching(uint8_t finger = 0, uint8_t xyId = 0) { /**
return !(ps4Data.xy[xyId].finger[finger].touching); // The bit is cleared every time when a finger is touching the touchpad * Returns whenever the user is toucing the touchpad.
* @param finger 0 = first finger, 1 = second finger. If omitted, then 0 will be used.
* @param xyId The controller sends out three packets with the same structure.
* The third one will contain the last measure, but if you read from the controller then there is only be data in the first one.
* For that reason it will be set to 0 if the argument is omitted.
* @return Returns true if the specific finger is touching the touchpad.
*/
bool isTouching(uint8_t finger = 0, uint8_t xyId = 0) {
return !(ps4Data.xy[xyId].finger[finger].touching); // The bit is cleared when a finger is touching the touchpad
}; };
/**
* This counter increments every time a finger touches the touchpad.
* @param finger 0 = first finger, 1 = second finger. If omitted, then 0 will be used.
* @param xyId The controller sends out three packets with the same structure.
* The third one will contain the last measure, but if you read from the controller then there is only be data in the first one.
* For that reason it will be set to 0 if the argument is omitted.
* @return Return the value of the counter, note that it is only a 7-bit value.
*/
uint8_t getTouchCounter(uint8_t finger = 0, uint8_t xyId = 0) { uint8_t getTouchCounter(uint8_t finger = 0, uint8_t xyId = 0) {
return ps4Data.xy[xyId].finger[finger].counter; return ps4Data.xy[xyId].finger[finger].counter;
}; };
/**
* Get the angle of the controller calculated using the accelerometer.
* @param a Either ::Pitch or ::Roll.
* @return Return the angle in the range of 0-360.
*/
double getAngle(AngleEnum a) { double getAngle(AngleEnum a) {
if(a == Pitch) if(a == Pitch)
return (atan2(ps4Data.accY, ps4Data.accZ) + PI) * RAD_TO_DEG; return (atan2(ps4Data.accY, ps4Data.accZ) + PI) * RAD_TO_DEG;
@ -186,6 +223,11 @@ public:
return (atan2(ps4Data.accX, ps4Data.accZ) + PI) * RAD_TO_DEG; return (atan2(ps4Data.accX, ps4Data.accZ) + PI) * RAD_TO_DEG;
}; };
/**
* Used to get the raw values from the 3-axis gyroscope and 3-axis accelerometer inside the PS4 controller.
* @param s The sensor to read.
* @return Returns the raw sensor reading.
*/
int16_t getSensor(SensorEnum s) { int16_t getSensor(SensorEnum s) {
switch(s) { switch(s) {
case gX: case gX:
@ -206,6 +248,14 @@ public:
}; };
/**@}*/ /**@}*/
protected:
/**
* Used to parse data sent from the PS4 controller.
* @param len Length of the data.
* @param buf Pointer to the data buffer.
*/
void Parse(uint8_t len, uint8_t *buf);
/** Used to reset the different buffers to their default values */ /** Used to reset the different buffers to their default values */
void Reset() { void Reset() {
uint8_t i; uint8_t i;
@ -228,9 +278,6 @@ public:
oldDpad = 0; oldDpad = 0;
}; };
protected:
void Parse(uint8_t len, uint8_t *buf);
private: private:
bool checkDpad(ButtonEnum b); // Used to check PS4 DPAD buttons bool checkDpad(ButtonEnum b); // Used to check PS4 DPAD buttons

35
PS4USB.h
View file

@ -32,13 +32,30 @@ class PS4USB : public HIDUniversal, public PS4Parser {
public: public:
/** /**
* Constructor for the PS4USB class. * Constructor for the PS4USB class.
* @param p Pointer to the HIDUniversal class instance. * @param p Pointer to the USB class instance.
*/ */
PS4USB(USB *p) : PS4USB(USB *p) :
HIDUniversal(p) { HIDUniversal(p) {
PS4Parser::Reset(); PS4Parser::Reset();
}; };
/**
* Used to check if a PS4 controller is connected.
* @return Returns true if it is connected.
*/
bool connected() {
return HIDUniversal::isReady() && HIDUniversal::VID == PS4_VID && HIDUniversal::PID == PS4_PID;
};
/**
* Used to call your own function when the device is successfully initialized.
* @param funcOnInit Function to call.
*/
void attachOnInit(void (*funcOnInit)(void)) {
pFuncOnInit = funcOnInit;
};
protected:
/** @name HIDUniversal implementation */ /** @name HIDUniversal implementation */
/** /**
* Used to parse USB HID data. * Used to parse USB HID data.
@ -65,22 +82,6 @@ public:
}; };
/**@}*/ /**@}*/
/**
* Used to check if a PS4 controller is connected.
* @return Returns true if it is connected.
*/
bool connected() {
return HIDUniversal::isReady() && HIDUniversal::VID == PS4_VID && HIDUniversal::PID == PS4_PID;
};
/**
* Used to call your own function when the device is successfully initialized.
* @param funcOnInit Function to call.
*/
void attachOnInit(void (*funcOnInit)(void)) {
pFuncOnInit = funcOnInit;
};
private: private:
void (*pFuncOnInit)(void); // Pointer to function called in onInit() void (*pFuncOnInit)(void); // Pointer to function called in onInit()
}; };