Diff: Components/lps25h/lps25h_class.h

Revision:

20:c20c8bd5be6b

Parent:

18:1cb4ae9d83e7

Child:

24:92cc9c6e4b2b

diff -r 1cb4ae9d83e7 -r c20c8bd5be6b Components/lps25h/lps25h_class.h
--- a/Components/lps25h/lps25h_class.h	Fri May 29 14:23:22 2015 +0200
+++ b/Components/lps25h/lps25h_class.h	Fri May 29 16:29:31 2015 +0200
@@ -41,18 +41,19 @@
 /* Includes ------------------------------------------------------------------*/
 #include "mbed.h"
 #include "DevI2C.h"
-#include "../Common/Pressure.h"
+#include "../Common/PressureSensor.h"
+#include "../Common/TempSensor.h"
 #include "lps25h.h"
 
 /* Classes -------------------------------------------------------------------*/
 /** Class representing a LPS25H sensor component
  */
-class LPS25H : public Pressure {
+class LPS25H : public PressureSensor, public TempSensor {
  public:
 	/** Constructor
 	 * @param i2c device I2C to be used for communication
 	 */
-        LPS25H(DevI2C &i2c) : Pressure(), dev_i2c(i2c) {
+        LPS25H(DevI2C &i2c) : PressureSensor(), TempSensor(), dev_i2c(i2c) {
 		LPS25H_SlaveAddress = LPS25H_ADDRESS_HIGH;
 	}
 	
@@ -87,12 +88,12 @@
 		return LPS25H_GetTemperature(pfData);
 	}
 
-	virtual void SlaveAddrRemap(uint8_t SA0_Bit_Status) {
+	virtual void AttachIT(void (*fptr)(void)) { /* not yet implemented */ }
+
+	void SlaveAddrRemap(uint8_t SA0_Bit_Status) {
 		LPS25H_SlaveAddrRemap(SA0_Bit_Status);
 	}
 
-	virtual void AttachIT(void (*fptr)(void)) { /* not yet implemented */ }
-
 protected:
 	/*** Methods ***/
 	PRESSURE_StatusTypeDef LPS25H_Init(PRESSURE_InitTypeDef *LPS25H_Init);