Commit Graph

3358 Commits

Author SHA1 Message Date
Robin Müller e45b8bc739 Merge remote-tracking branch 'origin/development' into mueller/pus-c-support 2021-04-20 16:31:35 +02:00
Robin Müller dcd72d421e Merge branch 'mueller/master' into mueller/pus-c-support 2021-04-20 16:19:04 +02:00
Robin Müller cc8c3aef3d
removed unused interface 2021-04-20 16:18:39 +02:00
Steffen Gaisser e4efc01e34 Merge pull request 'thermal sensor update' (#402) from mueller/thermal-handler into development
Reviewed-on: #402
2021-04-20 16:10:20 +02:00
Steffen Gaisser c455fc1417 Merge branch 'development' into mueller/thermal-handler 2021-04-20 16:10:14 +02:00
Robin Müller 9352e15405 Merge remote-tracking branch 'origin/development' into mueller/pus-c-support 2021-04-20 16:07:21 +02:00
Robin Müller 38a5e7e618
ctor variable better name 2021-04-20 16:00:01 +02:00
Robin Müller 1cceda8e63
Merge branch 'mueller/thermal-handler' into mueller/master 2021-04-20 15:59:44 +02:00
Robin Müller 0c342ad7fc
minor changes 2021-04-20 15:57:11 +02:00
Robin Müller 524e50a6dd
comment block corrected 2021-04-20 15:54:44 +02:00
Robin Müller 8c4381eca6 Merge remote-tracking branch 'ksat/mueller/master' into mueller/master 2021-04-20 15:49:55 +02:00
Robin Müller 29a05eb113 Merge remote-tracking branch 'ksat/mueller/master' into mueller/pus-c-support 2021-04-20 15:49:32 +02:00
Steffen Gaisser 17adb2cc3e Merge pull request 'small improvements for Linux' (#407) from mueller/linux-small-improvements into development
Reviewed-on: #407
2021-04-20 15:46:34 +02:00
Robin Müller 534b4850df Merge remote-tracking branch 'upstream/development' into mueller/master 2021-04-20 15:36:18 +02:00
Robin Müller 7b29583f8f small improvements 2021-04-20 15:32:12 +02:00
Robin Müller a66fc53396 config define moved, better warning 2021-04-20 15:31:03 +02:00
Robin Müller 5471030c32 Merge remote-tracking branch 'origin/development' into mueller/master 2021-04-20 15:13:28 +02:00
Steffen Gaisser 1af7870b15 Merge branch 'development' into mueller/thermal-handler 2021-04-20 15:11:19 +02:00
Steffen Gaisser 1cbeb54b8d Merge pull request 'Makes linux realtime optional' (#406) from gaisser/fsfw:gaisser_make_linux_realtime_optional into development
Reviewed-on: #406
2021-04-20 15:10:44 +02:00
Steffen Gaisser 0ec83afa13 Merge remote-tracking branch 'my_fork/gaisser_make_linux_realtime_optional' into gaisser_make_linux_realtime_optional 2021-04-20 15:06:40 +02:00
Steffen Gaisser 153c44601b
refixed spelling 2021-04-20 15:04:42 +02:00
Robin Müller e6a8371d4a temperature sensor update 2021-04-20 15:00:59 +02:00
Robin Müller 64efb8ec7f temperature sensor update 2021-04-20 14:58:35 +02:00
Robin Müller c8b2b3a038 Merge branch 'mueller/thermal-handler' of https://egit.irs.uni-stuttgart.de/fsfw/fsfw into mueller/thermal-handler 2021-04-20 14:47:18 +02:00
Robin Müller 6873d2b847 temp sensor update 2021-04-20 14:46:59 +02:00
Steffen Gaisser 91c3692f6d Merge branch 'development' into gaisser_make_linux_realtime_optional 2021-04-20 14:39:56 +02:00
Steffen Gaisser 69788e1279 Merge pull request 'Updating TC Distributor modules' (#403) from mueller/tmtcservices-update into development
Reviewed-on: #403
2021-04-20 14:39:07 +02:00
Steffen Gaisser ec69076652 Merge branch 'development' into mueller/tmtcservices-update 2021-04-20 14:38:59 +02:00
Steffen Gaisser a62bda97a0 Merge pull request 'UDP and TCPIP smaller tweaks' (#400) from mueller/udp-ai-passive-opt into development
Reviewed-on: #400
2021-04-20 14:38:16 +02:00
Steffen Gaisser 32f0131973 Merge branch 'development' into mueller/udp-ai-passive-opt 2021-04-20 14:38:01 +02:00
Steffen Gaisser 9784d5123b Merge branch 'development' into mueller/thermal-handler 2021-04-20 14:37:04 +02:00
Steffen Gaisser ea8d887a6b Merge pull request 'proper MQ implementation' (#401) from mueller/host-osal-vector-mq into development
Reviewed-on: #401
2021-04-20 14:36:47 +02:00
Robin Müller 29cebab790 Merge remote-tracking branch 'origin/development' into mueller/udp-ai-passive-opt 2021-04-20 14:18:06 +02:00
Steffen Gaisser 03095776f1
Added a comment and corrected a mistake 2021-04-20 13:31:15 +02:00
Steffen Gaisser bad9f67c39 Merge remote-tracking branch 'origin/development' into gaisser_make_linux_realtime_optional 2021-04-20 13:06:11 +02:00
Steffen Gaisser 98add88d14 Makes linux realtime optional
Adds new config variable FSFW_USE_REALTIME_FOR_LINUX
2021-04-20 13:01:24 +02:00
Steffen Gaisser e1b595d620 Merge branch 'development' into mueller/tmtcservices-update 2021-04-20 11:38:42 +02:00
Robin Müller 770356f8b6 fix for warning print 2021-04-19 14:38:56 +02:00
Robin Müller 62e409a9f2 doc fix 2021-04-15 10:07:39 +02:00
Steffen Gaisser 39940823d1 Merge branch 'development' into mueller/thermal-handler 2021-04-13 14:44:43 +02:00
Steffen Gaisser 4479a2628d Merge branch 'development' into mueller/host-osal-vector-mq 2021-04-13 14:32:18 +02:00
Steffen Gaisser b09119cd8d Merge pull request 'Small patch for CMakeLists file' (#397) from KSat/fsfw:mueller/cmake-lists-add-inc-paths into development
Reviewed-on: #397
2021-04-13 14:31:20 +02:00
Steffen Gaisser 10bc568560 Merge branch 'development' into mueller/cmake-lists-add-inc-paths 2021-04-13 14:23:04 +02:00
Steffen Gaisser 6e09e29ec2 Merge pull request 'added all coverity fixes' (#398) from KSat/fsfw:mueller/coverity-fixes into development
Reviewed-on: #398
2021-04-13 14:22:53 +02:00
Steffen Gaisser 43fb05ac5d Merge branch 'development' into mueller/thermal-handler 2021-04-13 14:02:24 +02:00
Steffen Gaisser e832487081 Merge branch 'development' into mueller/coverity-fixes 2021-04-13 14:02:03 +02:00
Steffen Gaisser 01acbaa270 Merge branch 'development' into mueller/cmake-lists-add-inc-paths 2021-04-13 14:01:45 +02:00
Robin Müller cf8a9996a7 added new test stub 2021-04-13 10:42:49 +02:00
Robin Müller a8b5fec725 Merge branch 'development' into mueller/udp-ai-passive-opt 2021-04-13 10:01:14 +02:00
Robin Müller fc7e401ddc pus c working 2021-04-13 01:24:26 +02:00