Commit Graph

6076 Commits

Author SHA1 Message Date
4bdac1e017 changed from mueller/master taken over 2020-09-04 14:49:59 +02:00
94b45d7407 changed taken over 2020-09-04 14:49:27 +02:00
381914886d initAfterTaskCreation added for linux 2020-09-04 14:43:53 +02:00
9d1f292af0 changed taken over 2020-09-04 14:32:32 +02:00
0eb4c3817e added initialize after taks creation for linux 2020-09-04 14:31:39 +02:00
6980245c98 added line break 2020-09-04 14:30:04 +02:00
31c16382fc took over changed for fixed slot sequence 2020-09-04 14:28:43 +02:00
4d7d48e8ca added a generic way to add a custom check 2020-09-04 14:24:34 +02:00
b8754fbc16 made fixed sequence slot doc generic 2020-09-04 14:11:59 +02:00
92c7369276 include guard fix 2020-09-04 13:56:12 +02:00
04532b8f6b renormalizing pull request step2 2020-09-04 13:52:54 +02:00
5eaf6cfd1f renormalizing pull request step1 2020-09-04 13:52:02 +02:00
7ad5274803 Merge remote-tracking branch 'upstream/master' into mueller/FixedTimeslotUpdate 2020-09-04 13:51:09 +02:00
403d83f32c removed commented out code 2020-09-03 13:01:14 +02:00
dbb394f761 new member to store last step 2020-09-03 00:22:16 +02:00
822a908353 separated steps, everything seems to work 2020-09-03 00:17:01 +02:00
e8fa9816ce doc improved 2020-09-02 23:45:14 +02:00
6069c64048 doc improved 2020-09-02 23:36:54 +02:00
631b2ca705 Merge branch 'mueller/master' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/master 2020-09-02 17:59:45 +02:00
ae9bc39bda some bugfixes and improvements 2020-09-02 17:59:26 +02:00
ab9f58438f Merge branch 'master' into mueller_tcPacketBase 2020-09-01 13:24:41 +02:00
4da21d2c38 Merge branch 'master' into mueller/ipc-updates 2020-09-01 13:12:39 +02:00
b3d08cd40b Merge pull request 'FIFO is StaticFIFO now, new FIFO using vector' (#127) from KSat/fsfw:mueller_FIFO_static_normal into master
Reviewed-on: fsfw/fsfw#127
2020-09-01 13:08:58 +02:00
d5accd16ba Merge branch 'mueller_FIFO_static_normal' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller_FIFO_static_normal 2020-09-01 12:58:38 +02:00
03b2ca679d include guard correction 2020-09-01 12:58:29 +02:00
33039f8c60 include guard correction 2020-09-01 12:57:56 +02:00
75f6cacd10 Merge branch 'master' into mueller_FIFO_static_normal 2020-09-01 12:56:41 +02:00
b32ea6e316 Merge pull request 'RingBuffer, static CTOR' (#132) from KSat/fsfw:mueller_ringBufferStatic into master
Reviewed-on: fsfw/fsfw#132
2020-09-01 12:56:23 +02:00
bec562ece0 FIFO updates 2020-09-01 12:54:33 +02:00
5308cb6237 Merge branch 'master' into mueller_ringBufferStatic 2020-09-01 12:54:08 +02:00
4f3869de8d Merge branch 'mueller_FIFO_static_normal' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller_FIFO_static_normal 2020-09-01 12:54:02 +02:00
b522b3c29c fifo updates 2020-09-01 12:53:53 +02:00
a634875b4b dynamic fifo update 2020-09-01 12:50:17 +02:00
7cf79c17a9 fifo update 2020-09-01 12:48:51 +02:00
f7f134ac20 corrections 2020-09-01 12:48:11 +02:00
02cfa8bcd5 Merge branch 'master' into mueller_FIFO_static_normal 2020-09-01 12:45:25 +02:00
96c421b72c Merge pull request 'parameter improvements' (#181) from KSat/fsfw:mueller/parameter-updates into master
Reviewed-on: fsfw/fsfw#181
2020-09-01 12:45:20 +02:00
f85e4eb22f Merge branch 'master' into mueller/parameter-updates 2020-09-01 12:44:14 +02:00
edde2ee58b offsetr update 2020-09-01 12:43:50 +02:00
66bc60f176 Merge branch 'mueller/parameter-updates' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/parameter-updates 2020-09-01 12:43:02 +02:00
695a4e7842 offset is size_t now 2020-09-01 12:42:52 +02:00
f068df9028 Merge pull request 'event manager improvements' (#180) from KSat/fsfw:mueller/eventmanager-improvements into master
Reviewed-on: fsfw/fsfw#180
2020-09-01 12:39:33 +02:00
636e5fb888 Merge branch 'master' into gaisser_fixes_fixedMap 2020-09-01 12:35:53 +02:00
77927363ce Merge branch 'master' into mueller/eventmanager-improvements 2020-09-01 12:29:16 +02:00
5d87650833 Merge branch 'master' into mueller/parameter-updates 2020-09-01 12:28:53 +02:00
e949637271 Merge branch 'master' into mueller_FIFO_static_normal 2020-09-01 12:24:41 +02:00
4a80872c3c Merge pull request 'DHB Update' (#144) from KSat/fsfw:mueller/feature/DHBupdate into master
Reviewed-on: fsfw/fsfw#144
2020-09-01 12:24:19 +02:00
a9e5b54238 Merge branch 'master' into mueller/feature/DHBupdate 2020-09-01 12:22:14 +02:00
e77c294360 Merge pull request 'fdir update' (#158) from KSat/fsfw:mueller/devices/FDIR into master
Reviewed-on: fsfw/fsfw#158
2020-09-01 12:21:48 +02:00
7059d5f158 Merge branch 'master' into mueller/devices/FDIR 2020-09-01 12:21:28 +02:00