|
|
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 |
|
|
|
df4fb17a45
|
Merge remote-tracking branch 'upstream/master' into mueller/feature/TmTcUnixBridge
|
2020-08-27 17:31:16 +02:00 |
|
|
|
0fedad6da0
|
semaphore factory update
|
2020-08-27 17:14:49 +02:00 |
|
|
|
3be253efd6
|
include fix
|
2020-08-27 17:07:42 +02:00 |
|
|
|
73db79a3fe
|
updated linux implementation
|
2020-08-27 17:06:10 +02:00 |
|
|
|
7723ee13b3
|
Merge remote-tracking branch 'upstream/master' into mueller_binSemaphoreInit
|
2020-08-27 16:28:50 +02:00 |
|
|
|
073f168b95
|
task management function taken over from master
|
2020-08-27 16:27:54 +02:00 |
|
|
|
aacda3afc2
|
interface adapted
|
2020-08-27 16:26:00 +02:00 |
|
|
|
64022212f9
|
removed is empty flag
|
2020-08-27 16:20:32 +02:00 |
|
|
|
4530b19548
|
header update
|
2020-08-27 16:13:36 +02:00 |
|
|
|
89d3fe5095
|
integrated change manually
|
2020-08-27 16:11:40 +02:00 |
|
|
|
66cf2d3559
|
timeslot update for FreeRTOS
|
2020-08-27 16:05:31 +02:00 |
|
|
|
02be87aa03
|
init after task creation moved to task functionality
|
2020-08-27 15:57:47 +02:00 |
|
|
|
76f145ddcf
|
Update 'globalfunctions/DleEncoder.cpp'
Just a missing char
|
2020-08-26 19:59:58 +02:00 |
|
|
|
281f13e27b
|
Update 'globalfunctions/DleEncoder.h'
Corrected some spelling mistakes
|
2020-08-26 19:58:18 +02:00 |
|
|
|
df850116ff
|
dle encoder doc added
|
2020-08-26 17:43:47 +02:00 |
|
|
|
a8f2cf910b
|
taken over dle encoder from upstream master
|
2020-08-26 17:43:20 +02:00 |
|
|
|
2748a8b93b
|
added doc to dle encoder
|
2020-08-26 17:42:13 +02:00 |
|
