Commit Graph

3101 Commits

Author SHA1 Message Date
gaisser 7f7c4aea84 Merge pull request 'removed glob pool' (#300) from KSat/fsfw:mueller/removed-glob-pool into development
Reviewed-on: fsfw/fsfw#300
2020-12-15 14:29:49 +01:00
gaisser 6deb0b565e Merge branch 'development' into mueller/removed-glob-pool 2020-12-15 14:28:54 +01:00
gaisser b9f50e8e42 Merge branch 'development' into mueller/rmap-convergence 2020-12-15 14:08:51 +01:00
muellerr 9986203eff Merge branch 'mueller/FreeRTOS' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/FreeRTOS 2020-12-14 23:56:57 +01:00
muellerr 3cc053a581 changes from mueller/master taken over 2020-12-14 23:56:44 +01:00
muellerr 0c3e87f1de using new xTaskDelayUntil 2020-12-14 23:55:54 +01:00
muellerr b8f4d8690b determination of freeRTOS features from version 2020-12-14 23:38:06 +01:00
muellerr 9170f466e8 freeRTOS version checks 2020-12-14 23:21:07 +01:00
muellerr 93842bb913 using long name now 2020-12-14 22:56:30 +01:00
muellerr 95b2191824 long name 2020-12-14 22:55:12 +01:00
muellerr b232a8a291 Merge remote-tracking branch 'upstream/development' into development 2020-12-14 21:57:42 +01:00
muellerr 3ee25785a2 linux changes adapted 2020-12-14 21:54:03 +01:00
muellerr 7f93c4a6aa Merge branch 'development' into mueller/FreeRTOS 2020-12-14 21:51:19 +01:00
muellerr efb4f0efbb Merge branch 'development' into mueller/type 2020-12-14 21:51:05 +01:00
muellerr 4f2470b93f task factory 2020-12-14 21:48:12 +01:00
muellerr f2ba653833 ipc changes taken over 2020-12-14 21:47:42 +01:00
muellerr 336b43572f linux update 2020-12-14 21:46:33 +01:00
muellerr db42e79fd4 taken over cmakelists file 2020-12-14 21:38:45 +01:00
muellerr 1c79da0e75 tc distrib changed taken over 2020-12-14 21:34:29 +01:00
muellerr 796f0e2e17 important changes adapted 2020-12-14 21:33:19 +01:00
muellerr 8c88255873 taken over some tweaks 2020-12-14 21:31:50 +01:00
muellerr 25db9bc9ed tmtcservices update 2020-12-14 21:30:39 +01:00
muellerr d2f631a955 cast added 2020-12-14 21:20:21 +01:00
muellerr f604d621e8 removed interrupt class 2020-12-14 21:19:12 +01:00
muellerr 6911f91744 rtems fixes taken over 2020-12-14 21:15:41 +01:00
muellerr 55a663beb2 unittest update 2020-12-14 21:14:38 +01:00
muellerr c1a156dde3 catch factory in objects folder again 2020-12-14 21:08:35 +01:00
muellerr 050770c184 catch factory fixes 2020-12-14 21:07:58 +01:00
muellerr a3ebad46e7 small fix 2020-12-14 21:00:15 +01:00
muellerr d96d3d6c46 one define now 2020-12-14 20:58:47 +01:00
muellerr 14a0573f3d one define now 2020-12-14 20:58:20 +01:00
muellerr b14c1c43cc small fix 2020-12-14 20:50:56 +01:00
muellerr 2100ae34f2 event folder taken over 2020-12-14 20:49:17 +01:00
muellerr 0f6d878d86 update 2020-12-14 20:48:41 +01:00
muellerr 57853ba566 event update 2020-12-14 20:22:59 +01:00
muellerr a0e7584e84 tiny tweak 2020-12-14 20:19:23 +01:00
gaisser 3bae575b5a Merge branch 'development' into mueller/subsyste-update 2020-12-14 13:16:44 +01:00
gaisser 4d5186b6cd Merge branch 'development' into mueller/tasks-update 2020-12-14 13:16:36 +01:00
gaisser e06b15cb9c Merge pull request 'fixed includes' (#303) from KSat/fsfw:mueller/int-unittest-fixes into development
Reviewed-on: fsfw/fsfw#303
2020-12-14 13:16:27 +01:00
gaisser 3f3c2481ad Merge branch 'development' into mueller/int-unittest-fixes 2020-12-14 13:16:09 +01:00
gaisser bd4ca743f5 Merge pull request 'Hotfixes for development branch' (#301) from hotfix/deviceHandlerThermalSet into development
Reviewed-on: fsfw/fsfw#301
2020-12-14 13:15:49 +01:00
muellerr 81c00cd3dc Merge remote-tracking branch 'upstream/development' into development 2020-12-14 13:02:10 +01:00
muellerr d62e092be6 task convergence 2020-12-14 11:49:30 +01:00
muellerr a547fafa33 minor tweaks 2020-12-14 11:49:01 +01:00
muellerr 3dd86039bb changes taken over 2020-12-14 11:43:32 +01:00
muellerr 9d5ac16398 some more improvements 2020-12-14 11:43:08 +01:00
muellerr 5eafd4f353 tiny format stuff 2020-12-14 11:42:02 +01:00
muellerr d3239b9064 tiny format stuff 2020-12-14 11:41:40 +01:00
muellerr 89de4cc321 changes and tweaks taken over 2020-12-14 11:40:26 +01:00
muellerr e97787cceb some more tweaks 2020-12-14 11:39:19 +01:00