5869 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Robin Müller	a5318b430b	Merge pull request 'scheduling tweaks for i2c' (#491) from scheduling_tweaks_i2c into develop ... Reviewed-on: #491	2023-03-17 16:27:28 +01:00
Robin Mueller	9cec20a550	scheduling tweaks for i2c	2023-03-17 16:27:00 +01:00
Robin Müller	024da6ceef	Merge pull request 'SA DEPLY updates' (#488) from sa_deply_updates into develop ... Reviewed-on: #488	2023-03-17 16:19:01 +01:00
Robin Mueller	d544792e29	Merge branch 'sa_deply_updates' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into sa_deply_updates	2023-03-17 16:19:09 +01:00
Robin Mueller	9a5901235c	changelog	2023-03-17 16:19:04 +01:00
Robin Müller	e16ee5d6a5	Merge branch 'develop' into sa_deply_updates	2023-03-17 16:17:37 +01:00
Robin Müller	596b6eb46d	Merge pull request 'reset the counter' (#490) from bugfix_acs_safe_fail_event into develop ... Reviewed-on: #490	2023-03-17 16:17:05 +01:00
Robin Mueller	5b84808d7c	reset the counter	2023-03-17 16:16:53 +01:00
Robin Müller	ce59e66c05	Merge pull request 'bugfix in SD card manager' (#489) from sdc_man_bugfix_ctor into develop ... Reviewed-on: #489	2023-03-17 16:05:31 +01:00
Robin Mueller	af85c883fa	bugfix in SD card manager	2023-03-17 16:04:35 +01:00
Robin Mueller	1fd5d065b6	set bat priority bit on transmitter enable	2023-03-17 14:51:00 +01:00
Robin Mueller	509d144117	SA DEPLY updates	2023-03-17 11:09:29 +01:00
Robin Mueller	6da3d6f06a	bump tmtc	2023-03-16 17:45:24 +01:00
Robin Mueller	2f0aed97dc	Merge remote-tracking branch 'origin/develop' into refactoring_bugfixes_power_switching	2023-03-16 17:44:46 +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	94ae33a554	Merge branch 'develop' into refactoring_bugfixes_power_switching	2023-03-15 16:27:54 +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	2f263c6aa6	small bugfix	2023-03-15 16:21:05 +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	f229ebb141	Merge remote-tracking branch 'origin/develop' into feature_scheduling_tweaks	2023-03-15 14:16:21 +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	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	53c38d9c05	Merge remote-tracking branch 'origin/develop' into acs-ctrl-finite-check	2023-03-15 11:31:31 +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
meggert	5e2f7fa3ed	reran gens	2023-03-15 09:39:46 +01:00
meggert	7ddfdc0978	post merge fix	2023-03-15 09:38:31 +01:00
meggert	bb895c9e12	Merge branch 'develop' into acs-ctrl-finite-check	2023-03-15 09:37:15 +01:00
Robin Müller	3eb5fc7f47	Merge pull request 'patch for v1.37.2' (#483) from patch_v1.37.2 into develop ... Reviewed-on: #483	2023-03-14 20:03:00 +01:00
Robin Mueller	533aaa207c	bump version	2023-03-14 20:02:39 +01:00
Robin Mueller	005d5a5223	prep patch version	2023-03-14 20:02:27 +01:00
Robin Müller	2b12cc4fa2	Merge branch 'develop' into feature_boot_sequence_eive_sys	2023-03-14 18:49:25 +01:00
Robin Müller	ec2db69236	Merge branch 'develop' into feature_scheduling_tweaks	2023-03-14 18:49:16 +01:00
Robin Müller	263f4eb25f	Merge branch 'develop' into refactoring_bugfixes_power_switching	2023-03-14 18:49:06 +01:00
Robin Müller	13c7ef373d	Merge pull request 'unittest hotfix' (#482) from unttest_hotfix into develop ... Reviewed-on: #482	2023-03-14 18:48:05 +01:00