Merge pull request nasa#38 from nasa/ic-20200304

Integration Candidate 20200304
jphickey · Mar 12, 2020 · 44d8fde · 44d8fde
2 parents 612bdfc + adf222c
commit 44d8fde
Show file tree

Hide file tree

Showing 7 changed files with 222 additions and 716 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,6 @@
+os: linux
 dist: bionic
-sudo: required
-language:
-  - c
+language: c
 compiler:
   - gcc
 addons:
@@ -16,7 +15,7 @@ before_install:
   - 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://apt.llvm.org/bionic/   llvm-toolchain-bionic  main'
+  - sudo add-apt-repository 'deb http://apt.llvm.org/bionic/   llvm-toolchain-bionic-10 main'
   - sudo apt-get update
   - sudo apt-get install clang-format-10
   - clang-format-10 --version

diff --git a/fsw/mission_inc/ci_lab_perfids.h b/fsw/mission_inc/ci_lab_perfids.h
@@ -29,8 +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_LAB_MAIN_TASK_PERF_ID  32
+#define CI_LAB_SOCKET_RCV_PERF_ID 33
 
 #endif /* _ci_lab_perfids_h_ */