X-Git-Url: http://pilppa.org/gitweb/?p=lib1wire.git;a=blobdiff_plain;f=src_test%2Ftest_w1_datalog_write.cc;fp=src_test%2Ftest_w1_datalog_write.cc;h=f397525c95b7004cee6dbe80e4a0222da6fc8f01;hp=141031b50c35fe58134937c9085a633e77da3eb6;hb=9d1c70c1f8f130ad17cf8e58d54387714b6f43b5;hpb=4d28d5175f0bd7f930f67b1280d998eddd21ed80

diff --git a/src_test/test_w1_datalog_write.cc b/src_test/test_w1_datalog_write.cc
index 141031b..f397525 100644
--- a/src_test/test_w1_datalog_write.cc
+++ b/src_test/test_w1_datalog_write.cc
@@ -19,6 +19,10 @@
 using namespace w1;
 using namespace std;
 
+#define DEFAULT_READ_INTERVAL_SECONDS	600
+#define DEFAULT_SAVE_INTERVAL_COUNT	5
+#define DEFAULT_MAX_READ_COUNT		-1
+
 bool try_parse_long(const char *str, long *result) {
 	int	new_result;
 	char 	*endptr;
@@ -44,50 +48,90 @@ bool try_parse_long(const char *str, long *result) {
 
 int main(int argc, char** argv) {
  	list<W1Device *>		device_list;
-	int				round;
-	long				scan_interval;
-	long				store_interval;
+	int				read_count_afer_save;
+	int				read_count_total;
+	long				cnt_max_scans;
+	long				read_interval_seconds;
+	long				save_interval_count;
 	string				loc;
 	W1Device 			*device;
 	list<W1Device *>::iterator	iter;
 
 	// default values than can be overwritten with parameters
 	loc	= "/tmp/w1data";
-	scan_interval	= 600; //600;
-	store_interval	= 2;
+	read_interval_seconds	= DEFAULT_READ_INTERVAL_SECONDS;
+	save_interval_count	= DEFAULT_SAVE_INTERVAL_COUNT;
+	cnt_max_scans		= DEFAULT_MAX_READ_COUNT;
 	if (argc > 1) {
 		loc	= argv[1];
-		log_info("storage location: %s\n", loc.c_str());
 	}
 	else {
-		log_warning("No storage location parameter given, using default location: %s\n", loc.c_str());
+		log_info("no parameter given using default values:\n");
+		log_info("\ttest_w1_datalog_write %s %ld %ld %ld\n\n", loc.c_str(), read_interval_seconds, save_interval_count, cnt_max_scans);
+		log_info("usage:\n\ttest_w1_datalog_write <result_save_path> <read_interval_seconds> <save_interval_count> <max_read_count>\n");
+		log_info("\tsave_interval_count == -1: do not save data that is read\n");
+		log_info("\tmax_read_count == -1: read devices until application is terminated\n\n");
 	}
 	if (argc > 2) {
-		try_parse_long(argv[2], &scan_interval);
+		try_parse_long(argv[2], &read_interval_seconds);
 	}
 	if (argc > 3) {
-		try_parse_long(argv[3], &store_interval);
+		try_parse_long(argv[3], &save_interval_count);
+	}
+	if (argc > 4) {
+		try_parse_long(argv[4], &cnt_max_scans);
+	}
+	log_info("searching 1-wire devices\n");
+	if (read_interval_seconds == DEFAULT_READ_INTERVAL_SECONDS) {
+		log_info("\tdevice read interval: %ld seconds (default value)\n", read_interval_seconds);
+	}
+	else {
+		log_info("\tdevice read interval: %ld seconds\n", read_interval_seconds);
+	}
+	if (save_interval_count != -1) {
+		if (save_interval_count == DEFAULT_SAVE_INTERVAL_COUNT) {
+			log_info("\tsave interval: %ld (default value)\n", save_interval_count);
+		}
+		else {
+			log_info("\tsave interval: %ld\n", save_interval_count);
+		}
+		log_info("\tdata save dir: %s\n", loc.c_str());
+	}
+	else {
+		log_info("\tresults are not saved\n");
+	}
+	if (cnt_max_scans == DEFAULT_MAX_READ_COUNT) {
+		log_info("\tmax read count: %ld (default value, devices will be read until application is terminated)\n\n", cnt_max_scans);
+	}
+	else {
+		log_info("\tmax read count: %ld\n\n", cnt_max_scans);
 	}
-	log_info("scanning 1-wire devices\n");
-	log_info("data save dir: %s, scan interval: %ld, save interval: %ld\n", loc.c_str(), scan_interval, store_interval);
 	DeviceConfig::set_base_dir_name(loc);
-	device_list	= Factory::get_device_list();
-	round		= 0;
+	device_list		= Factory::get_device_list();
+	read_count_afer_save	= 0;
+	read_count_total	= 0;
 	if (device_list.size() > 0) {
 		while(1) {
-			round++;
+			read_count_afer_save++;
+			read_count_total++;
+			if ((cnt_max_scans != -1) &&
+			    (read_count_total > cnt_max_scans)) {
+				log_info("closing the application, max read count reached. (%ld)\n", cnt_max_scans);
+				break;
+			}
 			for(iter = device_list.begin(); iter != device_list.end(); iter++) {
 				device = (W1Device *)*iter;
 				device->printout();
 				sleep(1);
-				if (round >= store_interval) {
+				if ((save_interval_count != -1) &&
+				    (read_count_afer_save >= save_interval_count)) {
 					device->save_data();
 				}
 			}
-			sleep(scan_interval);
-			if (round >= store_interval) {
-				round = 0;
-				break;
+			sleep(read_interval_seconds);
+			if ((save_interval_count != -1) &&
+			    (read_count_afer_save >= save_interval_count)) {
+				read_count_afer_save = 0;
 			}
 		}
 	}