 Robin Müller
|
d700fb551c
|
Merge remote-tracking branch 'upstream/development' into eive/develop
|
2021-06-12 15:24:08 +02:00 |
|
Robin Müller
|
73bae057bd
|
default color is magneta now for wanring
|
2021-06-12 15:03:18 +02:00 |
|
Robin Müller
|
589e64fc46
|
void function now
|
2021-06-11 15:05:43 +02:00 |
|
Robin Müller
|
1630682548
|
added function to set color
|
2021-06-11 14:52:09 +02:00 |
|
Robin Müller
|
4b095eea89
|
Merge remote-tracking branch 'upstream/mueller/master' into mueller/master
|
2021-06-08 15:37:13 +02:00 |
|
Robin Müller
|
c3be4cdee6
|
Merge remote-tracking branch 'upstream/mueller/master' into mueller/master
|
2021-05-31 17:06:07 +02:00 |
|
Robin Müller
|
43d4953e4a
|
Merge remote-tracking branch 'ksat/mueller/master' into mueller/master
|
2021-05-27 14:10:12 +02:00 |
|
Robin Müller
|
2bf5a972e1
|
introduced std check
|
2021-05-27 11:56:52 +02:00 |
|
Robin Müller
|
5d2c62e75d
|
abstract function defined again
|
2021-05-26 14:15:48 +02:00 |
|
Robin Müller
|
e9adaf672f
|
Merge branch 'mueller/master' into eive/develop
|
2021-05-18 16:18:47 +02:00 |
|
Robin Müller
|
fc4e65b2fc
|
Merge remote-tracking branch 'ksat/mueller/master' into mueller/master
|
2021-05-18 15:55:31 +02:00 |
|
Robin Müller
|
ac027e3ff2
|
Merge remote-tracking branch 'upstream/mueller/master' into mueller/master
|
2021-05-17 16:00:41 +02:00 |
|
Robin Müller
|
d7d24bd9aa
|
Merge remote-tracking branch 'upstream/mueller/master' into mueller/master
|
2021-05-05 22:48:29 +02:00 |
|
Robin Müller
|
5273ffa721
|
Merge remote-tracking branch 'origin/meier/dhbMultipleReplies' into mueller/master
|
2021-04-25 11:08:54 +02:00 |
 Jakob Meier
