X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=src%2FW1TemperatureSensor.cc;h=5f954cfaa1403923fd58f639128510a2288ee33b;hb=9e569babf7e271015fedac3b7153d9035ff17ee0;hp=e01e1cc0677e80f2ba8cb899ee2bece040a40340;hpb=af341b7dfafac0912f513879565ebd856aa77915;p=lib1wire.git

diff --git a/src/W1TemperatureSensor.cc b/src/W1TemperatureSensor.cc
index e01e1cc..5f954cf 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;
 
@@ -44,37 +44,25 @@ double convert_w1_temperature_to_celcius(string raw_value, int *err_flg) {
 */
 	}
 	else {
-		log_error("Failed to convert temperature %s to celsius value", raw_value.c_str());
+		log_error("Failed to convert temperature %s to celcius value.", raw_value.c_str());
 		*err_flg	= 1;
 	}
 	return dbl_val;
 }
 
-W1TemperatureSensor::W1TemperatureSensor(int family_code_param,
-				string device_id_param,
-				dirent *direntry_param): W1Device(family_code_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();
 	}
 }
 
 W1TemperatureSensor::~W1TemperatureSensor() {
-}
-
-bool W1TemperatureSensor::is_supported_w1_family_code(int family_code) {
-	bool	ret_val;
-
-	ret_val	= false;
-	switch(family_code) {
-		case 0x10:
-		case 0x28:
-			ret_val	= true;
-			break;
-	}
-	return ret_val;
+	log_debug("destructor\n");
 }
 
 vector<double> *W1TemperatureSensor::get_raw_data() {
@@ -117,10 +105,6 @@ string W1TemperatureSensor::get_unit() {
 	return CONST_UNIT_CELCIUS;
 }
 
-string W1TemperatureSensor::get_device_type() {
-	return "Temperature Sensor";
-}
-
 unsigned int W1TemperatureSensor::get_data_decimal_precision() {
 	return 3;
 }