Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: in GattClientSt, use ClaimableResource to control access over 2 different interfaces #411

Closed
wants to merge 5 commits into from
Closed

fix: in GattClientSt, use ClaimableResource to control access over 2 different interfaces #411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
24d41bf
chore: update GattClientSt for changed GattClientDiscovery interface
richardapeters Sep 3, 2024
89d2f32
Update TracingGattClientSt
richardapeters Sep 3, 2024
da10c64
services/ble/GattClient: Remove const from interface methods
richardapeters Sep 5, 2024
2402545
Merge remote-tracking branch 'origin/main' into feature/gatt-client
richardapeters Sep 10, 2024
b445f8f
fix: in GattClientSt, use ClaimableResource to control access over 2 …
richardapeters Sep 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
120 changes: 86 additions & 34 deletions hal_st/middlewares/ble_middleware/GattClientSt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,79 +18,125 @@ namespace hal

void GattClientSt::StartServiceDiscovery()
{
onDiscoveryCompletion = [](services::GattClientDiscoveryObserver& observer)
{
observer.ServiceDiscoveryComplete();
};
claimerDiscovery.Claim([this]()
{
onDiscoveryCompletion = [this]()
{
infra::Subject<services::GattClientDiscoveryObserver>::NotifyObservers([](auto& observer)
{
observer.ServiceDiscoveryComplete();
});

claimerDiscovery.Release();
};

aci_gatt_disc_all_primary_services(connectionHandle);
aci_gatt_disc_all_primary_services(connectionHandle);
});
}

void GattClientSt::StartCharacteristicDiscovery(const services::GattService& service)
void GattClientSt::StartCharacteristicDiscovery(services::AttAttribute::Handle handle, services::AttAttribute::Handle endHandle)
{
onDiscoveryCompletion = [](services::GattClientDiscoveryObserver& observer)
{
observer.CharacteristicDiscoveryComplete();
};
claimerDiscovery.Claim([this, handle, endHandle]()
{
onDiscoveryCompletion = [this]()
{
infra::Subject<services::GattClientDiscoveryObserver>::NotifyObservers([](auto& observer)
{
observer.CharacteristicDiscoveryComplete();
});

aci_gatt_disc_all_char_of_service(connectionHandle, service.Handle(), service.EndHandle());
claimerDiscovery.Release();
};

aci_gatt_disc_all_char_of_service(connectionHandle, handle, endHandle);
});
}

void GattClientSt::StartDescriptorDiscovery(const services::GattService& service)
void GattClientSt::StartDescriptorDiscovery(services::AttAttribute::Handle handle, services::AttAttribute::Handle endHandle)
{
onDiscoveryCompletion = [](services::GattClientDiscoveryObserver& observer)
{
observer.DescriptorDiscoveryComplete();
};
claimerDiscovery.Claim([this, handle, endHandle]()
{
onDiscoveryCompletion = [this]()
{
infra::Subject<services::GattClientDiscoveryObserver>::NotifyObservers([](auto& observer)
{
observer.DescriptorDiscoveryComplete();
});

claimerDiscovery.Release();
};

aci_gatt_disc_all_char_desc(connectionHandle, service.Handle(), service.EndHandle());
aci_gatt_disc_all_char_desc(connectionHandle, handle, endHandle);
});
}

void GattClientSt::Read(const services::GattClientCharacteristicOperationsObserver& characteristic, const infra::Function<void(const infra::ConstByteRange&)>& onResponse) const
void GattClientSt::Read(const services::GattClientCharacteristicOperationsObserver& characteristic, const infra::Function<void(const infra::ConstByteRange&)>& onResponse)
{
this->onResponse = onResponse;

aci_gatt_read_char_value(connectionHandle, characteristic.CharacteristicValueHandle());
claimerCharacteristicOperations.Claim([this, &characteristic]()
{
aci_gatt_read_char_value(connectionHandle, characteristic.CharacteristicValueHandle());
});
}

void GattClientSt::Write(const services::GattClientCharacteristicOperationsObserver& characteristic, infra::ConstByteRange data, const infra::Function<void()>& onDone) const
void GattClientSt::Write(const services::GattClientCharacteristicOperationsObserver& characteristic, infra::ConstByteRange data, const infra::Function<void()>& onDone)
{
this->onDone = onDone;

aci_gatt_write_char_value(connectionHandle, characteristic.CharacteristicValueHandle(), data.size(), data.cbegin());
claimerCharacteristicOperations.Claim([this, &characteristic, data]()
{
aci_gatt_write_char_value(connectionHandle, characteristic.CharacteristicValueHandle(), data.size(), data.cbegin());
});
}

