Skip to content

Commit c8f3da7

Browse files
marinagmoreiramarinagmoreira
authored
Release 0.13.0 (#105)
1 parent bb0fc3e commit c8f3da7

File tree

305 files changed

+12249
-3952
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

305 files changed

+12249
-3952
lines changed

‎.clang-format

Lines changed: 151 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,151 @@
1+
---
2+
Language: Cpp
3+
# BasedOnStyle: Google
4+
AccessModifierOffset: -1
5+
AlignAfterOpenBracket: Align
6+
AlignConsecutiveAssignments: false
7+
AlignConsecutiveDeclarations: false
8+
AlignEscapedNewlines: Left
9+
AlignOperands: true
10+
AlignTrailingComments: true
11+
AllowAllParametersOfDeclarationOnNextLine: true
12+
AllowShortBlocksOnASingleLine: false
13+
AllowShortCaseLabelsOnASingleLine: false
14+
AllowShortFunctionsOnASingleLine: All
15+
AllowShortIfStatementsOnASingleLine: true
16+
AllowShortLoopsOnASingleLine: true
17+
AlwaysBreakAfterDefinitionReturnType: None
18+
AlwaysBreakAfterReturnType: None
19+
AlwaysBreakBeforeMultilineStrings: true
20+
AlwaysBreakTemplateDeclarations: Yes
21+
BinPackArguments: true
22+
BinPackParameters: true
23+
BraceWrapping:
24+
AfterClass: false
25+
AfterControlStatement: false
26+
AfterEnum: false
27+
AfterFunction: false
28+
AfterNamespace: false
29+
AfterObjCDeclaration: false
30+
AfterStruct: false
31+
AfterUnion: false
32+
AfterExternBlock: false
33+
BeforeCatch: false
34+
BeforeElse: false
35+
IndentBraces: false
36+
SplitEmptyFunction: true
37+
SplitEmptyRecord: true
38+
SplitEmptyNamespace: true
39+
BreakBeforeBinaryOperators: None
40+
BreakBeforeBraces: Attach
41+
BreakBeforeInheritanceComma: false
42+
BreakInheritanceList: BeforeColon
43+
BreakBeforeTernaryOperators: true
44+
BreakConstructorInitializersBeforeComma: false
45+
BreakConstructorInitializers: BeforeColon
46+
BreakAfterJavaFieldAnnotations: false
47+
BreakStringLiterals: true
48+
ColumnLimit: 120 # changed
49+
CommentPragmas: '^ IWYU pragma:'
50+
CompactNamespaces: false
51+
ConstructorInitializerAllOnOneLineOrOnePerLine: true
52+
ConstructorInitializerIndentWidth: 4
53+
ContinuationIndentWidth: 2 # changed
54+
Cpp11BracedListStyle: true
55+
DerivePointerAlignment: false # changed
56+
DisableFormat: false
57+
ExperimentalAutoDetectBinPacking: false
58+
FixNamespaceComments: true
59+
ForEachMacros:
60+
- foreach
61+
- Q_FOREACH
62+
- BOOST_FOREACH
63+
IncludeBlocks: Preserve
64+
IncludeCategories:
65+
- Regex: '^<ext/.*\.h>'
66+
Priority: 2
67+
- Regex: '^<.*\.h>'
68+
Priority: 1
69+
- Regex: '^<.*'
70+
Priority: 2
71+
- Regex: '.*'
72+
Priority: 3
73+
IncludeIsMainRegex: '([-_](test|unittest))?$'
74+
IndentCaseLabels: true
75+
IndentPPDirectives: None
76+
IndentWidth: 2
77+
IndentWrappedFunctionNames: false
78+
JavaScriptQuotes: Leave
79+
JavaScriptWrapImports: true
80+
KeepEmptyLinesAtTheStartOfBlocks: false
81+
MacroBlockBegin: ''
82+
MacroBlockEnd: ''
83+
MaxEmptyLinesToKeep: 1
84+
NamespaceIndentation: None
85+
ObjCBinPackProtocolList: Never
86+
ObjCBlockIndentWidth: 2
87+
ObjCSpaceAfterProperty: false
88+
ObjCSpaceBeforeProtocolList: true
89+
PenaltyBreakAssignment: 2
90+
PenaltyBreakBeforeFirstCallParameter: 1
91+
PenaltyBreakComment: 300
92+
PenaltyBreakFirstLessLess: 120
93+
PenaltyBreakString: 1000
94+
PenaltyBreakTemplateDeclaration: 10
95+
PenaltyExcessCharacter: 1000000
96+
PenaltyReturnTypeOnItsOwnLine: 200
97+
PointerAlignment: Left
98+
RawStringFormats:
99+
- Language: Cpp
100+
Delimiters:
101+
- cc
102+
- CC
103+
- cpp
104+
- Cpp
105+
- CPP
106+
- 'c++'
107+
- 'C++'
108+
CanonicalDelimiter: ''
109+
BasedOnStyle: google
110+
- Language: TextProto
111+
Delimiters:
112+
- pb
113+
- PB
114+
- proto
115+
- PROTO
116+
EnclosingFunctions:
117+
- EqualsProto
118+
- EquivToProto
119+
- PARSE_PARTIAL_TEXT_PROTO
120+
- PARSE_TEST_PROTO
121+
- PARSE_TEXT_PROTO
122+
- ParseTextOrDie
123+
- ParseTextProtoOrDie
124+
CanonicalDelimiter: ''
125+
BasedOnStyle: google
126+
ReflowComments: true
127+
SortIncludes: false # changed
128+
SortUsingDeclarations: true
129+
SpaceAfterCStyleCast: false
130+
SpaceAfterTemplateKeyword: true
131+
SpaceBeforeAssignmentOperators: true
132+
SpaceBeforeCpp11BracedList: false
133+
SpaceBeforeCtorInitializerColon: true
134+
SpaceBeforeInheritanceColon: true
135+
SpaceBeforeParens: ControlStatements
136+
SpaceBeforeRangeBasedForLoopColon: true
137+
SpaceInEmptyParentheses: false
138+
SpacesBeforeTrailingComments: 2
139+
SpacesInAngles: false
140+
SpacesInContainerLiterals: true
141+
SpacesInCStyleCastParentheses: false
142+
SpacesInParentheses: false
143+
SpacesInSquareBrackets: false
144+
Standard: Auto
145+
StatementMacros:
146+
- Q_UNUSED
147+
- QT_REQUIRE_VERSION
148+
TabWidth: 8
149+
UseTab: Never
150+
...
151+

‎.dockerignore

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,6 @@
11
.git/
2-
scripts/setup/Dockerfile
2+
scripts/docker/
3+
submodules/android/
4+
submodules/avionics/
5+
submodules/common/
6+
submodules/platform/

‎.github/workflows/build_and_test.yml

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
name: Docker Image CI
2+
3+
on:
4+
push:
5+
branches: [ 'master', 'develop' ]
6+
pull_request:
7+
branches: [ 'master', 'develop' ]
8+
9+
jobs:
10+
11+
build-kinetic:
12+
13+
runs-on: ubuntu-16.04
14+
15+
steps:
16+
- uses: actions/checkout@v2
17+
18+
- name: Checkout submodule
19+
run: git submodule update --init --depth 1 description/media
20+
21+
- name: Build code for Ubuntu 16
22+
run: docker build . -f ./scripts/docker/astrobee_kinetic.Dockerfile -t astrobee/astrobee:latest-kinetic
23+
24+
- name: Test code
25+
run: docker build . -f ./scripts/docker/test_astrobee_kinetic.Dockerfile -t test
26+
27+
build-melodic:
28+
29+
runs-on: ubuntu-18.04
30+
31+
steps:
32+
- uses: actions/checkout@v2
33+
34+
- name: Checkout submodule
35+
run: git submodule update --init --depth 1 description/media
36+
37+
- name: Build code for Ubuntu 18
38+
run: docker build . -f ./scripts/docker/astrobee_melodic.Dockerfile -t astrobee/astrobee:latest-melodic
39+
40+
- name: Test code
41+
run: docker build . -f ./scripts/docker/test_astrobee_melodic.Dockerfile -t test

‎.github/workflows/docs.yaml

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
# Build documentation and commit to gh-pages branch.
2+
3+
name: Build and Push Documentation to gh-pages Branch
4+
5+
on:
6+
push:
7+
branches: ['develop']
8+
9+
jobs:
10+
build_and_push_docs:
11+
runs-on: ubuntu-latest
12+
13+
steps:
14+
- name: Checkout
15+
uses: actions/checkout@v2
16+
with:
17+
path: repo/
18+
- name: Checkout gh-pages
19+
uses: actions/checkout@v2
20+
with:
21+
path: docs/
22+
ref: gh-pages
23+
- name: Install dependencies
24+
run: |
25+
sudo apt-get install python-bson
26+
sudo apt-get install flex
27+
sudo apt-get install graphviz
28+
- name: Install doxygen
29+
run: |
30+
wget 'https://sourceforge.net/projects/doxygen/files/rel-1.8.20/doxygen-1.8.20.src.tar.gz'
31+
tar -zxvf doxygen-1.8.20.src.tar.gz
32+
cd doxygen-1.8.20
33+
mkdir build
34+
cd build
35+
cmake -G "Unix Makefiles" ..
36+
make
37+
sudo make install
38+
- name: install xgds_planner2
39+
run: |
40+
sudo pip install iso8601
41+
sudo pip install "django<2"
42+
git clone https://github.com/geocam/geocamUtilWeb.git
43+
cd geocamUtilWeb
44+
sudo python setup.py install
45+
cd ..
46+
git clone https://github.com/xgds/xgds_planner2.git
47+
cd xgds_planner2
48+
sudo python setup.py install
49+
- name: Generating command dictionary documentation
50+
run: |
51+
cd repo
52+
mkdir doc/html
53+
./scripts/build/genCommandDictionary.py astrobee/commands/freeFlyerPlanSchema.json doc/html/AstrobeeCommandDictionary.html
54+
- name: Build Documentation
55+
run: |
56+
cd repo/doc/diagrams/ && make && cd ../..
57+
doxygen astrobee.doxyfile
58+
cd ..
59+
- name: Replace old documentation with new
60+
run: |
61+
rm -r docs/html
62+
cp -r repo/doc/html docs
63+
- name: Commit and Push
64+
run: |
65+
cd docs
66+
git add --all html/
67+
EMAIL=`git show -s --format='%ae' HEAD`
68+
NAME=`git show -s --format='%an' HEAD`
69+
git config user.email "$EMAIL"
70+
git config user.name "$NAME"
71+
{ git commit -m "Automatic update for $GITHUB_SHA." || true; }
72+
git push origin gh-pages

‎.github/workflows/lint.yaml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# Check for lint error and auto correct them
2+
3+
name: Check for lint errors
4+
5+
on: ['push', 'pull_request']
6+
7+
jobs:
8+
lint_check:
9+
runs-on: ubuntu-latest
10+
11+
steps:
12+
- uses: actions/checkout@v2
13+
- name: Check repo for lint errors
14+
run: ./scripts/git/cpplint_repo.py .

‎.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ astrobee/config/dds
8080
#zones bin
8181
astrobee/zones/*.bin
8282
/description/*.tar.gz
83-
/description/media
8483
/localization/vive_localization/src/ukf
8584

8685
# catkin

‎.gitmodules

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1-
[submodule "submodules/common"]
2-
path = submodules/common
3-
url = https://babelfish.arc.nasa.gov/bitbucket/scm/astrobee/astrobee_common.git
41
[submodule "submodules/android"]
52
path = submodules/android
6-
url = https://babelfish.arc.nasa.gov/bitbucket/scm/astrobee/astrobee_android.git
3+
url = https://github.com/nasa/astrobee_android.git
74
[submodule "submodules/avionics"]
85
path = submodules/avionics
96
url = https://babelfish.arc.nasa.gov/bitbucket/scm/astrobee/astrobee_avionics.git
107
[submodule "submodules/platform"]
118
path = submodules/platform
129
url = https://babelfish.arc.nasa.gov/bitbucket/scm/astrobee/astrobee_platform.git
10+
[submodule "description/media"]
11+
path = description/media
12+
url = https://github.com/nasa/astrobee_media.git
13+
shallow = true

0 commit comments

Comments
 (0)