Commit Graph

2980 Commits

Author SHA1 Message Date
7310d2b5fe Merge pull request 'improved options' (#359) from eive/fsfw:eive/shadow-local-warning into development
Reviewed-on: fsfw/fsfw#359
2021-01-25 14:40:21 +01:00
d39c729a16 Merge branch 'development' into eive/shadow-local-warning 2021-01-25 14:40:06 +01:00
f11e7407d6 Merge pull request 'important bugfix' (#360) from KSat/fsfw:mueller/hk-bugfix into development
Reviewed-on: fsfw/fsfw#360
2021-01-25 14:39:48 +01:00
52c177479f some fixes, indentation with spaces now 2021-01-25 13:44:21 +01:00
0bb19c5ee5 Merge remote-tracking branch 'ksat/mueller/master' into mueller/master 2021-01-25 13:10:58 +01:00
4dbd5a58e3 local pool updates 2021-01-25 13:09:39 +01:00
df9f534d12 doxyfile update 2021-01-25 11:37:19 +01:00
ef93c70665 updated doxyfiles 2021-01-25 11:16:30 +01:00
47402055f9 added doxy folder 2021-01-25 11:07:02 +01:00
0495f390ef small stuff 2021-01-25 00:58:19 +01:00
d1c83159e5 added more unittests 2021-01-25 00:55:27 +01:00
5289c274f3 cmake lists update 2021-01-24 21:40:44 +01:00
094d237814 added more tests 2021-01-24 21:34:38 +01:00
e245f56a4f updated indentation 2021-01-24 21:18:22 +01:00
a85c94ea80 Merge branch 'development' into mueller/hk-bugfix 2021-01-24 17:06:48 +01:00
8850b770ee important bugfix 2021-01-24 17:03:03 +01:00
bdd1bdb080 bugfix 2021-01-24 16:53:58 +01:00
7b82a7c1a7 added stopwatch printf support 2021-01-22 12:21:45 +01:00
cc2e26443d Merge branch 'development' into mueller/master 2021-01-19 16:55:58 +01:00
50733e223a small fix 2021-01-19 16:42:18 +01:00
6a5f5af233 Merge branch 'eive/develop' into eive/shadow-local-warning 2021-01-19 16:39:23 +01:00
e0f8113eac added missing endif 2021-01-19 16:39:12 +01:00
8f83f7becd Merge remote-tracking branch 'upstream/development' into eive/develop 2021-01-19 16:34:45 +01:00
94d1b5acae Merge branch 'eive/shadow-local-warning' of https://egit.irs.uni-stuttgart.de/eive/fsfw into eive/shadow-local-warning 2021-01-19 16:33:20 +01:00
2e9a855181 updating cmakelists 2021-01-19 16:33:01 +01:00
fd5252bb57 Merge branch 'development' into eive/shadow-local-warning 2021-01-19 16:32:36 +01:00
55263fe4d8 Merge branch 'eive/shadow-local-warning' into eive/develop 2021-01-19 16:31:04 +01:00
b23309a5f4 improved options 2021-01-19 16:30:17 +01:00
2f64c16a8a Merge pull request 'Warning on local shadowing can be disabled optionally for GCC' (#357) from eive/fsfw:eive/shadow-local-warning into development
Reviewed-on: fsfw/fsfw#357
2021-01-19 16:28:56 +01:00
0d9bb5b35e Merge branch 'eive/shadow-local-warning' of https://egit.irs.uni-stuttgart.de/eive/fsfw into eive/shadow-local-warning 2021-01-19 16:18:18 +01:00
387bb0c434 Merge remote-tracking branch 'upstream/development' into eive/shadow-local-warning 2021-01-19 16:17:59 +01:00
97e86b19f0 Merge branch 'development' into eive/shadow-local-warning 2021-01-19 16:14:52 +01:00
ffb6208b24 cmake lists update 2021-01-19 16:13:10 +01:00
65f493b230 Merge remote-tracking branch 'upstream/development' into eive/develop 2021-01-19 16:03:50 +01:00
583d354fb5 removed include 2021-01-19 15:48:50 +01:00
d4ca1ddb20 Merge remote-tracking branch 'upstream/development' into mueller/comp_branch 2021-01-19 15:43:11 +01:00
543e0d4649 Merge pull request 'Local Pool Update' (#349) from KSat/fsfw:mueller/local-pool-update into development
Reviewed-on: fsfw/fsfw#349
2021-01-19 15:38:07 +01:00
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