v3 and v4 comparison PR #709

Closed

muellerr wants to merge 291 commits from main into main-v3

pull from: main

merge into: eive:main-v3

eive:mpsoc-file-split

eive:try-using-fixed-array-kalman

eive:str-valid-fixes

eive:auto-switch-image-feature

eive:acs-ptg-strat

eive:mohr/introspection

Conversation 0 Commits 291 Files Changed 96 +1905 -925

muellerr commented 2023-06-24 20:19:29 +02:00

Owner

Copy Link

No description provided.

muellerr added 98 commits 2023-06-24 20:19:30 +02:00

Squashed commit of the following: ... 7e6c25901b

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

bump tmtc 3d7d01d6ab

bump fsfw a615ed2d21

bump tmtc 97a7087827

dock hk improvements 8b467ec69e

Merge branch 'v2.1.0-dev' into update-ptme-code-2 22dcf10207

Merge branch 'v2.2.0-dev' into update-ptme-code-2 8cc4431e22

Merge pull request 'CFDP Bugfix' (#639) from cfdp-bugfix into v2.2.0-dev ... e04f349e77

Reviewed-on: #639

Merge remote-tracking branch 'origin/v2.2.0-dev' into update-ptme-code-2 9804898d05

Merge branch 'v2.1.0-dev' into v2.2.0-dev 148a876fc9

Merge branch 'v2.2.0-dev' into update-ptme-code-2 ea9f72b9c4

changelog 2543cdf5b7

Merge branch 'v2.2.0-dev' into update-ptme-code-2 e4fc6e3d2a

Merge remote-tracking branch 'origin/v2.1.0-dev' into v2.2.0-dev 4763ec84fa

Merge branch 'v2.2.0-dev' into update-ptme-code-2 8efbdf8279

Merge branch 'oh-no-no-no-bug' into update-ptme-code-2 f5a7fd2ffe

changelog, remove unnecessary logic 7222475985

Merge branch 'tm-store-task-base-bugfix' into update-ptme-code-2 7bd2fce86f

get rid of the printouts and of the delay 50327fb614

Merge branch 'no-dump-cancel-on-tx-off' into update-ptme-code-2 15139d6944

Merge branch 'always-dump-into-vc' into update-ptme-code-2 6cf488d0a6

Merge branch 'v2.1.0-dev' into v2.2.0-dev 351ca1154b

Merge branch 'v2.2.0-dev' into update-ptme-code-2 016e9dd2df

use read write permissions for uio 9c78362ac5

Merge branch 'v2.1.0-dev' into update-ptme-code-2 f3cc406495

working, remove some old unrequired code 9921522ce0

try to get rid of the nanosleep ddcdc38310

Merge branch 'v3.0.0-dev' into v4.0.0-dev 68e4d9be07

Merge branch 'v4.0.0-dev' into update-ptme-code-2 9711bb6300

bump major version 0b06bc4c8b

Merge branch 'v4.0.0-dev' into update-ptme-code-2 cc60847bd0

PAPB VC simplification 8113a71c79

small fix 442b1c94a6

Merge pull request 'Update PTME code' (#635) from update-ptme-code-2 into v4.0.0-dev ... 5c79d5e1f7

Reviewed-on: #635

back to somethng simple 998110dea4

changelog a85b0a4a76

Merge pull request 'PAPB VC Simplification' (#661) from papb-vc-if-simplification into v4.0.0-dev ... 004a283163

Reviewed-on: #661

Merge branch 'v3.0.0-dev' into v4.0.0-dev caa2800a7a

add force flag for cp helper aec383b974

let's not forget this 5058b8905d

bump fsfw b8064c4a39

Merge branch 'v3.0.0-dev' into v4.0.0-dev 9e787a7e44

bump fsfw cf48a18733

Merge remote-tracking branch 'origin/main' into v4.0.0-dev 55d6edcd66

Merge remote-tracking branch 'origin/v4.0.0-dev' into p60dock-hk-improvements c5b2b5c56c

Merge remote-tracking branch 'origin/main' into v4.0.0-dev 4bd3cf4d52

add PS I2C resetn 8da5f4dd44

changelog 40eae48a1a

finally have a firmware version 456ee156c3

Merge branch 'v4.0.0-dev' into p60dock-hk-improvements d85a5975c0

Merge pull request 'dock hk improvements' (#676) from p60dock-hk-improvements into v4.0.0-dev ... 931bb5ee28

Reviewed-on: #676

Merge branch 'v4.0.0-dev' into add-pl-i2c-resetn 3dd7530c3d

Merge pull request 'Add PL I2C reset GPIO' (#683) from add-pl-i2c-resetn into v4.0.0-dev ... 9544516cc4

Reviewed-on: #683

minor improvements 9c0744ae02

Merge remote-tracking branch 'origin/main' into v4.0.0-dev 2ae89769af

remove commented code af8b4d5bc8

extend RW dummy 4893af07ae

make imtq dummy more similar 3f9bf8e173

sus convert bugfix 295da50bc7

new FW info event 2d4a3c0ee2

Merge branch 'v4.0.0-dev' into sus-converter-h-fix f40348904c

Merge pull request 'sus convert bugfix' (#698) from sus-converter-h-fix into v4.0.0-dev ... 1c74d39faf

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

Merge pull request 'Increase FM and EM similarity' (#697) from increase-fm-em-similarity into main ... 4de1932c8a

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

set temperature invalid properly 0c394ad34d

those are the most important cases 3ae7dab8c7

changelog add083135e

Merge remote-tracking branch 'origin/v4.0.0-dev' into set-more-temps-to-invalid-value d0a9460676

core ctrl provides more info on reboot db3a4955c2

changelog afcc0cc21d

that should do the job 788fbb72f0

bump tmtc 880b8620ba

Merge pull request 'Set temperatures to invalid value when applicable' (#700) from set-more-temps-to-invalid-value into v4.0.0-dev ... 98a2338dcb

Reviewed-on: #700

Merge branch 'v4.0.0-dev' into more-info-on-reboot d1086bc9aa

bump tmtc e8bd3f447d

Merge branch 'more-info-on-reboot' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into more-info-on-reboot c7e554aebc

Merge branch 'v4.0.0-dev' into extend-cp-helper a0d559a5fd

Merge branch 'v4.0.0-dev' into extend-cp-helper ced812052d

Merge pull request 'More Info on Reboot' (#701) from more-info-on-reboot into v4.0.0-dev ... b634543c5a

Reviewed-on: #701

Merge branch 'v4.0.0-dev' into extend-cp-helper 4c66d8fb5f

Merge pull request 'Add force flag for cp helper' (#667) from extend-cp-helper into v4.0.0-dev ... 3a59cd301b

Reviewed-on: #667

bump tmtc and CHANGELOG 1c27ba7261

remove stray newline 9b2b087d08

changelog fb9303a8de

changelog tweak 2 de4562dd2f

reduce GNSS pin reset assertion time b2b7900720

Merge pull request 'reduce GNSS pin reset assertion time' (#703) from gnss-reset-adaptions into v4.0.0-dev ... da79f24b33

Reviewed-on: #703

prep v4.0.0 final f67d72a8dd

Merge branch 'main' into v4.0.0-dev 4dad1df13b

Merge pull request 'v4.0.0' (#699) from v4.0.0-dev into main ... 4a9b6bc0c4

Reviewed-on: #699

afmt f79acca1d6

bugfix packet demux 4a8e111a18

remove printouts db5e7a535e

this iis less confusing b261779ebf

changelog a95ab49690

Merge pull request 'Bugfix for packet demultiplexing' (#704) from bugfix-packet-demux into main ... e992f933ec

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

prep v4.0.1 patch 2901ebc15c

Merge pull request 'prep v4.0.1 patch' (#705) from prep_v4.0.1 into main ... 20bc31449a

Reviewed-on: #705

v3.1.1 changelog facfad3367

muellerr closed this pull request 2023-06-24 20:20:36 +02:00

All checks were successful

Hide all checks

EIVE/eive-obsw/pipeline/head This commit looks good

Details

Pull request closed

This pull request cannot be reopened because the branch was deleted.

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels   

OPS TODO

Issues identified by OPS

  

api change

API change

  

breaking api change

API change which can break existing code

  

bug

Something is not working

  

documentation

Documentation

  

duplicate

This issue or pull request already exists

  

feature

New feature

  

help wanted

Need some help

  

invalid

Something is wrong

  

question

More information is needed

  

wontfix

This won't be fixed

No Label

OPS TODO

api change

breaking api change

bug

documentation

duplicate

feature

help wanted

invalid

question

wontfix

Milestone

Clear milestone

No items

No Milestone

Assignees

Clear assignees

No Assignees

1 Participants

Notifications

Subscribe

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: eive/eive-obsw#709

No description provided.