Skip to content

Commit 82fbced

Browse files
GiovanniVisentiniSTGiovanniVisentiniST
committed
ST BLE Sensor v4.5.2 source code
move to androidX library new plot demo add support to the baby crying demo add multi NN demo
1 parent 5d34161 commit 82fbced

270 files changed

Lines changed: 4931 additions & 3592 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎BlueMS/build.gradle‎

Lines changed: 39 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,10 @@ android {
6161

6262
minSdkVersion rootProject.ext.minSdkVersion
6363
targetSdkVersion rootProject.ext.targetSdkVersion
64-
versionCode 34
65-
versionName '4.4.3'
64+
versionCode 37
65+
versionName '4.5.2'
6666
applicationId "com.st.bluems"
67-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
67+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
6868
vectorDrawables.useSupportLibrary = true
6969
multiDexEnabled true
7070
}
@@ -124,35 +124,46 @@ repositories {
124124

125125
dependencies {
126126

127-
implementation fileTree(include: '*.jar', dir: 'libs')
128127
implementation project(':BlueSTSDK')
129128
implementation project(':BlueSTSDK_Gui_Android')
130129
implementation project(':BlueMSCloud')
131130

132-
implementation 'com.github.PhilJay:MPAndroidChart:v3.0.3'
131+
implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0'
133132

134-
implementation 'com.android.support:multidex:1.0.3'
133+
implementation 'androidx.multidex:multidex:2.0.1'
135134

136-
implementation group: 'com.android.support', name: 'design', version: "$rootProject.supportLibraryVersion"
137-
implementation group: 'com.android.support', name: 'support-v13', version: "$rootProject.supportLibraryVersion"
138-
implementation group: 'com.android.support', name: 'gridlayout-v7', version: "$rootProject.supportLibraryVersion"
139-
implementation group: 'com.android.support', name: 'appcompat-v7', version: "$rootProject.supportLibraryVersion"
140-
implementation group: 'com.android.support', name: 'cardview-v7', version: "$rootProject.supportLibraryVersion"
141-
implementation group: 'com.android.support.constraint', name: 'constraint-layout', version: "$rootProject.constraintLayoutVersion"
135+
implementation group: 'com.google.android.material', name: 'material', version: "$rootProject.androidx_materialVersion"
136+
implementation group: 'androidx.legacy', name: 'legacy-support-v13', version: "$rootProject.androidx_supportLegacy"
137+
implementation group: 'androidx.gridlayout', name: 'gridlayout', version: "$rootProject.androidx_gridLayout"
138+
implementation group: 'androidx.appcompat', name: 'appcompat', version: "$rootProject.androidx_appCompatVersion"
139+
implementation group: 'androidx.fragment', name: 'fragment-ktx', version: "$rootProject.androidx_fragmentVersion"
140+
implementation group: 'androidx.cardview', name: 'cardview', version: "$rootProject.androidx_cardViewVersion"
141+
implementation group: 'androidx.constraintlayout', name: 'constraintlayout', version: "$rootProject.androidx_constraintLayoutVersion"
142+
implementation group: 'androidx.annotation', name:'annotation',version: "$rootProject.androidx_annotationVersion"
143+
implementation group: 'androidx.recyclerview', name:'recyclerview', version:"$rootProject.androidx_recycleViewVersion"
144+
implementation group: 'androidx.preference', name:'preference-ktx', version:"$rootProject.androidx_preferenceVersion"
142145

143-
implementation "android.arch.persistence.room:runtime:$rootProject.roomVersion"
144-
annotationProcessor "android.arch.persistence.room:compiler:$rootProject.roomVersion"
146+
implementation group:'androidx.room', name:'room-runtime', version: "$rootProject.androidx_roomVersion"
147+
annotationProcessor group:'androidx.room', name:'room-compiler', version: "$rootProject.androidx_roomVersion"
145148

146149
// Lifecycle components
147-
implementation "android.arch.lifecycle:extensions:$rootProject.archLifecycleVersion"
148-
annotationProcessor "android.arch.lifecycle:compiler:$rootProject.archLifecycleVersion"
150+
implementation group: 'androidx.lifecycle', name: 'lifecycle-viewmodel-ktx', version: "$rootProject.androidx_lifecycleExtVersion"
151+
implementation group: 'androidx.lifecycle', name: 'lifecycle-extensions', version: "$rootProject.androidx_lifecycleExtVersion"
149152

150153
// ibm speech to text
151-
implementation group: 'com.ibm.watson.developer_cloud', name: 'speech-to-text', version: '6.12.0'
154+
implementation(group: 'com.ibm.watson', name: 'speech-to-text', version: '8.0.0'){
155+
exclude group: 'com.google.code.findbugs', module: 'annotations'
156+
}
157+
152158

153159
//generic websocket speech to cloud, keep 3.12.x to be compatible with device < api 21
154160
implementation group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.12.2'
155161

162+
// crashlytics
163+
implementation group: 'com.crashlytics.sdk.android', name: 'crashlytics', version: '2.10.1'
164+
//keep the 16.x to avoid android x to avoid new support library that will break the plot
165+
implementation group: 'com.google.firebase', name: 'firebase-core', version: '17.2.0'
166+
156167
//memory leak detector
157168
debugImplementation group: 'com.squareup.leakcanary', name: 'leakcanary-android', version: "$leakcanaryVersion"
158169
releaseImplementation group: 'com.squareup.leakcanary', name: 'leakcanary-android-no-op', version: "$leakcanaryVersion"
@@ -163,7 +174,14 @@ dependencies {
163174
testImplementation group: 'junit', name: 'junit', version: "$rootProject.junitVersion"
164175
testImplementation group: 'org.mockito', name: 'mockito-core', version: "$rootProject.mockitoVersion"
165176

166-
androidTestImplementation "com.android.support.test:runner:$rootProject.runnerVersion"
167-
androidTestImplementation "com.android.support.test:rules:$rootProject.rulesVersion"
168-
androidTestImplementation "com.android.support.test.espresso:espresso-core:$rootProject.espressoVersion"
169-
}
177+
androidTestImplementation group:'androidx.test', name:'runner', version:"$rootProject.androidx_runnerVersion"
178+
androidTestImplementation group:'androidx.test', name:'rules', version:"$rootProject.androidx_rulesVersion"
179+
androidTestImplementation group:'androidx.test.espresso', name: 'espresso-core', version:"$rootProject.androidx_espressoVersion"
180+
181+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
182+
183+
}
184+
185+
apply plugin: 'kotlin-android'
186+
apply plugin: 'kotlin-android-extensions'
187+

‎BlueMS/libs/androidplot-core-0.6.1.jar‎

-171 KB
Binary file not shown.

‎BlueMS/src/androidTest/java/com/st/BlueMS/demos/Audio/BlueVoice/ASRServices/ASRSelector/AsrSelectorDialogFragmentTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
import android.app.Activity;
44
import android.os.Bundle;
55
import android.os.PersistableBundle;
6-
import android.support.annotation.Nullable;
7-
import android.support.test.rule.ActivityTestRule;
8-
import android.support.test.runner.AndroidJUnit4;
6+
import androidx.annotation.Nullable;
7+
import androidx.test.rule.ActivityTestRule;
8+
import androidx.test.ext.junit.runners.AndroidJUnit4;
99

1010
import com.st.BlueMS.R;
1111

@@ -14,9 +14,9 @@
1414
import org.junit.Test;
1515
import org.junit.runner.RunWith;
1616

17-
import static android.support.test.espresso.Espresso.onView;
18-
import static android.support.test.espresso.action.ViewActions.click;
19-
import static android.support.test.espresso.matcher.ViewMatchers.withId;
17+
import static androidx.test.espresso.Espresso.onView;
18+
import static androidx.test.espresso.action.ViewActions.click;
19+
import static androidx.test.espresso.matcher.ViewMatchers.withId;
2020
import static org.junit.Assert.*;
2121

2222
@RunWith(AndroidJUnit4.class)

‎BlueMS/src/androidTest/java/com/st/BlueMS/demos/TestCloudLogFragment.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737

3838
package com.st.BlueMS.demos;
3939

40-
import android.support.test.rule.ActivityTestRule;
41-
import android.support.test.runner.AndroidJUnit4;
40+
import androidx.test.rule.ActivityTestRule;
41+
import androidx.test.ext.junit.runners.AndroidJUnit4;
4242

4343
import com.st.BlueMS.R;
4444
import com.st.BlueSTSDK.Feature;
@@ -53,10 +53,10 @@
5353
import java.util.Arrays;
5454
import java.util.List;
5555

56-
import static android.support.test.espresso.Espresso.onView;
57-
import static android.support.test.espresso.assertion.ViewAssertions.matches;
58-
import static android.support.test.espresso.matcher.ViewMatchers.withId;
59-
import static android.support.test.espresso.matcher.ViewMatchers.withText;
56+
import static androidx.test.espresso.Espresso.onView;
57+
import static androidx.test.espresso.assertion.ViewAssertions.matches;
58+
import static androidx.test.espresso.matcher.ViewMatchers.withId;
59+
import static androidx.test.espresso.matcher.ViewMatchers.withText;
6060
import static org.mockito.Mockito.mock;
6161
import static org.mockito.Mockito.when;
6262

‎BlueMS/src/androidTest/java/com/st/BlueMS/demos/util/FeatureListViewAdapterTest.java‎

Lines changed: 5 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -37,32 +37,15 @@
3737

3838
package com.st.BlueMS.demos.util;
3939

40-
import android.app.Activity;
41-
import android.os.Bundle;
42-
import android.support.test.espresso.ViewInteraction;
43-
import android.support.test.filters.Suppress;
44-
import android.support.test.rule.ActivityTestRule;
45-
import android.support.test.runner.AndroidJUnit4;
46-
import android.support.v7.widget.RecyclerView;
40+
import androidx.test.espresso.ViewInteraction;
41+
import androidx.test.filters.Suppress;
42+
import androidx.test.rule.ActivityTestRule;
4743

4844

49-
import com.st.BlueSTSDK.Feature;
50-
import com.st.BlueSTSDK.Features.Field;
51-
52-
import org.junit.Test;
53-
import org.junit.Rule;
54-
import org.junit.runner.RunWith;
55-
56-
import java.util.Arrays;
57-
import java.util.List;
58-
59-
import static android.support.test.espresso.Espresso.onView;
60-
import static android.support.test.espresso.matcher.ViewMatchers.isAssignableFrom;
61-
62-
import junit.framework.Assert;
45+
import static androidx.test.espresso.Espresso.onView;
46+
import static androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom;
6347

6448
import static org.mockito.Mockito.mock;
65-
import static org.mockito.Mockito.when;
6649
/*
6750
@RunWith(AndroidJUnit4.class)
6851
public class FeatureListViewAdapterTest {

‎BlueMS/src/main/java/com/st/BlueMS/BlueMSApplication.java‎

Lines changed: 37 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,42 @@
1+
/*
2+
* Copyright (c) 2019 STMicroelectronics – All rights reserved
3+
* The STMicroelectronics corporate logo is a trademark of STMicroelectronics
4+
*
5+
* Redistribution and use in source and binary forms, with or without modification,
6+
* are permitted provided that the following conditions are met:
7+
*
8+
* - Redistributions of source code must retain the above copyright notice, this list of conditions
9+
* and the following disclaimer.
10+
*
11+
* - Redistributions in binary form must reproduce the above copyright notice, this list of
12+
* conditions and the following disclaimer in the documentation and/or other materials provided
13+
* with the distribution.
14+
*
15+
* - Neither the name nor trademarks of STMicroelectronics International N.V. nor any other
16+
* STMicroelectronics company nor the names of its contributors may be used to endorse or
17+
* promote products derived from this software without specific prior written permission.
18+
*
19+
* - All of the icons, pictures, logos and other images that are provided with the source code
20+
* in a directory whose title begins with st_images may only be used for internal purposes and
21+
* shall not be redistributed to any third party or modified in any way.
22+
*
23+
* - Any redistributions in binary form shall not include the capability to display any of the
24+
* icons, pictures, logos and other images that are provided with the source code in a directory
25+
* whose title begins with st_images.
26+
*
27+
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
28+
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
29+
* AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER
30+
* OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
31+
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
32+
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
33+
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
34+
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
35+
* OF SUCH DAMAGE.
36+
*/
137
package com.st.BlueMS;
238

3-
import android.support.multidex.MultiDexApplication;
39+
import androidx.multidex.MultiDexApplication;
440

541
import com.squareup.leakcanary.LeakCanary;
642

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

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,15 @@
4040
import android.content.Context;
4141
import android.content.Intent;
4242
import android.os.Bundle;
43-
import android.support.annotation.NonNull;
44-
import android.view.Menu;
43+
import androidx.annotation.NonNull;
4544
import android.view.MenuItem;
4645

4746
import com.st.BlueMS.demos.AccEvent.AccEventFragment;
4847
import com.st.BlueMS.demos.ActivityRecognition.ActivityRecognitionFragment;
4948
import com.st.BlueMS.demos.Audio.Beamforming.BeamformingFragment;
5049
import com.st.BlueMS.demos.Audio.BlueVoice.BlueVoiceFragment;
5150
import com.st.BlueMS.demos.Audio.SpeechToText.SpeechToTextFragment;
52-
import com.st.BlueMS.demos.AudioSceneClassificationFragment;
51+
import com.st.BlueMS.demos.AudioClassification.AudioClassificationFragment;
5352
import com.st.BlueMS.demos.COSensor.COSensorDemoFragment;
5453
import com.st.BlueMS.demos.CarryPositionFragment;
5554
import com.st.BlueMS.demos.Cloud.CloudLogFragment;
@@ -67,13 +66,13 @@
6766
import com.st.BlueMS.demos.MotionIntensityFragment;
6867
import com.st.BlueMS.demos.NodeStatus.NodeStatusFragment;
6968
import com.st.BlueMS.demos.PedometerFragment;
70-
import com.st.BlueMS.demos.PlotFeatureFragment;
7169
import com.st.BlueMS.demos.ProximityGestureRecognitionFragment;
7270
import com.st.BlueMS.demos.Audio.DirOfArrival.SourceLocFragment;
7371
import com.st.BlueMS.demos.SwitchFragment;
7472
import com.st.BlueMS.demos.motionAlgorithm.MotionAlgorithmFragment;
73+
import com.st.BlueMS.demos.multiNN.MultiNeuralNetworkFragment;
74+
import com.st.BlueMS.demos.plot.PlotFeatureFragment;
7575
import com.st.BlueMS.preference.nucleo.SettingsWithNucleoConfiguration;
76-
import com.st.BlueSTSDK.Debug;
7776
import com.st.BlueSTSDK.Node;
7877
import com.st.BlueSTSDK.Utils.ConnectionOption;
7978
import com.st.BlueSTSDK.gui.demos.DemoDescriptionAnnotation;
@@ -145,7 +144,7 @@ public static class LedButtonControlFragment extends com.st.STM32WB.p2pDemo.LedB
145144
SpeechToTextFragment.class,
146145
BeamformingFragment.class,
147146
SourceLocFragment.class,
148-
AudioSceneClassificationFragment.class,
147+
AudioClassificationFragment.class,
149148
HeartRateFragment.class,
150149
MotionIntensityFragment.class,
151150
CompassFragment.class,
@@ -154,11 +153,12 @@ public static class LedButtonControlFragment extends com.st.STM32WB.p2pDemo.LedB
154153
LedButtonControlFragment.class,
155154
StartOtaRebootFragment.class,
156155
AIDataLogDemoFragment.class,
156+
MultiNeuralNetworkFragment.class,
157157
CloudLogFragment.class,
158158
PredictiveMaintenanceFragment.class,
159159
MotionAlgorithmFragment.class,
160160
FitnessActivityFragment.class,
161-
NodeStatusFragment.class
161+
NodeStatusFragment.class,
162162
//FeatureDebugFragment.class
163163
};
164164

