File tree 2 files changed +17
-6
lines changed
2 files changed +17
-6
lines changed Original file line number Diff line number Diff line change @@ -238,19 +238,20 @@ class Advertisement:
238
238
239
239
def __init__ (self , * , entry = None ):
240
240
"""Create an empty advertising packet or one from a ScanEntry."""
241
- self .data_dict = {}
242
- self .address = None
243
- self ._rssi = None
244
- self .connectable = False
245
- self .mutable = True
246
- self .scan_response = False
247
241
if entry :
248
242
self .data_dict = decode_data (entry .advertisement_bytes )
249
243
self .address = entry .address
250
244
self ._rssi = entry .rssi # pylint: disable=protected-access
251
245
self .connectable = entry .connectable
252
246
self .scan_response = entry .scan_response
253
247
self .mutable = False
248
+ else :
249
+ self .data_dict = {}
250
+ self .address = None
251
+ self ._rssi = None
252
+ self .connectable = False
253
+ self .mutable = True
254
+ self .scan_response = False
254
255
255
256
@property
256
257
def rssi (self ):
Original file line number Diff line number Diff line change @@ -161,6 +161,11 @@ class ProvideServicesAdvertisement(Advertisement):
161
161
162
162
def __init__ (self , * services , entry = None ):
163
163
super ().__init__ (entry = entry )
164
+ if entry :
165
+ if services :
166
+ raise ValueError ("Supply services or entry, not both" )
167
+ # Attributes are supplied by entry.
168
+ return
164
169
if services :
165
170
self .services .extend (services )
166
171
self .connectable = True
@@ -186,6 +191,11 @@ class SolicitServicesAdvertisement(Advertisement):
186
191
187
192
def __init__ (self , * services , entry = None ):
188
193
super ().__init__ (entry = entry )
194
+ if entry :
195
+ if services :
196
+ raise ValueError ("Supply services or entry, not both" )
197
+ # Attributes are supplied by entry.
198
+ return
189
199
self .solicited_services .extend (services )
190
200
self .connectable = True
191
201
self .flags .general_discovery = True
You can’t perform that action at this time.
0 commit comments