Skip to content

Commit 1144343

Browse files
author
Guhan Iyer
committed
Merge remote-tracking branch 'origin/main' into guhan/isr-logging
2 parents e5417b6 + 43e8b97 commit 1144343

File tree

899 files changed

+25201
-2428
lines changed

Some content is hidden

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

899 files changed

+25201
-2428
lines changed

‎.cproject‎

Lines changed: 42 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,54 @@
3838
</storageModule>
3939
<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
4040
</cconfiguration>
41+
<cconfiguration id="0.1926137277">
42+
<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="0.1926137277" moduleId="org.eclipse.cdt.core.settings" name="Default">
43+
<externalSettings/>
44+
<extensions>
45+
<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
46+
<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
47+
<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
48+
<extension id="org.eclipse.cdt.core.VCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
49+
<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
50+
<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
51+
</extensions>
52+
</storageModule>
53+
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
54+
<configuration buildProperties="" description="" id="0.1926137277" name="Default" parent="org.eclipse.cdt.build.core.prefbase.cfg">
55+
<folderInfo id="0.1926137277." name="/" resourcePath="">
56+
<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.509203066" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">
57+
<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.509203066.1729245278" name=""/>
58+
<builder id="org.eclipse.cdt.build.core.settings.default.builder.556806524" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
59+
<tool id="org.eclipse.cdt.build.core.settings.holder.libs.1734362041" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>
60+
<tool id="org.eclipse.cdt.build.core.settings.holder.1549250771" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">
61+
<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1249863766" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
62+
</tool>
63+
<tool id="org.eclipse.cdt.build.core.settings.holder.1843726844" name="TI Linker Command" superClass="org.eclipse.cdt.build.core.settings.holder">
64+
<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1527951980" languageId="com.ti.ccstudio.core.TICMDLanguage" languageName="TI Linker Command" sourceContentType="com.ti.common.core.linkerCommandFile,com.ti.common.core.linkerCommandFile2" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
65+
</tool>
66+
<tool id="org.eclipse.cdt.build.core.settings.holder.1337354653" name="TI GNU C" superClass="org.eclipse.cdt.build.core.settings.holder">
67+
<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1712620404" languageId="com.ti.ccstudio.core.TIGCCLanguage" languageName="TI GNU C" sourceContentType="org.eclipse.cdt.core.cSource,org.eclipse.cdt.core.cHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
68+
</tool>
69+
<tool id="org.eclipse.cdt.build.core.settings.holder.635697724" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">
70+
<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1179758496" languageId="org.eclipse.cdt.core.g++" languageName="GNU C++" sourceContentType="org.eclipse.cdt.core.cxxSource,org.eclipse.cdt.core.cxxHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
71+
</tool>
72+
</toolChain>
73+
</folderInfo>
74+
</configuration>
75+
</storageModule>
76+
</cconfiguration>
4177
</storageModule>
4278
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
43-
<project id="OBC-firmware.null.1683502295" name="OBC-firmware"/>
79+
<project id="OBC-firmware.null.1127337211" name="OBC-firmware"/>
4480
</storageModule>
81+
<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
82+
<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
4583
<storageModule moduleId="scannerConfiguration">
4684
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
47-
<scannerConfigBuildInfo instanceId="0.608923889">
85+
<scannerConfigBuildInfo instanceId="0.1926137277">
4886
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
4987
</scannerConfigBuildInfo>
5088
</storageModule>
51-
<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
89+
<storageModule moduleId="null.devicePreference"/>
90+
<storageModule moduleId="cpuFamily"/>
5291
</cproject>

‎.github/workflows/gs_build.yml‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,23 @@ name: Ground Station Build
22
on: [push, pull_request]
33

44
jobs:
5-
build:
5+
build-linux:
6+
runs-on: ubuntu-latest
7+
defaults:
8+
run:
9+
shell: bash
10+
steps:
11+
- uses: actions/checkout@v3
12+
- name: Create binary directory
13+
run: |
14+
mkdir build
15+
- name: Build
16+
run: |
17+
cd build
18+
cmake .. -DCMAKE_BUILD_TYPE=GS -G"Unix Makefiles"
19+
make
20+
21+
build-windows:
622
runs-on: windows-latest
723
defaults:
824
run:

‎.github/workflows/hil_build.yml‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: HIL Build
2+
on:
3+
pull_request:
4+
push:
5+
branches:
6+
- main
7+
8+
jobs:
9+
build-linux:
10+
runs-on: self-hosted
11+
12+
defaults:
13+
run:
14+
shell: bash
15+
steps:
16+
- uses: actions/checkout@v3
17+
- name: Setup
18+
run: |
19+
sudo apt-get update
20+
sudo apt-get -y install build-essential cmake
21+
- name: Create binary directory
22+
run: |
23+
mkdir build_hil
24+
- name: Build
25+
run: |
26+
cd build_hil
27+
#Seems like we need to force the cxx standard here for it to be set in actions
28+
cmake .. -DCMAKE_BUILD_TYPE=HIL -DCMAKE_CXX_STANDARD=20
29+
make

‎.github/workflows/obc_build.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,15 @@ jobs:
99

