support v2 microbits

Author: microbit-sam

.idea/gradle.xml

@@ -15,8 +15,8 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.samsung.microbit"
-          android:versionCode="27"
-          android:versionName="2.6">
+          android:versionCode="29"
+          android:versionName="2.8">
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>

app/src/main/AndroidManifest.xml

@@ -1422,6 +1422,7 @@ private void startPairingSecureBle(BluetoothDevice device) {
         } else {
             logi("device.createBond returns " + device.createBond());
         }
+        device.createBond();
     }
 
     @Override

app/src/main/java/com/samsung/microbit/ui/activity/PairingActivity.java

@@ -1130,6 +1130,17 @@ protected void startFlashing(int flashingType) {
         String hexAbsolutePath = ret[0];
         int applicationSize = Integer.parseInt(ret[1]);
 
+        if(applicationSize == -1) {
+            // V1 Hex on a V2
+            PopUp.show(getString(R.string.v1_hex_v2_hardware),
+                    "",
+                    R.drawable.message_face, R.drawable.red_btn,
+                    PopUp.GIFF_ANIMATION_ERROR,
+                    TYPE_ALERT,
+                    null, null);
+            return;
+        }
+
         // If V2 create init packet
         String initPacketAbsolutePath = "-1";
         if(hardwareType == MICROBIT_V2) {
@@ -1143,7 +1154,7 @@ protected void startFlashing(int flashingType) {
             }
         }
 
-        if(flashingType == FLASH_TYPE_DFU) {
+        if(flashingType == FLASH_TYPE_DFU || hardwareType == MICROBIT_V2) {
 
             // Start DFU Service
             Log.v(TAG, "Start Full DFU");
@@ -1358,7 +1369,7 @@ private String[] universalHexToDFU(String inputPath, int hardwareType) {
 
                         int lower_bound = 0; int upper_bound = 0;
                         if(hardwareType == MICROBIT_V1) { lower_bound = 0x18000; upper_bound = 0x38000; }
-                        if(hardwareType == MICROBIT_V2) { lower_bound = 0x27000; upper_bound = 0x70000; }
+                        if(hardwareType == MICROBIT_V2) { lower_bound = 0x27000; upper_bound = 0x71FFF; }
 
                         if ((records_wanted || !is_fat) && b_addr >= lower_bound && b_addr < upper_bound) {
                             outputHex.write(bs, b_x, next);
@@ -1386,7 +1397,6 @@ private String[] universalHexToDFU(String inputPath, int hardwareType) {
             byte[] output = outputHex.toByteArray();
             Log.v(TAG, "Finished parsing HEX. Writing application HEX for flashing");
 
-
             try {
                 File hexToFlash = new File(this.getCacheDir() + "/application.hex");
                 if (hexToFlash.exists()) {
@@ -1404,6 +1414,10 @@ private String[] universalHexToDFU(String inputPath, int hardwareType) {
                 ret[0] = hexToFlash.getAbsolutePath();
                 ret[1] = Integer.toString(application_size);
 
+                if(hardwareType == MICROBIT_V2 && is_fat == false) {
+                    ret[1] = Integer.toString(-1); // Invalidate hex file
+                }
+
                 return ret;
             } catch (IOException e) {
                 e.printStackTrace();

app/src/main/java/com/samsung/microbit/ui/activity/ProjectActivity.java

@@ -248,6 +248,7 @@
     <string name="init_connection">Connecting to micro:bit</string>
     <string name="disconnecting">Disconnecting from micro:bit</string>
     <string name="dfu_status_starting_msg">Initializing flashing process&#8230;</string>
+    <string name="v1_hex_v2_hardware">This hex file is not compatible with V2 hardware\nPlease re-download it from MakeCode</string>
     <string name="multple_flashing_session_msg">A project is currently being flashed. Wait for it to complete!</string>
     <string name="internal_error_msg">Internal error. Please try again</string>
     <string name="no_device_paired">Cannot connect.  No micro:bit paired</string>