WIP: PTME: Separate registers for VCs #636

Closed

muellerr wants to merge 4 commits from ptme-separate-regs-for-vcs-2 into v4.0.0-dev

pull from: ptme-separate-regs-for-vcs-2

merge into: eive:v4.0.0-dev

eive:main

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 4 Files Changed 6 +79 -27

muellerr commented 2023-05-12 09:17:30 +02:00

Owner

Copy Link

No description provided.

muellerr added 2 commits 2023-05-12 09:17:31 +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

Squashed commit of the following: ... 00e98a2fd6

commit 120e50299b
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Wed May 10 14:24:39 2023 +0200

    update IP core handler

commit a13687a7dc
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Wed May 10 14:21:05 2023 +0200

    update AXI PTME config code

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

muellerr changed target branch from main to v2.2.0-dev 2023-05-12 09:17:38 +02:00

muellerr added this to the v4.0.0 milestone 2023-05-12 09:17:42 +02:00

muellerr referenced this pull request 2023-05-12 09:18:06 +02:00

WIP: PTME separate regs for VCs #627

muellerr changed title from PTME: Separate registers for VCs to WIP: PTME: Separate registers for VCs 2023-05-22 10:33:24 +02:00

muellerr added 71 commits 2023-05-22 11:47:08 +02:00

changelog 04b6c7006e

changelog 621a6fd401

changelog 97567736fb

changelog b34767c870

changelog 32d2ad8f1d

add HK request command c8d1ce40ba

add new set 3a0db9c9ad

bugfxi by marius 531f87cd76

mpsoc update 98e69b9a6a

MPSoC HK packet 30fba0456b

request HK regularly now 758ed22b08

dynamically enable/disable MPSoC 2b36195dac

changelog 2c9da6a1e4

changelog e762cc5fb3

changelog 5728d916ef

changelog d5a6feb347

changelog 07dd84ff1e

changelog 9b5fac828b

add HK request command f225d9a7c1

add new set 0fd18204bf

bugfxi by marius d67414e829

mpsoc update 66ca156ab3

MPSoC HK packet 4a3af32a65

request HK regularly now 2e00e10e09

start adding dir content report d4fc95ed9f

add some more commands 98a858876a

implement dir content report in OBSW 0fb07fd3d5

i think that should do the job bacc46a8dc

changelog dbdcf0b0d6

dynamically enable/disable MPSoC 92fd1548cb

changelog 50d5180076

Various fixes and improvements cbf3315e16

changelog 0156533385

Merge branch 'ploc-code-improvenemts-2' into ploc_mpsoc_update_2 412aaf93bd

never add CAM switcher dummy 29eb0e736f

Merge branch 'ploc-code-improvenemts-2' into ploc_mpsoc_update_2 f079818c42

