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

The Xbox button on the Xbox One controller was not read properly

Browse source 
XBOX_BUTTONS is stored in PROGMEM
This commit is contained in:
Kristian Sloth Lauszus 2016-11-26 23:56:45 -06:00
parent 1faec0f6f9
commit c362c04065
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
XBOXONE.cpp
View file

@ -260,9 +260,9 @@ void XBOXONE::readReport() {
if(readBuf[0] == 0x07) { if(readBuf[0] == 0x07) {
// The XBOX button has a separate message // The XBOX button has a separate message
if(readBuf[4] == 1) if(readBuf[4] == 1)
ButtonState |= XBOX_BUTTONS[XBOX]; ButtonState |= pgm_read_word(&XBOX_BUTTONS[XBOX]);
else else
ButtonState &= ~XBOX_BUTTONS[XBOX]; ButtonState &= ~pgm_read_word(&XBOX_BUTTONS[XBOX]);
} }
if(readBuf[0] != 0x20) { // Check if it's the correct report, otherwise return - the controller also sends different status reports if(readBuf[0] != 0x20) { // Check if it's the correct report, otherwise return - the controller also sends different status reports
#ifdef EXTRADEBUG #ifdef EXTRADEBUG
@ -272,7 +272,7 @@ void XBOXONE::readReport() {
return; return;
} }
uint16_t xbox = ButtonState & XBOX_BUTTONS[XBOX]; // Since the XBOX button is separate, save it and add it back in uint16_t xbox = ButtonState & pgm_read_word(&XBOX_BUTTONS[XBOX]); // Since the XBOX button is separate, save it and add it back in
// xbox button from before, dpad, abxy, start/back, sync, stick click, shoulder buttons // xbox button from before, dpad, abxy, start/back, sync, stick click, shoulder buttons
ButtonState = xbox | (((uint16_t)readBuf[5] & 0xF) << 8) | (readBuf[4] & 0xF0) | (((uint16_t)readBuf[4] & 0x0C) << 10) | ((readBuf[4] & 0x01) << 3) | (((uint16_t)readBuf[5] & 0xC0) << 8) | ((readBuf[5] & 0x30) >> 4); ButtonState = xbox | (((uint16_t)readBuf[5] & 0xF) << 8) | (readBuf[4] & 0xF0) | (((uint16_t)readBuf[4] & 0x0C) << 10) | ((readBuf[4] & 0x01) << 3) | (((uint16_t)readBuf[5] & 0xC0) << 8) | ((readBuf[5] & 0x30) >> 4);