Commit Graph

895 Commits

Author SHA1 Message Date
7a119bab6e
changelog
All checks were successful
EIVE/eive-obsw/pipeline/pr-v3.1.1-reduced-to-bare-minimum This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2023-06-19 17:34:47 +02:00
8f7d3dd815
changelog
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2023-06-18 17:24:19 +02:00
31fdbac8c0 Merge remote-tracking branch 'origin/main' into swap-pl-ps-i2c 2023-06-17 14:29:38 +02:00
51a3a2f5cf changelog
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2023-06-15 17:58:35 +02:00
456ee156c3
finally have a firmware version
All checks were successful
EIVE/eive-obsw/pipeline/pr-v4.0.0-dev This commit looks good
2023-06-15 10:02:12 +02:00
40eae48a1a
changelog
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-v4.0.0-dev This commit looks good
2023-06-15 09:51:34 +02:00
4bd3cf4d52
Merge remote-tracking branch 'origin/main' into v4.0.0-dev
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-06-15 05:09:52 +02:00
a05a8ffb50
Merge remote-tracking branch 'origin/main' into tmp-sign-bugfix
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2023-06-14 18:11:25 +02:00
885fddd45f
bump changelgo
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-06-14 06:15:04 +02:00
fab4cdd0dc
changelog 2023-06-14 06:09:18 +02:00
71d417710e
changelog
Some checks are pending
EIVE/eive-obsw/pipeline/pr-main Build started...
2023-06-14 03:39:13 +02:00
26199e7317
changelog
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2023-06-14 03:18:47 +02:00
38305e723f
changelog
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2023-06-13 23:26:27 +02:00
55d6edcd66
Merge remote-tracking branch 'origin/main' into v4.0.0-dev
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-06-11 18:54:04 +02:00
3fdd1feb94
prep release
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2023-06-11 18:46:30 +02:00
e3ae6260ad
changelog
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-v3.0.0-dev This commit looks good
2023-06-09 18:26:41 +02:00
9e787a7e44
Merge branch 'v3.0.0-dev' into v4.0.0-dev
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2023-06-09 18:10:38 +02:00
b2535662e6 Merge branch 'v3.0.0-dev' into core-ctrl-dir-listing-fsm
Some checks are pending
EIVE/eive-obsw/pipeline/pr-v3.0.0-dev Build queued...
2023-06-09 14:44:44 +02:00
3bdbc67e0d
Merge remote-tracking branch 'origin/v3.0.0-dev' into core-ctrl-dir-listing-fsm
All checks were successful
EIVE/eive-obsw/pipeline/pr-v3.0.0-dev This commit looks good
2023-06-09 14:24:42 +02:00
fe1cc9444d
changelog
Some checks failed
EIVE/eive-obsw/pipeline/pr-v3.0.0-dev There was a failure building this commit
2023-06-09 14:10:06 +02:00
9ec3eca10a Merge branch 'v3.0.0-dev' into bump-fsfw-tmtc
Some checks are pending
EIVE/eive-obsw/pipeline/pr-v3.0.0-dev Build started...
2023-06-09 13:40:16 +02:00
6c1dfafb2e
changelog
Some checks are pending
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-v3.0.0-dev This commit looks good
2023-06-09 13:13:05 +02:00
c1f8512b01
changelog
All checks were successful
EIVE/eive-obsw/pipeline/pr-v3.0.0-dev This commit looks good
2023-06-09 13:10:29 +02:00
08e7a8cf97
Merge branch 'v3.0.0-dev' into gyr-confg-rework-2
All checks were successful
EIVE/eive-obsw/pipeline/pr-v3.0.0-dev This commit looks good
2023-06-09 12:48:36 +02:00
d90ccd62f8
bump changelog and tmtc
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2023-06-09 12:47:07 +02:00
cab20a8c77 changelog
All checks were successful
EIVE/eive-obsw/pipeline/pr-v3.0.0-dev This commit looks good
2023-06-08 09:55:46 +02:00
6fdd9da2a0 Merge branch 'v3.0.0-dev' into gyr-confg-rework-2
All checks were successful
EIVE/eive-obsw/pipeline/pr-v3.0.0-dev This commit looks good
2023-06-08 09:36:07 +02:00
26ed774806
changelog
All checks were successful
EIVE/eive-obsw/pipeline/pr-v3.0.0-dev This commit looks good
2023-06-07 14:25:13 +02:00
376c359d6e Merge branch 'v3.0.0-dev' into acs-ptg-ctrl-fixes-2
Some checks are pending
EIVE/eive-obsw/pipeline/pr-v3.0.0-dev Build started...
2023-06-07 11:47:57 +02:00
7d1b99c3f4
Merge branch 'v3.0.0-dev' into acs-ptg-ctrl-fixes-2
All checks were successful
EIVE/eive-obsw/pipeline/pr-v3.0.0-dev This commit looks good
2023-06-06 11:13:42 +02:00
8052734028
tiny tweak 2023-06-06 11:12:41 +02:00
b7eb693295
Merge branch 'v3.0.0-dev' into str-invalid-off-transition 2023-06-06 11:12:30 +02:00
caa2800a7a
Merge branch 'v3.0.0-dev' into v4.0.0-dev
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-06-06 11:10:03 +02:00
58dee642a6 changelog
Some checks are pending
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-v3.0.0-dev This commit looks good
2023-06-05 16:06:36 +02:00
3be495fc30 Merge branch 'v3.0.0-dev' into gyr-confg-rework-2
All checks were successful
EIVE/eive-obsw/pipeline/pr-v3.0.0-dev This commit looks good
2023-06-05 09:54:23 +02:00
73981006a2 changelog
Some checks failed
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-v3.0.0-dev There was a failure building this commit
2023-06-05 09:25:31 +02:00
6915f0e003 changelog
All checks were successful
EIVE/eive-obsw/pipeline/pr-v3.0.0-dev This commit looks good
2023-06-02 17:45:08 +02:00
a85b0a4a76
changelog
Some checks are pending
EIVE/eive-obsw/pipeline/pr-v4.0.0-dev Build started...
EIVE/eive-obsw/pipeline/head This commit looks good
2023-05-31 16:31:50 +02:00
9711bb6300 Merge branch 'v4.0.0-dev' into update-ptme-code-2
All checks were successful
EIVE/eive-obsw/pipeline/pr-v4.0.0-dev This commit looks good
2023-05-31 11:50:59 +02:00
68e4d9be07
Merge branch 'v3.0.0-dev' into v4.0.0-dev
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-05-31 11:50:11 +02:00
170cb4d99c
changelog
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-05-31 10:45:40 +02:00
0aa617d440
switch info 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-30 16:54:56 +02:00
6aa856563e
Merge branch 'tcs-heater-event-fix' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into tcs-heater-event-fix
Some checks are pending
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev Build started...
2023-05-30 16:45:36 +02:00
ebf5609680
changelog 2023-05-30 16:45:09 +02:00
b135e2f6a1
changelog
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev This commit looks good
2023-05-30 15:14:47 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
7bd2fce86f
Merge branch 'tm-store-task-base-bugfix' into update-ptme-code-2 2023-05-23 19:40:17 +02:00
28beb006b2
thats an annoying bug
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev This commit looks good
2023-05-23 19:37:01 +02:00
7222475985
changelog, remove unnecessary logic 2023-05-23 19:18:42 +02:00
f5a7fd2ffe Merge branch 'oh-no-no-no-bug' into update-ptme-code-2 2023-05-23 19:16:36 +02:00
6bfb0d4fb0
changelog
All checks were successful
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev This commit looks good
2023-05-23 19:14:03 +02:00
8efbdf8279 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-23 18:30:00 +02:00
631a1aec42 Merge branch 'v2.1.0-dev' into gyr-confg-rework-2
All checks were successful
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev This commit looks good
2023-05-23 15:42:30 +02:00
04571bbd7a Merge branch 'v2.1.0-dev' into acs-params-fix
All checks were successful
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev This commit looks good
2023-05-23 15:08:56 +02:00
5390e947ca changelog
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
2023-05-23 15:02:35 +02:00
4763ec84fa
Merge remote-tracking branch 'origin/v2.1.0-dev' into v2.2.0-dev
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-05-23 14:46:44 +02:00
e4fc6e3d2a
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-22 11:46:48 +02:00
2543cdf5b7
changelog
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-05-22 11:44:42 +02:00
d23082283d
changelog
Some checks are pending
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev Build queued...
2023-05-22 11:42:08 +02:00
22dcf10207 Merge branch 'v2.1.0-dev' into update-ptme-code-2 2023-05-22 10:46:14 +02:00
a814746c53 Merge branch 'ploc_mpsoc_read_file_2' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into ploc_mpsoc_read_file_2
All checks were successful
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev This commit looks good
2023-05-19 09:41:51 +02:00
ed74367f01
changelog 2023-05-19 09:41:44 +02:00
a0e305fe1f
changelog
All checks were successful
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev This commit looks good
2023-05-17 18:55:53 +02:00
fabc6da562
changelog
Some checks failed
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev There was a failure building this commit
2023-05-15 15:16:44 +02:00
af77d083fa
Merge remote-tracking branch 'origin/v2.1.0-dev' into ploc_mpsoc_read_file_2
Some checks failed
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev There was a failure building this commit
2023-05-15 10:15:16 +02:00
07d9ab0dd9
Merge branch 'ploc_mpsoc_update_2' into ploc_mpsoc_dir_content_report_2
All checks were successful
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev This commit looks good
2023-05-12 13:31:13 +02:00
a3b119fda6
update changelog
Some checks are pending
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev This commit looks good
EIVE/eive-obsw/pipeline/head Build queued...
2023-05-12 13:26:15 +02:00
86241a0052
Merge remote-tracking branch 'origin/v2.1.0-dev' into ploc_mpsoc_update_2
All checks were successful
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev This commit looks good
2023-05-12 13:24:49 +02:00
9715612e46
changelog
All checks were successful
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev This commit looks good
2023-05-12 13:24:14 +02:00
af20a36634
Merge branch 'ploc_mpsoc_update_2' into ploc_mpsoc_dir_content_report_2
Some checks failed
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev There was a failure building this commit
2023-05-12 11:48:43 +02:00
f71a363385 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-12 11:08:41 +02:00
412aaf93bd Merge branch 'ploc-code-improvenemts-2' into ploc_mpsoc_update_2
All checks were successful
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev This commit looks good
2023-05-12 09:37:13 +02:00
0156533385
changelog
Some checks are pending
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev Build started...
2023-05-12 09:35:58 +02:00
7e6c25901b
Squashed commit of the following:
Some checks are pending
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-main This commit looks good
commit c137df64ab
Merge: a919b3d1 4179e8e1
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Fri Apr 28 15:38:52 2023 +0200

    Merge remote-tracking branch 'origin/main' into update_ptme_code

