 Robin Müller
|
e05e203c83
|
fix merge conflict
|
2022-02-28 15:50:27 +01:00 |
|
Robin Müller
|
ac036b2a70
|
Merge remote-tracking branch 'origin/eive/develop' into mueller/gpio-hal-updates
|
2022-02-28 15:49:11 +01:00 |
|
Robin Müller
|
2fed161eff
|
Merge branch 'eive/develop' into mueller/gpio-hal-updates
|
2022-02-28 15:34:48 +01:00 |
|
Robin Müller
|
4cf2a384f3
|
Merge remote-tracking branch 'upstream/development' into mueller/gpio-hal-updates
|
2022-02-28 15:22:32 +01:00 |
|
Robin Müller
|
27267b7cb0
|
Merge remote-tracking branch 'upstream/development' into mueller/gpio-hal-updates
|
2022-02-28 15:21:39 +01:00 |
|
Robin Müller
|
68225586d2
|
some fixes
|
2022-02-28 15:16:43 +01:00 |
 Steffen Gaisser
|
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 |
|
Steffen Gaisser
|
2635f39344
|
Merge branch 'development' into mueller/update-helper-script
|
2022-02-28 15:05:02 +01:00 |
 Ulrich Mohr
|
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 |
|
Robin Müller
|
c0fa365f8f
|
Merge remote-tracking branch 'upstream/development' into mueller/delete-obsolete-module
|
2022-02-28 14:58:28 +01:00 |
|
Robin Müller
|
331aa9442d
|
some updates
|
2022-02-28 14:56:37 +01:00 |
|
Ulrich Mohr
|
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 |
|
Robin Müller
|
afd3a942e2
|
use enum class
|
2022-02-28 14:46:12 +01:00 |
|
Robin Müller
|
729bcc4aaf
|
Merge remote-tracking branch 'upstream/development' into mueller/gpio-hal-updates
|
2022-02-28 14:39:35 +01:00 |
|
Robin Müller
|
a6c0f3fef5
|
Merge remote-tracking branch 'upstream/development' into mueller/delete-obsolete-module
|
2022-02-28 14:17:09 +01:00 |
|
Robin Müller
|
a10e5c6ed4
|
Merge branch 'development' into mueller/update-helper-script
|
2022-02-23 15:38:25 +01:00 |
|
Steffen Gaisser
|
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 |
|
Steffen Gaisser
|
e75155c329
|
Merge branch 'development' into mueller/apply-clang-format
|
2022-02-23 12:30:40 +01:00 |
|
Steffen Gaisser
|
d4e48006f2
|
Merge branch 'development' into mueller/update-helper-script
|
2022-02-23 12:28:12 +01:00 |
|
Robin Müller
|
7ce2c1b624
|
Merge branch 'development' into mueller/gpio-hal-updates
|
2022-02-23 11:02:02 +01:00 |
|
Robin Müller
|
5f7e384442
|
Merge branch 'development' into mueller/hal-i2c-wiretapping
|
2022-02-23 11:01:53 +01:00 |
|
Steffen Gaisser
|
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 |
|
Robin Müller
|
fdc8a3d4f7
|
display run commands in helper script
|
2022-02-22 14:02:03 +01:00 |
|
Robin Müller
|
eac7e6db07
|
try readme tweak
|
2022-02-22 11:40:31 +01:00 |
|
Robin Müller
|
b440c30223
|
update changelog
|
2022-02-22 11:26:11 +01:00 |
|
Robin Müller
|
68ace0b74a
|
update changelog
|
2022-02-22 11:23:29 +01:00 |
|
Robin Müller
|
d119479c0a
|
update changelog
|
2022-02-22 11:22:20 +01:00 |
|
Robin Müller
|
6739890d53
|
add i2c wiretapping option
|
2022-02-22 11:19:49 +01:00 |
|
Robin Müller
|
90b8ad1e6d
|
apply clang format
|
2022-02-22 11:16:33 +01:00 |
|
Robin Müller
|
025f79fcb4
|
apply clang format
|
2022-02-22 11:16:14 +01:00 |
|
Robin Müller
|
3966b656e9
|
apply .clang format
|
2022-02-22 11:15:01 +01:00 |
|
Robin Müller
|
6fb64f9ada
|
removed source from cmakelists.txt
|
2022-02-22 11:11:54 +01:00 |
|
Robin Müller
|
3a5881a0cb
|
more time
|
2022-02-22 11:10:02 +01:00 |
|
Robin Müller
|
2f1b923009
|
this module should not be needed anymore
|
2022-02-22 11:06:00 +01:00 |
|
Robin Müller
|
1e982ec00b
|
updated for windows compatibility
|
2022-02-22 11:00:39 +01:00 |