void GattClientSt::WriteWithoutResponse(const services::GattClientCharacteristicOperationsObserver& characteristic, infra::ConstByteRange data) const
void GattClientSt::WriteWithoutResponse(const services::GattClientCharacteristicOperationsObserver& characteristic, infra::ConstByteRange data)
{
aci_gatt_write_without_resp(connectionHandle, characteristic.CharacteristicValueHandle(), data.size(), data.cbegin());
claimerCharacteristicOperations.Claim([this, &characteristic, data]()
{
aci_gatt_write_without_resp(connectionHandle, characteristic.CharacteristicValueHandle(), data.size(), data.cbegin());
claimerCharacteristicOperations.Release();
});
}

void GattClientSt::EnableNotification(const services::GattClientCharacteristicOperationsObserver& characteristic, const infra::Function<void()>& onDone) const
void GattClientSt::EnableNotification(const services::GattClientCharacteristicOperationsObserver& characteristic, const infra::Function<void()>& onDone)
{
this->onDone = onDone;

WriteCharacteristicDescriptor(characteristic, services::GattCharacteristic::PropertyFlags::notify, services::GattDescriptor::ClientCharacteristicConfiguration::CharacteristicValue::enableNotification);
claimerCharacteristicOperations.Claim([this, &characteristic]()
{
WriteCharacteristicDescriptor(characteristic, services::GattCharacteristic::PropertyFlags::notify, services::GattDescriptor::ClientCharacteristicConfiguration::CharacteristicValue::enableNotification);
});
}

void GattClientSt::DisableNotification(const services::GattClientCharacteristicOperationsObserver& characteristic, const infra::Function<void()>& onDone) const
void GattClientSt::DisableNotification(const services::GattClientCharacteristicOperationsObserver& characteristic, const infra::Function<void()>& onDone)
{
this->onDone = onDone;

WriteCharacteristicDescriptor(characteristic, services::GattCharacteristic::PropertyFlags::notify, services::GattDescriptor::ClientCharacteristicConfiguration::CharacteristicValue::disable);
claimerCharacteristicOperations.Claim([this, &characteristic]()
{
WriteCharacteristicDescriptor(characteristic, services::GattCharacteristic::PropertyFlags::notify, services::GattDescriptor::ClientCharacteristicConfiguration::CharacteristicValue::disable);
});
}

void GattClientSt::EnableIndication(const services::GattClientCharacteristicOperationsObserver& characteristic, const infra::Function<void()>& onDone) const
void GattClientSt::EnableIndication(const services::GattClientCharacteristicOperationsObserver& characteristic, const infra::Function<void()>& onDone)
{
this->onDone = onDone;

WriteCharacteristicDescriptor(characteristic, services::GattCharacteristic::PropertyFlags::indicate, services::GattDescriptor::ClientCharacteristicConfiguration::CharacteristicValue::enableIndication);
claimerCharacteristicOperations.Claim([this, &characteristic]()
{
WriteCharacteristicDescriptor(characteristic, services::GattCharacteristic::PropertyFlags::indicate, services::GattDescriptor::ClientCharacteristicConfiguration::CharacteristicValue::enableIndication);
});
}

void GattClientSt::DisableIndication(const services::GattClientCharacteristicOperationsObserver& characteristic, const infra::Function<void()>& onDone) const
void GattClientSt::DisableIndication(const services::GattClientCharacteristicOperationsObserver& characteristic, const infra::Function<void()>& onDone)
{
this->onDone = onDone;

WriteCharacteristicDescriptor(characteristic, services::GattCharacteristic::PropertyFlags::indicate, services::GattDescriptor::ClientCharacteristicConfiguration::CharacteristicValue::disable);
claimerCharacteristicOperations.Claim([this, &characteristic]()
{
WriteCharacteristicDescriptor(characteristic, services::GattCharacteristic::PropertyFlags::indicate, services::GattDescriptor::ClientCharacteristicConfiguration::CharacteristicValue::disable);
});
}

