810 Commits

Author	SHA1	Message	Date
Cleanroom Laptop L15	23cabe4ca6	Merge branch 'develop' into mohr/thermal_controller	2022-05-30 12:10:19 +02:00
Robin Mueller	97db44e500	fix raspberry pi build	2022-05-26 11:46:28 +02:00
Jakob.Meier	f50682b56a	Merge pull request 'Split ACU HK' (#256) from mueller/split-acu-hk into develop ... Reviewed-on: #256 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-05-25 15:23:19 +02:00
Jakob.Meier	ad679a810e	Merge pull request 'add and schedule PUS11' (#259) from mueller/add-schedule-pus-11 into develop ... Reviewed-on: #259 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-05-25 15:21:25 +02:00
Jakob.Meier	686ec4bffa	Merge pull request 'GPS Reset Pin Handling Update' (#261) from mueller/gps-reset-pin-update into develop ... Reviewed-on: #261 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-05-25 15:20:12 +02:00
Robin Mueller	ae434853aa	bump number stored packets	2022-05-25 13:14:36 +02:00
Robin Mueller	01bac87afb	update reset pin handling	2022-05-25 10:59:20 +02:00
Robin Müller	ffdd6bbc3c	Merge branch 'develop' into mueller/add-schedule-pus-11	2022-05-25 10:27:36 +02:00
Robin Mueller	0b3fd65c9a	Merge remote-tracking branch 'origin/develop' into mueller/add-schedule-pus-11	2022-05-25 10:16:31 +02:00
Robin Mueller	0ac38e8490	Merge remote-tracking branch 'origin/develop' into mueller/split-acu-hk	2022-05-25 10:16:14 +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 Mueller	7646b683b2	Merge remote-tracking branch 'origin/develop' into mueller/split-acu-hk	2022-05-25 09:59:14 +02:00
Robin Mueller	43fc1ab780	Merge remote-tracking branch 'origin/develop' into mueller/add-schedule-pus-11	2022-05-25 09:57:34 +02:00
Robin Mueller	2bf044422f	Merge remote-tracking branch 'origin/develop' into meier/imtq	2022-05-25 09:56:41 +02:00
Jakob Meier	1ccd12e2e1	enable hk in imtq	2022-05-24 19:08:00 +02:00
Ulrich Mohr	b878508fec	Thermal COntroller collecting Sus Temperatures	2022-05-24 16:52:21 +02:00
Robin Mueller	3fff3ba21e	add and schedule PUS11	2022-05-24 15:21:37 +02:00
Robin Mueller	633fe00cd6	run afmt, minor improvements	2022-05-24 01:14:04 +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 Mueller	a1d2ec3db4	Merge remote-tracking branch 'origin/develop' into mueller/split-acu-hk	2022-05-23 22:24:28 +02:00
Robin Mueller	5df905182c	these brackets are less confusing	2022-05-23 18:40:17 +02:00
Robin Müller	43269d4add	Merge branch 'develop' into mueller/rtd-bugfixes	2022-05-23 18:37:40 +02:00
Robin Mueller	40b02aa46b	Merge remote-tracking branch 'origin/develop' into mueller/split-acu-hk	2022-05-23 18:37:28 +02:00
Robin Mueller	7d9ef6f887	run afmt	2022-05-23 18:37:04 +02:00
Robin Mueller	62ef9c7e70	set datapool entries of rad sensor valid	2022-05-23 18:25:39 +02:00
Robin Mueller	1f62d8284c	Merge remote-tracking branch 'origin/develop' into mueller/split-acu-hk	2022-05-23 18:01:37 +02:00
Robin Mueller	a4de3e9eb1	Merge remote-tracking branch 'origin/develop' into mueller/rtd-bugfixes	2022-05-23 18:00:45 +02:00
Robin Mueller	8aa664b49f	rtd bugfixes	2022-05-23 17:50:54 +02:00
Jakob Meier	d808a12c31	fixed conflicts	2022-05-23 16:53:20 +02:00
Robin Mueller	660f0d2dcd	some minor fixes	2022-05-23 14:19:57 +02:00
Robin Mueller	e522aadd44	set HKs valid	2022-05-23 14:04:46 +02:00
Robin Mueller	8ae6fe0be5	moved HK defs	2022-05-23 12:39:10 +02:00
Jakob Meier	fb5c6c4c17	continuation of failed mpsoc update	2022-05-23 12:05:42 +02:00
Robin Mueller	99e27a5a63	run afmt	2022-05-23 11:25:58 +02:00
Robin Mueller	3bdad61ac0	split ACU HK set	2022-05-23 10:42:57 +02:00
Ulrich Mohr	c024756540	WIP extending thermal controller	2022-05-23 00:37:49 +02:00
Ulrich Mohr	2f8f5ce79b	thermal controller is reading pt1000 values from datapool	2022-05-19 23:08:54 +02:00
Ulrich Mohr	e9725e3093	gcc 12 complained...	2022-05-19 23:06:18 +02:00
Ulrich Mohr	ef14fa3789	Merge remote-tracking branch 'origin/mueller/fixes-for-spi-update' into mohr/thermal_controller	2022-05-19 16:29:30 +02:00
Uli	710bd58ee1	Merge branch 'develop' into mohr/thermal_controller	2022-05-19 15:31:13 +02:00
Robin Mueller	377f762ca5	fixed for new SPI HAL API	2022-05-19 14:54:44 +02:00
Ulrich Mohr	90a92feee1	some thermal controller code to test TM chain	2022-05-19 00:40:42 +02:00
Robin Mueller	e49a1af9b7	bump fsfw	2022-05-18 14:51:33 +02:00
Robin Mueller	28a4f782f9	Merge remote-tracking branch 'origin/develop' into mueller/rtds-update	2022-05-17 17:55:25 +02:00
Robin Mueller	140bbcb7b8	Merge remote-tracking branch 'origin/develop' into mueller/rtds-update	2022-05-17 13:43:21 +02:00
Robin Mueller	8a5090b8ee	apply new auto-formatter on all files	2022-05-17 13:40:19 +02:00
Robin Mueller	e2cfce634b	GenericFactory bugfix	2022-05-17 13:35:21 +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