From 02bcbb346cd1872f25f6bdb702110c543ee40b69 Mon Sep 17 00:00:00 2001
From: Nate Gay <email@nategay.me>
Date: Mon, 30 Mar 2026 19:43:58 -0500
Subject: [PATCH 1/3] Upgrade Zephyr to 2.4.0

---
 lib/zephyr-workspace/zephyr |  2 +-
 west.yml                    | 21 ++++++++++++++-------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/lib/zephyr-workspace/zephyr b/lib/zephyr-workspace/zephyr
index 3568e1b6..77b0ef9d 160000
--- a/lib/zephyr-workspace/zephyr
+++ b/lib/zephyr-workspace/zephyr
@@ -1 +1 @@
-Subproject commit 3568e1b6d5cdd51a6b964a2a1d6d29200fea2056
+Subproject commit 77b0ef9da94480c4aced17e5484e306ced186db2
diff --git a/west.yml b/west.yml
index 051b91be..0cd103e0 100644
--- a/west.yml
+++ b/west.yml
@@ -17,7 +17,7 @@ manifest:
     # Zephyr RTOS core
     - name: zephyr
       repo-path: zephyr
-      revision: v4.3.0
+      revision: v4.4.0-rc1
       path: lib/zephyr-workspace/zephyr
       west-commands: scripts/west-commands.yml
       import:
@@ -46,34 +46,41 @@ manifest:
 
     - name: cmsis_6
       repo-path: CMSIS_6
-      revision: 06d952b6713a2ca41c9224a62075e4059402a151
+      revision: 30a859f44ef8ab4dc8f84b03ed586fd16ccf9d74
       path: lib/zephyr-workspace/modules/hal/cmsis_6
       groups:
         - hal
 
     - name: hal_rpi_pico
       path: lib/zephyr-workspace/modules/hal/rpi_pico
-      revision: 09e957522da60581cf7958b31f8e625d969c69a5
+      revision: 562b41e10a1d8b1a761b253b107c5c6a84cf4535
       groups:
         - hal
 
     - name: hal_st
-      revision: 9f81b4427e955885398805b7bca0da3a8cd9109c
+      revision: 7a792882847223c72944791e0c48eed6101e6569
       path: lib/zephyr-workspace/modules/hal/st
       groups:
         - hal
 
     - name: picolibc
       path: lib/zephyr-workspace/modules/lib/picolibc
-      revision: 560946f26db075c296beea5b39d99e6de43c9010
+      revision: 01254932e8e81085817ed61fd858648584ffe37c
 
     # Crypto libraries (commonly used)
     - name: mbedtls
-      revision: 85440ef5fffa95d0e9971e9163719189cf34d979
+      revision: 26158d1c012477e77765d138b26a791db917c881
       path: lib/zephyr-workspace/modules/crypto/mbedtls
       groups:
         - crypto
 
+    - name: tf-psa-crypto
+      revision: 6820f1dadc67c289d2dc63aec495519c9d589d8e
+      path: lib/zephyr-workspace/modules/crypto/mbedtls/tf-psa-crypto
+      groups:
+        - crypto
+
+    # TODO(nateinaction): tinycrypt is no longer in zephyr upstream west.yml. Do we still need it?
     - name: tinycrypt
       revision: 1012a3ebee18c15ede5efc8332ee2fc37817670f
       path: lib/zephyr-workspace/modules/crypto/tinycrypt
@@ -81,7 +88,7 @@ manifest:
         - crypto
 
     - name: mcuboot
-      revision: 96576b341ee19f1c3af6622256b0d4f3d408e1e3
+      revision: cf5810201c84d6e266aeda2abdab80854066ac08
       path: lib/zephyr-workspace/bootloader/mcuboot
 
     - name: fatfs

From 450812299ac097307fc99dce362a51de6b30294f Mon Sep 17 00:00:00 2001
From: Nate Gay <email@nategay.me>
Date: Mon, 30 Mar 2026 19:49:10 -0500
Subject: [PATCH 2/3] Remove tinycrypt as it was removed in 2.3.0 and is no
 longer maintained

---
 west.yml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/west.yml b/west.yml
index 0cd103e0..9903da73 100644
--- a/west.yml
+++ b/west.yml
@@ -28,7 +28,6 @@ manifest:
           - hal_rpi_pico  # Raspberry Pi Pico HAL (REQUIRED for RP2040/RP2350)
           - picolibc   # C library
           - mbedtls    # Crypto library
-          - tinycrypt  # Lightweight crypto library
           - mcuboot    # Bootloader support
           - fatfs      # FatFS (file system) support
           - hal_st     # Required for certain sensors
@@ -80,13 +79,6 @@ manifest:
       groups:
         - crypto
 
-    # TODO(nateinaction): tinycrypt is no longer in zephyr upstream west.yml. Do we still need it?
-    - name: tinycrypt
-      revision: 1012a3ebee18c15ede5efc8332ee2fc37817670f
-      path: lib/zephyr-workspace/modules/crypto/tinycrypt
-      groups:
-        - crypto
-
     - name: mcuboot
       revision: cf5810201c84d6e266aeda2abdab80854066ac08
       path: lib/zephyr-workspace/bootloader/mcuboot

From 8c2d948a9850a72e7eb95413321da3b971386906 Mon Sep 17 00:00:00 2001
From: Nate Gay <email@nategay.me>
Date: Tue, 31 Mar 2026 20:08:29 -0500
Subject: [PATCH 3/3] Remove timeout check

---
 .../Components/Drv/Drv2605Manager/Drv2605Manager.cpp            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PROVESFlightControllerReference/Components/Drv/Drv2605Manager/Drv2605Manager.cpp b/PROVESFlightControllerReference/Components/Drv/Drv2605Manager/Drv2605Manager.cpp
index c140e1e2..38e0171a 100644
--- a/PROVESFlightControllerReference/Components/Drv/Drv2605Manager/Drv2605Manager.cpp
+++ b/PROVESFlightControllerReference/Components/Drv/Drv2605Manager/Drv2605Manager.cpp
@@ -195,7 +195,7 @@ Fw::Success Drv2605Manager ::deinitializeDevice() {
 }
 
 bool Drv2605Manager ::loadSwitchReady() {
-    return this->m_load_switch_state == Fw::On::ON && this->getTime() >= this->m_load_switch_on_timeout;
+    return this->m_load_switch_state == Fw::On::ON;
 }
 
 }  // namespace Drv