Commit Graph

1510 Commits

Author SHA1 Message Date
cd1fb88313 Merge remote-tracking branch 'upstream/development' into mueller/linux-update 2020-12-15 22:49:18 +01:00
4f33a1908a Merge branch 'development' into mueller/hk-service3 2020-12-15 22:44:24 +01:00
e39c4fe2a8 added hk service 3 2020-12-15 22:42:50 +01:00
e7da1e37c3 Merge branch 'development' into mueller/tmtcservices-update 2020-12-15 15:57:09 +01:00
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
82a83a50ee change log update 2020-12-15 15:39:33 +01:00
72c54d59fa fsfw config 2020-12-15 15:32:56 +01:00
175db9e6fc Merge branch 'development' into mueller/event-update 2020-12-15 15:20:29 +01:00
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
703d2590ff update csb 2020-12-15 15:20:08 +01:00
9dabdf4b56 Merge branch 'development' into mueller/tasks-update 2020-12-15 15:19:38 +01:00
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
eb5ac573a9 Merge branch 'mueller/tmtcservices-update' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/tmtcservices-update 2020-12-15 15:16:51 +01:00
fcce61aee0 Merge remote-tracking branch 'upstream/development' into mueller/tmtcservices-update 2020-12-15 15:16:45 +01:00
4e4ffeb608 Merge branch 'development' into mueller/tmtcservices-update 2020-12-15 15:16:29 +01:00
103d8b8c6a fixed timeslot task IF 2020-12-15 15:12:31 +01:00
4c152e9fd8 subsystem doc upodate 2020-12-15 15:07:41 +01:00
a57af5852d made check sequence 2020-12-15 15:04:07 +01:00
2c92fa64bc Merge branch 'development' into mueller/subsyste-update 2020-12-15 14:44:19 +01:00
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
534805957c Merge branch 'development' into mueller/FreeRTOS 2020-12-15 14:42:31 +01:00
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
f733a85a9c type update 2020-12-15 14:41:33 +01:00
335c75ba5b Merge branch 'development' into mueller/type 2020-12-15 14:31:27 +01:00
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
a6a95b7719 Merge branch 'development' into mueller/rmap-convergence 2020-12-15 14:30:01 +01:00
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
6deb0b565e Merge branch 'development' into mueller/removed-glob-pool 2020-12-15 14:28:54 +01:00
b9f50e8e42 Merge branch 'development' into mueller/rmap-convergence 2020-12-15 14:08:51 +01:00
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
3cc053a581 changes from mueller/master taken over 2020-12-14 23:56:44 +01:00
93842bb913 using long name now 2020-12-14 22:56:30 +01:00
b232a8a291 Merge remote-tracking branch 'upstream/development' into development 2020-12-14 21:57:42 +01:00
7f93c4a6aa Merge branch 'development' into mueller/FreeRTOS 2020-12-14 21:51:19 +01:00
efb4f0efbb Merge branch 'development' into mueller/type 2020-12-14 21:51:05 +01:00
4f2470b93f task factory 2020-12-14 21:48:12 +01:00
336b43572f linux update 2020-12-14 21:46:33 +01:00
25db9bc9ed tmtcservices update 2020-12-14 21:30:39 +01:00
55a663beb2 unittest update 2020-12-14 21:14:38 +01:00
a3ebad46e7 small fix 2020-12-14 21:00:15 +01:00
d96d3d6c46 one define now 2020-12-14 20:58:47 +01:00
0f6d878d86 update 2020-12-14 20:48:41 +01:00
57853ba566 event update 2020-12-14 20:22:59 +01:00
3bae575b5a Merge branch 'development' into mueller/subsyste-update 2020-12-14 13:16:44 +01:00
4d5186b6cd Merge branch 'development' into mueller/tasks-update 2020-12-14 13:16:36 +01:00
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
3f3c2481ad Merge branch 'development' into mueller/int-unittest-fixes 2020-12-14 13:16:09 +01:00
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
81c00cd3dc Merge remote-tracking branch 'upstream/development' into development 2020-12-14 13:02:10 +01:00
d62e092be6 task convergence 2020-12-14 11:49:30 +01:00