6598 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Robin Müller	4074e08480	Merge pull request 'Adaption for EM: Add P60 dock without ACU' (#620) from adaption_em_p60_dock_without_acu into main ... Reviewed-on: #620 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-04-28 15:12:46 +02:00
Robin Mueller	38686ac3f6	Merge branch 'possible_bugfix_dual_lane_assy' into adaption_em_p60_dock_without_acu	2023-04-28 14:04:03 +02:00
Robin Mueller	74d5d70973	this bugfix might be super important	2023-04-28 13:58:08 +02:00
Robin Mueller	189a312628	Merge remote-tracking branch 'origin/main' into adaption_em_p60_dock_without_acu	2023-04-28 10:23:46 +02:00
Robin Mueller	a12794281b	changelog	2023-04-28 10:20:31 +02:00
Robin Mueller	fcaabb4e42	Merge remote-tracking branch 'origin/main' into adaption_em_p60_dock_without_acu	2023-04-28 10:20:02 +02:00
Robin Mueller	6c326489cb	adapt EM SW: GS PCDU added, but use dummy for ACU	2023-04-28 10:18:46 +02:00
Robin Müller	862a4f2685	Merge pull request 'Host SW bugfixes' (#618) from try_fix_host_obsw into main ... Reviewed-on: #618 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-04-28 09:37:55 +02:00
Robin Mueller	2daca272f8	changelog	2023-04-27 11:29:18 +02:00
Robin Mueller	03762f9620	lower live TM handler frequency	2023-04-26 17:38:06 +02:00
Robin Mueller	a296f16e5c	host SW works properly again	2023-04-26 17:36:38 +02:00
Robin Mueller	83f07a6e16	configurable event manager queue depth	2023-04-26 17:26:32 +02:00
Robin Mueller	00dab64628	Merge remote-tracking branch 'origin/main' into try_fix_host_obsw	2023-04-26 17:03:35 +02:00
Robin Müller	4aafca64a6	Merge pull request 'EM adaptions' (#619) from em_adaptions into main ... Reviewed-on: #619	2023-04-26 17:03:01 +02:00
Robin Mueller	6901eae816	Merge remote-tracking branch 'origin/main' into em_adaptions	2023-04-26 17:02:24 +02:00
Robin Mueller	7d630ebcf3	EM adaptions	2023-04-26 17:00:04 +02:00
Robin Mueller	641b8e847d	add back tm funnel handler for hosted build	2023-04-26 16:41:40 +02:00
Robin Mueller	1314268682	host build requires dedicated live TM task..	2023-04-26 16:23:50 +02:00
Robin Mueller	4040304ef0	this is annoying	2023-04-26 13:15:42 +02:00
Robin Mueller	9672d6d6cc	changelog	2023-04-26 11:11:09 +02:00
Robin Müller	f271242d66	Merge pull request 'the hottest fix' (#614) from hottest_fix_acs into main ... Reviewed-on: #614	2023-04-19 18:17:54 +02:00
Robin Mueller	1756b5edcc	patch revision	2023-04-19 18:14:28 +02:00
Robin Mueller	9c1fc44c60	Merge branch 'hottest_fix_acs' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into hottest_fix_acs	2023-04-19 18:12:40 +02:00
Robin Mueller	f46a705900	changelog	2023-04-19 18:12:32 +02:00
Robin Müller	9183d18acc	Merge branch 'main' into hottest_fix_acs	2023-04-19 18:10:50 +02:00
Robin Mueller	befa84a74b	the hottest fix	2023-04-19 18:09:57 +02:00
Robin Mueller	432b400835	bump tmtc	2023-04-18 10:28:01 +02:00
Robin Mueller	0eb6b7cccb	bump patch revision to 3	2023-04-17 11:58:44 +02:00
Robin Mueller	74ee291983	add tmtc release version	2023-04-17 11:58:13 +02:00
Robin Mueller	a146c34140	CI/CD: Use 8 jobs	2023-04-17 11:55:08 +02:00
Robin Müller	61ced11766	Merge pull request 'fixes and tweaks TCS and EM build' (#610) from fixes_and_tweaks into develop ... Reviewed-on: #610 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-04-17 11:53:15 +02:00
Robin Mueller	468fb096c9	high event severity	2023-04-17 11:44:51 +02:00
Robin Mueller	4a2dd19a73	Merge branch 'fixes_and_tweaks' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into fixes_and_tweaks	2023-04-17 11:41:26 +02:00
Robin Mueller	2658cabc9d	remove TODO	2023-04-17 11:41:21 +02:00
Robin Müller	dc83061f80	Merge branch 'develop' into fixes_and_tweaks	2023-04-17 11:38:21 +02:00
Robin Mueller	00da51b6a2	okay its an afmt thing	2023-04-17 11:36:34 +02:00
Robin Mueller	f846a18b33	update defines	2023-04-17 11:36:17 +02:00
Robin Mueller	ab588b4844	fixes and tweaks TCS and EM build	2023-04-17 11:35:10 +02:00
Robin Müller	d12dca183d	Merge pull request 'Test Cold Case EM' (#609) from test_cold_case_cam into develop ... Reviewed-on: #609	2023-04-17 10:45:14 +02:00
Robin Mueller	701ecbd182	disable test	2023-04-17 10:45:01 +02:00
Robin Mueller	bdd2b23ec3	test cold case camera	2023-04-17 10:41:10 +02:00
Robin Müller	d70245b56a	Merge pull request 'acs-safe-hotfix' (#608) from acs-safe-hotfix into develop ... Reviewed-on: #608	2023-04-17 10:15:52 +02:00
meggert	9097a3f3c7	changelog	2023-04-17 09:35:23 +02:00
meggert	e05d9d4b2a	prevent low pass filter if no sensor data is available	2023-04-17 09:29:50 +02:00
meggert	07572ab3a0	fixed shadowing	2023-04-17 09:20:09 +02:00
Robin Mueller	304aabc336	bump sagittactl to avoid CMake warning	2023-04-16 12:10:29 +02:00
Robin Mueller	07e8f95a31	of course something else was missing	2023-04-16 12:05:41 +02:00
Robin Mueller	babea226ab	thats an annoying patch release	2023-04-16 11:54:27 +02:00
Robin Müller	8c24a7310d	Merge pull request 'update CHANGELOG and CMakeLists.txt' (#606) from prep_final_v2.0.0 into develop ... Reviewed-on: #606	2023-04-16 11:49:05 +02:00
Robin Mueller	8f5982fd72	added additional note	2023-04-16 11:48:24 +02:00