eive/eive-obsw
eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 120 Wiki Activity
6,610 Commits 5 Branches 124 Tags 53 MiB
7e6c25901b
Commit Graph

6610 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robin Mueller
7e6c25901b
Squashed commit of the following:
Some checks are pending
EIVE/eive-obsw/pipeline/head Build queued...
Details
EIVE/eive-obsw/pipeline/pr-main This commit looks good
Details 
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
Robin Mueller
ef039c47b8
update changelog again
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Details
2023-05-11 19:35:57 +02:00
Robin Mueller
d4b7411de1
I guess no patch version 2023-05-11 19:34:37 +02:00
Robin Mueller
2e6a93c479 ACS board and init payload 2023-05-11 19:33:06 +02:00
Robin Mueller
f3a651602b this should be robust 2023-05-11 19:33:06 +02:00
Robin Mueller
6c00404ca7 changelog 2023-05-11 19:33:06 +02:00
Robin Mueller
1412dd4fb6 changelog readme etc. 2023-05-11 19:33:06 +02:00
meggert
1602d5d318 stuff 2023-05-11 19:33:06 +02:00
Robin Mueller
1870bf6405
changelog 2023-05-11 19:33:02 +02:00
Robin Mueller
51b0d897a1 adapt EM SW: GS PCDU added, but use dummy for ACU 2023-05-11 19:32:37 +02:00
Robin Mueller
670c753a75 hello 2023-05-11 19:32:37 +02:00
Robin Mueller
26e48f2f46 changelog 2023-05-11 19:32:37 +02:00
Robin Mueller
a352f25029 changelog 2023-05-11 19:32:37 +02:00
Robin Mueller
141438bd24 changelog and stop payload tracking 2023-05-11 19:32:37 +02:00
meggert
f5e20db03f added remaining acs modes as system modes 2023-05-11 19:32:37 +02:00
Robin Mueller
1cbb7d0af8
changelog 2023-05-11 19:32:33 +02:00
Robin Mueller
09ffcc8804 changelog 2023-05-11 19:32:10 +02:00
Robin Mueller
fb062bb4e8 changelog 2023-05-11 19:32:04 +02:00
Robin Mueller
2f58ca8534 changelog 2023-05-11 19:32:04 +02:00
Robin Mueller
5747f73dfe
changelog 2023-05-11 19:31:50 +02:00
Robin Mueller
67c0a3b03e lower live TM handler frequency 2023-05-11 19:31:23 +02:00
Robin Mueller
490790bd0c host SW works properly again 2023-05-11 19:31:23 +02:00
Robin Mueller
7dfc7dc8c1 configurable event manager queue depth 2023-05-11 19:31:23 +02:00
Robin Mueller
aa63bd1fa5 EM adaptions 2023-05-11 19:31:23 +02:00
Robin Mueller
b7383294c9 add back tm funnel handler for hosted build 2023-05-11 19:30:45 +02:00
Robin Mueller
e31a95d1c4 host build requires dedicated live TM task.. 2023-05-11 19:30:45 +02:00
Robin Mueller
3e9933c7ee this is annoying 2023-05-11 19:30:45 +02:00
Robin Mueller
ee3ef042cd
Merge remote-tracking branch 'origin/v2.0.5-dev' into HEAD
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Details
2023-05-11 19:30:33 +02:00
Robin Mueller
05b0efe851 patch revision 2023-05-11 19:29:02 +02:00
Robin Mueller
8ade378a69 bump tmtc 2023-05-11 19:29:02 +02:00
Robin Mueller
045d149946 bump revision
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Details
2023-05-11 18:50:49 +02:00
Robin Mueller
a75f9553be okay lets see if this works
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Details
2023-05-11 18:38:41 +02:00
Robin Müller
f271242d66 Merge pull request 'the hottest fix' (#614) from hottest_fix_acs into main
Some checks failed
EIVE/eive-obsw/pipeline/pr-main This commit looks good
Details
EIVE/eive-obsw/pipeline/head There was a failure building this commit
Details 
Reviewed-on: #614
 2023-04-19 18:17:54 +02:00
Robin Mueller
1756b5edcc patch revision
Some checks are pending
EIVE/eive-obsw/pipeline/pr-main Build queued...
Details
2023-04-19 18:14:28 +02:00
Robin Mueller
9c1fc44c60 Merge branch 'hottest_fix_acs' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into hottest_fix_acs
Some checks are pending
EIVE/eive-obsw/pipeline/pr-main Build queued...
Details
2023-04-19 18:12:40 +02:00
Robin Mueller
f46a705900 changelog 2023-04-19 18:12:32 +02:00
Robin Müller
9183d18acc Merge branch 'main' into hottest_fix_acs
Some checks are pending
EIVE/eive-obsw/pipeline/pr-main Build queued...
Details
2023-04-19 18:10:50 +02:00
Robin Mueller
befa84a74b the hottest fix
Some checks are pending
EIVE/eive-obsw/pipeline/head Build queued...
Details
EIVE/eive-obsw/pipeline/pr-main Build started...
Details
2023-04-19 18:09:57 +02:00
Robin Mueller
432b400835
bump tmtc
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Details
2023-04-18 10:28:01 +02:00
Robin Mueller
0eb6b7cccb
bump patch revision to 3
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Details
2023-04-17 11:58:44 +02:00
Robin Mueller
74ee291983
add tmtc release version
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Details
2023-04-17 11:58:13 +02:00
Robin Mueller
a146c34140
CI/CD: Use 8 jobs
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Details
2023-04-17 11:55:08 +02:00
Robin Müller
61ced11766 Merge pull request 'fixes and tweaks TCS and EM build' (#610) from fixes_and_tweaks into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Details 
Reviewed-on: #610
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
 2023-04-17 11:53:15 +02:00
Robin Mueller
468fb096c9
high event severity
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop Build queued...
Details
2023-04-17 11:44:51 +02:00
Robin Mueller
4a2dd19a73 Merge branch 'fixes_and_tweaks' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into fixes_and_tweaks
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop Build started...
Details
2023-04-17 11:41:26 +02:00
Robin Mueller
2658cabc9d
remove TODO 2023-04-17 11:41:21 +02:00
Robin Müller
dc83061f80 Merge branch 'develop' into fixes_and_tweaks
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
Details
2023-04-17 11:38:21 +02:00
Robin Mueller
00da51b6a2
okay its an afmt thing
Some checks are pending
EIVE/eive-obsw/pipeline/head Build queued...
Details
EIVE/eive-obsw/pipeline/pr-develop Build queued...
Details
2023-04-17 11:36:34 +02:00
Robin Mueller
f846a18b33
update defines
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
Details
2023-04-17 11:36:17 +02:00
Robin Mueller
ab588b4844
fixes and tweaks TCS and EM build
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
Details
2023-04-17 11:35:10 +02:00