eive/fsfw
eive
/
fsfw
forked from fsfw/fsfw
14
1
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity
592 Commits 28 Branches 1 Tag 24 MiB
Commit Graph

592 Commits

Author SHA1 Message Date
Robin Müller 84308c74d9 taken over some changes 2020-09-04 15:56:08 +02:00
Robin Müller d4d96a128e adapted doc 2020-09-04 15:47:08 +02:00
Robin Müller e83de82481 gathering remaining differences.. 2020-09-04 15:40:42 +02:00
Robin Müller 62eb327df6 health helper update 2020-09-04 15:19:33 +02:00
Robin Müller a3b80288e1 Merge remote-tracking branch 'upstream/master' into mueller/dledoc 2020-09-04 14:54:49 +02:00
Robin Müller 91d5277a94 added new returnvalues 2020-09-04 14:54:08 +02:00
Robin Müller 975fb9832b added interface ID 2020-09-04 14:52:17 +02:00
Robin Müller 4bdac1e017 changed from mueller/master taken over 2020-09-04 14:49:59 +02:00
Robin Müller 381914886d initAfterTaskCreation added for linux 2020-09-04 14:43:53 +02:00
Steffen Gaisser 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
Robin Müller 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
Robin Müller 03b2ca679d include guard correction 2020-09-01 12:58:29 +02:00
Steffen Gaisser 75f6cacd10 Merge branch 'master' into mueller_FIFO_static_normal 2020-09-01 12:56:41 +02:00
Steffen Gaisser 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
Steffen Gaisser 5308cb6237 Merge branch 'master' into mueller_ringBufferStatic 2020-09-01 12:54:08 +02:00
Robin Müller 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
Robin Müller b522b3c29c fifo updates 2020-09-01 12:53:53 +02:00
Robin Müller 02cfa8bcd5 Merge branch 'master' into mueller_FIFO_static_normal 2020-09-01 12:45:25 +02:00
Steffen Gaisser 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
Steffen Gaisser f85e4eb22f Merge branch 'master' into mueller/parameter-updates 2020-09-01 12:44:14 +02:00
Robin Müller 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
Robin Müller 695a4e7842 offset is size_t now 2020-09-01 12:42:52 +02:00
Steffen Gaisser 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
Steffen Gaisser 636e5fb888 Merge branch 'master' into gaisser_fixes_fixedMap 2020-09-01 12:35:53 +02:00
Steffen Gaisser 77927363ce Merge branch 'master' into mueller/eventmanager-improvements 2020-09-01 12:29:16 +02:00
Steffen Gaisser 5d87650833 Merge branch 'master' into mueller/parameter-updates 2020-09-01 12:28:53 +02:00
Steffen Gaisser e949637271 Merge branch 'master' into mueller_FIFO_static_normal 2020-09-01 12:24:41 +02:00
Steffen Gaisser 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
Steffen Gaisser a9e5b54238 Merge branch 'master' into mueller/feature/DHBupdate 2020-09-01 12:22:14 +02:00
Steffen Gaisser 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
Steffen Gaisser 7059d5f158 Merge branch 'master' into mueller/devices/FDIR 2020-09-01 12:21:28 +02:00
Robin Müller b07b19327c renormalize CHB 2020-09-01 11:52:18 +02:00
Robin Müller 4abdc436fb Revert "renormalize CHB" 
This reverts commit a4d9c761a7.
 2020-09-01 11:51:43 +02:00
Robin Müller d644a40e14 Merge branch 'mueller/feature/DHBupdate' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/feature/DHBupdate 2020-09-01 11:49:53 +02:00
Robin Müller a4d9c761a7 renormalize CHB 2020-09-01 11:49:43 +02:00
Steffen Gaisser cc5c944c84 Merge branch 'master' into gaisser_fixes_fixedMap 2020-09-01 11:41:03 +02:00
Robin Müller f645fe6607 Merge pull request 'Comments in serializeIF' (#174) from gaisser/fsfw:gaisser_comments_serialize into master 
Reviewed-on: fsfw/fsfw#174
 2020-09-01 11:37:21 +02:00
Steffen Gaisser c0ed474373 Update 'serialize/SerializeIF.h' 2020-09-01 11:34:28 +02:00
Steffen Gaisser f12c56c75f Merge branch 'master' into mueller/feature/DHBupdate 2020-09-01 11:20:21 +02:00
Robin Müller 7a5c70e753 typo fixes 2020-08-28 18:46:47 +02:00
Steffen Gaisser 478b88d7a2 Merge branch 'master' into gaisser_comments_serialize 2020-08-28 18:15:41 +02:00
Robin Müller b54d63edcb event manager improvements 2020-08-28 18:10:02 +02:00
Robin Müller aec557a8c0 updated unix udp bridge 2020-08-28 17:14:20 +02:00
Robin Müller 6c0defed5e Merge remote-tracking branch 'upstream/master' into mueller/feature/TmTcUnixBridge 2020-08-28 17:08:54 +02:00
Robin Müller 3ec7162832 Merge branch 'master' into mueller_FIFO_static_normal 2020-08-28 17:08:06 +02:00
Robin Müller b4978e7df3 Merge pull request 'Fixed a shadowing issue with moving a declaration to inner scope' (#163) from gaisser/fsfw:gaisser_small_bugfix_subsystem into master 
Reviewed-on: fsfw/fsfw#163
 2020-08-28 17:01:16 +02:00
Steffen Gaisser 2362b1d165 Merge branch 'master' into gaisser_small_bugfix_subsystem 2020-08-28 13:25:34 +02:00
Steffen Gaisser ce4d010b5c Merge pull request 'Semaphore Initialization - Linux and FreeRTOS' (#89) from KSat/fsfw:mueller_binSemaphoreInit into master 
Reviewed-on: fsfw/fsfw#89
 2020-08-28 13:25:05 +02:00
Robin Müller eb503ae030 include guard fix 2020-08-27 20:19:27 +02:00
Robin Müller 795b1e5245 Merge remote-tracking branch 'upstream/master' into mueller_FIFO_static_normal 2020-08-27 20:18:06 +02:00