diff --git a/fronius/integrationpluginfronius.cpp b/fronius/integrationpluginfronius.cpp
index 9d51c166..6631a8c4 100644
--- a/fronius/integrationpluginfronius.cpp
+++ b/fronius/integrationpluginfronius.cpp
@@ -51,7 +51,7 @@ void IntegrationPluginFronius::discoverThings(ThingDiscoveryInfo *info)
{
if (!hardwareManager()->networkDeviceDiscovery()->available()) {
qCWarning(dcFronius()) << "Failed to discover network devices. The network device discovery is not available.";
- info->finish(Thing::ThingErrorHardwareNotAvailable, QT_TR_NOOP("Unable to discovery devices in your network."));
+ info->finish(Thing::ThingErrorHardwareNotAvailable, QT_TR_NOOP("Unable to discover devices in your network."));
return;
}
@@ -127,7 +127,11 @@ void IntegrationPluginFronius::setupThing(ThingSetupInfo *info)
QByteArray data = reply->networkReply()->readAll();
if (reply->networkReply()->error() != QNetworkReply::NoError) {
qCWarning(dcFronius()) << "Network request error:" << reply->networkReply()->error() << reply->networkReply()->errorString() << reply->networkReply()->url();
- info->finish(Thing::ThingErrorHardwareNotAvailable, QT_TR_NOOP("The device is not reachable"));
+ if (reply->networkReply()->error() == QNetworkReply::ContentNotFoundError) {
+ info->finish(Thing::ThingErrorHardwareNotAvailable, QT_TR_NOOP("The device does not reply to our requests. Please verify that the Fronius Solar API is enabled on the device."));
+ } else {
+ info->finish(Thing::ThingErrorHardwareNotAvailable, QT_TR_NOOP("The device is not reachable."));
+ }
return;
}
@@ -136,7 +140,7 @@ void IntegrationPluginFronius::setupThing(ThingSetupInfo *info)
QJsonDocument jsonDoc = QJsonDocument::fromJson(data, &error);
if (error.error != QJsonParseError::NoError) {
qCWarning(dcFronius()) << "Failed to parse JSON data" << data << ":" << error.errorString() << data;
- info->finish(Thing::ThingErrorHardwareFailure, QT_TR_NOOP("Unable to read the data. Please try again."));
+ info->finish(Thing::ThingErrorHardwareFailure, QT_TR_NOOP("The data received from the device could not be processed because the format is unknown."));
return;
}
@@ -146,7 +150,7 @@ void IntegrationPluginFronius::setupThing(ThingSetupInfo *info)
// Knwon version with broken JSON API
if (versionResponseMap.value("CompatibilityRange").toString() == "1.6-2") {
qCWarning(dcFronius()) << "The Fronius data logger has a version which is known to have a broken JSON API firmware.";
- info->finish(Thing::ThingErrorHardwareFailure, QT_TR_NOOP("The firmware version 1.6-2 of this Fronius data logger has a broken API. Please update your Fronius device."));
+ info->finish(Thing::ThingErrorHardwareFailure, QT_TR_NOOP("The firmware version 1.6-2 of this Fronius data logger contains errors preventing proper operation. Please update your Fronius device and try again."));
return;
}
diff --git a/fronius/translations/02319cfc-8b55-49ba-99bc-0588bbfab063-de.ts b/fronius/translations/02319cfc-8b55-49ba-99bc-0588bbfab063-de.ts
index 97b09daa..bb5c7fb5 100644
--- a/fronius/translations/02319cfc-8b55-49ba-99bc-0588bbfab063-de.ts
+++ b/fronius/translations/02319cfc-8b55-49ba-99bc-0588bbfab063-de.ts
@@ -5,108 +5,119 @@
IntegrationPluginFronius
- Unable to discovery devices in your network.
-
-
-
-
- The device is not reachable
-
+ Unable to discover devices in your network.
+ Das Netzwerk kann nicht durchsucht werden.
- Unable to read the data. Please try again.
-
+ The device does not reply to our requests. Please verify that the Fronius Solar API is enabled on the device.
+ Das Gerät antwortet nicht auf Anfragen. Bitte überprüfe ob die Fronius Solar API am Gerät aktiviert ist.
-
- The firmware version 1.6-2 of this Fronius data logger has a broken API. Please update your Fronius device.
-
+
+ The device is not reachable.
+ Das Gerät ist nicht erreichbar.
+
+
+
+ The data received from the device could not be processed because the format is unknown.
+ Die erhaltene Antwort des Gerätes konnte nicht verarbeitet werden da das Format unbekannt ist.
+
+
+
+ The firmware version 1.6-2 of this Fronius data logger contains errors preventing proper operation. Please update your Fronius device and try again.
+ Die Firmware Version 1.6-2 dieses Fronius Geräts enthält Fehler welche eine ordnungsgemäße Funktion verhindern. Bitte update die Firmware des Fronius Geräts und versuche es erneut.fronius
-
+ Battery levelThe name of the StateType ({5c6da672-9662-41bc-8c8c-aa0f32481251}) of ThingClass storageBatteriestand
-
+ Battery level criticalThe name of the StateType ({e5396312-b50e-4d6f-b628-5b51448971d3}) of ThingClass storageBatteriestand kritisch
-
+ CapacityThe name of the StateType ({3b163deb-67a2-41d1-8441-b2d53ad846ef}) of ThingClass storage
-
+ Cell temperatureThe name of the StateType ({4417499c-1757-4309-868a-be5cf3455c4a}) of ThingClass storageZellentemperatur
-
+ Current phase AThe name of the StateType ({a9673688-d84a-4848-8583-a70739130252}) of ThingClass meter
-
+ Current phase BThe name of the StateType ({15632e49-95f9-496d-830c-53a31ca6d98e}) of ThingClass meter
-
+ Current phase CThe name of the StateType ({10a24ba9-a57a-48a9-98f3-52671c09e855}) of ThingClass meter
-
+ Current power phase AThe name of the StateType ({6dbbb062-447b-47d6-b2e4-dceac9aff795}) of ThingClass meter
-
+ Current power phase BThe name of the StateType ({f230e78e-15b0-47a4-b494-bae65be00755}) of ThingClass meter
-
+ Current power phase CThe name of the StateType ({56b5d550-d902-4c33-9288-8ee972735a75}) of ThingClass meter
-
+ FrequencyThe name of the StateType ({9ff64b29-e023-4395-abd4-b6c366acfd9e}) of ThingClass meter
-
+ Fronius smart meterThe name of the ThingClass ({c3cb53a4-32dd-434d-9d9c-aada41f8129c})
-
+
+ Fronius solar inverter
+ The name of the ThingClass ({540aa956-8b8f-4982-9f58-343a76cea846})
+
+
+
+ Fronius solar storageThe name of the ThingClass ({b00139fa-7386-48b1-8697-2fdd21a57ced})
-
-
+
+ Current powerThe name of the StateType ({5a89cd3f-3abf-4f51-ab2b-4039f1d211d9}) of ThingClass storage
----------
@@ -114,9 +125,9 @@ The name of the StateType ({788accbc-b86e-471b-b37f-14c9c6411526}) of ThingClass
Aktuelle Leistung
-
-
-
+
+
+ Device IDThe name of the ParamType (ThingClass: storage, Type: thing, ID: {49087f31-abf5-4bb8-946b-a3626ee80566})
----------
@@ -126,50 +137,50 @@ The name of the ParamType (ThingClass: inverter, Type: thing, ID: {f2f8c2f5-dd6a
Geräte ID
-
+ Energy ConsumedThe name of the StateType ({f3451818-48d2-42a5-94fd-ad094c06967f}) of ThingClass meterEnergie verbraucht
-
+ Energy producedThe name of the StateType ({ca14cca5-d9f0-49c5-a8f7-907d4c0825f0}) of ThingClass meter
-
+ Current power usageThe name of the StateType ({e5056ea1-88a2-410b-9c5e-6322aca4cb17}) of ThingClass meter
-
+ Charging stateThe name of the StateType ({7a045257-d829-4e58-a769-047b3aeec7c5}) of ThingClass storage
-
+ Energy produced todayThe name of the StateType ({b6af1bf5-753d-47b6-a151-e4d801fe6ff8}) of ThingClass inverter
-
+ Energy produced yearThe name of the StateType ({7fd2fa28-9bcc-4f01-a823-459437d185f6}) of ThingClass inverter
-
+ FroniusThe name of the vendor ({2286fc38-afd9-4128-ab7e-0fba527d53ba})Fronius
-
-
+
+ Fronius SolarThe name of the ThingClass ({4fd79fed-42f1-4df9-be64-3df7b2e0bda2})
----------
@@ -177,34 +188,28 @@ The name of the plugin fronius ({02319cfc-8b55-49ba-99bc-0588bbfab063})Fronius Solar
-
- Fronius Solar Inverter
- The name of the ThingClass ({540aa956-8b8f-4982-9f58-343a76cea846})
- Fronius Solar Inverter
-
-
-
+ Mac addressThe name of the ParamType (ThingClass: connection, Type: thing, ID: {2237972e-385b-4458-b5d3-1d1fb4ae8756})
-
+ VersionThe name of the StateType ({8fd0c0ed-af89-4887-bf0f-040b13c25268}) of ThingClass connection
-
+ Host addressThe name of the ParamType (ThingClass: connection, Type: thing, ID: {52da0197-4b78-4fec-aa72-70f949e26edc})Adresse
-
-
-
-
+
+
+
+ ReachableThe name of the StateType ({2f7e1267-b0be-4b78-9aa3-832b86c4efad}) of ThingClass storage
----------
@@ -216,9 +221,9 @@ The name of the StateType ({98e4476f-e745-4a7f-b795-19269cb70c40}) of ThingClass
Erreichbar
-
-
-
+
+
+ Serial numberThe name of the ParamType (ThingClass: storage, Type: thing, ID: {8b6c7053-5ba5-4808-8ff4-9024c624d77d})
----------
@@ -228,25 +233,25 @@ The name of the ParamType (ThingClass: inverter, Type: thing, ID: {5e073a9d-f2de
-
+ Total produced energyThe name of the StateType ({d6dbb879-4cbc-4db3-830e-b92ba91a13e5}) of ThingClass inverter
-
+ Voltage phase AThe name of the StateType ({267bc59f-1113-4aff-a502-4618a591aa16}) of ThingClass meter
-
+ Voltage phase BThe name of the StateType ({bbcedb80-30f1-493e-81f0-5f77f2847353}) of ThingClass meter
-
+ Voltage phase CThe name of the StateType ({8037557b-40dc-411b-8937-bcd1695f898a}) of ThingClass meter
diff --git a/fronius/translations/02319cfc-8b55-49ba-99bc-0588bbfab063-en_US.ts b/fronius/translations/02319cfc-8b55-49ba-99bc-0588bbfab063-en_US.ts
index 9d4703e6..9491e8b9 100644
--- a/fronius/translations/02319cfc-8b55-49ba-99bc-0588bbfab063-en_US.ts
+++ b/fronius/translations/02319cfc-8b55-49ba-99bc-0588bbfab063-en_US.ts
@@ -5,108 +5,119 @@
IntegrationPluginFronius
- Unable to discovery devices in your network.
-
-
-
-
- The device is not reachable
+ Unable to discover devices in your network.
- Unable to read the data. Please try again.
+ The device does not reply to our requests. Please verify that the Fronius Solar API is enabled on the device.
-
- The firmware version 1.6-2 of this Fronius data logger has a broken API. Please update your Fronius device.
+
+ The device is not reachable.
+
+
+
+
+ The data received from the device could not be processed because the format is unknown.
+
+
+
+
+ The firmware version 1.6-2 of this Fronius data logger contains errors preventing proper operation. Please update your Fronius device and try again.fronius
-
+ Battery levelThe name of the StateType ({5c6da672-9662-41bc-8c8c-aa0f32481251}) of ThingClass storage
-
+ Battery level criticalThe name of the StateType ({e5396312-b50e-4d6f-b628-5b51448971d3}) of ThingClass storage
-
+ CapacityThe name of the StateType ({3b163deb-67a2-41d1-8441-b2d53ad846ef}) of ThingClass storage
-
+ Cell temperatureThe name of the StateType ({4417499c-1757-4309-868a-be5cf3455c4a}) of ThingClass storage
-
+ Current phase AThe name of the StateType ({a9673688-d84a-4848-8583-a70739130252}) of ThingClass meter
-
+ Current phase BThe name of the StateType ({15632e49-95f9-496d-830c-53a31ca6d98e}) of ThingClass meter
-
+ Current phase CThe name of the StateType ({10a24ba9-a57a-48a9-98f3-52671c09e855}) of ThingClass meter
-
+ Current power phase AThe name of the StateType ({6dbbb062-447b-47d6-b2e4-dceac9aff795}) of ThingClass meter
-
+ Current power phase BThe name of the StateType ({f230e78e-15b0-47a4-b494-bae65be00755}) of ThingClass meter
-
+ Current power phase CThe name of the StateType ({56b5d550-d902-4c33-9288-8ee972735a75}) of ThingClass meter
-
+ FrequencyThe name of the StateType ({9ff64b29-e023-4395-abd4-b6c366acfd9e}) of ThingClass meter
-
+ Fronius smart meterThe name of the ThingClass ({c3cb53a4-32dd-434d-9d9c-aada41f8129c})
-
+
+ Fronius solar inverter
+ The name of the ThingClass ({540aa956-8b8f-4982-9f58-343a76cea846})
+
+
+
+ Fronius solar storageThe name of the ThingClass ({b00139fa-7386-48b1-8697-2fdd21a57ced})
-
-
+
+ Current powerThe name of the StateType ({5a89cd3f-3abf-4f51-ab2b-4039f1d211d9}) of ThingClass storage
----------
@@ -114,9 +125,9 @@ The name of the StateType ({788accbc-b86e-471b-b37f-14c9c6411526}) of ThingClass
-
-
-
+
+
+ Device IDThe name of the ParamType (ThingClass: storage, Type: thing, ID: {49087f31-abf5-4bb8-946b-a3626ee80566})
----------
@@ -126,50 +137,50 @@ The name of the ParamType (ThingClass: inverter, Type: thing, ID: {f2f8c2f5-dd6a
-
+ Energy ConsumedThe name of the StateType ({f3451818-48d2-42a5-94fd-ad094c06967f}) of ThingClass meter
-
+ Energy producedThe name of the StateType ({ca14cca5-d9f0-49c5-a8f7-907d4c0825f0}) of ThingClass meter
-
+ Current power usageThe name of the StateType ({e5056ea1-88a2-410b-9c5e-6322aca4cb17}) of ThingClass meter
-
+ Charging stateThe name of the StateType ({7a045257-d829-4e58-a769-047b3aeec7c5}) of ThingClass storage
-
+ Energy produced todayThe name of the StateType ({b6af1bf5-753d-47b6-a151-e4d801fe6ff8}) of ThingClass inverter
-
+ Energy produced yearThe name of the StateType ({7fd2fa28-9bcc-4f01-a823-459437d185f6}) of ThingClass inverter
-
+ FroniusThe name of the vendor ({2286fc38-afd9-4128-ab7e-0fba527d53ba})
-
-
+
+ Fronius SolarThe name of the ThingClass ({4fd79fed-42f1-4df9-be64-3df7b2e0bda2})
----------
@@ -177,34 +188,28 @@ The name of the plugin fronius ({02319cfc-8b55-49ba-99bc-0588bbfab063})
-
- Fronius Solar Inverter
- The name of the ThingClass ({540aa956-8b8f-4982-9f58-343a76cea846})
-
-
-
-
+ Mac addressThe name of the ParamType (ThingClass: connection, Type: thing, ID: {2237972e-385b-4458-b5d3-1d1fb4ae8756})
-
+ VersionThe name of the StateType ({8fd0c0ed-af89-4887-bf0f-040b13c25268}) of ThingClass connection
-
+ Host addressThe name of the ParamType (ThingClass: connection, Type: thing, ID: {52da0197-4b78-4fec-aa72-70f949e26edc})
-
-
-
-
+
+
+
+ ReachableThe name of the StateType ({2f7e1267-b0be-4b78-9aa3-832b86c4efad}) of ThingClass storage
----------
@@ -216,9 +221,9 @@ The name of the StateType ({98e4476f-e745-4a7f-b795-19269cb70c40}) of ThingClass
-
-
-
+
+
+ Serial numberThe name of the ParamType (ThingClass: storage, Type: thing, ID: {8b6c7053-5ba5-4808-8ff4-9024c624d77d})
----------
@@ -228,25 +233,25 @@ The name of the ParamType (ThingClass: inverter, Type: thing, ID: {5e073a9d-f2de
-
+ Total produced energyThe name of the StateType ({d6dbb879-4cbc-4db3-830e-b92ba91a13e5}) of ThingClass inverter
-
+ Voltage phase AThe name of the StateType ({267bc59f-1113-4aff-a502-4618a591aa16}) of ThingClass meter
-
+ Voltage phase BThe name of the StateType ({bbcedb80-30f1-493e-81f0-5f77f2847353}) of ThingClass meter
-
+ Voltage phase CThe name of the StateType ({8037557b-40dc-411b-8937-bcd1695f898a}) of ThingClass meter