X-Git-Url: http://pilppa.org/gitweb/?p=lib1wire.git;a=blobdiff_plain;f=src%2FW1TemperatureSensor.cc;fp=src%2FW1TemperatureSensor.cc;h=4aa52dab6e2514cfa6f4922bee80a72ce6e60c54;hp=b6d1dac08f60070d163c28daface2ffe5f8ca0b9;hb=a7002b0a87c5f17b542dfbd44f482014a191df97;hpb=da203ad44792ca37320768f4cbe68587c4806910

diff --git a/src/W1TemperatureSensor.cc b/src/W1TemperatureSensor.cc
index b6d1dac..4aa52da 100644
--- a/src/W1TemperatureSensor.cc
+++ b/src/W1TemperatureSensor.cc
@@ -9,11 +9,10 @@
 #include <sstream>
 #include <iomanip>
 
-#include "W1Util.hh"
-#include "W1TemperatureSensor.hh"
-
 #include <plp/log.h>
 
+#include "W1TemperatureSensor.hh"
+
 using namespace std;
 using namespace w1;
 
@@ -28,7 +27,8 @@ bool string_to_number(NumberDataType& result,
 	return !(iss >> format >> result).fail();
 }
 
-double convert_w1_temperature_to_celcius(string raw_value, int *err_flg) {
+double convert_w1_temperature_to_celcius(string raw_value,
+				int *err_flg) {
 	bool	suc_flg;
 	double	dbl_val;
 
@@ -50,12 +50,12 @@ double convert_w1_temperature_to_celcius(string raw_value, int *err_flg) {
 	return dbl_val;
 }
 
-W1TemperatureSensor::W1TemperatureSensor(string device_type_param,
-				string device_id_param,
-				dirent *direntry_param): W1Device(device_type_param, device_id_param, direntry_param) {
+W1TemperatureSensor::W1TemperatureSensor(string device_id_param,
+		string device_type_param,
+		dirent *direntry_param): W1Device(device_id_param, device_type_param, direntry_param) {
 	ifstream ifs(slave_file.c_str());
 	if (ifs.is_open() == false) {
-		log_error("%s: %s failed to read data from file: %s\n", id.c_str(), get_device_type().c_str(), slave_file.c_str());
+		log_error("%s: %s failed to read data from file: %s\n", id.c_str(), get_type().c_str(), slave_file.c_str());
 		log_error("Verify that you have w1_therm kernel module loaded.\n");
 		ifs.close();
 	}