Refactoring and fixes.

[lib1wire.git] / src / W1Device.cc

diff --git a/src/W1Device.cc b/src/W1Device.cc
index 48f366db655a1d74bdf92d717b629a03e7e8c168..7bb44183c489287c846d95487dbafa44abe25773 100644 (file)
--- a/src/W1Device.cc
+++ b/src/W1Device.cc
@@ -5,31 +5,40 @@
  *      Author: lamikr
  */
 #include <iostream>
+#include <fstream>
+#include <sstream>
+#include <iomanip>
+
 #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() {
 }
 
-int W1Device::get_family_code() {
+int W1Device::get_w1_family_code() {
        return family_code;
 }
 
@@ -59,8 +68,66 @@ string W1Device::get_time() {
 }
 
 void W1Device::printout() {
-       string text;
+       Data    *data;
+       string  text;
+
+       data    = get_and_collect_data();
+       if (data != NULL) {
+               text    = data->to_string();
+               cout << text << endl;
+       }
+       else {
+               log_error("Could not data for %s device: %s\n", get_device_type().c_str(),  get_name().c_str());
+       }
+}
+
+string W1Device::to_string(double dbl_val, int digit_count) {
+       string          ret_val;
+       ostringstream   out;
+
+       out << fixed << setprecision(digit_count) << dbl_val;
+       ret_val = out.str();
+       return ret_val;
+}
+
+
+Data *W1Device::get_and_collect_data() {
+       Data            *ret_val;
+       vector<double>  *vect;
+
+       ret_val = NULL;
+       vect    = get_raw_data();
+       if (vect != NULL) {
+               ret_val = new Data(vect, get_unit());
+               collect_data(ret_val);
+               delete(vect);
+       }
+       return ret_val;
+}
+
+/*
+Data *W1Device::get_formatted_data(Data *data) {
+       Data    *ret_val;
+
+       ret_val = get_time() + "|" + raw_data + " " + get_unit();
+       add_to_save_fifo(ret_val);
+       return ret_val;
+}
+*/
+
+void W1Device::collect_data(Data *data) {
+       // TODO: add mutex for memory_cache
+       memory_cache.push_back(data);
+}
+
+void W1Device::save_data() {
+       list<Data *>::iterator  iter;
+       Data                    *data;
 
-       text    = get_time() + ": device type = <unknown>, id = " + id + ", value = " + get_value();
-       cout << text << endl;
+       W1Store::save(id, &memory_cache);
+       for(iter = memory_cache.begin(); iter != memory_cache.end(); iter++) {
+               data    = (Data *)*iter;
+               delete(data);
+       }
+       memory_cache.clear();
 }