6681 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	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 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
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 Mueller	e82777479b	Merge remote-tracking branch 'origin/develop' into thermal_controller	2023-03-14 18:50:28 +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
Robin Mueller	adcc68e0fa	unittest hotfix	2023-03-14 18:47:48 +01:00
Robin Müller	11106cf755	Merge pull request 'prep v1.37.1' (#481) from prep_v1.37.1 into develop ... Reviewed-on: #481	2023-03-14 18:45:20 +01:00
Robin Mueller	f966b517a4	prep v1.37.1	2023-03-14 18:44:50 +01:00
Robin Mueller	3e5937db67	Merge remote-tracking branch 'origin/develop' into feature_scheduling_tweaks	2023-03-14 18:41:28 +01:00
Robin Mueller	d322096573	changelog	2023-03-14 18:41:11 +01:00
Robin Mueller	a392e31f99	Merge remote-tracking branch 'origin/develop' into feature_boot_sequence_eive_sys	2023-03-14 18:39:08 +01:00
Robin Mueller	719ffcad2b	Merge remote-tracking branch 'origin/develop' into refactoring_bugfixes_power_switching	2023-03-14 18:36:43 +01:00
Robin Müller	59ee375fc1	Merge pull request 'bump fsfw' (#480) from bump_fsfw into develop ... Reviewed-on: #480	2023-03-14 18:34:45 +01:00
Robin Mueller	bbb8dd7a8a	bump fsfw	2023-03-14 18:34:23 +01:00
Robin Müller	8fa2d0be0b	Merge branch 'develop' into feature_scheduling_tweaks	2023-03-14 18:33:33 +01:00
Robin Müller	af1d03f53f	Merge pull request 'bump fsfw, tmtc and allow spilling for pools' (#479) from feature_stores_allow_spilling into develop ... Reviewed-on: #479	2023-03-14 18:30:32 +01:00
Robin Mueller	8a6d292a48	bump fsfw, tmtc and allow spilling for pools	2023-03-14 18:29:21 +01:00
meggert	017171f221	changelog	2023-03-14 17:22:59 +01:00
meggert	f2210010de	prevent event spam and add action command to restore automatic recovery	2023-03-14 17:19:50 +01:00
Robin Müller	52ec5093bc	Merge pull request 'new subsystem.csv' (#478) from update_generators_subsystem_csvs into develop ... Reviewed-on: #478	2023-03-14 17:12:44 +01:00
Robin Mueller	77e39f3a92	new subsystem.csv	2023-03-14 17:12:05 +01:00
Robin Müller	af59a4e5d5	Merge pull request 'cfg set subscription' (#476) from bpx_batt_cfg_set into develop ... Reviewed-on: #476	2023-03-14 16:53:09 +01:00
Robin Müller	dc1047b7f9	Merge branch 'develop' into bpx_batt_cfg_set	2023-03-14 16:53:00 +01:00
Robin Müller	e27b0875e0	Merge pull request 'bump fsfw' (#477) from bump_fsfw_datapool_manager into develop ... Reviewed-on: #477	2023-03-14 16:52:40 +01:00