1067 Commits

Author	SHA1	Message	Date
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
Robin Mueller	fe6b13bb81	start fixing this crap	2022-11-03 22:59:51 +01:00
Robin Mueller	9503b2ca93	Merge remote-tracking branch 'origin/develop' into mueller/pl-ss	2022-11-03 20:10:05 +01:00
Robin Mueller	beb99d53f7	pus test service has higher prio now	2022-11-02 19:35:35 +01:00
Robin Mueller	70092b348a	pdec handler has higher priority now	2022-11-02 19:15:07 +01:00
Robin Mueller	8297bca969	small EM fix	2022-11-02 15:22:05 +01:00
Robin Mueller	964f9dc688	Merge remote-tracking branch 'origin/develop' into mueller/pdec_irq_handling	2022-11-02 14:16:14 +01:00
Robin Mueller	b1f7c66066	Merge remote-tracking branch 'origin/develop' into mueller/pdec_irq_handling	2022-11-02 10:37:52 +01:00
Robin Mueller	39778f9663	Merge remote-tracking branch 'origin/develop' into mueller/tm_funnel_improvements	2022-11-02 10:37:15 +01:00
Robin Mueller	76283e0e49	refactored TM funnels to allow multiple TM recipients	2022-11-02 10:26:45 +01:00
Robin Mueller	e5fd62a121	some updates for pdec and EM syrlinks tests	2022-10-31 18:45:39 +01:00
Robin Mueller	d19ddaa46c	Merge branch 'mueller/acs-ss-init' into mueller/pl-ss	2022-10-27 17:00:14 +02:00
Robin Mueller	51572208a9	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-10-27 16:59:32 +02:00
Robin Mueller	655c38a210	Merge remote-tracking branch 'origin/develop' into mueller/pdec_irq_handling	2022-10-27 15:34:54 +02:00
Robin Mueller	23da59fec5	bugfixes and improvements	2022-10-27 14:09:55 +02:00
Robin Mueller	833f7c6885	syrlink sim flag now EM/FM dependent	2022-10-27 14:04:55 +02:00
Robin Mueller	82af8e00df	bufixes for PDEC	2022-10-27 14:02:34 +02:00
Robin Mueller	95d2bc0887	first IRQ impl	2022-10-27 10:49:52 +02:00
Robin Mueller	bc277067ed	add PDEC IRQ uio file entry	2022-10-27 09:20:41 +02:00
Robin Mueller	890fba18e1	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-10-27 09:18:12 +02:00
Robin Mueller	35f9869861	tab replacements	2022-10-27 09:01:09 +02:00
Robin Mueller	ae16dcc4a7	afmt + changelog	2022-10-27 09:00:21 +02:00
Robin Müller	f24ea413c8	Merge branch 'develop' into mueller/uio-updates	2022-10-27 08:53:08 +02:00
Robin Mueller	8dd1d81e0d	consistent dev names	2022-10-27 08:51:49 +02:00
Robin Mueller	23238a1e58	reenable core ctrl + minor fm fix	2022-10-27 08:48:46 +02:00
Robin Mueller	db47e56474	Merge branch 'mueller/acs-ss-init' into mueller/pl-ss	2022-10-27 08:31:47 +02:00
Robin Mueller	592cbf6fad	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-10-27 08:31:21 +02:00
Robin Mueller	cace1217df	Merge remote-tracking branch 'origin/develop' into mueller/uio-updates	2022-10-27 08:29:49 +02:00
Robin Mueller	451581e1aa	enable IP core components for both EM and FM	2022-10-26 17:18:23 +02:00
Robin Mueller	5173a0c9cb	its the rad sensor	2022-10-26 17:11:57 +02:00
Robin Mueller	d7ff74b6bd	better configurability for PDEC/PTME usage	2022-10-26 16:11:34 +02:00
Robin Mueller	3475e167ee	perform SD card check more often for 2-3 cycles	2022-10-26 15:57:07 +02:00
Robin Mueller	00059251f0	further clean up em and general code	2022-10-26 15:47:23 +02:00
Robin Mueller	c2845aefaf	further reduce EM SW	2022-10-26 15:31:04 +02:00
Robin Mueller	d25e883e65	further reduce EM obj factory	2022-10-26 15:30:04 +02:00
Robin Mueller	4a8096998d	added two todos and new uio file names	2022-10-25 18:21:48 +02:00
Jakob Meier	1c9c2aba5b	Merge pull request 'safety mechanism on reboots' (#308) from mueller/sdc-safety-mechanism-on-reboot into develop ... Reviewed-on: #308 Reviewed-by: Jakob Meier <meierj@irs.uni-stuttgart.de>	2022-10-25 14:33:58 +02:00
Robin Mueller	9b8d2f3097	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-10-25 13:13:41 +02:00
Robin Mueller	4af8c85a84	small fix	2022-10-25 11:39:57 +02:00
Robin Mueller	0135bebc70	impl bugfix	2022-10-25 11:33:21 +02:00
Robin Mueller	b1e8be2ba5	checked FS usage	2022-10-25 11:31:06 +02:00
Robin Mueller	f198a401f2	this should work as well	2022-10-25 11:22:31 +02:00
Robin Mueller	a9096a46c0	safety mechanism on reboots	2022-10-25 11:04:24 +02:00
Robin Mueller	f4067abdac	Merge branch 'mueller/acs-ss-init' into mueller/pl-ss	2022-10-21 15:37:52 +02:00
Robin Mueller	dd7521cc4b	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-10-21 15:37:25 +02:00
Robin Mueller	83b8cf3198	Merge remote-tracking branch 'origin/develop' into mueller/imtq-updates	2022-10-21 15:33:47 +02:00
Robin Mueller	b9b850f621	object ID corrections	2022-10-21 14:49:54 +02:00
Robin Mueller	b6a5c8c854	added TODO, remove obsolete code	2022-10-21 11:54:14 +02:00
Robin Mueller	dc45c53e38	add new CFDP and PUS TM funnel	2022-10-21 11:51:44 +02:00
Robin Mueller	e0399a5db3	Merge branch 'mueller/acs-ss-init' into mueller/pl-ss	2022-10-21 11:20:01 +02:00
Robin Mueller	b2688c5ac0	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-10-21 11:18:39 +02:00
Robin Mueller	5abbaeddb0	update EM obj factory	2022-10-20 17:16:37 +02:00
Robin Mueller	ab273a8a59	re-use dipole set in IMTQ handler	2022-10-20 10:32:17 +02:00
Robin Mueller	386fc60441	new static variables to make torque status available	2022-10-19 18:52:16 +02:00
Robin Mueller	d190165bf3	Merge remote-tracking branch 'origin/mueller/acs-ss-init' into mueller/pl-ss	2022-10-17 10:52:05 +02:00
Robin Mueller	ed7bba2cf5	renaming	2022-10-17 10:34:57 +02:00
Robin Mueller	a8e03ab8fe	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-10-17 10:28:53 +02:00
Robin Mueller	c800ddfa31	basic SD card remount FDIR	2022-10-14 15:33:34 +02:00
Robin Mueller	213787d435	start SA depl task	2022-10-13 18:15:28 +02:00
Marius Eggert	2a9dc518a0	added GpsDummy	2022-10-12 15:04:19 +02:00
Robin Mueller	a2e1ed56c9	pass SDC man to SA DEPL handler	2022-10-12 14:09:07 +02:00
Robin Mueller	09c0afbe7f	simplified SA Depl init	2022-10-12 13:56:25 +02:00
Robin Mueller	ea82748496	new solar array deployment task	2022-10-12 13:29:38 +02:00
Robin Mueller	b6b258d82c	remove gpio pst	2022-10-12 13:21:58 +02:00
Robin Mueller	214428295b	only do time file handling with mounted SD card	2022-10-12 12:01:48 +02:00
Marius Eggert	d929b27c08	emplaced STR quaternion related dataPool. added STR dummy to acsTask	2022-10-12 10:26:33 +02:00
Robin Mueller	d3d29a3691	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-10-11 23:13:37 +02:00
Robin Mueller	607822b413	fix in SDC manager	2022-10-11 23:07:44 +02:00
Robin Mueller	21258c2d79	fix core controller	2022-10-11 22:58:31 +02:00
Marius Eggert	b2a715ef6a	added GYR dummies to acsTask. Added complete GYR dataSets to the dummies	2022-10-11 15:00:37 +02:00
Robin Mueller	964e0a3d8e	re-run afmt	2022-10-10 17:41:52 +02:00
Robin Mueller	0f57810a9a	re-run afmt	2022-10-10 17:40:30 +02:00
Robin Mueller	63d660119e	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-10-10 17:39:47 +02:00
Robin Mueller	c82c4cf9d1	Merge remote-tracking branch 'origin/develop' into scex-additions	2022-10-10 11:16:19 +02:00
Robin Mueller	20b7f8b46b	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-10-10 11:10:07 +02:00
Robin Mueller	50d41215fa	Merge remote-tracking branch 'origin/develop' into mueller/em-sw-updates	2022-10-10 10:15:55 +02:00
Marius Eggert	d726ce4e49	permanently activated ACS_CTRL	2022-10-10 09:43:52 +02:00
Robin Mueller	6d9999292c	Merge branch 'mueller/scex-em-tests' into scex-additions	2022-10-06 15:36:26 +02:00
Robin Mueller	8b35bbd241	use new SCEX uart dev name	2022-10-06 15:08:33 +02:00
Robin Mueller	0341865e98	this seems to work	2022-10-06 11:15:55 +02:00
Robin Mueller	c5e5df03d9	new Uart16550 for SCEX, try stop bits	2022-10-05 18:13:49 +02:00
Robin Mueller	3fa2c63a03	add EM code	2022-10-05 14:38:48 +02:00
Marius Eggert	9d0e10eb1e	fixed dummies, scheduled dummies as part of acsTask	2022-10-04 13:45:13 +02:00
Robin Mueller	470b236008	fixed some of the acs ss code	2022-09-30 15:05:48 +02:00
Robin Mueller	66c6f08447	connect acs ctrl to subsystem	2022-09-30 14:30:30 +02:00
Robin Mueller	57d37f14f3	fixed some bugs	2022-09-30 14:14:59 +02:00
Robin Mueller	dcd0a650f0	this should do the job	2022-09-30 13:30:22 +02:00
Robin Mueller	d10ff4efa6	compiles again	2022-09-30 12:09:03 +02:00
Robin Mueller	6af7ccc6a2	need to fix all of these TODOs	2022-09-29 19:40:00 +02:00
Robin Mueller	9512a7d280	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-09-29 17:50:09 +02:00
Robin Mueller	f27fccfd29	set DHB parents differently now	2022-09-29 17:06:19 +02:00
Robin Mueller	0f609fdaba	thats a bit tricky	2022-09-29 16:47:47 +02:00
Robin Mueller	541b44cea7	re-run afmt	2022-09-29 14:10:21 +02:00
Robin Mueller	49efbc4725	some bugfixes	2022-09-29 13:53:42 +02:00
Robin Mueller	151d27985f	Merge remote-tracking branch 'origin/develop' into scex-additions	2022-09-29 13:43:58 +02:00
Robin Mueller	a152553d00	Merge remote-tracking branch 'origin/develop' into mueller/em-sw-updates	2022-09-29 13:32:10 +02:00
Robin Mueller	97f02401fe	bugfix for SCEX code	2022-09-28 17:01:40 +02:00
Robin Mueller	269de1782a	Merge branch 'mueller/obsw-update-cmds' into mueller/acs-ss-init	2022-09-27 19:26:23 +02:00
Irini Kosmidou	5f2a0e107d	Merge branch 'scex-additions' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into scex-additions	2022-09-27 19:18:19 +02:00