faster api 21

Author: microbit-sam

build.gradle

@@ -5,7 +5,7 @@ android {
     buildToolsVersion '22.0.0'
 
     defaultConfig {
-        minSdkVersion 19
+        minSdkVersion 21
         targetSdkVersion 22
     }
 

src/main/AndroidManifest.xml

@@ -4,7 +4,7 @@
     android:versionName="1.0" >
 
     <uses-sdk
-        android:minSdkVersion="18"
+        android:minSdkVersion="21"
         android:targetSdkVersion="21" />
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />

src/main/java/org/microbit/android/partialflashing/PartialFlashingBaseService.java

@@ -204,7 +204,6 @@ public void onCharacteristicChanged(BluetoothGatt gatt, BluetoothGattCharacteris
                             break;
                         }
                         case FLASH_COMMAND: {
-                            Log.v(TAG, "Packet Acknowledged: " + notificationValue[1]);
                             packetState = notificationValue[1];
                         }
                     }
@@ -283,25 +282,6 @@ public Boolean attemptPartialFlash(String filePath) {
                     // Check if EOF
                     if(hex.getRecordTypeFromIndex(magicIndex + lineCount) != 0) break;
 
-                    // Log record being written
-                    Log.v(TAG, "Hex Data  : " + hexData);
-                    Log.v(TAG, "Hex Offset: " + Integer.toHexString(hex.getRecordAddressFromIndex(magicIndex + lineCount)));
-
-                    // If Hex Data is Embedded Source Magic
-                    if(hexData.length() == 32) {
-                        if (hexData.substring(0, 15).equals("41140E2FB82FA2B"))
-                        {
-                            // Start of embedded source
-                            Log.v(TAG, "Reached embedded source");
-                            // Time execution
-                            long endTime = SystemClock.elapsedRealtime();
-                            long elapsedMilliSeconds = endTime - startTime;
-                            double elapsedSeconds = elapsedMilliSeconds / 1000.0;
-                            Log.v(TAG, "Flash Time (No Embedded Source): " + Float.toString((float) elapsedSeconds) + " seconds");
-                            break;
-                        }
-                    }
-
                     // Split into bytes
                     int offsetToSend = 0;
                     if(count == 0) {
@@ -312,43 +292,44 @@ public Boolean attemptPartialFlash(String filePath) {
                         offsetToSend = hex.getSegmentAddress(magicIndex + lineCount);
                     }
 
-                    Log.v(TAG, "OFFSET_TO_SEND: " + offsetToSend);
                     byte chunk[] = recordToByteArray(hexData, offsetToSend, packetNum);
 
                     // Write without response
                     // Wait for previous write to complete
                     boolean writeStatus = writePartialFlash(chunk);
-                    Log.v(TAG, "Hex Write: " + Boolean.toString(writeStatus));
 
                     // Sleep after 4 packets
                     count++;
                     if(count == 4){
                         count = 0;
+                        
                         // Wait for notification
+                        Log.v(TAG, "Wait for notification");
+                        
+                        // Send broadcast while waiting
+                        int percent = Math.round((float)100 * ((float)(lineCount) / (float)(numOfLines)));
+                        sendProgressBroadcast(percent);
+
                         while(packetState == PACKET_STATE_WAITING);
+                        Log.v(TAG, "/Wait for notification");
 
                         // Reset to waiting state
                         packetState = PACKET_STATE_WAITING;
 
                     } else {
-                        Thread.sleep(5);
+                        Thread.sleep(3);
                     }
 
                     // If notification is retransmit -> retransmit last block.
                     // Else set start of new block
                     if(packetState == PACKET_STATE_RETRANSMIT) {
                         lineCount = lineCount - 4;
                     } else {
-                        // Send progress update
-                        Log.v(TAG, "LC: " + lineCount + ", NL: " + numOfLines);
-                        int percent = Math.round((float)100 * ((float)(lineCount) / (float)(numOfLines)));
-                        sendProgressBroadcast(percent);
-                        
                         // Next line
                         lineCount = lineCount + 1;
                     }
 
-                    // Increment packet #
+                    // Always increment packet #
                     packetNum = packetNum + 1;
 
                 }
@@ -449,6 +430,13 @@ private boolean initialize(String deviceId) {
             Log.v(TAG, "Notifications enabled");
         }
 
+        // Set up BLE priority
+        if(mBluetoothGatt.requestConnectionPriority(BluetoothGatt.CONNECTION_PRIORITY_HIGH)){
+            Log.e(TAG, "Failed to set up priority");
+        } else {
+            Log.v(TAG, "High priority");
+        }
+
         BluetoothGattDescriptor descriptor = partialFlashCharacteristic.getDescriptor(CLIENT_CHARACTERISTIC_CONFIG);
         descriptor.setValue(BluetoothGattDescriptor.ENABLE_NOTIFICATION_VALUE);