v6.1.0-branch #750

Closed

muellerr wants to merge 117 commits from v6.1.0-branch into v6.0.0-branch

pull from: v6.1.0-branch

merge into: eive:v6.0.0-branch

Conversation 0 Commits 117 Files Changed 53 +997 -560

muellerr commented 2023-07-20 16:28:57 +02:00

Owner

Copy Link

to search for possible regression..

to search for possible regression..

muellerr added 117 commits 2023-07-20 16:28:58 +02:00

swap i2cs 1b919ceaec

Merge remote-tracking branch 'origin/v4.0.0-dev' into swap-pl-ps-i2c 3e9accfa7b

Merge remote-tracking branch 'origin/main' into swap-pl-ps-i2c 31fdbac8c0

tmp is back in the house d6dd943ebf

stupid tmps 269d5f6a0a

that should do the job 727050520b

tmp1075 workssssss 07bb293816

always add TMP devs now 0cd5526de4

need to verify some things here later.. ecb8de1550

tmp fdir bugfix: use strange reply counter 322151acf8

another tmp FDIR fix 97268af555

changelog 8f7d3dd815

create TCS CTRL TMP1075 PLCDU 1 se tdynamically df4e657ec3

STR tests d14e256901

Merge remote-tracking branch 'origin/main' into swap-pl-ps-i2c 697a3e8577

lets see if this works 9ece676313

changelog 25c7058da5

that should do the job d1b9608a14

FM should build again d8ab6abc49

that should fix the host build 5c430212e7

set dataset invalid on OFF mode cd9cb48b04

small fix/tweaks 52eba5cae6

that really should not cause issues though.. 1e98fcbbd5

this is better to read.. 1d4b815452

pool read guard f4f365b110