Merge pull request 'Payload: Fixes and improvements' (#637) from ploc-code-improvenemts-2 into v2.1.0-dev ... c9121c5214

Reviewed-on: #637

horrible 1820dae3d4

fixed gps altitude fdir 42152ab711

changelog f71a363385

Merge pull request 'gps-fdir-fix' (#638) from gps-fdir-fix into v2.1.0-dev ... a2217b0e64

Reviewed-on: #638

some more minor improvements ba060be0d6

Merge branch 'ploc_mpsoc_update_2' into ploc_mpsoc_dir_content_report_2 af20a36634

some more fixes 66c9a5eea3

some HK corrections 699fc9a861

requires some wait cycles 2b999e7fa7

speed up payload components a bit 9391949369

works now 90d289f56e

changelog 9715612e46

Merge remote-tracking branch 'origin/v2.1.0-dev' into ploc_mpsoc_update_2 86241a0052

update changelog a3b119fda6

Merge branch 'ploc_mpsoc_update_2' into ploc_mpsoc_dir_content_report_2 07d9ab0dd9

horrible 1f9c9e2407

finally receiving the content report 9887359e31

bump tmtc edda42cb61

bump tmtc again ac73e6d2c3

add back normal command 3dc096c42b

somethings still wrong 4887dc9e6b

and were at DHB debugging again 714e2d07e5

done a718d182fc

8 wait cycles are also okay edf792c4fe

Merge pull request 'PLOC MPSoC dir content report' (#634) from ploc_mpsoc_dir_content_report_2 into v2.1.0-dev ... 9b1ab3eb75

Reviewed-on: #634

bump tmtc 3d7d01d6ab

add ACU dummy as well 04b9ed4504

Merge pull request 'add ACU dummy when adding all dummies' (#640) from dummy-bugfix-host-build into v2.1.0-dev ... 8ed3bdc95c

Reviewed-on: #640

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 remote-tracking branch 'origin/v2.2.0-dev' into update-ptme-code-2 9804898d05

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

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

Merge branch 'update-ptme-code-2' into ptme-separate-regs-for-vcs-2 9a3b8c1614

muellerr added 61 commits 2023-05-23 20:21:05 +02:00

changelog a7ccfae04e

changelog 1274993428

changelog c3604085c2

changelog 09ece30304

changelog fa13703394

start adding flash read 0a109e552d

first flash read impl almost done ff47fafdc2

now the helper just needs to be driven 119afe6148

driving code almost done as well e4431d20c4

start adding dir content report ff175170aa

add some more commands 5b4261104e

implement dir content report in OBSW 827419ef34

i think that should do the job 98ef38f3eb

changelog 71ef1edb68

this should do the job f72c797f53

bump tmtc 119b1c8eb9

Merge remote-tracking branch 'origin/v2.1.0-dev' into ploc_mpsoc_read_file_2 af77d083fa

forgot some git merge conflicts 770697d5d0

disable missed deadline printing by default 9fde16c912

seems to work fine f099cd7688

that should get the job done ae6b5b491b

clean up error handlng code 178a2183a2

this does not make sense 17df79b0d6

changelog fabc6da562

some more cleaning and refacoring 5ce0a60184

new events and retvals c8ed7fe20e

remove some more printouts 78972cd173

fix host build ab6a0c3e4d

correction for flashfclose cmd b39e448ab5

bugfix 468fa01650

kenning west alder 4ba9ebf58f

it is getting annoying again 90b7f069dc

pure chaos c3b6b0a7ee

that did not help 0179c04472

D'OH f9e8dc6e60

almost done e03df2ebca

everything is working now 7f115303ae

fix some regressions b9afeb9c19

bugfix d28bc3f74d

changelog a0e305fe1f

Merge branch 'v2.1.0-dev' into ploc_mpsoc_read_file_2 3f37c52f67

changelog ed74367f01

Merge branch 'ploc_mpsoc_read_file_2' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into ploc_mpsoc_read_file_2 a814746c53

Merge pull request 'PLOC MPSoC read file, fix write file' (#633) from ploc_mpsoc_read_file_2 into v2.1.0-dev ... fa4a40da6e

Reviewed-on: #633

ze batteri wos add cd514e8125

changelog d23082283d

Merge pull request 'ze batteri wos add' (#641) from add_ze_betteri into v2.1.0-dev ... 72b5c7d053

Reviewed-on: #641

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

buuuug 7ac2271eab

changelog 6bfb0d4fb0

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

changelog, remove unnecessary logic 7222475985

thats an annoying bug 28beb006b2

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

get rid of the printouts and of the delay 50327fb614

always dump data into the VC 303df55a12

changelog 042b8fb3c3

no dump cancel on TX OFF 266abad3b3

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 'update-ptme-code-2' into ptme-separate-regs-for-vcs-2 8d70d352cf

muellerr added 2 commits 2023-05-25 11:33:42 +02:00

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

Merge branch 'update-ptme-code-2' into ptme-separate-regs-for-vcs-2 abe2c5f8ad

muellerr changed target branch from v2.2.0-dev to v4.0.0-dev 2023-05-31 10:34:47 +02:00

muellerr closed this pull request 2023-06-22 17:43:32 +02:00

Some checks are pending

Hide all checks

EIVE/eive-obsw/pipeline/pr-v2.2.0-dev This commit looks good

Details

EIVE/-/pipeline/pr-v4.0.0-dev Build queued...

Details

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

v4.0.0

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#636

No description provided.