Commit Graph

3093 Commits

Author SHA1 Message Date
8a7483fae4 Merge remote-tracking branch 'upstream/development' into mueller/local-pool-update 2021-01-19 15:09:21 +01:00
ca22ff5d8e more renaming 2021-01-19 15:06:21 +01:00
b6888a8185 better naming 2021-01-19 15:04:47 +01:00
aea258cf5a Merge pull request 'important bugfix HasActionIF' (#353) from KSat/fsfw:mueller/action-bugfix into development
Reviewed-on: fsfw/fsfw#353
2021-01-19 14:56:09 +01:00
2469da757e Merge branch 'development' into mueller/action-bugfix 2021-01-19 14:52:58 +01:00
d77e356ce5 Merge pull request 'Added Service 3 to CMake sources' (#352) from mueller/added-hkservie3-cmake into development
Reviewed-on: fsfw/fsfw#352
2021-01-19 14:52:42 +01:00
6f3e90c2f0 Merge branch 'development' into mueller/added-hkservie3-cmake 2021-01-19 14:52:35 +01:00
867fa577b6 Merge pull request 'updated defaultcfg' (#351) from KSat/fsfw:mueller/defaultcfg-update into development
Reviewed-on: fsfw/fsfw#351
2021-01-19 14:52:22 +01:00
ff2c05012e Merge branch 'development' into mueller/defaultcfg-update 2021-01-19 14:52:05 +01:00
6ef11678d0 Merge pull request 'pool entry update' (#350) from KSat/fsfw:mueller/pool-entry-update into development
Reviewed-on: fsfw/fsfw#350
2021-01-19 14:51:55 +01:00
8bb67cd919 Merge branch 'development' into mueller/pool-entry-update 2021-01-19 14:51:46 +01:00
fe09add0fe Merge pull request 'updated cmakelists' (#348) from KSat/fsfw:mueller/cmake-update into development
Reviewed-on: fsfw/fsfw#348
2021-01-19 14:51:12 +01:00
d7220b7350 Merge branch 'development' into mueller/cmake-update 2021-01-19 14:50:25 +01:00
9d179f90ad Merge pull request 'doc update' (#347) from KSat/fsfw:mueller/doc-update into development
Reviewed-on: fsfw/fsfw#347
2021-01-19 14:50:14 +01:00
f4a60a0323 less confusing code 2021-01-19 14:37:52 +01:00
f7b70984c1 updated doc 2021-01-18 20:20:01 +01:00
74def820c6 improved naming convention 2021-01-18 20:03:03 +01:00
6e6e1304bb Merge branch 'mueller/action-bugfix' into mueller/master 2021-01-18 19:50:17 +01:00
87fbb5ce75 imrpoved doc 2021-01-18 19:49:59 +01:00
d4b08459f4 smaller changes and documentation 2021-01-18 19:49:15 +01:00
113b4b5ffa important bugfix 2021-01-18 19:44:25 +01:00
2c21400aed important bugfix 2021-01-18 19:43:44 +01:00
aa7ea35b80 cyan instead of magenta for debug now 2021-01-16 14:24:59 +01:00
0514ab4d05 doc 2021-01-15 18:15:52 +01:00
a9135696a5 array printer tests complete 2021-01-15 18:07:32 +01:00
38dd230887 fixed syntax error 2021-01-15 17:28:31 +01:00
eae3175976 repaired internal unit test 2021-01-15 17:25:27 +01:00
79cf009049 updated internal unit tester 2021-01-15 17:06:05 +01:00
73b9d058e5 updated internal unit test 2021-01-15 16:56:36 +01:00
baba8fa5d7 added array printer test stubs 2021-01-15 16:34:05 +01:00
05508418a7 printf support for array printer 2021-01-15 16:32:25 +01:00
f69d6d49c7 replaced zu with lu 2021-01-15 15:21:13 +01:00
eb5548333e added missing include guards 2021-01-14 20:00:48 +01:00
fd11cae7be printer: helper macros 2021-01-14 19:32:18 +01:00
4cf15e9ec6 Merge remote-tracking branch 'upstream/mueller/master' into development 2021-01-14 12:22:38 +01:00
d6b0af3be7 moved read helper into correct folder 2021-01-14 12:21:40 +01:00
16f2468e60 Merge branch 'mueller/master' into mueller/local-pool-update 2021-01-14 12:18:24 +01:00
f6c88886b8 Merge remote-tracking branch 'upstream/mueller/master' into development 2021-01-14 12:16:51 +01:00
026621bb96 Merge branch 'mueller/master' of https://egit.irs.uni-stuttgart.de/fsfw/fsfw into mueller/master 2021-01-14 12:15:51 +01:00
1996215bc7 small bugfix 2021-01-14 12:15:43 +01:00
d8423be98c Merge remote-tracking branch 'upstream/mueller/master' into mueller/master 2021-01-14 12:02:54 +01:00
549afaee1d initialized member 2021-01-14 12:02:20 +01:00
2c4cd756c6 updated to new internal interface 2021-01-14 11:58:50 +01:00
67ce8d2e24 improved internal interface 2021-01-14 11:50:33 +01:00
58c5b02113 Merge remote-tracking branch 'upstream/mueller/master' into mueller/master 2021-01-14 11:31:36 +01:00
a5e20657c6 resolved merge conflicts 2021-01-14 11:31:26 +01:00
5ea6769149 Merge branch 'mueller/added-hkservie3-cmake' into mueller/local-pool-update 2021-01-14 11:30:58 +01:00
6b1c7084ac added srv3 2021-01-14 11:29:38 +01:00
7bb570540b added hk service 2021-01-14 11:27:35 +01:00
f05af8f54a Merge remote-tracking branch 'upstream/mueller/master' into mueller/master 2021-01-14 11:25:14 +01:00