Restructuring including GUI reset in case of disconnects

config_example/config.py

 import task
 import tcp_socket
 
-FULL_SCRREN = False
+FULL_SCREEN = False
 
 
 # TCP-Server

gui.py

 #!/usr/bin/env python
 # -*- coding: UTF-8 -*-
 #
-# generated by wxGlade 0.9.3 on Mon Sep  7 11:55:26 2020
+# generated by wxGlade 0.9.3 on Wed Sep  9 07:31:16 2020
 #
 
 import wx
         # begin wxGlade: Wetation.__init__
         kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
         wx.Frame.__init__(self, *args, **kwds)
-        self.SetSize((800, 628))
+        self.SetSize((800, 655))
         self.date = wx.StaticText(self, wx.ID_ANY, "xx.xx.xxxx", style=wx.ALIGN_LEFT)
         self.time = wx.StaticText(self, wx.ID_ANY, "xx:xx", style=wx.ALIGN_RIGHT)
-        self.heading_out_envdata = wx.StaticText(self, wx.ID_ANY, u"Außentemperatur")
+        self.heading_out_envdata = wx.StaticText(self, wx.ID_ANY, u"Außen")
         self.out_humidity = wx.StaticText(self, wx.ID_ANY, "- %", style=wx.ALIGN_RIGHT)
-        self.out_pressure = wx.StaticText(self, wx.ID_ANY, "- mbar", style=wx.ALIGN_RIGHT)
+        self.out_pressure = wx.StaticText(self, wx.ID_ANY, "- hPa", style=wx.ALIGN_RIGHT)
         self.out_temperature_min = wx.StaticText(self, wx.ID_ANY, u"-.- °C", style=wx.ALIGN_RIGHT)
         self.out_temperature_max = wx.StaticText(self, wx.ID_ANY, u"-.- °C", style=wx.ALIGN_RIGHT)
         self.out_temperature = wx.StaticText(self, wx.ID_ANY, u"-.- °C", style=wx.ALIGN_RIGHT)
-        self.heading_in_envdata = wx.StaticText(self, wx.ID_ANY, "Innentemperatur")
+        self.heading_in_envdata = wx.StaticText(self, wx.ID_ANY, "Innen")
         self.in_humidity = wx.StaticText(self, wx.ID_ANY, "- %", style=wx.ALIGN_RIGHT)
-        self.in_pressure = wx.StaticText(self, wx.ID_ANY, "- mbar", style=wx.ALIGN_RIGHT)
+        self.in_pressure = wx.StaticText(self, wx.ID_ANY, "- hPa", style=wx.ALIGN_RIGHT)
         self.in_temperature_min = wx.StaticText(self, wx.ID_ANY, u"-.- °C", style=wx.ALIGN_RIGHT)
         self.in_temperature_max = wx.StaticText(self, wx.ID_ANY, u"-.- °C", style=wx.ALIGN_RIGHT)
         self.in_temperature = wx.StaticText(self, wx.ID_ANY, u"-.- °C", style=wx.ALIGN_RIGHT)
         self.time.SetFont(wx.Font(24, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, 0, ""))
         self.heading_out_envdata.SetBackgroundColour(wx.Colour(35, 35, 142))
         self.heading_out_envdata.SetForegroundColour(wx.Colour(250, 249, 255))
-        self.heading_out_envdata.SetFont(wx.Font(12, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, 0, ""))
+        self.heading_out_envdata.SetFont(wx.Font(16, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, 0, ""))
         self.out_humidity.SetFont(wx.Font(24, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, 0, ""))
         self.out_pressure.SetFont(wx.Font(24, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, 0, ""))
         self.out_temperature_min.SetFont(wx.Font(24, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, 0, ""))
         self.out_temperature.SetFont(wx.Font(48, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, 0, ""))
         self.heading_in_envdata.SetBackgroundColour(wx.Colour(35, 35, 142))
         self.heading_in_envdata.SetForegroundColour(wx.Colour(250, 249, 255))
