Commit Graph

4848 Commits

Author SHA1 Message Date
136524424f Merge pull request 'Fix for Catch2 build regression' (#548) from mohr/catch2workaround into development
Reviewed-on: fsfw/fsfw#548
2022-02-07 16:45:47 +01:00
793b97f651 Merge branch 'development' into mohr/catch2workaround 2022-02-07 16:40:13 +01:00
2e4cd80556 workaround for build regression catch2-v3.0.0-preview4 2022-02-07 15:51:06 +01:00
a4f57a38fa Merge branch 'mueller/update-changelog' of egit.irs.uni-stuttgart.de:fsfw/fsfw into mueller/update-changelog 2022-02-07 15:42:00 +01:00
6dc34fc1f0 removed cmake warning as I have a workaround 2022-02-07 15:41:10 +01:00
9e6948a8d7 Merge pull request 'virtual function to print datasets' (#544) from meier/printDataSet into development
Reviewed-on: fsfw/fsfw#544
2022-02-07 14:42:17 +01:00
9b17b282c6 Merge pull request 'do send read hook' (#545) from meier/doSendReadHook into development
Reviewed-on: fsfw/fsfw#545
2022-02-07 14:42:05 +01:00
5f48d77c64 Merge branch 'development' into meier/printDataSet 2022-02-07 14:17:26 +01:00
8ab8c57f9c Merge branch 'development' into meier/doSendReadHook 2022-02-07 14:17:03 +01:00
c7b9df5e40 Merge branch 'development' into mueller/update-changelog 2022-02-07 14:16:52 +01:00
7b8019c621 Merge branch 'development' into meier/uioMapper 2022-02-07 14:09:13 +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
f93c173715 Merge pull request 'Update development to master v3.0.1' (#546) from master into development
Reviewed-on: fsfw/fsfw#546
2022-02-04 13:29:59 +01:00
620841a9e5 Merge pull request 'bump version' (#542) from mueller/bump-version into master
Reviewed-on: fsfw/fsfw#542
2022-02-04 13:23:24 +01:00
bd29688307 bump revision 2022-02-04 13:11:27 +01:00
43b7a314b6 bump version 2022-02-04 13:11:27 +01:00
1b41153ee6
add uio subdirectory 2022-02-04 10:16:37 +01:00
Jakob Meier
f08d291e3e fix to remove compiler warning 2022-02-03 11:07:51 +01:00
Jakob Meier
06ffe27fcc do send read hook 2022-02-03 10:46:14 +01:00
Jakob Meier
e9b0951a95 virtual function to print datasets 2022-02-03 10:37:07 +01:00
Jakob Meier
348274c145 merged develop 2022-02-03 10:31:15 +01:00
Jakob Meier
40329a33b2 prepared for proper pr 2022-02-03 10:19:33 +01:00
Jakob Meier
2d52042ed6 add uio subdir 2022-02-03 10:16:06 +01:00
Jakob Meier
79936a3335 uio mapper 2022-02-03 10:14:47 +01:00
51add8a8ad Merge remote-tracking branch 'origin/development' into mueller/update-changelog 2022-02-02 10:40:25 +01:00
ad5bb4c694
update changelog.md 2022-02-02 10:40:00 +01:00
bf5a11cbd3 Merge pull request 'applied clang script' (#534) from mueller/apply-clang-script into development
Reviewed-on: fsfw/fsfw#534
2022-02-02 10:38:07 +01:00
ddcac2bbac
reapply clang format 2022-02-02 10:29:30 +01:00
70b593df65 Merge pull request 'Added CFDP packet stack' (#528) from KSat/fsfw:mueller/cfdp-pdus into development
Reviewed-on: fsfw/fsfw#528
2022-02-02 10:27:39 +01:00
e5cc7069a6
Merge remote-tracking branch 'upstream/development' into mueller/cfdp-pdus 2022-02-02 10:19:31 +01:00
98dbaf03e0 Merge pull request 'Linux CommandExecutor' (#536) from eive/fsfw:mueller/cmd-executor into development
Reviewed-on: fsfw/fsfw#536
2022-02-02 10:17:52 +01:00
e0c50477cb
it actually was an uninitialized array 2022-02-02 10:00:57 +01:00
30687f84c8 Merge branch 'mueller/cmd-executor' of https://egit.irs.uni-stuttgart.de/eive/fsfw into mueller/cmd-executor 2022-02-02 09:56:41 +01:00
fed39defd3
update helper script 2022-02-02 09:56:12 +01:00
acbc2cd749
valgrind why 2022-02-01 18:04:08 +01:00
368481f88b
move strcmp outside of macro 2022-02-01 14:04:13 +01:00
d2b561ba2f
test 2022-02-01 13:57:27 +01:00
990e8672a8
update dockerfile 2022-02-01 13:47:16 +01:00
Robin Mueller
9cde8c7f45 Merge branch 'mueller/cfdp-pdus' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/cfdp-pdus 2022-02-01 11:01:19 +01:00
Robin Mueller
751de7accc
Merge remote-tracking branch 'upstream/development' into mueller/cfdp-pdus 2022-02-01 11:00:57 +01:00
74ae3f1371 Merge remote-tracking branch 'upstream/development' into mueller/cmd-executor 2022-02-01 10:49:14 +01:00
02ac92a6b3 Merge pull request 'CMake optimization' (#533) from mueller/cmake-optimization into development
Reviewed-on: fsfw/fsfw#533
2022-01-31 15:41:09 +01:00
b83b2e8f89 Merge pull request 'Catch 2 Update' (#538) from mueller/catch2-update into development
Reviewed-on: fsfw/fsfw#538
2022-01-31 15:18:42 +01:00
8a39971a1c oops, wrong language 2022-01-31 15:11:37 +01:00
1ead156c64 added --pull to the docker build 2022-01-31 15:08:52 +01:00
5b968f7e5a Can't use env variables in top leve agent section 2022-01-31 15:01:45 +01:00
b98127cea6 Updated CI Build
- Always clean and rebuild docker image.
- Use single docker container
2022-01-31 14:59:45 +01:00
eba9abfc9a Jenkinsfile syntax is weird, maybe this works... 2022-01-28 14:10:24 +01:00
Robin Mueller
bf7fabd7ba
commented out when block 2022-01-28 13:46:05 +01:00