Skip to content

Commit

Permalink
Bug fixed related to devices without a list of registers
Browse files Browse the repository at this point in the history
  • Loading branch information
dberenguer committed Jun 26, 2015
1 parent 97165dc commit 12f1615
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 12 deletions.
14 changes: 8 additions & 6 deletions pyswap/swap/SwapServer.py
Original file line number Diff line number Diff line change
Expand Up @@ -246,15 +246,17 @@ def _checkMote(self, mote):
if self._eventHandler.newMoteDetected is not None:
self._eventHandler.newMoteDetected(mote)
# Notify the event handler about the discovery of new endpoints
for reg in mote.regular_registers:
for endp in reg.parameters:
if self._eventHandler.newEndpointDetected is not None:
self._eventHandler.newEndpointDetected(endp)
if mote.regular_registers is not None:
for reg in mote.regular_registers:
for endp in reg.parameters:
if self._eventHandler.newEndpointDetected is not None:
self._eventHandler.newEndpointDetected(endp)

if self._poll_regular_regs:
# Query all individual registers owned by this mote
for reg in mote.regular_registers:
reg.sendSwapQuery()
if mote.regular_registers is not None:
for reg in mote.regular_registers:
reg.sendSwapQuery()


def _updateMoteAddress(self, oldAddr, newAddr):
Expand Down
14 changes: 8 additions & 6 deletions pyswap/swap/protocol/SwapMote.py
Original file line number Diff line number Diff line change
Expand Up @@ -350,13 +350,15 @@ def dumps(self, include_units=False):
data["name"] = self.definition.product
data["address"] = self.address
data["txinterval"] = self.txinterval

regs = []
try:
for reg in self.regular_registers:
regs.append(reg.dumps(include_units))
except SwapException:
raise

if self.regular_registers is not None:
try:
for reg in self.regular_registers:
regs.append(reg.dumps(include_units))
except SwapException:
raise

data["registers"] = regs

Expand Down

0 comments on commit 12f1615

Please sign in to comment.