Add announcement of magnetometer not supported (SlimeVR#356)

* Add announcement of magnetometer not supported * undo platformio config * remove debug line
kounocom · Nov 12, 2024 · 90b22ec · 90b22ec
1 parent 3ad8ba2
commit 90b22ec
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/src/configuration/SensorConfig.cpp b/src/configuration/SensorConfig.cpp
@@ -48,11 +48,14 @@ const char* calibrationConfigTypeToString(SensorConfigType type) {
 	}
 }
 
-uint16_t configDataToNumber(SensorConfig sensorConfig) {
+// 1st bit specifies if magnetometer is enabled or disabled
+// 2nd bit specifies if magnetometer is supported
+uint16_t configDataToNumber(SensorConfig* sensorConfig, bool magSupported) {
 	uint16_t data = 0;
-	switch (sensorConfig.type) {
+	data += magSupported << 1;
+	switch (sensorConfig->type) {
 		case SensorConfigType::BNO0XX: {
-			auto config = &sensorConfig.data.bno0XX;
+			auto config = &sensorConfig->data.bno0XX;
 			data += config->magEnabled;
 			break;
 		}

diff --git a/src/configuration/SensorConfig.h b/src/configuration/SensorConfig.h
@@ -174,7 +174,7 @@ struct SensorConfig {
 	} data;
 };
 
-uint16_t configDataToNumber(SensorConfig sensorConfig);
+uint16_t configDataToNumber(SensorConfig* sensorConfig, bool magSupported);
 }  // namespace Configuration
 }  // namespace SlimeVR
 

diff --git a/src/sensors/sensor.cpp b/src/sensors/sensor.cpp
@@ -90,7 +90,10 @@ void Sensor::resetTemperatureCalibrationState() {
 uint16_t Sensor::getSensorConfigData() {
 	SlimeVR::Configuration::SensorConfig sensorConfig
 		= configuration.getSensor(sensorId);
-	return SlimeVR::Configuration::configDataToNumber(sensorConfig);
+	return SlimeVR::Configuration::configDataToNumber(
+		&sensorConfig,
+		magStatus != MagnetometerStatus::MAG_NOT_SUPPORTED
+	);
 }
 
 const char* getIMUNameByType(ImuID imuType) {