Merge branch 'develop' into master

ndeadly · Sep 16, 2020 · 198e7fa · 198e7fa
2 parents 6f4c5b0 + fa9f861
commit 198e7fa
Show file tree

Hide file tree

Showing 9 changed files with 415 additions and 8 deletions.
diff --git a/Atmosphere-libs b/Atmosphere-libs
diff --git a/bluetooth-mitm/source/controllers/controller_management.cpp b/bluetooth-mitm/source/controllers/controller_management.cpp
@@ -89,7 +89,19 @@ namespace ams::controller {
                 return ControllerType_Xiaomi;
             }
         }
-
+
+        for (auto hwId : GamesirController::hardware_ids) {
+            if ( (device->vid == hwId.vid) && (device->pid == hwId.pid) ) {
+                return ControllerType_Gamesir;
+            }
+        }
+
+        for (auto hwId : SteelseriesController::hardware_ids) {
+            if ( (device->vid == hwId.vid) && (device->pid == hwId.pid) ) {
+                return ControllerType_Steelseries;
+            }
+        }
+
         return ControllerType_Unknown;
     }
 
@@ -143,6 +155,12 @@ namespace ams::controller {
             case ControllerType_Xiaomi:
                 g_controllers.push_back(std::make_unique<XiaomiController>(address));
                 break;
+            case ControllerType_Gamesir:
+                g_controllers.push_back(std::make_unique<GamesirController>(address));
+				break;
+            case ControllerType_Steelseries:
+                g_controllers.push_back(std::make_unique<SteelseriesController>(address));
+                break;
             default:
                 g_controllers.push_back(std::make_unique<DefaultController>(address));
                 break;

diff --git a/bluetooth-mitm/source/controllers/controller_management.hpp b/bluetooth-mitm/source/controllers/controller_management.hpp
@@ -25,6 +25,8 @@
 #include "gembox_controller.hpp"
 #include "ipega_controller.hpp"
 #include "xiaomi_controller.hpp"
+#include "gamesir_controller.hpp"
+#include "steelseries_controller.hpp"
 
 namespace ams::controller {
 
@@ -41,6 +43,8 @@ namespace ams::controller {
         ControllerType_Gembox,
         ControllerType_Ipega,
         ControllerType_Xiaomi,
+        ControllerType_Gamesir,
+        ControllerType_Steelseries,
         ControllerType_Unknown,
     };
 

diff --git a/bluetooth-mitm/source/controllers/dualshock4_controller.hpp b/bluetooth-mitm/source/controllers/dualshock4_controller.hpp
@@ -124,8 +124,9 @@ namespace ams::controller {
 
         public:
             static constexpr const HardwareID hardware_ids[] = { 
-                {0x054c, 0x05c4},  // Official Dualshock4 v1
-                {0x054c, 0x09cc}   // Official Dualshock4 v2
+                {0x054c, 0x05c4},   // Official Dualshock4 v1
+                {0x054c, 0x09cc},   // Official Dualshock4 v2
+                {0x0f0d, 0x00f6}    // Hori ONYX
             };
 
             Dualshock4Controller(const bluetooth::Address *address)

diff --git a/bluetooth-mitm/source/controllers/gamesir_controller.cpp b/bluetooth-mitm/source/controllers/gamesir_controller.cpp
@@ -0,0 +1,100 @@
+/*
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+#include "gamesir_controller.hpp"
+#include <stratosphere.hpp>
+
+namespace ams::controller {
+
+    namespace {
+
+        const constexpr float stick_scale_factor = float(UINT12_MAX) / UINT8_MAX;
+
+    }
+
+    void GamesirController::ConvertReportFormat(const bluetooth::HidReport *in_report, bluetooth::HidReport *out_report) {
+        auto gamesir_report = reinterpret_cast<const GamesirReportData *>(&in_report->data);
+        auto switch_report = reinterpret_cast<SwitchReportData *>(&out_report->data);
+
+        switch(gamesir_report->id) {
+            case 0x12:
+                this->HandleInputReport0x12(gamesir_report, switch_report);
+                break;
+            case 0xc4:
+                this->HandleInputReport0xc4(gamesir_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 GamesirController::HandleInputReport0x12(const GamesirReportData *src, SwitchReportData *dst) {
+        dst->input0x30.buttons.home = src->input0x12.home;
+
+        this->PackStickData(&dst->input0x30.left_stick, STICK_ZERO, STICK_ZERO);
+        this->PackStickData(&dst->input0x30.right_stick, STICK_ZERO, STICK_ZERO);
+    }
+
+    void GamesirController::HandleInputReport0xc4(const GamesirReportData *src, SwitchReportData *dst) {
+        this->PackStickData(&dst->input0x30.left_stick,
+            static_cast<uint16_t>(stick_scale_factor * src->input0xc4.left_stick.x) & 0xfff,
+            static_cast<uint16_t>(stick_scale_factor * (UINT8_MAX - src->input0xc4.left_stick.y)) & 0xfff
+        );
+        this->PackStickData(&dst->input0x30.right_stick,
+            static_cast<uint16_t>(stick_scale_factor * src->input0xc4.right_stick.x) & 0xfff,
+            static_cast<uint16_t>(stick_scale_factor * (UINT8_MAX - src->input0xc4.right_stick.y)) & 0xfff
+        );
+
+        dst->input0x30.buttons.dpad_down   = (src->input0xc4.buttons.dpad == GamesirDpad_S)  ||
+                                             (src->input0xc4.buttons.dpad == GamesirDpad_SE) ||
+                                             (src->input0xc4.buttons.dpad == GamesirDpad_SW);
+        dst->input0x30.buttons.dpad_up     = (src->input0xc4.buttons.dpad == GamesirDpad_N)  ||
+                                             (src->input0xc4.buttons.dpad == GamesirDpad_NE) ||
+                                             (src->input0xc4.buttons.dpad == GamesirDpad_NW);
+        dst->input0x30.buttons.dpad_right  = (src->input0xc4.buttons.dpad == GamesirDpad_E)  ||
+                                             (src->input0xc4.buttons.dpad == GamesirDpad_NE) ||
+                                             (src->input0xc4.buttons.dpad == GamesirDpad_SE);
+        dst->input0x30.buttons.dpad_left   = (src->input0xc4.buttons.dpad == GamesirDpad_W)  ||
+                                             (src->input0xc4.buttons.dpad == GamesirDpad_NW) ||
+                                             (src->input0xc4.buttons.dpad == GamesirDpad_SW);
+
+        dst->input0x30.buttons.A = src->input0xc4.buttons.B;
+        dst->input0x30.buttons.B = src->input0xc4.buttons.A;
+        dst->input0x30.buttons.X = src->input0xc4.buttons.Y;
+        dst->input0x30.buttons.Y = src->input0xc4.buttons.X;
+
+        dst->input0x30.buttons.R  = src->input0xc4.buttons.RB;
+        dst->input0x30.buttons.ZR = src->input0xc4.buttons.RT;
+        dst->input0x30.buttons.L  = src->input0xc4.buttons.LB;
+        dst->input0x30.buttons.ZL = src->input0xc4.buttons.LT; 
+
+        dst->input0x30.buttons.minus = src->input0xc4.buttons.select;
+        dst->input0x30.buttons.plus  = src->input0xc4.buttons.start;
+
+        dst->input0x30.buttons.lstick_press = src->input0xc4.buttons.L3;
+        dst->input0x30.buttons.rstick_press = src->input0xc4.buttons.R3;  
+
+        dst->input0x30.buttons.capture  = 0;
+    }
+
+}
diff --git a/bluetooth-mitm/source/controllers/gamesir_controller.hpp b/bluetooth-mitm/source/controllers/gamesir_controller.hpp
@@ -0,0 +1,104 @@
+/*
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+#include "emulated_switch_controller.hpp"
+
+namespace ams::controller {
+
+    enum GamesirDpadDirection {
+        GamesirDpad_Released,
+        GamesirDpad_N,
+        GamesirDpad_NE,
+        GamesirDpad_E,
+        GamesirDpad_SE,
+        GamesirDpad_S,
+        GamesirDpad_SW,
+        GamesirDpad_W,
+        GamesirDpad_NW,
+    };
+
+    struct GamesirStickData {
+        uint8_t x;
+        uint8_t y;
+    } __attribute__((packed));
+
+    struct GamesirButtonData {
+        uint8_t A       : 1;
+        uint8_t B       : 1;
+        uint8_t         : 1;
+        uint8_t X       : 1;
+        uint8_t Y       : 1;
+        uint8_t         : 1;
+        uint8_t LB      : 1;
+        uint8_t RB      : 1;
+
+        uint8_t LT      : 1;
+        uint8_t RT      : 1;
+        uint8_t select  : 1;
+        uint8_t start   : 1;
+        uint8_t         : 1;
+        uint8_t L3      : 1;
+        uint8_t R3      : 1;
+        uint8_t         : 0;
+
+        uint8_t dpad;
+    } __attribute__((packed));
+
+    struct GamesirReport0x12 {
+        uint8_t         : 3;
+        uint8_t home    : 1;
+        uint8_t         : 0;
+
+        uint8_t _unk[2];
+    } __attribute__((packed));
+
+    struct GamesirReport0xc4 {
+        GamesirStickData    left_stick;
+        GamesirStickData    right_stick;
+        uint8_t             left_trigger;
+        uint8_t             right_trigger;
+        GamesirButtonData   buttons;
+        uint8_t             _unk;
+    } __attribute__((packed));
+
+    struct GamesirReportData {
+        uint8_t id;
+        union {
+            GamesirReport0x12  input0x12;
+            GamesirReport0xc4  input0xc4;
+        };
+    } __attribute__((packed));
+
+    class GamesirController : public EmulatedSwitchController {
+
+        public:
+            static constexpr const HardwareID hardware_ids[] = { 
+                {0x05ac, 0x022d} // Gamesir-G3s (Lol, this is actually the ID of an Apple wireless keyboard)
+            };  
+
+            GamesirController(const bluetooth::Address *address) 
+                : EmulatedSwitchController(address) { };
+
+            void ConvertReportFormat(const bluetooth::HidReport *in_report, bluetooth::HidReport *out_report);
+
+        private:
+            void HandleInputReport0x12(const GamesirReportData *src, SwitchReportData *dst);
+            void HandleInputReport0xc4(const GamesirReportData *src, SwitchReportData *dst);
+
+    };
+
+}
diff --git a/bluetooth-mitm/source/controllers/steelseries_controller.cpp b/bluetooth-mitm/source/controllers/steelseries_controller.cpp
@@ -0,0 +1,93 @@
+/*
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+#include "steelseries_controller.hpp"
+#include <stratosphere.hpp>
+
+namespace ams::controller {
+
+    namespace {
+
+        const constexpr float stick_scale_factor = float(UINT12_MAX) / UINT8_MAX;
+
+    }
+
+    void SteelseriesController::ConvertReportFormat(const bluetooth::HidReport *in_report, bluetooth::HidReport *out_report) {
+        auto steelseries_report = reinterpret_cast<const SteelseriesReportData *>(&in_report->data);
+        auto switch_report = reinterpret_cast<SwitchReportData *>(&out_report->data);
+
+        switch(steelseries_report->id) {
+            case 0x01:
+                this->HandleInputReport0x01(steelseries_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 SteelseriesController::HandleInputReport0x01(const SteelseriesReportData *src, SwitchReportData *dst) {
+        this->PackStickData(&dst->input0x30.left_stick,
+            static_cast<uint16_t>(stick_scale_factor * -static_cast<int8_t>(~src->input0x01.left_stick.x + 1) + 0x7ff) & 0xfff,
+            static_cast<uint16_t>(stick_scale_factor * (UINT8_MAX + static_cast<int8_t>(~src->input0x01.left_stick.y + 1)) + 0x7ff) & 0xfff
+        );
+        this->PackStickData(&dst->input0x30.right_stick,
+            static_cast<uint16_t>(stick_scale_factor * -static_cast<int8_t>(~src->input0x01.right_stick.x + 1) + 0x7ff) & 0xfff,
+            static_cast<uint16_t>(stick_scale_factor * (UINT8_MAX + static_cast<int8_t>(~src->input0x01.right_stick.y + 1)) + 0x7ff) & 0xfff
+        );
+
+        dst->input0x30.buttons.dpad_down    = (src->input0x01.dpad == SteelseriesDPad_S)  ||
+                                              (src->input0x01.dpad == SteelseriesDPad_SE) ||
+                                              (src->input0x01.dpad == SteelseriesDPad_SW);
+        dst->input0x30.buttons.dpad_up      = (src->input0x01.dpad == SteelseriesDPad_N)  ||
+                                              (src->input0x01.dpad == SteelseriesDPad_NE) ||
+                                              (src->input0x01.dpad == SteelseriesDPad_NW);
+        dst->input0x30.buttons.dpad_right   = (src->input0x01.dpad == SteelseriesDPad_E)  ||
+                                              (src->input0x01.dpad == SteelseriesDPad_NE) ||
+                                              (src->input0x01.dpad == SteelseriesDPad_SE);
+        dst->input0x30.buttons.dpad_left    = (src->input0x01.dpad == SteelseriesDPad_W)  ||
+                                              (src->input0x01.dpad == SteelseriesDPad_NW) ||
+                                              (src->input0x01.dpad == SteelseriesDPad_SW);
+
+        dst->input0x30.buttons.A = src->input0x01.buttons.B;
+        dst->input0x30.buttons.B = src->input0x01.buttons.A;
+        dst->input0x30.buttons.X = src->input0x01.buttons.Y;
+        dst->input0x30.buttons.Y = src->input0x01.buttons.X;
+
+        dst->input0x30.buttons.R  = src->input0x01.buttons.R;
+        dst->input0x30.buttons.L  = src->input0x01.buttons.L;
+
+        dst->input0x30.buttons.minus    = src->input0x01.buttons.select;
+        dst->input0x30.buttons.plus     = src->input0x01.buttons.start;
+
+        dst->input0x30.buttons.capture  = 0;
+
+        // Home button combo
+        dst->input0x30.buttons.home = dst->input0x30.buttons.dpad_down & dst->input0x30.buttons.minus;
+        if (dst->input0x30.buttons.home){
+            dst->input0x30.buttons.dpad_down    = 0;
+            dst->input0x30.buttons.minus        = 0;
+        }
+
+    }
+
+}
+7 −7		libstratosphere/include/stratosphere/fs/fs_code.hpp
+1 −1		libstratosphere/include/stratosphere/ro/impl/ro_ro_interface.hpp
+10 −9		libstratosphere/include/stratosphere/ro/ro_types.hpp
+10 −10		libstratosphere/source/fs/fs_code.cpp
+3 −3		libvapours/include/vapours/ams/ams_api_version.h
+3 −1		libvapours/include/vapours/ams/ams_target_firmware.h
+1 −1		libvapours/include/vapours/results/ro_results.hpp