5349 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Robin Müller	39bf9f9b5b	Merge pull request 'Possible Bugfix: Use system clock in Countdown' (#426) from bugfix_countdown_uses_sysclock into develop ... Reviewed-on: #426	2023-03-03 15:31:29 +01:00
Robin Mueller	2165f34a28	Merge remote-tracking branch 'origin/develop' into bugfix_countdown_uses_sysclock	2023-03-03 15:30:18 +01:00
Robin Müller	70e1d41a08	Merge pull request 'rework lock handling in rtd handler' (#424) from tweaks_rtd_locks into develop ... Reviewed-on: #424	2023-03-03 15:21:57 +01:00
Robin Müller	3b0490835c	Merge branch 'develop' into tweaks_rtd_locks	2023-03-03 15:21:46 +01:00
Robin Müller	6c7d1e674c	Merge pull request 'Smaller lock tweaks' (#423) from smaller_lock_tweaks into develop ... Reviewed-on: #423	2023-03-03 15:21:35 +01:00
Robin Müller	cc3bcdfaeb	Merge branch 'develop' into smaller_lock_tweaks	2023-03-03 15:21:24 +01:00
Robin Müller	26f9c499d8	Merge pull request 'acs hotfix v2' (#425) from acs-hotfix-the-second into develop ... Reviewed-on: #425	2023-03-03 15:20:59 +01:00
Jakob Meier	53133573e1	measurement base code and comment	2023-03-03 14:58:03 +01:00
Jakob Meier	7a7f25a638	lets see if this fixes issues	2023-03-03 14:36:52 +01:00
meggert	ec2ec32af4	actually use the stuff i wrote	2023-03-03 11:56:31 +01:00
Robin Mueller	fcba76b7f1	rework lock handling in rtd handler	2023-03-03 11:43:47 +01:00
Robin Mueller	60afb573a0	comment	2023-03-03 11:06:30 +01:00
Robin Mueller	ff50203fbb	smaller lock tweaks	2023-03-03 11:04:08 +01:00
Robin Müller	da72b3a96a	Merge pull request 'fixed that mgm value was overwritten in wrong unit' (#422) from acs-mgm-vector-hotfix into develop ... Reviewed-on: #422 Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>	2023-03-03 10:53:12 +01:00
Jakob Meier	1cf3fbaabe	fixed that mgm value was overwritten in wrong unit	2023-03-03 10:51:12 +01:00
Marius Eggert	245b5dfcc6	Merge pull request 'Rework Lock Handling' (#419) from rework_lock_handling into develop ... Reviewed-on: #419 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-03-03 09:13:32 +01:00
Robin Müller	c4ef164f41	Merge branch 'develop' into rework_lock_handling	2023-03-02 18:29:45 +01:00
Robin Müller	39bb90eb61	Merge pull request 'Fixed units in ACS Control Laws Safe and Detumble' (#421) from acs-units-fix into develop ... Reviewed-on: #421 Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>	2023-03-02 18:28:39 +01:00
Robin Müller	7a4a42c692	Merge branch 'develop' into acs-units-fix	2023-03-02 18:28:24 +01:00
Robin Müller	21ed43614e	Merge pull request 'Health handling for SUS assy' (#418) from bugfix_sus_brd_assy into develop ... Reviewed-on: #418	2023-03-02 18:26:55 +01:00
Robin Mueller	7288a5edbd	go to off immediately	2023-03-02 18:27:27 +01:00
Robin Mueller	d55daebabf	Merge remote-tracking branch 'origin/develop' into bugfix_sus_brd_assy	2023-03-02 18:04:29 +01:00
meggert	ca22904d32	Merge branch 'develop' into acs-units-fix	2023-03-02 17:57:34 +01:00
Robin Mueller	4ec362d849	afmt	2023-03-02 17:56:10 +01:00
Robin Mueller	00834de1b7	printout tweak, bump tmtc	2023-03-02 17:55:47 +01:00
meggert	3ade660132	changelog	2023-03-02 17:53:59 +01:00
meggert	3e2338f3a4	fixed units used in controler calculations	2023-03-02 17:52:36 +01:00
Robin Müller	79d27ff9e3	Merge pull request 'Syrlinks Assembly' (#414) from feature_syrlinks_assembly into develop ... Reviewed-on: #414	2023-03-02 17:45:42 +01:00
Robin Mueller	d13e593f89	more useful printout	2023-03-02 17:35:36 +01:00
Robin Mueller	35caddbfc4	handle children lost mode	2023-03-02 17:27:47 +01:00
Robin Mueller	196aca241e	add missing command table init	2023-03-02 17:25:32 +01:00
Robin Mueller	6530ad8f1a	re-gen objects	2023-03-02 17:08:44 +01:00
Robin Mueller	25dfb54be0	bump changelog	2023-03-02 15:44:07 +01:00
Robin Mueller	f43a93842e	max31865 lock improvements	2023-03-02 15:41:49 +01:00
Robin Mueller	ad4ab98356	lock context for sd card manager	2023-03-02 15:41:09 +01:00
Robin Mueller	7b571bc007	refactore more lock handling	2023-03-02 15:38:20 +01:00
Robin Mueller	dfb1e88f55	lockslockslocks	2023-03-02 15:32:12 +01:00
Robin Mueller	7b539e2fa5	rework lock handling	2023-03-02 15:22:21 +01:00
Robin Mueller	4b37a19644	try to use more locks with timeouts	2023-03-02 15:21:45 +01:00
Robin Mueller	718a440442	changelog update	2023-03-02 15:05:12 +01:00
Robin Mueller	7e33ec16e4	Merge remote-tracking branch 'origin/develop' into feature_syrlinks_assembly	2023-03-02 15:04:30 +01:00
Robin Mueller	0fc17624f3	sus brd assy health handling	2023-03-02 14:59:27 +01:00
Robin Müller	b5049fa8d0	Merge pull request 'allow quicker startup' (#411) from feature_allow_quicker_transition into develop ... Reviewed-on: #411 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-03-02 14:46:15 +01:00
Robin Müller	652326443b	Merge branch 'develop' into feature_allow_quicker_transition	2023-03-02 14:45:29 +01:00
Robin Müller	d4b7c6493a	Merge pull request 'CHANGELOG and tmtc' (#417) from bugfixes_acs_polling into develop ... Reviewed-on: #417	2023-03-02 14:45:17 +01:00
Robin Müller	4aa6ed4de4	Merge branch 'develop' into bugfixes_acs_polling	2023-03-02 14:45:08 +01:00
Robin Mueller	9067c4180e	bump tmtc	2023-03-02 14:48:00 +01:00
Robin Mueller	0056ebcb62	bump changelog	2023-03-02 14:46:20 +01:00
Robin Müller	a2485a2195	Merge branch 'develop' into feature_allow_quicker_transition	2023-03-02 14:44:12 +01:00
Robin Mueller	eaa0fc6cbe	bump changelog	2023-03-02 14:43:50 +01:00