Update PTME code #635

Merged

meggert merged 20 commits from update-ptme-code-2 into v4.0.0-dev 2023-05-31 15:23:15 +02:00

Conversation 2 Commits 20 Files Changed 8 +40 -77

muellerr commented 2023-05-12 09:14:06 +02:00

Owner

Copy Link

No description provided.

muellerr added 1 commit 2023-05-12 09:14:07 +02:00

Squashed commit of the following: ... 7e6c25901b

commit c137df64ab43e5b20fcf26c8821982fa71e43cff
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 4179e8e124b3f9f425ac64b7df8b7e7395982dbf
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 51f9d5e1fe8e71445ec15b833020c4e30b254e72
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 a17f57cbb587f960366baae7059309d18619cdc4
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Fri Apr 28 15:34:45 2023 +0200

    changelog

commit 26f5eff6d5957e4898f6d5a84200e77b1bd6250c
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 8a0f13bafbb995b724321a3936a674078d01882f
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 14baa3563c3dc6499bac49bb83c08ba98bfad171
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Fri Apr 28 15:30:09 2023 +0200

    hello

commit 7045b6034afdb819f4978f91f697d7f23806ab89
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Fri Apr 28 15:18:47 2023 +0200

    changelog

commit 37b9615525637294118266910979236127f8a8ce
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Fri Apr 28 15:18:16 2023 +0200

    changelog

commit 4074e0848012042565047726b8c526c6b5809a2c
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 23796345d966787f6f43c1d89b9555413bfe583a
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Fri Apr 28 15:04:30 2023 +0200

    changelog and stop payload tracking

commit b10275ca43f13ee68be013c7ece3b63acf762130
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Fri Apr 28 14:28:05 2023 +0200

    changelog

commit 383849c5cb62b1543037ab07c904b2725c91be13
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Fri Apr 28 14:25:14 2023 +0200

    that is more robust

commit c66cef9129586e8708a8f2679ff86b3c9977c5f5
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Fri Apr 28 14:23:21 2023 +0200

    changelog

commit 02ea8a7298ff14c8acab55b2f693e8593c277624
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Fri Apr 28 14:22:21 2023 +0200

    changelog

commit 38686ac3f621e50ea76be023520167841d2e2c19
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 74d5d70973b46c70d1483077e71e2820d3ca4ad6
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Fri Apr 28 13:58:08 2023 +0200

    this bugfix might be super important

commit 48355e82635b071b9347b62f2bd1da636bf4eae5
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 189a312628e561f54491ec238a2d2d5e2f211b57
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 a12794281bfc2ebb27a02bbc151696023e69a9f0
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Fri Apr 28 10:20:31 2023 +0200

    changelog

commit fcaabb4e421b5f792ede490b6dd135ce661c9db5
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 6c326489cbc59f2d70993542f05676472ca0102f
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 862a4f268510e04fc3cfb878b5eed9f0f9d62f05
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 5691fe8e72a2e3b008d6130f31be32d9d7aee9b7
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 2daca272f8f0397125349c0f6c193e22d0a26383
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Thu Apr 27 11:29:18 2023 +0200

    changelog

commit 03762f962020b55188d445ee3dd429b6e1a32135
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Wed Apr 26 17:38:06 2023 +0200

    lower live TM handler frequency

commit a296f16e5ce9d803ce5db54d9602e396dad7ebce
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Wed Apr 26 17:36:38 2023 +0200

    host SW works properly again

commit 83f07a6e16cbbf5fc4a9ccb2e7d92c3fdffb172b
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Wed Apr 26 17:26:32 2023 +0200

    configurable event manager queue depth

commit 00dab64628a53d2109fceb5f9a4ffc765a72fab6
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 4aafca64a67589826f1578865c92fa76141e8531
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 6901eae81689981937e7eb49b98886f8c78b727b
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 7d630ebcf3894a9a9896d1c3f05548d5ef230333
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Wed Apr 26 17:00:04 2023 +0200

    EM adaptions

