Start of the table control support, and spelling fixes

Author: James Boulton

dashio/__init__.py

@@ -90,6 +90,7 @@
 from .iotcontrol.button_group import ButtonGroup
 from .iotcontrol.event_log import EventData, EventLog
 from .iotcontrol.color_picker import ColorPicker
+from .iotcontrol.table import Table, TableRow
 
 __all__ = [
     'Device',
@@ -142,6 +143,8 @@
     'DataPoint',
     'DataPointArray',
     'Knob',
+    'Table',
+    'TableRow',
     'Dial',
     'Direction',
     'Map',

dashio/device.py

@@ -201,6 +201,7 @@ def _send_alarm(self, alarm_id, message_header, message_body):
     def _send_data(self, data: str):
         if not data:
             return
+        reply_send = ""
         if isinstance(data, str):
             reply_send = data.replace("{device_id}", self.device_id)
         elif isinstance(data, list):
@@ -238,7 +239,7 @@ def add_all_c64_controls(self, c64_dict: dict, column_no=1):
         c64_dict : Dict
             dictionary of the CFG loaded by decode_cfg from a CFG64 or json
         column_no: Int From 1 to 3 (default 1).
-            The DashIO app reports the size of the screen in no of columns. You can load a seperate
+            The DashIO app reports the size of the screen in no of columns. You can load a separate
             config for each reported column number.
         """
         if not 1 <= column_no <= 3:
@@ -253,6 +254,11 @@ def add_all_c64_controls(self, c64_dict: dict, column_no=1):
                     else:
                         new_control = CONTROL_INSTANCE_DICT[control_type].from_cfg_dict(control, column_no=column_no)
                         self.add_control(new_control)
+            elif control_type == "CFG" and isinstance(control_list, dict):
+                logger.debug("CFG: %s", control_list)
+                if 'name' in control_list['deviceSetup']:
+                    self._set_device_setup("name", True)
+                    self.set_name_callback(self._name_callback)
 
     def add_control(self, iot_control):
         """Add a control to the device.
@@ -309,7 +315,7 @@ def remove_control(self, iot_control):
         if key in self.controls_dict:
             del self.controls_dict[key]
 
-    def _set_devicesetup(self, control_name: str, settable: bool):
+    def _set_device_setup(self, control_name: str, settable: bool):
         if settable:
             self._device_commands_dict[control_name.upper()] = getattr(self, '_' + control_name + '_rx_event', None)
             if control_name not in self._device_setup_list:
@@ -350,14 +356,14 @@ def set_wifi_callback(self, callback):
                 The callback function. It will be invoked with one argument, the msg from IoTDashboard.
                 The callback must return a Boolean indicating success.
         """
-        self._set_devicesetup("wifi", True)
+        self._set_device_setup("wifi", True)
         self._wifi_rx_callback = callback
 
     def unset_wifi_callback(self):
         """
         Unset the wifi_rx_callback.
         """
-        self._set_devicesetup("wifi", False)
+        self._set_device_setup("wifi", False)
         self._wifi_rx_callback = None
 
     def _wifi_rx_event(self, msg) -> str:
@@ -377,14 +383,14 @@ def set_dashio_callback(self, callback):
                 The callback function. It will be invoked with one argument, the msg from IoTDashboard.
                 The callback must return a Boolean indicating success.
         """
-        self._set_devicesetup("dashio", True)
+        self._set_device_setup("dashio", True)
         self._dashio_rx_callback = callback
 
     def unset_dashio_callback(self):
         """
         Unset the dashio callback function.
         """
-        self._set_devicesetup("dashio", False)
+        self._set_device_setup("dashio", False)
         self._dashio_rx_callback = None
 
     def _dashio_rx_event(self, msg):
@@ -404,16 +410,20 @@ def set_name_callback(self, callback):
                 The callback function. It will be invoked with one argument, the msg from IoTDashboard.
                 The callback must return the new name.
         """
-        self._set_devicesetup("name", True)
+        self._set_device_setup("name", True)
         self._name_rx_callback = callback
 
     def unset_name_callback(self):
         """
         Unset the name callback function.
         """
-        self._set_devicesetup("name", False)
+        self._set_device_setup("name", False)
         self._name_rx_callback = None
 
+    def _name_callback(self, msg) -> str:
+        logger.debug("Name msg: %s", msg)
+        return msg[2]
+
     def _name_rx_event(self, msg) -> str:
         if self._name_rx_callback is not None:
             name = self._name_rx_callback(msg)
@@ -432,14 +442,14 @@ def set_tcp_callback(self, callback):
                 The callback function. It will be invoked with one argument, the msg from IoTDashboard.
                 The callback must return a Boolean indicating success.
         """
-        self._set_devicesetup("tcp", True)
+        self._set_device_setup("tcp", True)
         self._tcp_rx_callback = callback
 
     def unset_tcp_callback(self):
         """
         Unset the tcp callback function.
         """
-        self._set_devicesetup("tcp", False)
+        self._set_device_setup("tcp", False)
         self._tcp_rx_callback = None
 
     def _tcp_rx_event(self, msg):
@@ -459,14 +469,14 @@ def set_mqtt_callback(self, callback):
                 The callback function. It will be invoked with one argument, the msg from IoTDashboard.
                 The callback must return a Boolean indicating success.
         """
-        self._set_devicesetup("mqtt", True)
+        self._set_device_setup("mqtt", True)
         self._mqtt_rx_callback = callback
 
     def unset_mqtt_callback(self):
         """
         Unset the mqtt callback function.
         """
-        self._set_devicesetup("mqtt", False)
+        self._set_device_setup("mqtt", False)
         self._mqtt_rx_callback = None
 
     def _mqtt_rx_event(self, msg):

dashio/iotcontrol/__init__.py

@@ -23,3 +23,4 @@
 from .button_group import ButtonGroup, ButtonGroupConfig
 from .event_log import EventLog, EventData
 from .color_picker import ColorPicker, ColorPickerConfig
+from .table import Table, TableRow, TableConfig

dashio/iotcontrol/audio_visual_display.py

@@ -63,7 +63,7 @@ def __init__(
 
     @classmethod
     def from_cfg_dict(cls, cfg_dict: dict, column_no=1):
-        """Instatiates Button from cfg dictionary
+        """Instantiates Button from cfg dictionary
 
         Parameters
         ----------

dashio/iotcontrol/button.py

@@ -115,7 +115,7 @@ class Button(Control):
         Updates the button state, button icon and text.
 
     from_cfg_dict(cfg_dict: dict) :
-        Instatiates Button from cfg dictionary
+        Instantiates Button from cfg dictionary
     """
 
     def toggle_btn(self):
@@ -164,7 +164,7 @@ def __init__(
 
     @classmethod
     def from_cfg_dict(cls, cfg_dict: dict, column_no=1):
-        """Instatiates Button from cfg dictionary
+        """Instantiates Button from cfg dictionary
 
         Parameters
         ----------

dashio/iotcontrol/button_group.py

@@ -135,7 +135,7 @@ def __init__(
 
     @classmethod
     def from_cfg_dict(cls, cfg_dict: dict, column_no=1):
-        """Instatiates ButtonGroup from cfg dictionary
+        """Instantiates ButtonGroup from cfg dictionary
 
         Parameters
         ----------

dashio/iotcontrol/chart.py

@@ -40,7 +40,7 @@ def __init__(self, name="", line_type=ChartLineType.LINE, color=Color.BLACK, rig
             self.axis_side = 'right'
 
     def get_line_data(self):
-        """Returns the line data formated for the iotdashboard app
+        """Returns the line data formatted for the iotdashboard app
 
         Returns
         -------
@@ -267,7 +267,7 @@ def y_axis_num_bars(self):
 
     @classmethod
     def from_cfg_dict(cls, cfg_dict: dict, column_no=1):
-        """Instatiates Chart from cfg dictionary
+        """Instantiates Chart from cfg dictionary
 
         Parameters
         ----------

dashio/iotcontrol/color_picker.py

@@ -117,7 +117,7 @@ def __init__(
 
     @classmethod
     def from_cfg_dict(cls, cfg_dict: dict, column_no=1):
-        """Instatiates ColorPicker from cfg dictionary
+        """Instantiates ColorPicker from cfg dictionary
 
         Parameters
         ----------

dashio/iotcontrol/control.py

@@ -165,8 +165,8 @@ class ControlPosition:
 
     def __init__(self, x_position_ratio: float, y_position_ratio: float, width_ratio: float, height_ratio: float):
         """The ControlPosition class describes the location and size of a control on a DeviceView. The
-        x_postion and y_position ratio place the top left hand corner of the control. The width and height ratio
-        describe the controls size. The ratio is a number betwwen 0 and 1 representing the width and height of the
+        x_position and y_position ratio place the top left hand corner of the control. The width and height ratio
+        describe the controls size. The ratio is a number between 0 and 1 representing the width and height of the
         DeviceView.
 
         Parameters
@@ -258,7 +258,7 @@ def __init__(
 
     @classmethod
     def from_dict(cls, cfg_dict: dict):
-        """Instatiates Dial from cfg dictionary
+        """Instantiates Dial from cfg dictionary
 
         Parameters
         ----------
@@ -281,7 +281,7 @@ def from_dict(cls, cfg_dict: dict):
 
     @property
     def parent_id(self) -> str:
-        """The parent control or deviceview this control belongs to
+        """The parent control or device view this control belongs to
 
         Returns
         -------
@@ -367,7 +367,7 @@ def get_cfg64(self, data) -> list:
         return cfg_list
 
     def add_config(self, config, column_no=1):
-        """Add a duplicate Config for dashio Apps with wider screens"""
+        """Add a duplicate Config for DashIO Apps with wider screens"""
         config.cfg["controlID"] = self.control_id
         if 1 <= column_no <= self._cfg_max_no_columns:
             self._app_columns_cfg[str(column_no)].append(config)
@@ -389,7 +389,7 @@ def remove_transmit_message_callback(self, callback):
         self._message_tx_event -= callback
 
     def __init__(self, cntrl_type: str, control_id: str):
-        """Control base type - all controls have these charactoristics and methods.
+        """Control base type - all controls have these characteristics and methods.
 
         Parameters
         ----------
@@ -440,7 +440,7 @@ def state_str(self, val):
     #  Use getter, setter properties to store the settings in the config dictionary
     @property
     def parent_id(self, index=0, column_no=1) -> str:
-        """The parent control or deviceview this control belongs to
+        """The parent control or device view this control belongs to
 
         Returns
         -------

dashio/iotcontrol/device_view.py

@@ -110,7 +110,7 @@ def from_dict(cls, cfg_dict: dict):
 
 
 class DeviceView(Control):
-    """A DeviceView provides a control that descibes appearance and style of the group of controls
+    """A DeviceView provides a control that describes appearance and style of the group of controls
         that are displayed on this DeviceView by the iotdashboard app.
 
     Attributes
@@ -126,7 +126,7 @@ class DeviceView(Control):
         The Icon representing the DeviceView
     color : Color
         The color of the DeviceView
-    share_column : Booloan
+    share_column : Boolean
         Something something
     num_columns : int
         Number of columns for DeviceView
@@ -200,7 +200,7 @@ def __init__(
 
     @classmethod
     def from_cfg_dict(cls, cfg_dict: dict, column_no=1):
-        """Instatiates DeviceView from cfg dictionary
+        """Instantiates DeviceView from cfg dictionary
 
         Parameters
         ----------