void GattClientSt::HciEvent(hci_event_pckt& event)
Expand Down Expand Up @@ -204,9 +250,12 @@ namespace hal
really_assert(gattProcedureEvent.Connection_Handle == connectionHandle);

if (onDiscoveryCompletion)
infra::Subject<services::GattClientDiscoveryObserver>::NotifyObservers(std::exchange(onDiscoveryCompletion, nullptr));
onDiscoveryCompletion();
else if (onDone)
std::exchange(onDone, nullptr)();
{
onDone();
claimerCharacteristicOperations.Release();
}
}
}

Expand Down Expand Up @@ -245,7 +294,10 @@ namespace hal
really_assert(attReadResponse.Connection_Handle == connectionHandle);

if (onResponse)
std::exchange(onResponse, nullptr)(data);
{
onResponse(data);
claimerCharacteristicOperations.Release();
}
}

void GattClientSt::HandleGattIndicationEvent(evt_blecore_aci* vendorEvent)
Expand Down
30 changes: 17 additions & 13 deletions hal_st/middlewares/ble_middleware/GattClientSt.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

#include "ble/ble.h"
#include "hal_st/middlewares/ble_middleware/HciEventObserver.hpp"
#include "infra/event/ClaimableResource.hpp"
#include "infra/stream/ByteInputStream.hpp"
#include "infra/util/AutoResetFunction.hpp"
#include "infra/util/BoundedVector.hpp"
Expand All @@ -20,18 +21,17 @@

// Implementation of services::GattClientDiscovery
void StartServiceDiscovery() override;
void StartCharacteristicDiscovery(const services::GattService& service) override;
void StartDescriptorDiscovery(const services::GattService& service) override;
void StartCharacteristicDiscovery(services::AttAttribute::Handle handle, services::AttAttribute::Handle endHandle) override;

Check failure on line 24 in hal_st/middlewares/ble_middleware/GattClientSt.hpp

View workflow job for this annotation

GitHub Actions / Embedded Build (RelWithDebInfo, 10.3-2021.10, stm32wb55) 

'void hal::GattClientSt::StartCharacteristicDiscovery(services::AttAttribute::Handle, services::AttAttribute::Handle)' marked 'override', but does not override

Check failure on line 24 in hal_st/middlewares/ble_middleware/GattClientSt.hpp

View workflow job for this annotation

GitHub Actions / Embedded Build (RelWithDebInfo, 10.3-2021.10, stm32wba52) 

'void hal::GattClientSt::StartCharacteristicDiscovery(services::AttAttribute::Handle, services::AttAttribute::Handle)' marked 'override', but does not override

Check failure on line 24 in hal_st/middlewares/ble_middleware/GattClientSt.hpp

View workflow job for this annotation

GitHub Actions / Embedded Build (RelWithDebInfo, 10.3-2021.10, stm32wba52) 

'void hal::GattClientSt::StartCharacteristicDiscovery(services::AttAttribute::Handle, services::AttAttribute::Handle)' marked 'override', but does not override

Check failure on line 24 in hal_st/middlewares/ble_middleware/GattClientSt.hpp

View workflow job for this annotation

GitHub Actions / Embedded Build (RelWithDebInfo, 10.3-2021.10, stm32wba52) 

'void hal::GattClientSt::StartCharacteristicDiscovery(services::AttAttribute::Handle, services::AttAttribute::Handle)' marked 'override', but does not override

Check failure on line 24 in hal_st/middlewares/ble_middleware/GattClientSt.hpp

View workflow job for this annotation

GitHub Actions / Embedded Build (RelWithDebInfo, 10.3-2021.10, stm32wba52) 

'void hal::GattClientSt::StartCharacteristicDiscovery(services::AttAttribute::Handle, services::AttAttribute::Handle)' marked 'override', but does not override
void StartDescriptorDiscovery(services::AttAttribute::Handle handle, services::AttAttribute::Handle endHandle) override;

Check failure on line 25 in hal_st/middlewares/ble_middleware/GattClientSt.hpp

View workflow job for this annotation

GitHub Actions / Embedded Build (RelWithDebInfo, 10.3-2021.10, stm32wb55) 

'void hal::GattClientSt::StartDescriptorDiscovery(services::AttAttribute::Handle, services::AttAttribute::Handle)' marked 'override', but does not override

Check failure on line 25 in hal_st/middlewares/ble_middleware/GattClientSt.hpp

