Commit Graph

5721 Commits

Author SHA1 Message Date
Robin Müller fe03da6def
Merge remote-tracking branch 'origin/development' into mueller/cfdp-update-without-handlers 2022-09-26 15:38:45 +02:00
Steffen Gaisser 95ac53c417 Merge branch 'development' into mueller/smaller-tweaks 2022-09-26 14:40:29 +02:00
Steffen Gaisser 62f638a3d2 Merge pull request 'doc corrections' (#687) from mueller/doc-corrections into development
Reviewed-on: fsfw/fsfw#687
2022-09-26 14:38:39 +02:00
Steffen Gaisser bd64591f30 Merge branch 'development' into mueller/smaller-tweaks 2022-09-26 14:34:38 +02:00
Steffen Gaisser e6a877f048 Merge branch 'development' into mueller/doc-corrections 2022-09-26 14:26:48 +02:00
Steffen Gaisser ea8c557ee8 Merge pull request 'better error printout' (#686) from eive/fsfw:mueller/local-pool-obj-base-better-warning into development
Reviewed-on: fsfw/fsfw#686
2022-09-26 14:26:20 +02:00
Steffen Gaisser 0bdd780f82 Merge branch 'development' into mueller/doc-corrections 2022-09-26 14:17:24 +02:00
Steffen Gaisser 9ec397c8b7 Merge branch 'development' into mueller/local-pool-obj-base-better-warning 2022-09-26 14:17:19 +02:00
Robin Müller c54d9d7ba6
add some tests 2022-09-26 14:15:11 +02:00
Steffen Gaisser 30c03c110c Merge pull request 'include correction' (#683) from mueller/service-interface-include-correction into development
Reviewed-on: fsfw/fsfw#683
2022-09-26 14:14:57 +02:00
Steffen Gaisser 69f1be263a Merge branch 'development' into mueller/local-pool-obj-base-better-warning 2022-09-26 14:10:21 +02:00
Robin Müller c7b5309dcb Merge branch 'development' into mueller/service-interface-include-correction 2022-09-26 14:08:38 +02:00
Ulrich Mohr 775d5632de update to ssh connection to doc server 2022-09-23 20:26:45 +02:00
Ulrich Mohr 4f3361eb2b another ci check 2022-09-23 18:33:47 +02:00
Ulrich Mohr 9e6c1d60e5 another ci check 2022-09-23 17:54:41 +02:00
Ulrich Mohr 12d0c23c13 Revert "testing deployment of documentation"
This reverts commit 5488ee715f.
2022-09-23 17:31:17 +02:00
Ulrich Mohr 5c3bb13834 Revert "testing deployment of both development and master doc"
This reverts commit c0000a8635.
2022-09-23 17:31:07 +02:00
Ulrich Mohr 292fe3e5e4 forgot epilog file 2022-09-23 17:11:57 +02:00
Ulrich Mohr 33530f2819 adding Impressum and Datenschutz to lcov output 2022-09-23 17:04:35 +02:00
Ulrich Mohr c0000a8635 testing deployment of both development and master doc 2022-09-23 14:14:10 +02:00
Ulrich Mohr 5488ee715f testing deployment of documentation 2022-09-23 14:07:12 +02:00
Ulrich Mohr 0fea22d031 switching to rsync and deploying to web documentation 2022-09-23 14:06:28 +02:00
Ulrich Mohr 3b8ca09299 prepared docker for documentation rsync 2022-09-23 13:46:03 +02:00
Ulrich Mohr 9a2146fa2d added impressum and datenschutz in sphinx documentation 2022-09-23 11:36:29 +02:00
Robin Müller 808e3e0462
remove unused variable 2022-09-16 18:54:48 +02:00
Robin Müller 558550ecb9 Merge branch 'development' into mueller/smaller-tweaks 2022-09-16 18:37:39 +02:00
Robin Müller 79ab0c4aa5 Merge branch 'mueller/smaller-tweaks' into develop 2022-09-16 18:24:39 +02:00
Robin Müller 72172a972b
update changelog 2022-09-16 18:24:23 +02:00
Robin Müller b4b11ebd3b fixes and tweaks 2022-09-16 18:20:42 +02:00
Robin Müller c5b24f2516
fixes and tweaks 2022-09-16 18:08:20 +02:00
Robin Müller bdbe0cc9da pass message queue externally 2022-09-16 16:28:41 +02:00
Robin Müller e2c1158337
pass message queue externally 2022-09-16 16:27:57 +02:00
Robin Müller 95aac7dc8d Merge pull request 'CFDP FSFW Integration' (#111) from cfdp-integration into develop
Reviewed-on: #111
2022-09-16 11:11:20 +02:00
Robin Müller 3d2fc28468
Merge remote-tracking branch 'upstream/mueller/new-cfdp-update-with-handlers' into cfdp-integration 2022-09-16 11:10:35 +02:00
Robin Müller 1898b4f2db Merge remote-tracking branch 'upstream/development' into update-from-upstream 2022-09-16 11:06:05 +02:00
Robin Müller c38088c64b
adaptions for enum renaming 2022-09-15 18:44:00 +02:00
Robin Müller 7eb63d6d79 Merge branch 'mueller/cfdp-update-without-handlers' into mueller/new-cfdp-update-with-handlers 2022-09-15 18:41:29 +02:00
Robin Müller 6f8ccf83e7
use singular enum names 2022-09-15 18:41:15 +02:00
Robin Müller 67f1cd0b5f Merge branch 'development' into mueller/cfdp-update-without-handlers 2022-09-15 18:35:22 +02:00
Robin Müller 1d54507517 Merge pull request 'merge upstream development' (#110) from mohr/merge-upstream into develop
Reviewed-on: #110
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2022-09-15 18:34:50 +02:00
Robin Müller ef9ed95fd1 Merge branch 'develop' into mohr/merge-upstream 2022-09-15 18:34:37 +02:00
Robin Müller ed68268c0c
generic cfdp handler wrapper 2022-09-15 16:53:04 +02:00
Robin Müller c549914efb
include helpers 2022-09-15 16:50:06 +02:00
Robin Müller 753d5ff39e
adaptions for enum renaming 2022-09-15 16:47:09 +02:00
Robin Müller 36ca35da77 Merge branch 'mueller/cfdp-update-without-handlers' into mueller/new-cfdp-update-with-handlers 2022-09-15 16:46:25 +02:00
Robin Müller 54762232a4
refactoring and condition code to strin converter 2022-09-15 16:46:09 +02:00
Robin Müller 4fb7375492 Merge branch 'mueller/cfdp-update-without-handlers' into mueller/new-cfdp-update-with-handlers 2022-09-15 16:21:32 +02:00
Robin Müller 2fee2fdff5
unittest which would have caught this 2022-09-15 16:20:52 +02:00
Robin Müller 47df9e8b5b Merge branch 'mueller/cfdp-update-without-handlers' into mueller/new-cfdp-update-with-handlers 2022-09-15 16:03:06 +02:00
Robin Müller 954c749de0
additional docs 2022-09-15 16:02:46 +02:00