From 8f50be202ab7ab739a15fad0cfdeb5b42deb84ce Mon Sep 17 00:00:00 2001 From: Jacob Hageman Date: Sat, 23 May 2020 11:10:02 -0400 Subject: [PATCH 1/8] Fix #88, Only inline empty functions --- .clang-format | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.clang-format b/.clang-format index 2a9c7c7b2..b1c8cdf81 100755 --- a/.clang-format +++ b/.clang-format @@ -11,7 +11,7 @@ AlignTrailingComments: true AllowAllParametersOfDeclarationOnNextLine: true AllowShortBlocksOnASingleLine: Empty AllowShortCaseLabelsOnASingleLine: false -AllowShortFunctionsOnASingleLine: All +AllowShortFunctionsOnASingleLine: Empty AllowShortIfStatementsOnASingleLine: false AllowShortLoopsOnASingleLine: false AlwaysBreakAfterReturnType: None From 35b27b5959f8530ca330bae6a0c5ead59a474fde Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" Date: Wed, 27 May 2020 00:16:04 -0400 Subject: [PATCH 2/8] Update all submodules to integration-candidate for IC-2020-05-20 --- apps/ci_lab | 2 +- apps/sample_app | 2 +- apps/sch_lab | 2 +- apps/to_lab | 2 +- cfe | 2 +- osal | 2 +- psp | 2 +- tools/cFS-GroundSystem | 2 +- tools/elf2cfetbl | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/apps/ci_lab b/apps/ci_lab index a5891633b..197b3109c 160000 --- a/apps/ci_lab +++ b/apps/ci_lab @@ -1 +1 @@ -Subproject commit a5891633bd95edaf3314b98cbab38b1426fd6873 +Subproject commit 197b3109ca5948a0113a5f867ef1ebbc33fbf36d diff --git a/apps/sample_app b/apps/sample_app index 4b6d54ff6..6c3972be2 160000 --- a/apps/sample_app +++ b/apps/sample_app @@ -1 +1 @@ -Subproject commit 4b6d54ff6216cc8dd6cceab1dbcd1db21f456f69 +Subproject commit 6c3972be270efa336e3549ef3b444e33318d354c diff --git a/apps/sch_lab b/apps/sch_lab index 27a2bd71f..1af439df9 160000 --- a/apps/sch_lab +++ b/apps/sch_lab @@ -1 +1 @@ -Subproject commit 27a2bd71fcc3b21eeb17d88cc1524d1a792ec5da +Subproject commit 1af439df9616c34655124c33fd5422df1934045c diff --git a/apps/to_lab b/apps/to_lab index b0e577a9d..b9b76e211 160000 --- a/apps/to_lab +++ b/apps/to_lab @@ -1 +1 @@ -Subproject commit b0e577a9d5afd48d8cb7cd8b528bc998df883a0a +Subproject commit b9b76e21173becef7ac9f906068322f9b8cea966 diff --git a/cfe b/cfe index d217ca39f..31659cc31 160000 --- a/cfe +++ b/cfe @@ -1 +1 @@ -Subproject commit d217ca39f1de74695f0d4e0eb427f90fbe8b1156 +Subproject commit 31659cc311d09418ef6680b9631d9dfddc4df16e diff --git a/osal b/osal index 3597aafd4..5f910f755 160000 --- a/osal +++ b/osal @@ -1 +1 @@ -Subproject commit 3597aafd4b335458fb582c4258204ec593d8f190 +Subproject commit 5f910f7553630a053db16458add49b2f86a62861 diff --git a/psp b/psp index 37ee8eb2d..87542326b 160000 --- a/psp +++ b/psp @@ -1 +1 @@ -Subproject commit 37ee8eb2d7ce006dc1570b920ae75a7ac5f89d27 +Subproject commit 87542326b0546bf8def573b1061cfeb34d6bee21 diff --git a/tools/cFS-GroundSystem b/tools/cFS-GroundSystem index 5c1437574..b7b7ad1f8 160000 --- a/tools/cFS-GroundSystem +++ b/tools/cFS-GroundSystem @@ -1 +1 @@ -Subproject commit 5c14375741732382cf0b635073b0b3aab25cdca8 +Subproject commit b7b7ad1f814775f559c862aaac79e0fa0f8ea70c diff --git a/tools/elf2cfetbl b/tools/elf2cfetbl index 8e54e26f2..340b32a20 160000 --- a/tools/elf2cfetbl +++ b/tools/elf2cfetbl @@ -1 +1 @@ -Subproject commit 8e54e26f24419e0218587574ec717106937e59fe +Subproject commit 340b32a20d76b2aa529451fb8f8c7fab2a497c6f From 964edfb5f2a9b286f17bc4e4c7965d8d6ccfeb2f Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" Date: Wed, 27 May 2020 10:30:04 -0400 Subject: [PATCH 3/8] Update for osal PR#478 and psp PR #163 --- osal | 2 +- psp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/osal b/osal index 5f910f755..5c8a01c13 160000 --- a/osal +++ b/osal @@ -1 +1 @@ -Subproject commit 5f910f7553630a053db16458add49b2f86a62861 +Subproject commit 5c8a01c1335d09a18a5a335d584e180182822525 diff --git a/psp b/psp index 87542326b..bb9c39c14 160000 --- a/psp +++ b/psp @@ -1 +1 @@ -Subproject commit 87542326b0546bf8def573b1061cfeb34d6bee21 +Subproject commit bb9c39c14ae49ca453c07f044abb83717faa7d75 From ebbf5fe2d025f0971e78279f4c422a409932fb1e Mon Sep 17 00:00:00 2001 From: Joseph Hickey Date: Thu, 28 May 2020 10:52:13 -0400 Subject: [PATCH 4/8] Update OSAL with fix for documentation warning --- osal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osal b/osal index 5c8a01c13..f768a4303 160000 --- a/osal +++ b/osal @@ -1 +1 @@ -Subproject commit 5c8a01c1335d09a18a5a335d584e180182822525 +Subproject commit f768a430368b997a2ed32900157cce3f58a39fb3 From bef86a77e9de84accfd5ebbeaf8f4dd4208329ad Mon Sep 17 00:00:00 2001 From: Joseph Hickey Date: Thu, 28 May 2020 13:36:48 -0400 Subject: [PATCH 5/8] Update OSAL with merge fix --- osal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osal b/osal index f768a4303..ce45c3191 160000 --- a/osal +++ b/osal @@ -1 +1 @@ -Subproject commit f768a430368b997a2ed32900157cce3f58a39fb3 +Subproject commit ce45c31917412ed5174ac7bbcde8ba3379eca9d1 From 336aa5da81a2a8f9eff647080d589139a9114da4 Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" Date: Thu, 28 May 2020 17:31:37 -0400 Subject: [PATCH 6/8] Updates to submodules for FastTracked changes and osal PR #461 --- apps/sample_lib | 2 +- apps/sch_lab | 2 +- apps/to_lab | 2 +- osal | 2 +- tools/elf2cfetbl | 2 +- tools/tblCRCTool | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/sample_lib b/apps/sample_lib index 20f913532..553cf722b 160000 --- a/apps/sample_lib +++ b/apps/sample_lib @@ -1 +1 @@ -Subproject commit 20f9135329850c49ecca2661facaad8a10fd1dfa +Subproject commit 553cf722b42977dd5217d7c423c07eb37bc21175 diff --git a/apps/sch_lab b/apps/sch_lab index 1af439df9..6159db337 160000 --- a/apps/sch_lab +++ b/apps/sch_lab @@ -1 +1 @@ -Subproject commit 1af439df9616c34655124c33fd5422df1934045c +Subproject commit 6159db337bbb61f7e7453de4ed02c4e936b97c7b diff --git a/apps/to_lab b/apps/to_lab index b9b76e211..ee62526a3 160000 --- a/apps/to_lab +++ b/apps/to_lab @@ -1 +1 @@ -Subproject commit b9b76e21173becef7ac9f906068322f9b8cea966 +Subproject commit ee62526a3bf36cab529da1b808b44554790531c3 diff --git a/osal b/osal index ce45c3191..922df4f1a 160000 --- a/osal +++ b/osal @@ -1 +1 @@ -Subproject commit ce45c31917412ed5174ac7bbcde8ba3379eca9d1 +Subproject commit 922df4f1a2d17c32e7890f139e8755d866bd6008 diff --git a/tools/elf2cfetbl b/tools/elf2cfetbl index 340b32a20..aeb0d16f2 160000 --- a/tools/elf2cfetbl +++ b/tools/elf2cfetbl @@ -1 +1 @@ -Subproject commit 340b32a20d76b2aa529451fb8f8c7fab2a497c6f +Subproject commit aeb0d16f281e8e38236e4a5e7d26687400372f5d diff --git a/tools/tblCRCTool b/tools/tblCRCTool index 8d7e94a45..723ad4132 160000 --- a/tools/tblCRCTool +++ b/tools/tblCRCTool @@ -1 +1 @@ -Subproject commit 8d7e94a451010527f02e0daecdbe0c00e12c1768 +Subproject commit 723ad41328469d1282d0fe90d7bc0e8e139f4ea3 From 8a25c3336b2bca974fa2d5f2136b7ea60b6ae81d Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" Date: Fri, 29 May 2020 18:29:43 -0400 Subject: [PATCH 7/8] Update version numbers in submodules --- apps/sample_lib | 2 +- apps/sch_lab | 2 +- apps/to_lab | 2 +- osal | 2 +- psp | 2 +- tools/cFS-GroundSystem | 2 +- tools/elf2cfetbl | 2 +- tools/tblCRCTool | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/apps/sample_lib b/apps/sample_lib index 553cf722b..e686a20b8 160000 --- a/apps/sample_lib +++ b/apps/sample_lib @@ -1 +1 @@ -Subproject commit 553cf722b42977dd5217d7c423c07eb37bc21175 +Subproject commit e686a20b83bad0bc3df31fcaac54d972d0154910 diff --git a/apps/sch_lab b/apps/sch_lab index 6159db337..e5600d11a 160000 --- a/apps/sch_lab +++ b/apps/sch_lab @@ -1 +1 @@ -Subproject commit 6159db337bbb61f7e7453de4ed02c4e936b97c7b +Subproject commit e5600d11a30e63347d1aaead24b9d0641a59b6de diff --git a/apps/to_lab b/apps/to_lab index ee62526a3..8b282436d 160000 --- a/apps/to_lab +++ b/apps/to_lab @@ -1 +1 @@ -Subproject commit ee62526a3bf36cab529da1b808b44554790531c3 +Subproject commit 8b282436db58e3fc0d07255e33c01abfa2c84db7 diff --git a/osal b/osal index 922df4f1a..ffe100d04 160000 --- a/osal +++ b/osal @@ -1 +1 @@ -Subproject commit 922df4f1a2d17c32e7890f139e8755d866bd6008 +Subproject commit ffe100d048cd7542cd458fbc93316a4da25f7195 diff --git a/psp b/psp index bb9c39c14..0b64c95a7 160000 --- a/psp +++ b/psp @@ -1 +1 @@ -Subproject commit bb9c39c14ae49ca453c07f044abb83717faa7d75 +Subproject commit 0b64c95a7c7e4f576390607fc8a1d1486043c46c diff --git a/tools/cFS-GroundSystem b/tools/cFS-GroundSystem index b7b7ad1f8..d298b9cc0 160000 --- a/tools/cFS-GroundSystem +++ b/tools/cFS-GroundSystem @@ -1 +1 @@ -Subproject commit b7b7ad1f814775f559c862aaac79e0fa0f8ea70c +Subproject commit d298b9cc0273ab6f31a0874765ec094b24f2ea43 diff --git a/tools/elf2cfetbl b/tools/elf2cfetbl index aeb0d16f2..9b8368791 160000 --- a/tools/elf2cfetbl +++ b/tools/elf2cfetbl @@ -1 +1 @@ -Subproject commit aeb0d16f281e8e38236e4a5e7d26687400372f5d +Subproject commit 9b83687914c74b599186810ecde91fb33acdbfdb diff --git a/tools/tblCRCTool b/tools/tblCRCTool index 723ad4132..dbe66347b 160000 --- a/tools/tblCRCTool +++ b/tools/tblCRCTool @@ -1 +1 @@ -Subproject commit 723ad41328469d1282d0fe90d7bc0e8e139f4ea3 +Subproject commit dbe66347b7342fcde32140a8dedefdc0b6d5f2b0 From 2dcaa615f8de0b0c884ac2798134ad5306414665 Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" Date: Fri, 29 May 2020 18:50:06 -0400 Subject: [PATCH 8/8] Point submodules to master branches after merging Integrastion Candidate 2020-05-20 --- 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 197b3109c..a5891633b 160000 --- a/apps/ci_lab +++ b/apps/ci_lab @@ -1 +1 @@ -Subproject commit 197b3109ca5948a0113a5f867ef1ebbc33fbf36d +Subproject commit a5891633bd95edaf3314b98cbab38b1426fd6873 diff --git a/apps/sample_app b/apps/sample_app index 6c3972be2..4b6d54ff6 160000 --- a/apps/sample_app +++ b/apps/sample_app @@ -1 +1 @@ -Subproject commit 6c3972be270efa336e3549ef3b444e33318d354c +Subproject commit 4b6d54ff6216cc8dd6cceab1dbcd1db21f456f69 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 8b282436d..dd8d2f72a 160000 --- a/apps/to_lab +++ b/apps/to_lab @@ -1 +1 @@ -Subproject commit 8b282436db58e3fc0d07255e33c01abfa2c84db7 +Subproject commit dd8d2f72a493f0b09948c12fd9fcaeea2d8b03c3 diff --git a/cfe b/cfe index 31659cc31..d217ca39f 160000 --- a/cfe +++ b/cfe @@ -1 +1 @@ -Subproject commit 31659cc311d09418ef6680b9631d9dfddc4df16e +Subproject commit d217ca39f1de74695f0d4e0eb427f90fbe8b1156 diff --git a/osal b/osal index ffe100d04..360438765 160000 --- a/osal +++ b/osal @@ -1 +1 @@ -Subproject commit ffe100d048cd7542cd458fbc93316a4da25f7195 +Subproject commit 360438765d7eb83a9e7e15571cda89786f0d8330 diff --git a/psp b/psp index 0b64c95a7..39760aa35 160000 --- a/psp +++ b/psp @@ -1 +1 @@ -Subproject commit 0b64c95a7c7e4f576390607fc8a1d1486043c46c +Subproject commit 39760aa35b5bfa2cd58c697af481ec0dbeb7a50a diff --git a/tools/cFS-GroundSystem b/tools/cFS-GroundSystem index d298b9cc0..3263506ae 160000 --- a/tools/cFS-GroundSystem +++ b/tools/cFS-GroundSystem @@ -1 +1 @@ -Subproject commit d298b9cc0273ab6f31a0874765ec094b24f2ea43 +Subproject commit 3263506ae0501eb1d7b9aa6e401ed018bb1f5ffa 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