ST BLE Sensor v4.6.1 source code

add support for opus streaming mobilde -> board
add support for MLC / FSM demos

Author: GiovanniVisentiniST

.gitignore

@@ -33,3 +33,8 @@ proguard/
 
 #mac file
 .DS_Store
+
+#hprof file
+*.hprof
+
+!gradle.properties

BlueMS/build.gradle

@@ -36,6 +36,8 @@
  */
 
 apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-android'
 
 static def getDate() {
     def date = new Date()
@@ -61,8 +63,8 @@ android {
 
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 37
-        versionName '4.5.2'
+        versionCode 40
+        versionName '4.6.1'
         applicationId "com.st.bluems"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
@@ -109,6 +111,11 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+
     packagingOptions {
         exclude "thirdpartynotice.txt"
     }
@@ -120,9 +127,28 @@ ext {
 
 repositories {
     maven { url 'https://jitpack.io' }
+    mavenCentral()
 }
 
 dependencies {
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutineVersion"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_coroutineAndroidVersion"
+
+    components.all {
+        allVariants {
+            withDependencies { deps ->
+                deps.each { dep ->
+                    if (dep.group == 'org.eclipse.paho' && dep.name =='org.eclipse.paho.client.mqttv3') {
+                        dep.version {
+                            require "1.2.0"
+                        }
+                        dep.because "require api 24: https://github.com/eclipse/paho.mqtt.java/issues/633"
+                    }
+                }
+            }
+        }
+    }
 
     implementation project(':BlueSTSDK')
     implementation project(':BlueSTSDK_Gui_Android')
@@ -147,22 +173,23 @@ dependencies {
     annotationProcessor group:'androidx.room', name:'room-compiler', version: "$rootProject.androidx_roomVersion"
 
     // Lifecycle components
-    implementation group: 'androidx.lifecycle', name: 'lifecycle-viewmodel-ktx', version: "$rootProject.androidx_lifecycleExtVersion"
     implementation group: 'androidx.lifecycle', name: 'lifecycle-extensions', version: "$rootProject.androidx_lifecycleExtVersion"
+    implementation group: 'androidx.lifecycle', name: 'lifecycle-viewmodel-ktx', version: "$rootProject.androidx_lifecycleExtVersion"
+    implementation group: 'androidx.lifecycle', name: 'lifecycle-viewmodel-savedstate', version: "$rootProject.androidx_lifecycleSaveStateVersion"
+
 
     // ibm speech to text
-    implementation(group: 'com.ibm.watson', name: 'speech-to-text', version: '8.0.0'){
+    implementation(group: 'com.ibm.watson', name: 'speech-to-text', version: '8.1.0'){
         exclude group: 'com.google.code.findbugs', module: 'annotations'
     }
 
-
-    //generic websocket speech to cloud, keep 3.12.x to be compatible with device < api 21
-    implementation group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.12.2'
+    //use the v 3.11 to avoid chrash with ibm
+    implementation group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.11.0'
 
     // crashlytics
     implementation group: 'com.crashlytics.sdk.android', name: 'crashlytics', version: '2.10.1'
     //keep the 16.x to avoid android x to avoid new support library that will break the plot
-    implementation group: 'com.google.firebase', name: 'firebase-core', version: '17.2.0'
+    implementation group: 'com.google.firebase', name: 'firebase-core', version: '17.2.1'
 
     //memory leak detector
     debugImplementation group: 'com.squareup.leakcanary', name: 'leakcanary-android', version: "$leakcanaryVersion"
@@ -178,8 +205,6 @@ dependencies {
     androidTestImplementation group:'androidx.test', name:'rules', version:"$rootProject.androidx_rulesVersion"
     androidTestImplementation group:'androidx.test.espresso', name: 'espresso-core', version:"$rootProject.androidx_espressoVersion"
 
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-
 }
 
 apply plugin: 'kotlin-android'

BlueMS/proguard-rules.pro

@@ -16,37 +16,20 @@
 #   public *;
 #}
 
--keep class com.androidplot.xy.** { *; }
--keep class com.androidplot.ui.** { *; }
-
-#retrofit proguard rules http://square.github.io/retrofit/
-# Platform calls Class.forName on types which do not exist on Android to determine platform.
--dontnote retrofit2.Platform
-# Platform used when running on Java 8 VMs. Will not be used at runtime
--dontwarn retrofit2.Platform$Java8
-# Retain generic type information for use by reflection by converters and adapters.
--keepattributes Signature
-# Retain declared checked exceptions for use by a Proxy instance.
--keepattributes Exceptions
-#retrofit 2.3 & co
--dontwarn javax.annotation.**
--dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement
-
 #ibm watson
 #keep the class member name to avoid problems with json to java objects
--keepclassmembers class com.ibm.watson.developer_cloud.speech_to_text.v1.** { <fields>; }
+-keepclassmembers class com.ibm.watson.speech_to_text.v1.** { <fields>; }
 #ingore warnings about class that do not exist in android
 -dontwarn javax.naming.InitialContext
 -dontwarn javax.naming.Context
 
 #need for okhttp (audio websocket)
 # https://github.com/square/okhttp/blob/master/okhttp/src/main/resources/META-INF/proguard/okhttp3.pro
 # JSR 305 annotations are for embedding nullability information.
--dontwarn javax.annotation.**
-
+#-dontwarn javax.annotation.**
 # A resource is loaded with a relative path so the package of this class must be preserved.
--keepnames class okhttp3.internal.publicsuffix.PublicSuffixDatabase
+#-keepnames class okhttp3.internal.publicsuffix.PublicSuffixDatabase
 # Animal Sniffer compileOnly dependency to ensure APIs are compatible with older versions of Java.
--dontwarn org.codehaus.mojo.animal_sniffer.*
+#-dontwarn org.codehaus.mojo.animal_sniffer.*
 # OkHttp platform used only on JVM and when Conscrypt dependency is available.
--dontwarn okhttp3.internal.platform.ConscryptPlatform
+#-dontwarn okhttp3.internal.platform.ConscryptPlatform

BlueMS/src/main/AndroidManifest.xml

@@ -44,9 +44,11 @@
     <!-- Memes Sensor Fusion vibrate when a free fall is detected -->
     <uses-permission android:name="android.permission.VIBRATE" />
 
+    <!-- needed for the Sensor fusion demo demos -->
     <uses-feature
         android:glEsVersion="0x00020000"
-        android:required="true" /> <!-- needed for the BlueVoice demos -->
+        android:required="true" />
+    <!-- needed for the BlueVoice demos -->
     <uses-feature
         android:name="android.hardware.audio.low_latency"
         android:required="false" />
@@ -57,11 +59,10 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:logo="@drawable/app_logo"
-        android:theme="@style/AppTheme">
-        <!-- thanks to iFlytek library
-         https://developer.android.com/about/versions/pie/android-9.0-changes-28#apache-p
-         -->
-        <uses-library android:name="org.apache.http.legacy" android:required="false"/>
+        android:theme="@style/AppTheme"
+        android:requestLegacyExternalStorage="true"
+        >
+        <!-- requestLegacyExternalStorage = true to disable the scoped storage on android 10 -->
 
         <service
             android:name=".demos.fftAmpitude.FFTExportedService"

BlueMS/src/main/assets/ST_demoSong.opus

@@ -41,12 +41,15 @@
 import android.content.Intent;
 import android.os.Bundle;
 import androidx.annotation.NonNull;
+
+import android.util.Log;
 import android.view.MenuItem;
 
 import com.st.BlueMS.demos.AccEvent.AccEventFragment;
 import com.st.BlueMS.demos.ActivityRecognition.ActivityRecognitionFragment;
 import com.st.BlueMS.demos.Audio.Beamforming.BeamformingFragment;
 import com.st.BlueMS.demos.Audio.BlueVoice.BlueVoiceFragment;
+import com.st.BlueMS.demos.Audio.BlueVoice.fullBand.BlueVoiceFullBandFragment;
 import com.st.BlueMS.demos.Audio.SpeechToText.SpeechToTextFragment;
 import com.st.BlueMS.demos.AudioClassification.AudioClassificationFragment;
 import com.st.BlueMS.demos.COSensor.COSensorDemoFragment;
@@ -58,6 +61,8 @@
 import com.st.BlueMS.demos.aiDataLog.AIDataLogDemoFragment;
 import com.st.BlueMS.demos.fftAmpitude.FFTAmplitudeFragment;
 import com.st.BlueMS.demos.fitnessActivity.FitnessActivityFragment;
+import com.st.BlueMS.demos.machineLearningCore.FiniteStateMachineFragment;
+import com.st.BlueMS.demos.machineLearningCore.MachineLearningCoreFragment;
 import com.st.BlueMS.demos.memsSensorFusion.CompassFragment;
 import com.st.BlueMS.demos.EnvironmentalSensorsFragment;
 import com.st.BlueMS.demos.HeartRateFragment;
@@ -73,7 +78,11 @@
 import com.st.BlueMS.demos.multiNN.MultiNeuralNetworkFragment;
 import com.st.BlueMS.demos.plot.PlotFeatureFragment;
 import com.st.BlueMS.preference.nucleo.SettingsWithNucleoConfiguration;
+import com.st.BlueSTSDK.Debug;
+import com.st.BlueSTSDK.ExportedFeature;
+import com.st.BlueSTSDK.Features.Audio.Opus.ExportedFeatureAudioOpus;
 import com.st.BlueSTSDK.Node;
+import com.st.BlueSTSDK.NodeServer;
 import com.st.BlueSTSDK.Utils.ConnectionOption;
 import com.st.BlueSTSDK.gui.demos.DemoDescriptionAnnotation;
 import com.st.BlueSTSDK.gui.demos.DemoFragment;
@@ -85,6 +94,11 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
 /**
  * Activity that display all the demo available for the node
  */
@@ -133,6 +147,7 @@ public static class LedButtonControlFragment extends com.st.STM32WB.p2pDemo.LedB
             FFTAmplitudeFragment.class,
             PlotFeatureFragment.class,
             SDLogFragment.class,
+            MultiNeuralNetworkFragment.class,
             ActivityRecognitionFragment.class,
             CarryPositionFragment.class,
             ProximityGestureRecognitionFragment.class,
@@ -153,27 +168,51 @@ public static class LedButtonControlFragment extends com.st.STM32WB.p2pDemo.LedB
             LedButtonControlFragment.class,
             StartOtaRebootFragment.class,
             AIDataLogDemoFragment.class,
-            MultiNeuralNetworkFragment.class,
             CloudLogFragment.class,
             PredictiveMaintenanceFragment.class,
             MotionAlgorithmFragment.class,
             FitnessActivityFragment.class,
+            MachineLearningCoreFragment.class,
+            FiniteStateMachineFragment.class,
             NodeStatusFragment.class,
             //FeatureDebugFragment.class
     };
 
     @SuppressWarnings("unchecked")
     @Override
     protected Class<? extends DemoFragment>[] getAllDemos() {
-        return ALL_DEMOS;
+        ArrayList<Class<? extends DemoFragment>> demoList = new ArrayList<>(Arrays.asList(ALL_DEMOS));
+        if(getNode().getType() == Node.Type.STEVAL_BCN002V1){
+            demoList.remove(SpeechToTextFragment.class);
+        }
+
+        List<Class<? extends DemoFragment>> serverDemos = getServerSizeDemos();
+        if(!serverDemos.isEmpty()) {
+            demoList.addAll(0,serverDemos);
+        }
+        return demoList.toArray(new Class[0]);
+    }
+
+    private List<Class<? extends DemoFragment>> getServerSizeDemos(){
+        NodeServer server = getNode().getNodeServer();
+        if(server == null){
+            return Collections.emptyList();
+        }
+        ArrayList<Class<? extends DemoFragment>> demos = new ArrayList<>();
+
+        ExportedFeature opusAudio = server.getExportedFeature(ExportedFeatureAudioOpus.class);
+        if(opusAudio!=null && opusAudio.isNotificationEnabled()){
+            demos.add(BlueVoiceFullBandFragment.class);
+        }
+
+        return demos;
     }
 
     @Override
     protected boolean enableFwUploading() {
         return true;
     }
 
-
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         int id = item.getItemId();
@@ -187,4 +226,48 @@ public boolean onOptionsItemSelected(MenuItem item) {
         return super.onOptionsItemSelected(item);
     }
 
+
+    @Override
+    protected void onStart() {
+        enableServerSideDemo();
+        super.onStart();
+    }
+
+    private ExportedFeature.ExportedFeatureCallback mRefreshDemoList = new ExportedFeature.ExportedFeatureCallback() {
+        @Override
+        public void onNotificationDisabled(@NonNull ExportedFeature onFeature) {
+            Log.d("DEmoActivity","reload demos");
+            reloadDemoList();
+        }
+
+        @Override
+        public void onNotificationEnabled(@NonNull ExportedFeature onFeature) {
+            Log.d("DEmoActivity","reload demos");
+            reloadDemoList();
+        }
+    };
+
+    private void enableServerSideDemo() {
+        NodeServer server = getNode().getNodeServer();
+        if(server == null)
+            return;
+        ExportedFeature f = server.getExportedFeature(ExportedFeatureAudioOpus.class);
+        if(f!=null)
+            f.addListener(mRefreshDemoList);
+    }
+
+    @Override
+    protected void onStop() {
+        disableServerSideDemo();
+        super.onStop();
+    }
+
+    private void disableServerSideDemo() {
+        NodeServer server = getNode().getNodeServer();
+        if(server == null)
+            return;
+        ExportedFeature f = server.getExportedFeature(ExportedFeatureAudioOpus.class);
+        if(f!=null)
+            f.removeListener(mRefreshDemoList);
+    }
 }

BlueMS/src/main/java/com/st/BlueMS/DemosActivity.java

@@ -37,12 +37,14 @@
 
 package com.st.BlueMS;
 
+
 import androidx.annotation.NonNull;
 
 import com.st.BlueNRG.fwUpgrade.BlueNRGAdvertiseFilter;
 import com.st.BlueNRG.fwUpgrade.feature.BlueNRGOTASupport;
 import com.st.BlueSTSDK.Features.standardCharacteristics.StdCharToFeatureMap;
 import com.st.BlueSTSDK.Node;
+import com.st.BlueSTSDK.Utils.BLENodeDefines;
 import com.st.BlueSTSDK.Utils.ConnectionOption;
 import com.st.BlueSTSDK.Utils.advertise.AdvertiseFilter;
 import com.st.BlueSTSDK.gui.fwUpgrade.FwUpgradeActivity;
@@ -85,6 +87,8 @@ public void onNodeSelected(@NonNull Node n) {
 
         ConnectionOption options = optionsBuilder.build();
 
+        n.enableNodeServer(BLENodeDefines.FeatureCharacteristics.getDefaultExportedFeature());
+
         if(n.getAdvertiseInfo() instanceof BlueNRGAdvertiseFilter.BlueNRGAdvertiseInfo)
             startActivity(FwUpgradeActivity.getStartIntent(this, n,false,options));
         else if(n.getType()== Node.Type.STEVAL_WESU1)

BlueMS/src/main/java/com/st/BlueMS/NodeListActivity.java

@@ -86,7 +86,7 @@ public class AccEventFragment extends BaseDemoFragment implements AdapterView.On
             DetectableEvent.WAKE_UP
     };
 
-    private static final DetectableEvent SENSORTILE101_SUPPORTED_EVENT[] = {
+    private static final DetectableEvent SENSORTILEBOX_SUPPORTED_EVENT[] = {
             DetectableEvent.NONE,
             DetectableEvent.ORIENTATION,
             DetectableEvent.DOUBLE_TAP,
@@ -132,7 +132,7 @@ private static DetectableEvent[] getDetectableEvent(Node.Type type){
             case NUCLEO:
                 return NUCLEO_SUPPORTED_EVENT;
             case SENSOR_TILE_BOX:
-                return SENSORTILE101_SUPPORTED_EVENT;
+                return SENSORTILEBOX_SUPPORTED_EVENT;
             default:
                 return new DetectableEvent[0];
         }