@@ -173,13 +173,6 @@ protected boolean enableFwUploading() {
173173
return true;
174174
}
175175

176-
@Override
177-
public boolean onCreateOptionsMenu(Menu menu) {
178-
// Inflate the menu; this adds items to the action bar if it is present.
179-
getMenuInflater().inflate(R.menu.menu_demos_activity, menu);
180-
181-
return super.onCreateOptionsMenu(menu);
182-
}
183176

184177
@Override
185178
public boolean onOptionsItemSelected(MenuItem item) {

‎BlueMS/src/main/java/com/st/BlueMS/DemosActivityWesu.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,16 +46,16 @@
4646
import android.content.pm.PackageManager;
4747
import android.net.Uri;
4848
import android.os.Bundle;
49-
import android.support.annotation.NonNull;
49+
import androidx.annotation.NonNull;
5050
import android.view.MenuItem;
5151

5252
import com.st.BlueMS.demos.AccEvent.AccEventFragment;
5353
import com.st.BlueMS.demos.Cloud.CloudLogFragment;
5454
import com.st.BlueMS.demos.EnvironmentalSensorsFragment;
5555
import com.st.BlueMS.demos.NodeStatus.NodeStatusFragment;
5656
import com.st.BlueMS.demos.PedometerFragment;
57-
import com.st.BlueMS.demos.PlotFeatureFragment;
5857
import com.st.BlueMS.demos.SwitchFragment;
58+
import com.st.BlueMS.demos.plot.PlotFeatureFragment;
5959
import com.st.BlueMS.demos.wesu.ActivityRecognitionFragmentWesu;
6060
import com.st.BlueMS.demos.wesu.CarryPositionFragmentWesu;
6161
import com.st.BlueMS.demos.wesu.MemsSensorFusionFragmentWesu;

‎BlueMS/src/main/java/com/st/BlueMS/MainActivity.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,17 @@
3838
package com.st.BlueMS;
3939

4040
import android.content.Intent;
41+
import android.content.SharedPreferences;
42+
import android.content.pm.PackageInfo;
43+
import android.content.pm.PackageManager;
44+
import android.preference.PreferenceManager;
45+
import androidx.annotation.NonNull;
46+
import androidx.appcompat.app.AlertDialog;
47+
48+
import android.view.LayoutInflater;
4149
import android.view.View;
50+
import android.view.ViewGroup;
51+
import android.widget.TextView;
4252

4353
import com.st.BlueSTSDK.gui.AboutActivity;
4454
import com.st.BlueSTSDK.gui.thirdPartyLibLicense.LibLicense;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
import android.nfc.NfcAdapter;
4646
import android.os.Bundle;
4747
import android.os.Parcelable;
48-
import android.support.annotation.StringRes;
48+
import androidx.annotation.StringRes;
4949
import android.util.Log;
5050
import android.widget.Toast;
5151

0 commit comments

Comments
 (0)