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

somfytahoma: Rename Tahoma to TaHoma in log messages

master
Christian Fetzer 2022-05-29 13:51:15 +02:00
parent 427d9b6b42
commit 86442ac742
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
somfytahoma/integrationpluginsomfytahoma.cpp
View File

@ -51,7 +51,7 @@ void IntegrationPluginSomfyTahoma::discoverThings(ThingDiscoveryInfo *info)
foreach (const ZeroConfServiceEntry &entry, m_zeroConfBrowser->serviceEntries()) { foreach (const ZeroConfServiceEntry &entry, m_zeroConfBrowser->serviceEntries()) {
qCDebug(dcSomfyTahoma()) << "Found local gateway:" << entry; qCDebug(dcSomfyTahoma()) << "Found local gateway:" << entry;
ThingDescriptor descriptor(info->thingClassId(), "Somfy Tahoma Gateway", entry.hostAddress().toString()); ThingDescriptor descriptor(info->thingClassId(), "Somfy TaHoma Gateway", entry.hostAddress().toString());
ParamList params; ParamList params;
params << Param(gatewayThingGatewayIdParamTypeId, entry.name()); params << Param(gatewayThingGatewayIdParamTypeId, entry.name());
params << Param(gatewayThingGatewayPinParamTypeId, entry.txt("gateway_pin")); params << Param(gatewayThingGatewayPinParamTypeId, entry.txt("gateway_pin"));
@ -71,7 +71,7 @@ void IntegrationPluginSomfyTahoma::discoverThings(ThingDiscoveryInfo *info)
void IntegrationPluginSomfyTahoma::startPairing(ThingPairingInfo *info) void IntegrationPluginSomfyTahoma::startPairing(ThingPairingInfo *info)
{ {
info->finish(Thing::ThingErrorNoError, QT_TR_NOOP("Please enter the cloud login credentials for Somfy Tahoma in order to set up local access to the Gateway.")); info->finish(Thing::ThingErrorNoError, QT_TR_NOOP("Please enter the cloud login credentials for Somfy TaHoma in order to set up local access to the Gateway."));
} }
void IntegrationPluginSomfyTahoma::confirmPairing(ThingPairingInfo *info, const QString &username, const QString &password) void IntegrationPluginSomfyTahoma::confirmPairing(ThingPairingInfo *info, const QString &username, const QString &password)
@ -79,7 +79,7 @@ void IntegrationPluginSomfyTahoma::confirmPairing(ThingPairingInfo *info, const
// Request local token from cloud account. // Request local token from cloud account.
SomfyTahomaRequest *request = createCloudSomfyTahomaLoginRequest(hardwareManager()->networkManager(), username, password, this); SomfyTahomaRequest *request = createCloudSomfyTahomaLoginRequest(hardwareManager()->networkManager(), username, password, this);
connect(request, &SomfyTahomaRequest::error, info, [info](){ connect(request, &SomfyTahomaRequest::error, info, [info](){
info->finish(Thing::ThingErrorAuthenticationFailure, QT_TR_NOOP("Failed to login to Somfy Tahoma.")); info->finish(Thing::ThingErrorAuthenticationFailure, QT_TR_NOOP("Failed to login to Somfy TaHoma."));
}); });
connect(request, &SomfyTahomaRequest::finished, info, [this, info, username, password](const QVariant &/*result*/){ connect(request, &SomfyTahomaRequest::finished, info, [this, info, username, password](const QVariant &/*result*/){
SomfyTahomaRequest *request = createCloudSomfyTahomaGetRequest(hardwareManager()->networkManager(), "/config/" + info->params().paramValue(gatewayThingGatewayPinParamTypeId).toString() + "/local/tokens/generate", this); SomfyTahomaRequest *request = createCloudSomfyTahomaGetRequest(hardwareManager()->networkManager(), "/config/" + info->params().paramValue(gatewayThingGatewayPinParamTypeId).toString() + "/local/tokens/generate", this);
@ -119,7 +119,7 @@ void IntegrationPluginSomfyTahoma::setupThing(ThingSetupInfo *info)
// Compatibility to older cloud based versions of the plugin. // Compatibility to older cloud based versions of the plugin.
if (info->thing()->thingClassId() == tahomaThingClassId || if (info->thing()->thingClassId() == tahomaThingClassId ||
(info->thing()->thingClassId() == gatewayThingClassId && getToken(info->thing()).isEmpty())) { (info->thing()->thingClassId() == gatewayThingClassId && getToken(info->thing()).isEmpty())) {
info->finish(Thing::ThingErrorSetupFailed, QT_TR_NOOP("The Somfy Plugin switched to local connection. Please enable 'Developer Mode' on somfy.com, remove the account from Nymea and re-setup the Somfy Tahoma Gateway.")); info->finish(Thing::ThingErrorSetupFailed, QT_TR_NOOP("The Somfy Plugin switched to local connection. Please enable 'Developer Mode' on somfy.com, remove the account from Nymea and re-setup the Somfy TaHoma Gateway."));
return; return;
} }

6
somfytahoma/integrationpluginsomfytahoma.json
View File

@ -1,6 +1,6 @@
{ {
"name": "SomfyTahoma", "name": "SomfyTahoma",
"displayName": "Somfy Tahoma", "displayName": "Somfy TaHoma",
"id": "4e8be1c1-daa8-4e21-9e85-b2372ab1a450", "id": "4e8be1c1-daa8-4e21-9e85-b2372ab1a450",
"vendors": [ "vendors": [
{ {
@ -11,7 +11,7 @@
{ {
"id": "fedd72b8-547d-4e4f-b73e-71344a8ba0c1", "id": "fedd72b8-547d-4e4f-b73e-71344a8ba0c1",
"name": "tahoma", "name": "tahoma",
"displayName": "Tahoma Account", "displayName": "TaHoma Account",
"createMethods": ["auto"], "createMethods": ["auto"],
"interfaces": ["account"], "interfaces": ["account"],
"stateTypes": [ "stateTypes": [
@ -44,7 +44,7 @@
{ {
"id": "6c09e0b9-f0cc-4dea-9994-9e039eff78f1", "id": "6c09e0b9-f0cc-4dea-9994-9e039eff78f1",
"name": "gateway", "name": "gateway",
"displayName": "Tahoma Gateway", "displayName": "TaHoma Gateway",
"createMethods": ["discovery"], "createMethods": ["discovery"],
"setupMethod": "userandpassword", "setupMethod": "userandpassword",
"interfaces": ["gateway"], "interfaces": ["gateway"],