|
e7c00b5633
|
Merge branch 'mueller/master' into meier/dhbMultipleReplies
|
2021-04-25 10:49:56 +02:00 |
|
Robin Müller
|
f2ab07c782
|
Merge branch 'meier/dhbMultipleReplies' into mueller/master
|
2021-04-24 23:55:37 +02:00 |
|
Robin Müller
|
ff33a1274d
|
deleted old bridge
|
2021-04-24 23:54:13 +02:00 |
|
Robin Müller
|
e7cfd324ae
|
Merge branch 'mueller/master' into meier/dhbMultipleReplies
|
2021-04-24 23:43:53 +02:00 |
|
Jakob Meier
|
52b549b97c
|
adapted object factory to fsfw changes
|
2021-04-24 22:54:18 +02:00 |
|
Robin Müller
|
cac9a0eecd
|
Merge remote-tracking branch 'upstream/mueller/master' into mueller/master
|
2021-04-24 22:48:43 +02:00 |
|
Robin Müller
|
56d43f5b49
|
better output
|
2021-04-24 22:46:12 +02:00 |
|
Jakob Meier
|
10e7e42388
|
Merge branch 'development' into meier/dhbMultipleReplies
|
2021-04-24 18:05:00 +02:00 |
|
Jakob Meier
|
fc34e7fd75
|
Merge branch 'development' of https://egit.irs.uni-stuttgart.de/eive/fsfw into development
|
2021-04-24 18:04:43 +02:00 |
|
Jakob Meier
|
18a9729c75
|
added multiple reply support
|
2021-04-24 13:52:06 +02:00 |
|
Robin Müller
|
720ce59680
|
Merge remote-tracking branch 'upstream/mueller/master' into mueller/master
|
2021-04-10 21:58:27 +02:00 |
|
Robin Müller
|
dea2205908
|
improved output
|
2021-04-01 15:20:53 +02:00 |
|
Robin Müller
|
f2da31239c
|
Merge remote-tracking branch 'upstream/mueller/master' into development
|
2021-03-29 14:36:53 +02:00 |
|
Jakob Meier
|
42720e6f7d
|
Merge branch 'development' of https://egit.irs.uni-stuttgart.de/eive/fsfw into development
|
2021-03-26 12:25:20 +01:00 |
|
Robin Müller
|
83d0db8242
|
fixed udp bridge
|
2021-03-20 15:53:43 +01:00 |
|
Robin Müller
|
533d164cac
|
Merge remote-tracking branch 'upstream/mueller/udp-hotfix' into mueller/master
|
2021-03-20 14:59:43 +01:00 |
|
Robin Müller
|
0e92fa4046
|
Merge remote-tracking branch 'upstream/development' into mueller/master
|
2021-03-19 15:41:58 +01:00 |
|
Jakob Meier
|
32b289cbec
|
Merge pull request 'FSFW Update' (#4) from mueller/master into eive/develop
Reviewed-on: eive/fsfw#4
|
2021-03-19 15:40:15 +01:00 |
|
Jakob Meier
|
fa108f0a3b
|
Merge branch 'development' of https://egit.irs.uni-stuttgart.de/eive/fsfw into development
|
2021-03-19 15:38:06 +01:00 |
|
Robin Müller
|
f82cc1bca4
|
Merge remote-tracking branch 'upstream/mueller/master' into mueller/master
|
2021-03-08 11:47:54 +01:00 |
|
Robin Müller
|
778ef4ef23
|
cleaned up a bit, no functional change
|
2021-03-06 20:36:54 +01:00 |
|
Robin Müller
|
17b8d3fed0
|
printout for trans timeout
|
2021-03-06 18:12:41 +01:00 |
|
Robin Müller
|
d57955ade7
|
Merge branch 'mueller/master' of https://egit.irs.uni-stuttgart.de/eive/fsfw into mueller/master
|
2021-03-05 21:12:21 +01:00 |
|
Robin Müller
|
18e40d6248
|
Merge remote-tracking branch 'upstream/mueller/master' into mueller/master
|
2021-03-05 19:22:46 +01:00 |
|
Jakob Meier
|
41e30dcb6c
|
Merge branch 'development' of https://egit.irs.uni-stuttgart.de/eive/fsfw into development
|
2021-03-04 19:14:12 +01:00 |
|
Robin Müller
|
92f249dc62
|
zero size handling
|
2021-02-24 00:23:48 +01:00 |
|
Robin Müller
|
f3cc664d4f
|
small printout tweak
|
2021-02-23 22:07:32 +01:00 |
|
Robin Müller
|
91f69aa34f
|
Merge branch 'eive/develop' into mueller/master
|
2021-02-23 14:47:30 +01:00 |
|
Robin Müller
|
8b561d073c
|
Merge remote-tracking branch 'upstream/development' into eive/develop
|
2021-02-23 14:47:15 +01:00 |
|
Robin Müller
|
c55cf8f279
|
Merge branch 'mueller/hotfix' into mueller/master
|
2021-02-23 14:41:50 +01:00 |
|
Robin Müller
|
c5b2c47af4
|
Merge branch 'mueller/mutex-update' into mueller/master
|
2021-02-23 14:14:40 +01:00 |
|
Robin Müller
|
f0178a8f73
|
preprocessor optimization
|
2021-02-23 14:13:55 +01:00 |
|
Robin Müller
|
e1b57424f8
|
Merge branch 'mueller/mutex-update' into mueller/master
|
2021-02-23 14:12:04 +01:00 |
|
Robin Müller
|
8d7d4c639a
|
Merge branch 'mueller/mutex-update' into mueller/master
|
2021-02-23 14:11:16 +01:00 |
|
Robin Müller
|
a3d245f5a0
|
mutex helper print support and nullptr check
|
2021-02-23 11:28:12 +01:00 |
|
Robin Müller
|
1ccfb74709
|
Merge branch 'mueller/linux-no-deadline-missed-printout' into eive/develop
|
2021-02-22 18:45:39 +01:00 |
|
Robin Müller
|
939fa16d1a
|
Merge remote-tracking branch 'upstream/mueller/master' into development
|
2021-02-06 16:14:29 +01:00 |