Commit Graph

22 Commits

Author SHA1 Message Date
a6a3180196 removed conflict markers 2020-06-04 15:03:29 +02:00
3d175f603c removed conflict markers 2020-06-04 15:02:14 +02:00
e20244b0ce Merge remote-tracking branch 'upstream/master' into mueller_StoreAccessor 2020-06-04 14:35:55 +02:00
c0a0688a52 Merge branch 'mueller_localPoolNeat' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller_localPoolNeat 2020-06-04 14:22:16 +02:00
f871f75e1c added back default value for pool manager.h 2020-05-29 17:10:57 +02:00
2b0dbca1d4 Merge remote-tracking branch 'upstram/master' into mueller_localPoolNeat 2020-05-29 17:08:39 +02:00
023af149df Merge branch 'mueller_localPoolNeat' into mueller_StoreAccessor 2020-05-29 17:07:48 +02:00
a3f379e149 and another little include guard fix 2020-05-29 16:50:37 +02:00
acf037614f added another author tag 2020-05-29 16:48:53 +02:00
ab17e28405 include protection output fix 2020-05-29 16:45:52 +02:00
a993223f6e added include protection 2020-05-29 16:44:31 +02:00
d83181cb0f added author tag 2020-05-29 16:41:23 +02:00
8af5a32f1d new store accessor classes
implementation of local pool and pool manager extracted into
tpp file.

store_address_t definition extracted in separate file to avoid circular
includes by using forward declarations
2020-05-29 16:37:46 +02:00
91acc471b6 include guard fix, sif replacements 2020-05-20 14:47:58 +02:00
71e103e2b6 better include guards 2020-05-20 14:40:50 +02:00
26763b7cee added comparison operator 2020-05-13 11:24:17 +02:00
3ebc257968 some little formatting stuff 2020-05-07 23:00:09 +02:00
1158c9d675 storagemanager refactoring 2020-05-04 17:01:48 +02:00
2c6b446500 it is done :-)
However, commented outputs are not changed yet.
2020-04-23 19:13:18 +02:00
fd782b20c0 Adding Code for Linux 2018-12-19 19:42:00 +01:00
575f70ba03 updating code from Flying Laptop
This is the framework of Flying Laptop OBSW version A.13.0.
2018-07-12 16:29:32 +02:00
Bastian Baetz
1d22a6c97e Today's the day. Renamed platform to framework. 2016-06-15 23:48:49 +02:00