View workflow job for this annotation

GitHub Actions / Embedded Build (RelWithDebInfo, 10.3-2021.10, stm32wba52) 

'void hal::GattClientSt::StartDescriptorDiscovery(services::AttAttribute::Handle, services::AttAttribute::Handle)' marked 'override', but does not override

Check failure on line 25 in hal_st/middlewares/ble_middleware/GattClientSt.hpp

View workflow job for this annotation

GitHub Actions / Embedded Build (RelWithDebInfo, 10.3-2021.10, stm32wba52) 

'void hal::GattClientSt::StartDescriptorDiscovery(services::AttAttribute::Handle, services::AttAttribute::Handle)' marked 'override', but does not override

// Implementation of services::GattClientCharacteristicOperations
void Read(const services::GattClientCharacteristicOperationsObserver& characteristic, const infra::Function<void(const infra::ConstByteRange&)>& onDone) const override;
void Write(const services::GattClientCharacteristicOperationsObserver& characteristic, infra::ConstByteRange data, const infra::Function<void()>& onDone) const override;
void WriteWithoutResponse(const services::GattClientCharacteristicOperationsObserver& characteristic, infra::ConstByteRange data) const override;

void EnableNotification(const services::GattClientCharacteristicOperationsObserver& characteristic, const infra::Function<void()>& onDone) const override;
void DisableNotification(const services::GattClientCharacteristicOperationsObserver& characteristic, const infra::Function<void()>& onDone) const override;
void EnableIndication(const services::GattClientCharacteristicOperationsObserver& characteristic, const infra::Function<void()>& onDone) const override;
void DisableIndication(const services::GattClientCharacteristicOperationsObserver& characteristic, const infra::Function<void()>& onDone) const override;
void Read(const services::GattClientCharacteristicOperationsObserver& characteristic, const infra::Function<void(const infra::ConstByteRange&)>& onDone) override;

Check failure on line 28 in hal_st/middlewares/ble_middleware/GattClientSt.hpp

View workflow job for this annotation

GitHub Actions / Embedded Build (RelWithDebInfo, 10.3-2021.10, stm32wb55) 

'void hal::GattClientSt::Read(const services::GattClientCharacteristicOperationsObserver&, const infra::Function<void(const infra::MemoryRange<const unsigned char>&)>&)' marked 'override', but does not override

Check failure on line 28 in hal_st/middlewares/ble_middleware/GattClientSt.hpp

View workflow job for this annotation

GitHub Actions / Embedded Build (RelWithDebInfo, 10.3-2021.10, stm32wba52) 

'void hal::GattClientSt::Read(const services::GattClientCharacteristicOperationsObserver&, const infra::Function<void(const infra::MemoryRange<const unsigned char>&)>&)' marked 'override', but does not override

Check failure on line 28 in hal_st/middlewares/ble_middleware/GattClientSt.hpp

View workflow job for this annotation

GitHub Actions / Embedded Build (RelWithDebInfo, 10.3-2021.10, stm32wba52) 

'void hal::GattClientSt::Read(const services::GattClientCharacteristicOperationsObserver&, const infra::Function<void(const infra::MemoryRange<const unsigned char>&)>&)' marked 'override', but does not override
void Write(const services::GattClientCharacteristicOperationsObserver& characteristic, infra::ConstByteRange data, const infra::Function<void()>& onDone) override;

Check failure on line 29 in hal_st/middlewares/ble_middleware/GattClientSt.hpp

View workflow job for this annotation

GitHub Actions / Embedded Build (RelWithDebInfo, 10.3-2021.10, stm32wb55) 

'void hal::GattClientSt::Write(const services::GattClientCharacteristicOperationsObserver&, infra::ConstByteRange, const infra::Function<void(), 8>&)' marked 'override', but does not override

Check failure on line 29 in hal_st/middlewares/ble_middleware/GattClientSt.hpp

View workflow job for this annotation

GitHub Actions / Embedded Build (RelWithDebInfo, 10.3-2021.10, stm32wba52) 

'void hal::GattClientSt::Write(const services::GattClientCharacteristicOperationsObserver&, infra::ConstByteRange, const infra::Function<void(), 8>&)' marked 'override', but does not override

Check failure on line 29 in hal_st/middlewares/ble_middleware/GattClientSt.hpp

View workflow job for this annotation

