feat: gap and gatt refactored/improved due to embedded-infra changes

CMakeLists.txt

@@ -19,7 +19,7 @@ if (HALST_STANDALONE)
     FetchContent_Declare(
         emil
         GIT_REPOSITORY https://github.com/philips-software/amp-embedded-infra-lib.git
-        GIT_TAG        77eb4170285a16e31cae5aee6a96e792baea2aa7 # Unreleased
+        GIT_TAG        88a4689e8f08e2afe856170aa5b5036f69d1610c # Unreleased
     )
 
     FetchContent_MakeAvailable(emil)

hal_st/middlewares/ble_middleware/GapCentralSt.cpp

@@ -1,4 +1,5 @@
 #include "hal_st/middlewares/ble_middleware/GapCentralSt.hpp"
+#include "ble_defs.h"
 #include "infra/event/EventDispatcherWithWeakPtr.hpp"
 #include "infra/stream/ByteInputStream.hpp"
 
@@ -14,31 +15,6 @@ namespace hal
 
     namespace
     {
-        infra::ConstByteRange GetLocalNameFromAdvertising(infra::ConstByteRange advertisingIndication)
-        {
-            infra::ByteInputStream stream(advertisingIndication, infra::noFail);
-
-            while (!stream.Empty())
-            {
-                uint8_t length = 0;
-                uint8_t adType = 0;
-
-                stream >> length;
-
-                if (length > 0)
-                {
-                    stream >> adType;
-
-                    if (adType == AD_TYPE_COMPLETE_LOCAL_NAME || adType == AD_TYPE_SHORTENED_LOCAL_NAME)
-                        return stream.ContiguousRange(length - 1);
-
-                    stream.Consume(length - 1);
-                }
-            }
-
-            return infra::ConstByteRange();
-        }
-
         services::GapAdvertisingEventType ToAdvertisingEventType(uint8_t eventType)
         {
             return static_cast<services::GapAdvertisingEventType>(eventType);
@@ -165,6 +141,17 @@ namespace hal
         }
     }
 
+    void GapCentralSt::HandleGattCompleteEvent(evt_blecore_aci* vendorEvent)
+    {
+        auto gattCompleteEvent = *reinterpret_cast<aci_gatt_proc_complete_event_rp0*>(vendorEvent->data);
+
+        really_assert(gattCompleteEvent.Connection_Handle == connectionContext.connectionHandle);
+        really_assert(gattCompleteEvent.Error_Code == BLE_STATUS_SUCCESS);
+
+        if (onConnection)
+            infra::Subject<services::GapCentralObserver>::NotifyObservers(std::exchange(onConnection, nullptr));
+    }
+
     void GapCentralSt::HandleL2capConnectionUpdateRequestEvent(evt_blecore_aci* vendorEvent)
     {
         GapSt::HandleL2capConnectionUpdateRequestEvent(vendorEvent);
@@ -185,7 +172,44 @@ namespace hal
 
     void GapCentralSt::HandleGapDirectConnectionEstablishmentEvent()
     {
-        infra::EventDispatcherWithWeakPtr::Instance().Schedule([this]() { this->DataLengthUpdate(); });
+        onConnection = [](services::GapCentralObserver& observer)
+        {
+            observer.StateChanged(services::GapState::connected);
+        };
+
+        SetPhy();
+        SetDataLength();
+        MtuExchange();
+    }
+
+    void GapCentralSt::SetPhy()
+    {
+        infra::EventDispatcherWithWeakPtr::Instance().Schedule([this]()
+            {
+                if (hci_le_set_phy(this->connectionContext.connectionHandle, GapSt::allPhys, GapSt::speed2Mbps, GapSt::speed2Mbps, 0) == commandDisallowed)
+                {
+                    infra::EventDispatcherWithWeakPtr::Instance().Schedule([this]()
+                        {
+                            this->SetPhy();
+                        });
+                }
+            });
+    }
+
+    void GapCentralSt::SetDataLength() const
+    {
+        infra::EventDispatcherWithWeakPtr::Instance().Schedule([this]()
+            {
+                hci_le_set_data_length(this->connectionContext.connectionHandle, services::GapConnectionParameters::connectionInitialMaxTxOctets, services::GapConnectionParameters::connectionInitialMaxTxTime);
+            });
+    }
+
+    void GapCentralSt::MtuExchange() const
+    {
+        infra::EventDispatcherWithWeakPtr::Instance().Schedule([this]()
+            {
+                aci_gatt_exchange_config(this->connectionContext.connectionHandle);
+            });
     }
 
     void GapCentralSt::HandleAdvertisingReport(const Advertising_Report_t& advertisingReport)
@@ -199,27 +223,21 @@ namespace hal
 
         auto advertisementData = reinterpret_cast<const uint8_t*>(&advertisingReport.Length_Data) + 1;
 
-        discoveredDevice.data = GetLocalNameFromAdvertising(infra::MemoryRange(advertisementData, advertisementData + advertisingReport.Length_Data));
+        discoveredDevice.data = infra::MemoryRange(advertisementData, advertisementData + advertisingReport.Length_Data);
 
-        infra::Subject<services::GapCentralObserver>::NotifyObservers([&discoveredDevice](auto& observer) { observer.DeviceDiscovered(discoveredDevice); });
+        infra::Subject<services::GapCentralObserver>::NotifyObservers([&discoveredDevice](auto& observer)
+            {
+                observer.DeviceDiscovered(discoveredDevice);
+            });
     }
 
