Commit Graph

282 Commits

Author SHA1 Message Date
1037102349
merge retval refactoring 2022-08-16 01:08:26 +02:00
221361eb9c
Merge remote-tracking branch 'origin/development' into mueller/expand-retval-if 2022-08-15 20:32:38 +02:00
4224c3d009
bump changelog 2022-08-15 20:29:23 +02:00
c57e95c698 Merge remote-tracking branch 'upstream/mueller/refactor-tmtc-stack' into mueller/tmtc-stack-refactoring 2022-08-15 19:18:46 +02:00
9d64b96e9a
update changelog 2022-08-15 15:02:39 +02:00
8970a7379a
Merge remote-tracking branch 'upstream/development' into mueller/update-from-upstream 2022-08-12 12:21:50 +02:00
05d4162f5b Merge branch 'development' into v5.0.0 2022-07-25 14:35:36 +02:00
e030878023
changelog 2022-07-25 14:33:10 +02:00
9bbe1dc716 Merge branch 'development' into mueller/possible-ring-buffer-fix 2022-07-21 13:23:44 +02:00
6f751c2cf9 Merge branch 'development' into v5.0.0 2022-07-18 15:12:21 +02:00
91067cde98
typo 2022-07-18 15:00:40 +02:00
428018e4f1 update changelog 2022-07-18 14:59:25 +02:00
8b6dd3f868
add date to changelog 2022-07-18 14:49:27 +02:00
4da18172b3 Merge branch 'development' into mueller/possible-ring-buffer-fix 2022-07-18 14:37:56 +02:00
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
0e49640306
update CHANGELOG 2022-07-08 17:59:43 +02:00
0519083894
remove duplicate entries 2022-07-08 17:48:06 +02:00
a4247cd723
Merge remote-tracking branch 'upstream/development' into mueller/update-from-upstream 2022-07-04 10:53:52 +02:00
2ebefdffae
Merge remote-tracking branch 'upstream/development' into mueller/possible-ring-buffer-fix 2022-06-21 10:49:03 +02:00
732b615cb3 Merge branch 'development' into mueller/new-cicd-cmake-opts 2022-06-20 16:34:13 +02:00
d47a908117 Merge branch 'development' into mueller/task-if-refactoring 2022-06-20 09:40:31 +02:00
a3c0b441ec update changelog 2022-06-08 12:12:33 +02:00
3f9e459f48 update changelog 2022-06-08 12:12:09 +02:00
98b711a872 update changelog 2022-06-08 12:12:09 +02:00
4b323053ec
Merge remote-tracking branch 'upstream/development' into mueller/update-from-upstream 2022-05-16 15:27:58 +02:00
d871f55a89
Merge remote-tracking branch 'upstream/development' into mueller/possible-ring-buffer-fix 2022-05-16 15:13:47 +02:00
816550b69c Merge remote-tracking branch 'upstream/development' into mueller/new-cicd-cmake-opts 2022-05-16 14:58:25 +02:00
ef9d7aa7d3 Merge branch 'development' into mueller/extend-version-class 2022-05-16 14:42:23 +02:00
8a12a5097e
Merge branch 'mueller/apply-afmt' into mueller/new-cicd-cmake-opts 2022-05-13 13:50:41 +02:00
0375ee1881
update changelog 2022-05-13 13:46:54 +02:00
2708b71d77
Merge remote-tracking branch 'origin/development' into mueller/new-cicd-cmake-opts 2022-05-13 12:00:40 +02:00
13a34cd677
Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11 2022-05-13 11:58:41 +02:00
ff40a71582
Merge remote-tracking branch 'upstream/development' into mueller/possible-ring-buffer-fix 2022-05-13 11:30:32 +02:00
271057ca6b
Merge remote-tracking branch 'upstream/development' into mueller/extend-version-class 2022-05-13 11:28:54 +02:00
fc2b709148
resolve merge conflict 2022-05-12 20:48:50 +02:00
02473a0cd7
Merge remote-tracking branch 'origin/develop' into mueller/health-if-extension-eive 2022-05-12 20:11:45 +02:00
2e4b9bcd7c
Merge remote-tracking branch 'origin/development' into mueller/new-cicd-cmake-opts 2022-05-12 17:42:49 +02:00
e77bde459b
Merge remote-tracking branch 'upstream/development' into mueller/extend-version-class 2022-05-12 17:12:26 +02:00
c561271070 Merge branch 'development' into mueller/refactor-power-switch-if-etc 2022-05-12 17:09:27 +02:00
e5c140e0ae Merge branch 'development' into mueller/add-tc-scheduler-pus-11 2022-05-12 16:59:01 +02:00
9a4c7589cc Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11 2022-05-12 15:52:47 +02:00
e1604b292c Merge branch 'development' into mueller/possible-ring-buffer-fix 2022-05-11 11:34:32 +02:00
ab2d7ca98f
update changelog and docs 2022-05-11 11:29:28 +02:00
5941c21adf
Merge remote-tracking branch 'origin/develop' into mueller/spi-speed-mode-getter 2022-05-11 10:58:13 +02:00
0e880de0d0
update changelog 2022-05-11 10:54:39 +02:00
0410ecd9e3 Merge branch 'development' into mueller/add-lto-support 2022-05-10 11:51:39 +02:00
b38329aa0e Merge branch 'development' into mueller/extend-version-class 2022-05-10 11:19:48 +02:00
0fe1b70bae
keep LTO option off by default 2022-05-10 11:19:29 +02:00
c5b4499d98
Merge remote-tracking branch 'upstream/development' into mueller/refactor-power-switch-if-etc 2022-05-10 09:58:21 +02:00
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
eb0223bc51 Merge branch 'development' into mueller/add-lto-support 2022-05-09 22:34:28 +02:00
be6a492022 Merge branch 'development' into mueller/extend-version-class 2022-05-09 22:34:09 +02:00
ece32f88f4 Merge remote-tracking branch 'origin/development' into mueller/tcp-server-bugfix 2022-05-09 16:14:17 +02:00
dd9e28fca1 Merge branch 'development' into mueller/add-lto-support 2022-05-09 16:09:31 +02:00
88fa4f1d9d Merge remote-tracking branch 'origin/development' into mueller/tcp-server-bugfix 2022-05-09 15:55:07 +02:00
75132c1e39 Merge branch 'development' into mueller/add-lto-support 2022-05-09 15:52:28 +02:00
f1acf8e18b Merge remote-tracking branch 'upstream/development' into mueller/extend-version-class 2022-05-09 15:48:04 +02:00
281f91ec5d Merge remote-tracking branch 'origin/development' into mueller/health-srv-bugfix 2022-05-09 15:41:10 +02:00
15352b539d Merge remote-tracking branch 'upstream/development' into mueller/refactor-power-switch-if-etc 2022-05-09 15:37:32 +02:00
aacaf52fd9 Merge branch 'development' into mueller/new-cicd-cmake-opts 2022-05-09 15:34:36 +02:00
89f83f4e3d update changelog 2022-05-09 15:33:03 +02:00
8a40878eb5 Merge remote-tracking branch 'origin/development' into mueller/add-lto-support 2022-05-09 15:17:16 +02:00
10cc954d27 update changelog 2022-05-09 15:09:07 +02:00
73ff9b97db bump CMAKE_CXX_STANDARD to C++17 2022-05-09 15:07:46 +02:00
b0d71597f0 update changelog 2022-05-09 14:58:39 +02:00
398d04dc50
fixed tests 2022-05-09 11:15:18 +02:00
6bfdace512
update changelog 2022-05-09 11:00:31 +02:00
79f17843d8
update changelog 2022-05-09 10:50:29 +02:00
637512ad77
changelog update 2022-05-09 10:34:14 +02:00
a4bd5a2aaa
update changelog 2022-05-09 10:31:03 +02:00
e98857fab4
update changelog 2022-04-28 14:37:21 +02:00
e2eb4bfea4 Merge remote-tracking branch 'upstream/development' into mueller/update-from-upstream 2022-04-28 14:30:08 +02:00
8e4ad10627 Merge remote-tracking branch 'upstream/development' into mueller/extend-version-class 2022-04-27 08:46:18 +02:00
496bc665d6 Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11 2022-04-27 08:45:47 +02:00
2c8531ea48 Merge remote-tracking branch 'upstream/development' into mueller/refactor-power-switch-if-etc 2022-04-27 08:45:04 +02:00
d3e7037759 Merge branch 'development' into mueller/possible-ring-buffer-fix 2022-04-27 08:42:24 +02:00
5b7ca8c13c
update CHANGELOG.md, apply afmt 2022-04-27 08:39:21 +02:00
466a3639a5
Merge remote-tracking branch 'upstream/development' into mueller/update-fsfw 2022-04-26 10:02:43 +02:00
b94685e045
added missing PR cross-ref 2022-04-25 15:44:46 +02:00
572d602b72
improve changelog, add entry 2022-04-25 15:42:44 +02:00
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
755dcf66a3 Merge remote-tracking branch 'upstream/development' into mueller/possible-ring-buffer-fix 2022-04-25 15:16:52 +02:00
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
ac5a54b5da Merge branch 'development' into mueller/clock-addition 2022-04-25 15:12:24 +02:00
b7ffd2653b Merge remote-tracking branch 'upstream/development' into mueller/possible-ring-buffer-fix 2022-04-25 15:11:52 +02:00
29015b340b
update changelog 2022-04-25 15:10:50 +02:00
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
68231db9a1
changelog typo 2022-04-22 15:37:14 +02:00
539e01deee
minor form change 2022-04-22 14:53:12 +02:00
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
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
d1151ca707
changelog update 2022-04-11 16:13:47 +02:00
5525466b52
update changelog 2022-03-28 20:57:30 +02:00
8ff9eadf30
update changelog, add basic instructions for etl 2022-03-28 20:43:36 +02:00
f598f7030f
Merge remote-tracking branch 'upstream/development' into mueller/possible-ring-buffer-fix 2022-03-28 15:03:01 +02:00
70f575396d Added changelog 2022-03-25 15:27:22 +01:00
c60aa68d00 changed hal linux uart baudrate and bits per word to enums 2022-03-24 15:44:32 +01:00
f441505476
update changelog 2022-03-22 17:41:49 +01:00
522cbc7f3d
Merge remote-tracking branch 'upstream/development' into mueller/version-getter-upstream 2022-03-14 14:38:27 +01:00
97c93afeff Merge remote-tracking branch 'upstream/development' into mueller/version-getter-upstream 2022-03-14 14:24:43 +01:00
5d6de90859
Merge remote-tracking branch 'upstream/development' into mueller/spi-initialize-line-state 2022-03-14 14:15:13 +01:00
949549178a
update changelog 2022-03-10 09:36:36 +01:00
77e5fba7fd
update changelog 2022-03-08 10:08:53 +01:00
14620fdd72
minor correction 2022-03-08 09:02:40 +01:00
89c1878622
add link to PR 2022-03-08 09:01:23 +01:00
d6856fc54a
another minor changelog update 2022-03-08 09:00:14 +01:00
e5a9cab34e
fix changelog 2022-03-08 08:57:18 +01:00
983fa346b3
update CHANGELOG 2022-03-07 16:17:33 +01:00
41a82e923c
update changelog 2022-03-07 16:09:18 +01:00
95078e1103
Merge remote-tracking branch 'upstream/development' into mueller/dev-printout-runtime-configurable 2022-02-28 15:52:54 +01:00
19d217e3b9
Merge remote-tracking branch 'upstream/development' into mueller/dev-printout-runtime-configurable 2022-02-28 15:23:54 +01:00
af286d3bc6
Merge remote-tracking branch 'upstream/development' into mueller/test-task-one-shot-flag-not-static 2022-02-28 15:23:21 +01:00
cf45eca100
Merge remote-tracking branch 'upstream/development' into mueller/dev-printout-runtime-configurable 2022-02-28 15:00:38 +01:00
c0fa365f8f
Merge remote-tracking branch 'upstream/development' into mueller/delete-obsolete-module 2022-02-28 14:58:28 +01:00
9d9f19781d
Merge remote-tracking branch 'upstream/development' into mueller/test-task-one-shot-flag-not-static 2022-02-28 14:57:38 +01:00
0c4835bfb5
update changelog 2022-02-22 11:37:38 +01:00
9c2ceb4a9f
one shot flag not static anymore 2022-02-22 11:29:23 +01:00
68ace0b74a
update changelog 2022-02-22 11:23:29 +01:00
d119479c0a
update changelog 2022-02-22 11:22:20 +01:00
c3d78120ea preparing 4.0.0 2022-02-14 16:42:40 +01:00
c6d152a01d updated changelog 2022-02-07 17:11:04 +01:00
6dc34fc1f0 removed cmake warning as I have a workaround 2022-02-07 15:41:10 +01:00
baddbf7340 Updated changelog for v4.0.0 2022-02-07 13:44:25 +01:00
80a610141a added v3.0.1 to changelog 2022-02-04 13:45:09 +01:00
ad5bb4c694
update changelog.md 2022-02-02 10:40:00 +01:00