Fix coexistence with other IMU libs

facchinm · facchinm · commit bb2695787bf5 · 2022-10-07T13:06:07.000+02:00
diff --git a/src/ArduinoIMU.h b/src/ArduinoIMU.h
diff --git a/src/BMI270.cpp b/src/BMI270.cpp
@@ -452,6 +452,8 @@ void BoschSensorClass::print_rslt(int8_t rslt)
   }
 }
 
-#if IMU_INCLUDED
-  BoschSensorClass IMU(Wire1);
+#ifdef TARGET_ARDUINO_NANO33BLE
+BoschSensorClass IMU_BMI270_BMM150(Wire1);
+#else
+BoschSensorClass IMU_BMI270_BMM150(Wire);
 #endif
diff --git a/src/BoschSensorClass.h b/src/BoschSensorClass.h
@@ -21,10 +21,7 @@
 #include <Wire.h>
 #include "utilities/BMI270-Sensor-API/bmi270.h"
 #include "utilities/BMM150-Sensor-API/bmm150.h"
-#include "ArduinoIMU.h"
 
-
-#define IMU_INCLUDED !HAS_INCLUDE_IMU
 struct dev_info {
   TwoWire* _wire;
   uint8_t dev_addr;
@@ -87,6 +84,6 @@ class BoschSensorClass {
     uint16_t _int_status;
 };
 
-#if IMU_INCLUDED
-  extern BoschSensorClass IMU;
-#endif
+extern BoschSensorClass IMU_BMI270_BMM150;
+#undef IMU
+#define IMU IMU_BMI270_BMM150

Original file line number	Diff line number	Diff line change
`@@ -452,6 +452,8 @@ void BoschSensorClass::print_rslt(int8_t rslt)`
`452`	`452`	`}`
`453`	`453`	`}`
`454`	`454`
`455`		`-#if IMU_INCLUDED`
`456`		`- BoschSensorClass IMU(Wire1);`
	`455`	`+#ifdef TARGET_ARDUINO_NANO33BLE`
	`456`	`+BoschSensorClass IMU_BMI270_BMM150(Wire1);`
	`457`	`+#else`
	`458`	`+BoschSensorClass IMU_BMI270_BMM150(Wire);`
`457`	`459`	`#endif`