|
22dcf10207
|
Merge branch 'v2.1.0-dev' into update-ptme-code-2
|
2023-05-22 10:46:14 +02:00 |
|
|
edf792c4fe
|
8 wait cycles are also okay
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev This commit looks good
|
2023-05-12 17:44:41 +02:00 |
|
|
a718d182fc
|
done
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev This commit looks good
|
2023-05-12 17:39:15 +02:00 |
|
|
714e2d07e5
|
and were at DHB debugging again
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev This commit looks good
|
2023-05-12 17:13:51 +02:00 |
|
|
4887dc9e6b
|
somethings still wrong
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev This commit looks good
|
2023-05-12 16:58:56 +02:00 |
|
|
3dc096c42b
|
add back normal command
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev This commit looks good
|
2023-05-12 16:29:15 +02:00 |
|
|
9887359e31
|
finally receiving the content report
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev This commit looks good
|
2023-05-12 16:09:08 +02:00 |
|
|
1f9c9e2407
|
horrible
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev This commit looks good
|
2023-05-12 15:52:47 +02:00 |
|
|
07d9ab0dd9
|
Merge branch 'ploc_mpsoc_update_2' into ploc_mpsoc_dir_content_report_2
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev This commit looks good
|
2023-05-12 13:31:13 +02:00 |
|
|
90d289f56e
|
works now
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev This commit looks good
|
2023-05-12 13:23:17 +02:00 |
|
|
2b999e7fa7
|
requires some wait cycles
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev This commit looks good
|
2023-05-12 12:37:25 +02:00 |
|
|
699fc9a861
|
some HK corrections
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev This commit looks good
|
2023-05-12 12:14:37 +02:00 |
|
|
66c9a5eea3
|
some more fixes
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev This commit looks good
|
2023-05-12 11:55:33 +02:00 |
|
|
af20a36634
|
Merge branch 'ploc_mpsoc_update_2' into ploc_mpsoc_dir_content_report_2
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev There was a failure building this commit
|
2023-05-12 11:48:43 +02:00 |
|
|
ba060be0d6
|
some more minor improvements
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev This commit looks good
|
2023-05-12 11:44:39 +02:00 |
|
|
1820dae3d4
|
horrible
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev This commit looks good
|
2023-05-12 11:06:26 +02:00 |
|
|
412aaf93bd
|
Merge branch 'ploc-code-improvenemts-2' into ploc_mpsoc_update_2
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev This commit looks good
|
2023-05-12 09:37:13 +02:00 |
|
|
cbf3315e16
|
Various fixes and improvements
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-main This commit looks good
|
2023-05-12 09:32:24 +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 |
|
|
92fd1548cb
|
dynamically enable/disable MPSoC
|
2023-05-11 21:28:50 +02:00 |
|
|
bacc46a8dc
|
i think that should do the job
|
2023-05-11 21:28:50 +02:00 |
|
|
0fb07fd3d5
|
implement dir content report in OBSW
|
2023-05-11 21:28:50 +02:00 |
|
|
98a858876a
|
add some more commands
|
2023-05-11 21:28:50 +02:00 |
|
|
d4fc95ed9f
|
start adding dir content report
|
2023-05-11 21:28:50 +02:00 |
|
|
2e00e10e09
|
request HK regularly now
|
2023-05-11 21:28:50 +02:00 |
|
|
4a3af32a65
|
MPSoC HK packet
|
2023-05-11 21:28:46 +02:00 |
|
|
66ca156ab3
|
mpsoc update
|
2023-05-11 21:17:14 +02:00 |
|
|
d67414e829
|
bugfxi by marius
|
2023-05-11 21:17:14 +02:00 |
|
|
0fd18204bf
|
add new set
|
2023-05-11 21:17:14 +02:00 |
|
|
f225d9a7c1
|
add HK request command
|
2023-05-11 21:17:14 +02:00 |
|
|
2b36195dac
|
dynamically enable/disable MPSoC
|
2023-05-11 20:14:17 +02:00 |
|
|
758ed22b08
|
request HK regularly now
|
2023-05-11 20:14:17 +02:00 |
|
|
30fba0456b
|
MPSoC HK packet
|
2023-05-11 20:14:12 +02:00 |
|
|
98e69b9a6a
|
mpsoc update
|
2023-05-11 20:13:31 +02:00 |
|
|
531f87cd76
|
bugfxi by marius
|
2023-05-11 20:13:31 +02:00 |
|
|
3a0db9c9ad
|
add new set
|
2023-05-11 20:13:31 +02:00 |
|
|
c8d1ce40ba
|
add HK request command
|
2023-05-11 20:13:31 +02:00 |
|
|
ab588b4844
|
fixes and tweaks TCS and EM build
EIVE/eive-obsw/pipeline/head Build started...
|
2023-04-17 11:35:10 +02:00 |
|
|
500b3b6fc6
|
re-run generators. bump tmtc
EIVE/eive-obsw/pipeline/pr-develop Build queued...
|
2023-04-14 20:24:37 +02:00 |
|
|
4de71062af
|
fix host build
EIVE/eive-obsw/pipeline/head Build queued...
|
2023-04-14 20:11:33 +02:00 |
|
|
379fd6046e
|
ge-generate files
EIVE/eive-obsw/pipeline/pr-develop Build started...
|
2023-04-14 20:08:05 +02:00 |
|
|
7f1fe3a2d8
|
bugfix
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
|
2023-04-14 19:58:22 +02:00 |
|
|
e023220be4
|
better reset handling
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-04-14 19:42:11 +02:00 |
|
|
62d18826f1
|
proper post reset handling for PDEC reset
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-04-14 19:29:22 +02:00 |
|
|
644a768778
|
re-run generators
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-04-14 19:02:18 +02:00 |
|
|
756ea6d90d
|
Merge remote-tracking branch 'origin/develop' into feature_com_pdec_fdir
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-04-14 19:01:22 +02:00 |
|
|
5e53795cbe
|
Merge branch 'develop' into tmp_dev_custom_fdir
|
2023-04-14 18:55:36 +02:00 |
|
|
ca30fed4c3
|
Merge remote-tracking branch 'origin/develop' into str_update_v10.7
EIVE/eive-obsw/pipeline/pr-develop Build queued...
|
2023-04-14 18:53:45 +02:00 |
|
|
4bfd675073
|
Merge remote-tracking branch 'origin/develop' into tmp_dev_custom_fdir
EIVE/eive-obsw/pipeline/pr-develop Build started...
|
2023-04-14 18:48:20 +02:00 |
|
|
b0a2b5886f
|
hotfix ACS/SUS
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-develop Build started...
|
2023-04-14 18:45:58 +02:00 |
|