3083 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Robin Mueller	5d2a70b6c6	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-05-25 10:28:06 +02:00
Robin Mueller	96564f890e	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-05-25 10:28:00 +02:00
Robin Müller	d870f5ab10	Merge pull request 'Core Controller Remount SD Handling' (#253) from mueller/core-controller-remount-sd-handling into develop ... Reviewed-on: #253 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-05-25 10:27:10 +02:00
Robin Mueller	d79177e544	Merge remote-tracking branch 'origin/develop' into mueller/core-controller-remount-sd-handling	2022-05-25 10:15:48 +02:00
Robin Müller	addcb2b21f	Merge pull request 'IMTQ improvements' (#260) from meier/imtq into develop ... Reviewed-on: #260 Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>	2022-05-25 10:15:13 +02:00
Robin Mueller	83c7ec8067	solve merge conflicts	2022-05-25 10:12:37 +02:00
Robin Mueller	e1ed532f91	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-05-25 10:01:53 +02:00
Robin Mueller	3eca96fef5	Merge remote-tracking branch 'origin/develop' into mueller/core-controller-remount-sd-handling	2022-05-25 09:58:06 +02:00
Robin Mueller	2bf044422f	Merge remote-tracking branch 'origin/develop' into meier/imtq	2022-05-25 09:56:41 +02:00
Jakob.Meier	7f180ebc45	Merge pull request 'Reboot Command' (#242) from mueller/reboot-cmd into develop ... Reviewed-on: #242 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
Robin Mueller	3e9b337e31	changelog	2022-05-24 01:14:47 +02:00
Robin Mueller	633fe00cd6	run afmt, minor improvements	2022-05-24 01:14:04 +02:00
Robin Mueller	23d7b8f2fb	repoint tmtc	2022-05-24 00:55:17 +02:00
Robin Mueller	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
Robin Müller	237dd00216	Merge branch 'develop' into mueller/reboot-cmd	2022-05-24 00:54:49 +02:00
Robin Mueller	f7075a1397	Merge remote-tracking branch 'origin/develop' into mueller/reboot-cmd	2022-05-24 00:54:39 +02:00
Robin Mueller	2ebdb5c797	tweak sd card check countdown	2022-05-24 00:53:29 +02:00
Robin Mueller	1519b13b78	appears to work now	2022-05-24 00:52:08 +02:00
Robin Mueller	b2c286cd7e	improve and optimize SD card handling	2022-05-24 00:20:23 +02:00
Robin Müller	b66a91da2e	Merge branch 'develop' into mueller/core-controller-remount-sd-handling	2022-05-23 21:32:27 +02:00
Jakob.Meier	72305cc4c2	Merge pull request 'rtd bugfixes' (#258) from mueller/rtd-bugfixes into develop ... Reviewed-on: #258 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-05-23 19:36:13 +02:00
Robin Müller	e9908139e7	Merge branch 'develop' into mueller/core-controller-remount-sd-handling	2022-05-23 18:37:50 +02:00
Robin Müller	43269d4add	Merge branch 'develop' into mueller/rtd-bugfixes	2022-05-23 18:37:40 +02:00
Robin Mueller	7d9ef6f887	run afmt	2022-05-23 18:37:04 +02:00
Robin Mueller	a4de3e9eb1	Merge remote-tracking branch 'origin/develop' into mueller/rtd-bugfixes	2022-05-23 18:00:45 +02:00
Robin Müller	cc008623b6	Merge pull request 'PLOC handler improvements' (#257) from meier/ploc into develop ... Reviewed-on: #257 Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>	2022-05-23 17:53:55 +02:00
Robin Mueller	10e075efaf	update changelog	2022-05-23 17:52:44 +02:00
Robin Mueller	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
Jakob.Meier	a2eabdce01	Merge pull request 'RTD Update' (#251) from mueller/rtds-update into develop ... Reviewed-on: #251 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-05-23 16:20:37 +02:00
Robin Mueller	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
Robin Mueller	d960c371b9	bump submodules	2022-05-23 09:37:16 +02:00
Robin Müller	dc6fa57c03	Merge branch 'develop' into mueller/core-controller-remount-sd-handling	2022-05-20 08:20:13 +02:00
Robin Mueller	49a06772d2	Merge remote-tracking branch 'origin/develop' into mueller/rtds-update	2022-05-20 08:18:57 +02:00
Jakob.Meier	79d3755c16	Merge pull request 'fixed for new SPI HAL API' (#255) from mueller/fixes-for-spi-update into develop ... Reviewed-on: #255 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-05-19 19:09:54 +02:00
Robin Mueller	a63e87f5f4	subscribe for periodic core ctrl packet	2022-05-19 18:46:49 +02:00
Robin Mueller	eb20dda221	small fix for yocto script	2022-05-19 17:52:46 +02:00
Robin Mueller	e73bfc2c64	dev string for FM/EM	2022-05-19 16:00:26 +02:00
Robin Mueller	d274f5647d	fix EM cofig	2022-05-19 15:28:02 +02:00
Robin Mueller	377f762ca5	fixed for new SPI HAL API	2022-05-19 14:54:44 +02:00
Robin Mueller	847aadc7bf	update shell script helper to support EM installation	2022-05-19 14:48:16 +02:00
Robin Mueller	e49a1af9b7	bump fsfw	2022-05-18 14:51:33 +02:00
Robin Mueller	cf49d98524	bump fsfw	2022-05-17 18:15:21 +02:00
Robin Mueller	28a4f782f9	Merge remote-tracking branch 'origin/develop' into mueller/rtds-update	2022-05-17 17:55:25 +02:00