From 473a5bb09d47af71360e9905c5d2a2218e2ae763 Mon Sep 17 00:00:00 2001
From: Daniel Kampert <DanielKampert@kampis-elektroecke.de>
Date: Tue, 6 Aug 2024 15:21:08 +0200
Subject: [PATCH] Add patch for BMP5 sensor API to fix an uninitialized
 variable warning

---
 app/CMakeLists.txt                             | 11 +++++++++--
 app/patches/ext_drivers/bmp5.patch             | 13 +++++++++++++
 app/patches/{ => zephyr}/npm1300_charger.patch |  0
 app/patches/{ => zephyr}/ntc_fix.patch         |  0
 app/patches/{ => zephyr}/rv8263_rtc.patch      |  0
 5 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 app/patches/ext_drivers/bmp5.patch
 rename app/patches/{ => zephyr}/npm1300_charger.patch (100%)
 rename app/patches/{ => zephyr}/ntc_fix.patch (100%)
 rename app/patches/{ => zephyr}/rv8263_rtc.patch (100%)

diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index 625067bb..22c207c6 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -1,12 +1,19 @@
 cmake_minimum_required(VERSION 3.20.0)
 
-# Apply patches before build
-file(GLOB_RECURSE files RELATIVE ${CMAKE_SOURCE_DIR} "patches/*.patch")
+# Apply Zephyr patches before build
+file(GLOB_RECURSE files RELATIVE ${CMAKE_SOURCE_DIR} "patches/zephyr/*.patch")
 foreach(file ${files})
     execute_process(COMMAND 
                     patch -p1 -d $ENV{ZEPHYR_BASE} -i ${CMAKE_CURRENT_SOURCE_DIR}/${file} -r - --no-backup-if-mismatch)
 endforeach()
 
+# Apply ext_drivers patches before build
+file(GLOB_RECURSE files RELATIVE ${CMAKE_SOURCE_DIR} "patches/ext_drivers/*.patch")
+foreach(file ${files})
+    execute_process(COMMAND 
+                    patch -p1 -d ${CMAKE_SOURCE_DIR}/src/ext_drivers -i ${CMAKE_CURRENT_SOURCE_DIR}/${file} -r - --no-backup-if-mismatch)
+endforeach()
+
 # Get the target hardware
 string(REGEX MATCH "zswatch_nrf5340_cpuapp(_ns)?@([0-9]+)$" ZSWATCH_BOARD "${BOARD}")
 if(ZSWATCH_BOARD)
diff --git a/app/patches/ext_drivers/bmp5.patch b/app/patches/ext_drivers/bmp5.patch
new file mode 100644
index 00000000..15ac7e36
--- /dev/null
+++ b/app/patches/ext_drivers/bmp5.patch
@@ -0,0 +1,13 @@
+diff --git a/BMP5-Sensor-API/bmp5.c b/BMP5-Sensor-API/bmp5.c
+index 6af2f6a..e62172a 100644
+--- a/BMP5-Sensor-API/bmp5.c
++++ b/BMP5-Sensor-API/bmp5.c
+@@ -1130,7 +1130,7 @@ int8_t bmp5_get_fifo_len(uint16_t *fifo_len, struct bmp5_fifo *fifo, struct bmp5
+ int8_t bmp5_get_fifo_data(struct bmp5_fifo *fifo, struct bmp5_dev *dev)
+ {
+     int8_t rslt;
+-    uint16_t fifo_len;
++    uint16_t fifo_len = 0;
+ 
+     if (fifo != NULL)
+     {
diff --git a/app/patches/npm1300_charger.patch b/app/patches/zephyr/npm1300_charger.patch
similarity index 100%
rename from app/patches/npm1300_charger.patch
rename to app/patches/zephyr/npm1300_charger.patch
diff --git a/app/patches/ntc_fix.patch b/app/patches/zephyr/ntc_fix.patch
similarity index 100%
rename from app/patches/ntc_fix.patch
rename to app/patches/zephyr/ntc_fix.patch
diff --git a/app/patches/rv8263_rtc.patch b/app/patches/zephyr/rv8263_rtc.patch
similarity index 100%
rename from app/patches/rv8263_rtc.patch
rename to app/patches/zephyr/rv8263_rtc.patch