-        self.heading_in_envdata.SetFont(wx.Font(12, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, 0, ""))
+        self.heading_in_envdata.SetFont(wx.Font(16, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, 0, ""))
         self.in_humidity.SetFont(wx.Font(24, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, 0, ""))
         self.in_pressure.SetFont(wx.Font(24, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, 0, ""))
         self.in_temperature_min.SetFont(wx.Font(24, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, 0, ""))
         self.in_temperature.SetFont(wx.Font(48, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, 0, ""))
         self.heading_garage.SetBackgroundColour(wx.Colour(35, 35, 142))
         self.heading_garage.SetForegroundColour(wx.Colour(250, 249, 255))
-        self.heading_garage.SetFont(wx.Font(12, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, 0, ""))
-        self.heading_garage.Hide()
-        self.gate_oc.Hide()
-        self.gate_close.Hide()
+        self.heading_garage.SetFont(wx.Font(16, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, 0, ""))
+        self.gate_oc.SetMinSize((100, 50))
         self.gate_position.Enable(False)
-        self.gate_position.Hide()
-        self.gate_open.Hide()
         # end wxGlade
 
     def __do_layout(self):

gui.wxg

 <?xml version="1.0"?>
-<!-- generated by wxGlade 0.9.3 on Mon Sep  7 11:55:31 2020 -->
+<!-- generated by wxGlade 0.9.3 on Wed Sep  9 07:31:12 2020 -->
 
 <application class="MyApp" encoding="UTF-8" for_version="3.0" header_extension=".h" indent_amount="4" indent_symbol="space" is_template="0" language="python" mark_blocks="1" name="app" option="0" overwrite="1" path="./gui.py" source_extension=".cpp" top_window="wetation" use_gettext="0" use_new_namespace="1">
     <object class="Wetation" name="wetation" base="EditFrame">
-        <size>800, 628</size>
+        <size>800, 655</size>
         <background>#faf9ff</background>
         <foreground>#23238e</foreground>
         <title>frame</title>
                     <background>#23238e</background>
                     <foreground>#faf9ff</foreground>
                     <font>
-                        <size>12</size>
+                        <size>16</size>
                         <family>default</family>
                         <style>normal</style>
                         <weight>normal</weight>
                         <underlined>0</underlined>
                         <face />
                     </font>
-                    <label>Außentemperatur</label>
+                    <label>Außen</label>
                     <attribute>1</attribute>
                 </object>
             </object>
                                         <face />
                                     </font>
                                     <style>wxALIGN_RIGHT</style>
-                                    <label>- mbar</label>
+                                    <label>- hPa</label>
                                     <attribute>1</attribute>
                                 </object>
                             </object>
                     <background>#23238e</background>
                     <foreground>#faf9ff</foreground>
                     <font>
-                        <size>12</size>
+                        <size>16</size>
                         <family>default</family>
                         <style>normal</style>
                         <weight>normal</weight>
                         <underlined>0</underlined>
                         <face />
                     </font>
-                    <label>Innentemperatur</label>
+                    <label>Innen</label>
                     <attribute>1</attribute>
                 </object>
             </object>
                                         <face />
                                     </font>
                                     <style>wxALIGN_RIGHT</style>
-                                    <label>- mbar</label>
+                                    <label>- hPa</label>
                                     <attribute>1</attribute>
                                 </object>
                             </object>
                     <background>#23238e</background>
                     <foreground>#faf9ff</foreground>
                     <font>
-                        <size>12</size>
+                        <size>16</size>
                         <family>default</family>
                         <style>normal</style>
                         <weight>normal</weight>
                         <underlined>0</underlined>
                         <face />
                     </font>
-                    <hidden>1</hidden>
                     <label>Garage</label>
                     <attribute>1</attribute>
                 </object>
                             <events>
                                 <handler event="EVT_BUTTON">gate_oc_evt</handler>
                             </events>
