param gen reorganize and fix DISABLE_PARAMS_MODULE_SCOPING

src/modules/systemlib/param/CMakeLists.txt

@@ -0,0 +1,101 @@
+############################################################################
+#
+#   Copyright (c) 2017 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.
+#
+############################################################################
+
+set(SRCS)
+if ("${CONFIG_SHMEM}" STREQUAL "1")
+	message(STATUS "parameters shared memory enabled")
+	list(APPEND SRCS
+		param_shmem.c
+		)
+else()
+	list(APPEND SRCS
+		param.c
+		)
+endif()
+
+if (NOT PARAM_DEFAULT_OVERRIDES)
+	set(PARAM_DEFAULT_OVERRIDES "{}")
+endif()
+
+# get full path for each module
+set(module_list)
+if (DISABLE_PARAMS_MODULE_SCOPING)
+	# search all directories with .c files (potentially containing parameters)
+	file(GLOB_RECURSE new_list ${PX4_SOURCE_DIR}/src/*.c)
+	foreach(file_path ${new_list})
+		get_filename_component(dir_path ${file_path} PATH)
+		list(APPEND module_list "${dir_path}")
+	endforeach()
+	list(REMOVE_DUPLICATES module_list)
+else()
+	foreach(module ${config_module_list})
+		list(APPEND module_list ${PX4_SOURCE_DIR}/src/${module})
+	endforeach()
+endif()
+
+set(parameters_xml ${PX4_BINARY_DIR}/parameters.xml)
+file(GLOB_RECURSE param_src_files ${PX4_SOURCE_DIR}/src/*params.c)
+add_custom_command(OUTPUT ${parameters_xml}
+	COMMAND ${PYTHON_EXECUTABLE} ${PX4_SOURCE_DIR}/Tools/px_process_params.py
+		-s ${module_list} ${EXTERNAL_MODULES_LOCATION}
+		--board CONFIG_ARCH_${BOARD} --xml --inject-xml
+		--overrides ${PARAM_DEFAULT_OVERRIDES}
+	DEPENDS ${param_src_files} ${PX4_SOURCE_DIR}/Tools/px_process_params.py
+	WORKING_DIRECTORY ${PX4_BINARY_DIR}
+)
+add_custom_target(parameters_xml DEPENDS ${parameters_xml})
+
+# generate px4_parameters.c and px4_parameters.h
+add_custom_command(OUTPUT px4_parameters.c px4_parameters.h
+	COMMAND ${PYTHON_EXECUTABLE} ${PX4_SOURCE_DIR}/Tools/px_generate_params.py
+		--xml ${parameters_xml} --dest ${CMAKE_CURRENT_BINARY_DIR}
+	DEPENDS
+		${parameters_xml}
+		${PX4_SOURCE_DIR}/Tools/px_generate_params.py
+		${PX4_SOURCE_DIR}/Tools/templates/px4_parameters.c.jinja
+		${PX4_SOURCE_DIR}/Tools/templates/px4_parameters.h.jinja
+	)
+set_source_files_properties(px4_parameters.c PROPERTIES GENERATED TRUE)
+
+px4_add_module(
+	MODULE modules__systemlib__param
+	COMPILE_FLAGS
+	INCLUDES
+		${CMAKE_CURRENT_BINARY_DIR}
+	SRCS
+		${SRCS}
+		px4_parameters.c
+	DEPENDS
+		platforms__common
+	)
+# vim: set noet ft=cmake fenc=utf-8 ff=unix :

src/modules/systemlib/param/param.c

@@ -64,7 +64,7 @@
 #include "systemlib/uthash/utarray.h"
 #include "systemlib/bson/tinybson.h"
 
-//#define PARAM_NO_ORB ///< if defined, avoid uorb depenency. This disables publication of parameter_update on param change
+//#define PARAM_NO_ORB ///< if defined, avoid uorb dependency. This disables publication of parameter_update on param change
 //#define PARAM_NO_AUTOSAVE ///< if defined, do not autosave (avoids LP work queue dependency)
 
 #if !defined(PARAM_NO_ORB)