ETM-Schurig
/
powersync-plugins-modbus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge PR #12: Wallbe: Updated extendevcharger interface

master
Jenkins nymea 2021-02-19 01:34:29 +01:00
parent 5d4cd6421b 3f285f5b95
commit 68c32ab26e
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wallbe/integrationpluginwallbe.cpp
View File

@ -144,12 +144,12 @@ void IntegrationPluginWallbe::executeAction(ThingActionInfo *info)
m_asyncActions.insert(requestId, info); m_asyncActions.insert(requestId, info);
connect(info, &ThingActionInfo::aborted, this, [this, requestId] {m_asyncActions.remove(requestId);}); connect(info, &ThingActionInfo::aborted, this, [this, requestId] {m_asyncActions.remove(requestId);});
} else if(action.actionTypeId() == wallbeEcoChargeCurrentActionTypeId){ } else if(action.actionTypeId() == wallbeEcoMaxChargingCurrentActionTypeId){
uint16_t current = action.param(wallbeEcoChargeCurrentEventChargeCurrentParamTypeId).value().toUInt(); uint16_t current = action.param(wallbeEcoMaxChargingCurrentEventMaxChargingCurrentParamTypeId).value().toUInt();
qCDebug(dcWallbe) << "Charging power set to" << current; qCDebug(dcWallbe) << "Charging power set to" << current;
QUuid requestId = modbusTcpMaster->writeCoil(0xff, WallbeRegisterAddress::ChargingCurrent, current); QUuid requestId = modbusTcpMaster->writeCoil(0xff, WallbeRegisterAddress::ChargingCurrent, current);
thing->setStateValue(wallbeEcoChargeCurrentStateTypeId, current); thing->setStateValue(wallbeEcoMaxChargingCurrentStateTypeId, current);
m_asyncActions.insert(requestId, info); m_asyncActions.insert(requestId, info);
connect(info, &ThingActionInfo::aborted, this, [this, requestId] {m_asyncActions.remove(requestId);}); connect(info, &ThingActionInfo::aborted, this, [this, requestId] {m_asyncActions.remove(requestId);});
@ -241,7 +241,7 @@ void IntegrationPluginWallbe::onReceivedHoldingRegister(int slaveAddress, int mo
} }
break; break;
case WallbeRegisterAddress::ChargingCurrent: case WallbeRegisterAddress::ChargingCurrent:
thing->setStateValue(wallbeEcoChargeCurrentStateTypeId, value[0]); thing->setStateValue(wallbeEcoMaxChargingCurrentStateTypeId, value[0]);
break; break;
case WallbeRegisterAddress::ErrorCode: case WallbeRegisterAddress::ErrorCode:
qCDebug(dcWallbe()) << "Received Error Code modbus register" << value[0]; qCDebug(dcWallbe()) << "Received Error Code modbus register" << value[0];

9
wallbe/integrationpluginwallbe.json
View File

@ -77,14 +77,11 @@
}, },
{ {
"id": "60b5b6b8-bcd3-4c3f-8501-f15af94bc8c1", "id": "60b5b6b8-bcd3-4c3f-8501-f15af94bc8c1",
"name": "chargeCurrent", "name": "maxChargingCurrent",
"displayName": "Charging current", "displayName": "Charging current",
"displayNameAction": "Set charging current",
"displayNameEvent": "Charging current changed", "displayNameEvent": "Charging current changed",
"unit": "Ampere", "displayNameAction": "Set charging current",
"type": "int", "type": "double",
"defaultValue": 0,
"type": "int",
"unit": "Ampere", "unit": "Ampere",
"minValue": 6, "minValue": 6,
"maxValue": 80, "maxValue": 80,