Commit Graph

3821 Commits

Author SHA1 Message Date
b1f6252e30 Merge branch 'development' into gaisser_clock_leap_seconds_move 2021-06-15 15:53:16 +02:00
05edb7a00c Merge pull request 'Added some precautions in DHB::replyToReply' (#435) from gaisser/fsfw:gaisser_overflow_avoid_dhb into development
Reviewed-on: fsfw/fsfw#435
2021-06-15 15:53:05 +02:00
0cde65f5a1
Added some precautions in DHB::replyToReply 2021-06-15 15:33:52 +02:00
fbbc640f4d Merge pull request 'DHB tweak and class ID for GPIO HAL' (#434) from eive/fsfw:mueller/dhb-tweak into development
Reviewed-on: fsfw/fsfw#434
2021-06-15 15:23:23 +02:00
03e1a3e945
const correctness 2021-06-15 15:08:18 +02:00
cc5c8ca698
type 2021-06-15 15:04:40 +02:00
996fbf134e Merge branch 'mueller/dhb-tweak' of https://egit.irs.uni-stuttgart.de/eive/fsfw into mueller/dhb-tweak 2021-06-15 15:01:09 +02:00
1c7c532ef6
DHB update 2021-06-15 15:01:02 +02:00
41e3a6b54b Merge branch 'development' into mueller/dhb-tweak 2021-06-15 14:56:19 +02:00
aa1bfcbb96
DHB update 2021-06-15 14:52:56 +02:00
0f484abcaa Merge branch 'mueller/update-package' into mueller/master 2021-06-15 14:22:03 +02:00
c371cf4851
changelog update 2021-06-15 14:21:46 +02:00
ad191409f4
Merge remote-tracking branch 'upstream/development' into mueller/update-package 2021-06-15 14:20:03 +02:00
398250c959 Merge pull request 'added generic file system message' (#428) from KSat/fsfw:mueller/generic-filesyste-message into development
Reviewed-on: fsfw/fsfw#428
2021-06-15 14:08:24 +02:00
4b248740f3
added HAL gpio class ID 2021-06-15 13:32:11 +02:00
21d213f35f Merge branch 'development' into gaisser_clock_leap_seconds_move 2021-06-14 15:27:37 +02:00
105a498b93
added way to set source ID 2021-06-14 15:24:26 +02:00
0a0c5592f3 Merge branch 'mueller/update-package' into mueller/master 2021-06-14 15:15:23 +02:00
aa33ff2f48
max tm packet size now configurable 2021-06-14 15:14:57 +02:00
3076c423c0 Merge branch 'development' into mueller/generic-filesyste-message 2021-06-14 15:14:37 +02:00
5f27fe6392
indentation 2021-06-14 15:06:26 +02:00
af99303eac
indentation 2021-06-14 15:05:40 +02:00
1d2dabb4b4 Merge remote-tracking branch 'upstream/development' into mueller/update-package 2021-06-14 14:52:52 +02:00
eead2a8a49
Moved leap second management 2021-06-14 14:40:40 +02:00
a7068acca7
updated generic file system message 2021-06-14 14:38:09 +02:00
99b007f37e
added deletions 2021-06-14 14:37:38 +02:00
7cf4aa0d5a
fixes for pus tc c 2021-06-14 11:44:39 +02:00
b1e3a1b2b5
const correctness 2021-06-14 11:16:56 +02:00
56d2af9d25
cleaned up a bit 2021-06-14 10:19:01 +02:00
dadba69272
Merge branch 'mueller/fsfw-pus-c-tc' into mueller/master 2021-06-13 18:00:13 +02:00
40a8c9a495
srv 20 fixes 2021-06-13 17:58:44 +02:00
8dc66784a8
tiny changes 2021-06-13 16:59:28 +02:00
d0f37b851b
added pus c support for tc 2021-06-13 16:29:13 +02:00
1b6759020a
added getter function 2021-06-13 12:38:24 +02:00
537a30a4de
added pus a tc 2021-06-13 12:34:06 +02:00
a993872884 Merge pull request 'EIVE FSFW Update' (#430) from eive/fsfw:eive/develop into development
Reviewed-on: fsfw/fsfw#430
2021-06-12 15:44:31 +02:00
d700fb551c Merge remote-tracking branch 'upstream/development' into eive/develop 2021-06-12 15:24:08 +02:00
73bae057bd
default color is magneta now for wanring 2021-06-12 15:03:18 +02:00
589e64fc46
void function now 2021-06-11 15:05:43 +02:00
1630682548
added function to set color 2021-06-11 14:52:09 +02:00
4b095eea89 Merge remote-tracking branch 'upstream/mueller/master' into mueller/master 2021-06-08 15:37:13 +02:00
fb7b059137
added clear message 2021-06-08 15:13:49 +02:00
bc151983b5 Merge branch 'development' into mueller/generic-filesyste-message 2021-06-08 15:05:41 +02:00
40b2979ce8
added generic file system message 2021-06-08 15:03:17 +02:00
7030d3e108 Merge pull request 'Make Object Manager a Singleton and Refactored Linux Error Printing' (#424) from KSat/fsfw:mueller/master into development
Reviewed-on: fsfw/fsfw#424
2021-06-08 15:01:00 +02:00
41cb8cb8ae
Merge remote-tracking branch 'upstream/development' into mueller/master 2021-06-08 14:43:31 +02:00
75adf52d28
small update 2021-06-08 14:30:35 +02:00
0157681471
removed obsolete code 2021-06-08 14:27:21 +02:00
b6b144bcdb Merge pull request 'FreeRTOS Queue Map Manager' (#423) from KSat/fsfw:mueller/freertos-queue-map-manager into development
Reviewed-on: fsfw/fsfw#423
2021-06-08 14:03:45 +02:00
145dd33fb1
fixed merge conflict 2021-06-05 20:30:36 +02:00