From 68ce62f1731bad8f74ec41d3f54069ee4623e076 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beat=20K=C3=BCng?= <beat-kueng@gmx.net>
Date: Mon, 19 Mar 2018 14:21:56 +0100
Subject: [PATCH] Commander.hpp: remove usage of BlockParam & SuperBlock
---
src/modules/commander/Commander.hpp | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/modules/commander/Commander.hpp b/src/modules/commander/Commander.hpp
index a14870f0d7..c27e251155 100644
--- a/src/modules/commander/Commander.hpp
+++ b/src/modules/commander/Commander.hpp
@@ -36,6 +36,7 @@
#include <controllib/blocks.hpp>
#include <px4_module.h>
+#include <px4_module_params.h>
// publications
#include <uORB/Publication.hpp>
@@ -55,19 +56,16 @@
#include <uORB/topics/vehicle_global_position.h>
#include <uORB/topics/vehicle_local_position.h>
-using control::BlockParamFloat;
-using control::BlockParamInt;
using uORB::Publication;
using uORB::Subscription;
-class Commander : public control::SuperBlock, public ModuleBase<Commander>
+class Commander : public ModuleBase<Commander>, public ModuleParams
{
public:
Commander() :
- SuperBlock(nullptr, "COM"),
- _mission_result_sub(ORB_ID(mission_result), 0, 0, &getSubscriptions())
+ ModuleParams(nullptr),
+ _mission_result_sub(ORB_ID(mission_result))
{
- updateParams();
}
/** @see ModuleBase */
--
GitLab