-                            <hidden>1</hidden>
+                            <size>100, 50</size>
                             <label>Garage</label>
                         </object>
                     </object>
                         <border>0</border>
                         <flag>wxALIGN_CENTER</flag>
                         <object class="wxStaticText" name="gate_close" base="EditStaticText">
-                            <hidden>1</hidden>
                             <label>Close</label>
                             <attribute>1</attribute>
                         </object>
                         <flag>wxEXPAND</flag>
                         <object class="wxSlider" name="gate_position" base="EditSlider">
                             <disabled>1</disabled>
-                            <hidden>1</hidden>
                             <style>wxSL_HORIZONTAL</style>
                             <range>0, 100</range>
                             <value>50</value>
                         <border>0</border>
                         <flag>wxALIGN_CENTER</flag>
                         <object class="wxStaticText" name="gate_open" base="EditStaticText">
-                            <hidden>1</hidden>
                             <label>Open</label>
                             <attribute>1</attribute>
                         </object>

smarthome.py

 # -*- coding: UTF-8 -*-
 #
 
+#TODO: Zyklischer reconnect versuch (ggf. inkl. herstellen der Schnittstelle für ein reconnect beim tcp_client)
+
 import config
 import rpi_envsens as envsens
 import garage_protocol
 
 
 class WetationFrameProt(gui.Wetation):
+    PROT_ID_GARAGE = 0
+    PROT_ID_IN = 1
+    PROT_ID_OUT = 2
+    ALL_PROT_IDS = [PROT_ID_GARAGE, PROT_ID_IN, PROT_ID_OUT]
+    
+    REQUEST_MSGS = {
+        PROT_ID_GARAGE: [
+            {
+                'service_id': garage_protocol.my_base_protocol_tcp.SID_READ_REQUEST,
+                'data_id': garage_protocol.my_base_protocol_tcp.GATE_POSITION,
+            },
+        ],
+        PROT_ID_IN: [
+            {
+                'service_id': wetation_protocol.my_base_protocol_tcp.SID_READ_REQUEST,
+                'data_id': wetation_protocol.my_base_protocol_tcp.CURRENT_ENVDATA,
+            },
+        ],
+        PROT_ID_OUT: [
+            {
+                'service_id': wetation_protocol.my_base_protocol_tcp.SID_READ_REQUEST,
+                'data_id': wetation_protocol.my_base_protocol_tcp.CURRENT_ENVDATA,
+            },
+        ],
+    }
+
+
     def __init__(self, *args, **kwds):
+        self.__prot__ = {}
+        self.no_data = {
+            self.PROT_ID_GARAGE: self.update_gate_position,
+            self.PROT_ID_IN: self.update_current_env_data_in,
+            self.PROT_ID_OUT: self.update_current_env_data_out,
+        }
         gui.Wetation.__init__(self, *args, **kwds)
+        self.ShowFullScreen(config.FULL_SCREEN)
+
+        self.__init_communication__()
         self.__task_data_request__ = task.periodic(10, self.__initiate_data_request__)
-        self.__init__communication__()
 
-    def __init__communication__(self):
+    def __init_protocol__(self, prot_id, ip, port, prot_class, secret):
+        c_tcp = tcp_socket.tcp_client_stp(ip, port, rx_log_lvl=logging.DEBUG)
+        self.__prot__[prot_id] = prot_class(c_tcp, secret)
+        if config.server_garage_secret is not None:
+            self.__prot__[prot_id].authentificate()
+
+    def __init_communication__(self):
         #
         # Start TCP-Clients
