v1.16.0 #323

Merged

muellerr merged 223 commits from develop into main 2022-11-18 14:23:24 +01:00

Conversation 0 Commits 223 Files Changed 152 +2917 -1595

muellerr commented 2022-11-18 14:22:54 +01:00

Owner

Copy Link

No description provided.

muellerr added 223 commits 2022-11-18 14:22:59 +01:00

add first mode sequence for acs ss a0db5dcc7c

continued acs subsystem 874e06baa1

Merge remote-tracking branch 'origin/develop' into mueller/hand-written-subsystem c262d1ef90

small fix e3783d0941

neat baa6f05f8e

baseline acs mode tree done bbb4ba2191

bump fsfwgen 298148eebf

add IDLE charge mode 9ba65b04fd

system folder restructuring f014e2d5c7

create and schedule ACS SS f9dd77b8ec

started acs subsystem 0697cca88a

continued pl ss f5723dc181

Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init 636e2d62d8

submodule update b4a54804df

update changelog 40b84b0576

Merge remote-tracking branch 'origin/develop' into mueller/hand-written-subsystem df73e95d13

finished first rudimentary pl ss c1fe7563d2

more readable 5de45a7ae7

added all checks, made checker func generic 9c0a89bbdc

Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init cb47667d01

Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init 7db0872ee3

bump tmtc submodule aa9acef76a

Merge branch 'mueller/acs-ss-init' into mueller/pl-ss 0e97c4ad9a

Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init 3b40e622fe

fsfw update b49ed2bacf

Merge remote-tracking branch 'origin/develop' into mueller/pl-ss e8e3138fba

Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init 77704b3e79

Merge remote-tracking branch 'origin/develop' into mueller/pl-ss f598ac3daf

Merge remote-tracking branch 'origin/develop' into mueller/pl-ss a6c6325d41

Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init 1508a1e147

Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init 355ca27d31

Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init dd67191044

Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init 2fa1061c65

Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init 3713617ea5

Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init e1ed532f91

Merge branch 'mueller/acs-ss-init' into mueller/pl-ss 581423a40e

solve merge conflicts 83c7ec8067

Merge branch 'mueller/acs-ss-init' into mueller/pl-ss e537080166

Merge remote-tracking branch 'origin/develop' into mueller/pl-ss f7d436dc6b

Update PL SS c86e000f09

Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init 96564f890e

Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init 5d2a70b6c6

Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init 95121b5120

Merge remote-tracking branch 'origin/develop' into mueller/pl-ss 5b0f1efefd

Merge branch 'develop' into mueller/pl-ss 10a82eca25

Merge branch 'develop' into mueller/acs-ss-init 4632a56346

Merge remote-tracking branch 'origin/develop' into mueller/pl-ss 9e89a0689f

Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init b133a0538c

Merge remote-tracking branch 'origin/develop' into mueller/pl-ss 89b3b2ff42

Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init 4649c97205

Merge remote-tracking branch 'origin/develop' into mueller/pl-ss 975f202ddb

Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init 3ad7a35f0e

retval corrections aa86bc722f

retval replacements 86d3732f65

Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init 2b41b3ee26

bump fsfw 5813c5dd43

Merge branch 'mueller/obsw-update-cmds' into mueller/acs-ss-init 269de1782a

Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init 02333d8267

bump fsfw and tmtc 6bdc0b23de

Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init 92cf4580ca

include fix 8a5248a46d

thats a bit tricky 0f609fdaba

set DHB parents differently now f27fccfd29

bump fsfw 30dd6f1778

bump tmtc 08c03520f5

re-point fsfw 82cb87abae

Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init 9512a7d280

need to fix all of these TODOs 6af7ccc6a2

compiles again d10ff4efa6

this should do the job dcd0a650f0

fixed some bugs 57d37f14f3

bump tmtc f0e4d5a61e

connect acs ctrl to subsystem 66c6f08447

fixed some of the acs ss code 470b236008

improved retval checker a562d7e4ca

TCS ctrl bugfix 54a3d31c00

unittest fix 353cda832d

bump tmtc 797ed9200f

re-generate csvs 3f12d3500e

bump changelog 763fc54855

bump fsfw 8e9a91f32a

Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init 454c2f0ad1

bump submodules d8757ede0e

Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init 20b7f8b46b

Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init 63d660119e

re-run afmt 0f57810a9a

update changelog 3d1d31c020

bump deps 1780a09dc5

Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init 73d9bad9e2

Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init bb0ce1a329

