Commit Graph

4120 Commits

Author SHA1 Message Date
2fed161eff
Merge branch 'eive/develop' into mueller/gpio-hal-updates 2022-02-28 15:34:48 +01:00
4cf2a384f3
Merge remote-tracking branch 'upstream/development' into mueller/gpio-hal-updates 2022-02-28 15:22:32 +01:00
27267b7cb0
Merge remote-tracking branch 'upstream/development' into mueller/gpio-hal-updates 2022-02-28 15:21:39 +01:00
68225586d2 some fixes 2022-02-28 15:16:43 +01:00
a8426750f2 Merge pull request 'display run commands in helper script' (#564) from eive/fsfw:mueller/update-helper-script into development
Reviewed-on: fsfw/fsfw#564
2022-02-28 15:13:39 +01:00
2635f39344 Merge branch 'development' into mueller/update-helper-script 2022-02-28 15:05:02 +01:00
89327463e3 Merge pull request 'HkSwitchHelper should not be needed anymore' (#557) from eive/fsfw:mueller/delete-obsolete-module into development
Reviewed-on: fsfw/fsfw#557
2022-02-28 15:03:09 +01:00
c0fa365f8f
Merge remote-tracking branch 'upstream/development' into mueller/delete-obsolete-module 2022-02-28 14:58:28 +01:00
331aa9442d
some updates 2022-02-28 14:56:37 +01:00
bbacdc5cac Merge pull request 'Linux HAL: Add I2C wiretapping option' (#559) from eive/fsfw:mueller/hal-i2c-wiretapping into development
Reviewed-on: fsfw/fsfw#559
2022-02-28 14:55:21 +01:00
afd3a942e2
use enum class 2022-02-28 14:46:12 +01:00
729bcc4aaf Merge remote-tracking branch 'upstream/development' into mueller/gpio-hal-updates 2022-02-28 14:39:35 +01:00
a6c0f3fef5 Merge remote-tracking branch 'upstream/development' into mueller/delete-obsolete-module 2022-02-28 14:17:09 +01:00
a10e5c6ed4 Merge branch 'development' into mueller/update-helper-script 2022-02-23 15:38:25 +01:00
457bc6609e Merge pull request 'apply clang format' (#558) from eive/fsfw:mueller/apply-clang-format into development
Reviewed-on: fsfw/fsfw#558
2022-02-23 12:36:24 +01:00
e75155c329 Merge branch 'development' into mueller/apply-clang-format 2022-02-23 12:30:40 +01:00
d4e48006f2 Merge branch 'development' into mueller/update-helper-script 2022-02-23 12:28:12 +01:00
7ce2c1b624 Merge branch 'development' into mueller/gpio-hal-updates 2022-02-23 11:02:02 +01:00
5f7e384442 Merge branch 'development' into mueller/hal-i2c-wiretapping 2022-02-23 11:01:53 +01:00
5ff0f8ea10 Merge pull request 'README tweak' (#562) from eive/fsfw:mueller/readme-tweak into development
Reviewed-on: fsfw/fsfw#562
2022-02-23 10:08:49 +01:00
fdc8a3d4f7
display run commands in helper script 2022-02-22 14:02:03 +01:00
eac7e6db07
try readme tweak 2022-02-22 11:40:31 +01:00
b440c30223
update changelog 2022-02-22 11:26:11 +01:00
68ace0b74a
update changelog 2022-02-22 11:23:29 +01:00
d119479c0a
update changelog 2022-02-22 11:22:20 +01:00
6739890d53
add i2c wiretapping option 2022-02-22 11:19:49 +01:00
90b8ad1e6d
apply clang format 2022-02-22 11:16:33 +01:00
025f79fcb4
apply clang format 2022-02-22 11:16:14 +01:00
3966b656e9
apply .clang format 2022-02-22 11:15:01 +01:00
6fb64f9ada
removed source from cmakelists.txt 2022-02-22 11:11:54 +01:00
3a5881a0cb
more time 2022-02-22 11:10:02 +01:00
2f1b923009
this module should not be needed anymore 2022-02-22 11:06:00 +01:00
1e982ec00b
updated for windows compatibility 2022-02-22 11:00:39 +01:00
a274d6598e Merge pull request 'Release v4.0.0' (#554) from development into master
Reviewed-on: fsfw/fsfw#554
2022-02-14 16:49:15 +01:00
c3d78120ea preparing 4.0.0 2022-02-14 16:42:40 +01:00
f24de22e9b Merge pull request 'Some DHB docs' (#551) from eive/fsfw:mueller/dhb-docs into development
Reviewed-on: fsfw/fsfw#551
2022-02-14 16:35:10 +01:00
918783774f Merge branch 'development' into mueller/dhb-docs 2022-02-14 16:34:47 +01:00
6744a55b9b docs update 2022-02-14 16:31:13 +01:00
a612fb446c added two links 2022-02-14 16:23:21 +01:00
a5adeb333c Merge pull request 'Fixed valgrind python script' (#553) from gaisser/fsfw:gaisser_build_script into development
Reviewed-on: fsfw/fsfw#553
2022-02-14 15:27:04 +01:00
7788cada54 Merge branch 'development' into gaisser_build_script 2022-02-14 15:26:06 +01:00
074ef29b86 Fixed valgrind python script 2022-02-14 15:19:47 +01:00
d4f059d639 Merge pull request 'increase test limit' (#552) from eive/fsfw:mueller/increase-test-limit into development
Reviewed-on: fsfw/fsfw#552
2022-02-14 15:18:17 +01:00
22bc300902 increase other limits 2022-02-14 16:14:14 +01:00
0d38ac62d8 this should work an ALL systems 2022-02-14 16:12:48 +01:00
d81257a91c Merge branch 'mueller/increase-test-limit' of https://egit.irs.uni-stuttgart.de/eive/fsfw into mueller/increase-test-limit 2022-02-14 16:01:02 +01:00
d53c7e1190 increase test limit 2022-02-14 16:00:43 +01:00
e312cd094a Merge branch 'development' into mueller/increase-test-limit 2022-02-14 14:55:19 +01:00
9e958e752e applied clang format 2022-02-14 14:54:20 +01:00
3bcd71598d Merge branch 'development' into mueller/increase-test-limit 2022-02-14 14:51:35 +01:00