Skip to content

Commit

Permalink
Rebase to on top of NCS v2.5.0 (#12)
Browse files Browse the repository at this point in the history
This points our NCS module to a branch that is v2.5.0 upstream NCS tag,
with the changes from the `gminn/lte-metrics` branch rebased on top.

I'm also updating to latest 1.5.0-rc branch for the Memfault SDK, which
has some other fixes for FOTA (namely, handle CDN cert retry loop).

And setting a few more Kconfig options:

- disable the NRF_CLOUD_FOTA module, it's pretty large and we don't use
  it
- got back to default log level of 3, INFO, which is much more useful
  when testing vs. 2=WARNING

This works for FOTA, though might be unrelated to the actual root cause.
But I think it's cleaner to base our test app on a released NCS branch.
  • Loading branch information
noahp authored Nov 22, 2023
1 parent 90c6599 commit 738ec7e
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 4 deletions.
9 changes: 8 additions & 1 deletion overlay-memfault.conf
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,11 @@ CONFIG_MEMFAULT_EVENT_STORAGE_SIZE=2048
# Configure frequency of periodic upload and heartbeat collection
CONFIG_MEMFAULT_HTTP_PERIODIC_UPLOAD=y
CONFIG_MEMFAULT_HTTP_PERIODIC_UPLOAD_INTERVAL_SECS=10800
CONFIG_DEBUG_MODULE_MEMFAULT_HEARTBEAT_INTERVAL_SEC=3600
CONFIG_DEBUG_MODULE_MEMFAULT_HEARTBEAT_INTERVAL_SEC=3600

# To override the version for FOTA testing, set the following line
# CONFIG_MEMFAULT_NCS_FW_VERSION_PREFIX=\"0.0.1+\"

# Disable NRF Cloud FOTA to save some kB, we don't use it
CONFIG_NRF_CLOUD_FOTA=n
CONFIG_MEMFAULT_FOTA=y
4 changes: 3 additions & 1 deletion prj.conf
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ CONFIG_DOWNLOAD_CLIENT_HTTP_FRAG_SIZE_1024=y
CONFIG_DOWNLOAD_CLIENT_STACK_SIZE=4096
CONFIG_DOWNLOAD_CLIENT_BUF_SIZE=2300
CONFIG_DOWNLOAD_CLIENT_MAX_HOSTNAME_SIZE=128
CONFIG_DOWNLOAD_CLIENT_MAX_FILENAME_SIZE=400

# Flash - Used in FOTA, settings and storage for P-GPS.
CONFIG_FLASH=y
Expand Down Expand Up @@ -117,7 +118,8 @@ CONFIG_RTT_CONSOLE=n
CONFIG_USE_SEGGER_RTT=n
CONFIG_SHELL_BACKEND_RTT=n

CONFIG_LOG_DEFAULT_LEVEL=2
# Default log level 3=INFO
CONFIG_LOG_DEFAULT_LEVEL=3

# Ensure backend uses shell for logging so that logging
# output and console are available in the same window
Expand Down
4 changes: 2 additions & 2 deletions west.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ manifest:
# TODO: Remove url and revision when this is no
# longer needed
url: https://github.com/memfault/sdk-nrf.git
revision: gminn/lte-metrics
revision: gminn/v2.5.0-lte-metrics
import: true

- name: memfault-firmware-sdk
url: https://github.com/memfault/memfault-firmware-sdk
path: modules/lib/memfault-firmware-sdk
revision: "1.4.3"
revision: "release/1.5.0"

self:
path: firmware

0 comments on commit 738ec7e

Please sign in to comment.