Updating development with upstream changes #2

Closed
muellerr wants to merge 38 commits from mueller/master into development

38 Commits

Author SHA1 Message Date
Robin Müller 5b9c0e013e Merge branch 'mueller/test-update' into mueller/bundled-update 2020-12-28 18:01:05 +01:00
Robin Müller b2c98f0ae4 Merge branch 'mueller/test-update' of https://egit.irs.uni-stuttgart.de/fsfw/fsfw into mueller/test-update 2020-12-28 18:00:07 +01:00
Robin Müller c5212226b8 Merge remote-tracking branch 'origin/mueller/test-update' into mueller/bundled-update 2020-12-28 17:58:50 +01:00
Robin Müller 91cb061da9 datapool updates, fixes, pool read helper 2020-12-28 17:55:19 +01:00
Robin Müller bc475f0a9a bugfixes 2020-12-28 17:48:26 +01:00
Robin Müller d268c6d96c moved includes to allow c inclusion 2020-12-28 16:59:39 +01:00
Robin Müller b126149215 removed abi flags, are part of cross compile file now 2020-12-28 16:49:43 +01:00
Robin Müller f9bcc835d7 include updated 2020-12-28 01:17:03 +01:00
Robin Müller 1538a39d5b Merge branch 'mueller/test-update' into mueller/master 2020-12-27 15:16:08 +01:00
Robin Müller 254b1437e9 repaired windows unittests 2020-12-27 15:15:51 +01:00
Robin Müller 978cbea341 Merge remote-tracking branch 'origin/mueller/test-update' into mueller/master 2020-12-27 15:04:24 +01:00
Robin Müller f60f02c5b8 updated readme 2020-12-27 14:53:37 +01:00
Robin Müller d8d2f207e1 cleaned up includes 2020-12-27 14:20:26 +01:00
Robin Müller 37463b660b restructured test folder and enabled cmake v3 support 2020-12-27 14:14:38 +01:00
Robin Müller 39887db8d2 removed newline 2020-12-27 12:59:25 +01:00
Robin Müller e24e50b5ee removed todo 2020-12-27 12:58:05 +01:00
Robin Müller d80ddcccac Merge branch 'mueller/raiiacctest' into mueller/master 2020-12-27 02:04:56 +01:00
Robin Müller ed473d0a1b bugfix 2020-12-27 02:04:45 +01:00
Robin Müller 76403ce0ab renaming 2020-12-27 01:53:59 +01:00
Robin Müller f852c774f8 accessor test 2020-12-27 01:52:48 +01:00
Robin Müller 535b51ef70 improvements and clarifications 2020-12-27 01:15:52 +01:00
Robin Müller 639dbee8a3 form stuff 2020-12-27 00:21:39 +01:00
Robin Müller 76696e34be its possible to protect every read/commit now 2020-12-26 23:57:23 +01:00
Robin Müller e35c2cd604 hk manager optional now 2020-12-26 23:16:33 +01:00
Robin Müller b469340ef4 bugfix 2020-12-26 18:06:56 +01:00
Robin Müller 4157a4b638 Merge branch 'development' into mueller/master 2020-12-26 14:47:54 +01:00
Robin Müller 9eec75df26 linking against thread lib 2020-12-25 01:49:44 +01:00
Robin Müller 68fe923a01 renamed class enums 2020-12-24 02:03:33 +01:00
Robin Müller e9b819e21e Merge branch 'mueller/master' of https://egit.irs.uni-stuttgart.de/fsfw/fsfw into mueller/master 2020-12-23 20:27:22 +01:00
Robin Müller 159ad15b73 Merge branch 'development' into mueller/master 2020-12-23 20:27:14 +01:00
Robin Müller d7efa1b4d7 Merge branch 'development' into mueller/master 2020-12-23 20:19:34 +01:00
Robin Müller a00f3b9adc Merge remote-tracking branch 'upstream/development' into mueller/master 2020-12-23 20:19:23 +01:00
Robin Müller ba1f8f7171 Merge branch 'development' into mueller/master 2020-12-22 16:38:41 +01:00
Robin Müller 04c92bcdfc Merge branch 'mueller/master' of https://egit.irs.uni-stuttgart.de/fsfw/fsfw into mueller/master 2020-12-21 17:27:17 +01:00
Robin Müller 71ee86a688 reverted sif buffer changes 2020-12-21 17:18:31 +01:00
Robin Müller 59eab8866d using traits again 2020-12-21 17:16:44 +01:00
Robin Müller 4100bb19ce Merge branch 'mueller/host-cmake-improvements' into mueller/master 2020-12-21 14:07:25 +01:00
Robin Müller fc4da433d5 using winsock2 now 2020-12-21 13:49:42 +01:00