-    void GapCentralSt::SetConnectionInterval(uint16_t connectionInterval, uint16_t slaveLatency, uint16_t timeoutMultiplier)
+    void GapCentralSt::SetConnectionInterval() const
     {
         aci_l2cap_connection_parameter_update_req(connectionContext.connectionHandle,
             connectionParameters.minConnIntMultiplier, connectionParameters.maxConnIntMultiplier,
             connectionParameters.slaveLatency, connectionParameters.supervisorTimeoutMs);
     }
 
-    void GapCentralSt::DataLengthUpdate()
-    {
-        [[maybe_unused]] auto status = hci_le_set_data_length(connectionContext.connectionHandle, transmissionOctets, transmissionTime);
-
-        assert(status == BLE_STATUS_SUCCESS);
-
-        infra::Subject<services::GapCentralObserver>::NotifyObservers([](auto& observer) { observer.StateChanged(services::GapState::connected); });
-    }
-
     void GapCentralSt::Initialize(const GapService& gapService)
     {
         uint16_t gapServiceHandle, gapDevNameCharHandle, gapAppearanceCharHandle;

hal_st/middlewares/ble_middleware/GapCentralSt.hpp

@@ -7,6 +7,7 @@
 #include "hci_tl.h"
 #include "infra/util/BoundedString.hpp"
 #include "infra/util/BoundedVector.hpp"
+#include "infra/util/Function.hpp"
 #include "infra/util/ProxyCreator.hpp"
 #include "services/ble/BondStorageSynchronizer.hpp"
 #include "services/ble/Gap.hpp"
@@ -36,23 +37,23 @@ namespace hal
         virtual void HandleHciLeDataLengthChangeEvent(evt_le_meta_event* metaEvent) override;
         virtual void HandleHciLePhyUpdateCompleteEvent(evt_le_meta_event* metaEvent) override;
         virtual void HandleGapProcedureCompleteEvent(evt_blecore_aci* vendorEvent) override;
+        virtual void HandleGattCompleteEvent(evt_blecore_aci* vendorEvent) override;
         virtual void HandleL2capConnectionUpdateRequestEvent(evt_blecore_aci* vendorEvent) override;
 
     private:
         void HandleGapDiscoveryProcedureEvent();
         void HandleGapDirectConnectionEstablishmentEvent();
 
         void HandleAdvertisingReport(const Advertising_Report_t& advertisingReport);
-        void SetConnectionInterval(uint16_t connectionInterval, uint16_t slaveLatency, uint16_t timeoutMultiplier);
-        void DataLengthUpdate();
+        void SetConnectionInterval() const;
+        void SetPhy();
+        void SetDataLength() const;
+        void MtuExchange() const;
         void Initialize(const GapService& gapService);
 
     private:
         static const services::GapConnectionParameters connectionUpdateParameters;
 
-        const uint16_t transmissionOctets = 251;
-        const uint16_t transmissionTime = 2120;
-
         // Create connection parameters
         const uint16_t leScanInterval = 0x320;
         const uint16_t leScanWindow = 0x320;
@@ -68,8 +69,12 @@ namespace hal
         const uint8_t filterDuplicatesEnabled = 1;
         const uint8_t acceptAllParameters = 1;
 
+        // HCI status
+        const uint8_t commandDisallowed = 0x0c;
+
         bool discovering = false;
         services::GapConnectionParameters connectionParameters;
+        infra::Function<void(services::GapCentralObserver&)> onConnection;
     };
 }
 

hal_st/middlewares/ble_middleware/GapSt.cpp

@@ -93,7 +93,7 @@
 
         SVCCTL_Init();
 
-        hci_le_write_suggested_default_data_length(services::GapPeripheral::connectionInitialMaxTxOctets, services::GapPeripheral::connectionInitialMaxTxTime);
+        hci_le_write_suggested_default_data_length(services::GapConnectionParameters::connectionInitialMaxTxOctets, services::GapConnectionParameters::connectionInitialMaxTxTime);
         hci_le_set_default_phy(allPhys, speed2Mbps, speed2Mbps);
     }
 
@@ -137,8 +137,15 @@
 
     void GapSt::HandleMtuExchangeResponseEvent(evt_blecore_aci* vendorEvent)
     {
-        maxAttMtu = reinterpret_cast<aci_att_exchange_mtu_resp_event_rp0*>(vendorEvent->data)->Server_RX_MTU;
-        AttMtuExchange::NotifyObservers([](auto& observer) { observer.ExchangedMaxAttMtuSize(); });
+        auto attExchangeMtuResponse = *reinterpret_cast<aci_att_exchange_mtu_resp_event_rp0*>(vendorEvent->data);
+
+        really_assert(attExchangeMtuResponse.Connection_Handle == connectionContext.connectionHandle);
+        maxAttMtu = attExchangeMtuResponse.Server_RX_MTU;
+
+        AttMtuExchange::NotifyObservers([](auto& observer)
+            {
+                observer.ExchangedMaxAttMtuSize();
+            });
     }
 
     void GapSt::SetAddress(const hal::MacAddress& address, services::GapDeviceAddressType addressType)
