Merge pull request #117 from ut-issl/develop

Main update for major version v6.0.0

.github/CODEOWNERS

@@ -0,0 +1,8 @@
+# AOCS team
+* @ut-issl/aocs
+
+# CDH team
+# * @chutaro
+
+# ArkEdge Sapce
+* @sksat

.github/PULL_REQUEST_TEMPLATE.md

@@ -8,7 +8,17 @@
 詳しく
 
 ## 検証結果
-test へのリンクや，検証結果へのリンク
+### ビルドチェック (どちらもチェック)
+- [ ] SILSでのビルドチェックに通った(CIで確認)
+- [ ] vMicroでのビルドチェックに通った
+
+### 動作確認チェック (いずれかをチェック)
+- [ ] SILSでアルゴリズムが想定通りに動いた
+- [ ] 実機でアルゴリズムが想定通りに動いた
+- [ ] (テレコマ試験の場合)コマンドファイルを使った試験をパスした
+
+### 試験結果詳細記述場所 or 詳細ログ保存場所へのリンク
+- 図や表で記述する
 
 ## 影響範囲
 XX系の動作がガラッと変わる，とか．
@@ -17,7 +27,7 @@ XX系の動作がガラッと変わる，とか．
 何かあれば
 
 ## 注意
-- 関連する Projects が存在する場合，それの紐付けを行うこと
-- Assignees を設定すること
-- 可能ならば Reviewers を設定すること
-- 可能ならば `priority` ラベルを付けること
+- 6U AOCS team Projects への紐付けを行うこと
+- Assignees を自分に設定すること
+- Reviewers を設定すること
+- `priority` ラベルや`major/minor/patch update`ラベルを付けること

.github/labels.yml

@@ -1,67 +1,55 @@
-- name: "bug"
-  color: "d73a4a"
+- name: ":bug: bug"
+  color: "F9D0C4"
   description: "Something isn't working"
 
-- name: "documentation"
-  color: "0075ca"
+- name: ":notebook: documentation"
+  color: "F0F0F0"
   description: "Improvements or additions to documentation"
 
-- name: "duplicate"
-  color: "cfd8d7"
-  description: "This issue or pull request already exists"
-
-- name: "enhancement"
-  description: "New feature or request"
-  color: "a2eeef"
-
-- name: "good first issue"
+- name: ":beginner: good first issue"
   description: "Good for newcomers"
-  color: "7057ff"
-
-- name: "help wanted"
-  description: "Extra attention is needed"
-  color: "008672"
+  color: "F0F0F0"
 
-- name: "invalid"
-  description: "This doesn't seem right"
-  color: "e4e669"
-
-- name: "question"
+- name: ":question: question"
   description: "Further information is requested"
-  color: "d876e3"
-
-- name: "wontfix"
-  description: "This will not be worked on"
-  color: "ffffff"
+  color: "F0F0F0"
 
-- name: "icebox"
-  description: "icebox or pending"
-  color: "c5def5"
+- name: ":rocket: priority::high"
+  description: "priority high"
+  color: "F9D0C4"
 
-- name: "priority::high"
-  description: "priorityg high"
-  color: "d93f0b"
-
-- name: "priority::low"
+- name: ":car: priority::low"
   description: "priority low"
-  color: "9dcce0"
+  color: "C2E0C6"
 
-- name: "priority::medium"
+- name: ":airplane: priority::medium"
   description: "priority medium"
-  color: "fbca04"
+  color: "FEF2C0"
+
+- name: ":whale: major update"
+  color: "F9D0C4"
+  description: "Major update"
+
+- name: ":dolphin: minor update"
+  color: "FEF2C0"
+  description: "Minor update"
+
+- name: ":fish: patch"
+  color: "C2E0C6"
+  description: "Patch Update"
 
-- name: "tools"
-  description: ""
-  color: "510f70"
+- name: ":wrench: tools"
+  description: "Tools"
+  color: "F0F0F0"
 
-- name: "C2A"
-  description: ""
-  color: "2a9637"
+- name: ":artificial_satellite: C2A"
+  description: "Command Centric Architecture"
+  color: "F0F0F0"
 
