aboutsummaryrefslogtreecommitdiff
path: root/src/modules/uavcan
diff options
context:
space:
mode:
authorPavel Kirienko <pavel.kirienko@gmail.com>2014-08-22 13:24:31 +0400
committerPavel Kirienko <pavel.kirienko@gmail.com>2014-08-22 13:24:31 +0400
commitf820010a2b51d03f0099d3b4853e0620593721e6 (patch)
tree1f0e145d6c203321cd04efd751f735c4bb54cb50 /src/modules/uavcan
parent0d9f6b6e2ec86f7fa95bc2e7650256e1392544b2 (diff)
downloadpx4-firmware-f820010a2b51d03f0099d3b4853e0620593721e6.tar.gz
px4-firmware-f820010a2b51d03f0099d3b4853e0620593721e6.tar.bz2
px4-firmware-f820010a2b51d03f0099d3b4853e0620593721e6.zip
UAVCAN GNSS subscription name fix
Diffstat (limited to 'src/modules/uavcan')
-rw-r--r--src/modules/uavcan/sensors/gnss.cpp4
-rw-r--r--src/modules/uavcan/sensors/gnss.hpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/modules/uavcan/sensors/gnss.cpp b/src/modules/uavcan/sensors/gnss.cpp
index 4fc0743ff..fb89b8365 100644
--- a/src/modules/uavcan/sensors/gnss.cpp
+++ b/src/modules/uavcan/sensors/gnss.cpp
@@ -47,7 +47,7 @@
UavcanGnssBridge::UavcanGnssBridge(uavcan::INode &node) :
_node(node),
-_uavcan_sub_status(node),
+_sub_fix(node),
_report_pub(-1)
{
}
@@ -59,7 +59,7 @@ int UavcanGnssBridge::init()
int res = -1;
// GNSS fix subscription
- res = _uavcan_sub_status.start(FixCbBinder(this, &UavcanGnssBridge::gnss_fix_sub_cb));
+ res = _sub_fix.start(FixCbBinder(this, &UavcanGnssBridge::gnss_fix_sub_cb));
if (res < 0)
{
warnx("GNSS fix sub failed %i", res);
diff --git a/src/modules/uavcan/sensors/gnss.hpp b/src/modules/uavcan/sensors/gnss.hpp
index eec595ad1..6bdae8de3 100644
--- a/src/modules/uavcan/sensors/gnss.hpp
+++ b/src/modules/uavcan/sensors/gnss.hpp
@@ -77,7 +77,7 @@ private:
* libuavcan related things
*/
uavcan::INode &_node;
- uavcan::Subscriber<uavcan::equipment::gnss::Fix, FixCbBinder> _uavcan_sub_status;
+ uavcan::Subscriber<uavcan::equipment::gnss::Fix, FixCbBinder> _sub_fix;
/*
* uORB