ST BLE Sensor 4.4.3 Source code

add demos support for the SensorTile.box

Author: GiovanniVisentiniST

BlueMS/build.gradle

@@ -60,10 +60,10 @@ android {
     defaultConfig {
 
         minSdkVersion rootProject.ext.minSdkVersion
-        versionCode 30
-        versionName '4.3.0'
-        applicationId "com.st.bluems"
         targetSdkVersion rootProject.ext.targetSdkVersion
+        versionCode 34
+        versionName '4.4.3'
+        applicationId "com.st.bluems"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
         multiDexEnabled true
@@ -115,10 +115,7 @@ android {
 }
 
 ext {
-    leakcanaryVersion = '1.5.4'
-    retrofitVersion = '2.4.0'
-    roomVersion = "1.1.1"
-    archLifecycleVersion = '1.1.1'
+    leakcanaryVersion = '1.6.3'
 }
 
 repositories {
@@ -134,8 +131,6 @@ dependencies {
 
     implementation 'com.github.PhilJay:MPAndroidChart:v3.0.3'
 
-    implementation 'com.github.PhilJay:MPAndroidChart:v3.0.3'
-
     implementation 'com.android.support:multidex:1.0.3'
 
     implementation group: 'com.android.support', name: 'design', version: "$rootProject.supportLibraryVersion"
@@ -145,8 +140,8 @@ dependencies {
     implementation group: 'com.android.support', name: 'cardview-v7', version: "$rootProject.supportLibraryVersion"
     implementation group: 'com.android.support.constraint', name: 'constraint-layout', version: "$rootProject.constraintLayoutVersion"
 
-    implementation "android.arch.persistence.room:runtime:$roomVersion"
-    annotationProcessor "android.arch.persistence.room:compiler:$roomVersion"
+    implementation "android.arch.persistence.room:runtime:$rootProject.roomVersion"
+    annotationProcessor "android.arch.persistence.room:compiler:$rootProject.roomVersion"
 
     // Lifecycle components
     implementation "android.arch.lifecycle:extensions:$rootProject.archLifecycleVersion"
@@ -155,9 +150,8 @@ dependencies {
     // ibm speech to text
     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.13.1'
-
+    //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'
 
     //memory leak detector
     debugImplementation group: 'com.squareup.leakcanary', name: 'leakcanary-android', version: "$leakcanaryVersion"
@@ -172,5 +166,4 @@ dependencies {
     androidTestImplementation "com.android.support.test:runner:$rootProject.runnerVersion"
     androidTestImplementation "com.android.support.test:rules:$rootProject.rulesVersion"
     androidTestImplementation "com.android.support.test.espresso:espresso-core:$rootProject.espressoVersion"
-}
-
+}

BlueMS/src/main/AndroidManifest.xml

@@ -40,7 +40,8 @@
     <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.INTERNET" />
-    <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.ACCESS_NETWORK_STATE" />
+    <!-- Memes Sensor Fusion vibrate when a free fall is detected -->
     <uses-permission android:name="android.permission.VIBRATE" />
 
     <uses-feature
@@ -57,6 +58,11 @@
         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"/>
+
         <service
             android:name=".demos.fftAmpitude.FFTExportedService"
             android:exported="false"></service>
@@ -165,9 +171,6 @@
             </intent-filter>
         </receiver>
 
-        <service
-            android:name=".demos.Cloud.DownloadFwFileService"
-            android:exported="false" />
         <service
             android:name=".demos.aiDataLog.SessionAnnotationLoggingService"
             android:exported="false" />

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

@@ -39,6 +39,7 @@
 
 import android.content.Context;
 import android.content.Intent;
+import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -57,6 +58,7 @@
 import com.st.BlueMS.demos.SDLog.SDLogFragment;
 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.memsSensorFusion.CompassFragment;
 import com.st.BlueMS.demos.EnvironmentalSensorsFragment;
 import com.st.BlueMS.demos.HeartRateFragment;
@@ -69,12 +71,14 @@
 import com.st.BlueMS.demos.ProximityGestureRecognitionFragment;
 import com.st.BlueMS.demos.Audio.DirOfArrival.SourceLocFragment;
 import com.st.BlueMS.demos.SwitchFragment;
+import com.st.BlueMS.demos.motionAlgorithm.MotionAlgorithmFragment;
 import com.st.BlueMS.preference.nucleo.SettingsWithNucleoConfiguration;
 import com.st.BlueSTSDK.Debug;
 import com.st.BlueSTSDK.Node;
 import com.st.BlueSTSDK.Utils.ConnectionOption;
 import com.st.BlueSTSDK.gui.demos.DemoDescriptionAnnotation;
 import com.st.BlueSTSDK.gui.demos.DemoFragment;
+import com.st.BlueSTSDK.gui.fwUpgrade.download.DownloadFwFileCompletedReceiver;
 import com.st.STM32WB.fwUpgrade.feature.RebootOTAModeFeature;
 import com.st.STM32WB.p2pDemo.feature.FeatureControlLed;
 import com.st.STM32WB.p2pDemo.feature.FeatureSwitchStatus;
@@ -124,7 +128,7 @@ public static class LedButtonControlFragment extends com.st.STM32WB.p2pDemo.LedB
      * for the demo it will displayed
      */
     @SuppressWarnings("unchecked")
-    private final static Class<? extends DemoFragment> ALL_DEMOS[] = new Class[]{
+    private final static Class<? extends DemoFragment>[] ALL_DEMOS = new Class[]{
             EnvironmentalSensorsFragment.class,
             MemsSensorFusionFragment.class,
             FFTAmplitudeFragment.class,
@@ -152,18 +156,15 @@ public static class LedButtonControlFragment extends com.st.STM32WB.p2pDemo.LedB
             AIDataLogDemoFragment.class,
             CloudLogFragment.class,
             PredictiveMaintenanceFragment.class,
+            MotionAlgorithmFragment.class,
+            FitnessActivityFragment.class,
             NodeStatusFragment.class
             //FeatureDebugFragment.class
     };
 
     @SuppressWarnings("unchecked")
     @Override
     protected Class<? extends DemoFragment>[] getAllDemos() {
-        if(getNode().getType() == Node.Type.STEVAL_BCN002V1){
-            ArrayList<Class<? extends DemoFragment>> demoList = new ArrayList<>(Arrays.asList(ALL_DEMOS));
-            demoList.remove(SpeechToTextFragment.class);
-            return demoList.toArray(new Class[demoList.size()]);
-        }
         return ALL_DEMOS;
     }
 

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

@@ -37,6 +37,8 @@
 
 package com.st.BlueMS;
 
+import android.support.annotation.NonNull;
+
 import com.st.BlueNRG.fwUpgrade.BlueNRGAdvertiseFilter;
 import com.st.BlueNRG.fwUpgrade.feature.BlueNRGOTASupport;
 import com.st.BlueSTSDK.Features.standardCharacteristics.StdCharToFeatureMap;
@@ -56,7 +58,7 @@
 public class NodeListActivity extends com.st.BlueSTSDK.gui.NodeListActivity {
 
     @Override
-    public boolean displayNode(Node n) {
+    public boolean displayNode(@NonNull Node n) {
         return true;
     }
 
@@ -68,7 +70,7 @@ protected List<AdvertiseFilter> buildAdvertiseFilter() {
     }
 
     @Override
-    public void onNodeSelected(Node n) {
+    public void onNodeSelected(@NonNull Node n) {
 
         ConnectionOption.ConnectionOptionBuilder optionsBuilder = ConnectionOption.builder()
                 .resetCache(clearCacheIsSelected())
@@ -88,7 +90,7 @@ public void onNodeSelected(Node n) {
         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));
+            startActivity(FwUpgradeSTM32WBActivity.getStartIntent(this, n,null,null,null));
         }else {
             startActivity(DemosActivity.getStartIntent(this, n, options));
         }

BlueMS/src/main/java/com/st/BlueMS/demos/AccEvent/AccEventFragment.java

@@ -131,7 +131,7 @@ private static DetectableEvent[] getDetectableEvent(Node.Type type){
             case BLUE_COIN:
             case NUCLEO:
                 return NUCLEO_SUPPORTED_EVENT;
-            case SENSOR_TILE_101:
+            case SENSOR_TILE_BOX:
                 return SENSORTILE101_SUPPORTED_EVENT;
             default:
                 return new DetectableEvent[0];
@@ -154,7 +154,7 @@ private static DetectableEvent getDefaultEvent(Node.Type type){
             case SENSOR_TILE:
             case BLUE_COIN:
             case NUCLEO:
-            case SENSOR_TILE_101:
+            case SENSOR_TILE_BOX:
                 return DetectableEvent.ORIENTATION;
             default:
                 return DetectableEvent.NONE;

BlueMS/src/main/java/com/st/BlueMS/demos/ActivityRecognition/ActivityView.java

@@ -1,3 +1,40 @@
+/*
+ * Copyright (c) 2019  STMicroelectronics – All rights reserved
+ * The STMicroelectronics corporate logo is a trademark of STMicroelectronics
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * - Redistributions of source code must retain the above copyright notice, this list of conditions
+ *   and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above copyright notice, this list of
+ *   conditions and the following disclaimer in the documentation and/or other materials provided
+ *   with the distribution.
+ *
+ * - Neither the name nor trademarks of STMicroelectronics International N.V. nor any other
+ *   STMicroelectronics company nor the names of its contributors may be used to endorse or
+ *   promote products derived from this software without specific prior written permission.
+ *
+ * - All of the icons, pictures, logos and other images that are provided with the source code
+ *   in a directory whose title begins with st_images may only be used for internal purposes and
+ *   shall not be redistributed to any third party or modified in any way.
+ *
+ * - Any redistributions in binary form shall not include the capability to display any of the
+ *   icons, pictures, logos and other images that are provided with the source code in a directory
+ *   whose title begins with st_images.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
+
 package com.st.BlueMS.demos.ActivityRecognition;
 
 import android.content.Context;

BlueMS/src/main/java/com/st/BlueMS/demos/ActivityRecognition/HumanActivityRecognitionGMPView.java

@@ -1,3 +1,40 @@
+/*
+ * Copyright (c) 2019  STMicroelectronics – All rights reserved
+ * The STMicroelectronics corporate logo is a trademark of STMicroelectronics
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * - Redistributions of source code must retain the above copyright notice, this list of conditions
+ *   and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above copyright notice, this list of
+ *   conditions and the following disclaimer in the documentation and/or other materials provided
+ *   with the distribution.
+ *
+ * - Neither the name nor trademarks of STMicroelectronics International N.V. nor any other
+ *   STMicroelectronics company nor the names of its contributors may be used to endorse or
+ *   promote products derived from this software without specific prior written permission.
+ *
+ * - All of the icons, pictures, logos and other images that are provided with the source code
+ *   in a directory whose title begins with st_images may only be used for internal purposes and
+ *   shall not be redistributed to any third party or modified in any way.
+ *
+ * - Any redistributions in binary form shall not include the capability to display any of the
+ *   icons, pictures, logos and other images that are provided with the source code in a directory
+ *   whose title begins with st_images.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
+
 package com.st.BlueMS.demos.ActivityRecognition;
 
 import android.content.Context;

BlueMS/src/main/java/com/st/BlueMS/demos/ActivityRecognition/HumanActivityRecognitionIGNView.java

@@ -1,3 +1,39 @@
+/*
+ * Copyright (c) 2019  STMicroelectronics – All rights reserved
+ * The STMicroelectronics corporate logo is a trademark of STMicroelectronics
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * - Redistributions of source code must retain the above copyright notice, this list of conditions
+ *   and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above copyright notice, this list of
+ *   conditions and the following disclaimer in the documentation and/or other materials provided
+ *   with the distribution.
+ *
+ * - Neither the name nor trademarks of STMicroelectronics International N.V. nor any other
+ *   STMicroelectronics company nor the names of its contributors may be used to endorse or
+ *   promote products derived from this software without specific prior written permission.
+ *
+ * - All of the icons, pictures, logos and other images that are provided with the source code
+ *   in a directory whose title begins with st_images may only be used for internal purposes and
+ *   shall not be redistributed to any third party or modified in any way.
+ *
+ * - Any redistributions in binary form shall not include the capability to display any of the
+ *   icons, pictures, logos and other images that are provided with the source code in a directory
+ *   whose title begins with st_images.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 package com.st.BlueMS.demos.ActivityRecognition;
 
 import android.content.Context;

BlueMS/src/main/java/com/st/BlueMS/demos/ActivityRecognition/MotionARView.java

@@ -1,3 +1,39 @@
+/*
+ * Copyright (c) 2019  STMicroelectronics – All rights reserved
+ * The STMicroelectronics corporate logo is a trademark of STMicroelectronics
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * - Redistributions of source code must retain the above copyright notice, this list of conditions
+ *   and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above copyright notice, this list of
+ *   conditions and the following disclaimer in the documentation and/or other materials provided
+ *   with the distribution.
+ *
+ * - Neither the name nor trademarks of STMicroelectronics International N.V. nor any other
+ *   STMicroelectronics company nor the names of its contributors may be used to endorse or
+ *   promote products derived from this software without specific prior written permission.
+ *
+ * - All of the icons, pictures, logos and other images that are provided with the source code
+ *   in a directory whose title begins with st_images may only be used for internal purposes and
+ *   shall not be redistributed to any third party or modified in any way.
+ *
+ * - Any redistributions in binary form shall not include the capability to display any of the
+ *   icons, pictures, logos and other images that are provided with the source code in a directory
+ *   whose title begins with st_images.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 package com.st.BlueMS.demos.ActivityRecognition;
 
 import android.content.Context;