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

Add plugedIn interface state for goE-Charger

master
Simon Stürz 2021-08-26 09:14:06 +02:00
parent f966532b57
commit ecd2562b26
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
goecharger/integrationplugingoecharger.cpp
View File

@ -266,15 +266,19 @@ void IntegrationPluginGoECharger::update(Thing *thing, const QVariantMap &status
switch (carState) { switch (carState) {
case CarStateReadyNoCar: case CarStateReadyNoCar:
thing->setStateValue(goeHomeCarStatusStateTypeId, "Ready but no vehicle connected"); thing->setStateValue(goeHomeCarStatusStateTypeId, "Ready but no vehicle connected");
thing->setStateValue(goeHomePluggedInStateTypeId, false);
break; break;
case CarStateCharging: case CarStateCharging:
thing->setStateValue(goeHomeCarStatusStateTypeId, "Vehicle loads"); thing->setStateValue(goeHomeCarStatusStateTypeId, "Vehicle loads");
thing->setStateValue(goeHomePluggedInStateTypeId, true);
break; break;
case CarStateWaitForCar: case CarStateWaitForCar:
thing->setStateValue(goeHomeCarStatusStateTypeId, "Waiting for vehicle"); thing->setStateValue(goeHomeCarStatusStateTypeId, "Waiting for vehicle");
thing->setStateValue(goeHomePluggedInStateTypeId, false);
break; break;
case CarStateChargedCarConnected: case CarStateChargedCarConnected:
thing->setStateValue(goeHomeCarStatusStateTypeId, "Charging finished and vehicle still connected"); thing->setStateValue(goeHomeCarStatusStateTypeId, "Charging finished and vehicle still connected");
thing->setStateValue(goeHomePluggedInStateTypeId, true);
break; break;
} }
@ -403,6 +407,7 @@ void IntegrationPluginGoECharger::setupMqttChannel(ThingSetupInfo *info, const Q
qCDebug(dcGoECharger()) << "Configured successfully MQTT server" << thing << channel->serverAddress().toString(); qCDebug(dcGoECharger()) << "Configured successfully MQTT server" << thing << channel->serverAddress().toString();
} }
// Configure the port
QNetworkRequest request = buildConfigurationRequest(address, QString("mcp=%1").arg(channel->serverPort())); QNetworkRequest request = buildConfigurationRequest(address, QString("mcp=%1").arg(channel->serverPort()));
qCDebug(dcGoECharger()) << "Configure nymea mqtt server port on" << thing << request.url().toString(); qCDebug(dcGoECharger()) << "Configure nymea mqtt server port on" << thing << request.url().toString();
QNetworkReply *reply = hardwareManager()->networkManager()->sendCustomRequest(request, "SET"); QNetworkReply *reply = hardwareManager()->networkManager()->sendCustomRequest(request, "SET");
@ -432,6 +437,7 @@ void IntegrationPluginGoECharger::setupMqttChannel(ThingSetupInfo *info, const Q
qCDebug(dcGoECharger()) << "Configured successfully MQTT server" << thing << channel->serverPort(); qCDebug(dcGoECharger()) << "Configured successfully MQTT server" << thing << channel->serverPort();
} }
// Username
QNetworkRequest request = buildConfigurationRequest(address, QString("mcu=%1").arg(channel->username())); QNetworkRequest request = buildConfigurationRequest(address, QString("mcu=%1").arg(channel->username()));
qCDebug(dcGoECharger()) << "Configure nymea mqtt server user name on" << thing << request.url().toString(); qCDebug(dcGoECharger()) << "Configure nymea mqtt server user name on" << thing << request.url().toString();
QNetworkReply *reply = hardwareManager()->networkManager()->sendCustomRequest(request, "SET"); QNetworkReply *reply = hardwareManager()->networkManager()->sendCustomRequest(request, "SET");
@ -461,6 +467,7 @@ void IntegrationPluginGoECharger::setupMqttChannel(ThingSetupInfo *info, const Q
qCDebug(dcGoECharger()) << "Configured successfully MQTT server" << thing << channel->username(); qCDebug(dcGoECharger()) << "Configured successfully MQTT server" << thing << channel->username();
} }
// Password
QNetworkRequest request = buildConfigurationRequest(address, QString("mck=%1").arg(channel->password())); QNetworkRequest request = buildConfigurationRequest(address, QString("mck=%1").arg(channel->password()));
qCDebug(dcGoECharger()) << "Configure nymea mqtt server password on" << thing << request.url().toString(); qCDebug(dcGoECharger()) << "Configure nymea mqtt server password on" << thing << request.url().toString();
QNetworkReply *reply = hardwareManager()->networkManager()->sendCustomRequest(request, "SET"); QNetworkReply *reply = hardwareManager()->networkManager()->sendCustomRequest(request, "SET");
@ -490,6 +497,7 @@ void IntegrationPluginGoECharger::setupMqttChannel(ThingSetupInfo *info, const Q
qCDebug(dcGoECharger()) << "Configured successfully MQTT server" << thing << channel->password(); qCDebug(dcGoECharger()) << "Configured successfully MQTT server" << thing << channel->password();
} }
// Enable MQTT
QNetworkRequest request = buildConfigurationRequest(address, QString("mce=1")); QNetworkRequest request = buildConfigurationRequest(address, QString("mce=1"));
qCDebug(dcGoECharger()) << "Enable custom mqtt server on" << thing << request.url().toString(); qCDebug(dcGoECharger()) << "Enable custom mqtt server on" << thing << request.url().toString();
QNetworkReply *reply = hardwareManager()->networkManager()->sendCustomRequest(request, "SET"); QNetworkReply *reply = hardwareManager()->networkManager()->sendCustomRequest(request, "SET");

8
goecharger/integrationplugingoecharger.json
View File

@ -53,6 +53,14 @@
"defaultValue": "Ready but no vehicle connected", "defaultValue": "Ready but no vehicle connected",
"suggestLogging": true "suggestLogging": true
}, },
{
"id": "6cb155b1-0831-47bc-8657-17ca68716684",
"name": "pluggedIn",
"displayName": "Car plugged in",
"displayNameEvent": "Car plugged in changed",
"type": "bool",
"defaultValue": false
},
{ {
"id": "d80e1ed8-c3ae-4b68-bf86-21b4d7b2b201", "id": "d80e1ed8-c3ae-4b68-bf86-21b4d7b2b201",
"name": "access", "name": "access",