5835 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Robin Müller	577e45fec3	Merge pull request 'v1.39.0' (#506) from prep_v1.39.0 into develop ... Reviewed-on: #506	2023-03-21 23:40:10 +01:00
Robin Mueller	8611144a70	re-run generators again	2023-03-21 23:34:59 +01:00
Robin Mueller	25de385766	pre v1.39.0	2023-03-21 23:32:41 +01:00
Robin Müller	4277a98c16	Merge pull request 'PTME Bandwidth Allocation Table' (#495) from ptme_bat_priority_enable into develop ... Reviewed-on: #495	2023-03-21 14:44:03 +01:00
Robin Mueller	34cd92840f	belongs in separate PR	2023-03-21 15:43:59 +01:00
Robin Mueller	3f94bf7855	Merge remote-tracking branch 'origin/develop' into ptme_bat_priority_enable	2023-03-21 15:40:14 +01:00
Robin Mueller	1b05f45e24	Merge remote-tracking branch 'origin/develop' into ptme_bat_priority_enable	2023-03-21 15:07:11 +01:00
Robin Müller	be4a6b2434	Merge pull request 'Update Jenkins Buildjob' (#504) from update_jenkins_buildjob into develop ... Reviewed-on: #504	2023-03-21 14:39:24 +01:00
Robin Mueller	f68f4066be	small jenkinsfile fix	2023-03-21 15:30:09 +01:00
Robin Mueller	3f1f3fa916	update jenkins buildjob	2023-03-21 15:28:14 +01:00
Robin Müller	379c868abb	Merge pull request 'EM build fix' (#503) from bugfix_em_buld into develop ... Reviewed-on: #503	2023-03-21 14:18:27 +01:00
Robin Mueller	c9ec0f67bd	EM build fix	2023-03-21 15:18:17 +01:00
Robin Müller	eee829919b	Merge pull request 'Stop the Spam!' (#502) from stop-the-spam into develop ... Reviewed-on: #502	2023-03-21 13:46:48 +01:00
Robin Müller	3150261e3e	Merge branch 'develop' into stop-the-spam	2023-03-21 13:46:34 +01:00
Marius Eggert	fe01d3d4b5	Merge pull request 'only set time valid if at least 1 sat in view' (#501) from bugfix_gps into develop ... Reviewed-on: #501 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-03-21 13:41:26 +01:00
Marius Eggert	bc6b492976	Merge branch 'develop' into bugfix_gps	2023-03-21 13:39:31 +01:00
Marius Eggert	11ccd1f535	Merge pull request 'I2C fatal error counter' (#496) from feature_i2c_fatal_error_counter into develop ... Reviewed-on: #496 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-03-21 13:38:28 +01:00
meggert	b891198bee	Merge branch 'develop' into feature_i2c_fatal_error_counter	2023-03-21 13:38:29 +01:00
meggert	da831ff789	changelog	2023-03-21 13:25:22 +01:00
meggert	078299a07c	Merge branch 'develop' into stop-the-spam	2023-03-21 13:24:21 +01:00
meggert	2f5ec84237	stop the spam	2023-03-21 13:23:50 +01:00
Robin Mueller	2694f0cbc8	changelog	2023-03-21 12:56:22 +01:00
Robin Mueller	6e4d27a454	bump tmtc, additonal changelog entry	2023-03-21 12:55:39 +01:00
Robin Mueller	ab74382c12	only set time valid if at least 1 sat in view	2023-03-21 12:54:14 +01:00
Robin Müller	2be5cdabb0	Merge pull request 'Finite check for MEKF' (#465) from acs-ctrl-finite-check into develop ... Reviewed-on: #465	2023-03-21 11:47:32 +01:00
Robin Mueller	11e1222a7c	re-run generators	2023-03-21 12:46:54 +01:00
meggert	573ff334b8	fixes	2023-03-21 11:37:54 +01:00
meggert	19dd7a0964	?	2023-03-21 11:36:10 +01:00
meggert	a92f664770	Merge branch 'develop' into acs-ctrl-finite-check	2023-03-21 11:30:26 +01:00
Robin Mueller	bb27700cc2	changelog	2023-03-20 18:02:59 +01:00
Robin Mueller	3e3355a926	Merge remote-tracking branch 'origin/develop' into feature_i2c_fatal_error_counter	2023-03-20 18:02:09 +01:00
Robin Mueller	55d32a2bb0	Merge remote-tracking branch 'origin/develop' into ptme_bat_priority_enable	2023-03-20 18:01:13 +01:00
Robin Müller	2f990d8bbc	Merge pull request 'str transition fixes' (#498) from bugfix_str_mode_transitions into develop ... Reviewed-on: #498	2023-03-20 17:56:10 +01:00
Robin Mueller	8482d56fd0	Merge remote-tracking branch 'origin/develop' into bugfix_str_mode_transitions	2023-03-20 17:56:10 +01:00
Robin Müller	e349504b41	Merge pull request 'GYR Bias Update' (#499) from new-gyr-bias into develop ... Reviewed-on: #499	2023-03-20 17:54:46 +01:00
Robin Mueller	0bb5f08d23	Merge remote-tracking branch 'origin/develop' into bugfix_str_mode_transitions	2023-03-20 17:54:32 +01:00
Robin Mueller	0dbe6b9854	changelog	2023-03-20 17:53:33 +01:00
Robin Mueller	043a458f42	seems to work now	2023-03-20 17:51:10 +01:00
Robin Mueller	c682d75aff	works now	2023-03-20 17:05:57 +01:00
Robin Mueller	aea4313b7d	some more tweaks	2023-03-20 15:52:58 +01:00
meggert	11c54e270f	changelog	2023-03-20 15:50:50 +01:00
Robin Mueller	881a03fbed	direct transition to normal works again	2023-03-20 15:49:41 +01:00
meggert	f9e04ed9a2	updated gyr bias	2023-03-20 15:42:45 +01:00
Robin Mueller	d8f84ed00d	small tweak	2023-03-20 15:17:34 +01:00
Robin Mueller	b516f12a61	str transition fixes	2023-03-20 15:16:20 +01:00
Marius Eggert	de4bf6dd55	Merge pull request 'Dual Side to Single Side Bugfix' (#497) from bugfix_dual_to_single_side into develop ... Reviewed-on: #497 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-03-20 14:52:52 +01:00
Robin Mueller	22f8d256dd	changelog	2023-03-20 13:09:28 +01:00
Robin Mueller	7cf3247cbd	seems to work now	2023-03-20 13:08:38 +01:00
Robin Mueller	8843a0d8c5	resolve merge conflict	2023-03-20 11:48:23 +01:00
Robin Mueller	ec18cb7007	Merge remote-tracking branch 'origin/develop' into feature_i2c_fatal_error_counter	2023-03-20 11:41:11 +01:00