|
|
52d9a55d06
|
Merge pull request 'better error handling' (#329) from KSat/fsfw:mueller/osal-windows-tweak into development
Reviewed-on: fsfw/fsfw#329
|
2020-12-22 17:34:41 +01:00 |
|
|
|
c19b838657
|
Merge branch 'development' into mueller/osal-windows-tweak
|
2020-12-22 17:34:33 +01:00 |
|
|
|
f9e36d7268
|
Merge pull request 'include guards' (#330) from KSat/fsfw:mueller/tmtcpacket-tiny-tweak into development
Reviewed-on: fsfw/fsfw#330
|
2020-12-22 17:31:35 +01:00 |
|
|
|
0eff30e065
|
Merge branch 'development' into mueller/tmtcpacket-tiny-tweak
|
2020-12-22 17:31:25 +01:00 |
|
|
|
27fe235700
|
Merge branch 'development' into mueller/osal-windows-tweak
|
2020-12-22 17:30:42 +01:00 |
|
|
|
2706669011
|
Merge pull request 'time stamper ID added' (#328) from KSat/fsfw:mueller/fwObject-timestamper into development
Reviewed-on: fsfw/fsfw#328
|
2020-12-22 17:28:49 +01:00 |
|
|
|
ba1f8f7171
|
Merge branch 'development' into mueller/master
|
2020-12-22 16:38:41 +01:00 |
|
|
|
f017e9c6d4
|
include guards
|
2020-12-22 16:22:11 +01:00 |
|
|
|
e674b9248a
|
better error handling
|
2020-12-22 16:15:40 +01:00 |
|
|
|
571a64c42a
|
time stamper ID added
|
2020-12-22 16:10:53 +01:00 |
|
|
|
83458c851e
|
Merge pull request 'timemanager update' (#315) from KSat/fsfw:mueller/timeman-update into development
Reviewed-on: fsfw/fsfw#315
|
2020-12-22 15:50:28 +01:00 |
|
|
|
48a89d59d6
|
Merge branch 'mueller/timeman-update' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/timeman-update
|
2020-12-22 15:49:39 +01:00 |
|
|
|
958db291e8
|
now it compiles
|
2020-12-22 15:49:31 +01:00 |
|
|
|
c8ca680d5f
|
Merge branch 'development' into mueller/timeman-update
|
2020-12-22 15:40:14 +01:00 |
|
|
|
d2a9b769eb
|
Merge pull request 'tmtcservices update' (#309) from KSat/fsfw:mueller/tmtcservices-update into development
Reviewed-on: fsfw/fsfw#309
|
2020-12-22 15:39:07 +01:00 |
|
|
|
329cd8862a
|
Merge branch 'development' into mueller/tmtcservices-update
|
2020-12-22 15:37:22 +01:00 |
|
|
|
fe26fc4824
|
Merge branch 'development' into mueller/timeman-update
|
2020-12-22 15:36:48 +01:00 |
|
|
|
ddcdfb3403
|
Merge pull request 'Fixed file ending of devicehanlder remake' (#326) from gaisser/fsfw:development into development
Reviewed-on: fsfw/fsfw#326
|
2020-12-22 15:36:33 +01:00 |
|
|
|
822cc0306c
|
Fixed file ending of devicehanlder remake
|
2020-12-22 15:35:23 +01:00 |
|
|
|
483cec191b
|
Merge pull request 'updated docs, added new doc folder' (#325) from KSat/fsfw:mueller/doc-update into development
Reviewed-on: fsfw/fsfw#325
|
2020-12-22 15:31:50 +01:00 |
|
|
|
5a4f453aaa
|
Merge branch 'mueller/timeman-update' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/timeman-update
|
2020-12-22 15:30:03 +01:00 |
|
|
|
ab9965cb81
|
clock corrected
|
2020-12-22 15:29:42 +01:00 |
|
|
|
afad130918
|
Merge branch 'development' into mueller/doc-update
|
2020-12-22 15:29:05 +01:00 |
|
|
|
7f3bdb6082
|
Merge pull request 'devicehandler updates' (#320) from KSat/fsfw:mueller/devicehandlers-update into development
Reviewed-on: fsfw/fsfw#320
|
2020-12-22 15:28:46 +01:00 |
|
|
|
117b29e413
|
Merge branch 'development' into mueller/devicehandlers-update
|
2020-12-22 15:28:38 +01:00 |
|
|
|
0e1eac4f14
|
Merge pull request 'HOST CMake Improvements' (#318) from mueller/host-cmake-improvements into development
Reviewed-on: fsfw/fsfw#318
|
2020-12-22 15:22:57 +01:00 |
|
|
|
041aaf01db
|
Merge branch 'development' into mueller/host-cmake-improvements
|
2020-12-22 15:21:34 +01:00 |
|
|
|
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 |
|
|
|
cb7a22c370
|
Merge branch 'development' into mueller/cmake-fixes
|
2020-12-22 15:18:47 +01:00 |
|
|
|
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 |
|
|
|
631bbf70c2
|
Merge branch 'development' into mueller/ipc-update
|
2020-12-22 15:13:20 +01:00 |
|
|
|
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 |
|
|
|
3b59a50e9a
|
Merge branch 'development' into mueller/datapool-update
|
2020-12-22 15:11:37 +01:00 |
|
|
|
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 |
|
|
|
b0fcb404b3
|
Merge branch 'development' into mueller/unittest-update
|
2020-12-22 15:11:02 +01:00 |
|
|
|
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 |
|
|
|
d396bab455
|
Merge branch 'development' into mueller/defaultcfg-update
|
2020-12-22 15:05:16 +01:00 |
|
|
|
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 |
|
|
|
cf954ac8d1
|
Merge branch 'development' into mueller/deleted-storagman-tpp
|
2020-12-22 14:46:19 +01:00 |
|
|
|
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 |
|
|
|
49aa937968
|
Merge branch 'development' into mueller/datapoollocal-long-name
|
2020-12-22 14:45:24 +01:00 |
|
|
|
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 |
|
|
|
dca5e1b51c
|
Merge branch 'development' into mueller/hk-service3
|
2020-12-22 14:43:26 +01:00 |
|
|
|
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 |
|
|
|
1ad94bae7d
|
Merge remote-tracking branch 'upstream/development' into mueller/timeman-update
|
2020-12-22 14:27:36 +01:00 |
|
|
|
8349e12e43
|
Merge branch 'development' into mueller/timeman-update
|
2020-12-22 15:14:08 +01:00 |
|
|
|
332a327777
|
Merge branch 'development' into mueller/timeman-update
|
2020-12-22 14:48:11 +01:00 |
|
|
|
9ac07368da
|
changelog update
|
2020-12-22 14:26:42 +01:00 |
|
|
|
7934104cbb
|
Merge branch 'mueller/tmtcservices-update' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/tmtcservices-update
|
2020-12-22 14:19:22 +01:00 |
|
|
|
7075952a8b
|
Merge branch 'development' into mueller/tmtcservices-update
|
2020-12-22 15:17:12 +01:00 |
|
