support linux for uart and ccsds on SILS #341

flap1 · 2022-06-08T09:59:26Z

概要

linux環境でのport通信をサポート
Examples/minimum_user_for_s2e/src/src_user/IfWrapper/Sils/sils_sci_if.hppでport通信の基底クラスSCIComPortを定義

Issue

詳細

Linuxのnull modem emulator(tty0tty)を利用
実行環境に合わせて実行される(WIN32を用いている)のでVSを用いた実行結果に影響はない
- 地上局でもportを合わせる必要がある
sils_sci_if.hppでクラスSCIComPortを定義, ccsds_sils_sci_if.hppとuart_sils_sci_if.hppのそれぞれで継承している(中身は同じなので継承させる必要はないかもしれない)

検証結果

Windows環境での動作には影響を与えない
Ubuntu22.04上で動作確認済み

影響範囲

地上局でも対応が必要

補足

注意

Examples/minimum_user_for_s2e/src/src_user/IfWrapper/Sils/sils_sci_if.cpp

Examples/minimum_user_for_s2e/src/src_user/IfWrapper/Sils/ccsds_sils_sci_if.hpp

Examples/minimum_user_for_s2e/src/src_user/IfWrapper/Sils/uart_sils_sci_if.hpp

Examples/minimum_user_for_s2e/src/src_user/IfWrapper/Sils/sils_sci_if.hpp

meltingrabbit · 2022-06-08T10:01:17Z

C用のフォーマットチェックがC++に刺さっとるな

sksat · 2022-06-08T10:02:35Z

あーそういうことか．普段ここでC++書かれることないから...

meltingrabbit · 2022-06-08T10:03:24Z

Allmanスタイルの場合， SCIComPortUart(int port) : SCIComPort(port){} ってどうなるんだ？

流石に改行するか．

meltingrabbit · 2022-06-08T10:06:21Z

まあ，最悪

https://github.com/ut-issl/c2a-core/blob/develop/Script/CI/check_coding_rule.json

に追記してもらえれば大丈夫そう．

Examples/minimum_user_for_s2e/src/src_user/IfWrapper/Sils/sils_sci_if.cpp

meltingrabbit · 2022-06-08T10:12:33Z

ロジック変わってなくても，コード自体は変わってるので，windowsでもpytestをぜんぶ走らせ直しておいてもらえると 🙏

Examples/minimum_user_for_s2e/src/src_user/IfWrapper/Sils/ccsds_sils_sci_if.hpp

Examples/minimum_user_for_s2e/src/src_user/IfWrapper/Sils/sils_sci_if.cpp

Examples/minimum_user_for_s2e/src/src_user/IfWrapper/Sils/ccsds_sils_sci_if.hpp

Examples/minimum_user_for_s2e/src/src_user/IfWrapper/Sils/ccsds_sils_sci_if.cpp

Examples/minimum_user_for_s2e/src/src_user/IfWrapper/Sils/sils_sci_if.cpp

flap1 · 2022-06-08T11:56:01Z

該当ファイルをcheck_coding_rule.jsonに加えましたが弾かれました
原因がわかりません

flap1 · 2022-06-09T02:02:14Z

check_encodingを解決しました

meltingrabbit · 2022-06-09T21:57:04Z

Examples/minimum_user_for_s2e/src/src_user/IfWrapper/Sils/ccsds_sils_sci_if.cpp

@@ -3,116 +3,24 @@
 * @file
 * @brief   ccsds_sils_sci_if
 * @details WINGS TMTC IFとCCSDSのTransfer FrameをSCI COMでやりとりするIF
-            Windows上でcom0comを使うことを想定


[IMO] これは残しておいた方がいい？

Windowsでは ，とか

残した上で一行追加しました

Examples/minimum_user_for_s2e/src/src_user/IfWrapper/Sils/ccsds_sils_sci_if.hpp

Examples/minimum_user_for_s2e/src/src_user/IfWrapper/Sils/sils_sci_if.cpp

flap1 · 2022-10-28T17:36:45Z

@chutaro @yngyu @meltingrabbit
レビューお願いしますー

chutaro

良さそうです．お疲れさまでした！

chutaro · 2022-10-30T05:22:42Z

@meltingrabbit いちおう最後に見て approve お願いします

meltingrabbit · 2022-10-30T08:31:53Z

これ，コード規約どうするか～

まあ， C++ のコードなので，無視してもいいんだけど，若干気になるよね．

C2A の規約に合わせるなら，

SCIComPort > SciComPort
myHComPort_ > com_port_handle_ とか？

なんだけど，どうしよう？ @chutaro

meltingrabbit · 2022-10-30T08:34:48Z

Examples/minimum_user/src/src_user/IfWrapper/Sils/sils_sci_if.hpp

+  int myHComPort_;
+  struct termios config_;
+#endif
+  bool init_success;


[IMO] これも bool だし，
init_succeeded とかのほうが良さそう．

このコード，かなり古いコードなので，ついでに色々直したい）

まあ，上のコメントとあわせて，命名規則修正などは別 PR でやる，ってのも OK です．

このPR長引きすぎてるので、これは一回マージしてコード規約は別PR、でどうでしょう？

じゃ，そうしましょうか．
issue立てとくね

ありがとうございます

#463 これで @flap1

chutaro · 2022-10-30T08:38:00Z

@flap1 あと最新のdevelop からrebaseしといてください！

meltingrabbit · 2022-10-30T08:52:15Z

あ～，これ 2nd obc の方直ってないなぁ．．．．直すか～

meltingrabbit · 2022-10-30T08:53:10Z

71c74dc で最低限の命名直してます．

meltingrabbit · 2022-10-30T08:59:59Z

d8778b9 で 2nd obc 対応してます．

ざっと見てもらえると

flap1 · 2022-10-31T07:28:37Z

最新のdevelopからrebaseしました。
@chutaro @meltingrabbit @yngyu
これ自分がmergeしちゃって大丈夫でしょうか。

meltingrabbit · 2022-10-31T07:35:54Z

2nd obcのテストって回してる？回してたらok！

yngyu · 2022-11-13T14:24:49Z

本当に遅くなってすいません、2nd obc の Test が Windows で通ることを確認しました、 Linux でのテストはまた時間がかかりそうなので別 issue 切るとして一旦マージしてもよろしいでしょうか...?

meltingrabbit · 2022-11-13T14:55:08Z

@yngyu @flap1 よさそう．
rebase して CI とおしてからマージしてください！

meltingrabbit · 2023-04-24T12:44:10Z

rebase してくれてそう？
ちょっとだいぶ古くなったので，再度チェックしましょうか？

github-actions bot reviewed Jun 8, 2022

View reviewed changes

meltingrabbit added this to In progress in C2A via automation Jun 8, 2022

meltingrabbit added enhancement New feature or request priority::medium priority medium labels Jun 8, 2022

meltingrabbit requested review from meltingrabbit and sksat June 8, 2022 10:06

meltingrabbit assigned flap1 Jun 8, 2022

flap1 force-pushed the feature/support_linux branch from 81fe7a7 to 7496882 Compare June 8, 2022 10:07

github-actions bot reviewed Jun 8, 2022

View reviewed changes

Examples/minimum_user_for_s2e/src/src_user/IfWrapper/Sils/sils_sci_if.cpp Outdated Show resolved Hide resolved

meltingrabbit reviewed Jun 8, 2022

View reviewed changes

Examples/minimum_user_for_s2e/src/src_user/IfWrapper/Sils/ccsds_sils_sci_if.hpp Outdated Show resolved Hide resolved

meltingrabbit reviewed Jun 8, 2022

View reviewed changes

Examples/minimum_user_for_s2e/src/src_user/IfWrapper/Sils/sils_sci_if.cpp Outdated Show resolved Hide resolved

flap1 force-pushed the feature/support_linux branch from 7496882 to 40e386a Compare June 8, 2022 10:16

meltingrabbit reviewed Jun 8, 2022

View reviewed changes

Examples/minimum_user_for_s2e/src/src_user/IfWrapper/Sils/ccsds_sils_sci_if.hpp Outdated Show resolved Hide resolved

meltingrabbit reviewed Jun 8, 2022

View reviewed changes

Examples/minimum_user_for_s2e/src/src_user/IfWrapper/Sils/ccsds_sils_sci_if.cpp Outdated Show resolved Hide resolved

meltingrabbit reviewed Jun 8, 2022

View reviewed changes

Examples/minimum_user_for_s2e/src/src_user/IfWrapper/Sils/sils_sci_if.cpp Outdated Show resolved Hide resolved

flap1 force-pushed the feature/support_linux branch 3 times, most recently from 400411a to c0ffc1e Compare June 8, 2022 11:46

flap1 force-pushed the feature/support_linux branch 2 times, most recently from d01c6f4 to 7bddf76 Compare June 9, 2022 01:48

meltingrabbit reviewed Jun 9, 2022

View reviewed changes

Examples/minimum_user_for_s2e/src/src_user/IfWrapper/Sils/ccsds_sils_sci_if.hpp Outdated Show resolved Hide resolved

meltingrabbit reviewed Jun 9, 2022

View reviewed changes

Examples/minimum_user_for_s2e/src/src_user/IfWrapper/Sils/sils_sci_if.cpp Outdated Show resolved Hide resolved

chutaro requested a review from meltingrabbit October 26, 2022 02:28

chutaro approved these changes Oct 30, 2022

View reviewed changes