-        c_tcp = tcp_socket.tcp_client_stp(config.server_out_ip, config.server_out_port, rx_log_lvl=logging.DEBUG)
-        self.prot_out = wetation_protocol.my_base_protocol_tcp(c_tcp, config.server_out_secret)
-        self.prot_out.register_callback(wetation_protocol.my_base_protocol_tcp.SID_READ_RESPONSE, wetation_protocol.my_base_protocol_tcp.CURRENT_ENVDATA, self.update_current_env_data_out)
-        if config.server_out_secret is not None:
-            self.prot_out.authentificate()
-
-        c_tcp = tcp_socket.tcp_client_stp(config.server_in_ip, config.server_in_port, rx_log_lvl=logging.DEBUG)
-        self.prot_in = wetation_protocol.my_base_protocol_tcp(c_tcp, config.server_in_secret)
-        self.prot_in.register_callback(wetation_protocol.my_base_protocol_tcp.SID_READ_RESPONSE, wetation_protocol.my_base_protocol_tcp.CURRENT_ENVDATA, self.update_current_env_data_in)
-        if config.server_in_secret is not None:
-            self.prot_in.authentificate()
-
-        c_tcp = tcp_socket.tcp_client_stp(config.server_garage_ip, config.server_garage_port, rx_log_lvl=logging.DEBUG)
-        self.prot_garage = garage_protocol.my_base_protocol_tcp(c_tcp, config.server_garage_secret)
-        self.prot_garage.register_callback(garage_protocol.my_base_protocol_tcp.SID_READ_RESPONSE, garage_protocol.my_base_protocol_tcp.GATE_POSITION, self.update_gate_position)
-        if config.server_garage_secret is not None:
-            self.prot_garage.authentificate()
+        self.__init_protocol__(
+            self.PROT_ID_GARAGE,
+            config.server_garage_ip,
+            config.server_garage_port,
+            garage_protocol.my_base_protocol_tcp,
+            config.server_garage_secret
+        )
+        self.__prot__[self.PROT_ID_GARAGE].register_callback(garage_protocol.my_base_protocol_tcp.SID_READ_RESPONSE, None, self.__garage_data__)
+
+        self.__init_protocol__(
+            self.PROT_ID_IN,
+            config.server_in_ip,
+            config.server_in_port,
+            wetation_protocol.my_base_protocol_tcp,
+            config.server_in_secret
+        )
+        self.__prot__[self.PROT_ID_IN].register_callback(wetation_protocol.my_base_protocol_tcp.SID_READ_RESPONSE, None, self.__in_data__)
+
+        self.__init_protocol__(
+            self.PROT_ID_OUT,
+            config.server_out_ip,
+            config.server_out_port,
+            wetation_protocol.my_base_protocol_tcp,
+            config.server_out_secret
+        )
+        self.__prot__[self.PROT_ID_OUT].register_callback(wetation_protocol.my_base_protocol_tcp.SID_READ_RESPONSE, None, self.__out_data__)
 
-    def __update_current_envdata__(self, msg, temperature, humidity, pressure):
+    def __initiate_data_request__(self, rt):
+        for prot_id in self.ALL_PROT_IDS:
+            if self.__prot__[prot_id].is_connected():
+                for request_msg in self.REQUEST_MSGS.get(prot_id, []):
+                    service_id = request_msg['service_id']
+                    data_id = request_msg['data_id']
+                    logger.debug('Sending data request for prot_id %d, service_id %d and data_id %d', prot_id, service_id, data_id)
+                    self.__prot__[prot_id].send(service_id, data_id, None)
+            else:
+                logger.debug('Resetting GUI for prot_id %d', prot_id)
+                wx.CallAfter(self.no_data[prot_id], None)
+
+        # TODO: Move the following three lines to the wx idle task
+        wx.CallAfter(self.update_time)
+
+    def __in_data__(self, msg):
+        return self.__env_data__(msg, self.PROT_ID_IN)
+
+    def __out_data__(self, msg):
+        return self.__env_data__(msg, self.PROT_ID_OUT)
+
+    def __env_data__(self, msg, prot_id):
+        logger.debug('Received data for prot_id %d, service_id %d, data_id %d', prot_id, msg.get_service_id(), msg.get_data_id())
         if msg.get_status() == wetation_protocol.my_base_protocol_tcp.STATUS_OKAY:
