346 Commits

Author	SHA1	Message	Date
Robin Mueller	b426475ca4	better RTD names	2022-05-05 16:55:08 +02:00
Robin Mueller	a232b9bf98	assign better sus names	2022-05-05 16:46:04 +02:00
Robin Mueller	4c809e354d	better heater obj id names	2022-05-05 16:23:46 +02:00
Robin Mueller	95a634ea7f	update .cproject file	2022-05-05 01:33:18 +02:00
Robin Mueller	bcb6df87b0	update tmtc, gen files and formatting in config file	2022-05-05 00:47:50 +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	1536a0f94b	named heaters	2022-05-03 18:17:10 +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	0f4fe7694b	Merge remote-tracking branch 'origin/develop' into mueller/refactoring-conf-handling	2022-05-03 00:01:55 +02:00
Robin Mueller	1f8a68dabe	re-use existing enum	2022-05-02 22:55:39 +02:00
Robin Mueller	9449919b2b	Heaters are own objects with HealthIF now	2022-05-02 22:45:27 +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
Jakob Meier	be752997eb	fixed merge conflicts	2022-04-30 19:12:21 +02:00
Robin Mueller	c1248dd4e1	building new EM config	2022-04-29 15:47:54 +02:00
Irini Kosmidou	f2cb43a52f	scexDataHandler	2022-04-29 15:46:16 +02:00
Robin Mueller	cb47667d01	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-04-28 17:56:33 +02:00
Robin Mueller	f01f63d8e8	Merge remote-tracking branch 'origin/develop' into mueller/gomspace-fdir	2022-04-28 17:55:40 +02:00
Robin Mueller	7e2a993211	create rudimentary syrlinks fdir	2022-04-28 15:25:03 +02:00
Jakob Meier	582d2db05f	fixed conflicts	2022-04-28 14:29:23 +02:00
Robin Mueller	2b33d8772c	fixes most warnings for host build	2022-04-26 10:37:25 +02:00
Robin Mueller	0697cca88a	started acs subsystem	2022-04-25 13:36:11 +02:00
Robin Mueller	c262d1ef90	Merge remote-tracking branch 'origin/develop' into mueller/hand-written-subsystem	2022-04-23 12:21:04 +02:00
Jakob.Meier	9fe2de5244	Merge pull request 'CMake git describe support' (#226) from mueller/cmake-git-describe-support into develop ... Reviewed-on: #226 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-04-22 20:03:34 +02:00
Robin Mueller	a0db5dcc7c	add first mode sequence for acs ss	2022-04-22 17:00:23 +02:00
Robin Mueller	8bd7d00ab1	forgot to bump version	2022-04-22 16:15:04 +02:00
Robin Mueller	a416ca406b	git describe support finished	2022-04-22 14:09:08 +02:00
Jakob Meier	1ce45acba3	merged develop	2022-04-17 14:52:43 +02:00
Jakob Meier	7b54855397	supervisor fixes detected during testing	2022-04-16 17:19:32 +02:00
Jakob Meier	10343a0dab	supervisor event buffer request	2022-04-14 07:52:21 +02:00
Jakob Meier	a807aab97e	fsfw update	2022-04-13 12:01:39 +02:00
Robin Mueller	8a0999851f	update for new fsfw API ... - Apply auto-formatter	2022-04-11 14:56:20 +02:00
Robin Mueller	f05922e19e	Merge remote-tracking branch 'origin/develop' into mueller/split-pdu1-pdu2-sets	2022-04-11 08:55:25 +02:00
Jakob Meier	b440fc3df6	ploc update	2022-04-10 18:46:39 +02:00
Robin Mueller	90e8d7ecaf	Merge remote-tracking branch 'origin/develop' into mueller/pcdu-hk-core-sets	2022-04-08 14:15:58 +02:00
Robin Mueller	59d58da4f2	splitting pdu1 and pdu2 sets done	2022-04-07 19:48:09 +02:00
Robin Mueller	796b814b49	Add time file handling	2022-04-07 17:23:50 +02:00
Robin Mueller	64b3afae22	new event for battery mode: broadcast and changed	2022-04-07 13:07:28 +02:00
Jakob Meier	c0fd9aee6f	update helper wip	2022-04-07 11:00:07 +02:00
Robin Mueller	b5363604bc	Merge remote-tracking branch 'origin/develop' into mueller/plpcdu-refactoring	2022-03-29 15:40:02 +02:00
Cleanroom Laptop L15	50b8bca6b7	duplicated id	2022-03-28 17:37:02 +02:00
Robin Mueller	0c889f9492	Merge remote-tracking branch 'origin/develop' into mueller/plpcdu-refactoring	2022-03-28 10:33:49 +02:00
Jakob Meier	758c4e6f4f	uart isolator switch handling	2022-03-28 09:08:11 +02:00
Jakob Meier	44a0d4af61	removed te0720 code form q7s files	2022-03-27 10:56:40 +02:00
Jakob Meier	ceb7f40d35	fixed merge conflicts	2022-03-27 10:44:32 +02:00
Robin Mueller	ac0326a944	various improvements	2022-03-26 13:54:05 +01:00
Jakob Meier	47a3804145	fixed conflicts	2022-03-26 10:41:30 +01:00
Cleanroom Laptop L590	0ff84b31ef	longer timeout for mode service	2022-03-25 18:39:21 +01:00
Robin Mueller	f88a063d83	change to more generic type	2022-03-25 16:01:44 +01:00
Cleanroom Laptop L590	c8c2e543a1	update project file, new definitions file	2022-03-25 12:44:43 +01:00
Robin Mueller	9c6f349a08	add children lost mode event	2022-03-22 20:40:30 +01:00
Robin Mueller	14d9efce1f	continued tcs board assembly	2022-03-22 18:48:03 +01:00
Robin Mueller	bcd97076e1	started TCS subsystem	2022-03-22 11:57:48 +01:00
Jakob Meier	78b3f28188	restructured flash write command	2022-03-22 11:35:44 +01:00
Jakob Meier	bbed4a3b6e	e-band control commands	2022-03-21 16:21:51 +01:00
Jakob Meier	8d70560968	fixed conflicts	2022-03-17 19:52:37 +01:00
Robin Mueller	acd0307591	continued ACS board + SUS board assemblies ... - Handling and Testing of basic FDIR	2022-03-17 19:23:39 +01:00
Jakob Meier	9dc124004d	build configuration for trenz te0720-1cfa	2022-03-17 14:28:32 +01:00
Robin Mueller	40d9829700	Major update for power handling ... and various smaller updates	2022-03-16 20:13:21 +01:00
Jakob Meier	b0b2854d44	added ploc helper objects	2022-03-16 17:00:07 +01:00
Jakob Meier	9fc1e57943	fixed conflicts	2022-03-14 14:35:07 +01:00
Robin Mueller	3cfb58d681	started integrating new base obj into sus assembly	2022-03-10 11:02:07 +01:00
Robin Mueller	29f0c5b8f6	Merge branch 'mueller/hotfixes' into mueller/system-subsystems	2022-03-08 12:03:05 +01:00
Robin Mueller	15151e0400	bump revision	2022-03-08 11:59:06 +01:00
Robin Mueller	b9c1523e81	bump version	2022-03-08 10:28:07 +01:00
Robin Mueller	a73710088d	bump minor version	2022-03-08 10:25:47 +01:00
Robin Mueller	39c47a1abf	Merge branch 'mueller/additional-gcc-warnings' into mueller/system-subsystems	2022-03-08 09:44:38 +01:00
Robin Mueller	6ccf16f56d	enabled more GCC warnings	2022-03-08 09:37:23 +01:00
Robin Mueller	a2fee43c8c	Merge remote-tracking branch 'origin/develop' into mueller/system-subsystems	2022-03-07 15:44:18 +01:00
Robin Mueller	2ef1befb9c	common gpioIds.h file	2022-03-07 15:29:27 +01:00
Robin Mueller	f83153934c	command init switch state	2022-03-07 14:46:46 +01:00
Robin Mueller	970b8c33e5	Merge remote-tracking branch 'origin/develop' into mueller/system-subsystems	2022-03-07 11:35:28 +01:00
Robin Mueller	4eb948c5ef	start acs task	2022-03-04 16:03:57 +01:00
Robin Mueller	7f42de1c82	added PL PCDU code	2022-03-04 15:26:36 +01:00
Robin Mueller	120153e9c7	added some missing acs board ass code	2022-03-04 00:55:51 +01:00
Robin Mueller	63c4095d4d	Merge remote-tracking branch 'origin/develop' into mueller/system-subsystems	2022-03-03 15:50:31 +01:00
Robin Mueller	ff0da65662	started SUS assembly ... fixes for PCDU code and switcher list handling	2022-03-03 15:37:36 +01:00
Ulrich Mohr	182b90ee6d	small fixes	2022-03-02 17:04:58 +01:00
Robin Mueller	ba68c80d6b	Merge remote-tracking branch 'origin/develop' into mueller/reboot-file-handling	2022-02-28 13:29:22 +01:00
Jakob Meier	e61dfc0401	fixed conflicts	2022-02-25 14:39:18 +01:00
Robin Mueller	3a6c7e3183	separate branch for reboot file handling	2022-02-25 11:34:42 +01:00
Robin Mueller	9f60c82725	intermediate PR	2022-02-23 19:26:02 +01:00
Robin Mueller	ee53485d4e	update dev conf	2022-02-22 20:44:23 +01:00
Ulrich Mohr	91e0e9f233	Merge branch 'develop' into mohr/startracker ... Conflicts: CMakeLists.txt cmake/PreProjectConfig.cmake linux/fsfwconfig/events/translateEvents.cpp	2022-02-16 15:21:24 +01:00
Ulrich Mohr	50cf01376f	Merge branch 'develop' into mohr/cmake	2022-02-10 16:22:28 +01:00
Ulrich Mohr	4d154b7cee	reworked cmake, unfortunately a big one due to interdependence ... - /mission is a library now, in preparation of unittests (which bring their own main) - eive-simple is now only available in bsp=arm/q7s (but is still not compiling) - watchdog and simple are their own executables, not configurations any more - moved some q7s specific code into /bsp-q7s to flatten if-hierarchy in main CMakeLists.txt - compiler and linker options are not globally applied to all targets - linux is the default fsfw osal now, as current code does not compile on hosted	2022-02-09 21:38:56 +01:00
Jakob Meier	bb8ccd2842	fixed conflicts	2022-02-05 16:17:01 +01:00
Jakob Meier	e67bcd4e26	setup egse project	2022-02-05 13:19:20 +01:00
Robin Mueller	988a5e6b31	battery handler not created	2022-02-02 17:36:40 +01:00
Jakob Meier	c1726f897b	dynamic switching of cadu data sample time and clock manipulation	2022-01-30 17:16:17 +01:00
Jakob Meier	102385a707	introduced axi configuration interface for ptme ip core	2022-01-25 18:55:52 +01:00
Jakob Meier	38a1b496e7	papb interface no longer a system object	2022-01-25 14:33:06 +01:00
Jakob Meier	a56224c339	ptme axi interface	2022-01-24 07:43:14 +01:00
Robin Mueller	969251d9fa	new ACS ctrl task	2022-01-17 11:38:21 +01:00
Jakob Meier	45c7f9555d	flash write wip	2022-01-07 09:50:04 +01:00
Jakob Meier	996a8a226e	flash write wip	2022-01-06 18:05:21 +01:00
Jakob Meier	305e63cf4e	mpsoc flash fopen command	2022-01-05 11:26:01 +01:00
Jakob Meier	e26ffb6afd	fpga download image command	2021-12-29 20:33:20 +01:00
Jakob Meier	421866b739	str write command fix	2021-12-21 17:28:24 +01:00
Jakob Meier	36d33711a7	flash write command	2021-12-21 15:46:09 +01:00
Jakob Meier	e3841d180e	merged develop	2021-12-19 12:15:18 +01:00
Jakob Meier	5067519b8a	fixed merge conflicts	2021-12-14 19:57:35 +01:00
Robin Mueller	5fadb8f86d	moved heater handler	2021-12-14 17:35:21 +01:00
Jakob Meier	fac6996a15	star tracker limits setting	2021-12-06 19:36:21 +01:00
Jakob Meier	a7ab2bb93a	str img loader wip	2021-12-02 08:05:33 +01:00
Jakob Meier	8c649b3e70	str image loader wip	2021-11-30 16:01:02 +01:00
Jakob Meier	077913400f	star tracker image helper	2021-11-29 11:04:56 +01:00
Robin Mueller	1886c69e0b	Merge remote-tracking branch 'origin/develop' into mueller/master	2021-11-25 13:55:40 +01:00
Jakob Meier	b4479d6a7d	ccsds handler class id	2021-11-24 18:29:34 +01:00
Robin Müller	0f3e9de2b0	Merge branch 'develop' into meier/pdec	2021-11-09 23:01:20 +01:00
Jakob Meier	556a3986c1	pdec handler	2021-11-01 12:41:20 +01:00
Jakob Meier	b71ac25a77	changed spi of of RTDs	2021-10-29 19:15:14 +02:00
Robin Mueller	46dcc18ddb	updated constants	2021-10-18 18:23:26 +02:00
Robin Mueller	9ddea586ea	updated build scripts	2021-10-18 18:15:39 +02:00
Robin Mueller	0237a22ae9	using old names again	2021-10-13 15:42:55 +02:00
Robin Mueller	7c673d6e7f	bugfixes in max31685, indexing adapted	2021-10-12 17:55:36 +02:00
Robin Mueller	221012f790	hosted build compiling again	2021-10-11 19:34:34 +02:00
Jakob Meier	c5c7a895a4	fixed merge conflicts	2021-10-08 11:40:46 +02:00
Jakob Meier	18f7d3e3c9	tm now sent over PTME	2021-10-07 17:23:41 +02:00
Jakob Meier	7f70673625	Merge branch 'develop' into meier/ptme	2021-10-04 15:07:58 +02:00
Robin Mueller	f61d0e83f0	refactoring for added unittests	2021-09-29 10:52:36 +02:00
Robin Mueller	5b6f091859	function in namespace now	2021-09-28 17:43:18 +02:00
Robin Mueller	6a00fd3099	fsfw update and call fix	2021-09-28 17:41:02 +02:00
Robin Mueller	e5d0dac65e	tcpip components refactoring	2021-09-28 14:58:12 +02:00
Robin Mueller	04d791824d	class IDs and subsystem IDs moved to framework	2021-09-26 22:46:10 +02:00
Jakob Meier	5b26564058	ptme ip core packet insertion	2021-09-26 08:29:30 +02:00
Jakob Meier	773627dc3d	fixed merge conflicts	2021-09-25 11:57:33 +02:00
Robin Mueller	ebb575d490	updated subversion	2021-09-23 17:22:30 +02:00
Robin Mueller	0ccf062d51	transition delays	2021-09-23 15:20:55 +02:00
Jakob Meier	d54e2276d6	ccsds handler wip	2021-09-22 16:54:55 +02:00
Robin Mueller	da45326150	bumped SW subversion	2021-09-22 09:22:06 +02:00
Jakob Meier	e2c26efe4a	Merge branch 'meier/gpioNaming' into meier/ptme	2021-09-20 19:11:22 +02:00
Jakob Meier	ddd8ff2180	ptme handling wip	2021-09-19 12:27:48 +02:00
Robin Mueller	00bafd98fe	obsw config, gps update	2021-09-16 17:24:34 +02:00
Robin Mueller	bdd5a7dd21	more storage for events	2021-09-15 18:50:23 +02:00
Robin Mueller	ed6ee02861	Merge remote-tracking branch 'origin/develop' into mueller/gnss-acs-update	2021-09-06 11:12:14 +02:00
Robin Mueller	74e4415d58	updated busConf file	2021-09-02 20:04:41 +02:00
Jakob.Meier	0f79864446	ploc memory dumper complete	2021-08-31 11:20:21 +02:00
Jakob.Meier	89b68940be	ploc memory dumper wip	2021-08-29 07:31:34 +02:00
Robin Mueller	23782dc2fa	Device update ... 1. Sun sensors added but can be disabled with preprocessor defines 2. GPS Handler	2021-08-20 14:08:11 +02:00
IRS Cleanroom Laptop	2f72b4e42a	cleaned up	2021-08-17 19:50:48 +02:00
IRS Cleanroom Laptop	e98b985d66	cleaning up preproc defines	2021-08-17 17:48:51 +02:00
IRS Cleanroom Laptop	aa248b7997	new busConf file, cleaning up	2021-08-17 17:11:59 +02:00
Robin Mueller	d714f84df8	bumped revision	2021-08-09 18:30:20 +02:00
Robin Mueller	e92af98f34	moved q7s specific code to q7s folder	2021-08-09 17:19:10 +02:00
Robin Mueller	3b915f4c97	Merge remote-tracking branch 'origin/develop' into mueller/master	2021-08-09 16:45:32 +02:00
Robin Mueller	1d714ff85e	Moved PLOC components to q7s folder	2021-08-09 16:30:59 +02:00
Robin Mueller	6871cc597a	Merge remote-tracking branch 'origin/develop' into mueller/version-bump	2021-08-09 14:29:47 +02:00
Robin Mueller	f5f8df61ae	bumped subversion	2021-08-09 11:27:08 +02:00
Jakob.Meier	dc3dfa1292	ploc updater	2021-08-08 15:02:59 +02:00
Jakob.Meier	f64356d75e	ploc udpater wip	2021-08-05 16:37:39 +02:00
Jakob.Meier	0315a2a3d5	merged develop	2021-08-04 13:22:44 +02:00
Jakob.Meier	c431deede0	ploc udpdater wip	2021-08-04 10:20:36 +02:00
Robin Mueller	9790b395e6	include replacements	2021-08-03 15:58:01 +02:00
Robin Mueller	3cc3786505	TCP default now, bugfixes in CoreController	2021-08-03 15:29:45 +02:00
Robin Mueller	009234612a	updated retval list	2021-08-02 12:50:36 +02:00
Robin Mueller	292bfaad16	readme extended	2021-07-26 14:23:22 +02:00
Robin Mueller	261fc8b58f	moved config flag to cmmon config	2021-07-26 13:51:00 +02:00
Robin Mueller	be6ae6b7ae	added TCP support	2021-07-26 11:33:38 +02:00
Robin Mueller	2554afd503	Merge remote-tracking branch 'origin/develop' into mueller/master	2021-07-24 15:13:56 +02:00
Robin Mueller	6d48f70269	all versions written to version.txt file now	2021-07-24 15:00:07 +02:00
Robin Mueller	8f070cdb44	subversion change	2021-07-23 18:31:53 +02:00
Jakob.Meier	a2e62b28c3	fixed merge conflicts	2021-07-23 17:48:11 +02:00
Jakob.Meier	80665a3cc5	fixed merge conflicts	2021-07-23 14:36:15 +02:00
Robin Mueller	20e8fc3400	cleaned up code a bit	2021-07-19 12:44:43 +02:00
Robin Mueller	b3dfbcf7fe	removed fsfw_hal	2021-07-15 19:06:57 +02:00
Jakob.Meier	ea2260a61d	few commands implemented for the ploc supervisor	2021-07-13 08:32:14 +02:00
Robin Mueller	55ada72a8f	bumped subversion	2021-07-09 17:55:09 +02:00
Jakob.Meier	4148a8c0bd	StarTrackerHandler wip	2021-07-07 12:12:01 +02:00
Jakob.Meier	4a6cb9fa2f	fixed object id merge conflicts	2021-06-25 12:15:59 +02:00
Jakob.Meier	b7ca1606f7	fixed merge conflicts	2021-06-24 18:01:09 +02:00
Robin Mueller	675cd29df3	added assembly index	2021-06-24 17:52:09 +02:00
Robin Mueller	a167b53096	moved some object ids	2021-06-24 16:49:36 +02:00
Robin Mueller	cd395aa9c4	updated object IDs again	2021-06-24 16:43:15 +02:00
Robin Mueller	32c23ae2de	update dev handler IDs	2021-06-24 16:39:46 +02:00
Robin Mueller	fe65099b58	added bus descriptors	2021-06-24 16:36:42 +02:00
Robin Mueller	ed0aafa543	updated object IDs	2021-06-24 16:17:38 +02:00
Martin Zietz	8284ebec9f	rw wip	2021-06-24 12:04:36 +02:00
Robin Mueller	56cabbc117	split up psts	2021-06-23 15:18:31 +02:00
Jakob.Meier	33a55d7114	RwHandler first commands	2021-06-21 09:50:26 +02:00
Jakob.Meier	61f3a3e1c6	fixed merge conflicts	2021-06-11 14:55:28 +02:00
Robin Mueller	ab8aaba0f4	using configuration files now	2021-06-08 17:04:28 +02:00
Jakob.Meier	5144968ba5	added self test, untested	2021-06-04 16:45:54 +02:00
Robin Mueller	9f10f0a923	smaller corrections	2021-05-28 18:39:14 +02:00
Jakob.Meier	6fa9b65345	compile failure	2021-05-27 14:04:33 +02:00
Robin Mueller	d075495628	added core controller stub	2021-05-26 14:16:16 +02:00
Robin Mueller	fbac40e9cd	test pst	2021-05-24 01:20:44 +02:00
Robin Mueller	d9abf60db1	fix for hosted bsp	2021-05-18 16:17:51 +02:00
Robin Mueller	bd5badb90d	updated all auto-generated files	2021-05-18 16:14:11 +02:00
Robin Mueller	3dca311baa	generated event translation files	2021-05-17 19:39:35 +02:00
Robin Mueller	2a0fcc49e0	bumped OBSW version	2021-05-17 17:07:34 +02:00
Robin Mueller	6f9a1853ff	host compiling again	2021-05-17 16:37:29 +02:00
Robin Mueller	41de3d1f00	common config files	2021-05-17 16:22:51 +02:00
Robin Mueller	3de0c72073	common versioning file	2021-04-11 12:25:23 +02:00
Jakob.Meier	4291df77b1	moved some files	2021-03-04 18:29:28 +01:00