Started adding support for caches when reading data. Cache files for

[lib1wire.git] / src / DeviceConfig.hh

diff --git a/src/DeviceConfig.hh b/src/DeviceConfig.hh
index c2cfb31512fbce5f2619a3b405bf4339f2e59b8c..107018b907ae8997b82c9d6f53acbcb7901fa6b1 100644 (file)
--- a/src/DeviceConfig.hh
+++ b/src/DeviceConfig.hh
@@ -15,21 +15,22 @@ extern "C" {
 #include <plp/config.h>
 }
 
+#include "W1Configure.hh"
+
 #define DEVICE_CONFIG__FILE_NAME               "dev_cfg.txt"
 #define DEVICE_CONFIG__SECTION_TYPE            "device"
 #define DEVICE_CONFIG__SECTION_NAME            "base_data"
 #define DEVICE_CONFIG_VALUE_KEY__TYPE          "type"
+#define DEVICE_CONFIG_VALUE_KEY__ID            "id"
 #define DEVICE_CONFIG_VALUE_KEY__NAME          "name"
 
 namespace w1 {
-       enum enum_summary_calculation {SUM, DELTA, MEAN, MAX, MIN};
-
        struct ConfigHandle {
                public:
                        ConfigHandle(uci_context *ctx_param, uci_package *pkg_param);
                        ~ConfigHandle();
-                       struct uci_context      *ctx;
-                       struct uci_package      *pkg;
+                       struct uci_context      *_ctx;
+                       struct uci_package      *_pkg;
        };
 
        class DeviceConfig {
@@ -40,7 +41,7 @@ namespace w1 {
                        static void set_base_dir_name(std::string store_param);
                        std::string get_cfg_value(std::string key);
                        void set_cfg_value(std::string key, std::string value);
-                       enum_summary_calculation get_summary_calculation_type();
+                       EnumSummaryCalculationType get_summary_calculation_type();
                private:
                        static std::string      store_base_dir;
                        std::string             device_id;