Merge pull request #527 from athombv/master

Merge master into production (#patch)
athombv · Jan 20, 2025 · 3536298 · 3536298
2 parents da38b43 + 44d8172
commit 3536298
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/assets/capability/capabilities/measure_power.json b/assets/capability/capabilities/measure_power.json
@@ -12,7 +12,7 @@
     "da": "Effekt",
     "ru": "Электроэнергия",
     "pl": "Moc",
-    "ko": "전력"
+    "ko": "소비 전력"
   },
   "units": {
     "en": "W",
@@ -70,7 +70,7 @@
           "da": "Strømmen ændrede sig",
           "ru": "Электроэнергия изменена",
           "pl": "Zmiana mocy",
-          "ko": "전력이 변경되면"
+          "ko": "소비 전력이 변경되면"
         },
         "tokens": [
           {

diff --git a/generated_locales/ko.json b/generated_locales/ko.json
@@ -669,11 +669,11 @@
   "./assets/capability/capabilities/measure_pm25.json@units": "μg/m³",
   "./assets/capability/capabilities/measure_pm25.json@desc": "대기 중 미세입자 수(μg/m³)",
   "./assets/capability/capabilities/measure_pm25.json@$flow.triggers.0.title": "초미세먼지(PM2.5) 값이 변경되면",
-  "./assets/capability/capabilities/measure_power.json@title": "전력",
+  "./assets/capability/capabilities/measure_power.json@title": "소비 전력",
   "./assets/capability/capabilities/measure_power.json@units": "W",
   "./assets/capability/capabilities/measure_power.json@desc": "전력 와트(W)",
   "./assets/capability/capabilities/[email protected]": "이 플래그는 제품 자체에 전력 측정 기능이 없지만 드라이버가 에너지 사용량을 계산하는 경우에 사용돼요.",
-  "./assets/capability/capabilities/measure_power.json@$flow.triggers.0.title": "전력이 변경되면",
+  "./assets/capability/capabilities/measure_power.json@$flow.triggers.0.title": "소비 전력이 변경되면",
   "./assets/capability/capabilities/measure_pressure.json@title": "기압",
   "./assets/capability/capabilities/measure_pressure.json@units": "mbar",
   "./assets/capability/capabilities/measure_pressure.json@desc": "압력 밀리바(mbar)",

diff --git a/lib/App/index.js b/lib/App/index.js
@@ -310,7 +310,7 @@ class App {
 
           // validate battery
           if (BATTERY_CAPABILITIES.includes(capabilityId)) {
-            if (!driver.energy || !Array.isArray(driver.energy.batteries)) {
+            if ((!driver.energy || (!Array.isArray(driver.energy.batteries) && !driver.energy.homeBattery))) {
               if (levelPublish) {
                 throw new Error(`drivers.${driver.id} is missing an array 'energy.batteries' because the capability ${capabilityId} is being used.`);
               }