Jamie Satchell
/
JSatchell_SOFT253ReferredCoursework
Finished project.
Fork of ReferredCoursework2016 by
Diff: Components/hts221/hts221_class.h
- Revision:
- 20:c20c8bd5be6b
- Parent:
- 18:1cb4ae9d83e7
- Child:
- 43:2544d064d528
diff -r 1cb4ae9d83e7 -r c20c8bd5be6b Components/hts221/hts221_class.h --- a/Components/hts221/hts221_class.h Fri May 29 14:23:22 2015 +0200 +++ b/Components/hts221/hts221_class.h Fri May 29 16:29:31 2015 +0200 @@ -41,18 +41,19 @@ /* Includes ------------------------------------------------------------------*/ #include "mbed.h" #include "DevI2C.h" -#include "../Common/HumTemp.h" +#include "../Common/HumiditySensor.h" +#include "../Common/TempSensor.h" #include "hts221.h" /* Classes -------------------------------------------------------------------*/ /** Class representing a HTS221 sensor component */ -class HTS221 : public HumTemp { +class HTS221 : public HumiditySensor, public TempSensor { public: /** Constructor * @param i2c device I2C to be used for communication */ - HTS221(DevI2C &i2c) : HumTemp(), dev_i2c(i2c) { + HTS221(DevI2C &i2c) : HumiditySensor(), TempSensor(), dev_i2c(i2c) { T0_degC = T1_degC = H0_rh = H1_rh = 0.0; T0_out = T1_out = H0_T0_out = H1_T0_out = 0; } @@ -62,7 +63,7 @@ return HTS221_Init((HUM_TEMP_InitTypeDef*)init_struct); } - virtual int PowerOFF(void) { + virtual int PowerOff(void) { return HTS221_Power_OFF(); }