267 Commits

Author	SHA1	Message	Date
meggert	573ff334b8	fixes	2023-03-21 11:37:54 +01:00
meggert	a92f664770	Merge branch 'develop' into acs-ctrl-finite-check	2023-03-21 11:30:26 +01:00
Robin Mueller	5b84808d7c	reset the counter	2023-03-17 16:16:53 +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	f2210010de	prevent event spam and add action command to restore automatic recovery	2023-03-14 17:19:50 +01:00
meggert	66b38fa294	Merge branch 'develop' into acs-ctrl-finite-check	2023-03-14 14:19:30 +01:00
meggert	3a56297a83	mekfViolationTimer as parameter	2023-03-14 13:15:48 +01:00
meggert	f358719778	added event in case of safe mode controller failure	2023-03-13 16:33:48 +01:00
meggert	e77766ae59	reset the MEKF in case its results are not finite	2023-03-13 16:14:32 +01:00
meggert	eb66d7585c	fixed ptgCtrl after acs submode to mode changes	2023-03-13 10:01:08 +01:00
meggert	7b3393c5b2	Merge branch 'develop' into acs-bug-bash	2023-03-10 17:38:29 +01:00
meggert	342ff62837	fixed rw torque scaling	2023-03-10 17:31:12 +01:00
Robin Mueller	4a386ad3d1	simplification	2023-03-10 15:21:36 +01:00
Robin Mueller	2f4f7f088e	add missing break	2023-03-10 13:58:50 +01:00
Robin Mueller	c85c2cf4b6	this should be it for OBSW	2023-03-10 13:17:46 +01:00
meggert	ba0bc1b98b	anounce mode changes	2023-03-10 12:46:26 +01:00
meggert	170976566b	acsCtrl does not allow ON or NORMAL anymore	2023-03-10 12:11:10 +01:00
meggert	b1c4241b03	changed perform operation	2023-03-10 11:55:18 +01:00
meggert	cb8a49775d	added protection to not command rwSpeeds larger than the allowed speed range	2023-03-10 11:37:04 +01:00
meggert	b6477e099d	Merge branch 'develop' into acs-bug-bash	2023-03-10 09:26:50 +01:00
Robin Mueller	b261a4ecfa	works	2023-03-08 18:09:50 +01:00
meggert	72ab4b1a24	fixed naming collision with file for solar deployment	2023-03-07 14:13:17 +01:00
meggert	fd436dbe8b	added fdir for unrealistic gps altitudes	2023-03-07 11:10:47 +01:00
meggert	bd295d5b52	detumbleCounter doesnt hard reset anymore	2023-03-07 10:12:52 +01:00
meggert	37673a2782	Merge branch 'develop' into acs-bug-bash	2023-03-07 09:54:53 +01:00
Robin Mueller	e6b5ee65f3	prep v1.35.0	2023-03-04 17:19:36 +01:00
Robin Mueller	4c1b79fd66	that was an evil bug	2023-03-04 17:06:23 +01:00
Robin Mueller	c8a2395d61	a lot of bugfixes for IMTQ	2023-03-04 14:32:18 +01:00
Robin Müller	c4ef164f41	Merge branch 'develop' into rework_lock_handling	2023-03-02 18:29:45 +01:00
meggert	3e2338f3a4	fixed units used in controler calculations	2023-03-02 17:52:36 +01:00
Robin Mueller	dfb1e88f55	lockslockslocks	2023-03-02 15:32:12 +01:00
Robin Mueller	4b37a19644	try to use more locks with timeouts	2023-03-02 15:21:45 +01:00
Robin Mueller	14188a4f3b	bugfixes imtq	2023-03-02 14:42:42 +01:00
meggert	7b0657bb55	fixed usage of wrong parameters	2023-02-28 15:01:07 +01:00
meggert	d59daa2485	we might need this pointing law stuff ...	2023-02-28 15:00:05 +01:00
meggert	84643020da	fixed gs target mode using wrong parameter set	2023-02-28 10:43:17 +01:00
meggert	04a561b9a0	cleaned up detumble and fixed gyr detumble law to actual bdot law	2023-02-28 10:12:25 +01:00
meggert	26369039da	better solution for actuatorCmd	2023-02-27 17:36:33 +01:00
meggert	5c30adb9bb	changed AcsParameters instance in guidance to const pointer	2023-02-27 17:08:48 +01:00
meggert	d671de7efb	fill collection sets before executing acsctrl and actually use tgtRotRate in ctrlValData	2023-02-24 15:34:51 +01:00
meggert	7392012a00	Merge branch 'develop' into eggert/acs-ctrl-action-cmds	2023-02-24 09:18:25 +01:00
meggert	89230b60d7	we dont want commanding of actuators yet	2023-02-24 09:11:13 +01:00
Robin Mueller	0907e8f5e5	use more constants	2023-02-23 18:39:14 +01:00
Robin Mueller	59b80807ba	possible fix but not sure	2023-02-23 18:34:28 +01:00
meggert	5d9ed222f5	added returnvalue handling	2023-02-23 11:26:43 +01:00
meggert	5205c5b78a	include cleanup	2023-02-23 11:06:45 +01:00
meggert	29f1dd0f8e	Merge branch 'develop' into eggert/acs-ctrl-action-cmds	2023-02-23 09:31:58 +01:00
meggert	8873ecae48	boop	2023-02-22 17:31:40 +01:00
meggert	5ad2fa5e93	added action commands	2023-02-22 17:10:42 +01:00
meggert	2a91105124	added executeAction	2023-02-22 16:10:30 +01:00
meggert	83b81e1ba8	changed mekf events again	2023-02-22 14:57:44 +01:00
meggert	f19729e11d	throw a single event every time the mekf stops working	2023-02-21 17:10:59 +01:00
meggert	2a9c1aab7f	added mekf status to dataset	2023-02-21 16:02:26 +01:00
meggert	a2a822c118	get	2023-02-21 11:30:42 +01:00
meggert	b3b736a7bd	ctrlValData gets updated in every perform function	2023-02-21 11:13:06 +01:00
meggert	40446b1fea	all used guidance parts and their calls in AcsCrtl should work now	2023-02-20 16:30:53 +01:00
meggert	81a4112c45	nadir should work again	2023-02-20 16:23:14 +01:00
meggert	2c8cfa3874	can never happen	2023-02-20 16:00:54 +01:00
meggert	6016063add	fixed unused variables	2023-02-20 16:00:17 +01:00
meggert	04e1cb52ac	when did i push this last	2023-02-20 15:59:01 +01:00
meggert	700d7ced64	only one guidance function to calculate error quaternion	2023-02-20 11:52:53 +01:00
meggert	0dae3b04be	PTG_TARGET should work now	2023-02-17 15:57:07 +01:00
meggert	0d32bc0c0a	added target rotation rate to ctrlValData set	2023-02-17 15:15:47 +01:00
meggert	6352b65f46	some things also broken some things fixed again	2023-02-17 14:46:41 +01:00
meggert	f12fa77644	still broken	2023-02-17 13:54:36 +01:00
meggert	d709e190e2	added function for updating ctrlValData	2023-02-17 13:28:29 +01:00
meggert	1518fba6bd	moved actuatorCmdData to function	2023-02-17 11:11:48 +01:00
meggert	75ade4d8f8	event for multiple invalid rw now triggert after 5 failures	2023-02-17 09:21:30 +01:00
meggert	97f7f7c973	RW pseudo inverses now set from RW state. multiple invalids trigger event and disable ptgCtrl	2023-02-16 15:40:16 +01:00
Robin Mueller	29e78a7ae3	Merge remote-tracking branch 'origin/develop' into eggert/rw-cmd-acs-ctrl	2023-02-14 17:33:37 +01:00
Robin Mueller	2aac3c67ee	instrumented some more tasks	2023-02-14 11:10:18 +01:00
Robin Mueller	66d20dc118	add tracing for first tasks	2023-02-14 10:59:35 +01:00
meggert	ac22a00e09	Merge branch 'develop' into eggert/rw-cmd-acs-ctrl	2023-02-13 10:29:56 +01:00
Robin Mueller	2c0efdee5a	printout corrections	2023-02-13 10:03:16 +01:00
Robin Mueller	7e3de3ca95	timing problem does not fully disappear..	2023-02-13 09:56:57 +01:00
Robin Mueller	3759b5d34a	I am happy with this version	2023-02-13 01:26:30 +01:00
meggert	109560feb2	disabled actCmd from acsCtrl again for now	2023-02-10 11:30:52 +01:00
meggert	ea32d87c25	function now handles actuator cmd	2023-02-10 11:27:25 +01:00
meggert	a3eaace4a5	added RwSpeedActuationSets to AcsController	2023-02-09 17:31:26 +01:00
meggert	1d12d5f144	removed sensorValues inits	2023-02-08 17:02:22 +01:00
Robin Mueller	2e11f067e2	start replacing chained locks	2023-02-08 15:30:14 +01:00
Robin Mueller	4528e61fcd	initialize ACS controller	2023-02-08 15:02:56 +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
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	4412690652	Merge remote-tracking branch 'origin/develop' into acs_update_scheduling	2023-02-08 13:08:00 +01:00
meggert	4f2853e1b8	adapted new acs submodes for checkModeCommand	2023-02-07 18:07:19 +01:00
Robin Mueller	8bc71b268e	some tests with subsystem	2023-02-07 17:28:59 +01:00
meggert	e3cc45d7e3	merge aftermath: ... - fixed missing declarations of functions - fixed use of deprecated submode definitions - changed naming of some submodes	2023-02-07 13:09:42 +01:00
meggert	6567fd1023	Merge branch 'develop' into eggert/acs	2023-02-07 10:08:20 +01:00
Robin Mueller	3b8903b2e2	Merge remote-tracking branch 'origin/develop' into acs_update_scheduling	2023-02-03 16:13:40 +01:00
Robin Mueller	d9514e4184	a lot of bugfixes	2023-02-03 16:08:34 +01:00
Robin Mueller	f9ae4860d9	typo	2023-02-03 14:31:22 +01:00
Robin Mueller	4ed1e2411a	works	2023-02-03 14:21:36 +01:00
Robin Mueller	2c2c73b23f	fixes and updates for ACS mode tree	2023-02-03 11:25:03 +01:00
Robin Mueller	2b00d3a565	ACS updates ... - Adapt ACS subsystem to handle events from ACS CTRL - Some fixes and updates for ACS subsystem	2023-02-02 16:27:50 +01:00
meggert	43deed9dc0	Merge branch 'develop' into eggert/acs	2023-02-02 10:59:12 +01:00
Robin Marquardt	60e75612fd	fixed merge conflict	2023-02-01 15:27:01 +01:00
Robin Mueller	13f3963f69	Update ... - COM Subsystem now handles datarate config - torquer config and comCfg moved to mission/config folder - CCSDS Handler: Added default rate submode	2023-01-27 18:38:36 +01:00
Robin Marquardt	adef468c0b	applyed CppStyle Format	2023-01-23 16:34:52 +01:00
Marius Eggert	bd7a38ac2b	Merge branch 'develop' into eggert/acs	2023-01-20 10:50:43 +01:00
Robin Mueller	7e6ab01528	mekf is now diagnostic as well	2023-01-18 16:02:57 +01:00
Robin Mueller	a0750210ca	gyro sets are diagnostic now	2023-01-18 15:58:38 +01:00
Robin Marquardt	44b384cd17	access to different paramset for every pointing mode	2023-01-17 20:11:45 +01:00
Marius Eggert	673c24a34d	frmt	2023-01-16 15:43:40 +01:00
Robin Marquardt	ce3841a23d	use std::memcpy	2023-01-12 17:19:35 +01:00
Robin Marquardt	d8c0ba19fd	changed pointingParameters struct	2023-01-12 15:19:21 +01:00
Marius Eggert	a2626afebb	added gpsPosition to gpsProcessedData	2023-01-11 13:42:48 +01:00
Marius Eggert	ac83e66016	naming and frmt	2023-01-10 13:52:26 +01:00
Marius Eggert	0854b1c778	ACS Ctrl getParameter forwarding to ACS Param	2023-01-10 09:16:13 +01:00
Marius Eggert	887d193526	added ReceiversParameterMessagesIF and ParameterHelper to ACS Ctrl	2023-01-10 09:06:09 +01:00
Marius Eggert	341966e709	added GS target mode	2023-01-09 09:36:00 +01:00
Marius Eggert	00d4a7602a	Merge branch 'develop' into eggert/acs	2023-01-09 09:30:37 +01:00
Robin Mueller	b53cc475fe	bugfix acs controller	2022-12-21 16:11:53 +01:00
Robin Mueller	98597b98d7	use memset for zeroing	2022-12-20 11:43:02 +01:00
Marius Eggert	3f2910c3a7	changed order of submodes and their naming	2022-12-14 13:04:41 +01:00
Marius Eggert	8b415883e9	removed references to deprecated OutputValues and renamed guidance strategies	2022-12-14 11:46:58 +01:00
Marius Eggert	c97d319b2a	added gpsVelocity to gpsProcessed dataSet	2022-12-14 10:39:41 +01:00
Marius Eggert	b49d37e15a	clang	2022-12-13 11:51:03 +01:00
Marius Eggert	d33ae9ede7	Merge branch 'eggert/acs' into marquardt/ptgCtrl ... # Conflicts: # mission/controller/AcsController.cpp # mission/controller/AcsController.h # mission/controller/acs/AcsParameters.h # mission/controller/acs/ActuatorCmd.h # mission/controller/acs/Guidance.cpp # mission/controller/acs/Guidance.h # mission/controller/acs/MultiplicativeKalmanFilter.cpp # mission/controller/acs/OutputValues.h # mission/controller/acs/SensorProcessing.cpp # mission/controller/acs/SensorProcessing.h # mission/controller/acs/control/Detumble.cpp # mission/controller/acs/control/Detumble.h # mission/controller/acs/control/PtgCtrl.cpp # mission/controller/acs/util/MathOperations.h	2022-12-13 11:26:23 +01:00
Marius Eggert	08bdc87505	removed hardcoded modes	2022-12-01 14:19:42 +01:00
Robin Marquardt	8d1cbd9f8b	changed calculation of quaternion for target and sun pointing	2022-11-24 13:40:55 +01:00
Robin Marquardt	609d429161	added Nadir FLP version	2022-11-22 21:10:05 +01:00
Robin Marquardt	55dec574c5	added inertial pointing	2022-11-14 17:16:47 +01:00
Robin Marquardt	20936faec6	added Antistiction, added Nadir Pointing, added performSafe()	2022-11-08 13:48:50 +01:00
Marius Eggert	8cc368b131	fixed types for actuatorCmdData	2022-11-08 10:56:12 +01:00
Robin Marquardt	75ab11fc35	updated AcsParameters. change DCM_EJ calc to with precission and nutation	2022-11-04 17:21:17 +01:00
Marius Eggert	d184f7487e	post merge cleanup	2022-11-04 14:54:23 +01:00
Marius Eggert	895d03a35c	Merge branch 'develop' into eggert/acs ... # Conflicts: # dummies/CMakeLists.txt # mission/controller/AcsController.cpp # mission/controller/AcsController.h	2022-11-04 14:19:43 +01:00
Marius Eggert	c7bfe4002d	added event for SAFE to DETUMBLE transition. changed actuator input from double to int	2022-11-03 14:24:09 +01:00
Marius Eggert	a13ccb43d2	removed OutputValues ... amended sumbode list inserted writes to output DataPools	2022-11-03 10:43:27 +01:00
Marius Eggert	44dda9455d	SensorProcessing writes to AcsController DataSets now	2022-10-26 17:13:23 +02:00
Robin Mueller	9b8d2f3097	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-10-25 13:13:41 +02:00
Marius Eggert	69099881bd	small stuff	2022-10-25 11:31:54 +02:00
Marius Eggert	4bd2a2dac8	added and implemented all ACS related DataPools to AcsController	2022-10-24 10:41:28 +02:00
Robin Mueller	75a4cd1b69	awful solution but works	2022-10-20 16:09:18 +02:00
Robin Mueller	29a34256a7	old code seems to work	2022-10-20 15:08:33 +02:00
Marius Eggert	deb7c4e500	added saftCtrl to acsController	2022-10-20 11:07:45 +02:00
Marius Eggert	84fc44fd5f	fixed GPS and STR inputs	2022-10-12 15:06:24 +02:00
Marius Eggert	4aecd07970	added PtgCtrl code. matched inputs to actual SensorValues inputs	2022-10-12 10:28:44 +02:00
Marius Eggert	8536c79445	clean up	2022-10-11 15:01:44 +02:00
Marius Eggert	82e9c6d092	comments	2022-10-10 16:02:17 +02:00
Marius Eggert	f77b3498ec	fixed inputs. removed outputs. minor fixes	2022-10-10 09:54:06 +02:00
Marius Eggert	84e960a9ef	enabled performSafe	2022-10-06 15:37:41 +02:00
Marius Eggert	9d0e10eb1e	fixed dummies, scheduled dummies as part of acsTask	2022-10-04 13:45:13 +02:00
Marius Eggert	abe5f43ae9	added performDetumble and implemented ckeckModeCommand	2022-09-30 11:06:17 +02:00
Marius Eggert	16429009b4	added LocalDataPool entries	2022-09-30 10:13:27 +02:00
Robin Mueller	6af7ccc6a2	need to fix all of these TODOs	2022-09-29 19:40:00 +02:00