aboutsummaryrefslogtreecommitdiff
path: root/src/examples
diff options
context:
space:
mode:
authorThomas Gubler <thomasgubler@gmail.com>2014-12-03 15:11:27 +0100
committerThomas Gubler <thomasgubler@gmail.com>2014-12-03 15:11:27 +0100
commit924350a5de1a609e470618ef78212bf7b0044c33 (patch)
treee6c0e2c79135833e0dcc86aad68dae16320892b9 /src/examples
parent1c79f0cef1f21cff7935ddd7caf048fd96991eea (diff)
downloadpx4-firmware-924350a5de1a609e470618ef78212bf7b0044c33.tar.gz
px4-firmware-924350a5de1a609e470618ef78212bf7b0044c33.tar.bz2
px4-firmware-924350a5de1a609e470618ef78212bf7b0044c33.zip
bring up param wrapper for px4, moved global include file
Diffstat (limited to 'src/examples')
-rw-r--r--src/examples/subscriber/module.mk3
-rw-r--r--src/examples/subscriber/subscriber.cpp2
-rw-r--r--src/examples/subscriber/subscriber_params.c55
3 files changed, 58 insertions, 2 deletions
diff --git a/src/examples/subscriber/module.mk b/src/examples/subscriber/module.mk
index 481c36ea7..90b4d8ffc 100644
--- a/src/examples/subscriber/module.mk
+++ b/src/examples/subscriber/module.mk
@@ -37,6 +37,7 @@
MODULE_COMMAND = subscriber
-SRCS = subscriber.cpp
+SRCS = subscriber.cpp \
+ subscriber_params.c
MODULE_STACKSIZE = 2400
diff --git a/src/examples/subscriber/subscriber.cpp b/src/examples/subscriber/subscriber.cpp
index e52d661a9..cc9b7a794 100644
--- a/src/examples/subscriber/subscriber.cpp
+++ b/src/examples/subscriber/subscriber.cpp
@@ -84,7 +84,7 @@ PX4_MAIN_FUNCTION(subscriber) {
PX4_PARAM_GET(p_sub_interv, &sub_interval);
PX4_INFO("Param SUB_INTERV = %d", sub_interval);
PX4_PARAM_GET(p_test_float, &test_float);
- PX4_INFO("Param SUB_TESTF = %f", (double)test_float);
+ PX4_INFO("Param SUB_TESTF = %.3f", (double)test_float);
/**
* The subscribe() call is how you tell ROS that you want to receive messages
diff --git a/src/examples/subscriber/subscriber_params.c b/src/examples/subscriber/subscriber_params.c
new file mode 100644
index 000000000..e28bfbc36
--- /dev/null
+++ b/src/examples/subscriber/subscriber_params.c
@@ -0,0 +1,55 @@
+/****************************************************************************
+ *
+ * Copyright (c) 2013, 2014 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.
+ *
+ ****************************************************************************/
+
+/**
+ * @file subscriber_params.c
+ * Parameters for the subscriber example
+ *
+ * @author Thomas Gubler <thomasgubler@gmail.com>
+ */
+
+#include <systemlib/param/param.h>
+
+/**
+ * Interval of one subscriber in the example in ms
+ *
+ * @group Subscriber Example
+ */
+PARAM_DEFINE_INT32(SUB_INTERV, 100);
+
+/**
+ * Float Demonstration Parameter in the Example
+ *
+ * @group Subscriber Example
+ */
+PARAM_DEFINE_FLOAT(SUB_TESTF, 3.14f);