diff --git a/src/sensors/bno080sensor.cpp b/src/sensors/bno080sensor.cpp index ab046754e..d49eb385b 100644 --- a/src/sensors/bno080sensor.cpp +++ b/src/sensors/bno080sensor.cpp @@ -58,11 +58,13 @@ void BNO080Sensor::motionSetup() switch (sensorConfig.type) { case SlimeVR::Configuration::SensorConfigType::BNO0XX: m_Config = sensorConfig.data.bno0XX; - magStatus = m_Config.magEnabled ? MagnetometerStatus::ENABLED : MagnetometerStatus::DISABLED; + magStatus = m_Config.magEnabled ? MagnetometerStatus::MAG_ENABLED + : MagnetometerStatus::MAG_DISABLED; break; default: // Ignore lack of config for BNO, byt default use from FW build - magStatus = USE_6_AXIS ? MagnetometerStatus::DISABLED : MagnetometerStatus::ENABLED; + magStatus = USE_6_AXIS ? MagnetometerStatus::MAG_DISABLED + : MagnetometerStatus::MAG_ENABLED; break; } @@ -258,7 +260,8 @@ void BNO080Sensor::setFlag(uint16_t flagId, bool state) { if(flagId == FLAG_SENSOR_BNO0XX_MAG_ENABLED) { m_Config.magEnabled = state; - magStatus = state ? MagnetometerStatus::ENABLED : MagnetometerStatus::DISABLED; + magStatus = state ? MagnetometerStatus::MAG_ENABLED + : MagnetometerStatus::MAG_DISABLED; SlimeVR::Configuration::SensorConfig config; config.type = SlimeVR::Configuration::SensorConfigType::BNO0XX; diff --git a/src/sensors/sensor.h b/src/sensors/sensor.h index 3eededbe1..722d59ffd 100644 --- a/src/sensors/sensor.h +++ b/src/sensors/sensor.h @@ -42,9 +42,9 @@ enum class SensorStatus : uint8_t { }; enum class MagnetometerStatus : uint8_t { - NOT_SUPPORTED = 0, - DISABLED = 1, - ENABLED = 2, + MAG_NOT_SUPPORTED = 0, + MAG_DISABLED = 1, + MAG_ENABLED = 2, }; class Sensor @@ -80,7 +80,7 @@ class Sensor return sclPin != sdaPin; }; bool isMagEnabled() { - return magStatus == MagnetometerStatus::ENABLED; + return magStatus == MagnetometerStatus::MAG_ENABLED; } uint8_t getSensorId() { return sensorId; @@ -109,7 +109,7 @@ class Sensor bool configured = false; bool working = false; uint8_t calibrationAccuracy = 0; - MagnetometerStatus magStatus = MagnetometerStatus::NOT_SUPPORTED; + MagnetometerStatus magStatus = MagnetometerStatus::MAG_NOT_SUPPORTED; Quat sensorOffset; bool newFusedRotation = false;