Commit Graph

5727 Commits

Author SHA1 Message Date
42c5881c50 Merge pull request 'TMTC Stack Refactoring' (#106) from mueller/tmtc-stack-refactoring into develop
Reviewed-on: eive/fsfw#106
2022-08-16 17:30:16 +02:00
cdd0ca70ed Merge branch 'develop' into mueller/tmtc-stack-refactoring 2022-08-16 17:29:48 +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
2e52d7a31d Merge branch 'mueller/refactor-tmtc-stack' into mueller/cfdp-routers 2022-08-16 17:23:52 +02:00
239d053562
update changelog 2022-08-16 17:23:10 +02:00
875174c4ad
better name for global object 2022-08-16 17:17:45 +02:00
8fd8a37f59
flip verif reporter ctor arguments 2022-08-16 17:10:48 +02:00
d815f422c3
improve verif reporter API 2022-08-16 17:09:22 +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
f63f3fa564 more occurences in comments 2022-08-16 12:12:21 +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
7f9269b387
fix for def cfg 2022-08-15 20:30:59 +02:00
4224c3d009
bump changelog 2022-08-15 20:29:23 +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
e76e109bdb Merge branch 'mueller/refactor-tmtc-stack' into mueller/cfdp-routers 2022-08-15 19:17:15 +02:00
9e064fe800
fix unittests 2022-08-15 19:16:31 +02:00
2339c48756
Merge branch 'mueller/refactor-tmtc-stack' into mueller/cfdp-routers 2022-08-15 19:07:22 +02:00
d7ec04bf4b
Merge remote-tracking branch 'origin/development' into mueller/refactor-tmtc-stack 2022-08-15 19:05:50 +02:00
4d82d0e4c1
update source sequence counter code 2022-08-15 17:24:48 +02:00
adcc375f25 Merge pull request 'New UnsignedByte Field class' (#660) from mueller/new-object-id-class into development
Reviewed-on: fsfw/fsfw#660
2022-08-15 15:22:30 +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
57ce5d1f34 Merge pull request 'Expand SerializeIF' (#656) from mueller/expand-serialize-if into development
Reviewed-on: fsfw/fsfw#656
2022-08-15 15:13:50 +02:00
90963b3940 Merge pull request 'group MGM data in local pool vectors' (#664) from eive/fsfw:mueller/group-mgm-data into development
Reviewed-on: fsfw/fsfw#664
2022-08-15 15:07:16 +02:00
71ed95b09a Merge branch 'development' into mueller/group-mgm-data 2022-08-15 15:03:35 +02:00
7ac4f1c64d Merge branch 'development' into mueller/new-object-id-class 2022-08-15 15:03:11 +02:00
9d64b96e9a
update changelog 2022-08-15 15:02:39 +02:00
5de2c6af66 Merge branch 'mueller/new-object-id-class' of https://egit.irs.uni-stuttgart.de/fsfw/fsfw into mueller/new-object-id-class 2022-08-15 15:02:12 +02:00
ca2efb6021
remove object ID 2022-08-15 15:02:05 +02:00
3b000d924a Merge branch 'development' into mueller/expand-retval-if 2022-08-15 14:36:04 +02:00
deeeef553b
remove implicit machine endianness variants 2022-08-15 14:34:04 +02:00
0e7ec79af9 Merge pull request 'Add Linux HAL options' (#663) from eive/fsfw:mueller/cmake-linux-hal-options into development
Reviewed-on: fsfw/fsfw#663
2022-08-15 13:58:09 +02:00
007f958a0b
fsfw fixes for merge 2022-08-15 11:38:52 +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
d3cabd8984
afmt 2022-08-15 11:26:29 +02:00
8efe85cb15 Merge branch 'development' into mueller/new-object-id-class 2022-08-15 11:25:51 +02:00
b28091e05b Merge remote-tracking branch 'upstream/mueller/expand-serialize-if' into develop 2022-08-15 11:25:07 +02:00
f4c4f9946c
printout preproc block 2022-08-15 11:18:53 +02:00
7f89022f5b
Merge branch 'mueller/group-mgm-data' into develop 2022-08-15 10:50:10 +02:00
b28c26b288
group MGM data in local pool vectors 2022-08-15 10:49:00 +02:00
8b4253bc46
update cmakelists.txt 2022-08-12 13:02:30 +02:00
fdcfd89ed2
add some Linux HAL options 2022-08-12 12:55:31 +02:00
03fa77e2b3
get current uptime correctly 2022-08-12 12:29:10 +02:00
8970a7379a
Merge remote-tracking branch 'upstream/development' into mueller/update-from-upstream 2022-08-12 12:21:50 +02:00
c12492df03
continued host FS test 2022-08-11 10:19:25 +02:00