|
|
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 |
|
|
|
fc34e7fd75
|
Merge branch 'development' of https://egit.irs.uni-stuttgart.de/eive/fsfw into development
|
2021-04-24 18:04:43 +02:00 |
|
|
|
18a9729c75
|
added multiple reply support
|
2021-04-24 13:52:06 +02:00 |
|
|
|
763347f203
|
Merge remote-tracking branch 'upstream/development' into mueller/master
|
2021-04-22 19:55:02 +02:00 |
|
|
|
1ff52e43a0
|
Merge remote-tracking branch 'origin/development' into mueller/master
|
2021-04-22 19:52:44 +02:00 |
|
|
|
6a40b8244d
|
Merge pull request 'Subsystems replaced Magic Numbers' (#415) from gaisser_fixes_subsystem into development
Reviewed-on: fsfw/fsfw#415
|
2021-04-22 19:52:08 +02:00 |
|
|
|
7f1cbaef23
|
updated default cmakelists
|
2021-04-22 18:09:23 +02:00 |
|
|
|
3356ccc9d4
|
tested new comment export string for retvals
|
2021-04-22 17:45:46 +02:00 |
|
|
|
4fd443f70b
|
Merge remote-tracking branch 'origin/gaisser_fixes_subsystem' into gaisser_fixes_subsystem
|
2021-04-20 22:03:52 +02:00 |
|
|
|
06631d06a5
|
Added comments in AssemblyBase and SubsystemBase
|
2021-04-20 22:01:56 +02:00 |
|
|
|
9244a96e7b
|
Merge branch 'development' into gaisser_fixes_subsystem
|
2021-04-20 21:07:31 +02:00 |
|
|
|
03ef63302b
|
Replaced Magic Numbers
|
2021-04-20 20:45:15 +02:00 |
|
|
|
3f91803422
|
fixes from code review
|
2021-04-20 18:35:11 +02:00 |
|
|
|
5759c2cbe6
|
Merge remote-tracking branch 'origin/development' into mueller/pus-c-support
|
2021-04-20 18:03:49 +02:00 |
|
|
|
c50796b785
|
Merge pull request 'calling empty ctor now for SerializeElement (coverity)' (#413) from mueller/serialiize-element-coverity into development
Reviewed-on: fsfw/fsfw#413
|
2021-04-20 17:57:00 +02:00 |
|
|
|
a0caa92a8a
|
Merge branch 'development' into mueller/serialiize-element-coverity
|
2021-04-20 17:52:01 +02:00 |
|
|
|
a91139be76
|
Merge pull request 'small fix for linux printf printout in TCP/IP code' (#411) from mueller/linuxtcpip-printout-fix into development
Reviewed-on: fsfw/fsfw#411
|
2021-04-20 17:51:48 +02:00 |
|
|
|
fee2ac0eb9
|
Merge branch 'development' into mueller/linuxtcpip-printout-fix
|
2021-04-20 17:50:10 +02:00 |
|
|
|
2878f21c93
|
Merge pull request 'Possible bugfix found by coverity in TimeMessage' (#412) from mueller/timemessage-override-fix into development
Reviewed-on: fsfw/fsfw#412
|
2021-04-20 17:49:44 +02:00 |
|
|
|
4caf906d96
|
Merge branch 'development' into mueller/timemessage-override-fix
|
2021-04-20 17:44:07 +02:00 |
|
|
|
b38e9ede0c
|
Merge branch 'development' into mueller/linuxtcpip-printout-fix
|
2021-04-20 17:43:44 +02:00 |
|
|
|
17b3672330
|
Merge pull request 'heater tweaks + coverity fix' (#410) from mueller/heater-coverity into development
Reviewed-on: fsfw/fsfw#410
|
2021-04-20 17:43:19 +02:00 |
|
|
|
629814bc9b
|
Just comments
|
2021-04-20 17:35:28 +02:00 |
|
|
|
4fb792447e
|
Small rearragenment in Heater.cpp
|
2021-04-20 17:29:56 +02:00 |
|
