Commit Graph

4981 Commits

Author SHA1 Message Date
8970a7379a
Merge remote-tracking branch 'upstream/development' into mueller/update-from-upstream 2022-08-12 12:21:50 +02:00
43048c852a Merge pull request 'Fixed cmake variable for tests in README.md' (#661) from gaisser/fsfw:gaisser_readme_fix into development
Reviewed-on: fsfw/fsfw#661
2022-08-01 20:55:26 +02:00
19817bd3a5 Update 'docs/getting_started.rst'
Actually, this version still uses old folder names
2022-08-01 20:47:53 +02:00
1db04cf20c Update 'docs/getting_started.rst'
Update for new recommended build folder and cmake define name
2022-08-01 20:45:39 +02:00
52ee50ba8c Fixed cmake variable for tests in README.md 2022-08-01 16:21:07 +02:00
f11433e50f Merge pull request 'Release v5.0.0' (#657) from development into master
Reviewed-on: fsfw/fsfw#657
2022-07-25 15:05:56 +02:00
edc5a314b8 Merge pull request 'v5.0.0' (#654) from v5.0.0 into development
Reviewed-on: fsfw/fsfw#654
2022-07-25 14:53:35 +02:00
54fc35eae7
re-run afmt 2022-07-25 14:36:18 +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
c96e304b68 Merge pull request 'Possible Ring Buffer Fix' (#586) from eive/fsfw:mueller/possible-ring-buffer-fix into development
Merged to avoid crashing bug until full functionality is fixed.

Reviewed-on: fsfw/fsfw#586
2022-07-25 10:12:39 +02:00
9bbe1dc716 Merge branch 'development' into mueller/possible-ring-buffer-fix 2022-07-21 13:23:44 +02:00
74794bb71b
apply auto-formatter 2022-07-18 16:08:06 +02:00
6f751c2cf9 Merge branch 'development' into v5.0.0 2022-07-18 15:12:21 +02:00
9a2e68b37e Merge pull request 'Move HAL and Tests folder' (#653) from mueller/move-hal-tests-folder into development
Reviewed-on: fsfw/fsfw#653
2022-07-18 15:05:25 +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
f6ede7cd3e
bump version 2022-07-18 14:46:36 +02:00
4da18172b3 Merge branch 'development' into mueller/possible-ring-buffer-fix 2022-07-18 14:37:56 +02:00
6e5239e9a0
update jenkinsfile 2022-07-18 14:36:40 +02:00
78b09ed0c9
fixes includes 2022-07-18 11:58:55 +02:00
fdf35232ee
some fixes 2022-07-18 11:47:00 +02:00
8465670374
separate unittest folder 2022-07-18 11:42:51 +02:00
3b23fb77b4
add obsolete add_subdirectory calls 2022-07-18 09:01:45 +02:00
6f7be281ef
move HAL and tests folder 2022-07-18 08:59:40 +02:00
3686bbc486 Merge pull request 'DHB Reply Timeout' (#637) from meier/dhbReplyTimeout into development
Reviewed-on: fsfw/fsfw#637
2022-07-14 09:17:18 +02:00
ecac08814e better naming for functions which reset states of replies 2022-07-14 09:15:13 +02:00
e8b8fff0b5 Merge branch 'development' into meier/dhbReplyTimeout 2022-07-14 09:01:28 +02:00
4d34f93cfc missing reset of timedOut value in loop of decrementDeviceReplyMap 2022-07-14 08:58:23 +02:00
adbf375f38 some small fixes to dhb countdown addition 2022-07-13 21:58:07 +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
c519b70302 Merge pull request 'printout tweak' (#652) from mueller/printout-tweak-mq-linux-osal into development
Reviewed-on: fsfw/fsfw#652
2022-07-13 17:35:53 +02:00
45ee307bc4 Merge pull request 'remove duplicate CHANGELOG entries' (#649) from eive/fsfw:mueller/clean-changelog into development
Reviewed-on: fsfw/fsfw#649
2022-07-13 16:50:50 +02:00
8a2068aca6 Merge pull request 'clang-tidy changes for controller module' (#648) from clang-tidy-controllers into development
Reviewed-on: fsfw/fsfw#648
2022-07-13 16:49:15 +02:00
aa60484111 Merge pull request 'clang-tidy changes for actions module' (#647) from clang-tidy-actions into development
Reviewed-on: fsfw/fsfw#647
2022-07-13 16:42:39 +02:00
e99c7f3824 Merge pull request 'Install ETL library in CI/CD' (#645) from mueller/install-etl-cicd into development
Reviewed-on: fsfw/fsfw#645
2022-07-13 16:39:29 +02:00
2ee3ef1f1d Merge branch 'development' into mueller/install-etl-cicd 2022-07-13 16:38:30 +02:00
ce48827ee5 Merge branch 'development' into clang-tidy-actions 2022-07-13 16:00:50 +02:00
0d80fad685 Merge branch 'development' into clang-tidy-controllers 2022-07-13 16:00:42 +02:00
c6253bf0dd Merge branch 'development' into mueller/new-pool-entry-ctor 2022-07-13 15:41:47 +02:00
93933dee02 Merge pull request 'delete run configs' (#646) from mueller/del-cmake-run-cfgs into development
Reviewed-on: fsfw/fsfw#646
2022-07-13 15:37:55 +02:00
0e49640306
update CHANGELOG 2022-07-08 17:59:43 +02:00
32fea9838e
add new pool entry constructor
- This constructor allows to simply specify the length.
  This is also the new default constructor for scalar values
  which are initially invalid
2022-07-08 17:56:44 +02:00
0519083894
remove duplicate entries 2022-07-08 17:48:06 +02:00
904ae2cc0e Merge remote-tracking branch 'origin/irini' into develop 2022-07-08 16:34:24 +02:00
4a2012ac30 Merge branch 'irini' into develop 2022-07-08 16:31:57 +02:00
6a62cf7f1e Merge pull request 'Update FSFW from upstream' (#102) from mueller/update-from-upstream into develop
Reviewed-on: eive/fsfw#102
Reviewed-by: Jakob Meier <meierj@irs.uni-stuttgart.de>
2022-07-04 13:04:00 +02:00
14bac9a418
clang-tidy changes for controller module 2022-07-04 11:48:36 +02:00
3bef73708f
clang-tidy changes for actions module 2022-07-04 11:44:26 +02:00