Commit Graph

1736 Commits

Author SHA1 Message Date
Robin Müller f0c14e21e4
prep v2.19.1 2023-03-14 17:14:36 +01:00
Robin Müller fe6390fab3
update csvs 2023-03-14 17:09:47 +01:00
Robin Müller e9bf90e366
retval csv update, now sorted 2023-03-14 15:28:12 +01:00
Robin Müller 362be2288f
update returnvalue csv 2023-03-14 14:22:02 +01:00
Robin Müller 0efd9ca9c6
prep v2.19.0 2023-03-14 14:10:23 +01:00
Robin Müller f21ee37a01
add RTD HK 2023-03-14 10:11:01 +01:00
Robin Müller d8367f7e62 Merge pull request 'MPSoC commands' (#169) from meier/mpsoc-commands into main
Reviewed-on: #169
2023-03-13 11:03:26 +01:00
Robin Müller e862df4d06
some more MPSoC commands 2023-03-13 11:02:57 +01:00
Robin Müller fb851b93a0 Merge branch 'main' into meier/mpsoc-commands 2023-03-13 11:01:43 +01:00
Robin Müller 5337ac4517
afmt 2023-03-13 10:57:23 +01:00
Robin Müller 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
Robin Müller 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
Robin Müller 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
Robin Müller 10362f7d30
added STR temperature set 2023-03-13 10:51:55 +01:00
Robin Müller 21a3813643
afmt 2023-03-13 10:45:49 +01:00
Robin Müller ae2fd8bb37
STR hk handling fix 2023-03-13 10:45:39 +01:00
Robin Müller ca5b2238bc
add RTD ID and SetId enum 2023-03-13 10:35:33 +01:00
Robin Müller d520a0e2f2
add set ID for RTD 2023-03-13 10:31:27 +01:00
Robin Müller 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
Markus Kranz 2c7ad5385e str hk bug fix 2023-03-12 12:54:12 +01:00
Robin Müller a40c881b9f
prep v2.18.1
- Add announce boot counts command
2023-03-11 15:23:02 +01:00
Robin Müller 432a642422
changelog 2023-03-11 15:15:29 +01:00
Robin Müller abfe923b05
missing heater location fix 2023-03-11 15:15:00 +01:00
Robin Müller 65ada579d3
prep v2.18.0 2023-03-11 15:07:29 +01:00
Robin Müller 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
Robin Müller f4e9091484
re-generate files 2023-03-11 15:01:19 +01:00
Robin Müller e334521e6d Merge remote-tracking branch 'origin/main' into refactor_tm_handling 2023-03-11 15:01:00 +01:00
Robin Müller cd0fd4d5a7
new events 2023-03-10 21:01:25 +01:00
Robin Müller 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
Robin Müller 26cd265e19
new events, retvals, objects 2023-03-10 19:06:28 +01:00
Marius Eggert a4984c34c2 lil changelog 2023-03-10 17:53:58 +01:00
Marius Eggert 948ad4ef7f Merge branch 'main' into acs-ctrl-updates-v2 2023-03-10 17:43:45 +01:00
Robin Müller e32a6ded66
object stirng update 2023-03-10 15:36:15 +01:00
Robin Müller 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
Robin Müller 9f905524b6
small fix 2023-03-10 14:08:31 +01:00
Robin Müller d5685adb48 Merge branch 'main' into refactor_acs_modes 2023-03-10 13:39:44 +01:00
Robin Müller 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
Robin Müller 05429d2048
run black 2023-03-10 13:38:21 +01:00
Robin Müller 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
Marius Eggert fd692c901d Merge branch 'main' into acs-ctrl-updates-v2 2023-03-10 09:31:00 +01:00
Robin Müller b0f51072b2 Merge pull request 'fixed bug in dipoles set' (#161) from zink_imtq into main
Reviewed-on: #161
2023-03-09 17:57:01 +01:00
Julia Zink be5cf32dc8 fixed bug in dipoles set 2023-03-09 17:50:40 +01:00
Robin Müller cbbb335254
prep v2.17.3 2023-03-09 17:01:50 +01:00
Robin Müller 42434cbe7e Merge pull request 'obj ID fixes' (#160) from heater_obj_id_fixes into main
Reviewed-on: #160
2023-03-09 16:58:36 +01:00
Robin Müller bf158bee2d
fix for heater names
- Heater 7 HPA -> Syrlinks
2023-03-09 16:40:59 +01:00
Robin Müller 80539cf897
obj ID fixes 2023-03-09 16:30:24 +01:00
Robin Müller ffd2eb11f8 Merge pull request 'Add missing HK' (#159) from add_missing_hk into main
Reviewed-on: #159
2023-03-08 19:59:07 +01:00