Skip to content

Commit 3e90c6f

Browse files
Ernst79Ernst79
committed
add native to unit of measurement
1 parent 5a38ef5 commit 3e90c6f

File tree

4 files changed

+46
-46
lines changed

4 files changed

+46
-46
lines changed

‎custom_components/ble_monitor/const.py

+33-33
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ class BLEMonitorBinarySensorEntityDescription(
210210
sensor_class="TemperatureSensor",
211211
name="ble temperature",
212212
unique_id="t_",
213-
unit_of_measurement=TEMP_CELSIUS,
213+
native_unit_of_measurement=TEMP_CELSIUS,
214214
device_class=DEVICE_CLASS_TEMPERATURE,
215215
state_class=STATE_CLASS_MEASUREMENT,
216216
),
@@ -219,7 +219,7 @@ class BLEMonitorBinarySensorEntityDescription(
219219
sensor_class="TemperatureSensor",
220220
name="ble temperature outdoor",
221221
unique_id="t_outdoor_",
222-
unit_of_measurement=TEMP_CELSIUS,
222+
native_unit_of_measurement=TEMP_CELSIUS,
223223
device_class=DEVICE_CLASS_TEMPERATURE,
224224
state_class=STATE_CLASS_MEASUREMENT,
225225
),
@@ -228,7 +228,7 @@ class BLEMonitorBinarySensorEntityDescription(
228228
sensor_class="HumiditySensor",
229229
name="ble humidity",
230230
unique_id="h_",
231-
unit_of_measurement=PERCENTAGE,
231+
native_unit_of_measurement=PERCENTAGE,
232232
device_class=DEVICE_CLASS_HUMIDITY,
233233
state_class=STATE_CLASS_MEASUREMENT,
234234
),
@@ -237,7 +237,7 @@ class BLEMonitorBinarySensorEntityDescription(
237237
sensor_class="HumiditySensor",
238238
name="ble temperature outdoor",
239239
unique_id="h_outdoor_",
240-
unit_of_measurement=PERCENTAGE,
240+
native_unit_of_measurement=PERCENTAGE,
241241
device_class=DEVICE_CLASS_HUMIDITY,
242242
state_class=STATE_CLASS_MEASUREMENT,
243243
),
@@ -246,7 +246,7 @@ class BLEMonitorBinarySensorEntityDescription(
246246
sensor_class="MeasuringSensor",
247247
name="ble moisture",
248248
unique_id="m_",
249-
unit_of_measurement=PERCENTAGE,
249+
native_unit_of_measurement=PERCENTAGE,
250250
device_class=DEVICE_CLASS_HUMIDITY,
251251
state_class=STATE_CLASS_MEASUREMENT,
252252
),
@@ -255,7 +255,7 @@ class BLEMonitorBinarySensorEntityDescription(
255255
sensor_class="MeasuringSensor",
256256
name="ble pressure",
257257
unique_id="p_",
258-
unit_of_measurement=PRESSURE_HPA,
258+
native_unit_of_measurement=PRESSURE_HPA,
259259
device_class=DEVICE_CLASS_PRESSURE,
260260
state_class=STATE_CLASS_MEASUREMENT,
261261
),
@@ -265,7 +265,7 @@ class BLEMonitorBinarySensorEntityDescription(
265265
name="ble conductivity",
266266
unique_id="c_",
267267
icon="mdi:flash-circle",
268-
unit_of_measurement=CONDUCTIVITY,
268+
native_unit_of_measurement=CONDUCTIVITY,
269269
device_class=None,
270270
state_class=STATE_CLASS_MEASUREMENT,
271271
),
@@ -275,7 +275,7 @@ class BLEMonitorBinarySensorEntityDescription(
275275
name="ble illuminance",
276276
unique_id="l_",
277277
device_class=DEVICE_CLASS_ILLUMINANCE,
278-
unit_of_measurement=LIGHT_LUX,
278+
native_unit_of_measurement=LIGHT_LUX,
279279
state_class=STATE_CLASS_MEASUREMENT,
280280
),
281281
BLEMonitorSensorEntityDescription(
@@ -284,7 +284,7 @@ class BLEMonitorBinarySensorEntityDescription(
284284
name="ble formaldehyde",
285285
unique_id="f_",
286286
icon="mdi:chemical-weapon",
287-
unit_of_measurement=CONCENTRATION_MILLIGRAMS_PER_CUBIC_METER,
287+
native_unit_of_measurement=CONCENTRATION_MILLIGRAMS_PER_CUBIC_METER,
288288
device_class=None,
289289
state_class=STATE_CLASS_MEASUREMENT,
290290
),
@@ -293,7 +293,7 @@ class BLEMonitorBinarySensorEntityDescription(
293293
sensor_class="MeasuringSensor",
294294
name="ble voltage",
295295
unique_id="v_",
296-
unit_of_measurement=ELECTRIC_POTENTIAL_VOLT,
296+
native_unit_of_measurement=ELECTRIC_POTENTIAL_VOLT,
297297
device_class=DEVICE_CLASS_VOLTAGE,
298298
state_class=STATE_CLASS_MEASUREMENT,
299299
),
@@ -302,7 +302,7 @@ class BLEMonitorBinarySensorEntityDescription(
302302
sensor_class="BatterySensor",
303303
name="ble battery",
304304
unique_id="batt_",
305-
unit_of_measurement=PERCENTAGE,
305+
native_unit_of_measurement=PERCENTAGE,
306306
device_class=DEVICE_CLASS_BATTERY,
307307
state_class=STATE_CLASS_MEASUREMENT,
308308
),
@@ -312,7 +312,7 @@ class BLEMonitorBinarySensorEntityDescription(
312312
name="ble consumable",
313313
unique_id="cn_",
314314
icon="mdi:recycle-variant",
315-
unit_of_measurement=PERCENTAGE,
315+
native_unit_of_measurement=PERCENTAGE,
316316
device_class=None,
317317
state_class=STATE_CLASS_MEASUREMENT,
318318
),
@@ -322,7 +322,7 @@ class BLEMonitorBinarySensorEntityDescription(
322322
name="ble acceleration",
323323
unique_id="ac_",
324324
icon="mdi:axis-arrow",
325-
unit_of_measurement="mG",
325+
native_unit_of_measurement="mG",
326326
device_class=None,
327327
state_class=STATE_CLASS_MEASUREMENT,
328328
),
@@ -332,7 +332,7 @@ class BLEMonitorBinarySensorEntityDescription(
332332
name="ble toothbrush mode",
333333
unique_id="to_",
334334
icon="mdi:toothbrush-electric",
335-
unit_of_measurement=None,
335+
native_unit_of_measurement=None,
336336
device_class=None,
337337
state_class=None,
338338
),
@@ -342,7 +342,7 @@ class BLEMonitorBinarySensorEntityDescription(
342342
name="ble weight",
343343
unique_id="w_",
344344
icon="mdi:scale-bathroom",
345-
unit_of_measurement=MASS_KILOGRAMS,
345+
native_unit_of_measurement=MASS_KILOGRAMS,
346346
device_class=None,
347347
state_class=STATE_CLASS_MEASUREMENT,
348348
),
@@ -352,7 +352,7 @@ class BLEMonitorBinarySensorEntityDescription(
352352
name="ble non-stabilized weight",
353353
unique_id="nw_",
354354
icon="mdi:scale-bathroom",
355-
unit_of_measurement=MASS_KILOGRAMS,
355+
native_unit_of_measurement=MASS_KILOGRAMS,
356356
device_class=None,
357357
state_class=STATE_CLASS_MEASUREMENT,
358358
),
@@ -362,7 +362,7 @@ class BLEMonitorBinarySensorEntityDescription(
362362
name="ble impedance",
363363
unique_id="im_",
364364
icon="mdi:omega",
365-
unit_of_measurement="Ohm",
365+
native_unit_of_measurement="Ohm",
366366
device_class=None,
367367
state_class=STATE_CLASS_MEASUREMENT,
368368
),
@@ -371,7 +371,7 @@ class BLEMonitorBinarySensorEntityDescription(
371371
sensor_class="EnergySensor",
372372
name="ble energy",
373373
unique_id="e_",
374-
unit_of_measurement=ENERGY_KILO_WATT_HOUR,
374+
native_unit_of_measurement=ENERGY_KILO_WATT_HOUR,
375375
device_class=DEVICE_CLASS_ENERGY,
376376
state_class=STATE_CLASS_MEASUREMENT,
377377
),
@@ -380,7 +380,7 @@ class BLEMonitorBinarySensorEntityDescription(
380380
sensor_class="PowerSensor",
381381
name="ble power",
382382
unique_id="pow_",
383-
unit_of_measurement=POWER_KILO_WATT,
383+
native_unit_of_measurement=POWER_KILO_WATT,
384384
device_class=DEVICE_CLASS_POWER,
385385
state_class=STATE_CLASS_MEASUREMENT,
386386
),
@@ -390,7 +390,7 @@ class BLEMonitorBinarySensorEntityDescription(
390390
name="ble button",
391391
unique_id="bu_",
392392
icon="mdi:gesture-tap-button",
393-
unit_of_measurement=None,
393+
native_unit_of_measurement=None,
394394
device_class=None,
395395
state_class=None,
396396
),
@@ -400,7 +400,7 @@ class BLEMonitorBinarySensorEntityDescription(
400400
name="ble dimmer",
401401
unique_id="di_",
402402
icon="mdi:rotate-right",
403-
unit_of_measurement=None,
403+
native_unit_of_measurement=None,
404404
device_class=None,
405405
state_class=None,
406406
),
@@ -410,7 +410,7 @@ class BLEMonitorBinarySensorEntityDescription(
410410
name="ble one button switch",
411411
unique_id="switch_",
412412
icon="mdi:gesture-tap-button",
413-
unit_of_measurement=None,
413+
native_unit_of_measurement=None,
414414
device_class=None,
415415
state_class=None,
416416
),
@@ -420,7 +420,7 @@ class BLEMonitorBinarySensorEntityDescription(
420420
name="ble two button switch left",
421421
unique_id="left_switch_",
422422
icon="mdi:gesture-tap-button",
423-
unit_of_measurement=None,
423+
native_unit_of_measurement=None,
424424
device_class=None,
425425
state_class=None,
426426
),
@@ -430,7 +430,7 @@ class BLEMonitorBinarySensorEntityDescription(
430430
name="ble two button switch right",
431431
unique_id="right_switch_",
432432
icon="mdi:gesture-tap-button",
433-
unit_of_measurement=None,
433+
native_unit_of_measurement=None,
434434
device_class=None,
435435
state_class=None,
436436
),
@@ -440,7 +440,7 @@ class BLEMonitorBinarySensorEntityDescription(
440440
name="ble three button switch left",
441441
unique_id="left_switch_",
442442
icon="mdi:gesture-tap-button",
443-
unit_of_measurement=None,
443+
native_unit_of_measurement=None,
444444
device_class=None,
445445
state_class=None,
446446
),
@@ -450,7 +450,7 @@ class BLEMonitorBinarySensorEntityDescription(
450450
name="ble three button switch middle",
451451
unique_id="middle_switch_",
452452
icon="mdi:gesture-tap-button",
453-
unit_of_measurement=None,
453+
native_unit_of_measurement=None,
454454
device_class=None,
455455
state_class=None,
456456
),
@@ -460,7 +460,7 @@ class BLEMonitorBinarySensorEntityDescription(
460460
name="ble three button switch right",
461461
unique_id="right_switch_",
462462
icon="mdi:gesture-tap-button",
463-
unit_of_measurement=None,
463+
native_unit_of_measurement=None,
464464
device_class=None,
465465
state_class=None,
466466
),
@@ -470,7 +470,7 @@ class BLEMonitorBinarySensorEntityDescription(
470470
name="ble remote",
471471
unique_id="re_",
472472
icon="mdi:remote",
473-
unit_of_measurement=None,
473+
native_unit_of_measurement=None,
474474
device_class=None,
475475
state_class=None,
476476
),
@@ -480,7 +480,7 @@ class BLEMonitorBinarySensorEntityDescription(
480480
name="ble fan remote",
481481
unique_id="fa_",
482482
icon="mdi:remote",
483-
unit_of_measurement=None,
483+
native_unit_of_measurement=None,
484484
device_class=None,
485485
state_class=None,
486486
),
@@ -490,7 +490,7 @@ class BLEMonitorBinarySensorEntityDescription(
490490
name="ble ventilator fan remote",
491491
unique_id="fr_",
492492
icon="mdi:remote",
493-
unit_of_measurement=None,
493+
native_unit_of_measurement=None,
494494
device_class=None,
495495
state_class=None,
496496
),
@@ -500,7 +500,7 @@ class BLEMonitorBinarySensorEntityDescription(
500500
name="ble bathroom heater remote",
501501
unique_id="bh_",
502502
icon="mdi:remote",
503-
unit_of_measurement=None,
503+
native_unit_of_measurement=None,
504504
device_class=None,
505505
state_class=None,
506506
),
@@ -510,7 +510,7 @@ class BLEMonitorBinarySensorEntityDescription(
510510
name="ble volume dispensed port 1",
511511
unique_id="vd1_",
512512
icon="mdi:keg",
513-
unit_of_measurement=VOLUME_LITERS,
513+
native_unit_of_measurement=VOLUME_LITERS,
514514
device_class=None,
515515
state_class=STATE_CLASS_MEASUREMENT,
516516
),
@@ -520,7 +520,7 @@ class BLEMonitorBinarySensorEntityDescription(
520520
name="ble volume dispensed port 2",
521521
unique_id="vd2_",
522522
icon="mdi:keg",
523-
unit_of_measurement=VOLUME_LITERS,
523+
native_unit_of_measurement=VOLUME_LITERS,
524524
device_class=None,
525525
state_class=STATE_CLASS_MEASUREMENT,
526526
),

‎custom_components/ble_monitor/manifest.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111
],
1212
"dependencies": [],
1313
"codeowners": ["@Ernst79", "@Magalex2x14", "@Thrilleratplay"],
14-
"version": "5.1.2-beta",
14+
"version": "5.1.3",
1515
"iot_class": "local_polling"
1616
}

