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

Fix nrfconnect compilation errors #17713

Merged
merged 2 commits into from
Apr 26, 2022
Merged

Fix nrfconnect compilation errors #17713

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d899489
Fix nrfconnect compilation errors
vinitg1 Apr 25, 2022
3e60495
Chef: fix arguments for clean build
vinitg1 Apr 26, 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
4 changes: 2 additions & 2 deletions examples/chef/chef.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ def main(argv):
queueCommand(f"cd {paths['rootSampleFolder']}/nrfconnect")
if options.doClean:
# queueCommand(f"rm -rf {paths['rootSampleFolder']}/nrfconnect/build")
queueCommand(f"west build -b nrf52840dk_nrf52840")
queueCommand(f"west build -b nrf52840dk_nrf52840 -p always")
else:
queueCommand(f"west build -b nrf52840dk_nrf52840")
elif options.buildTarget == "linux":
Expand Down Expand Up @@ -403,7 +403,7 @@ def main(argv):
elif options.buildTarget == "nrfconnect":
queueCommand(f"cd {paths['rootSampleFolder']}/nrfconnect")
if options.doErase:
queueCommand("rm -rf build")
queueCommand("west flash --erase")
else:
queueCommand("west flash")

Expand Down
2 changes: 1 addition & 1 deletion examples/chef/nrfconnect/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ include(${CHEF}/project_include.cmake)

get_filename_component(GEN_DIR ${CHEF}/out/${SAMPLE_NAME}/zap-generated REALPATH)

set(CONF_FILE prj.conf)
set(CONF_FILE ${CHIP_ROOT}/config/nrfconnect/app/sample-defaults.conf prj.conf)
Damian-Nordic marked this conversation as resolved.
Show resolved Hide resolved

set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
set(CHIP_CFLAGS "${CHIP_CFLAGS} -DCHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID=${CONFIG_DEVICE_PRODUCT_ID}")
Expand Down
5 changes: 3 additions & 2 deletions examples/chef/nrfconnect/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#
mainmenu "Matter nRF Connect Chef Example Application"

rsource "../../../config/nrfconnect/chip-module/Kconfig.defaults"
rsource "../../../config/nrfconnect/chip-module/Kconfig.features"
#rsource "../../../config/nrfconnect/chip-module/Kconfig.defaults"
andy31415 marked this conversation as resolved.
Show resolved Hide resolved
#rsource "../../../config/nrfconnect/chip-module/Kconfig.features"
rsource "../../../config/nrfconnect/chip-module/Kconfig"
source "Kconfig.zephyr"
4 changes: 1 addition & 3 deletions examples/chef/nrfconnect/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,7 @@ CHIP_ERROR main()
chip::app::DnssdServer::Instance().SetExtendedDiscoveryTimeoutSecs(kExtDiscoveryTimeoutSecs);

// Start IM server
static chip::CommonCaseDeviceServerInitParams initParams;
(void) initParams.InitializeStaticResourcesBeforeServerInit();
ReturnErrorOnFailure(chip::Server::GetInstance().Init(initParams));
ReturnErrorOnFailure(chip::Server::GetInstance().Init());
Damian-Nordic marked this conversation as resolved.
Show resolved Hide resolved

chip::DeviceLayer::ConfigurationMgr().LogDeviceConfig();

Expand Down
3 changes: 0 additions & 3 deletions examples/chef/nrfconnect/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,6 @@ CONFIG_RESET_ON_FATAL_ERROR=n
# Disable Matter OTA DFU
CONFIG_CHIP_OTA_REQUESTOR=n

# Disable QSPI NOR
Damian-Nordic marked this conversation as resolved.
Show resolved Hide resolved
CONFIG_CHIP_QSPI_NOR=n

# CHIP configuration
CONFIG_CHIP_PROJECT_CONFIG="CHIPProjectConfig.h"
# 32773 == 0x8005 (example lighting-app)
Expand Down