Merge pull request #525 from ut-issl/develop

Update main (v3.8.0) on 2023-03-26

.github/workflows/.python-version

@@ -1 +1 @@
-3.10
+3.11

.github/workflows/build.yml

@@ -0,0 +1,43 @@
+name: Build
+
+on:
+  push:
+    branches:
+      - main
+      - develop
+  pull_request:
+
+jobs:
+  minimum_user:
+    name: minimum user
+    uses: arkedge/workflows-c2a/.github/workflows/c2a-build.yml@v1.0.0
+    with:
+      c2a_dir: Examples/minimum_user
+      c2a_custom_setup: |
+        cd $GITHUB_WORKSPACE
+        ls -l
+        cd ./repo
+        pwd
+        ls -l
+        if [ $RUNNER_OS = 'Windows' ]; then
+          cmd "/C setup.bat"
+        else
+          ./setup.sh
+        fi
+
+  second_obc_user:
+    name: 2nd obc user
+    uses: arkedge/workflows-c2a/.github/workflows/c2a-build.yml@v1.0.0
+    with:
+      c2a_dir: Examples/2nd_obc_user
+      c2a_custom_setup: |
+        cd $GITHUB_WORKSPACE
+        ls -l
+        cd ./repo
+        pwd
+        ls -l
+        if [ $RUNNER_OS = 'Windows' ]; then
+          cmd "/C setup.bat"
+        else
+          ./setup.sh
+        fi

.github/workflows/build_as_cxx.yml

@@ -8,34 +8,6 @@ on:
   pull_request:
 
 jobs:
-  build_example_user_as_cxx:
-    runs-on: windows-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        example:
-          - minimum_user
-          - 2nd_obc_user
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: setup
-        shell: cmd
-        run: ./setup.bat
-
-      - name: cmake
-        working-directory: ./Examples/${{ matrix.example }}
-        run: |
-          mkdir build
-          cd build
-          cmake --version
-          cmake .. -A Win32
-
-      - name: build
-        working-directory: ./Examples/${{ matrix.example }}/build
-        run: cmake --build .
-
   build_s2e_mockup:
     runs-on: windows-latest
     strategy:

.github/workflows/python_check_format.yml

@@ -13,6 +13,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
+      - name: install black formatter
+        run: pip install black==23.1.0
+
       # - name: check python format with black
       #   uses: psf/black@stable
 

.github/workflows/python_lint.yml

@@ -18,6 +18,9 @@ jobs:
         with:
           python-version-file: .github/workflows/.python-version
 
+      - name: install flake8
+        run: pip install flake8==6.0.0
+
       - name: flake8 Lint
         uses: reviewdog/action-flake8@v3
         with:

.gitignore

@@ -60,8 +60,6 @@ dkms.conf
 # for c2a user sample
 Examples/minimum_user/src/src_core
 Examples/minimum_user/build
-Examples/minimum_user/src/src_user/Test/authorization.json
 Examples/2nd_obc_user/src/src_core
 Examples/2nd_obc_user/build
-Examples/2nd_obc_user/src/src_user/Test/authorization.json
 *.pyc

Applications/CMakeLists.txt

@@ -3,7 +3,6 @@ cmake_minimum_required(VERSION 3.13)
 project(C2A_CORE_APPS)
 
 set(C2A_SRCS
-  anomaly_handler.c
   divided_cmd_utility.c
   gs_command_dispatcher.c
   event_utility.c

Applications/TestApp/test_ccp_util.c

@@ -8,16 +8,16 @@
 #include "../../TlmCmd/common_cmd_packet_util.h"
 #include <src_user/TlmCmd/command_definitions.h>
 
-CCP_EXEC_STS Cmd_TEST_CCP_REGISTER_TLC_ASAP(const CommonCmdPacket* packet)
+CCP_CmdRet Cmd_TEST_CCP_REGISTER_TLC_ASAP(const CommonCmdPacket* packet)
 {
   cycle_t ti = CCP_get_param_from_packet(packet, 0, cycle_t);
   PH_ACK ack = CCP_register_tlc_asap(ti, TLCD_ID_FROM_GS, Cmd_CODE_NOP, NULL, 0);
-  if (ack != PH_ACK_TLC_SUCCESS) return CCP_EXEC_ILLEGAL_CONTEXT;
+  if (ack != PH_ACK_TLC_SUCCESS) return CCP_make_cmd_ret_without_err_code(CCP_EXEC_ILLEGAL_CONTEXT);
 
-  return CCP_EXEC_SUCCESS;
+  return CCP_make_cmd_ret_without_err_code(CCP_EXEC_SUCCESS);
 }
 
-CCP_EXEC_STS Cmd_TEST_CCP_GET_RAW_PARAM_INFO(const CommonCmdPacket* packet)
+CCP_CmdRet Cmd_TEST_CCP_GET_RAW_PARAM_INFO(const CommonCmdPacket* packet)
 {
   uint16_t len = CCP_get_param_from_packet(packet, 0, uint16_t);
   uint8_t first_data = CCP_get_param_from_packet(packet, 1, uint8_t);
@@ -26,28 +26,28 @@ CCP_EXEC_STS Cmd_TEST_CCP_GET_RAW_PARAM_INFO(const CommonCmdPacket* packet)
   // CCP_get_raw_param_head の test
   if (CCP_get_raw_param_head(packet) != CCP_get_param_head(packet) + sizeof(uint16_t) + sizeof(uint8_t))
   {
-    return CCP_EXEC_ILLEGAL_CONTEXT;
+    return CCP_make_cmd_ret_without_err_code(CCP_EXEC_ILLEGAL_CONTEXT);
   }
 
   // len チェック
   if (CCP_get_raw_param_len(packet) != len)
   {
-    return CCP_EXEC_ILLEGAL_CONTEXT;
+    return CCP_make_cmd_ret_without_err_code(CCP_EXEC_ILLEGAL_CONTEXT);
   }
 
   if (len == 0)
   {
     // raw param なし
-    return CCP_EXEC_SUCCESS;
+    return CCP_make_cmd_ret_without_err_code(CCP_EXEC_SUCCESS);
   }
 
   data = CCP_get_raw_param_head(packet);
   if (data[0] != first_data)
   {
-    return CCP_EXEC_ILLEGAL_CONTEXT;
+    return CCP_make_cmd_ret_without_err_code(CCP_EXEC_ILLEGAL_CONTEXT);
   }
 
-  return CCP_EXEC_SUCCESS;
+  return CCP_make_cmd_ret_without_err_code(CCP_EXEC_SUCCESS);
 }
 
 #pragma section

Applications/TestApp/test_ccp_util.h

@@ -7,7 +7,7 @@
 
 #include "../../TlmCmd/common_cmd_packet.h"
 
-CCP_EXEC_STS Cmd_TEST_CCP_REGISTER_TLC_ASAP(const CommonCmdPacket* packet);
-CCP_EXEC_STS Cmd_TEST_CCP_GET_RAW_PARAM_INFO(const CommonCmdPacket* packet);
+CCP_CmdRet Cmd_TEST_CCP_REGISTER_TLC_ASAP(const CommonCmdPacket* packet);
+CCP_CmdRet Cmd_TEST_CCP_GET_RAW_PARAM_INFO(const CommonCmdPacket* packet);
 
 #endif