|
|
581423a40e
|
Merge branch 'mueller/acs-ss-init' into mueller/pl-ss
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
|
2022-05-25 10:09:24 +02:00 |
|
|
|
e1ed532f91
|
Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
|
2022-05-25 10:01:53 +02:00 |
|
|
|
28a4f782f9
|
Merge remote-tracking branch 'origin/develop' into mueller/rtds-update
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
|
2022-05-17 17:55:25 +02:00 |
|
|
|
8a5090b8ee
|
apply new auto-formatter on all files
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
|
2022-05-17 13:40:19 +02:00 |
|
|
|
2fa1061c65
|
Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-05-16 15:11:24 +02:00 |
|
|
|
f20fcd9a72
|
Merge remote-tracking branch 'origin/develop' into mueller/rtds-update
|
2022-05-14 17:07:27 +02:00 |
|
|
|
017cfb9d56
|
a lot of fixes, but some stuff doesnt work..
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-05-14 17:04:51 +02:00 |
|
|
|
478975db26
|
spi setup more stable now
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-05-14 11:34:25 +02:00 |
|
|
|
51466e68d7
|
Merge remote-tracking branch 'origin/develop' into mueller/heater-health-if
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
|
2022-05-12 14:11:46 +02:00 |
|
|
|
dd67191044
|
Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-05-12 14:02:15 +02:00 |
|
|
|
4864394590
|
renamed heaters
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-05-09 16:13:33 +02:00 |
|
|
|
71d9553f90
|
Merge remote-tracking branch 'origin/develop' into mueller/rw-ass
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-05-08 13:11:56 +02:00 |
|
|
|
646925c571
|
removed redundant SUS OBJ ID defs
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-05-08 13:08:49 +02:00 |
|
|
|
d9085e81a1
|
Merge remote-tracking branch 'origin/develop' into mueller/heater-health-if
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-05-08 13:06:47 +02:00 |
|
Jakob Meier
|
6dd57a3f5e
|
fixed merge conflicts
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
|
2022-05-06 19:44:18 +02:00 |
|
|
|
355ca27d31
|
Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-05-06 08:58:31 +02:00 |
|
|
|
22060b9b16
|
Merge remote-tracking branch 'origin/develop' into mueller/rw-ass
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-05-06 01:12:07 +02:00 |
|
|
|
68938c3b42
|
remove duplicate object ID
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-05-05 20:27:20 +02:00 |
|
|
|
a11a8c493d
|
Merge remote-tracking branch 'origin/develop' into mueller/heater-health-if
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
|
2022-05-05 19:53:18 +02:00 |
|
|
|
0c82d06ec4
|
Merge remote-tracking branch 'origin/develop' into mueller/rename-sus
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-05-05 19:41:36 +02:00 |
|
|
|
b426475ca4
|
better RTD names
|
2022-05-05 16:55:08 +02:00 |
|
|
|
a232b9bf98
|
assign better sus names
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-05-05 16:46:04 +02:00 |
|
|
|
4c809e354d
|
better heater obj id names
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-05-05 16:23:46 +02:00 |
|
|
|
95a634ea7f
|
update .cproject file
|
2022-05-05 01:33:18 +02:00 |
|
|
|
bcb6df87b0
|
update tmtc, gen files and formatting in config file
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-05-05 00:47:50 +02:00 |
|
|
|
1508a1e147
|
Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-05-04 16:43:31 +02:00 |
|
|
|
a6c6325d41
|
Merge remote-tracking branch 'origin/develop' into mueller/pl-ss
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-05-04 16:41:08 +02:00 |
|
|
|
1536a0f94b
|
named heaters
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-05-03 18:17:10 +02:00 |
|
|
|
ae0120f3ef
|
Merge branch 'mueller/refactoring-conf-handling' into mueller/heater-health-if
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-05-03 17:44:02 +02:00 |
|
|
|
0f4fe7694b
|
Merge remote-tracking branch 'origin/develop' into mueller/refactoring-conf-handling
|
2022-05-03 00:01:55 +02:00 |
|
|
|
1f8a68dabe
|
re-use existing enum
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-05-02 22:55:39 +02:00 |
|
|
|
9449919b2b
|
Heaters are own objects with HealthIF now
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-05-02 22:45:27 +02:00 |
|
|
|
0e97c4ad9a
|
Merge branch 'mueller/acs-ss-init' into mueller/pl-ss
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-05-02 12:55:15 +02:00 |
|
|
|
7db0872ee3
|
Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
|
2022-05-02 12:49:53 +02:00 |
|
Jakob Meier
|
be752997eb
|
fixed merge conflicts
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-04-30 19:12:21 +02:00 |
|
|
|
c1248dd4e1
|
building new EM config
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-04-29 15:47:54 +02:00 |
|
|
|
cb47667d01
|
Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2022-04-28 17:56:33 +02:00 |
|
|
|
f01f63d8e8
|
Merge remote-tracking branch 'origin/develop' into mueller/gomspace-fdir
|
2022-04-28 17:55:40 +02:00 |
|
|
|
7e2a993211
|
create rudimentary syrlinks fdir
EIVE/eive-obsw/pipeline/head There was a failure building this commit
|
2022-04-28 15:25:03 +02:00 |
|
Jakob Meier
|
582d2db05f
|
fixed conflicts
|
2022-04-28 14:29:23 +02:00 |
|
|
|
2b33d8772c
|
fixes most warnings for host build
EIVE/eive-obsw/pipeline/head There was a failure building this commit
|
2022-04-26 10:37:25 +02:00 |
|
|
|
0697cca88a
|
started acs subsystem
EIVE/eive-obsw/pipeline/head This commit looks good
|
2022-04-25 13:36:11 +02:00 |
|
|
|
c262d1ef90
|
Merge remote-tracking branch 'origin/develop' into mueller/hand-written-subsystem
|
2022-04-23 12:21:04 +02:00 |
|
|
|
9fe2de5244
|
Merge pull request 'CMake git describe support' (#226) from mueller/cmake-git-describe-support into develop
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #226
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
|
2022-04-22 20:03:34 +02:00 |
|
|
|
a0db5dcc7c
|
add first mode sequence for acs ss
EIVE/eive-obsw/pipeline/head This commit looks good
|
2022-04-22 17:00:23 +02:00 |
|
|
|
8bd7d00ab1
|
forgot to bump version
EIVE/eive-obsw/pipeline/head Build started...
|
2022-04-22 16:15:04 +02:00 |
|
|
|
a416ca406b
|
git describe support finished
EIVE/eive-obsw/pipeline/head There was a failure building this commit
|
2022-04-22 14:09:08 +02:00 |
|
Jakob Meier
|
1ce45acba3
|
merged develop
|
2022-04-17 14:52:43 +02:00 |
|
Jakob Meier
|
7b54855397
|
supervisor fixes detected during testing
|
2022-04-16 17:19:32 +02:00 |
|
Jakob Meier
|
10343a0dab
|
supervisor event buffer request
|
2022-04-14 07:52:21 +02:00 |
|
