From f84aa052c18a087349c36aafb338be1f109a2391 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Wed, 2 Oct 2024 10:40:35 +0200 Subject: [PATCH] Improve digital input settings string --- pcelectric/integrationpluginpcelectric.cpp | 12 ++++++------ pcelectric/integrationpluginpcelectric.json | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pcelectric/integrationpluginpcelectric.cpp b/pcelectric/integrationpluginpcelectric.cpp index e86d2a1..6b4d3bd 100644 --- a/pcelectric/integrationpluginpcelectric.cpp +++ b/pcelectric/integrationpluginpcelectric.cpp @@ -389,13 +389,13 @@ void IntegrationPluginPcElectric::setupConnection(ThingSetupInfo *info) switch (connection->digitalInputMode()) { case EV11ModbusTcpConnection::DigitalInputModeEnableCharging: - thing->setSettingValue(ev11SettingsDigitalInputModeParamTypeId, "Charging allowed"); + thing->setSettingValue(ev11SettingsDigitalInputModeParamTypeId, "0 | Charging allowed"); break; case EV11ModbusTcpConnection::DigitalInputModeEnableChargingInverted: - thing->setSettingValue(ev11SettingsDigitalInputModeParamTypeId, "Charging allowed inverted"); + thing->setSettingValue(ev11SettingsDigitalInputModeParamTypeId, "1 | Charging allowed inverted"); break; case EV11ModbusTcpConnection::DigitalInputModePwmS0Enabled: - thing->setSettingValue(ev11SettingsDigitalInputModeParamTypeId, "PWM and S0 signaling"); + thing->setSettingValue(ev11SettingsDigitalInputModeParamTypeId, "2 | PWM and S0 signaling"); break; } } @@ -421,11 +421,11 @@ void IntegrationPluginPcElectric::setupConnection(ThingSetupInfo *info) qCDebug(dcPcElectric()) << "Setting Digital input mode to" << mode; EV11ModbusTcpConnection::DigitalInputMode modeValue; - if (mode == "Charging allowed") { + if (mode == "0 | Charging allowed") { modeValue = EV11ModbusTcpConnection::DigitalInputModeEnableCharging; - } else if (mode == "Charging allowed inverted") { + } else if (mode == "1 | Charging allowed inverted") { modeValue = EV11ModbusTcpConnection::DigitalInputModeEnableChargingInverted; - } else if (mode == "PWM and S0 signaling") { + } else if (mode == "2 | PWM and S0 signaling") { modeValue = EV11ModbusTcpConnection::DigitalInputModePwmS0Enabled; } else { qCWarning(dcPcElectric()) << "Unknown mode value" << mode; diff --git a/pcelectric/integrationpluginpcelectric.json b/pcelectric/integrationpluginpcelectric.json index 82247fe..4f0e0a3 100644 --- a/pcelectric/integrationpluginpcelectric.json +++ b/pcelectric/integrationpluginpcelectric.json @@ -48,11 +48,11 @@ "name": "digitalInputMode", "displayName": "Digital input mode", "type": "QString", - "defaultValue": "Charging allowed", + "defaultValue": "0 | Charging allowed", "allowedValues": [ - "Charging allowed", - "Charging allowed inverted", - "PWM and S0 signaling" + "0 | Charging allowed", + "1 | Charging allowed inverted", + "2 | PWM and S0 signaling" ] } ],