muellerr
|
2f3ed2d587
|
Merge remote-tracking branch 'upstream/development' into mueller/enhanced-controller
|
2020-12-01 15:36:12 +01:00 |
|
muellerr
|
ea83261881
|
Merge branch 'mueller/pus-improvements' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/pus-improvements
|
2020-12-01 15:26:14 +01:00 |
|
muellerr
|
0a016f391a
|
changelog update
|
2020-12-01 15:26:06 +01:00 |
|
muellerr
|
0b94ed9612
|
Merge branch 'development' into mueller/pus-improvements
|
2020-12-01 15:23:50 +01:00 |
|
muellerr
|
c9adcc742b
|
Merge remote-tracking branch 'upstream/development' into mueller/enhanced-controller
|
2020-12-01 15:17:33 +01:00 |
|
muellerr
|
e097f1b5d6
|
Merge branch 'development' into fsfwexample/small-tweaks
|
2020-12-01 15:12:35 +01:00 |
|
muellerr
|
70b4ca8753
|
Merge branch 'development' into fsfwexample/small-tweaks
|
2020-12-01 15:12:18 +01:00 |
|
muellerr
|
221bf7e228
|
Merge remote-tracking branch 'upstream/development' into mueller/pus-improvements
|
2020-12-01 15:10:55 +01:00 |
|
muellerr
|
0b32d3dac8
|
change log update
|
2020-12-01 15:10:23 +01:00 |
|
muellerr
|
506f5ff48b
|
Merge branch 'mueller/pus-improvements' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/pus-improvements
|
2020-12-01 15:07:19 +01:00 |
|
muellerr
|
a5b1fb0803
|
Merge remote-tracking branch 'upstream/development' into mueller/pus-improvements
|
2020-12-01 15:07:13 +01:00 |
|
muellerr
|
e80d799865
|
Merge branch 'master' into mueller/pus-improvements
|
2020-12-01 15:06:36 +01:00 |
|
muellerr
|
c72ba92247
|
health service update
|
2020-12-01 15:05:54 +01:00 |
|
muellerr
|
257e3e2db9
|
change log update
|
2020-12-01 15:03:49 +01:00 |
|
muellerr
|
1cb8532687
|
Merge branch 'development' into mueller/healthservice
|
2020-12-01 15:00:51 +01:00 |
|
muellerr
|
3e74c18d88
|
health servicd
|
2020-12-01 14:59:35 +01:00 |
|
muellerr
|
45df446ab8
|
change log update
|
2020-12-01 14:44:03 +01:00 |
|
muellerr
|
802e24e293
|
change log update
|
2020-12-01 14:43:36 +01:00 |
|
muellerr
|
2f8bc046ad
|
Merge branch 'development' of https://egit.irs.uni-stuttgart.de/fsfw/fsfw into development
|
2020-12-01 14:36:09 +01:00 |
|
muellerr
|
1f78496cd3
|
changelog update
|
2020-12-01 14:01:04 +01:00 |
|
muellerr
|
4b83738241
|
Merge branch 'mueller/enhanced-controller' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/enhanced-controller
|
2020-12-01 14:00:10 +01:00 |
|
muellerr
|
5757f9d7a2
|
Merge remote-tracking branch 'upstream/development' into mueller/enhanced-controller
|
2020-12-01 13:59:41 +01:00 |
|
muellerr
|
74029a8483
|
Merge branch 'development' into mueller/enhanced-controller
|
2020-12-01 13:58:40 +01:00 |
|
muellerr
|
244e2b5f13
|
Merge branch 'master' into mueller/enhanced-controller
|
2020-12-01 13:55:18 +01:00 |
|
muellerr
|
b8cc1ccf7e
|
Merge remote-tracking branch 'ksat/mueller/defaultcfg-update' into development
|
2020-12-01 13:49:30 +01:00 |
|
muellerr
|
98dae18430
|
update defaultcfg folder
|
2020-12-01 13:46:29 +01:00 |
|
muellerr
|
59619825ac
|
Merge pull request 'Merge master into devel' (#271) from master into development
Reviewed-on: fsfw/fsfw#271
|
2020-12-01 13:21:04 +01:00 |
|
muellerr
|
a2c28198ed
|
Merge branch 'development' into master
|
2020-12-01 13:20:33 +01:00 |
|
muellerr
|
e34ff44913
|
Merge branch 'master' into mueller/enhanced-controller
|
2020-11-30 12:39:25 +01:00 |
|
muellerr
|
49479faa1a
|
better solution
|
2020-11-30 12:37:22 +01:00 |
|
muellerr
|
c182171b09
|
updated make file
|
2020-11-30 12:32:38 +01:00 |
|
muellerr
|
9cec8e4c0d
|
Merge branch 'development' into fsfwexample/small-tweaks
|
2020-11-30 12:29:31 +01:00 |
|
muellerr
|
9bfba41875
|
Merge pull request 'Update devel' (#264) from master into development
Reviewed-on: fsfw/fsfw#264
|
2020-11-30 12:27:10 +01:00 |
|
muellerr
|
7fadb0d8c6
|
Merge branch 'master' into mueller/enhanced-controller
|
2020-11-26 16:28:25 +01:00 |
|
muellerr
|
eb08ef1c1f
|
Merge remote-tracking branch 'upstream/development' into development
|
2020-11-24 13:46:56 +01:00 |
|
muellerr
|
767f105762
|
added changelog
|
2020-11-24 13:45:34 +01:00 |
|
muellerr
|
8c294729d0
|
extern c definition added
|
2020-11-22 12:34:16 +01:00 |
|
muellerr
|
1cc0847bb5
|
small bugfix
|
2020-11-21 00:15:31 +01:00 |
|
muellerr
|
6c22fab208
|
pus service improvements
|
2020-11-09 21:33:09 +01:00 |
|
muellerr
|
136f04a5c6
|
trnaslation files removed
|
2020-11-09 21:23:51 +01:00 |
|
muellerr
|
37fc22a117
|
config folder renamed and improved
|
2020-11-09 21:21:56 +01:00 |
|
muellerr
|
3cd0f8f5f0
|
Merge remote-tracking branch 'upstream/development' into development
|
2020-11-02 17:29:26 +01:00 |
|
muellerr
|
edecb7882b
|
Merge branch 'eive/include-fsfw' into development
|
2020-11-02 17:21:43 +01:00 |
|
muellerr
|
cc51d9ace9
|
small fix so that it compiles
|
2020-11-02 17:21:25 +01:00 |
|
muellerr
|
3067259a9b
|
include added
|
2020-11-02 17:19:24 +01:00 |
|
muellerr
|
7d83767c2b
|
include added
|
2020-11-02 16:45:19 +01:00 |
|
muellerr
|
59c200254d
|
Merge branch 'master' into development
|
2020-11-02 16:03:10 +01:00 |
|
muellerr
|
2f993cf39a
|
some minor form stuff
|
2020-11-02 15:51:52 +01:00 |
|
muellerr
|
652dc00cc9
|
Merge branch 'master' into mueller/feature/windowsUdpBridge
|
2020-11-02 15:28:07 +01:00 |
|
muellerr
|
a7e06c11fd
|
Merge branch 'master' into fsfwtest/testcfg-fix
|
2020-11-02 15:12:44 +01:00 |
|
muellerr
|
bcbc61ccba
|
Merge branch 'master' into fsfwtest/testcfg-fix
|
2020-11-02 15:06:10 +01:00 |
|
muellerr
|
9221d0ca7c
|
Merge branch 'master' into development
|
2020-11-02 15:04:25 +01:00 |
|
muellerr
|
a7bc69b0ac
|
health table update
|
2020-11-02 15:00:01 +01:00 |
|
muellerr
|
77fd2cb871
|
mission timestmap size is uint8 now
|
2020-11-02 14:53:44 +01:00 |
|
muellerr
|
963c333365
|
cast added
|
2020-11-02 14:45:10 +01:00 |
|
muellerr
|
b441f5242f
|
Merge remote-tracking branch 'upstream/master' into development
|
2020-11-02 14:23:51 +01:00 |
|
muellerr
|
508f31a359
|
adaptions so it compiles
|
2020-11-02 14:19:56 +01:00 |
|
muellerr
|
5d0f96c3a1
|
reamde update
|
2020-10-30 14:42:42 +01:00 |
|
muellerr
|
82a2f3ec61
|
testcfg fix
|
2020-10-30 14:21:31 +01:00 |
|
muellerr
|
a5cf510ae9
|
host osal fixes
|
2020-10-30 13:31:07 +01:00 |
|
muellerr
|
a0d4c77d94
|
Merge remote-tracking branch 'upstream/master' into mueller/returnvalue-convergence
|
2020-10-30 11:06:09 +01:00 |
|
muellerr
|
3098f34eb0
|
health update
|
2020-10-29 17:52:28 +01:00 |
|
muellerr
|
e35aebcd0a
|
HasREturnvalue update
|
2020-10-29 17:45:06 +01:00 |
|
muellerr
|
af4c6f1d45
|
config mk update
|
2020-10-29 17:33:40 +01:00 |
|
muellerr
|
9b5e940965
|
config make fix
|
2020-10-29 17:32:07 +01:00 |
|
muellerr
|
f5b0589f79
|
event manager update
|
2020-10-29 17:28:33 +01:00 |
|
muellerr
|
567cbd39ef
|
include fixes
|
2020-10-29 17:22:41 +01:00 |
|
muellerr
|
78896323b6
|
fsfw config update
|
2020-10-29 17:09:43 +01:00 |
|
muellerr
|
ba036805de
|
Merge branch 'master' into mueller/action-update
|
2020-10-29 16:49:07 +01:00 |
|
muellerr
|
9af5855ece
|
event stuff added
|
2020-10-29 15:23:14 +01:00 |
|
muellerr
|
64c341b5f6
|
now really five
|
2020-10-29 15:17:33 +01:00 |
|
muellerr
|
27e0b9cf38
|
default FIFO depth is 5 now
|
2020-10-29 15:17:13 +01:00 |
|
muellerr
|
4dd79b3495
|
not static anymore
|
2020-10-29 15:16:16 +01:00 |
|
muellerr
|
64ec4835f3
|
Merge branch 'master' into mueller/defaultcfg
|
2020-10-29 15:15:52 +01:00 |
|
muellerr
|
4229e256d1
|
include guard fix
|
2020-10-29 13:55:49 +01:00 |
|
muellerr
|
352296d200
|
action helper update
|
2020-10-29 13:52:52 +01:00 |
|
muellerr
|
4557a2eb36
|
better comments
|
2020-10-29 13:34:53 +01:00 |
|
muellerr
|
edb2d3848d
|
some improverments for simple helper
|
2020-10-29 13:27:41 +01:00 |
|
muellerr
|
56da648026
|
config folder update
|
2020-10-29 13:16:14 +01:00 |
|
muellerr
|
38135a3d53
|
reamde update
|
2020-10-29 13:13:48 +01:00 |
|
muellerr
|
3c1415a4bd
|
todos removed2
|
2020-10-29 13:08:09 +01:00 |
|
muellerr
|
08496c378e
|
Merge branch 'mueller/action-update' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/action-update
|
2020-10-29 13:07:17 +01:00 |
|
muellerr
|
af18f6c94c
|
todos removed
|
2020-10-29 13:07:08 +01:00 |
|
muellerr
|
5a8431e82b
|
Merge branch 'master' into mueller/action-update
|
2020-10-29 13:04:48 +01:00 |
|
muellerr
|
97f6dace26
|
some fixes for master
|
2020-10-29 12:42:29 +01:00 |
|
muellerr
|
c8fd698b3a
|
some changes
|
2020-10-29 12:23:27 +01:00 |
|
muellerr
|
50151310dc
|
Merge branch 'master' into mueller/unittest-integration-from-master
|
2020-10-29 12:20:38 +01:00 |
|
muellerr
|
53e98df37d
|
tm packet stored
|
2020-10-28 19:44:37 +01:00 |
|
muellerr
|
cb71a18277
|
ack fields improved
|
2020-10-28 19:21:33 +01:00 |
|
muellerr
|
546db47db4
|
more refactoring
|
2020-10-28 02:20:12 +01:00 |
|
muellerr
|
ce322ed121
|
Merge remote-tracking branch 'upstream/master' into mueller_tcPacketBase
|
2020-10-27 23:31:23 +01:00 |
|
muellerr
|
2eb1a5c1a0
|
Merge branch 'master' into mueller/enhanced-controller
|
2020-10-27 15:11:39 +01:00 |
|
muellerr
|
6cce062d62
|
some more fixes
|
2020-10-20 17:52:43 +02:00 |
|
muellerr
|
29a796ebdb
|
include names fixed
|
2020-10-20 17:51:13 +02:00 |
|
muellerr
|
ede00dfdcc
|
double files removed, versioning files renamed
|
2020-10-20 17:50:10 +02:00 |
|
muellerr
|
e4d323683d
|
readme fix
|
2020-10-20 17:47:52 +02:00 |
|
muellerr
|
4d4300cee6
|
Merge branch 'mueller/defaultcfg' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/defaultcfg
|
2020-10-20 17:44:35 +02:00 |
|
muellerr
|
1940a2acf0
|
some fixes
|
2020-10-20 17:44:27 +02:00 |
|
muellerr
|
279682351a
|
Merge branch 'master' into mueller/defaultcfg
|
2020-10-20 17:41:33 +02:00 |
|
muellerr
|
247c9f2947
|
added readme
|
2020-10-20 17:39:11 +02:00 |
|