From 0499fd03dadb3fc68c5f0db95d1934e12f0db934 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 29 Sep 2021 12:31:22 +0200 Subject: [PATCH 01/12] tmtc update --- tmtc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tmtc b/tmtc index 82495ad7..4bf23fb7 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit 82495ad785c83440ee90846bce70be1659b66209 +Subproject commit 4bf23fb764e3d1eca752a9c928a3b95f2c4272c4 -- 2.43.0 From 82b72e66ee286b8e7d2e29e184cf94607e348b75 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 4 Oct 2021 11:37:54 +0200 Subject: [PATCH 02/12] tmtc update --- tmtc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tmtc b/tmtc index 4bf23fb7..ba866a5f 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit 4bf23fb764e3d1eca752a9c928a3b95f2c4272c4 +Subproject commit ba866a5f0aead78945323b5fe2bfa2a3d3e41f71 -- 2.43.0 From 47733a564894acbbaa726a4136a8d0de4cda91fa Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 5 Oct 2021 01:28:20 +0200 Subject: [PATCH 03/12] fsfw and tmtc update --- fsfw | 2 +- tmtc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fsfw b/fsfw index 3d0ce199..94bd4c7b 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit 3d0ce1998114c5d7a43034233ee03a800c8821b0 +Subproject commit 94bd4c7b56f9f22cdec118df8e681ed30a2f47b3 diff --git a/tmtc b/tmtc index ba866a5f..706f79a1 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit ba866a5f0aead78945323b5fe2bfa2a3d3e41f71 +Subproject commit 706f79a1f2cc7c909fe995e8473ff148f2578083 -- 2.43.0 From 350e494930017df9216d62411fc9b5c02edd1fb3 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 5 Oct 2021 12:23:59 +0200 Subject: [PATCH 04/12] update tmtc --- tmtc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tmtc b/tmtc index 706f79a1..3b2caa73 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit 706f79a1f2cc7c909fe995e8473ff148f2578083 +Subproject commit 3b2caa7326042b18ee921fdd96003acefb547b50 -- 2.43.0 From 448ca372a97240dd65802ac0b057cca9514babbc Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 5 Oct 2021 13:49:10 +0200 Subject: [PATCH 05/12] fsfw update --- fsfw | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fsfw b/fsfw index 94bd4c7b..db801a0e 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit 94bd4c7b56f9f22cdec118df8e681ed30a2f47b3 +Subproject commit db801a0ecc7323f3bc552be0de383c6bb1b29fb7 -- 2.43.0 From a2a6bf1b45f849f07c2c3c702f86ad63ec762f8e Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 6 Oct 2021 18:02:05 +0200 Subject: [PATCH 06/12] tmtc update --- tmtc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tmtc b/tmtc index 3b2caa73..726935f7 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit 3b2caa7326042b18ee921fdd96003acefb547b50 +Subproject commit 726935f77b6fdb8415932d545554f748b5ed1dbb -- 2.43.0 From 1f981e7a603735464413f3da8ac99e0a9bde95c7 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 11 Oct 2021 10:25:40 +0200 Subject: [PATCH 07/12] tmtc update --- tmtc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tmtc b/tmtc index 726935f7..7b49babb 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit 726935f77b6fdb8415932d545554f748b5ed1dbb +Subproject commit 7b49babb1febb3959f0f817aa4b4ce4c32d6d21c -- 2.43.0 From 271d133053e3af808d4f611c18395a15d5c6a136 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 11 Oct 2021 10:47:52 +0200 Subject: [PATCH 08/12] updated comment --- scripts/q7s-port.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/q7s-port.sh b/scripts/q7s-port.sh index 82152898..e350d4c2 100755 --- a/scripts/q7s-port.sh +++ b/scripts/q7s-port.sh @@ -2,7 +2,8 @@ echo "Setting up all Q7S ports" echo "-L 1534:192.168.133.10:1534 for connection to TCF agent" echo "-L 1535:192.168.133.10:22 for file transfers" -echo "-L 1536:192.168.133.10:7301 for TMTC commanding" +echo "-L 1536:192.168.133.10:7301 for TMTC commanding using the TCP/IP IF" +echo "-L 1537:127.0.0.1:7100 for TMTC commanding using the CCSDS IF" ssh -L 1534:192.168.133.10:1534 \ -L 1535:192.168.133.10:22 \ -- 2.43.0 From 10f2a7a7b7725e1ef1c841094fa7282aba3e858d Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 11 Oct 2021 11:06:12 +0200 Subject: [PATCH 09/12] more information about systemd service --- README.md | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index f117535d..fa652ad4 100644 --- a/README.md +++ b/README.md @@ -576,11 +576,30 @@ Note: When now setting up a debug session in the Xilinx SDK or Eclipse, the host to localhost instead of the IP address of the Q7S. # TMTC testing -The OBSW supports sending PUS TM packets via TCP or the PDEC IP Core which transmits the data as CADU frames. To make the CADU frames receivabel by the [TMTC porgram](https://egit.irs.uni-stuttgart.de/eive/eive-tmtc), a python script is running as systemd service on the flatsat PC which forwards TCP commands to the TCP server of the OBC and reads CADU frames from a serial interface. The PUS packets transported with the CADU frames are extracted and forwared to the TMTC program's TCP client. The code of the TMTC bridge can be found [here](https://egit.irs.uni-stuttgart.de/eive/tmtc-bridge). To connect the TMTC program to the TMTC-bridge a port forwarding from a host must be set up with the following command: -```` +The OBSW supports sending PUS TM packets via TCP or the PDEC IP Core which transmits the data as +CADU frames. To make the CADU frames receivabel by the +[TMTC porgram](https://egit.irs.uni-stuttgart.de/eive/eive-tmtc), a python script is running as +`systemd` service named `tmtc_bridge` on the flatsat PC which forwards TCP commands to the TCP +server of the OBC and reads CADU frames from a serial interface. The PUS packets transported with +the CADU frames are extracted +and forwared to the TMTC program's TCP client. The code of the TMTC bridge can be found +[here](https://egit.irs.uni-stuttgart.de/eive/tmtc-bridge). To connect the TMTC program to the +TMTC-bridge a port forwarding from a host must be set up with the following command: + +```sh ssh -L 1537:127.0.0.1:7100 eive@2001:7c0:2018:1099:babe:0:e1fe:f1a5 -t bash -```` -Note: The encoding of the TM packets and conversion of CADU frames takes some time. Thus the replies are received with a larger delay compared to a direct TCP connection. +``` + +You can print the output of the `systemd` with + +```sh +journalctl -u tmtc_bridge +``` + +This can be helpful to determine whether any TCs arrive or TMs are coming back. + +Note: The encoding of the TM packets and conversion of CADU frames takes some time. +Thus the replies are received with a larger delay compared to a direct TCP connection. # Direct Debugging -- 2.43.0 From 7d6022ab0948eb635c920ec189ea4ae09eb70948 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 11 Oct 2021 11:09:53 +0200 Subject: [PATCH 10/12] another helpful command added --- README.md | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index fa652ad4..f345f654 100644 --- a/README.md +++ b/README.md @@ -580,8 +580,15 @@ The OBSW supports sending PUS TM packets via TCP or the PDEC IP Core which trans CADU frames. To make the CADU frames receivabel by the [TMTC porgram](https://egit.irs.uni-stuttgart.de/eive/eive-tmtc), a python script is running as `systemd` service named `tmtc_bridge` on the flatsat PC which forwards TCP commands to the TCP -server of the OBC and reads CADU frames from a serial interface. The PUS packets transported with -the CADU frames are extracted +server of the OBC and reads CADU frames from a serial interface. + +You can check whether the service is running with + +```sh +systemctl status tmtc_bridge +``` + +The PUS packets transported with the CADU frames are extracted and forwared to the TMTC program's TCP client. The code of the TMTC bridge can be found [here](https://egit.irs.uni-stuttgart.de/eive/tmtc-bridge). To connect the TMTC program to the TMTC-bridge a port forwarding from a host must be set up with the following command: -- 2.43.0 From f3f96e02a2512af4ae3c772835fee65477a4c7ed Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 11 Oct 2021 11:10:30 +0200 Subject: [PATCH 11/12] another minor update --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index f345f654..7287d921 100644 --- a/README.md +++ b/README.md @@ -576,13 +576,14 @@ Note: When now setting up a debug session in the Xilinx SDK or Eclipse, the host to localhost instead of the IP address of the Q7S. # TMTC testing + The OBSW supports sending PUS TM packets via TCP or the PDEC IP Core which transmits the data as CADU frames. To make the CADU frames receivabel by the [TMTC porgram](https://egit.irs.uni-stuttgart.de/eive/eive-tmtc), a python script is running as `systemd` service named `tmtc_bridge` on the flatsat PC which forwards TCP commands to the TCP server of the OBC and reads CADU frames from a serial interface. -You can check whether the service is running with +You can check whether the service is running the following command on the flatsat PC ```sh systemctl status tmtc_bridge -- 2.43.0 From 2e0606ff0ca5497ae57a07daaef7330803d5687c Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 11 Oct 2021 11:13:02 +0200 Subject: [PATCH 12/12] README update --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7287d921..ff2c359d 100644 --- a/README.md +++ b/README.md @@ -598,7 +598,7 @@ TMTC-bridge a port forwarding from a host must be set up with the following comm ssh -L 1537:127.0.0.1:7100 eive@2001:7c0:2018:1099:babe:0:e1fe:f1a5 -t bash ``` -You can print the output of the `systemd` with +You can print the output of the `systemd` service with ```sh journalctl -u tmtc_bridge -- 2.43.0