Commit Graph

3677 Commits

Author SHA1 Message Date
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
50fac22f54 Merge remote-tracking branch 'ksat/mueller/master' into mueller/master 2021-06-05 20:10:17 +02:00
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
57699cccb7
object manager is now a singleton 2021-06-05 19:52:38 +02:00
33e7c635c5
added hal class ids 2021-06-05 00:05:03 +02:00
070c3f3bbf
added example usage 2021-06-04 14:39:21 +02:00
3891014340
linux error print handling improved 2021-06-03 12:29:06 +02:00
c3be4cdee6 Merge remote-tracking branch 'upstream/mueller/master' into mueller/master 2021-05-31 17:06:07 +02:00
6b9747ee0b Merge remote-tracking branch 'upstream/mueller/master' into mueller/master 2021-05-31 17:03:55 +02:00
ad820fbe99
important bugfix 2021-05-31 17:00:51 +02:00
722a7b3240
renamed variable 2021-05-31 16:46:32 +02:00
442b9370ae Merge remote-tracking branch 'upstream/mueller/master' into source/develop 2021-05-31 12:31:46 +02:00
54e60f4ddc
cleaned up a bit 2021-05-31 12:30:54 +02:00
e961f3f038
better error handling for mq_receive() 2021-05-31 12:22:33 +02:00
c9836abf03
minor tweak 2021-05-31 11:36:32 +02:00
404c3821e6
corrected include 2021-05-31 11:12:52 +02:00
567699954c
added missing event translation 2021-05-28 18:30:43 +02:00
43d4953e4a Merge remote-tracking branch 'ksat/mueller/master' into mueller/master 2021-05-27 14:10:12 +02:00
e6059812b5 Merge remote-tracking branch 'upstream/development' into mueller/master 2021-05-27 14:00:03 +02:00
f0a7b1cad2
indentation 2021-05-27 13:47:22 +02:00
e46615e830 Merge branch 'mueller/freertos-queue-map-manager' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/freertos-queue-map-manager 2021-05-27 13:46:14 +02:00
e7ac2c7009
maybe this works 2021-05-27 13:46:04 +02:00
95c6a24437 Merge branch 'development' into mueller/freertos-queue-map-manager 2021-05-27 13:44:35 +02:00
237ba8112b
more unrelated changes removed 2021-05-27 13:43:48 +02:00
aab3fd828b
removed unrelated changes 2021-05-27 13:43:13 +02:00
46cfe7452a
for for ISR variant 2021-05-27 13:40:01 +02:00
e6868464bf
queue map manager working 2021-05-27 13:38:40 +02:00
e15f03fb0a
added FreeRTOS queue map manager 2021-05-27 13:12:34 +02:00
59e7f0caae
added more messages 2021-05-27 12:50:48 +02:00
a2deac3441 Merge branch 'mueller/master' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/master 2021-05-27 12:47:14 +02:00
5eadcaf10d
file system message update 2021-05-27 12:46:45 +02:00
2bf5a972e1
introduced std check 2021-05-27 11:56:52 +02:00
5d2c62e75d
abstract function defined again 2021-05-26 14:15:48 +02:00
5ac68f731e Merge pull request 'Doc Update + PUS IDs' (#422) from mueller/another-update-package into development
Reviewed-on: fsfw/fsfw#422
2021-05-25 14:49:10 +02:00
7fa0443725 Merge branch 'development' into mueller/another-update-package 2021-05-25 14:48:58 +02:00
f4cb63c53c Merge pull request 'TCP Server Update' (#421) from KSat/fsfw:mueller/tcp-server into development
Reviewed-on: fsfw/fsfw#421
2021-05-25 14:13:49 +02:00
0cde6f317d Merge branch 'development' into mueller/tcp-server 2021-05-25 14:10:46 +02:00
2737bc390c Merge pull request 'Update Package' (#420) from KSat/fsfw:mueller/update-package into development
Reviewed-on: fsfw/fsfw#420
2021-05-25 14:10:33 +02:00
07ba05b209 Merge remote-tracking branch 'upstream/mueller/master' into mueller/master 2021-05-25 14:06:18 +02:00
f3d9fb645e Merge remote-tracking branch 'ksat/mueller/master' into mueller/master 2021-05-25 14:05:59 +02:00
e9adaf672f Merge branch 'mueller/master' into eive/develop 2021-05-18 16:18:47 +02:00
fc4e65b2fc Merge remote-tracking branch 'ksat/mueller/master' into mueller/master 2021-05-18 15:55:31 +02:00
36030ef87c
typo 2021-05-18 15:37:05 +02:00
b7060a9c78
update README 2021-05-18 15:35:47 +02:00
e147d5a4f5
some more information 2021-05-18 15:34:31 +02:00