Align with BlueST-SDK V1.1.3

Signed-off-by: Luca Pezzoni <[email protected]>

README.md

@@ -4,7 +4,7 @@ Module for creating the BlueST-SDK library
 
 ## For using it
 
-Code compiled using gradle 8.2.1 and JDK jbr-17
+Code compiled using gradle 8.2.1 and JDK 17.0.7
 
 set on Gradle properties the Github Login name and SSO authentication
 Example:

app/build.gradle

@@ -20,9 +20,9 @@ android {
     defaultConfig {
         applicationId "com.st.demo"
         minSdk rootProject.minSdk
-        targetSdkVersion targetSdk
-        versionCode 2
-        versionName "5.0.0"
+        targetSdkVersion rootProject.targetSdk
+        versionCode 3
+        versionName "5.2.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {

app/src/main/java/com/st/demo/device_list/BleDeviceList.kt

@@ -31,7 +31,6 @@ import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavHostController
@@ -50,8 +49,6 @@ fun BleDeviceList(
     viewModel: BleDeviceListViewModel, navController: NavHostController
 ) {
 
-    val context = LocalContext.current
-
     var doNotShowRationale by rememberSaveable {
         mutableStateOf(false)
     }

build.gradle

@@ -16,29 +16,29 @@ buildscript {
 
         compose_bom_date = '2023.10.01'
 
-        accompanist_version = '0.30.1'
-        activity_compose_version = '1.8.0'
+        accompanist_version = '0.32.0'
+        activity_compose_version = '1.8.2'
         appcompat_version = '1.6.1'
         compose_compiler_version = '1.5.3'
         core_ktx_version = '1.12.0'
         espresso_core_version = '3.5.1'
-        google_material_version = '1.10.0'
-        gradle_version = '8.1.2'
-        hilt_version = '2.48.1'
-        hilt_compose_version = '1.0.0'
-        hilt_navigation_fragment_version = '1.0.0'
+        google_material_version = '1.11.0'
+        gradle_version = '8.2.2'
+        hilt_version = '2.50'
+        hilt_compose_version = '1.1.0'
+        hilt_navigation_fragment_version = '1.1.0'
         junit_version = '4.13.2'
         junit_ui_version = '1.1.5'
         kotlin_version = '1.9.10'
-        kotlinx_serialization_version = '1.6.0'
+        kotlinx_serialization_version = '1.6.2'
         kotlinx_retrofit_version = '1.0.0'
         ktlint_version = '11.3.1'
-        lifecycle_version = '2.6.2'
-        logging_version = '5.0.0-alpha.11'
+        lifecycle_version = '2.7.0'
+        logging_version = '5.0.0-alpha.12'
         nav_version = '2.6.0'
-        navigation_compose_version = '2.7.4'
+        navigation_compose_version = '2.7.6'
         retrofit_version = '2.9.0'
-        room_version = '2.6.0'
+        room_version = '2.6.1'
     }
 
     repositories {

st_blue_sdk/publish.gradle

@@ -10,7 +10,7 @@ apply plugin: 'maven-publish'
 
 def LIB_GROUP_ID = 'com.st.blue.sdk'
 def LIB_ARTIFACT_ID = 'st-blue-sdk'
-def LIB_VERSION = '1.1.0'
+def LIB_VERSION = '1.1.3'
 
 afterEvaluate {
     publishing {

st_blue_sdk/src/main/java/com/st/blue_sdk/BlueManager.kt

@@ -9,6 +9,7 @@ package com.st.blue_sdk
 
 import android.content.ContentResolver
 import android.net.Uri
+import com.st.blue_sdk.board_catalog.models.BleCharacteristic
 import com.st.blue_sdk.board_catalog.models.BoardDescription
 import com.st.blue_sdk.board_catalog.models.BoardFirmware
 import com.st.blue_sdk.board_catalog.models.DtmiModel
@@ -50,7 +51,11 @@ interface BlueManager {
 
     fun getRssi(nodeId: String)
 
-    fun connectToNode(nodeId: String, maxPayloadSize: Int = 248, enableServer: Boolean = true): Flow<Node>
+    fun connectToNode(
+        nodeId: String,
+        maxPayloadSize: Int = 248,
+        enableServer: Boolean = true
+    ): Flow<Node>
 
     fun getNode(nodeId: String): Node?
 
@@ -66,7 +71,10 @@ interface BlueManager {
 
     suspend fun getNodeWithFirmwareInfo(nodeId: String): Node
 
-    suspend fun enableFeatures(nodeId: String, features: List<Feature<*>>): Boolean
+    suspend fun enableFeatures(
+        nodeId: String, features: List<Feature<*>>,
+        onFeaturesEnabled: CoroutineScope.() -> Unit = { /** NOOP **/ }
+    ): Boolean
 
     suspend fun disableFeatures(nodeId: String, features: List<Feature<*>>): Boolean
 
@@ -103,9 +111,9 @@ interface BlueManager {
 
     suspend fun getBoardsDescription(): List<BoardDescription>
 
-    suspend fun reset(url: String?=null)
+    suspend fun reset(url: String? = null)
 
-    suspend fun getDtmiModel(nodeId: String,isBeta: Boolean): DtmiModel?
+    suspend fun getDtmiModel(nodeId: String, isBeta: Boolean): DtmiModel?
 
     suspend fun setBoardCatalog(fileUri: Uri, contentResolver: ContentResolver): List<BoardFirmware>
 
@@ -119,6 +127,8 @@ interface BlueManager {
 
     suspend fun getSensorAdapter(uniqueId: Int): Sensor?
 
+    suspend fun getBleCharacteristics(): List<BleCharacteristic>
+
     suspend fun upgradeFw(nodeId: String): FwConsole?
 
     fun getFwUpdateStrategy(nodeId: String): UpgradeStrategy

st_blue_sdk/src/main/java/com/st/blue_sdk/BlueManagerImpl.kt

@@ -17,6 +17,7 @@ import android.content.Context
 import android.net.Uri
 import android.util.Log
 import com.st.blue_sdk.board_catalog.BoardCatalogRepo
+import com.st.blue_sdk.board_catalog.models.BleCharacteristic
 import com.st.blue_sdk.board_catalog.models.BoardDescription
 import com.st.blue_sdk.board_catalog.models.BoardFirmware
 import com.st.blue_sdk.board_catalog.models.DtmiModel
@@ -234,10 +235,21 @@ class BlueManagerImpl @Inject constructor(
                 .filter { it.fota.bootloaderType == catalogInfo.fota.bootloaderType }
                 .filter { !it.fota.fwUrl.isNullOrEmpty() }.sortedBy { it.fwName }
 
-            val fwUpdate = catalog.getFw(
+            //List of fws update ordered by fw version
+            val listOfFwUpdate = catalog.getFw(
                 deviceId = catalogInfo.bleDevId, fwName = catalogInfo.fwName
-            ).filter { it.fota.fwUrl != null }.filter { it.fwVersion > catalogInfo.fwVersion }
-                .minByOrNull { it.fwVersion }
+            ).filter { it.fota.fwUrl != null }.filter { it.fwVersion > catalogInfo.fwVersion }.sortedBy { it.fwVersion }
+
+            //Search if there is a mandatory update
+            val fwMandatory = listOfFwUpdate.firstOrNull { it.fota.mandatory==true }
+
+            //the update will be the mandatory one, or the latest available
+            val fwUpdate = fwMandatory ?: listOfFwUpdate.maxByOrNull { it.fwVersion }
+
+//            val fwUpdate = catalog.getFw(
+//                deviceId = catalogInfo.bleDevId, fwName = catalogInfo.fwName
+//            ).filter { it.fota.fwUrl != null }.filter { it.fwVersion > catalogInfo.fwVersion }
+//                .minByOrNull { it.fwVersion }
 
             node.copy(
                 catalogInfo = catalogInfo, fwUpdate = fwUpdate, fwCompatibleList = fwCompatibleList
@@ -354,12 +366,13 @@ class BlueManagerImpl @Inject constructor(
     }
 
     override suspend fun enableFeatures(
-        nodeId: String, features: List<Feature<*>>
+        nodeId: String, features: List<Feature<*>>,
+        onFeaturesEnabled: CoroutineScope.() -> Unit
     ): Boolean {
         val service = nodeServiceConsumer.getNodeService(nodeId)
             ?: throw IllegalStateException("Unable to find NodeService for $nodeId")
 
-        return service.setFeaturesNotifications(features = features, true)
+        return service.setFeaturesNotifications(features = features, true,onFeaturesEnabled)
     }
 
     override suspend fun disableFeatures(
@@ -489,6 +502,10 @@ class BlueManagerImpl @Inject constructor(
        return catalog.getSensorAdapter(uniqueId=uniqueId)
     }
 
+    override suspend fun getBleCharacteristics() : List<BleCharacteristic> {
+        return catalog.getBleCharacteristics()
+    }
+
     override suspend fun upgradeFw(nodeId: String): FwConsole? {
         return otaService.updateFirmware(nodeId)
     }

st_blue_sdk/src/main/java/com/st/blue_sdk/LoggableUnit.kt

@@ -18,4 +18,5 @@ class LoggableUnit : Loggable {
 
     override fun toString(): String = "No Data"
 
+    override val logDoubleValues: List<Double> = listOf()
 }

st_blue_sdk/src/main/java/com/st/blue_sdk/NodeService.kt

@@ -123,7 +123,8 @@ class NodeService(
 
     suspend fun setFeaturesNotifications(
         features: List<Feature<*>>,
-        enabled: Boolean
+        enabled: Boolean,
+        onFeaturesEnabled: CoroutineScope.() -> Unit = { /** NOOP **/ }
     ): Boolean {
 
         var result = true
@@ -135,17 +136,39 @@ class NodeService(
         }.toSet()
 
         characteristicsWithFeatures.forEach {
-            val operationResult = bleHal.setCharacteristicNotification(
-                serviceUid = it.characteristic.service.uuid.toString(),
-                characteristicUid = it.characteristic.uuid.toString(),
-                enabled = enabled
-            )
-
-            if (operationResult) {
-                it.hasEnabledNotifications = enabled
+            if(enabled) {
+                it.numberEnables++
+            } else {
+                it.numberEnables--
             }
+            //For Avoiding to do this operation when it's not necessary
+            if(it.hasEnabledNotifications!=enabled) {
+                //For avoiding to remove the notification on Aggregate Features
+                if((!enabled && (it.numberEnables==0)) || enabled) {
+                    val operationResult = bleHal.setCharacteristicNotification(
+                        serviceUid = it.characteristic.service.uuid.toString(),
+                        characteristicUid = it.characteristic.uuid.toString(),
+                        enabled = enabled
+                    )
+
+                    if (operationResult) {
+                        it.hasEnabledNotifications = enabled
+                        if(enabled) {
+                            coroutineScope.launch {
+                                onFeaturesEnabled.invoke(this)
+                            }
+                        }
+                    }
 
-            result = result && operationResult
+                    result = result && operationResult
+                }
+            } else {
+                if(enabled) {
+                    coroutineScope.launch {
+                        onFeaturesEnabled.invoke(this)
+                    }
+                }
+            }
         }
 
         return result
@@ -455,5 +478,6 @@ class NodeService(
 data class CharacteristicWithFeatures(
     val characteristic: BluetoothGattCharacteristic,
     var hasEnabledNotifications: Boolean = false,
+    var numberEnables: Int = 0,
     val features: List<Feature<*>> = emptyList()
 )

st_blue_sdk/src/main/java/com/st/blue_sdk/board_catalog/BoardCatalogRepo.kt

@@ -9,6 +9,7 @@ package com.st.blue_sdk.board_catalog
 
 import android.content.ContentResolver
 import android.net.Uri
+import com.st.blue_sdk.board_catalog.models.BleCharacteristic
 import com.st.blue_sdk.board_catalog.models.BoardDescription
 import com.st.blue_sdk.board_catalog.models.BoardFirmware
 import com.st.blue_sdk.board_catalog.models.DtmiModel
@@ -23,6 +24,8 @@ interface BoardCatalogRepo {
 
     suspend fun getSensorAdapters(): List<Sensor>
 
+    suspend fun getBleCharacteristics(): List<BleCharacteristic>
+
     suspend fun getSensorAdapter(uniqueId: Int): Sensor?
 
     suspend fun getFwDetailsNode(deviceId: String, bleFwId: String): BoardFirmware?