Merge pull request #3 from grobx/main

Fix bug that prevent multiple sensor libraries to be used together
stm32duino · Jul 25, 2022 · 21c05a6 · 21c05a6
2 parents 5dd4909 + c2480fc
commit 21c05a6
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/examples/LPS22DF_DataLog_Terminal/LPS22DF_DataLog_Terminal.ino b/examples/LPS22DF_DataLog_Terminal/LPS22DF_DataLog_Terminal.ino
@@ -1,5 +1,5 @@
 /*
-   @file    LPS22DF_Example.ino
+   @file    LPS22DF_DataLog_Terminal.ino
    @author  Giuseppe Roberti <[email protected]>
    @brief   Example to use the LPS22DF 260-1260 hPa absolute digital
             output barometer

diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=STM32duino LPS22DF
-version=1.0.0
+version=1.0.1
 author=SRA
 maintainer=stm32duino
 sentence=Nano pressure sensor.

diff --git a/src/LPS22DFSensor.cpp b/src/LPS22DFSensor.cpp
@@ -2,13 +2,13 @@
  ******************************************************************************
  * @file    LPS22DFSensor.cpp
  * @author  SRA
- * @version V1.0.0
+ * @version V1.0.1
  * @date    July 2022
  * @brief   Implementation of a LPS22DF pressure sensor.
  ******************************************************************************
  * @attention
  *
- * <h2><center>&copy; COPYRIGHT(c) 2019 STMicroelectronics</center></h2>
+ * <h2><center>&copy; COPYRIGHT(c) 2022 STMicroelectronics</center></h2>
  *
  * Redistribution and use in source and binary forms, with or without modification,
  * are permitted provided that the following conditions are met:

diff --git a/src/LPS22DFSensor.h b/src/LPS22DFSensor.h
@@ -2,7 +2,7 @@
  ******************************************************************************
  * @file    LPS22DFSensor.h
  * @author  SRA
- * @version V1.0.0
+ * @version V1.0.1
  * @date    July 2022
  * @brief   Abstract Class of a LPS22DF pressure sensor.
  ******************************************************************************

diff --git a/src/lps22df_reg.h b/src/lps22df_reg.h
@@ -99,6 +99,13 @@ typedef struct {
 #define PROPERTY_DISABLE                (0U)
 #define PROPERTY_ENABLE                 (1U)
 
+#endif /* MEMS_SHARED_TYPES */
+
+/**
+  * @}
+  *
+  */
+
 /** @addtogroup  Interfaces_Functions
   * @brief       This section provide a set of functions used to read and
   *              write a generic register of the device.
@@ -123,8 +130,6 @@ typedef struct {
   *
   */
 
-#endif /* MEMS_SHARED_TYPES */
-
 #ifndef MEMS_UCF_SHARED_TYPES
 #define MEMS_UCF_SHARED_TYPES
 
@@ -151,11 +156,6 @@ typedef struct {
 
 #endif /* MEMS_UCF_SHARED_TYPES */
 
-/**
-  * @}
-  *
-  */
-
 /** @defgroup LPS22DF_Infos
   * @{
   *