mirror/pineapple
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

early-access version 2368

Browse source
This commit is contained in:
pineappleEA 2022-01-04 01:09:50 +01:00
parent 34a8274cf2
commit 0ee7c35877
3 changed files with 37 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -1,7 +1,7 @@
yuzu emulator early access yuzu emulator early access
============= =============
This is the source code for early-access 2367. This is the source code for early-access 2368.
## Legal Notice ## Legal Notice

34
src/core/hid/emulated_controller.cpp
View file

@ -901,10 +901,36 @@ void EmulatedController::SetSupportedNpadStyleTag(NpadStyleTag supported_styles)
if (!is_connected) { if (!is_connected) {
return; return;
} }
if (!IsControllerSupported()) { if (IsControllerSupported()) {
LOG_ERROR(Service_HID, "Controller type {} is not supported. Disconnecting controller", return;
npad_type); }
Disconnect();
Disconnect();
// Fallback fullkey controllers to Pro controllers
if (IsControllerFullkey() && supported_style_tag.fullkey) {
LOG_WARNING(Service_HID, "Reconnecting controller type {} as Pro controller", npad_type);
SetNpadStyleIndex(NpadStyleIndex::ProController);
Connect();
return;
}
LOG_ERROR(Service_HID, "Controller type {} is not supported. Disconnecting controller",
npad_type);
}
bool EmulatedController::IsControllerFullkey(bool use_temporary_value) const {
const auto type = is_configuring && use_temporary_value ? tmp_npad_type : npad_type;
switch (type) {
case NpadStyleIndex::ProController:
case NpadStyleIndex::GameCube:
case NpadStyleIndex::NES:
case NpadStyleIndex::SNES:
case NpadStyleIndex::N64:
case NpadStyleIndex::SegaGenesis:
return true;
default:
return false;
} }
} }

6
src/core/hid/emulated_controller.h
View file

@ -337,6 +337,12 @@ private:
/// Set the params for TAS devices /// Set the params for TAS devices
void LoadTASParams(); void LoadTASParams();
/**
* @param use_temporary_value If true tmp_npad_type will be used
* @return true if the controller style is fullkey
*/
bool IsControllerFullkey(bool use_temporary_value = false) const;
/** /**
* Checks the current controller type against the supported_style_tag * Checks the current controller type against the supported_style_tag
* @param use_temporary_value If true tmp_npad_type will be used * @param use_temporary_value If true tmp_npad_type will be used