Support for setting and reading device name from config file.

[lib1wire.git] / src / W1Device.cc

diff --git a/src/W1Device.cc b/src/W1Device.cc
index a765cd36a6091432b4d2577ae6828efc3f36694b..c9c2e7ed225318caa6b40630c6d2075d33796392 100644 (file)
--- a/src/W1Device.cc
+++ b/src/W1Device.cc
@@ -12,6 +12,8 @@
 #include <time.h>
 #include <plp/log.h>
 
+#include "DeviceConfig.hh"
+#include "Factory.hh"
 #include "W1Store.hh"
 #include "W1Device.hh"
 
@@ -32,7 +34,7 @@ W1Device::W1Device(int family_code_param,
        log_debug("w1 data file: %s\n", slave_file.c_str());
        family_code     = family_code_param;
        id              = device_id_param;
-       name            = device_id_param;
+       name            = "";
 }
 
 W1Device::~W1Device() {
@@ -55,11 +57,27 @@ string W1Device::get_id() {
 }
 
 string W1Device::get_name() {
+       DeviceConfig    *cfg;
+
+       if (name.empty() == true) {
+               cfg     = Factory::get_device_config(id);
+               if (cfg != NULL) {
+                       name    = cfg->get_cfg_value("name");
+                       delete(cfg);
+               }
+       }
        return name;
 }
 
 void W1Device::set_name(string name_param) {
+       DeviceConfig    *cfg;
+
        name    = name_param;
+       cfg     = Factory::get_device_config(id);
+       if (cfg != NULL) {
+               cfg->set_cfg_value("name", name_param);
+               delete(cfg);
+       }
 }
 
 void W1Device::printout() {