ST BLE Sensor v3.4 source code

add predictive mantenance demos
add support for BlueNRG1/2 OTA
add support for the opus codec

Author: GiovanniVisentiniST

.gitmodules

@@ -1,6 +1,6 @@
 [submodule "BlueSTSDK"]
 	path = BlueSTSDK
-	url = https://github.com/STMicroelectronics-CentralLabs/BlueSTSDK_Android.git
+	url = https://github.com/STMicroelectronics/BlueSTSDK_Android.git
 [submodule "BlueSTSDK_Gui_Android"]
 	path = BlueSTSDK_Gui_Android
-	url = https://github.com/STMicroelectronics-CentralLabs/BlueSTSDK_GUI_Android.git
+	url = https://github.com/STMicroelectronics/BlueSTSDK_GUI_Android.git

BlueMS/build.gradle

@@ -58,10 +58,10 @@ android {
     buildToolsVersion rootProject.ext.buildToolsVersion
 
     defaultConfig {
-        //19 since we need the setpin api
-        minSdkVersion 19
-        versionCode 26
-        versionName '4.1.2'
+
+        minSdkVersion rootProject.ext.minSdkVersion
+        versionCode 30
+        versionName '4.3.0'
         applicationId "com.st.bluems"
         targetSdkVersion rootProject.ext.targetSdkVersion
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -73,9 +73,8 @@ android {
             //signingConfig signingConfigs.config
             minifyEnabled true
             shrinkResources true
-            proguardFiles getDefaultProguardFile('proguard-android.txt'),
-                    'proguard-rules.pro',
-                    '../BlueSTSDK/BlueSTSDK/proguard-rules.pro'}
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
         debug {
             applicationIdSuffix ".debug"
             versionNameSuffix "-dev" + getDate()
@@ -110,7 +109,9 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-
+    packagingOptions {
+        exclude "thirdpartynotice.txt"
+    }
 }
 
 ext {
@@ -129,6 +130,9 @@ dependencies {
     implementation fileTree(include: '*.jar', dir: 'libs')
     implementation project(':BlueSTSDK')
     implementation project(':BlueSTSDK_Gui_Android')
+    implementation project(':BlueMSCloud')
+
+    implementation 'com.github.PhilJay:MPAndroidChart:v3.0.3'
 
     implementation 'com.github.PhilJay:MPAndroidChart:v3.0.3'
 
@@ -145,28 +149,15 @@ dependencies {
     annotationProcessor "android.arch.persistence.room:compiler:$roomVersion"
 
     // Lifecycle components
-    implementation "android.arch.lifecycle:extensions:$archLifecycleVersion"
-    annotationProcessor "android.arch.lifecycle:compiler:$archLifecycleVersion"
-
-    //necessary for ProviderInstaller.installIfNeeded for enable tls1.2 on android 4.4@samsung s4
-    implementation group: 'com.google.android.gms', name: 'play-services-base', version: '16.0.1'
-
-    //necessary to cloud demo, for mqtt connection
-    implementation group: 'org.eclipse.paho', name: 'org.eclipse.paho.client.mqttv3', version: '1.2.0'
-    implementation group: 'org.eclipse.paho', name: 'org.eclipse.paho.android.service', version: '1.1.1'
-
-    //necessary to azure iot
-    implementation group: 'com.squareup.retrofit2', name: 'retrofit', version: "$retrofitVersion"
-    implementation group: 'com.squareup.retrofit2', name: 'converter-gson', version: "$retrofitVersion"
-
-    //amazon aws iot
-    implementation group: 'com.amazonaws', name: 'aws-android-sdk-iot', version: "$rootProject.amazonSDKVersion"
+    implementation "android.arch.lifecycle:extensions:$rootProject.archLifecycleVersion"
+    annotationProcessor "android.arch.lifecycle:compiler:$rootProject.archLifecycleVersion"
 
     // ibm speech to text
-    implementation group: 'com.ibm.watson.developer_cloud', name: 'speech-to-text', version: '6.4.0'
+    implementation group: 'com.ibm.watson.developer_cloud', name: 'speech-to-text', version: '6.12.0'
 
     //generic websocket speech to cloud
-    implementation group: 'com.squareup.okhttp3', name:'okhttp', version: '3.11.0'
+    implementation group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.13.1'
+
 
     //memory leak detector
     debugImplementation group: 'com.squareup.leakcanary', name: 'leakcanary-android', version: "$leakcanaryVersion"
@@ -182,3 +173,4 @@ dependencies {
     androidTestImplementation "com.android.support.test:rules:$rootProject.rulesVersion"
     androidTestImplementation "com.android.support.test.espresso:espresso-core:$rootProject.espressoVersion"
 }
+

BlueMS/proguard-rules.pro

@@ -39,7 +39,14 @@
 -dontwarn javax.naming.InitialContext
 -dontwarn javax.naming.Context
 
-#need for okhttp
--dontwarn okhttp3.**
--dontwarn okio.**
+#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.**
+
+# A resource is loaded with a relative path so the package of this class must be preserved.
+-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.*
+# OkHttp platform used only on JVM and when Conscrypt dependency is available.
+-dontwarn okhttp3.internal.platform.ConscryptPlatform

BlueMS/src/main/AndroidManifest.xml

@@ -38,22 +38,14 @@
     package="com.st.BlueMS">
 
     <uses-permission android:name="android.permission.BLUETOOTH" />
-    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
-
-    <!-- needed for the BlueVoice demos -->
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" /> <!-- needed for the BlueVoice demos -->
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <!-- add for paho -->
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-
-    <!-- Memes Sensor Fusion vibrate when a free fall is detected -->
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <!-- Memes Sensor Fusion vibrate when a free fall is detected -->
     <uses-permission android:name="android.permission.VIBRATE" />
 
     <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" />
@@ -65,6 +57,10 @@
         android:label="@string/app_name"
         android:logo="@drawable/app_logo"
         android:theme="@style/AppTheme">
+        <service
+            android:name=".demos.fftAmpitude.FFTExportedService"
+            android:exported="false"></service>
+
         <activity
             android:name=".MainActivity"
             android:configChanges="keyboardHidden|screenSize"
@@ -103,20 +99,6 @@
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="com.st.BlueMS.NodeListActivity" />
         </activity>
-        <activity
-            android:name="com.st.BlueSTSDK.gui.DebugConsoleActivity"
-            android:parentActivityName=".DemosActivity">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="com.st.BlueMS.DemosActivity" />
-        </activity>
-        <activity
-            android:name="com.st.BlueSTSDK.gui.AboutActivity"
-            android:parentActivityName=".MainActivity">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="com.st.BlueMS.MainActivity" />
-        </activity>
         <activity
             android:name=".preference.wesu.SettingsWithWesuRegisters"
             android:label="@string/settings"
@@ -144,12 +126,27 @@
 
             <intent-filter>
                 <action android:name="android.nfc.action.NDEF_DISCOVERED" />
+
                 <category android:name="android.intent.category.DEFAULT" />
+
                 <data android:mimeType="application/com.st.w2stapp" />
             </intent-filter>
+        </activity> <!-- Start: integrate the BlueSTSDK.gui activity in the app, setting the parent activity -->
+        <activity
+            android:name="com.st.BlueSTSDK.gui.DebugConsoleActivity"
+            android:parentActivityName=".DemosActivity">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="com.st.BlueMS.DemosActivity" />
         </activity>
-
-        <!-- Start: integrate the BlueSTSDK.gui activity in the app, setting the parent activity -->
+        <activity
+            android:name="com.st.BlueSTSDK.gui.AboutActivity"
+            android:parentActivityName=".MainActivity">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="com.st.BlueMS.MainActivity" />
+        </activity>
+        <!-- End: integrate the BlueSTSDK.gui activity in the app, setting the parent activity -->
         <activity android:name="com.st.BlueSTSDK.gui.fwUpgrade.FwUpgradeActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
@@ -159,8 +156,7 @@
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="com.st.BlueMS.NodeListActivity" />
-        </activity>
-        <!-- End: integrate the BlueSTSDK.gui activity in the app, setting the parent activity -->
+        </activity> <!-- End: integrate the BlueSTSDK.gui activity in the app, setting the parent activity -->
 
         <receiver android:name=".NfcNodeConnection$InsertPairPin">
             <intent-filter>
@@ -169,15 +165,12 @@
             </intent-filter>
         </receiver>
 
-        <service
-            android:name="org.eclipse.paho.android.service.MqttService"
-            android:enabled="true" />
         <service
             android:name=".demos.Cloud.DownloadFwFileService"
             android:exported="false" />
         <service
             android:name=".demos.aiDataLog.SessionAnnotationLoggingService"
-            android:exported="false"/>
+            android:exported="false" />
     </application>
 
 </manifest>

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

@@ -53,9 +53,10 @@
 import com.st.BlueMS.demos.CarryPositionFragment;
 import com.st.BlueMS.demos.Cloud.CloudLogFragment;
 import com.st.BlueMS.demos.Level.LevelDemoFragment;
+import com.st.BlueMS.demos.PredictiveMaintenance.PredictiveMaintenanceFragment;
 import com.st.BlueMS.demos.SDLog.SDLogFragment;
 import com.st.BlueMS.demos.aiDataLog.AIDataLogDemoFragment;
-import com.st.BlueMS.demos.fftAmpitude.FFTAmplitudePlotFragment;
+import com.st.BlueMS.demos.fftAmpitude.FFTAmplitudeFragment;
 import com.st.BlueMS.demos.memsSensorFusion.CompassFragment;
 import com.st.BlueMS.demos.EnvironmentalSensorsFragment;
 import com.st.BlueMS.demos.HeartRateFragment;
@@ -126,7 +127,7 @@ public static class LedButtonControlFragment extends com.st.STM32WB.p2pDemo.LedB
     private final static Class<? extends DemoFragment> ALL_DEMOS[] = new Class[]{
             EnvironmentalSensorsFragment.class,
             MemsSensorFusionFragment.class,
-            FFTAmplitudePlotFragment.class,
+            FFTAmplitudeFragment.class,
             PlotFeatureFragment.class,
             SDLogFragment.class,
             ActivityRecognitionFragment.class,
@@ -150,6 +151,7 @@ public static class LedButtonControlFragment extends com.st.STM32WB.p2pDemo.LedB
             StartOtaRebootFragment.class,
             AIDataLogDemoFragment.class,
             CloudLogFragment.class,
+            PredictiveMaintenanceFragment.class,
             NodeStatusFragment.class
             //FeatureDebugFragment.class
     };

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

@@ -51,8 +51,8 @@
 
 import com.st.BlueSTSDK.Manager;
 import com.st.BlueSTSDK.Node;
-import com.st.BlueSTSDK.Utils.BleAdvertiseParser;
-import com.st.BlueSTSDK.Utils.InvalidBleAdvertiseFormat;
+import com.st.BlueSTSDK.Utils.BlueSTSDKAdvertiseFilter;
+import com.st.BlueSTSDK.Utils.advertise.BleAdvertiseInfo;
 import com.st.BlueSTSDK.Utils.NodeScanActivity;
 import com.st.BlueSTSDK.Utils.NumberConversion;
 import com.st.BlueSTSDK.Utils.SearchSpecificNode;
@@ -174,11 +174,11 @@ protected void onCreate(Bundle savedInstanceState) {
             int pin = NumberConversion.LittleEndian.bytesToInt32(messagePayload,
                     messagePayload.length-4);
             sPairingPin=pinToByte(pin);
-            try {
-                mNodeTag = new BleAdvertiseParser(messagePayload).getAddress();
-                Log.d("InsertPin", "nodeTag: "+mNodeTag + "Pin: "+pin);
-            } catch (InvalidBleAdvertiseFormat invalidBleAdvertiseFormat) {
+            BleAdvertiseInfo nodeInfo = new BlueSTSDKAdvertiseFilter().filter(messagePayload);
+            if(nodeInfo==null){
                 startNodeListActivityAndFinish(R.string.invalidNfc);
+            }else{
+                mNodeTag = nodeInfo.getAddress();
             }
         }else {
             startNodeListActivityAndFinish(R.string.invalidNfc);

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

@@ -37,13 +37,19 @@
 
 package com.st.BlueMS;
 
+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.ConnectionOption;
+import com.st.BlueSTSDK.Utils.advertise.AdvertiseFilter;
+import com.st.BlueSTSDK.gui.fwUpgrade.FwUpgradeActivity;
 import com.st.STM32WB.fwUpgrade.FwUpgradeSTM32WBActivity;
 import com.st.STM32WB.fwUpgrade.feature.STM32OTASupport;
 import com.st.STM32WB.p2pDemo.Peer2PeerDemoConfiguration;
 
+import java.util.List;
+
 /**
  * Activity that show the list of device found by the manager
  */
@@ -54,13 +60,21 @@ public boolean displayNode(Node n) {
         return true;
     }
 
+    @Override
+    protected List<AdvertiseFilter> buildAdvertiseFilter() {
+        List<AdvertiseFilter> defaultList =  super.buildAdvertiseFilter();
+        defaultList.add(new BlueNRGAdvertiseFilter());
+        return defaultList;
+    }
+
     @Override
     public void onNodeSelected(Node n) {
 
         ConnectionOption.ConnectionOptionBuilder optionsBuilder = ConnectionOption.builder()
                 .resetCache(clearCacheIsSelected())
                 .enableAutoConnect(false)
                 .setFeatureMap(STM32OTASupport.getOTAFeatures())
+                .setFeatureMap(BlueNRGOTASupport.getOTAFeatures())
                 .setFeatureMap(new StdCharToFeatureMap());
 
         if(Peer2PeerDemoConfiguration.isValidDeviceNode(n)){
@@ -69,7 +83,9 @@ public void onNodeSelected(Node n) {
 
         ConnectionOption options = optionsBuilder.build();
 
-        if(n.getType()== Node.Type.STEVAL_WESU1)
+        if(n.getAdvertiseInfo() instanceof BlueNRGAdvertiseFilter.BlueNRGAdvertiseInfo)
+            startActivity(FwUpgradeActivity.getStartIntent(this, n,false,options));
+        else if(n.getType()== Node.Type.STEVAL_WESU1)
             startActivity(DemosActivityWesu.getStartIntent(this,n,options));
         else if (STM32OTASupport.isOTANode(n)){
             startActivity(FwUpgradeSTM32WBActivity.getStartIntent(this, n,null,null));