Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[nrfconnect] Added factory data accessor implementation. #19614

Merged
merged 7 commits into from
Jun 23, 2022
Merged

[nrfconnect] Added factory data accessor implementation. #19614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
074fb66
[nrfconnect] Added factory data accessor implementation.
kkasperczyk-no Jun 15, 2022
6999cb0
Fixed some nrfconnect builds
kkasperczyk-no Jun 15, 2022
2cca906
Addressed review comments
kkasperczyk-no Jun 15, 2022
7b3d39f
Address more review comments
Damian-Nordic Jun 17, 2022
4e557f6
Restyled by whitespace
restyled-commits Jun 17, 2022
f16aa18
Restyled by clang-format
restyled-commits Jun 17, 2022
cf410a3
Merge branch 'master' into factory_data_support
ArekBalysNordic Jun 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions config/nrfconnect/chip-module/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,13 @@ chip_gn_arg_bool ("chip_detail_logging" CONFIG_MATTER_LOG_LE
chip_gn_arg_bool ("chip_automation_logging" "false")
chip_gn_arg_bool ("chip_malloc_sys_heap" CONFIG_CHIP_MALLOC_SYS_HEAP)

if (CONFIG_CHIP_FACTORY_DATA)
chip_gn_arg_bool ("chip_use_transitional_commissionable_data_provider" "false")
chip_gn_arg_bool ("chip_enable_factory_data" "true")
elseif (CONFIG_CHIP_FACTORY_DATA_CUSTOM_BACKEND)
chip_gn_arg_bool ("chip_use_transitional_commissionable_data_provider" "false")
endif()

if (CONFIG_CHIP_ROTATING_DEVICE_ID)
chip_gn_arg_bool("chip_enable_rotating_device_id" "true")
chip_gn_arg_bool("chip_enable_additional_data_advertising" "true")
Expand Down
16 changes: 16 additions & 0 deletions config/nrfconnect/chip-module/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,22 @@ config CHIP_DEBUG_SYMBOLS
help
Build the application with debug symbols.

config CHIP_FACTORY_DATA
bool "Enable Factory Data support"
select ZCBOR
help
Enables support for reading factory data from flash memory partition.
It requires factory_data partition to exist in the partition manager
configuration file pm_static.yml.

config CHIP_FACTORY_DATA_CUSTOM_BACKEND
bool "Enable Factory Data custom backend"
depends on !CHIP_FACTORY_DATA
help
Enables user custom factory data implementation. It cannot be used
with the CHIP_FACTORY_DATA that enabled default nRF Connect factory data
implementation.

config CHIP_FACTORY_DATA_BUILD
bool "Enable Factory Data build"
default n
Expand Down
16 changes: 10 additions & 6 deletions examples/all-clusters-app/nrfconnect/configuration/nrf52840dk_nrf52840/pm_static_dfu.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,32 +7,36 @@ mcuboot_pad:
size: 0x200
app:
address: 0x7200
size: 0xf4e00
size: 0xf3e00
mcuboot_primary:
orig_span: &id001
- mcuboot_pad
- app
span: *id001
address: 0x7000
size: 0xf5000
size: 0xf4000
region: flash_primary
mcuboot_primary_app:
orig_span: &id002
- app
span: *id002
address: 0x7200
size: 0xf4e00
size: 0xf3e00
factory_data:
address: 0xfb000
size: 0x1000
region: flash_primary
settings_storage:
address: 0xfc000
size: 0x4000
region: flash_primary
mcuboot_secondary:
address: 0x0
size: 0xf5000
size: 0xf4000
device: MX25R64
region: external_flash
external_flash:
address: 0xf5000
size: 0x70b000
address: 0xf4000
size: 0x70c000
device: MX25R64
region: external_flash
18 changes: 11 additions & 7 deletions ...ples/all-clusters-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/pm_static_dfu.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,25 @@ mcuboot_pad:
size: 0x200
app:
address: 0xC200
size: 0xefe00
size: 0xeee00
mcuboot_primary:
orig_span: &id001
- mcuboot_pad
- app
span: *id001
address: 0xC000
size: 0xf0000
size: 0xef000
region: flash_primary
mcuboot_primary_app:
orig_span: &id002
- app
span: *id002
address: 0xC200
size: 0xefe00
size: 0xeee00
factory_data:
address: 0xfb000
size: 0x1000
region: flash_primary
settings_storage:
address: 0xfc000
size: 0x4000
Expand All @@ -33,17 +37,17 @@ mcuboot_primary_1:
region: ram_flash
mcuboot_secondary:
address: 0x0
size: 0xf0000
size: 0xef000
device: MX25R64
region: external_flash
mcuboot_secondary_1:
address: 0xf0000
address: 0xef000
size: 0x40000
device: MX25R64
region: external_flash
external_flash:
address: 0x130000
size: 0x6D0000
address: 0x12f000
size: 0x6D1000
device: MX25R64
region: external_flash
pcd_sram:
Expand Down
7 changes: 7 additions & 0 deletions examples/all-clusters-app/nrfconnect/main/AppTask.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,14 @@ CHIP_ERROR AppTask::Init()
k_timer_user_data_set(&sFunctionTimer, this);

// Initialize CHIP server
#if CONFIG_CHIP_FACTORY_DATA
ReturnErrorOnFailure(mFactoryDataProvider.Init());
SetDeviceInstanceInfoProvider(&mFactoryDataProvider);
SetDeviceAttestationCredentialsProvider(&mFactoryDataProvider);
SetCommissionableDataProvider(&mFactoryDataProvider);
#else
SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
#endif

static CommonCaseDeviceServerInitParams initParams;
static OTATestEventTriggerDelegate testEventTriggerDelegate{ ByteSpan(kTestEventTriggerEnableKey) };
Expand Down
8 changes: 8 additions & 0 deletions examples/all-clusters-app/nrfconnect/main/include/AppTask.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@

#include <platform/CHIPDeviceLayer.h>

#if CONFIG_CHIP_FACTORY_DATA
#include <platform/nrfconnect/FactoryDataProvider.h>
#endif

struct k_timer;
class AppEvent;
class LEDWidget;
Expand Down Expand Up @@ -63,4 +67,8 @@ class AppTask
bool mIsThreadProvisioned{ false };
bool mIsThreadEnabled{ false };
bool mHaveBLEConnections{ false };

#if CONFIG_CHIP_FACTORY_DATA
chip::DeviceLayer::FactoryDataProvider<chip::DeviceLayer::InternalFlashFactoryData> mFactoryDataProvider;
#endif
};
16 changes: 10 additions & 6 deletions ...s/all-clusters-minimal-app/nrfconnect/configuration/nrf52840dk_nrf52840/pm_static_dfu.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,32 +7,36 @@ mcuboot_pad:
size: 0x200
app:
address: 0x7200
size: 0xf4e00
size: 0xf3e00
mcuboot_primary:
orig_span: &id001
- mcuboot_pad
- app
span: *id001
address: 0x7000
size: 0xf5000
size: 0xf4000
region: flash_primary
mcuboot_primary_app:
orig_span: &id002
- app
span: *id002
address: 0x7200
size: 0xf4e00
size: 0xf3e00
factory_data:
address: 0xfb000
size: 0x1000
region: flash_primary
settings_storage:
address: 0xfc000
size: 0x4000
region: flash_primary
mcuboot_secondary:
address: 0x0
size: 0xf5000
size: 0xf4000
device: MX25R64
region: external_flash
external_flash:
address: 0xf5000
size: 0x70b000
address: 0xf4000
size: 0x70c000
device: MX25R64
region: external_flash
18 changes: 11 additions & 7 deletions ...-clusters-minimal-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/pm_static_dfu.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,25 @@ mcuboot_pad:
size: 0x200
app:
address: 0xC200
size: 0xefe00
size: 0xeee00
mcuboot_primary:
orig_span: &id001
- mcuboot_pad
- app
span: *id001
address: 0xC000
size: 0xf0000
size: 0xef000
region: flash_primary
mcuboot_primary_app:
orig_span: &id002
- app
span: *id002
address: 0xC200
size: 0xefe00
size: 0xeee00
factory_data:
address: 0xfb000
size: 0x1000
region: flash_primary
settings_storage:
address: 0xfc000
size: 0x4000
Expand All @@ -33,17 +37,17 @@ mcuboot_primary_1:
region: ram_flash
mcuboot_secondary:
address: 0x0
size: 0xf0000
size: 0xef000
device: MX25R64
region: external_flash
mcuboot_secondary_1:
address: 0xf0000
address: 0xef000
size: 0x40000
device: MX25R64
region: external_flash
external_flash:
address: 0x130000
size: 0x6D0000
address: 0x12f000
size: 0x6D1000
device: MX25R64
region: external_flash
pcd_sram:
Expand Down
7 changes: 7 additions & 0 deletions examples/all-clusters-minimal-app/nrfconnect/main/AppTask.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,14 @@ CHIP_ERROR AppTask::Init()
k_timer_user_data_set(&sFunctionTimer, this);

