Commit Graph
100 Commits
Author SHA1 Message Date
muellerr 79615e47e4 Merge branch 'eive/develop' into meier/seqCount 2022-03-25 15:48:42 +01:00
muellerr 6895dbcc81 Merge remote-tracking branch 'origin/eive/develop' into mueller/master
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-03-25 14:39:22 +01:00
muellerr 5ca5fe4040 Merge remote-tracking branch 'upstream/development' into eive/develop 2022-03-14 17:50:27 +01:00
muellerr bc95e7c886 Merge branch 'mueller/event-update' of https://egit.irs.uni-stuttgart.de/eive/fsfw into mueller/event-update
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-03-14 15:08:54 +01:00
muellerr fca43b3d34 run auto-formatter 2022-03-14 15:08:45 +01:00
muellerr 48c5c3fbd5 Merge branch 'development' into mueller/event-update
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-03-14 15:07:25 +01:00
muellerr 522cbc7f3d Merge remote-tracking branch 'upstream/development' into mueller/version-getter-upstream
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-03-14 14:38:27 +01:00
muellerr ce5bcc5897 bugfix
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
2022-03-14 14:37:41 +01:00
muellerr 97c93afeff Merge remote-tracking branch 'upstream/development' into mueller/version-getter-upstream
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
2022-03-14 14:24:43 +01:00
muellerr 5d6de90859 Merge remote-tracking branch 'upstream/development' into mueller/spi-initialize-line-state
fsfw/fsfw/pipeline/pr-development Build queued...
2022-03-14 14:15:13 +01:00
muellerr 0bdcb40609 minor event changes
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-03-11 14:25:34 +01:00
muellerr fec5f83f4f minor event changes 2022-03-11 14:25:01 +01:00
muellerr 06577ed78a Merge branch 'mueller/version-getter' into mueller/master 2022-03-09 19:11:57 +01:00
muellerr ca508bfe61 getter not required anymore
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-03-09 19:10:33 +01:00
muellerr b27f3b84aa getter not required anymore 2022-03-09 19:10:05 +01:00
muellerr 345a799031 improved version.h
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-03-09 19:08:17 +01:00
muellerr 9509847b84 Merge branch 'mueller/version-getter' into mueller/master 2022-03-09 19:05:30 +01:00
muellerr 45b51f9ac8 improved version.h 2022-03-09 19:05:07 +01:00
muellerr 238baa8597 call setTimeout
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-03-08 11:54:20 +01:00
muellerr 47d158156b call setTimeout 2022-03-08 11:52:33 +01:00
muellerr d63c01b96f set timeout in countdown ctor 2022-03-08 11:50:47 +01:00
muellerr cc3210f366 Merge branch 'eive/develop' into mueller/define-fsfw-disabled-printout 2022-03-08 09:57:43 +01:00
muellerr 202cfc6dbb Merge branch 'eive/develop' into mueller/master 2022-03-08 09:47:37 +01:00
muellerr 82a645deba Merge branch 'eive/develop' into mueller/master 2022-03-08 09:36:25 +01:00
muellerr 983fa346b3 update CHANGELOG
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-03-07 16:17:33 +01:00
muellerr 32f420c4f0 SPI HAL improvement
fsfw/fsfw/pipeline/pr-development This commit looks good
- Initialize line state
2022-03-07 16:13:04 +01:00
muellerr 41a82e923c update changelog
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-03-07 16:09:18 +01:00
muellerr 5ddac36314 GPIO update 2022-03-07 16:07:01 +01:00
muellerr d06eecf9b0 small test device handler fixes
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-03-07 15:56:45 +01:00
muellerr a7cb2d4354 small test device handler fixes 2022-03-07 15:54:56 +01:00
muellerr 7571987a1d Merge branch 'eive/develop' into mueller/master 2022-03-07 15:43:52 +01:00
muellerr d6c1041133 Merge remote-tracking branch 'upstream/development' into eive/develop 2022-03-07 15:34:11 +01:00
muellerr 5912ddd2a2 Merge pull request 'Activates new gcc compiler flags' (#568) from gaisser/fsfw:gaisser_compiler_flags into development
fsfw/fsfw/pipeline/head This commit looks good
Reviewed-on: #568
2022-03-07 14:44:09 +01:00
muellerr 10ffa2f44a Merge branch 'development' into mueller/dev-printout-runtime-configurable
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-03-07 14:20:56 +01:00
muellerr 3c53e2c259 renamed some ModeIF definitions 2022-03-05 03:01:43 +01:00
muellerr 45f0d7fd45 docs 2022-03-04 18:06:57 +01:00
muellerr aebab4c73c Merge remote-tracking branch 'upstream/development' into mueller/master 2022-03-04 15:08:45 +01:00
muellerr c3c2e1c0dd Merge remote-tracking branch 'upstream/development' into eive/develop 2022-03-04 15:08:07 +01:00
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
muellerr 0ccaf27fcb better printout for parameter code 2022-03-01 19:43:21 +01:00
muellerr 95078e1103 Merge remote-tracking branch 'upstream/development' into mueller/dev-printout-runtime-configurable
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-02-28 15:52:54 +01:00
muellerr e05e203c83 fix merge conflict
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
2022-02-28 15:50:27 +01:00
muellerr ac036b2a70 Merge remote-tracking branch 'origin/eive/develop' into mueller/gpio-hal-updates
fsfw/fsfw/pipeline/pr-development This commit looks good
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
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-02-28 15:34:48 +01:00
muellerr 19d217e3b9 Merge remote-tracking branch 'upstream/development' into mueller/dev-printout-runtime-configurable
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
2022-02-28 15:23:54 +01:00
muellerr af286d3bc6 Merge remote-tracking branch 'upstream/development' into mueller/test-task-one-shot-flag-not-static
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-02-28 15:23:21 +01:00
muellerr 4cf2a384f3 Merge remote-tracking branch 'upstream/development' into mueller/gpio-hal-updates
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-02-28 15:22:32 +01:00
muellerr 27267b7cb0 Merge remote-tracking branch 'upstream/development' into mueller/gpio-hal-updates
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
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
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
2022-02-28 15:16:43 +01:00
muellerr 6d825a1aa6 some fixes 2022-02-28 15:16:24 +01:00
muellerr fa73ad6731 Merge branch 'mueller/gpio-hal-updates' into mueller/master 2022-02-28 15:01:41 +01:00
muellerr cf45eca100 Merge remote-tracking branch 'upstream/development' into mueller/dev-printout-runtime-configurable
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
2022-02-28 15:00:38 +01:00
muellerr c0fa365f8f Merge remote-tracking branch 'upstream/development' into mueller/delete-obsolete-module
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-02-28 14:58:28 +01:00
muellerr 9d9f19781d Merge remote-tracking branch 'upstream/development' into mueller/test-task-one-shot-flag-not-static
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
2022-02-28 14:57:38 +01:00
muellerr f4520ea346 Merge remote-tracking branch 'upstream/development' into mueller/test-task-one-shot-flag-not-static
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
2022-02-28 14:56:51 +01:00
muellerr 331aa9442d some updates
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
2022-02-28 14:56:37 +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
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
2022-02-28 14:46:12 +01:00
muellerr 729bcc4aaf Merge remote-tracking branch 'upstream/development' into mueller/gpio-hal-updates
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-02-28 14:39:35 +01:00
muellerr a6c0f3fef5 Merge remote-tracking branch 'upstream/development' into mueller/delete-obsolete-module
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
2022-02-28 14:17:09 +01:00
muellerr 6e0b90696d Merge pull request 'initial submode' (#35) from meier/dhbInitialSubmode into eive/develop
Reviewed-on: eive/fsfw#35
2022-02-28 13:23:26 +01:00
muellerr a10e5c6ed4 Merge branch 'development' into mueller/update-helper-script
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-02-23 15:38:25 +01:00
muellerr f99f5ed730 Merge branch 'development' into mueller/dev-printout-runtime-configurable
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
2022-02-23 11:03:48 +01:00
muellerr 7ce2c1b624 Merge branch 'development' into mueller/gpio-hal-updates
fsfw/fsfw/pipeline/pr-development Something is wrong with the build of this commit
2022-02-23 11:02:02 +01:00
muellerr 5f7e384442 Merge branch 'development' into mueller/hal-i2c-wiretapping
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-02-23 11:01:53 +01:00
muellerr 56d0c8c616 Merge branch 'development' into mueller/test-task-one-shot-flag-not-static
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
2022-02-23 11:01:34 +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
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-02-22 14:02:03 +01:00
muellerr 389641f8fd display run commands 2022-02-22 14:00:34 +01:00
muellerr 508979d32d cache mq args 2022-02-18 14:52:25 +01:00
muellerr 0d66569687 this is a bit cleaner 2022-02-18 14:07:41 +01:00
muellerr a5871ed0b1 added void* args to queue factory and mq ctor 2022-02-18 14:00:06 +01:00
muellerr a12e98d948 update event mngr printout 2022-02-18 13:39:42 +01:00
muellerr bd05afbddd printout improvements 2022-02-18 13:09:18 +01:00
muellerr b3482eba24 error check in event manager 2022-02-17 20:41:47 +01:00
muellerr 9e92afbf07 bugfix in test task 2022-02-16 18:54:55 +01:00
muellerr 0d6d44f72f Merge remote-tracking branch 'upstream/development' into mueller/master 2022-02-15 17:08:29 +01:00
muellerr 6744a55b9b docs update
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-02-14 16:31:13 +01:00
muellerr a612fb446c added two links
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-02-14 16:23:21 +01:00
muellerr 22bc300902 increase other limits
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-02-14 16:14:14 +01:00
muellerr 0d38ac62d8 this should work an ALL systems
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-02-14 16:12:48 +01:00
muellerr d81257a91c Merge branch 'mueller/increase-test-limit' of https://egit.irs.uni-stuttgart.de/eive/fsfw into mueller/increase-test-limit
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-02-14 16:01:02 +01:00
muellerr d53c7e1190 increase test limit 2022-02-14 16:00:43 +01:00
muellerr e312cd094a Merge branch 'development' into mueller/increase-test-limit 2022-02-14 14:55:19 +01:00
muellerr 3bcd71598d Merge branch 'development' into mueller/increase-test-limit
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-02-14 14:51:35 +01:00
muellerr 2602d4fed1 Merge branch 'development' into mueller/dhb-docs
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-02-14 14:51:16 +01:00
muellerr 5f48d77c64 Merge branch 'development' into meier/printDataSet
fsfw/fsfw/pipeline/pr-development Build started...
fsfw/fsfw/pipeline/head This commit looks good
2022-02-07 14:17:26 +01:00
muellerr 8ab8c57f9c Merge branch 'development' into meier/doSendReadHook
fsfw/fsfw/pipeline/pr-development This commit looks good
fsfw/fsfw/pipeline/head This commit looks good
2022-02-07 14:17:03 +01:00
muellerr c7b9df5e40 Merge branch 'development' into mueller/update-changelog
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-02-07 14:16:52 +01:00
muellerr 7b8019c621 Merge branch 'development' into meier/uioMapper
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-02-07 14:09:13 +01:00
muellerr c20bf31d5d Merge pull request 'meier/halAdjustments' (#32) from meier/halAdjustments into eive/develop
Reviewed-on: eive/fsfw#32
2022-02-07 11:03:09 +01:00
muellerr bd29688307 bump revision
fsfw/fsfw/pipeline/pr-master This commit looks good
fsfw/fsfw/pipeline/head This commit looks good
2022-02-04 13:11:27 +01:00
muellerr 43b7a314b6 bump version 2022-02-04 13:11:27 +01:00
muellerr 1b41153ee6 add uio subdirectory
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
2022-02-04 10:16:37 +01:00