meltingrabbit changed the title ~~support linux~~ support linux for uart and ccsds on SILS Oct 30, 2022

meltingrabbit reviewed Oct 30, 2022

View reviewed changes

meltingrabbit mentioned this pull request Oct 30, 2022

sils_sci_if まわりの古いコードのコード規約を直す #463

Open

meltingrabbit force-pushed the feature/support_linux branch from 5d0f3de to d8778b9 Compare October 30, 2022 17:24

flap1 force-pushed the feature/support_linux branch from 27c97bb to 00bdfb1 Compare October 31, 2022 07:24

meltingrabbit mentioned this pull request Nov 7, 2022

v3.8.0 リリース準備 #468

Closed

12 tasks

meltingrabbit approved these changes Nov 13, 2022

View reviewed changes

meltingrabbit mentioned this pull request Mar 26, 2023

v3.9.0 リリース準備 #514

Closed

25 tasks

flap1 and others added 6 commits April 17, 2023 07:30

support linux

55386ec

delete unnecessary line

76ee713

fix var names

ceba402

fix func name

9fe5847

fix for 2nd obc

5ec415e

fix typo

66ef89b

flap1 force-pushed the feature/support_linux branch from 00bdfb1 to 66ef89b Compare April 16, 2023 22:30

meltingrabbit mentioned this pull request Jun 19, 2023

v3.11.0 リリース準備 #616

Open

10 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

support linux for uart and ccsds on SILS #341

support linux for uart and ccsds on SILS #341

flap1 commented Jun 8, 2022 •

edited

Loading

meltingrabbit commented Jun 8, 2022

sksat commented Jun 8, 2022

meltingrabbit commented Jun 8, 2022 •

edited

Loading

meltingrabbit commented Jun 8, 2022

meltingrabbit commented Jun 8, 2022

flap1 commented Jun 8, 2022

flap1 commented Jun 9, 2022

meltingrabbit Jun 9, 2022

flap1 Oct 26, 2022

flap1 commented Oct 28, 2022

chutaro left a comment •

edited

Loading

chutaro commented Oct 30, 2022

meltingrabbit commented Oct 30, 2022

meltingrabbit Oct 30, 2022

chutaro Oct 30, 2022

meltingrabbit Oct 30, 2022

chutaro Oct 30, 2022

meltingrabbit Oct 30, 2022

chutaro commented Oct 30, 2022

meltingrabbit commented Oct 30, 2022

meltingrabbit commented Oct 30, 2022

meltingrabbit commented Oct 30, 2022 •

edited

Loading

flap1 commented Oct 31, 2022

meltingrabbit commented Oct 31, 2022

yngyu commented Nov 13, 2022 •

edited

Loading

meltingrabbit commented Nov 13, 2022

meltingrabbit commented Apr 24, 2023

support linux for uart and ccsds on SILS #341

Are you sure you want to change the base?

support linux for uart and ccsds on SILS #341

Conversation

flap1 commented Jun 8, 2022 • edited Loading

概要

Issue

詳細

検証結果

影響範囲

補足

注意

meltingrabbit commented Jun 8, 2022

sksat commented Jun 8, 2022

meltingrabbit commented Jun 8, 2022 • edited Loading

meltingrabbit commented Jun 8, 2022

meltingrabbit commented Jun 8, 2022

flap1 commented Jun 8, 2022

flap1 commented Jun 9, 2022

meltingrabbit Jun 9, 2022

Choose a reason for hiding this comment

flap1 Oct 26, 2022

Choose a reason for hiding this comment

flap1 commented Oct 28, 2022

chutaro left a comment • edited Loading

Choose a reason for hiding this comment

chutaro commented Oct 30, 2022

meltingrabbit commented Oct 30, 2022

meltingrabbit Oct 30, 2022

Choose a reason for hiding this comment

chutaro Oct 30, 2022

Choose a reason for hiding this comment

meltingrabbit Oct 30, 2022

Choose a reason for hiding this comment

chutaro Oct 30, 2022

Choose a reason for hiding this comment

meltingrabbit Oct 30, 2022

Choose a reason for hiding this comment

chutaro commented Oct 30, 2022

meltingrabbit commented Oct 30, 2022

meltingrabbit commented Oct 30, 2022

meltingrabbit commented Oct 30, 2022 • edited Loading

flap1 commented Oct 31, 2022

meltingrabbit commented Oct 31, 2022

yngyu commented Nov 13, 2022 • edited Loading

meltingrabbit commented Nov 13, 2022

meltingrabbit commented Apr 24, 2023

flap1 commented Jun 8, 2022 •

edited

Loading

meltingrabbit commented Jun 8, 2022 •

edited

Loading

chutaro left a comment •

edited

Loading

meltingrabbit commented Oct 30, 2022 •

edited

Loading

yngyu commented Nov 13, 2022 •

edited

Loading