Commit Graph

309 Commits

Author SHA1 Message Date
389836c10f Merge pull request 'v1.7.1' (#10) from develop into master
Reviewed-on: #10
2021-07-27 09:39:52 +02:00
ed1d9a81ed Merge branch 'master' into develop 2021-07-27 09:39:44 +02:00
132d9d2456 Merge pull request 'v1.7.1' (#9) from v1.7.1 into develop
Reviewed-on: #9
2021-07-26 18:17:33 +02:00
6f8d63ba87 Merge pull request 'v1.7.0' (#8) from develop into master
Reviewed-on: #8
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2021-07-26 18:17:08 +02:00
1f990e9647
v1.7.1 2021-07-26 17:57:19 +02:00
2a6c0a6cab
tmtccmd update 2021-07-26 17:53:38 +02:00
9aaf3cfa7a
tmtccmd update 2021-07-26 17:29:49 +02:00
a81b8b608d
assigned packet ID for tcp com if 2021-07-26 17:24:53 +02:00
Jakob.Meier
75ae2c786b update availabe and watchdogs enable command 2021-07-26 16:29:54 +02:00
6758ecef0d
service 200 handler (but test task missing) 2021-07-26 14:13:58 +02:00
Jakob.Meier
6352a6f272 Merge branch 'develop' into meier/plocSupervisor 2021-07-25 20:39:49 +02:00
Jakob.Meier
390081d00e ploc supervisor get boot status report added, not tested 2021-07-25 17:56:36 +02:00
2e942ec21e
printing own and tmtccmd version now
tmtccmd updated to v1.7.2
2021-07-24 14:58:47 +02:00
3436172026 Merge branch 'develop' of https://egit.irs.uni-stuttgart.de/eive/eive_tmtc into develop 2021-07-24 14:41:35 +02:00
7302b10e06
bumped version number 2021-07-24 14:41:23 +02:00
193060ea65 Merge pull request 'meier/plocSupervisor' (#7) from meier/plocSupervisor into develop
Reviewed-on: #7
2021-07-24 14:40:57 +02:00
Jakob.Meier
e552a92db4 all object ids are of bytes type now 2021-07-24 13:39:15 +02:00
Jakob.Meier
b0e78beaff Merge branch 'develop' into meier/plocSupervisor 2021-07-24 12:12:20 +02:00
Jakob.Meier
6d3be2af33 removed unused code in ploc_supervisor.py 2021-07-24 12:08:12 +02:00
Jakob.Meier
b0ef4446d5 ploc supervisor tests 2021-07-23 13:40:27 +02:00
Jakob.Meier
d55a12a100 ploc supervisor get hk test 2021-07-11 14:29:11 +02:00
Jakob.Meier
ec0ef1a4f7 renamed ploc mpsoc object id 2021-07-09 12:57:39 +02:00
Jakob.Meier
3b073a7eef corrected object ids of reaction wheels 2021-07-08 11:23:16 +02:00
941f46401e
deleted tmtc_core 2021-07-01 14:52:22 +02:00
2a38b1b16f Merge pull request 'meier/reactionwheels' (#6) from meier/reactionwheels into develop
Reviewed-on: #6
2021-07-01 14:50:41 +02:00
fe1bed900a added mode commanding for radiation sensor 2021-07-01 11:52:25 +02:00
7a15062efe fixed merge conflict in object ids 2021-06-30 15:12:10 +02:00
953f02e895 tmtccmd udpate 2021-06-30 15:10:57 +02:00
c226491b6c Merge remote-tracking branch 'origin' into meier/reactionwheels 2021-06-30 15:09:17 +02:00
da2968a512 reaction wheel get telemetry 2021-06-30 15:08:43 +02:00
96e9f26fd0
added linter 2021-06-30 11:18:57 +02:00
011fea37a0
tmtccmd update 2021-06-30 11:17:57 +02:00
78b6830782 rw4 increased timout 2021-06-29 17:28:04 +02:00
09cab1941f modified run configs 2021-06-29 16:10:03 +02:00
Martin Zietz
a8ea01bb2f added run configs for reaction wheels 2021-06-29 09:51:54 +02:00
9d98eb6b60
renaming logging functions 2021-06-28 19:06:09 +02:00
8048c50c22
tmtccmd update 2021-06-28 18:55:14 +02:00
98deb8444f
updated gitignore 2021-06-28 17:49:13 +02:00
Martin Zietz
10ea97ff0b add init command 2021-06-28 14:08:04 +02:00
Martin Zietz
19b76d961c rw test fixes 2021-06-25 15:25:22 +02:00
899cd942ce reaction wheel commands 2021-06-25 12:16:35 +02:00
3d26373726 reaction wheel set speed command 2021-06-25 12:07:16 +02:00
36582621f2 merge 2021-06-24 17:39:23 +02:00
2a9862489d
updated object ids again 2021-06-24 16:49:19 +02:00
8a66b2a721
updated TMTC IDs 2021-06-24 16:42:58 +02:00
f4e5bc1956
updated object IDS 2021-06-24 16:34:51 +02:00
5be05c2a92
tmtccmd update 2021-06-21 18:40:05 +02:00
0eb6736692 Merge pull request 'Update to v1.6.1' (#5) from develop into master
Reviewed-on: eive/eive_tmtc#5
2021-06-21 17:41:58 +02:00
20a44b4b67 Merge branch 'master' into develop 2021-06-21 17:41:46 +02:00
3927377e94
bumped revision 2021-06-21 17:36:37 +02:00