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

Handle DPAD properly on the PS4 controller

Browse source 
The DPAD got separate values for each case - see: DPADEnum in PS4BT.h.
This commit is contained in:
Kristian Lauszus 2014-01-12 18:15:13 +01:00
parent eea5c44b96
commit 3dd5b1ab1c
2 changed files with 45 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
PS4BT.cpp
View file

@ -53,14 +53,25 @@ const uint8_t PS4_ANALOG_BUTTONS[] PROGMEM = {
1, // R2 1, // R2
}; };
bool PS4BT::checkDpad(PS4Buttons ps4Buttons, DPADEnum b) { bool PS4BT::checkDpad(DPADEnum b) {
return ps4Buttons.dpad == b; switch (b) {
case DPAD_UP:
return ps4Data.btn.dpad == DPAD_LEFT_UP || ps4Data.btn.dpad == DPAD_UP || ps4Data.btn.dpad == DPAD_UP_RIGHT;
case DPAD_RIGHT:
return ps4Data.btn.dpad == DPAD_UP_RIGHT || ps4Data.btn.dpad == DPAD_RIGHT || ps4Data.btn.dpad == DPAD_RIGHT_DOWN;
case DPAD_DOWN:
return ps4Data.btn.dpad == DPAD_RIGHT_DOWN || ps4Data.btn.dpad == DPAD_DOWN || ps4Data.btn.dpad == DPAD_DOWN_LEFT;
case DPAD_LEFT:
return ps4Data.btn.dpad == DPAD_DOWN_LEFT || ps4Data.btn.dpad == DPAD_LEFT || ps4Data.btn.dpad == DPAD_LEFT_UP;
default:
return false;
}
} }
bool PS4BT::getButtonPress(ButtonEnum b) { bool PS4BT::getButtonPress(ButtonEnum b) {
uint8_t button = pgm_read_byte(&PS4_BUTTONS[(uint8_t)b]); uint8_t button = pgm_read_byte(&PS4_BUTTONS[(uint8_t)b]);
if (b <= LEFT) // Dpad if (b <= LEFT) // Dpad
return checkDpad(ps4Data.btn, (DPADEnum)button); return checkDpad((DPADEnum)button);
else { else {
uint8_t index = button < 8 ? 0 : button < 16 ? 1 : 2; uint8_t index = button < 8 ? 0 : button < 16 ? 1 : 2;
uint8_t mask = (1 << (button - 8 * index)); uint8_t mask = (1 << (button - 8 * index));
@ -69,21 +80,18 @@ bool PS4BT::getButtonPress(ButtonEnum b) {
} }
bool PS4BT::getButtonClick(ButtonEnum b) { bool PS4BT::getButtonClick(ButtonEnum b) {
uint8_t button = pgm_read_byte(&PS4_BUTTONS[(uint8_t)b]); uint8_t mask, index = 0;
if (b <= LEFT) { // Dpad if (b <= LEFT) // Dpad
if (checkDpad(buttonClickState, (DPADEnum)button)) { mask = 1 << b;
buttonClickState.dpad = DPAD_OFF; else {
return true; uint8_t button = pgm_read_byte(&PS4_BUTTONS[(uint8_t)b]);
} index = button < 8 ? 0 : button < 16 ? 1 : 2;
return false; mask = (1 << (button - 8 * index));
} else {
uint8_t index = button < 8 ? 0 : button < 16 ? 1 : 2;
uint8_t mask = (1 << (button - 8 * index));
bool click = buttonClickState.val[index] & mask;
buttonClickState.val[index] &= ~mask; // Clear "click" event
return click;
} }
bool click = buttonClickState.val[index] & mask;
buttonClickState.val[index] &= ~mask; // Clear "click" event
return click;
} }
uint8_t PS4BT::getAnalogButton(ButtonEnum a) { uint8_t PS4BT::getAnalogButton(ButtonEnum a) {
@ -99,11 +107,24 @@ void PS4BT::Parse(HID *hid, bool is_rpt_id, uint8_t len, uint8_t *buf) {
memcpy(&ps4Data, buf, len); memcpy(&ps4Data, buf, len);
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]) { if (ps4Data.btn.val[i] != oldButtonState.val[i]) { // Check if anything has changed
buttonClickState.val[i] = ps4Data.btn.val[i] & ~oldButtonState.val[i]; // Update click state variable buttonClickState.val[i] = ps4Data.btn.val[i] & ~oldButtonState.val[i]; // Update click state variable
oldButtonState.val[i] = ps4Data.btn.val[i]; oldButtonState.val[i] = ps4Data.btn.val[i];
if (i == 0) if (i == 0) { // The DPAD buttons does not set the different bits, but set a value corresponding to the buttons pressed, we will simply set the bits ourself
buttonClickState.dpad = ps4Data.btn.dpad; // The DPAD buttons does not set the different bits, but set a value corresponding to the buttons pressed uint8_t newDpad = 0;
if (checkDpad(DPAD_UP))
newDpad |= 1 << UP;
if (checkDpad(DPAD_RIGHT))
newDpad |= 1 << RIGHT;
if (checkDpad(DPAD_DOWN))
newDpad |= 1 << DOWN;
if (checkDpad(DPAD_LEFT))
newDpad |= 1 << LEFT;
if (newDpad != oldDpad) {
buttonClickState.dpad = newDpad & ~oldDpad; // Override values
oldDpad = newDpad;
}
}
} }
} }
#ifdef PRINTREPORT #ifdef PRINTREPORT

6
PS4BT.h
View file

@ -157,7 +157,8 @@ public:
ps4Data.btn.dpad = DPAD_OFF; ps4Data.btn.dpad = DPAD_OFF;
oldButtonState.dpad = DPAD_OFF; oldButtonState.dpad = DPAD_OFF;
buttonClickState.dpad = DPAD_OFF; buttonClickState.dpad = 0;
oldDpad = 0;
}; };
/** /**
@ -174,10 +175,11 @@ public:
private: private:
void (*pFuncOnInit)(void); // Pointer to function called in onInit() void (*pFuncOnInit)(void); // Pointer to function called in onInit()
bool checkDpad(PS4Buttons ps4Buttons, DPADEnum b); // Used to check PS4 DPAD buttons bool checkDpad(DPADEnum b); // Used to check PS4 DPAD buttons
BTHID *pBthid; // Pointer to BTHID instance BTHID *pBthid; // Pointer to BTHID instance
PS4Data ps4Data; PS4Data ps4Data;
PS4Buttons oldButtonState, buttonClickState; PS4Buttons oldButtonState, buttonClickState;
uint8_t oldDpad;
}; };
#endif #endif