Diff: MAX30205.h

Revision:

6:b5ab5204d944

Parent:

5:24039cc86fc1

Child:

7:f005887f21e7

--- a/MAX30205.h	Fri Apr 07 21:48:48 2017 +0000
+++ b/MAX30205.h	Tue Apr 11 22:07:28 2017 +0000
@@ -63,7 +63,7 @@
     
 public:
     /// MAX30205 Register Addresses
-    enum Registers 
+    enum Registers_e 
     {
         Temperature = 0x00,
         Configuration = 0x01,
@@ -72,10 +72,10 @@
     };
     
     ///MAX30205 Configuration register bitfields
-    union Config
+    union Configuration_u
     {
         uint8_t all;
-        struct BitField
+        struct BitField_s
         {
             uint8_t shutdown    : 1;
             uint8_t comp_int    : 1;
@@ -117,14 +117,14 @@
     * @param config - Reference to Configuration type
     * @return 0 on success, non-zero on failure
     */
-    int32_t readConfiguration(Config &config);
+    int32_t readConfiguration(Configuration_u &config);
     
     /**
     * @brief Write the configuration register with given configuration
     * @param config - Configuration to write
     * @return 0 on success, non-zero on failure
     */
-    int32_t writeConfiguration(const Config config);
+    int32_t writeConfiguration(const Configuration_u config);
 
     /**
     * @brief Read the THYST value from a specified device instance
@@ -176,7 +176,7 @@
     * @param value - Value to write
     * @return 0 on success, non-zero on failure
     */
-    int32_t writeRegister(Registers reg, uint16_t value);
+    int32_t writeRegister(Registers_e reg, uint16_t value);
 
     /**
     * @brief  Read register of device at slave address
@@ -184,7 +184,7 @@
     * @param[out] value - Read data on success
     * @return 0 on success, non-zero on failure
     */
-    int32_t readRegister(Registers reg, uint16_t &value);
+    int32_t readRegister(Registers_e reg, uint16_t &value);
 
 private:
     /// I2C object