Merge pull request #39 from rcy/master-1

Update README.md to correct micro:bit hex file download link.

README.md

@@ -102,7 +102,7 @@ Installation
 
 5. For micro:bit, install Scratch-link hex on your device.
 
-    * Download and unzip the [micro:bit Scratch Hex file](https://downloads.scratch.mit.edu/microbit/scratch-microbit-1.1.0.hex.zip).
+    * Download and unzip the [micro:bit Scratch Hex file](https://downloads.scratch.mit.edu/microbit/scratch-microbit.hex.zip).
     * Flash the micro:bit over USB with the Scratch Hex File, you will see the
       five character name of the micro:bit scroll across the screen such as
       'zo9ev'.
@@ -170,6 +170,10 @@ Please file issues to [GitHub issue tracker](https://github.com/kawasaki/pyscrli
 Releases
 --------
 
+Release 0.2.8
+
+* Supported Microbit More v2
+
 Release 0.2.7
 
 * Supported Snap Firefox and Chromium

pyscrlink/scratch_link.py

@@ -18,7 +18,7 @@ import traceback
 import argparse
 
 # for BLESession (e.g. BBC micro:bit)
-from bluepy.btle import Scanner, UUID, Peripheral, DefaultDelegate
+from bluepy.btle import Scanner, UUID, Peripheral, DefaultDelegate, ScanEntry
 from bluepy.btle import BTLEDisconnectError, BTLEManagementError
 from pyscrlink import bluepy_helper_cap
 
@@ -292,15 +292,19 @@ class BLESession(Session):
                             logger.debug("match...")
                             return True
             if 'namePrefix' in f:
-                # 0x08: Shortened Local Name
+                logger.debug(f"given namePrefix: {f['namePrefix']}")
-                deviceName = dev.getValueText(0x08)
+                deviceName = dev.getValueText(ScanEntry.SHORT_LOCAL_NAME)
-                if not deviceName:
+                if deviceName:
-                    continue
+                    logger.debug(f"SHORT_LOCAL_NAME: {deviceName}")
-                logger.debug(f"Name of \"{deviceName}\" begins with: \"{f['namePrefix']}\"?")
+                    if deviceName.startswith(f['namePrefix']):
-                if(deviceName.startswith(f['namePrefix'])):
+                        logger.debug(f"match...")
-                    logger.debug("Yes")
+                        return True
-                    return True
+                deviceName = dev.getValueText(ScanEntry.COMPLETE_LOCAL_NAME)
-                logger.debug("No")
+                if deviceName:
+                    logger.debug(f"COMPLETE_LOCAL_NAME: {deviceName}")
+                    if deviceName.startswith(f['namePrefix']):
+                        logger.debug(f"match...")
+                        return True
             if 'name' in f or 'manufactureData' in f:
                 logger.error("name/manufactureData filters not implemented")
                 # TODO: implement other filters defined:

setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="pyscrlink",
-    version="0.2.7",
+    version="0.2.8",
     author="Shin'ichiro Kawasaki",
     author_email='kawasaki@juno.dti.ne.jp',
     description='Scratch-link for Linux with Python',