Commit Graph

1743 Commits

Author SHA1 Message Date
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
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
e9bf90e366
retval csv update, now sorted 2023-03-14 15:28:12 +01:00
362be2288f
update returnvalue csv 2023-03-14 14:22:02 +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
ca5b2238bc
add RTD ID and SetId enum 2023-03-13 10:35:33 +01:00
d520a0e2f2
add set ID for RTD 2023-03-13 10:31:27 +01:00
c99a0701d2 Merge pull request 'str hk bug fix' (#166) from kranz_str_hk_handling into main
Reviewed-on: #166
2023-03-12 14:26:40 +01:00
2c7ad5385e str hk bug fix 2023-03-12 12:54:12 +01:00
a40c881b9f
prep v2.18.1
- Add announce boot counts command
2023-03-11 15:23:02 +01:00
432a642422
changelog 2023-03-11 15:15:29 +01:00
abfe923b05
missing heater location fix 2023-03-11 15:15:00 +01:00
65ada579d3
prep v2.18.0 2023-03-11 15:07:29 +01:00
fce0c4400b Merge pull request 'new events, retvals, objects' (#165) from refactor_tm_handling into main
Reviewed-on: #165
2023-03-11 15:02:16 +01:00
f4e9091484
re-generate files 2023-03-11 15:01:19 +01:00
e334521e6d Merge remote-tracking branch 'origin/main' into refactor_tm_handling 2023-03-11 15:01:00 +01:00
cd0fd4d5a7
new events 2023-03-10 21:01:25 +01:00
4686550eb9 Merge pull request 'acs-ctrl-updates-v2' (#164) from acs-ctrl-updates-v2 into main
Reviewed-on: #164
2023-03-10 19:07:41 +01:00
26cd265e19
new events, retvals, objects 2023-03-10 19:06:28 +01:00
a4984c34c2 lil changelog 2023-03-10 17:53:58 +01:00
948ad4ef7f Merge branch 'main' into acs-ctrl-updates-v2 2023-03-10 17:43:45 +01:00
e32a6ded66
object stirng update 2023-03-10 15:36:15 +01:00
0add5c6ac5 Merge pull request 'Refactor ACS modes' (#163) from refactor_acs_modes into main
Reviewed-on: #163
2023-03-10 15:00:12 +01:00
9f905524b6
small fix 2023-03-10 14:08:31 +01:00
d5685adb48 Merge branch 'main' into refactor_acs_modes 2023-03-10 13:39:44 +01:00
4acae93206 Merge pull request 'added missing str parameters' (#162) from zink_str into main
Reviewed-on: #162
2023-03-10 13:38:32 +01:00
05429d2048
run black 2023-03-10 13:38:21 +01:00
a249d71840
changelog 2023-03-10 13:37:17 +01:00
Julia Zink
a5cc03d8a0 added missing str parameters 2023-03-10 13:16:14 +01:00
fd692c901d Merge branch 'main' into acs-ctrl-updates-v2 2023-03-10 09:31:00 +01:00