Commit Graph

6206 Commits

Author SHA1 Message Date
d3ce6d147e Merge branch 'master' into mueller/VerifHotfix 2020-09-29 15:13:43 +02:00
ce983953ff Merge pull request 'Modes and Memory convergence' (#214) from KSat/fsfw:mueller/modes-memory into master
Reviewed-on: fsfw/fsfw#214
2020-09-29 15:13:34 +02:00
a71528551a include added 2020-09-29 15:10:08 +02:00
6a5268f5b0 typo fix 2020-09-29 15:05:18 +02:00
392d0299a9 Merge remote-tracking branch 'upstream/master' into mueller/modes-memory 2020-09-29 15:04:42 +02:00
8ade9e33c1 Merge branch 'master' into mueller/feature/windowsUdpBridge 2020-09-29 15:00:07 +02:00
37c605c4fb Merge pull request 'Fixes #194 Small Map Issues' (#209) from gaisser/fsfw:gaisser_small_map_issues into master
Reviewed-on: fsfw/fsfw#209
2020-09-29 14:59:55 +02:00
ea29b272bf Merge branch 'master' into mueller/feature/windowsUdpBridge 2020-09-29 14:59:50 +02:00
e55f8f583d Merge branch 'master' into gaisser_small_map_issues 2020-09-29 14:58:35 +02:00
0c3fd9c95f Merge branch 'master' into mueller/oldPoolRenaming 2020-09-29 14:58:21 +02:00
d6e82f64e7 Merge branch 'master' into mueller_tcPacketBase 2020-09-29 14:58:19 +02:00
a700f6a96d Merge pull request 'New StoreAccessors and separation of implementation for storagemanager classes' (#92) from KSat/fsfw:mueller_StoreAccessor into master
Reviewed-on: fsfw/fsfw#92
2020-09-29 14:57:06 +02:00
6c86cf88f3 Merge branch 'master' into mueller_StoreAccessor 2020-09-29 14:56:20 +02:00
352ce13fb3 removed line break 2020-09-29 14:55:17 +02:00
fd87a16661 changes taken over 2020-09-29 14:51:25 +02:00
1ed1b7ea06 include guard fix 2020-09-29 14:51:08 +02:00
a58e47623f update 2020-09-29 14:50:16 +02:00
485e96f12f merged changes 2020-09-29 14:49:57 +02:00
622c7a5a0d debug output removed 2020-09-29 14:45:23 +02:00
bed4e7affa nullptr replacement 2020-09-29 14:43:23 +02:00
1ff85c88b2 store accessor small changes 2020-09-29 14:42:48 +02:00
cef84b13d9 renormalization 2020-09-29 14:35:05 +02:00
6f965c74ac Merge remote-tracking branch 'upstream/master' into mueller_StoreAccessor 2020-09-29 14:34:49 +02:00
b2677ae040 Merge branch 'master' into mueller_tcPacketBase 2020-09-29 14:34:16 +02:00
40fa8e5405 Merge branch 'master' into mueller/oldPoolRenaming 2020-09-29 14:31:27 +02:00
dae79f30d7 Merge pull request 'timeslot update' (#179) from KSat/fsfw:mueller/FixedTimeslotUpdate into master
Reviewed-on: fsfw/fsfw#179
2020-09-29 14:30:59 +02:00
c01d904552 Merge branch 'mueller/FixedTimeslotUpdate' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/FixedTimeslotUpdate 2020-09-29 14:30:05 +02:00
7dbb73b7d8 removed dbeug printout 2020-09-29 14:29:57 +02:00
224248dfa1 removed debug outpuzt for missed deadline 2020-09-29 14:27:31 +02:00
9f7dad31eb Merge branch 'master' into mueller/FixedTimeslotUpdate 2020-09-29 14:21:02 +02:00
21cbb19410 Merge pull request 'ipc update' (#176) from KSat/fsfw:mueller/ipc-updates into master
Reviewed-on: fsfw/fsfw#176
2020-09-29 14:20:18 +02:00
170217e2e8 Merge branch 'master' into mueller/ipc-updates 2020-09-29 14:15:13 +02:00
bf5e7241b6 Merge branch 'master' into mueller/MQM_IF_UpdateLinux 2020-09-29 14:14:56 +02:00
291a62eeb9 Merge branch 'master' into gaisser_small_map_issues 2020-09-29 14:14:48 +02:00
945f49bbe9 Merge pull request 'Object Id and Verif Reporter Improvements' (#213) from KSat/fsfw:mueller/objectIdImprovement into master
User have to change instantiation to the objectId of the new PUS Services

Reviewed-on: fsfw/fsfw#213
2020-09-29 14:14:27 +02:00
1691d63169 include fix 2020-09-29 13:54:08 +02:00
3663d7269c changes taken over 2020-09-29 13:37:21 +02:00
183b6a4193 small bugfix 2020-09-29 13:34:27 +02:00
7b1f72254f object id names improved 2020-09-29 13:30:30 +02:00
53a6225790 doc & tweaks 2020-09-29 12:50:36 +02:00
260fac43f7 bugfix 2020-09-28 23:38:37 +02:00
1f70b1159d another small bugfix 2020-09-28 23:21:21 +02:00
7ff9c29b62 added another command 2020-09-28 22:51:02 +02:00
62ee1391bf added two new commands 2020-09-28 22:48:10 +02:00
1d972fcbef hk messages are cleared properly now 2020-09-28 22:46:18 +02:00
7e9d095ed1 important bugfixes 2020-09-28 22:38:36 +02:00
e48dbb8797 small improvements 2020-09-28 22:17:18 +02:00
786dcdf88d removed clock include 2020-09-28 22:13:17 +02:00
ad2ca814b2 improved doc 2020-09-28 21:28:03 +02:00
bf574c12e4 bugfixes, owner ptr not const anymore 2020-09-28 21:09:56 +02:00