1576 Commits

Author	SHA1	Message	Date
Robin Mueller	f789380343	reworked watchdog	2023-02-23 23:56:11 +01:00
meggert	f160dfa56d	bump generators	2023-02-23 17:06:36 +01:00
Robin Mueller	43a2993f4d	Merge remote-tracking branch 'origin/develop' into mueller/pus-15-tm-storage	2023-02-23 15:59:24 +01:00
Jakob Meier	ee4db78a95	removed wrong comment	2023-02-23 15:37:20 +01:00
Jakob Meier	5db1f71854	run clang formatting script	2023-02-23 15:27:24 +01:00
Robin Müller	419864e5da	Merge pull request 'tweaks for ACS scheduling' (#395) from tweaks_acs_scheduling into develop ... Reviewed-on: #395 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-02-23 15:23:34 +01:00
Jakob Meier	513dcf9be1	bugfixes in pdec handler parameter commands	2023-02-23 15:19:48 +01:00
Robin Mueller	bd60255220	interior structure changes, use new sched block	2023-02-23 11:57:12 +01:00
Jakob Meier	3b17af9d07	added local parameter handler to PdecConfig to store persistent parameters	2023-02-23 10:09:04 +01:00
Robin Mueller	a190d99f6d	auto-formatter	2023-02-22 19:45:41 +01:00
Robin Mueller	0466622a16	tweaks for ACS scheduling	2023-02-22 18:07:15 +01:00
Robin Mueller	90c1d45f20	correction for prefix handling on Q7S	2023-02-22 18:06:34 +01:00
Jakob Meier	28f3b07c5c	removed global config handler	2023-02-22 15:57:24 +01:00
Robin Mueller	ee811371c5	make EM build work	2023-02-22 15:28:24 +01:00
Jakob Meier	3137ebb86e	com subsystem complete	2023-02-22 13:02:40 +01:00
Jakob Meier	c64a490324	Merge branch 'develop' into meier/com-ss	2023-02-22 07:17:02 +01:00
Jakob Meier	62cadd16ab	missing constructor call in LocalParameterHandler	2023-02-22 07:15:19 +01:00
Jakob Meier	41adaf36bf	Merge branch 'develop' into meier/pdec-config-persistent	2023-02-21 15:34:16 +01:00
Jakob Meier	7dae81c122	added local parameter handler	2023-02-21 14:13:46 +01:00
Robin Mueller	6ca210ac31	Merge remote-tracking branch 'origin/develop' into mueller/pus-15-tm-storage	2023-02-21 11:14:56 +01:00
Robin Mueller	a91e6b7dfe	Merge remote-tracking branch 'origin/develop' into refactor_imtq_handling	2023-02-21 10:45:51 +01:00
Robin Mueller	586966bebe	prep v1.28.1 for em	2023-02-21 00:51:18 +01:00
Robin Mueller	ea6b13d189	priority adaptions for ACS	2023-02-20 19:08:04 +01:00
Jakob Meier	6074e9246e	merged develop	2023-02-20 14:34:57 +01:00
Robin Mueller	b1d56eb299	most important features working	2023-02-19 12:25:26 +01:00
Robin Mueller	eb6a0c410f	Merge remote-tracking branch 'origin/develop' into mueller/pus-15-tm-storage	2023-02-17 13:18:23 +01:00
Robin Mueller	fdebddb965	fix shadowing warnings	2023-02-17 12:19:53 +01:00
Robin Mueller	12c5a10662	Merge remote-tracking branch 'origin/develop' into mueller/pus-15-tm-storage	2023-02-17 11:20:40 +01:00
Robin Mueller	9d59f960a4	continue testing	2023-02-16 19:51:30 +01:00
Robin Mueller	fb3359b44f	remove obsolete code	2023-02-16 18:03:46 +01:00
Robin Mueller	cfad85c6c5	fixed some bugs	2023-02-16 17:57:21 +01:00
Robin Mueller	c29d7e6f3e	no bugs	2023-02-16 16:54:58 +01:00
Robin Mueller	feb59d321c	done and bugfree	2023-02-16 16:08:17 +01:00
Robin Mueller	8b0eceb072	continue rw refactoring	2023-02-15 17:02:22 +01:00
Jakob Meier	e7123a4bb1	fixed merge conflicts	2023-02-15 10:29:34 +01:00
Robin Mueller	166fd77f7b	stupid RW	2023-02-14 18:41:43 +01:00
Robin Mueller	075bba242b	Merge remote-tracking branch 'origin/develop' into mueller/pus-15-tm-storage	2023-02-14 17:45:30 +01:00
Robin Mueller	ecb22bdd85	further cut down the number of threads	2023-02-14 11:32:03 +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	4ba0d36800	Merge remote-tracking branch 'origin/develop' into make_satsyste_work_on_em	2023-02-13 18:01:20 +01:00
meggert	6a1d4bd52f	continue	2023-02-13 18:01:16 +01:00
Robin Mueller	17fa9a6e82	add TCS board assy for EM	2023-02-13 17:04:04 +01:00
meggert	2813d229bb	comntinue	2023-02-13 16:39:26 +01:00
Robin Mueller	6c0234149e	compile fixes	2023-02-13 16:19:14 +01:00
Robin Mueller	efbb5d69c7	remove removed task start	2023-02-13 15:44:19 +01:00
Robin Mueller	b4d9ea6c19	lets see if this fixes issues	2023-02-13 15:37:42 +01:00
Robin Mueller	97a001a1da	continue satsytem for EM	2023-02-13 13:53:13 +01:00
Robin Mueller	59a0a74032	start adding assy components for EM	2023-02-13 11:49:26 +01:00
Jakob Meier	60c99fdbfb	local parameter handler wip	2023-02-13 11:28:27 +01:00
Robin Mueller	b5e096abcb	start work on EM satsystem	2023-02-13 10:40:39 +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
Robin Mueller	4b36313fea	update config files	2023-02-12 21:34:55 +01:00
Robin Mueller	2f2d164526	this is crap but might just work	2023-02-12 21:27:10 +01:00
Robin Mueller	6521e419eb	issues with SPI..	2023-02-12 21:07:33 +01:00
Robin Mueller	e94af34ef0	some more tests to avoid SPI issue	2023-02-12 20:41:20 +01:00
Robin Mueller	f5b5ef66b7	some tweaks for SPI, some fixes	2023-02-12 20:01:20 +01:00
Robin Mueller	84a4d093bc	schedule new EIVE system	2023-02-10 18:07:44 +01:00
Robin Mueller	bd455b750c	small fix in SD card manager	2023-02-10 14:09:39 +01:00
Robin Mueller	37b786898e	prep v1.26.4	2023-02-10 14:02:27 +01:00
Robin Mueller	29eda50e35	EM compiles	2023-02-09 17:23:30 +01:00
Robin Mueller	7eab7169f7	Merge remote-tracking branch 'origin/develop' into heater_handling	2023-02-08 21:17:33 +01:00
Robin Mueller	7ec8ca3356	updates	2023-02-08 20:40:53 +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
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	b1da4bb81b	remove doubly scheduled ACS CTRL	2023-02-08 14:33:48 +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	02f0349525	done	2023-02-08 11:53:20 +01:00
Robin Mueller	37988fbfd4	complete impl	2023-02-08 11:17:08 +01:00
Robin Mueller	c170bff720	add release checklist	2023-02-08 11:08:38 +01:00
Robin Mueller	835d2277d8	impl variable freq depending on build type	2023-02-07 17:54:56 +01:00
Robin Mueller	6829c16ced	that seems to do the trick	2023-02-07 17:50:44 +01:00
Robin Mueller	8bc71b268e	some tests with subsystem	2023-02-07 17:28:59 +01:00
Robin Mueller	568954e9e0	Merge remote-tracking branch 'origin/develop' into mueller/pus-15-tm-storage	2023-02-07 10:55:09 +01:00
Robin Mueller	b6022d2ff1	should be covered by PST now	2023-02-07 10:34:09 +01:00
Robin Mueller	b1ea53ef1e	Merge remote-tracking branch 'origin/develop' into acs_update_scheduling	2023-02-07 10:31:40 +01:00
Robin Mueller	86babcf07b	important fix	2023-02-06 18:23:04 +01:00
Robin Mueller	4d6215f546	fixes for scheduling	2023-02-06 10:20:22 +01:00
Robin Mueller	10378ef1bb	bugfix for GPS handler	2023-02-05 13:13:09 +01:00
Robin Mueller	e4a227359b	some bugfixes, syrlinks needs to remain in PST cause of some bug	2023-02-03 15:02:08 +01:00
Robin Mueller	e46b4c51d5	Merge remote-tracking branch 'origin/develop' into heater_handling	2023-02-03 11:47:16 +01:00
Robin Mueller	c2fb224fea	ACS Update scheduling	2023-02-02 17:06:26 +01:00
Jakob Meier	fc1dedeb7a	moved transmitter timer and event handling of carrier and bitlock to ComSubsystem	2023-02-02 15:33:04 +01:00
Robin Mueller	c63ca66f68	done	2023-01-28 14:49:28 +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 Mueller	4707581c41	update generated files, COM subsystem first tests	2023-01-27 15:57:18 +01:00
Robin Mueller	9ad34aa395	schedule COM subsystem	2023-01-27 15:19:09 +01:00
Robin Mueller	9b211e1de7	do COM SS interconnect	2023-01-27 15:10:26 +01:00
Robin Mueller	438f9f3358	com subsystem	2023-01-27 14:44:40 +01:00
Robin Mueller	9410902454	go to startup immediately	2023-01-26 13:02:29 +01:00
Robin Mueller	d432443545	Merge remote-tracking branch 'origin/develop' into heater_handling	2023-01-25 14:07:48 +01:00
Robin Mueller	ae6f6538d2	add syrlinks submode handling	2023-01-24 19:40:27 +01:00
Robin Mueller	1f08d85319	rename syrlinks handler	2023-01-24 19:11:17 +01:00
Robin Mueller	a761b3f83c	Merge remote-tracking branch 'origin/develop' into mueller/pus-15-tm-storage	2023-01-23 14:22:05 +01:00
Robin Mueller	fe80ff4070	move some config and tweak queue sizes	2023-01-23 11:52:46 +01:00
Robin Mueller	aa4f0b4eea	tested TCS subsystem	2023-01-23 11:31:15 +01:00
Robin Mueller	4b396884c6	Merge remote-tracking branch 'origin/develop' into heater_handling	2023-01-20 14:25:44 +01:00
Robin Müller	17a1d8145c	Merge branch 'develop' into sus0-sus6-fix	2023-01-19 16:34:50 +01:00
Marius Eggert	879e6fa758	swapped SUS0 and SUS6 in ObjectFactory	2023-01-19 11:54:48 +01:00
Robin Mueller	3682a22021	add handling for correct range setting	2023-01-18 13:43:28 +01:00
Robin Mueller	5e7a088da9	try to understand the thermal stuff	2023-01-17 15:45:54 +01:00
Robin Mueller	6e4d3393ba	Merge remote-tracking branch 'origin/develop' into heater_handling	2023-01-17 15:37:57 +01:00
Robin Mueller	9e9aa71e9b	this works	2023-01-13 13:14:11 +01:00
Robin Mueller	3f079b415d	small tweaks	2023-01-13 11:59:11 +01:00
Robin Mueller	4ebf73bd03	include missing type	2023-01-13 11:44:16 +01:00
Robin Mueller	83361a5e16	add init boot delay handling in OBSW	2023-01-13 11:43:44 +01:00
Robin Mueller	bc169d50b9	Merge remote-tracking branch 'origin/develop' into heater_handling	2023-01-13 11:26:07 +01:00
Robin Mueller	25c59aa187	Merge remote-tracking branch 'origin/develop' into mueller/pus-15-tm-storage	2023-01-11 09:18:15 +01:00
Robin Mueller	6503778cd5	various bugfixes	2023-01-10 14:17:55 +01:00
Robin Müller	88dcba7966	Merge branch 'develop' into mueller_5v_stack_cmd_for_devices	2023-01-10 10:56:19 +01:00
Jakob Meier	d51904de2d	disabled damaged PL PCDU1 TMP1075	2023-01-09 11:57:48 +01:00
Robin Mueller	73df54abb0	Merge remote-tracking branch 'origin/develop' into heater_handling	2022-12-22 16:22:53 +01:00
Robin Mueller	268233551d	use stack handler in PL PCDU component	2022-12-22 11:10:55 +01:00
Robin Mueller	9aedc32527	disable rad sensor auto-on	2022-12-22 11:00:04 +01:00
Robin Mueller	b75102f670	add 5V stack handler	2022-12-21 14:11:31 +01:00
Robin Mueller	c83a6a44c6	actually use those defines	2022-12-20 11:45:46 +01:00
Robin Mueller	de3b2cefb0	reinitiate reboot file disabled	2022-12-20 11:45:21 +01:00
Robin Mueller	3965c08bfb	add misc store	2022-12-13 14:19:43 +01:00
Robin Mueller	141a3e9be8	Merge remote-tracking branch 'origin/develop' into heater_handling	2022-12-02 18:05:55 +01:00
Robin Mueller	1c4e9c8db6	Merge remote-tracking branch 'origin/develop' into mueller_consecutive_tmtc_server	2022-12-02 16:39:45 +01:00
Robin Mueller	d36202d86b	Merge remote-tracking branch 'origin/develop' into heater_handling	2022-12-02 16:24:19 +01:00
Robin Mueller	c6c2469487	allow consecutive tcp and udp server	2022-12-02 13:55:19 +01:00
Robin Mueller	266e1a8527	Merge remote-tracking branch 'origin/develop' into heater_handling	2022-12-01 16:40:18 +01:00
Robin Mueller	fb2325b9ea	Merge remote-tracking branch 'origin/develop' into acs-ctrl-v1	2022-12-01 15:57:09 +01:00
Robin Mueller	f73d293cdd	schedule PL task	2022-11-30 18:08:16 +01:00
Robin Mueller	ffbf7df557	rename ploc supv and i2c dev symlinks	2022-11-29 11:05:19 +01:00
Robin Mueller	d81ae3c35f	include fix	2022-11-28 11:46:06 +01:00
Robin Mueller	46165f8166	Merge remote-tracking branch 'origin/develop' into heater_handling	2022-11-28 08:49:00 +01:00
Robin Mueller	a20dce5a87	cmakelists fix, bump fsfw	2022-11-28 08:48:19 +01:00
Robin Mueller	23f12d2fd1	Merge remote-tracking branch 'origin/develop' into heater_handling	2022-11-25 11:04:46 +01:00
Robin Mueller	f771fefbc9	rename scheduling file	2022-11-25 11:04:33 +01:00
Robin Mueller	44aae18311	q7s compiles again	2022-11-25 11:01:06 +01:00
Robin Mueller	35cd18240c	generic scheduler function	2022-11-25 10:37:10 +01:00
Robin Mueller	697e27f876	scex working	2022-11-21 14:16:21 +01:00
Robin Mueller	0a5b79b8cd	extend power switch handling	2022-11-21 14:01:31 +01:00
Marius Eggert	f3ac6d4a7e	added GPS and RW sensor readings. added RW1..4 dummies to acsTask	2022-11-21 11:18:39 +01:00
Robin Mueller	3ef0b3ea6d	TAS PLOC SUPV	2022-11-16 15:03:10 +01:00
Robin Mueller	7d7efaca42	improve hosted SW	2022-11-15 16:44:07 +01:00
Robin Mueller	2f0f837534	Merge remote-tracking branch 'origin/develop' into mueller/tas_ploc_supv_update	2022-11-15 13:42:22 +01:00
Robin Mueller	d51c088afd	there is only one tmp1075 left	2022-11-14 09:16:17 +01:00
Robin Mueller	a855920fb2	README update, I2C addr update	2022-11-14 09:12:15 +01:00
Robin Mueller	1a17770bbc	all TMP1075 dev except the OBC IF board one working	2022-11-11 18:52:12 +01:00
Robin Mueller	6261296a0a	there is an issue..	2022-11-11 17:01:19 +01:00
Robin Mueller	0815380044	create all available TMP devices	2022-11-11 16:24:44 +01:00
Robin Mueller	7921acefd4	Merge remote-tracking branch 'origin/develop' into mueller/tmp_dev_updates	2022-11-11 15:50:23 +01:00
Robin Mueller	a21e938f36	renamed cookie as well	2022-11-11 11:41:40 +01:00
Robin Mueller	7ce24ef392	update TMP1075 dev handlers	2022-11-11 11:12:43 +01:00
Robin Mueller	a07a55eac1	Merge remote-tracking branch 'origin/develop' into mueller/tas_ploc_supv_update	2022-11-10 18:14:53 +01:00
Robin Mueller	ceba3b9dca	renaming of fsfw_hal components	2022-11-10 18:07:59 +01:00
Robin Mueller	02df949a48	this seems to work	2022-11-10 17:42:19 +01:00
Robin Mueller	ec7ce5ddb6	ploc components now compile for hosted (linux)	2022-11-10 17:32:11 +01:00
Robin Mueller	d690a54005	connect payload children to subsystem	2022-11-10 15:39:08 +01:00
Robin Mueller	07d93b6b67	schedule PL components differently	2022-11-10 14:08:44 +01:00
Robin Mueller	47b65a1fa3	create cam switcher, create new PL task	2022-11-10 13:09:31 +01:00
Robin Mueller	cb49ec1c7e	Merge remote-tracking branch 'origin/develop' into mueller/pl-ss	2022-11-09 15:15:57 +01:00
Robin Mueller	ea6fd8c952	smaller fixes and improvements	2022-11-09 13:07:20 +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
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
Irini Kosmidou	071e00e0ef	dog fixed	2022-09-27 19:17:24 +02:00
ikosmidou	aab2dc6367	Merge branch 'develop' into scex-additions	2022-09-27 19:14:40 +02:00
Irini Kosmidou	32c2b2038c	constructor correction	2022-09-27 19:06:55 +02:00
Irini Kosmidou	308a855d8c	bugfix for scex testcode	2022-09-27 18:54:48 +02:00
Irini Kosmidou	a1cc5b0ca7	Merge remote-tracking branch 'origin/develop' into irini	2022-09-27 17:36:19 +02:00
Robin Mueller	2b41b3ee26	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-09-27 14:57:01 +02:00
Robin Mueller	3c746e954b	updates on same image are problematic..	2022-09-27 14:29:39 +02:00
Robin Mueller	ff243fa46c	some bugfixes	2022-09-27 12:19:42 +02:00
Robin Mueller	51976730aa	important bugfix	2022-09-27 11:14:54 +02:00
Robin Mueller	caca7f5da8	small bugfix	2022-09-27 10:55:00 +02:00
Robin Mueller	8c0fd8d9e2	some informative docs	2022-09-27 10:51:56 +02:00
Robin Mueller	90962c9f8e	rudimentary SD commanding interface	2022-09-27 10:51:07 +02:00
Robin Mueller	2614239fe4	this should work for the same chip/copy as well	2022-09-27 09:27:40 +02:00
Robin Mueller	d87baa8da9	successfull SW update	2022-09-26 23:17:12 +02:00
Robin Mueller	9d440838e9	set correct owner for SW update procedure	2022-09-26 18:40:31 +02:00
Robin Mueller	8161d1cd88	finished update cmd impl	2022-09-26 12:26:08 +02:00
Robin Mueller	eb0ace3bc6	continuing SW update impl	2022-09-26 12:00:57 +02:00
Robin Mueller	b3275d015f	start update handler impl	2022-09-26 11:50:35 +02:00
Robin Mueller	05adc91f94	moved definitions	2022-09-26 11:39:17 +02:00
Robin Mueller	7d824f5448	updated helper scripts	2022-09-26 11:31:29 +02:00
Robin Mueller	ec91d9977a	move shell scripts helpers to root	2022-09-26 11:20:03 +02:00
Robin Mueller	80f0664139	added some more fixed file names	2022-09-26 11:15:37 +02:00
Robin Mueller	65a7d38f54	adaptions for update sequence	2022-09-26 11:12:41 +02:00
Robin Mueller	15641c61ea	these commands make more sense	2022-09-26 10:56:57 +02:00
Robin Mueller	0fc639cc11	added action IDs for new commands	2022-09-16 18:48:05 +02:00
Robin Mueller	8aa412e865	add CFDP APID to TCP parse list	2022-09-16 18:10:23 +02:00
Robin Mueller	9411b740ae	CFDP integration almost complete	2022-09-16 17:28:43 +02:00
Robin Mueller	54f73661fc	fix init error	2022-09-16 14:01:54 +02:00
Robin Mueller	65f4daf305	move config define	2022-09-16 12:35:10 +02:00
Robin Mueller	68039d5d4a	clean up config code	2022-09-16 12:28:39 +02:00
Robin Mueller	0b43c3137f	add new constants for CFDP, clean up	2022-09-16 12:22:46 +02:00
Robin Mueller	6b48fb64d8	start integrating cfdp code	2022-09-16 12:14:27 +02:00
Robin Mueller	547fcf22dd	add very basic test in Q7S Test task for FS helpers	2022-09-16 12:05:50 +02:00
Robin Mueller	26216eca88	new fs helper module	2022-09-16 11:53:33 +02:00
Robin Mueller	38f435d1ae	update for new FSFW code	2022-09-16 11:43:11 +02:00
Robin Mueller	9ad649e43e	ACS controller running in EM SW withour errors now	2022-09-15 13:40:57 +02:00
Robin Mueller	8a6a69d230	update EM code	2022-09-15 13:15:39 +02:00
Robin Mueller	8ebc62cbe6	new ACS preproc defines	2022-09-15 13:03:22 +02:00
Robin Mueller	2261ccb304	create ACS controller in EM sw	2022-09-15 11:40:10 +02:00
Robin Mueller	57331380c3	small fix for ACS task	2022-09-15 11:38:29 +02:00
Robin Mueller	fb3214fef9	swap order	2022-09-12 17:25:20 +02:00
Robin Mueller	4649a75d40	update to new API	2022-09-12 17:23:43 +02:00
Robin Mueller	31b3de784b	stuff	2022-09-12 17:00:49 +02:00
Robin Mueller	86d3732f65	retval replacements	2022-08-29 15:57:26 +02:00
Robin Mueller	aa86bc722f	retval corrections	2022-08-29 15:56:18 +02:00
Robin Mueller	3ad7a35f0e	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-08-29 15:53:57 +02:00
Robin Mueller	975f202ddb	Merge remote-tracking branch 'origin/develop' into mueller/pl-ss	2022-08-29 15:50:55 +02:00
Robin Mueller	aa0da618ca	Merge remote-tracking branch 'origin/develop' into irini	2022-08-29 15:49:23 +02:00
Robin Mueller	3b2794735b	disable test	2022-08-27 15:54:52 +02:00
Robin Mueller	8c110460a6	added test to retrieve pdu config	2022-08-26 14:28:06 +02:00
Robin Mueller	0f553e3431	Merge remote-tracking branch 'origin/develop' into mueller/update-p60-module-code	2022-08-26 13:45:53 +02:00
Robin Mueller	a7482b657a	changed all table parsing to use gom space API	2022-08-26 13:42:58 +02:00
Robin Mueller	efb0bce718	finally it works	2022-08-26 03:20:44 +02:00
Robin Mueller	d098ed6403	gomspace lib working	2022-08-26 00:39:06 +02:00
Robin Mueller	7a1dbf8456	add gom space client code	2022-08-25 23:22:17 +02:00
Robin Mueller	447c4d5c88	all retval replacements	2022-08-24 17:27:47 +02:00
Robin Mueller	bddaf120f4	Merge remote-tracking branch 'origin/develop' into irini	2022-08-24 16:54:39 +02:00
Robin Mueller	a134f3f100	Merge remote-tracking branch 'origin/develop' into irini	2022-08-16 18:52:16 +02:00
Robin Mueller	6ead94b5f4	this is even better	2022-08-16 17:49:50 +02:00
Robin Mueller	7e3517d309	it compiles again	2022-08-15 18:34:26 +02:00
Robin Mueller	c99cb4a81e	schedule ACS controller	2022-08-15 09:58:18 +02:00
Robin Mueller	4649c97205	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-08-08 17:12:12 +02:00
Robin Mueller	bd40af34c8	Merge branch 'develop' into irini	2022-08-08 17:10:57 +02:00
Robin Mueller	89b3b2ff42	Merge remote-tracking branch 'origin/develop' into mueller/pl-ss	2022-08-08 17:08:56 +02:00
Robin Mueller	722d7a67f5	important bugfix for FM SW	2022-08-04 01:45:49 +02:00
Robin Mueller	8b39f65472	modify oss to append at end	2022-07-13 11:25:53 +02:00
Robin Mueller	563e13765d	Merge remote-tracking branch 'origin/develop' into irini	2022-07-08 16:27:50 +02:00
Robin Mueller	b133a0538c	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-07-04 10:47:23 +02:00
Robin Mueller	9e89a0689f	Merge remote-tracking branch 'origin/develop' into mueller/pl-ss	2022-07-04 10:46:47 +02:00
meierj	d78155fd79	remove ccsds components from em object factory	2022-06-27 14:56:46 +02:00
meierj	a2e7c6cca6	moved ccsds object creation back to core object factory and run auto formatter	2022-06-27 10:58:46 +02:00
meierj	95da2372c9	run generators	2022-06-27 09:15:29 +02:00
Jakob Meier	ed0eb4fe9c	adaptions for setup with ccsds testbed	2022-06-23 20:12:56 +02:00
Jakob Meier	89757c447c	run auto-formatter	2022-06-17 08:31:36 +02:00
Jakob Meier	1ebae7f938	fixes for te0720 build	2022-06-08 07:16:12 +02:00
Jakob Meier	8c850614e5	fixed merge conflicts	2022-06-05 10:54:46 +02:00
Jakob Meier	52d94f44d4	device temeprature set	2022-06-01 10:48:18 +02:00
Cleanroom Laptop L15	593cc68b84	rtd dataset	2022-05-31 16:44:57 +02:00
Cleanroom Laptop L15	0e6d2354fc	thermal set fix	2022-05-30 14:32:50 +02:00
Jakob Meier	8106722a08	replaced EM preprocessor define	2022-05-27 16:24:41 +02:00
Robin Müller	4632a56346	Merge branch 'develop' into mueller/acs-ss-init	2022-05-27 15:28:41 +02:00
Robin Müller	10a82eca25	Merge branch 'develop' into mueller/pl-ss	2022-05-27 15:28:23 +02:00
Jakob Meier	9e93f1c814	adaptions for EM	2022-05-27 13:44:40 +02:00
Robin Müller	6f9d3c2f63	Merge branch 'develop' into meier/SdCardManager	2022-05-26 12:15:14 +02:00
Robin Mueller	1f616a101d	add scex preproc define to OBSWConfig.h.in	2022-05-26 12:10:56 +02:00
Robin Mueller	97db44e500	fix raspberry pi build	2022-05-26 11:46:28 +02:00
Jakob Meier	c588ec4a1a	bugfix SdCardManager	2022-05-26 01:56:19 +02:00
Robin Mueller	5b0f1efefd	Merge remote-tracking branch 'origin/develop' into mueller/pl-ss	2022-05-25 15:48:00 +02:00
Robin Mueller	95121b5120	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-05-25 15:47:21 +02:00
Jakob.Meier	ad679a810e	Merge pull request 'add and schedule PUS11' (#259) from mueller/add-schedule-pus-11 into develop ... Reviewed-on: #259 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-05-25 15:21:25 +02:00
Robin Mueller	bb1e1d80cc	resolve merge conflict	2022-05-25 11:00:18 +02:00
Robin Mueller	01bac87afb	update reset pin handling	2022-05-25 10:59:20 +02:00
Robin Mueller	5d2a70b6c6	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-05-25 10:28:06 +02:00
Robin Müller	ffdd6bbc3c	Merge branch 'develop' into mueller/add-schedule-pus-11	2022-05-25 10:27:36 +02:00
Robin Mueller	c86e000f09	Update PL SS	2022-05-25 10:25:40 +02:00
Robin Mueller	e537080166	Merge branch 'mueller/acs-ss-init' into mueller/pl-ss	2022-05-25 10:14:09 +02:00
Robin Mueller	83c7ec8067	solve merge conflicts	2022-05-25 10:12:37 +02:00
Robin Mueller	581423a40e	Merge branch 'mueller/acs-ss-init' into mueller/pl-ss	2022-05-25 10:09:24 +02:00
Robin Mueller	e1ed532f91	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-05-25 10:01:53 +02:00
Robin Mueller	3eca96fef5	Merge remote-tracking branch 'origin/develop' into mueller/core-controller-remount-sd-handling	2022-05-25 09:58:06 +02:00
Robin Mueller	43fc1ab780	Merge remote-tracking branch 'origin/develop' into mueller/add-schedule-pus-11	2022-05-25 09:57:34 +02:00
Robin Mueller	3fff3ba21e	add and schedule PUS11	2022-05-24 15:21:37 +02:00
Robin Mueller	633fe00cd6	run afmt, minor improvements	2022-05-24 01:14:04 +02:00
Robin Mueller	f7075a1397	Merge remote-tracking branch 'origin/develop' into mueller/reboot-cmd	2022-05-24 00:54:39 +02:00
Robin Mueller	2ebdb5c797	tweak sd card check countdown	2022-05-24 00:53:29 +02:00
Robin Mueller	1519b13b78	appears to work now	2022-05-24 00:52:08 +02:00
Robin Mueller	b2c286cd7e	improve and optimize SD card handling	2022-05-24 00:20:23 +02:00
Robin Müller	e9908139e7	Merge branch 'develop' into mueller/core-controller-remount-sd-handling	2022-05-23 18:37:50 +02:00
Robin Mueller	7d9ef6f887	run afmt	2022-05-23 18:37:04 +02:00
Robin Müller	dc6fa57c03	Merge branch 'develop' into mueller/core-controller-remount-sd-handling	2022-05-20 08:20:13 +02:00
Robin Mueller	49a06772d2	Merge remote-tracking branch 'origin/develop' into mueller/rtds-update	2022-05-20 08:18:57 +02:00
Robin Mueller	a63e87f5f4	subscribe for periodic core ctrl packet	2022-05-19 18:46:49 +02:00
Robin Mueller	e73bfc2c64	dev string for FM/EM	2022-05-19 16:00:26 +02:00
Robin Mueller	d274f5647d	fix EM cofig	2022-05-19 15:28:02 +02:00
Robin Mueller	377f762ca5	fixed for new SPI HAL API	2022-05-19 14:54:44 +02:00
Robin Mueller	e49a1af9b7	bump fsfw	2022-05-18 14:51:33 +02:00
Robin Mueller	28a4f782f9	Merge remote-tracking branch 'origin/develop' into mueller/rtds-update	2022-05-17 17:55:25 +02:00
Robin Mueller	8a5090b8ee	apply new auto-formatter on all files	2022-05-17 13:40:19 +02:00
Robin Mueller	7080758c67	Merge remote-tracking branch 'origin/develop' into mueller/core-controller-remount-sd-handling	2022-05-16 15:18:55 +02:00
Robin Mueller	2fa1061c65	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-05-16 15:11:24 +02:00
Robin Mueller	036024db7e	perm loop not necessary anymore	2022-05-14 17:22:57 +02:00
Robin Mueller	f20fcd9a72	Merge remote-tracking branch 'origin/develop' into mueller/rtds-update	2022-05-14 17:07:27 +02:00
Robin Mueller	017cfb9d56	a lot of fixes, but some stuff doesnt work..	2022-05-14 17:04:51 +02:00
Robin Mueller	478975db26	spi setup more stable now	2022-05-14 11:34:25 +02:00
Robin Mueller	1c9f411e75	new RTD handler working	2022-05-14 09:41:28 +02:00
Robin Mueller	e81ddaa1a5	added auto-shutdown for faulty heaters	2022-05-12 20:44:36 +02:00
Robin Mueller	e25c492aa4	create and schedule health PUS service	2022-05-12 19:22:20 +02:00
Robin Mueller	82f75bde97	fix for heater creation call	2022-05-12 19:12:12 +02:00
Jakob Meier	919141ae10	ccsds handler sending command to enable transmitter	2022-05-12 18:32:19 +02:00
Robin Mueller	d7316eff66	remove merge conflict markers	2022-05-12 14:23:10 +02:00
Robin Mueller	51466e68d7	Merge remote-tracking branch 'origin/develop' into mueller/heater-health-if	2022-05-12 14:11:46 +02:00
Robin Mueller	dd67191044	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-05-12 14:02:15 +02:00
Robin Mueller	c1faf65409	schedule new rtd reader component	2022-05-12 12:35:05 +02:00
Robin Mueller	382d93863f	create and pass correct comIF	2022-05-12 12:21:47 +02:00
Jakob Meier	e5710784b9	Merge branch 'develop' into meier/ccsds	2022-05-12 07:47:28 +02:00
Robin Mueller	c1992f59d6	Merge remote-tracking branch 'origin/develop' into mueller/reboot-cmd	2022-05-11 17:04:19 +02:00
Robin Mueller	5a82fe93d9	core ctrl remount sd handling	2022-05-11 17:02:57 +02:00
Robin Müller	1d1f04f57b	Merge branch 'develop' into mueller/reboot-cmd	2022-05-11 15:48:34 +02:00
Robin Mueller	625abcfd5b	important bugfixes	2022-05-11 15:45:38 +02:00
Robin Mueller	c043375ae3	RW Refactoring ... - FSFW update: SPI device is part of ComIF now - Only set RW mode (speed is set a side effect but not necessary) once - Release SPI bus in the 70 ms delay duration	2022-05-11 11:13:00 +02:00
Robin Mueller	91b69eacf6	A lot of stuff ... - refactored and simplified RW assemblies - create separate SPI Com IF for RWs - Update .cproject file: Fixed to decrease indexer parsing times	2022-05-11 01:48:26 +02:00
Robin Mueller	df7e0007d0	schedule RW ASS	2022-05-11 01:02:29 +02:00
Robin Mueller	8ccd55dd06	update .cproject file	2022-05-11 00:58:19 +02:00
Robin Mueller	4e78ee85c8	continued rw ass creation	2022-05-11 00:54:29 +02:00
Robin Mueller	db7dcc7e32	start creating rw ass in obj factory	2022-05-10 18:39:23 +02:00
Robin Mueller	45c1ac0f61	update	2022-05-10 18:34:39 +02:00
Jakob Meier	907b8f4a5d	ccsds config for te0720-1cfa	2022-05-10 07:48:36 +02:00
Robin Mueller	4864394590	renamed heaters	2022-05-09 16:13:33 +02:00
Robin Mueller	71d9553f90	Merge remote-tracking branch 'origin/develop' into mueller/rw-ass	2022-05-08 13:11:56 +02:00
Robin Mueller	d9085e81a1	Merge remote-tracking branch 'origin/develop' into mueller/heater-health-if	2022-05-08 13:06:47 +02:00
Jakob Meier	421237bfb7	fixed ploc supervisor build error which was hidden by prerocessor define	2022-05-08 12:01:35 +02:00
Jakob Meier	2bc2325b1f	removed unused includes	2022-05-07 13:59:53 +02:00
Jakob Meier	f8addd9365	preprocessor define fixes	2022-05-07 13:38:09 +02:00
Jakob Meier	43b0ed4b04	preprocessor define adjustments	2022-05-06 20:33:46 +02:00
Jakob Meier	322db3d617	removed ploc updater	2022-05-06 19:52:43 +02:00
Jakob Meier	6dd57a3f5e	fixed merge conflicts	2022-05-06 19:44:18 +02:00
Robin Müller	99a8cd0f2d	Merge branch 'develop' into mueller/reboot-cmd	2022-05-06 10:11:58 +02:00
Robin Mueller	355ca27d31	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-05-06 08:58:31 +02:00
Robin Mueller	b426475ca4	better RTD names	2022-05-05 16:55:08 +02:00
Robin Mueller	cf4edac604	maybe this fixes the timing issue?	2022-05-05 16:32:09 +02:00
Robin Mueller	4c809e354d	better heater obj id names	2022-05-05 16:23:46 +02:00
Robin Mueller	1f6aab8124	apply afmt, some more renaming	2022-05-05 13:40:43 +02:00
Robin Mueller	28c9e33d1c	separate PST for RWs	2022-05-05 02:00:56 +02:00
Robin Mueller	d108f7bbda	Merge remote-tracking branch 'origin/develop' into mueller/reboot-cmd	2022-05-04 16:54:39 +02:00
Robin Mueller	3458c272ad	Merge remote-tracking branch 'origin/develop' into mueller/rw-ass	2022-05-04 16:47:49 +02:00
Robin Mueller	1508a1e147	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-05-04 16:43:31 +02:00
Robin Mueller	a6c6325d41	Merge remote-tracking branch 'origin/develop' into mueller/pl-ss	2022-05-04 16:41:08 +02:00
Robin Mueller	d0e18f8b35	add mutex protections for switcher states	2022-05-04 11:11:29 +02:00
Robin Mueller	ae0120f3ef	Merge branch 'mueller/refactoring-conf-handling' into mueller/heater-health-if	2022-05-03 17:44:02 +02:00
Robin Mueller	e8e3138fba	Merge remote-tracking branch 'origin/develop' into mueller/pl-ss	2022-05-03 16:05:01 +02:00
Robin Mueller	3b40e622fe	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-05-03 16:02:45 +02:00
Robin Mueller	06df558be0	Merge remote-tracking branch 'origin/develop' into mueller/rw-ass	2022-05-03 16:01:09 +02:00
Robin Mueller	88842d4f07	Merge remote-tracking branch 'origin/develop' into mueller/heater-health-if	2022-05-03 15:59:28 +02:00
Robin Mueller	08046ef621	Merge remote-tracking branch 'origin/develop' into mueller/refactoring-conf-handling	2022-05-03 15:57:01 +02:00
Robin Mueller	f435f7217e	move RW loading opt to CMakeLists.txt	2022-05-03 11:54:48 +02:00
Robin Mueller	ac0b2e0dce	update object factory files	2022-05-03 11:53:10 +02:00
Robin Mueller	51bcdafe33	renaming	2022-05-03 11:39:49 +02:00
Robin Mueller	c131c685a4	fix test task	2022-05-03 11:39:12 +02:00
Robin Mueller	cce0d5448d	support both SHM and socket read	2022-05-03 00:55:01 +02:00
Robin Mueller	0f4fe7694b	Merge remote-tracking branch 'origin/develop' into mueller/refactoring-conf-handling	2022-05-03 00:01:55 +02:00
Robin Mueller	9449919b2b	Heaters are own objects with HealthIF now	2022-05-02 22:45:27 +02:00
Robin Mueller	b98c691c2b	added health helper to heater handler	2022-05-02 17:51:00 +02:00
Robin Mueller	238afbaa8b	add health IF to heater handler	2022-05-02 17:37:00 +02:00
Robin Mueller	0e97c4ad9a	Merge branch 'mueller/acs-ss-init' into mueller/pl-ss	2022-05-02 12:55:15 +02:00
Robin Mueller	7db0872ee3	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-05-02 12:49:53 +02:00
Robin Mueller	bab8412f10	Merge remote-tracking branch 'origin/develop' into mueller/rw-ass	2022-05-02 12:41:45 +02:00
Jakob Meier	be752997eb	fixed merge conflicts	2022-04-30 19:12:21 +02:00
Jakob Meier	20138d52b1	decreased stack size of supervisor helper task	2022-04-30 16:23:51 +02:00
Jakob Meier	6d322c6e78	run clang format script	2022-04-30 16:21:59 +02:00
Jakob Meier	016ca8cb7e	decreased acs handler task stack size	2022-04-30 16:20:33 +02:00
Jakob Meier	729b8f547c	time file writing commended in again	2022-04-30 16:19:00 +02:00