Merge pull request #322 from ut-issl/develop

Merge develop into main for major update v10.0.0
ut-issl · May 27, 2024 · d5f2e11 · d5f2e11
2 parents 0ba591d + 751d963
commit d5f2e11
Show file tree

Hide file tree

Showing 92 changed files with 3,146 additions and 1,272 deletions.
diff --git a/.github/workflows/actionlint.yml b/.github/workflows/actionlint.yml
@@ -9,7 +9,7 @@ jobs:
   actionlint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
+      - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
       - uses: reviewdog/action-actionlint@v1
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -27,15 +27,15 @@ jobs:
       fail-fast: false
 
     steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
+      - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
 
       - name: checkout the submodules
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
+        uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
         with:
           submodules: recursive
 
       - name: checkout S2E AOBC
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
+        uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
         with:
           path: s2e-aobc
           repository: ut-issl/s2e-aobc
@@ -107,15 +107,15 @@ jobs:
         compiler: ['gcc-11 g++-11'] # , 'clang clang++'] # 一旦clangは外す
 
     steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
+      - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
 
       - name: checkout the submodules
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
+        uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
         with:
           submodules: recursive
 
       - name: checkout S2E AOBC
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
+        uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
         with:
           path: s2e-aobc
           repository: ut-issl/s2e-aobc

diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
+      - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
 
       - name: Run Labeler
         uses: crazy-max/ghaction-github-labeler@v5

diff --git a/C2A_AOBC.vcxproj b/C2A_AOBC.vcxproj
@@ -304,7 +304,6 @@
     <ClCompile Include="src\src_user\Settings\Modes\TaskLists\tl_rough_sun_pointing.c" />
     <ClCompile Include="src\src_user\Settings\Modes\TaskLists\tl_rough_three_axis.c" />
     <ClCompile Include="src\src_user\Settings\Modes\TaskLists\tl_rough_three_axis_rw.c" />
-    <ClCompile Include="src\src_user\Settings\Modes\TaskLists\tl_gpsr_range_observe.c" />
     <ClCompile Include="src\src_user\Settings\Modes\Transitions\sl_bdot.c" />
     <ClCompile Include="src\src_user\Settings\Modes\Transitions\sl_fine_three_axis.c" />
     <ClCompile Include="src\src_user\Settings\Modes\Transitions\sl_initial.c" />

diff --git a/database/CMD_DB/AOBC_CMD_DB_BCT.csv b/database/CMD_DB/AOBC_CMD_DB_BCT.csv
@@ -94,7 +94,7 @@ Comment,Name,ShortName,BCID,エイリアス,,,,,Danger Flag,Description,Note
 *,ADCS:,,,,,,,,,,
 **,others 全体のテレメとかを登録,,,,,,,,,,
 *,システム試験TLM:,,,,,,,,,,
-**,BCT MAX : 80,,,,,,,,,,
+**,BCT MAX : 90,,,,,,,,,,
 ,,,,,,,,,,,
 ,,,,,,,,,,,
 ,,,,,,,,,,,