GitHub Actions / Embedded Build (RelWithDebInfo, 10.3-2021.10, stm32wba52) 

'void hal::GattClientSt::Write(const services::GattClientCharacteristicOperationsObserver&, infra::ConstByteRange, const infra::Function<void(), 8>&)' marked 'override', but does not override
void WriteWithoutResponse(const services::GattClientCharacteristicOperationsObserver& characteristic, infra::ConstByteRange data) override;

Check failure on line 30 in hal_st/middlewares/ble_middleware/GattClientSt.hpp

View workflow job for this annotation

GitHub Actions / Embedded Build (RelWithDebInfo, 10.3-2021.10, stm32wb55) 

'void hal::GattClientSt::WriteWithoutResponse(const services::GattClientCharacteristicOperationsObserver&, infra::ConstByteRange)' marked 'override', but does not override

Check failure on line 30 in hal_st/middlewares/ble_middleware/GattClientSt.hpp

View workflow job for this annotation

GitHub Actions / Embedded Build (RelWithDebInfo, 10.3-2021.10, stm32wba52) 

'void hal::GattClientSt::WriteWithoutResponse(const services::GattClientCharacteristicOperationsObserver&, infra::ConstByteRange)' marked 'override', but does not override

Check failure on line 30 in hal_st/middlewares/ble_middleware/GattClientSt.hpp

View workflow job for this annotation

GitHub Actions / Embedded Build (RelWithDebInfo, 10.3-2021.10, stm32wba52) 

'void hal::GattClientSt::WriteWithoutResponse(const services::GattClientCharacteristicOperationsObserver&, infra::ConstByteRange)' marked 'override', but does not override
void EnableNotification(const services::GattClientCharacteristicOperationsObserver& characteristic, const infra::Function<void()>& onDone) override;

Check failure on line 31 in hal_st/middlewares/ble_middleware/GattClientSt.hpp

View workflow job for this annotation

GitHub Actions / Embedded Build (RelWithDebInfo, 10.3-2021.10, stm32wb55) 

'void hal::GattClientSt::EnableNotification(const services::GattClientCharacteristicOperationsObserver&, const infra::Function<void(), 8>&)' marked 'override', but does not override

Check failure on line 31 in hal_st/middlewares/ble_middleware/GattClientSt.hpp

View workflow job for this annotation

GitHub Actions / Embedded Build (RelWithDebInfo, 10.3-2021.10, stm32wba52) 

'void hal::GattClientSt::EnableNotification(const services::GattClientCharacteristicOperationsObserver&, const infra::Function<void(), 8>&)' marked 'override', but does not override

Check failure on line 31 in hal_st/middlewares/ble_middleware/GattClientSt.hpp

View workflow job for this annotation

GitHub Actions / Embedded Build (RelWithDebInfo, 10.3-2021.10, stm32wba52) 

'void hal::GattClientSt::EnableNotification(const services::GattClientCharacteristicOperationsObserver&, const infra::Function<void(), 8>&)' marked 'override', but does not override
void DisableNotification(const services::GattClientCharacteristicOperationsObserver& characteristic, const infra::Function<void()>& onDone) override;

Check failure on line 32 in hal_st/middlewares/ble_middleware/GattClientSt.hpp

View workflow job for this annotation

GitHub Actions / Embedded Build (RelWithDebInfo, 10.3-2021.10, stm32wb55) 

'void hal::GattClientSt::DisableNotification(const services::GattClientCharacteristicOperationsObserver&, const infra::Function<void(), 8>&)' marked 'override', but does not override

Check failure on line 32 in hal_st/middlewares/ble_middleware/GattClientSt.hpp

View workflow job for this annotation

GitHub Actions / Embedded Build (RelWithDebInfo, 10.3-2021.10, stm32wba52) 

'void hal::GattClientSt::DisableNotification(const services::GattClientCharacteristicOperationsObserver&, const infra::Function<void(), 8>&)' marked 'override', but does not override

Check failure on line 32 in hal_st/middlewares/ble_middleware/GattClientSt.hpp

View workflow job for this annotation

GitHub Actions / Embedded Build (RelWithDebInfo, 10.3-2021.10, stm32wba52) 

'void hal::GattClientSt::DisableNotification(const services::GattClientCharacteristicOperationsObserver&, const infra::Function<void(), 8>&)' marked 'override', but does not override
void EnableIndication(const services::GattClientCharacteristicOperationsObserver& characteristic, const infra::Function<void()>& onDone) override;

