sensor data read fixes.

[lib1wire.git] / src / W1Device.hh

diff --git a/src/W1Device.hh b/src/W1Device.hh
index a702e0f728473166fa5550dc200fa4b41dad03fd..a9303030859cc5c0713ca48259f2cab36f4129b9 100644 (file)
--- a/src/W1Device.hh
+++ b/src/W1Device.hh
@@ -14,7 +14,10 @@
 #include <dirent.h>
 #include <stdbool.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 +28,27 @@
 #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();
                        std::string get_name();
                        void set_name(std::string name_param);
-                       virtual std::string get_unit() = 0;
-                       virtual std::string get_device_type() = 0;
-                       std::string get_time();
-                       Data *get_and_collect_data();
-                       virtual void save_data();
-                       virtual void printout();
+                       void printout();
+                       plp::Data *get_data();
+                       plp::DataReader *get_device_data();
                protected:
-                       virtual std::vector<double> *get_raw_data() = 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() = 0;
+                       void cache(plp::Data *data);
+                       std::string to_string(double val, int digit_count);
        };
 }