-            env_data = msg.get_data()
-            wx.CallAfter(temperature.SetLabel, "%.1f °C" % env_data[envsens.KEY_TEMPERATURE])
-            wx.CallAfter(humidity.SetLabel, "%.1f %%" % env_data[envsens.KEY_HUMIDITY])
-            wx.CallAfter(pressure.SetLabel, "%.0f mbar" % env_data[envsens.KEY_PRESSURE])
-            wx.CallAfter(self.Layout)
+            if msg.get_data_id() == wetation_protocol.my_base_protocol_tcp.CURRENT_ENVDATA:
+                if prot_id == self.PROT_ID_IN:
+                    wx.CallAfter(self.update_current_env_data_in, msg)
+                else:
+                    wx.CallAfter(self.update_current_env_data_out, msg)
+                return wetation_protocol.my_base_protocol_tcp.STATUS_OKAY, None
+            else:
+                logger.warning('Received unknown data for prot_id %d, service_id %d, data_id %d', self.PROT_ID_GARAGE, msg.get_service_id(), msg.get_data_id())
             return wetation_protocol.my_base_protocol_tcp.STATUS_OKAY, None
         else:
-            logger.error('No environmental data received! MSG_STATUS was %s', wetation_protocol.my_base_protocol_tcp.STATUS_NAMES.get(msg.get_status(), repr(msg.get_status())))
+            logger.error('Error, receiving environmental data! MSG_STATUS was %s with PROT_ID %d', garage_protocol.my_base_protocol_tcp.STATUS_NAMES.get(msg.get_status(), repr(msg.get_status())), prot_id)
             return wetation_protocol.my_base_protocol_tcp.STATUS_SERVICE_OR_DATA_UNKNOWN, None
 
-    def update_current_env_data_out(self, msg):
-        return self.__update_current_envdata__(msg, self.out_temperature, self.out_humidity, self.out_pressure)
+    def __garage_data__(self, msg):
+        logger.debug('Received data for prot_id %d, service_id %d, data_id %d', self.PROT_ID_GARAGE, msg.get_service_id(), msg.get_data_id())
+        if msg.get_status() == garage_protocol.my_base_protocol_tcp.STATUS_OKAY:
+            if msg.get_data_id() == garage_protocol.my_base_protocol_tcp.GATE_POSITION:
+                wx.CallAfter(self.update_gate_position, msg)
+                return garage_protocol.my_base_protocol_tcp.STATUS_OKAY, None
+            else:
+                logger.warning('Received unknown data for prot_id %d, service_id %d, data_id %d', self.PROT_ID_GARAGE, msg.get_service_id(), msg.get_data_id())
+        else:
+            logger.error('Error, receiving garage data! MSG_STATUS was %s', garage_protocol.my_base_protocol_tcp.STATUS_NAMES.get(msg.get_status(), repr(msg.get_status())))
+            return garage_protocol.my_base_protocol_tcp.STATUS_SERVICE_OR_DATA_UNKNOWN, None
+
 
     def update_current_env_data_in(self, msg):
-        return self.__update_current_envdata__(msg, self.in_temperature, self.in_humidity, self.in_pressure)
+        if msg is None:
+            temperature = '-.-'
+            humidity = '-.-'
+            pressure = '-'
+        else:
+            env_data = msg.get_data()
+            temperature = '%.1f' % env_data[envsens.KEY_TEMPERATURE]
+            humidity = '%.1f' % env_data[envsens.KEY_HUMIDITY]
+            pressure = '%.0f' % env_data[envsens.KEY_PRESSURE]
+        self.in_temperature.SetLabel("%s °C" % temperature)
+        self.in_humidity.SetLabel("%s %%" % humidity)
+        self.in_pressure.SetLabel("%s hPa" % pressure)
+        self.Layout()
 