Check failure on line 33 in hal_st/middlewares/ble_middleware/GattClientSt.hpp

View workflow job for this annotation

GitHub Actions / Embedded Build (RelWithDebInfo, 10.3-2021.10, stm32wb55) 

'void hal::GattClientSt::EnableIndication(const services::GattClientCharacteristicOperationsObserver&, const infra::Function<void(), 8>&)' marked 'override', but does not override

Check failure on line 33 in hal_st/middlewares/ble_middleware/GattClientSt.hpp

View workflow job for this annotation

GitHub Actions / Embedded Build (RelWithDebInfo, 10.3-2021.10, stm32wba52) 

'void hal::GattClientSt::EnableIndication(const services::GattClientCharacteristicOperationsObserver&, const infra::Function<void(), 8>&)' marked 'override', but does not override

Check failure on line 33 in hal_st/middlewares/ble_middleware/GattClientSt.hpp

View workflow job for this annotation

GitHub Actions / Embedded Build (RelWithDebInfo, 10.3-2021.10, stm32wba52) 

'void hal::GattClientSt::EnableIndication(const services::GattClientCharacteristicOperationsObserver&, const infra::Function<void(), 8>&)' marked 'override', but does not override
void DisableIndication(const services::GattClientCharacteristicOperationsObserver& characteristic, const infra::Function<void()>& onDone) override;

Check failure on line 34 in hal_st/middlewares/ble_middleware/GattClientSt.hpp

View workflow job for this annotation

GitHub Actions / Embedded Build (RelWithDebInfo, 10.3-2021.10, stm32wb55) 

'void hal::GattClientSt::DisableIndication(const services::GattClientCharacteristicOperationsObserver&, const infra::Function<void(), 8>&)' marked 'override', but does not override

Check failure on line 34 in hal_st/middlewares/ble_middleware/GattClientSt.hpp

View workflow job for this annotation

GitHub Actions / Embedded Build (RelWithDebInfo, 10.3-2021.10, stm32wba52) 

'void hal::GattClientSt::DisableIndication(const services::GattClientCharacteristicOperationsObserver&, const infra::Function<void(), 8>&)' marked 'override', but does not override

Check failure on line 34 in hal_st/middlewares/ble_middleware/GattClientSt.hpp

View workflow job for this annotation

GitHub Actions / Embedded Build (RelWithDebInfo, 10.3-2021.10, stm32wba52) 

'void hal::GattClientSt::DisableIndication(const services::GattClientCharacteristicOperationsObserver&, const infra::Function<void(), 8>&)' marked 'override', but does not override

// Implementation of hal::HciEventSink
void HciEvent(hci_event_pckt& event) override;
Expand Down Expand Up @@ -76,9 +76,13 @@

static constexpr uint16_t invalidConnection = 0xffff;

infra::Function<void(services::GattClientDiscoveryObserver&)> onDiscoveryCompletion;
mutable infra::AutoResetFunction<void(const infra::ConstByteRange&)> onResponse;
mutable infra::AutoResetFunction<void()> onDone;
infra::AutoResetFunction<void()> onDiscoveryCompletion;
infra::AutoResetFunction<void(const infra::ConstByteRange&)> onResponse;
infra::AutoResetFunction<void()> onDone;

infra::ClaimableResource resource;
infra::ClaimableResource::Claimer claimerDiscovery{ resource };
infra::ClaimableResource::Claimer::WithSize<2 * sizeof(services::GattClientDiscovery&) + sizeof(infra::ByteRange)> claimerCharacteristicOperations{ resource };
};
}

Expand Down
22 changes: 11 additions & 11 deletions hal_st/middlewares/ble_middleware/TracingGattClientSt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,55 +15,55 @@ namespace hal
GattClientSt::StartServiceDiscovery();
}

void TracingGattClientSt::StartCharacteristicDiscovery(const services::GattService& service)
void TracingGattClientSt::StartCharacteristicDiscovery(services::AttAttribute::Handle handle, services::AttAttribute::Handle endHandle)
{
tracer.Trace() << "TracingGattClientSt::StartCharacteristicDiscovery";
GattClientSt::StartCharacteristicDiscovery(service);
GattClientSt::StartCharacteristicDiscovery(handle, endHandle);
}

