Commit Graph

1968 Commits

Author SHA1 Message Date
996d102a39 Merge branch 'main' of https://egit.irs.uni-stuttgart.de/eive/eive-tmtc 2023-03-24 01:19:50 +01:00
9f17661f52 Merge pull request 'blub' (#175) from kranz_enum into main
Reviewed-on: #175
2023-03-23 13:59:31 +01:00
67d3cebed8 blub 2023-03-23 13:49:11 +01:00
d71f043704 new event 2023-03-23 10:44:26 +01:00
2263938b8b
update str generated files 2023-03-22 01:14:28 +01:00
c171654d2b
description fix 2023-03-21 23:59:45 +01:00
47a5dd4523
update retvals 2023-03-21 23:57:49 +01:00
e612e086ab
Merge remote-tracking branch 'origin/main' into thermal_controller 2023-03-21 23:43:13 +01:00
c5b8831b43
well thats annoying 2023-03-21 23:34:46 +01:00
7af0349a87
prep v2.19.3 2023-03-21 23:28:47 +01:00
934a147caa
re-run generators, black 2023-03-21 23:27:42 +01:00
c9b269b01a
improve STR code 2023-03-21 17:00:53 +01:00
7296344730 Merge remote-tracking branch 'origin/main' into thermal_controller 2023-03-21 14:18:20 +01:00
b32a9273ae
new returnvalues 2023-03-21 12:46:25 +01:00
e5a09e148b
prep v2.19.2 2023-03-17 18:05:15 +01:00
d3f9a83af8 Merge remote-tracking branch 'origin/main' into thermal_controller 2023-03-16 17:47:29 +01:00
350e5d77b8
add new event 2023-03-16 17:45:08 +01:00
a93381494a Merge pull request 'enum' (#173) from kranz_another_very_important_enum_really_tho into main
Reviewed-on: #173
2023-03-16 14:46:31 +01:00
9b56a3ce06 also really important 2023-03-16 14:41:52 +01:00
a3bdfe8b04 enum 2023-03-16 14:35:27 +01:00
9b503678c9 Merge pull request 'Added action command to ACS Ctrl to restore MEKF automatic recovery' (#171) from acs-ctrl-new-act-cmd into main
Reviewed-on: #171
2023-03-16 11:44:20 +01:00
298ecba373 Merge branch 'main' into acs-ctrl-new-act-cmd 2023-03-16 11:44:06 +01:00
45aa63b4ab Merge pull request 'tmp enum' (#172) from kranz_enum into main
Reviewed-on: #172
2023-03-16 11:43:55 +01:00
5245cbfdd0 tmp enum 2023-03-16 11:21:40 +01:00
a54e5a8e14
Merge remote-tracking branch 'origin/main' into thermal_controller 2023-03-14 18:50:22 +01:00
4f48c25bf7
changelog 2023-03-14 18:11:09 +01:00
d45c6bce97
unpack and use packet DT 2023-03-14 18:09:52 +01:00
5692d70de1 Merge branch 'main' into acs-ctrl-new-act-cmd 2023-03-14 17:27:29 +01:00
3974d4134a added action command to restore mekf automatic recovery 2023-03-14 17:24:21 +01:00
f0c14e21e4
prep v2.19.1 2023-03-14 17:14:36 +01:00
fe6390fab3
update csvs 2023-03-14 17:09:47 +01:00
5e17ea9bf0
bump retval, ordered now 2023-03-14 15:34:06 +01:00
e9bf90e366
retval csv update, now sorted 2023-03-14 15:28:12 +01:00
99d2c0e0ca
update events/retvals again 2023-03-14 14:25:21 +01:00
362be2288f
update returnvalue csv 2023-03-14 14:22:02 +01:00
98617b5ce5
update events and retvals 2023-03-14 14:16:44 +01:00
0efd9ca9c6
prep v2.19.0 2023-03-14 14:10:23 +01:00
f21ee37a01
add RTD HK 2023-03-14 10:11:01 +01:00
d8367f7e62 Merge pull request 'MPSoC commands' (#169) from meier/mpsoc-commands into main
Reviewed-on: #169
2023-03-13 11:03:26 +01:00
e862df4d06
some more MPSoC commands 2023-03-13 11:02:57 +01:00
fb851b93a0 Merge branch 'main' into meier/mpsoc-commands 2023-03-13 11:01:43 +01:00
5337ac4517
afmt 2023-03-13 10:57:23 +01:00
0ebb237787 Merge pull request 'fixed star tracker bug' (#168) from zink_startracker into main
Reviewed-on: #168
2023-03-13 10:57:03 +01:00
de0ecb44e4 Merge branch 'main' into zink_startracker 2023-03-13 10:56:58 +01:00
Julia Zink
42c34b310e Merge remote-tracking branch 'origin/main' into zink_startracker
# Conflicts:
#	eive_tmtc/tmtc/acs/star_tracker.py
2023-03-13 10:56:17 +01:00
c274615aac
missing set ID router 2023-03-13 10:53:41 +01:00
Julia Zink
e3e74c3f20 fixed star tracker bug 2023-03-13 10:52:31 +01:00
10362f7d30
added STR temperature set 2023-03-13 10:51:55 +01:00
21a3813643
afmt 2023-03-13 10:45:49 +01:00
ae2fd8bb37
STR hk handling fix 2023-03-13 10:45:39 +01:00