merge upstream development #110
mohr
commented
Owner
No description provided.
mohr
added 69 commits 2022-09-14 12:57:30 +02:00
make two helper functions protected
9131ca688b
this is annoying
64a7fde301
small fix which allows sending action reply immediately
7345c18b04
bugfix for SP parser
28ecd0e5c6
do not cache previous recipient
7ae82a5cb4
add comment blocks
7d3223d766
update header
c7f300671f
more simplfications
01651f0521
Merge pull request 'DHB set action commander before buildCommandFromCommand' (#672) from eive/fsfw:mueller/dhb-set-action-commander-before-building-cmd into development
3010f2f925
Merge branch 'development' into mueller/fixes-tmtc-server-sp-parser
67980cb592
Merge pull request 'DHB TM handler alternative API raw buffer' (#671) from mueller/dhb-handle-device-tm-2 into development
60fd3d43c0
one small additional precaution
2b01e86f9c
Merge pull request 'Service 11 regression' (#670) from eive/fsfw:mueller/service-11-issues into development
7dec45ccf2
Merge pull request 'Bugfix for Space Packet Parser' (#673) from eive/fsfw:mueller/fixes-tmtc-server-sp-parser into development
eb8e236cd4
Merge remote-tracking branch 'origin/development' into mueller/refactor-tmtc-stack
5c20cc804e
test fix
04bff7a522
Merge remote-tracking branch 'origin/development' into mueller/refactor-local-pool-api
5f8c549993
Merge branch 'mueller/refactor-tmtc-stack' into mueller/refactor-local-pool-api
9202c6c17f
provide a weak print char impl
ebc02673dd
remove user includes
1e85cdadfd
another user-level-include
04800df31e
better warning
80355910ee
Merge pull request 'better warning for missing include paths' (#676) from mueller/better-missing-inc-path-warning into development
eb03bf52a6
Merge branch 'development' into mueller/provide-weak-print-char
26bc80964e
Some improvements for time stamper API
d64ad71529
Merge branch 'development' into mueller/refactor-tmtc-stack
ee93f4a4ca
refactor ctors
f0b7a103d4
update FSFWCnfig.h
b7a1f79d5b
del data wrapper
75dc7a405d
Merge branch 'mueller/refactor-tmtc-stack' of https://egit.irs.uni-stuttgart.de/fsfw/fsfw into mueller/refactor-tmtc-stack
b7ed8ff390
explicit include
4c3f9feb93
refactor tm helper
f5421e9abd
set buffer expects const pointer now
1e395dc402
rename const buf setter
3583e30ee6
rename setBuffer to setConstBuffer
16688316a8
Merge branch 'mueller/refactor-serial-buffer-adapter' into mueller/refactor-tmtc-stack
80464f2a81
bump catch2 version
07ef9a0ec3
remove bsp specific code
282704e0fd
update header as well
04b619a15c
sif::buffer: if disabeld do not print
d52f335455
Merge branch 'development' into mueller/remove-user-includes
6ae709acc3
Merge pull request 'provide a weak print char impl' (#674) from mueller/provide-weak-print-char into development
7e379d2159
Merge branch 'development' into mohr/enableDisable
6a6aa7fdd6
Merge pull request 'sif::buffer: if disabeld do not print' (#680) from mohr/enableDisable into development
80467bf097
Merge branch 'development' into mueller/refactor-tmtc-stack
a64a04d7fe
Merge pull request 'remove user includes' (#675) from mueller/remove-user-includes into development
1126db2c8a
Merge pull request 'remove bsp specific code' (#679) from mueller/remove-bsp-specific-code into development
aed30d54ef
Merge pull request 'bump catch2 version' (#678) from mueller/bump-catch2 into development
278ed36db8
Merge pull request 'SerialBufferAdapter refactoring' (#677) from mueller/refactor-serial-buffer-adapter into development
62cd39e573
Merge pull request 'Refactor TMTC Stack, improve test framework' (#655) from mueller/refactor-tmtc-stack into development
a5b5523111
Merge pull request 'Refactor Local Pool API' (#667) from mueller/refactor-local-pool-api into development
9ee1896553
Documentation build tools in docker
003a6d00fa
testing Jenkinsfile
92e3ab04f3
testing Jenkinsfile
d79b5348d8
add jenkins user in docker so that ssh will work
8bbde05413
testing Jenkinsfile
ecf51b2913
typo in Dockerfile
9c7248e78e
testing Jenkinsfile
9bd600c488
testing Jenkinsfile
8e835be55f
testing Jenkinsfile
fa5605c959
fixing scp command
6451a16888
fixing scp command again
24ecf125a3
fixing scp yet again
f34cf9095d
fixing scp yet again again
3257935150
pushing code coverage report to documentation server
21a9d89fb3
reverting to only publish development
af282c7d3e
small fix in README
6970068d56
Merge pull request 'publish documentation for development and master branch' (#681) from mohr/documentation_ci into development
0ce568ad26
Merge remote-tracking branch 'upstream/development' into mohr/merge-upstream
bd594123a2
mohr
requested review from muellerr 
muellerr
approved these changes
muellerr
added 1 commit 2022-09-15 18:34:40 +02:00
Merge branch 'develop' into mohr/merge-upstream
ef9ed95fd1
muellerr
merged commit 1d54507517 into develop
muellerr
referenced this issue from a commit
Merge pull request 'merge upstream development' (#110) from mohr/merge-upstream into develop
muellerr
deleted branch mohr/merge-upstream 
No Assignees
Notifications
Due Date
No due date set.
Dependencies
No dependencies set.
Reference: eive/fsfw#110
Loading…
x
Reference in New Issue
Block a user
No description provided.
Delete Branch "mohr/merge-upstream"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?