Merge pull request #11 from microbit-foundation/from300

Merge changes through to 3.0.7 to master

Recent releases through 3.0.7 have been made from the from300 branch but there's no change on master that's not on this branch so this merges back cleanly.

See notes on microbit-foundation/microbit-android#49

Author: microbit-matt-hillsdon

.gitignore

@@ -87,3 +87,11 @@ lint/tmp/
 # Android Profiling
 *.hprof
 
+# OS-specific files
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+ehthumbs.db
+Thumbs.db

build.gradle

@@ -1,11 +1,11 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 29
+    compileSdk 34
 
     defaultConfig {
         minSdkVersion 19
-        targetSdkVersion 29
+        targetSdk 33
     }
 
     buildTypes {
@@ -14,12 +14,16 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
         }
     }
+    namespace 'org.microbit.partialflashing'
+    lint {
+        abortOnError false
+    }
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.android.support:support-annotations:+'
-    implementation "com.android.support:appcompat-v7:23.0.0"
+    implementation 'com.android.support:support-annotations:28.0.0'
+    implementation 'com.android.support:appcompat-v7:28.0.0'
 }
 
 

src/main/AndroidManifest.xml

@@ -1,8 +1,10 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.microbit.partialflashing"
-    android:versionCode="1"
-    android:versionName="1.1" >
+    android:versionCode="57"
+    android:versionName="3.0.7" >
 
-    <uses-permission android:name="android.permission.BLUETOOTH" />
-    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+    <uses-permission android:name="android.permission.BLUETOOTH" android:maxSdkVersion="30" />
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" android:maxSdkVersion="30"/>
+
+    <!-- API 31 Needed only if your app communicates with already-paired Bluetooth devices. -->
+    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
 </manifest>

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

@@ -124,7 +124,66 @@ public int searchForDataRegEx(String search) throws IOException {
         // Return -1 if no match
         return -1;
     }
-    
+
+    /*
+     * A function to search for an address in a hex file
+     * @param search the address to search for
+     * @return the index of the address. -1 if not found.
+     */
+    public int searchForAddress( long address) throws IOException {
+        long lastBaseAddr = 0;
+        String data;
+        // Iterate through
+        ListIterator i = hexLines.listIterator();
+        while ( i.hasNext()) {
+            // Have to call nextIndex() before next()
+            int index = i.nextIndex();
+            String line = i.next().toString();
+
+            switch (getRecordType(line)) {
+                case 2: {               // Extended Segment Address
+                    data = getRecordData(line);
+                    if ( data.length() != 4) {
+                        return -1;
+                    }
+                    int hi = Integer.parseInt( data.substring(0, 1), 16);
+                    int lo = Integer.parseInt( data.substring(1), 16);
+                    lastBaseAddr = (long) hi * (long) 0x1000 + (long) lo * (long) 0x10;
+                    if ( lastBaseAddr > address) {
+                        return -1;
+                    }
+                    break;
+                }
+                case 4: {
+                    data = getRecordData(line);
+                    if ( data.length() != 4) {
+                        return -1;
+                    }
+                    lastBaseAddr = Integer.parseInt( data, 16);
+                    lastBaseAddr *= (long) 0x10000;
+                    if ( lastBaseAddr > address) {
+                        return -1;
+                    }
+                    break;
+                }
+                case 0:
+                case 0x0D: {
+                    if ( address - lastBaseAddr < 0x10000) {
+                        long a = lastBaseAddr + getRecordAddress(line);
+                        int  n = getRecordDataLength( line) / 2; // bytes
+                        if ( a <= address && a + n > address) {
+                            return index;
+                        }
+                    }
+                    break;
+                }
+            }
+        }
+
+        // Return -1 if no match
+        return -1;
+    }
+
     /*
      * Returns data from an index
      * @param index
@@ -267,6 +326,5 @@ public static byte[] recordToByteArray(String hexString, int offset, int packetN
 
         return data;
     }
-
 }