Commit Graph
100 Commits
Author SHA1 Message Date
muellerr 42dd641924 Merge remote-tracking branch 'upstream/development' into mueller/DHB-update 2020-12-08 15:34:51 +01:00
muellerr 913914ce93 Merge branch 'mueller/make-event-update' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/make-event-update 2020-12-08 14:58:34 +01:00
muellerr 6ee4ceeb65 deleted event.cpp source file 2020-12-08 14:58:24 +01:00
muellerr f0b13427e6 changelog update 2020-12-08 14:51:36 +01:00
muellerr 7d70cce4de namepsace fix 2020-12-08 14:45:43 +01:00
muellerr fdbe5408b7 renamed namespaces 2020-12-08 14:43:44 +01:00
muellerr 7e9702c140 Merge branch 'mueller/make-event-update' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/make-event-update 2020-12-08 14:20:08 +01:00
muellerr 2a025de321 changelog update 2020-12-08 14:19:53 +01:00
muellerr bb11bc5685 task if is set now 2020-12-05 17:11:34 +01:00
muellerr 8b74fcff38 Merge branch 'development' into mueller/unittest-fixes 2020-12-05 11:51:54 +01:00
muellerr cb73e507b5 Merge branch 'development' into mueller/make-event-update 2020-12-05 11:46:39 +01:00
muellerr 32eec9dfda Merge pull request 'OSAL MessageQueue Hotfix' (#297) from mueller/osal-mq-hotfix into development
Reviewed-on: fsfw/fsfw#297
2020-12-05 11:43:13 +01:00
muellerr c8f4bdd09a Merge branch 'development' into mueller/host-osal-atomic 2020-12-05 10:48:59 +01:00
muellerr 6766abc0fa changelog update 2020-12-05 10:41:37 +01:00
muellerr c0e9c22f34 hotfix for message queue 2020-12-05 10:40:53 +01:00
muellerr 983556b3b3 evil bug fixed 2020-12-05 01:21:04 +01:00
muellerr 9781105ad0 moved catch factory again 2020-12-03 14:50:28 +01:00
muellerr 03aacea4dd fixed unittest 2020-12-03 14:44:11 +01:00
muellerr 2deb7037b0 todo added 2020-12-02 01:07:40 +01:00
muellerr 558220643e small form improvements 2020-12-02 01:01:31 +01:00
muellerr 7b742a2e67 warning removed from osal 2020-12-02 01:00:07 +01:00
muellerr 8ad30d489a important bugfix for host osal 2020-12-02 00:58:13 +01:00
muellerr 73d3defe9f error output improved 2020-12-02 00:32:07 +01:00
muellerr f5c384de14 some bugfixes 2020-12-02 00:27:53 +01:00
muellerr 206d4b58b2 removed boolean var 2020-12-02 00:17:12 +01:00
muellerr a92f6c5d8e mutex bugfix for host 2020-12-02 00:05:54 +01:00
muellerr 37196c8e3b atomic fix 2020-12-01 23:47:11 +01:00
muellerr d3711e2dc2 Merge branch 'development' into mueller/make-event-update 2020-12-01 17:46:30 +01:00
muellerr 94b108e03d changelog update 2020-12-01 17:45:23 +01:00
muellerr 606aac687b make event api change 2020-12-01 17:44:36 +01:00
muellerr ede099bdc9 Merge branch 'development' into mueller/op-divider-update 2020-12-01 17:10:02 +01:00
muellerr 29e701d14d op divider additional features 2020-12-01 17:08:46 +01:00
muellerr 5eb2cbde0e some additional ionclude fixes 2020-12-01 17:08:03 +01:00
muellerr 51b9e0074b Revert "testcfg update"
This reverts commit 36b76fa07c.
2020-12-01 17:06:05 +01:00
muellerr 36b76fa07c testcfg update 2020-12-01 17:04:33 +01:00
muellerr a0689320d1 more include fixes 2020-12-01 16:55:24 +01:00
muellerr c741ef3945 using relative includes now 2020-12-01 16:50:02 +01:00
muellerr 8cddf8f509 more relative includes 2020-12-01 16:24:38 +01:00
muellerr 29eb720071 introducing relative includes 2020-12-01 16:22:59 +01:00
muellerr f0f7388c0d Merge pull request 'added 201 packet' (#284) from KSat/fsfw:mueller/service201-packets into development
Reviewed-on: fsfw/fsfw#284
2020-12-01 16:06:08 +01:00
muellerr b198a6c13c added packet 2020-12-01 16:04:40 +01:00
muellerr 07246b8974 Merge remote-tracking branch 'upstream/development' into mueller/DHB-update 2020-12-01 15:39:20 +01:00
muellerr ea83261881 Merge branch 'mueller/pus-improvements' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/pus-improvements 2020-12-01 15:26:14 +01:00
muellerr 0a016f391a changelog update 2020-12-01 15:26:06 +01:00
muellerr 0b94ed9612 Merge branch 'development' into mueller/pus-improvements 2020-12-01 15:23:50 +01:00
muellerr 6024c40334 Merge remote-tracking branch 'upstream/development' into mueller/DHB-update 2020-12-01 15:23:36 +01:00
muellerr c9bfc0bbfd change log update 2020-12-01 15:22:18 +01:00
muellerr e097f1b5d6 Merge branch 'development' into fsfwexample/small-tweaks 2020-12-01 15:12:35 +01:00
muellerr 70b4ca8753 Merge branch 'development' into fsfwexample/small-tweaks 2020-12-01 15:12:18 +01:00
muellerr 221bf7e228 Merge remote-tracking branch 'upstream/development' into mueller/pus-improvements 2020-12-01 15:10:55 +01:00
muellerr 0b32d3dac8 change log update 2020-12-01 15:10:23 +01:00
muellerr 506f5ff48b Merge branch 'mueller/pus-improvements' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/pus-improvements 2020-12-01 15:07:19 +01:00
muellerr a5b1fb0803 Merge remote-tracking branch 'upstream/development' into mueller/pus-improvements 2020-12-01 15:07:13 +01:00
muellerr e80d799865 Merge branch 'master' into mueller/pus-improvements 2020-12-01 15:06:36 +01:00
muellerr c72ba92247 health service update 2020-12-01 15:05:54 +01:00
muellerr 257e3e2db9 change log update 2020-12-01 15:03:49 +01:00
muellerr 1cb8532687 Merge branch 'development' into mueller/healthservice 2020-12-01 15:00:51 +01:00
muellerr 3e74c18d88 health servicd 2020-12-01 14:59:35 +01:00
muellerr fb217c266b Merge branch 'development' into mueller/DHB-update 2020-12-01 14:53:36 +01:00
muellerr 45df446ab8 change log update 2020-12-01 14:44:03 +01:00
muellerr 802e24e293 change log update 2020-12-01 14:43:36 +01:00
muellerr 2f8bc046ad Merge branch 'development' of https://egit.irs.uni-stuttgart.de/fsfw/fsfw into development 2020-12-01 14:36:09 +01:00
muellerr 30f4348bff Merge branch 'master' into mueller/DHB-update 2020-12-01 14:11:35 +01:00
muellerr b8cc1ccf7e Merge remote-tracking branch 'ksat/mueller/defaultcfg-update' into development 2020-12-01 13:49:30 +01:00
muellerr 98dae18430 update defaultcfg folder 2020-12-01 13:46:29 +01:00
muellerr 59619825ac Merge pull request 'Merge master into devel' (#271) from master into development
Reviewed-on: fsfw/fsfw#271
2020-12-01 13:21:04 +01:00
muellerr a2c28198ed Merge branch 'development' into master 2020-12-01 13:20:33 +01:00
muellerr 49479faa1a better solution 2020-11-30 12:37:22 +01:00
muellerr c182171b09 updated make file 2020-11-30 12:32:38 +01:00
muellerr 9cec8e4c0d Merge branch 'development' into fsfwexample/small-tweaks 2020-11-30 12:29:31 +01:00
muellerr 9bfba41875 Merge pull request 'Update devel' (#264) from master into development
Reviewed-on: fsfw/fsfw#264
2020-11-30 12:27:10 +01:00
muellerr eb08ef1c1f Merge remote-tracking branch 'upstream/development' into development 2020-11-24 13:46:56 +01:00
muellerr 767f105762 added changelog 2020-11-24 13:45:34 +01:00
muellerr 8c294729d0 extern c definition added 2020-11-22 12:34:16 +01:00
muellerr 1cc0847bb5 small bugfix 2020-11-21 00:15:31 +01:00
muellerr 6c22fab208 pus service improvements 2020-11-09 21:33:09 +01:00
muellerr 136f04a5c6 trnaslation files removed 2020-11-09 21:23:51 +01:00
muellerr 37fc22a117 config folder renamed and improved 2020-11-09 21:21:56 +01:00
muellerr 3cd0f8f5f0 Merge remote-tracking branch 'upstream/development' into development 2020-11-02 17:29:26 +01:00
muellerr edecb7882b Merge branch 'eive/include-fsfw' into development 2020-11-02 17:21:43 +01:00
muellerr cc51d9ace9 small fix so that it compiles 2020-11-02 17:21:25 +01:00
muellerr 3067259a9b include added 2020-11-02 17:19:24 +01:00
muellerr 7d83767c2b include added 2020-11-02 16:45:19 +01:00
muellerr 59c200254d Merge branch 'master' into development 2020-11-02 16:03:10 +01:00
muellerr 2f993cf39a some minor form stuff 2020-11-02 15:51:52 +01:00
muellerr 652dc00cc9 Merge branch 'master' into mueller/feature/windowsUdpBridge 2020-11-02 15:28:07 +01:00
muellerr a7e06c11fd Merge branch 'master' into fsfwtest/testcfg-fix 2020-11-02 15:12:44 +01:00
muellerr bcbc61ccba Merge branch 'master' into fsfwtest/testcfg-fix 2020-11-02 15:06:10 +01:00
muellerr 9221d0ca7c Merge branch 'master' into development 2020-11-02 15:04:25 +01:00
muellerr a7bc69b0ac health table update 2020-11-02 15:00:01 +01:00
muellerr 77fd2cb871 mission timestmap size is uint8 now 2020-11-02 14:53:44 +01:00
muellerr 963c333365 cast added 2020-11-02 14:45:10 +01:00
muellerr b441f5242f Merge remote-tracking branch 'upstream/master' into development 2020-11-02 14:23:51 +01:00
muellerr 508f31a359 adaptions so it compiles 2020-11-02 14:19:56 +01:00
muellerr 5d0f96c3a1 reamde update 2020-10-30 14:42:42 +01:00
muellerr 82a2f3ec61 testcfg fix 2020-10-30 14:21:31 +01:00
muellerr a5cf510ae9 host osal fixes 2020-10-30 13:31:07 +01:00
muellerr a0d4c77d94 Merge remote-tracking branch 'upstream/master' into mueller/returnvalue-convergence 2020-10-30 11:06:09 +01:00
muellerr 3098f34eb0 health update 2020-10-29 17:52:28 +01:00
muellerr e35aebcd0a HasREturnvalue update 2020-10-29 17:45:06 +01:00