Commit Graph

Select branches

Hide Pull Requests

event-definition

event-definition-update

main

mdemke/mgm_helpers

meier/debug

meier/space-packet-crc-check

mueller/refactor-logging-with-fmt

ploc

refactor-periodic-hk-helpers

#10

#11

#12

#13

#14

#15

#16

#17

#18

#19

#2

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#3

#30

#31

#32

#33

#34

#35

#36

#37

#38

#39

#4

#40

#41

#42

#43

#44

#45

#46

#47

#48

#49

#5

#50

#51

#52

#6

#7

#8

#9

ASTP_0.0.1

ASTP_1.0.0

ASTP_1.1.0

PLOC-obsw

docker_d1

docker_d2

docker_d3

docker_d4

docker_d5

docker_d6

v1.3.0

v2.0.0

v2.0.1

v3.0.0

v3.0.1

v4.0.0

v5.0.0

Mono Color

• 0ccd266f51 internal unittests fixed Robin Mueller 2020-12-14 10:49:00 +01:00
• 720e3baa90 fixed includes Robin Mueller 2020-12-14 10:48:39 +01:00
• f161a94113 taken over upstream fixes Robin Mueller 2020-12-14 10:44:48 +01:00
• 692aa087d8 taken over cleaned up branch Robin Mueller 2020-12-13 22:13:22 +01:00
• 715386e366 clened up a bit Robin Mueller 2020-12-13 22:12:57 +01:00
• 3f77fab2d9 taken over cmake lists Robin Mueller 2020-12-13 22:01:38 +01:00
• 7c390c07ee taken over unnittest folder from upstream Robin Mueller 2020-12-13 21:58:54 +01:00
• 0b056720ba taken over master Robin Mueller 2020-12-13 21:57:06 +01:00
• d944e25d4a taken over upstream changes Robin Mueller 2020-12-13 21:54:46 +01:00
• f69113b4d5 taken over upstream change in ipc Robin Mueller 2020-12-13 21:53:37 +01:00
• 0e42ba062d notice taken over Robin Mueller 2020-12-13 21:51:46 +01:00
• 62e16b13d3 Merge branch 'mueller/master' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/master Robin Mueller 2020-12-13 21:51:09 +01:00
• b7dbdb072d taken over upstream changes Robin Mueller 2020-12-13 21:50:33 +01:00
• bc6936dddd indentation corrected (again) Robin.Mueller 2020-12-12 18:35:58 +01:00
• 5927d944de cmake fixes Robin.Mueller 2020-12-12 18:32:24 +01:00
• d0d6247753 and now it compiles Robin Mueller 2020-12-12 00:01:36 +01:00
• 101babd863 indentation consistent now Robin Mueller 2020-12-11 23:53:29 +01:00
• f9d5403204 added device handler thermalset Robin Mueller 2020-12-11 23:50:00 +01:00
• bb7ebf4b27 removed glob pool Spacefish 2020-12-10 17:29:23 +01:00
• 3c316218f7 Merge pull request 'Enhanced Controller Base' (#276) from KSat/fsfw:mueller/enhanced-controller into development gaisser 2020-12-10 17:25:25 +01:00
• d61c25f2d2 Merge branch 'development' into mueller/enhanced-controller gaisser 2020-12-10 17:25:10 +01:00
• 60ee66ec36 Merge pull request 'CMake Init' (#298) from mueller/cmake-init into development gaisser 2020-12-10 17:23:21 +01:00
• 03cc343527 Merge branch 'development' into mueller/cmake-init gaisser 2020-12-10 17:23:09 +01:00
• 0489c7a42d Merge remote-tracking branch 'upstream/development' into mueller/enhanced-controller Spacefish 2020-12-10 17:23:07 +01:00
• 000129172a Merge pull request 'device handler uses local pools now' (#299) from KSat/fsfw:mueller/DeviceHandler-LocalPools into development gaisser 2020-12-10 17:22:55 +01:00
• 45b02083c9 Merge branch 'development' into mueller/DeviceHandler-LocalPools gaisser 2020-12-10 17:22:44 +01:00
• 5577eb893f Merge pull request 'Local Pool Refactoring' (#275) from KSat/fsfw:mueller/LocalPoolRefactoring into development gaisser 2020-12-10 17:21:26 +01:00
• 0cf9f334cc Merge branch 'mueller/DeviceHandler-LocalPools' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/DeviceHandler-LocalPools Spacefish 2020-12-10 17:18:58 +01:00
• 7986584d17 updated comment Spacefish 2020-12-10 17:18:46 +01:00
• 5cf4f4e839 Merge remote-tracking branch 'upstream/development' into mueller/enhanced-controller Spacefish 2020-12-10 17:14:15 +01:00
• 9c59079e94 Merge remote-tracking branch 'upstream/development' into mueller/LocalPoolRefactoring Spacefish 2020-12-10 17:12:01 +01:00
• 8ae13a189d Merge remote-tracking branch 'upstream/development' into mueller/enhanced-controller Spacefish 2020-12-10 17:11:01 +01:00
• b8f4cfe953 Merge branch 'development' into mueller/DeviceHandler-LocalPools gaisser 2020-12-10 17:10:45 +01:00
• 2c7936cecd Merge pull request 'Parameter Improvements' (#250) from KSat/fsfw:mueller/parameter-convergence into development gaisser 2020-12-10 17:09:55 +01:00
• 804155e951 Merge remote-tracking branch 'upstream/development' into mueller/LocalPoolRefactoring Spacefish 2020-12-10 17:09:41 +01:00
• a2823835dd explicit cast added Spacefish 2020-12-10 17:05:41 +01:00
• 4964ba0246 Merge remote-tracking branch 'upstream/development' into mueller/parameter-convergence Spacefish 2020-12-10 17:02:07 +01:00
• 2569080425 Merge remote-tracking branch 'upstream/development' into mueller/parameter-convergence Spacefish 2020-12-10 17:01:07 +01:00
• 3fd18f9c58 Merge branch 'development' into mueller/DeviceHandler-LocalPools gaisser 2020-12-10 17:00:51 +01:00
• c99ef61c77 Merge pull request 'added new interface for file systems' (#287) from KSat/fsfw:feature/has-file-system-if-init into development gaisser 2020-12-10 17:00:37 +01:00
• 616a073bb0 Merge branch 'development' into feature/has-file-system-if-init gaisser 2020-12-10 17:00:08 +01:00
• 18f90ef2fc Merge pull request 'power update' (#295) from KSat/fsfw:mueller/power-update into development gaisser 2020-12-10 16:59:52 +01:00
• 413e008d35 Merge remote-tracking branch 'upstream/development' into feature/has-file-system-if-init Spacefish 2020-12-10 16:59:44 +01:00
• 9813e65dda Merge branch 'development' into mueller/power-update gaisser 2020-12-10 16:59:43 +01:00
• b2d01a31c2 removed some commented stuff Spacefish 2020-12-10 16:58:18 +01:00
• 50ad2c0380 resolved merge conflicts Spacefish 2020-12-10 16:57:43 +01:00
• f0380e4acc Merge branch 'development' into mueller/DeviceHandler-LocalPools gaisser 2020-12-10 16:57:24 +01:00
• 9fe2fc4cae Merge pull request 'new internal error reporter using local pools' (#292) from KSat/fsfw:mueller/internal-error-rprtr-update into development gaisser 2020-12-10 16:55:06 +01:00
• 67a8b031d0 Merge remote-tracking branch 'upstream/development' into mueller/LocalPoolRefactoring Spacefish 2020-12-10 16:54:22 +01:00
• 0120ec29fd Merge branch 'development' into mueller/internal-error-rprtr-update gaisser 2020-12-10 16:53:45 +01:00
• 7d3641d42e Merge pull request 'thermal update' (#296) from KSat/fsfw:mueller/thermal-update into development gaisser 2020-12-10 16:53:30 +01:00
• 65f411ace2 Merge branch 'development' into mueller/thermal-update gaisser 2020-12-10 16:53:16 +01:00
• cbdf56e62b Merge remote-tracking branch 'upstream/development' into mueller/enhanced-controller Spacefish 2020-12-10 16:52:44 +01:00
• 5628d16197 Merge remote-tracking branch 'upstream/development' into feature/has-file-system-if-init Spacefish 2020-12-10 16:51:42 +01:00
• d7ca1df85b Merge remote-tracking branch 'upstream/development' into mueller/internal-error-rprtr-update Spacefish 2020-12-10 16:50:14 +01:00
• b1012b7cef Merge remote-tracking branch 'upstream/development' into mueller/power-update Spacefish 2020-12-10 16:46:39 +01:00
• 03e4504815 Merge pull request 'some minor changes' (#291) from KSat/fsfw:mueller/datalinklayer-convergence into development gaisser 2020-12-10 16:45:21 +01:00
• 80531e73c9 Merge branch 'development' into mueller/datalinklayer-convergence gaisser 2020-12-10 16:45:14 +01:00
• 3dafdc9071 Merge pull request 'controller base update' (#290) from KSat/fsfw:mueller/controller-update into development gaisser 2020-12-10 16:42:45 +01:00
• d412e4ff5d Merge branch 'development' into mueller/controller-update gaisser 2020-12-10 16:42:30 +01:00
• be9913f262 themral module update Spacefish 2020-12-10 16:40:22 +01:00
• 5bad114205 thermal module set heating repaired Spacefish 2020-12-10 16:39:31 +01:00
• 9a540e97c5 taken over thermal module from thermal-update Spacefish 2020-12-10 16:36:44 +01:00
• f81c9d7ecc resolved merge conflicts Spacefish 2020-12-10 16:36:09 +01:00
• 0a5099e293 deleted file which was renamed Spacefish 2020-12-10 16:34:25 +01:00
• ff62ab8427 removed core component Spacefish 2020-12-10 16:32:52 +01:00
• 14e254141c Merge remote-tracking branch 'upstream/development' into mueller/thermal-update Spacefish 2020-12-10 16:30:21 +01:00
• 14ecce084e Merge branch 'development' into mueller/parameter-convergence gaisser 2020-12-10 16:24:19 +01:00
• 4fbebcb019 Merge pull request 'monitoring update' (#294) from KSat/fsfw:mueller/monitoring-update into development gaisser 2020-12-10 16:24:00 +01:00
• 96a9ee9fc4 Merge branch 'development' into mueller/monitoring-update gaisser 2020-12-10 16:18:34 +01:00
• a0a2752fd0 Merge branch 'development' into mueller/cmake-init gaisser 2020-12-09 10:07:22 +01:00
• 46596f9397 tab changed Robin Mueller 2020-12-08 16:01:48 +01:00
• df333e0cc8 tab replacement Robin Mueller 2020-12-08 16:01:23 +01:00
• e9a740f110 small tweak Robin Mueller 2020-12-08 16:00:02 +01:00
• 5e2e18ac07 device handler uses local pools now Robin Mueller 2020-12-08 15:59:30 +01:00
• beab942f07 fixes taken over from master Robin Mueller 2020-12-08 15:57:30 +01:00
• 1d6402a0c0 Merge remote-tracking branch 'upstream/development' into mueller/parameter-convergence Robin Mueller 2020-12-08 15:55:49 +01:00
• faedd40665 Merge pull request 'DHB additional step for performOperation' (#281) from KSat/fsfw:mueller/DHB-update into development gaisser 2020-12-08 15:53:05 +01:00
• c126833dcf Merge remote-tracking branch 'upstream/development' into mueller/parameter-convergence Robin Mueller 2020-12-08 15:51:31 +01:00
• 7f40566031 include removed Robin Mueller 2020-12-08 15:50:21 +01:00
• a612e19e94 ndentation Robin Mueller 2020-12-08 15:49:46 +01:00
• 81988e77d9 Merge remote-tracking branch 'upstream/development' into mueller/internal-error-rprtr-update Robin Mueller 2020-12-08 15:48:41 +01:00
• 9891086e65 Merge branch 'development' into mueller/datalinklayer-convergence Robin Müller 2020-12-08 15:46:49 +01:00
• 2514082af7 Merge remote-tracking branch 'upstream/development' into mueller/monitoring-update Robin Mueller 2020-12-08 15:46:25 +01:00
• 012fb6f314 Merge remote-tracking branch 'upstream/development' into feature/has-file-system-if-init Robin Mueller 2020-12-08 15:45:09 +01:00
• ac5446b2b1 removed hk switcher helper member Robin Mueller 2020-12-08 15:43:58 +01:00
• b0053c3b77 Merge remote-tracking branch 'upstream/development' into mueller/controller-update Robin Mueller 2020-12-08 15:42:51 +01:00
• 38819d796c Merge remote-tracking branch 'upstream/development' into mueller/enhanced-controller Robin Mueller 2020-12-08 15:40:43 +01:00
• eb781ecc7a Merge remote-tracking branch 'upstream/development' into mueller/DHB-update Robin Mueller 2020-12-08 15:36:16 +01:00
• 42dd641924 Merge remote-tracking branch 'upstream/development' into mueller/DHB-update Robin Mueller 2020-12-08 15:34:51 +01:00
• 7ff772d9d6 Merge pull request 'Local Data Pool Init' (#280) from KSat/fsfw:mueller/newLocalDataPools into development gaisser 2020-12-08 15:34:30 +01:00
• bd1137d089 replaced hardcoded value with NO_COMMAND Robin Mueller 2020-12-08 15:33:32 +01:00
• 2b8a2c4f29 Merge branch 'development' into mueller/newLocalDataPools gaisser 2020-12-08 15:18:48 +01:00
• ba52d54244 Merge remote-tracking branch 'upstream/development' into mueller/internal-error-rprtr-update Robin Mueller 2020-12-08 15:17:25 +01:00
• 6064984671 Merge remote-tracking branch 'upstream/development' into mueller/internal-error-rprtr-update Robin Mueller 2020-12-08 15:16:29 +01:00
• 3b0e5daeed Merge branch 'mueller/datalinklayer-convergence' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/datalinklayer-convergence Robin Mueller 2020-12-08 15:15:50 +01:00
• 8504bf3f42 Merge remote-tracking branch 'upstream/development' into mueller/datalinklayer-convergence Robin Mueller 2020-12-08 15:15:42 +01:00
• 322dd1253e map packet extract update Robin Mueller 2020-12-08 15:15:22 +01:00
• 4a46349286 minor imrpovements Robin Mueller 2020-12-08 15:14:39 +01:00
• 34dac6f312 Merge branch 'development' into mueller/datalinklayer-convergence Robin Müller 2020-12-08 15:11:32 +01:00