Commit Graph

4104 Commits

Author SHA1 Message Date
Robin Müller 0d6d44f72f Merge remote-tracking branch 'upstream/development' into mueller/master 2022-02-15 17:08:29 +01:00
Ulrich Mohr a274d6598e Merge pull request 'Release v4.0.0' (#554) from development into master
fsfw/fsfw/pipeline/pr-development Build started... Details
fsfw/fsfw/pipeline/head This commit looks good Details
Reviewed-on: #554
2022-02-14 16:49:15 +01:00
Ulrich Mohr c3d78120ea preparing 4.0.0
fsfw/fsfw/pipeline/pr-master Build started... Details
fsfw/fsfw/pipeline/head This commit looks good Details
2022-02-14 16:42:40 +01:00
Ulrich Mohr f24de22e9b Merge pull request 'Some DHB docs' (#551) from eive/fsfw:mueller/dhb-docs into development
fsfw/fsfw/pipeline/head This commit looks good Details
Reviewed-on: #551
2022-02-14 16:35:10 +01:00
Ulrich Mohr 918783774f Merge branch 'development' into mueller/dhb-docs
fsfw/fsfw/pipeline/pr-development Build started... Details
2022-02-14 16:34:47 +01:00
Robin Müller 6744a55b9b docs update
fsfw/fsfw/pipeline/pr-development This commit looks good Details
2022-02-14 16:31:13 +01:00
Robin Müller a612fb446c added two links
fsfw/fsfw/pipeline/pr-development This commit looks good Details
2022-02-14 16:23:21 +01:00
Ulrich Mohr a5adeb333c Merge pull request 'Fixed valgrind python script' (#553) from gaisser/fsfw:gaisser_build_script into development
fsfw/fsfw/pipeline/head This commit looks good Details
Reviewed-on: #553
2022-02-14 15:27:04 +01:00
Ulrich Mohr 7788cada54 Merge branch 'development' into gaisser_build_script 2022-02-14 15:26:06 +01:00
Steffen Gaisser 074ef29b86 Fixed valgrind python script
fsfw/fsfw/pipeline/pr-development This commit looks good Details
2022-02-14 15:19:47 +01:00
Ulrich Mohr d4f059d639 Merge pull request 'increase test limit' (#552) from eive/fsfw:mueller/increase-test-limit into development
fsfw/fsfw/pipeline/head This commit looks good Details
Reviewed-on: #552
2022-02-14 15:18:17 +01:00
Robin Müller 22bc300902 increase other limits
fsfw/fsfw/pipeline/pr-development This commit looks good Details
2022-02-14 16:14:14 +01:00
Robin Müller 0d38ac62d8 this should work an ALL systems
fsfw/fsfw/pipeline/pr-development This commit looks good Details
2022-02-14 16:12:48 +01:00
Robin Müller d81257a91c Merge branch 'mueller/increase-test-limit' of https://egit.irs.uni-stuttgart.de/eive/fsfw into mueller/increase-test-limit
fsfw/fsfw/pipeline/pr-development This commit looks good Details
2022-02-14 16:01:02 +01:00
Robin Müller d53c7e1190 increase test limit 2022-02-14 16:00:43 +01:00
Robin Müller e312cd094a Merge branch 'development' into mueller/increase-test-limit 2022-02-14 14:55:19 +01:00
Ulrich Mohr 9e958e752e applied clang format
fsfw/fsfw/pipeline/head This commit looks good Details
2022-02-14 14:54:20 +01:00
Robin Müller 3bcd71598d Merge branch 'development' into mueller/increase-test-limit
fsfw/fsfw/pipeline/pr-development This commit looks good Details
2022-02-14 14:51:35 +01:00
Robin Müller 2602d4fed1 Merge branch 'development' into mueller/dhb-docs
fsfw/fsfw/pipeline/pr-development This commit looks good Details
2022-02-14 14:51:16 +01:00
Ulrich Mohr 805538ec6e Merge pull request 'meier/uioMapper' (#543) from meier/uioMapper into development
fsfw/fsfw/pipeline/head There was a failure building this commit Details
Reviewed-on: #543
2022-02-14 14:50:52 +01:00
Jakob Meier 120750f22a removed one fclose
fsfw/fsfw/pipeline/pr-development This commit looks good Details
2022-02-14 08:51:53 +01:00
Jakob Meier 9897f51307 added flose and changed warning message to error message
fsfw/fsfw/pipeline/pr-development There was a failure building this commit Details
2022-02-14 08:43:10 +01:00
Robin Müller 4f87e24f60
increase test limit
fsfw/fsfw/pipeline/pr-development This commit looks good Details
2022-02-10 14:08:52 +01:00
Robin Müller 2dcf896cca
this sounds better
fsfw/fsfw/pipeline/pr-development This commit looks good Details
2022-02-10 14:04:23 +01:00
Robin Müller 81f5b0c3bf
Merge branch 'mueller/dhb-docs' into mueller/master 2022-02-10 14:03:28 +01:00
Robin Müller cdf2a90f90
fixed up cross-ref 2022-02-10 14:02:30 +01:00
Robin Müller b25555a533 started DHB docs 2022-02-10 13:53:59 +01:00
Robin Müller 062e93fd88
started DHB docs 2022-02-10 13:53:01 +01:00
Ulrich Mohr bc0100ee08 Merge pull request 'Update CHANGELOG' (#539) from mueller/update-changelog into development
fsfw/fsfw/pipeline/head There was a failure building this commit Details
Reviewed-on: #539
2022-02-07 17:13:41 +01:00
Ulrich Mohr c6d152a01d updated changelog
fsfw/fsfw/pipeline/pr-development This commit looks good Details
2022-02-07 17:11:04 +01:00
Ulrich Mohr f4f1174849 Merge branch 'development' into mueller/update-changelog 2022-02-07 17:06:16 +01:00
Ulrich Mohr 9df8722c10 Merge pull request 'Switching to a static docker image' (#549) from mohr/static_docker into development
fsfw/fsfw/pipeline/head This commit looks good Details
Reviewed-on: #549
2022-02-07 17:02:00 +01:00
Ulrich Mohr 7208139630 Jenkinsfile another typo
fsfw/fsfw/pipeline/head This commit looks good Details
fsfw/fsfw/pipeline/pr-development This commit looks good Details
2022-02-07 16:50:59 +01:00
Ulrich Mohr 54f3d7bd2d Jenkinsfile typo
fsfw/fsfw/pipeline/head There was a failure building this commit Details
2022-02-07 16:49:42 +01:00
Ulrich Mohr 7a83289b3d using prebuild, static docker image
fsfw/fsfw/pipeline/head There was a failure building this commit Details
2022-02-07 16:48:41 +01:00
Ulrich Mohr 136524424f Merge pull request 'Fix for Catch2 build regression' (#548) from mohr/catch2workaround into development
fsfw/fsfw/pipeline/head There was a failure building this commit Details
Reviewed-on: #548
2022-02-07 16:45:47 +01:00
Ulrich Mohr 793b97f651 Merge branch 'development' into mohr/catch2workaround
fsfw/fsfw/pipeline/pr-development This commit looks good Details
2022-02-07 16:40:13 +01:00
Ulrich Mohr 2e4cd80556 workaround for build regression catch2-v3.0.0-preview4
fsfw/fsfw/pipeline/pr-development This commit looks good Details
2022-02-07 15:51:06 +01:00
Ulrich Mohr a4f57a38fa Merge branch 'mueller/update-changelog' of egit.irs.uni-stuttgart.de:fsfw/fsfw into mueller/update-changelog
fsfw/fsfw/pipeline/pr-development This commit looks good Details
2022-02-07 15:42:00 +01:00
Ulrich Mohr 6dc34fc1f0 removed cmake warning as I have a workaround 2022-02-07 15:41:10 +01:00
Ulrich Mohr 9e6948a8d7 Merge pull request 'virtual function to print datasets' (#544) from meier/printDataSet into development
fsfw/fsfw/pipeline/head This commit looks good Details
Reviewed-on: #544
2022-02-07 14:42:17 +01:00
Ulrich Mohr 9b17b282c6 Merge pull request 'do send read hook' (#545) from meier/doSendReadHook into development
fsfw/fsfw/pipeline/head This commit looks good Details
Reviewed-on: #545
2022-02-07 14:42:05 +01:00
Robin Müller 5f48d77c64 Merge branch 'development' into meier/printDataSet
fsfw/fsfw/pipeline/pr-development Build started... Details
fsfw/fsfw/pipeline/head This commit looks good Details
2022-02-07 14:17:26 +01:00
Robin Müller 8ab8c57f9c Merge branch 'development' into meier/doSendReadHook
fsfw/fsfw/pipeline/pr-development This commit looks good Details
fsfw/fsfw/pipeline/head This commit looks good Details
2022-02-07 14:17:03 +01:00
Robin Müller c7b9df5e40 Merge branch 'development' into mueller/update-changelog
fsfw/fsfw/pipeline/pr-development This commit looks good Details
2022-02-07 14:16:52 +01:00
Robin Müller 7b8019c621 Merge branch 'development' into meier/uioMapper
fsfw/fsfw/pipeline/pr-development This commit looks good Details
2022-02-07 14:09:13 +01:00
Ulrich Mohr baddbf7340 Updated changelog for v4.0.0
fsfw/fsfw/pipeline/pr-development This commit looks good Details
2022-02-07 13:44:25 +01:00
Ulrich Mohr 80a610141a added v3.0.1 to changelog
fsfw/fsfw/pipeline/pr-development This commit looks good Details
2022-02-04 13:45:09 +01:00
Ulrich Mohr f93c173715 Merge pull request 'Update development to master v3.0.1' (#546) from master into development
fsfw/fsfw/pipeline/head This commit looks good Details
fsfw/fsfw/pipeline/pr-development This commit looks good Details
Reviewed-on: #546
2022-02-04 13:29:59 +01:00
Ulrich Mohr 620841a9e5 Merge pull request 'bump version' (#542) from mueller/bump-version into master
fsfw/fsfw/pipeline/pr-development Build started... Details
fsfw/fsfw/pipeline/head This commit looks good Details
Reviewed-on: #542
2022-02-04 13:23:24 +01:00