commit 4179e8e124
Merge: 26f5eff6 51f9d5e1
Author: Robin Müller <muellerr@irs.uni-stuttgart.de>
Date:   Fri Apr 28 15:35:54 2023 +0200

    Merge pull request 'This bugfix might be super important' (#621) from possible_bugfix_dual_lane_assy into main

    Reviewed-on: #621
    Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
    Reviewed-by: Steffen Gaisser <gaisser@irs.uni-stuttgart.de>

commit 51f9d5e1fe
Merge: a17f57cb 26f5eff6
Author: Robin Müller <muellerr@irs.uni-stuttgart.de>
Date:   Fri Apr 28 15:35:10 2023 +0200

    Merge branch 'main' into possible_bugfix_dual_lane_assy

commit a17f57cbb5
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Fri Apr 28 15:34:45 2023 +0200

    changelog

commit 26f5eff6d5
Merge: 4074e084 8a0f13ba
Author: Robin Müller <muellerr@irs.uni-stuttgart.de>
Date:   Fri Apr 28 15:32:03 2023 +0200

    Merge pull request 'More System Modes' (#612) from more-system-modes into main

    Reviewed-on: #612

commit 8a0f13bafb
Merge: 14baa356 4074e084
Author: Robin Müller <muellerr@irs.uni-stuttgart.de>
Date:   Fri Apr 28 15:31:51 2023 +0200

    Merge branch 'main' into more-system-modes

commit 14baa3563c
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Fri Apr 28 15:30:09 2023 +0200

    hello

commit 7045b6034a
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Fri Apr 28 15:18:47 2023 +0200

    changelog

commit 37b9615525
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Fri Apr 28 15:18:16 2023 +0200

    changelog

commit 4074e08480
Merge: 862a4f26 38686ac3
Author: Robin Müller <muellerr@irs.uni-stuttgart.de>
Date:   Fri Apr 28 15:12:46 2023 +0200

    Merge pull request 'Adaption for EM: Add P60 dock without ACU' (#620) from adaption_em_p60_dock_without_acu into main

    Reviewed-on: #620
    Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>

commit 23796345d9
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Fri Apr 28 15:04:30 2023 +0200

    changelog and stop payload tracking

commit b10275ca43
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Fri Apr 28 14:28:05 2023 +0200

    changelog

commit 383849c5cb
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Fri Apr 28 14:25:14 2023 +0200

    that is more robust

commit c66cef9129
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Fri Apr 28 14:23:21 2023 +0200

    changelog

commit 02ea8a7298
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Fri Apr 28 14:22:21 2023 +0200

    changelog

commit 38686ac3f6
Merge: 189a3126 74d5d709
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Fri Apr 28 14:04:03 2023 +0200

    Merge branch 'possible_bugfix_dual_lane_assy' into adaption_em_p60_dock_without_acu

commit 74d5d70973
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Fri Apr 28 13:58:08 2023 +0200

    this bugfix might be super important

commit 48355e8263
Merge: 5691fe8e 862a4f26
Author: Robin Müller <muellerr@irs.uni-stuttgart.de>
Date:   Fri Apr 28 10:25:50 2023 +0200

    Merge branch 'main' into more-system-modes

commit 189a312628
Merge: a1279428 862a4f26
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Fri Apr 28 10:23:46 2023 +0200

    Merge remote-tracking branch 'origin/main' into adaption_em_p60_dock_without_acu

commit a12794281b
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Fri Apr 28 10:20:31 2023 +0200

    changelog

commit fcaabb4e42
Merge: 6c326489 4aafca64
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Fri Apr 28 10:20:02 2023 +0200

    Merge remote-tracking branch 'origin/main' into adaption_em_p60_dock_without_acu

commit 6c326489cb
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Fri Apr 28 10:18:46 2023 +0200

    adapt EM SW: GS PCDU added, but use dummy for ACU

commit 862a4f2685
Merge: 4aafca64 2daca272
Author: Robin Müller <muellerr@irs.uni-stuttgart.de>
Date:   Fri Apr 28 09:37:55 2023 +0200

    Merge pull request 'Host SW bugfixes' (#618) from try_fix_host_obsw into main

    Reviewed-on: #618
    Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>

commit 5691fe8e72
Merge: 097be17a 4aafca64
Author: meggert <eggertm@irs.uni-stuttgart.de>
Date:   Thu Apr 27 15:40:31 2023 +0200

    Merge branch 'main' into more-system-modes

commit 2daca272f8
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Thu Apr 27 11:29:18 2023 +0200

    changelog

commit 03762f9620
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Wed Apr 26 17:38:06 2023 +0200

    lower live TM handler frequency

commit a296f16e5c
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Wed Apr 26 17:36:38 2023 +0200

    host SW works properly again

commit 83f07a6e16
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Wed Apr 26 17:26:32 2023 +0200

    configurable event manager queue depth

commit 00dab64628
Merge: 641b8e84 4aafca64
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Wed Apr 26 17:03:35 2023 +0200

    Merge remote-tracking branch 'origin/main' into try_fix_host_obsw

commit 4aafca64a6
Merge: f271242d 6901eae8
Author: Robin Müller <muellerr@irs.uni-stuttgart.de>
Date:   Wed Apr 26 17:03:01 2023 +0200

    Merge pull request 'EM adaptions' (#619) from em_adaptions into main

    Reviewed-on: #619

commit 6901eae816
Merge: 7d630ebc f271242d
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Wed Apr 26 17:02:24 2023 +0200

    Merge remote-tracking branch 'origin/main' into em_adaptions

commit 7d630ebcf3
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Wed Apr 26 17:00:04 2023 +0200

    EM adaptions

commit 641b8e847d
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Wed Apr 26 16:41:40 2023 +0200

    add back tm funnel handler for hosted build

commit 1314268682
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Wed Apr 26 16:23:50 2023 +0200

    host build requires dedicated live TM task..

commit 4040304ef0
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Wed Apr 26 13:15:42 2023 +0200

    this is annoying

commit a919b3d164
Merge: e22f2a53 9672d6d6
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Wed Apr 26 11:11:30 2023 +0200

    Merge remote-tracking branch 'origin/develop' into update_ptme_code

commit 9672d6d6cc
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Wed Apr 26 11:11:09 2023 +0200

    changelog

commit e22f2a53ea
Merge: b076e80b 0eb6b7cc
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Wed Apr 26 11:05:58 2023 +0200

    Merge remote-tracking branch 'origin/develop' into update_ptme_code

commit b076e80b44
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Wed Apr 26 11:04:10 2023 +0200

    changelog

commit 269aa6f7b0
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Wed Apr 26 11:03:42 2023 +0200

    changelog

commit caae2b4ba9
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Wed Apr 26 11:02:24 2023 +0200

    update PTME code

commit 097be17a29
Author: meggert <eggertm@irs.uni-stuttgart.de>
Date:   Wed Apr 19 15:07:21 2023 +0200

    added remaining acs modes as system modes
2023-05-12 09:13:02 +02:00
50d5180076
changelog
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2023-05-11 21:29:15 +02:00
dbdcf0b0d6 changelog 2023-05-11 21:28:50 +02:00
4a3af32a65
MPSoC HK packet 2023-05-11 21:28:46 +02:00
9b5fac828b
changelog 2023-05-11 21:17:06 +02:00
07dd84ff1e changelog 2023-05-11 20:25:26 +02:00
d5a6feb347 changelog 2023-05-11 20:25:26 +02:00
5728d916ef changelog 2023-05-11 20:25:26 +02:00
e762cc5fb3 changelog 2023-05-11 20:25:26 +02:00
f72c797f53
this should do the job 2023-05-11 20:21:44 +02:00
71ef1edb68
changelog 2023-05-11 20:21:07 +02:00
fa13703394
changelog 2023-05-11 20:18:39 +02:00
09ece30304 changelog 2023-05-11 20:17:50 +02:00
c3604085c2 changelog 2023-05-11 20:17:50 +02:00
1274993428 changelog 2023-05-11 20:17:41 +02:00
a7ccfae04e changelog 2023-05-11 20:17:41 +02:00
2c9da6a1e4 changelog
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-11 20:14:17 +02:00
30fba0456b
MPSoC HK packet 2023-05-11 20:14:12 +02:00
32d2ad8f1d
changelog 2023-05-11 20:13:26 +02:00
b34767c870 changelog 2023-05-11 20:12:15 +02:00
97567736fb changelog 2023-05-11 20:12:15 +02:00
621a6fd401 changelog 2023-05-11 20:12:13 +02:00
04b6c7006e changelog 2023-05-11 20:12:13 +02:00
e78d458f06 changelog
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-main Build queued...
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev This commit looks good
2023-05-11 19:54:44 +02:00
ef039c47b8
update changelog again
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-05-11 19:35:57 +02:00
d4b7411de1
I guess no patch version 2023-05-11 19:34:37 +02:00
2e6a93c479 ACS board and init payload 2023-05-11 19:33:06 +02:00
f3a651602b this should be robust 2023-05-11 19:33:06 +02:00
6c00404ca7 changelog 2023-05-11 19:33:06 +02:00
1412dd4fb6 changelog readme etc. 2023-05-11 19:33:06 +02:00
1870bf6405
changelog 2023-05-11 19:33:02 +02:00
670c753a75 hello 2023-05-11 19:32:37 +02:00
26e48f2f46 changelog 2023-05-11 19:32:37 +02:00
a352f25029 changelog 2023-05-11 19:32:37 +02:00
141438bd24 changelog and stop payload tracking 2023-05-11 19:32:37 +02:00
1cbb7d0af8
changelog 2023-05-11 19:32:33 +02:00
09ffcc8804 changelog 2023-05-11 19:32:10 +02:00
fb062bb4e8 changelog 2023-05-11 19:32:04 +02:00
2f58ca8534 changelog 2023-05-11 19:32:04 +02:00
5747f73dfe
changelog 2023-05-11 19:31:50 +02:00
a75f9553be okay lets see if this works
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-05-11 18:38:41 +02:00
f46a705900 changelog 2023-04-19 18:12:32 +02:00
74ee291983
add tmtc release version
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-04-17 11:58:13 +02:00
ab588b4844
fixes and tweaks TCS and EM build
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
2023-04-17 11:35:10 +02:00
9097a3f3c7 changelog
Some checks are pending
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-04-17 09:35:23 +02:00
07e8f95a31
of course something else was missing
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-04-16 12:05:41 +02:00
babea226ab
thats an annoying patch release
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-04-16 11:54:27 +02:00
8f5982fd72
added additional note
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop Build queued...
2023-04-16 11:48:24 +02:00
611a2c0b45
update CHANGELOG and CMakeLists.txt
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop Build started...
2023-04-16 11:41:30 +02:00
b8d010cd39
CHANGELOG + FS helpers
Some checks are pending
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-04-15 13:01:41 +02:00
b98f91f6c1
hopefully last EM fix for v2.0
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-04-14 21:44:23 +02:00
d24a983985
some EM fixes
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-04-14 21:02:39 +02:00
f0d55f9e5b
prep v1.45.0
Some checks are pending
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-04-14 20:35:00 +02:00
fa746f910d
Merge remote-tracking branch 'origin/develop' into acs-flp-safe
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop Build started...
2023-04-14 20:13:50 +02:00