commit 641b8e847d2b63ad11f28c4a37434a6161443690
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 13142686823bedee1a79ae5f851f124968822a54
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 4040304ef09a172f9d2bef42547d6b1effb8ca76
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Wed Apr 26 13:15:42 2023 +0200

    this is annoying

commit a919b3d1645d5c4a6e20903d973ce96424508cae
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 9672d6d6cca3ad7369bb4b06fd91a7f17a0f9db9
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Wed Apr 26 11:11:09 2023 +0200

    changelog

commit e22f2a53ea7388cc5c75c2024953aab293c8d277
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 b076e80b44e7ef2b2417def66ec1f1a684cfb228
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Wed Apr 26 11:04:10 2023 +0200

    changelog

commit 269aa6f7b0006125e9a516f8ecb6cdc32c91cbe5
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Wed Apr 26 11:03:42 2023 +0200

    changelog

commit caae2b4ba925747aa0ed1e2112582c6deff39d77
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date:   Wed Apr 26 11:02:24 2023 +0200

    update PTME code

commit 097be17a2900e64021fcbb457c89d6d4756ab697
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:14:31 +02:00

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

muellerr referenced this pull request 2023-05-12 09:14:48 +02:00

WIP: Update PTME code #617

muellerr added 4 commits 2023-05-22 10:46:11 +02:00

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

muellerr added 2 commits 2023-05-22 10:48:27 +02:00

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

muellerr added 1 commit 2023-05-22 11:46:31 +02:00

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

muellerr added 1 commit 2023-05-23 18:29:39 +02:00

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

muellerr added 7 commits 2023-05-23 19:43:53 +02:00

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

muellerr added 5 commits 2023-05-23 20:18:44 +02:00

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

muellerr added 1 commit 2023-05-25 10:34:09 +02:00

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

muellerr added 12 commits 2023-05-29 15:08:23 +02:00

another tweak for TM stores 276501c504

changelog 8d041c6753

another small logic fix e1aff4c641

Merge pull request 'Tweak for TM stores' (#650) from another-tweak-for-tm-stores into v2.1.0-dev ... d22f948af4

Reviewed-on: #650

added switcher for IMTQ dummy db79e34d3b

changelog a6787538f2

Merge pull request 'Added switcher for MGT dummy' (#651) from mgt-dummy-switcher-fix into v2.1.0-dev ... 2ff1c0d9d5

Reviewed-on: #651

heater mode fix 5afe22bc92

Merge pull request 'Heater Mode Fix' (#652) from heater-mode-fix into v2.1.0-dev ... 93cf6bab01

Reviewed-on: #652

use read write permissions for uio 9c78362ac5

i think the rad sesnor messing everything up 71eca867ea

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

muellerr added 2 commits 2023-05-30 19:22:39 +02:00

working, remove some old unrequired code 9921522ce0

try to get rid of the nanosleep ddcdc38310

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

muellerr added 1 commit 2023-05-31 11:51:02 +02:00

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

muellerr added 1 commit 2023-05-31 11:53:02 +02:00

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

muellerr changed title from WIP: Update PTME code to Update PTME code 2023-05-31 13:26:16 +02:00

muellerr requested review from meierj 2023-05-31 15:06:29 +02:00

muellerr requested review from meggert 2023-05-31 15:06:39 +02:00

meierj approved these changes 2023-05-31 15:16:37 +02:00

meggert approved these changes 2023-05-31 15:17:31 +02:00

meggert merged commit 5c79d5e1f7 into v4.0.0-dev 2023-05-31 15:23:15 +02:00

meggert referenced this issue from a commit 2023-05-31 15:23:15 +02:00

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

meggert deleted branch update-ptme-code-2 2023-05-31 15:23:17 +02:00

Sign in to join this conversation.

Reviewers

No Reviewers

meierj

meggert

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

Milestone

No items

No Milestone v4.0.0

Assignees

Clear assignees

No Assignees

3 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: eive/eive-obsw#635

No description provided.