From: jiung-yu Date: Mon, 18 Oct 2021 15:16:22 +0000 (+0900) Subject: Update filtered data X-Git-Tag: submit/tizen/20220209.010534~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F94%2F265394%2F1;p=platform%2Fcore%2Fconnectivity%2Fuwb-manager.git Update filtered data Change-Id: I618df6e66fd428b1344b4f3faa31f3ab87bba137 Signed-off-by: Yu jiung --- diff --git a/include/Node.h b/include/Node.h index ad3bf26..8f835e4 100755 --- a/include/Node.h +++ b/include/Node.h @@ -80,9 +80,11 @@ public: int getZ(void) {return _z;}; void setZ(int z) {_z = z;}; int getRange(void) {return _range;}; + void copyFilteredRange(const Node &node) { _filtered_range = node._filtered_range; } float getFilteredRange(void) { return _filtered_range.getState(); }; void setRange(int range) {_range = range;}; int getAoa(void) {return _aoa;}; + void copyFilteredAoa(const Node &node) { _filtered_aoa = node._filtered_aoa; } float getFilteredAoa(void) { return _filtered_aoa.getState(); }; void setAoa(int aoa) {_aoa = aoa;}; int getPdoa(void) {return _pdoa;}; diff --git a/packaging/uwb-manager.spec b/packaging/uwb-manager.spec index 2721e40..85af337 100755 --- a/packaging/uwb-manager.spec +++ b/packaging/uwb-manager.spec @@ -1,6 +1,6 @@ Name: uwb-manager Summary: This is the daemon managing UWB related functionalities -Version: 0.0.6 +Version: 0.0.7 Release: 1 Group: Network & Connectivity/Wireless License: Apache-2.0 diff --git a/src/LocationManager.cpp b/src/LocationManager.cpp index 3c1adb3..0fe3cc5 100644 --- a/src/LocationManager.cpp +++ b/src/LocationManager.cpp @@ -361,6 +361,10 @@ void LocationManager::updateUwbNodes(void) auto itr = this->_node_map.find(p_node->getNodeId()); bool added = itr == this->_node_map.end(); + if (!added) { + p_node->copyFilteredRange(*itr->second.get()); + p_node->copyFilteredAoa(*itr->second.get()); + } p_node->setLastUpdate(std::chrono::steady_clock::now()); p_node->updateFilters(); diff --git a/src/UwbDbusIfaceAdapter.cpp b/src/UwbDbusIfaceAdapter.cpp index 8ac7cee..5d8586d 100644 --- a/src/UwbDbusIfaceAdapter.cpp +++ b/src/UwbDbusIfaceAdapter.cpp @@ -300,6 +300,10 @@ static void __build_network_variant(std::map> &node_m g_variant_new_int32(node_ptr->getAoa())); g_variant_builder_add(builder, "{sv}", "Pdoa", g_variant_new_int32(node_ptr->getPdoa())); + g_variant_builder_add(builder, "{sv}", "FilteredRange", + g_variant_new_int32((int)node_ptr->getFilteredRange())); + g_variant_builder_add(builder, "{sv}", "FilteredAoa", + g_variant_new_int32((int)node_ptr->getFilteredAoa())); g_variant_builder_close(builder); }