5794 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Robin Mueller	b1d2f73b01	move Switches enum	2023-03-16 18:47:51 +01:00
Robin Mueller	eda1f7e212	syrlinks event works	2023-03-16 18:28:51 +01:00
Robin Mueller	56a4378a63	that should be transition safe	2023-03-16 18:05:23 +01:00
Robin Mueller	a16671762d	Merge remote-tracking branch 'origin/develop' into thermal_controller	2023-03-16 17:48:17 +01:00
Robin Mueller	350ed59033	handle syrlinks overheating in COM SS	2023-03-15 17:13:25 +01:00
Robin Müller	52ab77eded	Merge pull request 'Init Boot Mode' (#474) from feature_boot_sequence_eive_sys into develop ... Reviewed-on: #474	2023-03-15 16:29:18 +01:00
Robin Müller	4ff1548cf2	Merge branch 'develop' into feature_boot_sequence_eive_sys	2023-03-15 16:29:11 +01:00
Robin Müller	f6d1a41cb9	Merge pull request 'tweak scheduling frequencies' (#471) from feature_scheduling_tweaks into develop ... Reviewed-on: #471	2023-03-15 16:28:36 +01:00
Robin Müller	1623dd1c80	Merge branch 'develop' into feature_scheduling_tweaks	2023-03-15 16:28:26 +01:00
Robin Müller	e3c41dd807	Merge pull request 'ACS Safe Ctrl Failure Event' (#484) from acs-safe-mode-failure into develop ... Reviewed-on: #484 Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>	2023-03-15 16:27:42 +01:00
Robin Mueller	096253a9a3	Merge branch 'feature_scheduling_tweaks' into thermal_controller	2023-03-15 16:25:13 +01:00
Robin Mueller	11e5866f31	added some defines	2023-03-15 16:24:46 +01:00
Robin Mueller	9b8092fb09	this seems to work	2023-03-15 16:24:01 +01:00
Robin Mueller	f546df50a1	Merge branch 'feature_boot_sequence_eive_sys' into thermal_controller	2023-03-15 16:21:14 +01:00
Robin Mueller	2f263c6aa6	small bugfix	2023-03-15 16:21:05 +01:00
Robin Mueller	8201a4140a	works better now	2023-03-15 16:19:37 +01:00
Robin Mueller	364342855d	maybe force a mode command?	2023-03-15 15:52:20 +01:00
Robin Mueller	c688a51838	Merge remote-tracking branch 'origin/feature_boot_sequence_eive_sys' into thermal_controller	2023-03-15 15:52:14 +01:00
Robin Müller	8c83ec78fd	Merge branch 'develop' into feature_boot_sequence_eive_sys	2023-03-15 15:51:38 +01:00
Robin Mueller	715a69db89	this should cover upper bound checking when heater is off	2023-03-15 15:43:20 +01:00
Robin Mueller	dc44af5b29	copy and paste error	2023-03-15 15:20:47 +01:00
Robin Mueller	27f29eda40	small error	2023-03-15 15:16:12 +01:00
Robin Mueller	50a62b9243	sth broke..	2023-03-15 15:13:53 +01:00
Robin Mueller	da7c450e06	most temps should be valid now	2023-03-15 15:00:06 +01:00
Robin Mueller	a92fa31cb5	better variable names, tweaks for less init events	2023-03-15 14:56:26 +01:00
Robin Mueller	d273621419	some tweaks	2023-03-15 14:36:18 +01:00
Robin Mueller	f229ebb141	Merge remote-tracking branch 'origin/develop' into feature_scheduling_tweaks	2023-03-15 14:16:21 +01:00
Robin Müller	64ec76bfb7	Merge branch 'develop' into thermal_controller	2023-03-15 14:14:56 +01:00
Robin Müller	a2f2e1b84e	Merge pull request 'some user code fixes' (#487) from bump_fsfw into develop ... Reviewed-on: #487	2023-03-15 14:14:43 +01:00
Robin Müller	19753c43f1	Merge branch 'develop' into bump_fsfw	2023-03-15 14:14:31 +01:00
Robin Mueller	69525b6fd1	bump fsfw	2023-03-15 14:10:53 +01:00
Robin Mueller	c1d8eda2c7	Merge remote-tracking branch 'origin/develop' into thermal_controller	2023-03-15 14:10:36 +01:00
Robin Mueller	7ab01687ce	some user code fixes	2023-03-15 11:49:01 +01:00
Robin Müller	22076ea25e	Merge pull request 'bump fsfw' (#486) from bump_fsfw into develop ... Reviewed-on: #486	2023-03-15 11:42:21 +01:00
Robin Mueller	7c54e920ef	bump fsfw	2023-03-15 11:42:03 +01:00
Robin Mueller	be848ea5e4	changelog update	2023-03-15 11:32:58 +01:00
Robin Müller	8dd22b6ea0	Merge branch 'develop' into feature_scheduling_tweaks	2023-03-15 11:31:55 +01:00
Robin Mueller	d894479f75	Merge remote-tracking branch 'origin/develop' into acs-safe-mode-failure	2023-03-15 11:29:06 +01:00
Robin Müller	37e128041f	Merge pull request 'Reset RW dataset on shutdown' (#485) from rw-dataset-reset into develop ... Reviewed-on: #485 Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>	2023-03-15 11:27:29 +01:00
meggert	bab0bbf82d	changelog	2023-03-15 10:38:00 +01:00
meggert	7d9be35cb4	reset relevant datasets on shutdown	2023-03-15 10:36:25 +01:00
meggert	95a4d88ed4	cleanup	2023-03-15 10:17:24 +01:00
meggert	102228100e	reran event gens	2023-03-15 10:10:47 +01:00
meggert	c4fe772fe7	changelog	2023-03-15 10:08:58 +01:00
meggert	ccf1fcaa79	stuff	2023-03-15 10:06:24 +01:00
meggert	4fdb2de510	Merge branch 'develop' into acs-safe-mode-failure ... # Conflicts: # CHANGELOG.md # mission/controller/AcsController.cpp # mission/controller/AcsController.h	2023-03-15 10:06:02 +01:00
Robin Mueller	8b11302028	unittest works again	2023-03-14 20:35:49 +01:00
Robin Mueller	c1b4a1c164	Merge branch 'thermal_controller' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into thermal_controller	2023-03-14 20:04:03 +01:00
Robin Mueller	58212d7081	Merge remote-tracking branch 'origin/develop' into thermal_controller	2023-03-14 20:04:00 +01:00
Robin Müller	a6e6ee053d	Merge branch 'develop' into thermal_controller	2023-03-14 20:03:29 +01:00