Commit Graph

1299 Commits

Author SHA1 Message Date
Robin Müller 74c49e1481 Merge branch 'development' into mueller/master 2020-12-16 14:05:29 +01:00
Robin Müller 086cbe1e39 Merge remote-tracking branch 'upstream/development' into development 2020-12-16 12:00:59 +01:00
Robin Müller f128a1dc3d made datalinklayer optional 2020-12-15 23:44:43 +01:00
Robin Müller c48f1c8ee6 Merge branch 'development' into mueller/cmake-fixes 2020-12-15 23:05:32 +01:00
Steffen Gaisser 356bd2717e Merge pull request 'event update' (#308) from KSat/fsfw:mueller/event-update into development
Reviewed-on: fsfw/fsfw#308
2020-12-15 15:56:47 +01:00
Steffen Gaisser 175db9e6fc Merge branch 'development' into mueller/event-update 2020-12-15 15:20:29 +01:00
Steffen Gaisser 5ba1932076 Merge pull request 'task convergence' (#307) from KSat/fsfw:mueller/tasks-update into development
Reviewed-on: fsfw/fsfw#307
2020-12-15 15:20:15 +01:00
Steffen Gaisser 9dabdf4b56 Merge branch 'development' into mueller/tasks-update 2020-12-15 15:19:38 +01:00
Steffen Gaisser a343baa813 Merge pull request 'Subsystem Update' (#306) from KSat/fsfw:mueller/subsyste-update into development
Reviewed-on: fsfw/fsfw#306
2020-12-15 15:16:58 +01:00
Robin Müller 103d8b8c6a fixed timeslot task IF 2020-12-15 15:12:31 +01:00
Robin Müller 4c152e9fd8 subsystem doc upodate 2020-12-15 15:07:41 +01:00
Robin Müller a57af5852d made check sequence 2020-12-15 15:04:07 +01:00
Steffen Gaisser 2c92fa64bc Merge branch 'development' into mueller/subsyste-update 2020-12-15 14:44:19 +01:00
Steffen Gaisser d85686fd8d Merge pull request 'FreeRTOS update' (#305) from KSat/fsfw:mueller/FreeRTOS into development
Reviewed-on: fsfw/fsfw#305
2020-12-15 14:44:08 +01:00
Steffen Gaisser 534805957c Merge branch 'development' into mueller/FreeRTOS 2020-12-15 14:42:31 +01:00
Steffen Gaisser 4e6aa3128b Merge pull request 'type update' (#304) from KSat/fsfw:mueller/type into development
Reviewed-on: fsfw/fsfw#304
2020-12-15 14:42:16 +01:00
Robin Müller f733a85a9c type update 2020-12-15 14:41:33 +01:00
Steffen Gaisser 335c75ba5b Merge branch 'development' into mueller/type 2020-12-15 14:31:27 +01:00
Steffen Gaisser c53920f5ac Merge pull request 'RMAP folder convergence' (#302) from KSat/fsfw:mueller/rmap-convergence into development
Reviewed-on: fsfw/fsfw#302
2020-12-15 14:31:13 +01:00
Steffen Gaisser a6a95b7719 Merge branch 'development' into mueller/rmap-convergence 2020-12-15 14:30:01 +01:00
Steffen 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
Steffen Gaisser 6deb0b565e Merge branch 'development' into mueller/removed-glob-pool 2020-12-15 14:28:54 +01:00
Steffen Gaisser b9f50e8e42 Merge branch 'development' into mueller/rmap-convergence 2020-12-15 14:08:51 +01:00
Robin Müller 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
Robin Müller 3cc053a581 changes from mueller/master taken over 2020-12-14 23:56:44 +01:00
Robin Müller b232a8a291 Merge remote-tracking branch 'upstream/development' into development 2020-12-14 21:57:42 +01:00
Robin Müller 7f93c4a6aa Merge branch 'development' into mueller/FreeRTOS 2020-12-14 21:51:19 +01:00
Robin Müller efb4f0efbb Merge branch 'development' into mueller/type 2020-12-14 21:51:05 +01:00
Robin Müller a3ebad46e7 small fix 2020-12-14 21:00:15 +01:00
Robin Müller d96d3d6c46 one define now 2020-12-14 20:58:47 +01:00
Robin Müller 0f6d878d86 update 2020-12-14 20:48:41 +01:00
Robin Müller 57853ba566 event update 2020-12-14 20:22:59 +01:00
Steffen Gaisser 3bae575b5a Merge branch 'development' into mueller/subsyste-update 2020-12-14 13:16:44 +01:00
Steffen Gaisser 4d5186b6cd Merge branch 'development' into mueller/tasks-update 2020-12-14 13:16:36 +01:00
Steffen 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
Steffen Gaisser 3f3c2481ad Merge branch 'development' into mueller/int-unittest-fixes 2020-12-14 13:16:09 +01:00
Steffen 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
Robin Müller 81c00cd3dc Merge remote-tracking branch 'upstream/development' into development 2020-12-14 13:02:10 +01:00
Robin Müller d62e092be6 task convergence 2020-12-14 11:49:30 +01:00
Robin Müller 9d5ac16398 some more improvements 2020-12-14 11:43:08 +01:00
Robin Müller 5eafd4f353 tiny format stuff 2020-12-14 11:42:02 +01:00
Robin Müller e97787cceb some more tweaks 2020-12-14 11:39:19 +01:00
Robin Müller 252bfa5c39 subsystem convergence 2020-12-14 11:35:45 +01:00
Robin Müller 7eeba71619 subsystem update 2020-12-14 11:34:54 +01:00
Robin Müller 313d898aef small update 2020-12-14 11:22:44 +01:00
Robin Müller 94fa917202 some tweaks 2020-12-14 11:17:22 +01:00
Robin Müller dc72fa938d type update 2020-12-14 11:10:22 +01:00
Robin Müller 720e3baa90 fixed includes 2020-12-14 10:48:39 +01:00
Robin Müller 715386e366 clened up a bit 2020-12-13 22:12:57 +01:00
Robin Müller bc6936dddd indentation corrected (again) 2020-12-12 18:35:58 +01:00