diff --git a/smarthome.py b/smarthome.py index be2703c..c9b6608 100644 --- a/smarthome.py +++ b/smarthome.py @@ -31,6 +31,12 @@ class WetationFrameProt(gui.Wetation): PROT_ID_OUT = 2 ALL_PROT_IDS = [PROT_ID_GARAGE, PROT_ID_IN, PROT_ID_OUT, ] + PROT_NAMES = { + PROT_ID_GARAGE: u'garage', + PROT_ID_IN: u'wet-in', + PROT_ID_OUT: u'wet-out', + } + PROT_IPS = { PROT_ID_GARAGE: config.server_garage_ip, PROT_ID_IN: config.server_in_ip, @@ -113,7 +119,7 @@ class WetationFrameProt(gui.Wetation): for prot_id in self.ALL_PROT_IDS: logger.debug('Initiating communication channel for prot_id %d', prot_id) c_tcp = tcp_socket.tcp_client_stp(self.PROT_IPS[prot_id], self.PROT_PORTS[prot_id], rx_log_lvl=logging.DEBUG) - self.__prot__[prot_id] = self.PROT_CLASSES[prot_id](c_tcp, secret=self.PROT_SECRETS[prot_id], auto_auth=True) + self.__prot__[prot_id] = self.PROT_CLASSES[prot_id](c_tcp, secret=self.PROT_SECRETS[prot_id], auto_auth=True, channel_name=self.PROT_NAMES[prot_id]) # self.__prot__[prot_id].register_callback(None, None, self.__prot_resp_callbacks__, prot_id) diff --git a/socket_protocol b/socket_protocol index 8a8522d..8beacae 160000 --- a/socket_protocol +++ b/socket_protocol @@ -1 +1 @@ -Subproject commit 8a8522d26b486b005f65e7e542742e898f1109e7 +Subproject commit 8beacaef2257e82852e1c0b5442ec4d09b891b7c