anonfunc/LedD
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

added some more error handling

Browse Source 
fixed pwm_freq not getting set on init
This commit is contained in:
Giovanni Harting
2015-11-13 23:41:38 +01:00
parent a65bb770fd
commit 6ae2cc4fb8
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ledd/controller.py
View File

@@ -51,25 +51,22 @@ class Controller(Base):
i2c_device = Column(Integer) i2c_device = Column(Integer)
address = Column(String) address = Column(String)
stripes = relationship("Stripe", backref="controller") stripes = relationship("Stripe", backref="controller")
pwm_freq = Column("pwm_freq", Integer) _pwm_freq = Column("pwm_freq", Integer)
""" """
A controller controls a number of stripes. A controller controls a number of stripes.
""" """
@reconstructor
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs) super().__init__(*args, **kwargs)
self._mode = None self._mode = None
self.bus = smbus.SMBus(self.i2c_device) self.bus = smbus.SMBus(self.i2c_device)
self._address = int(self.address, 16) self._address = int(self.address, 16)
self._pwm_freq = self.pwm_freq if self._pwm_freq:
self.pwm_freq = self._pwm_freq
@reconstructor else:
def init_on_load(self): self.pwm_freq = 1526
self._mode = None
self.bus = smbus.SMBus(self.i2c_device)
self._address = int(self.address, 16)
self._pwm_freq = self.pwm_freq
def __repr__(self): def __repr__(self):
return "<Controller stripes={} cid={}>".format(len(self.stripes), self.id) return "<Controller stripes={} cid={}>".format(len(self.stripes), self.id)

3
ledd/daemon.py
View File

@@ -388,7 +388,10 @@ class LedDProtocol(asyncio.Protocol):
except UnicodeDecodeError: except UnicodeDecodeError:
log.warning("Recieved undecodable data, ignoring") log.warning("Recieved undecodable data, ignoring")
else: else:
try:
self.select_task(d_decoded) self.select_task(d_decoded)
except JSONRPCError:
log.warning("Recieved non-json data, ignoring")
def select_task(self, data): def select_task(self, data):
if data: if data: