Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update main (v3.9.2) on 2023-06-29 #627

Merged
merged 14 commits into from
Jun 29, 2023
Merged

Update main (v3.9.2) on 2023-06-29 #627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
5ed39ae
Fix: comparison between different types of enum
tarotene Jun 15, 2023
ef3bbae
Merge pull request #614 from ut-issl/feature/fix-ccp-enum-comparison
tarotene Jun 20, 2023
8e40624
fix include
meltingrabbit Jun 20, 2023
c79a41d
Merge pull request #617 from ut-issl/feature/fix_include
meltingrabbit Jun 20, 2023
91b8ea0
Update reviewdog/action-setup action to v1.0.5
renovate[bot] Jun 21, 2023
67c2a7a
Merge pull request #621 from ut-issl/renovate/reviewdog-action-setup-1.x
sksat Jun 26, 2023
7c1c861
fix function prototype mismatch in Applications
sksat Jun 26, 2023
956c83d
ignore pragma section REPRO warning on MSVC
sksat Jun 27, 2023
235ac33
Merge pull request #624 from ut-issl/feature/ignore-pragma-warning-msvc
sksat Jun 28, 2023
b469438
Update arkedge/workflows-c2a action to v2.5.0
renovate[bot] Jun 28, 2023
301abf7
Merge pull request #623 from ut-issl/renovate/arkedge-workflows-c2a-2.x
sksat Jun 28, 2023
59a8c53
Merge pull request #622 from ut-issl/feature/fix-prototype-mismatch
sksat Jun 28, 2023
62caef3
update version to v3.9.2
meltingrabbit Jun 28, 2023
f46de43
Merge pull request #625 from ut-issl/feature/update_version_3-9-2
meltingrabbit Jun 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand All @@ -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: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check_coding_rule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
2 changes: 1 addition & 1 deletion Applications/event_utility.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
2 changes: 1 addition & 1 deletion Applications/nop.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "c2a-core"
version = "3.9.1"
version = "3.9.2"
edition = "2021"

links = "c2a-core"
Expand Down
1 change: 1 addition & 0 deletions Library/endian.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
2 changes: 1 addition & 1 deletion TlmCmd/common_cmd_packet_util.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion c2a_core_main.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 4 additions & 0 deletions common.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down