5304 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Robin Mueller	e527695a33	update generates files	2023-02-09 14:25:29 +01:00
Robin Mueller	c496271a0e	Merge remote-tracking branch 'origin/develop' into add_heater_info_set	2023-02-08 21:42:20 +01:00
Robin Mueller	3159574cfa	resolve more merge conflicts	2023-02-08 21:41:19 +01:00
Robin Mueller	5542507024	changelog	2023-02-08 21:40:09 +01:00
Robin Mueller	fa62f07dce	Merge remote-tracking branch 'origin/develop' into add_heater_info_set	2023-02-08 21:39:27 +01:00
Robin Müller	c61e8f6dd7	Merge pull request 'Heater Handling' (#325) from heater_handling into develop ... Reviewed-on: #325	2023-02-08 21:35:04 +01:00
Robin Mueller	8d69996d4c	bump fsfw	2023-02-08 21:27:42 +01:00
Robin Mueller	c843e34464	prep v1.26.2	2023-02-08 21:22:07 +01:00
Robin Mueller	7eab7169f7	Merge remote-tracking branch 'origin/develop' into heater_handling	2023-02-08 21:17:33 +01:00
Robin Mueller	9d14788ef3	bump tmtc	2023-02-08 21:11:24 +01:00
Robin Mueller	7ec8ca3356	updates	2023-02-08 20:40:53 +01:00
Robin Müller	fc61066848	Merge pull request 'PDEC evil fix' (#374) from pdec_evil_fix into develop ... Reviewed-on: #374	2023-02-08 20:08:54 +01:00
Robin Mueller	cea0a28cee	bump changelog	2023-02-08 20:06:15 +01:00
Robin Mueller	557fe5a9a2	PDEC evil fix	2023-02-08 20:01:56 +01:00
Robin Müller	f7e59edaf2	Merge pull request 'ACS Update Scheduling' (#373) from acs_update_scheduling_again into develop ... Reviewed-on: #373 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-02-08 18:00:07 +01:00
Robin Mueller	4052534235	Merge remote-tracking branch 'origin/develop' into acs_update_scheduling_again	2023-02-08 17:55:07 +01:00
Robin Müller	ee885b516f	Merge pull request 'start replacing chained locks' (#372) from awesome_acs_branch into develop ... Reviewed-on: #372 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-02-08 17:52:07 +01:00
Robin Mueller	a4d551e420	Merge remote-tracking branch 'origin/develop' into mueller/pus-15-tm-storage	2023-02-08 17:43:43 +01:00
meggert	b943fee515	changelog	2023-02-08 17:17:19 +01:00
meggert	5f9a52977b	replaced all chained locks	2023-02-08 17:02:59 +01:00
meggert	1d12d5f144	removed sensorValues inits	2023-02-08 17:02:22 +01:00
Robin Mueller	fddfa80f76	fix unittest	2023-02-08 16:58:32 +01:00
Robin Mueller	c04936d0dc	Merge remote-tracking branch 'origin/develop' into heater_handling	2023-02-08 16:54:07 +01:00
Robin Mueller	13b3fe03b8	afmt and changelog	2023-02-08 16:46:30 +01:00
Robin Mueller	79a13b8b6a	update sched again	2023-02-08 16:45:19 +01:00
Robin Mueller	2e11f067e2	start replacing chained locks	2023-02-08 15:30:14 +01:00
Robin Mueller	e1e6ce5d34	bump patch version, prep v1.26.1	2023-02-08 15:03:22 +01:00
Robin Mueller	4528e61fcd	initialize ACS controller	2023-02-08 15:02:56 +01:00
Robin Mueller	881f9ea7ea	prep v1.26.0	2023-02-08 14:52:11 +01:00
Robin Mueller	b1da4bb81b	remove doubly scheduled ACS CTRL	2023-02-08 14:33:48 +01:00
Robin Mueller	50d8d0b278	remove old unneeded IF ID	2023-02-08 14:22:56 +01:00
Robin Mueller	7e0b30e845	ACS section separate	2023-02-08 14:11:49 +01:00
Robin Mueller	349ebca08d	re-run generators ... all associated changes and fixes	2023-02-08 14:11:11 +01:00
Robin Müller	6dcec02377	Merge pull request 'Final Version of the ACS Controller' (#367) from eggert/acs into develop ... Reviewed-on: #367 Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>	2023-02-08 13:50:10 +01:00
Robin Mueller	da166c7bc3	resolve merge conflicts	2023-02-08 13:40:03 +01:00
Robin Mueller	80f48acb07	Merge remote-tracking branch 'origin/develop' into eggert/acs	2023-02-08 13:27:09 +01:00
Robin Müller	c1d8693d3c	Merge pull request 'ACS Update scheduling' (#366) from acs_update_scheduling into develop ... Reviewed-on: #366 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-02-08 13:23:33 +01:00
Robin Mueller	6ae0ee5b26	small update	2023-02-08 13:23:05 +01:00
meggert	098fcc4f12	Merge branch 'develop' into eggert/acs	2023-02-08 13:21:49 +01:00
Robin Mueller	bfa61632c2	use singular enum name	2023-02-08 13:18:45 +01:00
Robin Mueller	e25eed7687	now it compiles	2023-02-08 13:17:47 +01:00
Robin Mueller	4412690652	Merge remote-tracking branch 'origin/develop' into acs_update_scheduling	2023-02-08 13:08:00 +01:00
Robin Müller	7c53cafbbe	Merge pull request 'Some GPS updates' (#369) from some_more_gps_updates into develop ... Reviewed-on: #369 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-02-08 13:04:45 +01:00
Robin Müller	f2629f1b51	Merge pull request 'MGM calibration fix' (#357) from eggert/mgm-calibration-fix into develop ... Reviewed-on: #357 Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>	2023-02-08 13:02:40 +01:00
Robin Mueller	6fa1084d21	Merge remote-tracking branch 'origin/develop' into acs_update_scheduling	2023-02-08 13:01:21 +01:00
Robin Mueller	ba5621f4b7	Merge remote-tracking branch 'origin/develop' into some_more_gps_updates	2023-02-08 13:00:07 +01:00
Robin Müller	fdb2b52f2f	Merge pull request 'Update version handling' (#371) from update_version_handling into develop ... Reviewed-on: #371	2023-02-08 11:57:49 +01:00
Robin Mueller	02f0349525	done	2023-02-08 11:53:20 +01:00
Robin Mueller	de95a1ba61	add new events	2023-02-08 11:22:57 +01:00
Robin Mueller	b7ec4e3b20	bump tmtc	2023-02-08 11:21:39 +01:00