Commit Graph

85 Commits

Author SHA1 Message Date
Robin Müller ef9d7aa7d3 Merge branch 'development' into mueller/extend-version-class 2022-05-16 14:42:23 +02:00
Robin Müller 13a34cd677
Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11 2022-05-13 11:58:41 +02:00
Robin Müller 271057ca6b
Merge remote-tracking branch 'upstream/development' into mueller/extend-version-class 2022-05-13 11:28:54 +02:00
Robin Müller e77bde459b
Merge remote-tracking branch 'upstream/development' into mueller/extend-version-class 2022-05-12 17:12:26 +02:00
Robin Müller c561271070 Merge branch 'development' into mueller/refactor-power-switch-if-etc 2022-05-12 17:09:27 +02:00
Robin Müller e5c140e0ae Merge branch 'development' into mueller/add-tc-scheduler-pus-11 2022-05-12 16:59:01 +02:00
Robin Müller 9a4c7589cc Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11 2022-05-12 15:52:47 +02:00
Steffen Gaisser 0410ecd9e3 Merge branch 'development' into mueller/add-lto-support 2022-05-10 11:51:39 +02:00
Robin Müller b38329aa0e Merge branch 'development' into mueller/extend-version-class 2022-05-10 11:19:48 +02:00
Robin Müller 0fe1b70bae
keep LTO option off by default 2022-05-10 11:19:29 +02:00
Robin Müller c5b4499d98
Merge remote-tracking branch 'upstream/development' into mueller/refactor-power-switch-if-etc 2022-05-10 09:58:21 +02:00
Ulrich Mohr 4499c9bf04 Merge pull request 'Added new functions to add sequences and tables' (#606) from eive/fsfw:mueller/new-ss-adder-functions into development
Reviewed-on: fsfw/fsfw#606
2022-05-10 09:35:16 +02:00
Robin Müller eb0223bc51 Merge branch 'development' into mueller/add-lto-support 2022-05-09 22:34:28 +02:00
Robin Müller be6a492022 Merge branch 'development' into mueller/extend-version-class 2022-05-09 22:34:09 +02:00
Robin Müller ece32f88f4 Merge remote-tracking branch 'origin/development' into mueller/tcp-server-bugfix 2022-05-09 16:14:17 +02:00
Robin Müller dd9e28fca1 Merge branch 'development' into mueller/add-lto-support 2022-05-09 16:09:31 +02:00
Robin Müller 88fa4f1d9d Merge remote-tracking branch 'origin/development' into mueller/tcp-server-bugfix 2022-05-09 15:55:07 +02:00
Robin Müller 75132c1e39 Merge branch 'development' into mueller/add-lto-support 2022-05-09 15:52:28 +02:00
Robin Müller f1acf8e18b Merge remote-tracking branch 'upstream/development' into mueller/extend-version-class 2022-05-09 15:48:04 +02:00
Robin Müller 281f91ec5d Merge remote-tracking branch 'origin/development' into mueller/health-srv-bugfix 2022-05-09 15:41:10 +02:00
Robin Müller 15352b539d Merge remote-tracking branch 'upstream/development' into mueller/refactor-power-switch-if-etc 2022-05-09 15:37:32 +02:00
Robin Müller 8a40878eb5 Merge remote-tracking branch 'origin/development' into mueller/add-lto-support 2022-05-09 15:17:16 +02:00
Robin Müller 10cc954d27 update changelog 2022-05-09 15:09:07 +02:00
Robin Müller 73ff9b97db bump CMAKE_CXX_STANDARD to C++17 2022-05-09 15:07:46 +02:00
Robin Müller b0d71597f0 update changelog 2022-05-09 14:58:39 +02:00
Robin Müller 398d04dc50
fixed tests 2022-05-09 11:15:18 +02:00
Robin Müller 6bfdace512
update changelog 2022-05-09 11:00:31 +02:00
Robin Müller 79f17843d8
update changelog 2022-05-09 10:50:29 +02:00
Robin Müller 637512ad77
changelog update 2022-05-09 10:34:14 +02:00
Robin Müller a4bd5a2aaa
update changelog 2022-05-09 10:31:03 +02:00
Robin Müller e98857fab4
update changelog 2022-04-28 14:37:21 +02:00
Robin Müller 8e4ad10627 Merge remote-tracking branch 'upstream/development' into mueller/extend-version-class 2022-04-27 08:46:18 +02:00
Robin Müller 496bc665d6 Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11 2022-04-27 08:45:47 +02:00
Robin Müller 2c8531ea48 Merge remote-tracking branch 'upstream/development' into mueller/refactor-power-switch-if-etc 2022-04-27 08:45:04 +02:00
Robin Müller 5b7ca8c13c
update CHANGELOG.md, apply afmt 2022-04-27 08:39:21 +02:00
Robin Müller b94685e045
added missing PR cross-ref 2022-04-25 15:44:46 +02:00
Robin Müller 572d602b72
improve changelog, add entry 2022-04-25 15:42:44 +02:00
Robin Müller d62ee6a611 Merge remote-tracking branch 'upstream/development' into mueller/extend-version-class 2022-04-25 15:23:46 +02:00
Robin Mueller 91ef4ff30b Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11 2022-04-25 15:23:15 +02:00
Robin Müller 4032228005
Merge remote-tracking branch 'upstream/development' into mueller/extend-version-class 2022-04-25 15:15:54 +02:00
Robin Mueller 68302e7c5e
Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11 2022-04-25 15:14:13 +02:00
Steffen Gaisser ac5a54b5da Merge branch 'development' into mueller/clock-addition 2022-04-25 15:12:24 +02:00
Robin Müller 29015b340b
update changelog 2022-04-25 15:10:50 +02:00
Ulrich Mohr 64274acbeb Merge pull request 'Add ETL dependency' (#592) from KSat/fsfw:mueller/add-etl-dependency into development
Reviewed-on: fsfw/fsfw#592
2022-04-25 15:08:05 +02:00
Robin Müller 68231db9a1
changelog typo 2022-04-22 15:37:14 +02:00
Robin Müller 539e01deee
minor form change 2022-04-22 14:53:12 +02:00
Robin Müller 4079edc80e
update changelog 2022-04-22 14:52:55 +02:00
Robin Mueller 352ab43c1f Merge remote-tracking branch 'upstream/development' into mueller/add-etl-dependency 2022-04-12 17:11:41 +02:00
Robin Mueller 35f257800e Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11 2022-04-12 17:10:55 +02:00
Robin Müller 97e98eae24 Merge branch 'development' into mueller/ipc-pass-arbitrary-args-to-mq 2022-04-12 17:06:30 +02:00