5
5
6
6
from .const import (CONF_DATA , CONF_FIRMWARE , CONF_MAC , CONF_MAJOR ,
7
7
CONF_MANUFACTURER , CONF_MEASURED_POWER , CONF_MINOR ,
8
- CONF_PACKET , CONF_RSSI , CONF_TRACKER_ID , CONF_TYPE ,
9
- CONF_UUID , DEFAULT_MANUFACTURER , MANUFACTURER_DICT )
8
+ CONF_PACKET , CONF_TRACKER_ID , CONF_TYPE , CONF_UUID ,
9
+ DEFAULT_MANUFACTURER , MANUFACTURER_DICT )
10
10
from .helpers import to_mac , to_unformatted_mac , to_uuid
11
11
12
12
_LOGGER = logging .getLogger (__name__ )
13
13
14
14
DEVICE_TYPE : Final = "AltBeacon"
15
15
16
16
17
- def parse_altbeacon (self , data : str , comp_id : int , source_mac : str , rssi : float ):
17
+ def parse_altbeacon (self , data : str , comp_id : int , mac : str ):
18
18
"""parser for Alt Beacon"""
19
19
if len (data ) >= 27 :
20
20
uuid = data [6 :22 ]
21
21
(major , minor , power ) = unpack (">HHb" , data [22 :27 ])
22
22
23
23
tracker_data = {
24
- CONF_RSSI : rssi ,
25
- CONF_MAC : to_unformatted_mac (source_mac ),
24
+ CONF_MAC : to_unformatted_mac (mac ),
26
25
CONF_UUID : to_uuid (uuid ).replace ('-' , '' ),
27
26
CONF_TRACKER_ID : uuid ,
28
27
CONF_MAJOR : major ,
@@ -42,18 +41,11 @@ def parse_altbeacon(self, data: str, comp_id: int, source_mac: str, rssi: float)
42
41
else :
43
42
if self .report_unknown == DEVICE_TYPE :
44
43
_LOGGER .info (
45
- "BLE ADV from UNKNOWN %s DEVICE: RSSI: %s, MAC: %s, ADV: %s" ,
44
+ "BLE ADV from UNKNOWN %s DEVICE: MAC: %s, ADV: %s" ,
46
45
DEVICE_TYPE ,
47
- rssi ,
48
- to_mac (source_mac ),
46
+ to_mac (mac ),
49
47
data .hex ()
50
48
)
51
49
return None , None
52
50
53
- # check for UUID presence in sensor whitelist, if needed
54
- if self .discovery is False and uuid and uuid not in self .sensor_whitelist :
55
- _LOGGER .debug ("Discovery is disabled. UUID: %s is not whitelisted!" , to_uuid (uuid ))
56
-
57
- return None , None
58
-
59
51
return sensor_data , tracker_data
0 commit comments