|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
b07b19327c
|
renormalize CHB
|
2020-09-01 11:52:18 +02:00 |
|
|
|
4abdc436fb
|
Revert "renormalize CHB"
This reverts commit a4d9c761a7.
|
2020-09-01 11:51:43 +02:00 |
|
|
|
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 |
|
|
|
a4d9c761a7
|
renormalize CHB
|
2020-09-01 11:49:43 +02:00 |
|
|
|
cc5c944c84
|
Merge branch 'master' into gaisser_fixes_fixedMap
|
2020-09-01 11:41:03 +02:00 |
|
|
|
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 |
|
|
|
c0ed474373
|
Update 'serialize/SerializeIF.h'
|
2020-09-01 11:34:28 +02:00 |
|
|
|
f12c56c75f
|
Merge branch 'master' into mueller/feature/DHBupdate
|
2020-09-01 11:20:21 +02:00 |
|
|
|
7a5c70e753
|
typo fixes
|
2020-08-28 18:46:47 +02:00 |
|
|
|
478b88d7a2
|
Merge branch 'master' into gaisser_comments_serialize
|
2020-08-28 18:15:41 +02:00 |
|
|
|
b54d63edcb
|
event manager improvements
|
2020-08-28 18:10:02 +02:00 |
|
|
|
aec557a8c0
|
updated unix udp bridge
|
2020-08-28 17:14:20 +02:00 |
|
|
|
6c0defed5e
|
Merge remote-tracking branch 'upstream/master' into mueller/feature/TmTcUnixBridge
|
2020-08-28 17:08:54 +02:00 |
|
|
|
3ec7162832
|
Merge branch 'master' into mueller_FIFO_static_normal
|
2020-08-28 17:08:06 +02:00 |
|
|
|
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 |
|
|
|
543e2f7d5d
|
Merge remote-tracking branch 'upstream/master' into mueller/SimpleRingBufferUpdate2
|
2020-08-28 13:31:23 +02:00 |
|
|
|
053f75968b
|
Merge remote-tracking branch 'upstream/master' into mueller/SimpleRingBufferUpdate2
|
2020-08-28 13:30:44 +02:00 |
|
|
|
b87a8ba086
|
Merge remote-tracking branch 'upstream/master' into mueller/sharedRingBufferPullRequest
|
2020-08-28 13:28:13 +02:00 |
|
|
|
2362b1d165
|
Merge branch 'master' into gaisser_small_bugfix_subsystem
|
2020-08-28 13:25:34 +02:00 |
|
|
|
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 |
|
|
|
eb503ae030
|
include guard fix
|
2020-08-27 20:19:27 +02:00 |
|
|
|
795b1e5245
|
Merge remote-tracking branch 'upstream/master' into mueller_FIFO_static_normal
|
2020-08-27 20:18:06 +02:00 |
|
|
|
54112acf62
|
chb update
|
2020-08-27 20:11:36 +02:00 |
|
|
|
c4c607776c
|
important fix, 0 init removed
|
2020-08-27 20:07:03 +02:00 |
|
|
|
8f2d5a5528
|
DH fdir improvements
|
2020-08-27 19:58:35 +02:00 |
|
|
|
2a74c8d150
|
Merge remote-tracking branch 'upstream/master' into mueller/devices/FDIR
|
2020-08-27 19:55:22 +02:00 |
|
|
|
dfe3658a85
|
removed hk stuff
|
2020-08-27 19:52:25 +02:00 |
|
|
|
386b153ede
|
Merge remote-tracking branch 'upstream/master' into mueller/feature/DHBupdate
|
2020-08-27 19:50:02 +02:00 |
|