-    def update_gate_position(self, msg):
-        if msg.get_status() == garage_protocol.my_base_protocol_tcp.STATUS_OKAY:
-            #
-            # show gate section in GUI
-            #
-            self.heading_garage.Show(True)
-            self.gate_oc.Show(True)
-            self.gate_open.Show(True)
-            self.gate_position.Show(True)
-            self.gate_close.Show(True)
-            #
-            # update gate position
-            #
-            wx.CallAfter(self.gate_position.SetValue, msg.get_data() * 100)
-            wx.CallAfter(self.Layout)
-            return garage_protocol.my_base_protocol_tcp.STATUS_OKAY, None
+    def update_current_env_data_out(self, msg):
+        if msg is None:
+            temperature = '-.-'
+            humidity = '-.-'
+            pressure = '-'
         else:
-            logger.error('No gate position received! MSG_STATUS was %s', garage_protocol.my_base_protocol_tcp.STATUS_NAMES.get(msg.get_status(), repr(msg.get_status())))
-            return garage_protocol.my_base_protocol_tcp.STATUS_SERVICE_OR_DATA_UNKNOWN, None
+            env_data = msg.get_data()
+            temperature = "%.1f" % env_data[envsens.KEY_TEMPERATURE]
+            humidity = "%.1f" % env_data[envsens.KEY_HUMIDITY]
+            pressure = "%.0f" % env_data[envsens.KEY_PRESSURE]
+        self.out_temperature.SetLabel("%s °C" % temperature)
+        self.out_humidity.SetLabel("%s %%" % humidity)
+        self.out_pressure.SetLabel("%s hPa" % pressure)
+        self.Layout()
 
-    def garage_oc_evt(self, event):  # wxGlade: Wetation.<event_handler>
+    def update_gate_position(self, msg):
+        self.heading_garage.Show(msg is not None)
+        self.gate_oc.Show(msg is not None)
+        self.gate_open.Show(msg is not None)
+        self.gate_position.Show(msg is not None)
+        self.gate_close.Show(msg is not None)
+        if msg is not None:
+            self.gate_position.SetValue(msg.get_data() * 100)
+        self.Layout()
+
+    def update_time(self):
+        self.time.SetLabel(time.strftime("%H:%M"))
+        self.date.SetLabel(time.strftime("%d.%m.%Y"))
+        self.Layout()
+
+    def gate_oc_evt(self, event):  # wxGlade: Wetation.<event_handler>
         self.prot_garage.send(garage_protocol.my_base_protocol_tcp.SID_EXECUTE_REQUEST, garage_protocol.my_base_protocol_tcp.OPEN_CLOSE_GATE, None)
         event.Skip()
 
-    def __initiate_data_request__(self, rt):
-        self.prot_out.send(wetation_protocol.my_base_protocol_tcp.SID_READ_REQUEST, wetation_protocol.my_base_protocol_tcp.CURRENT_ENVDATA, None)
-        self.prot_in.send(wetation_protocol.my_base_protocol_tcp.SID_READ_REQUEST, wetation_protocol.my_base_protocol_tcp.CURRENT_ENVDATA, None)
-        self.prot_garage.send(garage_protocol.my_base_protocol_tcp.SID_READ_REQUEST, garage_protocol.my_base_protocol_tcp.GATE_POSITION, None)
-        # TODO: Move the following three lines to the wx idle task
-        wx.CallAfter(self.time.SetLabel, time.strftime("%H:%M"))
-        wx.CallAfter(self.date.SetLabel, time.strftime("%d.%m.%Y"))
-        wx.CallAfter(self.Layout)
-
     def run(self):
         self.__task_data_request__.run()
 

socket_protocol

-Subproject commit b0857e4569c34b9b644f5640731be0c413ce54d4
+Subproject commit bfcdef7ad7ce8d8cb1fb1245ad7ce56ead34b39c

tcp_socket

-Subproject commit 62f13e2d878b09b81d094c2f77dbd830d72be2c7
+Subproject commit 10aa319d2edffda001750bf26bd468753d9c2dc4