Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

IC 20200304 #38

Merged
merged 10 commits into from
Mar 12, 2020
Merged

IC 20200304 #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1980588
Fix #27: Remove CFDP PDU introspection from CI_LAB
jphickey Feb 7, 2020
1f1c178
Fix #23: Use OSAL Socket API for bind/receive
jphickey Feb 7, 2020
484412c
Fix #34: Follow recommended patterns for message handling
jphickey Feb 7, 2020
a9c51f1
Fix #36: Add CI_LAB namespace to all identifiers
jphickey Feb 8, 2020
07a7077
Update #35, Fix comment on function header
jphickey Mar 9, 2020
87c736e
Merge pull request #35 from jphickey/fix-23-27-34-ci-lab-cleanup
astrogeco Mar 9, 2020
9e2abf3
Fix clang-format 10 apt-get repository
astrogeco Mar 10, 2020
6cf5a57
Fix travis ci keys
astrogeco Mar 10, 2020
e61830f
Update #40, rerun clang-format on CI_LAB FSW code
jphickey Mar 10, 2020
adf222c
Merge pull request #40 from astrogeco/fix39-clang-format-10-fails
astrogeco Mar 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
os: linux
dist: bionic
sudo: required
language:
- c
language: c
compiler:
- gcc
addons:
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions fsw/mission_inc/ci_lab_perfids.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_ */

Expand Down
Loading