Commit Graph

670 Commits

Author SHA1 Message Date
Jakob.Meier
b0f6551c0a Merge branch 'develop' into meier/develop 2021-08-20 11:35:26 +02:00
Jakob.Meier
a47925859b Merge branch 'meier/plocUpdater' into develop 2021-08-20 11:34:43 +02:00
ce5596f566 Merge pull request 'meier/plocUpdater' (#19) from meier/plocUpdater into develop
Reviewed-on: #19
2021-08-20 09:42:14 +02:00
ccf38bbbef Merge branch 'develop' into meier/plocUpdater 2021-08-20 09:40:46 +02:00
Jakob.Meier
77e46c12ba Merge branch 'develop' into meier/plocUpdater 2021-08-20 08:41:51 +02:00
Jakob.Meier
a0d586d753 supervisor update commanding 2021-08-20 08:40:18 +02:00
a7f1ed904c Merge branch 'mueller/master' of https://egit.irs.uni-stuttgart.de/eive/eive-tmtc into mueller/master 2021-08-19 17:03:18 +02:00
28c2d2015c
tmtccmd update 2021-08-19 10:16:40 +02:00
Jakob.Meier
df8f86ebd6 Merge branch 'meier/pcduSwitchCommanding' into meier/develop 2021-08-18 08:27:37 +02:00
Jakob.Meier
c125a62612 ploc commanding tcp 2021-08-18 08:27:07 +02:00
261eef449e updated object ID 2021-08-17 19:48:55 +02:00
573d2dca52 Merge pull request 'meier/pcduSwitchCommanding' (#18) from meier/pcduSwitchCommanding into develop
Reviewed-on: #18
2021-08-17 17:04:04 +02:00
28e527b8f9 lowered timeout 2021-08-17 16:35:27 +02:00
5c60914638 tmtccmd update 2021-08-17 16:07:22 +02:00
72b743f5ee Merge remote-tracking branch 'origin/develop' into mueller/master 2021-08-17 16:07:10 +02:00
Jakob.Meier
5b2ff49555 fixed 3v3 switch double off 2021-08-17 11:55:38 +02:00
Jakob.Meier
5574fe91c7 turn on stack 3V3 2021-08-17 11:49:37 +02:00
Jakob.Meier
84485a245b turn acs board side A on 2021-08-17 10:37:13 +02:00
0a2f1b3feb
removed some functions 2021-08-16 14:20:22 +02:00
Jakob.Meier
95c5aa46d9 star tracker ping command 2021-08-16 10:03:40 +02:00
Jakob.Meier
950adf36ed op_code to turn star tracker and sus nominal off 2021-08-13 09:34:44 +02:00
Jakob.Meier
e5dc68c819 turn sus nominal on 2021-08-12 17:17:28 +02:00
Jakob.Meier
30bb3c8778 pdu2 star tracker switch on 2021-08-12 15:07:03 +02:00
387a076a21
printing length as well 2021-08-11 19:32:51 +02:00
25f8543a8d
need to return something as well 2021-08-11 19:26:40 +02:00
5713bf0806
gps data handler function 2021-08-11 19:16:08 +02:00
Jakob.Meier
c7f5db0f53 op_code fix 2021-08-11 17:14:30 +02:00
Jakob.Meier
0c99bc9d11 star tracker on command 2021-08-11 16:49:32 +02:00
84656b90fc
tmtccmd update 2021-08-11 15:52:56 +02:00
cc6dbd8ef9 Merge pull request 'bumped version to v1.8.0' (#17) from develop into master
Reviewed-on: #17
2021-08-09 15:49:56 +02:00
3cd7de5649 Merge branch 'master' into develop 2021-08-09 15:49:50 +02:00
f8b36a651d
bumped version 2021-08-09 15:49:07 +02:00
82c8090afd Merge pull request 'Release v1.8.0' (#16) from develop into master
Reviewed-on: #16
2021-08-09 15:46:53 +02:00
fac74219f0 Merge branch 'master' into develop 2021-08-09 14:39:52 +02:00
3305e1d489 Merge pull request 'Update TMTC and linter script' (#15) from mueller/master into develop
Reviewed-on: #15
2021-08-09 14:19:43 +02:00
7c598f26a8
instructions to run linter 2021-08-09 11:45:01 +02:00
5ea6903881
updated linter python script 2021-08-09 11:38:37 +02:00
6824e7d8c7
made CLI and GUI executable 2021-08-09 11:31:08 +02:00
ca63149a67
Merge remote-tracking branch 'origin/develop' into mueller/master 2021-08-09 11:29:55 +02:00
f00cd8f6bd Merge pull request 'meier/plocSupervisor' (#14) from meier/plocSupervisor into develop
Reviewed-on: #14
2021-08-09 11:28:39 +02:00
Jakob.Meier
547b4b2137 fixed conflicts 2021-08-08 15:20:28 +02:00
Jakob.Meier
e7d8199e67 ploc updater commands 2021-08-08 15:02:29 +02:00
Jakob.Meier
98a1d0f856 supervisor CAN loopback test 2021-08-08 10:58:14 +02:00
Jakob.Meier
36ae6a233c ploc udpater test 2021-08-07 14:34:26 +02:00
3e8626bfaf
tmtccmd update 2021-08-04 17:40:39 +02:00
a226bf659e Merge pull request 'added reboot command' (#12) from mueller/master into develop
Reviewed-on: #12
2021-08-04 10:02:42 +02:00
bc32472d88
added reboot command 2021-08-03 15:28:28 +02:00
Jakob.Meier
4aebf4c0d9 debug tcs added 2021-08-02 15:28:34 +02:00
477743f626 Merge pull request 'meier/plocSupervisor' (#11) from meier/plocSupervisor into develop
Reviewed-on: #11
2021-08-02 12:59:04 +02:00
Jakob.Meier
d782aa2715 space packet id typo 2021-08-02 11:30:20 +02:00