Initial support for reading and writing device specific config data.

[lib1wire.git] / src / W1Device.cc

diff --git a/src/W1Device.cc b/src/W1Device.cc
index 48f366db655a1d74bdf92d717b629a03e7e8c168..467a3359685eb7a432ee606259684fe4d79e687b 100644 (file)
--- a/src/W1Device.cc
+++ b/src/W1Device.cc
@@ -5,25 +5,32 @@
  *      Author: lamikr
  */
 #include <iostream>
+#include <fstream>
+
 #include <time.h>
+#include <plp/log.h>
 
+#include "W1Store.hh"
 #include "W1Device.hh"
 
 using namespace w1;
 using namespace std;
 
-W1Device::W1Device(dirent *direntry, int family_code_param, string id_param) {
+W1Device::W1Device(int family_code_param,
+               string device_id_param,
+               dirent *direntry_param) {
        string rootdir;
        string device_dir;
        string temp_str;
 
        rootdir         = W1_SCAN_ROOTDIR;
        temp_str        = W1_SLAVE_FILE;
-       dir_path        = rootdir + "/" + direntry->d_name;
+       dir_path        = rootdir + "/" + direntry_param->d_name;
        slave_file      = dir_path + "/" + temp_str;
+       log_debug("w1 data file: %s\n", slave_file.c_str());
        family_code     = family_code_param;
-       id                      = id_param;
-       name            = id_param;
+       id              = device_id_param;
+       name            = device_id_param;
 }
 
 W1Device::~W1Device() {
@@ -61,6 +68,32 @@ string W1Device::get_time() {
 void W1Device::printout() {
        string text;
 
-       text    = get_time() + ": device type = <unknown>, id = " + id + ", value = " + get_value();
+       text    = get_formatted_value();
        cout << text << endl;
 }
+
+string W1Device::get_formatted_value() {
+       string ret_val;
+       string val;
+
+       val     = get_raw_value();
+       ret_val = get_formatted_value(val);
+       return ret_val;
+}
+
+string W1Device::get_formatted_value(string value) {
+       string ret_val;
+
+       ret_val = get_time() + "|" + get_device_type() + "|" + id + "|" + value + " " + get_unit();
+       add_to_memory_cache(ret_val);
+       return ret_val;
+}
+
+void W1Device::add_to_memory_cache(std::string formatted_data) {
+       // TODO: add mutex for memory_cache
+       memory_cache.push_back(formatted_data);
+}
+
+void W1Device::store() {
+       W1Store::store(id, &memory_cache);
+}