Second stage updating to ST BLE Sensor V5.1.0

Signed-off-by: Luca Pezzoni <luca.pezzoni@st.com>
STMicroelectronics · Oct 23, 2023 · ea0904d · ea0904d
1 parent a472e1f
commit ea0904d
Show file tree

Hide file tree

Showing 51 changed files with 441 additions and 124 deletions.
diff --git a/app/src/main/java/com/st/bluems/ui/home/HomeViewModel.kt b/app/src/main/java/com/st/bluems/ui/home/HomeViewModel.kt
@@ -21,7 +21,6 @@ import com.st.blue_sdk.common.Status
 import com.st.blue_sdk.models.ConnectionStatus
 import com.st.blue_sdk.models.Node
 import com.st.blue_sdk.models.NodeState
-import com.st.internal.BuildConfig
 import com.st.login.api.StLoginManager
 import com.st.preferences.StPreferences
 import com.st.user_profiling.model.LevelProficiency
@@ -151,14 +150,15 @@ class HomeViewModel @Inject constructor(
     }
 
     fun readBetaCatalog() {
-        viewModelScope.launch {
-            val url: String = BuildConfig.BLUESTSDK_DB_BASE_BETA_URL
-            blueManager.reset(url)
-            _boardsDescription.value = blueManager.getBoardsDescription()
-            //Log.i("DB","readBetaCatalog checkBoardsCatalogPresence = ${ _boardsDescription.value.size}")
-
-        }
+//        viewModelScope.launch {
+//            val url: String = BuildConfig.BLUESTSDK_DB_BASE_BETA_URL
+//            blueManager.reset(url)
+//            _boardsDescription.value = blueManager.getBoardsDescription()
+//            //Log.i("DB","readBetaCatalog checkBoardsCatalogPresence = ${ _boardsDescription.value.size}")
+//
+//        }
         //checkBoardsCatalogPresence()
+        readReleaseCatalog()
     }
 
     fun readReleaseCatalog() {

diff --git a/st_demo_showcase/src/main/java/com/st/demo_showcase/utils/Extensions.kt b/st_demo_showcase/src/main/java/com/st/demo_showcase/utils/Extensions.kt
@@ -58,7 +58,7 @@ fun List<String>?.toActions(
 fun Demo.isLoginRequired(): Boolean = when (this) {
 //    Demo.Flow -> true
 //    Demo.Cloud -> true
-    Demo.ExtConfig -> true
+//    Demo.ExtConfig -> true
     else -> false
 }
 

diff --git a/st_high_speed_data_log/build.gradle b/st_high_speed_data_log/build.gradle
@@ -84,6 +84,7 @@ dependencies {
     // Hilt
     implementation "androidx.hilt:hilt-navigation-fragment:$hilt_navigation_fragment_version"
     implementation "com.google.dagger:hilt-android:$hilt_version"
+    implementation project(path: ':st_preferences')
     kapt "com.google.dagger:hilt-compiler:$hilt_version"
 
     // Tests

diff --git a/st_high_speed_data_log/src/main/java/com/st/hight_speed_data_log/HighSpeedDataLog.kt b/st_high_speed_data_log/src/main/java/com/st/hight_speed_data_log/HighSpeedDataLog.kt
@@ -49,7 +49,7 @@ import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
 import com.st.blue_sdk.board_catalog.models.DtmiContent
 import com.st.high_speed_data_log.R
-import com.st.hight_speed_data_log.composable.BottomAppBarItem
+import com.st.ui.composables.BottomAppBarItem
 import com.st.hight_speed_data_log.composable.HsdlSensors
 import com.st.hight_speed_data_log.composable.HsdlTags
 import com.st.hight_speed_data_log.composable.StopLoggingDialog
@@ -165,7 +165,7 @@ fun HighSpeedDataLog(
         modifier = modifier,
         isFloatingActionButtonDocked = true,
         topBar = {
-            HsdlConfig.hsdlTabBar?.invoke(currentTitle)
+            HsdlConfig.hsdlTabBar?.invoke(currentTitle, isLoading)
         },
         floatingActionButtonPosition = androidx.compose.material.FabPosition.Center,
         floatingActionButton = {
@@ -258,6 +258,7 @@ fun HighSpeedDataLog(
                         HsdlSensors(
                             sensors = sensors,
                             status = status,
+                            isLoading = isLoading,
                             onValueChange = onValueChange,
                             onSendCommand = onSendCommand
                         )
@@ -281,13 +282,15 @@ fun HighSpeedDataLog(
                         HsdlTags(
                             tags = tags,
                             status = status,
+                            isLoading = isLoading,
                             onValueChange = onValueChange,
                             onSendCommand = onSendCommand
                         )
                     } else {
                         VespucciHsdlTags(
                             acquisitionInfo = acquisitionName,
                             vespucciTags = vespucciTags,
+                            isLoading = isLoading,
                             isLogging = isLogging,
                             onTagChangeState = onTagChangeState
                         )

diff --git a/...igh_speed_data_log/src/main/java/com/st/hight_speed_data_log/HighSpeedDataLogViewModel.kt b/...igh_speed_data_log/src/main/java/com/st/hight_speed_data_log/HighSpeedDataLogViewModel.kt
@@ -17,6 +17,7 @@ import com.st.blue_sdk.features.extended.pnpl.PnPL
 import com.st.blue_sdk.features.extended.pnpl.PnPLConfig
 import com.st.blue_sdk.features.extended.pnpl.request.PnPLCmd
 import com.st.blue_sdk.features.extended.pnpl.request.PnPLCommand
+import com.st.preferences.StPreferences
 import com.st.ui.composables.CommandRequest
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.CoroutineScope
@@ -46,7 +47,9 @@ private typealias ComponentWithInterface = Pair<DtmiContent.DtmiComponentContent
 
 @HiltViewModel
 class HighSpeedDataLogViewModel @Inject constructor(
-    private val blueManager: BlueManager, private val coroutineScope: CoroutineScope
+    private val blueManager: BlueManager,
+    private val stPreferences: StPreferences,
+    private val coroutineScope: CoroutineScope
 ) : ViewModel() {
 
     private var observeFeatureJob: Job? = null
@@ -245,7 +248,7 @@ class HighSpeedDataLogViewModel @Inject constructor(
         _isLoading.value = true
 
         val componentWithInterface =
-            blueManager.getDtmiModel(nodeId = nodeId)?.extractComponents(demoName = null)
+            blueManager.getDtmiModel(nodeId = nodeId, isBeta = stPreferences.isBetaApplication())?.extractComponents(demoName = null)
                 ?: emptyList()
 
         _sensors.value = componentWithInterface.hsdl2SensorsFilter()
@@ -304,7 +307,8 @@ class HighSpeedDataLogViewModel @Inject constructor(
     private suspend fun setName(nodeId: String) {
         val calendar = Calendar.getInstance(TimeZone.getTimeZone("UTC"))
         val timeInMillis = calendar.timeInMillis
-        val sdf = SimpleDateFormat("EEE MMM d yyyy HH:mm:ss", Locale.UK)
+        val nameFormatter = HsdlConfig.datalogNameFormat ?: "EEE MMM d yyyy HH:mm:ss"
+        val sdf = SimpleDateFormat(nameFormatter, Locale.UK)
         val datetime = sdf.format(Date(timeInMillis))
 
         _acquisitionName.emit(datetime)

diff --git a/st_high_speed_data_log/src/main/java/com/st/hight_speed_data_log/HsdlConfig.kt b/st_high_speed_data_log/src/main/java/com/st/hight_speed_data_log/HsdlConfig.kt
@@ -6,10 +6,11 @@ object HsdlConfig {
 
     var tags: List<String> = emptyList()
 
-    var hsdlTabBar: (@Composable (title: String) -> Unit)? = null
+    var hsdlTabBar: (@Composable (title: String, isLoading: Boolean) -> Unit)? = null
 
     var showStopDialog: Boolean = false
 
     var isLogging: Boolean = false
 
+    var datalogNameFormat: String? = null
 }
diff --git a/st_high_speed_data_log/src/main/java/com/st/hight_speed_data_log/composable/HsdlSensors.kt b/st_high_speed_data_log/src/main/java/com/st/hight_speed_data_log/composable/HsdlSensors.kt
@@ -22,6 +22,7 @@ import kotlinx.serialization.json.JsonObject
 @Composable
 fun HsdlSensors(
     modifier: Modifier = Modifier,
+    isLoading: Boolean,
     sensors: List<Pair<DtmiContent.DtmiComponentContent, DtmiContent.DtmiInterfaceContent>> = emptyList(),
     status: List<JsonObject>,
     onValueChange: (String, Pair<String, Any>) -> Unit,
@@ -39,6 +40,7 @@ fun HsdlSensors(
             Component(
                 name = name,
                 data = data,
+                enabled = isLoading.not(),
                 enableCollapse = true,
                 isOpen = isOpen == name,
                 componentModel = componentWithInterface.first,

diff --git a/st_high_speed_data_log/src/main/java/com/st/hight_speed_data_log/composable/HsdlTags.kt b/st_high_speed_data_log/src/main/java/com/st/hight_speed_data_log/composable/HsdlTags.kt
@@ -18,6 +18,7 @@ import kotlinx.serialization.json.JsonObject
 @Composable
 fun HsdlTags(
     modifier: Modifier = Modifier,
+    isLoading: Boolean,
     tags: List<Pair<DtmiContent.DtmiComponentContent, DtmiContent.DtmiInterfaceContent>> = emptyList(),
     status: List<JsonObject>,
     onValueChange: (String, Pair<String, Any>) -> Unit,
@@ -32,6 +33,7 @@ fun HsdlTags(
             val name = componentWithInterface.first.name
             val data = (status.find { it.containsKey(name) })?.get(name)
             Component(
+                enabled = isLoading.not(),
                 name = name,
                 data = data,
                 enableCollapse = false,

diff --git a/...h_speed_data_log/src/main/java/com/st/hight_speed_data_log/composable/VespucciHsdlTags.kt b/...h_speed_data_log/src/main/java/com/st/hight_speed_data_log/composable/VespucciHsdlTags.kt
@@ -45,6 +45,7 @@ import com.st.ui.theme.PreviewBlueMSTheme
 fun VespucciHsdlTags(
     modifier: Modifier = Modifier,
     acquisitionInfo: String,
+    isLoading: Boolean,
     isLogging: Boolean,
     vespucciTags: Map<String, Boolean>,
     onTagChangeState: (String, Boolean) -> Unit = { _, _ -> /**NOOP**/ }
@@ -66,6 +67,7 @@ fun VespucciHsdlTags(
         Spacer(modifier = Modifier.height(height = LocalDimensions.current.paddingMedium))
 
         TagsInfo(
+            isLoading = isLoading,
             isLogging = isLogging,
             vespucciTags = vespucciTags,
             onTagChangeState = onTagChangeState
@@ -168,6 +170,7 @@ fun AcquisitionInfo(
 @Composable
 fun TagsInfo(
     modifier: Modifier = Modifier,
+    isLoading: Boolean,
     isLogging: Boolean,
     vespucciTags: Map<String, Boolean> = emptyMap(),
     onTagChangeState: (String, Boolean) -> Unit = { _, _ -> /**NOOP**/ }
@@ -222,7 +225,7 @@ fun TagsInfo(
             vespucciTags.forEach { tag ->
                 TagListItem(
                     tag = tag.key,
-                    isEnabled = isLogging,
+                    isEnabled = isLogging && isLoading.not(),
                     isChecked = tag.value,
                     onCheckChange = { checked ->
                         onTagChangeState(tag.key, checked)
@@ -293,6 +296,7 @@ private fun VespucciHsdlTagsPreview() {
         VespucciHsdlTags(
             acquisitionInfo = "Fri May 26 2023 13:47:27",
             isLogging = false,
+            isLoading = false,
             vespucciTags = mapOf("Prova" to true, "Test" to false, "Mock" to true)
         )
     }
@@ -305,6 +309,20 @@ private fun VespucciHsdlTagsLoggingPreview() {
         VespucciHsdlTags(
             acquisitionInfo = "Fri May 26 2023 13:47:27",
             isLogging = true,
+            isLoading = false,
+            vespucciTags = mapOf("Prova" to true, "Test" to false, "Mock" to true)
+        )
+    }
+}
+
+@Preview(showBackground = true)
+@Composable
+private fun VespucciHsdlTagsLoadingPreview() {
+    PreviewBlueMSTheme {
+        VespucciHsdlTags(
+            acquisitionInfo = "Fri May 26 2023 13:47:27",
+            isLogging = false,
+            isLoading = true,
             vespucciTags = mapOf("Prova" to true, "Test" to false, "Mock" to true)
         )
     }

diff --git a/st_led_control/src/main/java/com/st/led_control/LedControlFragment.kt b/st_led_control/src/main/java/com/st/led_control/LedControlFragment.kt
@@ -79,13 +79,8 @@ class LedControlFragment : Fragment() {
 
         mLedImage.setOnClickListener {
             if(mCurrentDevice!=null) {
-                mLedStatus = if (mLedStatus) {
-                    mLedImage.setImageResource(R.drawable.stm32wb_led_off)
-                    false
-                } else {
-                    mLedImage.setImageResource(R.drawable.stm32wb_led_on)
-                    true
-                }
+                mLedStatus = mLedStatus==false
+                changeLedStatusImage(mLedStatus)
                 viewModel.writeSwitchCommand(nodeId, mCurrentDevice!!,mLedStatus)
             }
         }
@@ -95,6 +90,13 @@ class LedControlFragment : Fragment() {
         return binding.root
     }
 
+    private fun changeLedStatusImage(newState: Boolean) {
+        when(newState) {
+            true -> mLedImage.setImageResource(R.drawable.stm32wb_led_on)
+            false -> mLedImage.setImageResource(R.drawable.stm32wb_led_off)
+        }
+    }
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
@@ -172,24 +174,30 @@ class LedControlFragment : Fragment() {
         val node = viewModel.getNode(nodeId)
 
         if(node!=null) {
-            mCurrentDevice =
-                node.advertiseInfo?.getDeviceId()
-                    ?.let { P2PConfiguration.getDeviceIdByBoardId(it.toInt()) }
+            mCurrentDevice = node.advertiseInfo?.let {
+                val deviceId = it.getDeviceId().toInt()
+                val sdkVersion = it.getProtocolVersion().toInt()
+                P2PConfiguration.getDeviceIdByBoardId(deviceId,sdkVersion)
+            }
+//                node.advertiseInfo?.getDeviceId()
+//                    ?.let { P2PConfiguration.getDeviceIdByBoardId(it.toInt()) }
         }
 
         if (mCurrentDevice != null) {
             showDeviceDetected(mCurrentDevice!!)
         }
 
         if (node != null) {
-            if (node.boardType == Boards.Model.WBA_BOARD) { // there is no notion of P2PServer 1, P2PServer 2, etc. for WBA
+            if (node.familyType == Boards.Family.WBA_FAMILY) { // there is no notion of P2PServer 1, P2PServer 2, etc. for WBA
                 showDeviceDetected(P2PConfiguration.DeviceId.Device1)
             }
 
             if(node.rssi!=null) {
                 mRssiText.text = getString(R.string.stm32wb_rssiFormat, node.rssi!!.rssi)
             }
         }
+
+        changeLedStatusImage(mLedStatus)
     }
 
     override fun onPause() {

diff --git a/st_level/src/main/java/com/st/level/LevelDemoFragment.kt b/st_level/src/main/java/com/st/level/LevelDemoFragment.kt
@@ -91,7 +91,7 @@ class LevelDemoFragment : Fragment() {
         binding.levelSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
             override fun onItemSelected(
                 parent: AdapterView<*>?,
-                view: View,
+                view: View?,
                 position: Int,
                 id: Long
             ) {

diff --git a/st_login/build.gradle b/st_login/build.gradle
@@ -91,7 +91,7 @@ dependencies {
     implementation "com.google.dagger:hilt-android:$hilt_version"
     kapt "com.google.dagger:hilt-compiler:$hilt_version"
 
-    implementation 'com.auth0:java-jwt:4.0.0'
+    implementation 'com.auth0:java-jwt:4.4.0'
     implementation 'net.openid:appauth:0.11.1'
 
     // Tests

diff --git a/st_motion_algorithms/src/main/java/com/st/motion_algorithms/MotionAlgorithmsFragment.kt b/st_motion_algorithms/src/main/java/com/st/motion_algorithms/MotionAlgorithmsFragment.kt
@@ -81,7 +81,7 @@ class MotionAlgorithmsFragment : Fragment() {
         mAlgoSelector.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
             override fun onItemSelected(
                 parent: AdapterView<*>?,
-                view: View,
+                view: View?,
                 position: Int,
                 id: Long
             ) {

diff --git a/st_neai_anomaly_detection/src/main/res/values/strings.xml b/st_neai_anomaly_detection/src/main/res/values/strings.xml
@@ -38,7 +38,7 @@
     <string name="st_neaiAnomalyDetection_aiengine_state_unknownError">UNKNOWN ERROR</string>
     <string name="st_neaiAnomalyDetection_aiengine_state_null">NULL</string>
     <string name="st_neaiAnomalyDetection_text_progressTitle">Progress:\u0020</string>
-    <string name="st_neaiAnomalyDetection_results_status_normal">ANOMALY</string>
+    <string name="st_neaiAnomalyDetection_results_status_normal">NORMAL</string>
     <string name="st_neaiAnomalyDetection_results_status_anomaly">ANOMALY</string>
     <string name="st_neaiAnomalyDetection_results_status_null">NULL</string>
     <string name="st_neaiAnomalyDetection_text_resultsTitle">Results</string>

diff --git a/st_nfc_writing/src/main/java/com/st/nfc_writing/NfcWritingFragment.kt b/st_nfc_writing/src/main/java/com/st/nfc_writing/NfcWritingFragment.kt
@@ -180,7 +180,7 @@ class NfcWritingFragment : Fragment() {
         authorizationSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
             override fun onItemSelected(
                 parent: AdapterView<*>?,
-                view: View,
+                view: View?,
                 position: Int,
                 id: Long
             ) {
@@ -208,7 +208,7 @@ class NfcWritingFragment : Fragment() {
         encryptionSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
             override fun onItemSelected(
                 parent: AdapterView<*>?,
-                view: View,
+                view: View?,
                 position: Int,
                 id: Long
             ) {
@@ -304,7 +304,7 @@ class NfcWritingFragment : Fragment() {
         urlTypeSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
             override fun onItemSelected(
                 parent: AdapterView<*>?,
-                view: View,
+                view: View?,
                 position: Int,
                 id: Long
             ) {