Merge pull request nasa#31 from nasa/ic-20200108

Integration Candidate 20200108

.travis.yml

@@ -0,0 +1,40 @@
+dist: bionic
+sudo: required
+language:
+ - c
+compiler:
+ - gcc
+addons:
+ apt:
+ sources:
+ - ubuntu-toolchain-r-test
+ packages:
+ - cmake
+
+before_install:
+ - sudo apt-get install cppcheck
+ - cppcheck --version
+ # for clang-format 10
+ - wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
+ - sudo add-apt-repository 'deb http:https://apt.llvm.org/bionic/ llvm-toolchain-bionic main'
+ - sudo apt-get update
+ - sudo apt-get install clang-format-10
+ - clang-format-10 --version
+
+
+script:
+ # Get bundle (doesn't populate submodules, not needed for style enforcement)
+ - cd ..
+ - git clone https://github.com/nasa/cFS.git
+ - mv ci_lab cFS/apps
+ - cd cFS/apps/ci_lab
+ # Enforce formatting
+ - find . -name "*.[ch]" -exec clang-format-10 -i -style=file {} +
+ - git diff > style_differences.txt
+ - |
+ if [[ -s style_differences.txt ]]; then
+ echo "You must fix style differences before submitting a pull request"
+ echo ""
+ cat style_differences.txt
+ exit -1
+ fi

fsw/mission_inc/ci_lab_perfids.h

@@ -18,9 +18,9 @@
 ** See the License for the specific language governing permissions and
 ** limitations under the License.
 **
-** File: ci_lab_perfids.h 
+** File: ci_lab_perfids.h
 **
-** Purpose: 
+** Purpose:
 ** Define CI Lab Performance IDs
 **
 ** Notes:
@@ -29,9 +29,8 @@
 #ifndef _ci_lab_perfids_h_
 #define _ci_lab_perfids_h_
 
-
-#define CI_MAIN_TASK_PERF_ID 32
-#define CI_SOCKET_RCV_PERF_ID 33
+#define CI_MAIN_TASK_PERF_ID 32
+#define CI_SOCKET_RCV_PERF_ID 33
 
 #endif /* _ci_lab_perfids_h_ */
 

fsw/platform_inc/ci_lab_msgids.h

@@ -20,7 +20,7 @@
 **
 ** File: ci_lab_msgids.h
 **
-** Purpose: 
+** Purpose:
 ** Define CI Lab Message IDs
 **
 ** Notes:
@@ -29,11 +29,10 @@
 #ifndef _ci_lab_msgids_h_
 #define _ci_lab_msgids_h_
 
+#define CI_LAB_CMD_MID 0x1884
+#define CI_LAB_SEND_HK_MID 0x1885
 
-#define CI_LAB_CMD_MID 0x1884
-#define CI_LAB_SEND_HK_MID 0x1885
-
-#define CI_LAB_HK_TLM_MID 0x0884
+#define CI_LAB_HK_TLM_MID 0x0884
 
 #endif /* _ci_lab_msgids_h_ */