 gaisser
|
041aaf01db
|
Merge branch 'development' into mueller/host-cmake-improvements
|
2020-12-22 15:21:34 +01:00 |
|
|
gaisser
|
6663c69ee9
|
Merge pull request 'cmake fixes' (#314) from mueller/cmake-fixes into development
Reviewed-on: fsfw/fsfw#314
|
2020-12-22 15:18:58 +01:00 |
|
|
gaisser
|
cb7a22c370
|
Merge branch 'development' into mueller/cmake-fixes
|
2020-12-22 15:18:47 +01:00 |
|
|
gaisser
|
5941bd710a
|
Merge pull request 'clearing HK message included now' (#322) from KSat/fsfw:mueller/ipc-update into development
Reviewed-on: fsfw/fsfw#322
|
2020-12-22 15:13:51 +01:00 |
|
|
gaisser
|
631bbf70c2
|
Merge branch 'development' into mueller/ipc-update
|
2020-12-22 15:13:20 +01:00 |
|
|
gaisser
|
85d6e02291
|
Merge pull request 'nullptr check added' (#324) from KSat/fsfw:mueller/datapool-update into development
Reviewed-on: fsfw/fsfw#324
|
2020-12-22 15:12:03 +01:00 |
|
|
gaisser
|
3b59a50e9a
|
Merge branch 'development' into mueller/datapool-update
|
2020-12-22 15:11:37 +01:00 |
|
|
gaisser
|
4a154140f3
|
Merge pull request 'unittest update' (#323) from KSat/fsfw:mueller/unittest-update into development
Reviewed-on: fsfw/fsfw#323
|
2020-12-22 15:11:27 +01:00 |
|
|
gaisser
|
b0fcb404b3
|
Merge branch 'development' into mueller/unittest-update
|
2020-12-22 15:11:02 +01:00 |
|
|
gaisser
|
422a0f1ee0
|
Merge pull request 'defaultcfg update' (#319) from KSat/fsfw:mueller/defaultcfg-update into development
Reviewed-on: fsfw/fsfw#319
|
2020-12-22 15:05:36 +01:00 |
|
|
gaisser
|
d396bab455
|
Merge branch 'development' into mueller/defaultcfg-update
|
2020-12-22 15:05:16 +01:00 |
|
|
gaisser
|
11778c706c
|
Merge pull request 'deleted tpp files, replaced by source files' (#313) from mueller/deleted-storagman-tpp into development
Reviewed-on: fsfw/fsfw#313
|
2020-12-22 15:05:01 +01:00 |
|
|
gaisser
|
cf954ac8d1
|
Merge branch 'development' into mueller/deleted-storagman-tpp
|
2020-12-22 14:46:19 +01:00 |
|
|
gaisser
|
5e315ce083
|
Merge pull request 'LocalPoolVar: using long name now' (#312) from KSat/fsfw:mueller/datapoollocal-long-name into development
Reviewed-on: fsfw/fsfw#312
|
2020-12-22 14:45:56 +01:00 |
|
|
gaisser
|
49aa937968
|
Merge branch 'development' into mueller/datapoollocal-long-name
|
2020-12-22 14:45:24 +01:00 |
|
|
gaisser
|
eb310a72ef
|
Merge pull request 'added hk service 3' (#311) from KSat/fsfw:mueller/hk-service3 into development
Reviewed-on: fsfw/fsfw#311
|
2020-12-22 14:44:05 +01:00 |
|
|
gaisser
|
dca5e1b51c
|
Merge branch 'development' into mueller/hk-service3
|
2020-12-22 14:43:26 +01:00 |
|
|
gaisser
|
d8be07b4db
|
Merge pull request 'Linux convergence' (#310) from KSat/fsfw:mueller/linux-update into development
Reviewed-on: fsfw/fsfw#310
|
2020-12-22 14:43:15 +01:00 |
|
 muellerr
|
620ab01e38
|
Merge remote-tracking branch 'upstream/development' into mueller/ipc-update
|
2020-12-22 13:53:41 +01:00 |
|
|
muellerr
|
0fec6172a1
|
Merge remote-tracking branch 'upstream/development' into mueller/unittest-update
|
2020-12-22 13:31:03 +01:00 |
|
|
muellerr
|
4c41e36044
|
nullptr check added
|
2020-12-22 13:29:06 +01:00 |
|
|
muellerr
|
6b1a8afe2b
|
unittest update 2
|
2020-12-22 13:25:50 +01:00 |
|
|
muellerr
|
6f756a721c
|
clearing HK messagei ncluded now
|
2020-12-22 13:05:59 +01:00 |
|
|
muellerr
|
0a7aaffe6a
|
Merge remote-tracking branch 'upstream/development' into mueller/defaultcfg-update
|
2020-12-22 12:47:33 +01:00 |
|
|
muellerr
|
ca2d242adb
|
defaultcfg update
|
2020-12-22 12:45:51 +01:00 |
|
|
muellerr
|
5317391f8a
|
reverted change
|
2020-12-21 17:19:43 +01:00 |
|
|
muellerr
|
1d080ba6cb
|
clock update
|
2020-12-21 14:07:06 +01:00 |
|
|
muellerr
|
5c45b823ad
|
include fix
|
2020-12-21 13:52:41 +01:00 |
|
|
muellerr
|
de183e6c65
|
removed comment
|
2020-12-20 17:01:22 +01:00 |
|
|
muellerr
|
d8e5000d47
|
msvc tests
|
2020-12-20 15:32:03 +01:00 |
|
|
muellerr
|
3540adf022
|
added warning flags
|
2020-12-20 13:21:12 +01:00 |
|
|
muellerr
|
a0d5b23311
|
small improvement
|
2020-12-20 02:09:08 +01:00 |
|
|
muellerr
|
ebe7f02fc4
|
better error handling
|
2020-12-20 01:56:21 +01:00 |
|
|
muellerr
|
c64a9654ea
|
xcompile update
|
2020-12-19 22:51:10 +01:00 |
|
|
muellerr
|
d186b70d2e
|
comment added
|
2020-12-19 18:41:28 +01:00 |
|
|
muellerr
|
8ede00fdf1
|
small bugfixes
|
2020-12-19 18:38:02 +01:00 |
|
|
muellerr
|
b8e703ca83
|
linked against OS
|
2020-12-19 13:04:16 +01:00 |
|
|
muellerr
|
be20978998
|
better path determination
|
2020-12-19 12:10:29 +01:00 |
|
|
muellerr
|
e030d7ed97
|
correct interface and private includes
|
2020-12-19 02:29:22 +01:00 |
|
|
muellerr
|
c0099481a1
|
added freertos cmakelists
|
2020-12-19 00:21:08 +01:00 |
|
|
muellerr
|
62b5c19063
|
small fix
|
2020-12-17 20:18:16 +01:00 |
|
|
muellerr
|
ac40b1c966
|
cmake list formatting
|
2020-12-17 11:46:50 +01:00 |
|
|
muellerr
|
74c49e1481
|
Merge branch 'development' into mueller/master
|
2020-12-16 14:05:29 +01:00 |
|
|
muellerr
|
07814abf3a
|
Merge branch 'development' into mueller/datapoollocal-long-name
|
2020-12-16 14:03:23 +01:00 |
|
|
muellerr
|
086cbe1e39
|
Merge remote-tracking branch 'upstream/development' into development
|
2020-12-16 12:00:59 +01:00 |
|
|
muellerr
|
f128a1dc3d
|
made datalinklayer optional
|
2020-12-15 23:44:43 +01:00 |
|
|
muellerr
|
c48f1c8ee6
|
Merge branch 'development' into mueller/cmake-fixes
|
2020-12-15 23:05:32 +01:00 |
|
|
muellerr
|
a411df18db
|
deleted tpp files, replaced by source files
|
2020-12-15 22:52:29 +01:00 |
|
|
muellerr
|
cd1fb88313
|
Merge remote-tracking branch 'upstream/development' into mueller/linux-update
|
2020-12-15 22:49:18 +01:00 |
|
|
muellerr
|
4f33a1908a
|
Merge branch 'development' into mueller/hk-service3
|
2020-12-15 22:44:24 +01:00 |
|