Api cleanups for device querying

[lib1wire.git] / src / W1TemperatureSensor.cc

diff --git a/src/W1TemperatureSensor.cc b/src/W1TemperatureSensor.cc
index e7930ff6333a8668740373d9757748286f8c336f..b6d1dac08f60070d163c28daface2ffe5f8ca0b9 100644 (file)
--- a/src/W1TemperatureSensor.cc
+++ b/src/W1TemperatureSensor.cc
@@ -50,17 +50,13 @@ double convert_w1_temperature_to_celcius(string raw_value, int *err_flg) {
        return dbl_val;
 }
 
-W1TemperatureSensor::W1TemperatureSensor(int family_code_param,
+W1TemperatureSensor::W1TemperatureSensor(string device_type_param,
                                string device_id_param,
-                               dirent *direntry_param): W1Device(family_code_param, device_id_param, direntry_param) {
-       string  text;
-
-       log_debug("trying to open file: %s\n", slave_file.c_str());
+                               dirent *direntry_param): W1Device(device_type_param, device_id_param, direntry_param) {
        ifstream ifs(slave_file.c_str());
        if (ifs.is_open() == false) {
-               text    = get_time() + ": device type = " + get_device_type() + ", id = " + id + ", could not read file: " + slave_file + "\n";
-               log_debug(text.c_str());
-               log_debug("verify that you have w1_therm kernel module loaded.\n");
+               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("Verify that you have w1_therm kernel module loaded.\n");
                ifs.close();
        }
 }
@@ -68,19 +64,6 @@ W1TemperatureSensor::W1TemperatureSensor(int family_code_param,
 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;
-}
-
 vector<double> *W1TemperatureSensor::get_raw_data() {
        vector<double>  *ret_val;
        string          tmp_str;
@@ -121,6 +104,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;
 }