tmtcservices update #309

Merged
gaisser merged 15 commits from KSat/fsfw:mueller/tmtcservices-update into development 2020-12-22 15:39:07 +01:00

15 Commits

Author SHA1 Message Date
Steffen Gaisser 329cd8862a Merge branch 'development' into mueller/tmtcservices-update 2020-12-22 15:37:22 +01:00
Robin Müller 7934104cbb Merge branch 'mueller/tmtcservices-update' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/tmtcservices-update 2020-12-22 14:19:22 +01:00
Robin Müller 7075952a8b Merge branch 'development' into mueller/tmtcservices-update 2020-12-22 15:17:12 +01:00
Robin Müller d607332f8d removed comment 2020-12-22 14:19:13 +01:00
Robin Müller 3b391d3380 deleted service types header 2020-12-22 14:15:21 +01:00
Robin Müller 331d940852 Merge remote-tracking branch 'upstream/development' into mueller/tmtcservices-update 2020-12-22 14:07:33 +01:00
Robin Müller dda7b5ff6c Merge remote-tracking branch 'upstream/development' into mueller/tmtcservices-update 2020-12-22 14:06:13 +01:00
Steffen Gaisser e7da1e37c3 Merge branch 'development' into mueller/tmtcservices-update 2020-12-15 15:57:09 +01:00
Robin Müller 82a83a50ee change log update 2020-12-15 15:39:33 +01:00
Robin Müller 72c54d59fa fsfw config 2020-12-15 15:32:56 +01:00
Robin Müller 703d2590ff update csb 2020-12-15 15:20:08 +01:00
Robin Müller eb5ac573a9 Merge branch 'mueller/tmtcservices-update' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/tmtcservices-update 2020-12-15 15:16:51 +01:00
Robin Müller fcce61aee0 Merge remote-tracking branch 'upstream/development' into mueller/tmtcservices-update 2020-12-15 15:16:45 +01:00
Robin Müller 4e4ffeb608 Merge branch 'development' into mueller/tmtcservices-update 2020-12-15 15:16:29 +01:00
Robin Müller 25db9bc9ed tmtcservices update 2020-12-14 21:30:39 +01:00