X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=src%2FW1Device.hh;h=28d4d3852cf217fc17159e1a04698128e4ac0387;hb=14ca6b205211e856c924f88dff3abf0584b1e414;hp=321159abecd682afd1a0501ff99921dd98df98a0;hpb=d58713adbc518552c11fd19bd21ae8bd11ab434f;p=lib1wire.git

diff --git a/src/W1Device.hh b/src/W1Device.hh
index 321159a..28d4d38 100644
--- a/src/W1Device.hh
+++ b/src/W1Device.hh
@@ -13,8 +13,12 @@
 
 #include <dirent.h>
 #include <stdbool.h>
+#include <pthread.h>
 
-#include "Data.hh"
+#include <plp/Data.hh>
+#include <plp/DataReader.hh>
+#include <plp/SensorDevice.hh>
+#include <plp/Device.hh>
 
 #ifndef W1_SCAN_ROOTDIR
 #define W1_SCAN_ROOTDIR		"/sys/bus/w1/devices"
@@ -25,35 +29,28 @@
 #endif
 
 namespace w1 {
-	class W1Device {
+	class W1Device : public plp::SensorDevice {
 		public:
-			W1Device(int family_code_param,
-				std::string device_id_param,
+			W1Device(std::string device_id_param,
+				std::string device_type_param,
 				dirent *direntry_param);
-			virtual ~W1Device();
-			int get_w1_family_code();
-			std::string get_id();
+			~W1Device();
 			std::string get_name();
 			void set_name(std::string name_param);
-			virtual std::string get_unit() = 0;
-			virtual std::string get_device_type() = 0;
-			Data *get_and_collect_data();
-			virtual void save_data();
-			virtual void printout();
+			void printout();
+			plp::Data *get_data();
+			const plp::DataReader *get_device_data();
 		protected:
-			virtual std::vector<double> *get_raw_data() = 0;
-			virtual unsigned int get_data_decimal_precision() = 0;
-			void collect_data(Data *data);
-			std::string to_string(double val, int digit_count);
-			//Data *get_formatted_data(Data *data);
-			virtual bool is_supported_w1_family_code(int family_code) = 0;
-			int family_code;
-			std::string id;
-			std::string name;
 			std::string dir_path;
 			std::string slave_file;
-			std::list<w1::Data *> memory_cache;
-		private:
+			std::list<plp::Data *> memory_cache;
+			plp::DataReader *reader;
+			void save_and_clean_cache();
+			virtual std::vector<double> *get_raw_data() = 0;
+			virtual unsigned int get_data_decimal_precision() { return 1; }
+			void cache(plp::Data *new_data);
+			std::string to_string(double val, int digit_count);
+			pthread_mutex_t plock;
 	};
 }