Skip to content

Commit 1254666

Browse files
committed
Fix gyro/accel factory reset on USB connection
1 parent ae2353f commit 1254666

File tree

1 file changed

+2
-7
lines changed

1 file changed

+2
-7
lines changed

src/psmoveservice/PSMoveController/PSMoveController.cpp

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1179,14 +1179,9 @@ bool PSMoveController::open(
11791179
cfg = PSMoveControllerConfig(btaddr);
11801180
cfg.load();
11811181

1182-
if (!IsBluetooth || !cfg.is_valid)
1182+
if (!cfg.is_valid && !IsBluetooth)
11831183
{
1184-
if (!cfg.is_valid)
1185-
{
1186-
SERVER_LOG_ERROR("PSMoveController::open") << "PSMoveController(" << cur_dev_path << ") has invalid calibration.";
1187-
}
1188-
1189-
SERVER_LOG_INFO("PSMoveController::open") << "PSMoveController(" << cur_dev_path << ") is loading factory calibration.";
1184+
SERVER_LOG_WARNING("PSMoveController::open") << "PSMoveController(" << cur_dev_path << ") has invalid calibration. Using device factory calibration.";
11901185

11911186
// Load calibration from controller internal memory.
11921187
if (getIsPS4Controller())

0 commit comments

Comments
 (0)