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.

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.0) on 2023-06-02 #603

Merged
merged 231 commits into from
Jun 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
231 commits
Select commit Hold shift + click to select a range
1db7c5c
CDIS の実行エラーELを修正
chutaro Apr 5, 2023
cfb5243
black 23.0 を適用
chutaro Apr 5, 2023
2ea91c8
fix example user IfWrapper CMake if
sksat Apr 6, 2023
fa05cc3
prevent list(APPEND)
sksat Apr 6, 2023
8cf8f87
Merge pull request #499 from ut-issl/feature/revise_cdis_el
chutaro Apr 7, 2023
a8a6da5
BC展開時刻被りはコマンド実行エラーにしないようにした
chutaro Feb 27, 2023
c8556f8
PL_SUCCESS の ack も err code で返すようにした
chutaro Mar 4, 2023
2552383
TL ID も残すようにした
chutaro Mar 25, 2023
68f18ad
Merge pull request #500 from ut-issl/feature/el_bc_deploy_time_adjusted
chutaro Apr 7, 2023
860ef67
PH_ACK のコメントを微修正
chutaro Apr 5, 2023
ed7ca96
Merge pull request #530 from ut-issl/feature/ph_comment
chutaro Apr 7, 2023
cb866d0
update c2a core version to v6 in build ci
meltingrabbit Apr 9, 2023
432e355
Merge pull request #534 from ut-issl/feature/update_version_of_s2e_co…
meltingrabbit Apr 9, 2023
1cdc28a
change combine BC_AR_GS_RELATED_PROCESS in 2nd obc tl
meltingrabbit Apr 9, 2023
139854e
Merge pull request #533 from ut-issl/feature/change_cimbie_mobc_di_in…
meltingrabbit Apr 9, 2023
adf34b6
del cmd prefix
meltingrabbit Apr 3, 2023
b1bbabb
update version
meltingrabbit Apr 9, 2023
8075472
Merge pull request #529 from ut-issl/feature/del_cmd_prefix
meltingrabbit Apr 9, 2023
ad22287
remove APID_is_other_obc_tlm_apid
meltingrabbit Apr 10, 2023
3bc4ec2
fix bug
meltingrabbit Apr 10, 2023
24813f3
Merge pull request #535 from ut-issl/feature/remove_APID_is_other_obc…
meltingrabbit Apr 20, 2023
0f9fe9b
add tg generate tlm cmd template
meltingrabbit Apr 11, 2023
b7e128a
impl Cmd_TG_GENERATE_TLM
meltingrabbit Apr 11, 2023
fad6f87
del dump num
meltingrabbit Apr 19, 2023
6645d97
generate 2nd obc cmd def
meltingrabbit Apr 19, 2023
c07932e
fix typefix review
meltingrabbit Apr 19, 2023
45b3481
Merge pull request #541 from ut-issl/feature/generate_tlm
meltingrabbit Apr 20, 2023
fbd2a5a
impl foward tlm
meltingrabbit Apr 11, 2023
f956900
add foward cmd to cmd db
meltingrabbit Apr 11, 2023
ef70d94
add ULL sufix
meltingrabbit Apr 11, 2023
3d879e1
fix typo
meltingrabbit Apr 11, 2023
c8137e8
fix tlm code generator
meltingrabbit Apr 16, 2023
99ce34e
fix include
meltingrabbit Apr 16, 2023
85631be
typo
meltingrabbit Apr 16, 2023
0d149cf
generate tlm code of 2nd obc
meltingrabbit Apr 16, 2023
ee20aa3
fix
meltingrabbit Apr 16, 2023
07f2004
update test_comm_between_c2a.py for forward tlm
meltingrabbit Apr 16, 2023
6bd3fdc
fix comment
meltingrabbit Apr 16, 2023
91f47a1
del dump num
meltingrabbit Apr 19, 2023
f513c86
Update test_comm_between_c2a.py
meltingrabbit Apr 19, 2023
08d1ee3
apply black
meltingrabbit Apr 19, 2023
ec0a645
fix
meltingrabbit Apr 19, 2023
c0a2ffe
rename cmd name
meltingrabbit Apr 19, 2023
302877e
fix err code
meltingrabbit Apr 19, 2023
3f3dada
Update test_comm_between_c2a.py
meltingrabbit Apr 19, 2023
2bdeda6
update version
meltingrabbit Apr 20, 2023
afd6ee3
Merge pull request #544 from ut-issl/feature/forward_tlm
meltingrabbit Apr 20, 2023
24e20e5
Merge pull request #532 from ut-issl/feature/user-refactor-ifwrapper-…
sksat Apr 21, 2023
8858fa2
fix el comment
meltingrabbit Apr 24, 2023
74eeafe
Merge pull request #555 from ut-issl/feature/fix_el_comment
meltingrabbit Apr 24, 2023
a2b8a67
split C89 compile option to BUILD_C2A_AS_C89
sksat Mar 29, 2023
8d7b0e9
build C2A as C99 when BUILD_C2A_AS_C89=OFF
sksat Mar 29, 2023
5077d44
fix BUILD_C2A_AS_C89 to BUILD_C2A_AS_C99
sksat Mar 29, 2023
eb816a1
update version
meltingrabbit Apr 24, 2023
3040141
Merge pull request #527 from ut-issl/feature/split-c89-to-cmake-option
sksat Apr 25, 2023
918f173
Update reviewdog/action-setup action to v1.0.4
renovate[bot] Apr 27, 2023
257fa5d
Merge pull request #558 from ut-issl/renovate/reviewdog-action-setup-1.x
sksat Apr 28, 2023
af849f9
add Coding Acronyms
meltingrabbit May 8, 2023
812a749
Merge pull request #559 from ut-issl/feature/acronyms_table
meltingrabbit May 8, 2023
1a11a02
add Cargo.toml for packaging c2a-core as crate
sksat May 9, 2023
0087f19
add gigignore for Rust
sksat May 9, 2023
c99c2bb
add release rule for cargo publish
sksat May 9, 2023
004de64
add .
meltingrabbit May 9, 2023
2cc86f0
fix small
meltingrabbit May 9, 2023
eb2aa79
Update .gitignore
meltingrabbit May 9, 2023
603c44c
update version
meltingrabbit May 9, 2023
946266b
Merge pull request #564 from ut-issl/feature/package-as-crate
sksat May 9, 2023
361a1cf
Update README.md
meltingrabbit May 9, 2023
fbfa9bb
Update README.md
meltingrabbit May 9, 2023
d0e39ec
Merge pull request #565 from ut-issl/feature/update_readme
meltingrabbit May 9, 2023
e7250f3
sed pli to pl
meltingrabbit May 8, 2023
bc7ddd4
Merge pull request #563 from ut-issl/feature/sed_pli_to_pl
meltingrabbit May 10, 2023
909ae93
fix crate package license config
sksat May 10, 2023
eb70563
make c2a-core no_std crate
sksat May 10, 2023
38791ae
split dest flags when pl push back
meltingrabbit May 8, 2023
8aa9ae7
Update communication.md
meltingrabbit May 8, 2023
7038419
Merge pull request #562 from ut-issl/feature/split_dest_flags_when_pl…
meltingrabbit May 10, 2023
4dc77dc
Merge pull request #566 from ut-issl/feature/fix-crate-license-config
sksat May 10, 2023
fe8605a
Merge pull request #567 from ut-issl/feature/no-std
sksat May 10, 2023
bfa7767
add export-src, std feature to c2a-core crate
sksat May 10, 2023
b5b07ec
c2a-core is no_std crate on std feature is not set
sksat May 10, 2023
78637a0
add source dir export func in export-src feature
sksat May 10, 2023
5a96e61
Merge pull request #568 from ut-issl/feature/add-export-src-interface
sksat May 10, 2023
2602aa1
add CCP_DEST_TYPE_TO_APID
meltingrabbit May 8, 2023
4ac520d
fix bug
meltingrabbit May 8, 2023
32ee432
Update communication.md
meltingrabbit May 8, 2023
f9e376c
update version
meltingrabbit May 10, 2023
d2532e8
Merge pull request #561 from ut-issl/feature/CCP_DEST_TYPE_TO_APID
meltingrabbit May 10, 2023
f8d1120
update version
meltingrabbit May 10, 2023
6a70ce9
Merge pull request #569 from ut-issl/feature/fix_version
meltingrabbit May 10, 2023
57a200a
update tlm-cmd-code-generator
meltingrabbit May 11, 2023
084d0a1
update version
meltingrabbit May 11, 2023
b0097a6
Merge pull request #572 from ut-issl/feature/update_tlm-cmd-code-gene…
meltingrabbit May 11, 2023
0b392b3
check c2a-core version header from Rust build script
sksat May 17, 2023
785eae3
remove duplicate Rust crate package license config
sksat May 17, 2023
02c83d8
add Rust CI
sksat May 17, 2023
159ac0b
install libclang-dev in Rust CI
sksat May 17, 2023
b0567c7
TEMP: bump header version for test CI fail
sksat May 17, 2023
42a3665
Merge pull request #574 from ut-issl/feature/remove-duplicate-license…
sksat May 17, 2023
f3f2578
Merge pull request #573 from ut-issl/feature/check-core-version-rs
sksat May 17, 2023
a16e61a
Revert "TEMP: bump header version for test CI fail"
sksat May 17, 2023
756280a
Merge pull request #575 from ut-issl/feature/add-rust-ci
sksat May 17, 2023
e728bd9
Remove git_revision.c from user and set revision from compile option
sksat Dec 10, 2021
18f3769
Fix include path
sksat Dec 10, 2021
6134593
Remove old git_revision scripts
sksat Dec 10, 2021
fde57d0
Add print git revision
sksat Dec 10, 2021
c7a63c2
fix print Git revision
sksat Dec 13, 2021
dd7b15e
remove git_revison.c, move git_revision.h to core Library
sksat Dec 13, 2021
6967646
add generate revision header script and option
sksat Dec 13, 2021
4c3b8be
fix #error
sksat Dec 13, 2021
ab32701
remove old user git_revision.c
sksat Jan 18, 2022
384ba3b
add doc comment
sksat Feb 2, 2022
8da6bb3
rename src_user/Library/git_revision.h to src_user/Settings/git_revis…
sksat Feb 2, 2022
9fcd177
fix pre-commit file list
sksat Feb 2, 2022
66b566c
apply include guard coding rule
sksat Apr 19, 2023
bc42dd7
fix bat env expand
sksat Apr 24, 2023
6765b55
fix bat path
sksat May 1, 2023
94dbd83
bat file should be Shift-JIS
sksat May 17, 2023
6c0496c
generate whole revision file(not append)
sksat May 17, 2023
2c039a1
back to the script dir
sksat May 17, 2023
ab94bf5
more fake example hash
sksat May 17, 2023
537756a
fix generated header include guard
sksat May 17, 2023
6de84e3
match Doxygen comment coding rule
sksat May 17, 2023
8a53ac7
apply git rev to 2nd obc
meltingrabbit May 17, 2023
88d9b79
execute git log from 2nd obc user top CMake
sksat May 17, 2023
5f06f25
rerun sync_with_minimum_user.bat
meltingrabbit May 17, 2023
ebbf430
bump version for pre release
sksat May 17, 2023
784307c
Merge pull request #82 from ut-issl/feature/refactor-git-revision
sksat May 17, 2023
6d4a366
switch action-clippy reporter on event
sksat May 17, 2023
20e7936
TEMP: push trigger test
sksat May 17, 2023
f2c70fc
Revert "TEMP: push trigger test"
sksat May 17, 2023
aee2044
Merge pull request #577 from ut-issl/feature/switch-clippy-reporter-o…
sksat May 17, 2023
868160b
remove set-output
sksat May 17, 2023
9cb976d
add clang-runtime feature for fix link problem
sksat May 17, 2023
e7c79fb
change clang-runtime feature to default feature
sksat May 17, 2023
b5cbc86
Revert "install libclang-dev in Rust CI"
sksat May 17, 2023
b821fb8
add c2a-core crate links key
sksat May 17, 2023
8732865
export c2a-core crate source directory via cargo
sksat May 17, 2023
12f316e
remove ObcTime config from obc_time.h
sksat May 18, 2023
9284b1a
split ObcTime config into obc_time_config.h
sksat May 18, 2023
4864b86
task dispatcher use ObcTime config
sksat May 18, 2023
80b3bfc
time manager use ObcTime config
sksat May 18, 2023
9ed09dd
Merge pull request #583 from ut-issl/feature/split-obc-time-config-he…
sksat May 18, 2023
1c84862
update sample cmd file
meltingrabbit May 18, 2023
43e6d26
update conftest
meltingrabbit May 18, 2023
ab2948c
fix BCL_load_start_hk_tlm for Cmd_CODE_TG_GENERATE_MS_TLM
meltingrabbit May 18, 2023
8e2c6eb
update aobc tlm req
meltingrabbit May 18, 2023
d67baac
Merge pull request #584 from ut-issl/feature/del_GENERATE_TLM
meltingrabbit May 19, 2023
7987a66
Update Swatinem/rust-cache action to v2.4.0
renovate[bot] May 21, 2023
7497a8e
Merge pull request #579 from ut-issl/feature/add-clang-runtime-feature
sksat May 23, 2023
db74c28
Merge pull request #580 from ut-issl/feature/export-src-dir-via-cargo
sksat May 23, 2023
b72d308
Merge pull request #578 from ut-issl/remove-set-output
sksat May 23, 2023
b730216
Merge pull request #589 from ut-issl/renovate/swatinem-rust-cache-2.x
sksat May 23, 2023
2076aa7
Update arkedge/workflows-c2a action to v1.2.1
renovate[bot] May 23, 2023
a31e56e
Merge pull request #590 from ut-issl/renovate/arkedge-workflows-c2a-1.x
sksat May 23, 2023
b806228
del Cmd_CODE_GENERATE_TLM use in pytest
meltingrabbit May 18, 2023
750247b
update generate_and_receive_tlm in 2nd obc for GENERATE_TLM
meltingrabbit May 18, 2023
5734ca3
update generate_and_receive_tlm in mobc for GENERATE_TLM
meltingrabbit May 18, 2023
d21c43b
update version
meltingrabbit May 24, 2023
eee7bd9
Merge pull request #588 from ut-issl/feature/del_GENERATE_TLM_in_pytest
meltingrabbit May 24, 2023
5749653
modify revision.bat
chutaro May 24, 2023
8e76a65
add define C2A_GIT_REVISION_GENERATED to 2nd obc
chutaro May 24, 2023
042cdfa
Merge pull request #596 from ut-issl/feature/modify_git_revision
chutaro May 24, 2023
5c1a95e
add CCP_form_and_exec_rtc_to_other_obc
chutaro May 23, 2023
c373d55
typo
meltingrabbit May 25, 2023
74b6516
コメントを微修正
chutaro May 27, 2023
89dcaec
Merge pull request #593 from ut-issl/faeture/ccp_form_and_exec_other_…
chutaro May 27, 2023
2f20b88
Update arkedge/workflows-c2a action to v2
renovate[bot] May 27, 2023
b636ceb
fix c2a build workflow file ref
sksat May 29, 2023
585052d
fix example users build CI workflow custom setup script
sksat May 29, 2023
6a01a21
Merge pull request #594 from ut-issl/renovate/arkedge-workflows-c2a-2.x
sksat May 29, 2023
c10e2f6
fix CTP_set_on_board_subnet_time in TG
meltingrabbit May 29, 2023
6cf187d
check on board time in CTP_get_ctp_from_dssc
meltingrabbit May 29, 2023
85b44ab
add comment
meltingrabbit May 29, 2023
bb354c8
typo
meltingrabbit May 30, 2023
e897ac1
fix get c2a-core git revision working dir
sksat May 31, 2023
fc3a618
fix get example user git revision working dir
sksat May 31, 2023
29cd618
Merge pull request #599 from ut-issl/feature/TSP_set_on_board_subnet_…
meltingrabbit May 31, 2023
0a25b80
update version
meltingrabbit May 31, 2023
aedb983
Merge pull request #600 from ut-issl/feature/fix-core-git-revision-ou…
meltingrabbit May 31, 2023
dd86087
sed bct_cmd_pos
meltingrabbit May 18, 2023
7c66218
update header and sed of tlm mgr
meltingrabbit May 24, 2023
0314bd5
update TLM_MGR_init_1_
meltingrabbit May 24, 2023
f28a7f2
use RESULT type
meltingrabbit May 24, 2023
df5e703
update TLM_MGR_init_2_
meltingrabbit May 24, 2023
3275dd7
fix var name
meltingrabbit May 24, 2023
8d4cf8a
fix var name
meltingrabbit May 24, 2023
17e44c3
update TLM_MGR_init_4_
meltingrabbit May 24, 2023
292cdf7
sed BC_TLM_MGR
meltingrabbit May 25, 2023
105694f
update init of tlm mgr
meltingrabbit May 25, 2023
7d80706
update cmd
meltingrabbit May 25, 2023
cfded34
add user setting of tlm mgr
meltingrabbit May 25, 2023
a0883f4
impl register
meltingrabbit May 28, 2023
ccfc53f
impl delete
meltingrabbit May 28, 2023
00fa67c
impl delete
meltingrabbit May 29, 2023
4bff68c
add comment
meltingrabbit May 29, 2023
998aeb2
fix small
meltingrabbit May 29, 2023
bd08b1c
fix for ci
meltingrabbit May 29, 2023
eaa6cb2
fix ci
meltingrabbit May 29, 2023
197d069
update docs
meltingrabbit May 29, 2023
7050eed
set tlm
meltingrabbit May 29, 2023
a695e1f
fix docs
meltingrabbit May 29, 2023
1146eb8
update tlm
meltingrabbit May 29, 2023
154296c
sed
meltingrabbit May 29, 2023
34bbed3
fix bug
meltingrabbit May 29, 2023
e67606b
fix bug
meltingrabbit May 29, 2023
dbc01a8
fix bug
meltingrabbit May 29, 2023
3508199
fix typo
meltingrabbit Jun 1, 2023
1583530
review
meltingrabbit Jun 1, 2023
4166111
fix typo
meltingrabbit Jun 1, 2023
c372a8d
sed TLM_MGR_CmdBlock
meltingrabbit Jun 1, 2023
504929a
sed TLM_MGR_CmdElem
meltingrabbit Jun 1, 2023
f5a2571
Merge pull request #597 from ut-issl/feature/update_tlm_mgr_for_new_tg
meltingrabbit Jun 1, 2023
00b74fd
add _TLM suffix
meltingrabbit May 31, 2023
5070c14
change docs of CTP_DEST_FLAG
meltingrabbit May 31, 2023
810db1d
sed HK_TLM to HP_TLM
meltingrabbit May 31, 2023
f993eb9
sed hk_tlm to hp_tlm
meltingrabbit May 31, 2023
ebe0e94
sed MS_TLM to RT_TLM
meltingrabbit May 31, 2023
4c71325
sed ms_tlm to rt_tlm
meltingrabbit May 31, 2023
02e3b92
fix small
meltingrabbit May 31, 2023
14e8c3a
sed mst
meltingrabbit May 31, 2023
f3cc37d
fix
meltingrabbit May 31, 2023
a752900
fix small
meltingrabbit May 31, 2023
ca12527
sed MS_FLUSH
meltingrabbit May 31, 2023
e88c277
del ms
meltingrabbit May 31, 2023
bfd74b3
fix
meltingrabbit May 31, 2023
0a4a100
edit conflict
meltingrabbit Jun 1, 2023
aa3e237
update version
meltingrabbit Jun 1, 2023
9524dcd
Merge pull request #601 from ut-issl/feature/realtime_tlm
meltingrabbit Jun 1, 2023
53774ce
update version to v3.9.0
meltingrabbit Jun 1, 2023
bf801d1
Merge pull request #602 from ut-issl/feature/update_version_3-9-0
meltingrabbit Jun 1, 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
12 changes: 4 additions & 8 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,11 @@ on:
jobs:
minimum_user:
name: minimum user
uses: arkedge/workflows-c2a/.github/workflows/c2a-build.yml@v1.0.0
uses: arkedge/workflows-c2a/.github/workflows/build.yml@v2.1.0
with:
c2a_dir: Examples/minimum_user
c2a_custom_setup: |
cd $GITHUB_WORKSPACE
ls -l
cd ./repo
cd ../..
pwd
ls -l
if [ $RUNNER_OS = 'Windows' ]; then
Expand All @@ -27,13 +25,11 @@ jobs:

second_obc_user:
name: 2nd obc user
uses: arkedge/workflows-c2a/.github/workflows/c2a-build.yml@v1.0.0
uses: arkedge/workflows-c2a/.github/workflows/build.yml@v2.1.0
with:
c2a_dir: Examples/2nd_obc_user
c2a_custom_setup: |
cd $GITHUB_WORKSPACE
ls -l
cd ./repo
cd ../..
pwd
ls -l
if [ $RUNNER_OS = 'Windows' ]; then
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_with_s2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
pull_request:

env:
S2E_CORE_VERSION: v5.0.0
S2E_CORE_VERSION: v6.0.0

jobs:
build_s2e_win:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/check_coding_rule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@ jobs:
python ./src_core/Script/CI/check_coding_rule.py ./src_core/Script/CI/check_coding_rule.json | tee /tmp/coding-rule.log
status="${PIPESTATUS[0]}"
echo "status: ${status}"
echo "::set-output name=status::${status}"
echo "status=${status}" >> "$GITHUB_OUTPUT"
exit "${status}"

- name: install reviewdog
uses: reviewdog/[email protected].3
uses: reviewdog/[email protected].4

- name: fix error log source file path
run: |
Expand Down
36 changes: 36 additions & 0 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: Rust

on:
push:
branches:
- main
tags:
- v*
pull_request:

env:
CARGO_INCREMENTAL: 0

jobs:
rust:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3

- uses: dtolnay/rust-toolchain@v1
with:
toolchain: stable
components: clippy, rustfmt

- name: cache dependencies
uses: Swatinem/[email protected]

- name: reviewdog / clippy
uses: sksat/[email protected]
with:
reporter: ${{ github.event_name == 'pull_request' && 'github-pr-review' || 'github-check' }}
clippy_flags: --all-features

- name: unit test
run: cargo test
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -63,3 +63,7 @@ Examples/minimum_user/build
Examples/2nd_obc_user/src/src_core
Examples/2nd_obc_user/build
*.pyc

# Added by cargo
/target
/Cargo.lock
Loading