Commit Graph

266 Commits

Author SHA1 Message Date
Robin Müller 3d2fc28468
Merge remote-tracking branch 'upstream/mueller/new-cfdp-update-with-handlers' into cfdp-integration 2022-09-16 11:10:35 +02:00
Robin Müller 1898b4f2db Merge remote-tracking branch 'upstream/development' into update-from-upstream 2022-09-16 11:06:05 +02:00
Robin Müller e585c1d84a
Merge remote-tracking branch 'origin/development' into mueller/cfdp-update-without-handlers 2022-09-15 11:02:04 +02:00
Robin Müller 83b7b8707c
Merge remote-tracking branch 'origin/development' into mueller/refactor-accepts-tc-tm-if 2022-09-15 11:01:19 +02:00
Robin Müller 4f7f8310c9
Merge remote-tracking branch 'origin/development' into mueller/local-pool-update 2022-09-15 11:00:43 +02:00
Robin Müller 1a833e2d45
another missing changelog entry 2022-09-15 10:59:10 +02:00
Robin Müller 8df6d934d7
another missing changelog entry 2022-09-15 10:56:52 +02:00
Robin Müller 5363868120
added another missing changelog entry 2022-09-15 10:54:45 +02:00
Robin Müller 36cf59cc8e
Merge branch 'mueller/refactor-accepts-tc-tm-if' into mueller/cfdp-update-without-handlers 2022-09-15 10:52:13 +02:00
Robin Müller 97fec909f2
Merge branch 'mueller/local-pool-update' into mueller/cfdp-update-without-handlers 2022-09-15 10:50:35 +02:00
Robin Müller 1db77753e3
Merge remote-tracking branch 'origin/development' into mueller/local-pool-update 2022-09-15 10:49:24 +02:00
Robin Müller 8501477a78
Merge remote-tracking branch 'origin/development' into mueller/refactor-accepts-tc-tm-if 2022-09-15 10:48:42 +02:00
Robin Müller 9a181aa6a8
another missing changelog entry 2022-09-15 10:47:50 +02:00
Robin Müller 655c944c0e
another missing changelog entry 2022-09-15 10:45:35 +02:00
Robin Müller 2e310fca8d
add another missing changelog entry 2022-09-15 10:43:45 +02:00
Robin Müller 37390dfc74
add missing changelog entry 2022-09-15 10:42:35 +02:00
Robin Müller 75ddfdc65d
Merge branch 'mueller/refactor-accepts-tc-tm-if' into mueller/cfdp-update-without-handlers 2022-09-15 10:41:16 +02:00
Robin Müller 1efc0d2855
update changelog 2022-09-15 10:38:40 +02:00
Robin Müller e063b44899
add link to PR 2022-09-15 10:32:38 +02:00
Robin Müller b3c0e24611
bump changelog 2022-09-15 10:31:55 +02:00
Robin Müller 723f8749d4
bump changelog 2022-09-14 19:52:33 +02:00
Robin Müller 73f1917c81
update changelog 2022-09-14 19:26:07 +02:00
Robin Müller eedf57624f
Merge remote-tracking branch 'upstream/mueller/dhb-handle-device-tm' into develop 2022-08-30 15:40:52 +02:00
Robin Müller d4ed528426
Merge remote-tracking branch 'upstream/mueller/data-wrapper' into mueller/data-wrapper-update 2022-08-30 14:52:09 +02:00
Robin Müller e10e71cee9
Merge branch 'mueller/data-wrapper' into mueller/dhb-handle-device-tm 2022-08-30 14:42:13 +02:00
Robin Müller d675a789a2
update changelog 2022-08-30 14:41:37 +02:00
Robin Müller 6b8c83be29
update changelog 2022-08-30 14:40:02 +02:00
Robin Müller f91ad84bdc
Merge remote-tracking branch 'upstream/mueller/refactor-tmtc-stack' into mueller/refactor-tmtc-stack-retval-merged 2022-08-24 17:13:41 +02:00
Robin Müller a46d8c34d9
small changelog update 2022-08-22 16:37:53 +02:00
Robin Müller 10f34e5a48
Merge remote-tracking branch 'origin/development' into mueller/refactor-tmtc-stack-with-retval-refactoring 2022-08-22 15:57:22 +02:00
Robin Müller 2a4ab0af7b
Merge branch 'mueller/refactor-tmtc-stack' into mueller/refactor-tmtc-stack-with-retval-refactoring 2022-08-22 14:17:24 +02:00
Robin Müller e3648b6e30 Merge remote-tracking branch 'upstream/mueller/refactor-tmtc-stack' into mueller/tmtc-stack-refactoring 2022-08-16 17:25:22 +02:00
Robin Müller 239d053562
update changelog 2022-08-16 17:23:10 +02:00
Ulrich Mohr f63f3fa564 more occurences in comments 2022-08-16 12:12:21 +02:00
Robin Müller 1037102349
merge retval refactoring 2022-08-16 01:08:26 +02:00
Robin Müller 221361eb9c
Merge remote-tracking branch 'origin/development' into mueller/expand-retval-if 2022-08-15 20:32:38 +02:00
Robin Müller 4224c3d009
bump changelog 2022-08-15 20:29:23 +02:00
Robin Müller c57e95c698 Merge remote-tracking branch 'upstream/mueller/refactor-tmtc-stack' into mueller/tmtc-stack-refactoring 2022-08-15 19:18:46 +02:00
Robin Müller 9d64b96e9a
update changelog 2022-08-15 15:02:39 +02:00
Robin Müller 8970a7379a
Merge remote-tracking branch 'upstream/development' into mueller/update-from-upstream 2022-08-12 12:21:50 +02:00
Robin Müller 05d4162f5b Merge branch 'development' into v5.0.0 2022-07-25 14:35:36 +02:00
Robin Müller e030878023
changelog 2022-07-25 14:33:10 +02:00
Robin Müller 9bbe1dc716 Merge branch 'development' into mueller/possible-ring-buffer-fix 2022-07-21 13:23:44 +02:00
Robin Müller 6f751c2cf9 Merge branch 'development' into v5.0.0 2022-07-18 15:12:21 +02:00
Robin Müller 91067cde98
typo 2022-07-18 15:00:40 +02:00
Robin Müller 428018e4f1 update changelog 2022-07-18 14:59:25 +02:00
Robin Müller 8b6dd3f868
add date to changelog 2022-07-18 14:49:27 +02:00
Robin Müller 4da18172b3 Merge branch 'development' into mueller/possible-ring-buffer-fix 2022-07-18 14:37:56 +02:00
Ulrich Mohr 2e42f53682 Merge pull request 'New PoolEntry constructor' (#651) from eive/fsfw:mueller/new-pool-entry-ctor into development
Reviewed-on: fsfw/fsfw#651
2022-07-13 17:43:56 +02:00
Robin Müller 0e49640306
update CHANGELOG 2022-07-08 17:59:43 +02:00
Robin Müller 0519083894
remove duplicate entries 2022-07-08 17:48:06 +02:00
Robin Müller a4247cd723
Merge remote-tracking branch 'upstream/development' into mueller/update-from-upstream 2022-07-04 10:53:52 +02:00
Robin Müller 2ebefdffae
Merge remote-tracking branch 'upstream/development' into mueller/possible-ring-buffer-fix 2022-06-21 10:49:03 +02:00
Steffen Gaisser 732b615cb3 Merge branch 'development' into mueller/new-cicd-cmake-opts 2022-06-20 16:34:13 +02:00
Robin Müller d47a908117 Merge branch 'development' into mueller/task-if-refactoring 2022-06-20 09:40:31 +02:00
Robin Müller a3c0b441ec update changelog 2022-06-08 12:12:33 +02:00
Robin Müller 3f9e459f48 update changelog 2022-06-08 12:12:09 +02:00
Robin Müller 98b711a872 update changelog 2022-06-08 12:12:09 +02:00
Robin Müller 4b323053ec
Merge remote-tracking branch 'upstream/development' into mueller/update-from-upstream 2022-05-16 15:27:58 +02:00
Robin Müller d871f55a89
Merge remote-tracking branch 'upstream/development' into mueller/possible-ring-buffer-fix 2022-05-16 15:13:47 +02:00
Robin Müller 816550b69c Merge remote-tracking branch 'upstream/development' into mueller/new-cicd-cmake-opts 2022-05-16 14:58:25 +02:00
Robin Müller ef9d7aa7d3 Merge branch 'development' into mueller/extend-version-class 2022-05-16 14:42:23 +02:00
Robin Müller 8a12a5097e
Merge branch 'mueller/apply-afmt' into mueller/new-cicd-cmake-opts 2022-05-13 13:50:41 +02:00
Robin Müller 0375ee1881
update changelog 2022-05-13 13:46:54 +02:00
Robin Müller 2708b71d77
Merge remote-tracking branch 'origin/development' into mueller/new-cicd-cmake-opts 2022-05-13 12:00:40 +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 ff40a71582
Merge remote-tracking branch 'upstream/development' into mueller/possible-ring-buffer-fix 2022-05-13 11:30:32 +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 fc2b709148
resolve merge conflict 2022-05-12 20:48:50 +02:00
Robin Müller 02473a0cd7
Merge remote-tracking branch 'origin/develop' into mueller/health-if-extension-eive 2022-05-12 20:11:45 +02:00
Robin Müller 2e4b9bcd7c
Merge remote-tracking branch 'origin/development' into mueller/new-cicd-cmake-opts 2022-05-12 17:42:49 +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
Robin Müller e1604b292c Merge branch 'development' into mueller/possible-ring-buffer-fix 2022-05-11 11:34:32 +02:00
Robin Müller ab2d7ca98f
update changelog and docs 2022-05-11 11:29:28 +02:00
Robin Müller 5941c21adf
Merge remote-tracking branch 'origin/develop' into mueller/spi-speed-mode-getter 2022-05-11 10:58:13 +02:00
Robin Müller 0e880de0d0
update changelog 2022-05-11 10:54:39 +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 aacaf52fd9 Merge branch 'development' into mueller/new-cicd-cmake-opts 2022-05-09 15:34:36 +02:00
Robin Müller 89f83f4e3d update changelog 2022-05-09 15:33:03 +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 e2eb4bfea4 Merge remote-tracking branch 'upstream/development' into mueller/update-from-upstream 2022-04-28 14:30:08 +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 d3e7037759 Merge branch 'development' into mueller/possible-ring-buffer-fix 2022-04-27 08:42:24 +02:00
Robin Müller 5b7ca8c13c
update CHANGELOG.md, apply afmt 2022-04-27 08:39:21 +02:00
Robin Müller 466a3639a5
Merge remote-tracking branch 'upstream/development' into mueller/update-fsfw 2022-04-26 10:02:43 +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 755dcf66a3 Merge remote-tracking branch 'upstream/development' into mueller/possible-ring-buffer-fix 2022-04-25 15:16:52 +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 b7ffd2653b Merge remote-tracking branch 'upstream/development' into mueller/possible-ring-buffer-fix 2022-04-25 15:11:52 +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
Robin Mueller 7c2e50b665
added related PR in changelog 2022-04-11 17:32:01 +02:00
Robin Mueller 6aa54fe1d4
added missing empty implementation 2022-04-11 17:30:27 +02:00
Robin Mueller a18bc15cbb
update changelog 2022-04-11 16:16:56 +02:00
Robin Müller d1151ca707
changelog update 2022-04-11 16:13:47 +02:00
Robin Müller 5525466b52
update changelog 2022-03-28 20:57:30 +02:00
Robin Müller 8ff9eadf30
update changelog, add basic instructions for etl 2022-03-28 20:43:36 +02:00
Robin Müller f598f7030f
Merge remote-tracking branch 'upstream/development' into mueller/possible-ring-buffer-fix 2022-03-28 15:03:01 +02:00
Steffen Gaisser 70f575396d Added changelog 2022-03-25 15:27:22 +01:00
Ulrich Mohr c60aa68d00 changed hal linux uart baudrate and bits per word to enums 2022-03-24 15:44:32 +01:00
Robin Müller f441505476
update changelog 2022-03-22 17:41:49 +01:00
Robin Müller 522cbc7f3d
Merge remote-tracking branch 'upstream/development' into mueller/version-getter-upstream 2022-03-14 14:38:27 +01:00
Robin Müller 97c93afeff Merge remote-tracking branch 'upstream/development' into mueller/version-getter-upstream 2022-03-14 14:24:43 +01:00
Robin Müller 5d6de90859
Merge remote-tracking branch 'upstream/development' into mueller/spi-initialize-line-state 2022-03-14 14:15:13 +01:00
Robin Müller 949549178a
update changelog 2022-03-10 09:36:36 +01:00
Robin Müller 77e5fba7fd
update changelog 2022-03-08 10:08:53 +01:00
Robin Müller 14620fdd72
minor correction 2022-03-08 09:02:40 +01:00
Robin Müller 89c1878622
add link to PR 2022-03-08 09:01:23 +01:00
Robin Müller d6856fc54a
another minor changelog update 2022-03-08 09:00:14 +01:00
Robin Müller e5a9cab34e
fix changelog 2022-03-08 08:57:18 +01:00
Robin Müller 983fa346b3
update CHANGELOG 2022-03-07 16:17:33 +01:00
Robin Müller 41a82e923c
update changelog 2022-03-07 16:09:18 +01:00