|
|
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 |
|
|
|
e8de2fc47a
|
added srv3
|
2020-09-14 18:29:19 +02:00 |
|
|
|
2d2316a0c7
|
hk message continued
|
2020-09-14 18:01:48 +02:00 |
|
|
|
f9612afe06
|
added report status toggler
|
2020-09-11 14:06:08 +02:00 |
|
|
|
71125c075a
|
added new setter function
|
2020-09-10 21:05:50 +02:00 |
|
|
|
2d2d0de35c
|
local data pool manager bugfixes
|
2020-09-10 20:24:49 +02:00 |
|
|
|
4f48ed9756
|
added new periodic op divider
|
2020-09-10 19:53:52 +02:00 |
|
|
|
d7bbd4b652
|
severla bugfixes, new periodic op divider added
|
2020-09-10 19:51:17 +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 |
|
|
|
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 |
|