// Initialize CHIP server
#if CONFIG_CHIP_FACTORY_DATA
ReturnErrorOnFailure(mFactoryDataProvider.Init());
SetDeviceInstanceInfoProvider(&mFactoryDataProvider);
SetDeviceAttestationCredentialsProvider(&mFactoryDataProvider);
SetCommissionableDataProvider(&mFactoryDataProvider);
#else
SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
#endif

static chip::CommonCaseDeviceServerInitParams initParams;
(void) initParams.InitializeStaticResourcesBeforeServerInit();
Expand Down
8 changes: 8 additions & 0 deletions examples/all-clusters-minimal-app/nrfconnect/main/include/AppTask.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@

#include <platform/CHIPDeviceLayer.h>

#if CONFIG_CHIP_FACTORY_DATA
#include <platform/nrfconnect/FactoryDataProvider.h>
#endif

struct k_timer;
class AppEvent;
class LEDWidget;
Expand Down Expand Up @@ -63,4 +67,8 @@ class AppTask
bool mIsThreadProvisioned{ false };
bool mIsThreadEnabled{ false };
bool mHaveBLEConnections{ false };

#if CONFIG_CHIP_FACTORY_DATA
chip::DeviceLayer::FactoryDataProvider<chip::DeviceLayer::InternalFlashFactoryData> mFactoryDataProvider;
#endif
};
4 changes: 4 additions & 0 deletions examples/chef/nrfconnect/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,3 +60,7 @@ CONFIG_CHIP_ENABLE_PAIRING_AUTOSTART=y
# Configure CHIP shell
CONFIG_CHIP_LIB_SHELL=y
CONFIG_OPENTHREAD_SHELL=n

