DashIO Comms module working

Author: James Boulton

.gitignore

@@ -132,8 +132,20 @@ dmypy.json
 
 # End of https://www.gitignore.io/api/python
 .vscode/
+.VScode*
 *.ini
 .DS_Store
 pylint.out
 .noseids
 *.c64
+*.pdf
+*.gpx
+*.zip
+*.cfg
+scratch.py
+*_debug.py
+*.service
+*_text.py
+*_test.py
+ttn.py
+a

Examples/RaspberryPi/TestBLE.py

@@ -32,7 +32,7 @@
 import platform
 import zmq
 
-from dashio.bleconnection import BLEConnection
+from dashio.ble_connection import BLEConnection
 
 
 class TestControls:

Examples/RaspberryPi/ble_set_wifi.py

@@ -32,7 +32,7 @@
 import shortuuid
 
 import dashio
-from dashio import bleconnection
+from dashio import ble_connection
 
 shutdown = False
 
@@ -157,7 +157,7 @@ def set_name_callback(msg):
     device.set_wifi_callback(set_wifi_callback)
     device.set_name_callback(set_name_callback)
 
-    dash_conn = bleconnection.BLEConnection(ble_uuid=config_file_parser.get('DEFAULT', 'BLE_UUID'))
+    dash_conn = ble_connection.BLEConnection(ble_uuid=config_file_parser.get('DEFAULT', 'BLE_UUID'))
     dash_conn.add_device(device)
 
     while not shutdown:

Examples/serial_coms_module.py Examples/dashio_coms_module.py

@@ -116,18 +116,6 @@ def text_cntrl_message_handler(self, msg):
     def selector_ctrl_handler(self, msg):
         print(self.selector_ctrl.selection_list[int(msg[3])])
 
-    def _coms_reboot_msg(self, msg):
-        logging.debug("RBT: %s", msg)
-        msg = dashio.set_comms_module_passthough(msg[0])
-        self.serial_con.serial_com.write(msg.encode())
-        msg = dashio.enable_comms_module_ble(msg[0], True)
-        self.serial_con.serial_com.write(msg.encode())
-
-    def _comms_device_id_msg(self, msg):
-        logging.debug("Comms Module Device ID: %s", msg)
-        msg = dashio.reboot_comms_module(msg[0])
-        self.serial_con.serial_com.write(msg.encode())
-
     def __init__(self):
 
         # Catch CNTRL-C signal
@@ -142,11 +130,9 @@ def __init__(self):
         self.device = dashio.Device("ControlTest", args.device_id, args.device_name, context=context)
         # self.device.use_cfg64()
 
-        self.serial_con = dashio.SerialConnection(serial_port=args.serial, baud_rate=115200, context=context)
-        self.serial_con.set_crtl_reboot_callback(self._coms_reboot_msg)
-        self.serial_con.set_crtl_device_id_callback(self._comms_device_id_msg)
+        self.dcm = dashio.DashIOCommsModuleConnection(serial_port=args.serial, baud_rate=115200, context=context)
         self.device.config_revision = 2
-        self.serial_con.add_device(self.device)
+        self.dcm.add_device(self.device)
 
         self.page_name = "TestTCP: " + platform.node()
 
@@ -252,14 +238,11 @@ def __init__(self):
         self.device.add_control(self.up_btn)
         self.device.config_revision = 1
 
-        msg = dashio.reguest_comms_module_device_id()
-        self.serial_con.serial_com.write(msg.encode())
-
         while not self.shutdown:
             time.sleep(1)
             # self.comp_control.direction_value = random.random() * 360
 
-        self.serial_con.close()
+        self.dcm.close()
         self.device.close()
 
 

Examples/tcp_example.py

@@ -151,19 +151,19 @@ def __init__(self):
         self.page_test.add_control(self.down_btn)
 
         self.sldr_cntrl = dashio.Slider(
-            "SLDR", title="Slider", bar_max=10, slider_enabled=True, red_value=10, control_position=dashio.ControlPosition(0.02, 0.13, 0.22, 0.73)
+            "SLDR", title="Slider", bar_max=10, slider_enabled=True, red_value=10, bar_mode=dashio.BarMode.MSG, control_position=dashio.ControlPosition(0.02, 0.13, 0.22, 0.73)
         )
         self.sldr_cntrl.add_receive_message_callback(self.slider_event_handler)
         self.page_test.add_control(self.sldr_cntrl)
 
         self.sldr_dbl_cntrl = dashio.Slider(
-            "SLDR_DBL", title="Slider Double", bar_max=5, slider_enabled=True, red_value=5, control_position=dashio.ControlPosition(0.78, 0.01, 0.2, 0.98)
+            "SLDR_DBL", title="Slider Double", bar_max=5, slider_enabled=True, red_value=5, bar_mode=dashio.BarMode.MSG, control_position=dashio.ControlPosition(0.78, 0.01, 0.2, 0.98)
         )
         self.sldr_dbl_cntrl.bar2_value = 0
         self.sldr_dbl_cntrl.add_receive_message_callback(self.slider_dbl_event_handler)
         self.page_test.add_control(self.sldr_dbl_cntrl)
 
-        self.knb_control = dashio.Knob("KNB", title="A Knob", dial_max=10, red_value=10, control_position=dashio.ControlPosition(0.24, 0.14, 0.54, 0.21))
+        self.knb_control = dashio.Knob("KNB", title="A Knob", dial_max=10, red_value=10, dial_mode=dashio.DialMode.MSG, control_position=dashio.ControlPosition(0.24, 0.14, 0.54, 0.21))
         self.knb_control.add_receive_message_callback(self.knob_event_handler)
         self.page_test.add_control(self.knb_control)
 

dashio/__init__.py

@@ -34,28 +34,13 @@
 """
 
 from .device import Device
-from .tcpconnection import TCPConnection
-from .mqttconnection import MQTTConnection
-from .zmqconnection import ZMQConnection
-from .dashconnection import DashConnection
-from .serialconnection import SerialConnection
+from .tcp_connection import TCPConnection
+from .mqtt_connection import MQTTConnection
+from .zmq_connection import ZMQConnection
+from .dash_connection import DashConnection
+from .comms_module_connection import DashIOCommsModuleConnection
 from .schedular import Schedular
 from .load_config import decode_cfg64, encode_cfg64, load_all_controls_from_config, get_control_dict_from_config, get_control_from_config
-from .comms_module import (
-    enable_comms_module_ble,
-    enable_comms_module_dash,
-    enable_comms_module_tcp,
-    set_comms_module_dash,
-    set_comms_module_name,
-    set_comms_module_normal,
-    set_comms_module_passthough,
-    set_comms_module_tcp_port,
-    set_comms_module_wifi,
-    get_comms_module_active_connections,
-    reguest_comms_module_device_id,
-    reboot_comms_module,
-    comms_module_sleep
-)
 # from .bleconnection import BLEConnection
 from .iotcontrol.enums import (
     Color,
@@ -113,21 +98,8 @@
     'ZMQConnection',
     'DashConnection',
     'ConnectionState',
-    'SerialConnection',
+    'DashIOCommsModuleConnection',
     'Schedular',
-    'enable_comms_module_ble',
-    'enable_comms_module_dash',
-    'enable_comms_module_tcp',
-    'set_comms_module_dash',
-    'set_comms_module_name',
-    'set_comms_module_normal',
-    'set_comms_module_passthough',
-    'set_comms_module_tcp_port',
-    'set_comms_module_wifi',
-    'get_comms_module_active_connections',
-    'reguest_comms_module_device_id',
-    'reboot_comms_module',
-    'comms_module_sleep',
     'decode_cfg64',
     'encode_cfg64',
     'load_all_controls_from_config',