From 4d6384d0bebe7844b4e213d04bd4ae1e967baa62 Mon Sep 17 00:00:00 2001 From: ndeadly <24677491+ndeadly@users.noreply.github.com> Date: Mon, 14 Sep 2020 01:59:55 +0200 Subject: [PATCH 1/3] bluetooth-mitm: add initial support for 8bitdo zero controller --- .../source/controllers/8bitdo_controller.cpp | 62 ++++++++++++++ .../source/controllers/8bitdo_controller.hpp | 84 +++++++++++++++++++ .../controllers/controller_management.cpp | 9 ++ .../controllers/controller_management.hpp | 2 + 4 files changed, 157 insertions(+) create mode 100644 bluetooth-mitm/source/controllers/8bitdo_controller.cpp create mode 100644 bluetooth-mitm/source/controllers/8bitdo_controller.hpp diff --git a/bluetooth-mitm/source/controllers/8bitdo_controller.cpp b/bluetooth-mitm/source/controllers/8bitdo_controller.cpp new file mode 100644 index 0000000..2fe8bf5 --- /dev/null +++ b/bluetooth-mitm/source/controllers/8bitdo_controller.cpp @@ -0,0 +1,62 @@ +/* + * Copyright (C) 2020 ndeadly + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +#include "8bitdo_controller.hpp" +#include + +namespace ams::controller { + + void EightBitDoController::ConvertReportFormat(const bluetooth::HidReport *in_report, bluetooth::HidReport *out_report) { + auto eightbitdo_report = reinterpret_cast(&in_report->data); + auto switch_report = reinterpret_cast(&out_report->data); + + switch(eightbitdo_report->id) { + case 0x01: + this->HandleInputReport0x01(eightbitdo_report, switch_report); + break; + case 0x03: + this->HandleInputReport0x03(eightbitdo_report, switch_report); + break; + default: + break; + } + + out_report->size = sizeof(SwitchInputReport0x30) + 1; + switch_report->id = 0x30; + switch_report->input0x30.conn_info = 0x0; + switch_report->input0x30.battery = m_battery | m_charging; + std::memset(switch_report->input0x30.motion, 0, sizeof(switch_report->input0x30.motion)); + switch_report->input0x30.timer = os::ConvertToTimeSpan(os::GetSystemTick()).GetMilliSeconds() & 0xff; + } + + void EightBitDoController::HandleInputReport0x01(const EightBitDoReportData *src, SwitchReportData *dst) { + + } + + void EightBitDoController::HandleInputReport0x03(const EightBitDoReportData *src, SwitchReportData *dst) { + dst->input0x30.buttons.A = src->input0x03.buttons.B; + dst->input0x30.buttons.B = src->input0x03.buttons.A; + dst->input0x30.buttons.X = src->input0x03.buttons.Y; + dst->input0x30.buttons.Y = src->input0x03.buttons.X; + + dst->input0x30.buttons.R = src->input0x03.buttons.R; + dst->input0x30.buttons.L = src->input0x03.buttons.L; + + dst->input0x30.buttons.minus = src->input0x03.buttons.select; + dst->input0x30.buttons.plus = src->input0x03.buttons.start; + } + +} diff --git a/bluetooth-mitm/source/controllers/8bitdo_controller.hpp b/bluetooth-mitm/source/controllers/8bitdo_controller.hpp new file mode 100644 index 0000000..8a09792 --- /dev/null +++ b/bluetooth-mitm/source/controllers/8bitdo_controller.hpp @@ -0,0 +1,84 @@ +/* + * Copyright (C) 2020 ndeadly + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +#pragma once +#include "emulated_switch_controller.hpp" + +namespace ams::controller { + + struct EightBitDoStickData { + uint8_t x; + uint8_t y; + } __attribute__((packed)); + + struct EightBitDoButtonData { + uint8_t A : 1; + uint8_t B : 1; + uint8_t : 1; + uint8_t X : 1; + uint8_t Y : 1; + uint8_t : 1; + uint8_t L : 1; + uint8_t R : 1; + + uint8_t : 2; + uint8_t select : 1; + uint8_t start : 1; + uint8_t : 0; + }__attribute__((packed)); + + struct EightBitDoInputReport0x01 { + uint8_t _unk0[2]; + uint8_t dpad; + uint8_t _unk1[5]; + } __attribute__((packed)); + + struct EightBitDoInputReport0x03 { + uint8_t dpad; + EightBitDoStickData left_stick; + EightBitDoStickData right_stick; + uint8_t _unk[3]; + EightBitDoButtonData buttons; + } __attribute__((packed)); + + struct EightBitDoReportData{ + uint8_t id; + union { + EightBitDoInputReport0x01 input0x01; + EightBitDoInputReport0x03 input0x03; + }; + } __attribute__((packed)); + + class EightBitDoController : public EmulatedSwitchController { + + public: + static constexpr const HardwareID hardware_ids[] = { + {0x05a0, 0x3232} // 8BitDo Zero + }; + + EightBitDoController(const bluetooth::Address *address) + : EmulatedSwitchController(address) { }; + + void ConvertReportFormat(const bluetooth::HidReport *in_report, bluetooth::HidReport *out_report); + + private: + void HandleInputReport0x01(const EightBitDoReportData *src, SwitchReportData *dst); + void HandleInputReport0x03(const EightBitDoReportData *src, SwitchReportData *dst); + + }; + + +} diff --git a/bluetooth-mitm/source/controllers/controller_management.cpp b/bluetooth-mitm/source/controllers/controller_management.cpp index 5b30bb8..430b98d 100644 --- a/bluetooth-mitm/source/controllers/controller_management.cpp +++ b/bluetooth-mitm/source/controllers/controller_management.cpp @@ -103,6 +103,12 @@ namespace ams::controller { } } + for (auto hwId : EightBitDoController::hardware_ids) { + if ( (device->vid == hwId.vid) && (device->pid == hwId.pid) ) { + return ControllerType_8BitDo; + } + } + return ControllerType_Unknown; } @@ -162,6 +168,9 @@ namespace ams::controller { case ControllerType_Steelseries: g_controllers.push_back(std::make_unique(address)); break; + case ControllerType_8BitDo: + g_controllers.push_back(std::make_unique(address)); + break; default: g_controllers.push_back(std::make_unique(address)); break; diff --git a/bluetooth-mitm/source/controllers/controller_management.hpp b/bluetooth-mitm/source/controllers/controller_management.hpp index 88ceafb..c2b6e5e 100644 --- a/bluetooth-mitm/source/controllers/controller_management.hpp +++ b/bluetooth-mitm/source/controllers/controller_management.hpp @@ -28,6 +28,7 @@ #include "xiaomi_controller.hpp" #include "gamesir_controller.hpp" #include "steelseries_controller.hpp" +#include "8bitdo_controller.hpp" namespace ams::controller { @@ -46,6 +47,7 @@ namespace ams::controller { ControllerType_Xiaomi, ControllerType_Gamesir, ControllerType_Steelseries, + ControllerType_8BitDo, ControllerType_Unknown, }; From 89ac65c7eb67206b769e5e12ef39c1cbd295bc94 Mon Sep 17 00:00:00 2001 From: ndeadly <24677491+ndeadly@users.noreply.github.com> Date: Thu, 17 Sep 2020 01:32:03 +0200 Subject: [PATCH 2/3] bluetooth-mitm: map 8bitdo zero dpad and home button combo --- .../source/controllers/8bitdo_controller.cpp | 21 +++++++++++++++++++ .../source/controllers/8bitdo_controller.hpp | 16 ++++++++++++-- 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/bluetooth-mitm/source/controllers/8bitdo_controller.cpp b/bluetooth-mitm/source/controllers/8bitdo_controller.cpp index 2fe8bf5..12b9370 100644 --- a/bluetooth-mitm/source/controllers/8bitdo_controller.cpp +++ b/bluetooth-mitm/source/controllers/8bitdo_controller.cpp @@ -43,6 +43,18 @@ namespace ams::controller { } void EightBitDoController::HandleInputReport0x01(const EightBitDoReportData *src, SwitchReportData *dst) { + dst->input0x30.buttons.dpad_down = (src->input0x01.dpad == EightBitDoDPad_S) || + (src->input0x01.dpad == EightBitDoDPad_SE) || + (src->input0x01.dpad == EightBitDoDPad_SW); + dst->input0x30.buttons.dpad_up = (src->input0x01.dpad == EightBitDoDPad_N) || + (src->input0x01.dpad == EightBitDoDPad_NE) || + (src->input0x01.dpad == EightBitDoDPad_NW); + dst->input0x30.buttons.dpad_right = (src->input0x01.dpad == EightBitDoDPad_E) || + (src->input0x01.dpad == EightBitDoDPad_NE) || + (src->input0x01.dpad == EightBitDoDPad_SE); + dst->input0x30.buttons.dpad_left = (src->input0x01.dpad == EightBitDoDPad_W) || + (src->input0x01.dpad == EightBitDoDPad_NW) || + (src->input0x01.dpad == EightBitDoDPad_SW); } @@ -57,6 +69,15 @@ namespace ams::controller { dst->input0x30.buttons.minus = src->input0x03.buttons.select; dst->input0x30.buttons.plus = src->input0x03.buttons.start; + + // Home combo + dst->input0x30.buttons.home = dst->input0x30.buttons.R && dst->input0x30.buttons.L && dst->input0x30.buttons.minus && dst->input0x30.buttons.plus; + if (dst->input0x30.buttons.home) { + dst->input0x30.buttons.R = 0; + dst->input0x30.buttons.L = 0; + dst->input0x30.buttons.minus = 0; + dst->input0x30.buttons.plus = 0; + } } } diff --git a/bluetooth-mitm/source/controllers/8bitdo_controller.hpp b/bluetooth-mitm/source/controllers/8bitdo_controller.hpp index 8a09792..af37b55 100644 --- a/bluetooth-mitm/source/controllers/8bitdo_controller.hpp +++ b/bluetooth-mitm/source/controllers/8bitdo_controller.hpp @@ -19,6 +19,18 @@ namespace ams::controller { + enum EightBitDoDPadDirection : uint16_t { + EightBitDoDPad_Released = 0x0000, + EightBitDoDPad_N = 0x0052, + EightBitDoDPad_NE = 0x524f, + EightBitDoDPad_E = 0x004f, + EightBitDoDPad_SE = 0x4f51, + EightBitDoDPad_S = 0x0051, + EightBitDoDPad_SW = 0x5150, + EightBitDoDPad_W = 0x0050, + EightBitDoDPad_NW = 0x5250, + }; + struct EightBitDoStickData { uint8_t x; uint8_t y; @@ -42,8 +54,8 @@ namespace ams::controller { struct EightBitDoInputReport0x01 { uint8_t _unk0[2]; - uint8_t dpad; - uint8_t _unk1[5]; + uint16_t dpad; + uint8_t _unk1[4]; } __attribute__((packed)); struct EightBitDoInputReport0x03 { From 55e322464133cf059a071a1e48fe6cf5319294e8 Mon Sep 17 00:00:00 2001 From: ndeadly <24677491+ndeadly@users.noreply.github.com> Date: Fri, 18 Sep 2020 11:25:16 +0200 Subject: [PATCH 3/3] bluetooth-mitm: change 8bitdo zero home button combo to select + dpad down --- bluetooth-mitm/source/controllers/8bitdo_controller.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/bluetooth-mitm/source/controllers/8bitdo_controller.cpp b/bluetooth-mitm/source/controllers/8bitdo_controller.cpp index 12b9370..103f155 100644 --- a/bluetooth-mitm/source/controllers/8bitdo_controller.cpp +++ b/bluetooth-mitm/source/controllers/8bitdo_controller.cpp @@ -71,12 +71,10 @@ namespace ams::controller { dst->input0x30.buttons.plus = src->input0x03.buttons.start; // Home combo - dst->input0x30.buttons.home = dst->input0x30.buttons.R && dst->input0x30.buttons.L && dst->input0x30.buttons.minus && dst->input0x30.buttons.plus; + dst->input0x30.buttons.home = dst->input0x30.buttons.minus && dst->input0x30.buttons.dpad_down; if (dst->input0x30.buttons.home) { - dst->input0x30.buttons.R = 0; - dst->input0x30.buttons.L = 0; dst->input0x30.buttons.minus = 0; - dst->input0x30.buttons.plus = 0; + dst->input0x30.buttons.dpad_down = 0; } }