allow UMR input to be added to clusters

refs #10307

src/web/handler/structurerequesthandler.cpp

@@ -496,14 +496,16 @@ namespace dss {
}
if (!(dev->getGroupBitmask().test(gr->getStandardGroupID()-1) ||
-          (dev->getDeviceType() == DEVICE_TYPE_AKM))) {
+          (dev->getDeviceType() == DEVICE_TYPE_AKM) ||
+          (dev->getDeviceType() == DEVICE_TYPE_UMR))) {
return JSONWriter::failure("Devices does not match color of group (" + intToString(gr->getStandardGroupID()) + ")");
}
StructureManipulator manipulator(m_Interface, m_QueryInterface, m_Apartment);
try {
if (((dev->getDeviceType() == DEVICE_TYPE_AKM) ||
-          ((dev->getDeviceType() == DEVICE_TYPE_TKM) && !dev->hasOutput()))
+          ((dev->getDeviceType() == DEVICE_TYPE_TKM) && !dev->hasOutput()) ||
+          ((dev->getDeviceType() == DEVICE_TYPE_UMR) && dev->hasInput()))
&& (dev->getGroupsCount() > 1)) {
for (int g = 0; g < dev->getGroupsCount(); g++) {
boost::shared_ptr<Group> oldGroup = dev->getGroupByIndex(g);

src/structuremanipulator.cpp

@@ -518,7 +518,7 @@ namespace dss {
_device->addToGroup(_group->getID());
if (isAppUserGroup(_group->getID())) {
-      if ((_device->getDeviceType() == DEVICE_TYPE_AKM) && (_device->getBinaryInputCount() == 1)) {
+      if ((_device->getDeviceType() == DEVICE_TYPE_AKM || _device->getDeviceType() == DEVICE_TYPE_UMR) && (_device->getBinaryInputCount() == 1)) {
/* AKM with single input, set active group to last group */
_device->setDeviceBinaryInputTarget(0, 0, _group->getID());
_device->setBinaryInputTarget(0, 0, _group->getID());
@@ -552,7 +552,7 @@ namespace dss {
m_Interface.removeFromGroup(_device->getDSMeterDSID(), _group->getID(), _device->getShortAddress());
_device->removeFromGroup(_group->getID());
-    if ((_device->getDeviceType() == DEVICE_TYPE_AKM) &&
+    if ((_device->getDeviceType() == DEVICE_TYPE_AKM || _device->getDeviceType() == DEVICE_TYPE_UMR) &&
(_device->getBinaryInputCount() == 1) &&
(_group->getID() == _device->getBinaryInputs()[0]->m_targetGroupId)) {
/* AKM with single input, active on removed group */