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

store the state type along with the value in the state cache

pull/135/head
Michael Zanetti 2018-10-05 01:12:11 +02:00
parent a1255ed87e
commit 058cb8af06
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libnymea/devicemanager.cpp
View File

@ -1530,7 +1530,17 @@ void DeviceManager::loadDeviceStates(Device *device)
DeviceClass deviceClass = m_supportedDevices.value(device->deviceClassId());
foreach (const StateType &stateType, deviceClass.stateTypes()) {
if (stateType.cached()) {
device->setStateValue(stateType.id(), settings.value(stateType.id().toString(), stateType.defaultValue()));
QVariant value;
// First try to load new style
if (settings.childGroups().contains(stateType.id().toString())) {
settings.beginGroup(stateType.id().toString());
value = settings.value("value", stateType.defaultValue());
value.convert(settings.value("type").toInt());
settings.endGroup();
} else { // Try to fall back to the pre 0.9.0 way of storing states
value = settings.value(stateType.id().toString(), stateType.defaultValue());
}
device->setStateValue(stateType.id(), value);
} else {
device->setStateValue(stateType.id(), stateType.defaultValue());
}
@ -1545,7 +1555,10 @@ void DeviceManager::storeDeviceStates(Device *device)
DeviceClass deviceClass = m_supportedDevices.value(device->deviceClassId());
foreach (const StateType &stateType, deviceClass.stateTypes()) {
if (stateType.cached()) {
settings.setValue(stateType.id().toString(), device->stateValue(stateType.id()));
settings.beginGroup(stateType.id().toString());
settings.setValue("type", static_cast<int>(device->stateValue(stateType.id()).type()));
settings.setValue("value", device->stateValue(stateType.id()));
settings.endGroup();
}
}
settings.endGroup();