From 738ec7e91047b500a3a40e38d2a46658f9383288 Mon Sep 17 00:00:00 2001
From: Noah Pendleton <2538614+noahp@users.noreply.github.com>
Date: Wed, 22 Nov 2023 12:03:39 -0500
Subject: [PATCH] Rebase to on top of NCS v2.5.0 (#12)

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.
---
 overlay-memfault.conf | 9 ++++++++-
 prj.conf              | 4 +++-
 west.yml              | 4 ++--
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/overlay-memfault.conf b/overlay-memfault.conf
index b988947..668fda4 100644
--- a/overlay-memfault.conf
+++ b/overlay-memfault.conf
@@ -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
\ No newline at end of file
+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
diff --git a/prj.conf b/prj.conf
index 417dd62..2ef2956 100644
--- a/prj.conf
+++ b/prj.conf
@@ -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
@@ -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
diff --git a/west.yml b/west.yml
index 50bb060..b3d01f9 100644
--- a/west.yml
+++ b/west.yml
@@ -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