Commit Graph

4178 Commits

Author SHA1 Message Date
muellerr 4e6c1cb72a docs 2022-03-04 00:55:41 +01:00
muellerr e2eb6a46b6 Merge branch 'eive/develop' into mueller/master 2022-03-03 13:43:15 +01:00
meierj 75c56280ad Merge pull request 'GPIO HAL Updates' (#36) from mueller/gpio-hal-updates into eive/develop
Reviewed-on: #36
2022-03-03 09:44:42 +01:00
muellerr 0ccaf27fcb better printout for parameter code 2022-03-01 19:43:21 +01:00
muellerr e05e203c83 fix merge conflict 2022-02-28 15:50:27 +01:00
muellerr ac036b2a70 Merge remote-tracking branch 'origin/eive/develop' into mueller/gpio-hal-updates 2022-02-28 15:49:11 +01:00
muellerr 2d9216ba19 Merge branch 'mueller/gpio-hal-updates' into mueller/master 2022-02-28 15:37:03 +01:00
muellerr 2fed161eff Merge branch 'eive/develop' into mueller/gpio-hal-updates 2022-02-28 15:34:48 +01:00
muellerr 4cf2a384f3 Merge remote-tracking branch 'upstream/development' into mueller/gpio-hal-updates 2022-02-28 15:22:32 +01:00
muellerr 27267b7cb0 Merge remote-tracking branch 'upstream/development' into mueller/gpio-hal-updates 2022-02-28 15:21:39 +01:00
muellerr 505e00c067 Merge remote-tracking branch 'origin/eive/develop' into mueller/master 2022-02-28 15:17:29 +01:00
muellerr 68225586d2 some fixes 2022-02-28 15:16:43 +01:00
muellerr 6d825a1aa6 some fixes 2022-02-28 15:16:24 +01:00
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
gaisser 2635f39344 Merge branch 'development' into mueller/update-helper-script 2022-02-28 15:05:02 +01:00
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
muellerr fa73ad6731 Merge branch 'mueller/gpio-hal-updates' into mueller/master 2022-02-28 15:01:41 +01:00
muellerr c0fa365f8f Merge remote-tracking branch 'upstream/development' into mueller/delete-obsolete-module 2022-02-28 14:58:28 +01:00
muellerr 331aa9442d some updates 2022-02-28 14:56:37 +01:00
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
muellerr 28b28b5684 Merge branch 'mueller/gpio-hal-updates' into mueller/master 2022-02-28 14:48:27 +01:00
muellerr afd3a942e2 use enum class 2022-02-28 14:46:12 +01:00
muellerr 729bcc4aaf Merge remote-tracking branch 'upstream/development' into mueller/gpio-hal-updates 2022-02-28 14:39:35 +01:00
muellerr a6c0f3fef5 Merge remote-tracking branch 'upstream/development' into mueller/delete-obsolete-module 2022-02-28 14:17:09 +01:00
muellerr 6e0b90696d Merge pull request 'initial submode' (#35) from meier/dhbInitialSubmode into eive/develop
Reviewed-on: #35
2022-02-28 13:23:26 +01:00
Jakob Meier eacb4ac407 initial submode 2022-02-25 14:41:43 +01:00
meierj 09c1918c1f Merge pull request 'Update FSFW' (#34) from mueller/master into eive/develop
Reviewed-on: #34
2022-02-25 11:38:11 +01:00
muellerr 123f2ff360 removed unnecessary warning 2022-02-25 11:10:48 +01:00
muellerr a10e5c6ed4 Merge branch 'development' into mueller/update-helper-script 2022-02-23 15:38:25 +01:00
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
gaisser e75155c329 Merge branch 'development' into mueller/apply-clang-format 2022-02-23 12:30:40 +01:00
gaisser d4e48006f2 Merge branch 'development' into mueller/update-helper-script 2022-02-23 12:28:12 +01:00
muellerr 7ce2c1b624 Merge branch 'development' into mueller/gpio-hal-updates 2022-02-23 11:02:02 +01:00
muellerr 5f7e384442 Merge branch 'development' into mueller/hal-i2c-wiretapping 2022-02-23 11:01:53 +01:00
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
muellerr 4747e54c5d no default values for srv5 params 2022-02-22 20:08:19 +01:00
muellerr 2e230daa14 additional comment 2022-02-22 18:59:50 +01:00
muellerr e909c6b6f7 Merge branch 'mueller/spi-update-clock-polarity' into mueller/master 2022-02-22 18:59:06 +01:00
muellerr d88d7c938f update spi clock polarity
- Perform an empty SPI transfer after setting speed and mode
2022-02-22 18:58:20 +01:00
muellerr fdc8a3d4f7 display run commands in helper script 2022-02-22 14:02:03 +01:00
muellerr 389641f8fd display run commands 2022-02-22 14:00:34 +01:00
muellerr eac7e6db07 try readme tweak 2022-02-22 11:40:31 +01:00
muellerr b440c30223 update changelog 2022-02-22 11:26:11 +01:00
muellerr 68ace0b74a update changelog 2022-02-22 11:23:29 +01:00
muellerr d119479c0a update changelog 2022-02-22 11:22:20 +01:00
muellerr 6739890d53 add i2c wiretapping option 2022-02-22 11:19:49 +01:00
muellerr 90b8ad1e6d apply clang format 2022-02-22 11:16:33 +01:00
muellerr 025f79fcb4 apply clang format 2022-02-22 11:16:14 +01:00
muellerr 3966b656e9 apply .clang format 2022-02-22 11:15:01 +01:00
muellerr 6fb64f9ada removed source from cmakelists.txt 2022-02-22 11:11:54 +01:00