zrzk
/
px4_autopilot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Kconfig remove defconfig in root directory after gen 

Cleanup fmu configs
master
Peter van der Perk 3 years ago committed by Daniel Agar
parent
eb8620a0da
commit
3de5623556
6 changed files with 7 additions and 11 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      boards/px4/fmu-v2/fixedwing.px4board
  2. 3
      boards/px4/fmu-v5/ctrlalloc.px4board
  3. 2
      boards/px4/fmu-v5/debug.px4board
  4. 3
      boards/px4/fmu-v5/stackcheck.px4board
  5. 3
      boards/px4/fmu-v5/test.px4board
  6. 4
      cmake/kconfig.cmake

3
boards/px4/fmu-v2/fixedwing.px4board
Unescape View File

@ -1,12 +1,13 @@ @@ -1,12 +1,13 @@
CONFIG_DRIVERS_DIFFERENTIAL_PRESSURE_MS4525=n
CONFIG_MODULES_FLIGHT_MODE_MANAGER=n
CONFIG_MODULES_MC_ATT_CONTROL=n
CONFIG_MODULES_MC_HOVER_THRUST_ESTIMATOR=n
CONFIG_MODULES_MC_POS_CONTROL=n
CONFIG_MODULES_MC_RATE_CONTROL=n
CONFIG_SYSTEMCMDS_BL_UPDATE=n
CONFIG_COMMON_DIFFERENTIAL_PRESSURE=y
CONFIG_DRIVERS_CAMERA_CAPTURE=y
CONFIG_DRIVERS_CAMERA_TRIGGER=y
CONFIG_COMMON_DIFFERENTIAL_PRESSURE=y
CONFIG_DRIVERS_DISTANCE_SENSOR_LIGHTWARE_LASER_SERIAL=y
CONFIG_DRIVERS_DISTANCE_SENSOR_LL40LS=y
CONFIG_MODULES_CAMERA_FEEDBACK=y

3
boards/px4/fmu-v5/ctrlalloc.px4board
Unescape View File

@ -1,4 +1 @@ @@ -1,4 +1 @@
CONFIG_COMMON_BAROMETERS=y
CONFIG_COMMON_DISTANCE_SENSOR=y
CONFIG_COMMON_MAGNETOMETER=y
CONFIG_MODULES_CONTROL_ALLOCATOR=y

2
boards/px4/fmu-v5/debug.px4board
Unescape View File

@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
# CONFIG_BOARD_UAVCAN_TIMER_OVERRIDE is not set
CONFIG_COMMON_BAROMETERS=n
CONFIG_COMMON_DIFFERENTIAL_PRESSURE=n
CONFIG_COMMON_MAGNETOMETER=n
CONFIG_DRIVERS_ADC_ADS1115=n
CONFIG_DRIVERS_BATT_SMBUS=n
CONFIG_DRIVERS_DIFFERENTIAL_PRESSURE=n
CONFIG_DRIVERS_DSHOT=n
CONFIG_DRIVERS_HEATER=n
CONFIG_DRIVERS_IMU_ANALOG_DEVICES_ADIS16448=n

3
boards/px4/fmu-v5/stackcheck.px4board
Unescape View File

@ -30,6 +30,3 @@ CONFIG_MODULES_TEMPERATURE_COMPENSATION=n @@ -30,6 +30,3 @@ CONFIG_MODULES_TEMPERATURE_COMPENSATION=n
CONFIG_MODULES_VMOUNT=n
CONFIG_BOARD_CONSTRAINED_FLASH=y
CONFIG_BOARD_TESTING=y
CONFIG_COMMON_DISTANCE_SENSOR=y
CONFIG_COMMON_MAGNETOMETER=y
CONFIG_DRIVERS_BAROMETER_MS5611=y

3
boards/px4/fmu-v5/test.px4board
Unescape View File

@ -1,9 +1,6 @@ @@ -1,9 +1,6 @@
CONFIG_MODULES_ATTITUDE_ESTIMATOR_Q=n
CONFIG_MODULES_LOCAL_POSITION_ESTIMATOR=n
CONFIG_BOARD_TESTING=y
CONFIG_COMMON_BAROMETERS=y
CONFIG_COMMON_DISTANCE_SENSOR=y
CONFIG_COMMON_MAGNETOMETER=y
CONFIG_DRIVERS_TEST_PPM=y
CONFIG_EXAMPLES_FAKE_IMU=y
CONFIG_EXAMPLES_FAKE_MAGNETOMETER=y

