Merge pull request #7 from cparata/master

cparata · web-flow · commit 5b72a34dbe7c · 2020-11-03T17:17:56.000+01:00
Fix conflict issue with LSM6DSO PID
diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=STM32duino LSM6DSOX
-version=1.1.0
+version=1.1.1
 author=SRA
 maintainer=stm32duino
 sentence=Ultra Low Power inertial measurement unit.
diff --git a/src/lsm6dsox_reg.h b/src/lsm6dsox_reg.h
@@ -3148,8 +3148,8 @@ int32_t lsm6dsox_all_sources_get(lsm6dsox_ctx_t *ctx,
 
 typedef struct{
   uint8_t odr_fine_tune;
-} dev_cal_t;
-int32_t lsm6dsox_calibration_get(lsm6dsox_ctx_t *ctx, dev_cal_t *val);
+} lsm6dsox_dev_cal_t;
+int32_t lsm6dsox_calibration_get(lsm6dsox_ctx_t *ctx, lsm6dsox_dev_cal_t *val);
 
 typedef struct {
   struct {
