eive/fsfw
15
1
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests Releases 1 Wiki Activity
3,615 Commits 28 Branches 1 Tag
a6d744c9c8df4e2cd69c170a4bd6806f54b835f9
Commit Graph

3615 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
muellerr a6d744c9c8 Possible bugfix in DHB 
The delayCycles variables needs to be initialized differently
for periodic replies.
It is initialized to the maxDelayCycles value now
 2021-09-06 12:08:54 +02:00
muellerr 2d667cfb95 Merge pull request 'Colored prefix option only if colored output is enabled' (#449) from meier/ColeredDebugOutput into development 
Reviewed-on: fsfw/fsfw#449
 2021-07-27 13:07:16 +02:00
Jakob.Meier 3d80d5d036 added proposed changes 2021-07-27 12:59:21 +02:00
Jakob.Meier ebc9d99022 Merge branch 'meier/ColeredDebugOutput' of https://egit.irs.uni-stuttgart.de/fsfw/fsfw into meier/ColeredDebugOutput 2021-07-27 10:10:25 +02:00
Jakob.Meier 2489276350 removed double include 2021-07-27 10:05:56 +02:00
muellerr 3895806a2b Merge branch 'development' into meier/ColeredDebugOutput 2021-07-27 10:03:35 +02:00
gaisser 7b500eb0ed Merge pull request 'EventManager printout fixes and tweaks' (#447) from KSat/fsfw:mueller/event-manager-tweaks-printf-fix into development 
Reviewed-on: fsfw/fsfw#447
 2021-07-26 15:25:54 +02:00
Jakob.Meier a918c672a5 fixed merge conflicts 2021-07-24 07:15:24 +02:00
muellerr 1515d59432 EventManager fixes and tweaks 
1. Using sif::info consistently now
2. Fix for printf support: Event translation is printed now as well
 2021-07-21 09:45:36 +02:00
mohr ac146339a2 Merge pull request 'QueueMapManager bugfix' (#444) from mueller/queuemapmanager-bugfix into development 
Reviewed-on: fsfw/fsfw#444
 2021-07-19 15:04:10 +02:00
muellerr baf3d4da47 better form 2021-07-19 14:57:10 +02:00
muellerr e93230d0ef update init value 2021-07-19 14:47:33 +02:00
muellerr 0b45e5c89a fix 2021-07-19 14:40:32 +02:00
muellerr df1d5e5005 this is the correct implementation 2021-07-14 10:35:37 +02:00
muellerr 5f0a3f3baa using current ID 2021-07-14 10:34:38 +02:00
muellerr f6d1b8981c additional safety by check against NO_QUEUE 2021-07-14 10:33:55 +02:00
muellerr 8f1a54aa19 clarification 2021-07-14 10:27:33 +02:00
gaisser 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
muellerr 8189435b94 Merge branch 'master' into mueller/master 2021-07-13 08:59:40 +02:00
muellerr ff63a34384 include improvements 2021-07-12 23:32:24 +02:00
muellerr afebe15dc2 last replacement 2021-07-12 23:01:17 +02:00
muellerr 8035af28b9 using include structure as used in kernel 2021-07-12 22:42:07 +02:00
muellerr c9156e1219 some cmake fixes for FreeRTOS 2021-07-12 22:34:59 +02:00
Jakob.Meier 5e960f118f renamed freertos includes 2021-07-06 18:17:24 +02:00
gaisser 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
gaisser 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
muellerr b52644dd2a tiny form fix 2021-06-21 14:50:19 +02:00
muellerr c0c4a3190f cleaned up some event descriptions 2021-06-21 12:46:32 +02:00
muellerr 1015cdbe88 Merge remote-tracking branch 'upstream/development' into mueller/master 2021-06-20 17:16:35 +02:00
gaisser 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
muellerr 47af5260a2 added missing include 2021-06-17 12:04:39 +02:00
muellerr 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
gaisser bd7c13ff7e NO_COMMANDER was not using NO_QUEUE in DHB 2021-06-15 16:47:24 +02:00
gaisser 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
gaisser 66d1d14ae3 Merge branch 'development' into mueller/update-package 2021-06-15 16:33:26 +02:00
gaisser 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
gaisser 8a5a3c0243 Merge branch 'development' into gaisser_clock_leap_seconds_move 2021-06-15 16:13:35 +02:00
gaisser 2ccc0dbb00 Removed wrong static 2021-06-15 16:12:25 +02:00
muellerr 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
gaisser ee89a2f00d Removed author tag 2021-06-15 16:05:12 +02:00
gaisser dbfcf8b271 Removed old check 2021-06-15 16:03:11 +02:00
gaisser 717971f69c Fixed wrong namespace qualifier 2021-06-15 16:01:28 +02:00
gaisser 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
gaisser ecb03b8a6d Moved Code to own cpp 2021-06-15 15:59:20 +02:00
gaisser b1f6252e30 Merge branch 'development' into gaisser_clock_leap_seconds_move 2021-06-15 15:53:16 +02:00
muellerr 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
gaisser 0cde65f5a1 Added some precautions in DHB::replyToReply 2021-06-15 15:33:52 +02:00
gaisser 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
muellerr 03e1a3e945 const correctness 2021-06-15 15:08:18 +02:00
muellerr cc5c8ca698 type 2021-06-15 15:04:40 +02:00