4
cmake/kconfig.cmake
Unescape View File

@ -349,6 +349,7 @@ if(${LABEL} MATCHES "default" OR ${LABEL} MATCHES "bootloader" OR ${LABEL} MATCH @@ -349,6 +349,7 @@ if(${LABEL} MATCHES "default" OR ${LABEL} MATCHES "bootloader" OR ${LABEL} MATCH
${MENUCONFIG_PATH} Kconfig
COMMAND ${CMAKE_COMMAND} -E env ${COMMON_KCONFIG_ENV_SETTINGS} ${SAVEDEFCONFIG_PATH}
COMMAND ${CMAKE_COMMAND} -E copy defconfig ${BOARD_DEFCONFIG}
COMMAND ${CMAKE_COMMAND} -E remove defconfig
COMMAND ${CMAKE_COMMAND} -E remove ${PX4_BINARY_DIR}/NuttX/apps_copy.stamp
WORKING_DIRECTORY ${PX4_SOURCE_DIR}
USES_TERMINAL
@ -361,6 +362,7 @@ if(${LABEL} MATCHES "default" OR ${LABEL} MATCHES "bootloader" OR ${LABEL} MATCH @@ -361,6 +362,7 @@ if(${LABEL} MATCHES "default" OR ${LABEL} MATCHES "bootloader" OR ${LABEL} MATCH
${GUICONFIG_PATH} Kconfig
COMMAND ${CMAKE_COMMAND} -E env ${COMMON_KCONFIG_ENV_SETTINGS} ${SAVEDEFCONFIG_PATH}
COMMAND ${CMAKE_COMMAND} -E copy defconfig ${BOARD_DEFCONFIG}
COMMAND ${CMAKE_COMMAND} -E remove defconfig
COMMAND ${CMAKE_COMMAND} -E remove ${PX4_BINARY_DIR}/NuttX/apps_copy.stamp
WORKING_DIRECTORY ${PX4_SOURCE_DIR}
USES_TERMINAL
@ -373,6 +375,7 @@ else() @@ -373,6 +375,7 @@ else()
${MENUCONFIG_PATH} Kconfig
COMMAND ${CMAKE_COMMAND} -E env ${COMMON_KCONFIG_ENV_SETTINGS} ${SAVEDEFCONFIG_PATH}
COMMAND ${CMAKE_COMMAND} -E env ${COMMON_KCONFIG_ENV_SETTINGS} ${PYTHON_EXECUTABLE} ${PX4_SOURCE_DIR}/Tools/kconfig/diffconfig.py -m ${PX4_BOARD_DIR}/default.px4board defconfig > ${BOARD_DEFCONFIG}
COMMAND ${CMAKE_COMMAND} -E remove defconfig
COMMAND ${CMAKE_COMMAND} -E remove ${PX4_BINARY_DIR}/NuttX/apps_copy.stamp
WORKING_DIRECTORY ${PX4_SOURCE_DIR}
USES_TERMINAL
@ -385,6 +388,7 @@ else() @@ -385,6 +388,7 @@ else()
${GUICONFIG_PATH} Kconfig
COMMAND ${CMAKE_COMMAND} -E env ${COMMON_KCONFIG_ENV_SETTINGS} ${SAVEDEFCONFIG_PATH}
COMMAND ${CMAKE_COMMAND} -E env ${COMMON_KCONFIG_ENV_SETTINGS} ${PYTHON_EXECUTABLE} ${PX4_SOURCE_DIR}/Tools/kconfig/diffconfig.py -m ${PX4_BOARD_DIR}/default.px4board defconfig > ${BOARD_DEFCONFIG}
COMMAND ${CMAKE_COMMAND} -E remove defconfig
COMMAND ${CMAKE_COMMAND} -E remove ${PX4_BINARY_DIR}/NuttX/apps_copy.stamp
WORKING_DIRECTORY ${PX4_SOURCE_DIR}
USES_TERMINAL

Write Preview
Loading…
Cancel
Save