6586 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Robin Mueller	f2f33f5049	Merge tag 'v2.0.5' into v3.1.1-reduced-to-bare-minimum ... v2.0.5	2023-06-17 19:56:47 +02:00
Robin Mueller	3314d07942	correct patch version	2023-06-17 19:21:28 +02:00
Robin Mueller	4155aa8776	v3.1.1 reduced to the bare minimum	2023-06-17 19:17:50 +02:00
Robin Mueller	ee3ef042cd	Merge remote-tracking branch 'origin/v2.0.5-dev' into HEAD	2023-05-11 19:30:33 +02:00
Robin Mueller	05b0efe851	patch revision	2023-05-11 19:29:02 +02:00
Robin Mueller	8ade378a69	bump tmtc	2023-05-11 19:29:02 +02:00
Robin Mueller	045d149946	bump revision	2023-05-11 18:50:49 +02:00
Robin Mueller	a75f9553be	okay lets see if this works	2023-05-11 18:38:41 +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
Robin Mueller	611a2c0b45	update CHANGELOG and CMakeLists.txt	2023-04-16 11:41:30 +02:00
Robin Müller	61e6b09704	Merge pull request 'Update sagittactl to v10.7' (#605) from update_sagittactl_v10.7 into develop ... Reviewed-on: #605	2023-04-16 11:25:38 +02:00
Robin Müller	a9a0266a84	Merge branch 'develop' into update_sagittactl_v10.7	2023-04-16 11:01:19 +02:00
Robin Mueller	b7e6315be7	bump sagittactl to concrete version	2023-04-16 10:58:25 +02:00
Robin Mueller	740275f57a	normal mode now works as well	2023-04-16 04:04:57 +02:00
Robin Mueller	58dd53def8	bump sagittactl	2023-04-16 03:54:10 +02:00
Robin Mueller	ddbe30f832	afmt	2023-04-16 03:52:45 +02:00
Robin Mueller	680d496b28	STR seems to work well now	2023-04-16 03:52:10 +02:00
Robin Müller	9c163419b2	Merge pull request 'FS helpers' (#604) from core_ctrl_fs_helpers into develop ... Reviewed-on: #604 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-04-16 02:57:16 +02:00
Robin Mueller	f4fedd20c9	added more bugfixes for list dir dump	2023-04-16 02:56:46 +02:00
Robin Mueller	016fab105e	bump tmtc	2023-04-15 23:13:04 +02:00
Robin Mueller	767a0eda30	hopefully last bugfix	2023-04-15 23:11:00 +02:00