Commit Graph

520 Commits

Author SHA1 Message Date
Robin Müller b4ca42f1fb ccsds time update 2020-09-15 15:28:05 +02:00
Robin Müller f7223abaa3 added define necessary for minGW 2020-09-05 21:20:10 +02:00
Robin Müller 902cd4d210 host osal update 2020-09-05 21:19:53 +02:00
Robin Müller a1155686c5 updated host osal 2020-09-05 20:18:52 +02:00
Robin Müller c6dbce7446 Merge remote-tracking branch 'upstream/master' into mueller/hostosal 2020-09-05 20:18:18 +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: #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: #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: #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: #180
2020-09-01 12:39:33 +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: #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: #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
Robin Müller f645fe6607 Merge pull request 'Comments in serializeIF' (#174) from gaisser/fsfw:gaisser_comments_serialize into master
Reviewed-on: #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 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: #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: #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
Robin Müller 54112acf62 chb update 2020-08-27 20:11:36 +02:00
Robin Müller c4c607776c important fix, 0 init removed 2020-08-27 20:07:03 +02:00
Robin Müller 8f2d5a5528 DH fdir improvements 2020-08-27 19:58:35 +02:00
Robin Müller 2a74c8d150 Merge remote-tracking branch 'upstream/master' into mueller/devices/FDIR 2020-08-27 19:55:22 +02:00
Robin Müller dfe3658a85 removed hk stuff 2020-08-27 19:52:25 +02:00
Robin Müller 386b153ede Merge remote-tracking branch 'upstream/master' into mueller/feature/DHBupdate 2020-08-27 19:50:02 +02:00
Robin Müller 0fedad6da0 semaphore factory update 2020-08-27 17:14:49 +02:00
Robin Müller 3be253efd6 include fix 2020-08-27 17:07:42 +02:00