From a36e16321e767da137c7b1235f6f421dd47379f3 Mon Sep 17 00:00:00 2001
From: "NDC\\rjbrown6" <Robert.J.Brown@nasa.gov>
Date: Wed, 25 Sep 2024 12:42:16 -0400
Subject: [PATCH 1/6] [nasa/nos3#325] Updates to cFE, OSAL, PSP, TOOLS

---
 cfg/nos3-mission.xml | 2 +-
 fsw/osal             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cfg/nos3-mission.xml b/cfg/nos3-mission.xml
index 031c7214..4e5f140c 100644
--- a/cfg/nos3-mission.xml
+++ b/cfg/nos3-mission.xml
@@ -2,7 +2,7 @@
     <start-time>814048200.0</start-time>
     <gsw>cosmos</gsw>
     <number-spacecraft>1</number-spacecraft>
-    <sc-1-cfg>sc-full-config.xml</sc-1-cfg>
+    <sc-1-cfg>sc-minimal-config.xml</sc-1-cfg>
     <!--
     <sc-2-cfg>sc-minimal-config.xml</sc-2-cfg>
     -->
diff --git a/fsw/osal b/fsw/osal
index 9c9b9f6d..a366b903 160000
--- a/fsw/osal
+++ b/fsw/osal
@@ -1 +1 @@
-Subproject commit 9c9b9f6dd75b7b3adaf9021040db3d112ef709e5
+Subproject commit a366b903070faecc9a7522c00de9ef2f91ceeb54

From 476912ccd33034f3d91b66a57d99ee0a609d4cb7 Mon Sep 17 00:00:00 2001
From: "NDC\\rjbrown6" <Robert.J.Brown@nasa.gov>
Date: Wed, 25 Sep 2024 12:48:25 -0400
Subject: [PATCH 2/6] [nasa/nos3#325] Updates to CFE, PSP, OSAL

---
 fsw/cfe | 2 +-
 fsw/psp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fsw/cfe b/fsw/cfe
index 79c22d9e..dbea2746 160000
--- a/fsw/cfe
+++ b/fsw/cfe
@@ -1 +1 @@
-Subproject commit 79c22d9edfe425f39efc782bb168aefe8db5ddf7
+Subproject commit dbea2746a0ca9596a70b04d50fc2953a0a91ddcb
diff --git a/fsw/psp b/fsw/psp
index cd5546b9..0e8ac1d4 160000
--- a/fsw/psp
+++ b/fsw/psp
@@ -1 +1 @@
-Subproject commit cd5546b9b873fb50a5a7154d4072356dc6ba042e
+Subproject commit 0e8ac1d4a7545a6a6ed1aea63e05b0fb4805027f

From 7bdbc7f49fda1885f4c63f201cd50db76c2c41e1 Mon Sep 17 00:00:00 2001
From: "NDC\\rjbrown6" <Robert.J.Brown@nasa.gov>
Date: Wed, 25 Sep 2024 14:55:34 -0400
Subject: [PATCH 3/6] [nasa/nos3#25] Update Submodule OSAL

---
 fsw/osal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fsw/osal b/fsw/osal
index a366b903..05445fe5 160000
--- a/fsw/osal
+++ b/fsw/osal
@@ -1 +1 @@
-Subproject commit a366b903070faecc9a7522c00de9ef2f91ceeb54
+Subproject commit 05445fe527e79844ef54eb116bbdd54008ee193e

From 4981ca26df11a91daf174eb731bd926ecaf9e4ff Mon Sep 17 00:00:00 2001
From: "NDC\\rjbrown6" <Robert.J.Brown@nasa.gov>
Date: Wed, 25 Sep 2024 15:40:01 -0400
Subject: [PATCH 4/6] [nasa/nos3#325] Update Cfe snprintf

---
 fsw/cfe | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fsw/cfe b/fsw/cfe
index dbea2746..3849a5b4 160000
--- a/fsw/cfe
+++ b/fsw/cfe
@@ -1 +1 @@
-Subproject commit dbea2746a0ca9596a70b04d50fc2953a0a91ddcb
+Subproject commit 3849a5b447fc99c89ec3a732e0923345ca0ee2d4

From 062fcb03a338f7794bafcd2036e79e309a8a2565 Mon Sep 17 00:00:00 2001
From: "NDC\\rjbrown6" <Robert.J.Brown@nasa.gov>
Date: Thu, 10 Oct 2024 09:28:49 -0400
Subject: [PATCH 5/6] [nasa/nos3#325] Revert nos3-mission.xml to sc-full-config
 instead of minimal.

---
 cfg/nos3-mission.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cfg/nos3-mission.xml b/cfg/nos3-mission.xml
index 4e5f140c..a9ee451b 100644
--- a/cfg/nos3-mission.xml
+++ b/cfg/nos3-mission.xml
@@ -2,8 +2,8 @@
     <start-time>814048200.0</start-time>
     <gsw>cosmos</gsw>
     <number-spacecraft>1</number-spacecraft>
-    <sc-1-cfg>sc-minimal-config.xml</sc-1-cfg>
+    <sc-1-cfg>sc-full-config.xml</sc-1-cfg>
     <!--
     <sc-2-cfg>sc-minimal-config.xml</sc-2-cfg>
     -->
-</nos3-mission-cfg>
+</nos3-mission-cfg>
\ No newline at end of file

From de897ef478cbac745062959595931d13516a002f Mon Sep 17 00:00:00 2001
From: "Lucas, John P." <John.P.Lucas@nasa.gov>
Date: Thu, 10 Oct 2024 10:45:15 -0400
Subject: [PATCH 6/6] [nasa/nos3#325] Quick fix to change the IMU 42 IPC port
 to avoid conflict with thruster;

---
 cfg/InOut/Inp_IPC.txt       | 2 +-
 cfg/sims/nos3-simulator.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cfg/InOut/Inp_IPC.txt b/cfg/InOut/Inp_IPC.txt
index d0644602..bdc24c48 100644
--- a/cfg/InOut/Inp_IPC.txt
+++ b/cfg/InOut/Inp_IPC.txt
@@ -157,7 +157,7 @@ TX                                      ! IPC Mode (OFF,TX,RX,TXRX,ACS,WRITEFILE
 0                                       ! AC.ID for ACS mode
 "IMU.42"                                ! File name for WRITE or READ
 SERVER                                  ! Socket Role (SERVER,CLIENT,GMSEC_CLIENT)
-fortytwo       4280                     ! Server Host Name, Port 
+fortytwo       4281                     ! Server Host Name, Port 
 FALSE                                   ! Allow Blocking (i.e. wait on RX)
 FALSE                                   ! Echo to stdout
 1                                       ! Number of TX prefixes
diff --git a/cfg/sims/nos3-simulator.xml b/cfg/sims/nos3-simulator.xml
index f6587b44..8c464de2 100644
--- a/cfg/sims/nos3-simulator.xml
+++ b/cfg/sims/nos3-simulator.xml
@@ -576,7 +576,7 @@
                 <data-provider>
                     <type>GENERIC_IMU_42_PROVIDER</type>
                     <hostname>fortytwo</hostname>
-                    <port>4280</port>
+                    <port>4281</port>
                     <max-connection-attempts>30</max-connection-attempts>
                     <retry-wait-seconds>1</retry-wait-seconds>
                     <spacecraft>0</spacecraft>