Merge pull request #627 from ut-issl/develop

Update main (v3.9.2) on 2023-06-29
ut-issl · Jun 29, 2023 · 9d6caea · 9d6caea
2 parents 772e7ca + f46de43
commit 9d6caea
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -10,7 +10,7 @@ on:
 jobs:
   minimum_user:
     name: minimum user
-    uses: arkedge/workflows-c2a/.github/workflows/build.yml@v2.3.0
+    uses: arkedge/workflows-c2a/.github/workflows/build.yml@v2.5.0
     with:
       c2a_dir: Examples/minimum_user
       c2a_custom_setup: |
@@ -25,7 +25,7 @@ jobs:
 
   second_obc_user:
     name: 2nd obc user
-    uses: arkedge/workflows-c2a/.github/workflows/build.yml@v2.3.0
+    uses: arkedge/workflows-c2a/.github/workflows/build.yml@v2.5.0
     with:
       c2a_dir: Examples/2nd_obc_user
       c2a_custom_setup: |

diff --git a/.github/workflows/check_coding_rule.yml b/.github/workflows/check_coding_rule.yml
@@ -39,7 +39,7 @@ jobs:
           exit "${status}"
 
       - name: install reviewdog
-        uses: reviewdog/action-setup@v1.0.4
+        uses: reviewdog/action-setup@v1.0.5
 
       - name: fix error log source file path
         run: |

diff --git a/Applications/event_utility.c b/Applications/event_utility.c
@@ -26,7 +26,7 @@ static void EVENT_UTIL_init_(void)
   event_utility_.is_enabled_eh_execution = 1;
 }
 
-static void EVENT_UTIL_update_()
+static void EVENT_UTIL_update_(void)
 {
   if (event_utility_.is_enabled_eh_execution)
   {

diff --git a/Applications/nop.c b/Applications/nop.c
@@ -16,7 +16,7 @@ AppInfo NOP_create_app(void)
   return AI_create_app_info("nop", NULL, NOP_nop_);
 }
 
-static void NOP_nop_() {
+static void NOP_nop_(void) {
   // no operation
 }
 

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "c2a-core"
-version = "3.9.1"
+version = "3.9.2"
 edition = "2021"
 
 links = "c2a-core"

diff --git a/Library/endian.c b/Library/endian.c
@@ -6,6 +6,7 @@
 #include "endian.h"
 #include <src_user/Settings/build_settings.h>
 #include <stdint.h>
+#include <string.h>
 
 void* ENDIAN_memcpy(void* dest, const void* src, size_t size)
 {

diff --git a/TlmCmd/common_cmd_packet_util.c b/TlmCmd/common_cmd_packet_util.c
@@ -266,7 +266,7 @@ PH_ACK CCP_register_tlc(cycle_t ti, TLCD_ID tlcd_id, CMD_CODE cmd_id, const uint
 {
   CCP_EXEC_TYPE type = CCP_get_exec_type_from_tlcd_id(tlcd_id);
 
-  if (type == CCP_EXEC_UNKNOWN)
+  if (type == CCP_EXEC_TYPE_UNKNOWN)
   {
     return PH_ACK_INVALID_PACKET;
   }

diff --git a/c2a_core_main.h b/c2a_core_main.h
@@ -9,7 +9,7 @@ void C2A_core_main(void);
 // 詳細: Docs/General/release.md
 #define C2A_CORE_VER_MAJOR (3)
 #define C2A_CORE_VER_MINOR (9)
-#define C2A_CORE_VER_PATCH (1)
+#define C2A_CORE_VER_PATCH (2)
 #define C2A_CORE_VER_PRE   ("")
 
 #endif
diff --git a/common.cmake b/common.cmake
@@ -34,6 +34,10 @@ if(MSVC)
   if(BUILD_C2A_AS_UTF8)
     target_compile_options(${PROJECT_NAME} PUBLIC "/source-charset:utf-8")
   endif()
+
+  # warning
+  target_compile_options(${PROJECT_NAME} PRIVATE /wd4083) # disable #pragma SECTION REPRO warning
+  target_compile_options(${PROJECT_NAME} PRIVATE /wd4081) # disable #pragma section (EOF)
 else()
   # SJIS
   # if (NOT CMAKE_C_COMPILER_ID STREQUAL "Clang")