Commit Graph

5782 Commits

Author SHA1 Message Date
1d54507517 Merge pull request 'merge upstream development' (#110) from mohr/merge-upstream into develop
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 2022-09-15 16:53:04 +02:00
c549914efb
include helpers 2022-09-15 16:50:06 +02:00
753d5ff39e
adaptions for enum renaming 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 2022-09-15 16:46:09 +02:00
4fb7375492 Merge branch 'mueller/cfdp-update-without-handlers' into mueller/new-cfdp-update-with-handlers 2022-09-15 16:21:32 +02:00
2fee2fdff5
unittest which would have caught this 2022-09-15 16:20:52 +02:00
47df9e8b5b Merge branch 'mueller/cfdp-update-without-handlers' into mueller/new-cfdp-update-with-handlers 2022-09-15 16:03:06 +02:00
954c749de0
additional docs 2022-09-15 16:02:46 +02:00
bcbbc9763a
markdown update not required, will be removed 2022-09-15 14:00:01 +02:00
0042372cb6
now that doc server is up, remove markdown files 2022-09-15 13:58:13 +02:00
8dea13742f
update rst file 2022-09-15 13:57:39 +02:00
0f027d29d2 doc corrections 2022-09-15 13:53:42 +02:00
131e3ff1e3 Revert "doc corrections"
This reverts commit 423a9540ed.
2022-09-15 13:52:28 +02:00
423a9540ed
doc corrections 2022-09-15 13:51:59 +02:00
7e0a5d5a9e printout tweak 2022-09-15 13:40:37 +02:00
ce7146e468
printout tweak 2022-09-15 13:40:12 +02:00
a681a4a797 better error printout 2022-09-15 13:38:38 +02:00
ee1c6a3f04
better error printout 2022-09-15 13:37:10 +02:00
86aafe4422 Merge branch 'mueller/cfdp-update-without-handlers' into mueller/new-cfdp-update-with-handlers 2022-09-15 11:02:46 +02:00
e585c1d84a
Merge remote-tracking branch 'origin/development' into mueller/cfdp-update-without-handlers 2022-09-15 11:02:04 +02:00
83b7b8707c
Merge remote-tracking branch 'origin/development' into mueller/refactor-accepts-tc-tm-if 2022-09-15 11:01:19 +02:00
4002b74ea2 Merge branch 'development' into mueller/service-interface-include-correction 2022-09-15 11:01:06 +02:00
4f7f8310c9
Merge remote-tracking branch 'origin/development' into mueller/local-pool-update 2022-09-15 11:00:43 +02:00
1a833e2d45
another missing changelog entry 2022-09-15 10:59:10 +02:00
8df6d934d7
another missing changelog entry 2022-09-15 10:56:52 +02:00
5363868120
added another missing changelog entry 2022-09-15 10:54:45 +02:00
36cf59cc8e
Merge branch 'mueller/refactor-accepts-tc-tm-if' into mueller/cfdp-update-without-handlers 2022-09-15 10:52:13 +02:00
97fec909f2
Merge branch 'mueller/local-pool-update' into mueller/cfdp-update-without-handlers 2022-09-15 10:50:35 +02:00
1db77753e3
Merge remote-tracking branch 'origin/development' into mueller/local-pool-update 2022-09-15 10:49:24 +02:00
8501477a78
Merge remote-tracking branch 'origin/development' into mueller/refactor-accepts-tc-tm-if 2022-09-15 10:48:42 +02:00
6eea711d9f Merge branch 'development' into mueller/service-interface-include-correction 2022-09-15 10:48:28 +02:00
9a181aa6a8
another missing changelog entry 2022-09-15 10:47:50 +02:00
655c944c0e
another missing changelog entry 2022-09-15 10:45:35 +02:00
2e310fca8d
add another missing changelog entry 2022-09-15 10:43:45 +02:00
37390dfc74
add missing changelog entry 2022-09-15 10:42:35 +02:00
75ddfdc65d
Merge branch 'mueller/refactor-accepts-tc-tm-if' into mueller/cfdp-update-without-handlers 2022-09-15 10:41:16 +02:00
1efc0d2855
update changelog 2022-09-15 10:38:40 +02:00
e063b44899
add link to PR 2022-09-15 10:32:38 +02:00
b3c0e24611
bump changelog 2022-09-15 10:31:55 +02:00
ab7c3480f5
storage manager update 2022-09-15 10:30:22 +02:00
237e29cc59
all necessary modifications 2022-09-14 20:21:03 +02:00
0849c8a08d
adding files manually 2022-09-14 20:10:41 +02:00
9d626e0a5d
include correction 2022-09-14 19:59:02 +02:00
723f8749d4
bump changelog 2022-09-14 19:52:33 +02:00
dbaeed83af Merge branch 'mueller/cfdp-update-without-handlers' into mueller/new-cfdp-update-with-handlers 2022-09-14 19:48:25 +02:00
2e27a85c95
finished renaming operation 2022-09-14 19:48:11 +02:00
385a0ffd73
add CFDP handlers manually 2022-09-14 19:29:43 +02:00