X-Git-Url: http://pilppa.org/gitweb/?p=lib1wire.git;a=blobdiff_plain;f=src%2FW1Device.hh;fp=src%2FW1Device.hh;h=d1371e9e5214a598bd267872bfef9a076789c03f;hp=e5de6d971cd0f0b9e233ea883e061fde3a56202f;hb=6caee6cb22c1334701afe7aa30bcf9668ca3a5c5;hpb=9d1c70c1f8f130ad17cf8e58d54387714b6f43b5

diff --git a/src/W1Device.hh b/src/W1Device.hh
index e5de6d9..d1371e9 100644
--- a/src/W1Device.hh
+++ b/src/W1Device.hh
@@ -15,6 +15,7 @@
 #include <stdbool.h>
 
 #include "Data.hh"
+#include "DeviceTypeSensor.hh"
 
 #ifndef W1_SCAN_ROOTDIR
 #define W1_SCAN_ROOTDIR		"/sys/bus/w1/devices"
@@ -25,7 +26,7 @@
 #endif
 
 namespace w1 {
-	class W1Device {
+	class W1Device : public plp::DeviceTypeSensor {
 		public:
 			W1Device(int family_code_param,
 				std::string device_id_param,
@@ -35,11 +36,9 @@ namespace w1 {
 			std::string get_id();
 			std::string get_name();
 			void set_name(std::string name_param);
-			virtual std::string get_unit() = 0;
-			virtual std::string get_device_type() = 0;
-			plp::Data *get_and_collect_data();
-			virtual void save_data();
-			virtual void printout();
+			void printout();
+			plp::Data *get_data();
+			void save_data();
 		protected:
 			virtual std::vector<double> *get_raw_data() = 0;
 			virtual unsigned int get_data_decimal_precision() = 0;