Commit Graph

3032 Commits

Author SHA1 Message Date
Robin Müller c5b2c47af4 Merge branch 'mueller/mutex-update' into mueller/master 2021-02-23 14:14:40 +01:00
Robin Müller ce770a67b2 preprocessor define improved 2021-02-23 14:14:23 +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 06eadb55ab small stuff 2021-02-23 14:11:53 +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 58e219981f updated mutex helper 2021-02-23 14:09:55 +01:00
Robin Müller 671bab012e mutex helper printf support and nullptr check 2021-02-23 11:30:11 +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 1443758274 added new static function to print missed deadline 2021-02-22 18:43:09 +01:00
Robin Müller e013ae954f removed missed deadline printout 2021-02-22 18:00:23 +01:00
Robin Müller c28398257b Merge remote-tracking branch 'upstream/development' into mueller/master 2021-02-13 18:56:11 +01:00
Steffen Gaisser 8a1f043b39 Merge pull request 'Additional Update for Local Data Pools' (#367) from mueller/fsfw-update-2 into development
Reviewed-on: #367
2021-02-09 15:20:25 +01:00
Robin Müller 2a1aea7c73 Merge branch 'mueller/master' into mueller/fsfw-update-2 2021-02-09 15:07:40 +01:00
Robin Müller 8d748a4bbf Merge remote-tracking branch 'origin/development' into mueller/master 2021-02-09 15:07:14 +01:00
Robin Müller dc88424910 deleted commented code 2021-02-09 15:00:10 +01:00
Robin Müller 03b2e1be3e Merge remote-tracking branch 'origin/development' into mueller/fsfw-update-2 2021-02-09 14:58:21 +01:00
Robin Müller 10390de63b changelog update 2021-02-09 14:57:14 +01:00
Steffen Gaisser 0416aaf3fe Merge pull request 'FSFW Update - Parameter Service (PUS 20)' (#365) from mueller/fsfw-update into development
Reviewed-on: #365
2021-02-09 14:55:54 +01:00
Robin Müller ee67e46a9f Merge remote-tracking branch 'origin/development' into mueller/fsfw-update-2 2021-02-09 14:44:19 +01:00
Robin Müller eb37a0ad2f Merge remote-tracking branch 'origin/development' into mueller/fsfw-update 2021-02-09 14:27:49 +01:00
Steffen Gaisser b9cb0495a9 Merge pull request 'RTEMS and DHB update' (#362) from mueller/rtems-update into development
Reviewed-on: #362
2021-02-09 14:25:49 +01:00
Robin Müller ac5d0cf58f Merge remote-tracking branch 'upstream/development' into mueller/rtems-update 2021-02-09 14:17:31 +01:00
Steffen Gaisser 48375a5221 Merge pull request 'RTEMS Updates and Bugfixes' (#363) from mueller/rtems-only into development
Reviewed-on: #363
2021-02-09 14:14:36 +01:00
Steffen Gaisser 46e4816faf Merge branch 'development' into mueller/rtems-only 2021-02-09 14:13:38 +01:00
Steffen Gaisser 85b92af777 Merge pull request 'ActionHelper: Better diagnostic output' (#370) from KSat/fsfw:mueller/action-diag-output into development
Reviewed-on: #370
2021-02-09 14:13:25 +01:00
Robin Müller 5136d90659 Merge remote-tracking branch 'upstream/development' into mueller/rtems-update 2021-02-09 14:13:16 +01:00
Steffen Gaisser cb2c66e256 Merge branch 'development' into mueller/action-diag-output 2021-02-09 14:10:45 +01:00
Robin Müller 72ce47358e Merge remote-tracking branch 'upstream/development' into mueller/action-diag-output 2021-02-09 14:10:20 +01:00
Steffen Gaisser 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: #369
2021-02-09 14:10:16 +01:00
Steffen Gaisser ae5d880406 Merge branch 'development' into mueller/csb-diag-printout-request 2021-02-09 14:06:59 +01:00
Steffen Gaisser 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: #364
2021-02-09 14:06:46 +01:00
Robin Müller 5209a9bb89 Merge branch 'mueller/csb-diag-printout-request' into mueller/master 2021-02-09 12:42:52 +01:00
Robin Müller 712ba5124c Merge remote-tracking branch 'upstream/development' into mueller/action-diag-output 2021-02-08 14:29:07 +01:00
Robin Müller 16763202c1 taken over action folder 2021-02-08 14:22:34 +01:00
Robin Müller d4d3da60a9 format improvements 2021-02-08 13:47:20 +01:00
Robin Müller 9b2772c126 better diagnostic printout if case there are issues 2021-02-08 13:42:44 +01:00
Robin Müller 939fa16d1a Merge remote-tracking branch 'upstream/mueller/master' into development 2021-02-06 16:14:29 +01:00
Robin Müller d736e9c874 deleted ctors 2021-02-06 14:15:56 +01:00
Robin Müller 257e79f8fc Merge remote-tracking branch 'upstream/mueller/master' into mueller/master 2021-02-05 11:17:26 +01:00
Robin Müller 3bd7ba961e just form stuff 2021-02-04 15:04:52 +01:00
Robin Müller 6be6d593a3 minor tweaks 2021-02-04 13:46:27 +01:00
Robin Müller 1829d9cf0a lpid replaced by gpid 2021-02-04 01:31:46 +01:00
Robin Müller 255d4a90a9 extended controller base 2021-02-03 22:23:31 +01:00
Robin Müller f7c1aae464 small tweak 2021-02-03 22:18:00 +01:00
Robin Müller cdb012fe5a important bugfix 2021-02-03 22:09:22 +01:00
Robin Müller 2bca40c527 printout improvements 2021-02-03 18:04:55 +01:00
Robin Müller 1446ce94bf small tweaks 2021-02-03 16:31:03 +01:00
Robin Müller 8c5e261a0d Merge remote-tracking branch 'upstream/mueller/master' into mueller/master 2021-02-03 13:39:09 +01:00