Commit Graph

1506 Commits

Author SHA1 Message Date
8bb67cd919 Merge branch 'development' into mueller/pool-entry-update 2021-01-19 14:51:46 +01:00
fe09add0fe Merge pull request 'updated cmakelists' (#348) from KSat/fsfw:mueller/cmake-update into development
Reviewed-on: fsfw/fsfw#348
2021-01-19 14:51:12 +01:00
d7220b7350 Merge branch 'development' into mueller/cmake-update 2021-01-19 14:50:25 +01:00
9d179f90ad Merge pull request 'doc update' (#347) from KSat/fsfw:mueller/doc-update into development
Reviewed-on: fsfw/fsfw#347
2021-01-19 14:50:14 +01:00
eb6a851935 pool entry update 2021-01-13 12:02:23 +01:00
c9913ea53a updated cmakelists 2021-01-13 11:47:04 +01:00
482f240995 doc update 2021-01-13 11:39:19 +01:00
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
8332b348ee Merge branch 'development' into mueller/fsfw-printers 2021-01-12 15:25:52 +01:00
7a3ba06b01 Merge remote-tracking branch 'upstream/mueller/datapool-update' into mueller/fsfw-printers 2021-01-12 15:14:16 +01:00
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
e30d020445 Merge branch 'development' into mueller/tmstorage 2021-01-12 15:09:00 +01:00
a89d9eab36 Merge branch 'development' into mueller/datapool-update 2021-01-12 15:07:06 +01:00
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
165710b43c service interface update 2021-01-12 15:06:25 +01:00
295852a45c Merge remote-tracking branch 'upstream/development' into mueller/fsfw-printers 2021-01-12 15:05:25 +01:00
fa66fafd2c Merge branch 'development' into mueller/rtems-update-stm32 2021-01-12 15:01:33 +01:00
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
67879bf12f Merge branch 'development' into mueller/devicehandler-bugfix 2021-01-12 13:28:10 +01:00
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
ba9a604c93 Merge branch 'development' into mueller/bugfix/defaultcfg 2021-01-12 13:27:19 +01:00
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
e64b2e0616 bugfix 2021-01-04 15:38:46 +01:00
63e80206bc rtems osal update 2021-01-04 15:34:08 +01:00
51cdf6cc76 missing include added 2021-01-03 16:48:18 +01:00
c94a396ffb changelog update 2021-01-03 15:31:44 +01:00
59d327f8b6 console init for printf on windows 2021-01-03 15:15:03 +01:00
8c8965177f new amalgated header 2021-01-03 15:04:37 +01:00
98af84c145 additional tweask 2021-01-03 14:41:54 +01:00
695a767164 some include fixes 2021-01-03 14:33:17 +01:00
2edf158312 correct preprocessor define now used 2021-01-03 14:16:52 +01:00
4515c0d3cd exlcuding ostream headers 2021-01-03 14:08:40 +01:00
afda3b2fa0 small tweak 2021-01-03 14:00:29 +01:00
c19e628d79 all cstdout uses wrapped in preprocessor defines 2021-01-03 13:58:18 +01:00
61fc6cac97 added change for windows 2021-01-03 13:25:42 +01:00
087482300d include order 2021-01-03 01:49:12 +01:00
717027792e minor improvements and docuemntation 2021-01-03 01:47:01 +01:00
e300207f48 removed comment 2021-01-03 01:40:35 +01:00
5c42888f10 whitespace 2021-01-03 01:39:06 +01:00
0e2875b22d added colored output for streams as well 2021-01-03 01:35:17 +01:00
b30405fee7 added stdio pinters 2021-01-03 01:02:07 +01:00
7759b19961 added new files 2021-01-02 23:22:50 +01:00
4c07ca21eb important include fix 2021-01-02 19:40:00 +01:00
e5b3f991ef added important rtems include 2021-01-02 19:39:02 +01:00
4de5fc44b4 rtems init 2021-01-01 21:19:42 +01:00
ced753b513 include guard 2021-01-01 18:06:33 +01:00
f223aa148e updated cmake lists 2021-01-01 18:05:02 +01:00
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
5be95fada7 bugfixes and RTEMS update for STM32 2021-01-01 17:18:37 +01:00
193881f784 Merge branch 'mueller/defaultcfg-update' into mueller/master 2020-12-30 22:59:20 +01:00