X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=src%2FW1Device.cc;h=843910ac9764bca9a59257ce25eebbd0411399c7;hb=64f4c95cf6d3a772bfc721081dc39e2105c2756c;hp=bc86d830fc6580c786d142f173f423a06151f138;hpb=87afaf6ff028091d7de11f577bc1f24f1bd0d3e3;p=lib1wire.git

diff --git a/src/W1Device.cc b/src/W1Device.cc
index bc86d83..843910a 100644
--- a/src/W1Device.cc
+++ b/src/W1Device.cc
@@ -66,20 +66,20 @@ string W1Device::get_time() {
 void W1Device::printout() {
 	string text;
 
-	text	= get_formatted_data();
+	text	= get_formatted_value();
 	cout << text << endl;
 }
 
-string W1Device::get_formatted_data() {
+string W1Device::get_formatted_value() {
 	string ret_val;
 	string val;
 
-	val	= get_value();
-	ret_val	= get_formatted_data(val);
+	val	= get_raw_value();
+	ret_val	= get_formatted_value(val);
 	return ret_val;
 }
 
-string W1Device::get_formatted_data(string value) {
+string W1Device::get_formatted_value(string value) {
 	string ret_val;
 
 	ret_val	= get_time() + "|" + get_devicetype_name() + "|" + id + "|" + value + " " + get_unit();