eive/fsfw
eive
/
fsfw
forked from fsfw/fsfw
14
1
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

merge upstream development #110

Merged
muellerr merged 70 commits from mohr/merge-upstream into develop 2022-09-15 18:34:50 +02:00
Conversation 0 Commits 70 Files Changed 48 +315 -381

70 Commits

Author SHA1 Message Date
Robin Müller ef9ed95fd1 Merge branch 'develop' into mohr/merge-upstream 2022-09-15 18:34:37 +02:00
Ulrich Mohr bd594123a2 Merge remote-tracking branch 'upstream/development' into mohr/merge-upstream 2022-09-14 12:54:15 +02:00
Robin Müller 0ce568ad26 Merge pull request 'publish documentation for development and master branch' (#681) from mohr/documentation_ci into development 
Reviewed-on: fsfw/fsfw#681
 2022-09-14 11:22:35 +02:00
Ulrich Mohr 6970068d56 small fix in README 2022-09-13 18:19:35 +02:00
Ulrich Mohr af282c7d3e reverting to only publish development 2022-09-13 18:17:56 +02:00
Ulrich Mohr 21a9d89fb3 pushing code coverage report to documentation server 2022-09-13 18:14:26 +02:00
Ulrich Mohr 3257935150 fixing scp yet again again 2022-09-13 18:06:16 +02:00
Ulrich Mohr f34cf9095d fixing scp yet again 2022-09-13 18:02:38 +02:00
Ulrich Mohr 24ecf125a3 fixing scp command again 2022-09-13 17:55:12 +02:00
Ulrich Mohr 6451a16888 fixing scp command 2022-09-13 17:51:01 +02:00
Ulrich Mohr fa5605c959 testing Jenkinsfile 2022-09-13 14:50:37 +02:00
Ulrich Mohr 8e835be55f testing Jenkinsfile 2022-09-13 14:46:12 +02:00
Ulrich Mohr 9bd600c488 testing Jenkinsfile 2022-09-13 14:32:10 +02:00
Ulrich Mohr 9c7248e78e typo in Dockerfile 2022-09-13 14:20:30 +02:00
Ulrich Mohr ecf51b2913 testing Jenkinsfile 2022-09-13 14:09:08 +02:00
Ulrich Mohr 8bbde05413 add jenkins user in docker so that ssh will work 2022-09-13 14:08:04 +02:00
Ulrich Mohr d79b5348d8 testing Jenkinsfile 2022-09-13 14:00:36 +02:00
Ulrich Mohr 92e3ab04f3 testing Jenkinsfile 2022-09-13 13:54:23 +02:00
Ulrich Mohr 003a6d00fa Documentation build tools in docker 2022-09-13 13:13:18 +02:00
Ulrich Mohr 9ee1896553 Merge pull request 'Refactor Local Pool API' (#667) from mueller/refactor-local-pool-api into development 
Reviewed-on: fsfw/fsfw#667
 2022-09-12 14:32:08 +02:00
Ulrich Mohr a5b5523111 Merge pull request 'Refactor TMTC Stack, improve test framework' (#655) from mueller/refactor-tmtc-stack into development 
Reviewed-on: fsfw/fsfw#655
 2022-09-12 14:31:22 +02:00
Ulrich Mohr 62cd39e573 Merge pull request 'SerialBufferAdapter refactoring' (#677) from mueller/refactor-serial-buffer-adapter into development 
Reviewed-on: fsfw/fsfw#677
 2022-09-12 14:30:51 +02:00
Ulrich Mohr 278ed36db8 Merge pull request 'bump catch2 version' (#678) from mueller/bump-catch2 into development 
Reviewed-on: fsfw/fsfw#678
 2022-09-12 14:24:28 +02:00
Ulrich Mohr aed30d54ef Merge pull request 'remove bsp specific code' (#679) from mueller/remove-bsp-specific-code into development 
Reviewed-on: fsfw/fsfw#679
 2022-09-12 14:23:48 +02:00
Ulrich Mohr 1126db2c8a Merge pull request 'remove user includes' (#675) from mueller/remove-user-includes into development 
Reviewed-on: fsfw/fsfw#675
 2022-09-12 14:15:18 +02:00
Ulrich Mohr a64a04d7fe Merge branch 'development' into mueller/refactor-tmtc-stack 2022-09-12 14:14:49 +02:00
Robin Müller 80467bf097 Merge pull request 'sif::buffer: if disabeld do not print' (#680) from mohr/enableDisable into development 
Reviewed-on: fsfw/fsfw#680
 2022-09-12 14:12:13 +02:00
Robin Müller 6a6aa7fdd6 Merge branch 'development' into mohr/enableDisable 2022-09-12 14:11:38 +02:00
Ulrich Mohr 7e379d2159 Merge pull request 'provide a weak print char impl' (#674) from mueller/provide-weak-print-char into development 
Reviewed-on: fsfw/fsfw#674
 2022-09-12 14:10:31 +02:00
Robin Müller 6ae709acc3 Merge branch 'development' into mueller/remove-user-includes 2022-09-12 14:07:09 +02:00
Ulrich Mohr d52f335455 sif::buffer: if disabeld do not print 2022-09-08 11:47:40 +02:00
Robin Müller 04b619a15c
update header as well 2022-09-07 17:58:49 +02:00
Robin Müller 282704e0fd
remove bsp specific code 2022-09-07 17:54:04 +02:00
Robin Müller 07ef9a0ec3
bump catch2 version 2022-09-06 15:47:04 +02:00
Robin Müller 80464f2a81
Merge branch 'mueller/refactor-serial-buffer-adapter' into mueller/refactor-tmtc-stack 2022-09-05 16:38:58 +02:00
Robin Müller 16688316a8
rename setBuffer to setConstBuffer 2022-09-05 16:31:56 +02:00
Robin Müller 3583e30ee6
rename const buf setter 2022-09-05 16:27:20 +02:00
Robin Müller 1e395dc402
set buffer expects const pointer now 2022-09-05 16:25:02 +02:00
Robin Müller f5421e9abd
refactor tm helper 2022-09-05 16:10:06 +02:00
Robin Müller 4c3f9feb93
explicit include 2022-09-05 16:06:24 +02:00
Robin Müller b7ed8ff390 Merge branch 'mueller/refactor-tmtc-stack' of https://egit.irs.uni-stuttgart.de/fsfw/fsfw into mueller/refactor-tmtc-stack 2022-09-05 16:02:41 +02:00
Robin Müller 75dc7a405d
del data wrapper 2022-09-05 16:02:32 +02:00
Robin Müller b7a1f79d5b
update FSFWCnfig.h 2022-09-05 15:36:12 +02:00
Robin Müller f0b7a103d4
refactor ctors 2022-09-05 15:30:53 +02:00
Robin Müller ee93f4a4ca Merge branch 'development' into mueller/refactor-tmtc-stack 2022-09-05 14:46:51 +02:00
Robin Müller d64ad71529
Some improvements for time stamper API 2022-09-05 14:44:35 +02:00
Robin Müller 26bc80964e Merge branch 'development' into mueller/provide-weak-print-char 2022-09-05 14:14:06 +02:00
Steffen Gaisser eb03bf52a6 Merge pull request 'better warning for missing include paths' (#676) from mueller/better-missing-inc-path-warning into development 
Reviewed-on: fsfw/fsfw#676
 2022-09-05 14:13:19 +02:00
Robin Müller 80355910ee
better warning 2022-09-02 09:05:10 +02:00
Robin Müller 04800df31e
another user-level-include 2022-09-02 09:04:37 +02:00
Robin Müller 1e85cdadfd
remove user includes 2022-09-02 08:55:33 +02:00
Robin Müller ebc02673dd
provide a weak print char impl 2022-09-02 08:50:39 +02:00
Robin Müller 9202c6c17f Merge branch 'mueller/refactor-tmtc-stack' into mueller/refactor-local-pool-api 2022-09-01 17:51:50 +02:00
Robin Müller 5f8c549993 Merge remote-tracking branch 'origin/development' into mueller/refactor-local-pool-api 2022-09-01 17:51:44 +02:00
Robin Müller 04bff7a522
test fix 2022-09-01 17:51:09 +02:00
Robin Müller 5c20cc804e Merge remote-tracking branch 'origin/development' into mueller/refactor-tmtc-stack 2022-09-01 17:48:40 +02:00
Ulrich Mohr eb8e236cd4 Merge pull request 'Bugfix for Space Packet Parser' (#673) from eive/fsfw:mueller/fixes-tmtc-server-sp-parser into development 
Reviewed-on: fsfw/fsfw#673
 2022-09-01 14:12:16 +02:00
Ulrich Mohr 7dec45ccf2 Merge pull request 'Service 11 regression' (#670) from eive/fsfw:mueller/service-11-issues into development 
Reviewed-on: fsfw/fsfw#670
 2022-09-01 11:59:18 +02:00
Ulrich Mohr 2b01e86f9c one small additional precaution 2022-09-01 11:56:07 +02:00
Ulrich Mohr 60fd3d43c0 Merge pull request 'DHB TM handler alternative API raw buffer' (#671) from mueller/dhb-handle-device-tm-2 into development 
Reviewed-on: fsfw/fsfw#671
 2022-09-01 11:22:17 +02:00
Robin Müller 67980cb592 Merge branch 'development' into mueller/fixes-tmtc-server-sp-parser 2022-09-01 11:21:02 +02:00
Ulrich Mohr 3010f2f925 Merge pull request 'DHB set action commander before buildCommandFromCommand' (#672) from eive/fsfw:mueller/dhb-set-action-commander-before-building-cmd into development 
Reviewed-on: fsfw/fsfw#672
 2022-09-01 11:18:32 +02:00
Robin Müller 01651f0521 more simplfications 2022-09-01 10:52:48 +02:00
Robin Müller c7f300671f
update header 2022-09-01 10:45:10 +02:00
Robin Müller 7d3223d766
add comment blocks 2022-09-01 10:44:57 +02:00
Robin Müller 7ae82a5cb4
do not cache previous recipient 2022-09-01 08:58:18 +02:00
Robin Müller 28ecd0e5c6
bugfix for SP parser 2022-09-01 08:51:12 +02:00
Robin Müller 7345c18b04 small fix which allows sending action reply immediately 2022-08-31 16:50:48 +02:00
Robin Müller 64a7fde301 this is annoying 2022-08-30 15:19:01 +02:00
Robin Müller 9131ca688b
make two helper functions protected 2022-08-30 15:01:10 +02:00