Commit Graph

3559 Commits

Author SHA1 Message Date
Steffen Gaisser 2ccc0dbb00
Removed wrong static 2021-06-15 16:12:25 +02:00
Steffen Gaisser ee89a2f00d
Removed author tag 2021-06-15 16:05:12 +02:00
Steffen Gaisser dbfcf8b271 Removed old check 2021-06-15 16:03:11 +02:00
Steffen Gaisser 717971f69c
Fixed wrong namespace qualifier 2021-06-15 16:01:28 +02:00
Steffen 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
Steffen Gaisser ecb03b8a6d
Moved Code to own cpp 2021-06-15 15:59:20 +02:00
Steffen Gaisser b1f6252e30 Merge branch 'development' into gaisser_clock_leap_seconds_move 2021-06-15 15:53:16 +02:00
Robin Müller 05edb7a00c Merge pull request 'Added some precautions in DHB::replyToReply' (#435) from gaisser/fsfw:gaisser_overflow_avoid_dhb into development
Reviewed-on: #435
2021-06-15 15:53:05 +02:00
Steffen Gaisser 0cde65f5a1
Added some precautions in DHB::replyToReply 2021-06-15 15:33:52 +02:00
Steffen Gaisser fbbc640f4d Merge pull request 'DHB tweak and class ID for GPIO HAL' (#434) from eive/fsfw:mueller/dhb-tweak into development
Reviewed-on: #434
2021-06-15 15:23:23 +02:00
Robin Müller 03e1a3e945
const correctness 2021-06-15 15:08:18 +02:00
Robin Müller cc5c8ca698
type 2021-06-15 15:04:40 +02:00
Robin Müller 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
Robin Müller 1c7c532ef6
DHB update 2021-06-15 15:01:02 +02:00
Robin Müller 41e3a6b54b Merge branch 'development' into mueller/dhb-tweak 2021-06-15 14:56:19 +02:00
Robin Müller aa1bfcbb96
DHB update 2021-06-15 14:52:56 +02:00
Steffen Gaisser 398250c959 Merge pull request 'added generic file system message' (#428) from KSat/fsfw:mueller/generic-filesyste-message into development
Reviewed-on: #428
2021-06-15 14:08:24 +02:00
Robin Müller 4b248740f3
added HAL gpio class ID 2021-06-15 13:32:11 +02:00
Steffen Gaisser 21d213f35f Merge branch 'development' into gaisser_clock_leap_seconds_move 2021-06-14 15:27:37 +02:00
Steffen Gaisser 3076c423c0 Merge branch 'development' into mueller/generic-filesyste-message 2021-06-14 15:14:37 +02:00
Robin Müller af99303eac
indentation 2021-06-14 15:05:40 +02:00
Steffen Gaisser eead2a8a49
Moved leap second management 2021-06-14 14:40:40 +02:00
Robin Müller 99b007f37e
added deletions 2021-06-14 14:37:38 +02:00
Jakob Meier a993872884 Merge pull request 'EIVE FSFW Update' (#430) from eive/fsfw:eive/develop into development
Reviewed-on: #430
2021-06-12 15:44:31 +02:00
Robin Müller d700fb551c Merge remote-tracking branch 'upstream/development' into eive/develop 2021-06-12 15:24:08 +02:00
Robin Müller 73bae057bd
default color is magneta now for wanring 2021-06-12 15:03:18 +02:00
Robin Müller 589e64fc46
void function now 2021-06-11 15:05:43 +02:00
Robin Müller 1630682548
added function to set color 2021-06-11 14:52:09 +02:00
Robin Müller 4b095eea89 Merge remote-tracking branch 'upstream/mueller/master' into mueller/master 2021-06-08 15:37:13 +02:00
Robin Müller fb7b059137
added clear message 2021-06-08 15:13:49 +02:00
Robin Müller bc151983b5 Merge branch 'development' into mueller/generic-filesyste-message 2021-06-08 15:05:41 +02:00
Robin Müller 40b2979ce8
added generic file system message 2021-06-08 15:03:17 +02:00
Steffen Gaisser 7030d3e108 Merge pull request 'Make Object Manager a Singleton and Refactored Linux Error Printing' (#424) from KSat/fsfw:mueller/master into development
Reviewed-on: #424
2021-06-08 15:01:00 +02:00
Robin Müller 41cb8cb8ae
Merge remote-tracking branch 'upstream/development' into mueller/master 2021-06-08 14:43:31 +02:00
Robin Müller 75adf52d28
small update 2021-06-08 14:30:35 +02:00
Robin Müller 0157681471
removed obsolete code 2021-06-08 14:27:21 +02:00
Steffen Gaisser b6b144bcdb Merge pull request 'FreeRTOS Queue Map Manager' (#423) from KSat/fsfw:mueller/freertos-queue-map-manager into development
Reviewed-on: #423
2021-06-08 14:03:45 +02:00
Robin Müller 145dd33fb1
fixed merge conflict 2021-06-05 20:30:36 +02:00
Robin Müller 50fac22f54 Merge remote-tracking branch 'ksat/mueller/master' into mueller/master 2021-06-05 20:10:17 +02:00
Robin Müller 8b83541264
Merge branch 'mueller/master' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/master 2021-06-05 19:59:51 +02:00
Robin Müller 57699cccb7
object manager is now a singleton 2021-06-05 19:52:38 +02:00
Robin Müller 33e7c635c5
added hal class ids 2021-06-05 00:05:03 +02:00
Robin Müller 070c3f3bbf
added example usage 2021-06-04 14:39:21 +02:00
Robin Müller 3891014340
linux error print handling improved 2021-06-03 12:29:06 +02:00
Robin Müller c3be4cdee6 Merge remote-tracking branch 'upstream/mueller/master' into mueller/master 2021-05-31 17:06:07 +02:00
Robin Müller 6b9747ee0b Merge remote-tracking branch 'upstream/mueller/master' into mueller/master 2021-05-31 17:03:55 +02:00
Robin Müller ad820fbe99
important bugfix 2021-05-31 17:00:51 +02:00
Robin Müller 722a7b3240
renamed variable 2021-05-31 16:46:32 +02:00
Robin Müller 442b9370ae Merge remote-tracking branch 'upstream/mueller/master' into source/develop 2021-05-31 12:31:46 +02:00
Robin Müller 54e60f4ddc
cleaned up a bit 2021-05-31 12:30:54 +02:00