7602 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Robin Mueller	37b6c32d15	Merge remote-tracking branch 'origin/main' into rework-pdec-fdir	2023-08-14 16:06:27 +02:00
Robin Müller	8447b3c41e	Merge pull request 'Use SGP4 Propagator for GPS' (#770) from use-sgp4-propagator into main ... Reviewed-on: #770 Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>	2023-08-14 15:47:32 +02:00
meggert	93896557aa	fuck math.h	2023-08-14 15:36:20 +02:00
meggert	36b38dd5bf	Merge branch 'main' into use-sgp4-propagator	2023-08-14 15:34:20 +02:00
Robin Müller	639fddcdef	Merge pull request 'Cleaner Calculation of MGM and SUS Rate' (#775) from mgm-sus-rate-calc into main ... Reviewed-on: #775 Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>	2023-08-14 15:28:33 +02:00
Robin Müller	6f8484be2a	Merge branch 'main' into mgm-sus-rate-calc	2023-08-14 15:28:22 +02:00
Robin Mueller	424f3c5247	changelog and re-run generators	2023-08-14 15:09:45 +02:00
Robin Mueller	e2b54ddb8e	Merge remote-tracking branch 'origin/main' into meier/pdec-config-readback	2023-08-14 15:06:58 +02:00
Robin Mueller	567d68107d	auto-formatting	2023-08-14 15:06:22 +02:00
Robin Mueller	dd5b858666	changelog	2023-08-14 14:59:56 +02:00
meggert	acc140412d	Merge branch 'use-sgp4-propagator' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into use-sgp4-propagator	2023-08-14 12:48:47 +02:00
meggert	15421240f1	naming	2023-08-14 12:48:22 +02:00
Robin Mueller	84f7642411	Merge remote-tracking branch 'origin/main' into use-sgp4-propagator	2023-08-14 12:21:53 +02:00
Robin Müller	4851c6fdb0	Merge pull request 'Add debug GPS dataset including more data' (#771) from more-gps-tm into main ... Reviewed-on: #771 Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>	2023-08-14 12:20:40 +02:00
Robin Müller	d65c63b58f	Merge branch 'main' into use-sgp4-propagator	2023-08-14 10:50:04 +02:00
Robin Müller	819f5c299d	Merge branch 'main' into mgm-sus-rate-calc	2023-08-14 10:40:29 +02:00
Robin Müller	2af1b6b698	Merge branch 'main' into more-gps-tm	2023-08-14 10:40:07 +02:00
Robin Müller	35fe0c909a	Merge pull request 'ENOUGH IS ENOUGH' (#774) from ENOUGH-IS-ENOUGH into main ... Reviewed-on: #774 Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>	2023-08-14 10:39:49 +02:00
Robin Mueller	da25d650d9	bugfix	2023-08-14 10:34:06 +02:00