Initial support for reading and writing device specific config data.

[lib1wire.git] / src_test / test_w1_datalog_read.cc

diff --git a/src_test/test_w1_datalog_read.cc b/src_test/test_w1_datalog_read.cc
index 50003edf754dd580ec075aabda55f02f1f63bbb3..0c4a5b9b1859f65b8833dc3c09589d130fc3d4b3 100644 (file)
--- a/src_test/test_w1_datalog_read.cc
+++ b/src_test/test_w1_datalog_read.cc
@@ -14,9 +14,10 @@
 #include <plp/log.h>
 
 #include "W1DataList.hh"
-#include "W1Store.hh"
+#include "DeviceConfig.hh"
 #include "W1Scanner.hh"
 
+#include "Date.hh"
 #include "W1Util.hh"
 
 using namespace w1;
@@ -46,9 +47,7 @@ bool try_parse_long(const char *str, long *result) {
 }
 
 int main(int argc, char** argv) {
-       int             round;
        string          loc;
-       bool            err_flg;
        Data            *fdata;
        Data            *ldata;
        W1DataList      *dlist;
@@ -65,7 +64,7 @@ int main(int argc, char** argv) {
        else {
                log_warning("No storage location parameter given, using default location: %s\n", loc.c_str());
        }
-       W1Store::set_base_dir_name(loc);
+       DeviceConfig::set_base_dir_name(loc);
        dlist   = new W1DataList("0008014e9e09");
        if (dlist != NULL) {
                dr      = dlist->get_data_range();
@@ -76,7 +75,12 @@ int main(int argc, char** argv) {
                                ldata   = dr->get_last_data();
                                if (ldata != NULL) {
                                        ldata->printout();
-                                       dr2     = dlist->get_data(&fdata->get_date(), &ldata->get_date());
+                                       plp::Date d1;
+                                       plp::Date d2;
+
+                                       d1      = fdata->get_date();
+                                       d2      = ldata->get_date();
+                                       dr2     = dlist->get_data(&d1, &d2);
                                        delete(ldata);
                                        if (dr2 != NULL) {
                                                delete(dr2);