@@ -202,7 +209,7 @@
 
         switch (vendorEvent->ecode)
         {
         case ACI_GAP_PAIRING_COMPLETE_VSEVT_CODE:
             HandlePairingCompleteEvent(vendorEvent);
             break;
         case ACI_GAP_BOND_LOST_VSEVT_CODE:
@@ -211,6 +218,9 @@
         case ACI_GAP_PROC_COMPLETE_VSEVT_CODE:
             HandleGapProcedureCompleteEvent(vendorEvent);
             break;
+        case ACI_GATT_PROC_COMPLETE_VSEVT_CODE:
+            HandleGattCompleteEvent(vendorEvent);
+            break;
         case ACI_L2CAP_CONNECTION_UPDATE_REQ_VSEVT_CODE:
             HandleL2capConnectionUpdateRequestEvent(vendorEvent);
             break;

hal_st/middlewares/ble_middleware/GapSt.hpp

@@ -40,23 +40,24 @@
         virtual void HandleHciDisconnectEvent(hci_event_pckt& eventPacket);
 
         virtual void HandleHciLeConnectionCompleteEvent(evt_le_meta_event* metaEvent);
         virtual void HandleHciLeAdvertisingReportEvent(evt_le_meta_event* metaEvent) {};
         virtual void HandleHciLeConnectionUpdateCompleteEvent(evt_le_meta_event* metaEvent) {};
         virtual void HandleHciLeDataLengthChangeEvent(evt_le_meta_event* metaEvent) {};
         virtual void HandleHciLePhyUpdateCompleteEvent(evt_le_meta_event* metaEvent) {};
         virtual void HandleHciLeEnhancedConnectionCompleteEvent(evt_le_meta_event* metaEvent);
 
-        virtual void HandlePairingCompleteEvent(evt_blecore_aci* vendorEvent) {};
+        virtual void HandlePairingCompleteEvent(evt_blecore_aci* vendorEvent){};
         virtual void HandleBondLostEvent(evt_blecore_aci* vendorEvent);
-        virtual void HandleGapProcedureCompleteEvent(evt_blecore_aci* vendorEvent) {};
-        virtual void HandleL2capConnectionUpdateRequestEvent(evt_blecore_aci* vendorEvent) {};
+        virtual void HandleGapProcedureCompleteEvent(evt_blecore_aci* vendorEvent){};
+        virtual void HandleGattCompleteEvent(evt_blecore_aci* vendorEvent){};
+        virtual void HandleL2capConnectionUpdateRequestEvent(evt_blecore_aci* vendorEvent){};
         virtual void HandleMtuExchangeResponseEvent(evt_blecore_aci* vendorEvent);
 
         void SetAddress(const hal::MacAddress& address, services::GapDeviceAddressType addressType);
 
     private:
         // Implementation of HciEventSink
-        virtual void HciEvent(hci_event_pckt& event);
+        void HciEvent(hci_event_pckt& event) override;
 
         void HandleHciLeMetaEvent(hci_event_pckt& eventPacket);
         void HandleHciVendorSpecificDebugEvent(hci_event_pckt& eventPacket);

hal_st/middlewares/ble_middleware/GattClientSt.cpp

@@ -192,12 +192,14 @@ namespace hal
         auto gattProcedureEvent = *reinterpret_cast<aci_gatt_proc_complete_event_rp0*>(vendorEvent->data);
 
         really_assert(gattProcedureEvent.Connection_Handle == connectionHandle);
-        really_assert(gattProcedureEvent.Error_Code == BLE_STATUS_SUCCESS);
 
-        if (onDiscoveryCompletion)
-            infra::Subject<services::GattClientDiscoveryObserver>::NotifyObservers(std::exchange(onDiscoveryCompletion, nullptr));
-        else if (onDone)
-            std::exchange(onDone, nullptr)();
+        if (gattProcedureEvent.Error_Code == BLE_STATUS_SUCCESS)
+        {
+            if (onDiscoveryCompletion)
+                infra::Subject<services::GattClientDiscoveryObserver>::NotifyObservers(std::exchange(onDiscoveryCompletion, nullptr));
+            else if (onDone)
+                std::exchange(onDone, nullptr)();
+        }
     }
 
     void GattClientSt::HandleHciLeConnectionCompleteEvent(evt_le_meta_event* metaEvent)

hal_st/middlewares/ble_middleware/GattClientSt.hpp

@@ -13,7 +13,6 @@ namespace hal
     class GattClientSt
         : public services::GattClientDiscovery
         , public services::GattClientCharacteristicOperations
-        , public services::GattClientStackUpdate
         , public hal::HciEventSink
     {
     public: