Commit Graph

3447 Commits

Author SHA1 Message Date
968d7fad81 replaced some timeout values 2020-05-27 17:07:35 +02:00
66b75802b2 Merge branch 'mueller_framework' into front_branch 2020-05-27 12:58:17 +02:00
5b521e039b Merge branch 'mueller_fw_loc_globpool_distinction' into mueller_framework 2020-05-27 12:40:01 +02:00
9b5095e5b8 Merge branch 'mueller_framework' into front_branch 2020-05-27 12:28:43 +02:00
badcacad49 added new timeout values 2020-05-27 11:48:11 +02:00
f6ae0348cb some linux mutex tweaks 2020-05-27 11:41:36 +02:00
be4ac0bc8f added semaph factory to linux 2020-05-27 00:28:13 +02:00
ca74e0c0f2 removed comments 2020-05-26 16:07:32 +02:00
f7dd91891a removed comments 2020-05-26 16:05:03 +02:00
1a623a6a52 added override 2020-05-26 11:05:49 +02:00
a19fa231f5 comment improvements 2020-05-26 01:21:48 +02:00
9f2d5b64e0 comment improvements 2020-05-26 01:03:26 +02:00
a926312b25 Merge branch 'mueller_framework' into front_branch 2020-05-26 00:08:00 +02:00
242ca355f5 removed swappers for arraylist for now 2020-05-26 00:01:07 +02:00
8ddccfe3bd Merge branch 'mueller_framework' into front_branch 2020-05-25 23:54:39 +02:00
9951b59627 DHB retval fixes 2020-05-25 23:45:32 +02:00
3fd306356a fix for dh returnvalues 2020-05-25 23:43:44 +02:00
243ea9cd87 improved dhb IF returnvalues 2020-05-25 23:38:51 +02:00
dd5b301980 improved returnvalues 2020-05-25 23:38:11 +02:00
5de68fcc6e some returnvalue comments 2020-05-25 23:36:47 +02:00
eacda67f02 added some comments for returnvalues 2020-05-25 23:36:03 +02:00
112779d91f cleaned up returnvlaues 2020-05-25 23:31:13 +02:00
98449ddc7f comment removed 2020-05-25 23:17:15 +02:00
19b4332801 some little tweaks 2020-05-25 23:16:46 +02:00
18d19fbb2c < removed 2020-05-25 23:12:25 +02:00
a37f01cd0e improved readability of mode explanations 2020-05-25 23:11:56 +02:00
96462ba8dc Merge branch 'mueller_framework' into mueller_fw_loc_globpool_distinction 2020-05-25 22:29:33 +02:00
7a0cbfb2f5 Merge remote-tracking branch 'upstram/master' into mueller_framework 2020-05-25 22:21:13 +02:00
219d85d700 Merge remote-tracking branch 'upstram/master' into front_branch 2020-05-25 15:59:17 +02:00
d6af9da566 Merge remote-tracking branch 'upstram/master' into mueller_framework 2020-05-25 15:58:57 +02:00
35b9346c2b include improvements for clock, sif fixes 2020-05-25 15:25:17 +02:00
4f278b610d Merge remote-tracking branch 'upstram/master' into mueller_stopwatch 2020-05-25 15:08:47 +02:00
7eb250a90a include testing 2020-05-25 15:06:54 +02:00
cb14ec15b5 Merge pull request 'additional access function for mode message' (#70) from KSat/fsfw:mueller_ModeMessageAddition into master
Getter for Can't reach mode reason. Should have been there from the beginning.
2020-05-25 15:05:00 +02:00
50fd86edc1 removed shoulddo, issue will be created 2020-05-25 15:03:31 +02:00
9c4bf240b2 Merge remote-tracking branch 'upstram/master' into mueller_ModeMessageAddition 2020-05-25 15:00:22 +02:00
d235bb5c06 Merge pull request 'added comparison operator for store_address_t' (#77) from KSat/fsfw:mueller_store_address_compOperator into master
Adds a comparison operator for store_address_t. Small enhancement which should not break anything.
2020-05-25 14:54:29 +02:00
f6ec65d35d Merge remote-tracking branch 'upstram/master' into mueller_fw_loc_globpool_distinction 2020-05-25 14:49:22 +02:00
5e91363d2d Merge pull request 'fifo enhancement' (#57) from KSat/fsfw:mueller_fifo_enhancement into master
Implements #57
2020-05-25 14:48:29 +02:00
8eb13ec627 Merge branch 'mueller_framework' into mueller_fw_loc_globpool_distinction 2020-05-25 14:02:43 +02:00
723e715022 consistency fix 2020-05-25 14:01:35 +02:00
2f16b1e733 moved some files 2020-05-25 13:48:43 +02:00
d4abfacd27 found solution for circ dependency
had to put store_address_t in own file though
2020-05-22 01:15:02 +02:00
d2d1ef9a85 better include guards 2020-05-22 00:58:30 +02:00
aea18c423e Merge branch 'mueller_framework' into front_branch 2020-05-21 17:01:29 +02:00
91acc471b6 include guard fix, sif replacements 2020-05-20 14:47:58 +02:00
3a6b7f4895 added new cast for MQ 2020-05-20 14:42:52 +02:00
71e103e2b6 better include guards 2020-05-20 14:40:50 +02:00
e576ddaa86 Merge remote-tracking branch 'upstram/master' into mueller_localPoolNeat 2020-05-20 14:38:41 +02:00
f6b17d6e2e deleted copyctor and copy assignment 2020-05-20 12:50:56 +02:00