eive/fsfw
15
1
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests Releases 1 Wiki Activity
4,284 Commits 28 Branches 1 Tag
38c87fdeb2ef5403c4a8ff4e8323126b6f02198c
Commit Graph

4284 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
muellerr 38c87fdeb2 Merge remote-tracking branch 'upstream/development' into eive/develop 2022-03-17 09:47:20 +01:00
muellerr 5ca5fe4040 Merge remote-tracking branch 'upstream/development' into eive/develop 2022-03-14 17:50:27 +01:00
gaisser e08bdd3e35 Merge pull request 'Always define FSFW_DISABLE_PRINTOUT' (#576) from eive/fsfw:mueller/define-fsfw-disabled-printout-upstream into development 
Reviewed-on: fsfw/fsfw#576
 2022-03-14 15:20:40 +01:00
gaisser d2dd16aef3 Merge branch 'development' into mueller/define-fsfw-disabled-printout-upstream 2022-03-14 15:12:37 +01:00
gaisser b7a617dab3 Merge pull request 'minor event changes' (#578) from eive/fsfw:mueller/event-update into development 
Reviewed-on: fsfw/fsfw#578
 2022-03-14 15:12:21 +01:00
muellerr bc95e7c886 Merge branch 'mueller/event-update' of https://egit.irs.uni-stuttgart.de/eive/fsfw into mueller/event-update 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 2022-03-14 15:07:25 +01:00
gaisser b694aea100 Merge pull request 'call setTimeout in Countdown ctor' (#577) from eive/fsfw:mueller/countdown-improvement-upstream into development 
Reviewed-on: fsfw/fsfw#577
 2022-03-14 15:04:57 +01:00
gaisser 6998626ad4 Merge branch 'development' into mueller/define-fsfw-disabled-printout-upstream 2022-03-14 15:02:07 +01:00
gaisser 24ad858b64 Merge branch 'development' into mueller/countdown-improvement-upstream 2022-03-14 14:46:54 +01:00
gaisser 288d453978 Merge pull request 'Version Getter Function' (#575) from eive/fsfw:mueller/version-getter-upstream into development 
Reviewed-on: fsfw/fsfw#575
 2022-03-14 14:44:37 +01:00
muellerr 522cbc7f3d Merge remote-tracking branch 'upstream/development' into mueller/version-getter-upstream 2022-03-14 14:38:27 +01:00
muellerr ce5bcc5897 bugfix 2022-03-14 14:37:41 +01:00
muellerr 97c93afeff Merge remote-tracking branch 'upstream/development' into mueller/version-getter-upstream 2022-03-14 14:24:43 +01:00
mohr 8704b9ab06 Merge pull request 'Fixed test issue with overflow of times' (#574) from gaisser/fsfw:gaisser_ccsds_time_tests into development 
Reviewed-on: fsfw/fsfw#574
 2022-03-14 14:23:35 +01:00
mohr 5a1585bd00 Merge pull request 'SPI HAL improvement' (#573) from eive/fsfw:mueller/spi-initialize-line-state into development 
Reviewed-on: fsfw/fsfw#573
 2022-03-14 14:18:03 +01:00
muellerr 5d6de90859 Merge remote-tracking branch 'upstream/development' into mueller/spi-initialize-line-state 2022-03-14 14:15:13 +01:00
mohr 378c6c8006 Merge pull request 'HAL: Update for GPIO code' (#572) from eive/fsfw:mueller/gpio-update into development 
Reviewed-on: fsfw/fsfw#572
 2022-03-14 14:13:33 +01:00
mohr f4922a8686 Merge pull request 'small test device handler fixes' (#571) from eive/fsfw:mueller/small-dh-test-foxes into development 
Reviewed-on: fsfw/fsfw#571
 2022-03-14 14:11:44 +01:00
muellerr 0bdcb40609 minor event changes 2022-03-11 14:25:34 +01:00
muellerr e684680d60 avoid namespace pollution 2022-03-10 09:58:37 +01:00
muellerr aa5d1042f0 undef major and minor 2022-03-10 09:57:37 +01:00
muellerr 14ac852b7e this tests even a bit more 2022-03-10 09:44:06 +01:00
muellerr 6b1a81ee92 minor tweaks 2022-03-10 09:40:34 +01:00
muellerr 3779b44813 added some more minor tests 2022-03-10 09:37:57 +01:00
muellerr 949549178a update changelog 2022-03-10 09:36:36 +01:00
muellerr 7daa9812ff added tests 2022-03-10 09:35:10 +01:00
muellerr ca508bfe61 getter not required anymore 2022-03-09 19:10:33 +01:00
muellerr 345a799031 improved version.h 2022-03-09 19:08:17 +01:00
gaisser 445d5dd6f0 Added Checks for CDSShort in unittests 2022-03-09 18:56:08 +01:00
meierj d5ff6da40b Merge pull request 'function to get fsfw version' (#43) from mueller/version-getter into eive/develop 
Reviewed-on: #43
 2022-03-08 12:04:13 +01:00
meierj e498136273 Merge pull request 'call setTimeout' (#44) from mueller/countdown-improvement into eive/develop 
Reviewed-on: #44
 2022-03-08 12:03:13 +01:00
muellerr 238baa8597 call setTimeout 2022-03-08 11:54:20 +01:00
muellerr 47d158156b call setTimeout 2022-03-08 11:52:33 +01:00
muellerr 7932afc315 small form change 2022-03-08 10:13:11 +01:00
muellerr d1e3dc4d49 define FSFW_DISABLE_PRINTOUT in any case 2022-03-08 10:12:02 +01:00
meierj 73f0b9c0dc Merge pull request 'define FSFW_DISABLE_PRINTOUT in any case' (#42) from mueller/define-fsfw-disabled-printout into eive/develop 
Reviewed-on: #42
 2022-03-08 10:11:45 +01:00
meierj b5e55f64b0 Merge pull request 'Another HasModesIF improvement' (#41) from mueller/master into eive/develop 
Reviewed-on: #41
 2022-03-08 10:11:05 +01:00
muellerr 77e5fba7fd update changelog 2022-03-08 10:08:53 +01:00
muellerr ca70c8c614 function to get fsfw version 2022-03-08 10:07:07 +01:00
muellerr 7ca6d1a695 function to get fsfw version 2022-03-08 10:05:18 +01:00
muellerr cc3210f366 Merge branch 'eive/develop' into mueller/define-fsfw-disabled-printout 2022-03-08 09:57:43 +01:00
muellerr 155d66e534 define FSFW_DISABLE_PRINTOUT in any case 2022-03-08 09:57:11 +01:00
muellerr 202cfc6dbb Merge branch 'eive/develop' into mueller/master 2022-03-08 09:47:37 +01:00
muellerr 84f95e8d76 this is better 2022-03-08 09:45:58 +01:00
meierj 6de4798805 Merge pull request 'better name of invalid mode retval' (#40) from mueller/master into eive/develop 
Reviewed-on: #40
 2022-03-08 09:37:58 +01:00
muellerr 82a645deba Merge branch 'eive/develop' into mueller/master 2022-03-08 09:36:25 +01:00
muellerr 8b1c277c58 better name of invalid mode retval 2022-03-08 09:34:22 +01:00
muellerr 14620fdd72 minor correction 2022-03-08 09:02:40 +01:00