|
cc60847bd0
|
Merge branch 'v4.0.0-dev' into update-ptme-code-2
EIVE/eive-obsw/pipeline/pr-v4.0.0-dev This commit looks good
|
2023-05-31 11:53:04 +02:00 |
|
|
9711bb6300
|
Merge branch 'v4.0.0-dev' into update-ptme-code-2
EIVE/eive-obsw/pipeline/pr-v4.0.0-dev This commit looks good
|
2023-05-31 11:50:59 +02:00 |
|
|
ddcdc38310
|
try to get rid of the nanosleep
EIVE/eive-obsw/pipeline/pr-v2.2.0-dev This commit looks good
|
2023-05-30 19:22:23 +02:00 |
|
|
9921522ce0
|
working, remove some old unrequired code
|
2023-05-30 19:06:59 +02:00 |
|
|
f3cc406495
|
Merge branch 'v2.1.0-dev' into update-ptme-code-2
EIVE/eive-obsw/pipeline/pr-v2.2.0-dev This commit looks good
|
2023-05-27 17:03:58 +02:00 |
|
|
9c78362ac5
|
use read write permissions for uio
|
2023-05-27 17:00:41 +02:00 |
|
|
016e9dd2df
|
Merge branch 'v2.2.0-dev' into update-ptme-code-2
EIVE/eive-obsw/pipeline/pr-v2.2.0-dev This commit looks good
|
2023-05-25 10:34:04 +02:00 |
|
|
6cf488d0a6
|
Merge branch 'always-dump-into-vc' into update-ptme-code-2
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 |
|
|
50327fb614
|
get rid of the printouts and of the delay
EIVE/eive-obsw/pipeline/pr-v2.2.0-dev This commit looks good
|
2023-05-23 19:44:06 +02:00 |
|
|
7bd2fce86f
|
Merge branch 'tm-store-task-base-bugfix' into update-ptme-code-2
|
2023-05-23 19:40:17 +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 |
|
|
8efbdf8279
|
Merge branch 'v2.2.0-dev' into update-ptme-code-2
EIVE/eive-obsw/pipeline/pr-v2.2.0-dev This commit looks good
|
2023-05-23 18:30:00 +02:00 |
|
|
e4fc6e3d2a
|
Merge branch 'v2.2.0-dev' into update-ptme-code-2
EIVE/eive-obsw/pipeline/pr-v2.2.0-dev This commit looks good
|
2023-05-22 11:46:48 +02:00 |
|
|
ea9f72b9c4
|
Merge branch 'v2.2.0-dev' into update-ptme-code-2
EIVE/eive-obsw/pipeline/pr-v2.2.0-dev This commit looks good
|
2023-05-22 10:48:47 +02:00 |
|
|
9804898d05
|
Merge remote-tracking branch 'origin/v2.2.0-dev' into update-ptme-code-2
|
2023-05-22 10:48:22 +02:00 |
|
|
8cc4431e22
|
Merge branch 'v2.2.0-dev' into update-ptme-code-2
EIVE/eive-obsw/pipeline/pr-v2.2.0-dev This commit looks good
|
2023-05-22 10:46:25 +02:00 |
|
|
22dcf10207
|
Merge branch 'v2.1.0-dev' into update-ptme-code-2
|
2023-05-22 10:46:14 +02:00 |
|
|
7e6c25901b
|
Squashed commit of the following:
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 |
|