From 94da0c1de1b9481c19b9b60e81ca07df0f5a3177 Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" Date: Wed, 1 Jul 2020 10:29:01 -0400 Subject: [PATCH 1/3] Update submodules for IC-20200624 --- apps/ci_lab | 2 +- apps/sample_app | 2 +- apps/sample_lib | 2 +- apps/sch_lab | 2 +- apps/to_lab | 2 +- cfe | 2 +- osal | 2 +- psp | 2 +- tools/cFS-GroundSystem | 2 +- tools/elf2cfetbl | 2 +- tools/tblCRCTool | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/apps/ci_lab b/apps/ci_lab index e4a1bb833..50ce862f6 160000 --- a/apps/ci_lab +++ b/apps/ci_lab @@ -1 +1 @@ -Subproject commit e4a1bb83357c25fac89a5c7fc240a925ecd66094 +Subproject commit 50ce862f63bab09d6aeceaba55bc07ef6e2c6fb0 diff --git a/apps/sample_app b/apps/sample_app index 71d2c3290..2a6b755c6 160000 --- a/apps/sample_app +++ b/apps/sample_app @@ -1 +1 @@ -Subproject commit 71d2c3290f4c18359cf9212346394e30b5d34fab +Subproject commit 2a6b755c67ccd0c143ca4db54a22796ae0474370 diff --git a/apps/sample_lib b/apps/sample_lib index 14710ac0d..e686a20b8 160000 --- a/apps/sample_lib +++ b/apps/sample_lib @@ -1 +1 @@ -Subproject commit 14710ac0d777e40d5673d61b0fa6cc54c68200d3 +Subproject commit e686a20b83bad0bc3df31fcaac54d972d0154910 diff --git a/apps/sch_lab b/apps/sch_lab index 2e8c26797..e5600d11a 160000 --- a/apps/sch_lab +++ b/apps/sch_lab @@ -1 +1 @@ -Subproject commit 2e8c26797f2dbed50ad95b7b83b582b077753f9d +Subproject commit e5600d11a30e63347d1aaead24b9d0641a59b6de diff --git a/apps/to_lab b/apps/to_lab index 7e7dc4b5e..2ce817606 160000 --- a/apps/to_lab +++ b/apps/to_lab @@ -1 +1 @@ -Subproject commit 7e7dc4b5e10386ce533fdf890d7e2805cdece38c +Subproject commit 2ce8176067da321365a4fe10ebad889134bf45d8 diff --git a/cfe b/cfe index 84ec281b4..a8f6f8b1e 160000 --- a/cfe +++ b/cfe @@ -1 +1 @@ -Subproject commit 84ec281b4a432db7f41f0814e37fc239c723ad39 +Subproject commit a8f6f8b1eebc6395868755e638e4ef4cc37ecb8f diff --git a/osal b/osal index 33471c7ef..57701dafa 160000 --- a/osal +++ b/osal @@ -1 +1 @@ -Subproject commit 33471c7efa3d4e6a1e3760e0804c79fb21c3de54 +Subproject commit 57701dafa85b96fa696edba46c9fd009348c6d92 diff --git a/psp b/psp index 24450768d..a21a1d854 160000 --- a/psp +++ b/psp @@ -1 +1 @@ -Subproject commit 24450768d270eebbc887513a6e867942482ff730 +Subproject commit a21a1d854324e81c4558a22c95c9eb908076fc11 diff --git a/tools/cFS-GroundSystem b/tools/cFS-GroundSystem index 9cd5304e7..aa15da9d8 160000 --- a/tools/cFS-GroundSystem +++ b/tools/cFS-GroundSystem @@ -1 +1 @@ -Subproject commit 9cd5304e749b0ca24e27f96ac8918dd1a613a65d +Subproject commit aa15da9d84a2e80d44b7ad6400d9832b56eccfd6 diff --git a/tools/elf2cfetbl b/tools/elf2cfetbl index 8f53aee4d..685964d0c 160000 --- a/tools/elf2cfetbl +++ b/tools/elf2cfetbl @@ -1 +1 @@ -Subproject commit 8f53aee4da49f2e432a1ef1396ba5e2df885e733 +Subproject commit 685964d0cc680b4733c59088af119f6646315609 diff --git a/tools/tblCRCTool b/tools/tblCRCTool index c8009d3fa..dbe66347b 160000 --- a/tools/tblCRCTool +++ b/tools/tblCRCTool @@ -1 +1 @@ -Subproject commit c8009d3fa9cc397f1b989df0bac71c6830097a65 +Subproject commit dbe66347b7342fcde32140a8dedefdc0b6d5f2b0 From 054297a7eeb84624f595646f661dcc37aa96cff8 Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" Date: Sat, 25 Jul 2020 15:44:13 -0400 Subject: [PATCH 2/3] HOTFIX IC-20200624, fix sample_defs in gitignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index cadc28456..f54746608 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ Makefile build -sample_defs +/sample_defs From f41ae80cd1bba9e164635c2af728bb35b8e6942c Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" Date: Sun, 26 Jul 2020 00:31:17 -0400 Subject: [PATCH 3/3] IC-20200624, Point submodules to master --- apps/ci_lab | 2 +- apps/sample_app | 2 +- apps/sample_lib | 2 +- apps/sch_lab | 2 +- apps/to_lab | 2 +- cfe | 2 +- osal | 2 +- psp | 2 +- tools/cFS-GroundSystem | 2 +- tools/elf2cfetbl | 2 +- tools/tblCRCTool | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/apps/ci_lab b/apps/ci_lab index 50ce862f6..d305869fd 160000 --- a/apps/ci_lab +++ b/apps/ci_lab @@ -1 +1 @@ -Subproject commit 50ce862f63bab09d6aeceaba55bc07ef6e2c6fb0 +Subproject commit d305869fde6123142e3d3442072b7273293e5c2b diff --git a/apps/sample_app b/apps/sample_app index 2a6b755c6..58e405d0f 160000 --- a/apps/sample_app +++ b/apps/sample_app @@ -1 +1 @@ -Subproject commit 2a6b755c67ccd0c143ca4db54a22796ae0474370 +Subproject commit 58e405d0f540d7a7030ccdb634a4477a795958d3 diff --git a/apps/sample_lib b/apps/sample_lib index e686a20b8..32d2d0114 160000 --- a/apps/sample_lib +++ b/apps/sample_lib @@ -1 +1 @@ -Subproject commit e686a20b83bad0bc3df31fcaac54d972d0154910 +Subproject commit 32d2d01140acfd48709e485e75641461f64b328e diff --git a/apps/sch_lab b/apps/sch_lab index e5600d11a..fdc1ed1a1 160000 --- a/apps/sch_lab +++ b/apps/sch_lab @@ -1 +1 @@ -Subproject commit e5600d11a30e63347d1aaead24b9d0641a59b6de +Subproject commit fdc1ed1a18b12a70f512be6f6b95d0b309024aff diff --git a/apps/to_lab b/apps/to_lab index 2ce817606..5adf513cb 160000 --- a/apps/to_lab +++ b/apps/to_lab @@ -1 +1 @@ -Subproject commit 2ce8176067da321365a4fe10ebad889134bf45d8 +Subproject commit 5adf513cb0211d51e25278258fd2dd9b64d5459a diff --git a/cfe b/cfe index a8f6f8b1e..deeb2942b 160000 --- a/cfe +++ b/cfe @@ -1 +1 @@ -Subproject commit a8f6f8b1eebc6395868755e638e4ef4cc37ecb8f +Subproject commit deeb2942b0766a87d7b399bd8c11c2d5c8deffc0 diff --git a/osal b/osal index 57701dafa..8cfd6fe71 160000 --- a/osal +++ b/osal @@ -1 +1 @@ -Subproject commit 57701dafa85b96fa696edba46c9fd009348c6d92 +Subproject commit 8cfd6fe71a5506be8e463f26d92441785fd3e242 diff --git a/psp b/psp index a21a1d854..e54cd35a0 160000 --- a/psp +++ b/psp @@ -1 +1 @@ -Subproject commit a21a1d854324e81c4558a22c95c9eb908076fc11 +Subproject commit e54cd35a03e970c09e3933dcf15e793ec2e9c4c6 diff --git a/tools/cFS-GroundSystem b/tools/cFS-GroundSystem index aa15da9d8..2cdf1822a 160000 --- a/tools/cFS-GroundSystem +++ b/tools/cFS-GroundSystem @@ -1 +1 @@ -Subproject commit aa15da9d84a2e80d44b7ad6400d9832b56eccfd6 +Subproject commit 2cdf1822a7be5a71ac476f492536d91da7326c3b diff --git a/tools/elf2cfetbl b/tools/elf2cfetbl index 685964d0c..7a3d1cab6 160000 --- a/tools/elf2cfetbl +++ b/tools/elf2cfetbl @@ -1 +1 @@ -Subproject commit 685964d0cc680b4733c59088af119f6646315609 +Subproject commit 7a3d1cab61de365fbc8ff969c6930701220f9578 diff --git a/tools/tblCRCTool b/tools/tblCRCTool index dbe66347b..1b82c5515 160000 --- a/tools/tblCRCTool +++ b/tools/tblCRCTool @@ -1 +1 @@ -Subproject commit dbe66347b7342fcde32140a8dedefdc0b6d5f2b0 +Subproject commit 1b82c551579d4c01f2225b7cda0a0de34cc5e46d