5745 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Robin Mueller	2f5f47a02c	tmtc bump	2023-03-08 19:20:18 +01:00
Robin Mueller	8821cc1079	prep v1.36.0	2023-03-08 19:17:24 +01:00
Robin Müller	14cea6369a	Merge pull request 'add health handling for TCS ASSY' (#436) from bugfix_tcs_brd_assy into develop ... Reviewed-on: #436	2023-03-08 19:12:34 +01:00
Robin Mueller	0a37db617b	tmtc update	2023-03-08 19:12:10 +01:00
Robin Mueller	101117cebe	small fix	2023-03-08 19:06:48 +01:00
Robin Mueller	4863dad1cd	changelog	2023-03-08 18:59:22 +01:00
Robin Mueller	1154c0e887	move acs event handling to system	2023-03-08 18:56:27 +01:00
Robin Mueller	c6289e27ae	Merge remote-tracking branch 'origin/develop' into bugfix_tcs_brd_assy	2023-03-08 18:54:52 +01:00
Robin Müller	6538005a30	Merge pull request 'Feature: STR Assembly' (#437) from feature_str_assy into develop ... Reviewed-on: #437	2023-03-08 18:13:33 +01:00
Robin Mueller	fa5883bdf3	this contains a bit more now	2023-03-08 18:12:37 +01:00
Robin Mueller	b261a4ecfa	works	2023-03-08 18:09:50 +01:00
Robin Mueller	a6dfe02128	regenerate csvs	2023-03-08 16:45:21 +01:00
Robin Mueller	bcd31c9248	wrong object ID	2023-03-08 16:42:30 +01:00
Robin Mueller	bf73f2ff04	Merge remote-tracking branch 'origin/develop' into feature_str_assy	2023-03-08 16:34:35 +01:00
Irini Kosmidou	7a62624687	changes	2023-03-08 15:56:05 +01:00
Marius Eggert	b2a8c5d7ec	Merge pull request 'avoid exceptions' (#447) from bugfix_create_dir_no_exceptions into develop ... Reviewed-on: #447 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-03-08 15:07:56 +01:00
Robin Mueller	2dd97a55f8	fixes	2023-03-08 14:59:50 +01:00
Robin Mueller	ccf03b131b	avoid exceptions	2023-03-08 14:50:25 +01:00
Irini Kosmidou	337717d271	Merge branch 'thermal_controller' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into thermal_controller	2023-03-08 14:35:04 +01:00
Robin Mueller	c48268ffa9	Merge remote-tracking branch 'origin/develop' into feature_str_assy	2023-03-08 13:28:01 +01:00
Robin Mueller	97a78fc4c9	Merge remote-tracking branch 'origin/develop' into bugfix_tcs_brd_assy	2023-03-08 13:26:27 +01:00
Marius Eggert	0bdc6d3d7c	Merge pull request 'now fix loss should always be detected and reported' (#445) from bugfix_gps_fix_logic into develop ... Reviewed-on: #445 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-03-08 13:23:45 +01:00
Robin Müller	66583e8009	Merge branch 'develop' into bugfix_gps_fix_logic	2023-03-08 13:21:57 +01:00
Robin Müller	c0f01a75e4	Merge pull request 'Feature: Reboot events' (#446) from feature_reboot_events into develop ... Reviewed-on: #446	2023-03-08 13:21:47 +01:00
Robin Mueller	6a15aa14a2	changelog and new action cmd	2023-03-08 11:37:11 +01:00
Robin Mueller	11e9d71775	add new reboot events	2023-03-08 11:31:04 +01:00
Robin Mueller	d30bab7bc0	Merge remote-tracking branch 'origin/develop' into feature_str_assy	2023-03-08 11:13:02 +01:00
Robin Mueller	a366ef0960	Merge remote-tracking branch 'origin/develop' into bugfix_gps_fix_logic	2023-03-08 11:11:34 +01:00
Robin Müller	930f7a5233	Merge pull request 'Star Tracker : Tweaks and fixes' (#443) from startracker_try_cfg_time_reduction into develop ... Reviewed-on: #443	2023-03-08 01:26:03 +01:00
Robin Mueller	68f4323d14	changelog	2023-03-08 01:24:41 +01:00
Robin Mueller	01e97c8381	OFF -> NORMAL transition works now	2023-03-08 01:21:18 +01:00
Robin Mueller	1b73e7de7d	Merge remote-tracking branch 'origin/develop' into startracker_try_cfg_time_reduction	2023-03-08 00:10:17 +01:00
Robin Müller	8759f86889	Merge pull request 'lets hope this fixes the occasional error' (#444) from optimize_lock_handling into develop ... Reviewed-on: #444	2023-03-08 00:09:34 +01:00
Robin Müller	a2d5138c71	Merge branch 'develop' into optimize_lock_handling	2023-03-08 00:09:25 +01:00
Robin Mueller	f5c4e2b788	changelog	2023-03-07 21:07:58 +01:00
Robin Mueller	af1c18e8cf	now fix loss should always be detected and reported	2023-03-07 21:02:59 +01:00
Robin Mueller	c562c4a240	lets hope this fixes the occasional error	2023-03-07 19:35:46 +01:00
Robin Mueller	45e1e7250b	small comment	2023-03-07 19:13:22 +01:00
Robin Mueller	70e2a3f5f8	bump arcsec str	2023-03-07 19:02:19 +01:00
Robin Müller	e6a5847e9c	Merge pull request 'use flight config for FM' (#442) from str_ground_config_off_for_fm into develop ... Reviewed-on: #442	2023-03-07 18:55:32 +01:00
Robin Mueller	72ae6aee94	changelog update	2023-03-07 18:55:11 +01:00
Robin Mueller	25e5f8d2a4	Merge branch 'str_ground_config_off_for_fm' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into str_ground_config_off_for_fm	2023-03-07 18:54:37 +01:00
Robin Mueller	0f25f95307	Merge remote-tracking branch 'origin/develop' into str_ground_config_off_for_fm	2023-03-07 18:54:32 +01:00
Robin Müller	af5d4e12c5	Merge branch 'develop' into str_ground_config_off_for_fm	2023-03-07 18:54:07 +01:00
Robin Mueller	fd62efcae2	move json init somewhere else	2023-03-07 18:47:16 +01:00
Robin Mueller	1b00029202	move those json thingies into the header	2023-03-07 18:16:35 +01:00
Robin Müller	72174c76cd	Merge pull request 'ACS system updates' (#441) from update_fsfw_submode_mask into develop ... Reviewed-on: #441	2023-03-07 17:23:04 +01:00
Robin Mueller	7476f33905	bump tmtc and fsfw	2023-03-07 17:22:08 +01:00
Robin Mueller	e48d080673	small tweak	2023-03-07 17:08:33 +01:00
Robin Mueller	888ade0bfb	bump fsfw	2023-03-07 17:05:34 +01:00