diff --git a/database/CMD_DB/AOBC_CMD_DB_CMD_DB.csv b/database/CMD_DB/AOBC_CMD_DB_CMD_DB.csv
diff --git a/database/CmdPlan/AOBC_SAGITTA_PARAMETER_CHANGE.ops b/database/CmdPlan/AOBC_SAGITTA_PARAMETER_CHANGE.ops
@@ -0,0 +1,301 @@
+.# ===== SAGITTA CHANGE PARAMETER =====
+.# Sagittaの電源を投入し起動する
+.AOBC_RT.TLCD_DEPLOY_BLOCK 1 39  # BC_POWER_ON_SAGITTA
+.#
+.# ！！中断！！（緊急時）電源をOFFする
+.AOBC_RT.TLCD_DEPLOY_BLOCK 1 51  # BC_POWER_OFF_SAGITTA
+.#
+.# パラメータの変更手順
+.# 1. ドライバ内の値を変更する
+.# 2. Sagittaに送信する
+.# 3. Sagittaに設定されたパラメータを読み取る
+.# SWでアサーションはしていない
+.# 変更後に読み取ったパラメータが正常かをテレメで確認する
+.#
+.# LOG LEVEL
+.AOBC_RT.TG_GENERATE_RT_TLM 0x34  # AOBC_SAGITTA_SET1
+.AOBC_RT.DI_SAGITTA_CHANGE_PARAMETER 3 0 1
+ wait_sec 1
+ AOBC_RT.DI_SAGITTA_CHANGE_PARAMETER 3 15 2
+ wait_sec 1
+ AOBC_RT.TG_GENERATE_RT_TLM 0x34  # AOBC_SAGITTA_SET1
+ #
+.AOBC_RT.TG_GENERATE_RT_TLM 0x36  # AOBC_SAGITTA_READ1
+.AOBC_RT.DI_SAGITTA_SET_PARAMETER 3
+ wait_sec 1
+ AOBC_RT.DI_SAGITTA_READ_PARAMETER 3
+ wait_sec 1
+ AOBC_RT.TG_GENERATE_RT_TLM 0x36  # AOBC_SAGITTA_READ1
+.#
+.# LIMITS
+.AOBC_RT.TG_GENERATE_RT_TLM 0x34  # AOBC_SAGITTA_SET1
+.AOBC_RT.DI_SAGITTA_CHANGE_PARAMETER 5 0 1
+ wait_sec 1
+ AOBC_RT.DI_SAGITTA_CHANGE_PARAMETER 5 10 0.123
+ wait_sec 1
+ AOBC_RT.TG_GENERATE_RT_TLM 0x34  # AOBC_SAGITTA_SET1
+ #
+.AOBC_RT.TG_GENERATE_RT_TLM 0x36  # AOBC_SAGITTA_READ1
+.AOBC_RT.DI_SAGITTA_SET_PARAMETER 5
+ wait_sec 1
+ AOBC_RT.DI_SAGITTA_READ_PARAMETER 5
+ wait_sec 1
+ AOBC_RT.TG_GENERATE_RT_TLM 0x36  # AOBC_SAGITTA_READ1
+.#
+.# MOUNTING
+.AOBC_RT.TG_GENERATE_RT_TLM 0x34  # AOBC_SAGITTA_SET1
+.AOBC_RT.DI_SAGITTA_CHANGE_PARAMETER 6 0 0
+ wait_sec 1
+ AOBC_RT.DI_SAGITTA_CHANGE_PARAMETER 6 3 1
+ wait_sec 1
+ AOBC_RT.TG_GENERATE_RT_TLM 0x34  # AOBC_SAGITTA_SET1
+ #
+.AOBC_RT.TG_GENERATE_RT_TLM 0x36  # AOBC_SAGITTA_READ1
+.AOBC_RT.DI_SAGITTA_SET_PARAMETER 6
+ wait_sec 1
+ AOBC_RT.DI_SAGITTA_READ_PARAMETER 6
+ wait_sec 1
+ AOBC_RT.TG_GENERATE_RT_TLM 0x36  # AOBC_SAGITTA_READ1
+.#
+.# DISTORTION
+.AOBC_RT.TG_GENERATE_RT_TLM 0x34  # AOBC_SAGITTA_SET1
+.AOBC_RT.DI_SAGITTA_CHANGE_PARAMETER 8 0 1
+ wait_sec 1
+ AOBC_RT.DI_SAGITTA_CHANGE_PARAMETER 8 16 0.1
+ wait_sec 1
+ AOBC_RT.TG_GENERATE_RT_TLM 0x34  # AOBC_SAGITTA_SET1
+ #
+.AOBC_RT.TG_GENERATE_RT_TLM 0x36  # AOBC_SAGITTA_READ1
+.AOBC_RT.DI_SAGITTA_SET_PARAMETER 8
+ wait_sec 1
+ AOBC_RT.DI_SAGITTA_READ_PARAMETER 8
+ wait_sec 1
+ AOBC_RT.TG_GENERATE_RT_TLM 0x36  # AOBC_SAGITTA_READ1
+.#
+.# CAMERA
+.AOBC_RT.TG_GENERATE_RT_TLM 0x34  # AOBC_SAGITTA_SET1
+.AOBC_RT.DI_SAGITTA_CHANGE_PARAMETER 9 0 1
+ wait_sec 1
+ AOBC_RT.DI_SAGITTA_CHANGE_PARAMETER 9 23 1
+ wait_sec 1
+ AOBC_RT.TG_GENERATE_RT_TLM 0x34  # AOBC_SAGITTA_SET1
+ #
+.AOBC_RT.TG_GENERATE_RT_TLM 0x36  # AOBC_SAGITTA_READ1
+.AOBC_RT.DI_SAGITTA_SET_PARAMETER 9
+ wait_sec 1
+ AOBC_RT.DI_SAGITTA_READ_PARAMETER 9
+ wait_sec 1
+ AOBC_RT.TG_GENERATE_RT_TLM 0x36  # AOBC_SAGITTA_READ1
+.#
+.# IMAGE PROCESSOR
+.AOBC_RT.TG_GENERATE_RT_TLM 0x34  # AOBC_SAGITTA_SET1
+.AOBC_RT.DI_SAGITTA_CHANGE_PARAMETER 10 0 1
+ wait_sec 1
+ AOBC_RT.DI_SAGITTA_CHANGE_PARAMETER 10 4 1
+ wait_sec 1
+ AOBC_RT.TG_GENERATE_RT_TLM 0x34  # AOBC_SAGITTA_SET1
+ #
+.AOBC_RT.TG_GENERATE_RT_TLM 0x36  # AOBC_SAGITTA_READ1
+.AOBC_RT.DI_SAGITTA_SET_PARAMETER 10
+ wait_sec 1
+ AOBC_RT.DI_SAGITTA_READ_PARAMETER 10
+ wait_sec 1
+ AOBC_RT.TG_GENERATE_RT_TLM 0x36  # AOBC_SAGITTA_READ1
+.#
+.# CENTROIDING
+.AOBC_RT.TG_GENERATE_RT_TLM 0x35  # AOBC_SAGITTA_SET2
+.AOBC_RT.DI_SAGITTA_CHANGE_PARAMETER 11 0 0
+ wait_sec 1
+ AOBC_RT.DI_SAGITTA_CHANGE_PARAMETER 11 12 1
+ wait_sec 1
+ AOBC_RT.TG_GENERATE_RT_TLM 0x35  # AOBC_SAGITTA_SET2
+ #
+.AOBC_RT.TG_GENERATE_RT_TLM 0x37  # AOBC_SAGITTA_READ2
+.AOBC_RT.DI_SAGITTA_SET_PARAMETER 11
+ wait_sec 1
+ AOBC_RT.DI_SAGITTA_READ_PARAMETER 11
+ wait_sec 1
+ AOBC_RT.TG_GENERATE_RT_TLM 0x37  # AOBC_SAGITTA_READ2
+.#
+.# LISA
+.AOBC_RT.TG_GENERATE_RT_TLM 0x35  # AOBC_SAGITTA_SET2
+.AOBC_RT.DI_SAGITTA_CHANGE_PARAMETER 12 0 6
+ wait_sec 1
+ AOBC_RT.DI_SAGITTA_CHANGE_PARAMETER 12 13 0.123
+ wait_sec 1
+ AOBC_RT.TG_GENERATE_RT_TLM 0x35  # AOBC_SAGITTA_SET2
+ #
+.AOBC_RT.TG_GENERATE_RT_TLM 0x37  # AOBC_SAGITTA_READ2
+.AOBC_RT.DI_SAGITTA_SET_PARAMETER 12
+ wait_sec 1
+ AOBC_RT.DI_SAGITTA_READ_PARAMETER 12
+ wait_sec 1
+ AOBC_RT.TG_GENERATE_RT_TLM 0x37  # AOBC_SAGITTA_READ2
+.#
+.# MATCHING
+.AOBC_RT.TG_GENERATE_RT_TLM 0x34  # AOBC_SAGITTA_SET1
+.AOBC_RT.DI_SAGITTA_CHANGE_PARAMETER 13 0 0.123
+ wait_sec 1
+ AOBC_RT.DI_SAGITTA_CHANGE_PARAMETER 13 1 0.123
+ wait_sec 1
+ AOBC_RT.TG_GENERATE_RT_TLM 0x34  # AOBC_SAGITTA_SET1
+ #
+.AOBC_RT.TG_GENERATE_RT_TLM 0x36  # AOBC_SAGITTA_READ1
+.AOBC_RT.DI_SAGITTA_SET_PARAMETER 13
+ wait_sec 1
+ AOBC_RT.DI_SAGITTA_READ_PARAMETER 13
+ wait_sec 1
+ AOBC_RT.TG_GENERATE_RT_TLM 0x36  # AOBC_SAGITTA_READ1
+.#
+.# TRACKING
+.AOBC_RT.TG_GENERATE_RT_TLM 0x34  # AOBC_SAGITTA_SET1
+.AOBC_RT.DI_SAGITTA_CHANGE_PARAMETER 14 0 0.123
+ wait_sec 1
+ AOBC_RT.DI_SAGITTA_CHANGE_PARAMETER 14 3 3
+ wait_sec 1
+ AOBC_RT.TG_GENERATE_RT_TLM 0x34  # AOBC_SAGITTA_SET1
+ #
+.AOBC_RT.TG_GENERATE_RT_TLM 0x36  # AOBC_SAGITTA_READ1
+.AOBC_RT.DI_SAGITTA_SET_PARAMETER 14
+ wait_sec 1
+ AOBC_RT.DI_SAGITTA_READ_PARAMETER 14
+ wait_sec 1
+ AOBC_RT.TG_GENERATE_RT_TLM 0x36  # AOBC_SAGITTA_READ1
+.#
+.# VALIDATION
+.AOBC_RT.TG_GENERATE_RT_TLM 0x35  # AOBC_SAGITTA_SET2
+.AOBC_RT.DI_SAGITTA_CHANGE_PARAMETER 15 0 2
+ wait_sec 1
+ AOBC_RT.DI_SAGITTA_CHANGE_PARAMETER 15 3 10
+ wait_sec 1
+ AOBC_RT.TG_GENERATE_RT_TLM 0x35  # AOBC_SAGITTA_SET2
+ #
+.AOBC_RT.TG_GENERATE_RT_TLM 0x37  # AOBC_SAGITTA_READ2
+.AOBC_RT.DI_SAGITTA_SET_PARAMETER 15
+ wait_sec 1
+ AOBC_RT.DI_SAGITTA_READ_PARAMETER 15
+ wait_sec 1
+ AOBC_RT.TG_GENERATE_RT_TLM 0x37  # AOBC_SAGITTA_READ2
+.#
+.# ALGO
+.AOBC_RT.TG_GENERATE_RT_TLM 0x35  # AOBC_SAGITTA_SET2
+.AOBC_RT.DI_SAGITTA_CHANGE_PARAMETER 16 0 11
+ wait_sec 1
+ AOBC_RT.DI_SAGITTA_CHANGE_PARAMETER 16 4 10
+ wait_sec 1
+ AOBC_RT.TG_GENERATE_RT_TLM 0x35  # AOBC_SAGITTA_SET2
+ #
+.AOBC_RT.TG_GENERATE_RT_TLM 0x37  # AOBC_SAGITTA_READ2
+.AOBC_RT.DI_SAGITTA_SET_PARAMETER 16
+ wait_sec 1
+ AOBC_RT.DI_SAGITTA_READ_PARAMETER 16
+ wait_sec 1
+ AOBC_RT.TG_GENERATE_RT_TLM 0x37  # AOBC_SAGITTA_READ2
+.#
+.# SUBSCROPTION
+.AOBC_RT.TG_GENERATE_RT_TLM 0x35  # AOBC_SAGITTA_SET2
+.AOBC_RT.DI_SAGITTA_CHANGE_PARAMETER 18 0 0
+ wait_sec 1
+ AOBC_RT.DI_SAGITTA_CHANGE_PARAMETER 18 15 27
+ wait_sec 1
+ AOBC_RT.TG_GENERATE_RT_TLM 0x35  # AOBC_SAGITTA_SET2
+ #
+.AOBC_RT.TG_GENERATE_RT_TLM 0x37  # AOBC_SAGITTA_READ2
+.AOBC_RT.DI_SAGITTA_SET_PARAMETER 18
+ wait_sec 1
+ AOBC_RT.DI_SAGITTA_READ_PARAMETER 18
+ wait_sec 1
+ AOBC_RT.TG_GENERATE_RT_TLM 0x37  # AOBC_SAGITTA_READ2
+.#
+.# AUTO_THRESHOLD
+.AOBC_RT.TG_GENERATE_RT_TLM 0x35  # AOBC_SAGITTA_SET2
+.AOBC_RT.DI_SAGITTA_CHANGE_PARAMETER 23 0 2
+ wait_sec 1
+ AOBC_RT.DI_SAGITTA_CHANGE_PARAMETER 23 4 0.1
+ wait_sec 1
+ AOBC_RT.TG_GENERATE_RT_TLM 0x35  # AOBC_SAGITTA_SET2
+ #
+.AOBC_RT.TG_GENERATE_RT_TLM 0x37  # AOBC_SAGITTA_READ2
+.AOBC_RT.DI_SAGITTA_SET_PARAMETER 23
+ wait_sec 1
+ AOBC_RT.DI_SAGITTA_READ_PARAMETER 23
+ wait_sec 1
+ AOBC_RT.TG_GENERATE_RT_TLM 0x37  # AOBC_SAGITTA_READ2
+.#
+.# FAST_LISA
+.AOBC_RT.TG_GENERATE_RT_TLM 0x35  # AOBC_SAGITTA_SET2
+.AOBC_RT.DI_SAGITTA_CHANGE_PARAMETER 25 0 0.3
+ wait_sec 1
+ AOBC_RT.DI_SAGITTA_CHANGE_PARAMETER 25 1 0.3
+ wait_sec 1
+ AOBC_RT.TG_GENERATE_RT_TLM 0x35  # AOBC_SAGITTA_SET2
+ #
+.AOBC_RT.TG_GENERATE_RT_TLM 0x37  # AOBC_SAGITTA_READ2
+.AOBC_RT.DI_SAGITTA_SET_PARAMETER 25
+ wait_sec 1
+ AOBC_RT.DI_SAGITTA_READ_PARAMETER 25
+ wait_sec 1
+ AOBC_RT.TG_GENERATE_RT_TLM 0x37  # AOBC_SAGITTA_READ2
+.#
+.# NOISE_LIMITS
+.AOBC_RT.TG_GENERATE_RT_TLM 0x35  # AOBC_SAGITTA_SET2
+.AOBC_RT.DI_SAGITTA_CHANGE_PARAMETER 30 0 6  # limit1
+ wait_sec 1
+ AOBC_RT.DI_SAGITTA_CHANGE_PARAMETER 30 2 3  # min
+ wait_sec 1
+ AOBC_RT.TG_GENERATE_RT_TLM 0x35  # AOBC_SAGITTA_SET2
+ #
+.AOBC_RT.TG_GENERATE_RT_TLM 0x37  # AOBC_SAGITTA_READ2
+.AOBC_RT.DI_SAGITTA_SET_PARAMETER 30
+ wait_sec 1
+ AOBC_RT.DI_SAGITTA_READ_PARAMETER 30
+ wait_sec 1
+ AOBC_RT.TG_GENERATE_RT_TLM 0x37  # AOBC_SAGITTA_READ2
+.#
+.# BLOB_FILTER
+.AOBC_RT.TG_GENERATE_RT_TLM 0x35  # AOBC_SAGITTA_SET2
+.AOBC_RT.DI_SAGITTA_CHANGE_PARAMETER 31 0 304161858  # max_open_upper (1306365233408905761)
+ wait_sec 1
+ AOBC_RT.DI_SAGITTA_CHANGE_PARAMETER 31 1 608309793  # max_open_lower (1306365233408905761)
+ wait_sec 1
+ AOBC_RT.DI_SAGITTA_CHANGE_PARAMETER 31 11 3  # max_height
+ wait_sec 1
+ AOBC_RT.TG_GENERATE_RT_TLM 0x35  # AOBC_SAGITTA_SET2
+ #
+.AOBC_RT.TG_GENERATE_RT_TLM 0x37  # AOBC_SAGITTA_READ2
+.AOBC_RT.DI_SAGITTA_SET_PARAMETER 31
+ wait_sec 1
+ AOBC_RT.DI_SAGITTA_READ_PARAMETER 31
+ wait_sec 1
+ AOBC_RT.TG_GENERATE_RT_TLM 0x37  # AOBC_SAGITTA_READ2
+.#
+.# ===== Sagittaコンポ側アサーションの確認 =====
+.# Sagitta側の閾値（24-26）を超えて焦点距離を設定
+.AOBC_RT.DI_SAGITTA_CHANGE_PARAMETER 9 1 -3
+ #
+.AOBC_RT.TG_GENERATE_RT_TLM 0x36  # AOBC_SAGITTA_READ1
+.AOBC_RT.DI_SAGITTA_SET_PARAMETER 9
+.# エラーが返ってくることを確認
+.AOBC_RT.DI_SAGITTA_READ_PARAMETER 9
+ wait_sec 1
+ AOBC_RT.TG_GENERATE_RT_TLM 0x36  # AOBC_SAGITTA_READ1
+.# SETに失敗していることを確認
+.#
+.# Sagitta側の閾値（24-26）を超えて焦点距離を設定
+.AOBC_RT.DI_SAGITTA_CHANGE_PARAMETER 9 1 20
+ #
+.AOBC_RT.TG_GENERATE_RT_TLM 0x36  # AOBC_SAGITTA_READ1
+.AOBC_RT.DI_SAGITTA_SET_PARAMETER 9
+.# エラーが返ってくることを確認
+.AOBC_RT.DI_SAGITTA_READ_PARAMETER 9
+ wait_sec 1
+ AOBC_RT.TG_GENERATE_RT_TLM 0x36  # AOBC_SAGITTA_READ1
+.# SETに失敗していることを確認
+.#
+.# ===== SAGITTA TELEMETRY =====
+ #
+.AOBC_RT.TG_GENERATE_RT_TLM 0x36  # AOBC_SAGITTA_READ1
+.AOBC_RT.DI_SAGITTA_SET_PARAMETER 18
+.#
+.# ===== 終了手順 =====
+.AOBC_RT.TLCD_DEPLOY_BLOCK 1 51  # BC_POWER_OFF_SAGITTA