polymachine/b-parasite-esp32
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #165 from rbaron/nrf2.5

Browse source 
Update to nRF Connect SDK 2.5
This commit is contained in:
rbaron 2023-11-08 08:33:01 +01:00 • committed by GitHub
commit 37ea3a1062
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.devcontainer/devcontainer.json
View file

@ -1,6 +1,6 @@
{ {
"name": "nrf-connect:v2.4", "name": "nrf-connect:v2.4",
"image": "nordicplayground/nrfconnect-sdk:v2.4-branch", "image": "nordicplayground/nrfconnect-sdk:v2.5-branch",
"features": { "features": {
}, },
"customizations": { "customizations": {

2
.github/actions/build/action.yml vendored
View file

@ -18,7 +18,7 @@ runs:
steps: steps:
- run: | - run: |
docker run --rm -v ${GITHUB_WORKSPACE}:/repo \ docker run --rm -v ${GITHUB_WORKSPACE}:/repo \
nordicplayground/nrfconnect-sdk:v2.4-branch \ nordicplayground/nrfconnect-sdk:v2.5-branch \
west build \ west build \
--build-dir /repo/${{ inputs.sample-dir }}/build \ --build-dir /repo/${{ inputs.sample-dir }}/build \
--pristine \ --pristine \

4
code/nrf-connect/prstlib/boards/arm/bparasite_nrf52833/bparasite_nrf52833.dts
View file

@ -56,6 +56,10 @@
}; };
}; };
&uicr {
gpio-as-nreset;
};
&gpiote { &gpiote {
status = "okay"; status = "okay";
}; };

2
code/nrf-connect/prstlib/boards/arm/bparasite_nrf52833/bparasite_nrf52833_defconfig
View file

@ -16,6 +16,4 @@ CONFIG_GPIO=y
CONFIG_CONSOLE=y CONFIG_CONSOLE=y
CONFIG_RTT_CONSOLE=y CONFIG_RTT_CONSOLE=y
CONFIG_GPIO_AS_PINRESET=y
CONFIG_PINCTRL=y CONFIG_PINCTRL=y

4
code/nrf-connect/prstlib/boards/arm/bparasite_nrf52840/bparasite_nrf52840.dts
View file

@ -56,6 +56,10 @@
}; };
}; };
&uicr {
gpio-as-nreset;
};
&gpiote { &gpiote {
status = "okay"; status = "okay";
}; };

2
code/nrf-connect/prstlib/boards/arm/bparasite_nrf52840/bparasite_nrf52840_defconfig
View file

@ -16,6 +16,4 @@ CONFIG_GPIO=y
CONFIG_CONSOLE=y CONFIG_CONSOLE=y
CONFIG_RTT_CONSOLE=y CONFIG_RTT_CONSOLE=y
CONFIG_GPIO_AS_PINRESET=y
CONFIG_PINCTRL=y CONFIG_PINCTRL=y

2
code/nrf-connect/samples/ble/prj.conf
View file

@ -11,8 +11,6 @@ CONFIG_BT_DEVICE_NAME="prst"
CONFIG_BT_CTLR_TX_PWR_PLUS_8=y CONFIG_BT_CTLR_TX_PWR_PLUS_8=y
CONFIG_SERIAL=n CONFIG_SERIAL=n
CONFIG_PM=y
CONFIG_PM_DEVICE=y
CONFIG_USE_SEGGER_RTT=y CONFIG_USE_SEGGER_RTT=y

2
code/nrf-connect/samples/input/prj.conf
View file

@ -7,8 +7,6 @@ CONFIG_GPIO=y
CONFIG_CBPRINTF_FP_SUPPORT=y CONFIG_CBPRINTF_FP_SUPPORT=y
CONFIG_SERIAL=n CONFIG_SERIAL=n
CONFIG_PM=y
CONFIG_PM_DEVICE=y
CONFIG_USE_SEGGER_RTT=y CONFIG_USE_SEGGER_RTT=y

2
code/nrf-connect/samples/soil_read_loop/prj.conf
View file

@ -5,6 +5,4 @@ CONFIG_PWM_LOG_LEVEL_DBG=y
CONFIG_CBPRINTF_FP_SUPPORT=y CONFIG_CBPRINTF_FP_SUPPORT=y
CONFIG_ADC=y CONFIG_ADC=y
CONFIG_GPIO=y CONFIG_GPIO=y
CONFIG_PM=y
CONFIG_PM_DEVICE=y
CONFIG_USE_SEGGER_RTT=y CONFIG_USE_SEGGER_RTT=y

2
code/nrf-connect/samples/zigbee/src/flash_fs.c
View file

@ -12,7 +12,7 @@ FS_LITTLEFS_DECLARE_DEFAULT_CONFIG(storage);
static struct fs_mount_t lfs_storage_mnt = { static struct fs_mount_t lfs_storage_mnt = {
.type = FS_LITTLEFS, .type = FS_LITTLEFS,
.fs_data = &storage, .fs_data = &storage,
.storage_dev = (void *)FLASH_AREA_ID(storage), .storage_dev = (void *)FIXED_PARTITION_ID(storage_partition),
.mnt_point = "/lfs", .mnt_point = "/lfs",
}; };