diff --git a/_x_b_o_x_o_n_e_8cpp_source.html b/_x_b_o_x_o_n_e_8cpp_source.html
index 440a73ad..123a47ec 100644
--- a/_x_b_o_x_o_n_e_8cpp_source.html
+++ b/_x_b_o_x_o_n_e_8cpp_source.html
@@ -569,7 +569,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
483 XboxCommand(writeBuf, 13);
-
+
uint8_t getConfDescr(uint8_t addr, uint8_t ep, uint16_t nbytes, uint8_t conf, uint8_t *dataptr)
@@ -583,11 +583,11 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
-
+
uint8_t setConf(uint8_t addr, uint8_t ep, uint8_t conf_value)
-
+
#define USB_TRANSFER_TYPE_INTERRUPT
#define NotifyFailGetDevDescr(...)
@@ -595,7 +595,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
void EndpointXtract(uint8_t conf, uint8_t iface, uint8_t alt, uint8_t proto, const USB_ENDPOINT_DESCRIPTOR *ep)
virtual void FreeAddress(uint8_t addr)=0
virtual UsbDevice * GetUsbDevicePtr(uint8_t addr)=0
-
+
@@ -604,7 +604,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
#define NotifyFailGetConfDescr(...)
void PrintEndpointDescriptor(const USB_ENDPOINT_DESCRIPTOR *ep_ptr)
-
+
#define XBOX_ONE_MAX_ENDPOINTS
#define NotifyFailUnknownDevice(...)
@@ -620,7 +620,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
uint16_t getButtonPress(ButtonEnum b)
-
+
virtual uint8_t AllocAddress(uint8_t parent, bool is_hub=false, uint8_t port=0)=0
@@ -628,7 +628,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
#define XBOX_ONE_INPUT_PIPE
-EpInfo epInfo[XBOX_ONE_MAX_ENDPOINTS]
+EpInfo epInfo[XBOX_ONE_MAX_ENDPOINTS]
bool getButtonClick(ButtonEnum b)
@@ -651,7 +651,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
uint8_t RegisterDeviceClass(USBDeviceConfig *pdev)
#define NotifyFailSetConfDescr(...)
-virtual bool VIDPIDOK(uint16_t vid, uint16_t pid)
+virtual bool VIDPIDOK(uint16_t vid, uint16_t pid)
uint8_t getDevDescr(uint8_t addr, uint8_t ep, uint16_t nbytes, uint8_t *dataptr)
defined(USB_METHODS_INLINE)
#define NotifyFailSetDevTblEntry(...)
void setRumbleOn(uint8_t leftTrigger, uint8_t rightTrigger, uint8_t leftMotor, uint8_t rightMotor)
diff --git a/_x_b_o_x_o_n_e_8h.html b/_x_b_o_x_o_n_e_8h.html
index a643241a..97cfc60a 100644
--- a/_x_b_o_x_o_n_e_8h.html
+++ b/_x_b_o_x_o_n_e_8h.html
@@ -134,6 +134,8 @@ Macros
|
#define | XBOX_ONE_PID4 0x02EA |
|
+#define | XBOX_ONE_PID13 0x0B0A |
+ |
#define | XBOX_VID2 0x0738 |
|
#define | XBOX_VID3 0x0E6F |
@@ -300,6 +302,20 @@ Macros
Definition at line 46 of file XBOXONE.h.
+
+
+
+
+
+
+
+ #define XBOX_ONE_PID13 0x0B0A |
+
+
+
@@ -312,7 +328,7 @@ Macros
@@ -326,7 +342,7 @@ Macros
@@ -340,7 +356,7 @@ Macros
@@ -354,7 +370,7 @@ Macros
@@ -368,7 +384,7 @@ Macros
@@ -382,7 +398,7 @@ Macros
@@ -396,7 +412,7 @@ Macros
@@ -410,7 +426,7 @@ Macros
@@ -424,7 +440,7 @@ Macros
@@ -438,7 +454,7 @@ Macros
@@ -452,7 +468,7 @@ Macros
@@ -466,7 +482,7 @@ Macros
@@ -480,7 +496,7 @@ Macros
diff --git a/_x_b_o_x_o_n_e_8h_source.html b/_x_b_o_x_o_n_e_8h_source.html
index 66c49027..ce5c77a6 100644
--- a/_x_b_o_x_o_n_e_8h_source.html
+++ b/_x_b_o_x_o_n_e_8h_source.html
@@ -131,154 +131,156 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
44 #define XBOX_ONE_PID2 0x02DD // Microsoft X-Box One pad (Firmware 2015)
45 #define XBOX_ONE_PID3 0x02E3 // Microsoft X-Box One Elite pad
46 #define XBOX_ONE_PID4 0x02EA // Microsoft X-Box One S pad
-
-
- 49 #define XBOX_VID2 0x0738 // Mad Catz
- 50 #define XBOX_VID3 0x0E6F // Afterglow
- 51 #define XBOX_VID4 0x0F0D // HORIPAD ONE
- 52 #define XBOX_VID5 0x1532 // Razer
- 53 #define XBOX_VID6 0x24C6 // PowerA
-
- 55 #define XBOX_ONE_PID5 0x4A01 // Mad Catz FightStick TE 2 - might have different mapping for triggers?
- 56 #define XBOX_ONE_PID6 0x0139 // Afterglow Prismatic Wired Controller
- 57 #define XBOX_ONE_PID7 0x0146 // Rock Candy Wired Controller for Xbox One
- 58 #define XBOX_ONE_PID8 0x0067 // HORIPAD ONE
- 59 #define XBOX_ONE_PID9 0x0A03 // Razer Wildcat
- 60 #define XBOX_ONE_PID10 0x541A // PowerA Xbox One Mini Wired Controller
- 61 #define XBOX_ONE_PID11 0x542A // Xbox ONE spectra
- 62 #define XBOX_ONE_PID12 0x543A // PowerA Xbox One wired controller
-
-
-
-
-
- 81 virtual uint8_t
Init(uint8_t parent, uint8_t port,
bool lowspeed);
-
- 91 virtual uint8_t
Poll();
-
-
-
-
-
-
-
-
-
-
-
-
-
- 123 virtual bool VIDPIDOK(uint16_t vid, uint16_t pid) {
-
-
-
-
-
-
-
-
-
-
-
- 157 pFuncOnInit = funcOnInit;
-
-
-
-
- 170 void setRumbleOn(uint8_t leftTrigger, uint8_t rightTrigger, uint8_t leftMotor, uint8_t rightMotor);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 215 void (*pFuncOnInit)(void);
-
- 217 uint8_t pollInterval;
-
-
-
- 221 uint16_t ButtonState;
- 222 uint16_t OldButtonState;
- 223 uint16_t ButtonClickState;
-
- 225 uint16_t triggerValue[2];
- 226 uint16_t triggerValueOld[2];
-
-
-
-
-
-
-
-
-
-
- 237 uint8_t XboxCommand(uint8_t* data, uint16_t nbytes);
-
-
-
-
-
-
+ 47 #define XBOX_ONE_PID13 0x0B0A // Microsoft X-Box One Adaptive Controller
+
+
+ 50 #define XBOX_VID2 0x0738 // Mad Catz
+ 51 #define XBOX_VID3 0x0E6F // Afterglow
+ 52 #define XBOX_VID4 0x0F0D // HORIPAD ONE
+ 53 #define XBOX_VID5 0x1532 // Razer
+ 54 #define XBOX_VID6 0x24C6 // PowerA
+
+ 56 #define XBOX_ONE_PID5 0x4A01 // Mad Catz FightStick TE 2 - might have different mapping for triggers?
+ 57 #define XBOX_ONE_PID6 0x0139 // Afterglow Prismatic Wired Controller
+ 58 #define XBOX_ONE_PID7 0x0146 // Rock Candy Wired Controller for Xbox One
+ 59 #define XBOX_ONE_PID8 0x0067 // HORIPAD ONE
+ 60 #define XBOX_ONE_PID9 0x0A03 // Razer Wildcat
+ 61 #define XBOX_ONE_PID10 0x541A // PowerA Xbox One Mini Wired Controller
+ 62 #define XBOX_ONE_PID11 0x542A // Xbox ONE spectra
+ 63 #define XBOX_ONE_PID12 0x543A // PowerA Xbox One wired controller
+
+
+
+
+
+ 82 virtual uint8_t
Init(uint8_t parent, uint8_t port,
bool lowspeed);
+
+ 92 virtual uint8_t
Poll();
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 124 virtual bool VIDPIDOK(uint16_t vid, uint16_t pid) {
+
+
+
+
+
+
+
+
+
+
+
+ 158 pFuncOnInit = funcOnInit;
+
+
+
+
+ 171 void setRumbleOn(uint8_t leftTrigger, uint8_t rightTrigger, uint8_t leftMotor, uint8_t rightMotor);
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 216 void (*pFuncOnInit)(void);
+
+ 218 uint8_t pollInterval;
+
+
+
+ 222 uint16_t ButtonState;
+ 223 uint16_t OldButtonState;
+ 224 uint16_t ButtonClickState;
+
+ 226 uint16_t triggerValue[2];
+ 227 uint16_t triggerValueOld[2];
+
+
+
+
+
+
+
+
+
+
+ 238 uint8_t XboxCommand(uint8_t* data, uint16_t nbytes);
+
+
+
+
+
+
-
+
#define XBOX_ONE_EP_MAXPKTSIZE
-
-void attachOnInit(void(*funcOnInit)(void))
+
+void attachOnInit(void(*funcOnInit)(void))
-
+
-
+
void EndpointXtract(uint8_t conf, uint8_t iface, uint8_t alt, uint8_t proto, const USB_ENDPOINT_DESCRIPTOR *ep)
-
-
+
+
void PrintEndpointDescriptor(const USB_ENDPOINT_DESCRIPTOR *ep_ptr)
-
+
#define XBOX_ONE_MAX_ENDPOINTS
-
+
-
+
virtual uint8_t Release()
-
+
uint16_t getButtonPress(ButtonEnum b)
-virtual uint8_t GetAddress()
-
+virtual uint8_t GetAddress()
+
-EpInfo epInfo[XBOX_ONE_MAX_ENDPOINTS]
+EpInfo epInfo[XBOX_ONE_MAX_ENDPOINTS]
bool getButtonClick(ButtonEnum b)
-uint8_t readPollInterval()
+uint8_t readPollInterval()
-
+
virtual uint8_t Init(uint8_t parent, uint8_t port, bool lowspeed)
-
-
+
+
+
-
-
+
+
int16_t getAnalogHat(AnalogHatEnum a)
-
+
-virtual bool VIDPIDOK(uint16_t vid, uint16_t pid)
+virtual bool VIDPIDOK(uint16_t vid, uint16_t pid)
void setRumbleOn(uint8_t leftTrigger, uint8_t rightTrigger, uint8_t leftMotor, uint8_t rightMotor)
diff --git a/class_u_s_b_device_config.html b/class_u_s_b_device_config.html
index 21e6e897..36f38d28 100644
--- a/class_u_s_b_device_config.html
+++ b/class_u_s_b_device_config.html
@@ -261,7 +261,7 @@ Public Member Functions
-
Reimplemented in BulkOnly, BTD, HIDBoot< BOOT_PROTOCOL >, ACM, USBHub, FTDI, ADK, HIDUniversal, XBOXONE, XBOXRECV, HIDComposite, XBOXUSB, PS3USB, and XBOXOLD.
+
Reimplemented in BulkOnly, BTD, HIDBoot< BOOT_PROTOCOL >, ACM, USBHub, FTDI, ADK, XBOXONE, HIDUniversal, XBOXRECV, HIDComposite, XBOXUSB, PS3USB, and XBOXOLD.
Definition at line 149 of file UsbCore.h.
@@ -354,7 +354,7 @@ Public Member Functions
-
Reimplemented in BTD, PSBuzz, FTDI, PS4USB, XBOXONE, ADK, XR21B1411, XBOXRECV, XBOXUSB, PS3USB, and XBOXOLD.
+
Reimplemented in BTD, PSBuzz, FTDI, XBOXONE, PS4USB, ADK, XR21B1411, XBOXRECV, XBOXUSB, PS3USB, and XBOXOLD.
Definition at line 161 of file UsbCore.h.
diff --git a/class_x_b_o_x_o_n_e.html b/class_x_b_o_x_o_n_e.html
index bd7e38a1..34b4df4e 100644
--- a/class_x_b_o_x_o_n_e.html
+++ b/class_x_b_o_x_o_n_e.html
@@ -183,7 +183,7 @@ Protected Attributes
This class implements support for a Xbox ONE controller connected via USB.
-
Definition at line 65 of file XBOXONE.h.
+
Definition at line 66 of file XBOXONE.h.
@@ -375,7 +375,7 @@ Protected Attributes
Used to check if the controller has been initialized.
- Returns
- True if it's ready.
-Definition at line 105 of file XBOXONE.h.
+Definition at line 106 of file XBOXONE.h.
@@ -402,7 +402,7 @@ Protected Attributes
Read the poll interval taken from the endpoint descriptors.
- Returns
- The poll interval in ms.
-Definition at line 113 of file XBOXONE.h.
+Definition at line 114 of file XBOXONE.h.
@@ -449,7 +449,7 @@ Protected Attributes
Reimplemented from USBDeviceConfig.
-Definition at line 123 of file XBOXONE.h.
+Definition at line 124 of file XBOXONE.h.
@@ -564,7 +564,7 @@ Protected Attributes
-Definition at line 156 of file XBOXONE.h.
+Definition at line 157 of file XBOXONE.h.
@@ -748,7 +748,7 @@ Protected Attributes
True if a Xbox ONE controller is connected.
-
Definition at line 174 of file XBOXONE.h.
+
Definition at line 175 of file XBOXONE.h.
@@ -771,7 +771,7 @@ Protected Attributes
@@ -794,7 +794,7 @@ Protected Attributes
@@ -817,7 +817,7 @@ Protected Attributes
@@ -840,7 +840,7 @@ Protected Attributes
@@ -863,7 +863,7 @@ Protected Attributes
Total number of endpoints in the configuration.
-
Definition at line 187 of file XBOXONE.h.
+
Definition at line 188 of file XBOXONE.h.
@@ -886,7 +886,7 @@ Protected Attributes
Next poll time based on poll interval taken from the USB descriptor.
-
Definition at line 189 of file XBOXONE.h.
+
Definition at line 190 of file XBOXONE.h.
diff --git a/globals_defs_x.html b/globals_defs_x.html
index 01a9031f..15904b46 100644
--- a/globals_defs_x.html
+++ b/globals_defs_x.html
@@ -188,6 +188,9 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
XBOX_ONE_PID12
: XBOXONE.h
+XBOX_ONE_PID13
+: XBOXONE.h
+
XBOX_ONE_PID2
: XBOXONE.h
diff --git a/globals_eval.html b/globals_eval.html
index a3db3f4b..07d5a77c 100644
--- a/globals_eval.html
+++ b/globals_eval.html
@@ -595,12 +595,12 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
- w -
diff --git a/globals_w.html b/globals_w.html
index 6df62abb..8651e719 100644
--- a/globals_w.html
+++ b/globals_w.html
@@ -125,12 +125,12 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
Here is a list of all file members with links to the files they belong to:
- w -
-- WHITE
-: controllerEnums.h
-
- White
: controllerEnums.h
+- WHITE
+: controllerEnums.h
+
- WI_PROTOCOL_BT
: BTD.h
diff --git a/globals_x.html b/globals_x.html
index 9d996aba..1ba74d68 100644
--- a/globals_x.html
+++ b/globals_x.html
@@ -202,6 +202,9 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
- XBOX_ONE_PID12
: XBOXONE.h
+- XBOX_ONE_PID13
+: XBOXONE.h
+
- XBOX_ONE_PID2
: XBOXONE.h
diff --git a/search/all_17.js b/search/all_17.js
index fa2888c1..d8759988 100644
--- a/search/all_17.js
+++ b/search/all_17.js
@@ -3,7 +3,7 @@ var searchData=
['wiicamerareadme',['WiiCameraReadme',['../md__wii_camera_readme.html',1,'']]],
['waitingforconnection',['waitingForConnection',['../class_b_t_d.html#a93a522edb2974185c7567b8f83860424',1,'BTD']]],
['wdescriptorlength',['wDescriptorLength',['../struct_u_s_b___h_i_d___d_e_s_c_r_i_p_t_o_r.html#a0b160c43f6a6132c0debabd6ef171950',1,'USB_HID_DESCRIPTOR::wDescriptorLength()'],['../struct_h_i_d___c_l_a_s_s___d_e_s_c_r_i_p_t_o_r___l_e_n___a_n_d___t_y_p_e.html#a98251c1867caf1651f6e926952189201',1,'HID_CLASS_DESCRIPTOR_LEN_AND_TYPE::wDescriptorLength()']]],
- ['white',['WHITE',['../controller_enums_8h.html#a94f7389d205c78830a5441370d7870fda283fc479650da98250635b9c3c0e7e50',1,'WHITE(): controllerEnums.h'],['../controller_enums_8h.html#aac6fa7b0395b95cc528deaad0ce884a2ab548046646b36c12aa6ba841de500094',1,'White(): controllerEnums.h']]],
+ ['white',['White',['../controller_enums_8h.html#aac6fa7b0395b95cc528deaad0ce884a2ab548046646b36c12aa6ba841de500094',1,'White(): controllerEnums.h'],['../controller_enums_8h.html#a94f7389d205c78830a5441370d7870fda283fc479650da98250635b9c3c0e7e50',1,'WHITE(): controllerEnums.h']]],
['wi_5fprotocol_5fbt',['WI_PROTOCOL_BT',['../_b_t_d_8h.html#a05903a9351c5ced6b8be27b2869e62af',1,'BTD.h']]],
['wi_5fsubclass_5frf',['WI_SUBCLASS_RF',['../_b_t_d_8h.html#a177fe269ddb7979d99b76d52bc281551',1,'BTD.h']]],
['wide',['wide',['../structtty__features.html#af97f813b49e81e0f89435a07525b3321',1,'tty_features::wide()'],['../class_a_c_m.html#ab171c6eefd542e7d4a7ce555d2f2f389',1,'ACM::wide()']]],
diff --git a/search/all_18.js b/search/all_18.js
index f0362917..5084062a 100644
--- a/search/all_18.js
+++ b/search/all_18.js
@@ -25,6 +25,7 @@ var searchData=
['xbox_5fone_5fpid10',['XBOX_ONE_PID10',['../_x_b_o_x_o_n_e_8h.html#ad7aedc27b8dfa49a7af8fce89432df0a',1,'XBOXONE.h']]],
['xbox_5fone_5fpid11',['XBOX_ONE_PID11',['../_x_b_o_x_o_n_e_8h.html#a3692a20fd79bcdfdcdec36b4acae8a76',1,'XBOXONE.h']]],
['xbox_5fone_5fpid12',['XBOX_ONE_PID12',['../_x_b_o_x_o_n_e_8h.html#a185f8aba65c0c20a1917efa6383d7ab0',1,'XBOXONE.h']]],
+ ['xbox_5fone_5fpid13',['XBOX_ONE_PID13',['../_x_b_o_x_o_n_e_8h.html#ae5a3f07dfb7cb42bc8f9ce64659b5081',1,'XBOXONE.h']]],
['xbox_5fone_5fpid2',['XBOX_ONE_PID2',['../_x_b_o_x_o_n_e_8h.html#abba090da8fd2707cb996899e798d1bd4',1,'XBOXONE.h']]],
['xbox_5fone_5fpid3',['XBOX_ONE_PID3',['../_x_b_o_x_o_n_e_8h.html#a6cc79a26eb1b03c3ca320f8adcd1d1bd',1,'XBOXONE.h']]],
['xbox_5fone_5fpid4',['XBOX_ONE_PID4',['../_x_b_o_x_o_n_e_8h.html#a148021ecf4a60cb1f25d59bb698fa7df',1,'XBOXONE.h']]],
diff --git a/search/defines_17.js b/search/defines_17.js
index 11c32048..05848022 100644
--- a/search/defines_17.js
+++ b/search/defines_17.js
@@ -20,6 +20,7 @@ var searchData=
['xbox_5fone_5fpid10',['XBOX_ONE_PID10',['../_x_b_o_x_o_n_e_8h.html#ad7aedc27b8dfa49a7af8fce89432df0a',1,'XBOXONE.h']]],
['xbox_5fone_5fpid11',['XBOX_ONE_PID11',['../_x_b_o_x_o_n_e_8h.html#a3692a20fd79bcdfdcdec36b4acae8a76',1,'XBOXONE.h']]],
['xbox_5fone_5fpid12',['XBOX_ONE_PID12',['../_x_b_o_x_o_n_e_8h.html#a185f8aba65c0c20a1917efa6383d7ab0',1,'XBOXONE.h']]],
+ ['xbox_5fone_5fpid13',['XBOX_ONE_PID13',['../_x_b_o_x_o_n_e_8h.html#ae5a3f07dfb7cb42bc8f9ce64659b5081',1,'XBOXONE.h']]],
['xbox_5fone_5fpid2',['XBOX_ONE_PID2',['../_x_b_o_x_o_n_e_8h.html#abba090da8fd2707cb996899e798d1bd4',1,'XBOXONE.h']]],
['xbox_5fone_5fpid3',['XBOX_ONE_PID3',['../_x_b_o_x_o_n_e_8h.html#a6cc79a26eb1b03c3ca320f8adcd1d1bd',1,'XBOXONE.h']]],
['xbox_5fone_5fpid4',['XBOX_ONE_PID4',['../_x_b_o_x_o_n_e_8h.html#a148021ecf4a60cb1f25d59bb698fa7df',1,'XBOXONE.h']]],
diff --git a/search/enumvalues_13.js b/search/enumvalues_13.js
index 9beeb375..d578bd9a 100644
--- a/search/enumvalues_13.js
+++ b/search/enumvalues_13.js
@@ -1,4 +1,4 @@
var searchData=
[
- ['white',['WHITE',['../controller_enums_8h.html#a94f7389d205c78830a5441370d7870fda283fc479650da98250635b9c3c0e7e50',1,'WHITE(): controllerEnums.h'],['../controller_enums_8h.html#aac6fa7b0395b95cc528deaad0ce884a2ab548046646b36c12aa6ba841de500094',1,'White(): controllerEnums.h']]]
+ ['white',['White',['../controller_enums_8h.html#aac6fa7b0395b95cc528deaad0ce884a2ab548046646b36c12aa6ba841de500094',1,'White(): controllerEnums.h'],['../controller_enums_8h.html#a94f7389d205c78830a5441370d7870fda283fc479650da98250635b9c3c0e7e50',1,'WHITE(): controllerEnums.h']]]
];