void TracingGattClientSt::StartDescriptorDiscovery(const services::GattService& service)
void TracingGattClientSt::StartDescriptorDiscovery(services::AttAttribute::Handle handle, services::AttAttribute::Handle endHandle)
{
tracer.Trace() << "TracingGattClientSt::StartDescriptorDiscovery";
GattClientSt::StartDescriptorDiscovery(service);
GattClientSt::StartDescriptorDiscovery(handle, endHandle);
}

void TracingGattClientSt::Read(const services::GattClientCharacteristicOperationsObserver& characteristic, const infra::Function<void(const infra::ConstByteRange&)>& onResponse) const
void TracingGattClientSt::Read(const services::GattClientCharacteristicOperationsObserver& characteristic, const infra::Function<void(const infra::ConstByteRange&)>& onResponse)
{
tracer.Trace() << "TracingGattClientSt::Read, Value Handle: " << infra::hex << characteristic.CharacteristicValueHandle();
GattClientSt::Read(characteristic, onResponse);
}

void TracingGattClientSt::Write(const services::GattClientCharacteristicOperationsObserver& characteristic, infra::ConstByteRange data, const infra::Function<void()>& onDone) const
void TracingGattClientSt::Write(const services::GattClientCharacteristicOperationsObserver& characteristic, infra::ConstByteRange data, const infra::Function<void()>& onDone)
{
tracer.Trace() << "TracingGattClientSt::Write, Value Handle: " << infra::hex << characteristic.CharacteristicValueHandle() << ", data: " << infra::AsHex(data);
GattClientSt::Write(characteristic, data, onDone);
}

void TracingGattClientSt::WriteWithoutResponse(const services::GattClientCharacteristicOperationsObserver& characteristic, infra::ConstByteRange data) const
void TracingGattClientSt::WriteWithoutResponse(const services::GattClientCharacteristicOperationsObserver& characteristic, infra::ConstByteRange data)
{
tracer.Trace() << "TracingGattClientSt::WriteWithoutResponse, Value Handle: " << infra::hex << characteristic.CharacteristicValueHandle() << ", data: " << infra::AsHex(data);
GattClientSt::WriteWithoutResponse(characteristic, data);
}

void TracingGattClientSt::EnableNotification(const services::GattClientCharacteristicOperationsObserver& characteristic, const infra::Function<void()>& onDone) const
void TracingGattClientSt::EnableNotification(const services::GattClientCharacteristicOperationsObserver& characteristic, const infra::Function<void()>& onDone)
{
tracer.Trace() << "TracingGattClientSt::EnableNotification, Handle: " << infra::hex << (characteristic.CharacteristicValueHandle() + 1);
GattClientSt::EnableNotification(characteristic, onDone);
}

void TracingGattClientSt::DisableNotification(const services::GattClientCharacteristicOperationsObserver& characteristic, const infra::Function<void()>& onDone) const
void TracingGattClientSt::DisableNotification(const services::GattClientCharacteristicOperationsObserver& characteristic, const infra::Function<void()>& onDone)
{
tracer.Trace() << "TracingGattClientSt::DisableNotification, Handle: " << infra::hex << (characteristic.CharacteristicValueHandle() + 1);
GattClientSt::DisableNotification(characteristic, onDone);
}

void TracingGattClientSt::EnableIndication(const services::GattClientCharacteristicOperationsObserver& characteristic, const infra::Function<void()>& onDone) const
void TracingGattClientSt::EnableIndication(const services::GattClientCharacteristicOperationsObserver& characteristic, const infra::Function<void()>& onDone)
{
tracer.Trace() << "TracingGattClientSt::EnableIndication, Handle: " << infra::hex << (characteristic.CharacteristicValueHandle() + 1);
GattClientSt::EnableIndication(characteristic, onDone);
}

void TracingGattClientSt::DisableIndication(const services::GattClientCharacteristicOperationsObserver& characteristic, const infra::Function<void()>& onDone) const
void TracingGattClientSt::DisableIndication(const services::GattClientCharacteristicOperationsObserver& characteristic, const infra::Function<void()>& onDone)
{
tracer.Trace() << "TracingGattClientSt::DisableIndication, Handle: " << infra::hex << (characteristic.CharacteristicValueHandle() + 1);
GattClientSt::DisableIndication(characteristic, onDone);
Expand Down
Loading
Loading