Merge pull request 'set dataset invalid on OFF mode' (#726) from tmp-1075-set-sets-invalid into main ... 0c47513e98

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

Merge remote-tracking branch 'origin/main' into swap-pl-ps-i2c ... bda2ba79bf

make marius extremely happy

Merge pull request 'Swap PL and PS I2C' (#725) from swap-pl-ps-i2c into main ... ee4285075a

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

the TCS subsystem does not work on the EM.. b7e4953126

this works but is kind of ugly 6182218813

remove some cruft 61ea80f92c

changelog 5630ae4962

heater events for TCS ctrl 3c9eec7b3f

add new events 785c1c65a0

Merge branch 'main' into some-more-tcs-tweaks 5ea3bfeb7b

TCS ctrl bugfix 12ff365433

update changelog 64ca329d5a

form fix 3e92d175d5

there are actually 8 heaters 7b611810df

compile fix faffca0c2c

continue max heater duration ce19f30325

Merge branch 'another-tcs-fix' into tcs-heater-upper-limit fc697732b4

some docs c558a117b0

done 027955597f

comment f1ca4b174f

Merge pull request 'More TMP1075 bugfixes' (#727) from more-tmp-bugfixes into main ... a7a530cb59

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

changelog 351c33e504

bump tmtc 377cc64d0f

Merge remote-tracking branch 'origin/main' into add-tcs-ctrl-heater-events c1a23e0d73

Merge branch 'main' into some-more-tcs-tweaks b0b43b3ecc

changelog 2bad2a142b

Merge pull request 'Add TCS CTRL heater events' (#728) from add-tcs-ctrl-heater-events into main ... 06a24da2b9

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

Merge remote-tracking branch 'origin/main' into some-more-tcs-tweaks bd33a51bf1

Merge remote-tracking branch 'origin/main' into tcs-ctrl-bugfix ec39dc05ae

Merge remote-tracking branch 'origin/main' into another-tcs-fix 908cf8dcc3

Merge remote-tracking branch 'origin/main' into tcs-heater-upper-limit 0b673fcdec

Merge branch 'tcs-heater-upper-limit' into tcs-observability 603ddcef9c

Merge pull request 'Some TCS tweaks' (#729) from some-more-tcs-tweaks into main ... 8255869f2d

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

Merge branch 'main' into tcs-ctrl-bugfix 3087049726

Merge pull request 'TCS CTRL bugfix' (#730) from tcs-ctrl-bugfix into main ... 6ae0fdf191

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

Merge remote-tracking branch 'origin/main' into another-tcs-fix a6461fcaf8

Merge remote-tracking branch 'origin/main' into tcs-heater-upper-limit 7388c4f661

Merge pull request 'Another TCS fix' (#731) from another-tcs-fix into main ... b3d2fdc277

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

Merge remote-tracking branch 'origin/main' into tcs-heater-upper-limit 977e9f366f

Merge branch 'tcs-heater-upper-limit' into tcs-observability a7ab26d804

changelog 6bf9fd5969

compile fixes ff7d0b3989

Merge branch 'tcs-heater-upper-limit' into tcs-observability fce16cc695

add event f2f73b088d

add event 7337595d47

bump tmtc b662e220e1

Merge branch 'tcs-heater-upper-limit' into tcs-observability f7c49adea5

pls compile fa85cc4d78

Merge branch 'tcs-heater-upper-limit' into tcs-observability c0ae25a973

resolve merge conflicts properly 43d86c9aad

that should be sufficient 06fe113d7f

changelog a351dcf99e

done df3755d6cc

Merge branch 'tcs-heater-upper-limit' into tcs-observability 2210ec3737

this should do the job 647f3d00bb

COMPILE 268f10ced5

Merge pull request 'Make OBSW compatible to prospective FW v5.0.0' (#734) from tmp-devs-to-q7-i2c into main ... 3f4a34d616

Reviewed-on: #734

Merge remote-tracking branch 'origin/main' into tcs-heater-upper-limit 106d73238b

this should be better 33de08eafc

that should be it ce2755e161

minor tweaks for XADC code be1d1cf5bf

TCS improvements 7e01a9602e

Merge branch 'tcs-heater-upper-limit' into tcs-observability a61d7901bf

add back with other name and comment 7c4f98ec22

bump tmtc 84e37d8b7b

disable test case 53d53e8771

Merge branch 'tcs-heater-upper-limit' into tcs-observability d2dfc22373

fsfw bump and changelog c7f716c433

Merge branch 'bump-fsfw' into tcs-observability cf582dd6a4

seems to work now fdf1c7a611

Merge pull request 'TCS improvements' (#735) from tcs-tweaks into main ... 3fb083fd87

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

Merge branch 'main' into minor-xadc-tweak 643f8c5b54

changelog 852f1203c6

Merge pull request 'minor tweaks for XADC code' (#736) from minor-xadc-tweak into main ... dbc3868f47

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

Merge remote-tracking branch 'origin/main' into bump-fsfw 690f8cb49a

Merge remote-tracking branch 'origin/main' into tcs-heater-upper-limit 8800b20409

Merge pull request 'fsfw bump and changelog' (#737) from bump-fsfw into main ... 9443d3844a

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

thermal controller ed7d75a777

Merge branch 'main' into tcs-heater-upper-limit 914a22f642

Merge pull request 'TCS heater upper burn limit' (#732) from tcs-heater-upper-limit into main ... 55affe5a42

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

Merge remote-tracking branch 'origin/main' into tcs-observability 72dbc34936

bump tmtc 46bb602c96

TCS observability 13e965948c

Merge pull request 'TCS Observability' (#733) from tcs-observability into main ... 74859dd5c6

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

use correct clock API 54309b512f

Merge pull request 'use correct clock API in TCS CTRL' (#738) from small-tcs-fix into main ... 887bfc87c3

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

Merge remote-tracking branch 'origin/main' into startracker-tests a800ad6c9a

remove printout 8cc5220dd0

changelog 86f7d05526

Merge pull request 'STR tests' (#739) from startracker-tests into main ... 546053f95a

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

bump minor version 1f44533b3e

Merge pull request 'v6.1.0' (#740) from prep_v6.1.0 into main ... 70c4f8f3fd

Reviewed-on: #740

meggert added a new dependency 2023-07-25 09:49:07 +02:00

#748 New Safe Mode Controller

meggert removed a dependency 2023-07-25 09:49:11 +02:00

#748 New Safe Mode Controller

muellerr closed this pull request 2023-08-03 13:20:08 +02:00

All checks were successful

Hide all checks

EIVE/eive-obsw/pipeline/pr-v6.0.0-branch This commit looks good

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

Milestone

No items

No Milestone

Assignees

Clear assignees

No Assignees

1 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: eive/eive-obsw#750

No description provided.