|
|
b71ccf8dd8
|
some refactoring
|
2020-11-03 15:28:55 +01:00 |
|
|
|
3920fd89bd
|
Merge branch 'master' into mueller/enhanced-controller
|
2020-11-03 12:06:56 +01:00 |
|
|
|
3cd0f8f5f0
|
Merge remote-tracking branch 'upstream/development' into development
|
2020-11-02 17:29:26 +01:00 |
|
|
|
edecb7882b
|
Merge branch 'eive/include-fsfw' into development
|
2020-11-02 17:21:43 +01:00 |
|
|
|
cc51d9ace9
|
small fix so that it compiles
|
2020-11-02 17:21:25 +01:00 |
|
|
|
3067259a9b
|
include added
|
2020-11-02 17:19:24 +01:00 |
|
|
|
7d83767c2b
|
include added
|
2020-11-02 16:45:19 +01:00 |
|
|
|
59c200254d
|
Merge branch 'master' into development
|
2020-11-02 16:03:10 +01:00 |
|
|
|
71382032a1
|
Merge remote-tracking branch 'upstream/master' into mueller/parameter-convergence
|
2020-11-02 15:55:07 +01:00 |
|
|
|
cd71a9cc12
|
fsfw container taken over
|
2020-11-02 15:53:08 +01:00 |
|
|
|
2f993cf39a
|
some minor form stuff
|
2020-11-02 15:51:52 +01:00 |
|
|
|
41bf5622f3
|
master taken over
|
2020-11-02 15:50:14 +01:00 |
|
|
|
aed7f31f24
|
health changes taken over
|
2020-11-02 15:47:09 +01:00 |
|
|
|
319765ad1d
|
Merge remote-tracking branch 'upstream/master' into mueller/newLocalDataPools
|
2020-11-02 15:41:48 +01:00 |
|
|
|
9180c76ca7
|
Merge remote-tracking branch 'upstream/master' into mueller/LocalPoolRefactoring
|
2020-11-02 15:38:08 +01:00 |
|
|
|
0ff092e8b9
|
Merge remote-tracking branch 'upstream/master' into mueller/LocalPoolRefactoring
|
2020-11-02 15:35:30 +01:00 |
|
|
|
6bedc9b805
|
Merge pull request 'added new windows udp bridge' (#188) from KSat/fsfw:mueller/feature/windowsUdpBridge into master
Reviewed-on: fsfw/fsfw#188
|
2020-11-02 15:29:08 +01:00 |
|
|
|
652dc00cc9
|
Merge branch 'master' into mueller/feature/windowsUdpBridge
|
2020-11-02 15:28:07 +01:00 |
|
|
|
719aab2a26
|
Merge pull request 'health update' (#246) from KSat/fsfw:mueller/health-convergence into master
Reviewed-on: fsfw/fsfw#246
|
2020-11-02 15:26:51 +01:00 |
|
|
|
470196a044
|
Merge branch 'master' into mueller/health-convergence
|
2020-11-02 15:22:58 +01:00 |
|
|
|
9c9facf4a1
|
Merge pull request 'host osal fixes' (#247) from eive/fsfw:development into master
Reviewed-on: fsfw/fsfw#247
|
2020-11-02 15:22:37 +01:00 |
|
|
|
cf46aebf32
|
Merge branch 'master' into development
|
2020-11-02 15:16:10 +01:00 |
|
|
|
449a08c92c
|
Merge pull request 'testcfg fix' (#248) from fsfwtest/testcfg-fix into master
Reviewed-on: fsfw/fsfw#248
|
2020-11-02 15:15:59 +01:00 |
|
|
|
a7e06c11fd
|
Merge branch 'master' into fsfwtest/testcfg-fix
|
2020-11-02 15:12:44 +01:00 |
|
|
|
0c15a90399
|
Merge pull request 'Default Configuration' (#243) from KSat/fsfw:mueller/defaultcfg into master
Reviewed-on: fsfw/fsfw#243
|
2020-11-02 15:09:55 +01:00 |
|
|
|
bcbc61ccba
|
Merge branch 'master' into fsfwtest/testcfg-fix
|
2020-11-02 15:06:10 +01:00 |
|
|
|
9221d0ca7c
|
Merge branch 'master' into development
|
2020-11-02 15:04:25 +01:00 |
|
|
|
a7bc69b0ac
|
health table update
|
2020-11-02 15:00:01 +01:00 |
|
|
|
77fd2cb871
|
mission timestmap size is uint8 now
|
2020-11-02 14:53:44 +01:00 |
|
|
|
093d3562b6
|
Merge branch 'master' into mueller/health-convergence
|
2020-11-02 14:53:20 +01:00 |
|
|
|
2761ee8109
|
Merge branch 'master' into mueller/defaultcfg
|
2020-11-02 14:48:23 +01:00 |
|
|
|
52d3dbfd20
|
Merge pull request 'HasReturnvaluesIF small improvements' (#245) from KSat/fsfw:mueller/returnvalue-convergence into master
Reviewed-on: fsfw/fsfw#245
|
2020-11-02 14:48:10 +01:00 |
|
|
|
d42a1e2abc
|
Merge remote-tracking branch 'upstream/master' into mueller/newLocalDataPools
|
2020-11-02 14:46:16 +01:00 |
|
|
|
963c333365
|
cast added
|
2020-11-02 14:45:10 +01:00 |
|
|
|
1f632b9331
|
Merge remote-tracking branch 'upstream/master' into mueller/newLocalDataPools
|
2020-11-02 14:41:47 +01:00 |
|
|
|
b441f5242f
|
Merge remote-tracking branch 'upstream/master' into development
|
2020-11-02 14:23:51 +01:00 |
|
|
|
508f31a359
|
adaptions so it compiles
|
2020-11-02 14:19:56 +01:00 |
|
|
|
5d0f96c3a1
|
reamde update
|
2020-10-30 14:42:42 +01:00 |
|
|
|
82a2f3ec61
|
testcfg fix
|
2020-10-30 14:21:31 +01:00 |
|
|
|
a5cf510ae9
|
host osal fixes
|
2020-10-30 13:31:07 +01:00 |
|
|
|
a0d4c77d94
|
Merge remote-tracking branch 'upstream/master' into mueller/returnvalue-convergence
|
2020-10-30 11:06:09 +01:00 |
|
|
|
0b855c5b55
|
Merge branch 'master' into mueller/defaultcfg
|
2020-10-29 20:09:31 +01:00 |
|
|
|
38830dfc17
|
Merge branch 'master' into mueller/health-convergence
|
2020-10-29 20:06:03 +01:00 |
|
|
|
11a351a202
|
Merge pull request 'Unittest integrated in FSFW now' (#242) from KSat/fsfw:mueller/unittest-integration-from-master into master
Reviewed-on: fsfw/fsfw#242
|
2020-10-29 20:05:30 +01:00 |
|
|
|
51c5b05f03
|
Merge branch 'master' into mueller/unittest-integration-from-master
|
2020-10-29 19:59:23 +01:00 |
|
|
|
de5e62a9c8
|
Merge pull request 'Action folder: minor form improvements, include guards' (#235) from KSat/fsfw:mueller/action-update into master
Reviewed-on: fsfw/fsfw#235
|
2020-10-29 19:59:05 +01:00 |
|
|
|
6ea9334923
|
parameter updates
|
2020-10-29 17:57:27 +01:00 |
|
|
|
3098f34eb0
|
health update
|
2020-10-29 17:52:28 +01:00 |
|
|
|
e0a11f3a6e
|
include guard update
|
2020-10-29 17:46:44 +01:00 |
|
|
|
e35aebcd0a
|
HasREturnvalue update
|
2020-10-29 17:45:06 +01:00 |
|
