eive/fsfw

1 Fork 0

forked from fsfw/fsfw

Update FSFW #33

Merged

meierj merged 75 commits from mueller/master into eive/develop

2022-02-21 11:00:17 +01:00

muellerr commented

2022-02-19 16:58:50 +01:00

Owner

Integrate development changes
Allow way to pass context in form ob object ID (or/and any other arbitrary information) to MessageQueue ctor call. This allows to trace MQ issues to object ID faster
HAL: Make periodic printout runtime configurable

- Integrate development changes - Allow way to pass context in form ob object ID (or/and any other arbitrary information) to MessageQueue ctor call. This allows to trace MQ issues to object ID faster - HAL: Make periodic printout runtime configurable

muellerr added 74 commits 2022-02-19 16:58:55 +01:00

Merge pull request 'Release v3.0.0' (#532 ) from development into master 2a268e14d1

Reviewed-on: fsfw/fsfw#532

update changelog.md ad5bb4c694

Merge remote-tracking branch 'origin/development' into mueller/update-changelog 51add8a8ad

uio mapper 79936a3335

add uio subdir 2d52042ed6

prepared for proper pr 40329a33b2

merged develop 348274c145

virtual function to print datasets e9b0951a95

do send read hook 06ffe27fcc

fix to remove compiler warning f08d291e3e

removed HK switch helper from cmake file 0d4bd856bd

another include removed 32a9e0c704

add uio subdirectory 1b41153ee6

bump version 43b7a314b6

bump revision bd29688307

Merge pull request 'bump version' (#542 ) from mueller/bump-version into master 620841a9e5

Reviewed-on: fsfw/fsfw#542

Merge pull request 'Update development to master v3.0.1' (#546 ) from master into development f93c173715

Reviewed-on: fsfw/fsfw#546

added v3.0.1 to changelog 80a610141a

Updated changelog for v4.0.0 baddbf7340

Merge branch 'development' into meier/uioMapper 7b8019c621

Merge branch 'development' into mueller/update-changelog c7b9df5e40

Merge branch 'development' into meier/doSendReadHook 8ab8c57f9c

Merge branch 'development' into meier/printDataSet 5f48d77c64

Merge pull request 'do send read hook' (#545 ) from meier/doSendReadHook into development 9b17b282c6

Reviewed-on: fsfw/fsfw#545

Merge pull request 'virtual function to print datasets' (#544 ) from meier/printDataSet into development 9e6948a8d7

Reviewed-on: fsfw/fsfw#544

removed cmake warning as I have a workaround 6dc34fc1f0

Merge branch 'mueller/update-changelog' of egit.irs.uni-stuttgart.de:fsfw/fsfw into mueller/update-changelog a4f57a38fa

workaround for build regression catch2-v3.0.0-preview4 2e4cd80556

Merge branch 'development' into mohr/catch2workaround 793b97f651

Merge pull request 'Fix for Catch2 build regression' (#548 ) from mohr/catch2workaround into development 136524424f

Reviewed-on: fsfw/fsfw#548

using prebuild, static docker image 7a83289b3d

Jenkinsfile typo 54f3d7bd2d

Jenkinsfile another typo 7208139630

Merge pull request 'Switching to a static docker image' (#549 ) from mohr/static_docker into development 9df8722c10

Reviewed-on: fsfw/fsfw#549

Merge branch 'development' into mueller/update-changelog f4f1174849

updated changelog c6d152a01d

Merge pull request 'Update CHANGELOG' (#539 ) from mueller/update-changelog into development bc0100ee08

Reviewed-on: fsfw/fsfw#539

started DHB docs 062e93fd88

started DHB docs b25555a533

fixed up cross-ref cdf2a90f90

Merge branch 'mueller/dhb-docs' into mueller/master 81f5b0c3bf

this sounds better 2dcf896cca

increase test limit 4f87e24f60

added flose and changed warning message to error message 9897f51307

removed one fclose 120750f22a

Merge pull request 'meier/uioMapper' (#543 ) from meier/uioMapper into development 805538ec6e

Reviewed-on: fsfw/fsfw#543

Merge branch 'development' into mueller/dhb-docs 2602d4fed1

Merge branch 'development' into mueller/increase-test-limit 3bcd71598d

applied clang format 9e958e752e

Merge branch 'development' into mueller/increase-test-limit e312cd094a

increase test limit d53c7e1190

Merge branch 'mueller/increase-test-limit' of https://egit.irs.uni-stuttgart.de/eive/fsfw into mueller/increase-test-limit d81257a91c

this should work an ALL systems 0d38ac62d8

increase other limits 22bc300902

Merge pull request 'increase test limit' (#552 ) from eive/fsfw:mueller/increase-test-limit into development d4f059d639

Reviewed-on: fsfw/fsfw#552

Fixed valgrind python script 074ef29b86

Merge branch 'development' into gaisser_build_script 7788cada54

Merge pull request 'Fixed valgrind python script' (#553 ) from gaisser/fsfw:gaisser_build_script into development a5adeb333c

Reviewed-on: fsfw/fsfw#553

added two links a612fb446c

docs update 6744a55b9b

Merge branch 'development' into mueller/dhb-docs 918783774f

Merge pull request 'Some DHB docs' (#551 ) from eive/fsfw:mueller/dhb-docs into development f24de22e9b

Reviewed-on: fsfw/fsfw#551

preparing 4.0.0 c3d78120ea

Merge pull request 'Release v4.0.0' (#554 ) from development into master a274d6598e

Reviewed-on: fsfw/fsfw#554

Merge remote-tracking branch 'upstream/development' into mueller/master 0d6d44f72f

bugfix in test task 9e92afbf07

error check in event manager b3482eba24

printout improvements bd05afbddd

update event mngr printout a12e98d948

added void* args to queue factory and mq ctor a5871ed0b1

this is a bit cleaner 0d66569687

cache mq args 508979d32d

passing mqArgs to all mq ctor calls cf69af4e7e

make periodic printout run time configurable d74a373f1d

meierj approved these changes

2022-02-21 09:20:28 +01:00

Dismissed

meierj dismissed meierj's review 2022-02-21 09:20:55 +01:00

muellerr added 1 commit 2022-02-21 10:37:58 +01:00

Merge remote-tracking branch 'origin/eive/develop' into mueller/master c4a055986c

meierj approved these changes

2022-02-21 11:00:06 +01:00

meierj merged commit 19f8e41c7f into eive/develop

2022-02-21 11:00:17 +01:00

meierj referenced this issue from a commit

2022-02-21 11:00:18 +01:00

Merge pull request 'Update FSFW' (#33) from mueller/master into eive/develop

Sign in to join this conversation.

2 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: eive/fsfw#33