#include <string.h>
#include <plp/log.h>
+#include <plp/DeviceConfig.hh>
+#include <plp/DeviceTypes.hh>
+#include <plp/FileUtil.hh>
-#include "DeviceTypes.hh"
#include "Factory.hh"
#include "W1TemperatureSensor.hh"
#include "W1CounterDevice.hh"
-#include "W1Util.hh"
using namespace w1;
using namespace plp;
switch(family_code_param) {
case 0x10:
case 0x28:
- ret_val = new W1TemperatureSensor(type, device_id_param, direntry_param);
+ ret_val = new W1TemperatureSensor(device_id_param, type, direntry_param);
break;
case 0x1d:
- ret_val = new W1CounterDevice(type, device_id_param, direntry_param);
+ ret_val = new W1CounterDevice(device_id_param, type, direntry_param);
break;
case 0x81:
// 0x81 is the 1-wire USB dongle... No need to create device for it.
}
if (ret_val != NULL) {
// check that device config exist
- config = get_device_config(device_id_param);
+ config = DeviceConfig::get_device_config(device_id_param);
if (config != NULL) {
// if not, create default device config
type = config->get_cfg_value(DEVICE_CONFIG_VALUE_KEY__TYPE);
if (type.empty() == true) {
- type = ret_val->get_device_type();
+ type = ret_val->get_type();
config->set_cfg_value(DEVICE_CONFIG_VALUE_KEY__TYPE, type);
config->set_cfg_value(DEVICE_CONFIG_VALUE_KEY__ID, ret_val->get_id());
}
if (dir != NULL) {
direntry = readdir(dir);
while(direntry != NULL) {
- is_subdir = W1Util::is_subdirectory(W1_SCAN_ROOTDIR, direntry);
+ is_subdir = FileUtil::is_subdirectory(W1_SCAN_ROOTDIR, direntry);
if (is_subdir == true) {
err_flg = 0;
device = create_w1_device(direntry, &err_flg);
direntry = readdir(dir);
while(direntry != NULL) {
if (strcmp(direntry->d_name, "cache") != 0) {
- is_subdir = W1Util::is_subdirectory(dr_name.c_str(), direntry);
+ is_subdir = FileUtil::is_subdirectory(dr_name.c_str(), direntry);
if (is_subdir == true) {
reader = new DataReader(direntry->d_name);
ret_val.push_back(reader);
}
return ret_val;
}
-
-DeviceConfig *Factory::get_device_config(string device_id) {
- DeviceConfig *ret_val;
-
- ret_val = new DeviceConfig(device_id);
- return ret_val;
-}