3049 Commits

Author SHA1 Message Date
0b3fd65c9a Merge remote-tracking branch 'origin/develop' into mueller/add-schedule-pus-11 2022-05-25 10:16:31 +02:00
addcb2b21f Merge pull request 'IMTQ improvements' () from meier/imtq into develop
Reviewed-on: 
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2022-05-25 10:15:13 +02:00
43fc1ab780
Merge remote-tracking branch 'origin/develop' into mueller/add-schedule-pus-11 2022-05-25 09:57:34 +02:00
2bf044422f
Merge remote-tracking branch 'origin/develop' into meier/imtq 2022-05-25 09:56:41 +02:00
7f180ebc45 Merge pull request 'Reboot Command' () from mueller/reboot-cmd into develop
Reviewed-on: 
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-05-24 19:11:07 +02:00
Jakob Meier
1ccd12e2e1 enable hk in imtq 2022-05-24 19:08:00 +02:00
88faf8f87d
bump fsfw 2022-05-24 16:23:00 +02:00
c0da8aef2e
delete obsolete folder 2022-05-24 15:50:39 +02:00
59d0d880bb
bump fsfw 2022-05-24 15:45:12 +02:00
3eb8525419
update changelog 2022-05-24 15:22:45 +02:00
3fff3ba21e
add and schedule PUS11 2022-05-24 15:21:37 +02:00
3e9b337e31
changelog 2022-05-24 01:14:47 +02:00
633fe00cd6
run afmt, minor improvements 2022-05-24 01:14:04 +02:00
23d7b8f2fb
repoint tmtc 2022-05-24 00:55:17 +02:00
d088d728b1 Merge branch 'mueller/reboot-cmd' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into mueller/reboot-cmd 2022-05-24 00:54:55 +02:00
237dd00216 Merge branch 'develop' into mueller/reboot-cmd 2022-05-24 00:54:49 +02:00
f7075a1397 Merge remote-tracking branch 'origin/develop' into mueller/reboot-cmd 2022-05-24 00:54:39 +02:00
72305cc4c2 Merge pull request 'rtd bugfixes' () from mueller/rtd-bugfixes into develop
Reviewed-on: 
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-05-23 19:36:13 +02:00
43269d4add Merge branch 'develop' into mueller/rtd-bugfixes 2022-05-23 18:37:40 +02:00
7d9ef6f887
run afmt 2022-05-23 18:37:04 +02:00
a4de3e9eb1
Merge remote-tracking branch 'origin/develop' into mueller/rtd-bugfixes 2022-05-23 18:00:45 +02:00
cc008623b6 Merge pull request 'PLOC handler improvements' () from meier/ploc into develop
Reviewed-on: 
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2022-05-23 17:53:55 +02:00
10e075efaf
update changelog 2022-05-23 17:52:44 +02:00
8aa664b49f
rtd bugfixes 2022-05-23 17:50:54 +02:00
Jakob Meier
f18507d278 boot image select memory default argument 2022-05-23 17:05:06 +02:00
Jakob Meier
e365b36ecd tmtc update 2022-05-23 17:04:03 +02:00
Jakob Meier
990759fbc6 commented in core controller file write 2022-05-23 16:54:18 +02:00
Jakob Meier
d808a12c31 fixed conflicts 2022-05-23 16:53:20 +02:00
Jakob Meier
379c5f06ba supervisor command to continue interrupted mpsoc update 2022-05-23 16:43:46 +02:00
a2eabdce01 Merge pull request 'RTD Update' () from mueller/rtds-update into develop
Reviewed-on: 
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-05-23 16:20:37 +02:00
01ca80fa30
bump submodules 2022-05-23 16:12:03 +02:00
Jakob Meier
fb5c6c4c17 continuation of failed mpsoc update 2022-05-23 12:05:42 +02:00
d960c371b9
bump submodules 2022-05-23 09:37:16 +02:00
49a06772d2
Merge remote-tracking branch 'origin/develop' into mueller/rtds-update 2022-05-20 08:18:57 +02:00
79d3755c16 Merge pull request 'fixed for new SPI HAL API' () from mueller/fixes-for-spi-update into develop
Reviewed-on: 
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-05-19 19:09:54 +02:00
a63e87f5f4
subscribe for periodic core ctrl packet 2022-05-19 18:46:49 +02:00
eb20dda221
small fix for yocto script 2022-05-19 17:52:46 +02:00
e73bfc2c64
dev string for FM/EM 2022-05-19 16:00:26 +02:00
d274f5647d
fix EM cofig 2022-05-19 15:28:02 +02:00
377f762ca5
fixed for new SPI HAL API 2022-05-19 14:54:44 +02:00
847aadc7bf
update shell script helper to support EM installation 2022-05-19 14:48:16 +02:00
e49a1af9b7
bump fsfw 2022-05-18 14:51:33 +02:00
cf49d98524
bump fsfw 2022-05-17 18:15:21 +02:00
28a4f782f9
Merge remote-tracking branch 'origin/develop' into mueller/rtds-update 2022-05-17 17:55:25 +02:00
8eaae461b4 Merge pull request 'apply new auto-formatter on all files' () from mueller/update-aformatters into develop
Reviewed-on: 
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-05-17 14:53:20 +02:00
140bbcb7b8
Merge remote-tracking branch 'origin/develop' into mueller/rtds-update 2022-05-17 13:43:21 +02:00
8a5090b8ee
apply new auto-formatter on all files 2022-05-17 13:40:19 +02:00
e2cfce634b
GenericFactory bugfix 2022-05-17 13:35:21 +02:00
8b875e13c5
repoint fsfw 2022-05-16 15:46:20 +02:00
a26b1bb311
Merge remote-tracking branch 'origin/develop' into mueller/rtds-update 2022-05-16 15:17:29 +02:00