1010
- name: Setup
1111
run: |
12+
sudo apt-get update
1213
sudo apt-get -y install build-essential cmake
1314
15+
1416
- name: Create binary directory
1517
run: |
1618
mkdir build
1719
cd build
20+
export REPO_ROOT=$(git rev-parse --show-toplevel)
1821
1922
- name: Build (Release-Launchpad)
2023
run: |

‎.github/workflows/obc_examples.yml‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
name: OBC Examples
2+
on:
3+
pull_request:
4+
push:
5+
branches:
6+
- main
7+
8+
jobs:
9+
setup:
10+
runs-on: ubuntu-latest
11+
12+
steps:
13+
- uses: actions/checkout@v3
14+
15+
- name: Setup
16+
run: |
17+
sudo apt-get update
18+
sudo apt-get -y install build-essential cmake
19+
20+
build:
21+
runs-on: ubuntu-latest
22+
needs: setup
23+
24+
strategy:
25+
matrix:
26+
example:
27+
[
28+
DMA_SPI,
29+
FRAM_PERSIST,
30+
FRAM_SPI,
31+
LM75BD,
32+
# MPU6050,
33+
RE_SD,
34+
# RTC,
35+
UART_RX,
36+
UART_TX,
37+
VN100,
38+
# CC1120_SPI,
39+
RS,
40+
ADC,
41+
42+
# ADD NEW EXAMPLES ABOVE THIS LINE, MUST BE INLINE WITH OTHER EXAMPLES
43+
]
44+
board: [
45+
RM46_LAUNCHPAD,
46+
OBC_REVISION_1,
47+
OBC_REVISION_2,
48+
]
49+
50+
steps:
51+
- uses: actions/checkout@v3
52+
53+
- name: Create binary directory
54+
run: |
55+
mkdir build
56+
57+
- name: Build (Examples-${{ matrix.board }} ${{ matrix.example }})
58+
run: |
59+
cd build
60+
cmake .. -DCMAKE_BUILD_TYPE=Examples -DEXAMPLE_TYPE=${{matrix.example}} -DBOARD_TYPE=${{matrix.board}} -G"Unix Makefiles" -DDEBUG=1
61+
make

‎.github/workflows/pre-commit.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
- uses: actions/checkout@v3
1313
- uses: actions/setup-python@v3
1414
with:
15-
python-version: 3.9
15+
python-version: '3.10'
1616
- id: file_changes
1717
uses: trilom/file-changes-action@v1.2.4
1818
with:

‎.github/workflows/pytest.yml‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
name: Pytest
2+
3+
on:
4+
pull_request:
5+
push:
6+
branches:
7+
- main
8+
9+
jobs:
10+
pytest:
11+
runs-on: ${{ matrix.os }}
12+
13+
strategy:
14+
matrix:
15+
os: [ubuntu-latest, windows-latest]
16+
python-version: ['3.10']
17+
18+
steps:
19+
- uses: actions/checkout@v3
20+
21+
- name: Set up Python ${{ matrix.python-version }}
22+
uses: actions/setup-python@v3
23+
with:
24+
python-version: ${{ matrix.python-version }}
25+
26+
- name: Install dependencies
27+
run: |
28+
python -m pip install --upgrade pip
29+
pip install -r requirements.txt
30+
pip install -e .
31+
32+
- name: Run pytest
33+
run: |
34+
python -m pytest

‎.github/workflows/python_validation.yml‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: Python CI
2+
3+
on: [push, pull_request]
4+
5+
jobs:
6+
mypy:
7+
runs-on: ubuntu-latest
8+
9+
strategy:
10+
matrix:
11+
python-version: ['3.10']
12+
13+
steps:
14+
- uses: actions/checkout@v3
15+
16+
- name: Set up Python ${{ matrix.python-version }}
17+
uses: actions/setup-python@v3
18+
with:
19+
python-version: ${{ matrix.python-version }}
20+
21+
- name: Install dependencies
22+
run: |
23+
python -m pip install --upgrade pip
24+
pip install -r requirements.txt
25+
pip install -e .
26+
27+
- name: Run mypy
28+
run: |
29+
python -m mypy .

‎.github/workflows/test.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ jobs:
1111

1212
steps:
1313
- uses: actions/checkout@v3
14+
- name: Install GNU cross compilation
15+
run: |
16+
sudo apt-get update
17+
sudo apt-get install gcc-multilib g++-multilib
1418
- name: Configure CMake
1519
run: |
1620
mkdir build

‎.gitignore‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,17 +54,23 @@ dkms.conf
5454
# IDE files
5555
.vscode/
5656
.idea/
57-
58-
# HALCoGen-generated main file
59-
**/sys_main.c
57+
compile_commands.json
58+
.cache/
6059

6160
.env
6261

6362
/build*
6463

64+
# Python
6565
.venv/
6666
venv/
67-
68-
# Python
6967
__pycache__/
7068
.pytest_cache/
69+
70+
#matlab
71+
/matlab
72+
73+
*.egg-info/
74+
*.coverage
75+
.mypy_cache/
76+
.ruff_cache/

0 commit comments

Comments
 (0)