Commit 95b87c98 authored by Nicolas Tappret's avatar Nicolas Tappret

remove some reference to BLM

parent d1ad43e4
......@@ -169,7 +169,7 @@ void AttributeCombiner::init_device()
set_state(Tango::ON);
set_status("ON");
// Create BLM group
// Create devices group
deviceGroup = new Tango::Group("DEVGROUP");
errorStack.clear();
......@@ -181,14 +181,10 @@ void AttributeCombiner::init_device()
deviceGroup->add(deviceList);
deviceGroup->set_timeout_millis(timeout);
//TangoSys_OMemStream ss;
//blmGroup->dump(ss);
//cout << ss.str() << endl;
Tango::GroupReply::enable_exception(false);
self = new Tango::DeviceProxy(device_name);
// Read disabled BLM
// Read disabled Devices
Tango::DbData dbd;
dbd.push_back(Tango::DbDatum("DisabledDevices"));
get_db_device()->get_property(dbd);
......@@ -467,7 +463,7 @@ void AttributeCombiner::add_dynamic_attributes()
exit(0);
}
// We group all blm attribute in only one (for scalar only)
// We group all Devices attribute in only one (for scalar only)
DynAttribute *att = new DynAttribute(name.c_str(), type, rwType, expert);
add_attribute(att);
......@@ -667,7 +663,7 @@ void AttributeCombiner::enable_device(Tango::DevShort argin)
}
deviceGroup->enable(deviceList[argin]);
saveDisabledBLM();
saveDisabled();
/*----- PROTECTED REGION END -----*/ // AttributeCombiner::enable_device
}
......@@ -692,7 +688,7 @@ void AttributeCombiner::disable_device(Tango::DevShort argin)
}
deviceGroup->disable(deviceList[argin]);
saveDisabledBLM();
saveDisabled();
/*----- PROTECTED REGION END -----*/ // AttributeCombiner::disable_device
}
......@@ -769,7 +765,7 @@ void AttributeCombiner::disable_all()
for (int i = 0; i < (int) deviceList.size(); i++)
deviceGroup->disable(deviceList[i]);
saveDisabledBLM();
saveDisabled();
/*----- PROTECTED REGION END -----*/ // AttributeCombiner::disable_all
......@@ -788,7 +784,7 @@ void AttributeCombiner::enable_all()
for (int i = 0; i < (int) deviceList.size(); i++)
deviceGroup->enable(deviceList[i]);
saveDisabledBLM();
saveDisabled();
/*----- PROTECTED REGION END -----*/ // AttributeCombiner::enable_all
}
......@@ -945,9 +941,9 @@ void AttributeCombiner::add_dynamic_commands()
ATTITEM *item = attMap.get(attName);
if (item == NULL) {
Tango::Except::throw_exception(
(const char *) "BLMAll::error_read",
(const char *) "AttributeCombiner::error_read",
(const char *) "Unknown attribute",
(const char *) "BLMAll::read_dyn_attributes");
(const char *) "AttributeCombiner::read_dyn_attributes");
}
// Read all values
......@@ -1619,7 +1615,7 @@ void AttributeCombiner::add_dynamic_commands()
return dev_attr->get_w_attr_by_name(name.c_str());
}
void AttributeCombiner::saveDisabledBLM() {
void AttributeCombiner::saveDisabled() {
Tango::DbData dbd;
Tango::DbDatum dbt("DisabledDevices");
......
......@@ -107,7 +107,7 @@ public:
void addError(int devIndex,Tango::GroupAttrReply &reply);
Tango::WAttribute &getAtt(string name);
bool isNumber(std::string value);
void saveDisabledBLM();
void saveDisabled();
bool isDisabled(int idx);
/*----- PROTECTED REGION END -----*/ // AttributeCombiner::Data Members
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment