added W1CounterDevice

[lib1wire.git] / src_test / test_w1.cc

diff --git a/src_test/test_w1.cc b/src_test/test_w1.cc
index 6c6c1167f31b311a89496be63c3e4ed6505d1090..3a07a0a37ab780f8322b69cc26312edabe639738 100644 (file)
--- a/src_test/test_w1.cc
+++ b/src_test/test_w1.cc
@@ -8,7 +8,7 @@
 #include <string>
 #include <iostream>
 
-#include <unistd.h>
+#include <plp/log.h>
 
 #include "W1Scanner.hh"
 
@@ -17,38 +17,43 @@ using namespace std;
 
 int main(int argc, char** argv)
 {
-       W1Scanner                       *scanner;
+       W1Scanner               *scanner;
        list<W1Device *>        device_list;
-       int                                     round;
-       int                                     interval_seconds;
-       int                                     store_interval;
+       int                     round;
+       int                     interval_seconds;
+       int                     store_interval;
 
        interval_seconds        = 60;
        store_interval          = 10;
-       scanner                         = new W1Scanner();
-       device_list                     = scanner->get_device_list();
-       round                           = 0;
-       while(1) {
-               round++;
-               for(list<W1Device *>::iterator list_iter = device_list.begin(); list_iter != device_list.end(); list_iter++)
-               {
-                       W1Device *device = (W1Device *)*list_iter;
+       scanner                 = new W1Scanner();
+       device_list             = scanner->get_device_list();
+       round                   = 0;
+       if (device_list.size() > 0) {
+               while(1) {
+                       round++;
+                       for(list<W1Device *>::iterator list_iter = device_list.begin(); list_iter != device_list.end(); list_iter++)
+                       {
+                               W1Device *device = (W1Device *)*list_iter;
 /*
                        string name     = device->get_name();
                        string value    = device->get_value();
                        string unit             = device->get_unit();
                        cout << name << ": " << value << " " << unit << endl;
 */
-                       device->printout();
-                       sleep(1);
+                               device->printout();
+                               sleep(1);
+                               if (round >= store_interval) {
+                                       device->store();
+                               }
+                       }
+                       sleep(interval_seconds);
                        if (round >= store_interval) {
-                               device->store();
+                               round = 0;
                        }
                }
-               sleep(interval_seconds);
-               if (round >= store_interval) {
-                       round = 0;
-               }
+       }
+       else {
+               log_debug("could not find 1-wire devices.\n");
        }
        return 0;
 }