Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions app/prj.conf
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,7 @@ CONFIG_TASK_WDT_MIN_TIMEOUT=10000
# Device power management
CONFIG_PM_DEVICE=y
CONFIG_PM_DEVICE_SHELL=y
CONFIG_PM_DEVICE_RUNTIME=n

# nRF Cloud Provisioning
CONFIG_MODEM_ATTEST_TOKEN=y
Expand Down
1 change: 1 addition & 0 deletions app/src/modules/power/Kconfig.power
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ config APP_POWER_SHELL

config APP_POWER_DISABLE_UART_ON_VBUS_REMOVED
bool "Disable UART when VBUS is removed"
default y
help
Disable UART when VBUS is removed to save power.
The UART is re-enabled when VBUS is connected again.
Expand Down
1 change: 1 addition & 0 deletions tests/module/cloud/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ zephyr_include_directories(../../../app/src/modules/environmental)
zephyr_include_directories(../../../app/src/modules/location)
zephyr_include_directories(../../../app/src/modules/storage)
zephyr_include_directories(${NRF_DIR}/subsys/net/lib/nrf_cloud/include)
zephyr_include_directories(${NRF_DIR}/subsys/net/lib/nrf_cloud/common/include)
zephyr_include_directories(${NRF_DIR}/include/net)
zephyr_include_directories(${NRF_DIR}/subsys/net/lib/nrf_cloud/coap/include)
zephyr_include_directories(${NRF_DIR}/../modules/lib/cjson)
Expand Down
2 changes: 2 additions & 0 deletions tests/module/fota/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ zephyr_include_directories(${ZEPHYR_BASE}/subsys/testsuite/include)

zephyr_include_directories(${NRF_DIR}/include/net)
zephyr_include_directories(${NRF_DIR}/subsys/net/lib/nrf_cloud/include)
zephyr_include_directories(${NRF_DIR}/subsys/net/lib/nrf_cloud/common/include)
zephyr_include_directories(${NRF_DIR}/subsys/net/lib/nrf_cloud/mqtt/include)
zephyr_include_directories(${NRF_DIR}/../modules/lib/cjson)
zephyr_include_directories(${NRF_DIR}/../modules/lib/cjson)

Expand Down
2 changes: 1 addition & 1 deletion west.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ manifest:
- name: nrf
remote: ncs
repo-path: sdk-nrf
revision: 810b478aacde5d612130c32c9f0be52ca49aee2a
revision: fd20d7a44cf2361183b6b2dbdb79b5aff82fbd03
import: true
Loading