Commit Graph

1751 Commits

Author SHA1 Message Date
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
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
cbbb335254
prep v2.17.3 2023-03-09 17:01:50 +01:00
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
bf158bee2d
fix for heater names
- Heater 7 HPA -> Syrlinks
2023-03-09 16:40:59 +01:00
80539cf897
obj ID fixes 2023-03-09 16:30:24 +01:00
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
ed5cb87cad
thats a large set 2023-03-08 19:57:28 +01:00
4386b18049
add dipole set handling 2023-03-08 19:36:57 +01:00
a3e03350fa
prep v2.17.2 2023-03-08 19:19:01 +01:00
d758a1f11a Merge pull request 'STR ASSY' (#158) from str_assy into main
Reviewed-on: #158
2023-03-08 18:10:28 +01:00
af17e30676
new object ID 2023-03-08 16:45:02 +01:00
5652305ee1 Merge pull request 'New events for core controller' (#157) from feature_reboot_flags into main
Reviewed-on: #157
2023-03-08 11:41:50 +01:00
a3f5c92654
re-generate csvs 2023-03-08 11:30:36 +01:00
2e21087c6d +rad2deg -opIds +setInterval 2023-03-07 11:07:01 +01:00
e74e751142
re-run black 2023-03-07 10:11:11 +01:00
d43badaddf
add better assy names, group legacy object IDs 2023-03-07 10:10:14 +01:00
26b292f05a
prep v2.17.1 2023-03-07 10:08:01 +01:00
6f397289ca
add MGT_ASSEMBLY object ID as well 2023-03-07 10:06:58 +01:00
3d4ef7003c
bump changelog 2023-03-07 10:05:15 +01:00
bf31810f25
prep v2.17.0 2023-03-07 10:03:22 +01:00
9462a6e245
add some more objects 2023-03-06 14:25:04 +01:00
208d328683 Merge pull request 'imtq_assy' (#156) from imtq_assy into main
Reviewed-on: #156
2023-03-06 14:00:51 +01:00
90ea903c0a Merge branch 'main' into imtq_assy 2023-03-06 14:00:39 +01:00
2aa1ecd3a7
changelog 2023-03-06 13:58:52 +01:00
f18a7f49cf
add health set and announce health impl 2023-03-06 13:09:28 +01:00
7f872c92c4
add object prompt to test assy 2023-03-06 12:03:51 +01:00
82352bc5fa
add imtq assy 2023-03-06 11:38:34 +01:00
a5bfee076a Merge pull request 'tmeperature' (#155) from kranz_tmeperature into main
Reviewed-on: #155
2023-03-06 10:36:59 +01:00
0c17203825 tmeperature 2023-03-06 10:36:08 +01:00
beb8e61e2c Merge pull request 'tmeperature' (#154) from kranz_tmeperature into main
Reviewed-on: #154
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2023-03-06 10:33:50 +01:00
e9d10dae1b tmeperature 2023-03-06 10:26:58 +01:00
b959f60f0a
update retvals 2023-03-04 17:18:23 +01:00
3e666d76b7
prep v2.16.4 2023-03-04 17:17:04 +01:00
7eafefc93b Merge pull request 'IMTQ updates' (#153) from imtq_updates into main
Reviewed-on: #153
2023-03-04 17:10:36 +01:00
09c694cf9c
IMTQ updates 2023-03-04 17:05:11 +01:00
94ae2d16e2 Merge pull request 'prep v2.16.3' (#152) from vprep_2.16.3 into main
Reviewed-on: #152
2023-03-03 16:48:03 +01:00
68a4764a56
prep v2.16.3 2023-03-03 16:50:48 +01:00
a9e59ae42b Merge pull request 'improve some STR code' (#151) from improve_some_str_tmtc_code into main
Reviewed-on: #151
2023-03-03 16:36:56 +01:00
3522405e8a
improve some STR code 2023-03-03 16:38:17 +01:00
783d5a8ed5 Merge pull request 'kranz_revert_mgt_hk' (#150) from kranz_revert_mgt_hk into main
Reviewed-on: #150
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2023-03-03 10:53:46 +01:00
fc9b4efecf imtq fix 2023-03-03 09:57:26 +01:00