|
|
489d8f1903
|
Merge branch 'master' into mueller/serialize-convergence
|
2020-09-10 16:40:02 +02:00 |
|
|
|
be0cf56994
|
Merge branch 'master' into mueller/feature/windowsUdpBridge
|
2020-09-10 16:39:46 +02:00 |
|
|
|
bbd81c2d6a
|
Merge pull request 'FixedMap Fixes #47 and #36' (#182) from gaisser/fsfw:gaisser_fixes_fixedMap into master
Reviewed-on: fsfw/fsfw#182
Performed CSB tests, everything working as before
|
2020-09-10 16:38:42 +02:00 |
|
|
|
e4d95a4e09
|
subsystem changes taken over
|
2020-09-10 16:07:09 +02:00 |
|
|
|
e57d4a11ae
|
fixed ordered multi map changes integrated
|
2020-09-10 16:01:05 +02:00 |
|
|
|
d9dcee3692
|
array list changes taken over
|
2020-09-10 15:55:56 +02:00 |
|
|
|
f35efa3cbe
|
taken over CSB changes
|
2020-09-10 15:52:00 +02:00 |
|
|
|
96e471add6
|
merged fixed map changes
|
2020-09-10 15:51:11 +02:00 |
|
|
|
e7444912d5
|
corrected include guard
|
2020-09-10 15:29:19 +02:00 |
|
|
|
b8d638cb69
|
Merge branch 'master' into gaisser_fixes_fixedMap
|
2020-09-10 15:27:15 +02:00 |
|
|
|
1635f16bc0
|
removed changes from datapool separation
|
2020-09-10 15:26:33 +02:00 |
|
|
|
c63baf70a1
|
Merge remote-tracking branch 'upstream/master' into mueller/feature/windowsUdpBridge
|
2020-09-10 15:26:13 +02:00 |
|
|
|
bbc73a6aaf
|
taken over serialize adapter changes
|
2020-09-10 15:25:29 +02:00 |
|
|
|
0da6456bad
|
Merge remote-tracking branch 'upstream/master' into mueller/serialize-convergence
|
2020-09-10 15:23:22 +02:00 |
|
|
|
fd09774fc3
|
serialize if update
|
2020-09-10 15:18:45 +02:00 |
|
|
|
f663de2418
|
taken over changes from master
|
2020-09-10 15:17:38 +02:00 |
|
|
|
224ea3914a
|
deleted file not needed anymore
|
2020-09-10 15:15:13 +02:00 |
|
|
|
db2a31aef4
|
Merge pull request 'Implements #192' (#193) from gaisser/fsfw:gaisser_serialize_c11_update into master
Reviewed-on: fsfw/fsfw#193
|
2020-09-10 15:13:54 +02:00 |
|
|
|
de46cf5b08
|
Merge branch 'master' into gaisser_serialize_c11_update
|
2020-09-10 15:06:05 +02:00 |
|
|
|
db3e32655d
|
changes taken over from master
|
2020-09-10 15:05:26 +02:00 |
|
|
|
18e6de7d6b
|
added compile time check
|
2020-09-10 15:04:43 +02:00 |
|
|
|
cefac2db0b
|
assignment operator added
|
2020-09-10 15:03:28 +02:00 |
|
|
|
d43ef479b6
|
assignment operator added
|
2020-09-10 15:02:58 +02:00 |
|
|
|
26bb2de050
|
Merge branch 'mueller/master' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/master
|
2020-09-10 15:01:49 +02:00 |
|
|
|
a364f36f38
|
Merge pull request 'Fixes for #190 and #189' (#191) from gaisser/fsfw:gaisser_bugs_fixedMap_FIFO into master
Reviewed-on: fsfw/fsfw#191
|
2020-09-10 15:00:34 +02:00 |
|
|
|
2d76c744c5
|
Merge branch 'master' into mueller/HealthHelperIdFix
|
2020-09-08 14:34:33 +02:00 |
|
|
|
d1f8040599
|
Merge branch 'master' into mueller/ipc-updates
|
2020-09-08 14:33:50 +02:00 |
|
|
|
e24e080f31
|
Merge branch 'master' into mueller/sharedRingBufferPullRequest
|
2020-09-08 14:31:40 +02:00 |
|
|
|
dab10d761a
|
Merge branch 'master' into mueller/serialize-convergence
|
2020-09-08 14:27:12 +02:00 |
|
|
|
976fd54f5e
|
Merge branch 'master' into gaisser_fixes_fixedMap
|
2020-09-08 14:17:53 +02:00 |
|
|
|
d87cf0a612
|
Merge branch 'master' into gaisser_bugs_fixedMap_FIFO
|
2020-09-08 14:14:38 +02:00 |
|
|
|
b3af2b5fbc
|
Merge branch 'master' into mueller/feature/windowsUdpBridge
|
2020-09-08 14:14:03 +02:00 |
|
|
|
fb36c55419
|
Merge pull request 'new tmtc unix udp bridge' (#141) from KSat/fsfw:mueller/feature/TmTcUnixBridge into master
Reviewed-on: fsfw/fsfw#141
|
2020-09-08 14:14:00 +02:00 |
|
|
|
5dd08877a5
|
Merge pull request 'tmtc bridge update, uses dynamic FIFO now' (#187) from KSat/fsfw:mueller/TmTcBridgeUpdate into master
Reviewed-on: fsfw/fsfw#187
|
2020-09-08 14:12:43 +02:00 |
|
|
|
0258ce62f0
|
Added documentation
|
2020-09-07 18:35:25 +02:00 |
|
|
|
b65789824c
|
Removed old hacks and replaced by standard c++
Added overflow check in SerializeAdapter
|
2020-09-07 18:06:08 +02:00 |
|
|
|
278053a342
|
Another fix in DynamicFIFO
|
2020-09-07 15:49:28 +02:00 |
|
|
|
2a28114b49
|
Fixes for #190 and #189
|
2020-09-07 15:43:48 +02:00 |
|
|
|
e085deb235
|
fifo fix
|
2020-09-07 15:23:27 +02:00 |
|
|
|
d99b100ace
|
debug output removed
|
2020-09-06 18:46:56 +02:00 |
|
|
|
67b11c0535
|
Merge branch 'master' into mueller/feature/TmTcUnixBridge
|
2020-09-06 15:51:34 +02:00 |
|
|
|
6c42189371
|
some minor improvements
|
2020-09-06 15:49:32 +02:00 |
|
|
|
2439ac455b
|
tmtc bridge update, uses dynamic FIFO now
|
2020-09-06 15:48:30 +02:00 |
|
|
|
a9975f5aef
|
added new windows udp bridge
|
2020-09-06 15:46:49 +02:00 |
|
|
|
ba01b4578c
|
Merge branch 'master' into mueller/TaskUpdates
|
2020-09-06 15:41:40 +02:00 |
|
|
|
f61056eeb7
|
adapted DHB to renaming
|
2020-09-06 15:30:56 +02:00 |
|
|
|
790d3f1465
|
taken over all changes
|
2020-09-06 15:25:56 +02:00 |
|
|
|
e9b86e51df
|
init commit
|
2020-09-06 15:23:38 +02:00 |
|
|
|
26cbcdbff0
|
removed comment
|
2020-09-06 15:21:02 +02:00 |
|
|
|
673af26472
|
rework/restructuring
|
2020-09-06 14:57:05 +02:00 |
|
