 muellerr
|
9a2e68b37e
|
Merge pull request 'Move HAL and Tests folder' (#653) from mueller/move-hal-tests-folder into development
fsfw/fsfw/pipeline/head This commit looks good
Reviewed-on: #653
|
2022-07-18 15:05:25 +02:00 |
|
|
muellerr
|
c6253bf0dd
|
Merge branch 'development' into mueller/new-pool-entry-ctor
fsfw/fsfw/pipeline/pr-development This commit looks good
|
2022-07-13 15:41:47 +02:00 |
|
|
muellerr
|
d47a908117
|
Merge branch 'development' into mueller/task-if-refactoring
fsfw/fsfw/pipeline/pr-development This commit looks good
|
2022-06-20 09:40:31 +02:00 |
|
|
muellerr
|
fce95e04a8
|
Merge branch 'development' into mueller/new-cicd-cmake-opts
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
|
2022-06-20 09:39:58 +02:00 |
|
|
muellerr
|
ca453a8f16
|
Merge pull request 'run auto formatters' (#641) from KSat/fsfw:mueller/reapply-fmt into development
fsfw/fsfw/pipeline/head This commit looks good
Reviewed-on: #641
|
2022-06-13 17:04:11 +02:00 |
|
|
muellerr
|
b7c0c07141
|
Merge remote-tracking branch 'origin/development' into mueller/new-cicd-cmake-opts
fsfw/fsfw/pipeline/pr-development This commit looks good
|
2022-06-13 16:28:01 +02:00 |
|
|
muellerr
|
0158102f11
|
Merge pull request 'apply afmt, basic CLion support' (#625) from mueller/apply-afmt into development
fsfw/fsfw/pipeline/head This commit looks good
Reviewed-on: #625
|
2022-06-13 16:27:02 +02:00 |
|
|
muellerr
|
90bccc744e
|
Merge pull request 'Fix SPI ComIF shadowing warning' (#639) from KSat/fsfw:mueller/spi-com-if-shadowing into development
fsfw/fsfw/pipeline/head This commit looks good
Reviewed-on: #639
|
2022-06-13 14:35:46 +02:00 |
|
|
muellerr
|
ab89108c55
|
Merge pull request 'some fixes for TC Map printout function' (#640) from KSat/fsfw:mueller/pus-11-printout-fixes into development
fsfw/fsfw/pipeline/head This commit looks good
Reviewed-on: #640
|
2022-06-13 14:29:36 +02:00 |
|
|
muellerr
|
71ce966531
|
Merge branch 'mueller/spi-com-if-shadowing' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/spi-com-if-shadowing
fsfw/fsfw/pipeline/pr-development This commit looks good
|
2022-06-13 10:54:25 +02:00 |
|
|
muellerr
|
6b0f4a159f
|
Merge remote-tracking branch 'upstream/development' into mueller/spi-com-if-shadowing
|
2022-06-13 10:54:20 +02:00 |
|
|
muellerr
|
65bc8213fe
|
Merge branch 'development' into mueller/new-cicd-cmake-opts
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
|
2022-06-13 09:43:32 +02:00 |
|
|
muellerr
|
a07a368272
|
Merge branch 'development' into mueller/apply-afmt
fsfw/fsfw/pipeline/pr-development This commit looks good
|
2022-06-08 17:34:04 +02:00 |
|
|
muellerr
|
cb8a4bbbec
|
Merge remote-tracking branch 'origin/development' into mueller/task-if-refactoring
fsfw/fsfw/pipeline/pr-development This commit looks good
|
2022-06-08 17:33:12 +02:00 |
|
|
muellerr
|
17f54006b8
|
Merge pull request 'rtems fixes' (#635) from mueller/rtems-fixes into development
fsfw/fsfw/pipeline/head There was a failure building this commit
Reviewed-on: #635
|
2022-06-08 16:12:53 +02:00 |
|
|
muellerr
|
51d7df2dba
|
Merge branch 'development' into mueller/new-cicd-cmake-opts
fsfw/fsfw/pipeline/pr-development This commit looks good
|
2022-06-08 11:13:13 +02:00 |
|
|
muellerr
|
12046a2db6
|
Merge pull request 'bump etl to 20.28.0' (#634) from mueller/bump-etl into development
fsfw/fsfw/pipeline/head This commit looks good
Reviewed-on: #634
|
2022-06-08 11:09:42 +02:00 |
|
|
muellerr
|
7dddcdfd55
|
Merge branch 'development' into mueller/possible-fix-ccsds-distrib
fsfw/fsfw/pipeline/pr-development This commit looks good
|
2022-05-25 09:52:33 +02:00 |
|
|
muellerr
|
940fd6f465
|
Merge branch 'development' into mueller/new-cicd-cmake-opts
fsfw/fsfw/pipeline/pr-development This commit looks good
|
2022-05-23 15:59:13 +02:00 |
|
|
muellerr
|
f288d5120d
|
Merge branch 'development' into mueller/tc-11-tweaks
fsfw/fsfw/pipeline/pr-development This commit looks good
|
2022-05-23 15:34:00 +02:00 |
|
|
muellerr
|
576414438c
|
Merge pull request 'Apply cmake-format and auto-format script on all CMakeLists.txt file' (#628) from eive/fsfw:mueller/apply-clang-format-on-all-files into development
fsfw/fsfw/pipeline/head This commit looks good
Reviewed-on: #628
|
2022-05-18 13:14:18 +02:00 |
|
|
muellerr
|
816550b69c
|
Merge remote-tracking branch 'upstream/development' into mueller/new-cicd-cmake-opts
fsfw/fsfw/pipeline/pr-development This commit looks good
|
2022-05-16 14:58:25 +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
|
8a12a5097e
|
Merge branch 'mueller/apply-afmt' into mueller/new-cicd-cmake-opts
fsfw/fsfw/pipeline/pr-development This commit looks good
|
2022-05-13 13:50:41 +02:00 |
|
|
muellerr
|
c8e034d975
|
Merge branch 'development' into mueller/new-cicd-cmake-opts
fsfw/fsfw/pipeline/pr-development This commit looks good
|
2022-05-13 13:41:58 +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
|
2708b71d77
|
Merge remote-tracking branch 'origin/development' into mueller/new-cicd-cmake-opts
fsfw/fsfw/pipeline/pr-development This commit looks good
|
2022-05-13 12:00:40 +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
|
6366283ce2
|
Merge branch 'development' into mueller/apply-afmt
fsfw/fsfw/pipeline/pr-development This commit looks good
|
2022-05-13 11:50:03 +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
|
2e4b9bcd7c
|
Merge remote-tracking branch 'origin/development' into mueller/new-cicd-cmake-opts
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
|
2022-05-12 17:42:49 +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
|
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
|
aacaf52fd9
|
Merge branch 'development' into mueller/new-cicd-cmake-opts
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
|
2022-05-09 15:34:36 +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
|
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 |
|