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

fixed wrong calculation of read pwm frequency

Browse Source 
some more error handling
This commit is contained in:
Giovanni Harting
2015-11-14 14:35:42 +01:00
parent db379ccdf0
commit 7d6d289178
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ledd/controller.py
View File

@@ -117,7 +117,7 @@ class Controller(Base):
@property @property
def pwm_freq(self): def pwm_freq(self):
self._pwm_freq = (self.bus.read_byte_data(self._address, PCA9685_PRESCALE) + 1) / 4096 * 25000000 self._pwm_freq = round(390625 / ((self.bus.read_byte_data(self._address, PCA9685_PRESCALE) + 1) * 64))
return self._pwm_freq return self._pwm_freq
@pwm_freq.setter @pwm_freq.setter

18
ledd/daemon.py
View File

@@ -207,6 +207,7 @@ def set_color(**kwargs):
stripe.set_color(spectra.hsv(kwargs['hsv']['h'], kwargs['hsv']['s'], kwargs['hsv']['v'])) stripe.set_color(spectra.hsv(kwargs['hsv']['h'], kwargs['hsv']['s'], kwargs['hsv']['v']))
except OSError as e: except OSError as e:
if int(e) == errno.ECOMM: if int(e) == errno.ECOMM:
log.warning("Communication error on I2C Bus")
return e return e
else: else:
raise raise
@@ -252,7 +253,7 @@ def add_controller(**kwargs):
try: try:
ncontroller = Controller(channels=int(kwargs['channels']), i2c_device=int(kwargs['i2c_dev']), ncontroller = Controller(channels=int(kwargs['channels']), i2c_device=int(kwargs['i2c_dev']),
address=kwargs['address'], pwm_freq=1526) address=kwargs['address'], _pwm_freq=1526)
except OSError as e: except OSError as e:
log.error("Error opening i2c device: %s (%s)", kwargs['i2c_dev'], e) log.error("Error opening i2c device: %s (%s)", kwargs['i2c_dev'], e)
return JSONRPCError(-1004, "Error while opening i2c device", e) return JSONRPCError(-1004, "Error while opening i2c device", e)
@@ -346,7 +347,10 @@ def test_channel(**kwargs):
""" :type : ledd.controller.Controller """ """ :type : ledd.controller.Controller """
if contr is not None: if contr is not None:
contr.set_channel(kwargs['channel'], kwargs['value'], 2.8) try:
contr.set_channel(kwargs['channel'], kwargs['value'], 2.8)
except OSError as e:
return JSONRPCError(-1009, "Internal Error", e)
else: else:
return JSONRPCError(-1002, "Controller not found") return JSONRPCError(-1002, "Controller not found")
@@ -388,17 +392,17 @@ 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:
data_split = data.splitlines() data_split = data.splitlines()
for line in data_split: for line in data_split:
if line: if line:
self.transport.write(JSONRPCResponseManager.handle(line, dispatcher).json.encode()) try:
self.transport.write(JSONRPCResponseManager.handle(line, dispatcher).json.encode())
except TypeError as te:
log.warning("Can't send response: %s", te)
def connection_lost(self, exc): def connection_lost(self, exc):
log.info("Lost connection to %s", self.transport.get_extra_info("peername")) log.info("Lost connection to %s", self.transport.get_extra_info("peername"))