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

Merge PR #4: Generic car: Add capacity and phaseCount states and settings

pull/6/head
jenkins 2022-06-30 15:05:20 +02:00
parent f2e2bc4814 284b447e31
commit 0135835911
2 changed files with 40 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
genericcar/integrationplugingenericcar.cpp
View File

@ -46,12 +46,19 @@ void IntegrationPluginGenericCar::setupThing(ThingSetupInfo *info)
// Set the min charging current state if the settings value changed
connect(thing, &Thing::settingChanged, this, [thing](const ParamTypeId &paramTypeId, const QVariant &value){
if (paramTypeId == carSettingsMinChargingCurrentParamTypeId) {
if (paramTypeId == carSettingsCapacityParamTypeId) {
thing->setStateValue(carCapacityStateTypeId, value);
} else if (paramTypeId == carSettingsMinChargingCurrentParamTypeId) {
qCDebug(dcGenericCar()) << "Car minimum charging current settings changed" << value.toUInt() << "A";
thing->setStateValue(carMinChargingCurrentStateTypeId, value);
} else if (paramTypeId == carSettingsPhaseCountParamTypeId) {
thing->setStateValue(carPhaseCountStateTypeId, value);
}
});
// Migration from earlier versions (pre 1.3) which had the capacity setting as a writable state.
thing->setSettingValue(carSettingsCapacityParamTypeId, thing->stateValue(carCapacityStateTypeId));
// Finish the setup
info->finish(Thing::ThingErrorNoError);
@ -64,10 +71,7 @@ void IntegrationPluginGenericCar::executeAction(ThingActionInfo *info)
Thing *thing = info->thing();
Action action = info->action();
if (action.actionTypeId() == carCapacityActionTypeId) {
thing->setStateValue(carCapacityStateTypeId, action.paramValue(carCapacityActionCapacityParamTypeId));
info->finish(Thing::ThingErrorNoError);
} else if (action.actionTypeId() == carBatteryLevelActionTypeId) {
if (action.actionTypeId() == carBatteryLevelActionTypeId) {
thing->setStateValue(carBatteryLevelStateTypeId, action.paramValue(carBatteryLevelActionBatteryLevelParamTypeId));
thing->setStateValue(carBatteryCriticalStateTypeId, action.paramValue(carBatteryLevelActionBatteryLevelParamTypeId).toInt() < 10);
info->finish(Thing::ThingErrorNoError);

35
genericcar/integrationplugingenericcar.json
View File

@ -21,9 +21,28 @@
"displayName": "Minimum charging current",
"type": "uint",
"unit": "Ampere",
"minValue": 6,
"minValue": 4,
"maxValue": 16,
"defaultValue": 6
},
{
"id": "57f36386-dd71-4ab0-8d2f-8c74a391f90d",
"name": "capacity",
"displayName": "Capacity",
"type": "uint",
"unit": "KiloWattHour",
"minValue": 5,
"maxValue": 200,
"defaultValue": 50
},
{
"id": "6ee1534a-f2c7-4819-8cd5-728dc63a31ba",
"name": "phaseCount",
"displayName": "Phase count",
"type": "uint",
"minValue": 1,
"maxValue": 3,
"defaultValue": 1
}
],
"stateTypes": [
@ -32,11 +51,9 @@
"name": "capacity",
"displayName": "Capacity",
"displayNameEvent": "Capacity changed",
"displayNameAction": "Set capacity",
"type": "double",
"unit": "KiloWattHour",
"defaultValue": 50,
"writable": true
"defaultValue": 50
},
{
"id": "d33982d6-6467-4281-b448-68c1b1db088d",
@ -69,6 +86,16 @@
"minValue": 6,
"maxValue": 16,
"defaultValue": 6
},
{
"id": "c886c062-bf1a-46c5-8e54-aed804a22d57",
"name": "phaseCount",
"displayName": "Phase count",
"displayNameEvent": "Phase count changed",
"type": "uint",
"minValue": 1,
"maxValue": 3,
"defaultValue": 1
}
]
}