aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpineappleEA <pineaea@gmail.com>2024-02-18 22:43:02 +0100
committerpineappleEA <pineaea@gmail.com>2024-02-18 22:43:02 +0100
commitbe0bf24d0e2506ed18932bc6099e46c9dfaa5551 (patch)
tree507c07c136259af1b43ad3e8fc828f9b0d9b6750
parent70404689ef42506fafe57483ca089737a422fc14 (diff)
early-access version 4149EA-4149
-rwxr-xr-xREADME.md2
-rwxr-xr-xsrc/hid_core/frontend/emulated_controller.cpp6
2 files changed, 6 insertions, 2 deletions
diff --git a/README.md b/README.md
index fc7dcd41b..3d7e2e09c 100755
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
1yuzu emulator early access 1yuzu emulator early access
2============= 2=============
3 3
4This is the source code for early-access 4148. 4This is the source code for early-access 4149.
5 5
6## Legal Notice 6## Legal Notice
7 7
diff --git a/src/hid_core/frontend/emulated_controller.cpp b/src/hid_core/frontend/emulated_controller.cpp
index 3fa06d188..d9d278fa3 100755
--- a/src/hid_core/frontend/emulated_controller.cpp
+++ b/src/hid_core/frontend/emulated_controller.cpp
@@ -174,9 +174,13 @@ void EmulatedController::LoadDevices() {
174 // Only map virtual devices to the first controller 174 // Only map virtual devices to the first controller
175 if (npad_id_type == NpadIdType::Player1 || npad_id_type == NpadIdType::Handheld) { 175 if (npad_id_type == NpadIdType::Player1 || npad_id_type == NpadIdType::Handheld) {
176 camera_params[1] = Common::ParamPackage{"engine:camera,camera:1"}; 176 camera_params[1] = Common::ParamPackage{"engine:camera,camera:1"};
177 ring_params[1] = Common::ParamPackage{"engine:joycon,axis_x:100,axis_y:101"};
178 nfc_params[0] = Common::ParamPackage{"engine:virtual_amiibo,nfc:1"}; 177 nfc_params[0] = Common::ParamPackage{"engine:virtual_amiibo,nfc:1"};
178#ifdef HAVE_LIBUSB
179 ring_params[1] = Common::ParamPackage{"engine:joycon,axis_x:100,axis_y:101"};
180#endif
181#ifdef ANDROID
179 android_params = Common::ParamPackage{"engine:android,port:100"}; 182 android_params = Common::ParamPackage{"engine:android,port:100"};
183#endif
180 } 184 }
181 185
182 output_params[LeftIndex] = left_joycon; 186 output_params[LeftIndex] = left_joycon;