From c4cbe016b38aecfce5d3ceedd4d5ed0582d8ab1a Mon Sep 17 00:00:00 2001 From: lbleier-GSFC Date: Fri, 29 May 2020 10:00:53 -0400 Subject: [PATCH 01/10] Fix #92 - Update lgtm.yml file to exclude Ui files --- .lgtm.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.lgtm.yml b/.lgtm.yml index d794485f8..01e3d8a8a 100644 --- a/.lgtm.yml +++ b/.lgtm.yml @@ -10,6 +10,7 @@ extraction: version: "3" index: include: "tools/cFS-GroundSystem" + exclude: "tools/cFS-GroundSystem/**/Ui_*" cpp: index: build_command: From 6dd632a3dd3d8e7eb428193c2072c4f514184470 Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" Date: Wed, 3 Jun 2020 10:38:53 -0400 Subject: [PATCH 02/10] Update submodules for IC-2020-05-27 --- 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 a5891633b..58c8d0671 160000 --- a/apps/ci_lab +++ b/apps/ci_lab @@ -1 +1 @@ -Subproject commit a5891633bd95edaf3314b98cbab38b1426fd6873 +Subproject commit 58c8d06710d6bc5cac2ce58943bd05154c5d90f2 diff --git a/apps/sample_app b/apps/sample_app index 4b6d54ff6..aa39e2de3 160000 --- a/apps/sample_app +++ b/apps/sample_app @@ -1 +1 @@ -Subproject commit 4b6d54ff6216cc8dd6cceab1dbcd1db21f456f69 +Subproject commit aa39e2de33f67f31a02f19ff294373ac10d65c08 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 dd8d2f72a..491e2cef4 160000 --- a/apps/to_lab +++ b/apps/to_lab @@ -1 +1 @@ -Subproject commit dd8d2f72a493f0b09948c12fd9fcaeea2d8b03c3 +Subproject commit 491e2cef4c8eb7b26173a6668f1f7c42ec164a70 diff --git a/cfe b/cfe index d217ca39f..0cad26986 160000 --- a/cfe +++ b/cfe @@ -1 +1 @@ -Subproject commit d217ca39f1de74695f0d4e0eb427f90fbe8b1156 +Subproject commit 0cad26986c01d4378a9179ab95f7c63e1c7a2ec8 diff --git a/osal b/osal index 360438765..f31171aa8 160000 --- a/osal +++ b/osal @@ -1 +1 @@ -Subproject commit 360438765d7eb83a9e7e15571cda89786f0d8330 +Subproject commit f31171aa8808658d1d3f77b9fb3d8a8852a65d59 diff --git a/psp b/psp index 39760aa35..6e0c7a59d 160000 --- a/psp +++ b/psp @@ -1 +1 @@ -Subproject commit 39760aa35b5bfa2cd58c697af481ec0dbeb7a50a +Subproject commit 6e0c7a59d1c11725c51add75731d356eb53d1134 diff --git a/tools/cFS-GroundSystem b/tools/cFS-GroundSystem index 3263506ae..59409e6ac 160000 --- a/tools/cFS-GroundSystem +++ b/tools/cFS-GroundSystem @@ -1 +1 @@ -Subproject commit 3263506ae0501eb1d7b9aa6e401ed018bb1f5ffa +Subproject commit 59409e6ac56d93b155900ac429b9fc31d4cf21bf diff --git a/tools/elf2cfetbl b/tools/elf2cfetbl index 8f53aee4d..9b8368791 160000 --- a/tools/elf2cfetbl +++ b/tools/elf2cfetbl @@ -1 +1 @@ -Subproject commit 8f53aee4da49f2e432a1ef1396ba5e2df885e733 +Subproject commit 9b83687914c74b599186810ecde91fb33acdbfdb 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 f3b303a433eaafceb39f51cdaf75e1f18f4a2214 Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" Date: Mon, 8 Jun 2020 12:20:55 -0400 Subject: [PATCH 03/10] Update osal for PR #481 --- osal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osal b/osal index f31171aa8..ff44e9f98 160000 --- a/osal +++ b/osal @@ -1 +1 @@ -Subproject commit f31171aa8808658d1d3f77b9fb3d8a8852a65d59 +Subproject commit ff44e9f98541f680484ad260220d2f22abcd24a2 From 2e60b4cd72509cd9b182781533c9447e9fe62276 Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" Date: Mon, 8 Jun 2020 13:59:41 -0400 Subject: [PATCH 04/10] Update sample_app to reflect HOTFIX --- apps/sample_app | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/sample_app b/apps/sample_app index aa39e2de3..3874dbf46 160000 --- a/apps/sample_app +++ b/apps/sample_app @@ -1 +1 @@ -Subproject commit aa39e2de33f67f31a02f19ff294373ac10d65c08 +Subproject commit 3874dbf46bf9f83da0ce329fd2e8ea6c90296dc4 From 8c83a0f04064eaa4a2cf9235b0d1df8e74e35a57 Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" Date: Mon, 8 Jun 2020 14:30:07 -0400 Subject: [PATCH 05/10] Update cFS-GroundSystem to reflect HOTFIX --- tools/cFS-GroundSystem | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/cFS-GroundSystem b/tools/cFS-GroundSystem index 59409e6ac..326b7c5e1 160000 --- a/tools/cFS-GroundSystem +++ b/tools/cFS-GroundSystem @@ -1 +1 @@ -Subproject commit 59409e6ac56d93b155900ac429b9fc31d4cf21bf +Subproject commit 326b7c5e10851603c8f09e0c89452398f4a7f4dd From 8d1c4dbf9a2ff8cea419b5411d780f075e518161 Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" Date: Tue, 9 Jun 2020 22:02:59 -0400 Subject: [PATCH 06/10] Add osal PR#495 to fix race condition --- osal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osal b/osal index ff44e9f98..aca67515d 160000 --- a/osal +++ b/osal @@ -1 +1 @@ -Subproject commit ff44e9f98541f680484ad260220d2f22abcd24a2 +Subproject commit aca67515dc5b67bae83f3b1a1ae7f886710b1f50 From 67304975deb854c78d8bdf6badb21636ebfdc94e Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" Date: Tue, 9 Jun 2020 23:26:56 -0400 Subject: [PATCH 07/10] Update submodules to include version increases --- apps/ci_lab | 2 +- apps/sample_app | 2 +- cfe | 2 +- osal | 2 +- psp | 2 +- tools/cFS-GroundSystem | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/ci_lab b/apps/ci_lab index 58c8d0671..50ce862f6 160000 --- a/apps/ci_lab +++ b/apps/ci_lab @@ -1 +1 @@ -Subproject commit 58c8d06710d6bc5cac2ce58943bd05154c5d90f2 +Subproject commit 50ce862f63bab09d6aeceaba55bc07ef6e2c6fb0 diff --git a/apps/sample_app b/apps/sample_app index 3874dbf46..878a8a3d8 160000 --- a/apps/sample_app +++ b/apps/sample_app @@ -1 +1 @@ -Subproject commit 3874dbf46bf9f83da0ce329fd2e8ea6c90296dc4 +Subproject commit 878a8a3d8ee2c8c90d25a73a56da5f1ddb9dd0bf diff --git a/cfe b/cfe index 0cad26986..767bc55fa 160000 --- a/cfe +++ b/cfe @@ -1 +1 @@ -Subproject commit 0cad26986c01d4378a9179ab95f7c63e1c7a2ec8 +Subproject commit 767bc55fa55095bf228f342c86b97cd42360b703 diff --git a/osal b/osal index aca67515d..28d6865b3 160000 --- a/osal +++ b/osal @@ -1 +1 @@ -Subproject commit aca67515dc5b67bae83f3b1a1ae7f886710b1f50 +Subproject commit 28d6865b3bf0a14a47d947e4f820d7f36a796276 diff --git a/psp b/psp index 6e0c7a59d..9c731523f 160000 --- a/psp +++ b/psp @@ -1 +1 @@ -Subproject commit 6e0c7a59d1c11725c51add75731d356eb53d1134 +Subproject commit 9c731523f9e3b095d7d667059803a9b9476144c8 diff --git a/tools/cFS-GroundSystem b/tools/cFS-GroundSystem index 326b7c5e1..78c576611 160000 --- a/tools/cFS-GroundSystem +++ b/tools/cFS-GroundSystem @@ -1 +1 @@ -Subproject commit 326b7c5e10851603c8f09e0c89452398f4a7f4dd +Subproject commit 78c57661151714cc4bc430279e578a49f567df74 From 84a95e1db9ea5395dc6559bcdd6bce621dc3872a Mon Sep 17 00:00:00 2001 From: Jacob Hageman Date: Wed, 10 Jun 2020 16:17:03 -0400 Subject: [PATCH 08/10] HOTFIX: sample app unit test --- apps/sample_app | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/sample_app b/apps/sample_app index 878a8a3d8..d4a857b7c 160000 --- a/apps/sample_app +++ b/apps/sample_app @@ -1 +1 @@ -Subproject commit 878a8a3d8ee2c8c90d25a73a56da5f1ddb9dd0bf +Subproject commit d4a857b7cb2a544d85563c6d13d2c3dea0310318 From 2b180f5c527584934394aec75360702a27fdd316 Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" Date: Wed, 10 Jun 2020 19:33:26 -0400 Subject: [PATCH 09/10] updates to to_lab and sample_app --- apps/sample_app | 2 +- apps/to_lab | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/sample_app b/apps/sample_app index d4a857b7c..0e0c71c1d 160000 --- a/apps/sample_app +++ b/apps/sample_app @@ -1 +1 @@ -Subproject commit d4a857b7cb2a544d85563c6d13d2c3dea0310318 +Subproject commit 0e0c71c1d68eb76882ceca32a05b9227fd6fe268 diff --git a/apps/to_lab b/apps/to_lab index 491e2cef4..daee6384a 160000 --- a/apps/to_lab +++ b/apps/to_lab @@ -1 +1 @@ -Subproject commit 491e2cef4c8eb7b26173a6668f1f7c42ec164a70 +Subproject commit daee6384ac94571f2d92b5e186d5c3901e8435b5 From 0b3c934226479916ce805717a46ca25bbca4c376 Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" Date: Wed, 10 Jun 2020 21:10:51 -0400 Subject: [PATCH 10/10] Update to master for IC-20200527 --- 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..e4a1bb833 160000 --- a/apps/ci_lab +++ b/apps/ci_lab @@ -1 +1 @@ -Subproject commit 50ce862f63bab09d6aeceaba55bc07ef6e2c6fb0 +Subproject commit e4a1bb83357c25fac89a5c7fc240a925ecd66094 diff --git a/apps/sample_app b/apps/sample_app index 0e0c71c1d..4a4b8e281 160000 --- a/apps/sample_app +++ b/apps/sample_app @@ -1 +1 @@ -Subproject commit 0e0c71c1d68eb76882ceca32a05b9227fd6fe268 +Subproject commit 4a4b8e281802f244a2facdcb3c32238751c678f3 diff --git a/apps/sample_lib b/apps/sample_lib index e686a20b8..14710ac0d 160000 --- a/apps/sample_lib +++ b/apps/sample_lib @@ -1 +1 @@ -Subproject commit e686a20b83bad0bc3df31fcaac54d972d0154910 +Subproject commit 14710ac0d777e40d5673d61b0fa6cc54c68200d3 diff --git a/apps/sch_lab b/apps/sch_lab index e5600d11a..2e8c26797 160000 --- a/apps/sch_lab +++ b/apps/sch_lab @@ -1 +1 @@ -Subproject commit e5600d11a30e63347d1aaead24b9d0641a59b6de +Subproject commit 2e8c26797f2dbed50ad95b7b83b582b077753f9d diff --git a/apps/to_lab b/apps/to_lab index daee6384a..00f703e94 160000 --- a/apps/to_lab +++ b/apps/to_lab @@ -1 +1 @@ -Subproject commit daee6384ac94571f2d92b5e186d5c3901e8435b5 +Subproject commit 00f703e94ab3b8846b7f7cf89ad309f1d7e31365 diff --git a/cfe b/cfe index 767bc55fa..ad2190af9 160000 --- a/cfe +++ b/cfe @@ -1 +1 @@ -Subproject commit 767bc55fa55095bf228f342c86b97cd42360b703 +Subproject commit ad2190af9a2b40c9b9d0f3b88f601e931ad4059d diff --git a/osal b/osal index 28d6865b3..07fd02282 160000 --- a/osal +++ b/osal @@ -1 +1 @@ -Subproject commit 28d6865b3bf0a14a47d947e4f820d7f36a796276 +Subproject commit 07fd02282b251f8065d85aaffb2a3c2bf9d0e6f9 diff --git a/psp b/psp index 9c731523f..4703df284 160000 --- a/psp +++ b/psp @@ -1 +1 @@ -Subproject commit 9c731523f9e3b095d7d667059803a9b9476144c8 +Subproject commit 4703df284632415b8053bf16ce93f89f9a78eb31 diff --git a/tools/cFS-GroundSystem b/tools/cFS-GroundSystem index 78c576611..52f706bf5 160000 --- a/tools/cFS-GroundSystem +++ b/tools/cFS-GroundSystem @@ -1 +1 @@ -Subproject commit 78c57661151714cc4bc430279e578a49f567df74 +Subproject commit 52f706bf50741da2f0523f340ec6d7e1e27e9ff9 diff --git a/tools/elf2cfetbl b/tools/elf2cfetbl index 9b8368791..8f53aee4d 160000 --- a/tools/elf2cfetbl +++ b/tools/elf2cfetbl @@ -1 +1 @@ -Subproject commit 9b83687914c74b599186810ecde91fb33acdbfdb +Subproject commit 8f53aee4da49f2e432a1ef1396ba5e2df885e733 diff --git a/tools/tblCRCTool b/tools/tblCRCTool index dbe66347b..c8009d3fa 160000 --- a/tools/tblCRCTool +++ b/tools/tblCRCTool @@ -1 +1 @@ -Subproject commit dbe66347b7342fcde32140a8dedefdc0b6d5f2b0 +Subproject commit c8009d3fa9cc397f1b989df0bac71c6830097a65