X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=src%2FW1Device.cc;h=467a3359685eb7a432ee606259684fe4d79e687b;hb=83dba70b46600014932da34e8744ba70584077aa;hp=843910ac9764bca9a59257ce25eebbd0411399c7;hpb=9c47855d3ddc3d09b9733c43d420a7d5b739bd37;p=lib1wire.git

diff --git a/src/W1Device.cc b/src/W1Device.cc
index 843910a..467a335 100644
--- a/src/W1Device.cc
+++ b/src/W1Device.cc
@@ -8,6 +8,7 @@
 #include <fstream>
 
 #include <time.h>
+#include <plp/log.h>
 
 #include "W1Store.hh"
 #include "W1Device.hh"
@@ -15,20 +16,21 @@
 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() {
@@ -82,7 +84,7 @@ string W1Device::get_formatted_value() {
 string W1Device::get_formatted_value(string value) {
 	string ret_val;
 
-	ret_val	= get_time() + "|" + get_devicetype_name() + "|" + id + "|" + value + " " + get_unit();
+	ret_val	= get_time() + "|" + get_device_type() + "|" + id + "|" + value + " " + get_unit();
 	add_to_memory_cache(ret_val);
 	return ret_val;
 }