Fix coexistence with other IMU libs

facchinm · facchinm · commit 2c5c142fe5ed · 2022-10-07T13:07:26.000+02:00
diff --git a/src/LSM6DSOX.cpp b/src/LSM6DSOX.cpp
@@ -276,7 +276,7 @@ int LSM6DSOXClass::writeRegister(uint8_t address, uint8_t value)
 }
 
 #ifdef LSM6DS_DEFAULT_SPI
-LSM6DSOXClass IMU(LSM6DS_DEFAULT_SPI, PIN_SPI_SS1, LSM6DS_INT);
+LSM6DSOXClass IMU_LSM6DSOX(LSM6DS_DEFAULT_SPI, PIN_SPI_SS1, LSM6DS_INT);
 #else
-LSM6DSOXClass IMU(Wire, LSM6DSOX_ADDRESS);
+LSM6DSOXClass IMU_LSM6DSOX(Wire, LSM6DSOX_ADDRESS);
 #endif
diff --git a/src/LSM6DSOX.h b/src/LSM6DSOX.h
@@ -21,7 +21,6 @@
 #include <Wire.h>
 #include <SPI.h>
 
-
 class LSM6DSOXClass {
   public:
     LSM6DSOXClass(TwoWire& wire, uint8_t slaveAddress);
@@ -62,4 +61,6 @@ class LSM6DSOXClass {
     SPISettings _spiSettings;
 };
 
-extern LSM6DSOXClass IMU;
+extern LSM6DSOXClass IMU_LSM6DSOX;
+#undef IMU
+#define IMU IMU_LSM6DSOX

Original file line number	Diff line number	Diff line change
`@@ -276,7 +276,7 @@ int LSM6DSOXClass::writeRegister(uint8_t address, uint8_t value)`
`276`	`276`	`}`
`277`	`277`
`278`	`278`	`#ifdef LSM6DS_DEFAULT_SPI`
`279`		`-LSM6DSOXClass IMU(LSM6DS_DEFAULT_SPI, PIN_SPI_SS1, LSM6DS_INT);`
	`279`	`+LSM6DSOXClass IMU_LSM6DSOX(LSM6DS_DEFAULT_SPI, PIN_SPI_SS1, LSM6DS_INT);`
`280`	`280`	`#else`
`281`		`-LSM6DSOXClass IMU(Wire, LSM6DSOX_ADDRESS);`
	`281`	`+LSM6DSOXClass IMU_LSM6DSOX(Wire, LSM6DSOX_ADDRESS);`
`282`	`282`	`#endif`