From 94be751d248a95091e4adfeb34e7bb23eeff5af7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Thu, 21 Oct 2021 09:18:43 +0200 Subject: [PATCH] Update phase states to common ABC definition --- keba/integrationpluginkeba.cpp | 12 +++++------ keba/integrationpluginkeba.json | 36 ++++++++++++++++----------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/keba/integrationpluginkeba.cpp b/keba/integrationpluginkeba.cpp index 355c4203..b1e492ae 100644 --- a/keba/integrationpluginkeba.cpp +++ b/keba/integrationpluginkeba.cpp @@ -459,12 +459,12 @@ void IntegrationPluginKeba::onReportThreeReceived(const KeContact::ReportThree & qCDebug(dcKeba()) << " - Uptime" << reportThree.seconds/60 << "[min]"; if (reportThree.serialNumber == thing->stateValue(wallboxSerialnumberStateTypeId).toString()) { - thing->setStateValue(wallboxCurrentPhase1EventTypeId, reportThree.currentPhase1); - thing->setStateValue(wallboxCurrentPhase2EventTypeId, reportThree.currentPhase2); - thing->setStateValue(wallboxCurrentPhase3EventTypeId, reportThree.currentPhase3); - thing->setStateValue(wallboxVoltagePhase1EventTypeId, reportThree.voltagePhase1); - thing->setStateValue(wallboxVoltagePhase2EventTypeId, reportThree.voltagePhase2); - thing->setStateValue(wallboxVoltagePhase3EventTypeId, reportThree.voltagePhase3); + thing->setStateValue(wallboxCurrentPhaseAEventTypeId, reportThree.currentPhase1); + thing->setStateValue(wallboxCurrentPhaseBEventTypeId, reportThree.currentPhase2); + thing->setStateValue(wallboxCurrentPhaseCEventTypeId, reportThree.currentPhase3); + thing->setStateValue(wallboxVoltagePhaseAEventTypeId, reportThree.voltagePhase1); + thing->setStateValue(wallboxVoltagePhaseBEventTypeId, reportThree.voltagePhase2); + thing->setStateValue(wallboxVoltagePhaseCEventTypeId, reportThree.voltagePhase3); thing->setStateValue(wallboxCurrentPowerStateTypeId, reportThree.power); thing->setStateValue(wallboxSessionEnergyStateTypeId, reportThree.energySession); thing->setStateValue(wallboxPowerFactorStateTypeId, reportThree.powerFactor); diff --git a/keba/integrationpluginkeba.json b/keba/integrationpluginkeba.json index fe55cd2a..08058dbb 100644 --- a/keba/integrationpluginkeba.json +++ b/keba/integrationpluginkeba.json @@ -163,36 +163,36 @@ }, { "id": "4a2d75d8-a3a0-4b40-9ca7-e8b6f11d0ef9", - "name": "voltagePhase1", - "displayName": "Voltage phase 1", - "displayNameEvent": "Voltage phase 1 changed", + "name": "voltagePhaseA", + "displayName": "Voltage phase A", + "displayNameEvent": "Voltage phase A changed", "type": "int", "unit": "Volt", "defaultValue": 0 }, { "id": "c8344ca5-21ac-4cd1-8f4b-e5ed202c5862", - "name": "voltagePhase2", - "displayName": "Voltage phase 2", - "displayNameEvent": "Voltage phase 2 changed", + "name": "voltagePhaseB", + "displayName": "Voltage phase B", + "displayNameEvent": "Voltage phase B changed", "type": "int", "unit": "Volt", "defaultValue": 0 }, { "id": "5f01e86c-0943-4849-a01a-db441916ebd5", - "name": "voltagePhase3", - "displayName": "Voltage phase 3", - "displayNameEvent": "Voltage phase 3 changed", + "name": "voltagePhaseC", + "displayName": "Voltage phase C", + "displayNameEvent": "Voltage phase C changed", "type": "int", "unit": "Volt", "defaultValue": 0 }, { "id": "31ec17b0-11e3-4332-92b0-fea821cf024f", - "name": "currentPhase1", - "displayName": "Current phase 1", - "displayNameEvent": "Current phase 1 changed", + "name": "currentPhaseA", + "displayName": "Current phase A", + "displayNameEvent": "Current phase A changed", "type": "double", "unit": "Ampere", "defaultValue": 0.00, @@ -200,9 +200,9 @@ }, { "id": "cdc7e10a-0d0a-4e93-ad2c-d34ffca45c97", - "name": "currentPhase2", - "displayName": "Current phase 2", - "displayNameEvent": "Current phase 2 changed", + "name": "currentPhaseB", + "displayName": "Current phase B", + "displayNameEvent": "Current phase B changed", "type": "double", "unit": "Ampere", "defaultValue": 0.00, @@ -210,9 +210,9 @@ }, { "id": "da838dc8-85f0-4e55-b4b5-cb93a43b373d", - "name": "currentPhase3", - "displayName": "Current phase 3", - "displayNameEvent": "Current phase 3 changed", + "name": "currentPhaseC", + "displayName": "Current phase C", + "displayNameEvent": "Current phase C changed", "type": "double", "unit": "Ampere", "defaultValue": 0.00,