From 4e763c47e4f896c0fd6a724e19b920785de6792e Mon Sep 17 00:00:00 2001 From: Kenji Brameld Date: Wed, 2 Apr 2025 19:22:12 -0500 Subject: [PATCH 1/3] Fix code block in README --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index f589fe5ea..804162a46 100644 --- a/README.md +++ b/README.md @@ -139,6 +139,7 @@ Copy in the default makefile and definitions: The cFS Framework including sample applications will build and run on the pc-linux platform support package (should run on most Linux distributions), via the steps described in [the cFE cmake readme](). Quick-start is below: To prep, compile, and run on the host (from cFS directory above) as a normal user (best effort message queue depth and task priorities): + make distclean (For a clean build on subsequent runs) make SIMULATION=native prep From 99e387733a36d0f2a9be8b58d3170915f757030e Mon Sep 17 00:00:00 2001 From: "Dylan Z. Baker" Date: Mon, 7 Apr 2025 18:08:21 +0000 Subject: [PATCH 2/3] Merge pull request #834 from ijnek:patch-1 Fix code block in README*cFS* --- cfe | 2 +- osal | 2 +- psp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cfe b/cfe index fa57a77e1..fe9b65915 160000 --- a/cfe +++ b/cfe @@ -1 +1 @@ -Subproject commit fa57a77e1ac1d70304e3d8bab04377dfa7a9aed4 +Subproject commit fe9b65915983b7b7df5011df72572089f11a474a diff --git a/osal b/osal index 0309a8943..59d9bb9ef 160000 --- a/osal +++ b/osal @@ -1 +1 @@ -Subproject commit 0309a89432ab01b9031b8714e2269ae21625d0db +Subproject commit 59d9bb9efb03e72efe05dc6610ddd2d62d7ca602 diff --git a/psp b/psp index 28bb3408f..cfc9234b1 160000 --- a/psp +++ b/psp @@ -1 +1 @@ -Subproject commit 28bb3408f6855a82ed53c36dc7034204877714bc +Subproject commit cfc9234b1bfcae83c0a3bcfaca1c9d0fff818468 From 73d0611e6b3aa2fdf155420b80bedfe64657f96f Mon Sep 17 00:00:00 2001 From: "Dylan Z. Baker" Date: Mon, 7 Apr 2025 18:13:30 +0000 Subject: [PATCH 3/3] IC: equuleus-rc1+dev28 *Combines:* cFE equuleus-rc1+dev243 osal equuleus-rc1+dev113 psp equuleus-rc1+dev67 sample_app equuleus-rc1+dev54 **Includes:** *cFS* - nasa/cFS#834 *cFE* - nasa/cFE#2646 *osal* - nasa/osal#1497 *PSP* - nasa/PSP#453 *sample_app* - nasa/sample_app#238 Co-authored by:Kenji Brameld Co-authored by:Anh Van Co-authored by:Jose Martinez Pedraza --- apps/sample_app | 2 +- cfe | 2 +- osal | 2 +- psp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/sample_app b/apps/sample_app index 97ef16c31..46279d0ee 160000 --- a/apps/sample_app +++ b/apps/sample_app @@ -1 +1 @@ -Subproject commit 97ef16c316d6ab9692ef31dd12f930d0576213b9 +Subproject commit 46279d0eeadf7cfa605888acc4db6c64193e4e88 diff --git a/cfe b/cfe index fe9b65915..2d04be3c9 160000 --- a/cfe +++ b/cfe @@ -1 +1 @@ -Subproject commit fe9b65915983b7b7df5011df72572089f11a474a +Subproject commit 2d04be3c94e4c69af31da2b717c98fc5c0a03ad9 diff --git a/osal b/osal index 59d9bb9ef..dd5f5affb 160000 --- a/osal +++ b/osal @@ -1 +1 @@ -Subproject commit 59d9bb9efb03e72efe05dc6610ddd2d62d7ca602 +Subproject commit dd5f5affb8a1ba4b2e7297607f57f61f90f3abad diff --git a/psp b/psp index cfc9234b1..15911059e 160000 --- a/psp +++ b/psp @@ -1 +1 @@ -Subproject commit cfc9234b1bfcae83c0a3bcfaca1c9d0fff818468 +Subproject commit 15911059e1ed8635ec4a8e8dc930aefcfef75ec3