safe mode is now callback sequence f5adbea923

Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init d3d29a3691

Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init a8e03ab8fe

renaming ed7bba2cf5

Merge remote-tracking branch 'origin/mueller/acs-ss-init' into mueller/pl-ss d190165bf3

Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init 48ed7500d8

Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init b2688c5ac0

Merge branch 'mueller/acs-ss-init' into mueller/pl-ss e0399a5db3

Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init dd7521cc4b

Merge branch 'mueller/acs-ss-init' into mueller/pl-ss f4067abdac

Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init c54f52eff6

Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init 9b8d2f3097

add some baseline defines and config values b5d3422d90

small fix 278db35ae0

split up Pdec Handler 2286451039

Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init 592cbf6fad

Merge branch 'mueller/acs-ss-init' into mueller/pl-ss db47e56474

Merge remote-tracking branch 'origin/develop' into mueller/pdec_irq_handling 115c6a6a57

pdec handler now compiles 7799e3477f

Merge remote-tracking branch 'origin/develop' into mueller/pdec_irq_handling ffb93dacd7

Merge remote-tracking branch 'origin/develop' into mueller/pdec_irq_handling a3a9bc8b39

Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init 890fba18e1

add PDEC IRQ uio file entry bc277067ed

first IRQ impl 95d2bc0887

countdown to ensure periodic lock checking 24c050765b

Merge remote-tracking branch 'origin/main' into mueller/pdec_irq_handling e5ccc6473e

bufixes for PDEC 82af8e00df

syrlink sim flag now EM/FM dependent 833f7c6885

bugfixes and improvements 23da59fec5

fixes for bash script 09642eb6bf

Merge remote-tracking branch 'origin/develop' into mueller/pdec_irq_handling 655c38a210

use baudrate 115200 for SCEX now 745fad2a19

Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init 51572208a9

Merge branch 'mueller/acs-ss-init' into mueller/pl-ss d19ddaa46c

bump fsfw 7dcc00312f

bump submodules 885a7b0c6a

Merge remote-tracking branch 'origin/develop' into mueller/pdec_irq_handling 3f3162fb36

some updates for pdec and EM syrlinks tests e5fd62a121

refactored TM funnels to allow multiple TM recipients 191d5f1268

bump fsfw 97fd35fe7b

refactored TM funnels to allow multiple TM recipients 76283e0e49

Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init 0c549dd1ce

