make param wrapper macros compatible for px4 and ros, needs cleanup

src/examples/subscriber/subscriber.cpp

@@ -26,6 +26,7 @@
  */
 
 #include <px4.h>
+#include "subscriber_params.h"
 
 using namespace px4;
 
@@ -75,8 +76,8 @@ PX4_MAIN_FUNCTION(subscriber) {
 	px4::NodeHandle n;
 
 	/* Define parameters */
-	px4_param_t p_sub_interv = PX4_PARAM_INIT("SUB_INTERV", 100);
-	px4_param_t p_test_float = PX4_PARAM_INIT("SUB_TESTF", 3.14f);
+	px4_param_t p_sub_interv = PX4_PARAM_INIT(SUB_INTERV);
+	px4_param_t p_test_float = PX4_PARAM_INIT(SUB_TESTF);
 
 	/* Read the parameter back for testing */
 	int32_t sub_interval;

src/examples/subscriber/subscriber_params.c

@@ -38,18 +38,19 @@
  * @author Thomas Gubler <thomasgubler@gmail.com>
  */
 
-#include <systemlib/param/param.h>
+#include <px4_defines.h>
+#include "subscriber_params.h"
 
 /**
  * Interval of one subscriber in the example in ms
  *
  * @group Subscriber Example
  */
-PARAM_DEFINE_INT32(SUB_INTERV, 100);
+PARAM_DEFINE_INT32(SUB_INTERV, PX4_PARAM_DEFAULT_VALUE_NAME(SUB_INTERV));
 
 /**
  * Float Demonstration Parameter in the Example
  *
  * @group Subscriber Example
  */
-PARAM_DEFINE_FLOAT(SUB_TESTF, 3.14f);
+PARAM_DEFINE_FLOAT(SUB_TESTF, PX4_PARAM_DEFAULT_VALUE_NAME(SUB_TESTF));

src/examples/subscriber/subscriber_params.h

@@ -0,0 +1,43 @@
+/****************************************************************************
+ *
+ *   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.h
+ * Default parameters for the subscriber example
+ *
+ * @author Thomas Gubler <thomasgubler@gmail.com>
+ */
+#pragma once
+
+#define SUB_INTERV_DEFAULT_VALUE 100
+#define SUB_TESTF_DEFAULT_VALUE 3.14f