5100 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Robin Mueller	a190d99f6d	auto-formatter	2023-02-22 19:45:41 +01:00
Robin Mueller	5357de8da8	bump fsfe	2023-02-22 18:13:52 +01:00
Robin Mueller	9614a76acf	Merge remote-tracking branch 'origin/develop' into meier/com-ss	2023-02-22 18:13:29 +01:00
Robin Mueller	0466622a16	tweaks for ACS scheduling	2023-02-22 18:07:15 +01:00
meggert	8873ecae48	boop	2023-02-22 17:31:40 +01:00
meggert	5ad2fa5e93	added action commands	2023-02-22 17:10:42 +01:00
meggert	2c4a47f302	added function to delete files	2023-02-22 17:08:42 +01:00
Jakob Meier	0d8cb295d9	removed duplicate code	2023-02-22 16:55:12 +01:00
meggert	2a91105124	added executeAction	2023-02-22 16:10:30 +01:00
meggert	eaceb32359	Merge branch 'develop' into eggert/acs-dataset-stuff	2023-02-22 16:03:36 +01:00
meggert	01d8eccdd2	changelog	2023-02-22 16:00:28 +01:00
Robin Mueller	19d04c0023	v1.30.0	2023-02-22 15:03:07 +01:00
meggert	67a14ca6f6	handle ACS event in AcsSubsystem	2023-02-22 15:02:15 +01:00
meggert	83b81e1ba8	changed mekf events again	2023-02-22 14:57:44 +01:00
Jakob Meier	e915f6cc90	Merge pull request 'PDEC possible fixes' (#393) from pdec_possible_fixes_and_fdir into develop ... Reviewed-on: #393 Reviewed-by: Jakob Meier <meierj@irs.uni-stuttgart.de>	2023-02-22 14:45:48 +01:00
Robin Mueller	c9f16b223a	Merge remote-tracking branch 'origin/develop' into pdec_possible_fixes_and_fdir	2023-02-22 14:30:31 +01:00
Jakob Meier	3137ebb86e	com subsystem complete	2023-02-22 13:02:40 +01:00
Jakob Meier	fd1c090141	tmtc update	2023-02-22 13:02:04 +01:00
Jakob Meier	82d428440b	tmtc update	2023-02-22 09:53:39 +01:00
Jakob Meier	018f93cfbe	fixed bugs in com subsystem	2023-02-22 09:53:09 +01:00
Jakob Meier	c64a490324	Merge branch 'develop' into meier/com-ss	2023-02-22 07:17:02 +01:00
meggert	2c3a7791e1	Merge branch 'develop' into eggert/acs-dataset-stuff	2023-02-21 17:16:15 +01:00
meggert	f19729e11d	throw a single event every time the mekf stops working	2023-02-21 17:10:59 +01:00
meggert	019cc29c24	useMekf actually now uses returnvalues as inteded	2023-02-21 17:09:49 +01:00
meggert	d1402587dc	differentiate between mekf not working during safe/detumble or any higer mode	2023-02-21 17:06:24 +01:00
meggert	793e6f4119	returnvalues for all mekf termination cases now	2023-02-21 16:56:13 +01:00
meggert	0ec0d551a3	added functions for updating datasets upon errors or success	2023-02-21 16:08:46 +01:00
meggert	2a9c1aab7f	added mekf status to dataset	2023-02-21 16:02:26 +01:00
Robin Mueller	243088252c	bump revision	2023-02-21 11:41:38 +01:00
Robin Müller	9be00603f4	Merge pull request 'Fix some issues' (#392) from bugfixes_code_review_msg_handling into develop ... Reviewed-on: #392 Reviewed-by: Steffen Gaisser <gaisser@irs.uni-stuttgart.de>	2023-02-21 11:40:51 +01:00
Robin Mueller	f3fe65080b	Merge remote-tracking branch 'origin/develop' into bugfixes_code_review_msg_handling	2023-02-21 11:40:48 +01:00
Robin Mueller	d9ef0f9a9d	small tweak	2023-02-21 11:39:56 +01:00
Robin Mueller	7aa977efdf	move changelog entry	2023-02-21 11:32:51 +01:00
Robin Mueller	adda32854d	Merge remote-tracking branch 'origin/develop' into bugfixes_code_review_msg_handling	2023-02-21 11:32:17 +01:00
Robin Mueller	01ac2f4aff	Merge remote-tracking branch 'origin/develop' into pdec_possible_fixes_and_fdir	2023-02-21 11:32:05 +01:00
meggert	b01b9d3b99	Merge branch 'develop' into eggert/acs-dataset-stuff	2023-02-21 11:31:27 +01:00
meggert	a2a822c118	get	2023-02-21 11:30:42 +01:00
Robin Mueller	1bdfd5f8ea	prep v1.29.0	2023-02-21 11:29:18 +01:00
Steffen Gaisser	0f5e65e5ce	Merge branch 'develop' into bugfixes_code_review_msg_handling	2023-02-21 11:29:03 +01:00
Robin Mueller	62e7e23512	prep v1.29.0	2023-02-21 11:23:27 +01:00
Robin Mueller	b6558acdbc	Merge remote-tracking branch 'origin/develop' into pdec_possible_fixes_and_fdir	2023-02-21 11:20:01 +01:00
Robin Müller	257efd4974	Merge pull request 'Heater Info Set' (#351) from add_heater_info_set into develop ... Reviewed-on: #351	2023-02-21 11:18:48 +01:00
meggert	b3b736a7bd	ctrlValData gets updated in every perform function	2023-02-21 11:13:06 +01:00
Robin Mueller	b3dd2ec57a	merge conflict	2023-02-21 11:11:10 +01:00
Robin Mueller	262e6d0b39	Merge remote-tracking branch 'origin/develop' into pdec_possible_fixes_and_fdir	2023-02-21 11:08:06 +01:00
Robin Mueller	7bda0dfb97	Merge remote-tracking branch 'origin/develop' into add_heater_info_set	2023-02-21 11:06:14 +01:00
Robin Müller	eefdc8ff5b	Merge pull request 'Refactor IMTQ handling' (#384) from refactor_imtq_handling into develop ... Reviewed-on: #384 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-02-21 11:04:28 +01:00
meggert	1a8f9ab4a2	Merge branch 'develop' into eggert/acs-dataset-stuff	2023-02-21 10:55:06 +01:00
meggert	0d7b77e5d1	this should make steffen happy	2023-02-21 10:50:08 +01:00
Robin Mueller	6ea22b63df	Merge remote-tracking branch 'origin/develop' into add_heater_info_set	2023-02-21 10:46:10 +01:00