api v0.5.0 commit

Author: scaryghost

MANIFEST.in

@@ -1,13 +1,26 @@
 include LICENSE.txt
 include README.rst
 
-recursive-include MetaWear-SDK-Cpp *
-prune MetaWear-SDK-Cpp/.git
+graft MetaWear-SDK-Cpp
+prune MetaWear-SDK-Cpp/bindings/javascript
+prune MetaWear-SDK-Cpp/bindings/swift
+prune MetaWear-SDK-Cpp/cppdocs
 prune MetaWear-SDK-Cpp/build
 prune MetaWear-SDK-Cpp/dist
+prune MetaWear-SDK-Cpp/Debug
+prune MetaWear-SDK-Cpp/Release
+prune MetaWear-SDK-Cpp/x64
 
-recursive-include mbientlab *.py
-recursive-include examples *.py
+graft mbientlab
+recursive-exclude mbientlab/metawear cbindings.py
 
-recursive-exclude * __pycache__
-recursive-exclude * *.py[co]
+global-exclude *.git
+global-exclude *.gitmodules
+global-exclude *.gitignore
+global-exclude __pycache__
+global-exclude *.py[co]
+global-exclude *.d
+global-exclude *.o
+global-exclude *.so*
+global-exclude *.dll
+global-exclude *.a

MetaWear-SDK-Cpp

@@ -29,19 +29,23 @@ If you do not know the MAC address of your device, use ``PyWarble`` to scan for
 .. code-block:: python
 
     from mbientlab.warble import *
+    from mbientlab.metawear import *
     from threading import Event
     
     e = Event()
     address = None
     def device_discover_task(result):
         global address
-        # grab the first discoered device
-        address = result.mac
-        e.set()
+        if (result.has_service_uuid(MetaWear.GATT_SERVICE)):
+            # grab the first discovered metawear device
+            address = result.mac
+            e.set()
     
-    BleScanner.set_handler(scan_result_printer)
+    BleScanner.set_handler(device_discover_task)
     BleScanner.start()
     e.wait()
+
+    BleScanner.stop()
     
 Once you have the device's MAC address, create a MetaWear object with the MAC address and connect to the device.
 

README.rst

@@ -16,39 +16,35 @@
 
 from .metawear import MetaWear
 
+_value_parsers = {
+    DataTypeId.UINT32: lambda p: cast(p.contents.value, POINTER(c_uint)).contents.value,
+    DataTypeId.INT32: lambda p: cast(p.contents.value, POINTER(c_int)).contents.value,
+    DataTypeId.FLOAT: lambda p: cast(p.contents.value, POINTER(c_float)).contents.value,
+    DataTypeId.CARTESIAN_FLOAT: lambda p: cast(p.contents.value, POINTER(CartesianFloat)).contents,
+    DataTypeId.BATTERY_STATE: lambda p: cast(p.contents.value, POINTER(BatteryState)).contents,
+    DataTypeId.TCS34725_ADC: lambda p: cast(p.contents.value, POINTER(Tcs34725ColorAdc)).contents,
+    DataTypeId.EULER_ANGLE: lambda p: cast(p.contents.value, POINTER(EulerAngles)).contents,
+    DataTypeId.QUATERNION: lambda p: cast(p.contents.value, POINTER(Quaternion)).contents,
+    DataTypeId.CORRECTED_CARTESIAN_FLOAT: lambda p: cast(p.contents.value, POINTER(CorrectedCartesianFloat)).contents,
+    DataTypeId.OVERFLOW_STATE: lambda p: cast(p.contents.value, POINTER(OverflowState)).contents,
+    DataTypeId.LOGGING_TIME: lambda p: cast(p.contents.value, POINTER(LoggingTime)).contents,
+    DataTypeId.BTLE_ADDRESS: lambda p: cast(p.contents.value, POINTER(BtleAddress)).contents,
+    DataTypeId.BOSCH_ANY_MOTION: lambda p: cast(p.contents.value, POINTER(BoschAnyMotion)).contents,
+    DataTypeId.CALIBRATION_STATE: lambda p: cast(p.contents.value, POINTER(CalibrationState)).contents
+}
 def parse_value(p_data):
     """
     Helper function to extract the value from a Data object.  If you are storing the values to be used at a later time, 
     call copy.deepcopy preserve the value.  You do not need to do this if the underlying type is a native type or a byte array
     @params:
         p_data      - Required  : Pointer to a Data object
     """
-    if (p_data.contents.type_id == DataTypeId.UINT32):
-        return cast(p_data.contents.value, POINTER(c_uint)).contents.value
-    elif (p_data.contents.type_id == DataTypeId.INT32 or p_data.contents.type_id == DataTypeId.SENSOR_ORIENTATION):
-        return cast(p_data.contents.value, POINTER(c_int)).contents.value
-    elif (p_data.contents.type_id == DataTypeId.FLOAT):
-        return cast(p_data.contents.value, POINTER(c_float)).contents.value
-    elif (p_data.contents.type_id == DataTypeId.CARTESIAN_FLOAT):
-        return cast(p_data.contents.value, POINTER(CartesianFloat)).contents
-    elif (p_data.contents.type_id == DataTypeId.BATTERY_STATE):
-        return cast(p_data.contents.value, POINTER(BatteryState)).contents
+    if (p_data.contents.type_id in _value_parsers):
+        return _value_parsers[p_data.contents.type_id](p_data)
+    elif (p_data.contents.type_id == DataTypeId.SENSOR_ORIENTATION):
+        return _value_parsers[DataTypeId.INT32](p_data)
     elif (p_data.contents.type_id == DataTypeId.BYTE_ARRAY):
