aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xREADME.md2
-rwxr-xr-xsrc/hid_core/frontend/emulated_controller.cpp5
-rwxr-xr-xtools/reset-submodules.sh8
3 files changed, 11 insertions, 4 deletions
diff --git a/README.md b/README.md
index fc3f1ce00..60c9cf79f 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 4170. 4This is the source code for early-access 4171.
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 7664341bd..9aa08d5cc 100755
--- a/src/hid_core/frontend/emulated_controller.cpp
+++ b/src/hid_core/frontend/emulated_controller.cpp
@@ -176,10 +176,9 @@ void EmulatedController::LoadDevices() {
176 if (npad_id_type == NpadIdType::Player1 || npad_id_type == NpadIdType::Handheld) { 176 if (npad_id_type == NpadIdType::Player1 || npad_id_type == NpadIdType::Handheld) {
177 camera_params[1] = Common::ParamPackage{"engine:camera,camera:1"}; 177 camera_params[1] = Common::ParamPackage{"engine:camera,camera:1"};
178 nfc_params[0] = Common::ParamPackage{"engine:virtual_amiibo,nfc:1"}; 178 nfc_params[0] = Common::ParamPackage{"engine:virtual_amiibo,nfc:1"};
179#ifdef HAVE_LIBUSB 179#ifndef ANDROID
180 ring_params[1] = Common::ParamPackage{"engine:joycon,axis_x:100,axis_y:101"}; 180 ring_params[1] = Common::ParamPackage{"engine:joycon,axis_x:100,axis_y:101"};
181#endif 181#else
182#ifdef ANDROID
183 android_params = Common::ParamPackage{"engine:android,port:100"}; 182 android_params = Common::ParamPackage{"engine:android,port:100"};
184#endif 183#endif
185 } 184 }
diff --git a/tools/reset-submodules.sh b/tools/reset-submodules.sh
new file mode 100755
index 000000000..6fdfe0bcd
--- /dev/null
+++ b/tools/reset-submodules.sh
@@ -0,0 +1,8 @@
1#!/bin/bash -ex
2
3# SPDX-FileCopyrightText: 2024 yuzu Emulator Project
4# SPDX-License-Identifier: MIT
5
6git submodule sync
7git submodule foreach --recursive git reset --hard
8git submodule update --init --recursive