7747 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
meggert	cfbd6d3b1e	changelog	2023-09-06 14:38:19 +02:00
meggert	63b6db258c	params for new safe mode	2023-09-06 14:37:04 +02:00
meggert	c709bd0881	changelog	2023-09-06 14:35:40 +02:00
meggert	a81eae7726	exchange nominal and 1st redundancy sensor for ploc mission board	2023-09-06 14:34:15 +02:00
Marius Eggert	a39da169d8	Merge pull request 'Bump Submodules' (#788) from bump-submodules into main ... Reviewed-on: #788	2023-08-21 18:53:54 +02:00
meggert	4f335ea270	bump tmtc	2023-08-21 18:49:49 +02:00
meggert	90b4a4d8c0	bump fsfw	2023-08-21 18:36:01 +02:00
Marius Eggert	3acdb54fab	Merge pull request 'Prep v6.4.1' (#787) from prep-v6.4.1 into main ... Reviewed-on: #787	2023-08-21 18:23:12 +02:00
meggert	6048ffe656	prep	2023-08-21 16:01:56 +02:00
Marius Eggert	5060de1f6d	Merge pull request 'Fix for MAG Field Vector calculation' (#786) from mgm4-disabled-fix into main ... Reviewed-on: #786	2023-08-21 14:51:29 +02:00
meggert	26bf178b2a	changelog	2023-08-21 14:41:16 +02:00
meggert	b9167c7e22	valid check now includes allowed use of mgm4	2023-08-21 14:33:55 +02:00
Marius Eggert	b97afc9f1c	Merge pull request 'PDEC Corrupted Config Event Parameters' (#785) from meier/pdec-event-params into main ... Reviewed-on: #785 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-08-21 09:20:30 +02:00
meggert	a1d360502f	changelog	2023-08-21 09:14:16 +02:00
Jakob Meier	ddbf4a5ff0	run auto formatter	2023-08-19 06:37:39 +02:00
Jakob Meier	6febf6242a	pdec config corrupted event, readback config used as parameters	2023-08-19 06:33:31 +02:00
Robin Müller	da71aea101	Merge pull request 'event fix for file corruption' (#784) from persistent-tm-store-event-fix into main ... Reviewed-on: #784 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-08-17 16:45:12 +02:00
Robin Mueller	df397f6dee	changelog	2023-08-17 10:28:55 +02:00
Robin Mueller	e148e95471	event fix for file corruption	2023-08-17 10:27:33 +02:00
Marius Eggert	b11461c2f7	Merge pull request 'missing changelog entry' (#783) from ploc-supv-changelog into main ... Reviewed-on: #783 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-08-16 13:58:04 +02:00
Robin Mueller	1748d18852	missing changelog entry	2023-08-16 10:57:02 +02:00
Robin Müller	8a1e6bc5d2	Merge pull request 'date correction' (#782) from prep_v6.4.0 into main ... Reviewed-on: #782	2023-08-16 10:54:50 +02:00
Robin Mueller	72fc99dc49	date correction	2023-08-16 10:54:02 +02:00
Robin Müller	3652b6cfad	Merge pull request 'PLOC SUPV periodic HK' (#781) from ploc-supv-periodic-hk into main ... Reviewed-on: #781 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-08-15 18:56:11 +02:00
Robin Mueller	d1a446d445	hopefully dont need this const	2023-08-15 14:43:23 +02:00
Robin Mueller	e64e9daed1	bump eive-tmtc	2023-08-15 14:42:12 +02:00
Robin Mueller	963ca0c939	PLOC SUPV	2023-08-15 14:34:10 +02:00
Robin Mueller	2d18ce4ff1	adapt changelog	2023-08-15 13:59:59 +02:00
Robin Mueller	0b35585449	Merge branch 'prep_v6.4.0' into ploc-supv-periodic-hk	2023-08-15 13:59:47 +02:00
Robin Mueller	af5f51928b	PLOC SUPV periodic HK	2023-08-15 13:49:06 +02:00
Robin Müller	6919ab9455	Merge pull request 'new event, bump tmtc' (#779) from new-event into main ... Reviewed-on: #779	2023-08-15 13:32:44 +02:00
Robin Mueller	e4545d0515	new event, bump tmtc	2023-08-15 13:29:46 +02:00
Robin Mueller	fb2995575b	prep next version	2023-08-15 13:26:45 +02:00
Robin Müller	77e3b8c359	Merge pull request 'PDEC corrupted Config Event' (#773) from meier/pdec-config-readback into main ... Reviewed-on: #773 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-08-15 13:24:02 +02:00
Robin Mueller	63b483b71a	Merge remote-tracking branch 'origin/main' into meier/pdec-config-readback	2023-08-15 13:22:42 +02:00
Robin Mueller	e24212207f	Merge remote-tracking branch 'origin/main' into meier/pdec-config-readback	2023-08-15 13:21:53 +02:00
Robin Müller	2ed010327f	Merge pull request 'Improve Safe Strat State Machine' (#777) from safe-strat-improvement into main ... Reviewed-on: #777	2023-08-15 13:19:14 +02:00
Robin Mueller	181d355741	bump tmtc	2023-08-15 13:17:08 +02:00
Robin Mueller	0fb57064d3	Merge remote-tracking branch 'origin/main' into safe-strat-improvement	2023-08-15 13:16:58 +02:00
Robin Müller	2526873be2	Merge pull request 'Rework PDEC FDIR' (#772) from rework-pdec-fdir into main ... Reviewed-on: #772 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-08-15 11:23:54 +02:00
Robin Mueller	bda57d9bd1	Merge remote-tracking branch 'origin/main' into meier/pdec-config-readback	2023-08-15 10:50:02 +02:00
Robin Mueller	6fc50f164e	Merge remote-tracking branch 'origin/main' into rework-pdec-fdir	2023-08-15 10:49:17 +02:00
Robin Mueller	41ff0cc9ac	Merge remote-tracking branch 'origin/main' into safe-strat-improvement	2023-08-15 10:48:49 +02:00
Robin Müller	cc4795c657	Merge pull request 'Flag for MGM4 Usage' (#778) from delete-mgm4-from-existance into main ... Reviewed-on: #778	2023-08-15 10:31:13 +02:00
meggert	196781ed4a	changelog	2023-08-15 09:39:59 +02:00
meggert	7ab8fb8cb9	added parameter to disable usage of mgm4	2023-08-15 09:37:54 +02:00
meggert	0a42093de3	changelog	2023-08-15 09:20:00 +02:00
meggert	d82a6ece5a	use safeCtrl even if SUS and MGM vectors are too close	2023-08-15 09:11:57 +02:00
Robin Mueller	693c183dcc	bump tmtc	2023-08-14 16:07:16 +02:00
Robin Mueller	fe0d2bf832	Merge remote-tracking branch 'origin/main' into meier/pdec-config-readback	2023-08-14 16:06:59 +02:00