Initial support for reading and writing device specific config data.

[lib1wire.git] / src / W1CounterDevice.cc

diff --git a/src/W1CounterDevice.cc b/src/W1CounterDevice.cc
index 2566e1d4888114c0ccad31f28965a510948f39a0..53c95f93a0751cd97ed55087b0b24ed77ba10c1e 100644 (file)
--- a/src/W1CounterDevice.cc
+++ b/src/W1CounterDevice.cc
@@ -13,18 +13,16 @@
 using namespace std;
 using namespace w1;
 
-W1CounterDevice::W1CounterDevice(dirent *direntry,
-                               int family_code_param,
-                               string id_param): W1Device(direntry, family_code_param, id_param) {
-       ifstream ifs(slave_file.c_str());
-       if (ifs.is_open() == false) {
-               string text;
+W1CounterDevice::W1CounterDevice(int family_code_param,
+                               string device_id_param,
+                               dirent *direntry_param): W1Device(family_code_param, device_id_param, direntry_param) {
+       string text;
 
-               text    = get_time() + ": device type = " + get_devicetype_name() + ", id = " + id + ", could not read file: " + slave_file;
+       ifstream ifs(slave_file.c_str());
+       if (ifs.is_open() == true) {
+               text    = get_time() + ": device type = " + get_device_type() + ", id = " + id + ", could not read file: " + slave_file;
                cout << text << endl;
                cout << "verify that you have w1_ds2423 kernel module loaded." << endl;
-       }
-       else {
                ifs.close();
        }
 }
@@ -45,12 +43,11 @@ bool W1CounterDevice::is_supported_family_code(int family_code) {
        return ret_val;
 }
 
-string W1CounterDevice::get_value() {
-       string          ret_val;
-       string          value_line;
-       int             pos;
-       int             length;
-       int             ii;
+string W1CounterDevice::get_raw_value() {
+       string  ret_val;
+       string  value_line;
+       int     pos;
+       int     length;
 
        ret_val = "<could not read>";
        ifstream ifs(slave_file.c_str());
@@ -87,6 +84,6 @@ string W1CounterDevice::get_unit() {
        return "";
 }
 
-string W1CounterDevice::get_devicetype_name() {
+string W1CounterDevice::get_device_type() {
        return "Counter Device";
 }