|
|
c28398257b
|
Merge remote-tracking branch 'upstream/development' into mueller/master
|
2021-02-13 18:56:11 +01:00 |
|
|
|
4154c06825
|
Merge branch 'source/develop' into mueller/master
|
2021-02-09 15:48:55 +01:00 |
|
|
|
8a1f043b39
|
Merge pull request 'Additional Update for Local Data Pools' (#367) from mueller/fsfw-update-2 into development
Reviewed-on: fsfw/fsfw#367
|
2021-02-09 15:20:25 +01:00 |
|
|
|
2a1aea7c73
|
Merge branch 'mueller/master' into mueller/fsfw-update-2
|
2021-02-09 15:07:40 +01:00 |
|
|
|
8d748a4bbf
|
Merge remote-tracking branch 'origin/development' into mueller/master
|
2021-02-09 15:07:14 +01:00 |
|
|
|
dc88424910
|
deleted commented code
|
2021-02-09 15:00:10 +01:00 |
|
|
|
03b2e1be3e
|
Merge remote-tracking branch 'origin/development' into mueller/fsfw-update-2
|
2021-02-09 14:58:21 +01:00 |
|
|
|
10390de63b
|
changelog update
|
2021-02-09 14:57:14 +01:00 |
|
|
|
0416aaf3fe
|
Merge pull request 'FSFW Update - Parameter Service (PUS 20)' (#365) from mueller/fsfw-update into development
Reviewed-on: fsfw/fsfw#365
|
2021-02-09 14:55:54 +01:00 |
|
|
|
ee67e46a9f
|
Merge remote-tracking branch 'origin/development' into mueller/fsfw-update-2
|
2021-02-09 14:44:19 +01:00 |
|
|
|
eb37a0ad2f
|
Merge remote-tracking branch 'origin/development' into mueller/fsfw-update
|
2021-02-09 14:27:49 +01:00 |
|
|
|
b9cb0495a9
|
Merge pull request 'RTEMS and DHB update' (#362) from mueller/rtems-update into development
Reviewed-on: fsfw/fsfw#362
|
2021-02-09 14:25:49 +01:00 |
|
|
|
ac5d0cf58f
|
Merge remote-tracking branch 'upstream/development' into mueller/rtems-update
|
2021-02-09 14:17:31 +01:00 |
|
|
|
48375a5221
|
Merge pull request 'RTEMS Updates and Bugfixes' (#363) from mueller/rtems-only into development
Reviewed-on: fsfw/fsfw#363
|
2021-02-09 14:14:36 +01:00 |
|
|
|
46e4816faf
|
Merge branch 'development' into mueller/rtems-only
|
2021-02-09 14:13:38 +01:00 |
|
|
|
85b92af777
|
Merge pull request 'ActionHelper: Better diagnostic output' (#370) from KSat/fsfw:mueller/action-diag-output into development
Reviewed-on: fsfw/fsfw#370
|
2021-02-09 14:13:25 +01:00 |
|
|
|
5136d90659
|
Merge remote-tracking branch 'upstream/development' into mueller/rtems-update
|
2021-02-09 14:13:16 +01:00 |
|
|
|
cb2c66e256
|
Merge branch 'development' into mueller/action-diag-output
|
2021-02-09 14:10:45 +01:00 |
|
|
|
72ce47358e
|
Merge remote-tracking branch 'upstream/development' into mueller/action-diag-output
|
2021-02-09 14:10:20 +01:00 |
|
|
|
36d1a36a74
|
Merge pull request 'CSB: Better diagnostic printout in case there are issues' (#369) from eive/fsfw:mueller/csb-diag-printout-request into development
Reviewed-on: fsfw/fsfw#369
|
2021-02-09 14:10:16 +01:00 |
|
|
|
ae5d880406
|
Merge branch 'development' into mueller/csb-diag-printout-request
|
2021-02-09 14:06:59 +01:00 |
|
|
|
bcd51c0725
|
Merge pull request 'replaced tabs by spaces for some folders with sed script' (#364) from mueller/first-tabs-to-spaces into development
Reviewed-on: fsfw/fsfw#364
|
2021-02-09 14:06:46 +01:00 |
|
|
|
5209a9bb89
|
Merge branch 'mueller/csb-diag-printout-request' into mueller/master
|
2021-02-09 12:42:52 +01:00 |
|
|
|
712ba5124c
|
Merge remote-tracking branch 'upstream/development' into mueller/action-diag-output
|
2021-02-08 14:29:07 +01:00 |
|
|
|
16763202c1
|
taken over action folder
|
2021-02-08 14:22:34 +01:00 |
|
|
|
9998de086f
|
added printouts for action helper
|
2021-02-08 14:20:36 +01:00 |
|
|
|
d4d3da60a9
|
format improvements
|
2021-02-08 13:47:20 +01:00 |
|
|
|
9b2772c126
|
better diagnostic printout if case there are issues
|
2021-02-08 13:42:44 +01:00 |
|
|
|
939fa16d1a
|
Merge remote-tracking branch 'upstream/mueller/master' into development
|
2021-02-06 16:14:29 +01:00 |
|
|
|
d736e9c874
|
deleted ctors
|
2021-02-06 14:15:56 +01:00 |
|
|
|
257e79f8fc
|
Merge remote-tracking branch 'upstream/mueller/master' into mueller/master
|
2021-02-05 11:17:26 +01:00 |
|
|
|
3bd7ba961e
|
just form stuff
|
2021-02-04 15:04:52 +01:00 |
|
|
|
6be6d593a3
|
minor tweaks
|
2021-02-04 13:46:27 +01:00 |
|
|
|
1829d9cf0a
|
lpid replaced by gpid
|
2021-02-04 01:31:46 +01:00 |
|
|
|
255d4a90a9
|
extended controller base
|
2021-02-03 22:23:31 +01:00 |
|
|
|
f7c1aae464
|
small tweak
|
2021-02-03 22:18:00 +01:00 |
|
|
|
cdb012fe5a
|
important bugfix
|
2021-02-03 22:09:22 +01:00 |
|
|
|
2bca40c527
|
printout improvements
|
2021-02-03 18:04:55 +01:00 |
|
|
|
1446ce94bf
|
small tweaks
|
2021-02-03 16:31:03 +01:00 |
|
|
|
8c5e261a0d
|
Merge remote-tracking branch 'upstream/mueller/master' into mueller/master
|
2021-02-03 13:39:09 +01:00 |
|
|
|
5f197be2ff
|
Merge remote-tracking branch 'upstream/mueller/master' into mueller/master
|
2021-02-03 13:36:45 +01:00 |
|
|
|
6e5252b69e
|
some more small stuff
|
2021-02-03 13:35:10 +01:00 |
|
|
|
093eb05269
|
small formatting changes
|
2021-02-03 13:33:50 +01:00 |
|
|
|
c1cb93baa9
|
whitespace stuff
|
2021-02-03 13:32:25 +01:00 |
|
|
|
c0b490df65
|
indentation
|
2021-02-03 13:32:14 +01:00 |
|
|
|
e27d4fd060
|
small bugfix
|
2021-02-03 13:30:04 +01:00 |
|
|
|
a404bc881e
|
removed hk switcher for now
|
2021-02-03 13:28:31 +01:00 |
|
|
|
5ac3762dc5
|
srv20 improvements and bugfixes
|
2021-01-31 20:53:25 +01:00 |
|
|
|
4522668066
|
some form stuff
|
2021-01-31 19:13:40 +01:00 |
|
|
|
8b90360b45
|
changed order
|
2021-01-31 18:27:21 +01:00 |
|
