Issue #1205 - Fixed mismatching return types for mpl3115.c and sx9500.h

Closes #1205
Closes #1110

Author: mluis1

src/peripherals/mpl3115.c

@@ -52,6 +52,7 @@ typedef enum
  *
  * \param [IN]:    addr
  * \param [IN]:    data
+ *
  * \retval status [LMN_STATUS_OK, LMN_STATUS_ERROR]
  */
 LmnStatus_t MPL3115Write( uint8_t addr, uint8_t data );
@@ -62,6 +63,7 @@ LmnStatus_t MPL3115Write( uint8_t addr, uint8_t data );
  * \param [IN]: addr
  * \param [IN]: data
  * \param [IN]: size
+ *
  * \retval status [LMN_STATUS_OK, LMN_STATUS_ERROR]
  */
 LmnStatus_t MPL3115WriteBuffer( uint8_t addr, uint8_t *data, uint8_t size );
@@ -71,6 +73,7 @@ LmnStatus_t MPL3115WriteBuffer( uint8_t addr, uint8_t *data, uint8_t size );
  *
  * \param [IN]: addr
  * \param [OUT]: data
+ *
  * \retval status [LMN_STATUS_OK, LMN_STATUS_ERROR]
  */
 LmnStatus_t MPL3115Read( uint8_t addr, uint8_t *data );
@@ -81,6 +84,7 @@ LmnStatus_t MPL3115Read( uint8_t addr, uint8_t *data );
  * \param [IN]: addr
  * \param [OUT]: data
  * \param [IN]: size
+ *
  * \retval status [LMN_STATUS_OK, LMN_STATUS_ERROR]
  */
 LmnStatus_t MPL3115ReadBuffer( uint8_t addr, uint8_t *data, uint8_t size );
@@ -186,7 +190,7 @@ void MPL3115SetDeviceAddr( uint8_t addr )
     I2cDeviceAddr = addr;
 }
 
-LmnStatus_t MPL3115GetDeviceAddr( void )
+uint8_t MPL3115GetDeviceAddr( void )
 {
     return I2cDeviceAddr;
 }
@@ -336,7 +340,7 @@ float MPL3115ReadTemperature( void )
 
     if( msb > 0x7F )
     {
-        val = ~( ( msb << 8 ) + lsb ) + 1;      // 2’s complement
+        val = ~( ( msb << 8 ) + lsb ) + 1;      // 2's complement
         msb = val >> 8;
         lsb = val & 0x00F0;
         negSign = true;

src/peripherals/sx9500.h

@@ -57,52 +57,56 @@ extern "C"
 
 #define SX9500_RESET_CMD                            0xDE
 
-uint8_t SX9500Init( void );
+LmnStatus_t SX9500Init( void );
 
 /*!
  * \brief Resets the device
  *
- * \retval status [OK, ERROR, UNSUPPORTED]
+ * \retval status [LMN_STATUS_OK, LMN_STATUS_ERROR]
  */
-uint8_t SX9500Reset( void );
+LmnStatus_t SX9500Reset( void );
 
 /*!
  * \brief Writes a byte at specified address in the device
  *
  * \param [IN]: addr
  * \param [IN]: data
- * \retval status [OK, ERROR, UNSUPPORTED]
+ *
+ * \retval status [LMN_STATUS_OK, LMN_STATUS_ERROR]
  */
-uint8_t SX9500Write( uint8_t addr, uint8_t data );
+LmnStatus_t SX9500Write( uint8_t addr, uint8_t data );
 
 /*!
  * \brief Writes a buffer at specified address in the device
  *
  * \param [IN]: addr
  * \param [IN]: data
  * \param [IN]: size
- * \retval status [OK, ERROR, UNSUPPORTED]
+ *
+ * \retval status [LMN_STATUS_OK, LMN_STATUS_ERROR]
  */
-uint8_t SX9500WriteBuffer( uint8_t addr, uint8_t *data, uint8_t size );
+LmnStatus_t SX9500WriteBuffer( uint8_t addr, uint8_t *data, uint8_t size );
 
 /*!
  * \brief Reads a byte at specified address in the device
  *
  * \param [IN]: addr
  * \param [OUT]: data
- * \retval status [OK, ERROR, UNSUPPORTED]
+ *
+ * \retval status [LMN_STATUS_OK, LMN_STATUS_ERROR]
  */
-uint8_t SX9500Read( uint8_t addr, uint8_t *data );
+LmnStatus_t SX9500Read( uint8_t addr, uint8_t *data );
 
 /*!
  * \brief Reads a buffer at specified address in the device
  *
  * \param [IN]: addr
  * \param [OUT]: data
  * \param [IN]: size
- * \retval status [OK, ERROR, UNSUPPORTED]
+ *
+ * \retval status [LMN_STATUS_OK, LMN_STATUS_ERROR]
  */
-uint8_t SX9500ReadBuffer( uint8_t addr, uint8_t *data, uint8_t size );
+LmnStatus_t SX9500ReadBuffer( uint8_t addr, uint8_t *data, uint8_t size );
 
 /*!
  * \brief Sets the I2C device slave address