ExternalVendorCode/OpenMTC
1
0
Fork 0
mirror of https://github.com/OpenMTC/OpenMTC.git synced 2025-06-01 06:30:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

adds logging and correct handling of actuators in sim mode for cul868ipe

Browse Source
This commit is contained in:
Christian Klopp 2018-06-12 14:25:56 +02:00
parent e71dfd15e8
commit 54593be26c
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ipes/CUL868IPE/src/cul868ipe/cul_868_coordinator.py
View File

@ -25,7 +25,7 @@ class CUL868Coordinator(LoggerMixin):
PROTOCOL_FS20 = "F"
PROTOCOL_HMS = "H"
def __init__(self, device="/dev/ttyACM1"):
def __init__(self, device="/dev/ttyACM1", sim=True):
super(CUL868Coordinator, self).__init__()
self.running = False
self.device = device
@ -37,6 +37,7 @@ class CUL868Coordinator(LoggerMixin):
"H": HMSParser()
}
self.sim = sim
self.sim_parsers = {
"K": SIMParser(),
# "E": SIMParser(),
@ -140,10 +141,16 @@ class CUL868Coordinator(LoggerMixin):
self.logger.debug("Command sent")
def switch_on(self, house_code, device_code):
self._send_fs20(house_code, device_code, self.COMMAND_ON)
self.logger.info("Switch on %s-%s" % (house_code, device_code))
if not self.sim:
self._send_fs20(house_code, device_code, self.COMMAND_ON)
def switch_off(self, house_code, device_code):
self._send_fs20(house_code, device_code, self.COMMAND_OFF)
self.logger.info("Switch off %s-%s" % (house_code, device_code))
if not self.sim:
self._send_fs20(house_code, device_code, self.COMMAND_OFF)
def toggle(self, house_code, device_code):
self._send_fs20(house_code, device_code, self.COMMAND_TOGGLE)
self.logger.info("Toggle %s-%s" % (house_code, device_code))
if not self.sim:
self._send_fs20(house_code, device_code, self.COMMAND_TOGGLE)

2
ipes/CUL868IPE/src/cul868ipe/cul_868_ipe.py
View File

@ -42,7 +42,7 @@ class CUL868IPE(XAE):
self._old_fs20_values = {}
self.cul = CUL868Coordinator(device=device)
self.cul = CUL868Coordinator(device=device, sim=sim)
for d in map(lambda s: CULDevice(*s.split(":")[:2]), cul_devices):
if d.type == "fs20":