empathicqubit/BetterJoy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

- Add option to use raw gyro (without filter) input for gyro control mapping

Browse source
This commit is contained in:
David Khachaturov 2021-04-30 17:05:48 +01:00
parent d0709ac6ff
commit 50b64b1165
2 changed files with 35 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
BetterJoyForCemu/App.config
View file

@ -85,16 +85,19 @@
<!-- When "joy_left" or "joy_right", turn gyro movements into respective left/right joystick (mouse-like) movements -->
<!-- When "mouse", turn gyro movements into mouse movement. Press either stick-button to reset to middle of primary display -->
<!-- Default: none -->
<add key="GyroToJoyOrMouse" value="none"/>
<add key="GyroToJoyOrMouse" value="false"/>
<!-- Whether to use filtered IMU or raw gyro values (the latter is more responsive) -->
<!-- Default: true -->
<add key="UseFilteredIMU" value="true"/>
<!-- Beta value of AHRS. Affects divergence of filter -->
<!-- Default: 0.05 -->
<add key="AHRS_beta" value="0.05"/>
<!-- Sensitivity of gyro-to-mouse movements -->
<!-- Default: 1200; 800 -->
<!-- Default: 1200; 800 (if using raw values, decrease by a factor of ~15) -->
<add key="GyroMouseSensitivityX" value="1200"/>
<add key="GyroMouseSensitivityY" value="800"/>
<!-- Sensitivity of gyro-to-joystick movements -->
<!-- Default: 40.0; 10.0 -->
<!-- Default: 40.0; 10.0 (if using raw values, decrease by a factor of ~15: eg 2.6, 0.6) -->
<add key="GyroStickSensitivityX" value="40.0"/>
<add key="GyroStickSensitivityY" value="10.0"/>
<!-- Stick range reduction when gyro-to-joystick is enabled and active; divides range by factor (so 1 is no change; 1.5 is halved range (with deadzone in mind)) -->

35
BetterJoyForCemu/Joycon.cs
View file

@ -687,6 +687,7 @@ namespace BetterJoyForCemu {
long lastDoubleClick = -1;
string extraGyroFeature = ConfigurationManager.AppSettings["GyroToJoyOrMouse"];
bool UseFilteredIMU = Boolean.Parse(ConfigurationManager.AppSettings["UseFilteredIMU"]);
int GyroMouseSensitivityX = Int32.Parse(ConfigurationManager.AppSettings["GyroMouseSensitivityX"]);
int GyroMouseSensitivityY = Int32.Parse(ConfigurationManager.AppSettings["GyroMouseSensitivityY"]);
float GyroStickSensitivityX = float.Parse(ConfigurationManager.AppSettings["GyroStickSensitivityX"]);
@ -770,13 +771,21 @@ namespace BetterJoyForCemu {
// Filtered IMU data
this.cur_rotation = AHRS.GetEulerAngles();
float dt = 0.015f; // 15ms
if (GyroAnalogSliders && (other != null || isPro)) {
Button leftT = isLeft ? Button.SHOULDER_2 : Button.SHOULDER2_2;
Button rightT = isLeft ? Button.SHOULDER2_2 : Button.SHOULDER_2;
Joycon left = isLeft ? this : (isPro ? this : this.other); Joycon right = !isLeft ? this : (isPro ? this : this.other);
int ldy = (int)(GyroAnalogSensitivity * (left.cur_rotation[0] - left.cur_rotation[3]));
int rdy = (int)(GyroAnalogSensitivity * (right.cur_rotation[0] - right.cur_rotation[3]));
int ldy, rdy;
if (UseFilteredIMU) {
ldy = (int)(GyroAnalogSensitivity * (left.cur_rotation[0] - left.cur_rotation[3]));
rdy = (int)(GyroAnalogSensitivity * (right.cur_rotation[0] - right.cur_rotation[3]));
} else {
ldy = (int)(GyroAnalogSensitivity * (left.gyr_g.Y * dt));
rdy = (int)(GyroAnalogSensitivity * (right.gyr_g.Y * dt));
}
if (buttons[(int)leftT]) {
sliderVal[0] = (byte)Math.Min(Byte.MaxValue, Math.Max(0, (int)sliderVal[0] + ldy));
@ -808,8 +817,15 @@ namespace BetterJoyForCemu {
if (extraGyroFeature.Substring(0, 3) == "joy") {
if (Config.Value("active_gyro") == "0" || active_gyro) {
float[] control_stick = (extraGyroFeature == "joy_left") ? stick : stick2;
float dx = (GyroStickSensitivityX * (cur_rotation[1] - cur_rotation[4])); // yaw
float dy = -(GyroStickSensitivityY * (cur_rotation[0] - cur_rotation[3])); // pitch
float dx, dy;
if (UseFilteredIMU) {
dx = (GyroStickSensitivityX * (cur_rotation[1] - cur_rotation[4])); // yaw
dy = -(GyroStickSensitivityY * (cur_rotation[0] - cur_rotation[3])); // pitch
} else {
dx = (GyroStickSensitivityX * (gyr_g.Z * dt)); // yaw
dy = -(GyroStickSensitivityY * (gyr_g.Y * dt)); // pitch
}
control_stick[0] = Math.Max(-1.0f, Math.Min(1.0f, control_stick[0] / GyroStickReduction + dx));
control_stick[1] = Math.Max(-1.0f, Math.Min(1.0f, control_stick[1] / GyroStickReduction + dy));
@ -817,8 +833,15 @@ namespace BetterJoyForCemu {
} else if (extraGyroFeature == "mouse" && (isPro || (other == null) || (other != null && (Boolean.Parse(ConfigurationManager.AppSettings["GyroMouseLeftHanded"]) ? isLeft : !isLeft)))) {
// gyro data is in degrees/s
if (Config.Value("active_gyro") == "0" || active_gyro) {
int dx = (int)(GyroMouseSensitivityX * (cur_rotation[1] - cur_rotation[4])); // yaw
int dy = (int)-(GyroMouseSensitivityY * (cur_rotation[0] - cur_rotation[3])); // pitch
int dx, dy;
if (UseFilteredIMU) {
dx = (int)(GyroMouseSensitivityX * (cur_rotation[1] - cur_rotation[4])); // yaw
dy = (int)-(GyroMouseSensitivityY * (cur_rotation[0] - cur_rotation[3])); // pitch
} else {
dx = (int)(GyroMouseSensitivityX * (gyr_g.Z * dt));
dy = (int)-(GyroMouseSensitivityY * (gyr_g.Y * dt));
}
WindowsInput.Simulate.Events().MoveBy(dx, dy).Invoke();
}