upstream fsfw bundled update #3

Closed
muellerr wants to merge 97 commits from mueller/bundled-update into eive/develop

97 Commits

Author SHA1 Message Date
muellerr 9fa4be9ff9 Merge remote-tracking branch 'upstream/development' into mueller/bundled-update 2021-01-12 15:30:34 +01:00
gaisser 5639273d9b Merge pull request 'C++ ostream made optional' (#342) from mueller/fsfw-printers into development
Reviewed-on: fsfw/fsfw#342
2021-01-12 15:27:14 +01:00
gaisser 8332b348ee Merge branch 'development' into mueller/fsfw-printers 2021-01-12 15:25:52 +01:00
muellerr 7a3ba06b01 Merge remote-tracking branch 'upstream/mueller/datapool-update' into mueller/fsfw-printers 2021-01-12 15:14:16 +01:00
gaisser b42535dd2d Merge pull request 'TM storage convergence' (#327) from KSat/fsfw:mueller/tmstorage into development
Reviewed-on: fsfw/fsfw#327
2021-01-12 15:09:14 +01:00
gaisser e30d020445 Merge branch 'development' into mueller/tmstorage 2021-01-12 15:09:00 +01:00
gaisser a89d9eab36 Merge branch 'development' into mueller/datapool-update 2021-01-12 15:07:06 +01:00
gaisser 4d6d951ae6 Merge pull request 'rtems stm32 init' (#341) from mueller/rtems-update-stm32 into development
Reviewed-on: fsfw/fsfw#341
2021-01-12 15:06:46 +01:00
muellerr 165710b43c service interface update 2021-01-12 15:06:25 +01:00
muellerr 295852a45c Merge remote-tracking branch 'upstream/development' into mueller/fsfw-printers 2021-01-12 15:05:25 +01:00
gaisser fa66fafd2c Merge branch 'development' into mueller/rtems-update-stm32 2021-01-12 15:01:33 +01:00
gaisser f81d3e81dc Merge pull request 'Bugfix Device Handler Base' (#339) from mueller/devicehandler-bugfix into development
Reviewed-on: fsfw/fsfw#339
2021-01-12 14:45:11 +01:00
gaisser 67879bf12f Merge branch 'development' into mueller/devicehandler-bugfix 2021-01-12 13:28:10 +01:00
gaisser d281b56ce2 Merge pull request 'moved includes' (#335) from mueller/bugfix/defaultcfg into development
Reviewed-on: fsfw/fsfw#335
2021-01-12 13:27:57 +01:00
gaisser ba9a604c93 Merge branch 'development' into mueller/bugfix/defaultcfg 2021-01-12 13:27:19 +01:00
gaisser 72e9a9516f Merge pull request 'cmake lists updates' (#336) from mueller/cmake-updates into development
Reviewed-on: fsfw/fsfw#336
2021-01-12 13:26:39 +01:00
muellerr e64b2e0616 bugfix 2021-01-04 15:38:46 +01:00
muellerr 63e80206bc rtems osal update 2021-01-04 15:34:08 +01:00
muellerr 51cdf6cc76 missing include added 2021-01-03 16:48:18 +01:00
muellerr c94a396ffb changelog update 2021-01-03 15:31:44 +01:00
muellerr 59d327f8b6 console init for printf on windows 2021-01-03 15:15:03 +01:00
muellerr 8c8965177f new amalgated header 2021-01-03 15:04:37 +01:00
muellerr 98af84c145 additional tweask 2021-01-03 14:41:54 +01:00
muellerr 695a767164 some include fixes 2021-01-03 14:33:17 +01:00
muellerr 2edf158312 correct preprocessor define now used 2021-01-03 14:16:52 +01:00
muellerr 4515c0d3cd exlcuding ostream headers 2021-01-03 14:08:40 +01:00
muellerr afda3b2fa0 small tweak 2021-01-03 14:00:29 +01:00
muellerr c19e628d79 all cstdout uses wrapped in preprocessor defines 2021-01-03 13:58:18 +01:00
muellerr 61fc6cac97 added change for windows 2021-01-03 13:25:42 +01:00
muellerr 087482300d include order 2021-01-03 01:49:12 +01:00
muellerr 717027792e minor improvements and docuemntation 2021-01-03 01:47:01 +01:00
muellerr e300207f48 removed comment 2021-01-03 01:40:35 +01:00
muellerr 5c42888f10 whitespace 2021-01-03 01:39:06 +01:00
muellerr 0e2875b22d added colored output for streams as well 2021-01-03 01:35:17 +01:00
muellerr b30405fee7 added stdio pinters 2021-01-03 01:02:07 +01:00
muellerr 7759b19961 added new files 2021-01-02 23:22:50 +01:00
muellerr 184b1cf2c5 Merge branch 'mueller/rtems-update-stm32' into mueller/bundled-update 2021-01-02 19:40:32 +01:00
muellerr 4c07ca21eb important include fix 2021-01-02 19:40:00 +01:00
muellerr e5b3f991ef added important rtems include 2021-01-02 19:39:02 +01:00
muellerr 4de5fc44b4 rtems init 2021-01-01 21:19:42 +01:00
muellerr ced753b513 include guard 2021-01-01 18:06:33 +01:00
muellerr f223aa148e updated cmake lists 2021-01-01 18:05:02 +01:00
muellerr 3ea763bf34 Merge branch 'mueller/master' of https://egit.irs.uni-stuttgart.de/fsfw/fsfw into mueller/master 2021-01-01 18:03:40 +01:00
muellerr 5be95fada7 bugfixes and RTEMS update for STM32 2021-01-01 17:18:37 +01:00
muellerr 193881f784 Merge branch 'mueller/defaultcfg-update' into mueller/master 2020-12-30 22:59:20 +01:00
muellerr 7b15a5a431 moved includes 2020-12-30 22:57:52 +01:00
muellerr c4fb1f49d8 updated defaultcfg 2020-12-30 22:56:46 +01:00
muellerr 1d98a6ab5a Merge branch 'mueller/devicehandler-bugfix' into mueller/bundled-update 2020-12-30 22:37:26 +01:00
muellerr 8920349ed0 Merge branch 'mueller/devicehandler-bugfix' into mueller/master 2020-12-30 22:37:02 +01:00
muellerr 0a4d0b5937 bugfix 2020-12-30 22:34:40 +01:00
muellerr 56eac46472 Revert "device handler base update"
This reverts commit 44dcd3104e.
2020-12-30 22:17:08 +01:00
muellerr 44dcd3104e device handler base update 2020-12-30 22:01:11 +01:00
muellerr c8af75f9c7 moved inlcudes 2020-12-28 18:06:34 +01:00
muellerr bc1513c649 cmake lists updates 2020-12-28 18:06:00 +01:00
muellerr 5b9c0e013e Merge branch 'mueller/test-update' into mueller/bundled-update 2020-12-28 18:01:05 +01:00
muellerr 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
muellerr c5212226b8 Merge remote-tracking branch 'origin/mueller/test-update' into mueller/bundled-update 2020-12-28 17:58:50 +01:00
muellerr 91cb061da9 datapool updates, fixes, pool read helper 2020-12-28 17:55:19 +01:00
muellerr bc475f0a9a bugfixes 2020-12-28 17:48:26 +01:00
muellerr d268c6d96c moved includes to allow c inclusion 2020-12-28 16:59:39 +01:00
muellerr b126149215 removed abi flags, are part of cross compile file now 2020-12-28 16:49:43 +01:00
muellerr f9bcc835d7 include updated 2020-12-28 01:17:03 +01:00
muellerr 1538a39d5b Merge branch 'mueller/test-update' into mueller/master 2020-12-27 15:16:08 +01:00
muellerr 254b1437e9 repaired windows unittests 2020-12-27 15:15:51 +01:00
muellerr 978cbea341 Merge remote-tracking branch 'origin/mueller/test-update' into mueller/master 2020-12-27 15:04:24 +01:00
muellerr f60f02c5b8 updated readme 2020-12-27 14:53:37 +01:00
muellerr d8d2f207e1 cleaned up includes 2020-12-27 14:20:26 +01:00
muellerr 37463b660b restructured test folder and enabled cmake v3 support 2020-12-27 14:14:38 +01:00
muellerr 39887db8d2 removed newline 2020-12-27 12:59:25 +01:00
muellerr e24e50b5ee removed todo 2020-12-27 12:58:05 +01:00
muellerr d80ddcccac Merge branch 'mueller/raiiacctest' into mueller/master 2020-12-27 02:04:56 +01:00
muellerr ed473d0a1b bugfix 2020-12-27 02:04:45 +01:00
muellerr 76403ce0ab renaming 2020-12-27 01:53:59 +01:00
muellerr f852c774f8 accessor test 2020-12-27 01:52:48 +01:00
muellerr 535b51ef70 improvements and clarifications 2020-12-27 01:15:52 +01:00
muellerr 639dbee8a3 form stuff 2020-12-27 00:21:39 +01:00
muellerr 76696e34be its possible to protect every read/commit now 2020-12-26 23:57:23 +01:00
muellerr e35c2cd604 hk manager optional now 2020-12-26 23:16:33 +01:00
muellerr b469340ef4 bugfix 2020-12-26 18:06:56 +01:00
muellerr 4157a4b638 Merge branch 'development' into mueller/master 2020-12-26 14:47:54 +01:00
muellerr 9eec75df26 linking against thread lib 2020-12-25 01:49:44 +01:00
muellerr 68fe923a01 renamed class enums 2020-12-24 02:03:33 +01:00
gaisser c5eae8c41b Merge branch 'development' into mueller/tmstorage 2020-12-23 23:51:54 +01:00
muellerr 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
muellerr 159ad15b73 Merge branch 'development' into mueller/master 2020-12-23 20:27:14 +01:00
muellerr d7efa1b4d7 Merge branch 'development' into mueller/master 2020-12-23 20:19:34 +01:00
muellerr a00f3b9adc Merge remote-tracking branch 'upstream/development' into mueller/master 2020-12-23 20:19:23 +01:00
gaisser bda9546f51 Merge branch 'development' into mueller/tmstorage 2020-12-22 17:35:26 +01:00
gaisser bc8c3da1b7 Merge branch 'development' into mueller/tmstorage 2020-12-22 17:30:27 +01:00
muellerr ba1f8f7171 Merge branch 'development' into mueller/master 2020-12-22 16:38:41 +01:00
muellerr 09161f22d0 updated tm storage 2020-12-22 15:58:52 +01:00
muellerr 021b9b8c50 improvements 2020-12-22 15:57:43 +01:00
muellerr 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
muellerr 71ee86a688 reverted sif buffer changes 2020-12-21 17:18:31 +01:00
muellerr 59eab8866d using traits again 2020-12-21 17:16:44 +01:00
muellerr 4100bb19ce Merge branch 'mueller/host-cmake-improvements' into mueller/master 2020-12-21 14:07:25 +01:00
muellerr fc4da433d5 using winsock2 now 2020-12-21 13:49:42 +01:00