 muellerr
|
8f83f7becd
|
Merge remote-tracking branch 'upstream/development' into eive/develop
|
2021-01-19 16:34:45 +01:00 |
|
|
muellerr
|
55263fe4d8
|
Merge branch 'eive/shadow-local-warning' into eive/develop
|
2021-01-19 16:31:04 +01:00 |
|
|
muellerr
|
b23309a5f4
|
improved options
|
2021-01-19 16:30:17 +01:00 |
|
 gaisser
|
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 |
|
|
muellerr
|
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 |
|
|
muellerr
|
387bb0c434
|
Merge remote-tracking branch 'upstream/development' into eive/shadow-local-warning
|
2021-01-19 16:17:59 +01:00 |
|
|
muellerr
|
97e86b19f0
|
Merge branch 'development' into eive/shadow-local-warning
|
2021-01-19 16:14:52 +01:00 |
|
|
muellerr
|
ffb6208b24
|
cmake lists update
|
2021-01-19 16:13:10 +01:00 |
|
|
muellerr
|
65f493b230
|
Merge remote-tracking branch 'upstream/development' into eive/develop
|
2021-01-19 16:03:50 +01:00 |
|
|
gaisser
|
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 |
|
|
muellerr
|
8a7483fae4
|
Merge remote-tracking branch 'upstream/development' into mueller/local-pool-update
|
2021-01-19 15:09:21 +01:00 |
|
|
gaisser
|
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 |
|
|
gaisser
|
2469da757e
|
Merge branch 'development' into mueller/action-bugfix
|
2021-01-19 14:52:58 +01:00 |
|
|
gaisser
|
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 |
|
|
gaisser
|
6f3e90c2f0
|
Merge branch 'development' into mueller/added-hkservie3-cmake
|
2021-01-19 14:52:35 +01:00 |
|
|
gaisser
|
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 |
|
|
gaisser
|
ff2c05012e
|
Merge branch 'development' into mueller/defaultcfg-update
|
2021-01-19 14:52:05 +01:00 |
|
|
gaisser
|
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 |
|
|
gaisser
|
8bb67cd919
|
Merge branch 'development' into mueller/pool-entry-update
|
2021-01-19 14:51:46 +01:00 |
|
|
gaisser
|
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 |
|
|
gaisser
|
d7220b7350
|
Merge branch 'development' into mueller/cmake-update
|
2021-01-19 14:50:25 +01:00 |
|
|
gaisser
|
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 |
|
|
muellerr
|
87fbb5ce75
|
imrpoved doc
|
2021-01-18 19:49:59 +01:00 |
|
|
muellerr
|
d4b08459f4
|
smaller changes and documentation
|
2021-01-18 19:49:15 +01:00 |
|
|
muellerr
|
113b4b5ffa
|
important bugfix
|
2021-01-18 19:44:25 +01:00 |
|
|
muellerr
|
4cf15e9ec6
|
Merge remote-tracking branch 'upstream/mueller/master' into development
|
2021-01-14 12:22:38 +01:00 |
|
|
muellerr
|
d6b0af3be7
|
moved read helper into correct folder
|
2021-01-14 12:21:40 +01:00 |
|
|
muellerr
|
16f2468e60
|
Merge branch 'mueller/master' into mueller/local-pool-update
|
2021-01-14 12:18:24 +01:00 |
|
|
muellerr
|
f6c88886b8
|
Merge remote-tracking branch 'upstream/mueller/master' into development
|
2021-01-14 12:16:51 +01:00 |
|
|
muellerr
|
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 |
|
|
muellerr
|
1996215bc7
|
small bugfix
|
2021-01-14 12:15:43 +01:00 |
|
|
muellerr
|
d8423be98c
|
Merge remote-tracking branch 'upstream/mueller/master' into mueller/master
|
2021-01-14 12:02:54 +01:00 |
|
|
muellerr
|
549afaee1d
|
initialized member
|
2021-01-14 12:02:20 +01:00 |
|
|
muellerr
|
2c4cd756c6
|
updated to new internal interface
|
2021-01-14 11:58:50 +01:00 |
|
|
muellerr
|
67ce8d2e24
|
improved internal interface
|
2021-01-14 11:50:33 +01:00 |
|
|
muellerr
|
58c5b02113
|
Merge remote-tracking branch 'upstream/mueller/master' into mueller/master
|
2021-01-14 11:31:36 +01:00 |
|
|
muellerr
|
a5e20657c6
|
resolved merge conflicts
|
2021-01-14 11:31:26 +01:00 |
|
|
muellerr
|
5ea6769149
|
Merge branch 'mueller/added-hkservie3-cmake' into mueller/local-pool-update
|
2021-01-14 11:30:58 +01:00 |
|
|
muellerr
|
6b1c7084ac
|
added srv3
|
2021-01-14 11:29:38 +01:00 |
|
|
muellerr
|
7bb570540b
|
added hk service
|
2021-01-14 11:27:35 +01:00 |
|
|
muellerr
|
f05af8f54a
|
Merge remote-tracking branch 'upstream/mueller/master' into mueller/master
|
2021-01-14 11:25:14 +01:00 |
|
|
muellerr
|
0cd457725e
|
trying to suppress certain warnings
|
2021-01-13 21:35:17 +01:00 |
|
|
muellerr
|
5710f3824a
|
indentation consistent now
|
2021-01-13 13:06:57 +01:00 |
|
|
muellerr
|
2e456cebb7
|
include fix
|
2021-01-13 13:06:30 +01:00 |
|
|
muellerr
|
7ac59c6d18
|
include fix
|
2021-01-13 13:01:41 +01:00 |
|
|
muellerr
|
cd3f19d0e4
|
updated defaultcfg
|
2021-01-13 12:56:55 +01:00 |
|
|
muellerr
|
fa49def1cf
|
indentation
|
2021-01-13 12:53:05 +01:00 |
|
|
muellerr
|
3a4b89cc28
|
more changes
|
2021-01-13 12:43:53 +01:00 |
|
|
muellerr
|
a4e0f15dac
|
consistency changes
|
2021-01-13 12:41:24 +01:00 |
|
|
muellerr
|
fdef8bc22b
|
read commit if
|
2021-01-13 12:18:05 +01:00 |
|