TySS-Dev/nearby
1
0
Fork 0
mirror of https://github.com/kidfromjupiter/nearby.git synced 2026-09-14 14:46:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Maintain on_characteristic_changed_cb in GattCharacteristicData struct

Browse Source 
PiperOrigin-RevId: 516972294
This commit is contained in:
Qin Wang
2023-03-15 17:19:39 -07:00
committed by Copybara-Service
parent ae3a4ca0b5
commit 52d41aa671
2 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/platform/implementation/windows/ble_gatt_client.cc
+24 -22
View File
@@ -414,7 +414,6 @@ bool BleGattClient::SetCharacteristicSubscription(
on_characteristic_changed_cb) {
NEARBY_LOGS(VERBOSE) << __func__
<< ": Started to set Characteristic Subscription.";
absl::MutexLock lock(&mutex_);
GattClientCharacteristicConfigurationDescriptorValue gcccd_value =
GattClientCharacteristicConfigurationDescriptorValue::None;
if ((characteristic.property & Property::kNotify) != Property::kNone) {
@@ -430,10 +429,12 @@ bool BleGattClient::SetCharacteristicSubscription(
return false;
}
GattCharacteristicData gatt_characteristic_data =
native_characteristic_map_[characteristic];
std::optional<GattCharacteristic> gatt_characteristic =
gatt_characteristic_data.native_characteristic;
std::optional<GattCharacteristic> gatt_characteristic;
{
absl::MutexLock lock(&mutex_);
gatt_characteristic =
native_characteristic_map_[characteristic].native_characteristic;
}
if (!gatt_characteristic.has_value()) {
NEARBY_LOGS(ERROR) << __func__
@@ -450,30 +451,29 @@ bool BleGattClient::SetCharacteristicSubscription(
return false;
}
absl::MutexLock lock(&mutex_);
// Set value changed handler
try {
if (enable) {
gatt_characteristic_data.notification_token =
native_characteristic_map_[characteristic].on_characteristic_changed_cb =
std::move(on_characteristic_changed_cb);
native_characteristic_map_[characteristic].notification_token =
gatt_characteristic->ValueChanged(
[this, &on_characteristic_changed_cb](
GattCharacteristic const& characteristic,
[&](GattCharacteristic const& native_characteristic,
GattValueChangedEventArgs args) {
BleGattClient::OnCharacteristicValueChanged(
characteristic, args,
std::move(on_characteristic_changed_cb));
BleGattClient::OnCharacteristicValueChanged(characteristic,
args);
});
if (!gatt_characteristic_data.notification_token) {
if (!native_characteristic_map_[characteristic].notification_token) {
NEARBY_LOGS(ERROR) << __func__
<< ": Failed to add value change handler.";
return false;
}
} else {
if (gatt_characteristic_data.notification_token) {
gatt_characteristic->ValueChanged(
std::exchange(gatt_characteristic_data.notification_token, {}));
} else if (native_characteristic_map_[characteristic].notification_token) {
gatt_characteristic->ValueChanged(std::exchange(
native_characteristic_map_[characteristic].notification_token, {}));
}
}
NEARBY_LOGS(ERROR) << __func__
<< ": Successfully set Characteristic Subscription.";
return true;
@@ -610,10 +610,9 @@ bool BleGattClient::WriteCharacteristicConfigurationDescriptor(
}
void BleGattClient::OnCharacteristicValueChanged(
GattCharacteristic const& characteristic, GattValueChangedEventArgs args,
absl::AnyInvocable<void(absl::string_view value)>
on_characteristic_changed_cb) {
NEARBY_LOGS(VERBOSE) << __func__ << "Gatt Characteristic value changed.";
const api::ble_v2::GattCharacteristic& characteristic,
GattValueChangedEventArgs args) {
NEARBY_LOGS(VERBOSE) << __func__ << ": Gatt Characteristic value changed.";
IBuffer buffer = args.CharacteristicValue();
int size = buffer.Length();
DataReader data_reader = DataReader::FromBuffer(buffer);
@@ -624,7 +623,10 @@ void BleGattClient::OnCharacteristicValueChanged(
}
NEARBY_LOGS(VERBOSE) << __func__
<< ": Got characteristic value length= " << data.size();
on_characteristic_changed_cb(data);
absl::MutexLock lock(&mutex_);
DCHECK(
native_characteristic_map_[characteristic].on_characteristic_changed_cb);
native_characteristic_map_[characteristic].on_characteristic_changed_cb(data);
}
} // namespace windows
internal/platform/implementation/windows/ble_gatt_client.h
+4 -5
View File
@@ -69,6 +69,8 @@ class BleGattClient : public api::ble_v2::GattClient {
GenericAttributeProfile::GattCharacteristic>
native_characteristic = std::nullopt;
::winrt::event_token notification_token;
absl::AnyInvocable<void(absl::string_view value)>
on_characteristic_changed_cb;
};
std::optional<::winrt::Windows::Devices::Bluetooth::GenericAttributeProfile::
GattCharacteristic>
@@ -82,12 +84,9 @@ class BleGattClient : public api::ble_v2::GattClient {
GattClientCharacteristicConfigurationDescriptorValue value);
void OnCharacteristicValueChanged(
const api::ble_v2::GattCharacteristic& characteristic,
::winrt::Windows::Devices::Bluetooth::GenericAttributeProfile::
GattCharacteristic const& characteristic,
::winrt::Windows::Devices::Bluetooth::GenericAttributeProfile::
GattValueChangedEventArgs args,
absl::AnyInvocable<void(absl::string_view value)>
on_characteristic_changed_cb);
GattValueChangedEventArgs args);
absl::Mutex mutex_;