6529 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Robin Mueller	c1ccfe66eb	this compiles with warnings	2023-04-15 15:17:22 +02:00
Robin Mueller	ae9f43c707	adaptions for new sagittalib	2023-04-15 15:15:06 +02:00
Robin Müller	22370e3e1e	Merge pull request 'prep v1.45.0' (#603) from prep_v1.45.0 into develop ... Reviewed-on: #603	2023-04-14 22:32:15 +02:00
Robin Mueller	b98f91f6c1	hopefully last EM fix for v2.0	2023-04-14 21:44:23 +02:00
Robin Mueller	b47bda8ed1	bump fsfw	2023-04-14 21:22:55 +02:00
Robin Mueller	078a04b317	bump fsfw	2023-04-14 21:08:55 +02:00
Robin Mueller	d24a983985	some EM fixes	2023-04-14 21:02:39 +02:00
Robin Mueller	b964b03b2d	fix STR dummy	2023-04-14 20:41:50 +02:00
Robin Mueller	f0d55f9e5b	prep v1.45.0	2023-04-14 20:35:00 +02:00
Robin Müller	aa54dbbd10	Merge pull request 'Revert ACS Safe Mode Controller to FLP Design' (#466) from acs-flp-safe into develop ... Reviewed-on: #466 Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>	2023-04-14 20:26:19 +02:00
Robin Mueller	1a62a13d97	bump tmtc again	2023-04-14 20:26:02 +02:00
Robin Mueller	500b3b6fc6	re-run generators. bump tmtc	2023-04-14 20:24:37 +02:00
Robin Mueller	fa746f910d	Merge remote-tracking branch 'origin/develop' into acs-flp-safe	2023-04-14 20:13:50 +02:00
Robin Müller	602c635967	Merge pull request 'fix host build' (#602) from feature_com_pdec_fdir into develop ... Reviewed-on: #602	2023-04-14 20:12:27 +02:00
Robin Müller	84db92f75e	Merge branch 'develop' into feature_com_pdec_fdir	2023-04-14 20:12:19 +02:00
Robin Mueller	4de71062af	fix host build	2023-04-14 20:11:33 +02:00
Robin Müller	a4c8319cec	Merge pull request 'Feature COM PDEC FDIR' (#599) from feature_com_pdec_fdir into develop ... Reviewed-on: #599 Reviewed-by: Jakob Meier <meierj@irs.uni-stuttgart.de>	2023-04-14 20:09:44 +02:00
Robin Mueller	379fd6046e	ge-generate files	2023-04-14 20:08:05 +02:00
Robin Mueller	aa800c4524	trigger special reboot events	2023-04-14 20:04:51 +02:00
Robin Mueller	7f1fe3a2d8	bugfix	2023-04-14 19:58:22 +02:00
Robin Mueller	e023220be4	better reset handling	2023-04-14 19:42:11 +02:00
Robin Mueller	8cf9dd9136	use config constant	2023-04-14 19:30:40 +02:00
Robin Mueller	62d18826f1	proper post reset handling for PDEC reset	2023-04-14 19:29:22 +02:00
meggert	41f762c6ff	also only use mekf for detumble check if allowed to	2023-04-14 19:12:05 +02:00
Robin Mueller	644a768778	re-run generators	2023-04-14 19:02:18 +02:00
Robin Mueller	756ea6d90d	Merge remote-tracking branch 'origin/develop' into feature_com_pdec_fdir	2023-04-14 19:01:22 +02:00
meggert	2d19d94d09	Merge branch 'acs-flp-safe' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into acs-flp-safe	2023-04-14 18:58:47 +02:00
meggert	09a2ba7843	fixed type	2023-04-14 18:57:06 +02:00
Robin Müller	716f2b2832	Merge branch 'develop' into acs-flp-safe	2023-04-14 18:56:11 +02:00
meggert	6934721a42	prevent div by zero	2023-04-14 18:56:05 +02:00
Robin Müller	fc8a8ce5a9	Merge pull request 'Custom FDIR for tmp devices' (#598) from tmp_dev_custom_fdir into develop ... Reviewed-on: #598 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-04-14 18:55:55 +02:00
Robin Müller	5e53795cbe	Merge branch 'develop' into tmp_dev_custom_fdir	2023-04-14 18:55:36 +02:00
Robin Müller	2f2d1c7c7a	Merge pull request 'v10.7' (#601) from str_update_v10.7 into develop ... Reviewed-on: #601	2023-04-14 18:55:12 +02:00
Robin Mueller	f7be454dae	changelog	2023-04-14 18:55:20 +02:00
Robin Mueller	ca30fed4c3	Merge remote-tracking branch 'origin/develop' into str_update_v10.7	2023-04-14 18:53:45 +02:00
Robin Mueller	54f742bf19	addition to changelog	2023-04-14 18:53:17 +02:00
Robin Mueller	4bfd675073	Merge remote-tracking branch 'origin/develop' into tmp_dev_custom_fdir	2023-04-14 18:48:20 +02:00
Robin Müller	36420a6855	Merge pull request 'hotfix ACS/SUS' (#600) from hotfix_acs_sus into develop ... Reviewed-on: #600	2023-04-14 18:47:07 +02:00
Robin Mueller	b0a2b5886f	hotfix ACS/SUS	2023-04-14 18:45:58 +02:00
Robin Mueller	33d60ccf7f	v10.7	2023-04-14 18:31:56 +02:00
Marius Eggert	c8472f222c	Merge pull request 'Heater Health Device' (#597) from heater_health_device into develop ... Reviewed-on: #597 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-04-14 17:15:50 +02:00
meggert	e68ac9cc2d	changelog	2023-04-14 16:55:28 +02:00
meggert	a306b2a0af	Merge branch 'develop' into acs-flp-safe	2023-04-14 16:50:31 +02:00
meggert	f112c28391	enabled commanding from ACS ctrl	2023-04-14 16:50:02 +02:00
meggert	4693407b68	fixed parameters	2023-04-14 16:47:53 +02:00
meggert	4e6b3ec9ed	fixed shadowing	2023-04-14 16:44:37 +02:00
Robin Mueller	38b9a9b34e	bump sagittactl	2023-04-14 14:45:02 +02:00
Robin Mueller	7c67648b8e	bump sagitactl	2023-04-14 14:44:48 +02:00
Robin Mueller	9b1d4de9c5	Merge remote-tracking branch 'origin/develop' into tmp_dev_custom_fdir	2023-04-14 14:44:40 +02:00
Robin Mueller	998f93e3fa	Merge remote-tracking branch 'origin/develop' into heater_health_device	2023-04-14 14:32:27 +02:00