|
6ce09e968d
|
Merge pull request 'Update from FSFW upstream' (#56) from mueller/update-from-upstream into eive/develop
Reviewed-on: #56
|
2022-04-11 09:03:08 +02:00 |
|
|
290db6ccad
|
Merge remote-tracking branch 'upstream/development' into mueller/update-from-upstream
|
2022-04-11 08:51:55 +02:00 |
|
|
85a6e4b129
|
Merge pull request 'improve clock error handler' (#55) from mueller/clock-update into eive/develop
Reviewed-on: #55
|
2022-04-07 19:29:49 +02:00 |
|
|
f94bc02b6c
|
Merge branch 'eive/develop' into mueller/clock-update
|
2022-04-07 17:36:04 +02:00 |
|
|
5bda877d97
|
improve clock error handler
|
2022-04-07 17:23:06 +02:00 |
|
|
51e7f1c2f2
|
Merge pull request 'FSFW Update' (#54) from mueller/clock-update into eive/develop
Reviewed-on: #54
|
2022-04-07 11:33:06 +02:00 |
|
|
a11d7455df
|
Merge branch 'eive/develop' into mueller/master
|
2022-04-07 11:04:47 +02:00 |
|
|
4dc903fe20
|
Merge pull request 'Pool Entry Update' (#53) from mueller/pool-entry-update into eive/develop
Reviewed-on: #53
|
2022-04-07 11:04:29 +02:00 |
|
|
3325cc18fc
|
Merge branch 'eive/develop' into mueller/pool-entry-update
|
2022-04-07 11:03:56 +02:00 |
|
|
43917d98c0
|
Merge branch 'mueller/master' of https://egit.irs.uni-stuttgart.de/eive/fsfw into mueller/master
|
2022-04-07 11:01:49 +02:00 |
|
|
e3ffcae3e0
|
emit warning in linux clock
|
2022-04-07 11:01:39 +02:00 |
|
|
0677de39aa
|
make reporting setter public
|
2022-04-07 00:15:42 +02:00 |
|
|
aded4fae1e
|
printout improvement
|
2022-04-04 20:34:31 +02:00 |
|
|
7df51f7202
|
Merge pull request 'add power switcher component' (#52) from mueller/power-switcher-component into eive/develop
Reviewed-on: #52
|
2022-04-04 15:51:18 +02:00 |
|
|
7530c44849
|
Merge branch 'eive/develop' into mueller/pool-entry-update
|
2022-04-04 15:46:10 +02:00 |
|
|
e4c6a69f77
|
this should also zero-init the pool entries
|
2022-04-04 15:44:03 +02:00 |
|
|
761a0c9bac
|
new pool ctor which only takes len
|
2022-04-04 15:39:02 +02:00 |
|
|
518666f822
|
add power switcher component
|
2022-04-01 17:01:56 +02:00 |
|
|
318cd8e244
|
Merge pull request 'Update FSFW' (#51) from mueller/master into eive/develop
Reviewed-on: #51
|
2022-04-01 14:51:31 +02:00 |
|
|
1bc7a91869
|
apply auto-formatter
|
2022-04-01 14:08:29 +02:00 |
|
|
8e26e287c3
|
Merge remote-tracking branch 'origin/eive/develop' into mueller/master
|
2022-04-01 14:07:26 +02:00 |
|
|
ce2f7c4fdf
|
Merge pull request 'DHB and CommandActionHelper changes' (#50) from meier/develop into eive/develop
Reviewed-on: #50
|
2022-04-01 14:07:05 +02:00 |
|
|
b3d2d440d7
|
Merge remote-tracking branch 'origin/eive/develop' into mueller/master
|
2022-03-31 16:13:47 +02:00 |
|
Jakob Meier
|
fbf9626fde
|
Merge branch 'eive/develop' into meier/dhbAlternativeReply
|
2022-03-31 15:04:55 +02:00 |
|
|
29cf8c9009
|
fix in getReplyLength
|
2022-03-31 11:42:39 +02:00 |
|
|
61d0815de8
|
Merge pull request 'Refactor Power Module' (#49) from mueller/refactor-power-switch-if-etc-eive into eive/develop
Reviewed-on: #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 |
|
Jakob Meier
|
532607bf8f
|
extended command info
|
2022-03-30 09:21:03 +02:00 |
|
Jakob Meier
|
a230dc4313
|
command action default arguments
|
2022-03-30 09:20:46 +02:00 |
|
|
0d7d2203d2
|
Merge pull request 'Added function to add component to a periodic task by pointer' (#591) from mohr/task into development
Reviewed-on: fsfw/fsfw#591
|
2022-03-28 15:23:26 +02:00 |
|
|
cde184f428
|
Merge branch 'development' into mohr/task
|
2022-03-28 15:18:23 +02:00 |
|
|
df3794dfd8
|
Merge pull request 'delete code which is not required anymore' (#587) from eive/fsfw:mueller/small-mgmlis3-tweak into development
Reviewed-on: fsfw/fsfw#587
|
2022-03-28 15:08:22 +02:00 |
|
|
d02d5c351d
|
Merge branch 'development' into mueller/small-mgmlis3-tweak
|
2022-03-28 15:05:24 +02:00 |
|
|
febecd4b30
|
Merge pull request 'small tweaks for local datapool code' (#582) from eive/fsfw:mueller/localpool-tweaks into development
Reviewed-on: fsfw/fsfw#582
|
2022-03-28 14:49:42 +02:00 |
|
|
964e311d8b
|
Merge branch 'development' into mueller/localpool-tweaks
|
2022-03-28 14:48:34 +02:00 |
|
|
d43caa8296
|
Merge pull request 'Using enums to configure baudrate and bits per word in Linux HAL UART' (#585) from mohr/hal_uart into development
Reviewed-on: fsfw/fsfw#585
|
2022-03-28 14:47:04 +02:00 |
|
|
916ed3f56a
|
added function to add component to a periodic task by pointer
|
2022-03-28 13:50:42 +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: #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: #46
|
2022-03-28 10:21:48 +02:00 |
|