Skip to content

Commit 508160e

Browse files
garbled1garbled1
authored
Merge pull request #24 from GSzabados/patch-1
Update for HA version 115 and fixing typos and adding WH25BATT and WH80BATT
2 parents 7243400 + efd3743 commit 508160e

1 file changed

Lines changed: 27 additions & 21 deletions

File tree

‎custom_components/ecowitt/__init__.py‎

Lines changed: 27 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
3030
POWER_WATT,
3131
TEMP_CELSIUS,
32-
UNIT_PERCENTAGE,
32+
PERCENTAGE,
3333
PRESSURE_HPA,
3434
PRESSURE_INHG,
3535
LENGTH_INCHES,
@@ -149,6 +149,8 @@
149149
TYPE_WH26BATT = "wh26batt"
150150
TYPE_WH65BATT = "wh65batt"
151151
TYPE_WH57BATT = "wh57batt"
152+
TYPE_WH25BATT = "wh25batt"
153+
TYPE_WH80BATT = "wh80batt"
152154
TYPE_SOILBATT1 = "soilbatt1"
153155
TYPE_SOILBATT2 = "soilbatt2"
154156
TYPE_SOILBATT3 = "soilbatt3"
@@ -228,34 +230,34 @@
228230
TYPE_SENSOR, None, "mdi:water", S_METRIC),
229231
TYPE_YEARLYRAINMM: ("Yearly Rain Rate", f"mm/{TIME_YEARS}",
230232
TYPE_SENSOR, None, "mdi:water", S_METRIC),
231-
TYPE_HUMIDITY: ("Humidity", UNIT_PERCENTAGE,
233+
TYPE_HUMIDITY: ("Humidity", PERCENTAGE,
232234
TYPE_SENSOR, DEVICE_CLASS_HUMIDITY,
233235
"mdi:water-percent", 0),
234-
TYPE_HUMIDITYIN: ("Indoor Humidity", UNIT_PERCENTAGE,
236+
TYPE_HUMIDITYIN: ("Indoor Humidity", PERCENTAGE,
235237
TYPE_SENSOR, DEVICE_CLASS_HUMIDITY,
236238
"mdi:water-percent", 0),
237-
TYPE_HUMIDITY1: ("Humidity 1", UNIT_PERCENTAGE,
239+
TYPE_HUMIDITY1: ("Humidity 1", PERCENTAGE,
238240
TYPE_SENSOR, DEVICE_CLASS_HUMIDITY,
239241
"mdi:water-percent", 0),
240-
TYPE_HUMIDITY2: ("Humidity 2", UNIT_PERCENTAGE,
242+
TYPE_HUMIDITY2: ("Humidity 2", PERCENTAGE,
241243
TYPE_SENSOR, DEVICE_CLASS_HUMIDITY,
242244
"mdi:water-percent", 0),
243-
TYPE_HUMIDITY3: ("Humidity 3", UNIT_PERCENTAGE,
245+
TYPE_HUMIDITY3: ("Humidity 3", PERCENTAGE,
244246
TYPE_SENSOR, DEVICE_CLASS_HUMIDITY,
245247
"mdi:water-percent", 0),
246-
TYPE_HUMIDITY4: ("Humidity 4", UNIT_PERCENTAGE,
248+
TYPE_HUMIDITY4: ("Humidity 4", PERCENTAGE,
247249
TYPE_SENSOR, DEVICE_CLASS_HUMIDITY,
248250
"mdi:water-percent", 0),
249-
TYPE_HUMIDITY5: ("Humidity 5", UNIT_PERCENTAGE,
251+
TYPE_HUMIDITY5: ("Humidity 5", PERCENTAGE,
250252
TYPE_SENSOR, DEVICE_CLASS_HUMIDITY,
251253
"mdi:water-percent", 0),
252-
TYPE_HUMIDITY6: ("Humidity 6", UNIT_PERCENTAGE,
254+
TYPE_HUMIDITY6: ("Humidity 6", PERCENTAGE,
253255
TYPE_SENSOR, DEVICE_CLASS_HUMIDITY,
254256
"mdi:water-percent", 0),
255-
TYPE_HUMIDITY7: ("Humidity 7", UNIT_PERCENTAGE,
257+
TYPE_HUMIDITY7: ("Humidity 7", PERCENTAGE,
256258
TYPE_SENSOR, DEVICE_CLASS_HUMIDITY,
257259
"mdi:water-percent", 0),
258-
TYPE_HUMIDITY8: ("Humidity 8", UNIT_PERCENTAGE,
260+
TYPE_HUMIDITY8: ("Humidity 8", PERCENTAGE,
259261
TYPE_SENSOR, DEVICE_CLASS_HUMIDITY,
260262
"mdi:water-percent", 0),
261263
TYPE_WINDDIR: ("Wind Direction", DEGREE,
@@ -277,7 +279,7 @@
277279
TYPE_SENSOR, None, "mdi:weather-windy", S_IMPERIAL),
278280
TYPE_MAXDAILYGUST: ("Max Daily Wind Gust", SPEED_MILES_PER_HOUR,
279281
TYPE_SENSOR, None, "mdi:weather-windy", S_IMPERIAL),
280-
TYPE_MAXDAILYGUSTKMH: ("Max Daily Wind Gust", SPEED_MILES_PER_HOUR,
282+
TYPE_MAXDAILYGUSTKMH: ("Max Daily Wind Gust", SPEED_KILOMETERS_PER_HOUR,
281283
TYPE_SENSOR, None, "mdi:weather-windy", S_METRIC),
282284
TYPE_TEMPC: ("Outdoor Temperature", TEMP_CELSIUS,
283285
TYPE_SENSOR, DEVICE_CLASS_TEMPERATURE, "mdi:thermometer", 0),
@@ -338,28 +340,28 @@
338340
"mdi:weather-sunny", 0),
339341
TYPE_UV: ("UV Index", UV_INDEX,
340342
TYPE_SENSOR, None, "mdi:sunglasses", 0),
341-
TYPE_SOILMOISTURE1: ("Soil Moisture 1", UNIT_PERCENTAGE,
343+
TYPE_SOILMOISTURE1: ("Soil Moisture 1", PERCENTAGE,
342344
TYPE_SENSOR, DEVICE_CLASS_HUMIDITY,
343345
"mdi:water-percent", 0),
344-
TYPE_SOILMOISTURE2: ("Soil Moisture 2", UNIT_PERCENTAGE,
346+
TYPE_SOILMOISTURE2: ("Soil Moisture 2", PERCENTAGE,
345347
TYPE_SENSOR, DEVICE_CLASS_HUMIDITY,
346348
"mdi:water-percent", 0),
347-
TYPE_SOILMOISTURE3: ("Soil Moisture 3", UNIT_PERCENTAGE,
349+
TYPE_SOILMOISTURE3: ("Soil Moisture 3", PERCENTAGE,
348350
TYPE_SENSOR, DEVICE_CLASS_HUMIDITY,
349351
"mdi:water-percent", 0),
350-
TYPE_SOILMOISTURE4: ("Soil Moisture 4", UNIT_PERCENTAGE,
352+
TYPE_SOILMOISTURE4: ("Soil Moisture 4", PERCENTAGE,
351353
TYPE_SENSOR, DEVICE_CLASS_HUMIDITY,
352354
"mdi:water-percent", 0),
353-
TYPE_SOILMOISTURE5: ("Soil Moisture 5", UNIT_PERCENTAGE,
355+
TYPE_SOILMOISTURE5: ("Soil Moisture 5", PERCENTAGE,
354356
TYPE_SENSOR, DEVICE_CLASS_HUMIDITY,
355357
"mdi:water-percent", 0),
356-
TYPE_SOILMOISTURE6: ("Soil Moisture 6", UNIT_PERCENTAGE,
358+
TYPE_SOILMOISTURE6: ("Soil Moisture 6", PERCENTAGE,
357359
TYPE_SENSOR, DEVICE_CLASS_HUMIDITY,
358360
"mdi:water-percent", 0),
359-
TYPE_SOILMOISTURE7: ("Soil Moisture 7", UNIT_PERCENTAGE,
361+
TYPE_SOILMOISTURE7: ("Soil Moisture 7", PERCENTAGE,
360362
TYPE_SENSOR, DEVICE_CLASS_HUMIDITY,
361363
"mdi:water-percent", 0),
362-
TYPE_SOILMOISTURE8: ("Soil Moisture 8", UNIT_PERCENTAGE,
364+
TYPE_SOILMOISTURE8: ("Soil Moisture 8", PERCENTAGE,
363365
TYPE_SENSOR, DEVICE_CLASS_HUMIDITY,
364366
"mdi:water-percent", 0),
365367
TYPE_PM25_CH1: ("PM2.5 1", CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
@@ -392,6 +394,10 @@
392394
None, "mdi:battery", 0),
393395
TYPE_WH57BATT: ("WH57 Battery", "BATT", TYPE_SENSOR,
394396
None, "mdi:battery", 0),
397+
TYPE_WH25BATT: ("WH25 Battery", "BATT", TYPE_SENSOR,
398+
None, "mdi:battery", 0),
399+
TYPE_WH80BATT: ("WH80 Battery", "BATT", TYPE_SENSOR,
400+
None, "mdi:battery", 0),
395401
TYPE_SOILBATT1: ("Soil Moisture 1 Battery", "BATT", TYPE_SENSOR,
396402
None, "mdi:battery", 0),
397403
TYPE_SOILBATT2: ("Soil Moisture 2 Battery", "BATT", TYPE_SENSOR,
@@ -456,7 +462,7 @@
456462
'dateutc',
457463
'windgustms',
458464
'windspeedms',
459-
'windspdms_avg10m'
465+
'windspdms_avg10m',
460466
'maxdailygustms',
461467
'windchillf',
462468
'dewpointf',

0 commit comments

Comments
 (0)