Merged -r448 into branches/2.0

This commit is contained in:
Micke Prag 2010-02-01 13:59:04 +00:00
parent f32606854e
commit 76cc75dfca
4 changed files with 229 additions and 0 deletions

View file

@ -13,6 +13,7 @@
#include "Device.h"
#include "DeviceBrateck.h"
#include "DeviceEverflourish.h"
#include "DeviceGroup.h"
#include "DeviceNexa.h"
#include "DeviceRisingSun.h"
@ -92,6 +93,11 @@ Device *Manager::getDevice(int intDeviceId){
dev = new DeviceBrateck(intDeviceId, strModel, strName);
((DeviceBrateck*)dev)->setHouse(settings.getDeviceParameter(intDeviceId, "house"));
} else if (strcasecmp(protocol.c_str(), "everflourish") == 0){
dev = new DeviceEverflourish(intDeviceId, strModel, strName);
((DeviceEverflourish*)dev)->setHouse(settings.getDeviceParameter(intDeviceId, "house"));
((DeviceEverflourish*)dev)->setUnit(settings.getDeviceParameter(intDeviceId, "unit"));
} else if (strcasecmp(protocol.c_str(), "group") == 0) {
dev = new DeviceGroup(intDeviceId, strModel, strName);
((DeviceGroup*)dev)->setDevices(settings.getDeviceParameter(intDeviceId, "devices"));