mirror of
https://github.com/felis/USB_Host_Shield_2.0.git
synced 2024-03-22 11:31:26 +01:00
port debugging of new files, need to eliminate all serial.print yet.
This commit is contained in:
Andrew J. Kroll
parent
629594f957
commit
9b224b9899
7 changed files with 1736 additions and 1713 deletions
76
PS3BT.cpp
76
PS3BT.cpp
|
|
@ -256,9 +256,9 @@ void PS3BT::ACLData(uint8_t* ACLData) {
|
|||
remote_name[i] = pBtd->remote_name[i]; // Store the remote name for the connection
|
||||
#ifdef DEBUG
|
||||
if(pBtd->hci_version < 3) { // Check the HCI Version of the Bluetooth dongle
|
||||
Notify(PSTR("\r\nYour dongle may not support reading the analog buttons, sensors and status\r\nYour HCI Version is: "));
|
||||
Notify(PSTR("\r\nYour dongle may not support reading the analog buttons, sensors and status\r\nYour HCI Version is: "), 0x80);
|
||||
Serial.print(pBtd->hci_version);
|
||||
Notify(PSTR("\r\nBut should be at least 3\r\nThis means that it doesn't support Bluetooth Version 2.0+EDR"));
|
||||
Notify(PSTR("\r\nBut should be at least 3\r\nThis means that it doesn't support Bluetooth Version 2.0+EDR"), 0x80);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
|
@ -270,32 +270,32 @@ void PS3BT::ACLData(uint8_t* ACLData) {
|
|||
if ((l2capinbuf[6] | (l2capinbuf[7] << 8)) == 0x0001) { //l2cap_control - Channel ID for ACL-U
|
||||
if (l2capinbuf[8] == L2CAP_CMD_COMMAND_REJECT) {
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nL2CAP Command Rejected - Reason: "));
|
||||
PrintHex<uint8_t>(l2capinbuf[13]);
|
||||
Notify(PSTR("\r\nL2CAP Command Rejected - Reason: "), 0x80);
|
||||
PrintHex<uint8_t>(l2capinbuf[13], 0x80);
|
||||
Serial.print(" ");
|
||||
PrintHex<uint8_t>(l2capinbuf[12]);
|
||||
PrintHex<uint8_t>(l2capinbuf[12], 0x80);
|
||||
Serial.print(" Data: ");
|
||||
PrintHex<uint8_t>(l2capinbuf[17]);
|
||||
PrintHex<uint8_t>(l2capinbuf[17], 0x80);
|
||||
Serial.print(" ");
|
||||
PrintHex<uint8_t>(l2capinbuf[16]);
|
||||
PrintHex<uint8_t>(l2capinbuf[16], 0x80);
|
||||
Serial.print(" ");
|
||||
PrintHex<uint8_t>(l2capinbuf[15]);
|
||||
PrintHex<uint8_t>(l2capinbuf[15], 0x80);
|
||||
Serial.print(" ");
|
||||
PrintHex<uint8_t>(l2capinbuf[14]);
|
||||
PrintHex<uint8_t>(l2capinbuf[14], 0x80);
|
||||
#endif
|
||||
}
|
||||
else if (l2capinbuf[8] == L2CAP_CMD_CONNECTION_REQUEST) {
|
||||
#ifdef EXTRADEBUG
|
||||
Notify(PSTR("\r\nL2CAP Connection Request - PSM: "));
|
||||
PrintHex<uint8_t>(l2capinbuf[13]);
|
||||
Notify(PSTR(" "));
|
||||
PrintHex<uint8_t>(l2capinbuf[12]);
|
||||
Notify(PSTR(" SCID: "));
|
||||
PrintHex<uint8_t>(l2capinbuf[15]);
|
||||
Notify(PSTR(" "));
|
||||
PrintHex<uint8_t>(l2capinbuf[14]);
|
||||
Notify(PSTR(" Identifier: "));
|
||||
PrintHex<uint8_t>(l2capinbuf[9]);
|
||||
Notify(PSTR("\r\nL2CAP Connection Request - PSM: "), 0x80);
|
||||
PrintHex<uint8_t>(l2capinbuf[13], 0x80);
|
||||
Notify(PSTR(" "), 0x80);
|
||||
PrintHex<uint8_t>(l2capinbuf[12], 0x80);
|
||||
Notify(PSTR(" SCID: "), 0x80);
|
||||
PrintHex<uint8_t>(l2capinbuf[15], 0x80);
|
||||
Notify(PSTR(" "), 0x80);
|
||||
PrintHex<uint8_t>(l2capinbuf[14], 0x80);
|
||||
Notify(PSTR(" Identifier: "), 0x80);
|
||||
PrintHex<uint8_t>(l2capinbuf[9], 0x80);
|
||||
#endif
|
||||
if ((l2capinbuf[12] | (l2capinbuf[13] << 8)) == HID_CTRL_PSM) {
|
||||
identifier = l2capinbuf[9];
|
||||
|
|
@ -337,7 +337,7 @@ void PS3BT::ACLData(uint8_t* ACLData) {
|
|||
else if (l2capinbuf[8] == L2CAP_CMD_DISCONNECT_REQUEST) {
|
||||
if (l2capinbuf[12] == control_dcid[0] && l2capinbuf[13] == control_dcid[1]) {
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nDisconnect Request: Control Channel"));
|
||||
Notify(PSTR("\r\nDisconnect Request: Control Channel"), 0x80);
|
||||
#endif
|
||||
identifier = l2capinbuf[9];
|
||||
pBtd->l2cap_disconnection_response(hci_handle,identifier,control_dcid,control_scid);
|
||||
|
|
@ -345,7 +345,7 @@ void PS3BT::ACLData(uint8_t* ACLData) {
|
|||
}
|
||||
else if (l2capinbuf[12] == interrupt_dcid[0] && l2capinbuf[13] == interrupt_dcid[1]) {
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nDisconnect Request: Interrupt Channel"));
|
||||
Notify(PSTR("\r\nDisconnect Request: Interrupt Channel"), 0x80);
|
||||
#endif
|
||||
identifier = l2capinbuf[9];
|
||||
pBtd->l2cap_disconnection_response(hci_handle,identifier,interrupt_dcid,interrupt_scid);
|
||||
|
|
@ -366,8 +366,8 @@ void PS3BT::ACLData(uint8_t* ACLData) {
|
|||
}
|
||||
#ifdef EXTRADEBUG
|
||||
else {
|
||||
Notify(PSTR("\r\nL2CAP Unknown Signaling Command: "));
|
||||
PrintHex<uint8_t>(l2capinbuf[8]);
|
||||
Notify(PSTR("\r\nL2CAP Unknown Signaling Command: "), 0x80);
|
||||
PrintHex<uint8_t>(l2capinbuf[8], 0x80);
|
||||
}
|
||||
#endif
|
||||
} else if (l2capinbuf[6] == interrupt_dcid[0] && l2capinbuf[7] == interrupt_dcid[1]) { // l2cap_interrupt
|
||||
|
|
@ -380,8 +380,8 @@ void PS3BT::ACLData(uint8_t* ACLData) {
|
|||
else if(PS3MoveConnected)
|
||||
ButtonState = (uint32_t)(l2capinbuf[10] | ((uint16_t)l2capinbuf[11] << 8) | ((uint32_t)l2capinbuf[12] << 16));
|
||||
|
||||
//Notify(PSTR("\r\nButtonState");
|
||||
//PrintHex<uint32_t>(ButtonState);
|
||||
//Notify(PSTR("\r\nButtonState", 0x80);
|
||||
//PrintHex<uint32_t>(ButtonState, 0x80);
|
||||
|
||||
if(ButtonState != OldButtonState) {
|
||||
ButtonClickState = ButtonState & ~OldButtonState; // Update click state variable
|
||||
|
|
@ -390,7 +390,7 @@ void PS3BT::ACLData(uint8_t* ACLData) {
|
|||
|
||||
#ifdef PRINTREPORT // Uncomment "#define PRINTREPORT" to print the report send by the PS3 Controllers
|
||||
for(uint8_t i = 10; i < 58;i++) {
|
||||
PrintHex<uint8_t>(l2capinbuf[i]);
|
||||
PrintHex<uint8_t>(l2capinbuf[i], 0x80);
|
||||
Serial.print(" ");
|
||||
}
|
||||
Serial.println();
|
||||
|
|
@ -406,7 +406,7 @@ void PS3BT::L2CAP_task() {
|
|||
case L2CAP_WAIT:
|
||||
if (l2cap_connection_request_control_flag) {
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nHID Control Incoming Connection Request"));
|
||||
Notify(PSTR("\r\nHID Control Incoming Connection Request"), 0x80);
|
||||
#endif
|
||||
pBtd->l2cap_connection_response(hci_handle,identifier, control_dcid, control_scid, PENDING);
|
||||
delay(1);
|
||||
|
|
@ -420,7 +420,7 @@ void PS3BT::L2CAP_task() {
|
|||
case L2CAP_CONTROL_REQUEST:
|
||||
if (l2cap_config_request_control_flag) {
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nHID Control Configuration Request"));
|
||||
Notify(PSTR("\r\nHID Control Configuration Request"), 0x80);
|
||||
#endif
|
||||
pBtd->l2cap_config_response(hci_handle,identifier, control_scid);
|
||||
l2cap_state = L2CAP_CONTROL_SUCCESS;
|
||||
|
|
@ -430,7 +430,7 @@ void PS3BT::L2CAP_task() {
|
|||
case L2CAP_CONTROL_SUCCESS:
|
||||
if (l2cap_config_success_control_flag) {
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nHID Control Successfully Configured"));
|
||||
Notify(PSTR("\r\nHID Control Successfully Configured"), 0x80);
|
||||
#endif
|
||||
l2cap_state = L2CAP_INTERRUPT_SETUP;
|
||||
}
|
||||
|
|
@ -438,7 +438,7 @@ void PS3BT::L2CAP_task() {
|
|||
case L2CAP_INTERRUPT_SETUP:
|
||||
if (l2cap_connection_request_interrupt_flag) {
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nHID Interrupt Incoming Connection Request"));
|
||||
Notify(PSTR("\r\nHID Interrupt Incoming Connection Request"), 0x80);
|
||||
#endif
|
||||
pBtd->l2cap_connection_response(hci_handle,identifier, interrupt_dcid, interrupt_scid, PENDING);
|
||||
delay(1);
|
||||
|
|
@ -453,7 +453,7 @@ void PS3BT::L2CAP_task() {
|
|||
case L2CAP_INTERRUPT_REQUEST:
|
||||
if (l2cap_config_request_interrupt_flag) {
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nHID Interrupt Configuration Request"));
|
||||
Notify(PSTR("\r\nHID Interrupt Configuration Request"), 0x80);
|
||||
#endif
|
||||
pBtd->l2cap_config_response(hci_handle,identifier, interrupt_scid);
|
||||
l2cap_state = L2CAP_INTERRUPT_SUCCESS;
|
||||
|
|
@ -462,7 +462,7 @@ void PS3BT::L2CAP_task() {
|
|||
case L2CAP_INTERRUPT_SUCCESS:
|
||||
if (l2cap_config_success_interrupt_flag) {
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nHID Interrupt Successfully Configured"));
|
||||
Notify(PSTR("\r\nHID Interrupt Successfully Configured"), 0x80);
|
||||
#endif
|
||||
if(remote_name[0] == 'M') { // First letter in Motion Controller ('M')
|
||||
for (uint8_t i = 0; i < BULK_MAXPKTSIZE; i++) // Reset l2cap in buffer as it sometimes read it as a button has been pressed
|
||||
|
|
@ -482,7 +482,7 @@ void PS3BT::L2CAP_task() {
|
|||
case L2CAP_INTERRUPT_DISCONNECT:
|
||||
if (l2cap_disconnect_response_interrupt_flag) {
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nDisconnected Interrupt Channel"));
|
||||
Notify(PSTR("\r\nDisconnected Interrupt Channel"), 0x80);
|
||||
#endif
|
||||
identifier++;
|
||||
pBtd->l2cap_disconnection_request(hci_handle, identifier, control_scid, control_dcid);
|
||||
|
|
@ -493,7 +493,7 @@ void PS3BT::L2CAP_task() {
|
|||
case L2CAP_CONTROL_DISCONNECT:
|
||||
if (l2cap_disconnect_response_control_flag) {
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nDisconnected Control Channel"));
|
||||
Notify(PSTR("\r\nDisconnected Control Channel"), 0x80);
|
||||
#endif
|
||||
pBtd->hci_disconnect(hci_handle);
|
||||
hci_handle = -1; // Reset handle
|
||||
|
|
@ -525,20 +525,20 @@ void PS3BT::Run() {
|
|||
if (remote_name[0] == 'P') { // First letter in PLAYSTATION(R)3 Controller ('P')
|
||||
setLedOn(LED1);
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nDualshock 3 Controller Enabled\r\n"));
|
||||
Notify(PSTR("\r\nDualshock 3 Controller Enabled\r\n"), 0x80);
|
||||
#endif
|
||||
PS3Connected = true;
|
||||
} else if (remote_name[0] == 'N') { // First letter in Navigation Controller ('N')
|
||||
setLedOn(LED1); // This just turns LED constantly on, on the Navigation controller
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nNavigation Controller Enabled\r\n"));
|
||||
Notify(PSTR("\r\nNavigation Controller Enabled\r\n"), 0x80);
|
||||
#endif
|
||||
PS3NavigationConnected = true;
|
||||
} else if(remote_name[0] == 'M') { // First letter in Motion Controller ('M')
|
||||
moveSetBulb(Red);
|
||||
timerBulbRumble = millis();
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nMotion Controller Enabled\r\n"));
|
||||
Notify(PSTR("\r\nMotion Controller Enabled\r\n"), 0x80);
|
||||
#endif
|
||||
PS3MoveConnected = true;
|
||||
}
|
||||
|
|
@ -648,7 +648,7 @@ void PS3BT::moveSetBulb(Colors color) { //Use this to set the Color using the pr
|
|||
void PS3BT::moveSetRumble(uint8_t rumble) {
|
||||
#ifdef DEBUG
|
||||
if(rumble < 64 && rumble != 0) // The rumble value has to at least 64, or approximately 25% (64/255*100)
|
||||
Notify(PSTR("\r\nThe rumble value has to at least 64, or approximately 25%"));
|
||||
Notify(PSTR("\r\nThe rumble value has to at least 64, or approximately 25%"), 0x80);
|
||||
#endif
|
||||
//set the rumble value into the write buffer
|
||||
HIDMoveBuffer[7] = rumble;
|
||||
|
|
|
|||
60
PS3USB.cpp
60
PS3USB.cpp
|
|
@ -72,12 +72,12 @@ uint8_t PS3USB::Init(uint8_t parent, uint8_t port, bool lowspeed) {
|
|||
// get memory address of USB device address pool
|
||||
AddressPool &addrPool = pUsb->GetAddressPool();
|
||||
#ifdef EXTRADEBUG
|
||||
Notify(PSTR("\r\nPS3USB Init"));
|
||||
Notify(PSTR("\r\nPS3USB Init"), 0x80);
|
||||
#endif
|
||||
// check if address has already been assigned to an instance
|
||||
if (bAddress) {
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nAddress in use"));
|
||||
Notify(PSTR("\r\nAddress in use"), 0x80);
|
||||
#endif
|
||||
return USB_ERROR_CLASS_INSTANCE_ALREADY_IN_USE;
|
||||
}
|
||||
|
|
@ -87,14 +87,14 @@ uint8_t PS3USB::Init(uint8_t parent, uint8_t port, bool lowspeed) {
|
|||
|
||||
if (!p) {
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nAddress not found"));
|
||||
Notify(PSTR("\r\nAddress not found"), 0x80);
|
||||
#endif
|
||||
return USB_ERROR_ADDRESS_NOT_FOUND_IN_POOL;
|
||||
}
|
||||
|
||||
if (!p->epinfo) {
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nepinfo is null"));
|
||||
Notify(PSTR("\r\nepinfo is null"), 0x80);
|
||||
#endif
|
||||
return USB_ERROR_EPINFO_IS_NULL;
|
||||
}
|
||||
|
|
@ -137,14 +137,14 @@ uint8_t PS3USB::Init(uint8_t parent, uint8_t port, bool lowspeed) {
|
|||
addrPool.FreeAddress(bAddress);
|
||||
bAddress = 0;
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nsetAddr: "));
|
||||
Notify(PSTR("\r\nsetAddr: "), 0x80);
|
||||
#endif
|
||||
PrintHex<uint8_t>(rcode);
|
||||
PrintHex<uint8_t>(rcode, 0x80);
|
||||
return rcode;
|
||||
}
|
||||
#ifdef EXTRADEBUG
|
||||
Notify(PSTR("\r\nAddr: "));
|
||||
PrintHex<uint8_t>(bAddress);
|
||||
Notify(PSTR("\r\nAddr: "), 0x80);
|
||||
PrintHex<uint8_t>(bAddress, 0x80);
|
||||
#endif
|
||||
p->lowspeed = false;
|
||||
|
||||
|
|
@ -192,12 +192,12 @@ uint8_t PS3USB::Init(uint8_t parent, uint8_t port, bool lowspeed) {
|
|||
if(PID == PS3_PID || PID == PS3NAVIGATION_PID) {
|
||||
if(PID == PS3_PID) {
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nDualshock 3 Controller Connected"));
|
||||
Notify(PSTR("\r\nDualshock 3 Controller Connected"), 0x80);
|
||||
#endif
|
||||
PS3Connected = true;
|
||||
} else { // must be a navigation controller
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nNavigation Controller Connected"));
|
||||
Notify(PSTR("\r\nNavigation Controller Connected"), 0x80);
|
||||
#endif
|
||||
PS3NavigationConnected = true;
|
||||
}
|
||||
|
|
@ -215,7 +215,7 @@ uint8_t PS3USB::Init(uint8_t parent, uint8_t port, bool lowspeed) {
|
|||
}
|
||||
else { // must be a Motion controller
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nMotion Controller Connected"));
|
||||
Notify(PSTR("\r\nMotion Controller Connected"), 0x80);
|
||||
#endif
|
||||
PS3MoveConnected = true;
|
||||
setMoveBdaddr(my_bdaddr); // Set internal bluetooth address
|
||||
|
|
@ -227,38 +227,38 @@ uint8_t PS3USB::Init(uint8_t parent, uint8_t port, bool lowspeed) {
|
|||
}
|
||||
|
||||
bPollEnable = true;
|
||||
Notify(PSTR("\r\n"));
|
||||
Notify(PSTR("\r\n"), 0x80);
|
||||
timer = millis();
|
||||
return 0; // successful configuration
|
||||
|
||||
/* diagnostic messages */
|
||||
FailGetDevDescr:
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\ngetDevDescr:"));
|
||||
Notify(PSTR("\r\ngetDevDescr:"), 0x80);
|
||||
#endif
|
||||
goto Fail;
|
||||
FailSetDevTblEntry:
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nsetDevTblEn:"));
|
||||
Notify(PSTR("\r\nsetDevTblEn:"), 0x80);
|
||||
#endif
|
||||
goto Fail;
|
||||
FailSetConf:
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nsetConf:"));
|
||||
Notify(PSTR("\r\nsetConf:"), 0x80);
|
||||
#endif
|
||||
goto Fail;
|
||||
FailUnknownDevice:
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nUnknown Device Connected - VID: "));
|
||||
PrintHex<uint16_t>(VID);
|
||||
Notify(PSTR(" PID: "));
|
||||
PrintHex<uint16_t>(PID);
|
||||
Notify(PSTR("\r\nUnknown Device Connected - VID: "), 0x80);
|
||||
PrintHex<uint16_t>(VID, 0x80);
|
||||
Notify(PSTR(" PID: "), 0x80);
|
||||
PrintHex<uint16_t>(PID, 0x80);
|
||||
#endif
|
||||
rcode = USB_DEV_CONFIG_ERROR_DEVICE_NOT_SUPPORTED;
|
||||
goto Fail;
|
||||
Fail:
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nPS3 Init Failed, error code: "));
|
||||
Notify(PSTR("\r\nPS3 Init Failed, error code: "), 0x80);
|
||||
Serial.print(rcode,HEX);
|
||||
#endif
|
||||
Release();
|
||||
|
|
@ -305,8 +305,8 @@ void PS3USB::readReport() {
|
|||
|
||||
ButtonState = (uint32_t)(readBuf[2] | ((uint16_t)readBuf[3] << 8) | ((uint32_t)readBuf[4] << 16));
|
||||
|
||||
//Notify(PSTR("\r\nButtonState");
|
||||
//PrintHex<uint32_t>(ButtonState);
|
||||
//Notify(PSTR("\r\nButtonState", 0x80);
|
||||
//PrintHex<uint32_t>(ButtonState, 0x80);
|
||||
|
||||
if(ButtonState != OldButtonState) {
|
||||
ButtonClickState = ButtonState & ~OldButtonState; // Update click state variable
|
||||
|
|
@ -319,7 +319,7 @@ void PS3USB::printReport() { //Uncomment "#define PRINTREPORT" to print the repo
|
|||
if (readBuf == NULL)
|
||||
return;
|
||||
for(uint8_t i = 0; i < PS3_REPORT_BUFFER_SIZE;i++) {
|
||||
PrintHex<uint8_t>(readBuf[i]);
|
||||
PrintHex<uint8_t>(readBuf[i], 0x80);
|
||||
Serial.print(" ");
|
||||
}
|
||||
Serial.println();
|
||||
|
|
@ -479,12 +479,12 @@ void PS3USB::setBdaddr(uint8_t* BDADDR) {
|
|||
//bmRequest = Host to device (0x00) | Class (0x20) | Interface (0x01) = 0x21, bRequest = Set Report (0x09), Report ID (0xF5), Report Type (Feature 0x03), interface (0x00), datalength, datalength, data)
|
||||
pUsb->ctrlReq(bAddress,epInfo[PS3_CONTROL_PIPE].epAddr, bmREQ_HID_OUT, HID_REQUEST_SET_REPORT, 0xF5, 0x03, 0x00, 8, 8, buf, NULL);
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nBluetooth Address was set to: "));
|
||||
Notify(PSTR("\r\nBluetooth Address was set to: "), 0x80);
|
||||
for(int8_t i = 5; i > 0; i--) {
|
||||
PrintHex<uint8_t>(my_bdaddr[i]);
|
||||
PrintHex<uint8_t>(my_bdaddr[i], 0x80);
|
||||
Serial.print(":");
|
||||
}
|
||||
PrintHex<uint8_t>(my_bdaddr[0]);
|
||||
PrintHex<uint8_t>(my_bdaddr[0], 0x80);
|
||||
#endif
|
||||
return;
|
||||
}
|
||||
|
|
@ -518,7 +518,7 @@ void PS3USB::moveSetBulb(Colors color) { //Use this to set the Color using the p
|
|||
void PS3USB::moveSetRumble(uint8_t rumble) {
|
||||
#ifdef DEBUG
|
||||
if(rumble < 64 && rumble != 0) // The rumble value has to at least 64, or approximately 25% (64/255*100)
|
||||
Notify(PSTR("\r\nThe rumble value has to at least 64, or approximately 25%"));
|
||||
Notify(PSTR("\r\nThe rumble value has to at least 64, or approximately 25%"), 0x80);
|
||||
#endif
|
||||
//set the rumble value into the write buffer
|
||||
writeBuf[6] = rumble;
|
||||
|
|
@ -540,12 +540,12 @@ void PS3USB::setMoveBdaddr(uint8_t* BDADDR) {
|
|||
//bmRequest = Host to device (0x00) | Class (0x20) | Interface (0x01) = 0x21, bRequest = Set Report (0x09), Report ID (0x05), Report Type (Feature 0x03), interface (0x00), datalength, datalength, data)
|
||||
pUsb->ctrlReq(bAddress,epInfo[PS3_CONTROL_PIPE].epAddr, bmREQ_HID_OUT, HID_REQUEST_SET_REPORT, 0x05, 0x03, 0x00,11,11, buf, NULL);
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nBluetooth Address was set to: "));
|
||||
Notify(PSTR("\r\nBluetooth Address was set to: "), 0x80);
|
||||
for(int8_t i = 5; i > 0; i--) {
|
||||
PrintHex<uint8_t>(my_bdaddr[i]);
|
||||
PrintHex<uint8_t>(my_bdaddr[i], 0x80);
|
||||
Serial.print(":");
|
||||
}
|
||||
PrintHex<uint8_t>(my_bdaddr[0]);
|
||||
PrintHex<uint8_t>(my_bdaddr[0], 0x80);
|
||||
#endif
|
||||
return;
|
||||
}
|
||||
138
SPP.cpp
138
SPP.cpp
|
|
@ -96,31 +96,31 @@ void SPP::ACLData(uint8_t* l2capinbuf) {
|
|||
if ((l2capinbuf[6] | (l2capinbuf[7] << 8)) == 0x0001) { //l2cap_control - Channel ID for ACL-U
|
||||
if (l2capinbuf[8] == L2CAP_CMD_COMMAND_REJECT) {
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nL2CAP Command Rejected - Reason: "));
|
||||
PrintHex<uint8_t>(l2capinbuf[13]);
|
||||
Notify(PSTR(" "));
|
||||
PrintHex<uint8_t>(l2capinbuf[12]);
|
||||
Notify(PSTR(" Data: "));
|
||||
PrintHex<uint8_t>(l2capinbuf[17]);
|
||||
Notify(PSTR(" "));
|
||||
PrintHex<uint8_t>(l2capinbuf[16]);
|
||||
Notify(PSTR(" "));
|
||||
PrintHex<uint8_t>(l2capinbuf[15]);
|
||||
Notify(PSTR(" "));
|
||||
PrintHex<uint8_t>(l2capinbuf[14]);
|
||||
Notify(PSTR("\r\nL2CAP Command Rejected - Reason: "), 0x80);
|
||||
PrintHex<uint8_t>(l2capinbuf[13], 0x80);
|
||||
Notify(PSTR(" "), 0x80);
|
||||
PrintHex<uint8_t>(l2capinbuf[12], 0x80);
|
||||
Notify(PSTR(" Data: "), 0x80);
|
||||
PrintHex<uint8_t>(l2capinbuf[17], 0x80);
|
||||
Notify(PSTR(" "), 0x80);
|
||||
PrintHex<uint8_t>(l2capinbuf[16], 0x80);
|
||||
Notify(PSTR(" "), 0x80);
|
||||
PrintHex<uint8_t>(l2capinbuf[15], 0x80);
|
||||
Notify(PSTR(" "), 0x80);
|
||||
PrintHex<uint8_t>(l2capinbuf[14], 0x80);
|
||||
#endif
|
||||
} else if (l2capinbuf[8] == L2CAP_CMD_CONNECTION_REQUEST) {
|
||||
#ifdef EXTRADEBUG
|
||||
Notify(PSTR("\r\nL2CAP Connection Request - PSM: "));
|
||||
PrintHex<uint8_t>(l2capinbuf[13]);
|
||||
Notify(PSTR(" "));
|
||||
PrintHex<uint8_t>(l2capinbuf[12]);
|
||||
Notify(PSTR(" SCID: "));
|
||||
PrintHex<uint8_t>(l2capinbuf[15]);
|
||||
Notify(PSTR(" "));
|
||||
PrintHex<uint8_t>(l2capinbuf[14]);
|
||||
Notify(PSTR(" Identifier: "));
|
||||
PrintHex<uint8_t>(l2capinbuf[9]);
|
||||
Notify(PSTR("\r\nL2CAP Connection Request - PSM: "), 0x80);
|
||||
PrintHex<uint8_t>(l2capinbuf[13], 0x80);
|
||||
Notify(PSTR(" "), 0x80);
|
||||
PrintHex<uint8_t>(l2capinbuf[12], 0x80);
|
||||
Notify(PSTR(" SCID: "), 0x80);
|
||||
PrintHex<uint8_t>(l2capinbuf[15], 0x80);
|
||||
Notify(PSTR(" "), 0x80);
|
||||
PrintHex<uint8_t>(l2capinbuf[14], 0x80);
|
||||
Notify(PSTR(" Identifier: "), 0x80);
|
||||
PrintHex<uint8_t>(l2capinbuf[9], 0x80);
|
||||
#endif
|
||||
if ((l2capinbuf[12] | (l2capinbuf[13] << 8)) == SDP_PSM) { // It doesn't matter if it receives another reqeust, since it waits for the channel to disconnect in the L2CAP_SDP_DONE state, and the l2cap_event_flag will be cleared if so
|
||||
identifier = l2capinbuf[9];
|
||||
|
|
@ -157,11 +157,11 @@ void SPP::ACLData(uint8_t* l2capinbuf) {
|
|||
}
|
||||
} else if (l2capinbuf[8] == L2CAP_CMD_DISCONNECT_REQUEST) {
|
||||
if (l2capinbuf[12] == sdp_dcid[0] && l2capinbuf[13] == sdp_dcid[1]) {
|
||||
//Notify(PSTR("\r\nDisconnect Request: SDP Channel"));
|
||||
//Notify(PSTR("\r\nDisconnect Request: SDP Channel"), 0x80);
|
||||
identifier = l2capinbuf[9];
|
||||
l2cap_event_flag |= L2CAP_FLAG_DISCONNECT_SDP_REQUEST;
|
||||
} else if (l2capinbuf[12] == rfcomm_dcid[0] && l2capinbuf[13] == rfcomm_dcid[1]) {
|
||||
//Notify(PSTR("\r\nDisconnect Request: RFCOMM Channel"));
|
||||
//Notify(PSTR("\r\nDisconnect Request: RFCOMM Channel"), 0x80);
|
||||
identifier = l2capinbuf[9];
|
||||
l2cap_event_flag |= L2CAP_FLAG_DISCONNECT_RFCOMM_REQUEST;
|
||||
}
|
||||
|
|
@ -177,15 +177,15 @@ void SPP::ACLData(uint8_t* l2capinbuf) {
|
|||
}
|
||||
} else if (l2capinbuf[8] == L2CAP_CMD_INFORMATION_REQUEST) {
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nInformation request"));
|
||||
Notify(PSTR("\r\nInformation request"), 0x80);
|
||||
#endif
|
||||
identifier = l2capinbuf[9];
|
||||
pBtd->l2cap_information_response(hci_handle,identifier,l2capinbuf[12],l2capinbuf[13]);
|
||||
}
|
||||
#ifdef EXTRADEBUG
|
||||
else {
|
||||
Notify(PSTR("\r\nL2CAP Unknown Signaling Command: "));
|
||||
PrintHex<uint8_t>(l2capinbuf[8]);
|
||||
Notify(PSTR("\r\nL2CAP Unknown Signaling Command: "), 0x80);
|
||||
PrintHex<uint8_t>(l2capinbuf[8], 0x80);
|
||||
}
|
||||
#endif
|
||||
} else if (l2capinbuf[6] == sdp_dcid[0] && l2capinbuf[7] == sdp_dcid[1]) { // SDP
|
||||
|
|
@ -226,20 +226,20 @@ void SPP::ACLData(uint8_t* l2capinbuf) {
|
|||
rfcommChannelConnection = rfcommChannel;
|
||||
|
||||
#ifdef EXTRADEBUG
|
||||
Notify(PSTR("\r\nRFCOMM Channel: "));
|
||||
Notify(PSTR("\r\nRFCOMM Channel: "), 0x80);
|
||||
Serial.print(rfcommChannel>>3,HEX);
|
||||
Notify(PSTR(" Direction: "));
|
||||
Notify(PSTR(" Direction: "), 0x80);
|
||||
Serial.print(rfcommDirection>>2,HEX);
|
||||
Notify(PSTR(" CommandResponse: "));
|
||||
Notify(PSTR(" CommandResponse: "), 0x80);
|
||||
Serial.print(rfcommCommandResponse>>1,HEX);
|
||||
Notify(PSTR(" ChannelType: "));
|
||||
Notify(PSTR(" ChannelType: "), 0x80);
|
||||
Serial.print(rfcommChannelType,HEX);
|
||||
Notify(PSTR(" PF_BIT: "));
|
||||
Notify(PSTR(" PF_BIT: "), 0x80);
|
||||
Serial.print(rfcommPfBit,HEX);
|
||||
#endif
|
||||
if (rfcommChannelType == RFCOMM_DISC) {
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nReceived Disconnect RFCOMM Command on channel: "));
|
||||
Notify(PSTR("\r\nReceived Disconnect RFCOMM Command on channel: "), 0x80);
|
||||
Serial.print(rfcommChannel>>3,HEX);
|
||||
#endif
|
||||
connected = false;
|
||||
|
|
@ -256,10 +256,10 @@ void SPP::ACLData(uint8_t* l2capinbuf) {
|
|||
rfcommAvailable += length;
|
||||
}
|
||||
#ifdef EXTRADEBUG
|
||||
Notify(PSTR("\r\nRFCOMM Data Available: "));
|
||||
Notify(PSTR("\r\nRFCOMM Data Available: "), 0x80);
|
||||
Serial.print(rfcommAvailable);
|
||||
if (offset) {
|
||||
Notify(PSTR(" - Credit: 0x"));
|
||||
Notify(PSTR(" - Credit: 0x"), 0x80);
|
||||
Serial.print(l2capinbuf[11],HEX);
|
||||
}
|
||||
#endif
|
||||
|
|
@ -269,7 +269,7 @@ void SPP::ACLData(uint8_t* l2capinbuf) {
|
|||
#endif
|
||||
} else if (rfcommChannelType == RFCOMM_UIH && l2capinbuf[11] == BT_RFCOMM_RPN_CMD) { // UIH Remote Port Negotiation Command
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nReceived UIH Remote Port Negotiation Command"));
|
||||
Notify(PSTR("\r\nReceived UIH Remote Port Negotiation Command"), 0x80);
|
||||
#endif
|
||||
rfcommbuf[0] = BT_RFCOMM_RPN_RSP; // Command
|
||||
rfcommbuf[1] = l2capinbuf[12]; // Length and shiftet like so: length << 1 | 1
|
||||
|
|
@ -284,7 +284,7 @@ void SPP::ACLData(uint8_t* l2capinbuf) {
|
|||
sendRfcomm(rfcommChannel,rfcommDirection,0,RFCOMM_UIH,rfcommPfBit,rfcommbuf,0x0A); // UIH Remote Port Negotiation Response
|
||||
} else if(rfcommChannelType == RFCOMM_UIH && l2capinbuf[11] == BT_RFCOMM_MSC_CMD) { // UIH Modem Status Command
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nSend UIH Modem Status Response"));
|
||||
Notify(PSTR("\r\nSend UIH Modem Status Response"), 0x80);
|
||||
#endif
|
||||
rfcommbuf[0] = BT_RFCOMM_MSC_RSP; // UIH Modem Status Response
|
||||
rfcommbuf[1] = 2 << 1 | 1; // Length and shiftet like so: length << 1 | 1
|
||||
|
|
@ -295,12 +295,12 @@ void SPP::ACLData(uint8_t* l2capinbuf) {
|
|||
} else {
|
||||
if(rfcommChannelType == RFCOMM_SABM) { // SABM Command - this is sent twice: once for channel 0 and then for the channel to establish
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nReceived SABM Command"));
|
||||
Notify(PSTR("\r\nReceived SABM Command"), 0x80);
|
||||
#endif
|
||||
sendRfcomm(rfcommChannel,rfcommDirection,rfcommCommandResponse,RFCOMM_UA,rfcommPfBit,rfcommbuf,0x00); // UA Command
|
||||
} else if(rfcommChannelType == RFCOMM_UIH && l2capinbuf[11] == BT_RFCOMM_PN_CMD) { // UIH Parameter Negotiation Command
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nReceived UIH Parameter Negotiation Command"));
|
||||
Notify(PSTR("\r\nReceived UIH Parameter Negotiation Command"), 0x80);
|
||||
#endif
|
||||
rfcommbuf[0] = BT_RFCOMM_PN_RSP; // UIH Parameter Negotiation Response
|
||||
rfcommbuf[1] = l2capinbuf[12]; // Length and shiftet like so: length << 1 | 1
|
||||
|
|
@ -315,7 +315,7 @@ void SPP::ACLData(uint8_t* l2capinbuf) {
|
|||
sendRfcomm(rfcommChannel,rfcommDirection,0,RFCOMM_UIH,rfcommPfBit,rfcommbuf,0x0A);
|
||||
} else if(rfcommChannelType == RFCOMM_UIH && l2capinbuf[11] == BT_RFCOMM_MSC_CMD) { // UIH Modem Status Command
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nSend UIH Modem Status Response"));
|
||||
Notify(PSTR("\r\nSend UIH Modem Status Response"), 0x80);
|
||||
#endif
|
||||
rfcommbuf[0] = BT_RFCOMM_MSC_RSP; // UIH Modem Status Response
|
||||
rfcommbuf[1] = 2 << 1 | 1; // Length and shiftet like so: length << 1 | 1
|
||||
|
|
@ -325,7 +325,7 @@ void SPP::ACLData(uint8_t* l2capinbuf) {
|
|||
|
||||
delay(1);
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nSend UIH Modem Status Command"));
|
||||
Notify(PSTR("\r\nSend UIH Modem Status Command"), 0x80);
|
||||
#endif
|
||||
rfcommbuf[0] = BT_RFCOMM_MSC_CMD; // UIH Modem Status Command
|
||||
rfcommbuf[1] = 2 << 1 | 1; // Length and shiftet like so: length << 1 | 1
|
||||
|
|
@ -336,7 +336,7 @@ void SPP::ACLData(uint8_t* l2capinbuf) {
|
|||
} else if(rfcommChannelType == RFCOMM_UIH && l2capinbuf[11] == BT_RFCOMM_MSC_RSP) { // UIH Modem Status Response
|
||||
if(!creditSent) {
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nSend UIH Command with credit"));
|
||||
Notify(PSTR("\r\nSend UIH Command with credit"), 0x80);
|
||||
#endif
|
||||
sendRfcommCredit(rfcommChannelConnection,rfcommDirection,0,RFCOMM_UIH,0x10,sizeof(rfcommDataBuffer)); // Send credit
|
||||
creditSent = true;
|
||||
|
|
@ -345,11 +345,11 @@ void SPP::ACLData(uint8_t* l2capinbuf) {
|
|||
}
|
||||
} else if(rfcommChannelType == RFCOMM_UIH && l2capinbuf[10] == 0x01) { // UIH Command with credit
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nReceived UIH Command with credit"));
|
||||
Notify(PSTR("\r\nReceived UIH Command with credit"), 0x80);
|
||||
#endif
|
||||
} else if(rfcommChannelType == RFCOMM_UIH && l2capinbuf[11] == BT_RFCOMM_RPN_CMD) { // UIH Remote Port Negotiation Command
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nReceived UIH Remote Port Negotiation Command"));
|
||||
Notify(PSTR("\r\nReceived UIH Remote Port Negotiation Command"), 0x80);
|
||||
#endif
|
||||
rfcommbuf[0] = BT_RFCOMM_RPN_RSP; // Command
|
||||
rfcommbuf[1] = l2capinbuf[12]; // Length and shiftet like so: length << 1 | 1
|
||||
|
|
@ -363,7 +363,7 @@ void SPP::ACLData(uint8_t* l2capinbuf) {
|
|||
rfcommbuf[9] = l2capinbuf[20]; // Number of Frames
|
||||
sendRfcomm(rfcommChannel,rfcommDirection,0,RFCOMM_UIH,rfcommPfBit,rfcommbuf,0x0A); // UIH Remote Port Negotiation Response
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nRFCOMM Connection is now established\r\n"));
|
||||
Notify(PSTR("\r\nRFCOMM Connection is now established\r\n"), 0x80);
|
||||
#endif
|
||||
waitForLastCommand = false;
|
||||
creditSent = false;
|
||||
|
|
@ -371,20 +371,20 @@ void SPP::ACLData(uint8_t* l2capinbuf) {
|
|||
}
|
||||
#ifdef DEBUG
|
||||
else if(rfcommChannelType != RFCOMM_DISC) {
|
||||
Notify(PSTR("\r\nUnsupported RFCOMM Data - ChannelType: "));
|
||||
PrintHex<uint8_t>(rfcommChannelType);
|
||||
Notify(PSTR(" Command: "));
|
||||
PrintHex<uint8_t>(l2capinbuf[11]);
|
||||
Notify(PSTR("\r\nUnsupported RFCOMM Data - ChannelType: "), 0x80);
|
||||
PrintHex<uint8_t>(rfcommChannelType, 0x80);
|
||||
Notify(PSTR(" Command: "), 0x80);
|
||||
PrintHex<uint8_t>(l2capinbuf[11], 0x80);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
}
|
||||
#ifdef EXTRADEBUG
|
||||
else {
|
||||
Notify(PSTR("\r\nUnsupported L2CAP Data - Channel ID: "));
|
||||
PrintHex<uint8_t>(l2capinbuf[7]);
|
||||
Notify(PSTR(" "));
|
||||
PrintHex<uint8_t>(l2capinbuf[6]);
|
||||
Notify(PSTR("\r\nUnsupported L2CAP Data - Channel ID: "), 0x80);
|
||||
PrintHex<uint8_t>(l2capinbuf[7], 0x80);
|
||||
Notify(PSTR(" "), 0x80);
|
||||
PrintHex<uint8_t>(l2capinbuf[6], 0x80);
|
||||
}
|
||||
#endif
|
||||
SDP_task();
|
||||
|
|
@ -394,7 +394,7 @@ void SPP::ACLData(uint8_t* l2capinbuf) {
|
|||
void SPP::Run() {
|
||||
if(waitForLastCommand && (millis() - timer) > 100) { // We will only wait 100ms and see if the UIH Remote Port Negotiation Command is send, as some deviced don't send it
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nRFCOMM Connection is now established - Automatic\r\n"));
|
||||
Notify(PSTR("\r\nRFCOMM Connection is now established - Automatic\r\n"), 0x80);
|
||||
#endif
|
||||
creditSent = false;
|
||||
waitForLastCommand = false;
|
||||
|
|
@ -408,7 +408,7 @@ void SPP::SDP_task() {
|
|||
if (l2cap_connection_request_sdp_flag) {
|
||||
l2cap_event_flag &= ~L2CAP_FLAG_CONNECTION_SDP_REQUEST; // Clear flag
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nSDP Incoming Connection Request"));
|
||||
Notify(PSTR("\r\nSDP Incoming Connection Request"), 0x80);
|
||||
#endif
|
||||
pBtd->l2cap_connection_response(hci_handle,identifier, sdp_dcid, sdp_scid, PENDING);
|
||||
delay(1);
|
||||
|
|
@ -423,7 +423,7 @@ void SPP::SDP_task() {
|
|||
if (l2cap_config_request_sdp_flag) {
|
||||
l2cap_event_flag &= ~L2CAP_FLAG_CONFIG_SDP_REQUEST; // Clear flag
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nSDP Configuration Request"));
|
||||
Notify(PSTR("\r\nSDP Configuration Request"), 0x80);
|
||||
#endif
|
||||
pBtd->l2cap_config_response(hci_handle,identifier, sdp_scid);
|
||||
l2cap_sdp_state = L2CAP_SDP_SUCCESS;
|
||||
|
|
@ -433,7 +433,7 @@ void SPP::SDP_task() {
|
|||
if (l2cap_config_success_sdp_flag) {
|
||||
l2cap_event_flag &= ~L2CAP_FLAG_CONFIG_SDP_SUCCESS; // Clear flag
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nSDP Successfully Configured"));
|
||||
Notify(PSTR("\r\nSDP Successfully Configured"), 0x80);
|
||||
#endif
|
||||
firstMessage = true; // Reset bool
|
||||
SDPConnected = true;
|
||||
|
|
@ -445,7 +445,7 @@ void SPP::SDP_task() {
|
|||
l2cap_event_flag &= ~L2CAP_FLAG_DISCONNECT_SDP_REQUEST; // Clear flag
|
||||
SDPConnected = false;
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nDisconnected SDP Channel"));
|
||||
Notify(PSTR("\r\nDisconnected SDP Channel"), 0x80);
|
||||
#endif
|
||||
pBtd->l2cap_disconnection_response(hci_handle,identifier,sdp_dcid,sdp_scid);
|
||||
l2cap_sdp_state = L2CAP_SDP_WAIT;
|
||||
|
|
@ -455,7 +455,7 @@ void SPP::SDP_task() {
|
|||
case L2CAP_DISCONNECT_RESPONSE: // This is for both disconnection response from the RFCOMM and SDP channel if they were connected
|
||||
if (l2cap_disconnect_response_flag) {
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nDisconnected L2CAP Connection"));
|
||||
Notify(PSTR("\r\nDisconnected L2CAP Connection"), 0x80);
|
||||
#endif
|
||||
RFCOMMConnected = false;
|
||||
SDPConnected = false;
|
||||
|
|
@ -476,7 +476,7 @@ void SPP::RFCOMM_task()
|
|||
if(l2cap_connection_request_rfcomm_flag) {
|
||||
l2cap_event_flag &= ~L2CAP_FLAG_CONNECTION_RFCOMM_REQUEST; // Clear flag
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nRFCOMM Incoming Connection Request"));
|
||||
Notify(PSTR("\r\nRFCOMM Incoming Connection Request"), 0x80);
|
||||
#endif
|
||||
pBtd->l2cap_connection_response(hci_handle,identifier, rfcomm_dcid, rfcomm_scid, PENDING);
|
||||
delay(1);
|
||||
|
|
@ -491,7 +491,7 @@ void SPP::RFCOMM_task()
|
|||
if (l2cap_config_request_rfcomm_flag) {
|
||||
l2cap_event_flag &= ~L2CAP_FLAG_CONFIG_RFCOMM_REQUEST; // Clear flag
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nRFCOMM Configuration Request"));
|
||||
Notify(PSTR("\r\nRFCOMM Configuration Request"), 0x80);
|
||||
#endif
|
||||
pBtd->l2cap_config_response(hci_handle,identifier, rfcomm_scid);
|
||||
l2cap_rfcomm_state = L2CAP_RFCOMM_SUCCESS;
|
||||
|
|
@ -501,7 +501,7 @@ void SPP::RFCOMM_task()
|
|||
if (l2cap_config_success_rfcomm_flag) {
|
||||
l2cap_event_flag &= ~L2CAP_FLAG_CONFIG_RFCOMM_SUCCESS; // Clear flag
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nRFCOMM Successfully Configured"));
|
||||
Notify(PSTR("\r\nRFCOMM Successfully Configured"), 0x80);
|
||||
#endif
|
||||
rfcommAvailable = 0; // Reset number of bytes available
|
||||
bytesRead = 0; // Reset number of bytes received
|
||||
|
|
@ -515,7 +515,7 @@ void SPP::RFCOMM_task()
|
|||
RFCOMMConnected = false;
|
||||
connected = false;
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nDisconnected RFCOMM Channel"));
|
||||
Notify(PSTR("\r\nDisconnected RFCOMM Channel"), 0x80);
|
||||
#endif
|
||||
pBtd->l2cap_disconnection_response(hci_handle,identifier,rfcomm_dcid,rfcomm_scid);
|
||||
l2cap_rfcomm_state = L2CAP_RFCOMM_WAIT;
|
||||
|
|
@ -666,10 +666,10 @@ void SPP::sendRfcomm(uint8_t channel, uint8_t direction, uint8_t CR, uint8_t cha
|
|||
l2capoutbuf[i+3] = data[i];
|
||||
l2capoutbuf[i+3] = calcFcs(l2capoutbuf);
|
||||
#ifdef EXTRADEBUG
|
||||
Notify(PSTR(" - RFCOMM Data: "));
|
||||
Notify(PSTR(" - RFCOMM Data: "), 0x80);
|
||||
for(i = 0; i < length+4; i++) {
|
||||
Serial.print(l2capoutbuf[i],HEX);
|
||||
Notify(PSTR(" "));
|
||||
Notify(PSTR(" "), 0x80);
|
||||
}
|
||||
#endif
|
||||
RFCOMM_Command(l2capoutbuf,length+4);
|
||||
|
|
@ -682,10 +682,10 @@ void SPP::sendRfcommCredit(uint8_t channel, uint8_t direction, uint8_t CR, uint8
|
|||
l2capoutbuf[3] = credit; // Credit
|
||||
l2capoutbuf[4] = calcFcs(l2capoutbuf);
|
||||
#ifdef EXTRADEBUG
|
||||
Notify(PSTR(" - RFCOMM Credit Data: "));
|
||||
Notify(PSTR(" - RFCOMM Credit Data: "), 0x80);
|
||||
for(uint8_t i = 0; i < 5; i++) {
|
||||
Serial.print(l2capoutbuf[i],HEX);
|
||||
Notify(PSTR(" "));
|
||||
Notify(PSTR(" "), 0x80);
|
||||
}
|
||||
#endif
|
||||
RFCOMM_Command(l2capoutbuf,5);
|
||||
|
|
@ -902,9 +902,9 @@ uint8_t SPP::read() {
|
|||
bytesRead = 0;
|
||||
sendRfcommCredit(rfcommChannelConnection,rfcommDirection,0,RFCOMM_UIH,0x10,sizeof(rfcommDataBuffer)); // Send more credit
|
||||
#ifdef EXTRADEBUG
|
||||
Notify(PSTR("\r\nSent "));
|
||||
Notify(PSTR("\r\nSent "), 0x80);
|
||||
Serial.print(sizeof(rfcommDataBuffer));
|
||||
Notify(PSTR(" more credit"));
|
||||
Notify(PSTR(" more credit"), 0x80);
|
||||
#endif
|
||||
}
|
||||
return output;
|
||||
|
|
|
|||
174
Wii.cpp
174
Wii.cpp
|
|
@ -118,7 +118,7 @@ void WII::Reset() {
|
|||
void WII::disconnect() { // Use this void to disconnect any of the controllers
|
||||
if(motionPlusConnected && !pBtd->motionPlusInside) { // Disable the Motion Plus extension
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nDeactivating Motion Plus"));
|
||||
Notify(PSTR("\r\nDeactivating Motion Plus"), 0x80);
|
||||
#endif
|
||||
initExtension1(); // This will disable the Motion Plus extension
|
||||
}
|
||||
|
|
@ -144,18 +144,18 @@ void WII::ACLData(uint8_t* l2capinbuf) {
|
|||
if ((l2capinbuf[6] | (l2capinbuf[7] << 8)) == 0x0001) { //l2cap_control - Channel ID for ACL-U
|
||||
if (l2capinbuf[8] == L2CAP_CMD_COMMAND_REJECT) {
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nL2CAP Command Rejected - Reason: "));
|
||||
PrintHex<uint8_t>(l2capinbuf[13]);
|
||||
Notify(PSTR(" "));
|
||||
PrintHex<uint8_t>(l2capinbuf[12]);
|
||||
Notify(PSTR(" "));
|
||||
PrintHex<uint8_t>(l2capinbuf[17]);
|
||||
Notify(PSTR(" "));
|
||||
PrintHex<uint8_t>(l2capinbuf[16]);
|
||||
Notify(PSTR(" "));
|
||||
PrintHex<uint8_t>(l2capinbuf[15]);
|
||||
Notify(PSTR(" "));
|
||||
PrintHex<uint8_t>(l2capinbuf[14]);
|
||||
Notify(PSTR("\r\nL2CAP Command Rejected - Reason: "), 0x80);
|
||||
PrintHex<uint8_t>(l2capinbuf[13], 0x80);
|
||||
Notify(PSTR(" "), 0x80);
|
||||
PrintHex<uint8_t>(l2capinbuf[12], 0x80);
|
||||
Notify(PSTR(" "), 0x80);
|
||||
PrintHex<uint8_t>(l2capinbuf[17], 0x80);
|
||||
Notify(PSTR(" "), 0x80);
|
||||
PrintHex<uint8_t>(l2capinbuf[16], 0x80);
|
||||
Notify(PSTR(" "), 0x80);
|
||||
PrintHex<uint8_t>(l2capinbuf[15], 0x80);
|
||||
Notify(PSTR(" "), 0x80);
|
||||
PrintHex<uint8_t>(l2capinbuf[14], 0x80);
|
||||
#endif
|
||||
}
|
||||
else if (l2capinbuf[8] == L2CAP_CMD_CONNECTION_RESPONSE) {
|
||||
|
|
@ -178,16 +178,16 @@ void WII::ACLData(uint8_t* l2capinbuf) {
|
|||
}
|
||||
else if (l2capinbuf[8] == L2CAP_CMD_CONNECTION_REQUEST) {
|
||||
#ifdef EXTRADEBUG
|
||||
Notify(PSTR("\r\nL2CAP Connection Request - PSM: "));
|
||||
PrintHex<uint8_t>(l2capinbuf[13]);
|
||||
Notify(PSTR(" "));
|
||||
PrintHex<uint8_t>(l2capinbuf[12]);
|
||||
Notify(PSTR(" SCID: "));
|
||||
PrintHex<uint8_t>(l2capinbuf[15]);
|
||||
Notify(PSTR(" "));
|
||||
PrintHex<uint8_t>(l2capinbuf[14]);
|
||||
Notify(PSTR(" Identifier: "));
|
||||
PrintHex<uint8_t>(l2capinbuf[9]);
|
||||
Notify(PSTR("\r\nL2CAP Connection Request - PSM: "), 0x80);
|
||||
PrintHex<uint8_t>(l2capinbuf[13], 0x80);
|
||||
Notify(PSTR(" "), 0x80);
|
||||
PrintHex<uint8_t>(l2capinbuf[12], 0x80);
|
||||
Notify(PSTR(" SCID: "), 0x80);
|
||||
PrintHex<uint8_t>(l2capinbuf[15], 0x80);
|
||||
Notify(PSTR(" "), 0x80);
|
||||
PrintHex<uint8_t>(l2capinbuf[14], 0x80);
|
||||
Notify(PSTR(" Identifier: "), 0x80);
|
||||
PrintHex<uint8_t>(l2capinbuf[9], 0x80);
|
||||
#endif
|
||||
if ((l2capinbuf[12] | (l2capinbuf[13] << 8)) == HID_CTRL_PSM) {
|
||||
identifier = l2capinbuf[9];
|
||||
|
|
@ -229,7 +229,7 @@ void WII::ACLData(uint8_t* l2capinbuf) {
|
|||
else if (l2capinbuf[8] == L2CAP_CMD_DISCONNECT_REQUEST) {
|
||||
if (l2capinbuf[12] == control_dcid[0] && l2capinbuf[13] == control_dcid[1]) {
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nDisconnect Request: Control Channel"));
|
||||
Notify(PSTR("\r\nDisconnect Request: Control Channel"), 0x80);
|
||||
#endif
|
||||
identifier = l2capinbuf[9];
|
||||
pBtd->l2cap_disconnection_response(hci_handle,identifier,control_dcid,control_scid);
|
||||
|
|
@ -237,7 +237,7 @@ void WII::ACLData(uint8_t* l2capinbuf) {
|
|||
}
|
||||
else if (l2capinbuf[12] == interrupt_dcid[0] && l2capinbuf[13] == interrupt_dcid[1]) {
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nDisconnect Request: Interrupt Channel"));
|
||||
Notify(PSTR("\r\nDisconnect Request: Interrupt Channel"), 0x80);
|
||||
#endif
|
||||
identifier = l2capinbuf[9];
|
||||
pBtd->l2cap_disconnection_response(hci_handle,identifier,interrupt_dcid,interrupt_scid);
|
||||
|
|
@ -259,8 +259,8 @@ void WII::ACLData(uint8_t* l2capinbuf) {
|
|||
#ifdef EXTRADEBUG
|
||||
else {
|
||||
identifier = l2capinbuf[9];
|
||||
Notify(PSTR("\r\nL2CAP Unknown Signaling Command: "));
|
||||
PrintHex<uint8_t>(l2capinbuf[8]);
|
||||
Notify(PSTR("\r\nL2CAP Unknown Signaling Command: "), 0x80);
|
||||
PrintHex<uint8_t>(l2capinbuf[8], 0x80);
|
||||
}
|
||||
#endif
|
||||
} else if (l2capinbuf[6] == interrupt_dcid[0] && l2capinbuf[7] == interrupt_dcid[1]) { // l2cap_interrupt
|
||||
|
|
@ -285,9 +285,9 @@ void WII::ACLData(uint8_t* l2capinbuf) {
|
|||
else if(!unknownExtensionConnected)
|
||||
ButtonState = (uint32_t)((l2capinbuf[10] & 0x1F) | ((uint16_t)(l2capinbuf[11] & 0x9F) << 8));
|
||||
#ifdef PRINTREPORT
|
||||
Notify(PSTR("ButtonState: "));
|
||||
PrintHex<uint32_t>(ButtonState);
|
||||
Notify(PSTR("\r\n"));
|
||||
Notify(PSTR("ButtonState: "), 0x80);
|
||||
PrintHex<uint32_t>(ButtonState, 0x80);
|
||||
Notify(PSTR("\r\n"), 0x80);
|
||||
#endif
|
||||
if(ButtonState != OldButtonState) {
|
||||
ButtonClickState = ButtonState & ~OldButtonState; // Update click state variable
|
||||
|
|
@ -307,13 +307,13 @@ void WII::ACLData(uint8_t* l2capinbuf) {
|
|||
batteryLevel = l2capinbuf[15]; // Update battery level
|
||||
if(l2capinbuf[12] & 0x01) {
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nWARNING: Battery is nearly empty"));
|
||||
Notify(PSTR("\r\nWARNING: Battery is nearly empty"), 0x80);
|
||||
#endif
|
||||
}
|
||||
if(l2capinbuf[12] & 0x02) { // Check if a extension is connected
|
||||
#ifdef DEBUG
|
||||
if(!unknownExtensionConnected)
|
||||
Notify(PSTR("\r\nExtension connected"));
|
||||
Notify(PSTR("\r\nExtension connected"), 0x80);
|
||||
#endif
|
||||
unknownExtensionConnected = true;
|
||||
#ifdef WIICAMERA
|
||||
|
|
@ -323,11 +323,11 @@ void WII::ACLData(uint8_t* l2capinbuf) {
|
|||
}
|
||||
else {
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nExtension disconnected"));
|
||||
Notify(PSTR("\r\nExtension disconnected"), 0x80);
|
||||
#endif
|
||||
if(motionPlusConnected) {
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR(" - from Motion Plus"));
|
||||
Notify(PSTR(" - from Motion Plus"), 0x80);
|
||||
#endif
|
||||
l2cap_event_flag &= ~WII_FLAG_NUNCHUCK_CONNECTED;
|
||||
if(!activateNunchuck) // If it's already trying to initialize the Nunchuck don't set it to false
|
||||
|
|
@ -336,7 +336,7 @@ void WII::ACLData(uint8_t* l2capinbuf) {
|
|||
}
|
||||
else if(nunchuckConnected) {
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR(" - Nunchuck"));
|
||||
Notify(PSTR(" - Nunchuck"), 0x80);
|
||||
#endif
|
||||
nunchuckConnected = false; // It must be the Nunchuck controller then
|
||||
l2cap_event_flag &= ~WII_FLAG_NUNCHUCK_CONNECTED;
|
||||
|
|
@ -352,64 +352,64 @@ void WII::ACLData(uint8_t* l2capinbuf) {
|
|||
// See: http://wiibrew.org/wiki/Wiimote/Extension_Controllers
|
||||
if(l2capinbuf[16] == 0x00 && l2capinbuf[17] == 0xA4 && l2capinbuf[18] == 0x20 && l2capinbuf[19] == 0x00 && l2capinbuf[20] == 0x00) {
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nNunchuck connected"));
|
||||
Notify(PSTR("\r\nNunchuck connected"), 0x80);
|
||||
#endif
|
||||
l2cap_event_flag |= WII_FLAG_NUNCHUCK_CONNECTED;
|
||||
} else if(l2capinbuf[16] == 0x00 && (l2capinbuf[17] == 0xA6 || l2capinbuf[17] == 0xA4) && l2capinbuf[18] == 0x20 && l2capinbuf[19] == 0x00 && l2capinbuf[20] == 0x05) {
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nMotion Plus connected"));
|
||||
Notify(PSTR("\r\nMotion Plus connected"), 0x80);
|
||||
#endif
|
||||
l2cap_event_flag |= WII_FLAG_MOTION_PLUS_CONNECTED;
|
||||
} else if(l2capinbuf[16] == 0x00 && l2capinbuf[17] == 0xA4 && l2capinbuf[18] == 0x20 && l2capinbuf[19] == 0x04 && l2capinbuf[20] == 0x05) {
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nMotion Plus activated in normal mode"));
|
||||
Notify(PSTR("\r\nMotion Plus activated in normal mode"), 0x80);
|
||||
#endif
|
||||
motionPlusConnected = true;
|
||||
} else if(l2capinbuf[16] == 0x00 && l2capinbuf[17] == 0xA4 && l2capinbuf[18] == 0x20 && l2capinbuf[19] == 0x05 && l2capinbuf[20] == 0x05) {
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nMotion Plus activated in Nunchuck pass-through mode"));
|
||||
Notify(PSTR("\r\nMotion Plus activated in Nunchuck pass-through mode"), 0x80);
|
||||
#endif
|
||||
activateNunchuck = false;
|
||||
motionPlusConnected = true;
|
||||
nunchuckConnected = true;
|
||||
} else if(l2capinbuf[16] == 0x00 && l2capinbuf[17] == 0xA6 && l2capinbuf[18] == 0x20 && (l2capinbuf[19] == 0x00 || l2capinbuf[19] == 0x04 || l2capinbuf[19] == 0x05 || l2capinbuf[19] == 0x07) && l2capinbuf[20] == 0x05) {
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nInactive Wii Motion Plus"));
|
||||
Notify(PSTR("\r\nPlease unplug the Motion Plus, disconnect the Wiimote and then replug the Motion Plus Extension"));
|
||||
Notify(PSTR("\r\nInactive Wii Motion Plus"), 0x80);
|
||||
Notify(PSTR("\r\nPlease unplug the Motion Plus, disconnect the Wiimote and then replug the Motion Plus Extension"), 0x80);
|
||||
#endif
|
||||
stateCounter = 300; // Skip the rest in "L2CAP_CHECK_MOTION_PLUS_STATE"
|
||||
} else if(l2capinbuf[16] == 0x00 && l2capinbuf[17] == 0xA4 && l2capinbuf[18] == 0x20 && l2capinbuf[19] == 0x01 && l2capinbuf[20] == 0x20) {
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nWii U Pro Controller connected"));
|
||||
Notify(PSTR("\r\nWii U Pro Controller connected"), 0x80);
|
||||
#endif
|
||||
wiiUProControllerConnected = true;
|
||||
}
|
||||
#ifdef DEBUG
|
||||
else {
|
||||
Notify(PSTR("\r\nUnknown Device: "));
|
||||
PrintHex<uint8_t>(l2capinbuf[13]);
|
||||
PrintHex<uint8_t>(l2capinbuf[14]);
|
||||
Notify(PSTR("\r\nData: "));
|
||||
Notify(PSTR("\r\nUnknown Device: "), 0x80);
|
||||
PrintHex<uint8_t>(l2capinbuf[13], 0x80);
|
||||
PrintHex<uint8_t>(l2capinbuf[14], 0x80);
|
||||
Notify(PSTR("\r\nData: "), 0x80);
|
||||
for(uint8_t i = 0; i < ((l2capinbuf[12] >> 4)+1); i++) { // bit 4-7 is the length-1
|
||||
PrintHex<uint8_t>(l2capinbuf[15+i]);
|
||||
Notify(PSTR(" "));
|
||||
PrintHex<uint8_t>(l2capinbuf[15+i], 0x80);
|
||||
Notify(PSTR(" "), 0x80);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
#ifdef EXTRADEBUG
|
||||
else {
|
||||
Notify(PSTR("\r\nReport Error: "));
|
||||
PrintHex<uint8_t>(l2capinbuf[13]);
|
||||
PrintHex<uint8_t>(l2capinbuf[14]);
|
||||
Notify(PSTR("\r\nReport Error: "), 0x80);
|
||||
PrintHex<uint8_t>(l2capinbuf[13], 0x80);
|
||||
PrintHex<uint8_t>(l2capinbuf[14], 0x80);
|
||||
}
|
||||
#endif
|
||||
break;
|
||||
case 0x22: // Acknowledge output report, return function result
|
||||
#ifdef DEBUG
|
||||
if(l2capinbuf[13] != 0x00) { // Check if there is an error
|
||||
Notify(PSTR("\r\nCommand failed: "));
|
||||
PrintHex<uint8_t>(l2capinbuf[12]);
|
||||
Notify(PSTR("\r\nCommand failed: "), 0x80);
|
||||
PrintHex<uint8_t>(l2capinbuf[12], 0x80);
|
||||
}
|
||||
#endif
|
||||
break;
|
||||
|
|
@ -511,7 +511,7 @@ void WII::ACLData(uint8_t* l2capinbuf) {
|
|||
} else {
|
||||
if((micros() - timer) > 1000000) { // Loop for 1 sec before resetting the values
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nThe gyro values has been reset"));
|
||||
Notify(PSTR("\r\nThe gyro values has been reset"), 0x80);
|
||||
#endif
|
||||
gyroYawZero = (l2capinbuf[15] | ((l2capinbuf[18] & 0xFC) << 6));
|
||||
gyroRollZero = (l2capinbuf[16] | ((l2capinbuf[19] & 0xFC) << 6));
|
||||
|
|
@ -546,7 +546,7 @@ void WII::ACLData(uint8_t* l2capinbuf) {
|
|||
extensionConnected = true;
|
||||
unknownExtensionConnected = true;
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nExtension connected to Motion Plus"));
|
||||
Notify(PSTR("\r\nExtension connected to Motion Plus"), 0x80);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
|
@ -555,7 +555,7 @@ void WII::ACLData(uint8_t* l2capinbuf) {
|
|||
extensionConnected = false;
|
||||
unknownExtensionConnected = true;
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nExtension disconnected from Motion Plus"));
|
||||
Notify(PSTR("\r\nExtension disconnected from Motion Plus"), 0x80);
|
||||
#endif
|
||||
nunchuckConnected = false; // There is no extension connected to the Motion Plus if this report is sent
|
||||
}
|
||||
|
|
@ -581,7 +581,7 @@ void WII::ACLData(uint8_t* l2capinbuf) {
|
|||
break;
|
||||
#ifdef DEBUG
|
||||
default:
|
||||
Notify(PSTR("\r\nUnknown Report type: "));
|
||||
Notify(PSTR("\r\nUnknown Report type: "), 0x80);
|
||||
Serial.print(l2capinbuf[9],HEX);
|
||||
break;
|
||||
#endif
|
||||
|
|
@ -598,7 +598,7 @@ void WII::L2CAP_task() {
|
|||
case L2CAP_CONTROL_SUCCESS:
|
||||
if (l2cap_config_success_control_flag) {
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nHID Control Successfully Configured"));
|
||||
Notify(PSTR("\r\nHID Control Successfully Configured"), 0x80);
|
||||
#endif
|
||||
l2cap_state = L2CAP_INTERRUPT_SETUP;
|
||||
}
|
||||
|
|
@ -607,7 +607,7 @@ void WII::L2CAP_task() {
|
|||
case L2CAP_INTERRUPT_SETUP:
|
||||
if (l2cap_connection_request_interrupt_flag) {
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nHID Interrupt Incoming Connection Request"));
|
||||
Notify(PSTR("\r\nHID Interrupt Incoming Connection Request"), 0x80);
|
||||
#endif
|
||||
pBtd->l2cap_connection_response(hci_handle,identifier, interrupt_dcid, interrupt_scid, PENDING);
|
||||
delay(1);
|
||||
|
|
@ -624,7 +624,7 @@ void WII::L2CAP_task() {
|
|||
case L2CAP_CONTROL_CONNECT_REQUEST:
|
||||
if (l2cap_connected_control_flag) {
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nSend HID Control Config Request"));
|
||||
Notify(PSTR("\r\nSend HID Control Config Request"), 0x80);
|
||||
#endif
|
||||
identifier++;
|
||||
pBtd->l2cap_config_request(hci_handle, identifier, control_scid);
|
||||
|
|
@ -635,7 +635,7 @@ void WII::L2CAP_task() {
|
|||
case L2CAP_CONTROL_CONFIG_REQUEST:
|
||||
if(l2cap_config_success_control_flag) {
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nSend HID Interrupt Connection Request"));
|
||||
Notify(PSTR("\r\nSend HID Interrupt Connection Request"), 0x80);
|
||||
#endif
|
||||
identifier++;
|
||||
pBtd->l2cap_connection_request(hci_handle,identifier,interrupt_dcid,HID_INTR_PSM);
|
||||
|
|
@ -646,7 +646,7 @@ void WII::L2CAP_task() {
|
|||
case L2CAP_INTERRUPT_CONNECT_REQUEST:
|
||||
if(l2cap_connected_interrupt_flag) {
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nSend HID Interrupt Config Request"));
|
||||
Notify(PSTR("\r\nSend HID Interrupt Config Request"), 0x80);
|
||||
#endif
|
||||
identifier++;
|
||||
pBtd->l2cap_config_request(hci_handle, identifier, interrupt_scid);
|
||||
|
|
@ -657,7 +657,7 @@ void WII::L2CAP_task() {
|
|||
case L2CAP_INTERRUPT_CONFIG_REQUEST:
|
||||
if(l2cap_config_success_interrupt_flag) { // Now the HID channels is established
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nHID Channels Established"));
|
||||
Notify(PSTR("\r\nHID Channels Established"), 0x80);
|
||||
#endif
|
||||
pBtd->connectToWii = false;
|
||||
pBtd->pairWithWii = false;
|
||||
|
|
@ -672,7 +672,7 @@ void WII::L2CAP_task() {
|
|||
case L2CAP_INTERRUPT_DISCONNECT:
|
||||
if (l2cap_disconnect_response_interrupt_flag) {
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nDisconnected Interrupt Channel"));
|
||||
Notify(PSTR("\r\nDisconnected Interrupt Channel"), 0x80);
|
||||
#endif
|
||||
identifier++;
|
||||
pBtd->l2cap_disconnection_request(hci_handle, identifier, control_scid, control_dcid);
|
||||
|
|
@ -683,7 +683,7 @@ void WII::L2CAP_task() {
|
|||
case L2CAP_CONTROL_DISCONNECT:
|
||||
if (l2cap_disconnect_response_control_flag) {
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nDisconnected Control Channel"));
|
||||
Notify(PSTR("\r\nDisconnected Control Channel"), 0x80);
|
||||
#endif
|
||||
pBtd->hci_disconnect(hci_handle);
|
||||
hci_handle = -1; // Reset handle
|
||||
|
|
@ -700,7 +700,7 @@ void WII::Run() {
|
|||
pBtd->l2capConnectionClaimed = true;
|
||||
activeConnection = true;
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nSend HID Control Connection Request"));
|
||||
Notify(PSTR("\r\nSend HID Control Connection Request"), 0x80);
|
||||
#endif
|
||||
hci_handle = pBtd->hci_handle; // Store the HCI Handle for the connection
|
||||
l2cap_event_flag = 0; // Reset flags
|
||||
|
|
@ -709,7 +709,7 @@ void WII::Run() {
|
|||
l2cap_state = L2CAP_CONTROL_CONNECT_REQUEST;
|
||||
} else if (l2cap_connection_request_control_flag) {
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nHID Control Incoming Connection Request"));
|
||||
Notify(PSTR("\r\nHID Control Incoming Connection Request"), 0x80);
|
||||
#endif
|
||||
pBtd->l2cap_connection_response(hci_handle,identifier, control_dcid, control_scid, PENDING);
|
||||
delay(1);
|
||||
|
|
@ -724,7 +724,7 @@ void WII::Run() {
|
|||
case L2CAP_CHECK_MOTION_PLUS_STATE:
|
||||
#ifdef DEBUG
|
||||
if(stateCounter == 0) // Only print onnce
|
||||
Notify(PSTR("\r\nChecking if a Motion Plus is connected"));
|
||||
Notify(PSTR("\r\nChecking if a Motion Plus is connected"), 0x80);
|
||||
#endif
|
||||
stateCounter++;
|
||||
if(stateCounter%200 == 0)
|
||||
|
|
@ -736,7 +736,7 @@ void WII::Run() {
|
|||
|
||||
if(unknownExtensionConnected) {
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nA extension is also connected"));
|
||||
Notify(PSTR("\r\nA extension is also connected"), 0x80);
|
||||
#endif
|
||||
activateNunchuck = true; // For we will just set this to true as this the only extension supported so far
|
||||
}
|
||||
|
|
@ -744,7 +744,7 @@ void WII::Run() {
|
|||
}
|
||||
else if(stateCounter == 601) { // We will try three times to check for the motion plus
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nNo Motion Plus was detected"));
|
||||
Notify(PSTR("\r\nNo Motion Plus was detected"), 0x80);
|
||||
#endif
|
||||
stateCounter = 0;
|
||||
l2cap_state = L2CAP_CHECK_EXTENSION_STATE;
|
||||
|
|
@ -754,7 +754,7 @@ void WII::Run() {
|
|||
case L2CAP_CHECK_EXTENSION_STATE: // This is used to check if there is anything plugged in to the extension port
|
||||
#ifdef DEBUG
|
||||
if(stateCounter == 0) // Only print onnce
|
||||
Notify(PSTR("\r\nChecking if there is any extension connected"));
|
||||
Notify(PSTR("\r\nChecking if there is any extension connected"), 0x80);
|
||||
#endif
|
||||
stateCounter++; // We use this counter as there has to be a short delay between the commands
|
||||
if(stateCounter == 1)
|
||||
|
|
@ -801,7 +801,7 @@ void WII::Run() {
|
|||
if(unknownExtensionConnected) {
|
||||
#ifdef DEBUG
|
||||
if(stateCounter == 0) // Only print once
|
||||
Notify(PSTR("\r\nChecking extension port"));
|
||||
Notify(PSTR("\r\nChecking extension port"), 0x80);
|
||||
#endif
|
||||
stateCounter++; // We will use this counter as there has to be a short delay between the commands
|
||||
if(stateCounter == 50)
|
||||
|
|
@ -818,7 +818,7 @@ void WII::Run() {
|
|||
else if(stateCounter == 250) {
|
||||
if(nunchuck_connected_flag) {
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nNunchuck was reconnected"));
|
||||
Notify(PSTR("\r\nNunchuck was reconnected"), 0x80);
|
||||
#endif
|
||||
activateNunchuck = true;
|
||||
nunchuckConnected = true;
|
||||
|
|
@ -829,7 +829,7 @@ void WII::Run() {
|
|||
else if (stateCounter == 300) {
|
||||
if(motionPlusConnected) {
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nReactivating the Motion Plus"));
|
||||
Notify(PSTR("\r\nReactivating the Motion Plus"), 0x80);
|
||||
#endif
|
||||
initMotionPlus();
|
||||
} else
|
||||
|
|
@ -963,12 +963,12 @@ void WII::activateMotionPlus() {
|
|||
uint8_t buf[1];
|
||||
if(pBtd->wiiUProController) {
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nActivating Wii U Pro Controller"));
|
||||
Notify(PSTR("\r\nActivating Wii U Pro Controller"), 0x80);
|
||||
#endif
|
||||
buf[0] = 0x00; // It seems like you can send anything but 0x04, 0x05, and 0x07
|
||||
} else if(activateNunchuck) {
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nActivating Motion Plus in pass-through mode"));
|
||||
Notify(PSTR("\r\nActivating Motion Plus in pass-through mode"), 0x80);
|
||||
#endif
|
||||
buf[0] = 0x05; // Activate nunchuck pass-through mode
|
||||
}
|
||||
|
|
@ -976,7 +976,7 @@ void WII::activateMotionPlus() {
|
|||
//buf[0] = 0x07;
|
||||
else {
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nActivating Motion Plus in normal mode"));
|
||||
Notify(PSTR("\r\nActivating Motion Plus in normal mode"), 0x80);
|
||||
#endif
|
||||
buf[0] = 0x04; // Don't use any extension
|
||||
}
|
||||
|
|
@ -1060,58 +1060,58 @@ void WII::IRinitialize(){ // Turns on and initialises the IR camera
|
|||
|
||||
enableIRCamera1();
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nEnable IR Camera1 Complete"));
|
||||
Notify(PSTR("\r\nEnable IR Camera1 Complete"), 0x80);
|
||||
#endif
|
||||
delay(80);
|
||||
|
||||
enableIRCamera2();
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nEnable IR Camera2 Complete"));
|
||||
Notify(PSTR("\r\nEnable IR Camera2 Complete"), 0x80);
|
||||
#endif
|
||||
delay(80);
|
||||
|
||||
write0x08Value();
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nWrote hex number 0x08"));
|
||||
Notify(PSTR("\r\nWrote hex number 0x08"), 0x80);
|
||||
#endif
|
||||
delay(80);
|
||||
|
||||
writeSensitivityBlock1();
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nWrote Sensitivity Block 1"));
|
||||
Notify(PSTR("\r\nWrote Sensitivity Block 1"), 0x80);
|
||||
#endif
|
||||
delay(80);
|
||||
|
||||
writeSensitivityBlock2();
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nWrote Sensitivity Block 2"));
|
||||
Notify(PSTR("\r\nWrote Sensitivity Block 2"), 0x80);
|
||||
#endif
|
||||
delay(80);
|
||||
|
||||
uint8_t mode_num = 0x03;
|
||||
setWiiModeNumber(mode_num); // Change input for whatever mode you want i.e. 0x01, 0x03, or 0x05
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nSet Wii Mode Number To 0x"));
|
||||
PrintHex<uint8_t>(mode_num);
|
||||
Notify(PSTR("\r\nSet Wii Mode Number To 0x"), 0x80);
|
||||
PrintHex<uint8_t>(mode_num, 0x80);
|
||||
#endif
|
||||
delay(80);
|
||||
|
||||
write0x08Value();
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nWrote Hex Number 0x08"));
|
||||
Notify(PSTR("\r\nWrote Hex Number 0x08"), 0x80);
|
||||
#endif
|
||||
delay(80);
|
||||
|
||||
setReportMode(false, 0x33);
|
||||
//setReportMode(false, 0x3f); // For full reporting mode, doesn't work yet
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nSet Report Mode to 0x33"));
|
||||
Notify(PSTR("\r\nSet Report Mode to 0x33"), 0x80);
|
||||
#endif
|
||||
delay(80);
|
||||
|
||||
statusRequest(); // Used to update wiiState - call isIRCameraEnabled() afterwards to check if it actually worked
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nIR Initialized"));
|
||||
Notify(PSTR("\r\nIR Initialized"), 0x80);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
|
|
|||
60
XBOXRECV.cpp
60
XBOXRECV.cpp
|
|
@ -48,12 +48,12 @@ uint8_t XBOXRECV::Init(uint8_t parent, uint8_t port, bool lowspeed) {
|
|||
// get memory address of USB device address pool
|
||||
AddressPool &addrPool = pUsb->GetAddressPool();
|
||||
#ifdef EXTRADEBUG
|
||||
Notify(PSTR("\r\nXBOXRECV Init"));
|
||||
Notify(PSTR("\r\nXBOXRECV Init"), 0x80);
|
||||
#endif
|
||||
// check if address has already been assigned to an instance
|
||||
if (bAddress) {
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nAddress in use"));
|
||||
Notify(PSTR("\r\nAddress in use"), 0x80);
|
||||
#endif
|
||||
return USB_ERROR_CLASS_INSTANCE_ALREADY_IN_USE;
|
||||
}
|
||||
|
|
@ -63,14 +63,14 @@ uint8_t XBOXRECV::Init(uint8_t parent, uint8_t port, bool lowspeed) {
|
|||
|
||||
if (!p) {
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nAddress not found"));
|
||||
Notify(PSTR("\r\nAddress not found"), 0x80);
|
||||
#endif
|
||||
return USB_ERROR_ADDRESS_NOT_FOUND_IN_POOL;
|
||||
}
|
||||
|
||||
if (!p->epinfo) {
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nepinfo is null"));
|
||||
Notify(PSTR("\r\nepinfo is null"), 0x80);
|
||||
#endif
|
||||
return USB_ERROR_EPINFO_IS_NULL;
|
||||
}
|
||||
|
|
@ -98,7 +98,7 @@ uint8_t XBOXRECV::Init(uint8_t parent, uint8_t port, bool lowspeed) {
|
|||
goto FailUnknownDevice;
|
||||
else if(PID != XBOX_WIRELESS_RECEIVER_PID && PID != XBOX_WIRELESS_RECEIVER_THIRD_PARTY_PID) {
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nYou'll need a wireless receiver for this libary to work"));
|
||||
Notify(PSTR("\r\nYou'll need a wireless receiver for this libary to work"), 0x80);
|
||||
#endif
|
||||
goto FailUnknownDevice;
|
||||
}
|
||||
|
|
@ -119,14 +119,14 @@ uint8_t XBOXRECV::Init(uint8_t parent, uint8_t port, bool lowspeed) {
|
|||
addrPool.FreeAddress(bAddress);
|
||||
bAddress = 0;
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nsetAddr: "));
|
||||
Notify(PSTR("\r\nsetAddr: "), 0x80);
|
||||
#endif
|
||||
PrintHex<uint8_t>(rcode);
|
||||
PrintHex<uint8_t>(rcode, 0x80);
|
||||
return rcode;
|
||||
}
|
||||
#ifdef EXTRADEBUG
|
||||
Notify(PSTR("\r\nAddr: "));
|
||||
PrintHex<uint8_t>(bAddress);
|
||||
Notify(PSTR("\r\nAddr: "), 0x80);
|
||||
PrintHex<uint8_t>(bAddress, 0x80);
|
||||
#endif
|
||||
p->lowspeed = false;
|
||||
|
||||
|
|
@ -210,7 +210,7 @@ uint8_t XBOXRECV::Init(uint8_t parent, uint8_t port, bool lowspeed) {
|
|||
goto FailSetConf;
|
||||
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nXbox Wireless Receiver Connected\r\n"));
|
||||
Notify(PSTR("\r\nXbox Wireless Receiver Connected\r\n"), 0x80);
|
||||
#endif
|
||||
XboxReceiverConnected = true;
|
||||
bPollEnable = true;
|
||||
|
|
@ -219,31 +219,31 @@ uint8_t XBOXRECV::Init(uint8_t parent, uint8_t port, bool lowspeed) {
|
|||
/* diagnostic messages */
|
||||
FailGetDevDescr:
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\ngetDevDescr:"));
|
||||
Notify(PSTR("\r\ngetDevDescr:"), 0x80);
|
||||
#endif
|
||||
goto Fail;
|
||||
FailSetDevTblEntry:
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nsetDevTblEn:"));
|
||||
Notify(PSTR("\r\nsetDevTblEn:"), 0x80);
|
||||
#endif
|
||||
goto Fail;
|
||||
FailSetConf:
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nsetConf:"));
|
||||
Notify(PSTR("\r\nsetConf:"), 0x80);
|
||||
#endif
|
||||
goto Fail;
|
||||
FailUnknownDevice:
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nUnknown Device Connected - VID: "));
|
||||
PrintHex<uint16_t>(VID);
|
||||
Notify(PSTR(" PID: "));
|
||||
PrintHex<uint16_t>(PID);
|
||||
Notify(PSTR("\r\nUnknown Device Connected - VID: "), 0x80);
|
||||
PrintHex<uint16_t>(VID, 0x80);
|
||||
Notify(PSTR(" PID: "), 0x80);
|
||||
PrintHex<uint16_t>(PID, 0x80);
|
||||
#endif
|
||||
rcode = USB_DEV_CONFIG_ERROR_DEVICE_NOT_SUPPORTED;
|
||||
goto Fail;
|
||||
Fail:
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nXbox 360 Init Failed, error code: "));
|
||||
Notify(PSTR("\r\nXbox 360 Init Failed, error code: "), 0x80);
|
||||
Serial.print(rcode,HEX);
|
||||
#endif
|
||||
Release();
|
||||
|
|
@ -280,9 +280,9 @@ uint8_t XBOXRECV::Poll() {
|
|||
pUsb->inTransfer(bAddress, epInfo[ inputPipe ].epAddr, &bufferSize, readBuf);
|
||||
if(bufferSize > 0) { // The number of received bytes
|
||||
#ifdef EXTRADEBUG
|
||||
Notify(PSTR("Bytes Received: "));
|
||||
Notify(PSTR("Bytes Received: "), 0x80);
|
||||
Serial.print(bufferSize);
|
||||
Notify(PSTR("\r\n"));
|
||||
Notify(PSTR("\r\n"), 0x80);
|
||||
#endif
|
||||
readReport(i);
|
||||
#ifdef PRINTREPORT
|
||||
|
|
@ -300,7 +300,7 @@ void XBOXRECV::readReport(uint8_t controller) {
|
|||
if(readBuf[0] == 0x08 && readBuf[1] != Xbox360Connected[controller]) {
|
||||
Xbox360Connected[controller] = readBuf[1];
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("Controller "));
|
||||
Notify(PSTR("Controller "), 0x80);
|
||||
Serial.print(controller);
|
||||
#endif
|
||||
if(Xbox360Connected[controller]) {
|
||||
|
|
@ -311,8 +311,8 @@ void XBOXRECV::readReport(uint8_t controller) {
|
|||
case 0x40: str = PSTR(" as headset\r\n"); break;
|
||||
case 0xC0: str = PSTR(" as controller+headset\r\n"); break;
|
||||
}
|
||||
Notify(PSTR(": connected"));
|
||||
Notify(str);
|
||||
Notify(PSTR(": connected"), 0x80);
|
||||
Notify(str, 0x80);
|
||||
#endif
|
||||
LED led;
|
||||
switch (controller) {
|
||||
|
|
@ -325,7 +325,7 @@ void XBOXRECV::readReport(uint8_t controller) {
|
|||
}
|
||||
#ifdef DEBUG
|
||||
else
|
||||
Notify(PSTR(": disconnected\r\n"));
|
||||
Notify(PSTR(": disconnected\r\n"), 0x80);
|
||||
#endif
|
||||
return;
|
||||
}
|
||||
|
|
@ -348,8 +348,8 @@ void XBOXRECV::readReport(uint8_t controller) {
|
|||
hatValue[controller][RightHatX] = (int16_t)(((uint16_t)readBuf[15] << 8) | readBuf[14]);
|
||||
hatValue[controller][RightHatY] = (int16_t)(((uint16_t)readBuf[17] << 8) | readBuf[16]);
|
||||
|
||||
//Notify(PSTR("\r\nButtonState: "));
|
||||
//PrintHex<uint32_t>(ButtonState[controller]);
|
||||
//Notify(PSTR("\r\nButtonState: "), 0x80);
|
||||
//PrintHex<uint32_t>(ButtonState[controller], 0x80);
|
||||
|
||||
if(ButtonState[controller] != OldButtonState[controller]) {
|
||||
buttonStateChanged[controller] = true;
|
||||
|
|
@ -366,11 +366,11 @@ void XBOXRECV::printReport(uint8_t controller, uint8_t nBytes) { //Uncomment "#d
|
|||
#ifdef PRINTREPORT
|
||||
if (readBuf == NULL)
|
||||
return;
|
||||
Notify(PSTR("Controller "));
|
||||
Notify(PSTR("Controller "), 0x80);
|
||||
Serial.print(controller);
|
||||
Notify(PSTR(": "));
|
||||
Notify(PSTR(": "), 0x80);
|
||||
for(uint8_t i = 0; i < nBytes;i++) {
|
||||
PrintHex<uint8_t>(readBuf[i]);
|
||||
PrintHex<uint8_t>(readBuf[i], 0x80);
|
||||
Serial.print(" ");
|
||||
}
|
||||
Serial.println();
|
||||
|
|
@ -449,7 +449,7 @@ void XBOXRECV::XboxCommand(uint8_t controller, uint8_t* data, uint16_t nbytes) {
|
|||
rcode = pUsb->outTransfer(bAddress, epInfo[ outputPipe ].epAddr, nbytes, data);
|
||||
#ifdef EXTRADEBUG
|
||||
if(rcode)
|
||||
Notify(PSTR("Error sending Xbox message\r\n"));
|
||||
Notify(PSTR("Error sending Xbox message\r\n"), 0x80);
|
||||
#endif
|
||||
}
|
||||
void XBOXRECV::setLedRaw(uint8_t controller, uint8_t value) {
|
||||
|
|
|
|||
44
XBOXUSB.cpp
44
XBOXUSB.cpp
|
|
@ -46,12 +46,12 @@ uint8_t XBOXUSB::Init(uint8_t parent, uint8_t port, bool lowspeed) {
|
|||
// get memory address of USB device address pool
|
||||
AddressPool &addrPool = pUsb->GetAddressPool();
|
||||
#ifdef EXTRADEBUG
|
||||
Notify(PSTR("\r\nXBOXUSB Init"));
|
||||
Notify(PSTR("\r\nXBOXUSB Init"), 0x80);
|
||||
#endif
|
||||
// check if address has already been assigned to an instance
|
||||
if (bAddress) {
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nAddress in use"));
|
||||
Notify(PSTR("\r\nAddress in use"), 0x80);
|
||||
#endif
|
||||
return USB_ERROR_CLASS_INSTANCE_ALREADY_IN_USE;
|
||||
}
|
||||
|
|
@ -61,14 +61,14 @@ uint8_t XBOXUSB::Init(uint8_t parent, uint8_t port, bool lowspeed) {
|
|||
|
||||
if (!p) {
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nAddress not found"));
|
||||
Notify(PSTR("\r\nAddress not found"), 0x80);
|
||||
#endif
|
||||
return USB_ERROR_ADDRESS_NOT_FOUND_IN_POOL;
|
||||
}
|
||||
|
||||
if (!p->epinfo) {
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nepinfo is null"));
|
||||
Notify(PSTR("\r\nepinfo is null"), 0x80);
|
||||
#endif
|
||||
return USB_ERROR_EPINFO_IS_NULL;
|
||||
}
|
||||
|
|
@ -96,13 +96,13 @@ uint8_t XBOXUSB::Init(uint8_t parent, uint8_t port, bool lowspeed) {
|
|||
goto FailUnknownDevice;
|
||||
if(PID == XBOX_WIRELESS_PID) {
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nYou have plugged in a wireless Xbox 360 controller - it doesn't support USB communication"));
|
||||
Notify(PSTR("\r\nYou have plugged in a wireless Xbox 360 controller - it doesn't support USB communication"), 0x80);
|
||||
#endif
|
||||
goto FailUnknownDevice;
|
||||
}
|
||||
else if(PID == XBOX_WIRELESS_RECEIVER_PID || PID == XBOX_WIRELESS_RECEIVER_THIRD_PARTY_PID) {
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nThis library only supports Xbox 360 controllers via USB"));
|
||||
Notify(PSTR("\r\nThis library only supports Xbox 360 controllers via USB"), 0x80);
|
||||
#endif
|
||||
goto FailUnknownDevice;
|
||||
}
|
||||
|
|
@ -123,14 +123,14 @@ uint8_t XBOXUSB::Init(uint8_t parent, uint8_t port, bool lowspeed) {
|
|||
addrPool.FreeAddress(bAddress);
|
||||
bAddress = 0;
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nsetAddr: "));
|
||||
Notify(PSTR("\r\nsetAddr: "), 0x80);
|
||||
#endif
|
||||
PrintHex<uint8_t>(rcode);
|
||||
PrintHex<uint8_t>(rcode, 0x80);
|
||||
return rcode;
|
||||
}
|
||||
#ifdef EXTRADEBUG
|
||||
Notify(PSTR("\r\nAddr: "));
|
||||
PrintHex<uint8_t>(bAddress);
|
||||
Notify(PSTR("\r\nAddr: "), 0x80);
|
||||
PrintHex<uint8_t>(bAddress, 0x80);
|
||||
#endif
|
||||
p->lowspeed = false;
|
||||
|
||||
|
|
@ -175,7 +175,7 @@ uint8_t XBOXUSB::Init(uint8_t parent, uint8_t port, bool lowspeed) {
|
|||
goto FailSetConf;
|
||||
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nXbox 360 Controller Connected\r\n"));
|
||||
Notify(PSTR("\r\nXbox 360 Controller Connected\r\n"), 0x80);
|
||||
#endif
|
||||
setLedOn(LED1);
|
||||
Xbox360Connected = true;
|
||||
|
|
@ -185,31 +185,31 @@ uint8_t XBOXUSB::Init(uint8_t parent, uint8_t port, bool lowspeed) {
|
|||
/* diagnostic messages */
|
||||
FailGetDevDescr:
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\ngetDevDescr:"));
|
||||
Notify(PSTR("\r\ngetDevDescr:"), 0x80);
|
||||
#endif
|
||||
goto Fail;
|
||||
FailSetDevTblEntry:
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nsetDevTblEn:"));
|
||||
Notify(PSTR("\r\nsetDevTblEn:"), 0x80);
|
||||
#endif
|
||||
goto Fail;
|
||||
FailSetConf:
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nsetConf:"));
|
||||
Notify(PSTR("\r\nsetConf:"), 0x80);
|
||||
#endif
|
||||
goto Fail;
|
||||
FailUnknownDevice:
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nUnknown Device Connected - VID: "));
|
||||
PrintHex<uint16_t>(VID);
|
||||
Notify(PSTR(" PID: "));
|
||||
PrintHex<uint16_t>(PID);
|
||||
Notify(PSTR("\r\nUnknown Device Connected - VID: "), 0x80);
|
||||
PrintHex<uint16_t>(VID, 0x80);
|
||||
Notify(PSTR(" PID: "), 0x80);
|
||||
PrintHex<uint16_t>(PID, 0x80);
|
||||
#endif
|
||||
rcode = USB_DEV_CONFIG_ERROR_DEVICE_NOT_SUPPORTED;
|
||||
goto Fail;
|
||||
Fail:
|
||||
#ifdef DEBUG
|
||||
Notify(PSTR("\r\nXbox 360 Init Failed, error code: "));
|
||||
Notify(PSTR("\r\nXbox 360 Init Failed, error code: "), 0x80);
|
||||
Serial.print(rcode,HEX);
|
||||
#endif
|
||||
Release();
|
||||
|
|
@ -250,8 +250,8 @@ void XBOXUSB::readReport() {
|
|||
hatValue[RightHatX] = (int16_t)(((uint16_t)readBuf[11] << 8) | readBuf[10]);
|
||||
hatValue[RightHatY] = (int16_t)(((uint16_t)readBuf[13] << 8) | readBuf[12]);
|
||||
|
||||
//Notify(PSTR("\r\nButtonState"));
|
||||
//PrintHex<uint32_t>(ButtonState);
|
||||
//Notify(PSTR("\r\nButtonState"), 0x80);
|
||||
//PrintHex<uint32_t>(ButtonState, 0x80);
|
||||
|
||||
if(ButtonState != OldButtonState) {
|
||||
ButtonClickState = (ButtonState >> 16) & ((~OldButtonState) >> 16); // Update click state variable, but don't include the two trigger buttons L2 and R2
|
||||
|
|
@ -268,7 +268,7 @@ void XBOXUSB::printReport() { //Uncomment "#define PRINTREPORT" to print the rep
|
|||
if (readBuf == NULL)
|
||||
return;
|
||||
for(uint8_t i = 0; i < XBOX_REPORT_BUFFER_SIZE;i++) {
|
||||
PrintHex<uint8_t>(readBuf[i]);
|
||||
PrintHex<uint8_t>(readBuf[i], 0x80);
|
||||
Serial.print(" ");
|
||||
}
|
||||
Serial.println();
|
||||
|
|
|
|||
Loading…
Reference in a new issue