From 5ed39aea89460bf64cfc25ea24e89cf34fdd62de Mon Sep 17 00:00:00 2001 From: Kentaro Sugimoto Date: Thu, 15 Jun 2023 11:24:27 +0900 Subject: [PATCH 1/7] Fix: comparison between different types of enum --- TlmCmd/common_cmd_packet_util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TlmCmd/common_cmd_packet_util.c b/TlmCmd/common_cmd_packet_util.c index 66890200e..e82781c27 100644 --- 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; } From 8e40624cda6b26bb4710203ab3f73ff33a554edc Mon Sep 17 00:00:00 2001 From: Ryo Suzumoto Date: Tue, 20 Jun 2023 23:31:06 +0900 Subject: [PATCH 2/7] fix include --- Library/endian.c | 1 + 1 file changed, 1 insertion(+) diff --git a/Library/endian.c b/Library/endian.c index 667dc66e6..1a506be48 100644 --- a/Library/endian.c +++ b/Library/endian.c @@ -6,6 +6,7 @@ #include "endian.h" #include #include +#include void* ENDIAN_memcpy(void* dest, const void* src, size_t size) { From 91b8ea0b999cb324f37fbe965e3fa6f59cc7ffea Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 21 Jun 2023 14:01:47 +0000 Subject: [PATCH 3/7] Update reviewdog/action-setup action to v1.0.5 --- .github/workflows/check_coding_rule.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check_coding_rule.yml b/.github/workflows/check_coding_rule.yml index 5f3e9372c..a88a0cb50 100644 --- 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: | From 7c1c86103e944604feda947cad99fd9709ff4068 Mon Sep 17 00:00:00 2001 From: sksat Date: Mon, 26 Jun 2023 18:19:35 +0900 Subject: [PATCH 4/7] fix function prototype mismatch in Applications --- Applications/event_utility.c | 2 +- Applications/nop.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Applications/event_utility.c b/Applications/event_utility.c index 0aa771bb0..91ed344b7 100644 --- 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 index f773a6087..fa181b93d 100644 --- 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 } From 956c83d30257466b163f0e9196d56c184e2db123 Mon Sep 17 00:00:00 2001 From: sksat Date: Wed, 28 Jun 2023 03:39:53 +0900 Subject: [PATCH 5/7] ignore pragma section REPRO warning on MSVC --- common.cmake | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/common.cmake b/common.cmake index b4c4ea2a5..229eb1cbf 100644 --- 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") From b46943844cc38e0bf64f2ce1e734af6101e33561 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 28 Jun 2023 05:00:15 +0000 Subject: [PATCH 6/7] Update arkedge/workflows-c2a action to v2.5.0 --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5f74cdc26..989fa61d5 100644 --- 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: | From 62caef34f601a3efcca77eefe81070c01a5a20c1 Mon Sep 17 00:00:00 2001 From: Ryo Suzumoto Date: Wed, 28 Jun 2023 14:51:54 +0900 Subject: [PATCH 7/7] update version to v3.9.2 --- Cargo.toml | 2 +- c2a_core_main.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 5064b6f94..bc008f3eb 100644 --- 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/c2a_core_main.h b/c2a_core_main.h index d4e95cc0d..184e0dcca 100644 --- 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