Merge remote-tracking branch 'origin/main'

tolwi · Sep 5, 2024 · a190b25 · a190b25
2 parents 8d161da + 1e03006
commit a190b25
Show file tree

Hide file tree

Showing 4 changed files with 83 additions and 2 deletions.
diff --git a/custom_components/ecoflow_cloud/devices/internal/powerstream.py b/custom_components/ecoflow_cloud/devices/internal/powerstream.py
@@ -91,7 +91,7 @@ def sensors(self, client: EcoflowApiClient) -> list[BaseSensorEntity]:
     def numbers(self, client: EcoflowApiClient) -> list[BaseNumberEntity]:
         return [
             # These will likely be some form of serialised data rather than JSON will look into it later
-            # MinBatteryLevelEntity(client, self,  "lowerLimit", "Min Disharge Level", 50, 100,
+            # MinBatteryLevelEntity(client, self,  "lowerLimit", "Min Discharge Level", 50, 100,
             #                       lambda value: {"moduleType": 0, "operateType": "TCP",
             #                                      "params": {"id": 00, "lowerLimit": value}}),
             # MaxBatteryLevelEntity(client, self,  "upperLimit", "Max Charge Level", 0, 30,

diff --git a/custom_components/ecoflow_cloud/devices/public/powerstream.py b/custom_components/ecoflow_cloud/devices/public/powerstream.py
@@ -5,14 +5,16 @@
 from ...number import MinBatteryLevelEntity, MaxBatteryLevelEntity, BrightnessLevelEntity, DeciChargingPowerEntity
 from ...select import PowerDictSelectEntity
 from ...sensor import StatusSensorEntity, InWattsSolarSensorEntity, DecivoltSensorEntity, CentivoltSensorEntity, \
-    DeciampSensorEntity, DecicelsiusSensorEntity, MiscSensorEntity, LevelSensorEntity, DeciwattsSensorEntity, \
+    DeciampSensorEntity, CelsiusSensorEntity, DecicelsiusSensorEntity, MiscSensorEntity, LevelSensorEntity, DeciwattsSensorEntity, \
     AmpSensorEntity, RemainSensorEntity, DecihertzSensorEntity
 
 
 class PowerStream(BaseDevice):
 
     def sensors(self, client: EcoflowApiClient) -> list[BaseSensorEntity]:
         return [
+            CelsiusSensorEntity(client, self, "20_1.espTempsensor", "ESP Temperature"),
+
             InWattsSolarSensorEntity(client, self, "20_1.pv1InputWatts", "Solar 1 Watts"),
             DecivoltSensorEntity(client, self, "20_1.pv1InputVolt", "Solar 1 Input Potential"),
             CentivoltSensorEntity(client, self, "20_1.pv1OpVolt", "Solar 1 Op Potential"),

diff --git a/custom_components/ecoflow_cloud/sensor.py b/custom_components/ecoflow_cloud/sensor.py
@@ -107,6 +107,9 @@ class TempSensorEntity(BaseSensorEntity):
     _attr_state_class = SensorStateClass.MEASUREMENT
     _attr_native_value = -1
 
+class CelsiusSensorEntity(TempSensorEntity):
+    def _update_value(self, val: Any) -> bool:
+        return super()._update_value(int(val))
 
 class DecicelsiusSensorEntity(TempSensorEntity):
     def _update_value(self, val: Any) -> bool:

diff --git a/custom_components/ecoflow_cloud/translations/uk_UA.json b/custom_components/ecoflow_cloud/translations/uk_UA.json
@@ -0,0 +1,76 @@
+{
+  "title": "EcoFlow-Cloud",
+  "config": {
+    "step": {
+      "user": {
+        "data": {
+          "group": "Група пристроїв"
+        }
+      },
+      "api": {
+        "menu_options": {
+          "api_add_device": "Додати пристрій",
+          "remove_device": "Видалити пристрій",
+          "finish": "Завершити"
+        },
+        "data": {
+          "access_key": "Access key",
+          "secret_key": "Secret key",
+          "load_all_devices": "Автоматичне завантаження пристроїв"
+        }
+      },
+      "choose_type": {
+         "menu_options": {
+          "api": "Використовувати public API",
+          "manual": "Використовувати application API"
+        }
+      },
+      "select_device": {
+        "data": {
+          "select_device": "Вибрати пристрій"
+        }
+      },
+      "confirm_cloud_device": {
+        "data": {
+          "device_type": "Тип пристрою",
+          "device_name": "Назва пристрою",
+          "device_id": "SN пристрою"
+        }
+      },
+      "manual": {
+        "menu_options": {
+          "manual_add_device": "Додати пристрій",
+          "remove_device": "Видалити пристрій",
+          "finish": "Завершити"
+        },
+        "data": {
+          "username": "Email користувача",
+          "password": "Password користувача"
+        }
+      },
+      "manual_device_input": {
+        "data": {
+          "device_type": "Тип пристрою",
+          "device_name": "Назва пристрою",
+          "device_id": "SN пристрою"
+        }
+      }
+    }
+  },
+  "options": {
+    "step": {
+      "init": {
+        "data": {
+          "select_device": "Вибрати пристрій"
+        }
+      },
+      "options": {
+        "data": {
+          "power_step": "Крок регулятора потужності заряджання",
+          "refresh_period_sec": "Період оновлення даних (сек)",
+          "diagnostic_mode": "Діагностичний режим"
+        }
+      }
+    }
+  }
+}