3382 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Robin Mueller	51466e68d7	Merge remote-tracking branch 'origin/develop' into mueller/heater-health-if	2022-05-12 14:11:46 +02:00
Cleanroom Laptop L15	e6f55ba2c1	increased execution timeout of prepare update command	2022-05-12 14:04:55 +02:00
Robin Mueller	c1faf65409	schedule new rtd reader component	2022-05-12 12:35:05 +02:00
Robin Mueller	382d93863f	create and pass correct comIF	2022-05-12 12:21:47 +02:00
Robin Mueller	a173ef4308	create low level rtd handler in obj factory	2022-05-12 12:12:47 +02:00
Robin Mueller	6b9e49e632	continued low level MAX31865 handler	2022-05-12 11:27:30 +02:00
Cleanroom Laptop L15	0dd0af73a1	change in mpsoc status codes	2022-05-12 10:50:12 +02:00
Robin Mueller	23f209fb07	added eive specific max31865 handler	2022-05-12 09:48:41 +02:00
Jakob Meier	e5710784b9	Merge branch 'develop' into meier/ccsds	2022-05-12 07:47:28 +02:00
Robin Mueller	56f491befb	compile fix	2022-05-12 00:48:49 +02:00
Robin Mueller	93f605bc0a	Merge remote-tracking branch 'origin/develop' into mueller/rtds-update	2022-05-12 00:45:57 +02:00
Robin Mueller	d1d365c76d	bump tmtc again	2022-05-11 18:00:11 +02:00
Robin Mueller	38d03dbe57	bump deps, regenerate translation files	2022-05-11 17:59:08 +02:00
Jakob Meier	af52b90abe	fsfwgen update	2022-05-11 17:16:40 +02:00
Jakob Meier	a315a8b529	fixed conflicts	2022-05-11 17:08:44 +02:00
Robin Mueller	5f96d157a7	repoint fsfw	2022-05-11 17:04:31 +02:00
Robin Mueller	c1992f59d6	Merge remote-tracking branch 'origin/develop' into mueller/reboot-cmd	2022-05-11 17:04:19 +02:00
Jakob.Meier	658acb0554	Merge pull request 'RW Assembly' (#224) from mueller/rw-ass into develop ... Reviewed-on: #224 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-05-11 17:03:32 +02:00
Robin Mueller	5a82fe93d9	core ctrl remount sd handling	2022-05-11 17:02:57 +02:00
Jakob Meier	8a90f0025b	commented in time file write	2022-05-11 17:01:03 +02:00
Jakob Meier	beba258a77	update fsfw	2022-05-11 16:57:23 +02:00
Jakob Meier	c7e2cc22af	init sequence count	2022-05-11 16:49:07 +02:00
Cleanroom Laptop L15	835a10e538	sequence count init	2022-05-11 16:11:17 +02:00
Robin Müller	1d1f04f57b	Merge branch 'develop' into mueller/reboot-cmd	2022-05-11 15:48:34 +02:00
Robin Mueller	625abcfd5b	important bugfixes	2022-05-11 15:45:38 +02:00
Jakob Meier	914acd9925	fixed conflicts	2022-05-11 14:37:36 +02:00
Jakob Meier	c7e4704234	fixed merge conflict	2022-05-11 14:36:23 +02:00