Comparator #712

Closed
muellerr wants to merge 0 commits from current-main into main
Owner
No description provided.
muellerr added 118 commits 2023-06-26 15:45:42 +02:00
EIVE/eive-obsw/pipeline/head Build queued... Details
EIVE/eive-obsw/pipeline/pr-main This commit looks good Details
7e6c25901b
Squashed commit of the following:
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
EIVE/eive-obsw/pipeline/head This commit looks good Details
3d7d01d6ab
bump tmtc
EIVE/eive-obsw/pipeline/head Build queued... Details
EIVE/eive-obsw/pipeline/pr-v2.2.0-dev This commit looks good Details
a615ed2d21
bump fsfw
EIVE/eive-obsw/pipeline/pr-v2.2.0-dev This commit looks good Details
97a7087827
bump tmtc
EIVE/eive-obsw/pipeline/head This commit looks good Details
EIVE/-/pipeline/head Build queued... Details
EIVE/eive-obsw/pipeline/pr-v4.0.0-dev This commit looks good Details
8b467ec69e
dock hk improvements
EIVE/eive-obsw/pipeline/pr-v2.2.0-dev This commit looks good Details
8cc4431e22
Merge branch 'v2.2.0-dev' into update-ptme-code-2
EIVE/eive-obsw/pipeline/head This commit looks good Details
e04f349e77
Merge pull request 'CFDP Bugfix' (#639) from cfdp-bugfix into v2.2.0-dev
Reviewed-on: #639
EIVE/eive-obsw/pipeline/head This commit looks good Details
148a876fc9
Merge branch 'v2.1.0-dev' into v2.2.0-dev
EIVE/eive-obsw/pipeline/pr-v2.2.0-dev This commit looks good Details
ea9f72b9c4
Merge branch 'v2.2.0-dev' into update-ptme-code-2
EIVE/eive-obsw/pipeline/head This commit looks good Details
2543cdf5b7
changelog
EIVE/eive-obsw/pipeline/pr-v2.2.0-dev This commit looks good Details
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 Details
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 Details
50327fb614
get rid of the printouts and of the delay
EIVE/eive-obsw/pipeline/pr-v2.2.0-dev This commit looks good Details
6cf488d0a6
Merge branch 'always-dump-into-vc' into update-ptme-code-2
EIVE/eive-obsw/pipeline/head This commit looks good Details
EIVE/-/pipeline/head Build queued... Details
351ca1154b
Merge branch 'v2.1.0-dev' into v2.2.0-dev
EIVE/eive-obsw/pipeline/pr-v2.2.0-dev This commit looks good Details
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 Details
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 Details
ddcdc38310
try to get rid of the nanosleep
EIVE/eive-obsw/pipeline/head This commit looks good Details
68e4d9be07
Merge branch 'v3.0.0-dev' into v4.0.0-dev
EIVE/eive-obsw/pipeline/pr-v4.0.0-dev This commit looks good Details
9711bb6300
Merge branch 'v4.0.0-dev' into update-ptme-code-2
EIVE/eive-obsw/pipeline/head This commit looks good Details
0b06bc4c8b
bump major version
EIVE/eive-obsw/pipeline/pr-v4.0.0-dev This commit looks good Details
cc60847bd0
Merge branch 'v4.0.0-dev' into update-ptme-code-2
EIVE/eive-obsw/pipeline/head This commit looks good Details
8113a71c79
PAPB VC simplification
EIVE/eive-obsw/pipeline/pr-update-ptme-code-2 Build started... Details
EIVE/eive-obsw/pipeline/head This commit looks good Details
EIVE/eive-obsw/pipeline/pr-v4.0.0-dev This commit looks good Details
442b1c94a6
small fix
EIVE/eive-obsw/pipeline/pr-v4.0.0-dev This commit looks good Details
998110dea4
back to somethng simple
EIVE/eive-obsw/pipeline/pr-v4.0.0-dev Build started... Details
EIVE/eive-obsw/pipeline/head This commit looks good Details
a85b0a4a76
changelog
EIVE/eive-obsw/pipeline/head This commit looks good Details
caa2800a7a
Merge branch 'v3.0.0-dev' into v4.0.0-dev
EIVE/eive-obsw/pipeline/head This commit looks good Details
EIVE/eive-obsw/pipeline/pr-v4.0.0-dev This commit looks good Details
aec383b974
add force flag for cp helper
EIVE/eive-obsw/pipeline/pr-v4.0.0-dev This commit looks good Details
EIVE/-/pipeline/pr-v4.0.0-dev Build queued... Details
5058b8905d
let's not forget this
EIVE/eive-obsw/pipeline/head This commit looks good Details
b8064c4a39
bump fsfw
EIVE/eive-obsw/pipeline/head There was a failure building this commit Details
9e787a7e44
Merge branch 'v3.0.0-dev' into v4.0.0-dev
EIVE/eive-obsw/pipeline/head This commit looks good Details
EIVE/-/pipeline/head Build started... Details
cf48a18733
bump fsfw
EIVE/eive-obsw/pipeline/head This commit looks good Details
55d6edcd66
Merge remote-tracking branch 'origin/main' into v4.0.0-dev
EIVE/eive-obsw/pipeline/head This commit looks good Details
4bd3cf4d52
Merge remote-tracking branch 'origin/main' into v4.0.0-dev
EIVE/eive-obsw/pipeline/head This commit looks good Details
8da5f4dd44
add PS I2C resetn
EIVE/eive-obsw/pipeline/head Build started... Details
EIVE/eive-obsw/pipeline/pr-v4.0.0-dev This commit looks good Details
40eae48a1a
changelog
EIVE/eive-obsw/pipeline/pr-v4.0.0-dev This commit looks good Details
456ee156c3
finally have a firmware version
EIVE/eive-obsw/pipeline/pr-v4.0.0-dev Build started... Details
d85a5975c0
Merge branch 'v4.0.0-dev' into p60dock-hk-improvements
EIVE/eive-obsw/pipeline/pr-v4.0.0-dev This commit looks good Details
3dd7530c3d
Merge branch 'v4.0.0-dev' into add-pl-i2c-resetn
EIVE/eive-obsw/pipeline/head There was a failure building this commit Details
2ae89769af
Merge remote-tracking branch 'origin/main' into v4.0.0-dev
EIVE/eive-obsw/pipeline/head This commit looks good Details
af8b4d5bc8
remove commented code
EIVE/eive-obsw/pipeline/head This commit looks good Details
4893af07ae
extend RW dummy
EIVE/eive-obsw/pipeline/head This commit looks good Details
EIVE/eive-obsw/pipeline/pr-main This commit looks good Details
3f9bf8e173
make imtq dummy more similar
EIVE/eive-obsw/pipeline/head Build queued... Details
EIVE/eive-obsw/pipeline/pr-main This commit looks good Details
295da50bc7
sus convert bugfix
EIVE/eive-obsw/pipeline/head This commit looks good Details
2d4a3c0ee2
new FW info event
EIVE/eive-obsw/pipeline/pr-v4.0.0-dev Build started... Details
f40348904c
Merge branch 'v4.0.0-dev' into sus-converter-h-fix
EIVE/eive-obsw/pipeline/pr-main This commit looks good Details
EIVE/eive-obsw/pipeline/head This commit looks good Details
1c74d39faf
Merge pull request 'sus convert bugfix' (#698) from sus-converter-h-fix into v4.0.0-dev
Reviewed-on: #698
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
EIVE/eive-obsw/pipeline/pr-v2.0.5-branch This commit looks good Details
EIVE/eive-obsw/pipeline/head This commit looks good Details
4de1932c8a
Merge pull request 'Increase FM and EM similarity' (#697) from increase-fm-em-similarity into main
Reviewed-on: #697
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
EIVE/eive-obsw/pipeline/head Build started... Details
0c394ad34d
set temperature invalid properly
EIVE/eive-obsw/pipeline/head Build queued... Details
EIVE/eive-obsw/pipeline/pr-v4.0.0-dev This commit looks good Details
3ae7dab8c7
those are the most important cases
EIVE/eive-obsw/pipeline/pr-v4.0.0-dev This commit looks good Details
add083135e
changelog
EIVE/eive-obsw/pipeline/head There was a failure building this commit Details
afcc0cc21d
changelog
EIVE/eive-obsw/pipeline/head This commit looks good Details
788fbb72f0
that should do the job
EIVE/eive-obsw/pipeline/head This commit looks good Details
EIVE/eive-obsw/pipeline/pr-v4.0.0-dev This commit looks good Details
880b8620ba
bump tmtc
EIVE/eive-obsw/pipeline/pr-v4.0.0-dev This commit looks good Details
d1086bc9aa
Merge branch 'v4.0.0-dev' into more-info-on-reboot
EIVE/eive-obsw/pipeline/pr-v4.0.0-dev There was a failure building this commit Details
a0d559a5fd
Merge branch 'v4.0.0-dev' into extend-cp-helper
EIVE/eive-obsw/pipeline/pr-v4.0.0-dev Build queued... Details
ced812052d
Merge branch 'v4.0.0-dev' into extend-cp-helper
EIVE/eive-obsw/pipeline/pr-v4.0.0-dev Build queued... Details
4c66d8fb5f
Merge branch 'v4.0.0-dev' into extend-cp-helper
EIVE/eive-obsw/pipeline/pr-main This commit looks good Details
1c27ba7261
bump tmtc and CHANGELOG
EIVE/eive-obsw/pipeline/pr-main This commit looks good Details
9b2b087d08
remove stray newline
EIVE/eive-obsw/pipeline/pr-main This commit looks good Details
fb9303a8de
changelog
EIVE/eive-obsw/pipeline/pr-main This commit looks good Details
de4562dd2f
changelog tweak 2
EIVE/eive-obsw/pipeline/head Build queued... Details
EIVE/eive-obsw/pipeline/pr-v4.0.0-dev Build started... Details
b2b7900720
reduce GNSS pin reset assertion time
EIVE/eive-obsw/pipeline/pr-main This commit looks good Details
f67d72a8dd
prep v4.0.0 final
EIVE/eive-obsw/pipeline/pr-main Build started... Details
4dad1df13b
Merge branch 'main' into v4.0.0-dev
EIVE/eive-obsw/pipeline/head This commit looks good Details
4a9b6bc0c4
Merge pull request 'v4.0.0' (#699) from v4.0.0-dev into main
Reviewed-on: #699
EIVE/eive-obsw/pipeline/head This commit looks good Details
f79acca1d6
afmt
EIVE/eive-obsw/pipeline/head This commit looks good Details
4a8e111a18
bugfix packet demux
EIVE/eive-obsw/pipeline/head This commit looks good Details
db5e7a535e
remove printouts
EIVE/eive-obsw/pipeline/head Build started... Details
EIVE/eive-obsw/pipeline/pr-main This commit looks good Details
b261779ebf
this iis less confusing
EIVE/eive-obsw/pipeline/pr-main This commit looks good Details
a95ab49690
changelog
EIVE/eive-obsw/pipeline/head This commit looks good Details
e992f933ec
Merge pull request 'Bugfix for packet demultiplexing' (#704) from bugfix-packet-demux into main
Reviewed-on: #704
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
EIVE/eive-obsw/pipeline/head Build queued... Details
2901ebc15c
prep v4.0.1 patch
EIVE/eive-obsw/pipeline/pr-v3.3.0-dev This commit looks good Details
EIVE/eive-obsw/pipeline/head This commit looks good Details
20bc31449a
Merge pull request 'prep v4.0.1 patch' (#705) from prep_v4.0.1 into main
Reviewed-on: #705
EIVE/eive-obsw/pipeline/head This commit looks good Details
07df6eb95f
continuing
EIVE/eive-obsw/pipeline/pr-main This commit looks good Details
4e7b774d32
some legacy/backword compatiblity additions
EIVE/eive-obsw/pipeline/pr-main This commit looks good Details
6040cd2d1e
some important tweaks
EIVE/eive-obsw/pipeline/pr-main This commit looks good Details
5420e322f7
this is annoying to test..
EIVE/eive-obsw/pipeline/pr-main This commit looks good Details
4465170747
i hope that is the last bug..
EIVE/eive-obsw/pipeline/pr-main This commit looks good Details
5c9d7a43ab
that reboot was not graceful..
EIVE/eive-obsw/pipeline/pr-main This commit looks good Details
966faf51b5
last important bugfixes
EIVE/eive-obsw/pipeline/pr-main This commit looks good Details
d95ecc3678
changelog
EIVE/eive-obsw/pipeline/pr-v3.3.0-dev This commit looks good Details
EIVE/eive-obsw/pipeline/head This commit looks good Details
facfad3367
v3.1.1 changelog
EIVE/eive-obsw/pipeline/head Build queued... Details
EIVE/eive-obsw/pipeline/pr-main Build started... Details
c2b415bdd6
update .cproject file
EIVE/eive-obsw/pipeline/pr-main This commit looks good Details
d88ffb1734
small fix
EIVE/eive-obsw/pipeline/pr-main This commit looks good Details
7a68188140
Merge branch 'main' into total-boot-counter-file
EIVE/eive-obsw/pipeline/pr-main This commit looks good Details
5a642b7d2f
update core ctrl
EIVE/eive-obsw/pipeline/head This commit looks good Details
239410e2dc
Merge pull request 'New total reboot counter handling' (#708) from total-boot-counter-file into main
Reviewed-on: #708
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
EIVE/eive-obsw/pipeline/pr-main-v3 This commit looks good Details
EIVE/eive-obsw/pipeline/head Build queued... Details
1f18904810
bump tmtc
muellerr changed target branch from main-v3 to main 2023-06-26 17:09:31 +02:00
muellerr closed this pull request 2023-06-28 13:49:36 +02:00
Some checks are pending
EIVE/eive-obsw/pipeline/pr-main-v3 This commit looks good
EIVE/eive-obsw/pipeline/head Build queued...

Pull request closed

Sign in to join this conversation.
No description provided.