From 7667b3a782db83dab1fba476ea01a767ca930db4 Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Wed, 20 Sep 2023 19:04:42 -0400 Subject: [PATCH] boards: use littlefs for parameter storage MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Igor Mišić Co-authored-by: Daniel Agar --- .ci/Jenkinsfile-hardware | 12 +- ROMFS/px4fmu_common/init.d/rcS | 16 +- Tools/HIL/test_airframes.sh | 6 +- .../mindpx-v2/nuttx-config/nsh/defconfig | 5 + boards/ark/fmu-v6x/nuttx-config/nsh/defconfig | 5 + .../atl/mantis-edu/nuttx-config/nsh/defconfig | 5 + .../crazyflie/nuttx-config/nsh/defconfig | 1 + boards/bitcraze/crazyflie/src/mtd.cpp | 2 +- .../crazyflie21/nuttx-config/nsh/defconfig | 12 +- boards/cuav/nora/nuttx-config/nsh/defconfig | 5 + boards/cuav/x7pro/nuttx-config/nsh/defconfig | 5 + boards/cuav/x7pro/nuttx-config/test/defconfig | 5 + .../cubeorange/nuttx-config/nsh/defconfig | 5 + .../cubeorange/nuttx-config/test/defconfig | 5 + .../cubeorangeplus/nuttx-config/nsh/defconfig | 5 + .../nuttx-config/test/defconfig | 5 + .../cubeyellow/nuttx-config/nsh/defconfig | 5 + .../durandal-v1/nuttx-config/nsh/defconfig | 5 + .../pix32v5/nuttx-config/nsh/defconfig | 5 + .../modalai/fc-v1/nuttx-config/nsh/defconfig | 5 + boards/modalai/fc-v2/default.px4board | 2 - .../modalai/fc-v2/nuttx-config/nsh/defconfig | 5 + .../nuttx-config/nsh/defconfig | 5 + .../nuttx-config/nsh/defconfig | 5 + .../ctrl-zero-f7/nuttx-config/nsh/defconfig | 5 + .../nuttx-config/nsh/defconfig | 5 + .../ctrl-zero-h7/nuttx-config/nsh/defconfig | 5 + .../pixracerpro/nuttx-config/nsh/defconfig | 5 + boards/mro/x21-777/nuttx-config/nsh/defconfig | 5 + boards/mro/x21/nuttx-config/nsh/defconfig | 5 + .../nxp/fmuk66-e/nuttx-config/nsh/defconfig | 5 + .../fmuk66-e/nuttx-config/socketcan/defconfig | 5 + .../nxp/fmuk66-v3/nuttx-config/nsh/defconfig | 5 + .../nuttx-config/socketcan/defconfig | 5 + .../nxp/fmuk66-v3/nuttx-config/test/defconfig | 5 + .../fmurt1062-v1/nuttx-config/nsh/defconfig | 5 + .../mr-canhubk3/nuttx-config/nsh/defconfig | 1 - .../nuttx-config/sysview/defconfig | 1 - .../ucans32k146/nuttx-config/nsh/defconfig | 1 + boards/px4/fmu-v2/nuttx-config/nsh/defconfig | 5 + boards/px4/fmu-v3/nuttx-config/nsh/defconfig | 5 + boards/px4/fmu-v4/nuttx-config/nsh/defconfig | 5 + boards/px4/fmu-v4/nuttx-config/test/defconfig | 5 + boards/px4/fmu-v4pro/default.px4board | 1 - .../px4/fmu-v4pro/nuttx-config/nsh/defconfig | 5 + .../px4/fmu-v4pro/nuttx-config/test/defconfig | 5 + boards/px4/fmu-v4pro/test.px4board | 3 +- .../fmu-v5/nuttx-config/cryptotest/defconfig | 5 + .../px4/fmu-v5/nuttx-config/cyphal/defconfig | 5 + .../px4/fmu-v5/nuttx-config/debug/defconfig | 5 + boards/px4/fmu-v5/nuttx-config/nsh/defconfig | 5 + .../fmu-v5/nuttx-config/protected/defconfig | 5 + .../fmu-v5/nuttx-config/stackcheck/defconfig | 5 + boards/px4/fmu-v5/nuttx-config/test/defconfig | 5 + boards/px4/fmu-v5/stackcheck.px4board | 11 ++ boards/px4/fmu-v5x/nuttx-config/nsh/defconfig | 5 + .../px4/fmu-v5x/nuttx-config/test/defconfig | 5 + boards/px4/fmu-v6c/default.px4board | 2 - boards/px4/fmu-v6c/nuttx-config/nsh/defconfig | 5 + boards/px4/fmu-v6u/nuttx-config/nsh/defconfig | 5 + boards/px4/fmu-v6x/default.px4board | 2 - boards/px4/fmu-v6x/nuttx-config/nsh/defconfig | 5 + boards/siyi/n7/nuttx-config/nsh/defconfig | 5 + .../nuttx-config/nsh/defconfig | 5 + boards/thepeach/k1/nuttx-config/nsh/defconfig | 5 + boards/thepeach/r1/nuttx-config/nsh/defconfig | 5 + boards/uvify/core/nuttx-config/nsh/defconfig | 5 + .../include/px4_platform_common/px4_mtd.h | 18 ++ .../px4_work_queue/WorkQueueManager.hpp | 2 +- .../nuttx/src/px4/common/px4_manifest.cpp | 6 + platforms/nuttx/src/px4/common/px4_mtd.cpp | 164 +++++++++++++++--- src/systemcmds/param/CMakeLists.txt | 1 + src/systemcmds/param/param.cpp | 58 +++++++ 73 files changed, 528 insertions(+), 54 deletions(-) diff --git a/.ci/Jenkinsfile-hardware b/.ci/Jenkinsfile-hardware index 73483107a7..3110e6ee53 100644 --- a/.ci/Jenkinsfile-hardware +++ b/.ci/Jenkinsfile-hardware @@ -684,7 +684,7 @@ void checkStatus() { sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param save"' sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param status"' sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param show SYS*"' - sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "bsondump /fs/mtd_params"' + sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "bsondump /fs/mtd_params/parameters.bson"' // status commands sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "cat /proc/fs/blocks"' @@ -715,7 +715,7 @@ void checkStatus() { sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "mavlink status" || true' sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "mount"' sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "mtd status"' - sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "bsondump /fs/mtd_params"' + sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "bsondump /fs/mtd_params/parameters.bson"' sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param show" || true' sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param status"' sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "perf latency"' @@ -769,13 +769,7 @@ void runTests() { sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "tests file" || true' - sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "bsondump /fs/mtd_params"' - sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "mtd readtest"' - sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "bsondump /fs/mtd_params"' - sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "mtd rwtest"' - sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "bsondump /fs/mtd_params"' - sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "mtd erase"' - sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "bsondump /fs/mtd_params" || true' // expected to fail after erase + sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "bsondump /fs/mtd_params/parameters.bson"' sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "sd_bench"' sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "sd_bench -v"' diff --git a/ROMFS/px4fmu_common/init.d/rcS b/ROMFS/px4fmu_common/init.d/rcS index 4a391d39f9..cbd44959d4 100644 --- a/ROMFS/px4fmu_common/init.d/rcS +++ b/ROMFS/px4fmu_common/init.d/rcS @@ -112,7 +112,21 @@ else # if mft query -q -k MTD -s MTD_PARAMETERS -v /fs/mtd_params then - set PARAM_FILE /fs/mtd_params + set PARAM_FILE /fs/mtd_params/parameters.bson + else + # TODO: This code shall be reverted after the BCH->LittleFS param transition time is completed + set PARAM_FILE /fs/mtd_params/parameters.bson + param select $PARAM_FILE + echo "Start parameter transition to LittleFS" + if ! param transition + then + echo "ERROR [init] param transition" + else + echo "The system will reboot!" + # Wait for UART to send messages + usleep 200000 + reboot + fi fi # diff --git a/Tools/HIL/test_airframes.sh b/Tools/HIL/test_airframes.sh index 24d20f07ec..0d2317322f 100755 --- a/Tools/HIL/test_airframes.sh +++ b/Tools/HIL/test_airframes.sh @@ -43,13 +43,13 @@ do ${DIR}/run_nsh_cmd.py --device ${SERIAL_DEVICE} --cmd 'param reset SYS_HITL' ${DIR}/run_nsh_cmd.py --device ${SERIAL_DEVICE} --cmd 'param status' ${DIR}/run_nsh_cmd.py --device ${SERIAL_DEVICE} --cmd 'param save' - ${DIR}/run_nsh_cmd.py --device ${SERIAL_DEVICE} --cmd 'bsondump /fs/mtd_params' + ${DIR}/run_nsh_cmd.py --device ${SERIAL_DEVICE} --cmd 'bsondump /fs/mtd_params/parameters.bson' ${DIR}/reboot.py --device ${SERIAL_DEVICE} ${DIR}/run_nsh_cmd.py --device ${SERIAL_DEVICE} --cmd 'param status' - ${DIR}/run_nsh_cmd.py --device ${SERIAL_DEVICE} --cmd 'bsondump /fs/mtd_params' || true - ${DIR}/run_nsh_cmd.py --device ${SERIAL_DEVICE} --cmd 'bsondump /fs/microsd/parameters_backup.bson' || true + ${DIR}/run_nsh_cmd.py --device ${SERIAL_DEVICE} --cmd 'bsondump /fs/mtd_params/parameters.bson' + ${DIR}/run_nsh_cmd.py --device ${SERIAL_DEVICE} --cmd 'bsondump /fs/microsd/parameters_backup.bson' ${DIR}/run_nsh_cmd.py --device ${SERIAL_DEVICE} --cmd 'ps' ${DIR}/run_nsh_cmd.py --device ${SERIAL_DEVICE} --cmd 'work_queue status' diff --git a/boards/airmind/mindpx-v2/nuttx-config/nsh/defconfig b/boards/airmind/mindpx-v2/nuttx-config/nsh/defconfig index 27ce829659..444f5b1d2b 100644 --- a/boards/airmind/mindpx-v2/nuttx-config/nsh/defconfig +++ b/boards/airmind/mindpx-v2/nuttx-config/nsh/defconfig @@ -94,6 +94,11 @@ CONFIG_FS_BINFS=y CONFIG_FS_CROMFS=y CONFIG_FS_FAT=y CONFIG_FS_FATTIME=y +CONFIG_FS_LITTLEFS=y +CONFIG_FS_LITTLEFS_BLOCK_CYCLE=-1 +CONFIG_FS_LITTLEFS_BLOCK_SIZE_FACTOR=4 +CONFIG_FS_LITTLEFS_LOOKAHEAD_SIZE=128 +CONFIG_FS_LITTLEFS_PROGRAM_SIZE_FACTOR=1 CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_INCLUDE_PROGMEM=y CONFIG_FS_PROCFS_REGISTER=y diff --git a/boards/ark/fmu-v6x/nuttx-config/nsh/defconfig b/boards/ark/fmu-v6x/nuttx-config/nsh/defconfig index 1493783f1b..ab5d3a3cdb 100644 --- a/boards/ark/fmu-v6x/nuttx-config/nsh/defconfig +++ b/boards/ark/fmu-v6x/nuttx-config/nsh/defconfig @@ -105,6 +105,11 @@ CONFIG_FS_BINFS=y CONFIG_FS_CROMFS=y CONFIG_FS_FAT=y CONFIG_FS_FATTIME=y +CONFIG_FS_LITTLEFS=y +CONFIG_FS_LITTLEFS_BLOCK_CYCLE=-1 +CONFIG_FS_LITTLEFS_BLOCK_SIZE_FACTOR=4 +CONFIG_FS_LITTLEFS_LOOKAHEAD_SIZE=128 +CONFIG_FS_LITTLEFS_PROGRAM_SIZE_FACTOR=1 CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_INCLUDE_PROGMEM=y CONFIG_FS_PROCFS_MAX_TASKS=64 diff --git a/boards/atl/mantis-edu/nuttx-config/nsh/defconfig b/boards/atl/mantis-edu/nuttx-config/nsh/defconfig index 3b5905a830..f33221496f 100644 --- a/boards/atl/mantis-edu/nuttx-config/nsh/defconfig +++ b/boards/atl/mantis-edu/nuttx-config/nsh/defconfig @@ -99,6 +99,11 @@ CONFIG_FS_BINFS=y CONFIG_FS_CROMFS=y CONFIG_FS_FAT=y CONFIG_FS_FATTIME=y +CONFIG_FS_LITTLEFS=y +CONFIG_FS_LITTLEFS_BLOCK_CYCLE=-1 +CONFIG_FS_LITTLEFS_BLOCK_SIZE_FACTOR=4 +CONFIG_FS_LITTLEFS_LOOKAHEAD_SIZE=128 +CONFIG_FS_LITTLEFS_PROGRAM_SIZE_FACTOR=1 CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_INCLUDE_PROGMEM=y CONFIG_FS_PROCFS_MAX_TASKS=64 diff --git a/boards/bitcraze/crazyflie/nuttx-config/nsh/defconfig b/boards/bitcraze/crazyflie/nuttx-config/nsh/defconfig index ff4b7ff6ff..9dc5ea2b7d 100644 --- a/boards/bitcraze/crazyflie/nuttx-config/nsh/defconfig +++ b/boards/bitcraze/crazyflie/nuttx-config/nsh/defconfig @@ -94,6 +94,7 @@ CONFIG_FS_BINFS=y CONFIG_FS_CROMFS=y CONFIG_FS_FAT=y CONFIG_FS_FATTIME=y +CONFIG_FS_LITTLEFS=y CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_INCLUDE_PROGMEM=y CONFIG_FS_PROCFS_REGISTER=y diff --git a/boards/bitcraze/crazyflie/src/mtd.cpp b/boards/bitcraze/crazyflie/src/mtd.cpp index d81e3e4596..e921644d6d 100644 --- a/boards/bitcraze/crazyflie/src/mtd.cpp +++ b/boards/bitcraze/crazyflie/src/mtd.cpp @@ -47,7 +47,7 @@ static const px4_mtd_entry_t fmu_eeprom = { { .type = MTD_PARAMETERS, .path = "/fs/mtd_params", - .nblocks = 128 + .nblocks = 256 } }, }; diff --git a/boards/bitcraze/crazyflie21/nuttx-config/nsh/defconfig b/boards/bitcraze/crazyflie21/nuttx-config/nsh/defconfig index df3a85dc70..d69e96448d 100644 --- a/boards/bitcraze/crazyflie21/nuttx-config/nsh/defconfig +++ b/boards/bitcraze/crazyflie21/nuttx-config/nsh/defconfig @@ -73,8 +73,8 @@ CONFIG_CDCACM=y CONFIG_CDCACM_IFLOWCONTROL=y CONFIG_CDCACM_PRODUCTID=0x0016 CONFIG_CDCACM_PRODUCTSTR="PX4 Crazyflie v2.0" -CONFIG_CDCACM_RXBUFSIZE=300 -CONFIG_CDCACM_TXBUFSIZE=1000 +CONFIG_CDCACM_RXBUFSIZE=600 +CONFIG_CDCACM_TXBUFSIZE=2000 CONFIG_CDCACM_VENDORID=0x26ac CONFIG_CDCACM_VENDORSTR="Bitcraze AB" CONFIG_DEBUG_FULLOPT=y @@ -93,11 +93,11 @@ CONFIG_FDCLONE_STDIO=y CONFIG_FS_BINFS=y CONFIG_FS_CROMFS=y CONFIG_FS_FAT=y +CONFIG_FS_FATTIME=y +CONFIG_FS_LITTLEFS=y CONFIG_FS_PROCFS=y -CONFIG_FS_PROCFS_EXCLUDE_BLOCKS=y -CONFIG_FS_PROCFS_EXCLUDE_MEMINFO=y -CONFIG_FS_PROCFS_EXCLUDE_MOUNT=y -CONFIG_FS_PROCFS_EXCLUDE_USAGE=y +CONFIG_FS_PROCFS_INCLUDE_PROGMEM=y +CONFIG_FS_PROCFS_REGISTER=y CONFIG_FS_ROMFS=y CONFIG_GRAN=y CONFIG_GRAN_INTR=y diff --git a/boards/cuav/nora/nuttx-config/nsh/defconfig b/boards/cuav/nora/nuttx-config/nsh/defconfig index 2f6287a368..cd0ce1158c 100644 --- a/boards/cuav/nora/nuttx-config/nsh/defconfig +++ b/boards/cuav/nora/nuttx-config/nsh/defconfig @@ -98,6 +98,11 @@ CONFIG_FS_BINFS=y CONFIG_FS_CROMFS=y CONFIG_FS_FAT=y CONFIG_FS_FATTIME=y +CONFIG_FS_LITTLEFS=y +CONFIG_FS_LITTLEFS_BLOCK_CYCLE=-1 +CONFIG_FS_LITTLEFS_BLOCK_SIZE_FACTOR=4 +CONFIG_FS_LITTLEFS_LOOKAHEAD_SIZE=128 +CONFIG_FS_LITTLEFS_PROGRAM_SIZE_FACTOR=1 CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_INCLUDE_PROGMEM=y CONFIG_FS_PROCFS_MAX_TASKS=64 diff --git a/boards/cuav/x7pro/nuttx-config/nsh/defconfig b/boards/cuav/x7pro/nuttx-config/nsh/defconfig index f4b2ac6dbb..2c87783a9f 100644 --- a/boards/cuav/x7pro/nuttx-config/nsh/defconfig +++ b/boards/cuav/x7pro/nuttx-config/nsh/defconfig @@ -99,6 +99,11 @@ CONFIG_FS_BINFS=y CONFIG_FS_CROMFS=y CONFIG_FS_FAT=y CONFIG_FS_FATTIME=y +CONFIG_FS_LITTLEFS=y +CONFIG_FS_LITTLEFS_BLOCK_CYCLE=-1 +CONFIG_FS_LITTLEFS_BLOCK_SIZE_FACTOR=4 +CONFIG_FS_LITTLEFS_LOOKAHEAD_SIZE=128 +CONFIG_FS_LITTLEFS_PROGRAM_SIZE_FACTOR=1 CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_INCLUDE_PROGMEM=y CONFIG_FS_PROCFS_MAX_TASKS=64 diff --git a/boards/cuav/x7pro/nuttx-config/test/defconfig b/boards/cuav/x7pro/nuttx-config/test/defconfig index 8ade766da6..2ae735123d 100644 --- a/boards/cuav/x7pro/nuttx-config/test/defconfig +++ b/boards/cuav/x7pro/nuttx-config/test/defconfig @@ -99,6 +99,11 @@ CONFIG_FS_BINFS=y CONFIG_FS_CROMFS=y CONFIG_FS_FAT=y CONFIG_FS_FATTIME=y +CONFIG_FS_LITTLEFS=y +CONFIG_FS_LITTLEFS_BLOCK_CYCLE=-1 +CONFIG_FS_LITTLEFS_BLOCK_SIZE_FACTOR=4 +CONFIG_FS_LITTLEFS_LOOKAHEAD_SIZE=128 +CONFIG_FS_LITTLEFS_PROGRAM_SIZE_FACTOR=1 CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_INCLUDE_PROGMEM=y CONFIG_FS_PROCFS_MAX_TASKS=64 diff --git a/boards/cubepilot/cubeorange/nuttx-config/nsh/defconfig b/boards/cubepilot/cubeorange/nuttx-config/nsh/defconfig index 5f881d7394..b992e4574d 100644 --- a/boards/cubepilot/cubeorange/nuttx-config/nsh/defconfig +++ b/boards/cubepilot/cubeorange/nuttx-config/nsh/defconfig @@ -99,6 +99,11 @@ CONFIG_FS_BINFS=y CONFIG_FS_CROMFS=y CONFIG_FS_FAT=y CONFIG_FS_FATTIME=y +CONFIG_FS_LITTLEFS=y +CONFIG_FS_LITTLEFS_BLOCK_CYCLE=-1 +CONFIG_FS_LITTLEFS_BLOCK_SIZE_FACTOR=4 +CONFIG_FS_LITTLEFS_LOOKAHEAD_SIZE=128 +CONFIG_FS_LITTLEFS_PROGRAM_SIZE_FACTOR=1 CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_INCLUDE_PROGMEM=y CONFIG_FS_PROCFS_MAX_TASKS=64 diff --git a/boards/cubepilot/cubeorange/nuttx-config/test/defconfig b/boards/cubepilot/cubeorange/nuttx-config/test/defconfig index 387d393f6b..bde1c7121a 100644 --- a/boards/cubepilot/cubeorange/nuttx-config/test/defconfig +++ b/boards/cubepilot/cubeorange/nuttx-config/test/defconfig @@ -100,6 +100,11 @@ CONFIG_FS_BINFS=y CONFIG_FS_CROMFS=y CONFIG_FS_FAT=y CONFIG_FS_FATTIME=y +CONFIG_FS_LITTLEFS=y +CONFIG_FS_LITTLEFS_BLOCK_CYCLE=-1 +CONFIG_FS_LITTLEFS_BLOCK_SIZE_FACTOR=4 +CONFIG_FS_LITTLEFS_LOOKAHEAD_SIZE=128 +CONFIG_FS_LITTLEFS_PROGRAM_SIZE_FACTOR=1 CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_INCLUDE_PROGMEM=y CONFIG_FS_PROCFS_MAX_TASKS=64 diff --git a/boards/cubepilot/cubeorangeplus/nuttx-config/nsh/defconfig b/boards/cubepilot/cubeorangeplus/nuttx-config/nsh/defconfig index 439a5eb93c..f882730a33 100644 --- a/boards/cubepilot/cubeorangeplus/nuttx-config/nsh/defconfig +++ b/boards/cubepilot/cubeorangeplus/nuttx-config/nsh/defconfig @@ -99,6 +99,11 @@ CONFIG_FS_BINFS=y CONFIG_FS_CROMFS=y CONFIG_FS_FAT=y CONFIG_FS_FATTIME=y +CONFIG_FS_LITTLEFS=y +CONFIG_FS_LITTLEFS_BLOCK_CYCLE=-1 +CONFIG_FS_LITTLEFS_BLOCK_SIZE_FACTOR=4 +CONFIG_FS_LITTLEFS_LOOKAHEAD_SIZE=128 +CONFIG_FS_LITTLEFS_PROGRAM_SIZE_FACTOR=1 CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_INCLUDE_PROGMEM=y CONFIG_FS_PROCFS_MAX_TASKS=64 diff --git a/boards/cubepilot/cubeorangeplus/nuttx-config/test/defconfig b/boards/cubepilot/cubeorangeplus/nuttx-config/test/defconfig index 62a9b86689..ac8c96f8e4 100644 --- a/boards/cubepilot/cubeorangeplus/nuttx-config/test/defconfig +++ b/boards/cubepilot/cubeorangeplus/nuttx-config/test/defconfig @@ -100,6 +100,11 @@ CONFIG_FS_BINFS=y CONFIG_FS_CROMFS=y CONFIG_FS_FAT=y CONFIG_FS_FATTIME=y +CONFIG_FS_LITTLEFS=y +CONFIG_FS_LITTLEFS_BLOCK_CYCLE=-1 +CONFIG_FS_LITTLEFS_BLOCK_SIZE_FACTOR=4 +CONFIG_FS_LITTLEFS_LOOKAHEAD_SIZE=128 +CONFIG_FS_LITTLEFS_PROGRAM_SIZE_FACTOR=1 CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_INCLUDE_PROGMEM=y CONFIG_FS_PROCFS_MAX_TASKS=64 diff --git a/boards/cubepilot/cubeyellow/nuttx-config/nsh/defconfig b/boards/cubepilot/cubeyellow/nuttx-config/nsh/defconfig index 2dcf0c9dd7..d10efe6424 100644 --- a/boards/cubepilot/cubeyellow/nuttx-config/nsh/defconfig +++ b/boards/cubepilot/cubeyellow/nuttx-config/nsh/defconfig @@ -99,6 +99,11 @@ CONFIG_FS_BINFS=y CONFIG_FS_CROMFS=y CONFIG_FS_FAT=y CONFIG_FS_FATTIME=y +CONFIG_FS_LITTLEFS=y +CONFIG_FS_LITTLEFS_BLOCK_CYCLE=-1 +CONFIG_FS_LITTLEFS_BLOCK_SIZE_FACTOR=4 +CONFIG_FS_LITTLEFS_LOOKAHEAD_SIZE=128 +CONFIG_FS_LITTLEFS_PROGRAM_SIZE_FACTOR=1 CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_INCLUDE_PROGMEM=y CONFIG_FS_PROCFS_MAX_TASKS=64 diff --git a/boards/holybro/durandal-v1/nuttx-config/nsh/defconfig b/boards/holybro/durandal-v1/nuttx-config/nsh/defconfig index 2be97e6b00..eafd8e9226 100644 --- a/boards/holybro/durandal-v1/nuttx-config/nsh/defconfig +++ b/boards/holybro/durandal-v1/nuttx-config/nsh/defconfig @@ -100,6 +100,11 @@ CONFIG_FS_BINFS=y CONFIG_FS_CROMFS=y CONFIG_FS_FAT=y CONFIG_FS_FATTIME=y +CONFIG_FS_LITTLEFS=y +CONFIG_FS_LITTLEFS_BLOCK_CYCLE=-1 +CONFIG_FS_LITTLEFS_BLOCK_SIZE_FACTOR=4 +CONFIG_FS_LITTLEFS_LOOKAHEAD_SIZE=128 +CONFIG_FS_LITTLEFS_PROGRAM_SIZE_FACTOR=1 CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_INCLUDE_PROGMEM=y CONFIG_FS_PROCFS_MAX_TASKS=64 diff --git a/boards/holybro/pix32v5/nuttx-config/nsh/defconfig b/boards/holybro/pix32v5/nuttx-config/nsh/defconfig index 257f8695bf..46e1ad83f8 100644 --- a/boards/holybro/pix32v5/nuttx-config/nsh/defconfig +++ b/boards/holybro/pix32v5/nuttx-config/nsh/defconfig @@ -99,6 +99,11 @@ CONFIG_FS_BINFS=y CONFIG_FS_CROMFS=y CONFIG_FS_FAT=y CONFIG_FS_FATTIME=y +CONFIG_FS_LITTLEFS=y +CONFIG_FS_LITTLEFS_BLOCK_CYCLE=-1 +CONFIG_FS_LITTLEFS_BLOCK_SIZE_FACTOR=4 +CONFIG_FS_LITTLEFS_LOOKAHEAD_SIZE=128 +CONFIG_FS_LITTLEFS_PROGRAM_SIZE_FACTOR=1 CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_INCLUDE_PROGMEM=y CONFIG_FS_PROCFS_MAX_TASKS=64 diff --git a/boards/modalai/fc-v1/nuttx-config/nsh/defconfig b/boards/modalai/fc-v1/nuttx-config/nsh/defconfig index f116d40e2e..3bb8ee186e 100644 --- a/boards/modalai/fc-v1/nuttx-config/nsh/defconfig +++ b/boards/modalai/fc-v1/nuttx-config/nsh/defconfig @@ -98,6 +98,11 @@ CONFIG_FS_BINFS=y CONFIG_FS_CROMFS=y CONFIG_FS_FAT=y CONFIG_FS_FATTIME=y +CONFIG_FS_LITTLEFS=y +CONFIG_FS_LITTLEFS_BLOCK_CYCLE=-1 +CONFIG_FS_LITTLEFS_BLOCK_SIZE_FACTOR=4 +CONFIG_FS_LITTLEFS_LOOKAHEAD_SIZE=128 +CONFIG_FS_LITTLEFS_PROGRAM_SIZE_FACTOR=1 CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_INCLUDE_PROGMEM=y CONFIG_FS_PROCFS_MAX_TASKS=64 diff --git a/boards/modalai/fc-v2/default.px4board b/boards/modalai/fc-v2/default.px4board index a34d1ad7a4..974e12cad3 100644 --- a/boards/modalai/fc-v2/default.px4board +++ b/boards/modalai/fc-v2/default.px4board @@ -59,9 +59,7 @@ CONFIG_MODULES_MC_POS_CONTROL=y CONFIG_MODULES_MC_RATE_CONTROL=y CONFIG_MODULES_NAVIGATOR=y CONFIG_MODULES_RC_UPDATE=y -CONFIG_MODULES_ROVER_POS_CONTROL=y CONFIG_MODULES_SENSORS=y -CONFIG_MODULES_SIMULATION_SIMULATOR_SIH=y CONFIG_MODULES_TEMPERATURE_COMPENSATION=y CONFIG_MODULES_UXRCE_DDS_CLIENT=y CONFIG_MODULES_VTOL_ATT_CONTROL=y diff --git a/boards/modalai/fc-v2/nuttx-config/nsh/defconfig b/boards/modalai/fc-v2/nuttx-config/nsh/defconfig index 0c799b496e..03104279bd 100644 --- a/boards/modalai/fc-v2/nuttx-config/nsh/defconfig +++ b/boards/modalai/fc-v2/nuttx-config/nsh/defconfig @@ -100,6 +100,11 @@ CONFIG_FS_BINFS=y CONFIG_FS_CROMFS=y CONFIG_FS_FAT=y CONFIG_FS_FATTIME=y +CONFIG_FS_LITTLEFS=y +CONFIG_FS_LITTLEFS_BLOCK_CYCLE=-1 +CONFIG_FS_LITTLEFS_BLOCK_SIZE_FACTOR=4 +CONFIG_FS_LITTLEFS_LOOKAHEAD_SIZE=128 +CONFIG_FS_LITTLEFS_PROGRAM_SIZE_FACTOR=1 CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_INCLUDE_PROGMEM=y CONFIG_FS_PROCFS_MAX_TASKS=64 diff --git a/boards/mro/ctrl-zero-classic/nuttx-config/nsh/defconfig b/boards/mro/ctrl-zero-classic/nuttx-config/nsh/defconfig index 9bd8b8fd00..19e568b8cc 100644 --- a/boards/mro/ctrl-zero-classic/nuttx-config/nsh/defconfig +++ b/boards/mro/ctrl-zero-classic/nuttx-config/nsh/defconfig @@ -100,6 +100,11 @@ CONFIG_FS_BINFS=y CONFIG_FS_CROMFS=y CONFIG_FS_FAT=y CONFIG_FS_FATTIME=y +CONFIG_FS_LITTLEFS=y +CONFIG_FS_LITTLEFS_BLOCK_CYCLE=-1 +CONFIG_FS_LITTLEFS_BLOCK_SIZE_FACTOR=4 +CONFIG_FS_LITTLEFS_LOOKAHEAD_SIZE=128 +CONFIG_FS_LITTLEFS_PROGRAM_SIZE_FACTOR=1 CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_INCLUDE_PROGMEM=y CONFIG_FS_PROCFS_MAX_TASKS=64 diff --git a/boards/mro/ctrl-zero-f7-oem/nuttx-config/nsh/defconfig b/boards/mro/ctrl-zero-f7-oem/nuttx-config/nsh/defconfig index b9551c20e5..78f370dc31 100644 --- a/boards/mro/ctrl-zero-f7-oem/nuttx-config/nsh/defconfig +++ b/boards/mro/ctrl-zero-f7-oem/nuttx-config/nsh/defconfig @@ -98,6 +98,11 @@ CONFIG_FS_BINFS=y CONFIG_FS_CROMFS=y CONFIG_FS_FAT=y CONFIG_FS_FATTIME=y +CONFIG_FS_LITTLEFS=y +CONFIG_FS_LITTLEFS_BLOCK_CYCLE=-1 +CONFIG_FS_LITTLEFS_BLOCK_SIZE_FACTOR=4 +CONFIG_FS_LITTLEFS_LOOKAHEAD_SIZE=128 +CONFIG_FS_LITTLEFS_PROGRAM_SIZE_FACTOR=1 CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_INCLUDE_PROGMEM=y CONFIG_FS_PROCFS_MAX_TASKS=64 diff --git a/boards/mro/ctrl-zero-f7/nuttx-config/nsh/defconfig b/boards/mro/ctrl-zero-f7/nuttx-config/nsh/defconfig index 553cc8187f..e3c8978295 100644 --- a/boards/mro/ctrl-zero-f7/nuttx-config/nsh/defconfig +++ b/boards/mro/ctrl-zero-f7/nuttx-config/nsh/defconfig @@ -98,6 +98,11 @@ CONFIG_FS_BINFS=y CONFIG_FS_CROMFS=y CONFIG_FS_FAT=y CONFIG_FS_FATTIME=y +CONFIG_FS_LITTLEFS=y +CONFIG_FS_LITTLEFS_BLOCK_CYCLE=-1 +CONFIG_FS_LITTLEFS_BLOCK_SIZE_FACTOR=4 +CONFIG_FS_LITTLEFS_LOOKAHEAD_SIZE=128 +CONFIG_FS_LITTLEFS_PROGRAM_SIZE_FACTOR=1 CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_INCLUDE_PROGMEM=y CONFIG_FS_PROCFS_MAX_TASKS=64 diff --git a/boards/mro/ctrl-zero-h7-oem/nuttx-config/nsh/defconfig b/boards/mro/ctrl-zero-h7-oem/nuttx-config/nsh/defconfig index 7223031aa8..59f0565ebf 100644 --- a/boards/mro/ctrl-zero-h7-oem/nuttx-config/nsh/defconfig +++ b/boards/mro/ctrl-zero-h7-oem/nuttx-config/nsh/defconfig @@ -98,6 +98,11 @@ CONFIG_FS_BINFS=y CONFIG_FS_CROMFS=y CONFIG_FS_FAT=y CONFIG_FS_FATTIME=y +CONFIG_FS_LITTLEFS=y +CONFIG_FS_LITTLEFS_BLOCK_CYCLE=-1 +CONFIG_FS_LITTLEFS_BLOCK_SIZE_FACTOR=4 +CONFIG_FS_LITTLEFS_LOOKAHEAD_SIZE=128 +CONFIG_FS_LITTLEFS_PROGRAM_SIZE_FACTOR=1 CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_INCLUDE_PROGMEM=y CONFIG_FS_PROCFS_MAX_TASKS=64 diff --git a/boards/mro/ctrl-zero-h7/nuttx-config/nsh/defconfig b/boards/mro/ctrl-zero-h7/nuttx-config/nsh/defconfig index 51a503c418..231df219e1 100644 --- a/boards/mro/ctrl-zero-h7/nuttx-config/nsh/defconfig +++ b/boards/mro/ctrl-zero-h7/nuttx-config/nsh/defconfig @@ -98,6 +98,11 @@ CONFIG_FS_BINFS=y CONFIG_FS_CROMFS=y CONFIG_FS_FAT=y CONFIG_FS_FATTIME=y +CONFIG_FS_LITTLEFS=y +CONFIG_FS_LITTLEFS_BLOCK_CYCLE=-1 +CONFIG_FS_LITTLEFS_BLOCK_SIZE_FACTOR=4 +CONFIG_FS_LITTLEFS_LOOKAHEAD_SIZE=128 +CONFIG_FS_LITTLEFS_PROGRAM_SIZE_FACTOR=1 CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_INCLUDE_PROGMEM=y CONFIG_FS_PROCFS_MAX_TASKS=64 diff --git a/boards/mro/pixracerpro/nuttx-config/nsh/defconfig b/boards/mro/pixracerpro/nuttx-config/nsh/defconfig index 7cbf355d40..4317dd5a56 100644 --- a/boards/mro/pixracerpro/nuttx-config/nsh/defconfig +++ b/boards/mro/pixracerpro/nuttx-config/nsh/defconfig @@ -99,6 +99,11 @@ CONFIG_FS_BINFS=y CONFIG_FS_CROMFS=y CONFIG_FS_FAT=y CONFIG_FS_FATTIME=y +CONFIG_FS_LITTLEFS=y +CONFIG_FS_LITTLEFS_BLOCK_CYCLE=-1 +CONFIG_FS_LITTLEFS_BLOCK_SIZE_FACTOR=4 +CONFIG_FS_LITTLEFS_LOOKAHEAD_SIZE=128 +CONFIG_FS_LITTLEFS_PROGRAM_SIZE_FACTOR=1 CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_INCLUDE_PROGMEM=y CONFIG_FS_PROCFS_MAX_TASKS=64 diff --git a/boards/mro/x21-777/nuttx-config/nsh/defconfig b/boards/mro/x21-777/nuttx-config/nsh/defconfig index b61d8a33e3..e2b5c0397f 100644 --- a/boards/mro/x21-777/nuttx-config/nsh/defconfig +++ b/boards/mro/x21-777/nuttx-config/nsh/defconfig @@ -98,6 +98,11 @@ CONFIG_FS_BINFS=y CONFIG_FS_CROMFS=y CONFIG_FS_FAT=y CONFIG_FS_FATTIME=y +CONFIG_FS_LITTLEFS=y +CONFIG_FS_LITTLEFS_BLOCK_CYCLE=-1 +CONFIG_FS_LITTLEFS_BLOCK_SIZE_FACTOR=4 +CONFIG_FS_LITTLEFS_LOOKAHEAD_SIZE=128 +CONFIG_FS_LITTLEFS_PROGRAM_SIZE_FACTOR=1 CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_INCLUDE_PROGMEM=y CONFIG_FS_PROCFS_MAX_TASKS=64 diff --git a/boards/mro/x21/nuttx-config/nsh/defconfig b/boards/mro/x21/nuttx-config/nsh/defconfig index b5b5614c51..6ba50f19b0 100644 --- a/boards/mro/x21/nuttx-config/nsh/defconfig +++ b/boards/mro/x21/nuttx-config/nsh/defconfig @@ -95,6 +95,11 @@ CONFIG_FS_BINFS=y CONFIG_FS_CROMFS=y CONFIG_FS_FAT=y CONFIG_FS_FATTIME=y +CONFIG_FS_LITTLEFS=y +CONFIG_FS_LITTLEFS_BLOCK_CYCLE=-1 +CONFIG_FS_LITTLEFS_BLOCK_SIZE_FACTOR=4 +CONFIG_FS_LITTLEFS_LOOKAHEAD_SIZE=128 +CONFIG_FS_LITTLEFS_PROGRAM_SIZE_FACTOR=1 CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_INCLUDE_PROGMEM=y CONFIG_FS_PROCFS_REGISTER=y diff --git a/boards/nxp/fmuk66-e/nuttx-config/nsh/defconfig b/boards/nxp/fmuk66-e/nuttx-config/nsh/defconfig index 9d591289b7..3fc4b01e13 100644 --- a/boards/nxp/fmuk66-e/nuttx-config/nsh/defconfig +++ b/boards/nxp/fmuk66-e/nuttx-config/nsh/defconfig @@ -51,6 +51,11 @@ CONFIG_FS_BINFS=y CONFIG_FS_CROMFS=y CONFIG_FS_FAT=y CONFIG_FS_FATTIME=y +CONFIG_FS_LITTLEFS=y +CONFIG_FS_LITTLEFS_BLOCK_CYCLE=-1 +CONFIG_FS_LITTLEFS_BLOCK_SIZE_FACTOR=4 +CONFIG_FS_LITTLEFS_LOOKAHEAD_SIZE=128 +CONFIG_FS_LITTLEFS_PROGRAM_SIZE_FACTOR=1 CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_REGISTER=y CONFIG_FS_ROMFS=y diff --git a/boards/nxp/fmuk66-e/nuttx-config/socketcan/defconfig b/boards/nxp/fmuk66-e/nuttx-config/socketcan/defconfig index 9b5559eaf6..f9b295dd89 100644 --- a/boards/nxp/fmuk66-e/nuttx-config/socketcan/defconfig +++ b/boards/nxp/fmuk66-e/nuttx-config/socketcan/defconfig @@ -52,6 +52,11 @@ CONFIG_FS_BINFS=y CONFIG_FS_CROMFS=y CONFIG_FS_FAT=y CONFIG_FS_FATTIME=y +CONFIG_FS_LITTLEFS=y +CONFIG_FS_LITTLEFS_BLOCK_CYCLE=-1 +CONFIG_FS_LITTLEFS_BLOCK_SIZE_FACTOR=4 +CONFIG_FS_LITTLEFS_LOOKAHEAD_SIZE=128 +CONFIG_FS_LITTLEFS_PROGRAM_SIZE_FACTOR=1 CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_REGISTER=y CONFIG_FS_ROMFS=y diff --git a/boards/nxp/fmuk66-v3/nuttx-config/nsh/defconfig b/boards/nxp/fmuk66-v3/nuttx-config/nsh/defconfig index 6bd106b415..42b49738ee 100644 --- a/boards/nxp/fmuk66-v3/nuttx-config/nsh/defconfig +++ b/boards/nxp/fmuk66-v3/nuttx-config/nsh/defconfig @@ -55,6 +55,11 @@ CONFIG_FS_BINFS=y CONFIG_FS_CROMFS=y CONFIG_FS_FAT=y CONFIG_FS_FATTIME=y +CONFIG_FS_LITTLEFS=y +CONFIG_FS_LITTLEFS_BLOCK_CYCLE=-1 +CONFIG_FS_LITTLEFS_BLOCK_SIZE_FACTOR=4 +CONFIG_FS_LITTLEFS_LOOKAHEAD_SIZE=128 +CONFIG_FS_LITTLEFS_PROGRAM_SIZE_FACTOR=1 CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_REGISTER=y CONFIG_FS_ROMFS=y diff --git a/boards/nxp/fmuk66-v3/nuttx-config/socketcan/defconfig b/boards/nxp/fmuk66-v3/nuttx-config/socketcan/defconfig index cff2a6be8f..ec61b034eb 100644 --- a/boards/nxp/fmuk66-v3/nuttx-config/socketcan/defconfig +++ b/boards/nxp/fmuk66-v3/nuttx-config/socketcan/defconfig @@ -53,6 +53,11 @@ CONFIG_FS_BINFS=y CONFIG_FS_CROMFS=y CONFIG_FS_FAT=y CONFIG_FS_FATTIME=y +CONFIG_FS_LITTLEFS=y +CONFIG_FS_LITTLEFS_BLOCK_CYCLE=-1 +CONFIG_FS_LITTLEFS_BLOCK_SIZE_FACTOR=4 +CONFIG_FS_LITTLEFS_LOOKAHEAD_SIZE=128 +CONFIG_FS_LITTLEFS_PROGRAM_SIZE_FACTOR=1 CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_REGISTER=y CONFIG_FS_ROMFS=y diff --git a/boards/nxp/fmuk66-v3/nuttx-config/test/defconfig b/boards/nxp/fmuk66-v3/nuttx-config/test/defconfig index d340e15847..adca4e95f7 100644 --- a/boards/nxp/fmuk66-v3/nuttx-config/test/defconfig +++ b/boards/nxp/fmuk66-v3/nuttx-config/test/defconfig @@ -53,6 +53,11 @@ CONFIG_FS_BINFS=y CONFIG_FS_CROMFS=y CONFIG_FS_FAT=y CONFIG_FS_FATTIME=y +CONFIG_FS_LITTLEFS=y +CONFIG_FS_LITTLEFS_BLOCK_CYCLE=-1 +CONFIG_FS_LITTLEFS_BLOCK_SIZE_FACTOR=4 +CONFIG_FS_LITTLEFS_LOOKAHEAD_SIZE=128 +CONFIG_FS_LITTLEFS_PROGRAM_SIZE_FACTOR=1 CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_REGISTER=y CONFIG_FS_ROMFS=y diff --git a/boards/nxp/fmurt1062-v1/nuttx-config/nsh/defconfig b/boards/nxp/fmurt1062-v1/nuttx-config/nsh/defconfig index 5c945c7355..c22bec4607 100644 --- a/boards/nxp/fmurt1062-v1/nuttx-config/nsh/defconfig +++ b/boards/nxp/fmurt1062-v1/nuttx-config/nsh/defconfig @@ -58,6 +58,11 @@ CONFIG_FS_BINFS=y CONFIG_FS_CROMFS=y CONFIG_FS_FAT=y CONFIG_FS_FATTIME=y +CONFIG_FS_LITTLEFS=y +CONFIG_FS_LITTLEFS_BLOCK_CYCLE=-1 +CONFIG_FS_LITTLEFS_BLOCK_SIZE_FACTOR=4 +CONFIG_FS_LITTLEFS_LOOKAHEAD_SIZE=128 +CONFIG_FS_LITTLEFS_PROGRAM_SIZE_FACTOR=1 CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_REGISTER=y CONFIG_FS_ROMFS=y diff --git a/boards/nxp/mr-canhubk3/nuttx-config/nsh/defconfig b/boards/nxp/mr-canhubk3/nuttx-config/nsh/defconfig index 1f9258e5ab..6d167e6831 100644 --- a/boards/nxp/mr-canhubk3/nuttx-config/nsh/defconfig +++ b/boards/nxp/mr-canhubk3/nuttx-config/nsh/defconfig @@ -96,7 +96,6 @@ CONFIG_FSUTILS_IPCFG=y CONFIG_FS_CROMFS=y CONFIG_FS_FAT=y CONFIG_FS_FATTIME=y -CONFIG_FS_LITTLEFS=y CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_MAX_TASKS=64 CONFIG_FS_PROCFS_REGISTER=y diff --git a/boards/nxp/mr-canhubk3/nuttx-config/sysview/defconfig b/boards/nxp/mr-canhubk3/nuttx-config/sysview/defconfig index 83287f2d3b..5f5eaf9611 100644 --- a/boards/nxp/mr-canhubk3/nuttx-config/sysview/defconfig +++ b/boards/nxp/mr-canhubk3/nuttx-config/sysview/defconfig @@ -97,7 +97,6 @@ CONFIG_FSUTILS_IPCFG=y CONFIG_FS_CROMFS=y CONFIG_FS_FAT=y CONFIG_FS_FATTIME=y -CONFIG_FS_LITTLEFS=y CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_MAX_TASKS=64 CONFIG_FS_PROCFS_REGISTER=y diff --git a/boards/nxp/ucans32k146/nuttx-config/nsh/defconfig b/boards/nxp/ucans32k146/nuttx-config/nsh/defconfig index b66b8e0498..19f0440d64 100644 --- a/boards/nxp/ucans32k146/nuttx-config/nsh/defconfig +++ b/boards/nxp/ucans32k146/nuttx-config/nsh/defconfig @@ -34,6 +34,7 @@ CONFIG_DEBUG_TCBINFO=y CONFIG_DISABLE_MQUEUE=y CONFIG_DISABLE_POSIX_TIMERS=y CONFIG_EXAMPLES_HELLO=y +CONFIG_FS_LITTLEFS=y CONFIG_FS_CROMFS=y CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_MAX_TASKS=16 diff --git a/boards/px4/fmu-v2/nuttx-config/nsh/defconfig b/boards/px4/fmu-v2/nuttx-config/nsh/defconfig index 086587205a..97186bdedd 100644 --- a/boards/px4/fmu-v2/nuttx-config/nsh/defconfig +++ b/boards/px4/fmu-v2/nuttx-config/nsh/defconfig @@ -94,6 +94,11 @@ CONFIG_FS_BINFS=y CONFIG_FS_CROMFS=y CONFIG_FS_FAT=y CONFIG_FS_FATTIME=y +CONFIG_FS_LITTLEFS=y +CONFIG_FS_LITTLEFS_BLOCK_CYCLE=-1 +CONFIG_FS_LITTLEFS_BLOCK_SIZE_FACTOR=4 +CONFIG_FS_LITTLEFS_LOOKAHEAD_SIZE=128 +CONFIG_FS_LITTLEFS_PROGRAM_SIZE_FACTOR=1 CONFIG_FS_ROMFS=y CONFIG_GRAN=y CONFIG_GRAN_INTR=y diff --git a/boards/px4/fmu-v3/nuttx-config/nsh/defconfig b/boards/px4/fmu-v3/nuttx-config/nsh/defconfig index 7cda8cfcaf..b31fdee7df 100644 --- a/boards/px4/fmu-v3/nuttx-config/nsh/defconfig +++ b/boards/px4/fmu-v3/nuttx-config/nsh/defconfig @@ -96,6 +96,11 @@ CONFIG_FS_BINFS=y CONFIG_FS_CROMFS=y CONFIG_FS_FAT=y CONFIG_FS_FATTIME=y +CONFIG_FS_LITTLEFS=y +CONFIG_FS_LITTLEFS_BLOCK_CYCLE=-1 +CONFIG_FS_LITTLEFS_BLOCK_SIZE_FACTOR=4 +CONFIG_FS_LITTLEFS_LOOKAHEAD_SIZE=128 +CONFIG_FS_LITTLEFS_PROGRAM_SIZE_FACTOR=1 CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_INCLUDE_PROGMEM=y CONFIG_FS_PROCFS_REGISTER=y diff --git a/boards/px4/fmu-v4/nuttx-config/nsh/defconfig b/boards/px4/fmu-v4/nuttx-config/nsh/defconfig index 543fb546bf..11a78485f0 100644 --- a/boards/px4/fmu-v4/nuttx-config/nsh/defconfig +++ b/boards/px4/fmu-v4/nuttx-config/nsh/defconfig @@ -95,6 +95,11 @@ CONFIG_FS_BINFS=y CONFIG_FS_CROMFS=y CONFIG_FS_FAT=y CONFIG_FS_FATTIME=y +CONFIG_FS_LITTLEFS=y +CONFIG_FS_LITTLEFS_BLOCK_CYCLE=-1 +CONFIG_FS_LITTLEFS_BLOCK_SIZE_FACTOR=4 +CONFIG_FS_LITTLEFS_LOOKAHEAD_SIZE=128 +CONFIG_FS_LITTLEFS_PROGRAM_SIZE_FACTOR=1 CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_INCLUDE_PROGMEM=y CONFIG_FS_PROCFS_REGISTER=y diff --git a/boards/px4/fmu-v4/nuttx-config/test/defconfig b/boards/px4/fmu-v4/nuttx-config/test/defconfig index 9a02cef6e0..66bf907101 100644 --- a/boards/px4/fmu-v4/nuttx-config/test/defconfig +++ b/boards/px4/fmu-v4/nuttx-config/test/defconfig @@ -96,6 +96,11 @@ CONFIG_FS_BINFS=y CONFIG_FS_CROMFS=y CONFIG_FS_FAT=y CONFIG_FS_FATTIME=y +CONFIG_FS_LITTLEFS=y +CONFIG_FS_LITTLEFS_BLOCK_CYCLE=-1 +CONFIG_FS_LITTLEFS_BLOCK_SIZE_FACTOR=4 +CONFIG_FS_LITTLEFS_LOOKAHEAD_SIZE=128 +CONFIG_FS_LITTLEFS_PROGRAM_SIZE_FACTOR=1 CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_INCLUDE_PROGMEM=y CONFIG_FS_PROCFS_REGISTER=y diff --git a/boards/px4/fmu-v4pro/default.px4board b/boards/px4/fmu-v4pro/default.px4board index f722e649ef..03b53bf075 100644 --- a/boards/px4/fmu-v4pro/default.px4board +++ b/boards/px4/fmu-v4pro/default.px4board @@ -50,7 +50,6 @@ CONFIG_MODULES_FW_POS_CONTROL=y CONFIG_MODULES_FW_RATE_CONTROL=y CONFIG_MODULES_GIMBAL=y CONFIG_MODULES_GYRO_CALIBRATION=y -CONFIG_MODULES_GYRO_FFT=y CONFIG_MODULES_LAND_DETECTOR=y CONFIG_MODULES_LANDING_TARGET_ESTIMATOR=y CONFIG_MODULES_LOAD_MON=y diff --git a/boards/px4/fmu-v4pro/nuttx-config/nsh/defconfig b/boards/px4/fmu-v4pro/nuttx-config/nsh/defconfig index 25089317ed..4290a5db2a 100644 --- a/boards/px4/fmu-v4pro/nuttx-config/nsh/defconfig +++ b/boards/px4/fmu-v4pro/nuttx-config/nsh/defconfig @@ -95,6 +95,11 @@ CONFIG_FS_BINFS=y CONFIG_FS_CROMFS=y CONFIG_FS_FAT=y CONFIG_FS_FATTIME=y +CONFIG_FS_LITTLEFS=y +CONFIG_FS_LITTLEFS_BLOCK_CYCLE=-1 +CONFIG_FS_LITTLEFS_BLOCK_SIZE_FACTOR=4 +CONFIG_FS_LITTLEFS_LOOKAHEAD_SIZE=128 +CONFIG_FS_LITTLEFS_PROGRAM_SIZE_FACTOR=1 CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_INCLUDE_PROGMEM=y CONFIG_FS_PROCFS_REGISTER=y diff --git a/boards/px4/fmu-v4pro/nuttx-config/test/defconfig b/boards/px4/fmu-v4pro/nuttx-config/test/defconfig index b24350d06e..617339a128 100644 --- a/boards/px4/fmu-v4pro/nuttx-config/test/defconfig +++ b/boards/px4/fmu-v4pro/nuttx-config/test/defconfig @@ -96,6 +96,11 @@ CONFIG_FS_BINFS=y CONFIG_FS_CROMFS=y CONFIG_FS_FAT=y CONFIG_FS_FATTIME=y +CONFIG_FS_LITTLEFS=y +CONFIG_FS_LITTLEFS_BLOCK_CYCLE=-1 +CONFIG_FS_LITTLEFS_BLOCK_SIZE_FACTOR=4 +CONFIG_FS_LITTLEFS_LOOKAHEAD_SIZE=128 +CONFIG_FS_LITTLEFS_PROGRAM_SIZE_FACTOR=1 CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_INCLUDE_PROGMEM=y CONFIG_FS_PROCFS_REGISTER=y diff --git a/boards/px4/fmu-v4pro/test.px4board b/boards/px4/fmu-v4pro/test.px4board index 057de060c0..63b0e0df69 100644 --- a/boards/px4/fmu-v4pro/test.px4board +++ b/boards/px4/fmu-v4pro/test.px4board @@ -3,8 +3,9 @@ CONFIG_DRIVERS_IMU_ANALOG_DEVICES_ADIS16448=n CONFIG_DRIVERS_IRLOCK=n CONFIG_DRIVERS_PCA9685_PWM_OUT=n CONFIG_MODULES_ATTITUDE_ESTIMATOR_Q=n -CONFIG_MODULES_GYRO_FFT=n CONFIG_MODULES_LOCAL_POSITION_ESTIMATOR=n +CONFIG_MODULES_UUV_ATT_CONTROL=n +CONFIG_MODULES_UUV_POS_CONTROL=n CONFIG_BOARD_TESTING=y CONFIG_DRIVERS_TEST_PPM=y CONFIG_SYSTEMCMDS_MICROBENCH=y diff --git a/boards/px4/fmu-v5/nuttx-config/cryptotest/defconfig b/boards/px4/fmu-v5/nuttx-config/cryptotest/defconfig index f5e9ec7dee..08c7496cfb 100644 --- a/boards/px4/fmu-v5/nuttx-config/cryptotest/defconfig +++ b/boards/px4/fmu-v5/nuttx-config/cryptotest/defconfig @@ -100,6 +100,11 @@ CONFIG_FS_BINFS=y CONFIG_FS_CROMFS=y CONFIG_FS_FAT=y CONFIG_FS_FATTIME=y +CONFIG_FS_LITTLEFS=y +CONFIG_FS_LITTLEFS_BLOCK_CYCLE=-1 +CONFIG_FS_LITTLEFS_BLOCK_SIZE_FACTOR=4 +CONFIG_FS_LITTLEFS_LOOKAHEAD_SIZE=128 +CONFIG_FS_LITTLEFS_PROGRAM_SIZE_FACTOR=1 CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_INCLUDE_PROGMEM=y CONFIG_FS_PROCFS_MAX_TASKS=64 diff --git a/boards/px4/fmu-v5/nuttx-config/cyphal/defconfig b/boards/px4/fmu-v5/nuttx-config/cyphal/defconfig index 1f4256f27b..25e8af6e9b 100644 --- a/boards/px4/fmu-v5/nuttx-config/cyphal/defconfig +++ b/boards/px4/fmu-v5/nuttx-config/cyphal/defconfig @@ -100,6 +100,11 @@ CONFIG_FS_BINFS=y CONFIG_FS_CROMFS=y CONFIG_FS_FAT=y CONFIG_FS_FATTIME=y +CONFIG_FS_LITTLEFS=y +CONFIG_FS_LITTLEFS_BLOCK_CYCLE=-1 +CONFIG_FS_LITTLEFS_BLOCK_SIZE_FACTOR=4 +CONFIG_FS_LITTLEFS_LOOKAHEAD_SIZE=128 +CONFIG_FS_LITTLEFS_PROGRAM_SIZE_FACTOR=1 CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_INCLUDE_PROGMEM=y CONFIG_FS_PROCFS_MAX_TASKS=64 diff --git a/boards/px4/fmu-v5/nuttx-config/debug/defconfig b/boards/px4/fmu-v5/nuttx-config/debug/defconfig index fdf2d4a9a0..e188d33704 100644 --- a/boards/px4/fmu-v5/nuttx-config/debug/defconfig +++ b/boards/px4/fmu-v5/nuttx-config/debug/defconfig @@ -144,6 +144,11 @@ CONFIG_FS_BINFS=y CONFIG_FS_CROMFS=y CONFIG_FS_FAT=y CONFIG_FS_FATTIME=y +CONFIG_FS_LITTLEFS=y +CONFIG_FS_LITTLEFS_BLOCK_CYCLE=-1 +CONFIG_FS_LITTLEFS_BLOCK_SIZE_FACTOR=4 +CONFIG_FS_LITTLEFS_LOOKAHEAD_SIZE=128 +CONFIG_FS_LITTLEFS_PROGRAM_SIZE_FACTOR=1 CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_INCLUDE_PROGMEM=y CONFIG_FS_PROCFS_MAX_TASKS=64 diff --git a/boards/px4/fmu-v5/nuttx-config/nsh/defconfig b/boards/px4/fmu-v5/nuttx-config/nsh/defconfig index 81aa1bec53..0c12d32521 100644 --- a/boards/px4/fmu-v5/nuttx-config/nsh/defconfig +++ b/boards/px4/fmu-v5/nuttx-config/nsh/defconfig @@ -99,6 +99,11 @@ CONFIG_FS_BINFS=y CONFIG_FS_CROMFS=y CONFIG_FS_FAT=y CONFIG_FS_FATTIME=y +CONFIG_FS_LITTLEFS=y +CONFIG_FS_LITTLEFS_BLOCK_CYCLE=-1 +CONFIG_FS_LITTLEFS_BLOCK_SIZE_FACTOR=4 +CONFIG_FS_LITTLEFS_LOOKAHEAD_SIZE=128 +CONFIG_FS_LITTLEFS_PROGRAM_SIZE_FACTOR=1 CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_INCLUDE_PROGMEM=y CONFIG_FS_PROCFS_MAX_TASKS=64 diff --git a/boards/px4/fmu-v5/nuttx-config/protected/defconfig b/boards/px4/fmu-v5/nuttx-config/protected/defconfig index f82eaf8cf6..b0777a463f 100644 --- a/boards/px4/fmu-v5/nuttx-config/protected/defconfig +++ b/boards/px4/fmu-v5/nuttx-config/protected/defconfig @@ -102,6 +102,11 @@ CONFIG_FS_BINFS=y CONFIG_FS_CROMFS=y CONFIG_FS_FAT=y CONFIG_FS_FATTIME=y +CONFIG_FS_LITTLEFS=y +CONFIG_FS_LITTLEFS_BLOCK_CYCLE=-1 +CONFIG_FS_LITTLEFS_BLOCK_SIZE_FACTOR=4 +CONFIG_FS_LITTLEFS_LOOKAHEAD_SIZE=128 +CONFIG_FS_LITTLEFS_PROGRAM_SIZE_FACTOR=1 CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_INCLUDE_PROGMEM=y CONFIG_FS_PROCFS_MAX_TASKS=64 diff --git a/boards/px4/fmu-v5/nuttx-config/stackcheck/defconfig b/boards/px4/fmu-v5/nuttx-config/stackcheck/defconfig index efec10a978..d58b2effd2 100644 --- a/boards/px4/fmu-v5/nuttx-config/stackcheck/defconfig +++ b/boards/px4/fmu-v5/nuttx-config/stackcheck/defconfig @@ -99,6 +99,11 @@ CONFIG_FS_BINFS=y CONFIG_FS_CROMFS=y CONFIG_FS_FAT=y CONFIG_FS_FATTIME=y +CONFIG_FS_LITTLEFS=y +CONFIG_FS_LITTLEFS_BLOCK_CYCLE=-1 +CONFIG_FS_LITTLEFS_BLOCK_SIZE_FACTOR=4 +CONFIG_FS_LITTLEFS_LOOKAHEAD_SIZE=128 +CONFIG_FS_LITTLEFS_PROGRAM_SIZE_FACTOR=1 CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_INCLUDE_PROGMEM=y CONFIG_FS_PROCFS_MAX_TASKS=64 diff --git a/boards/px4/fmu-v5/nuttx-config/test/defconfig b/boards/px4/fmu-v5/nuttx-config/test/defconfig index 8e67566725..33c2fcd53a 100644 --- a/boards/px4/fmu-v5/nuttx-config/test/defconfig +++ b/boards/px4/fmu-v5/nuttx-config/test/defconfig @@ -99,6 +99,11 @@ CONFIG_FS_BINFS=y CONFIG_FS_CROMFS=y CONFIG_FS_FAT=y CONFIG_FS_FATTIME=y +CONFIG_FS_LITTLEFS=y +CONFIG_FS_LITTLEFS_BLOCK_CYCLE=-1 +CONFIG_FS_LITTLEFS_BLOCK_SIZE_FACTOR=4 +CONFIG_FS_LITTLEFS_LOOKAHEAD_SIZE=128 +CONFIG_FS_LITTLEFS_PROGRAM_SIZE_FACTOR=1 CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_INCLUDE_PROGMEM=y CONFIG_FS_PROCFS_MAX_TASKS=64 diff --git a/boards/px4/fmu-v5/stackcheck.px4board b/boards/px4/fmu-v5/stackcheck.px4board index 4c5f5b12c0..c352d2f074 100644 --- a/boards/px4/fmu-v5/stackcheck.px4board +++ b/boards/px4/fmu-v5/stackcheck.px4board @@ -3,6 +3,9 @@ CONFIG_COMMON_BAROMETERS=n CONFIG_COMMON_DIFFERENTIAL_PRESSURE=n CONFIG_COMMON_DISTANCE_SENSOR=n CONFIG_COMMON_HYGROMETERS=n +CONFIG_COMMON_MAGNETOMETER=n +CONFIG_COMMON_OPTICAL_FLOW=n +CONFIG_COMMON_OSD=n CONFIG_COMMON_TELEMETRY=n CONFIG_DRIVERS_ADC_ADS1115=n CONFIG_DRIVERS_BATT_SMBUS=n @@ -23,12 +26,15 @@ CONFIG_EXAMPLES_FAKE_GPS=n CONFIG_MODULES_ATTITUDE_ESTIMATOR_Q=n CONFIG_MODULES_CAMERA_FEEDBACK=n CONFIG_MODULES_ESC_BATTERY=n +CONFIG_MODULES_EVENTS=n CONFIG_MODULES_FW_AUTOTUNE_ATTITUDE_CONTROL=n CONFIG_MODULES_GIMBAL=n CONFIG_MODULES_GYRO_CALIBRATION=n CONFIG_MODULES_LANDING_TARGET_ESTIMATOR=n CONFIG_MODULES_LOCAL_POSITION_ESTIMATOR=n +CONFIG_MODULES_MAG_BIAS_ESTIMATOR=n CONFIG_MODULES_MC_AUTOTUNE_ATTITUDE_CONTROL=n +CONFIG_MODULES_MC_HOVER_THRUST_ESTIMATOR=n CONFIG_MODULES_ROVER_POS_CONTROL=n CONFIG_MODULES_SIMULATION_SIMULATOR_SIH=n CONFIG_MODULES_TEMPERATURE_COMPENSATION=n @@ -38,3 +44,8 @@ CONFIG_SYSTEMCMDS_REFLECT=n CONFIG_BOARD_CONSTRAINED_FLASH=y CONFIG_BOARD_TESTING=y CONFIG_DRIVERS_BAROMETER_MS5611=y +CONFIG_DRIVERS_MAGNETOMETER_AKM_AK09916=y +CONFIG_DRIVERS_MAGNETOMETER_AKM_AK8963=y +CONFIG_DRIVERS_MAGNETOMETER_BOSCH_BMM150=y +CONFIG_DRIVERS_MAGNETOMETER_ISENTEK_IST8308=y +CONFIG_DRIVERS_MAGNETOMETER_ISENTEK_IST8310=y diff --git a/boards/px4/fmu-v5x/nuttx-config/nsh/defconfig b/boards/px4/fmu-v5x/nuttx-config/nsh/defconfig index d27c259ee5..1acea1be19 100644 --- a/boards/px4/fmu-v5x/nuttx-config/nsh/defconfig +++ b/boards/px4/fmu-v5x/nuttx-config/nsh/defconfig @@ -104,6 +104,11 @@ CONFIG_FS_BINFS=y CONFIG_FS_CROMFS=y CONFIG_FS_FAT=y CONFIG_FS_FATTIME=y +CONFIG_FS_LITTLEFS=y +CONFIG_FS_LITTLEFS_BLOCK_CYCLE=-1 +CONFIG_FS_LITTLEFS_BLOCK_SIZE_FACTOR=4 +CONFIG_FS_LITTLEFS_LOOKAHEAD_SIZE=128 +CONFIG_FS_LITTLEFS_PROGRAM_SIZE_FACTOR=1 CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_INCLUDE_PROGMEM=y CONFIG_FS_PROCFS_MAX_TASKS=64 diff --git a/boards/px4/fmu-v5x/nuttx-config/test/defconfig b/boards/px4/fmu-v5x/nuttx-config/test/defconfig index f3254fb7c8..9b17809aaf 100644 --- a/boards/px4/fmu-v5x/nuttx-config/test/defconfig +++ b/boards/px4/fmu-v5x/nuttx-config/test/defconfig @@ -103,6 +103,11 @@ CONFIG_FS_BINFS=y CONFIG_FS_CROMFS=y CONFIG_FS_FAT=y CONFIG_FS_FATTIME=y +CONFIG_FS_LITTLEFS=y +CONFIG_FS_LITTLEFS_BLOCK_CYCLE=-1 +CONFIG_FS_LITTLEFS_BLOCK_SIZE_FACTOR=4 +CONFIG_FS_LITTLEFS_LOOKAHEAD_SIZE=128 +CONFIG_FS_LITTLEFS_PROGRAM_SIZE_FACTOR=1 CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_INCLUDE_PROGMEM=y CONFIG_FS_PROCFS_MAX_TASKS=64 diff --git a/boards/px4/fmu-v6c/default.px4board b/boards/px4/fmu-v6c/default.px4board index 94957c2692..8f16088e7d 100644 --- a/boards/px4/fmu-v6c/default.px4board +++ b/boards/px4/fmu-v6c/default.px4board @@ -61,9 +61,7 @@ CONFIG_MODULES_MC_POS_CONTROL=y CONFIG_MODULES_MC_RATE_CONTROL=y CONFIG_MODULES_NAVIGATOR=y CONFIG_MODULES_RC_UPDATE=y -CONFIG_MODULES_ROVER_POS_CONTROL=y CONFIG_MODULES_SENSORS=y -CONFIG_MODULES_SIMULATION_SIMULATOR_SIH=y CONFIG_MODULES_TEMPERATURE_COMPENSATION=y CONFIG_MODULES_UXRCE_DDS_CLIENT=y CONFIG_MODULES_VTOL_ATT_CONTROL=y diff --git a/boards/px4/fmu-v6c/nuttx-config/nsh/defconfig b/boards/px4/fmu-v6c/nuttx-config/nsh/defconfig index 02ac045e13..dd212069dc 100644 --- a/boards/px4/fmu-v6c/nuttx-config/nsh/defconfig +++ b/boards/px4/fmu-v6c/nuttx-config/nsh/defconfig @@ -99,6 +99,11 @@ CONFIG_FS_BINFS=y CONFIG_FS_CROMFS=y CONFIG_FS_FAT=y CONFIG_FS_FATTIME=y +CONFIG_FS_LITTLEFS=y +CONFIG_FS_LITTLEFS_BLOCK_CYCLE=-1 +CONFIG_FS_LITTLEFS_BLOCK_SIZE_FACTOR=4 +CONFIG_FS_LITTLEFS_LOOKAHEAD_SIZE=128 +CONFIG_FS_LITTLEFS_PROGRAM_SIZE_FACTOR=1 CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_INCLUDE_PROGMEM=y CONFIG_FS_PROCFS_MAX_TASKS=64 diff --git a/boards/px4/fmu-v6u/nuttx-config/nsh/defconfig b/boards/px4/fmu-v6u/nuttx-config/nsh/defconfig index 19376fdc87..e857318808 100644 --- a/boards/px4/fmu-v6u/nuttx-config/nsh/defconfig +++ b/boards/px4/fmu-v6u/nuttx-config/nsh/defconfig @@ -99,6 +99,11 @@ CONFIG_FS_BINFS=y CONFIG_FS_CROMFS=y CONFIG_FS_FAT=y CONFIG_FS_FATTIME=y +CONFIG_FS_LITTLEFS=y +CONFIG_FS_LITTLEFS_BLOCK_CYCLE=-1 +CONFIG_FS_LITTLEFS_BLOCK_SIZE_FACTOR=4 +CONFIG_FS_LITTLEFS_LOOKAHEAD_SIZE=128 +CONFIG_FS_LITTLEFS_PROGRAM_SIZE_FACTOR=1 CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_INCLUDE_PROGMEM=y CONFIG_FS_PROCFS_MAX_TASKS=64 diff --git a/boards/px4/fmu-v6x/default.px4board b/boards/px4/fmu-v6x/default.px4board index cb9b676b68..4c7d891df5 100644 --- a/boards/px4/fmu-v6x/default.px4board +++ b/boards/px4/fmu-v6x/default.px4board @@ -28,8 +28,6 @@ CONFIG_DRIVERS_IMU_INVENSENSE_ICM42688P=y CONFIG_COMMON_INS=y CONFIG_COMMON_LIGHT=y CONFIG_COMMON_MAGNETOMETER=y -CONFIG_COMMON_OPTICAL_FLOW=y -CONFIG_COMMON_OSD=y CONFIG_DRIVERS_POWER_MONITOR_INA226=y CONFIG_DRIVERS_POWER_MONITOR_INA228=y CONFIG_DRIVERS_POWER_MONITOR_INA238=y diff --git a/boards/px4/fmu-v6x/nuttx-config/nsh/defconfig b/boards/px4/fmu-v6x/nuttx-config/nsh/defconfig index c355dbfd36..8178869cb3 100644 --- a/boards/px4/fmu-v6x/nuttx-config/nsh/defconfig +++ b/boards/px4/fmu-v6x/nuttx-config/nsh/defconfig @@ -105,6 +105,11 @@ CONFIG_FS_BINFS=y CONFIG_FS_CROMFS=y CONFIG_FS_FAT=y CONFIG_FS_FATTIME=y +CONFIG_FS_LITTLEFS=y +CONFIG_FS_LITTLEFS_BLOCK_CYCLE=-1 +CONFIG_FS_LITTLEFS_BLOCK_SIZE_FACTOR=4 +CONFIG_FS_LITTLEFS_LOOKAHEAD_SIZE=128 +CONFIG_FS_LITTLEFS_PROGRAM_SIZE_FACTOR=1 CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_INCLUDE_PROGMEM=y CONFIG_FS_PROCFS_MAX_TASKS=64 diff --git a/boards/siyi/n7/nuttx-config/nsh/defconfig b/boards/siyi/n7/nuttx-config/nsh/defconfig index c06b04d176..9031f83af6 100644 --- a/boards/siyi/n7/nuttx-config/nsh/defconfig +++ b/boards/siyi/n7/nuttx-config/nsh/defconfig @@ -99,6 +99,11 @@ CONFIG_FS_BINFS=y CONFIG_FS_CROMFS=y CONFIG_FS_FAT=y CONFIG_FS_FATTIME=y +CONFIG_FS_LITTLEFS=y +CONFIG_FS_LITTLEFS_BLOCK_CYCLE=-1 +CONFIG_FS_LITTLEFS_BLOCK_SIZE_FACTOR=4 +CONFIG_FS_LITTLEFS_LOOKAHEAD_SIZE=128 +CONFIG_FS_LITTLEFS_PROGRAM_SIZE_FACTOR=1 CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_INCLUDE_PROGMEM=y CONFIG_FS_PROCFS_MAX_TASKS=64 diff --git a/boards/sky-drones/smartap-airlink/nuttx-config/nsh/defconfig b/boards/sky-drones/smartap-airlink/nuttx-config/nsh/defconfig index c3df909ceb..feb476625b 100644 --- a/boards/sky-drones/smartap-airlink/nuttx-config/nsh/defconfig +++ b/boards/sky-drones/smartap-airlink/nuttx-config/nsh/defconfig @@ -102,6 +102,11 @@ CONFIG_FS_BINFS=y CONFIG_FS_CROMFS=y CONFIG_FS_FAT=y CONFIG_FS_FATTIME=y +CONFIG_FS_LITTLEFS=y +CONFIG_FS_LITTLEFS_BLOCK_CYCLE=-1 +CONFIG_FS_LITTLEFS_BLOCK_SIZE_FACTOR=4 +CONFIG_FS_LITTLEFS_LOOKAHEAD_SIZE=128 +CONFIG_FS_LITTLEFS_PROGRAM_SIZE_FACTOR=1 CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_INCLUDE_PROGMEM=y CONFIG_FS_PROCFS_MAX_TASKS=64 diff --git a/boards/thepeach/k1/nuttx-config/nsh/defconfig b/boards/thepeach/k1/nuttx-config/nsh/defconfig index 04ea6197a0..4cf3210a8d 100644 --- a/boards/thepeach/k1/nuttx-config/nsh/defconfig +++ b/boards/thepeach/k1/nuttx-config/nsh/defconfig @@ -96,6 +96,11 @@ CONFIG_FS_BINFS=y CONFIG_FS_CROMFS=y CONFIG_FS_FAT=y CONFIG_FS_FATTIME=y +CONFIG_FS_LITTLEFS=y +CONFIG_FS_LITTLEFS_BLOCK_CYCLE=-1 +CONFIG_FS_LITTLEFS_BLOCK_SIZE_FACTOR=4 +CONFIG_FS_LITTLEFS_LOOKAHEAD_SIZE=128 +CONFIG_FS_LITTLEFS_PROGRAM_SIZE_FACTOR=1 CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_INCLUDE_PROGMEM=y CONFIG_FS_PROCFS_REGISTER=y diff --git a/boards/thepeach/r1/nuttx-config/nsh/defconfig b/boards/thepeach/r1/nuttx-config/nsh/defconfig index cd0486b09e..ec8dff17d4 100644 --- a/boards/thepeach/r1/nuttx-config/nsh/defconfig +++ b/boards/thepeach/r1/nuttx-config/nsh/defconfig @@ -96,6 +96,11 @@ CONFIG_FS_BINFS=y CONFIG_FS_CROMFS=y CONFIG_FS_FAT=y CONFIG_FS_FATTIME=y +CONFIG_FS_LITTLEFS=y +CONFIG_FS_LITTLEFS_BLOCK_CYCLE=-1 +CONFIG_FS_LITTLEFS_BLOCK_SIZE_FACTOR=4 +CONFIG_FS_LITTLEFS_LOOKAHEAD_SIZE=128 +CONFIG_FS_LITTLEFS_PROGRAM_SIZE_FACTOR=1 CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_INCLUDE_PROGMEM=y CONFIG_FS_PROCFS_REGISTER=y diff --git a/boards/uvify/core/nuttx-config/nsh/defconfig b/boards/uvify/core/nuttx-config/nsh/defconfig index 3870bebea9..7a796fd3e3 100644 --- a/boards/uvify/core/nuttx-config/nsh/defconfig +++ b/boards/uvify/core/nuttx-config/nsh/defconfig @@ -94,6 +94,11 @@ CONFIG_FS_BINFS=y CONFIG_FS_CROMFS=y CONFIG_FS_FAT=y CONFIG_FS_FATTIME=y +CONFIG_FS_LITTLEFS=y +CONFIG_FS_LITTLEFS_BLOCK_CYCLE=-1 +CONFIG_FS_LITTLEFS_BLOCK_SIZE_FACTOR=4 +CONFIG_FS_LITTLEFS_LOOKAHEAD_SIZE=128 +CONFIG_FS_LITTLEFS_PROGRAM_SIZE_FACTOR=1 CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_INCLUDE_PROGMEM=y CONFIG_FS_PROCFS_REGISTER=y diff --git a/platforms/common/include/px4_platform_common/px4_mtd.h b/platforms/common/include/px4_platform_common/px4_mtd.h index 7313bd78a9..80196d3fcf 100644 --- a/platforms/common/include/px4_platform_common/px4_mtd.h +++ b/platforms/common/include/px4_platform_common/px4_mtd.h @@ -77,6 +77,24 @@ __EXPORT int px4_mtd_get_geometry(const mtd_instance_s *instance, unsigned long */ __EXPORT ssize_t px4_mtd_get_partition_size(const mtd_instance_s *instance, const char *partname); +/* + Helper function for transition to LittleFS. + It will unmount MTD for parameters with LittleFS and mount Block Device +*/ +__EXPORT int px4_mtd_unmount_littlefs_mount_block_device(void); + +/* + Helper function for transition to LittleFS. + It will unmount MTD for parameters with Block Device and mount LittleFS with force formatting +*/ +__EXPORT int px4_mtd_unmount_block_device_mount_littlefs(void); + +/* + Helper function for transition to LittleFS. + It will force formatting to LittleFS +*/ +__EXPORT int px4_mtd_forceformat_littlefs(void); + int px4_at24c_initialize(FAR struct i2c_master_s *dev, uint8_t address, FAR struct mtd_dev_s **mtd_dev); diff --git a/platforms/common/include/px4_platform_common/px4_work_queue/WorkQueueManager.hpp b/platforms/common/include/px4_platform_common/px4_work_queue/WorkQueueManager.hpp index 9bee390323..ed75a077c7 100644 --- a/platforms/common/include/px4_platform_common/px4_work_queue/WorkQueueManager.hpp +++ b/platforms/common/include/px4_platform_common/px4_work_queue/WorkQueueManager.hpp @@ -89,7 +89,7 @@ static constexpr wq_config_t ttyS9{"wq:ttyS9", 1728, -30}; static constexpr wq_config_t ttyACM0{"wq:ttyACM0", 1728, -31}; static constexpr wq_config_t ttyUnknown{"wq:ttyUnknown", 1728, -32}; -static constexpr wq_config_t lp_default{"wq:lp_default", 1920, -50}; +static constexpr wq_config_t lp_default{"wq:lp_default", 2048, -50}; static constexpr wq_config_t test1{"wq:test1", 2000, 0}; static constexpr wq_config_t test2{"wq:test2", 2000, 0}; diff --git a/platforms/nuttx/src/px4/common/px4_manifest.cpp b/platforms/nuttx/src/px4/common/px4_manifest.cpp index d7402215ab..16dcb7a804 100644 --- a/platforms/nuttx/src/px4/common/px4_manifest.cpp +++ b/platforms/nuttx/src/px4/common/px4_manifest.cpp @@ -76,9 +76,12 @@ __EXPORT int px4_mft_configure(const px4_mft_s *mft) if (mft != nullptr) { for (uint32_t m = 0; m < mft->nmft; m++) { switch (mft->mfts[m]->type) { +#if defined(CONFIG_MTD) + case MTD: px4_mtd_config(static_cast(mft->mfts[m]->pmft)); break; +#endif // CONFIG_MTD case MFT: default: @@ -99,9 +102,12 @@ __EXPORT int px4_mft_query(const px4_mft_s *mft, px4_manifest_types_e type, for (uint32_t m = 0; m < mft->nmft; m++) { if (mft->mfts[m]->type == type) switch (type) { +#if defined(CONFIG_MTD) + case MTD: return px4_mtd_query(sub, val, nullptr); break; +#endif // CONFIG_MTD case MFT: default: diff --git a/platforms/nuttx/src/px4/common/px4_mtd.cpp b/platforms/nuttx/src/px4/common/px4_mtd.cpp index f4b3476722..9ce8a994b8 100644 --- a/platforms/nuttx/src/px4/common/px4_mtd.cpp +++ b/platforms/nuttx/src/px4/common/px4_mtd.cpp @@ -39,6 +39,8 @@ * @author David Sidrane */ +#if defined(CONFIG_MTD) + #ifndef MODULE_NAME #define MODULE_NAME "PX4_MTD" #endif @@ -57,6 +59,7 @@ #include #include #include +#include extern "C" { struct mtd_dev_s *ramtron_initialize(FAR struct spi_dev_s *dev); @@ -67,6 +70,9 @@ static int num_instances = 0; static int total_blocks = 0; static mtd_instance_s *instances[MAX_MTD_INSTANCES] = {}; +static int8_t param_instance = -1; +static int8_t param_part = -1; +static int8_t param_block = -1; static int ramtron_attach(mtd_instance_s &instance) { @@ -118,15 +124,6 @@ static int ramtron_attach(mtd_instance_s &instance) return -EIO; } - int ret = instance.mtd_dev->ioctl(instance.mtd_dev, MTDIOC_SETSPEED, (unsigned long)spi_speed_mhz * 1000 * 1000); - - if (ret != OK) { - // FIXME: From the previous warning call, it looked like this should have been fatal error instead. Tried - // that but setting the bus speed does fail all the time. Which was then exiting and the board would - // not run correctly. So changed to PX4_WARN. - PX4_WARN("failed to set bus speed"); - } - return 0; #endif } @@ -395,27 +392,54 @@ memoryout: } /* Initialize to provide an FTL block driver on the MTD FLASH interface */ - snprintf(blockname, sizeof(blockname), "/dev/mtdblock%d", total_blocks); - rv = ftl_initialize(total_blocks, instances[i]->part_dev[part]); + printf("blockname: %s, type: %d, name: %s\n", blockname, instances[i]->partition_types[part], + instances[i]->partition_names[part]); - if (rv < 0) { - PX4_ERR("ftl_initialize %s failed: %d", blockname, rv); - goto errout; + if (instances[i]->partition_types[part] == MTD_PARAMETERS) { + + param_instance = i; + param_part = part; + param_block = total_blocks; + + rv = register_mtddriver(blockname, instances[i]->part_dev[part], 0755, nullptr); + + if (rv < 0) { + PX4_ERR("register_mtddriver %s failed: %d", blockname, rv); + goto errout; + } + + // Now create a character device on the block device + //TODO: after the transition period return "autoformat" + rv = nx_mount(blockname, instances[i]->partition_names[part], "littlefs", 0, ""); + + printf("nx_mount: blockname: %s partition: %s\n", blockname, instances[i]->partition_names[part]); + + if (rv < 0) { + PX4_ERR("nx_mount %s failed: %d", instances[i]->partition_names[part], rv); + goto errout; + } + + } else { + rv = ftl_initialize(total_blocks, instances[i]->part_dev[part]); + + if (rv < 0) { + PX4_ERR("ftl_initialize %s failed: %d", blockname, rv); + goto errout; + } + + /* Now create a character device on the block device */ + rv = bchdev_register(blockname, instances[i]->partition_names[part], false); + + if (rv < 0) { + PX4_ERR("bchdev_register %s failed: %d", instances[i]->partition_names[part], rv); + goto errout; + } } total_blocks++; - /* Now create a character device on the block device */ - - rv = bchdev_register(blockname, instances[i]->partition_names[part], false); - - if (rv < 0) { - PX4_ERR("bchdev_register %s failed: %d", instances[i]->partition_names[part], rv); - goto errout; - } - instances[i]->n_partitions_current++; } @@ -474,3 +498,97 @@ __EXPORT int px4_mtd_query(const char *sub, const char *val, const char **get) return rv; } + +int px4_mtd_unmount_littlefs_mount_block_device(void) +{ + if ((param_instance == -1) || (param_part == -1) || (param_block == -1)) { + PX4_ERR("MTD_PARAMETERS never initialized"); + return -1; + } + + char blockname[32]; + snprintf(blockname, sizeof(blockname), "/dev/mtdblock%d", param_block); + + // in case LittleFS is mounted, unmount it + nx_umount2(instances[param_instance]->partition_names[param_part], 0); + unregister_mtddriver(blockname); + + int ret = ftl_initialize(0, instances[param_instance]->part_dev[param_part]); + + if (ret < 0) { + PX4_ERR("ftl_initialize failed with error %d, param_block %d, param_instance %d, param_part %d, block_counts %d", + ret, param_block, param_instance, param_part, *instances[param_instance]->partition_block_counts); + + } else { + ret = bchdev_register(blockname, instances[param_instance]->partition_names[param_part], false); + + if (ret < 0) { + PX4_ERR("bchdev_register failed: %d", ret); + + } + } + + return ret; +} + +int px4_mtd_unmount_block_device_mount_littlefs(void) +{ + if ((param_instance == -1) || (param_part == -1) || (param_block == -1)) { + PX4_ERR("MTD_PARAMETERS never initialized"); + return -1; + } + + char blockname[32]; + snprintf(blockname, sizeof(blockname), "/dev/mtdblock%d", param_block); + + int ret = bchdev_unregister(instances[param_instance]->partition_names[param_part]); + + if (ret < 0) { + PX4_ERR("bchdev_unregister %s failed: %d", instances[param_instance]->partition_names[param_part], ret); + + } else { + ret = unregister_blockdriver(blockname); + + if (ret < 0) { + PX4_ERR("unregister_blockdriver %s failed: %d", blockname, ret); + + } else { + ret = px4_mtd_forceformat_littlefs(); + } + } + + return ret; +} + +int px4_mtd_forceformat_littlefs(void) +{ + if ((param_instance == -1) || (param_part == -1) || (param_block == -1)) { + PX4_ERR("MTD_PARAMETERS never initialized"); + return -1; + } + + char blockname[32]; + snprintf(blockname, sizeof(blockname), "/dev/mtdblock%d", param_block); + + // in case bchdev is register + bchdev_unregister(instances[param_instance]->partition_names[param_part]); + unregister_blockdriver(blockname); + + int ret = register_mtddriver(blockname, instances[param_instance]->part_dev[param_part], 0755, nullptr); + + if (ret < 0) { + PX4_ERR("register_mtddriver %s failed: %d", blockname, ret); + + } else { + ret = nx_mount(blockname, instances[param_instance]->partition_names[param_part], "littlefs", 0, "forceformat"); + + if (ret < 0) { + PX4_ERR("nx_mount %s failed: %d", instances[param_instance]->partition_names[param_part], ret); + + } + } + + return ret; +} + +#endif // CONFIG_MTD diff --git a/src/systemcmds/param/CMakeLists.txt b/src/systemcmds/param/CMakeLists.txt index 0a27cf9589..056401daf7 100644 --- a/src/systemcmds/param/CMakeLists.txt +++ b/src/systemcmds/param/CMakeLists.txt @@ -35,6 +35,7 @@ px4_add_module( MAIN param COMPILE_FLAGS -Wno-array-bounds + STACK_MAIN 4096 SRCS param.cpp DEPENDS diff --git a/src/systemcmds/param/param.cpp b/src/systemcmds/param/param.cpp index f1f355514c..77e6afde91 100644 --- a/src/systemcmds/param/param.cpp +++ b/src/systemcmds/param/param.cpp @@ -43,6 +43,7 @@ #include #include #include +#include #include #include @@ -84,6 +85,7 @@ enum class COMPARE_ERROR_LEVEL { static int do_save(const char *param_file_name); static int do_save_default(); static int do_load(const char *param_file_name); +static int do_transition(); static int do_import(const char *param_file_name = nullptr); static int do_show(const char *search_string, bool only_changed); static int do_show_for_airframe(); @@ -218,6 +220,11 @@ param_main(int argc, char *argv[]) } } + // TODO: This code shall be reverted after the BCH->LittleFS param transition time is completed + if (!strcmp(argv[1], "transition")) { + return do_transition(); + } + if (!strcmp(argv[1], "import")) { if (argc >= 3) { return do_import(argv[2]); @@ -466,6 +473,57 @@ do_load(const char *param_file_name) return 0; } +static int +do_transition() +{ +#if defined(CONFIG_FS_LITTLEFS) + + int ret_val = px4_mtd_unmount_littlefs_mount_block_device(); + + if (ret_val < 0) { + PX4_ERR("Transition from LittleFS to Blockdriver"); + } else { + char param_path[] = "/fs/mtd_params"; + PX4_INFO("Try path: %s", param_path); + ret_val = do_import(param_path); + + if (ret_val == 1) { + PX4_WARN("Try path: %s", param_path); + + char param_path_backup[] = "/fs/microsd/parameters_backup.bson"; + ret_val = do_import(param_path_backup); + } + + if (ret_val == 0) { + ret_val = px4_mtd_unmount_block_device_mount_littlefs(); + + if (ret_val < 0) { + PX4_ERR("Transition from Blockdriver to LittleFS failed"); + } else { + + PX4_INFO("Exporting params to LittleFS!"); + ret_val = param_export(param_get_default_file(), nullptr); + + if (ret_val == 0) { + PX4_INFO("Successful params transition!"); + } + } + + } else { + PX4_INFO("Params are unreadable from any known path. Format partition to LittleFS!"); + ret_val = px4_mtd_forceformat_littlefs(); + } + } + + if (ret_val < 0) { + return 1; + } + +#endif // CONFIG_FS_LITTLEFS + + return 0; +} + static int do_import(const char *param_file_name) {