mirrors/yuzu
2
1
Fork 0
mirror of https://github.com/yuzu-emu/yuzu.git synced 2024-07-04 23:31:19 +01:00
Code Issues Releases Activity

Left joycon rotation button remapping

Browse source
This commit is contained in:
David Marcec 2018-10-18 19:00:16 +11:00 committed by Zach Hilman
parent b9c1e4b0e7
commit 7fbe2c83a7
2 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/core/hle/service/hid/controllers/npad.cpp
View file

@ -79,21 +79,31 @@ void Controller_NPad::InitNewlyAddedControler(std::size_t controller_idx) {
controller.joy_styles.handheld.Assign(1); controller.joy_styles.handheld.Assign(1);
controller.device_type.handheld.Assign(1); controller.device_type.handheld.Assign(1);
controller.pad_assignment = NPadAssignments::Dual; controller.pad_assignment = NPadAssignments::Dual;
controller.properties.is_vertical.Assign(1);
controller.properties.use_plus.Assign(1);
controller.properties.use_minus.Assign(1);
break; break;
case NPadControllerType::JoyDual: case NPadControllerType::JoyDual:
controller.joy_styles.joycon_dual.Assign(1); controller.joy_styles.joycon_dual.Assign(1);
controller.device_type.joycon_left.Assign(1); controller.device_type.joycon_left.Assign(1);
controller.device_type.joycon_right.Assign(1); controller.device_type.joycon_right.Assign(1);
controller.properties.is_vertical.Assign(1);
controller.properties.use_plus.Assign(1);
controller.properties.use_minus.Assign(1);
controller.pad_assignment = NPadAssignments::Dual; controller.pad_assignment = NPadAssignments::Dual;
break; break;
case NPadControllerType::JoyLeft: case NPadControllerType::JoyLeft:
controller.joy_styles.joycon_left.Assign(1); controller.joy_styles.joycon_left.Assign(1);
controller.device_type.joycon_left.Assign(1); controller.device_type.joycon_left.Assign(1);
controller.properties.is_horizontal.Assign(1);
controller.properties.use_minus.Assign(1);
controller.pad_assignment = NPadAssignments::Single; controller.pad_assignment = NPadAssignments::Single;
break; break;
case NPadControllerType::JoyRight: case NPadControllerType::JoyRight:
controller.joy_styles.joycon_right.Assign(1); controller.joy_styles.joycon_right.Assign(1);
controller.device_type.joycon_right.Assign(1); controller.device_type.joycon_right.Assign(1);
controller.properties.is_horizontal.Assign(1);
controller.properties.use_plus.Assign(1);
controller.pad_assignment = NPadAssignments::Single; controller.pad_assignment = NPadAssignments::Single;
break; break;
case NPadControllerType::Pokeball: case NPadControllerType::Pokeball:
@ -104,6 +114,9 @@ void Controller_NPad::InitNewlyAddedControler(std::size_t controller_idx) {
case NPadControllerType::ProController: case NPadControllerType::ProController:
controller.joy_styles.pro_controller.Assign(1); controller.joy_styles.pro_controller.Assign(1);
controller.device_type.pro_controller.Assign(1); controller.device_type.pro_controller.Assign(1);
controller.properties.is_vertical.Assign(1);
controller.properties.use_plus.Assign(1);
controller.properties.use_minus.Assign(1);
controller.pad_assignment = NPadAssignments::Single; controller.pad_assignment = NPadAssignments::Single;
break; break;
} }
@ -118,9 +131,6 @@ void Controller_NPad::InitNewlyAddedControler(std::size_t controller_idx) {
controller.right_color.body_color = JOYCON_BODY_NEON_RED; controller.right_color.body_color = JOYCON_BODY_NEON_RED;
controller.right_color.button_color = JOYCON_BUTTONS_NEON_RED; controller.right_color.button_color = JOYCON_BUTTONS_NEON_RED;
controller.properties.is_vertical.Assign(1); // TODO(ogniK): Swap joycons orientations
controller.properties.use_plus.Assign(1);
controller.properties.use_minus.Assign(1);
controller.battery_level[0] = BATTERY_FULL; controller.battery_level[0] = BATTERY_FULL;
controller.battery_level[1] = BATTERY_FULL; controller.battery_level[1] = BATTERY_FULL;
controller.battery_level[2] = BATTERY_FULL; controller.battery_level[2] = BATTERY_FULL;
@ -202,8 +212,8 @@ void Controller_NPad::RequestPadStateUpdate(u32 npad_id) {
pad_state.r_stick_right.Assign(buttons[RStick_Right - BUTTON_HID_BEGIN]->GetStatus()); pad_state.r_stick_right.Assign(buttons[RStick_Right - BUTTON_HID_BEGIN]->GetStatus());
pad_state.r_stick_down.Assign(buttons[RStick_Down - BUTTON_HID_BEGIN]->GetStatus()); pad_state.r_stick_down.Assign(buttons[RStick_Down - BUTTON_HID_BEGIN]->GetStatus());
pad_state.sl.Assign(buttons[SL - BUTTON_HID_BEGIN]->GetStatus()); pad_state.left_sl.Assign(buttons[SL - BUTTON_HID_BEGIN]->GetStatus());
pad_state.sr.Assign(buttons[SR - BUTTON_HID_BEGIN]->GetStatus()); pad_state.left_sr.Assign(buttons[SR - BUTTON_HID_BEGIN]->GetStatus());
const auto [stick_l_x_f, stick_l_y_f] = const auto [stick_l_x_f, stick_l_y_f] =
sticks[static_cast<std::size_t>(JoystickId::Joystick_Left)]->GetStatus(); sticks[static_cast<std::size_t>(JoystickId::Joystick_Left)]->GetStatus();
@ -307,6 +317,7 @@ void Controller_NPad::OnUpdate(u8* data, std::size_t data_len) {
pad_state.l_stick = temp_lstick_entry; pad_state.l_stick = temp_lstick_entry;
pad_state.r_stick = temp_rstick_entry; pad_state.r_stick = temp_rstick_entry;
} }
libnx_entry.connection_status.raw = 0; libnx_entry.connection_status.raw = 0;
switch (controller_type) { switch (controller_type) {

7
src/core/hle/service/hid/controllers/npad.h
View file

@ -165,8 +165,11 @@ private:
BitField<23, 1, u64_le> r_stick_down; BitField<23, 1, u64_le> r_stick_down;
// Not always active? // Not always active?
BitField<24, 1, u64_le> sl; BitField<24, 1, u64_le> left_sl;
BitField<25, 1, u64_le> sr; BitField<25, 1, u64_le> left_sr;
BitField<26, 1, u64_le> right_sl;
BitField<27, 1, u64_le> right_sr;
}; };
}; };
static_assert(sizeof(ControllerPadState) == 8, "ControllerPadState is an invalid size"); static_assert(sizeof(ControllerPadState) == 8, "ControllerPadState is an invalid size");