From 93a54ee63dcdbc2164f702df9ec70f60d91a5ffc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beat=20K=C3=BCng?= <beat-kueng@gmx.net>
Date: Thu, 11 Nov 2021 11:10:24 +0100
Subject: [PATCH] metadata: fix generic param metadata generation

Adds the module.yaml params that was previously split into a separate file.
---
 cmake/metadata.cmake | 18 +++++++++++++++---
 src/.gitignore       |  3 ---
 2 files changed, 15 insertions(+), 6 deletions(-)
 delete mode 100644 src/.gitignore

diff --git a/cmake/metadata.cmake b/cmake/metadata.cmake
index a5519173de..5f64b0fdc5 100644
--- a/cmake/metadata.cmake
+++ b/cmake/metadata.cmake
@@ -45,14 +45,26 @@ add_custom_target(metadata_airframes
 	USES_TERMINAL
 )
 
+
+set(generated_params_dir ${PX4_BINARY_DIR}/generated_params_metadata)
 file(GLOB_RECURSE yaml_config_files ${PX4_SOURCE_DIR}/src/modules/*.yaml
 	${PX4_SOURCE_DIR}/src/drivers/*.yaml ${PX4_SOURCE_DIR}/src/lib/*.yaml)
+list(FILTER yaml_config_files EXCLUDE REGEX ".*/pwm_out_sim/") # avoid param duplicates
 add_custom_target(metadata_parameters
 	COMMAND ${CMAKE_COMMAND} -E make_directory ${PX4_BINARY_DIR}/docs
-	COMMAND ${PYTHON_EXECUTABLE}
-	${PX4_SOURCE_DIR}/Tools/serial/generate_config.py --all-ports --ethernet --params-file ${PX4_SOURCE_DIR}/src/generated_serial_params.c --config-files ${yaml_config_files}
+	COMMAND ${CMAKE_COMMAND} -E make_directory ${generated_params_dir}
+
+	COMMAND ${PYTHON_EXECUTABLE} ${PX4_SOURCE_DIR}/Tools/serial/generate_config.py
+		--all-ports --ethernet --params-file ${generated_params_dir}/serial_params.c --config-files ${yaml_config_files}
+
+	COMMAND ${PYTHON_EXECUTABLE} ${PX4_SOURCE_DIR}/Tools/module_config/generate_params.py
+		--params-file ${generated_params_dir}/module_params.c
+		--timer-config ${PX4_SOURCE_DIR}/boards/px4/fmu-v5/src/timer_config.cpp # select a typical board
+		--board-with-io
+		--config-files ${yaml_config_files} #--verbose
+
 	COMMAND ${PYTHON_EXECUTABLE} ${PX4_SOURCE_DIR}/src/lib/parameters/px_process_params.py
-		--src-path `find ${PX4_SOURCE_DIR}/src -maxdepth 4 -type d`
+		--src-path `find ${PX4_SOURCE_DIR}/src -maxdepth 4 -type d` ${generated_params_dir}
 		--inject-xml ${PX4_SOURCE_DIR}/src/lib/parameters/parameters_injected.xml
 		--markdown ${PX4_BINARY_DIR}/docs/parameters.md
 
diff --git a/src/.gitignore b/src/.gitignore
deleted file mode 100644
index 0ee2771b77..0000000000
--- a/src/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-
-/generated_serial_params.c
-