3209 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Robin Mueller	8b875e13c5	repoint fsfw	2022-05-16 15:46:20 +02:00
Robin Mueller	7080758c67	Merge remote-tracking branch 'origin/develop' into mueller/core-controller-remount-sd-handling	2022-05-16 15:18:55 +02:00
Robin Mueller	a26b1bb311	Merge remote-tracking branch 'origin/develop' into mueller/rtds-update	2022-05-16 15:17:29 +02:00
Robin Müller	5f165f666b	Merge pull request 'PLOC Handler Improvements' (#252) from meier/ploc into develop ... Reviewed-on: #252 Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>	2022-05-16 15:12:28 +02:00
Robin Mueller	a6abeb697f	comment	2022-05-16 15:09:02 +02:00
Robin Mueller	a92024a858	now supports auto mode as well	2022-05-14 17:32:33 +02:00
Robin Mueller	036024db7e	perm loop not necessary anymore	2022-05-14 17:22:57 +02:00
Robin Mueller	e040f6b218	bump tmtc	2022-05-14 17:12:29 +02:00
Robin Mueller	f20fcd9a72	Merge remote-tracking branch 'origin/develop' into mueller/rtds-update	2022-05-14 17:07:27 +02:00
Robin Mueller	017cfb9d56	a lot of fixes, but some stuff doesnt work..	2022-05-14 17:04:51 +02:00
Robin Mueller	2cfd2cc1fc	switch to new dev handlers completely	2022-05-14 15:26:08 +02:00
Robin Mueller	478975db26	spi setup more stable now	2022-05-14 11:34:25 +02:00
Robin Mueller	1c9f411e75	new RTD handler working	2022-05-14 09:41:28 +02:00
Cleanroom Laptop L15	d60e7a706a	fixed conflicts	2022-05-13 18:44:52 +02:00
Cleanroom Laptop L15	45f34df6b9	Merge branch 'develop' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into develop	2022-05-13 18:38:26 +02:00
Jakob.Meier	4cbe732087	Merge pull request 'Heater Health IF' (#236) from mueller/heater-health-if into develop ... Reviewed-on: #236 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-05-13 18:38:12 +02:00
Cleanroom Laptop L15	54d7392467	improved mpsoc update handling	2022-05-13 18:37:16 +02:00
Robin Mueller	8715683d6b	enable periodic reply for eie RTD	2022-05-13 17:25:06 +02:00
Robin Mueller	2c684643b3	some smaller fixed for new rtd handler	2022-05-13 16:29:57 +02:00
Robin Mueller	b12a634b81	typo	2022-05-13 15:16:48 +02:00
Robin Mueller	3ae1812c32	some renaming	2022-05-13 15:16:10 +02:00
Robin Mueller	80eeebfaf5	Merge remote-tracking branch 'origin/develop' into mueller/core-controller-remount-sd-handling	2022-05-13 11:21:06 +02:00
Robin Mueller	e6ec6bcfa4	Merge remote-tracking branch 'origin/develop' into mueller/reboot-cmd	2022-05-13 11:15:09 +02:00
Jakob Meier	bb397a58de	event with packet number for which mpsoc update failed	2022-05-13 10:47:10 +02:00
Robin Mueller	44e7f06c2e	shorter debug string	2022-05-13 10:33:35 +02:00
Robin Mueller	f3b473ea99	some more rtd tweaks	2022-05-13 10:27:26 +02:00
Robin Mueller	706e3d458b	switch to direct handler again	2022-05-13 10:13:16 +02:00
Robin Mueller	d999f57fef	apply afmt	2022-05-13 10:10:56 +02:00
Robin Mueller	6b54a4dea9	cleaning up, better fault status handling	2022-05-13 10:10:02 +02:00
Robin Mueller	fd0de9426f	Merge remote-tracking branch 'origin/develop' into mueller/rtds-update	2022-05-13 09:51:22 +02:00
Robin Mueller	bf7acf83ff	update .cproject file	2022-05-13 09:51:11 +02:00
Robin Mueller	23f37e19af	bump fsfw	2022-05-13 09:39:49 +02:00
Robin Mueller	b5821ec6dc	changelog update	2022-05-13 09:35:47 +02:00
Robin Mueller	be1c26ddf7	rtd testing	2022-05-13 01:17:23 +02:00
Robin Mueller	da4d3e4891	update changelog	2022-05-12 20:47:19 +02:00
Robin Mueller	ac34bcbb3d	Merge remote-tracking branch 'origin/develop' into mueller/heater-health-if	2022-05-12 20:46:00 +02:00
Robin Mueller	e81ddaa1a5	added auto-shutdown for faulty heaters	2022-05-12 20:44:36 +02:00
Robin Mueller	21ba8c95ff	additional parameter to identify cmd source	2022-05-12 20:12:01 +02:00
Robin Mueller	e25c492aa4	create and schedule health PUS service	2022-05-12 19:22:20 +02:00
Robin Mueller	82f75bde97	fix for heater creation call	2022-05-12 19:12:12 +02:00
Jakob Meier	919141ae10	ccsds handler sending command to enable transmitter	2022-05-12 18:32:19 +02:00
Robin Mueller	e48aa64766	repoint fsfw	2022-05-12 17:48:18 +02:00
Jakob Meier	3c3884476b	Merge branch 'develop' into meier/ccsds	2022-05-12 15:57:26 +02:00
Robin Müller	569754bdad	Merge branch 'develop' into meier/ploc	2022-05-12 15:48:56 +02:00
Robin Mueller	5fe814e972	Merge remote-tracking branch 'origin/develop' into mueller/rtds-update	2022-05-12 15:48:26 +02:00
Cleanroom Laptop L15	06219744ea	Merge branch 'meier/ploc' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into meier/ploc	2022-05-12 15:47:16 +02:00
Cleanroom Laptop L15	9db58210b8	Merge branch 'develop' into meier/ploc	2022-05-12 15:47:06 +02:00
Jakob.Meier	ee99c3312e	Merge pull request 'Update EIVE OBSW' (#250) from mueller/update-eive-obsw into develop ... Reviewed-on: #250 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-05-12 15:34:07 +02:00
Jakob Meier	3a6beafae5	commented time file writing in again	2022-05-12 15:31:52 +02:00
Robin Mueller	d7316eff66	remove merge conflict markers	2022-05-12 14:23:10 +02:00