|
|
5ca5fe4040
|
Merge remote-tracking branch 'upstream/development' into eive/develop
|
2022-03-14 17:50:27 +01:00 |
|
Jakob Meier
|
1b7e0371c3
|
fixed merge conflict
|
2022-03-14 15:25:17 +01:00 |
|
|
|
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 |
|
|
|
d2dd16aef3
|
Merge branch 'development' into mueller/define-fsfw-disabled-printout-upstream
|
2022-03-14 15:12:37 +01:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
fca43b3d34
|
run auto-formatter
|
2022-03-14 15:08:45 +01:00 |
|
|
|
48c5c3fbd5
|
Merge branch 'development' into mueller/event-update
|
2022-03-14 15:07:25 +01:00 |
|
|
|
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 |
|
|
|
6998626ad4
|
Merge branch 'development' into mueller/define-fsfw-disabled-printout-upstream
|
2022-03-14 15:02:07 +01:00 |
|
Jakob Meier
|
d4ade5e885
|
sequence count operator overloading
|
2022-03-14 15:01:17 +01:00 |
|
|
|
24ad858b64
|
Merge branch 'development' into mueller/countdown-improvement-upstream
|
2022-03-14 14:46:54 +01:00 |
|
|
|
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 |
|
|
|
522cbc7f3d
|
Merge remote-tracking branch 'upstream/development' into mueller/version-getter-upstream
|
2022-03-14 14:38:27 +01:00 |
|
|
|
ce5bcc5897
|
bugfix
|
2022-03-14 14:37:41 +01:00 |
|
|
|
97c93afeff
|
Merge remote-tracking branch 'upstream/development' into mueller/version-getter-upstream
|
2022-03-14 14:24:43 +01:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
5d6de90859
|
Merge remote-tracking branch 'upstream/development' into mueller/spi-initialize-line-state
|
2022-03-14 14:15:13 +01:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
0bdcb40609
|
minor event changes
|
2022-03-11 14:25:34 +01:00 |
|
|
|
fec5f83f4f
|
minor event changes
|
2022-03-11 14:25:01 +01:00 |
|
|
|
17262a1da9
|
Merge branch 'mueller/version-getter-upstream' into mueller/master
|
2022-03-10 09:59:18 +01:00 |
|
|
|
e684680d60
|
avoid namespace pollution
|
2022-03-10 09:58:37 +01:00 |
|
|
|
aa5d1042f0
|
undef major and minor
|
2022-03-10 09:57:37 +01:00 |
|
|
|
b5d6b9745f
|
undef major and minor
|
2022-03-10 09:56:23 +01:00 |
|
|
|
60639f56dc
|
Merge branch 'mueller/version-getter' into mueller/master
|
2022-03-10 09:47:32 +01:00 |
|
|
|
3aa0bbde68
|
Merge branch 'mueller/version-getter-upstream' into mueller/version-getter
|
2022-03-10 09:47:10 +01:00 |
|
|
|
14ac852b7e
|
this tests even a bit more
|
2022-03-10 09:44:06 +01:00 |
|
|
|
6b1a81ee92
|
minor tweaks
|
2022-03-10 09:40:34 +01:00 |
|
|
|
3779b44813
|
added some more minor tests
|
2022-03-10 09:37:57 +01:00 |
|
|
|
949549178a
|
update changelog
|
2022-03-10 09:36:36 +01:00 |
|
|
|
7daa9812ff
|
added tests
|
2022-03-10 09:35:10 +01:00 |
|
|
|
97bc71a3ff
|
added tests
|
2022-03-10 09:34:29 +01:00 |
|
|
|
06577ed78a
|
Merge branch 'mueller/version-getter' into mueller/master
|
2022-03-09 19:11:57 +01:00 |
|
|
|
ca508bfe61
|
getter not required anymore
|
2022-03-09 19:10:33 +01:00 |
|
|
|
b27f3b84aa
|
getter not required anymore
|
2022-03-09 19:10:05 +01:00 |
|
|
|
345a799031
|
improved version.h
|
2022-03-09 19:08:17 +01:00 |
|
|
|
9509847b84
|
Merge branch 'mueller/version-getter' into mueller/master
|
2022-03-09 19:05:30 +01:00 |
|
|
|
45b51f9ac8
|
improved version.h
|
2022-03-09 19:05:07 +01:00 |
|
|
|
445d5dd6f0
|
Added Checks for CDSShort in unittests
|
2022-03-09 18:56:08 +01:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
238baa8597
|
call setTimeout
|
2022-03-08 11:54:20 +01:00 |
|
|
|
47d158156b
|
call setTimeout
|
2022-03-08 11:52:33 +01:00 |
|
|
|
d63c01b96f
|
set timeout in countdown ctor
|
2022-03-08 11:50:47 +01:00 |
|
|
|
3b497dbb8d
|
Merge branch 'mueller/version-getter' into mueller/master
|
2022-03-08 10:16:56 +01:00 |
|
|
|
bf733162eb
|
Merge remote-tracking branch 'origin/eive/develop' into mueller/master
|
2022-03-08 10:15:54 +01:00 |
|
|
|
7932afc315
|
small form change
|
2022-03-08 10:13:11 +01:00 |
|
