Skip to content

Commit 12f1615

Browse files
committed
Bug fixed related to devices without a list of registers
1 parent 97165dc commit 12f1615

2 files changed

Lines changed: 16 additions & 12 deletions

File tree

pyswap/swap/SwapServer.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -246,15 +246,17 @@ def _checkMote(self, mote):
246246
if self._eventHandler.newMoteDetected is not None:
247247
self._eventHandler.newMoteDetected(mote)
248248
# Notify the event handler about the discovery of new endpoints
249-
for reg in mote.regular_registers:
250-
for endp in reg.parameters:
251-
if self._eventHandler.newEndpointDetected is not None:
252-
self._eventHandler.newEndpointDetected(endp)
249+
if mote.regular_registers is not None:
250+
for reg in mote.regular_registers:
251+
for endp in reg.parameters:
252+
if self._eventHandler.newEndpointDetected is not None:
253+
self._eventHandler.newEndpointDetected(endp)
253254

254255
if self._poll_regular_regs:
255256
# Query all individual registers owned by this mote
256-
for reg in mote.regular_registers:
257-
reg.sendSwapQuery()
257+
if mote.regular_registers is not None:
258+
for reg in mote.regular_registers:
259+
reg.sendSwapQuery()
258260

259261

260262
def _updateMoteAddress(self, oldAddr, newAddr):

pyswap/swap/protocol/SwapMote.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -350,13 +350,15 @@ def dumps(self, include_units=False):
350350
data["name"] = self.definition.product
351351
data["address"] = self.address
352352
data["txinterval"] = self.txinterval
353-
353+
354354
regs = []
355-
try:
356-
for reg in self.regular_registers:
357-
regs.append(reg.dumps(include_units))
358-
except SwapException:
359-
raise
355+
356+
if self.regular_registers is not None:
357+
try:
358+
for reg in self.regular_registers:
359+
regs.append(reg.dumps(include_units))
360+
except SwapException:
361+
raise
360362

361363
data["registers"] = regs
362364

0 commit comments

Comments
 (0)