Merge branch 'jensck/b5som_support'

particle-iot · Jun 16, 2020 · 7098fc3 · 7098fc3
2 parents 5e7d12d + 69362a7
commit 7098fc3
Show file tree

Hide file tree

Showing 39 changed files with 998 additions and 118 deletions.
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -30,8 +30,8 @@ android {
         minSdkVersion 21
         targetSdkVersion 28
         // scheme for these version numbers: EPOCH MAJOR MINOR PATCH BUILD
-        versionCode 1_03_00_02_00
-        versionName  "3.0.2"
+        versionCode 1_03_01_00_03
+        versionName  "3.1.0"
 
         vectorDrawables.useSupportLibrary = false  // no need for this since we're min SDK=21
 
@@ -65,6 +65,11 @@ android {
     androidExtensions {
         experimental = true
     }
+
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+
 }
 
 

diff --git a/app/src/main/java/io/particle/android/sdk/ui/FlashAppHelper.kt b/app/src/main/java/io/particle/android/sdk/ui/FlashAppHelper.kt
@@ -8,6 +8,7 @@ import androidx.fragment.app.FragmentActivity
 import io.particle.android.sdk.cloud.ParticleDevice
 import io.particle.android.sdk.cloud.ParticleDevice.ParticleDeviceType.ARGON
 import io.particle.android.sdk.cloud.ParticleDevice.ParticleDeviceType.A_SOM
+import io.particle.android.sdk.cloud.ParticleDevice.ParticleDeviceType.B5_SOM
 import io.particle.android.sdk.cloud.ParticleDevice.ParticleDeviceType.BLUZ
 import io.particle.android.sdk.cloud.ParticleDevice.ParticleDeviceType.BORON
 import io.particle.android.sdk.cloud.ParticleDevice.ParticleDeviceType.B_SOM
@@ -44,6 +45,7 @@ fun flashTinkerWithDialog(
         ARGON -> R.raw.tinker_firmware_080_rc27_argon
         BORON -> R.raw.tinker_firmware_080_rc27_boron
         XENON -> R.raw.tinker_firmware_080_rc27_xenon
+        B5_SOM -> R.raw.b5som_tinker_1_4_5_b5som_2
 
         CORE -> {
             flashKnownAppWithDialog(activity, device, ParticleDevice.KnownApp.TINKER)

diff --git a/app/src/main/java/io/particle/android/sdk/ui/devicelist/DeviceListTransformer.kt b/app/src/main/java/io/particle/android/sdk/ui/devicelist/DeviceListTransformer.kt
@@ -4,6 +4,7 @@ import io.particle.android.sdk.cloud.ParticleDevice
 import io.particle.android.sdk.cloud.ParticleDevice.ParticleDeviceType
 import io.particle.android.sdk.cloud.ParticleDevice.ParticleDeviceType.ARGON
 import io.particle.android.sdk.cloud.ParticleDevice.ParticleDeviceType.A_SOM
+import io.particle.android.sdk.cloud.ParticleDevice.ParticleDeviceType.B5_SOM
 import io.particle.android.sdk.cloud.ParticleDevice.ParticleDeviceType.BORON
 import io.particle.android.sdk.cloud.ParticleDevice.ParticleDeviceType.B_SOM
 import io.particle.android.sdk.cloud.ParticleDevice.ParticleDeviceType.ELECTRON
@@ -37,7 +38,7 @@ enum class OnlineStatusFilter {
 }
 
 enum class DeviceTypeFilter {
-    BORON,    // also B SoM
+    BORON,    // also B SoM/B5 SoM
     ELECTRON, // also E SoM
     ARGON,    // also A SoM
     PHOTON,   // also P1
@@ -102,6 +103,7 @@ private fun ParticleDeviceType?.toDeviceTypeFilter(): DeviceTypeFilter {
         ARGON -> DeviceTypeFilter.ARGON
 
         B_SOM,
+        B5_SOM,
         BORON -> DeviceTypeFilter.BORON
 
         PHOTON,

diff --git a/app/src/main/res/raw/b5som_tinker_1_4_5_b5som_2.bin b/app/src/main/res/raw/b5som_tinker_1_4_5_b5som_2.bin