From 8814ced9dc33334a62c28a492f2d38a0e4f91836 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Thu, 9 Dec 2021 07:17:40 +0100 Subject: [PATCH] Update states and clean up code --- goecharger/integrationplugingoecharger.cpp | 4 +- goecharger/integrationplugingoecharger.json | 62 +++++++++------------ 2 files changed, 28 insertions(+), 38 deletions(-) diff --git a/goecharger/integrationplugingoecharger.cpp b/goecharger/integrationplugingoecharger.cpp index 556ad26b..e4977700 100644 --- a/goecharger/integrationplugingoecharger.cpp +++ b/goecharger/integrationplugingoecharger.cpp @@ -208,7 +208,7 @@ void IntegrationPluginGoECharger::executeAction(ThingActionInfo *info) } else if (action.actionTypeId() == goeHomeMaxChargingCurrentActionTypeId) { uint maxChargingCurrent = action.paramValue(goeHomeMaxChargingCurrentActionMaxChargingCurrentParamTypeId).toUInt(); qCDebug(dcGoECharger()) << "Setting max charging current to" << maxChargingCurrent << "A"; - // FIXME: check if we can use amx since it is better for pc charging, not all version seen implement amx + // FIXME: check if we can use amx since it is better for pv charging, not all version seen implement amx // Maybe check if the user sets it or a rule / hems logic // Set the allow value QString configuration = QString("amp=%1").arg(maxChargingCurrent); @@ -354,7 +354,7 @@ void IntegrationPluginGoECharger::update(Thing *thing, const QVariantMap &status thing->setStateValue(goeHomeUpdateAvailableStateTypeId, (statusMap.value("upd").toUInt() == 0 ? false : true)); thing->setStateValue(goeHomeCloudStateTypeId, (statusMap.value("cdi").toUInt() == 0 ? false : true)); thing->setStateValue(goeHomeFirmwareVersionStateTypeId, statusMap.value("fwv").toString()); - // FIXME: check if we can use amx since it is better for pc charging, not all version seen implement this + // FIXME: check if we can use amx since it is better for pv charging, not all version seen implement this thing->setStateValue(goeHomeMaxChargingCurrentStateTypeId, statusMap.value("amp").toUInt()); thing->setStateValue(goeHomeLedBrightnessStateTypeId, statusMap.value("lbr").toUInt()); thing->setStateValue(goeHomeLedEnergySaveStateTypeId, statusMap.value("lse").toBool()); diff --git a/goecharger/integrationplugingoecharger.json b/goecharger/integrationplugingoecharger.json index 91d99714..2fda2c65 100644 --- a/goecharger/integrationplugingoecharger.json +++ b/goecharger/integrationplugingoecharger.json @@ -66,7 +66,8 @@ "displayName": "Car plugged in", "displayNameEvent": "Car plugged in changed", "type": "bool", - "defaultValue": false + "defaultValue": false, + "suggestLogging": true }, { "id": "48c6cdb8-9fc1-4c14-95df-3e2c62e59361", @@ -74,7 +75,8 @@ "displayName": "Charging", "displayNameEvent": "Charging changed", "type": "bool", - "defaultValue": false + "defaultValue": false, + "suggestLogging": true }, { "id": "d80e1ed8-c3ae-4b68-bf86-21b4d7b2b201", @@ -98,7 +100,8 @@ "displayNameAction": "Allow charging", "displayNameEvent": "Allow charging changed", "defaultValue": false, - "writable": true + "writable": true, + "suggestLogging": true }, { "id": "446fb786-bfbe-4938-963c-73d02184573f", @@ -111,7 +114,8 @@ "minValue": 6, "maxValue": 32, "defaultValue": 16, - "writable": true + "writable": true, + "suggestLogging": true }, { "id": "58cd977d-22df-48c9-829a-81554130d607", @@ -123,8 +127,9 @@ "unit": "Ampere", "minValue": 6, "maxValue": 32, - "defaultValue": 0, - "writable": true + "defaultValue": 20, + "writable": true, + "suggestLogging": true }, { "id": "ac849296-3f70-4b1b-aa30-127d774667bb", @@ -134,8 +139,7 @@ "displayNameEvent": "Cloud enabled changed", "type": "bool", "defaultValue": true, - "writable": true, - "suggestLogging": true + "writable": true }, { "id": "08b107bc-1284-455d-9e5a-6a1c3adc389f", @@ -190,8 +194,7 @@ "displayNameEvent": "Current power changed", "type": "double", "unit": "Watt", - "defaultValue": 0.00, - "filter": "adaptive" + "defaultValue": 0.00 }, { "id": "c6f68517-c4cd-415d-9455-b1731f7d9a1a", @@ -200,8 +203,7 @@ "displayNameEvent": "Current power phase A changed", "type": "double", "unit": "Watt", - "defaultValue": 0.00, - "filter": "adaptive" + "defaultValue": 0.00 }, { "id": "92005049-9ab9-4d7d-a7b6-6ab1a36c5f5f", @@ -210,8 +212,7 @@ "displayNameEvent": "Current power phase B changed", "type": "double", "unit": "Watt", - "defaultValue": 0.00, - "filter": "adaptive" + "defaultValue": 0.00 }, { "id": "1076fbd0-f42b-46e3-adc9-004361d6cd51", @@ -220,8 +221,7 @@ "displayNameEvent": "Current power phase C changed", "type": "double", "unit": "Watt", - "defaultValue": 0.00, - "filter": "adaptive" + "defaultValue": 0.00 }, { "id": "c8aab9e2-ba53-43b9-95db-e2c3edc97e33", @@ -230,8 +230,7 @@ "displayNameEvent": "Phase A current changed", "type": "double", "unit": "Ampere", - "defaultValue": 0.00, - "filter": "adaptive" + "defaultValue": 0.00 }, { "id": "f11ac403-728d-48f3-8669-0e684faf9890", @@ -240,8 +239,7 @@ "displayNameEvent": "Phase B current changed", "type": "double", "unit": "Ampere", - "defaultValue": 0.00, - "filter": "adaptive" + "defaultValue": 0.00 }, { "id": "55295e1c-50b0-400b-82e4-b3417b5ed4d1", @@ -250,8 +248,7 @@ "displayNameEvent": "Phase C current changed", "type": "double", "unit": "Ampere", - "defaultValue": 0.00, - "filter": "adaptive" + "defaultValue": 0.00 }, { "id": "76da8f16-44a4-4242-b78b-09c9bb127623", @@ -260,8 +257,7 @@ "displayNameEvent": "Phase A volatage changed", "type": "double", "unit": "Volt", - "defaultValue": 0.00, - "filter": "adaptive" + "defaultValue": 0.00 }, { "id": "7df01eb4-0d4d-400c-b1bc-001ca83a6a3c", @@ -270,8 +266,7 @@ "displayNameEvent": "Phase B voltage changed", "type": "double", "unit": "Volt", - "defaultValue": 0.00, - "filter": "adaptive" + "defaultValue": 0.00 }, { "id": "31814cfe-626d-4168-802b-b7fc6592fc79", @@ -280,8 +275,7 @@ "displayNameEvent": "Phase C voltage changed", "type": "double", "unit": "Volt", - "defaultValue": 0.00, - "filter": "adaptive" + "defaultValue": 0.00 }, { "id": "b78d805a-f97c-4c9d-a647-5fc98f8d6dd1", @@ -322,8 +316,7 @@ "displayNameEvent": "Temperature 1 changed", "type": "double", "unit": "DegreeCelsius", - "defaultValue": 0.0, - "suggestLogging": true + "defaultValue": 0.0 }, { "id": "558e273a-4028-495a-902a-e4e932a0ae24", @@ -332,8 +325,7 @@ "displayNameEvent": "Temperature 2 changed", "type": "double", "unit": "DegreeCelsius", - "defaultValue": 0.0, - "suggestLogging": true + "defaultValue": 0.0 }, { "id": "dbf8a5dc-b8f5-437a-ac0c-c4cf8a09aacb", @@ -342,8 +334,7 @@ "displayNameEvent": "Temperature 3 changed", "type": "double", "unit": "DegreeCelsius", - "defaultValue": 0.0, - "suggestLogging": true + "defaultValue": 0.0 }, { "id": "1953e29f-fe28-4016-9b05-f4baf4c311ff", @@ -352,8 +343,7 @@ "displayNameEvent": "Temperature 4 changed", "type": "double", "unit": "DegreeCelsius", - "defaultValue": 0.0, - "suggestLogging": true + "defaultValue": 0.0 }, { "id": "5d18b48d-b886-409e-ab2e-336d9c94a55c",