Moved files that were not w1 specific to libplp.

[lib1wire.git] / src / W1Device.hh

diff --git a/src/W1Device.hh b/src/W1Device.hh
index 4dab3a657de10e960d58e6ebdf8657ad156a01f4..6ce09990ccf1962672e0055fad09e83ecf889d89 100644 (file)
--- a/src/W1Device.hh
+++ b/src/W1Device.hh
@@ -14,9 +14,9 @@
 #include <dirent.h>
 #include <stdbool.h>
 
-#include "Data.hh"
-#include "SensorDevice.hh"
-#include "Device.hh"
+#include <plp/Data.hh>
+#include <plp/SensorDevice.hh>
+#include <plp/Device.hh>
 
 #ifndef W1_SCAN_ROOTDIR
 #define W1_SCAN_ROOTDIR                "/sys/bus/w1/devices"
@@ -29,32 +29,25 @@
 namespace w1 {
        class W1Device : public plp::SensorDevice {
                public:
-                       W1Device(std::string device_type_param,
-                               std::string device_id_param,
+                       W1Device(std::string device_id_param,
+                               std::string device_type_param,
                                dirent *direntry_param);
                        virtual ~W1Device();
-                       std::string get_id();
                        std::string get_name();
                        void set_name(std::string name_param);
                        void printout();
                        plp::Data *get_data();
                        plp::DataReader *get_device_data();
-                       std::string get_device_type();
-                       plp::EnumDeviceLifeCycleStatus get_lifecycle_state();
                protected:
+                       std::string dir_path;
+                       std::string slave_file;
+                       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);
-                       //Data *get_formatted_data(Data *data);
-                       std::string id;
-                       std::string type;
-                       std::string name;
-                       std::string dir_path;
-                       std::string slave_file;
-                       std::list<plp::Data *> memory_cache;
-                       plp::EnumDeviceLifeCycleStatus lifecycle_status;
        };
 }