|
|
4f5b233505
|
Merge pull request 'init after task creation moved to task functionality' (#178) from KSat/fsfw:mueller/TaskUpdates into master
Reviewed-on: #178
|
2020-09-15 15:08:18 +02:00 |
|
|
|
9334a705f8
|
Merge branch 'master' into mueller/TaskUpdates
|
2020-09-15 15:05:45 +02:00 |
|
|
|
2c6a239d5e
|
Merge pull request 'added new periodic op divider' (#195) from KSat/fsfw:mueller/feature/periodicOpDivider into master
Reviewed-on: #195
|
2020-09-15 15:04:30 +02:00 |
|
|
|
fbd75f947a
|
Merge branch 'master' into mueller/feature/periodicOpDivider
|
2020-09-15 15:02:34 +02:00 |
|
|
|
4c17ef7be5
|
Merge pull request 'DLE encoder doc added' (#177) from KSat/fsfw:mueller/dledoc into master
Reviewed-on: #177
|
2020-09-15 15:01:07 +02:00 |
|
|
|
4f48ed9756
|
added new periodic op divider
|
2020-09-10 19:53:52 +02:00 |
|
|
|
d83573cefc
|
additional IDs removed
|
2020-09-10 16:47:01 +02:00 |
|
|
|
8048195f63
|
Merge remote-tracking branch 'upstream/master' into mueller/dledoc
|
2020-09-10 16:46:31 +02:00 |
|
|
|
bbd81c2d6a
|
Merge pull request 'FixedMap Fixes #47 and #36' (#182) from gaisser/fsfw:gaisser_fixes_fixedMap into master
Reviewed-on: #182
Performed CSB tests, everything working as before
|
2020-09-10 16:38:42 +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 |
|
|
|
db2a31aef4
|
Merge pull request 'Implements #192' (#193) from gaisser/fsfw:gaisser_serialize_c11_update into master
Reviewed-on: #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 |
|
|
|
a364f36f38
|
Merge pull request 'Fixes for #190 and #189' (#191) from gaisser/fsfw:gaisser_bugs_fixedMap_FIFO into master
Reviewed-on: #191
|
2020-09-10 15:00:34 +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 |
|
|
|
fb36c55419
|
Merge pull request 'new tmtc unix udp bridge' (#141) from KSat/fsfw:mueller/feature/TmTcUnixBridge into master
Reviewed-on: #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: #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 |
|
|
|
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 |
|
|
|
ba01b4578c
|
Merge branch 'master' into mueller/TaskUpdates
|
2020-09-06 15:41:40 +02:00 |
|
|
|
234fbcbf41
|
small bugfix in error checking
|
2020-09-06 09:34:06 +02:00 |
|
|
|
a3b80288e1
|
Merge remote-tracking branch 'upstream/master' into mueller/dledoc
|
2020-09-04 14:54:49 +02:00 |
|
|
|
91d5277a94
|
added new returnvalues
|
2020-09-04 14:54:08 +02:00 |
|
|
|
975fb9832b
|
added interface ID
|
2020-09-04 14:52:17 +02:00 |
|
|
|
4bdac1e017
|
changed from mueller/master taken over
|
2020-09-04 14:49:59 +02:00 |
|
|
|
381914886d
|
initAfterTaskCreation added for linux
|
2020-09-04 14:43:53 +02:00 |
|
|
|
b3d08cd40b
|
Merge pull request 'FIFO is StaticFIFO now, new FIFO using vector' (#127) from KSat/fsfw:mueller_FIFO_static_normal into master
Reviewed-on: #127
|
2020-09-01 13:08:58 +02:00 |
|
|
|
d5accd16ba
|
Merge branch 'mueller_FIFO_static_normal' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller_FIFO_static_normal
|
2020-09-01 12:58:38 +02:00 |
|
|
|
03b2ca679d
|
include guard correction
|
2020-09-01 12:58:29 +02:00 |
|
|
|
75f6cacd10
|
Merge branch 'master' into mueller_FIFO_static_normal
|
2020-09-01 12:56:41 +02:00 |
|
|
|
b32ea6e316
|
Merge pull request 'RingBuffer, static CTOR' (#132) from KSat/fsfw:mueller_ringBufferStatic into master
Reviewed-on: #132
|
2020-09-01 12:56:23 +02:00 |
|
|
|
5308cb6237
|
Merge branch 'master' into mueller_ringBufferStatic
|
2020-09-01 12:54:08 +02:00 |
|
|
|
4f3869de8d
|
Merge branch 'mueller_FIFO_static_normal' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller_FIFO_static_normal
|
2020-09-01 12:54:02 +02:00 |
|
|
|
b522b3c29c
|
fifo updates
|
2020-09-01 12:53:53 +02:00 |
|
|
|
02cfa8bcd5
|
Merge branch 'master' into mueller_FIFO_static_normal
|
2020-09-01 12:45:25 +02:00 |
|
|
|
96c421b72c
|
Merge pull request 'parameter improvements' (#181) from KSat/fsfw:mueller/parameter-updates into master
Reviewed-on: #181
|
2020-09-01 12:45:20 +02:00 |
|
|
|
f85e4eb22f
|
Merge branch 'master' into mueller/parameter-updates
|
2020-09-01 12:44:14 +02:00 |
|
|
|
66bc60f176
|
Merge branch 'mueller/parameter-updates' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/parameter-updates
|
2020-09-01 12:43:02 +02:00 |
|
|
|
695a4e7842
|
offset is size_t now
|
2020-09-01 12:42:52 +02:00 |
|
|
|
f068df9028
|
Merge pull request 'event manager improvements' (#180) from KSat/fsfw:mueller/eventmanager-improvements into master
Reviewed-on: #180
|
2020-09-01 12:39:33 +02:00 |
|
|
|
636e5fb888
|
Merge branch 'master' into gaisser_fixes_fixedMap
|
2020-09-01 12:35:53 +02:00 |
|
|
|
77927363ce
|
Merge branch 'master' into mueller/eventmanager-improvements
|
2020-09-01 12:29:16 +02:00 |
|
|
|
5d87650833
|
Merge branch 'master' into mueller/parameter-updates
|
2020-09-01 12:28:53 +02:00 |
|
|
|
e949637271
|
Merge branch 'master' into mueller_FIFO_static_normal
|
2020-09-01 12:24:41 +02:00 |
|
