Mirrors/MissionControl
2
0
Fork 0
mirror of https://github.com/ndeadly/MissionControl synced 2025-02-16 21:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

btdrv-mitm: refactor wii controller code and add initial support for extension controllers

Browse source
This commit is contained in:
ndeadly 2020-07-30 22:04:15 +02:00
parent c34f2da65c
commit 75938d205c
6 changed files with 410 additions and 268 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

303
btdrv-mitm/source/controllers/wiicontroller.cpp
View file

@ -7,26 +7,300 @@
namespace ams::controller {
Result WiiController::initialize(void) {
FakeSwitchController::initialize();
return this->setPlayerLeds(WiiControllerLEDs_P1);
WiiController::WiiController(ControllerType type, const bluetooth::Address *address)
: FakeSwitchController(type, address)
, m_extension(WiiExtensionController_None)
{
}
Result WiiController::writeMemory(uint32_t writeaddr, const uint8_t *data, uint8_t length) {
void WiiController::convertReportFormat(const bluetooth::HidReport *inReport, bluetooth::HidReport *outReport) {
auto wiiReport = reinterpret_cast<const WiiReportData *>(&inReport->data);
auto switchReport = reinterpret_cast<SwitchReportData *>(&outReport->data);
switch(wiiReport->id) {
case 0x20: // status
this->handleInputReport0x20(wiiReport, switchReport);
break;
case 0x21: // memory read
this->handleInputReport0x21(wiiReport, switchReport);
break;
case 0x22: // ack
this->handleInputReport0x22(wiiReport, switchReport);
break;
case 0x30:
this->handleInputReport0x30(wiiReport, switchReport);
break;
case 0x31:
this->handleInputReport0x31(wiiReport, switchReport);
break;
case 0x32:
this->handleInputReport0x32(wiiReport, switchReport);
break;
case 0x34:
this->handleInputReport0x34(wiiReport, switchReport);
break;
default:
BTDRV_LOG_FMT("WII CONTROLLER: RECEIVED REPORT [0x%02x]", wiiReport->id);
break;
}
outReport->size = 0x31;
switchReport->id = 0x30;
switchReport->input0x30.conn_info = 0x0;
switchReport->input0x30.battery = m_battery | m_charging;
switchReport->input0x30.timer = os::ConvertToTimeSpan(os::GetSystemTick()).GetMilliSeconds() & 0xff;
}
void WiiController::handleInputReport0x20(const WiiReportData *src, SwitchReportData *dst) {
if (!src->input0x20.extension_connected) {
m_extension = WiiExtensionController_None;
this->setReportMode(0x31);
}
else if (src->input0x20.extension_connected && (m_extension == WiiExtensionController_None)) {
// Initialise extension
this->sendInit1();
this->sendInit2();
// Read extension type
this->readMemory(0x04a400fa, 6);
}
m_battery = convert8bitBatteryLevel(src->input0x20.battery);
}
void WiiController::handleInputReport0x21(const WiiReportData *src, SwitchReportData *dst) {
u16 read_addr = util::SwapBytes(src->input0x21.address);
//u8 size = src->input0x21.size + 1;
if (read_addr == 0x00fa) {
// Identify extension controller
u64 extension_id = util::SwapBytes(*reinterpret_cast<const u64 *>(&src->input0x21.data)) >> 16;
switch (extension_id) {
case 0x0000A4200000:
m_extension = WiiExtensionController_Nunchuck;
this->setReportMode(0x32);
break;
case 0x0000A4200101:
m_extension = WiiExtensionController_Classic;
this->setReportMode(0x32);
break;
case 0x0100A4200101:
m_extension = WiiExtensionController_ClassicPro;
this->setReportMode(0x32);
break;
case 0x0000a4200120:
m_extension = WiiExtensionController_WiiUPro;
this->setReportMode(0x34);
break;
default:
m_extension = WiiExtensionController_Unsupported;
this->setReportMode(0x31);
break;
}
}
}
void WiiController::handleInputReport0x22(const WiiReportData *src, SwitchReportData *dst) {
//BTDRV_LOG_DATA_MSG((void*)&src->input0x22, sizeof(WiiInputReport0x22), "WII CONTROLLER: ACK");
}
void WiiController::handleInputReport0x30(const WiiReportData *src, SwitchReportData *dst) {
packStickData(&dst->input0x30.left_stick, STICK_ZERO, STICK_ZERO);
packStickData(&dst->input0x30.right_stick, STICK_ZERO, STICK_ZERO);
this->mapButtonsHorizontalOrientation(&src->input0x30.buttons, dst);
}
void WiiController::handleInputReport0x31(const WiiReportData *src, SwitchReportData *dst) {
packStickData(&dst->input0x30.left_stick, STICK_ZERO, STICK_ZERO);
packStickData(&dst->input0x30.right_stick, STICK_ZERO, STICK_ZERO);
this->mapButtonsHorizontalOrientation(&src->input0x31.buttons, dst);
// Todo: Accelerometer data
}
void WiiController::handleInputReport0x32(const WiiReportData *src, SwitchReportData *dst) {
if (m_extension == WiiExtensionController_Nunchuck) {
this->mapButtonsVerticalOrientation(&src->input0x32.buttons, dst);
}
this->mapExtensionBytes(src->input0x32.extension, dst);
}
void WiiController::handleInputReport0x34(const WiiReportData *src, SwitchReportData *dst) {
if (m_extension == WiiExtensionController_Nunchuck) {
this->mapButtonsVerticalOrientation(&src->input0x34.buttons, dst);
}
this->mapExtensionBytes(src->input0x34.extension, dst);
}
void WiiController::mapButtonsHorizontalOrientation(const WiiButtonData *buttons, SwitchReportData *dst) {
dst->input0x30.buttons.dpad_down = buttons->dpad_left;
dst->input0x30.buttons.dpad_up = buttons->dpad_right;
dst->input0x30.buttons.dpad_right = buttons->dpad_down;
dst->input0x30.buttons.dpad_left = buttons->dpad_up;
dst->input0x30.buttons.A = buttons->two;
dst->input0x30.buttons.B = buttons->one;
dst->input0x30.buttons.R = buttons->A;
dst->input0x30.buttons.L = buttons->B;
dst->input0x30.buttons.minus = buttons->minus;
dst->input0x30.buttons.plus = buttons->plus;
dst->input0x30.buttons.home = buttons->home;
}
void WiiController::mapButtonsVerticalOrientation(const WiiButtonData *buttons, SwitchReportData *dst) {
dst->input0x30.buttons.dpad_down = buttons->dpad_down;
dst->input0x30.buttons.dpad_up = buttons->dpad_up;
dst->input0x30.buttons.dpad_right = buttons->dpad_right;
dst->input0x30.buttons.dpad_left = buttons->dpad_left;
dst->input0x30.buttons.A = buttons->A;
dst->input0x30.buttons.B = buttons->B;
// Not the best mapping but at least most buttons are mapped to something when nunchuck is connected.
dst->input0x30.buttons.R = buttons->one;
dst->input0x30.buttons.ZR = buttons->two;
dst->input0x30.buttons.minus = buttons->minus;
dst->input0x30.buttons.plus = buttons->plus;
dst->input0x30.buttons.home = buttons->home;
}
void WiiController::mapExtensionBytes(const u8 ext[], SwitchReportData *dst) {
switch(m_extension) {
case WiiExtensionController_Nunchuck:
this->mapNunchuckExtension(ext, dst);
break;
case WiiExtensionController_Classic:
case WiiExtensionController_ClassicPro:
this->mapClassicControllerExtension(ext, dst);
break;
case WiiExtensionController_WiiUPro:
this->mapWiiUProControllerExtension(ext, dst);
break;
default:
break;
}
}
void WiiController::mapNunchuckExtension(const u8 ext[], SwitchReportData *dst) {
auto extension = reinterpret_cast<const WiiNunchuckExtensionData *>(ext);
packStickData(&dst->input0x30.left_stick,
extension->stick_x,
extension->stick_y
);
dst->input0x30.buttons.L = !extension->C;
dst->input0x30.buttons.ZL = !extension->Z;
}
void WiiController::mapClassicControllerExtension(const u8 ext[], SwitchReportData *dst) {
packStickData(&dst->input0x30.left_stick,
ext[0] & 0x3f,
ext[1] & 0x3f
);
packStickData(&dst->input0x30.right_stick,
((ext[0] >> 3) & 0x18) | ((ext[1] >> 5) & 0x06) | ((ext[2] >> 7) & 0x01),
ext[2] & 0x1f
);
auto buttons = reinterpret_cast<const WiiClassicControllerButtonData *>(&ext[4]);
dst->input0x30.buttons.dpad_down = !buttons->dpad_down;
dst->input0x30.buttons.dpad_up = !buttons->dpad_up;
dst->input0x30.buttons.dpad_right = !buttons->dpad_right;
dst->input0x30.buttons.dpad_left = !buttons->dpad_left;
dst->input0x30.buttons.A = !buttons->A;
dst->input0x30.buttons.B = !buttons->B;
dst->input0x30.buttons.X = !buttons->X;
dst->input0x30.buttons.Y = !buttons->Y;
dst->input0x30.buttons.L = !buttons->L;
dst->input0x30.buttons.ZL = !buttons->ZL;
dst->input0x30.buttons.R = !buttons->R;
dst->input0x30.buttons.ZR = !buttons->ZR;
dst->input0x30.buttons.minus = !buttons->minus;
dst->input0x30.buttons.plus = !buttons->plus;
dst->input0x30.buttons.home = !buttons->home;
}
void WiiController::mapWiiUProControllerExtension(const u8 ext[], SwitchReportData *dst) {
auto extension = reinterpret_cast<const WiiUProExtensionData *>(ext);
packStickData(&dst->input0x30.left_stick,
((3 * (extension->left_stick_x - STICK_ZERO)) >> 1) + STICK_ZERO,
((3 * (extension->left_stick_y - STICK_ZERO)) >> 1) + STICK_ZERO
);
packStickData(&dst->input0x30.right_stick,
((3 * (extension->right_stick_x - STICK_ZERO)) >> 1) + STICK_ZERO,
((3 * (extension->right_stick_y - STICK_ZERO)) >> 1) + STICK_ZERO
);
dst->input0x30.buttons.dpad_down = !extension->buttons.dpad_down;
dst->input0x30.buttons.dpad_up = !extension->buttons.dpad_up;
dst->input0x30.buttons.dpad_right = !extension->buttons.dpad_right;
dst->input0x30.buttons.dpad_left = !extension->buttons.dpad_left;
dst->input0x30.buttons.A = !extension->buttons.A;
dst->input0x30.buttons.B = !extension->buttons.B;
dst->input0x30.buttons.X = !extension->buttons.X;
dst->input0x30.buttons.Y = !extension->buttons.Y;
dst->input0x30.buttons.R = !extension->buttons.R;
dst->input0x30.buttons.ZR = !extension->buttons.ZR;
dst->input0x30.buttons.L = !extension->buttons.L;
dst->input0x30.buttons.ZL = !extension->buttons.ZL;
dst->input0x30.buttons.minus = !extension->buttons.minus;
dst->input0x30.buttons.plus = !extension->buttons.plus;
dst->input0x30.buttons.lstick_press = !extension->buttons.lstick_press;
dst->input0x30.buttons.rstick_press = !extension->buttons.rstick_press;
dst->input0x30.buttons.home = !extension->buttons.home;
}
Result WiiController::writeMemory(uint32_t write_addr, const uint8_t *data, uint8_t size) {
bluetooth::HidReport report = {};
report.size = sizeof(WiiOutputReport0x16) + 1;
auto reportData = reinterpret_cast<WiiReportData *>(report.data);
reportData->id = 0x16;
reportData->output0x16.address = ams::util::SwapBytes(writeaddr);
reportData->output0x16.size = length;
std::memcpy(&reportData->output0x16.data, data, length);
reportData->output0x16.address = ams::util::SwapBytes(write_addr);
reportData->output0x16.size = size;
std::memcpy(&reportData->output0x16.data, data, size);
return btdrvWriteHidData(&m_address, &report);
}
Result WiiController::readMemory(uint32_t read_addr, uint16_t size) {
bluetooth::HidReport report = {};
report.size = sizeof(WiiOutputReport0x17) + 1;
auto reportData = reinterpret_cast<WiiReportData *>(report.data);
reportData->id = 0x17;
reportData->output0x17.address = ams::util::SwapBytes(read_addr);
reportData->output0x17.size = ams::util::SwapBytes(size);
return btdrvWriteHidData(&m_address, &report);
}
Result WiiController::setReportMode(uint8_t mode) {
bluetooth::HidReport report = {};
report.size = sizeof(WiiOutputReport0x12) + 1;
auto reportData = reinterpret_cast<WiiReportData *>(report.data);
reportData->id = 0x12;
@ -38,6 +312,7 @@ namespace ams::controller {
Result WiiController::setPlayerLeds(uint8_t mask) {
bluetooth::HidReport report = {};
report.size = sizeof(WiiOutputReport0x15) + 1;
auto reportData = reinterpret_cast<WiiReportData *>(report.data);
reportData->id = 0x11;
@ -48,6 +323,7 @@ namespace ams::controller {
Result WiiController::queryStatus(void) {
bluetooth::HidReport report = {};
report.size = sizeof(WiiOutputReport0x15) + 1;
auto reportData = reinterpret_cast<WiiReportData *>(report.data);
reportData->id = 0x15;
@ -58,6 +334,7 @@ namespace ams::controller {
Result WiiController::setPlayerLed(uint8_t led_mask) {
//bluetooth::HidReport report = {};
m_outputReport.size = sizeof(WiiOutputReport0x15) + 1;
auto reportData = reinterpret_cast<WiiReportData *>(m_outputReport.data);
reportData->id = 0x11;
@ -66,4 +343,14 @@ namespace ams::controller {
return ams::ResultSuccess();
}
Result WiiController::sendInit1(void) {
const uint8_t data[] = {0x55};
return this->writeMemory(0x04a400f0, data, sizeof(data));
}
Result WiiController::sendInit2(void) {
const uint8_t data[] = {0x00};
return this->writeMemory(0x04a400fb, data, sizeof(data));
}
}

117
btdrv-mitm/source/controllers/wiicontroller.hpp
View file

@ -10,6 +10,15 @@ namespace ams::controller {
WiiControllerLEDs_P4 = 0x80,
};
enum WiiExtensionController {
WiiExtensionController_None,
WiiExtensionController_Nunchuck,
WiiExtensionController_Classic,
WiiExtensionController_ClassicPro,
WiiExtensionController_WiiUPro,
WiiExtensionController_Unsupported,
};
struct WiiButtonData {
uint8_t dpad_left : 1;
uint8_t dpad_right : 1;
@ -28,9 +37,77 @@ namespace ams::controller {
} __attribute__ ((__packed__));
struct WiiAccelerometerData {
uint8_t xyz[3];
uint8_t x;
uint8_t y;
uint8_t z;
} __attribute__ ((__packed__));
struct WiiClassicControllerButtonData {
uint8_t dpad_right : 1;
uint8_t dpad_down : 1;
uint8_t L : 1;
uint8_t minus : 1;
uint8_t home : 1;
uint8_t plus : 1;
uint8_t R : 1;
uint8_t : 0;
uint8_t ZL : 1;
uint8_t B : 1;
uint8_t Y : 1;
uint8_t A : 1;
uint8_t X : 1;
uint8_t ZR : 1;
uint8_t dpad_left : 1;
uint8_t dpad_up : 1;
} __attribute__ ((__packed__));
struct WiiNunchuckExtensionData {
uint8_t stick_x;
uint8_t stick_y;
uint8_t accel_x_92;
uint8_t accel_y_92;
uint8_t accel_z_92;
uint8_t accel_z_10 : 2;
uint8_t accel_y_10 : 2;
uint8_t accel_x_10 : 2;
uint8_t C : 1;
uint8_t Z : 1;
};
struct WiiUProButtonData {
uint8_t : 1;
uint8_t R : 1;
uint8_t plus : 1;
uint8_t home : 1;
uint8_t minus : 1;
uint8_t L : 1;
uint8_t dpad_down : 1;
uint8_t dpad_right : 1;
uint8_t dpad_up : 1;
uint8_t dpad_left : 1;
uint8_t ZR : 1;
uint8_t X : 1;
uint8_t A : 1;
uint8_t Y : 1;
uint8_t B : 1;
uint8_t ZL : 1;
uint8_t rstick_press : 1;
uint8_t lstick_press : 1;
uint8_t : 0;
} __attribute__ ((__packed__));
struct WiiUProExtensionData {
uint16_t left_stick_x;
uint16_t right_stick_x;
uint16_t left_stick_y;
uint16_t right_stick_y;
WiiUProButtonData buttons;
} __attribute__ ((__packed__));
struct WiiOutputReport0x10 {
uint8_t rumble;
} __attribute__ ((__packed__));
@ -78,8 +155,11 @@ namespace ams::controller {
struct WiiInputReport0x20 {
WiiButtonData buttons;
uint8_t led : 4;
uint8_t flags : 4;
uint8_t battery_critical : 1;
uint8_t extension_connected : 1;
uint8_t speaker_enabled : 1;
uint8_t ir_enabled : 1;
uint8_t led_state : 4;
uint8_t _pad[2];
uint8_t battery;
} __attribute__ ((__packed__));
@ -175,19 +255,42 @@ namespace ams::controller {
class WiiController : public FakeSwitchController {
public:
Result initialize(void);
public:
void convertReportFormat(const bluetooth::HidReport *inReport, bluetooth::HidReport *outReport);
protected:
WiiController(ControllerType type, const bluetooth::Address *address) : FakeSwitchController(type, address) {};
WiiController(ControllerType type, const bluetooth::Address *address);
void handleInputReport0x20(const WiiReportData *src, SwitchReportData *dst);
void handleInputReport0x21(const WiiReportData *src, SwitchReportData *dst);
void handleInputReport0x22(const WiiReportData *src, SwitchReportData *dst);
void handleInputReport0x30(const WiiReportData *src, SwitchReportData *dst);
void handleInputReport0x31(const WiiReportData *src, SwitchReportData *dst);
void handleInputReport0x32(const WiiReportData *src, SwitchReportData *dst);
void handleInputReport0x34(const WiiReportData *src, SwitchReportData *dst);
void mapButtonsHorizontalOrientation(const WiiButtonData *buttons, SwitchReportData *dst);
void mapButtonsVerticalOrientation(const WiiButtonData *buttons, SwitchReportData *dst);
void mapExtensionBytes(const u8 ext[], SwitchReportData *dst);
void mapNunchuckExtension(const u8 ext[], SwitchReportData *dst);
void mapClassicControllerExtension(const u8 ext[], SwitchReportData *dst);
void mapWiiUProControllerExtension(const u8 ext[], SwitchReportData *dst);
Result writeMemory(uint32_t writeaddr, const uint8_t *data, uint8_t size);
Result readMemory(uint32_t read_addr, uint16_t size);
Result writeMemory(uint32_t writeaddr, const uint8_t *data, uint8_t length);
Result setReportMode(uint8_t mode);
Result setPlayerLeds(uint8_t mask);
Result queryStatus(void);
Result setPlayerLed(u8 led_mask);
Result sendInit1(void);
Result sendInit2(void);
WiiExtensionController m_extension;
};

92
btdrv-mitm/source/controllers/wiimote.cpp
View file

@ -5,100 +5,10 @@
namespace ams::controller {
WiimoteController::WiimoteController(const bluetooth::Address *address)
: WiiController(ControllerType_Wiimote, address) {
}
Result WiimoteController::initialize(void) {
R_TRY(WiiController::initialize());
R_TRY(this->setReportMode(0x31));
return 0;
}
void WiimoteController::convertReportFormat(const bluetooth::HidReport *inReport, bluetooth::HidReport *outReport) {
auto wiiReport = reinterpret_cast<const WiiReportData *>(&inReport->data);
auto switchReport = reinterpret_cast<SwitchReportData *>(&outReport->data);
switch(wiiReport->id) {
case 0x20: //extension connected
this->handleInputReport0x20(wiiReport, switchReport);
break;
case 0x30:
this->handleInputReport0x30(wiiReport, switchReport);
break;
case 0x31:
this->handleInputReport0x31(wiiReport, switchReport);
break;
default:
BTDRV_LOG_FMT("WIIMOTE: RECEIVED REPORT [0x%02x]", wiiReport->id);
break;
}
outReport->size = 0x31;
switchReport->id = 0x30;
switchReport->input0x30.conn_info = 0x0;
switchReport->input0x30.battery = m_battery | m_charging;
switchReport->input0x30.timer = os::ConvertToTimeSpan(os::GetSystemTick()).GetMilliSeconds() & 0xff;
}
void WiimoteController::handleInputReport0x20(const WiiReportData *src, SwitchReportData *dst) {
m_battery = convert8bitBatteryLevel(src->input0x20.battery);
}
void WiimoteController::handleInputReport0x30(const WiiReportData *src, SwitchReportData *dst) {
packStickData(&dst->input0x30.left_stick, STICK_ZERO, STICK_ZERO);
packStickData(&dst->input0x30.right_stick, STICK_ZERO, STICK_ZERO);
// Orientation vertical
//dst->input0x30.buttons.dpad_down = src->input0x30.buttons.dpad_down;
//dst->input0x30.buttons.dpad_up = src->input0x30.buttons.dpad_up;
//dst->input0x30.buttons.dpad_right = src->input0x30.buttons.dpad_right;
//dst->input0x30.buttons.dpad_left = src->input0x30.buttons.dpad_left;
dst->input0x30.buttons.dpad_down = src->input0x30.buttons.dpad_left;
dst->input0x30.buttons.dpad_up = src->input0x30.buttons.dpad_right;
dst->input0x30.buttons.dpad_right = src->input0x30.buttons.dpad_down;
dst->input0x30.buttons.dpad_left = src->input0x30.buttons.dpad_up;
dst->input0x30.buttons.A = src->input0x30.buttons.two;
dst->input0x30.buttons.B = src->input0x30.buttons.one;
dst->input0x30.buttons.R = src->input0x30.buttons.A;
dst->input0x30.buttons.L = src->input0x30.buttons.B;
dst->input0x30.buttons.minus = src->input0x30.buttons.minus;
dst->input0x30.buttons.plus = src->input0x30.buttons.plus;
dst->input0x30.buttons.home = src->input0x30.buttons.home;
}
void WiimoteController::handleInputReport0x31(const WiiReportData *src, SwitchReportData *dst) {
packStickData(&dst->input0x30.left_stick, STICK_ZERO, STICK_ZERO);
packStickData(&dst->input0x30.right_stick, STICK_ZERO, STICK_ZERO);
dst->input0x30.buttons.dpad_down = src->input0x31.buttons.dpad_left;
dst->input0x30.buttons.dpad_up = src->input0x31.buttons.dpad_right;
dst->input0x30.buttons.dpad_right = src->input0x31.buttons.dpad_down;
dst->input0x30.buttons.dpad_left = src->input0x31.buttons.dpad_up;
dst->input0x30.buttons.A = src->input0x31.buttons.two;
dst->input0x30.buttons.B = src->input0x31.buttons.one;
dst->input0x30.buttons.R = src->input0x31.buttons.A;
dst->input0x30.buttons.L = src->input0x31.buttons.B;
dst->input0x30.buttons.minus = src->input0x31.buttons.minus;
dst->input0x30.buttons.plus = src->input0x31.buttons.plus;
dst->input0x30.buttons.home = src->input0x31.buttons.home;
// Todo: Accelerometer data
return ams::ResultSuccess();
}
}

13
btdrv-mitm/source/controllers/wiimote.hpp
View file

@ -3,8 +3,6 @@
namespace ams::controller {
class WiimoteController : public WiiController {
public:
@ -12,17 +10,10 @@ namespace ams::controller {
{0x057e, 0x0306}, // Official wiimote
};
WiimoteController(const bluetooth::Address *address);
WiimoteController(const bluetooth::Address *address)
: WiiController(ControllerType_Wiimote, address) { };
Result initialize(void);
void convertReportFormat(const bluetooth::HidReport *inReport, bluetooth::HidReport *outReport);
private:
void handleInputReport0x20(const WiiReportData *src, SwitchReportData *dst);
void handleInputReport0x30(const WiiReportData *src, SwitchReportData *dst);
void handleInputReport0x31(const WiiReportData *src, SwitchReportData *dst);
};
}

106
btdrv-mitm/source/controllers/wiiupro.cpp
View file

@ -1,106 +0,0 @@
#include "wiiupro.hpp"
#include <stratosphere.hpp>
#include "../btdrv_mitm_logging.hpp"
namespace ams::controller {
WiiUProController::WiiUProController(const bluetooth::Address *address)
: WiiController(ControllerType_WiiUPro, address) {
}
Result WiiUProController::initialize(void) {
WiiController::initialize();
// This should actually probably be run in response to report 0x20
R_TRY(this->sendInit1());
R_TRY(this->sendInit2());
R_TRY(this->setReportMode(0x34));
return 0;
}
Result WiiUProController::sendInit1(void) {
const uint8_t data[] = {0x55};
return this->writeMemory(0x04a400f0, data, sizeof(data));
}
Result WiiUProController::sendInit2(void) {
const uint8_t data[] = {0x00};
return this->writeMemory(0x04a400fb, data, sizeof(data));
}
void WiiUProController::convertReportFormat(const bluetooth::HidReport *inReport, bluetooth::HidReport *outReport) {
auto wiiUReport = reinterpret_cast<const WiiReportData *>(&inReport->data);
auto switchReport = reinterpret_cast<SwitchReportData *>(&outReport->data);
switch(wiiUReport->id) {
case 0x20: //extension connected
this->handleInputReport0x20(wiiUReport, switchReport);
break;
//case 0x22: // Acknowledgement
//break;
//case 0x32: // Buttons + Ext bytes
//break;
case 0x34: // Buttons + 19 ext bytes
this->handleInputReport0x34(wiiUReport, switchReport);
break;
default:
BTDRV_LOG_FMT("WIIUPRO: RECEIVED REPORT [0x%02x]", wiiUReport->id);
break;
}
outReport->size = 0x31;
switchReport->id = 0x30;
switchReport->input0x30.conn_info = 0x0;
switchReport->input0x30.battery = m_battery | m_charging;
switchReport->input0x30.timer = os::ConvertToTimeSpan(os::GetSystemTick()).GetMilliSeconds() & 0xff;
}
void WiiUProController::handleInputReport0x20(const WiiReportData *src, SwitchReportData *dst) {
m_battery = convert8bitBatteryLevel(src->input0x20.battery);
}
void WiiUProController::handleInputReport0x34(const WiiReportData *src, SwitchReportData *dst) {
auto extension = reinterpret_cast<const WiiUProExtensionData *>(src->input0x34.extension);
packStickData(&dst->input0x30.left_stick,
((3 * (extension->left_stick_x - STICK_ZERO)) >> 1) + STICK_ZERO,
((3 * (extension->left_stick_y - STICK_ZERO)) >> 1) + STICK_ZERO
);
packStickData(&dst->input0x30.right_stick,
((3 * (extension->right_stick_x - STICK_ZERO)) >> 1) + STICK_ZERO,
((3 * (extension->right_stick_y - STICK_ZERO)) >> 1) + STICK_ZERO
);
dst->input0x30.buttons.dpad_down = !extension->buttons.dpad_down;
dst->input0x30.buttons.dpad_up = !extension->buttons.dpad_up;
dst->input0x30.buttons.dpad_right = !extension->buttons.dpad_right;
dst->input0x30.buttons.dpad_left = !extension->buttons.dpad_left;
dst->input0x30.buttons.A = !extension->buttons.A;
dst->input0x30.buttons.B = !extension->buttons.B;
dst->input0x30.buttons.X = !extension->buttons.X;
dst->input0x30.buttons.Y = !extension->buttons.Y;
dst->input0x30.buttons.R = !extension->buttons.R;
dst->input0x30.buttons.ZR = !extension->buttons.ZR;
dst->input0x30.buttons.L = !extension->buttons.L;
dst->input0x30.buttons.ZL = !extension->buttons.ZL;
dst->input0x30.buttons.minus = !extension->buttons.minus;
dst->input0x30.buttons.plus = !extension->buttons.plus;
dst->input0x30.buttons.lstick_press = !extension->buttons.lstick_press;
dst->input0x30.buttons.rstick_press = !extension->buttons.rstick_press;
dst->input0x30.buttons.home = !extension->buttons.home;
}
}

47
btdrv-mitm/source/controllers/wiiupro.hpp
View file

@ -3,38 +3,6 @@
namespace ams::controller {
struct WiiUProButtonData {
uint8_t : 1;
uint8_t R : 1;
uint8_t plus : 1;
uint8_t home : 1;
uint8_t minus : 1;
uint8_t L : 1;
uint8_t dpad_down : 1;
uint8_t dpad_right : 1;
uint8_t dpad_up : 1;
uint8_t dpad_left : 1;
uint8_t ZR : 1;
uint8_t X : 1;
uint8_t A : 1;
uint8_t Y : 1;
uint8_t B : 1;
uint8_t ZL : 1;
uint8_t rstick_press : 1;
uint8_t lstick_press : 1;
uint8_t : 0;
} __attribute__ ((__packed__));
struct WiiUProExtensionData {
uint16_t left_stick_x;
uint16_t right_stick_x;
uint16_t left_stick_y;
uint16_t right_stick_y;
WiiUProButtonData buttons;
} __attribute__ ((__packed__));
class WiiUProController : public WiiController {
public:
@ -42,19 +10,8 @@ namespace ams::controller {
{0x057e, 0x0330}, // Official Wii U Pro Controller
};
WiiUProController(const bluetooth::Address *address);
void convertReportFormat(const bluetooth::HidReport *inReport, bluetooth::HidReport *outReport);
Result initialize(void);
private:
Result sendInit1(void);
Result sendInit2(void);
void handleInputReport0x20(const WiiReportData *src, SwitchReportData *dst);
void handleInputReport0x34(const WiiReportData *src, SwitchReportData *dst);
WiiUProController(const bluetooth::Address *address)
: WiiController(ControllerType_WiiUPro, address) { };
};
}