From 423c43ad8e5f1175da6741a0b415d2ff32a6b51b Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Tue, 17 Oct 2023 16:20:40 -0400 Subject: [PATCH] boards: ARK CAN Flow enable ekf2 --- ROMFS/cannode/init.d/rcS | 2 ++ boards/ark/can-flow/default.px4board | 20 ++++++------ .../ark/can-flow/nuttx-config/nsh/defconfig | 31 ------------------- 3 files changed, 11 insertions(+), 42 deletions(-) diff --git a/ROMFS/cannode/init.d/rcS b/ROMFS/cannode/init.d/rcS index 1e4add8bbb..2e7316e316 100644 --- a/ROMFS/cannode/init.d/rcS +++ b/ROMFS/cannode/init.d/rcS @@ -117,4 +117,6 @@ param set-default SENS_MAG_RATE 100 sensors start +ekf2 start + unset R diff --git a/boards/ark/can-flow/default.px4board b/boards/ark/can-flow/default.px4board index a120df6638..340e189dd4 100644 --- a/boards/ark/can-flow/default.px4board +++ b/boards/ark/can-flow/default.px4board @@ -6,27 +6,25 @@ CONFIG_BOARD_NO_HELP=y CONFIG_BOARD_CONSTRAINED_MEMORY=y CONFIG_DRIVERS_BOOTLOADERS=y CONFIG_DRIVERS_DISTANCE_SENSOR_BROADCOM_AFBRS50=y -CONFIG_DRIVERS_IMU_BOSCH_BMI088=y CONFIG_DRIVERS_IMU_INVENSENSE_ICM42688P=y -CONFIG_DRIVERS_IMU_INVENSENSE_IIM42652=y -CONFIG_DRIVERS_OPTICAL_FLOW_PAA3905=y CONFIG_DRIVERS_OPTICAL_FLOW_PAW3902=y CONFIG_BOARD_UAVCAN_INTERFACES=1 CONFIG_DRIVERS_UAVCANNODE=y CONFIG_UAVCANNODE_FLOW_MEASUREMENT=y CONFIG_UAVCANNODE_RANGE_SENSOR_MEASUREMENT=y -CONFIG_MODULES_GYRO_CALIBRATION=y +CONFIG_MODULES_EKF2=y +# CONFIG_EKF2_AUXVEL is not set +# CONFIG_EKF2_BAROMETER is not set +# CONFIG_EKF2_EXTERNAL_VISION is not set +# CONFIG_EKF2_GNSS is not set +# CONFIG_EKF2_GRAVITY_FUSION is not set +# CONFIG_EKF2_MAGNETOMETER is not set +# CONFIG_EKF2_WIND is not set CONFIG_MODULES_SENSORS=y # CONFIG_SENSORS_VEHICLE_AIRSPEED is not set # CONFIG_SENSORS_VEHICLE_AIR_DATA is not set +# CONFIG_SENSORS_VEHICLE_ANGULAR_VELOCITY is not set # CONFIG_SENSORS_VEHICLE_ACCELERATION is not set # CONFIG_SENSORS_VEHICLE_GPS_POSITION is not set # CONFIG_SENSORS_VEHICLE_MAGNETOMETER is not set CONFIG_SYSTEMCMDS_PARAM=y -CONFIG_SYSTEMCMDS_PERF=y -CONFIG_SYSTEMCMDS_REBOOT=y -CONFIG_SYSTEMCMDS_TOP=y -CONFIG_SYSTEMCMDS_TOPIC_LISTENER=y -CONFIG_SYSTEMCMDS_UORB=y -CONFIG_SYSTEMCMDS_VER=y -CONFIG_SYSTEMCMDS_WORK_QUEUE=y diff --git a/boards/ark/can-flow/nuttx-config/nsh/defconfig b/boards/ark/can-flow/nuttx-config/nsh/defconfig index eb4cb5e929..51b0692d55 100644 --- a/boards/ark/can-flow/nuttx-config/nsh/defconfig +++ b/boards/ark/can-flow/nuttx-config/nsh/defconfig @@ -27,7 +27,6 @@ # CONFIG_NSH_DISABLE_LOOPS is not set # CONFIG_NSH_DISABLE_LS is not set # CONFIG_NSH_DISABLE_MKDIR is not set -# CONFIG_NSH_DISABLE_MKFATFS is not set # CONFIG_NSH_DISABLE_MOUNT is not set # CONFIG_NSH_DISABLE_MV is not set # CONFIG_NSH_DISABLE_PS is not set @@ -66,17 +65,8 @@ CONFIG_DEBUG_HARDFAULT_ALERT=y CONFIG_DEBUG_SYMBOLS=y CONFIG_DEBUG_TCBINFO=y CONFIG_DEFAULT_SMALL=y -CONFIG_DEV_FIFO_SIZE=0 -CONFIG_DEV_PIPE_MAXSIZE=1024 -CONFIG_DEV_PIPE_SIZE=70 CONFIG_FDCLONE_STDIO=y -CONFIG_FS_BINFS=y CONFIG_FS_CROMFS=y -CONFIG_FS_FAT=y -CONFIG_FS_FATTIME=y -CONFIG_FS_PROCFS=y -CONFIG_FS_PROCFS_INCLUDE_PROGMEM=y -CONFIG_FS_PROCFS_REGISTER=y CONFIG_FS_ROMFS=y CONFIG_GRAN=y CONFIG_GRAN_INTR=y @@ -88,14 +78,9 @@ CONFIG_INIT_STACKSIZE=2624 CONFIG_LIBC_FLOATINGPOINT=y CONFIG_LIBC_LONG_LONG=y CONFIG_LIBC_MAX_EXITFUNS=1 -CONFIG_LIBC_STRERROR=y CONFIG_MEMSET_64BIT=y CONFIG_MEMSET_OPTSPEED=y CONFIG_MM_REGIONS=2 -CONFIG_MTD=y -CONFIG_MTD_BYTE_WRITE=y -CONFIG_MTD_PARTITION=y -CONFIG_MTD_RAMTRON=y CONFIG_NAME_MAX=40 CONFIG_NSH_ARCHINIT=y CONFIG_NSH_ARGCAT=y @@ -108,31 +93,20 @@ CONFIG_NSH_NESTDEPTH=8 CONFIG_NSH_QUOTE=y CONFIG_NSH_ROMFSETC=y CONFIG_NSH_ROMFSSECTSIZE=128 -CONFIG_NSH_STRERROR=y CONFIG_NSH_VARS=y -CONFIG_PIPES=y CONFIG_PREALLOC_TIMERS=50 -CONFIG_PRIORITY_INHERITANCE=y CONFIG_PTHREAD_MUTEX_ROBUST=y CONFIG_PTHREAD_STACK_MIN=512 -CONFIG_RAMTRON_EMULATE_PAGE_SHIFT=5 -CONFIG_RAMTRON_EMULATE_SECTOR_SHIFT=5 -CONFIG_RAMTRON_SETSPEED=y CONFIG_RAM_SIZE=262144 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y -CONFIG_RTC_DATETIME=y CONFIG_SCHED_HPWORK=y CONFIG_SCHED_HPWORKPRIORITY=254 CONFIG_SCHED_HPWORKSTACKSIZE=3000 CONFIG_SCHED_INSTRUMENTATION=y CONFIG_SCHED_INSTRUMENTATION_EXTERNAL=y CONFIG_SCHED_INSTRUMENTATION_SWITCH=y -CONFIG_SCHED_LPWORK=y -CONFIG_SCHED_LPWORKPRIORITY=50 -CONFIG_SCHED_LPWORKSTACKSIZE=1632 CONFIG_SCHED_WAITPID=y -CONFIG_SEM_PREALLOCHOLDERS=32 CONFIG_SERIAL_TERMIOS=y CONFIG_SIG_DEFAULT=y CONFIG_SIG_SIGALRM_ACTION=y @@ -151,11 +125,6 @@ CONFIG_STM32_FLASH_PREFETCH=y CONFIG_STM32_FLOWCONTROL_BROKEN=y CONFIG_STM32_JTAG_SW_ENABLE=y CONFIG_STM32_PWR=y -CONFIG_STM32_RTC=y -CONFIG_STM32_RTC_HSECLOCK=y -CONFIG_STM32_RTC_MAGIC=0xfacefeee -CONFIG_STM32_RTC_MAGIC_REG=1 -CONFIG_STM32_RTC_MAGIC_TIME_SET=0xfacefeef CONFIG_STM32_SERIALBRK_BSDCOMPAT=y CONFIG_STM32_SERIAL_DISABLE_REORDERING=y CONFIG_STM32_SPI1=y