5510 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Robin Mueller	6ca210ac31	Merge remote-tracking branch 'origin/develop' into mueller/pus-15-tm-storage	2023-02-21 11:14:56 +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
Robin Mueller	a91e6b7dfe	Merge remote-tracking branch 'origin/develop' into refactor_imtq_handling	2023-02-21 10:45:51 +01:00
meggert	1d5856b4d4	same for nadir single axis	2023-02-21 10:45:25 +01:00
meggert	35ad0a40d3	output is now target quaternion	2023-02-21 10:38:10 +01:00
meggert	5349fb45e3	revert single axis pointing to original code	2023-02-21 10:22:02 +01:00
Robin Mueller	b5b80cef97	fixed regression in max31865 code	2023-02-21 02:59:28 +01:00
Robin Mueller	582c8e8eff	some more fixes so heater info works	2023-02-21 02:28:57 +01:00
Robin Mueller	3ffdcf3885	announce mode worsk for heaters	2023-02-21 01:53:23 +01:00
Robin Mueller	80f8df3ee4	forgot version bump	2023-02-21 00:53:39 +01:00
Robin Mueller	ef24aba750	changelog	2023-02-21 00:52:52 +01:00
Robin Mueller	586966bebe	prep v1.28.1 for em	2023-02-21 00:51:18 +01:00
Robin Mueller	a864d51ddf	Merge remote-tracking branch 'origin/develop' into add_heater_info_set	2023-02-20 23:33:59 +01:00
Robin Mueller	6104b94268	Merge remote-tracking branch 'origin/develop' into mueller/pus-15-tm-storage	2023-02-20 20:06:31 +01:00
Robin Mueller	682b528004	changelog tweask	2023-02-20 20:05:53 +01:00
Robin Mueller	124e08e80b	Merge remote-tracking branch 'origin/develop' into refactor_imtq_handling	2023-02-20 20:03:09 +01:00
Robin Mueller	030d3272d3	afmt	2023-02-20 20:01:36 +01:00
Robin Mueller	03fbc6b23d	Merge branch 'develop' into pdec_possible_fixes_and_fdir	2023-02-20 19:59:58 +01:00
Robin Mueller	c149f3871a	changelog entry	2023-02-20 19:59:22 +01:00
Robin Mueller	328fd149e5	quickfix for CMakeLists.txt to make CI/CD work	2023-02-20 19:57:44 +01:00
Robin Mueller	d0613727ba	clear read flags again	2023-02-20 19:55:03 +01:00
Robin Mueller	7af4a777ae	ignoe replies when not in nml mode ... disable traces	2023-02-20 19:54:04 +01:00
Robin Mueller	c98b3f6aa4	stupid merge conflict	2023-02-20 19:47:19 +01:00
Robin Mueller	532add94d0	bump tmtc	2023-02-20 19:46:26 +01:00
Robin Mueller	e3d9614fae	Merge remote-tracking branch 'origin/develop' into refactor_imtq_handling	2023-02-20 19:45:45 +01:00
Robin Mueller	9ce065adb2	another small fix, verfiy timing now	2023-02-20 19:44:54 +01:00
Robin Mueller	d38b5346a2	another fix	2023-02-20 19:40:16 +01:00
Robin Mueller	fb0ff922a8	resolve merge conflict	2023-02-20 19:38:41 +01:00
Robin Mueller	cac634503d	small compile fix	2023-02-20 19:37:26 +01:00