-        p_data_ptr= cast(p_data.contents.value, POINTER(c_ubyte * p_data.contents.length))
-
-        byte_array= []
-        for i in range(0, p_data.contents.length):
-            byte_array.append(p_data_ptr.contents[i])
-        return byte_array
-    elif (p_data.contents.type_id == DataTypeId.TCS34725_ADC):
-        return cast(p_data.contents.value, POINTER(Tcs34725ColorAdc)).contents
-    elif (p_data.contents.type_id == DataTypeId.EULER_ANGLE):
-        return cast(p_data.contents.value, POINTER(EulerAngles)).contents
-    elif (p_data.contents.type_id == DataTypeId.QUATERNION):
-        return cast(p_data.contents.value, POINTER(Quaternion)).contents
-    elif (p_data.contents.type_id == DataTypeId.CORRECTED_CARTESIAN_FLOAT):
-        return cast(p_data.contents.value, POINTER(CorrectedCartesianFloat)).contents
-    elif (p_data.contents.type_id == DataTypeId.OVERFLOW_STATE):
-        return cast(p_data.contents.value, POINTER(OverflowState)).contents
+        array_ptr= cast(p_data.contents.value, POINTER(c_ubyte * p_data.contents.length))
+        return [array_ptr.contents[i] for i in range(0, p_data.contents.length)]
     else:
         raise RuntimeError('Unrecognized data type id: ' + str(p_data.contents.type_id))

mbientlab/metawear/__init__.py

@@ -48,7 +48,7 @@ def _download_file(url, dest):
         return content
 
 class MetaWear(object):
-    _METABOOT_SERVICE = "00001530-1212-efde-1523-785feabcd123"
+    GATT_SERVICE = "326a9000-85cb-9195-d9dd-464cfbbae75a"
     _DEV_INFO = {
         "00002a27-0000-1000-8000-00805f9b34fb": "hardware",
         "00002a29-0000-1000-8000-00805f9b34fb": "manufacturer",
@@ -117,7 +117,7 @@ def in_metaboot_mode(self):
         """
         True if the board is in MetaBoot mode.  The only permitted operation for MetaBoot boards is to update the firmware
         """
-        return self.warble.service_exists(MetaWear._METABOOT_SERVICE)
+        return self.warble.service_exists("00001530-1212-efde-1523-785feabcd123")
 
     def disconnect(self):
         """

mbientlab/metawear/metawear.py

@@ -1,3 +1,4 @@
+from distutils.command.clean import clean
 from multiprocessing import cpu_count
 from shutil import copy2, move
 from subprocess import call, STDOUT
@@ -9,6 +10,23 @@
 import sys
 
 machine = "arm" if "arm" in platform.machine() else ("x64" if sys.maxsize > 2**32 else "x86")
+root = os.path.dirname(os.path.abspath(__file__))
+dest = os.path.join("mbientlab", "metawear")
+
+class MetaWearClean(clean):
+    def run(self):
+        bindings = os.path.join(dest, "cbindings.py")
+        if os.path.isfile(bindings):
+            os.remove(bindings)
+
+        if (platform.system() == 'Windows'):
+            dll = os.path.join(dest, "MetaWear.Win32.dll")
+            if os.path.isfile(dll):
+                os.remove(dll)
+        elif (platform.system() == 'Linux'):
+            for f in os.listdir(dest):
+                if (f.startswith("libmetawear.so")):
+                    os.remove(os.path.join(dest, f))
 
 class MetaWearBuild(build_py):
     @staticmethod
@@ -17,9 +35,7 @@ def _move(src, dest, basename):
             if (f.startswith(basename)):
                 move(os.path.join(src, f), dest)
 
-    def run(self):
-        root = os.path.dirname(os.path.abspath(__file__))
-        dest = os.path.join("mbientlab", "metawear")
+    def run(self):        
         cpp_sdk = os.path.join(root, 'MetaWear-SDK-Cpp')
         dist_dir = os.path.join(cpp_sdk, 'dist', 'release', 'lib', machine)
 
@@ -49,7 +65,7 @@ def run(self):
 setup(
     name='metawear',
     packages=['mbientlab', 'mbientlab.metawear'],
-    version='0.4.0',
+    version='0.5.0',
     description='Python bindings for the MetaWear C++ SDK by MbientLab',
     long_description=open(os.path.join(os.path.dirname(__file__), "README.rst")).read(),
     package_data={'mbientlab.metawear': so_pkg_data},
@@ -58,18 +74,20 @@ def run(self):
     author='MbientLab',
     author_email="[email protected]",
     install_requires=[
-        'warble >= 1.0, < 2.0',
+        'warble >= 1.1, < 2.0',
         'requests'
     ],
     cmdclass={
         'build_py': MetaWearBuild,
+        'clean': MetaWearClean
     },
     keywords = ['sensors', 'mbientlab', 'metawear', 'bluetooth le', 'native'],
     python_requires='>=2.7',
     classifiers=[
         'Development Status :: 4 - Beta',
         'Intended Audience :: Developers',
         'Operating System :: POSIX :: Linux',
+        'Operating System :: Microsoft :: Windows :: Windows 10',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
     ]