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

Update to nRF Connect SDK 2.5

Browse source
This commit is contained in:
rbaron 2023-11-07 18:31:32 +01:00
parent 7de5115705
commit 5199ceaa50
7 changed files with 10 additions and 8 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