Browse Source

Changes to add px4fmu-v2_lpe config.

sbg
James Goppert 8 years ago committed by Lorenz Meier
parent
commit
434dddedea
  1. 5
      CMakeLists.txt
  2. 1
      Makefile
  3. 15
      Tools/px_process_params.py
  4. 6
      cmake/common/px4_base.cmake
  5. 12
      cmake/configs/nuttx_px4fmu-v2_lpe.cmake

5
CMakeLists.txt

@ -365,8 +365,9 @@ px4_generate_messages(TARGET msg_gen @@ -365,8 +365,9 @@ px4_generate_messages(TARGET msg_gen
DEPENDS git_genmsg git_gencpp prebuild_targets
)
px4_generate_parameters_xml(OUT parameters.xml
BOARD ${BOARD}
SCOPE ${PX4_SOURCE_DIR}/cmake/configs/${OS}_${BOARD}_${LABEL}.cmake)
BOARD ${BOARD}
SCOPE ${PX4_SOURCE_DIR}/cmake/configs/${OS}_${BOARD}_${LABEL}.cmake
OVERRIDES ${PARAM_DEFAULT_OVERRIDES})
px4_generate_airframes_xml(OUT airframes.xml BOARD ${BOARD})
add_custom_target(xml_gen
DEPENDS parameters.xml airframes.xml)

1
Makefile

@ -207,6 +207,7 @@ qgc_firmware: \ @@ -207,6 +207,7 @@ qgc_firmware: \
check_mindpx-v2_default \
check_px4fmu-v1_default \
check_px4fmu-v2_default \
check_px4fmu-v2_lpe \
check_px4fmu-v3_default \
check_px4fmu-v4_default \
check_tap-v1_default \

15
Tools/px_process_params.py

@ -53,6 +53,7 @@ import argparse @@ -53,6 +53,7 @@ import argparse
from px4params import srcscanner, srcparser, xmlout, dokuwikiout, dokuwikirpc, scope, cmakeparser
import re
import json
import codecs
def main():
@ -112,6 +113,10 @@ def main(): @@ -112,6 +113,10 @@ def main():
help="DokuWiki page edit summary")
parser.add_argument('-v', '--verbose', action='store_true', help="verbose output")
parser.add_argument('--scope', default=None, action='store', help="pass the scope (list of compiled modules)")
parser.add_argument("-o", "--overrides",
default="{}",
metavar="OVERRIDES",
help="a dict of overrides in the form of a json string")
args = parser.parse_args()
@ -155,6 +160,16 @@ def main(): @@ -155,6 +160,16 @@ def main():
if len(param_groups) == 0:
print("Warning: no parameters found")
override_dict = json.loads(args.overrides)
if len(override_dict.keys()) > 0:
for group in param_groups:
for param in group.GetParams():
name = param.GetName()
if name in override_dict.keys():
val = str(override_dict[param.GetName()])
param.default = val
print("OVERRIDING {:s} to {:s}!!!!!".format(name, val))
# Output to XML file
if args.xml:
if args.verbose: print("Creating XML file " + args.xml)

6
cmake/common/px4_base.cmake

@ -1014,16 +1014,20 @@ endfunction() @@ -1014,16 +1014,20 @@ endfunction()
function(px4_generate_parameters_xml)
px4_parse_function_args(
NAME px4_generate_parameters_xml
ONE_VALUE OUT BOARD SCOPE
ONE_VALUE OUT BOARD SCOPE OVERRIDES
REQUIRED OUT BOARD
ARGN ${ARGN})
set(path ${PX4_SOURCE_DIR}/src)
file(GLOB_RECURSE param_src_files
${PX4_SOURCE_DIR}/src/*params.c
)
if (NOT OVERRIDES)
set(OVERRIDES "{}")
endif()
add_custom_command(OUTPUT ${OUT}
COMMAND ${PYTHON_EXECUTABLE} ${PX4_SOURCE_DIR}/Tools/px_process_params.py
-s ${path} --board CONFIG_ARCH_${BOARD} --xml --inject-xml --scope ${SCOPE}
--overrides ${OVERRIDES}
DEPENDS ${param_src_files} ${PX4_SOURCE_DIR}/Tools/px_process_params.py
${PX4_SOURCE_DIR}/Tools/px_generate_params.py
)

12
cmake/configs/nuttx_px4fmu-v2_lpe.cmake

@ -0,0 +1,12 @@ @@ -0,0 +1,12 @@
include(configs/nuttx_px4fmu-v2_default)
set(PARAM_DEFAULT_OVERRIDES "{\\\"SYS_MC_EST_GROUP\\\": 1}")
list(REMOVE_ITEM config_module_list
modules/ekf2
)
list(APPEND config_module_list
modules/attitude_estimator_q
modules/local_position_estimator
)
Loading…
Cancel
Save