Merge pull request 'ACS Subsystem Init' (#228) from mueller/acs-ss-init into develop ... a0c784113b

Reviewed-on: #228

Merge remote-tracking branch 'origin/develop' into mueller/tm_funnel_improvements 39778f9663

Merge remote-tracking branch 'origin/develop' into mueller/pdec_irq_handling b1f7c66066

Merge remote-tracking branch 'origin/develop' into mueller/pl-ss b6cde9e8fc

Merge remote-tracking branch 'origin/develop' into dhb2normal 621966b6f3

small logic fix 14b8b00880

bump changelog e1526f712e

bump changelog 802b851924

Merge pull request 'refactored TM funnels to allow multiple TM recipients' (#312) from mueller/tm_funnel_improvements into develop ... 004e79580e

Reviewed-on: #312
Reviewed-by: Jakob Meier <meierj@irs.uni-stuttgart.de>

hosted build works again 53214f0019

Merge branch 'mueller/tm_funnel_improvements' into dhb2normal ce743e238b

Merge remote-tracking branch 'origin/develop' into mueller/pdec_irq_handling 964f9dc688

small EM fix 8297bca969

debug printout a45e7d7561

bugfixes for dummies 3995b15ccf

dummy fix 098f69b1bc

bump deps ddc68669fc

some more tests b2e3bc7e7a

irq working 2d821ef8df

pdec handler has higher priority now 70092b348a

Merge pull request 'PDEC IRQ Handling' (#310) from mueller/pdec_irq_handling into develop ... a2c1ca97b8

Reviewed-on: #310

Merge remote-tracking branch 'origin/develop' into dhb2normal 1afd34b450

pus test service has higher prio now beb99d53f7

bump tmtc 0e3918a3a7

Merge remote-tracking branch 'origin/develop' into dhb2normal 957d4a61d8

bump fsfw 772e189040

bump fsfw again 23684710e7

remove stray info printout d5a908ab75

tweak for gomspace to normal function 264a34d227

larger queues caa81e3b8e

print correction 1f2c410a5f

Merge pull request 'print correction' (#314) from pdec_handler_print_correction into develop ... 954cd91c93

Reviewed-on: #314
Reviewed-by: Jakob Meier <meierj@irs.uni-stuttgart.de>

Merge remote-tracking branch 'origin/develop' into dhb2normal aed2d077af

even larger queues 9044a5476c

simplify max RTD low level handler 8e26ad2871

remove debug dummy b742f91ea8

important bugfix 89083cdbc8

bump fsfw 7ce9bbf2e8

bump changelog 60d81fac41

bump changelog again 6069948b4e

Merge pull request 'dhb2normal' (#313) from dhb2normal into develop ... 2b545f67ec

Reviewed-on: #313

re-run generators, TCS ctrl adaption ... 42f5f6e943

- Scoped TCS controller device temperature copy handling

afmt 10611d0415

Merge remote-tracking branch 'origin/develop' into mueller/pl-ss 9503b2ca93

small fix ba70bde3e9

start fixing this crap fe6b13bb81

remove PLOC_SWITCHER and PLOC_SUBSYSTEM usage c8ddf7472c

update changelog e3c245b99f

smaller fixes and improvements ea6fd8c952

bump tmtc 4a070f2b7f

Merge pull request 'Smaller fixes and improvements' (#317) from mueller/smaller_fixes_improvements into develop ... 7515f88843

Reviewed-on: #317

Merge remote-tracking branch 'origin/develop' into mueller/pl-ss cb49ec1c7e

keep old baud for FM b6dc81da0e

create cam switcher, create new PL task 47b65a1fa3

schedule PL components differently 07d93b6b67

wrap in preproc defines 76ca81b997

fix for object IDs 4c0bf18268

pl ss fixes f90120191f

connect payload children to subsystem d690a54005

Merge branch 'develop' into mueller/pl-ss 19cf64f5f0

Merge pull request 'Payload Subsystem' (#231) from mueller/pl-ss into develop ... b47d00844a

Reviewed-on: #231

renaming of fsfw_hal components ceba3b9dca

update TMP1075 dev handlers 7ce24ef392

renamed cookie as well a21e938f36

Merge remote-tracking branch 'origin/develop' into mueller/tmp_dev_updates 7921acefd4

create all available TMP devices 0815380044

update changelog d4de445112

there is an issue.. 6261296a0a

all TMP1075 dev except the OBC IF board one working 1a17770bbc

add some informative comments ee6bb4df3b

README update, I2C addr update a855920fb2

re-name enum a39ff34a0a

there is only one tmp1075 left d51c088afd

remove unused code 31f6a865d3

Merge pull request 'update TMP1075 dev handlers' (#318) from mueller/tmp_dev_updates into develop ... d2d13e3de6

Reviewed-on: #318

add missing TMP1075 devs in TCS ctrl 012590273f

add missing tmp devs in ctrel map as well 876c2b36bf

Merge pull request 'add missing TMP1075 devs in TCS ctrl' (#321) from mueller/tcs_ctrl_add_missing_tmp_devs into develop ... 37558c0fdc

Reviewed-on: #321

fix for set capacity 0d08a282b4

update object list 89af06a310

bump fsfw 5690e35a58

Merge branch 'develop' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into develop 6b03902465

bump fsfw 6c56810233

bump deps f6729cb3b4

lets see if that works 9da5a55ef3

add thirdparty CMakeLists.txt 478e3b9237

uart test class tweak 3c469e5c7a

Merge pull request 'Compile Linux files conditionally for Host' (#322) from mueller/compile_linux_files_conditionally_for_host into develop ... f6fc47671f

Reviewed-on: #322

update changelog 7384c5ce16

bump deps 2a00f5af47

bump version and changelog 2bbe98a403

muellerr added this to the v1.16.0 milestone 2022-11-18 14:23:13 +01:00

muellerr merged commit 6e5a8ffc31 into main 2022-11-18 14:23:24 +01:00

muellerr referenced this issue from a commit 2022-11-18 14:23:24 +01:00

Merge pull request 'v1.16.0' (#323) from develop into main

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 v1.16.0

Assignees

Clear assignees

ahinkel dgoerner jenkins_buildfix lkoester lteichroeb meggert meierj mkoller mkranz mohr msenger muellerr rmarquardt rschweigert steinertm zinkj

No Assignees

1 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: eive/eive-obsw#323

No description provided.