ETM-Schurig
/
nymea
mirror of https://github.com/nymea/nymea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

make use of actions in addconfigureddevice

pull/1/head
Michael Zanetti 2014-01-02 01:27:46 +01:00
parent ee7b30696c
commit 3d3195419b
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libhive/devicemanager.cpp
View File

@ -62,6 +62,14 @@ DeviceManager::DeviceError DeviceManager::addConfiguredDevice(const QUuid &devic
triggers.append(trigger);
}
device->setTriggers(triggers);
QList<Action> actions;
foreach (const ActionType &actionType, deviceClass.actions()) {
Action action(QUuid::createUuid());
action.setName(actionType.name());
action.setParams(actionType.parameters());
actions.append(action);
}
device->setActions(actions);
m_configuredDevices.append(device);
storeConfiguredDevices();

6
server/jsonrpcserver.cpp
View File

@ -140,6 +140,7 @@ QVariantMap JsonRPCServer::packDeviceClass(const DeviceClass &deviceClass)
triggerTypes.append(triggerMap);
}
QVariantList actionTypes;
qDebug() << "*******************" << deviceClass.actions().count();
foreach (const ActionType &actionType, deviceClass.actions()) {
QVariantMap actionMap;
actionMap.insert("id", actionType.id().toString());
@ -165,6 +166,11 @@ QVariantMap JsonRPCServer::packDevice(Device *device)
triggers.append(trigger.id());
}
variant.insert("triggers", triggers);
QVariantList actions;
foreach (const Action &action, device->actions()) {
actions.append(action.id());
}
variant.insert("actions", actions);
variant.insert("params", device->params());
return variant;
}