Commit Graph

5496 Commits

Author SHA1 Message Date
f78344b8fb Merge remote-tracking branch 'origin/develop' into mueller/improve-ss-dhb-logic 2022-09-29 17:46:54 +02:00
b9d0ff8fb7
DHB bug
Some checks failed
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
2022-09-29 17:20:18 +02:00
77f7fa2ef1
typo 2022-09-29 16:48:23 +02:00
78314ad966
this makes a bit more sense 2022-09-29 16:47:23 +02:00
227535c461
formatting and smaller stuff
Some checks failed
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
2022-09-29 16:46:55 +02:00
c47bed0760 small important bugfix for DLE parser
Some checks failed
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
2022-09-28 17:04:11 +02:00
9927dbb2e4 Merge branch 'windows-tweaks' into develop
Some checks failed
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
2022-09-28 10:06:08 +02:00
14a48fe41d
better comment 2022-09-28 09:56:20 +02:00
c932e51818 Merge branch 'windows-tweaks' into develop
Some checks failed
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
2022-09-28 00:03:51 +02:00
2ca8d72e83
another small windows tweak 2022-09-28 00:03:12 +02:00
03e1a93250
last windows tweak 2022-09-27 23:57:58 +02:00
6d2f44a432
tweaks to make windows build again 2022-09-27 21:46:11 +02:00
808e3e0462
remove unused variable
Some checks failed
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
2022-09-16 18:54:48 +02:00
79ab0c4aa5 Merge branch 'mueller/smaller-tweaks' into develop
Some checks failed
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
2022-09-16 18:24:39 +02:00
72172a972b
update changelog
Some checks failed
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
2022-09-16 18:24:23 +02:00
b4b11ebd3b fixes and tweaks 2022-09-16 18:20:42 +02:00
c5b24f2516
fixes and tweaks
Some checks failed
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
2022-09-16 18:08:20 +02:00
e2c1158337
pass message queue externally
All checks were successful
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-09-16 16:27:57 +02:00
95aac7dc8d Merge pull request 'CFDP FSFW Integration' (#111) from cfdp-integration into develop
All checks were successful
fsfw/fsfw/pipeline/pr-development This commit looks good
Reviewed-on: eive/fsfw#111
2022-09-16 11:11:20 +02:00
3d2fc28468
Merge remote-tracking branch 'upstream/mueller/new-cfdp-update-with-handlers' into cfdp-integration 2022-09-16 11:10:35 +02:00
1898b4f2db Merge remote-tracking branch 'upstream/development' into update-from-upstream
All checks were successful
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-09-16 11:06:05 +02:00
c38088c64b
adaptions for enum renaming
All checks were successful
fsfw/fsfw/pipeline/head This commit looks good
2022-09-15 18:44:00 +02:00
7eb63d6d79 Merge branch 'mueller/cfdp-update-without-handlers' into mueller/new-cfdp-update-with-handlers
Some checks failed
fsfw/fsfw/pipeline/head There was a failure building this commit
2022-09-15 18:41:29 +02:00
6f8ccf83e7
use singular enum names
Some checks failed
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
2022-09-15 18:41:15 +02:00
67f1cd0b5f Merge branch 'development' into mueller/cfdp-update-without-handlers
Some checks failed
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
2022-09-15 18:35:22 +02:00
1d54507517 Merge pull request 'merge upstream development' (#110) from mohr/merge-upstream into develop
All checks were successful
fsfw/fsfw/pipeline/pr-development This commit looks good
Reviewed-on: eive/fsfw#110
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2022-09-15 18:34:50 +02:00
ef9ed95fd1 Merge branch 'develop' into mohr/merge-upstream 2022-09-15 18:34:37 +02:00
ed68268c0c
generic cfdp handler wrapper
Some checks failed
fsfw/fsfw/pipeline/head There was a failure building this commit
2022-09-15 16:53:04 +02:00
c549914efb
include helpers
Some checks failed
fsfw/fsfw/pipeline/head There was a failure building this commit
2022-09-15 16:50:06 +02:00
753d5ff39e
adaptions for enum renaming
Some checks failed
fsfw/fsfw/pipeline/head There was a failure building this commit
2022-09-15 16:47:09 +02:00
36ca35da77 Merge branch 'mueller/cfdp-update-without-handlers' into mueller/new-cfdp-update-with-handlers 2022-09-15 16:46:25 +02:00
54762232a4
refactoring and condition code to strin converter
Some checks failed
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
2022-09-15 16:46:09 +02:00
4fb7375492 Merge branch 'mueller/cfdp-update-without-handlers' into mueller/new-cfdp-update-with-handlers
All checks were successful
fsfw/fsfw/pipeline/head This commit looks good
2022-09-15 16:21:32 +02:00
2fee2fdff5
unittest which would have caught this
All checks were successful
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-09-15 16:20:52 +02:00
47df9e8b5b Merge branch 'mueller/cfdp-update-without-handlers' into mueller/new-cfdp-update-with-handlers
All checks were successful
fsfw/fsfw/pipeline/head This commit looks good
2022-09-15 16:03:06 +02:00
954c749de0
additional docs
Some checks failed
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
2022-09-15 16:02:46 +02:00
131e3ff1e3 Revert "doc corrections"
All checks were successful
fsfw/fsfw/pipeline/head This commit looks good
This reverts commit 423a9540ed.
2022-09-15 13:52:28 +02:00
423a9540ed
doc corrections
All checks were successful
fsfw/fsfw/pipeline/head This commit looks good
2022-09-15 13:51:59 +02:00
7e0a5d5a9e printout tweak
Some checks failed
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
2022-09-15 13:40:37 +02:00
ee1c6a3f04
better error printout
Some checks failed
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
2022-09-15 13:37:10 +02:00
86aafe4422 Merge branch 'mueller/cfdp-update-without-handlers' into mueller/new-cfdp-update-with-handlers
All checks were successful
fsfw/fsfw/pipeline/head This commit looks good
2022-09-15 11:02:46 +02:00
e585c1d84a
Merge remote-tracking branch 'origin/development' into mueller/cfdp-update-without-handlers
All checks were successful
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-09-15 11:02:04 +02:00
1a833e2d45
another missing changelog entry
All checks were successful
fsfw/fsfw/pipeline/head This commit looks good
2022-09-15 10:59:10 +02:00
8df6d934d7
another missing changelog entry
All checks were successful
fsfw/fsfw/pipeline/head This commit looks good
2022-09-15 10:56:52 +02:00
5363868120
added another missing changelog entry
All checks were successful
fsfw/fsfw/pipeline/head This commit looks good
2022-09-15 10:54:45 +02:00
36cf59cc8e
Merge branch 'mueller/refactor-accepts-tc-tm-if' into mueller/cfdp-update-without-handlers
Some checks failed
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
2022-09-15 10:52:13 +02:00
97fec909f2
Merge branch 'mueller/local-pool-update' into mueller/cfdp-update-without-handlers
All checks were successful
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-09-15 10:50:35 +02:00
1db77753e3
Merge remote-tracking branch 'origin/development' into mueller/local-pool-update
Some checks failed
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
2022-09-15 10:49:24 +02:00
8501477a78
Merge remote-tracking branch 'origin/development' into mueller/refactor-accepts-tc-tm-if
Some checks failed
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
2022-09-15 10:48:42 +02:00
9a181aa6a8
another missing changelog entry
All checks were successful
fsfw/fsfw/pipeline/head This commit looks good
2022-09-15 10:47:50 +02:00