Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Report IMU errors #288

Merged
merged 2 commits into from
Sep 21, 2023
Merged

Report IMU errors #288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8cc5d0c
Make not working sensors report error by default
l0ud Sep 19, 2023
ec44796
Set IMU error flag if any sensor reported error
l0ud Sep 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/sensors/EmptySensor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@ namespace SlimeVR
void motionLoop() override final{};
void sendData() override final{};
void startCalibration(int calibrationType) override final{};
SensorStatus getSensorState() override final
{
return SensorStatus::SENSOR_OFFLINE;
};
};
}
}
Expand Down
7 changes: 7 additions & 0 deletions src/sensors/SensorManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,13 +187,20 @@ namespace SlimeVR
void SensorManager::update()
{
// Gather IMU data
bool allIMUGood = true;
for (auto sensor : m_Sensors) {
if (sensor->isWorking()) {
swapI2C(sensor->sclPin, sensor->sdaPin);
sensor->motionLoop();
}
if (sensor->getSensorState() == SensorStatus::SENSOR_ERROR)
{
allIMUGood = false;
}
}

statusManager.setStatus(SlimeVR::Status::IMU_ERROR, !allIMUGood);

if (!networkConnection.isConnected()) {
return;
}
Expand Down
2 changes: 1 addition & 1 deletion src/sensors/sensor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#include "calibration.h"

SensorStatus Sensor::getSensorState() {
return isWorking() ? SensorStatus::SENSOR_OK : SensorStatus::SENSOR_OFFLINE;
return isWorking() ? SensorStatus::SENSOR_OK : SensorStatus::SENSOR_ERROR;
}

void Sensor::setAccelerationReady() {
Expand Down
Loading