8618 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Marius Eggert	2d7356b9ed	Merge pull request 'Nah' (#891) from i-hate-it-here into main ... Reviewed-on: #891 Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>	2024-04-11 14:04:51 +02:00
meggert	675dda8e9e	bump version	2024-04-11 14:00:30 +02:00
meggert	5bb1bd8946	changelog	2024-04-11 13:58:57 +02:00
meggert	eff9116aec	???	2024-04-11 13:57:40 +02:00
Marius Eggert	4ed516e0bc	Merge pull request 'Prep v7.8.0' (#890) from prep-v7.8.0 into main ... Reviewed-on: #890	2024-04-10 12:48:14 +02:00
meggert	e2ee6a492c	changelog	2024-04-10 11:57:17 +02:00
meggert	a6422f2d73	bump version	2024-04-10 11:56:19 +02:00
meggert	ceb2130726	bumped tmtc	2024-04-10 11:54:17 +02:00
meggert	fcd3b7815c	reran gens	2024-04-10 11:53:21 +02:00
Marius Eggert	1067abba9a	Merge pull request 'Improve device FDIR' (#885) from improve-dev-fdir into main ... Reviewed-on: #885 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2024-04-10 11:43:30 +02:00
meggert	53376fd9ed	fix changelog	2024-04-10 11:43:06 +02:00
Marius Eggert	c2d05b2045	Merge branch 'main' into improve-dev-fdir	2024-04-10 11:41:51 +02:00
Marius Eggert	48914a2aba	Merge pull request 'GNSS Ctrl Improvements' (#871) from gnss-ctrl-improvements into main ... Reviewed-on: #871 Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>	2024-04-10 11:40:24 +02:00
meggert	ef8736bd81	Merge branch 'main' into gnss-ctrl-improvements	2024-04-10 11:40:04 +02:00
Marius Eggert	584a16a67c	Merge pull request 'Fix Error Quaternion' (#883) from error-quat-fix into main ... Reviewed-on: #883 Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>	2024-04-10 11:38:35 +02:00
Robin Müller	addfadddb6	Merge branch 'main' into improve-dev-fdir	2024-04-10 11:30:15 +02:00
meggert	df392d3319	Merge branch 'main' into error-quat-fix	2024-04-10 10:49:59 +02:00
Robin Müller	b079ce85f2	Merge pull request 'Update for PWR CTRL Limits' (#884) from change-pwr-ctrl-limits into main ... Reviewed-on: #884 Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>	2024-04-10 10:48:12 +02:00
meggert	bc9b8efdb8	Merge branch 'main' into change-pwr-ctrl-limits	2024-04-10 08:57:07 +02:00
Robin Mueller	51dcb56583	Merge remote-tracking branch 'origin/main' into payload-module	2024-04-09 17:42:01 +02:00
Robin Mueller	df0c8eefab	bump tmtc	2024-04-09 17:41:34 +02:00
Robin Müller	5a7df626ab	Merge branch 'main' into improve-dev-fdir	2024-04-09 17:36:37 +02:00
meggert	7b53275d61	changelog	2024-04-09 15:06:23 +02:00
meggert	709c53d533	Merge branch 'main' into gnss-ctrl-improvements	2024-04-09 14:49:36 +02:00
Marius Eggert	3a70155105	Merge pull request 'Enable MEKF for PTG as Default' (#888) from enable-mekf into main ... Reviewed-on: #888 Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>	2024-04-09 14:45:10 +02:00
meggert	7a12c1c8fe	the first fix should trigger an event	2024-04-09 14:43:47 +02:00
Robin Müller	0f1c41e828	Merge branch 'main' into enable-mekf	2024-04-09 14:33:36 +02:00
Robin Mueller	c4340c3515	re-point tmtc	2024-04-09 14:33:02 +02:00
Robin Mueller	eec934e1b0	bump submodules	2024-04-09 14:32:00 +02:00
Robin Mueller	b01d4f6363	bump tmtc	2024-04-09 14:30:11 +02:00
Robin Mueller	d9789a48d8	Merge remote-tracking branch 'origin/main' into improve-dev-fdir	2024-04-09 14:29:54 +02:00
Robin Müller	c3237cae3c	Merge pull request 'impl relative timeshift in framework' (#886) from relative-timeshift into main ... Reviewed-on: #886 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2024-04-09 14:29:28 +02:00
meggert	427c53df8c	better	2024-04-09 14:04:20 +02:00
meggert	c89e81cac9	Merge branch 'main' into enable-mekf	2024-04-09 13:55:11 +02:00
Robin Müller	fb54d976d2	Merge branch 'main' into relative-timeshift	2024-04-09 13:41:34 +02:00
Robin Mueller	25a1e4ea25	Merge remote-tracking branch 'origin/main' into improve-dev-fdir	2024-04-09 13:41:10 +02:00
Robin Müller	a63eb331eb	Merge pull request 'Revert lower PLOC OP Limits' (#887) from ploc-op-limit into main ... Reviewed-on: #887 Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>	2024-04-09 13:34:37 +02:00
Robin Mueller	1793b325ec	compiles again	2024-04-09 13:33:56 +02:00
meggert	1c36f36b1f	this seems better	2024-04-09 13:31:27 +02:00
meggert	0f3eeb42d6	15 should be enough	2024-04-09 13:30:22 +02:00
meggert	887f165484	ye maybe dont hold the reset pin for 3h	2024-04-09 13:29:42 +02:00
Robin Mueller	6cc1d86018	add new payload module	2024-04-09 13:19:52 +02:00
meggert	d4eb124cdf	missing reset	2024-04-09 11:26:55 +02:00
Robin Mueller	47cedb90f9	bump fsfw	2024-04-09 11:07:05 +02:00
meggert	f3d4e09487	improved event comment	2024-04-09 09:59:21 +02:00
meggert	2057ab9c10	some cleanup	2024-04-09 09:58:05 +02:00
Robin Mueller	1f0e2d99e9	fix comment block	2024-04-08 13:38:35 +02:00
Robin Mueller	35181a2693	changelog	2024-04-08 13:36:21 +02:00
Robin Mueller	e1b5625086	update events	2024-04-08 13:35:42 +02:00
Robin Mueller	72626582f6	bump submodules	2024-04-08 13:27:08 +02:00