Commit Graph

7219 Commits

Author SHA1 Message Date
fe34f69abe Merge pull request 'MTQ Scaling Bugfix' (#653) from mtq-cmd-bugfix into v2.1.0-dev
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #653
2023-05-30 09:25:24 +02:00
899b19f34f Merge branch 'v2.1.0-dev' into mtq-cmd-bugfix
Some checks are pending
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev Build queued...
2023-05-30 09:25:06 +02:00
faeece7210 Merge pull request 'Remove Rad Sensor, fix image swichting' (#654) from remove-rad-sensor-again into v2.1.0-dev
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #654
2023-05-30 09:24:17 +02:00
ada77ed53b
ACS board still required
Some checks are pending
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev Build started...
2023-05-30 09:22:59 +02:00
f3cc406495 Merge branch 'v2.1.0-dev' into update-ptme-code-2
All checks were successful
EIVE/eive-obsw/pipeline/pr-v2.2.0-dev This commit looks good
2023-05-27 17:03:58 +02:00
71eca867ea
i think the rad sesnor messing everything up
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev This commit looks good
2023-05-27 17:03:33 +02:00
9c78362ac5
use read write permissions for uio 2023-05-27 17:00:41 +02:00
a7c6cd017d changelog
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev This commit looks good
2023-05-26 13:53:46 +02:00
335394b863 fixed use of c abs which will truncate the value 2023-05-26 13:51:24 +02:00
de18ebfbe0 fixed error angle being calculated but not returned
All checks were successful
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev This commit looks good
2023-05-26 09:57:03 +02:00
93cf6bab01 Merge pull request 'Heater Mode Fix' (#652) from heater-mode-fix into v2.1.0-dev
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #652
2023-05-26 09:47:35 +02:00
5afe22bc92 heater mode fix
All checks were successful
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev This commit looks good
2023-05-25 15:48:28 +02:00
2ff1c0d9d5 Merge pull request 'Added switcher for MGT dummy' (#651) from mgt-dummy-switcher-fix into v2.1.0-dev
Some checks are pending
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev Build queued...
Reviewed-on: #651
2023-05-25 11:23:56 +02:00
a6787538f2 changelog
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev Build started...
2023-05-25 11:21:28 +02:00
db79e34d3b added switcher for IMTQ dummy 2023-05-25 11:20:28 +02:00
016e9dd2df
Merge branch 'v2.2.0-dev' into update-ptme-code-2
All checks were successful
EIVE/eive-obsw/pipeline/pr-v2.2.0-dev This commit looks good
2023-05-25 10:34:04 +02:00
d22f948af4 Merge pull request 'Tweak for TM stores' (#650) from another-tweak-for-tm-stores into v2.1.0-dev
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #650
2023-05-25 10:21:19 +02:00
351ca1154b Merge branch 'v2.1.0-dev' into v2.2.0-dev
Some checks are pending
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/-/pipeline/head Build queued...
2023-05-25 09:10:34 +02:00
e1aff4c641
another small logic fix
Some checks are pending
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev This commit looks good
2023-05-25 08:48:03 +02:00
8d041c6753
changelog
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
2023-05-25 08:45:20 +02:00
276501c504
another tweak for TM stores 2023-05-25 08:43:52 +02:00
65223ad3c7 Merge pull request 'ACU dummy enable HK sets' (#649) from acu-enable-hk-sets into v2.1.0-dev
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #649
2023-05-24 14:15:38 +02:00
075c750e4a Merge branch 'v2.1.0-dev' into acu-enable-hk-sets
Some checks are pending
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev Build queued...
2023-05-24 14:14:07 +02:00
04f5011e0f Merge pull request 'IMTQ Dummy HK sets' (#648) from imtq-enable-hk-sets into v2.1.0-dev
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #648
2023-05-24 14:13:46 +02:00
832140935f Merge branch 'v2.1.0-dev' into imtq-enable-hk-sets
Some checks are pending
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev Build started...
2023-05-24 14:13:29 +02:00
86bc6c4e0e
Merge branch 'imtq-enable-hk-sets' into acu-enable-hk-sets
All checks were successful
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev This commit looks good
2023-05-24 11:53:34 +02:00
31e24e297f
fix host SW
All checks were successful
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev This commit looks good
2023-05-24 11:53:07 +02:00
4dacca6df1 Merge pull request 'Another annoying TM store bug' (#645) from tm-store-task-base-bugfix into v2.1.0-dev
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #645
2023-05-24 11:34:29 +02:00
ce9d00a42a
Merge remote-tracking branch 'origin/v2.1.0-dev' into tm-store-task-base-bugfix
Some checks are pending
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev Build queued...
2023-05-24 11:34:39 +02:00
6e4d4cea95 Merge pull request 'HK TM store bug' (#644) from oh-no-no-no-bug into v2.1.0-dev
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #644
2023-05-24 11:33:13 +02:00
3641dc3bfa Merge branch 'imtq-enable-hk-sets' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into imtq-enable-hk-sets
Some checks failed
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev There was a failure building this commit
2023-05-24 11:17:08 +02:00
b899bad0a8
IMTQ HK sets 2023-05-24 11:17:00 +02:00
9e0989915c
changelog
Some checks failed
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev There was a failure building this commit
2023-05-24 11:16:35 +02:00
758f2b9d7a
add ACU HK sets
Some checks are pending
EIVE/eive-obsw/pipeline/head Build queued...
2023-05-24 11:15:58 +02:00
46dd662145 Merge branch 'v2.1.0-dev' into imtq-enable-hk-sets
Some checks failed
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev There was a failure building this commit
2023-05-24 11:05:40 +02:00
8f4bba6fd1 Merge branch 'v2.1.0-dev' into oh-no-no-no-bug
All checks were successful
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev This commit looks good
2023-05-24 11:04:48 +02:00
a38f5c78ae Merge branch 'v2.1.0-dev' into tm-store-task-base-bugfix
All checks were successful
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev This commit looks good
2023-05-24 11:04:35 +02:00
dc36513efa Merge pull request 'always dump data into the VC' (#646) from always-dump-into-vc into v2.1.0-dev
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #646
2023-05-24 11:04:24 +02:00
ee0646caf1
enable IMTQ HK sets
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
2023-05-24 11:04:07 +02:00
a831ec7bda Merge branch 'v2.1.0-dev' into oh-no-no-no-bug
All checks were successful
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev This commit looks good
2023-05-24 09:30:10 +02:00
efa9c42345
Merge remote-tracking branch 'origin/v2.1.0-dev' into always-dump-into-vc
All checks were successful
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev This commit looks good
2023-05-24 09:27:26 +02:00
a0b1ac3d06 Merge pull request 'no dump cancel on TX OFF' (#647) from no-dump-cancel-on-tx-off into v2.1.0-dev
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #647
2023-05-24 09:10:01 +02:00
30bb2da570 Merge branch 'v2.1.0-dev' into no-dump-cancel-on-tx-off
Some checks are pending
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev Build started...
2023-05-24 09:09:33 +02:00
c45f267e94
Merge remote-tracking branch 'origin/v2.1.0-dev' into oh-no-no-no-bug
All checks were successful
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev This commit looks good
2023-05-23 20:32:43 +02:00
13fdaf731c
Merge remote-tracking branch 'origin/v2.1.0-dev' into tm-store-task-base-bugfix
All checks were successful
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev This commit looks good
2023-05-23 20:31:45 +02:00
d7a35d9818 Merge pull request 'ACS Parameter Fix' (#642) from acs-params-fix into v2.1.0-dev
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #642
2023-05-23 20:20:02 +02:00
6cf488d0a6
Merge branch 'always-dump-into-vc' into update-ptme-code-2
All checks were successful
EIVE/eive-obsw/pipeline/pr-v2.2.0-dev This commit looks good
2023-05-23 20:19:06 +02:00
15139d6944 Merge branch 'no-dump-cancel-on-tx-off' into update-ptme-code-2 2023-05-23 20:18:37 +02:00
266abad3b3
no dump cancel on TX OFF
Some checks are pending
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev This commit looks good
2023-05-23 20:15:36 +02:00
042b8fb3c3
changelog
All checks were successful
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev This commit looks good
2023-05-23 20:13:02 +02:00