Diff: Components/tsu104/tsu104_class.h

Revision:

16:2f9443aedbe8

Parent:

15:114514787e83

Child:

18:25dbc718084c

--- a/Components/tsu104/tsu104_class.h	Fri Apr 08 05:58:02 2016 +0000
+++ b/Components/tsu104/tsu104_class.h	Fri Apr 08 08:00:29 2016 +0000
@@ -72,6 +72,7 @@
  *   #include "../Interfaces/Temperature_class.h"                             *
  *----------------------------------------------------------------------------*/
 #include "../Interfaces/Windcomp_class.h"
+#include "../Interfaces/PhotoSensor_class.h"
 
 
 /* Classes -------------------------------------------------------------------*/
@@ -81,7 +82,7 @@
  * configuration allows the user to compare a signal to two threshold voltages. When the signal
  * is out of the required voltage range, the output of the operational amplifier toggles
  */
-class TSU104 : public Windcomp
+class TSU104 : public Windcomp, public PhotoSensor
 {
 public:
 
@@ -149,7 +150,7 @@
 	 * @param  pin AnalogIn pin to use for detecting the voltage
 	 * @retval voltage detected by photo sensor
 	 */		
-	virtual unsigned int TSU104_PhotoSensor_GetVoltage(void)
+	virtual unsigned int Get_PhotoSensor_GetVoltage(void)
 	{
 		AnalogIn photoSensor(photo_sensor_pin);
 		double voltage = photoSensor.read();
@@ -235,29 +236,6 @@
 
 	/*** Component's I/O Methods ***/
 
-	/* ACTION 8 --------------------------------------------------------------*
-	 * Implement here other I/O methods beyond those already implemented      *
-	 * above, which are declared extern within the component's header file.   *
-	 *------------------------------------------------------------------------*/
-	unsigned int TSU104_Read_Pin_D2()
-	{
-		/* TO BE IMPLEMENTED BY USING TARGET PLATFORM'S APIs. */
-		return (unsigned int) 0;
-	}
-
-	unsigned int TSU104_Read_Pin_D4()
-	{
-		/* TO BE IMPLEMENTED BY USING TARGET PLATFORM'S APIs. */
-		return (unsigned int) 0;
-	}
-
-	unsigned int TSU104_Read_Pin_A4()
-	{
-		/* TO BE IMPLEMENTED BY USING TARGET PLATFORM'S APIs. */
-		return (unsigned int) 0;
-	}
-
-
 	/*** Component's Instance Variables ***/
 
 	/* ACTION 9 --------------------------------------------------------------*