Commit Graph

4118 Commits

Author SHA1 Message Date
ac027e3ff2 Merge remote-tracking branch 'upstream/mueller/master' into mueller/master 2021-05-17 16:00:41 +02:00
ff6b4134a5
Merge remote-tracking branch 'ksat/mueller/master' into mueller/master 2021-05-17 14:13:53 +02:00
5847081a24 tweaks and fixes for TCP 2021-05-13 22:17:21 +02:00
0bc124fd21 renamed tcpip tasks 2021-05-13 21:46:46 +02:00
1e9c789287 Merge remote-tracking branch 'upstream/mueller/tcp-server' into mueller/master 2021-05-13 21:11:59 +02:00
b06113993c Merge remote-tracking branch 'origin/development' into mueller/master 2021-05-12 18:38:10 +02:00
4fa56a2f1d
moved string port argument 2021-05-12 18:37:52 +02:00
a320e3e1ef Merge branch 'mueller/update-package' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/update-package 2021-05-12 17:32:53 +02:00
4095be449a
some more preprocessor replacements 2021-05-12 17:32:40 +02:00
d20f0c5da1 Merge branch 'development' into mueller/update-package 2021-05-12 17:25:37 +02:00
9496ed42e2 Merge pull request 'Implements Network Endianness' (#419) from gaisser/fsfw:gaisser_network_serialize into development
Reviewed-on: fsfw/fsfw#419
2021-05-12 17:25:13 +02:00
14027e449c Merge remote-tracking branch 'gaisser/gaisser_network_serialize' into mueller/merge-test 2021-05-12 17:18:12 +02:00
1626b266d7
platform header file 2021-05-12 16:47:53 +02:00
d27f49c968
added platform header file 2021-05-12 16:38:02 +02:00
a6dd2d5dcb
event manager update 2021-05-12 16:37:12 +02:00
8293e6b0c7
more include fixes 2021-05-12 14:48:39 +02:00
d81c6f40fb
define fixes 2021-05-12 14:43:08 +02:00
5b23b928cf
added missing include 2021-05-12 14:28:37 +02:00
cd016c8281
event manager printout refactoring 2021-05-12 13:40:26 +02:00
e1c91f82b7
some fixes and tweaks 2021-05-12 10:54:10 +02:00
9d0155d9ae
Added a returnvalue 2021-05-11 15:30:49 +02:00
d807998f4d Added Missing includes in Host Osal
Updated correct defaults for Host MessageQueues
2021-05-11 15:25:38 +02:00
8b17c40aa6 Added Network Byte Order 2021-05-11 15:02:04 +02:00
d7d24bd9aa Merge remote-tracking branch 'upstream/mueller/master' into mueller/master 2021-05-05 22:48:29 +02:00
c1d30aad13 TCP server implementation finished
A lot of smaller tweaks and smaller refactoring done
in UDP TMTC bridge as well
2021-05-05 15:59:41 +02:00
126def219b continued tmtc server and bridge 2021-05-05 12:59:42 +02:00
08b9e92d25 Merge pull request 'PUS C Telemetry implementation' (#414) from mueller/pus-c-support into development
Reviewed-on: fsfw/fsfw#414
2021-05-04 14:43:39 +02:00
86431c854b Merge remote-tracking branch 'origin/development' into mueller/pus-c-support 2021-05-04 14:07:56 +02:00
f3530d3c7e small format change for event to test 2021-04-30 23:59:45 +02:00
0a76c5b0b5 Merge pull request 'use timestamp size from FSFWConfig.h' (#418) from mueller/use-config-timestamp-size into development
Reviewed-on: fsfw/fsfw#418
2021-04-29 20:54:45 +02:00
6ede3f9ba2 Merge remote-tracking branch 'origin/development' into mueller/pus-c-support 2021-04-29 20:24:37 +02:00
097244bf8b use timestamp size from FSFWConfig.h 2021-04-29 19:51:38 +02:00
5c9b1769c1 Merge remote-tracking branch 'origin/development' into mueller/master 2021-04-28 22:18:08 +02:00
2f511523cb Merge pull request 'Apollo Sojus Test Project Version 1.0.0' (#408) from development into master
Reviewed-on: fsfw/fsfw#408
2021-04-27 14:20:06 +02:00
9f83739771 Merge pull request 'dhb multiple replies support' (#416) from eive/fsfw:meier/multipleRepliesDhb into development
Reviewed-on: fsfw/fsfw#416
2021-04-27 14:18:15 +02:00
054de9781b
avoid duplicate printout 2021-04-27 14:17:27 +02:00
20e7fe6cb1 Merge branch 'development' into meier/multipleRepliesDhb 2021-04-26 16:19:57 +02:00
f8cd8e1e7d Merge pull request 'ParameterHelper: Returnvalue not checked' (#417) from KSat/fsfw:mueller/parameter-bugfix into development
Reviewed-on: fsfw/fsfw#417
2021-04-26 16:19:31 +02:00
818634755d checking returnvalue now 2021-04-26 15:47:49 +02:00
413ff0d1b9 parameter wrapper bugfix 2021-04-26 14:17:57 +02:00
87fee9bd0e dhb multiple replies support 2021-04-25 11:40:04 +02:00
5273ffa721 Merge remote-tracking branch 'origin/meier/dhbMultipleReplies' into mueller/master 2021-04-25 11:08:54 +02:00
e7c00b5633 Merge branch 'mueller/master' into meier/dhbMultipleReplies 2021-04-25 10:49:56 +02:00
f2ab07c782 Merge branch 'meier/dhbMultipleReplies' into mueller/master 2021-04-24 23:55:37 +02:00
ff33a1274d deleted old bridge 2021-04-24 23:54:13 +02:00
e7cfd324ae Merge branch 'mueller/master' into meier/dhbMultipleReplies 2021-04-24 23:43:53 +02:00
52b549b97c adapted object factory to fsfw changes 2021-04-24 22:54:18 +02:00
cac9a0eecd Merge remote-tracking branch 'upstream/mueller/master' into mueller/master 2021-04-24 22:48:43 +02:00
56d43f5b49 better output 2021-04-24 22:46:12 +02:00
10e7e42388 Merge branch 'development' into meier/dhbMultipleReplies 2021-04-24 18:05:00 +02:00