FIX - Fix Crazyflie scanning after recent change in Firmware #97

#97

Author: fredg02

src/se/bitcraze/crazyfliecontrol/ble/BleLink.java

@@ -240,7 +240,7 @@ public void onLeScan(final BluetoothDevice device, int rssi, byte[] scanRecord)
             if (device != null && device.getName() != null) {
                 mLogger.debug("Scanned device \"" + device.getName() + "\" RSSI: " + rssi);
 
-                if (device.getName().equals(CF_DEVICE_NAME) && rssi>rssiThreshold) {
+                if (device.getName().startsWith(CF_DEVICE_NAME) && !device.getName().equals(CF_LOADER_DEVICE_NAME) && rssi > rssiThreshold) {
                     stopScan();
                     if (mScannTimer != null) {
                         mScannTimer.cancel();
@@ -262,6 +262,7 @@ public void run() {
     private void scan () {
         // Filtered scan
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            //FIXME
             ScanFilter cfFilter = new ScanFilter.Builder().setDeviceName(CF_DEVICE_NAME).build();
             mBluetoothLeScanner.startScan(Arrays.asList(cfFilter), new ScanSettings.Builder().build(), mScanCallback21);
         } else {
@@ -320,7 +321,7 @@ public void onScanResult(int callbackType, ScanResult result) {
                             if (device != null && device.getName() != null) {
                                 // mLogger.debug("Scanned device \"" + device.getName() + "\" RSSI: " + rssi);
 
-                                if (device.getName().equals(CF_DEVICE_NAME) && rssi > rssiThreshold) {
+                                if (device.getName().startsWith(CF_DEVICE_NAME) && !device.getName().equals(CF_LOADER_DEVICE_NAME) && rssi > rssiThreshold) {
                                     stopScan();
                                     if (mScannTimer != null) {
                                         mScannTimer.cancel();