# Disable factory data support.
CONFIG_CHIP_FACTORY_DATA=n
CONFIG_CHIP_FACTORY_DATA_BUILD=n
16 changes: 10 additions & 6 deletions examples/light-switch-app/nrfconnect/configuration/nrf52840dk_nrf52840/pm_static_dfu.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,32 +7,36 @@ mcuboot_pad:
size: 0x200
app:
address: 0x7200
size: 0xf4e00
size: 0xf3e00
mcuboot_primary:
orig_span: &id001
- mcuboot_pad
- app
span: *id001
address: 0x7000
size: 0xf5000
size: 0xf4000
region: flash_primary
mcuboot_primary_app:
orig_span: &id002
- app
span: *id002
address: 0x7200
size: 0xf4e00
size: 0xf3e00
factory_data:
address: 0xfb000
size: 0x1000
region: flash_primary
settings_storage:
address: 0xfc000
size: 0x4000
region: flash_primary
mcuboot_secondary:
address: 0x0
size: 0xf5000
size: 0xf4000
device: MX25R64
region: external_flash
external_flash:
address: 0xf5000
size: 0x70b000
address: 0xf4000
size: 0x70c000
device: MX25R64
region: external_flash
18 changes: 11 additions & 7 deletions ...ples/light-switch-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/pm_static_dfu.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,25 @@ mcuboot_pad:
size: 0x200
app:
address: 0xC200
size: 0xefe00
size: 0xeee00
mcuboot_primary:
orig_span: &id001
- mcuboot_pad
- app
span: *id001
address: 0xC000
size: 0xf0000
size: 0xef000
region: flash_primary
mcuboot_primary_app:
orig_span: &id002
- app
span: *id002
address: 0xC200
size: 0xefe00
size: 0xeee00
factory_data:
address: 0xfb000
size: 0x1000
region: flash_primary
settings_storage:
address: 0xfc000
size: 0x4000
Expand All @@ -33,17 +37,17 @@ mcuboot_primary_1:
region: ram_flash
mcuboot_secondary:
address: 0x0
size: 0xf0000
size: 0xef000
device: MX25R64
region: external_flash
mcuboot_secondary_1:
address: 0xf0000
address: 0xef000
size: 0x40000
device: MX25R64
region: external_flash
external_flash:
address: 0x130000
size: 0x6D0000
address: 0x12f000
size: 0x6D1000
device: MX25R64
region: external_flash
pcd_sram:
Expand Down
Loading