Commit Graph

130 Commits

Author SHA1 Message Date
c42da5df86 fixed DHB unittest for new Actions 2022-09-14 17:04:17 +02:00
253aa30263 fixing merge 2022-09-14 16:31:24 +02:00
eae7bfc935 Merge branch 'mohr/merge-upstream' into mohr/introspection 2022-09-14 16:23:23 +02:00
bd594123a2 Merge remote-tracking branch 'upstream/development' into mohr/merge-upstream 2022-09-14 12:54:15 +02:00
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
3583e30ee6
rename const buf setter 2022-09-05 16:27:20 +02:00
75dc7a405d
del data wrapper 2022-09-05 16:02:32 +02:00
d64ad71529
Some improvements for time stamper API 2022-09-05 14:44:35 +02:00
9202c6c17f Merge branch 'mueller/refactor-tmtc-stack' into mueller/refactor-local-pool-api 2022-09-01 17:51:50 +02:00
5f8c549993 Merge remote-tracking branch 'origin/development' into mueller/refactor-local-pool-api 2022-09-01 17:51:44 +02:00
04bff7a522
test fix 2022-09-01 17:51:09 +02:00
5c20cc804e Merge remote-tracking branch 'origin/development' into mueller/refactor-tmtc-stack 2022-09-01 17:48:40 +02:00
2b01e86f9c one small additional precaution 2022-09-01 11:56:07 +02:00
496dac89e4
important bugfix for TCP TMTC server 2022-08-31 22:47:58 +02:00
6ebd6a965b
Merge remote-tracking branch 'upstream/mueller/data-wrapper' into develop 2022-08-30 16:05:02 +02:00
8d1777fa0c
additional tests 2022-08-30 16:02:50 +02:00
3ebebbd493 Merge branch 'develop' into mueller/data-wrapper-update 2022-08-30 14:54:20 +02:00
a8c066dccc Merge remote-tracking branch 'upstream/mueller/refactor-local-pool-api' into develop 2022-08-30 14:54:03 +02:00
4d17f1c4bb
Merge remote-tracking branch 'upstream/mueller/refactor-tmtc-stack' into develop 2022-08-30 14:53:38 +02:00
d4ed528426
Merge remote-tracking branch 'upstream/mueller/data-wrapper' into mueller/data-wrapper-update 2022-08-30 14:52:09 +02:00
192255df1c
additional test 2022-08-30 14:03:33 +02:00
bdd79d060d
basic data wrapper unittests 2022-08-30 14:02:58 +02:00
a9277622ce
move data wrapper 2022-08-30 12:04:15 +02:00
9fedd03ed8
use cfg struct for local pool API 2022-08-30 11:02:21 +02:00
92d65aa3a5
use old lpm api 2022-08-30 10:57:02 +02:00
f5866ddace
missing replacements 2022-08-24 17:25:45 +02:00
f91ad84bdc
Merge remote-tracking branch 'upstream/mueller/refactor-tmtc-stack' into mueller/refactor-tmtc-stack-retval-merged 2022-08-24 17:13:41 +02:00
10f34e5a48
Merge remote-tracking branch 'origin/development' into mueller/refactor-tmtc-stack-with-retval-refactoring 2022-08-22 15:57:22 +02:00
8c8d1cfa84
apply auto-formatter 2022-08-22 15:02:16 +02:00
2a4ab0af7b
Merge branch 'mueller/refactor-tmtc-stack' into mueller/refactor-tmtc-stack-with-retval-refactoring 2022-08-22 14:17:24 +02:00
31f59f915c Merge commit 'd9759581' into mohr/introspection 2022-08-18 12:20:20 +02:00
e3648b6e30 Merge remote-tracking branch 'upstream/mueller/refactor-tmtc-stack' into mueller/tmtc-stack-refactoring 2022-08-16 17:25:22 +02:00
875174c4ad
better name for global object 2022-08-16 17:17:45 +02:00
217276d50c renamed returnvalue header 2022-08-16 12:48:22 +02:00
d2ac3603a5 some more occurences 2022-08-16 12:29:53 +02:00
d975958120 Merge remote-tracking branch 'upstream/development' into develop 2022-08-16 11:26:59 +02:00
fc34d56239
cicd fix 2022-08-16 01:12:50 +02:00
1037102349
merge retval refactoring 2022-08-16 01:08:26 +02:00
221361eb9c
Merge remote-tracking branch 'origin/development' into mueller/expand-retval-if 2022-08-15 20:32:38 +02:00
62fe75ee40
perform renaming 2022-08-15 20:28:16 +02:00
c57e95c698 Merge remote-tracking branch 'upstream/mueller/refactor-tmtc-stack' into mueller/tmtc-stack-refactoring 2022-08-15 19:18:46 +02:00
9e064fe800
fix unittests 2022-08-15 19:16:31 +02:00
d7ec04bf4b
Merge remote-tracking branch 'origin/development' into mueller/refactor-tmtc-stack 2022-08-15 19:05:50 +02:00
94a718ff19 Merge remote-tracking branch 'origin/development' into mueller/expand-retval-if 2022-08-15 15:15:51 +02:00
4a10f76784 Merge remote-tracking branch 'origin/development' into mueller/new-object-id-class 2022-08-15 15:15:00 +02:00
ca2efb6021
remove object ID 2022-08-15 15:02:05 +02:00
deeeef553b
remove implicit machine endianness variants 2022-08-15 14:34:04 +02:00
d022ce82c5
Merge remote-tracking branch 'upstream/mueller/refactor-tmtc-stack' into mueller/tmtc-stack-refactoring 2022-08-15 11:30:09 +02:00
b28091e05b Merge remote-tracking branch 'upstream/mueller/expand-serialize-if' into develop 2022-08-15 11:25:07 +02:00
8970a7379a
Merge remote-tracking branch 'upstream/development' into mueller/update-from-upstream 2022-08-12 12:21:50 +02:00