Merge pull request #274 from ut-issl/develop

Merge develop to main for Major update v9.0.0
ut-issl · Feb 16, 2024 · 0ba591d · 0ba591d
2 parents 12dc463 + d44547e
commit 0ba591d
Show file tree

Hide file tree

Showing 81 changed files with 2,635 additions and 1,951 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@8ade135a41bc03ea155e62e844d188df1ea18608 # v4
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
       - 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@8ade135a41bc03ea155e62e844d188df1ea18608 # v4
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
 
       - name: checkout the submodules
-        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
         with:
           submodules: recursive
 
       - name: checkout S2E AOBC
-        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
         with:
           path: s2e-aobc
           repository: ut-issl/s2e-aobc
@@ -55,7 +55,7 @@ jobs:
 
       - name: cache extlib
         id: cache-extlib
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           key: extlib-${{ runner.os }}-${{ hashFiles('./s2e-aobc/s2e-core/ExtLibraries/**') }}
           path: ./s2e-aobc/s2e-core/ExtLibraries
@@ -107,15 +107,15 @@ jobs:
         compiler: ['gcc-11 g++-11'] # , 'clang clang++'] # 一旦clangは外す
 
     steps:
-      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
 
       - name: checkout the submodules
-        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
         with:
           submodules: recursive
 
       - name: checkout S2E AOBC
-        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
         with:
           path: s2e-aobc
           repository: ut-issl/s2e-aobc
@@ -153,7 +153,7 @@ jobs:
 
       - name: cache extlib
         id: cache-extlib
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           key: extlib-${{ runner.os }}-${{ hashFiles('./s2e-aobc/s2e-core/ExtLibraries/**') }}-BUILD_64BIT=OFF
           path: ./s2e-aobc/s2e-core/ExtLibraries

diff --git a/.github/workflows/c2a.yml b/.github/workflows/c2a.yml
@@ -10,4 +10,4 @@ on:
 jobs:
   c2a:
     name: C2A
-    uses: arkedge/workflows-c2a/.github/workflows/[email protected].2
+    uses: arkedge/workflows-c2a/.github/workflows/[email protected].3
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@8ade135a41bc03ea155e62e844d188df1ea18608 # v4
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
 
       - name: Run Labeler
         uses: crazy-max/ghaction-github-labeler@v5

diff --git a/C2A_AOBC.vcxproj b/C2A_AOBC.vcxproj
@@ -180,6 +180,7 @@
     <ClCompile Include="src\src_user\Applications\UserDefined\AOCS\AttitudeDetermination\rough_three_axis_determination.c" />
     <ClCompile Include="src\src_user\Applications\UserDefined\AOCS\AttitudeDetermination\stt_gyro_ekf.c" />
     <ClCompile Include="src\src_user\Applications\UserDefined\AOCS\AttitudeDetermination\sun_vector_propagator.c" />
+    <ClCompile Include="src\src_user\Applications\UserDefined\AOCS\ExclusiveControl\magnetic_exclusive_control_timer.c" />
     <ClCompile Include="src\src_user\Applications\UserDefined\AOCS\HardwareDependent\SensorFilters\mpu9250_filter.c" />
     <ClCompile Include="src\src_user\Applications\UserDefined\AOCS\HardwareDependent\SensorFilters\rm3100_filter.c" />
     <ClCompile Include="src\src_user\Applications\UserDefined\AOCS\HardwareDependent\SensorFilters\rw0003_filter.c" />
@@ -207,6 +208,7 @@
     <ClCompile Include="src\src_user\Applications\UserDefined\AOCS\TargetAttitude\target_attitude_from_orbit.c" />
     <ClCompile Include="src\src_user\Applications\UserDefined\AppStatus.c" />
     <ClCompile Include="src\src_user\Applications\UserDefined\Cdh\aocs_data_recorder.c" />
+    <ClCompile Include="src\src_user\Applications\UserDefined\Cdh\non_volatile_memory_bc.c" />
     <ClCompile Include="src\src_user\Applications\UserDefined\Cdh\non_volatile_memory_manager.c" />
     <ClCompile Include="src\src_user\Applications\UserDefined\Cdh\non_volatile_memory_parameter.c" />
     <ClCompile Include="src\src_user\Applications\UserDefined\Cdh\non_volatile_memory_partition.c" />
@@ -342,4 +344,4 @@
       <UserProperties arduino.build.auto_discover_includes="1" arduino.build.skip_library_file_if_exists_in_project="0" arduino.upload.port="COM13" config.Debug.customdebug_chipKIT_MXL795b_debugger_type="universal" VM_ADDITIONAL_COMPILER_C_FLAGS=" -I&quot;{build.path}\src&quot; -Wno-pragmas -Wno-write-strings  -Wno-unused-variable -Wno-unused-function" VM_ADDITIONAL_COMPILER_CPP_FLAGS=" -I&quot;{build.path}\src&quot; -Wno-pragmas -Wno-write-strings   -Wno-unused-variable -Wno-unused-function" />
     </VisualStudio>
   </ProjectExtensions>
-</Project>
+</Project>
diff --git a/database/CMD_DB/AOBC_CMD_DB_BCT.csv b/database/CMD_DB/AOBC_CMD_DB_BCT.csv
@@ -20,7 +20,6 @@ Comment,Name,ShortName,BCID,エイリアス,,,,,Danger Flag,Description,Note
 ,BC_TL_ROUGH_THREE_AXIS,,14,,,,,,danger,,
 ,BC_TL_ROUGH_THREE_AXIS_RW,,15,,,,,,danger,,
 ,BC_TL_FINE_THREE_AXIS,,16,,,,,,danger,,
-,BC_TL_GPSR_RANGE_OBSERVE,,17,,,,,,danger,,
 **,Block Cmds for Composition (App Rotator@@ Combiner),,,,,,,,,,
 *,./src_user/Settings/Modes/TaskLists/Elements/ で定義,,,,,,,,,,
 *,BC_AR_DEBUG_DISPLAY_INI,,,,,,,,danger,,
@@ -298,3 +297,4 @@ Comment,Name,ShortName,BCID,エイリアス,,,,,Danger Flag,Description,Note
 ,,,,,,,,,,,
 ,,,,,,,,,,,
 ,,,,,,,,,,,
+,,,,,,,,,,,