From 5199ceaa5070e946a05f87755d67118f7bd95ed8 Mon Sep 17 00:00:00 2001 From: rbaron Date: Tue, 7 Nov 2023 18:31:32 +0100 Subject: [PATCH 1/3] Update to nRF Connect SDK 2.5 --- .devcontainer/devcontainer.json | 2 +- .github/actions/build/action.yml | 2 +- .../boards/arm/bparasite_nrf52833/bparasite_nrf52833.dts | 4 ++++ .../arm/bparasite_nrf52833/bparasite_nrf52833_defconfig | 2 -- .../boards/arm/bparasite_nrf52840/bparasite_nrf52840.dts | 4 ++++ .../arm/bparasite_nrf52840/bparasite_nrf52840_defconfig | 2 -- code/nrf-connect/samples/ble/prj.conf | 2 -- 7 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index f8b020e..1b78822 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "name": "nrf-connect:v2.4", - "image": "nordicplayground/nrfconnect-sdk:v2.4-branch", + "image": "nordicplayground/nrfconnect-sdk:v2.5-branch", "features": { }, "customizations": { diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml index 56e880c..583bd4a 100644 --- a/.github/actions/build/action.yml +++ b/.github/actions/build/action.yml @@ -18,7 +18,7 @@ runs: steps: - run: | docker run --rm -v ${GITHUB_WORKSPACE}:/repo \ - nordicplayground/nrfconnect-sdk:v2.4-branch \ + nordicplayground/nrfconnect-sdk:v2.5-branch \ west build \ --build-dir /repo/${{ inputs.sample-dir }}/build \ --pristine \ diff --git a/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52833/bparasite_nrf52833.dts b/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52833/bparasite_nrf52833.dts index 7487715..f22ce6a 100644 --- a/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52833/bparasite_nrf52833.dts +++ b/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52833/bparasite_nrf52833.dts @@ -56,6 +56,10 @@ }; }; +&uicr { + gpio-as-nreset; +}; + &gpiote { status = "okay"; }; diff --git a/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52833/bparasite_nrf52833_defconfig b/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52833/bparasite_nrf52833_defconfig index e9c2d50..f18797f 100644 --- a/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52833/bparasite_nrf52833_defconfig +++ b/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52833/bparasite_nrf52833_defconfig @@ -16,6 +16,4 @@ CONFIG_GPIO=y CONFIG_CONSOLE=y CONFIG_RTT_CONSOLE=y -CONFIG_GPIO_AS_PINRESET=y - CONFIG_PINCTRL=y diff --git a/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52840/bparasite_nrf52840.dts b/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52840/bparasite_nrf52840.dts index 811d8a3..b0da5cb 100644 --- a/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52840/bparasite_nrf52840.dts +++ b/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52840/bparasite_nrf52840.dts @@ -56,6 +56,10 @@ }; }; +&uicr { + gpio-as-nreset; +}; + &gpiote { status = "okay"; }; diff --git a/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52840/bparasite_nrf52840_defconfig b/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52840/bparasite_nrf52840_defconfig index 43a095b..386002b 100644 --- a/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52840/bparasite_nrf52840_defconfig +++ b/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52840/bparasite_nrf52840_defconfig @@ -16,6 +16,4 @@ CONFIG_GPIO=y CONFIG_CONSOLE=y CONFIG_RTT_CONSOLE=y -CONFIG_GPIO_AS_PINRESET=y - CONFIG_PINCTRL=y diff --git a/code/nrf-connect/samples/ble/prj.conf b/code/nrf-connect/samples/ble/prj.conf index 51d475d..b58da14 100644 --- a/code/nrf-connect/samples/ble/prj.conf +++ b/code/nrf-connect/samples/ble/prj.conf @@ -11,8 +11,6 @@ CONFIG_BT_DEVICE_NAME="prst" CONFIG_BT_CTLR_TX_PWR_PLUS_8=y CONFIG_SERIAL=n -CONFIG_PM=y -CONFIG_PM_DEVICE=y CONFIG_USE_SEGGER_RTT=y From 171a1eb4a0057a427672c4df7c81375effabc747 Mon Sep 17 00:00:00 2001 From: rbaron Date: Tue, 7 Nov 2023 20:57:54 +0100 Subject: [PATCH 2/3] Uses newwer FIXED_PARTITION_ID for fs_mount_t ... This is what new samples use, but there should be no functional difference. --- code/nrf-connect/samples/input/prj.conf | 2 -- code/nrf-connect/samples/zigbee/src/flash_fs.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/code/nrf-connect/samples/input/prj.conf b/code/nrf-connect/samples/input/prj.conf index 243e054..cef2c65 100644 --- a/code/nrf-connect/samples/input/prj.conf +++ b/code/nrf-connect/samples/input/prj.conf @@ -7,8 +7,6 @@ CONFIG_GPIO=y CONFIG_CBPRINTF_FP_SUPPORT=y CONFIG_SERIAL=n -CONFIG_PM=y -CONFIG_PM_DEVICE=y CONFIG_USE_SEGGER_RTT=y diff --git a/code/nrf-connect/samples/zigbee/src/flash_fs.c b/code/nrf-connect/samples/zigbee/src/flash_fs.c index 01e72f5..ae45a8b 100644 --- a/code/nrf-connect/samples/zigbee/src/flash_fs.c +++ b/code/nrf-connect/samples/zigbee/src/flash_fs.c @@ -12,7 +12,7 @@ FS_LITTLEFS_DECLARE_DEFAULT_CONFIG(storage); static struct fs_mount_t lfs_storage_mnt = { .type = FS_LITTLEFS, .fs_data = &storage, - .storage_dev = (void *)FLASH_AREA_ID(storage), + .storage_dev = (void *)FIXED_PARTITION_ID(storage_partition), .mnt_point = "/lfs", }; From ad3cd4194fadc8d64e480afb49fdb94142783cd3 Mon Sep 17 00:00:00 2001 From: rbaron Date: Tue, 7 Nov 2023 21:18:20 +0100 Subject: [PATCH 3/3] Remove PM configs from soil_read_loop --- code/nrf-connect/samples/soil_read_loop/prj.conf | 2 -- 1 file changed, 2 deletions(-) diff --git a/code/nrf-connect/samples/soil_read_loop/prj.conf b/code/nrf-connect/samples/soil_read_loop/prj.conf index 4dac114..358a2de 100644 --- a/code/nrf-connect/samples/soil_read_loop/prj.conf +++ b/code/nrf-connect/samples/soil_read_loop/prj.conf @@ -5,6 +5,4 @@ CONFIG_PWM_LOG_LEVEL_DBG=y CONFIG_CBPRINTF_FP_SUPPORT=y CONFIG_ADC=y CONFIG_GPIO=y -CONFIG_PM=y -CONFIG_PM_DEVICE=y CONFIG_USE_SEGGER_RTT=y