‎custom_components/ble_monitor/sensor.py

+11-11
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ async def async_added_to_hass(self):
337337
self.ready_for_update = True
338338
return
339339
try:
340-
self._attr_unit_of_measurement = old_state.unit_of_measurement
340+
self._attr_native_unit_of_measurement = old_state.unit_of_measurement
341341
except AttributeError:
342342
pass
343343
self._state = old_state.state
@@ -388,7 +388,7 @@ async def async_added_to_hass(self):
388388
self.ready_for_update = True
389389

390390
@property
391-
def state(self):
391+
def native_value(self):
392392
"""Return the state of the sensor."""
393393
return self._state
394394

@@ -537,7 +537,7 @@ class TemperatureSensor(MeasuringSensor):
537537
def __init__(self, config, mac, devtype, firmware, description):
538538
"""Initialize the sensor."""
539539
super().__init__(config, mac, devtype, firmware, description)
540-
self._attr_unit_of_measurement = self._device_settings["temperature unit"]
540+
self._attr_native_unit_of_measurement = self._device_settings["temperature unit"]
541541

542542
self._temp_min = CONF_TMIN_KETTLES if devtype in KETTLES else CONF_TMIN
543543
self._temp_max = CONF_TMAX_KETTLES if devtype in KETTLES else CONF_TMAX
@@ -722,9 +722,9 @@ def collect(self, data, batt_attr=None):
722722
data["weight removed"]
723723
)
724724
if "weight unit" in data:
725-
self._attr_unit_of_measurement = data["weight unit"]
725+
self._attr_native_unit_of_measurement = data["weight unit"]
726726
else:
727-
self._attr_unit_of_measurement = None
727+
self._attr_native_unit_of_measurement = None
728728
if batt_attr is not None:
729729
self._extra_state_attributes[ATTR_BATTERY_LEVEL] = batt_attr
730730
self.pending_update = True
@@ -748,10 +748,10 @@ def collect(self, data, batt_attr=None):
748748
self._extra_state_attributes["last packet id"] = data["packet"]
749749
self._extra_state_attributes["firmware"] = data["firmware"]
750750
if "energy unit" in data:
751-
self._attr_unit_of_measurement = data["energy unit"]
751+
self._attr_native_unit_of_measurement = data["energy unit"]
752752
else:
753-
self._attr_unit_of_measurement = (
754-
self.entity_description.unit_of_measurement
753+
self._attr_native_unit_of_measurement = (
754+
self.entity_description.native_unit_of_measurement
755755
)
756756
if "constant" in data:
757757
self._extra_state_attributes["constant"] = data["constant"]
@@ -780,10 +780,10 @@ def collect(self, data, batt_attr=None):
780780
self._extra_state_attributes["last packet id"] = data["packet"]
781781
self._extra_state_attributes["firmware"] = data["firmware"]
782782
if "power unit" in data:
783-
self._attr_unit_of_measurement = data["power unit"]
783+
self._attr_native_unit_of_measurement = data["power unit"]
784784
else:
785-
self._attr_unit_of_measurement = (
786-
self.entity_description.unit_of_measurement
785+
self._attr_native_unit_of_measurement = (
786+
self.entity_description.native_unit_of_measurement
787787
)
788788
if "constant" in data:
789789
self._extra_state_attributes["constant"] = data["constant"]

‎hacs.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
"name": "Passive BLE monitor integration (Xiaomi MiBeacon and Scale, Qingping, ATC, Kegtron and Thermoplus sensors)",
33
"domains": "ble_monitor",
44
"iot_class": "local push",
5-
"homeassistant": "2021.8.0"
5+
"homeassistant": "2021.9.0"
66
}

0 commit comments

Comments
 (0)