-- name: "S2E"
-  description: ""
-  color: "eef789"
+- name: ":ringed_planet: S2E"
+  description: "Spacecraft Simulation Environment"
+  color: "F0F0F0"
 
-- name: "WINGS"
-  description: ""
-  color: "1503bb"
+- name: ":satellite: WINGS"
+  description: "Web-based INterface Ground-station Software"
+  color: "F0F0F0"

.github/workflows/build.yml

@@ -0,0 +1,195 @@
+name: Build
+
+on:
+  push:
+    branches:
+      - main
+      - develop
+  pull_request:
+    types: [opened, synchronize, reopened, labeled]
+    paths:
+      - '.github/workflows/build.yml'
+      - 'CMakeLists.txt'
+      - 'CMakeSettings.json'
+      - 'Examples/**'
+      - 'src/**'
+
+env:
+  S2E_AOBC_VERSION: v2.0.1
+
+jobs:
+  build_c2a_with_s2e_win:
+    name: Build C2A with S2E on Windows VS2022
+    # VS2022 を使うため
+    runs-on: windows-2022
+    strategy:
+      fail-fast: false
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: checkout the submodules
+        uses: actions/checkout@v3
+        with:
+          submodules: recursive
+
+      - name: checkout S2E AOBC
+        uses: actions/checkout@v3
+        with:
+          path: s2e-aobc
+          repository: ut-issl/s2e-aobc
+          ref: '${{ env.S2E_AOBC_VERSION }}'
+          submodules: recursive
+          ssh-key: ${{ secrets.S2E_AOBC_SSH_KEY }}
+          fetch-depth: 1
+
+      - name: Configure build for x86
+        uses: ilammy/msvc-dev-cmd@v1
+        with:
+          arch: amd64_x86
+
+      - name: show tools version
+        shell: powershell
+        run: |
+          cmake --version
+
+      - name: cache extlib
+        id: cache-extlib
+        uses: actions/cache@v3
+        with:
+          key: extlib-${{ runner.os }}-${{ hashFiles('./s2e-aobc/s2e-core/ExtLibraries/**') }}
+          path: ./s2e-aobc/s2e-core/ExtLibraries
+
+      - name: build extlib
+        if: steps.cache-extlib.outputs.cache-hit != 'true'
+        shell: powershell
+        working-directory: ./s2e-aobc/s2e-core/ExtLibraries
+        run: |
+          $extlib_dir=(pwd).Path
+          cmake -G "Visual Studio 17 2022" -A Win32 -DCMAKE_CONFIGURATION_TYPES:STRING="Debug" -DEXT_LIB_DIR="${extlib_dir}"
+          cmake --build . --clean-first
+
+      - name: install extlib
+        if: steps.cache-extlib.outputs.cache-hit != 'true'
+        shell: powershell
+        working-directory: ./s2e-aobc/s2e-core/ExtLibraries
+        run: |
+          cmake --install .
+
+      - name: check extlib
+        shell: powershell
+        working-directory: ./s2e-aobc/s2e-core/ExtLibraries
+        run: |
+          ls cspice
+          ls cspice/cspice_msvs/lib
+          ls cspice/include
+          ls cspice/generic_kernels
+          ls nrlmsise00
+          ls nrlmsise00/table
+          ls nrlmsise00/lib
+          ls nrlmsise00/lib/libnrlmsise00.lib
+          ls nrlmsise00/src
+
+      - name: build
+        shell: cmd
+        working-directory: ./s2e-aobc/s2e-aocs-core
+        run: |
+          cl.exe
+          cmake -G "Visual Studio 17 2022" -A Win32 -DCMAKE_CONFIGURATION_TYPES:STRING="Debug" -DEXT_LIB_DIR=../s2e-core/ExtLibraries -DFLIGHT_SW_DIR=../../../ -DC2A_NAME=c2a-aobc -DUSE_C2A=ON
+          cmake --build . --clean-first
+
+  build_c2a_with_s2e_linux:
+    name: Build C2A with S2E on Linux
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        compiler: ['gcc-11 g++-11'] # , 'clang clang++'] # 一旦clangは外す
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: checkout the submodules
+        uses: actions/checkout@v3
+        with:
+          submodules: recursive
+
+      - name: checkout S2E AOBC
+        uses: actions/checkout@v3
+        with:
+          path: s2e-aobc
+          repository: ut-issl/s2e-aobc
+          ref: '${{ env.S2E_AOBC_VERSION }}'
+          submodules: recursive
+          ssh-key: ${{ secrets.S2E_AOBC_SSH_KEY }}
+          fetch-depth: 1
+
+      - name: set compiler
+        id: compiler
+        run: |
+          COMPILER="${{ matrix.compiler }}"
+          read -r -a COMPILER <<< "$COMPILER"
+          echo "CC=${COMPILER[0]}" >> "$GITHUB_OUTPUT"
+          echo "CXX=${COMPILER[1]}" >> "$GITHUB_OUTPUT"
+
+      - name: install deps
+        run: |
+          # FIXME: temporary install gcc-11 in ubuntu:focal
+          if [[ "${{ steps.compiler.outputs.CC }}" =~ "gcc-11" ]]; then
+            sudo add-apt-repository ppa:ubuntu-toolchain-r/test
+          fi
+          sudo apt-get update
+          if [[ "${{ steps.compiler.outputs.CC }}" =~ "gcc" ]]; then
+            sudo apt-get install -y ${{ steps.compiler.outputs.CC }}-multilib \
+                                    ${{ steps.compiler.outputs.CXX }}-multilib
+          else
+            sudo apt-get install -y gcc-multilib g++-multilib
+          fi
+
+      - name: show tools version
+        run: |
+          cmake --version
+          ${{ steps.compiler.outputs.CC  }} --version
+          ${{ steps.compiler.outputs.CXX }} --version
+
+      - name: cache extlib
+        id: cache-extlib
+        uses: actions/cache@v3
+        with:
+          key: extlib-${{ runner.os }}-${{ hashFiles('./s2e-aobc/s2e-core/ExtLibraries/**') }}-BUILD_64BIT=OFF
+          path: ./s2e-aobc/s2e-core/ExtLibraries
+
+      - name: build extlib
+        if: steps.cache-extlib.outputs.cache-hit != 'true'
+        working-directory: ./s2e-aobc/s2e-core/ExtLibraries
+        run: |
+          cmake -DBUILD_64BIT=OFF -DEXT_LIB_DIR="$(pwd)"
+          cmake --build . --clean-first
+
+      - name: install extlib
+        if: steps.cache-extlib.outputs.cache-hit != 'true'
+        working-directory: ./s2e-aobc/s2e-core/ExtLibraries
+        run: |
+          cmake --install .
+
+      - name: check extlib
+        working-directory: ./s2e-aobc/s2e-core/ExtLibraries
+        run: |
+          ls cspice
+          ls cspice/cspice_unix*
+          ls cspice/include
+          ls cspice/generic_kernels
+          ls nrlmsise00
+          ls nrlmsise00/table
+          ls nrlmsise00/lib*
+          ls nrlmsise00/lib*/libnrlmsise00.a
+          ls nrlmsise00/src
+
+      - name: build
+        working-directory: ./s2e-aobc/s2e-aocs-core
+        env:
+          CC:  ${{ steps.compiler.outputs.CC  }}
+          CXX: ${{ steps.compiler.outputs.CXX }}
+        run: |
+          cmake . -DBUILD_64BIT=OFF -DEXT_LIB_DIR=../s2e-core/ExtLibraries -DFLIGHT_SW_DIR=../../../ -DC2A_NAME=c2a-aobc -DUSE_C2A=ON
+          cmake --build . --clean-first

.gitignore

@@ -58,3 +58,6 @@ src/src_user/IfWrapper/SILS/FLASH_DB/*.dat
 # Visual Micro for PIC32
 Debug/
 Release/
+
+# for c2a user sample
+Examples/src_aobc

C2A_ISSL6U_AOBC.sln → C2A_AOBC.sln

@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.30413.136
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "c2a_issl6u_aobc", "c2a_issl6u_aobc.vcxproj", "{C5F80730-F44F-4478-BDAE-6634EFC2CA88}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "c2a_aobc", "c2a_aobc.vcxproj", "{C5F80730-F44F-4478-BDAE-6634EFC2CA88}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution