Add bit:commander extension to microbit (ukBaz#166)

4tronix is creating a new game controller style add-on for the microbit.
This adds support for that functionality.
This also adds better support for microbit IO Pin Service
This also adds better support for async/eventloop

.travis.yml

@@ -43,6 +43,7 @@ script:
   # Shared
   - coverage run -m unittest -v tests.test_tools
   - coverage run --append -m unittest -v tests.test_dbus_tools
+  - coverage run --append -m unittest -v tests.test_async_tools
   # Level 100
   - coverage run --append -m unittest -v tests.test_adapter
   - coverage run --append -m unittest -v tests.test_advertisement

bluezero/GATT.py

@@ -20,19 +20,12 @@ def emit(self, record):
 from bluezero import device
 
 dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
-mainloop = GObject.MainLoop()
 
 logger = logging.getLogger(__name__)
 logger.setLevel(logging.INFO)
 logger.addHandler(NullHandler())
 
 
-def generic_error_cb(error):
-    """Generic Error Callback function."""
-    logger.error('D-Bus call failed: ' + str(error))
-    mainloop.quit()
-
-
 class Service:
     """Remote GATT Service."""
 
@@ -428,6 +421,11 @@ def UUIDs(self):
         return self.profile_props.Get(constants.GATT_PROFILE_IFACE, 'UUIDs')
 
 
+def generic_error_cb(error):
+    """Generic Error Callback function."""
+    logger.error('D-Bus call failed: ' + str(error))
+
+
 def register_app_cb():
     """Application registration callback."""
     logger.info('GATT application registered')
@@ -436,7 +434,7 @@ def register_app_cb():
 def register_app_error_cb(error):
     """Application registration error callback."""
     logger.warning('Failed to register application: ' + str(error))
-    mainloop.quit()
+    # mainloop.quit()
 
 
 class GattManager:

bluezero/adapter.py

@@ -4,17 +4,11 @@
 
 # D-Bus imports
 import dbus
-import dbus.mainloop.glib
 
 # python-bluezero imports
 from bluezero import constants
 from bluezero import dbus_tools
-
-# Main eventloop import
-try:
-    from gi.repository import GLib as GObject
-except ImportError:
-    import gobject as GObject
+from bluezero import async_tools
 
 import logging
 try:  # Python 2.7+
@@ -25,9 +19,6 @@ def emit(self, record):
             pass
 
 
-# Initialise the mainloop
-dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
-
 logger = logging.getLogger(__name__)
 logger.setLevel(logging.WARNING)
 logger.addHandler(NullHandler())
@@ -98,7 +89,7 @@ def __init__(self, adapter_addr=None):
 
         self._nearby_timeout = 10
         self._nearby_count = 0
-        self.mainloop = GObject.MainLoop()
+        self.mainloop = async_tools.EventLoop()
 
         self.bus.add_signal_receiver(dbus_tools.interfaces_added,
                                      dbus_interface=constants.DBUS_OM_IFACE,
@@ -224,10 +215,17 @@ def nearby_discovery(self, timeout=10):
         self._nearby_timeout = timeout
         self._nearby_count = 0
 
-        GObject.timeout_add(1000, self._discovering_timeout)
+        # GLib.timeout_add(1000, self._discovering_timeout)
+        self.mainloop.add_timer(1000, self._discovering_timeout)
         self.adapter_methods.StartDiscovery()
         self.mainloop.run()
 
     def stop_discovery(self):
         """Stop scanning of nearby Bluetooth devices."""
         self.adapter_methods.StopDiscovery()
+
+    def run(self):
+        self.mainloop.run()
+
+    def quit(self):
+        self.mainloop.quit()

bluezero/async_tools.py

@@ -0,0 +1,49 @@
+# Main eventloop import
+from gi.repository import GLib
+
+import logging
+try:  # Python 2.7+
+    from logging import NullHandler
+except ImportError:
+    class NullHandler(logging.Handler):
+        def emit(self, record):
+            pass
+
+logger = logging.getLogger(__name__)
+logger.setLevel(logging.WARNING)
+logger.addHandler(NullHandler())
+
+
+class EventLoop:
+    # def generic_error_cb(self, error):
+    #     """Generic Error Callback function."""
+    #     logger.error('D-Bus call failed: ' + str(error))
+    #     self.mainloop.quit()
+
+    # def __new__(cls):
+    #     return object.__new__(cls)
+
+    def __init__(self):
+        self.mainloop = GLib.MainLoop()
+
+    # @property
+    # def run(self):
+    #     return self.mainloop.is_running()
+    #
+    # @run.setter
+    # def run(self, state):
+    #     if state:
+    #         self.mainloop.run()
+    #     else:
+    #         self.mainloop.quit()
+    def run(self):
+        self.mainloop.run()
+
+    def quit(self):
+        self.mainloop.quit()
+
+    def is_running(self):
+        self.mainloop.is_running()
+
+    def add_timer(self, time, callback):
+        GLib.timeout_add(time, callback)

bluezero/central.py

@@ -19,12 +19,6 @@ def emit(self, record):
 logger.addHandler(NullHandler())
 
 
-def generic_error_cb(error):
-    """Generic Error Callback function."""
-    logger.error('D-Bus call failed: ' + str(error))
-    mainloop.quit()
-
-
 class Central:
     """Create a BLE instance taking the Central role."""
 
@@ -92,3 +86,9 @@ def connect(self, profile=None):
     def disconnect(self):
         """Disconnect from the remote device."""
         self.rmt_device.disconnect()
+
+    def run(self):
+        self.dongle.run()
+
+    def quit(self):
+        self.dongle.quit()

bluezero/dbus_tools.py

@@ -13,16 +13,11 @@ def emit(self, record):
 # D-Bus import
 import dbus
 import dbus.mainloop.glib
-try:
-    from gi.repository import GObject
-except ImportError:
-    import gobject as GObject
 
 # python-bluezero constants import
 from bluezero import constants
 
 dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
-mainloop = GObject.MainLoop()
 
 logger = logging.getLogger(__name__)
 logger.setLevel(logging.WARNING)
@@ -300,20 +295,3 @@ def get_props(adapter=None,
                              descriptor)
 
     return get_dbus_iface(dbus.PROPERTIES_IFACE, get_dbus_obj(path_obj))
-
-
-#############################
-# Interface search functions
-#############################
-
-def start_mainloop():
-    mainloop.run()
-
-
-def stop_mainloop():
-    mainloop.quit()
-
-
-def generic_error_cb(error):
-    print('D-Bus call failed: ' + str(error))
-    mainloop.quit()