Commit Graph

2918 Commits

Author SHA1 Message Date
5b9c0e013e Merge branch 'mueller/test-update' into mueller/bundled-update 2020-12-28 18:01:05 +01:00
b2c98f0ae4 Merge branch 'mueller/test-update' of https://egit.irs.uni-stuttgart.de/fsfw/fsfw into mueller/test-update 2020-12-28 18:00:07 +01:00
c5212226b8 Merge remote-tracking branch 'origin/mueller/test-update' into mueller/bundled-update 2020-12-28 17:58:50 +01:00
91cb061da9 datapool updates, fixes, pool read helper 2020-12-28 17:55:19 +01:00
bc475f0a9a bugfixes 2020-12-28 17:48:26 +01:00
d268c6d96c moved includes to allow c inclusion 2020-12-28 16:59:39 +01:00
b126149215 removed abi flags, are part of cross compile file now 2020-12-28 16:49:43 +01:00
f9bcc835d7 include updated 2020-12-28 01:17:03 +01:00
1538a39d5b Merge branch 'mueller/test-update' into mueller/master 2020-12-27 15:16:08 +01:00
254b1437e9 repaired windows unittests 2020-12-27 15:15:51 +01:00
978cbea341 Merge remote-tracking branch 'origin/mueller/test-update' into mueller/master 2020-12-27 15:04:24 +01:00
f60f02c5b8 updated readme 2020-12-27 14:53:37 +01:00
d8d2f207e1 cleaned up includes 2020-12-27 14:20:26 +01:00
37463b660b restructured test folder and enabled cmake v3 support 2020-12-27 14:14:38 +01:00
39887db8d2 removed newline 2020-12-27 12:59:25 +01:00
e24e50b5ee removed todo 2020-12-27 12:58:05 +01:00
d80ddcccac Merge branch 'mueller/raiiacctest' into mueller/master 2020-12-27 02:04:56 +01:00
ed473d0a1b bugfix 2020-12-27 02:04:45 +01:00
76403ce0ab renaming 2020-12-27 01:53:59 +01:00
f852c774f8 accessor test 2020-12-27 01:52:48 +01:00
535b51ef70 improvements and clarifications 2020-12-27 01:15:52 +01:00
639dbee8a3 form stuff 2020-12-27 00:21:39 +01:00
76696e34be its possible to protect every read/commit now 2020-12-26 23:57:23 +01:00
e35c2cd604 hk manager optional now 2020-12-26 23:16:33 +01:00
b469340ef4 bugfix 2020-12-26 18:06:56 +01:00
4157a4b638 Merge branch 'development' into mueller/master 2020-12-26 14:47:54 +01:00
9eec75df26 linking against thread lib 2020-12-25 01:49:44 +01:00
3486a04741 renaming for name shadowing 2020-12-25 00:37:24 +01:00
68fe923a01 renamed class enums 2020-12-24 02:03:33 +01:00
c5eae8c41b Merge branch 'development' into mueller/tmstorage 2020-12-23 23:51:54 +01:00
426514b9a2 Merge pull request 'Move static constants to DeviceHandlerIF' (#331) from eive/fsfw:mueller/no-raw-command-moved-to-if into development
Reviewed-on: fsfw/fsfw#331
2020-12-23 23:51:40 +01:00
e9b819e21e Merge branch 'mueller/master' of https://egit.irs.uni-stuttgart.de/fsfw/fsfw into mueller/master 2020-12-23 20:27:22 +01:00
159ad15b73 Merge branch 'development' into mueller/master 2020-12-23 20:27:14 +01:00
d7efa1b4d7 Merge branch 'development' into mueller/master 2020-12-23 20:19:34 +01:00
a00f3b9adc Merge remote-tracking branch 'upstream/development' into mueller/master 2020-12-23 20:19:23 +01:00
dcc111e4fa moved no comamnd and raw command to device handler IF 2020-12-23 20:17:10 +01:00
e94238762f Merge remote-tracking branch 'upstream/development' into development 2020-12-23 20:15:39 +01:00
ccbbef7778 Merge branch 'development' into mueller/master 2020-12-22 17:54:10 +01:00
bda9546f51 Merge branch 'development' into mueller/tmstorage 2020-12-22 17:35:26 +01:00
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
bc8c3da1b7 Merge branch 'development' into mueller/tmstorage 2020-12-22 17:30:27 +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
208ad7d479 fixed timeslot task doc 2020-12-22 16:24:52 +01:00
e55df691ff upstream subsystem taken over 2020-12-22 16:24:15 +01:00
f017e9c6d4 include guards 2020-12-22 16:22:11 +01:00