 muellerr
|
b313043e43
|
added new local data pool files
|
2020-10-01 12:05:24 +02:00 |
|
|
muellerr
|
f979d603b4
|
Merge branch 'mueller/oldPoolRenaming' into mueller/newLocalDataPools
|
2020-10-01 12:04:33 +02:00 |
|
|
muellerr
|
7c3f99ed2d
|
Revert "DH IF and DH message form improved"
This reverts commit adf528fce9.
|
2020-10-01 11:06:46 +02:00 |
|
|
muellerr
|
2344efb3ac
|
Merge remote-tracking branch 'upstream/master'
|
2020-10-01 11:06:21 +02:00 |
|
|
muellerr
|
236a833d0b
|
Merge pull request 'Added null pointer checks for FIFO Base' (#224) from gaisser/fsfw:gaisser_fifobase_nullptr_check into master
Reviewed-on: fsfw/fsfw#224
|
2020-10-01 11:04:55 +02:00 |
|
|
muellerr
|
6c4ec713f3
|
Merge branch 'master' into gaisser_fifobase_nullptr_check
|
2020-10-01 11:04:22 +02:00 |
|
|
muellerr
|
b2a7859549
|
Merge pull request 'Added Documentation to PlacementFactory' (#223) from gaisser/fsfw:gaisser_documentation_placementFactory into master
Reviewed-on: fsfw/fsfw#223
|
2020-10-01 11:04:08 +02:00 |
|
|
muellerr
|
8178be9dc5
|
Merge branch 'master' into gaisser_documentation_placementFactory
|
2020-10-01 11:02:46 +02:00 |
|
|
muellerr
|
adf528fce9
|
DH IF and DH message form improved
|
2020-10-01 11:01:52 +02:00 |
|
|
muellerr
|
e104cd18e6
|
Merge pull request 'Hotfix Linux include' (#219) from mueller/hotfix-linuxinclude into master
Reviewed-on: fsfw/fsfw#219
|
2020-09-29 17:57:58 +02:00 |
|
|
muellerr
|
71f2f34aab
|
Merge remote-tracking branch 'upstream/master' into mueller/hotfix-linuxinclude
|
2020-09-29 17:57:20 +02:00 |
|
|
muellerr
|
f73f798a4d
|
lines removed
|
2020-09-29 17:28:37 +02:00 |
|
|
muellerr
|
4fce0377a9
|
missing include for linux
|
2020-09-29 17:28:02 +02:00 |
|
|
muellerr
|
cdadf48f38
|
Merge pull request 'Returns failed now in Service 200 when mode answer is negative' (#217) from gaisser/fsfw:gaisser_service200_returns into master
Reviewed-on: fsfw/fsfw#217
|
2020-09-29 16:02:02 +02:00 |
|
|
muellerr
|
13b30f8de6
|
Merge pull request 'Removed comments and added include in tmtcservices/PusVerificationReporter' (#216) from gaisser/fsfw:gaisser_removed_unused into master
Reviewed-on: fsfw/fsfw#216
|
2020-09-29 15:28:16 +02:00 |
|
|
muellerr
|
a71528551a
|
include added
|
2020-09-29 15:10:08 +02:00 |
|
|
muellerr
|
6a5268f5b0
|
typo fix
|
2020-09-29 15:05:18 +02:00 |
|
|
muellerr
|
392d0299a9
|
Merge remote-tracking branch 'upstream/master' into mueller/modes-memory
|
2020-09-29 15:04:42 +02:00 |
|
|
muellerr
|
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 |
|
|
muellerr
|
6c86cf88f3
|
Merge branch 'master' into mueller_StoreAccessor
|
2020-09-29 14:56:20 +02:00 |
|
|
muellerr
|
352ce13fb3
|
removed line break
|
2020-09-29 14:55:17 +02:00 |
|
|
muellerr
|
1ed1b7ea06
|
include guard fix
|
2020-09-29 14:51:08 +02:00 |
|
|
muellerr
|
a58e47623f
|
update
|
2020-09-29 14:50:16 +02:00 |
|
|
muellerr
|
622c7a5a0d
|
debug output removed
|
2020-09-29 14:45:23 +02:00 |
|
|
muellerr
|
bed4e7affa
|
nullptr replacement
|
2020-09-29 14:43:23 +02:00 |
|
|
muellerr
|
1ff85c88b2
|
store accessor small changes
|
2020-09-29 14:42:48 +02:00 |
|
|
muellerr
|
cef84b13d9
|
renormalization
|
2020-09-29 14:35:05 +02:00 |
|
|
muellerr
|
6f965c74ac
|
Merge remote-tracking branch 'upstream/master' into mueller_StoreAccessor
|
2020-09-29 14:34:49 +02:00 |
|
|
muellerr
|
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 |
|
|
muellerr
|
7dbb73b7d8
|
removed dbeug printout
|
2020-09-29 14:29:57 +02:00 |
|
|
muellerr
|
183b6a4193
|
small bugfix
|
2020-09-29 13:34:27 +02:00 |
|
|
muellerr
|
6d2266f7d0
|
equalization complete
|
2020-09-26 14:58:53 +02:00 |
|
|
muellerr
|
9d4c2b90f3
|
removed proxy/ not used&working?
|
2020-09-26 14:54:23 +02:00 |
|
|
muellerr
|
7b57f372bf
|
starting convergence
|
2020-09-26 14:51:00 +02:00 |
|
|
muellerr
|
496251bd68
|
Merge branch 'master' into mueller/ipc-updates
|
2020-09-26 14:21:05 +02:00 |
|
|
muellerr
|
22d9b77165
|
added documentation
|
2020-09-26 14:19:51 +02:00 |
|
|
muellerr
|
40558835c7
|
Merge branch 'master' into mueller/FixedTimeslotUpdate
|
2020-09-26 14:14:50 +02:00 |
|
|
muellerr
|
4d1492f130
|
event cfg file loc not explicit anymore
|
2020-09-26 14:13:20 +02:00 |
|
|
muellerr
|
c24c0ea575
|
Merge branch 'master' into mueller/oldPoolRenaming
|
2020-09-26 14:04:41 +02:00 |
|
|
muellerr
|
59e4b95b62
|
Merge pull request 'srv17 id added, include fix for linux' (#206) from KSat/fsfw:mueller/include_fix_srv17_id into master
Reviewed-on: fsfw/fsfw#206
|
2020-09-22 16:03:23 +02:00 |
|
|
muellerr
|
ab0f4d8c87
|
service 9 ID added
|
2020-09-22 16:01:34 +02:00 |
|
|
muellerr
|
98333b92ef
|
srv17 id added, include fix for linux
|
2020-09-22 15:57:26 +02:00 |
|
|
muellerr
|
74b9aef36b
|
freeRTOS update
|
2020-09-22 15:33:28 +02:00 |
|
|
muellerr
|
7dc3a7ecbd
|
fix so it compiles
|
2020-09-22 15:31:15 +02:00 |
|
|
muellerr
|
4248e4000c
|
Merge branch 'mueller/ipc-updates' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/ipc-updates
|
2020-09-22 15:29:38 +02:00 |
|
|
muellerr
|
b2777faf66
|
queueue factory update
|
2020-09-22 15:29:28 +02:00 |
|
|
muellerr
|
d57b329630
|
Merge branch 'master' into mueller/oldPoolRenaming
|
2020-09-22 15:24:09 +02:00 |
|
|
muellerr
|
522433e1b5
|
Merge branch 'mueller/file_renormalization' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/file_renormalization
|
2020-09-22 15:21:17 +02:00 |
|
|
muellerr
|
156f44c268
|
Merge remote-tracking branch 'upstream/master' into mueller/file_renormalization
|
2020-09-22 15:21:12 +02:00 |
|
|
muellerr
|
4587fbb76d
|
srv9 func removed
|
2020-09-22 14:52:24 +02:00 |
|
|
muellerr
|
5e974877fe
|
Merge branch 'master' into mueller/pusSrv17
|
2020-09-22 14:34:05 +02:00 |
|
|
muellerr
|
7851a71a8e
|
commanding service base hotfix
|
2020-09-22 14:00:18 +02:00 |
|
|
muellerr
|
721793a058
|
added author tag back
|
2020-09-18 13:38:53 +02:00 |
|
|
muellerr
|
8ea0a38658
|
shoulddo fix
|
2020-09-18 13:37:38 +02:00 |
|
|
muellerr
|
6062192bf0
|
dded back retval expalanation
|
2020-09-18 13:37:06 +02:00 |
|
|
muellerr
|
85f21b0516
|
object manager convergence
|
2020-09-18 13:32:53 +02:00 |
|
|
muellerr
|
386f347574
|
renormalized files
|
2020-09-18 13:15:14 +02:00 |
|
|
muellerr
|
56ff2aef26
|
include replacement
|
2020-09-18 13:03:48 +02:00 |
|
|
muellerr
|
ad8c6f3528
|
commented out code added back
|
2020-09-18 12:58:38 +02:00 |
|
|
muellerr
|
0f0ddfc375
|
stopwatch update
|
2020-09-18 12:27:40 +02:00 |
|
|
muellerr
|
96f2b68a22
|
Merge remote-tracking branch 'upstream/master' into mueller/SimpleRingBufferUpdate2
|
2020-09-16 19:56:13 +02:00 |
|
|
muellerr
|
53723b0795
|
include fix
|
2020-09-16 19:38:43 +02:00 |
|
|
muellerr
|
b0a816490e
|
fixed includes
|
2020-09-16 19:37:17 +02:00 |
|
|
muellerr
|
963015513f
|
added time stamper to framework
|
2020-09-16 19:36:15 +02:00 |
|
|
muellerr
|
85d6e81881
|
added srv9 to class IDs
|
2020-09-16 19:17:00 +02:00 |
|
|
muellerr
|
b31bee4fda
|
added srv9
|
2020-09-16 19:11:50 +02:00 |
|
|
muellerr
|
ae426c50ba
|
space replaced by tab
|
2020-09-16 19:09:51 +02:00 |
|
|
muellerr
|
a5c6be9dd9
|
added srv17
|
2020-09-16 19:05:25 +02:00 |
|
|
muellerr
|
21346e40a5
|
some improvements
|
2020-09-15 16:58:38 +02:00 |
|
|
muellerr
|
3fcbb988ae
|
new file for typedef to avoid circular include
|
2020-09-15 16:47:01 +02:00 |
|
|
muellerr
|
e96ab12312
|
comment and calculation fix
|
2020-09-15 15:55:35 +02:00 |
|
|
muellerr
|
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 |
|
|
muellerr
|
b4ca42f1fb
|
ccsds time update
|
2020-09-15 15:28:05 +02:00 |
|
|
muellerr
|
4f48ed9756
|
added new periodic op divider
|
2020-09-10 19:53:52 +02:00 |
|
|
muellerr
|
058a036bac
|
Merge branch 'master' into mueller/oldPoolRenaming
|
2020-09-10 16:47:21 +02:00 |
|
|
muellerr
|
d83573cefc
|
additional IDs removed
|
2020-09-10 16:47:01 +02:00 |
|
|
muellerr
|
8048195f63
|
Merge remote-tracking branch 'upstream/master' into mueller/dledoc
|
2020-09-10 16:46:31 +02:00 |
|
|
muellerr
|
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 |
|
|
muellerr
|
d807ea3afe
|
using MessageQueueIF::NO_QUEUE now
|
2020-09-10 16:42:11 +02:00 |
|
|
muellerr
|
036a022e66
|
Merge branch 'master' into mueller/HealthHelperIdFix
|
2020-09-10 16:40:20 +02:00 |
|
|
muellerr
|
489d8f1903
|
Merge branch 'master' into mueller/serialize-convergence
|
2020-09-10 16:40:02 +02:00 |
|
|
muellerr
|
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 |
|
|
muellerr
|
e7444912d5
|
corrected include guard
|
2020-09-10 15:29:19 +02:00 |
|
|
muellerr
|
b8d638cb69
|
Merge branch 'master' into gaisser_fixes_fixedMap
|
2020-09-10 15:27:15 +02:00 |
|
|
muellerr
|
0da6456bad
|
Merge remote-tracking branch 'upstream/master' into mueller/serialize-convergence
|
2020-09-10 15:23:22 +02:00 |
|
|
muellerr
|
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 |
|
|
muellerr
|
de46cf5b08
|
Merge branch 'master' into gaisser_serialize_c11_update
|
2020-09-10 15:06:05 +02:00 |
|
|
muellerr
|
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 |
|
|
muellerr
|
67b11c0535
|
Merge branch 'master' into mueller/feature/TmTcUnixBridge
|
2020-09-06 15:51:34 +02:00 |
|
|
muellerr
|
6c42189371
|
some minor improvements
|
2020-09-06 15:49:32 +02:00 |
|
|
muellerr
|
2439ac455b
|
tmtc bridge update, uses dynamic FIFO now
|
2020-09-06 15:48:30 +02:00 |
|
|
muellerr
|
ba01b4578c
|
Merge branch 'master' into mueller/TaskUpdates
|
2020-09-06 15:41:40 +02:00 |
|
|
muellerr
|
f61056eeb7
|
adapted DHB to renaming
|
2020-09-06 15:30:56 +02:00 |
|
|
muellerr
|
790d3f1465
|
taken over all changes
|
2020-09-06 15:25:56 +02:00 |
|
|
muellerr
|
e9b86e51df
|
init commit
|
2020-09-06 15:23:38 +02:00 |
|
|
muellerr
|
234fbcbf41
|
small bugfix in error checking
|
2020-09-06 09:34:06 +02:00 |
|
|
muellerr
|
f7223abaa3
|
added define necessary for minGW
|
2020-09-05 21:20:10 +02:00 |
|
|
muellerr
|
902cd4d210
|
host osal update
|
2020-09-05 21:19:53 +02:00 |
|
|
muellerr
|
a1155686c5
|
updated host osal
|
2020-09-05 20:18:52 +02:00 |
|
|
muellerr
|
c6dbce7446
|
Merge remote-tracking branch 'upstream/master' into mueller/hostosal
|
2020-09-05 20:18:18 +02:00 |
|