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

Merge pull request #101 from MJDSys/zigbee_2.2_sdk

Browse source
This commit is contained in:
rbaron 2023-01-23 11:12:55 +01:00 • committed by GitHub
commit 41ba531fba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.devcontainer/devcontainer.json
View file

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

2
.github/actions/build/Dockerfile vendored
View file

@ -1,4 +1,4 @@
FROM nordicplayground/nrfconnect-sdk:v2.1-branch FROM nordicplayground/nrfconnect-sdk:v2.2-branch
COPY build.sh /build.sh COPY build.sh /build.sh

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

@ -10,6 +10,7 @@
zephyr,sram = &sram0; zephyr,sram = &sram0;
zephyr,flash = &flash0; zephyr,flash = &flash0;
zephyr,code-partition = &slot0_partition; zephyr,code-partition = &slot0_partition;
zephyr,ieee802154 = &ieee802154;
}; };
zephyr,user { zephyr,user {
@ -61,6 +62,10 @@
status = "okay"; status = "okay";
}; };
&ieee802154 {
status = "okay";
};
&uart0 { &uart0 {
compatible = "nordic,nrf-uart"; compatible = "nordic,nrf-uart";
status = "disabled"; status = "disabled";

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

@ -10,6 +10,7 @@
zephyr,sram = &sram0; zephyr,sram = &sram0;
zephyr,flash = &flash0; zephyr,flash = &flash0;
zephyr,code-partition = &slot0_partition; zephyr,code-partition = &slot0_partition;
zephyr,ieee802154 = &ieee802154;
}; };
zephyr,user { zephyr,user {
@ -61,6 +62,10 @@
status = "okay"; status = "okay";
}; };
&ieee802154 {
status = "okay";
};
&uart0 { &uart0 {
compatible = "nordic,nrf-uart"; compatible = "nordic,nrf-uart";
status = "disabled"; status = "disabled";

1
code/nrf-connect/samples/zigbee/prj.conf
View file

@ -29,6 +29,7 @@ CONFIG_CRYPTO_NRF_ECB=y
CONFIG_CRYPTO_INIT_PRIORITY=80 CONFIG_CRYPTO_INIT_PRIORITY=80
# Networking # Networking
CONFIG_NET_IPV6=n
CONFIG_NET_IPV6_MLD=n CONFIG_NET_IPV6_MLD=n
CONFIG_NET_IPV6_NBR_CACHE=n CONFIG_NET_IPV6_NBR_CACHE=n
CONFIG_NET_IPV6_RA_RDNSS=n CONFIG_NET_IPV6_RA_RDNSS=n