|
|
85d6e81881
|
added srv9 to class IDs
|
2020-09-16 19:17:00 +02:00 |
|
|
|
b31bee4fda
|
added srv9
|
2020-09-16 19:11:50 +02:00 |
|
|
|
ae426c50ba
|
space replaced by tab
|
2020-09-16 19:09:51 +02:00 |
|
|
|
a5c6be9dd9
|
added srv17
|
2020-09-16 19:05:25 +02:00 |
|
|
|
21346e40a5
|
some improvements
|
2020-09-15 16:58:38 +02:00 |
|
|
|
589b95d28b
|
Merge branch 'master' into mueller/feature/windowsUdpBridge
|
2020-09-15 16:56:55 +02:00 |
|
|
|
d38e13f9d3
|
Merge branch 'master' into mueller/FixedTimeslotUpdate
|
2020-09-15 16:53:04 +02:00 |
|
|
|
3fcbb988ae
|
new file for typedef to avoid circular include
|
2020-09-15 16:47:01 +02:00 |
|
|
|
e96ab12312
|
comment and calculation fix
|
2020-09-15 15:55:35 +02:00 |
|
|
|
f3d42de399
|
Merge branch 'master' into mueller/ipc-updates
|
2020-09-15 15:47:14 +02:00 |
|
|
|
db697f16de
|
Merge branch 'master' into mueller_StoreAccessor
|
2020-09-15 15:46:11 +02:00 |
|
|
|
42bfedd36c
|
Merge pull request 'health helper update' (#184) from KSat/fsfw:mueller/HealthHelperIdFix into master
Reviewed-on: fsfw/fsfw#184
|
2020-09-15 15:45:56 +02:00 |
|
|
|
9061d6d67e
|
Merge branch 'master' into mueller/HealthHelperIdFix
|
2020-09-15 15:45:42 +02:00 |
|
|
|
c375e838b8
|
Merge pull request 'Some minor serialize file changes' (#185) from KSat/fsfw:mueller/serialize-convergence into master
Reviewed-on: fsfw/fsfw#185
|
2020-09-15 15:44:40 +02:00 |
|
|
|
d77d370c8a
|
Merge branch 'master' into mueller/serialize-convergence
|
2020-09-15 15:42:12 +02:00 |
|
|
|
21094c4926
|
Merge pull request 'added host osal' (#165) from KSat/fsfw:mueller/hostosal into master
Reviewed-on: fsfw/fsfw#165
|
2020-09-15 15:33:51 +02:00 |
|
|
|
51cf13428b
|
Merge branch 'mueller/hostosal' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/hostosal
|
2020-09-15 15:28:37 +02:00 |
|
|
|
b4ca42f1fb
|
ccsds time update
|
2020-09-15 15:28:05 +02:00 |
|
|
|
bff08a69fa
|
Merge branch 'master' into mueller/hostosal
|
2020-09-15 15:08:58 +02:00 |
|
|
|
4f5b233505
|
Merge pull request 'init after task creation moved to task functionality' (#178) from KSat/fsfw:mueller/TaskUpdates into master
Reviewed-on: fsfw/fsfw#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: fsfw/fsfw#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: fsfw/fsfw#177
|
2020-09-15 15:01:07 +02:00 |
|
|
|
4f48ed9756
|
added new periodic op divider
|
2020-09-10 19:53:52 +02:00 |
|
|
|
6362de5bc0
|
Merge branch 'master' into mueller/FixedTimeslotUpdate
|
2020-09-10 18:20:17 +02:00 |
|
|
|
058a036bac
|
Merge branch 'master' into mueller/oldPoolRenaming
|
2020-09-10 16:47:21 +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 |
|
|
|
853bd75fec
|
Merge branch 'mueller/HealthHelperIdFix' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/HealthHelperIdFix
|
2020-09-10 16:42:25 +02:00 |
|
|
|
d807ea3afe
|
using MessageQueueIF::NO_QUEUE now
|
2020-09-10 16:42:11 +02:00 |
|
|
|
036a022e66
|
Merge branch 'master' into mueller/HealthHelperIdFix
|
2020-09-10 16:40:20 +02:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
0da6456bad
|
Merge remote-tracking branch 'upstream/master' into mueller/serialize-convergence
|
2020-09-10 15:23:22 +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 |
|
|
|
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 |
|
