Commit Graph
100 Commits
Author SHA1 Message Date
muellerr 1e7a39a8e1 Merge remote-tracking branch 'upstream/development' into mueller/clang-improvements
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
2022-05-16 15:01:29 +02:00
muellerr f0debecbbc Merge pull request 'Extend version handling and class' (#601) from eive/fsfw:mueller/extend-version-class into development
fsfw/fsfw/pipeline/head This commit looks good
Reviewed-on: #601
2022-05-16 14:52:15 +02:00
muellerr ef9d7aa7d3 Merge branch 'development' into mueller/extend-version-class
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-05-16 14:42:23 +02:00
muellerr b8fd2db434 Merge pull request 'Add PUS TC scheduler service' (#594) from KSat/fsfw:mueller/add-tc-scheduler-pus-11 into development
fsfw/fsfw/pipeline/head This commit looks good
Reviewed-on: #594
2022-05-16 14:32:19 +02:00
muellerr 878e32cbe8 Merge branch 'development' into mueller/add-tc-scheduler-pus-11
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-05-16 14:29:02 +02:00
muellerr 4821706561 Merge branch 'development' into mueller/extend-version-class
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-05-16 14:16:53 +02:00
muellerr eed6a64597 Merge pull request 'Power Switcher Component' (#596) from eive/fsfw:mueller/power-switcher-component-upstream into development
fsfw/fsfw/pipeline/head This commit looks good
Reviewed-on: #596
2022-05-13 22:42:23 +02:00
muellerr 5736023ffa Merge branch 'development' into mueller/extend-version-class
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-05-13 17:22:57 +02:00
muellerr 28380deab0 Merge branch 'development' into mueller/clang-improvements
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
2022-05-13 13:42:30 +02:00
muellerr e98aa005cb Merge branch 'development' into mueller/power-switcher-component-upstream
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-05-13 13:25:13 +02:00
muellerr 52310f7d32 Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-05-13 13:24:26 +02:00
muellerr e3d1308205 Merge pull request 'preproc guards' (#612) from eive/fsfw:mueller/missing-preproc-defs into development
fsfw/fsfw/pipeline/head This commit looks good
Reviewed-on: #612
2022-05-13 13:22:38 +02:00
muellerr 970f039e85 Merge remote-tracking branch 'origin/development' into mueller/extend-version-class
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-05-13 13:21:01 +02:00
muellerr 5a4539def4 Merge branch 'mueller/add-tc-scheduler-pus-11' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/add-tc-scheduler-pus-11
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
2022-05-13 11:58:45 +02:00
muellerr 13a34cd677 Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11 2022-05-13 11:58:41 +02:00
muellerr 00952e15b0 Merge branch 'development' into mueller/missing-preproc-defs
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-05-13 11:50:24 +02:00
muellerr 57bac4f262 Merge remote-tracking branch 'origin/development' into mueller/amft-cmakelists
fsfw/fsfw/pipeline/head Build queued...
2022-05-13 11:46:17 +02:00
muellerr ec03a674bd Merge branch 'mueller/amft-cmakelists' of https://egit.irs.uni-stuttgart.de/fsfw/fsfw into mueller/amft-cmakelists
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-05-13 11:35:28 +02:00
muellerr 57a830cb46 Merge branch 'development' into mueller/amft-cmakelists
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-05-13 11:30:52 +02:00
muellerr 271057ca6b Merge remote-tracking branch 'upstream/development' into mueller/extend-version-class
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
2022-05-13 11:28:54 +02:00
muellerr 861335212e Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
2022-05-13 00:30:18 +02:00
muellerr ccadbb5942 Merge branch 'development' into mueller/missing-preproc-defs
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-05-13 00:24:04 +02:00
muellerr 171c48495c Merge remote-tracking branch 'upstream/development' into mueller/power-switcher-component-upstream
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-05-12 19:07:12 +02:00
muellerr c361751751 Merge remote-tracking branch 'origin/development' into mueller/clang-improvements
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-05-12 17:34:21 +02:00
muellerr 6442dd0c38 Merge branch 'mueller/amft-cmakelists' of https://egit.irs.uni-stuttgart.de/fsfw/fsfw into mueller/amft-cmakelists
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-05-12 17:16:15 +02:00
muellerr 9b6fa646ed Merge remote-tracking branch 'origin/development' into mueller/amft-cmakelists 2022-05-12 17:16:10 +02:00
muellerr e77bde459b Merge remote-tracking branch 'upstream/development' into mueller/extend-version-class
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
2022-05-12 17:12:26 +02:00
muellerr 2d9d83a1c5 Merge branch 'development' into mueller/missing-preproc-defs
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-05-12 17:10:54 +02:00
muellerr c561271070 Merge branch 'development' into mueller/refactor-power-switch-if-etc
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-05-12 17:09:27 +02:00
muellerr 70d4fc1e0a Merge branch 'mueller/add-tc-scheduler-pus-11' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/add-tc-scheduler-pus-11
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-05-12 17:06:12 +02:00
muellerr e5c140e0ae Merge branch 'development' into mueller/add-tc-scheduler-pus-11 2022-05-12 16:59:01 +02:00
muellerr 9a4c7589cc Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11 2022-05-12 15:52:47 +02:00
muellerr 34e124f2db Merge branch 'development' into mueller/amft-cmakelists
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
2022-05-11 11:30:40 +02:00
muellerr 2ca8523215 Merge branch 'mueller/add-lto-support' of https://egit.irs.uni-stuttgart.de/fsfw/fsfw into mueller/add-lto-support
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-05-10 11:57:01 +02:00
muellerr b38329aa0e Merge branch 'development' into mueller/extend-version-class
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-05-10 11:19:48 +02:00
muellerr c5b4499d98 Merge remote-tracking branch 'upstream/development' into mueller/refactor-power-switch-if-etc
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-05-10 09:58:21 +02:00
muellerr 458aa5c265 Merge branch 'development' into mueller/missing-preproc-defs
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-05-10 09:56:29 +02:00
muellerr eb0223bc51 Merge branch 'development' into mueller/add-lto-support
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-05-09 22:34:28 +02:00
muellerr be6a492022 Merge branch 'development' into mueller/extend-version-class
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-05-09 22:34:09 +02:00
muellerr d8bd08dd8c Merge branch 'development' into mueller/amft-cmakelists
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-05-09 17:22:40 +02:00
muellerr 18c2847b08 Merge branch 'development' into mueller/missing-preproc-defs
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-05-09 17:21:48 +02:00
muellerr ece32f88f4 Merge remote-tracking branch 'origin/development' into mueller/tcp-server-bugfix
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-05-09 16:14:17 +02:00
muellerr 17a153485d Merge remote-tracking branch 'origin/development' into mueller/clang-improvements
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
2022-05-09 16:11:14 +02:00
muellerr fffe1f812f Merge remote-tracking branch 'origin/development' into mueller/clang-improvements
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
2022-05-09 16:10:20 +02:00
muellerr dd9e28fca1 Merge branch 'development' into mueller/add-lto-support
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-05-09 16:09:31 +02:00
muellerr 7b7f5d7e0a Merge branch 'mueller/add-lto-support' of https://egit.irs.uni-stuttgart.de/fsfw/fsfw into mueller/add-lto-support
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-05-09 16:07:19 +02:00
muellerr 88fa4f1d9d Merge remote-tracking branch 'origin/development' into mueller/tcp-server-bugfix
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
2022-05-09 15:55:07 +02:00
muellerr da8a108cb7 Merge remote-tracking branch 'origin/development' into mueller/amft-cmakelists 2022-05-09 15:54:10 +02:00
muellerr 75132c1e39 Merge branch 'development' into mueller/add-lto-support
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
2022-05-09 15:52:28 +02:00
muellerr eb494707af Merge remote-tracking branch 'upstream/development' into mueller/power-switcher-component-upstream
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-05-09 15:51:28 +02:00
muellerr f1acf8e18b Merge remote-tracking branch 'upstream/development' into mueller/extend-version-class
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
2022-05-09 15:48:04 +02:00
muellerr 281f91ec5d Merge remote-tracking branch 'origin/development' into mueller/health-srv-bugfix
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-05-09 15:41:10 +02:00
muellerr 15352b539d Merge remote-tracking branch 'upstream/development' into mueller/refactor-power-switch-if-etc
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
2022-05-09 15:37:32 +02:00
muellerr 4015e85506 Merge branch 'development' into mueller/missing-preproc-defs
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-05-09 15:35:49 +02:00
muellerr 8a40878eb5 Merge remote-tracking branch 'origin/development' into mueller/add-lto-support
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
2022-05-09 15:17:16 +02:00
muellerr 220469a2dd Merge remote-tracking branch 'origin/development' into mueller/amft-cmakelists
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
2022-05-09 15:16:12 +02:00
muellerr 5d5a355110 Merge remote-tracking branch 'upstream/development' into mueller/extend-version-class
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-05-09 11:04:15 +02:00
muellerr c78b7c432b Merge branch 'development' into mueller/refactor-power-switch-if-etc
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
2022-05-09 11:02:45 +02:00
muellerr 2fbf847367 Merge branch 'development' into mueller/missing-preproc-defs
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-05-02 16:16:33 +02:00
muellerr 2a9300e947 Merge branch 'development' into mueller/clang-improvements
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
2022-05-02 16:16:19 +02:00
muellerr 13f3a312be Merge branch 'development' into mueller/clang-improvements
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-05-02 15:24:24 +02:00
muellerr 57e6c46e72 Merge branch 'development' into mueller/missing-preproc-defs
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-05-02 15:16:37 +02:00
muellerr cddf16f941 Merge branch 'development' into mueller/mac-os
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-05-02 15:15:53 +02:00
muellerr 7801c6effe Merge remote-tracking branch 'upstream/development' into mueller/new-ss-adder-functions
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-05-02 15:09:09 +02:00
muellerr b62c19a364 Merge branch 'development' into mueller/extend-version-class
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-05-02 14:48:23 +02:00
muellerr 7cfb1e6076 Merge branch 'development' into mueller/bump-catch2
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-05-02 14:36:44 +02:00
muellerr 861bd15eda Merge branch 'development' into mueller/hotfix-etl
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-05-02 14:20:40 +02:00
muellerr fea301bcc9 Merge remote-tracking branch 'origin/mueller/hotfix-etl' into mueller/mac-os
fsfw/fsfw/pipeline/pr-development Build queued...
2022-05-02 09:35:28 +02:00
muellerr 8642b13fd1 Merge branch 'mueller/hotfix-etl' into mueller/bump-catch2
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
2022-04-27 21:55:45 +02:00
muellerr 0e0dbc74aa Merge branch 'mueller/hotfix-etl' into mueller/bump-catch2 2022-04-27 09:45:42 +02:00
muellerr 70eb8325a0 Merge remote-tracking branch 'upstream/development' into mueller/compiler-warning-fixes-upstream-2
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-04-27 08:47:45 +02:00
muellerr 8e4ad10627 Merge remote-tracking branch 'upstream/development' into mueller/extend-version-class
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-04-27 08:46:18 +02:00
muellerr 496bc665d6 Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-04-27 08:45:47 +02:00
muellerr 2c8531ea48 Merge remote-tracking branch 'upstream/development' into mueller/refactor-power-switch-if-etc
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-04-27 08:45:04 +02:00
muellerr 88051c9302 Merge remote-tracking branch 'upstream/development' into mueller/refactor-power-switch-if-etc
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-04-25 15:37:03 +02:00
muellerr 80be937d9d Merge remote-tracking branch 'upstream/development' into mueller/compiler-warning-fixes-upstream-2
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-04-25 15:24:17 +02:00
muellerr d62ee6a611 Merge remote-tracking branch 'upstream/development' into mueller/extend-version-class
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-04-25 15:23:46 +02:00
Robin Mueller 91ef4ff30b Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-04-25 15:23:15 +02:00
muellerr 4032228005 Merge remote-tracking branch 'upstream/development' into mueller/extend-version-class
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-04-25 15:15:54 +02:00
muellerr 50ce13d596 Merge branch 'development' into mueller/power-switcher-component-upstream
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-04-25 15:14:38 +02:00
Robin Mueller 68302e7c5e Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-04-25 15:14:13 +02:00
muellerr ff98c42514 Merge branch 'development' into mueller/clock-addition
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-04-25 14:54:22 +02:00
Robin Mueller 352ab43c1f Merge remote-tracking branch 'upstream/development' into mueller/add-etl-dependency
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-04-12 17:11:41 +02:00
Robin Mueller 35f257800e Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
2022-04-12 17:10:55 +02:00
muellerr 07f5dbb9ac Merge branch 'development' into mueller/compiler-warning-fixes-upstream-2
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-04-12 17:08:56 +02:00
muellerr 97e98eae24 Merge branch 'development' into mueller/ipc-pass-arbitrary-args-to-mq
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-04-12 17:06:30 +02:00
muellerr b03a6684f9 Merge branch 'development' into mueller/small-stm32-hal-bugifx
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-04-11 17:34:39 +02:00
muellerr afce942bf8 Merge branch 'development' into mueller/compiler-warning-fixes-upstream-2
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
2022-04-11 17:33:04 +02:00
Robin Mueller c55925959b Merge branch 'mueller/add-etl-dependency' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/add-etl-dependency
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-04-11 16:44:30 +02:00
muellerr f0d996ffd2 Merge branch 'development' into mueller/add-etl-dependency 2022-04-11 16:17:46 +02:00
Robin Mueller d0b7c22afc Merge branch 'mueller/add-tc-scheduler-pus-11' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/add-tc-scheduler-pus-11
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-04-11 16:17:05 +02:00
muellerr f4d05c2c9c Merge branch 'mueller/ipc-pass-arbitrary-args-to-mq' of https://egit.irs.uni-stuttgart.de/eive/fsfw into mueller/ipc-pass-arbitrary-args-to-mq
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-04-11 16:13:55 +02:00
muellerr 82f46992f6 Merge branch 'development' into mueller/ipc-pass-arbitrary-args-to-mq
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-04-11 16:11:57 +02:00
muellerr 4ed9cc933f Merge branch 'development' into mueller/refactor-power-switch-if-etc
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-04-11 16:11:27 +02:00
muellerr bd0b7aa230 Merge branch 'mueller/power-switcher-component-upstream' of https://egit.irs.uni-stuttgart.de/eive/fsfw into mueller/power-switcher-component-upstream
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-04-11 16:09:32 +02:00
muellerr dd1b0a9380 Merge branch 'development' into mueller/power-switcher-component-upstream
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-04-11 16:08:27 +02:00
muellerr c0f80680ef Merge branch 'mueller/propagate-pool-manage-retval' of https://egit.irs.uni-stuttgart.de/eive/fsfw into mueller/propagate-pool-manage-retval
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-04-11 14:35:28 +02:00
muellerr fe739aa81a Merge branch 'development' into mueller/propagate-pool-manage-retval
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-04-11 14:26:34 +02:00
muellerr a011e70665 Merge branch 'development' into mueller/ipc-pass-arbitrary-args-to-mq
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-04-04 17:21:11 +02:00
muellerr 4dee913d51 Merge branch 'development' into mueller/add-tc-scheduler-pus-11
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-04-04 14:19:25 +02:00