Skip to content

Commit ccd6be0

Browse files
committed
Increase default madgwick beta for stabilization
1 parent 06829ca commit ccd6be0

File tree

5 files changed

+22
-5
lines changed

5 files changed

+22
-5
lines changed

src/psmoveconfigtool/AppStage_ControllerSettings.cpp

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1061,6 +1061,14 @@ void AppStage_ControllerSettings::renderUI()
10611061
request_offset = true;
10621062
}
10631063
ImGui::PopItemWidth();
1064+
1065+
if (ImGui::IsItemHovered())
1066+
{
1067+
ImGui::SetTooltip(
1068+
"Stabilization will reduce magnetometer and accelerometer jittering\n"
1069+
"when the controller is stable."
1070+
);
1071+
}
10641072
}
10651073

10661074
if (!settings_shown)
@@ -1082,7 +1090,7 @@ void AppStage_ControllerSettings::renderUI()
10821090
controllerInfo.FilterPassiveDriftCorrectionDelay = 100.f;
10831091
controllerInfo.FilterUseStabilization = false;
10841092
controllerInfo.FilterStabilizationMinScale = 0.1f;
1085-
controllerInfo.FilterMadgwickBeta = 0.2f;
1093+
controllerInfo.FilterMadgwickBeta = 0.5f;
10861094
controllerInfo.FilterMadgwickStabilization = true;
10871095

10881096
request_offset = true;

src/psmoveconfigtool/AppStage_HMDSettings.cpp

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -489,6 +489,15 @@ void AppStage_HMDSettings::renderUI()
489489
request_offset = true;
490490
}
491491
ImGui::PopItemWidth();
492+
493+
494+
if (ImGui::IsItemHovered())
495+
{
496+
ImGui::SetTooltip(
497+
"Stabilization will reduce magnetometer and accelerometer jittering\n"
498+
"when the head-mounted display is stable."
499+
);
500+
}
492501
}
493502

494503
if (!settings_shown)
@@ -502,7 +511,7 @@ void AppStage_HMDSettings::renderUI()
502511
{
503512
hmdInfo.FilterLowPassOpticalDistance = 10.f;
504513
hmdInfo.FilterLowPassOpticalSmoothing = 0.40f;
505-
hmdInfo.FilterMadgwickBeta = 0.2f;
514+
hmdInfo.FilterMadgwickBeta = 0.5f;
506515
hmdInfo.FilterMadgwickStabilization = true;
507516

508517
request_offset = true;

src/psmoveservice/MorpheusHMD/MorpheusHMD.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class MorpheusHMDConfig : public PSMoveConfig
4949
, tracking_color_id(eCommonTrackingColorID::Blue)
5050
, filter_lowpassoptical_distance(10.f)
5151
, filter_lowpassoptical_smoothing(0.40f)
52-
, filter_madgwick_beta(0.2f)
52+
, filter_madgwick_beta(0.5f)
5353
, filter_madgwick_stabilization(true)
5454
{
5555
offset_position.set(0.0f, 0.0f, 0.0f);

src/psmoveservice/PSDualShock4/PSDualShock4Controller.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ class PSDualShock4ControllerConfig : public PSMoveConfig
7373
, hand("Any")
7474
, filter_lowpassoptical_distance(10.f)
7575
, filter_lowpassoptical_smoothing(0.40f)
76-
, filter_madgwick_beta(0.2f)
76+
, filter_madgwick_beta(0.5f)
7777
, filter_madgwick_stabilization(true)
7878
{
7979
offset_position.set(0.0f, 0.0f, 0.0f);

src/psmoveservice/PSMoveController/PSMoveController.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ class PSMoveControllerConfig : public PSMoveConfig
8282
, filter_passive_drift_correction_delay(100.f)
8383
, filter_use_stabilization(false)
8484
, filter_stabilization_min_scale(0.1f)
85-
, filter_madgwick_beta(0.2f)
85+
, filter_madgwick_beta(0.5f)
8686
, filter_madgwick_stabilization(true)
8787
{
8888
magnetometer_identity.clear();

0 commit comments

Comments
 (0)