|
|
b3d2d440d7
|
Merge remote-tracking branch 'origin/eive/develop' into mueller/master
|
2022-03-31 16:13:47 +02:00 |
|
|
|
61d0815de8
|
Merge pull request 'Refactor Power Module' (#49) from mueller/refactor-power-switch-if-etc-eive into eive/develop
Reviewed-on: eive/fsfw#49
|
2022-03-31 09:01:24 +02:00 |
|
|
|
127fbeb980
|
Merge branch 'mueller/refactor-power-switch-if-etc' into mueller/refactor-power-switch-if-etc-eive
|
2022-03-30 17:41:55 +02:00 |
|
|
|
b42987059a
|
make dummy power switcher a system object
|
2022-03-30 17:41:38 +02:00 |
|
|
|
c2581ff4f5
|
Merge remote-tracking branch 'origin/eive/develop' into mueller/master
|
2022-03-30 13:12:11 +02:00 |
|
|
|
7b6f68c509
|
Merge remote-tracking branch 'origin/eive/develop' into mueller/refactor-power-switch-if-etc-eive
|
2022-03-30 12:14:57 +02:00 |
|
|
|
3ea9f999b7
|
apply auto-formatter
|
2022-03-28 12:59:51 +02:00 |
|
|
|
79f3c7324a
|
tweaks for dummy power switcher
|
2022-03-28 12:59:32 +02:00 |
|
|
|
23af170229
|
small tweaks
|
2022-03-28 12:59:03 +02:00 |
|
|
|
b32d1da421
|
this should compile
|
2022-03-28 12:57:11 +02:00 |
|
|
|
6f0362b956
|
refactor power module
|
2022-03-28 12:48:15 +02:00 |
|
|
|
60972228ef
|
reworked power switch interface
|
2022-03-28 12:47:09 +02:00 |
|
|
|
6ea1eabb2d
|
small order change in DHB
|
2022-03-28 12:21:25 +02:00 |
|
|
|
283a37dccc
|
Merge pull request 'meier/gpioClass' (#47) from meier/gpioClass into eive/develop
Reviewed-on: eive/fsfw#47
|
2022-03-28 10:22:32 +02:00 |
|
|
|
acf0cdfba3
|
Merge branch 'eive/develop' into meier/gpioClass
|
2022-03-28 10:22:11 +02:00 |
|
|
|
a01002aa5d
|
Merge pull request 'meier/seqCount' (#46) from meier/seqCount into eive/develop
Reviewed-on: eive/fsfw#46
|
2022-03-28 10:21:48 +02:00 |
|
Jakob Meier
|
b52f19254b
|
class to abstract gpio handling
|
2022-03-28 09:12:29 +02:00 |
|
|
|
79615e47e4
|
Merge branch 'eive/develop' into meier/seqCount
|
2022-03-25 15:48:42 +01:00 |
|
|
|
e6130263ef
|
Merge pull request 'Update FSFW' (#45) from mueller/master into eive/develop
Reviewed-on: eive/fsfw#45
|
2022-03-25 14:56:19 +01:00 |
|
|
|
6895dbcc81
|
Merge remote-tracking branch 'origin/eive/develop' into mueller/master
|
2022-03-25 14:39:22 +01:00 |
|
|
|
4b5e3e70f7
|
add option to directly check switch state
|
2022-03-22 20:35:04 +01:00 |
|
|
|
bbe21e7e89
|
doc additions
|
2022-03-22 16:14:23 +01:00 |
|
|
|
2823420c46
|
more docs
|
2022-03-22 16:10:20 +01:00 |
|
|
|
6dd6f28db0
|
added active function
|
2022-03-22 15:55:18 +01:00 |
|
|
|
d791fc87b7
|
some improvements for PowerSwitcher
|
2022-03-22 15:49:04 +01:00 |
|
|
|
16f2fa9327
|
Merge remote-tracking branch 'upstream/development' into mueller/master
|
2022-03-21 10:12:06 +01:00 |
|
|
|
927041209b
|
added override specifiers
|
2022-03-21 09:12:56 +01:00 |
|
Jakob Meier
|
bac8b40880
|
Merge branch 'eive/develop' into meier/seqCount
|
2022-03-17 20:02:29 +01:00 |
|
Jakob Meier
|
caf78835b2
|
added -- operator
|
2022-03-17 20:00:17 +01:00 |
|
|
|
b6ed45a85c
|
small form fix
|
2022-03-17 19:59:16 +01:00 |
|
|
|
ddc1cdb1f5
|
additional docs
|
2022-03-17 19:22:24 +01:00 |
|
|
|
543daaa95a
|
various tweaks and improvements
|
2022-03-17 19:19:02 +01:00 |
|
|
|
38c87fdeb2
|
Merge remote-tracking branch 'upstream/development' into eive/develop
|
2022-03-17 09:47:20 +01:00 |
|
|
|
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 |
|
