From 25483faf8803297f0d4be83c8d90aea890a1918e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beat=20K=C3=BCng?= <beat-kueng@gmx.net> Date: Wed, 17 Jan 2018 16:04:30 +0100 Subject: [PATCH] modules: add a new module that serves as template for background tasks --- src/templates/module/CMakeLists.txt | 44 ++++++ src/templates/module/module.cpp | 228 ++++++++++++++++++++++++++++ src/templates/module/module.h | 80 ++++++++++ 3 files changed, 352 insertions(+) create mode 100644 src/templates/module/CMakeLists.txt create mode 100644 src/templates/module/module.cpp create mode 100644 src/templates/module/module.h diff --git a/src/templates/module/CMakeLists.txt b/src/templates/module/CMakeLists.txt new file mode 100644 index 0000000000..b21e9bfc8a --- /dev/null +++ b/src/templates/module/CMakeLists.txt @@ -0,0 +1,44 @@ +############################################################################ +# +# Copyright (c) 2018 PX4 Development Team. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name PX4 nor the names of its contributors may be +# used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +############################################################################ + +px4_add_module( + MODULE templates__module + MAIN module + STACK_MAIN 1024 + SRCS + module.cpp + DEPENDS + platforms__common + modules__uORB + ) + diff --git a/src/templates/module/module.cpp b/src/templates/module/module.cpp new file mode 100644 index 0000000000..cde02bc6be --- /dev/null +++ b/src/templates/module/module.cpp @@ -0,0 +1,228 @@ +/**************************************************************************** + * + * Copyright (c) 2018 PX4 Development Team. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name PX4 nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + ****************************************************************************/ + +#include "module.h" + +#include <px4_getopt.h> +#include <px4_log.h> +#include <px4_posix.h> + +#include <uORB/topics/parameter_update.h> +#include <uORB/topics/sensor_combined.h> + + +int Module::print_usage(const char *reason) +{ + if (reason) { + PX4_WARN("%s\n", reason); + } + + PRINT_MODULE_DESCRIPTION( + R"DESCR_STR( +### Description +Section that describes the provided module functionality. + +This is a template for a module running as a task in the background with start/stop/status functionality. + +### Implementation +Section describing the high-level implementation of this module. + +### Examples +CLI usage example: +$ module start -f -p 42 + +)DESCR_STR"); + + PRINT_MODULE_USAGE_NAME("module", "system"); + PRINT_MODULE_USAGE_COMMAND("start"); + PRINT_MODULE_USAGE_PARAM_FLAG('f', "Optional example flag", true); + PRINT_MODULE_USAGE_PARAM_INT('p', 0, 0, 1000, "Optional example parameter", true); + PRINT_MODULE_USAGE_DEFAULT_COMMANDS(); + + return 0; +} + +int Module::print_status() +{ + PX4_INFO("Running"); + // TODO: print additional runtime information about the state of the module + + return 0; +} + +int Module::custom_command(int argc, char *argv[]) +{ + /* + // additional custom commands can be handled like this: + if (!strcmp(argv[0], "do-something")) { + get_instance()->do_something(); + return 0; + } + */ + + return print_usage("unknown command"); +} + + +int Module::task_spawn(int argc, char *argv[]) +{ + _task_id = px4_task_spawn_cmd("module", + SCHED_DEFAULT, + SCHED_PRIORITY_DEFAULT, + 1024, + (px4_main_t)&run_trampoline, + (char *const *)argv); + + if (_task_id < 0) { + _task_id = -1; + return -errno; + } + + return 0; +} + +Module *Module::instantiate(int argc, char *argv[]) +{ + int example_param = 0; + bool example_flag = false; + bool error_flag = false; + + int myoptind = 1; + int ch; + const char *myoptarg = nullptr; + + // parse CLI arguments + while ((ch = px4_getopt(argc, argv, "p:f", &myoptind, &myoptarg)) != EOF) { + switch (ch) { + case 'p': + example_param = (int)strtol(myoptarg, nullptr, 10); + break; + + case 'f': + example_flag = true; + break; + + case '?': + error_flag = true; + break; + + default: + PX4_WARN("unrecognized flag"); + error_flag = true; + break; + } + } + + if (error_flag) { + return nullptr; + } + + Module *instance = new Module(example_param, example_flag); + + if (instance == nullptr) { + PX4_ERR("alloc failed"); + } + + return instance; +} + +Module::Module(int example_param, bool example_flag) + : SuperBlock(nullptr, "MOD"), + _sys_autostart(this, "SYS_AUTOSTART", false) +{ +} + +void Module::run() +{ + // Example: run the loop synchronized to the sensor_combined topic publication + int sensor_combined_sub = orb_subscribe(ORB_ID(sensor_combined)); + + px4_pollfd_struct_t fds[1]; + fds[0].fd = sensor_combined_sub; + fds[0].events = POLLIN; + + // initialize parameters + int parameter_update_sub = orb_subscribe(ORB_ID(parameter_update)); + parameters_update(parameter_update_sub, true); + + while (!should_exit()) { + + // wait for up to 1000ms for data + int pret = px4_poll(fds, (sizeof(fds) / sizeof(fds[0])), 1000); + + if (pret == 0) { + // Timeout: let the loop run anyway, don't do `continue` here + + } else if (pret < 0) { + // this is undesirable but not much we can do + PX4_ERR("poll error %d, %d", pret, errno); + usleep(50000); + continue; + + } else if (fds[0].revents & POLLIN) { + + struct sensor_combined_s sensor_combined; + orb_copy(ORB_ID(sensor_combined), sensor_combined_sub, &sensor_combined); + // TODO: do something with the data... + + } + + + parameters_update(parameter_update_sub); + } + + orb_unsubscribe(sensor_combined_sub); + orb_unsubscribe(parameter_update_sub); +} + +void Module::parameters_update(int parameter_update_sub, bool force) +{ + bool updated; + struct parameter_update_s param_upd; + + orb_check(parameter_update_sub, &updated); + + if (updated) { + orb_copy(ORB_ID(parameter_update), parameter_update_sub, ¶m_upd); + } + + if (force || updated) { + updateParams(); + } +} + + +int module_main(int argc, char *argv[]) +{ + return Module::main(argc, argv); +} diff --git a/src/templates/module/module.h b/src/templates/module/module.h new file mode 100644 index 0000000000..4f05838aa1 --- /dev/null +++ b/src/templates/module/module.h @@ -0,0 +1,80 @@ +/**************************************************************************** + * + * Copyright (c) 2018 PX4 Development Team. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name PX4 nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + ****************************************************************************/ + +#pragma once + +#include <px4_module.h> +#include <controllib/blocks.hpp> +#include <controllib/block/BlockParam.hpp> + +extern "C" __EXPORT int module_main(int argc, char *argv[]); + + +class Module : public ModuleBase<Module>, public control::SuperBlock +{ +public: + Module(int example_param, bool example_flag); + + virtual ~Module() = default; + + /** @see ModuleBase */ + static int task_spawn(int argc, char *argv[]); + + /** @see ModuleBase */ + static Module *instantiate(int argc, char *argv[]); + + /** @see ModuleBase */ + static int custom_command(int argc, char *argv[]); + + /** @see ModuleBase */ + static int print_usage(const char *reason = nullptr); + + /** @see ModuleBase::run() */ + void run() override; + + /** @see ModuleBase::print_status() */ + int print_status() override; + +private: + + /** + * Check for parameter changes and update them if needed. + * @param parameter_update_sub uorb subscription to parameter_update + * @param force for a parameter update + */ + void parameters_update(int parameter_update_sub, bool force = false); + + + control::BlockParamInt _sys_autostart; /**< example parameter */ +}; + -- GitLab