Commit Graph

3598 Commits

Author SHA1 Message Date
8f1a54aa19
clarification 2021-07-14 10:27:33 +02:00
f427c87270 Merge pull request 'FreeRTOS OSAL update and minor tweaks' (#442) from mueller/freertos-updates-minor-tweaks into development
Reviewed-on: fsfw/fsfw#442
2021-07-13 14:18:02 +02:00
8189435b94 Merge branch 'master' into mueller/master 2021-07-13 08:59:40 +02:00
ff63a34384
include improvements 2021-07-12 23:32:24 +02:00
afebe15dc2
last replacement 2021-07-12 23:01:17 +02:00
8035af28b9
using include structure as used in kernel 2021-07-12 22:42:07 +02:00
c9156e1219
some cmake fixes for FreeRTOS 2021-07-12 22:34:59 +02:00
b00bfe4bda Merge pull request 'ASTP 1.1.0 Merge Development in Master' (#441) from development into master
Reviewed-on: fsfw/fsfw#441
2021-06-29 14:11:46 +02:00
2b2899e100 Merge pull request 'Missing function for TC Constructor' (#440) from KSat/fsfw:mueller/master into development
Reviewed-on: fsfw/fsfw#440
2021-06-22 14:36:05 +02:00
b52644dd2a
tiny form fix 2021-06-21 14:50:19 +02:00
c0c4a3190f
cleaned up some event descriptions 2021-06-21 12:46:32 +02:00
1015cdbe88 Merge remote-tracking branch 'upstream/development' into mueller/master 2021-06-20 17:16:35 +02:00
cae69d5400 Merge pull request 'added missing include' (#439) from mueller/missing-include into development
Reviewed-on: fsfw/fsfw#439
2021-06-17 12:35:20 +02:00
47af5260a2
added missing include 2021-06-17 12:04:39 +02:00
1e380fe562 Merge pull request 'NO_COMMANDER was not using NO_QUEUE in DHB' (#438) from gaisser/fsfw:gaisser_small_dhb_fix into development
Reviewed-on: fsfw/fsfw#438
2021-06-15 16:49:53 +02:00
bd7c13ff7e
NO_COMMANDER was not using NO_QUEUE in DHB 2021-06-15 16:47:24 +02:00
2684e82c7f Merge pull request 'PUS C support for Telecommands and first FSFW.h file' (#432) from KSat/fsfw:mueller/update-package into development
Reviewed-on: fsfw/fsfw#432
2021-06-15 16:37:40 +02:00
66d1d14ae3 Merge branch 'development' into mueller/update-package 2021-06-15 16:33:26 +02:00
5f9a6bb155 Merge pull request 'Removed wrong static' (#437) from gaisser/fsfw:gaisser_clock_leap_seconds_move into development
Reviewed-on: fsfw/fsfw#437
2021-06-15 16:13:55 +02:00
8a5a3c0243 Merge branch 'development' into gaisser_clock_leap_seconds_move 2021-06-15 16:13:35 +02:00
2ccc0dbb00
Removed wrong static 2021-06-15 16:12:25 +02:00
cfbdb10a55 Merge pull request 'Moved leap second handling from OSALs to clock.h' (#436) from gaisser/fsfw:gaisser_clock_leap_seconds_move into development
Reviewed-on: fsfw/fsfw#436
2021-06-15 16:09:53 +02:00
ee89a2f00d
Removed author tag 2021-06-15 16:05:12 +02:00
dbfcf8b271 Removed old check 2021-06-15 16:03:11 +02:00
717971f69c
Fixed wrong namespace qualifier 2021-06-15 16:01:28 +02:00
b0a69d4c9d Merge remote-tracking branch 'my_fork/gaisser_clock_leap_seconds_move' into gaisser_clock_leap_seconds_move 2021-06-15 16:00:23 +02:00
ecb03b8a6d
Moved Code to own cpp 2021-06-15 15:59:20 +02:00
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