2678 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Robin Mueller	c6e16e0866	resolve merge conflict, ran afmt	2022-04-07 09:57:19 +02:00
Robin Mueller	042a6b2960	Merge remote-tracking branch 'origin/develop' into mueller/pl-pcdu-update-mode-handling	2022-04-07 09:50:21 +02:00
Robin Mueller	06a15ccec1	submodule updates	2022-04-07 00:16:15 +02:00
Robin Mueller	834e935c64	switch handling working now	2022-04-07 00:14:18 +02:00
Robin Mueller	d7e899e113	Merge remote-tracking branch 'origin/develop' into mueller/improve-pcdu-hk-handling	2022-04-06 12:10:50 +02:00
Robin Mueller	f325d139da	p60 dock HK does not need to be diagnostic	2022-04-06 12:10:22 +02:00
Robin Müller	1d6ae35465	Merge pull request 'meier/syrlinks' (#199) from meier/syrlinks into develop ... Reviewed-on: #199 Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>	2022-04-06 12:09:50 +02:00
Robin Mueller	65d504bed1	p60 dock HK is diagnostic again	2022-04-05 19:49:57 +02:00
Robin Mueller	36db47466f	tmtc update	2022-04-05 19:43:28 +02:00
Robin Mueller	3cfd0deb22	set p60 dock HK vars to valid	2022-04-05 19:29:09 +02:00
Jakob Meier	146868da21	fsfw update	2022-04-05 14:43:20 +02:00
Jakob Meier	d48ec92d09	fixed conflicts	2022-04-05 13:57:16 +02:00
Jakob Meier	29b7c97892	tmtc update	2022-04-05 12:00:12 +02:00
Jakob Meier	1f4328d9a0	prepared pr	2022-04-05 11:52:01 +02:00
Jakob Meier	f91efd8c1e	prepared pr	2022-04-05 11:50:45 +02:00
Jakob Meier	40403b81c3	debug flag	2022-04-05 08:38:36 +02:00
Robin Mueller	6020b20fc9	hk handling	2022-04-04 18:47:09 +02:00
Robin Mueller	5031e78365	Merge remote-tracking branch 'origin/develop' into mueller/improve-pcdu-hk-handling	2022-04-04 17:22:33 +02:00
Robin Mueller	65ce25ec7a	improved P60 HK handling	2022-04-04 17:16:52 +02:00
Jakob Meier	a30e57142a	tmtc update	2022-04-04 15:05:56 +02:00
Jakob Meier	d2f54f033f	syrlinks	2022-04-04 14:58:35 +02:00
Robin Mueller	4327fcb92e	set internal state properly	2022-04-04 13:55:25 +02:00
Robin Mueller	d315d6b458	tmtc update	2022-04-04 13:53:44 +02:00
Jakob.Meier	734972af07	Merge pull request 'apply auto-formatter' (#197) from mueller/afmt into develop ... Reviewed-on: #197 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-04-04 13:51:37 +02:00
Robin Mueller	ec880d4232	apply auto-formatter	2022-04-04 13:40:45 +02:00
Robin Mueller	b12ffb6f44	PL PCDU switch states like mode bitmask now	2022-04-04 13:39:35 +02:00
Robin Mueller	99f56a89af	tmtc update	2022-04-04 12:00:39 +02:00
Robin Mueller	5e3e152d8e	Merge remote-tracking branch 'origin/develop' into mueller/master	2022-04-04 11:58:51 +02:00
Jakob.Meier	50db2fedef	Merge pull request 'bugfix in SUS device handler' (#196) from mueller/sus-bugfix into develop ... Reviewed-on: #196 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-04-04 07:49:53 +02:00
Robin Mueller	4cb434e750	Merge branch 'mueller/sus-bugfix' into mueller/master	2022-04-03 20:36:10 +02:00
Robin Mueller	007badc324	bugfix in SUS device handler	2022-04-03 20:35:49 +02:00
Robin Mueller	36666f214c	Merge remote-tracking branch 'origin/develop' into mueller/master	2022-04-03 20:15:41 +02:00
Robin Mueller	189674a9bb	re-enable all suses	2022-04-03 20:12:14 +02:00
Jakob.Meier	a57f3faafb	Merge pull request 'update fsfw dependency' (#195) from mueller/update-fsfw into develop ... Reviewed-on: #195 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-04-01 14:58:22 +02:00
Jakob.Meier	04de6c7136	Merge pull request 'move GNSS NReset handling to assembly' (#194) from mueller/move-gnss-nreset-handling into develop ... Reviewed-on: #194 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-04-01 14:55:49 +02:00
Jakob.Meier	afb1d22f76	Merge pull request 'activate all suses again' (#193) from mueller/rpi-sus-port into develop ... Reviewed-on: #193 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-04-01 14:52:10 +02:00
Jakob Meier	07c242282d	syrlinks test	2022-04-01 14:15:42 +02:00
Robin Mueller	8a4de72713	update header file as well	2022-04-01 14:13:37 +02:00
Robin Mueller	d3050625bb	update fsfw dependency	2022-04-01 14:12:14 +02:00
Robin Mueller	c55fafee48	fsfw update	2022-04-01 14:11:41 +02:00
Robin Mueller	c231a775b3	Merge remote-tracking branch 'origin/develop' into mueller/move-gnss-nreset-handling	2022-04-01 14:05:32 +02:00
Robin Müller	2cc14532cd	Merge pull request 'meier/deviceHandlerUpdate' (#192) from meier/deviceHandlerUpdate into develop ... Reviewed-on: #192 Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>	2022-04-01 14:05:04 +02:00
Robin Mueller	1eb5a428cb	move GNSS NReset handling to assembly ... - Also update fsfwgen dependency	2022-04-01 14:01:12 +02:00
Robin Müller	1a280dd5cf	Merge branch 'develop' into mueller/rpi-sus-port	2022-04-01 13:46:14 +02:00
Robin Mueller	0fba9cbf7e	Merge remote-tracking branch 'origin/develop' into mueller/master	2022-04-01 13:44:47 +02:00
Robin Mueller	d769d3ce22	Merge remote-tracking branch 'origin/develop' into meier/deviceHandlerUpdate	2022-04-01 13:41:04 +02:00
Jakob Meier	ca1e8f3dc1	syrlinks fault flag	2022-04-01 09:20:35 +02:00
Robin Mueller	61769de4bf	activate all suses again	2022-03-31 19:12:40 +02:00
Jakob.Meier	ff86b9bbb3	Merge pull request 'Port of Sun Sensor and RTD code to Raspberry Pi' (#190) from mueller/rpi-sus-port into develop ... Reviewed-on: #190 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-03-31 18:58:10 +02:00
Robin Mueller	487c21f16a	fixes	2022-03-31 18:04:55 +02:00