413 Commits

Author	SHA1	Message	Date
Robin Mueller	fd1d53aa23	Merge remote-tracking branch 'origin/develop' into scex-additions	2022-10-10 10:18:29 +02:00
Robin Mueller	50d41215fa	Merge remote-tracking branch 'origin/develop' into mueller/em-sw-updates	2022-10-10 10:15:55 +02:00
Robin Mueller	aa56c26e25	Merge remote-tracking branch 'origin/develop' into petri_dev	2022-09-29 13:45: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	1463963532	unittest builds now	2022-09-29 13:20:05 +02:00
Robin Mueller	269de1782a	Merge branch 'mueller/obsw-update-cmds' into mueller/acs-ss-init	2022-09-27 19:26:23 +02:00
Robin Mueller	8161d1cd88	finished update cmd impl	2022-09-26 12:26:08 +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	8aa412e865	add CFDP APID to TCP parse list	2022-09-16 18:10:23 +02:00
Robin Mueller	2f18347430	move object ID definition	2022-09-16 15:12:32 +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	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	bddaf120f4	Merge remote-tracking branch 'origin/develop' into irini	2022-08-24 16:54:39 +02:00
Robin Mueller	7455514797	it compiles now	2022-08-17 09:05:58 +02:00
Robin Mueller	a134f3f100	Merge remote-tracking branch 'origin/develop' into irini	2022-08-16 18:52:16 +02:00
Robin Mueller	b81218e2d4	Merge branch 'mueller/tmtc-stack-refactoring' into petri_dev	2022-08-16 18:48:10 +02:00
Robin Mueller	8ecf04f005	Merge remote-tracking branch 'origin/develop' into petri_dev	2022-08-16 18:48:06 +02:00
Robin Mueller	a669137d5c	Merge remote-tracking branch 'origin/develop' into mueller/tmtc-stack-refactoring	2022-08-16 17:39:35 +02:00
Robin Mueller	676b94b139	map dataset to sid	2022-08-16 11:56:17 +02:00
Robin Mueller	0c371623c6	change PLOC/MPSOC code to using new SP code	2022-08-15 17:25:16 +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	89b3b2ff42	Merge remote-tracking branch 'origin/develop' into mueller/pl-ss	2022-08-08 17:08:56 +02:00
Robin Mueller	2c3c05e2d4	Merge remote-tracking branch 'origin/develop' into petri_dev	2022-07-14 17:31:08 +02:00
petriVM18	84c4f47ed1	Removed obsolete stuff	2022-07-13 09:26:22 +02:00
Robin Mueller	563e13765d	Merge remote-tracking branch 'origin/develop' into irini	2022-07-08 16:27:50 +02:00
petriVM18	c4b8fa5444	Merged from development, added unit test for config file handler, removed obsolete stuff from handler	2022-07-05 10:02:43 +02:00
Robin Mueller	76a217ffc2	bump changelog and version	2022-07-05 02:14:32 +02:00
Robin Mueller	62f725beea	bump changelog and version	2022-07-04 11:13:26 +02:00
Irini Kosmidou	005e548059	comntinued scex handler	2022-06-21 16:44:14 +02:00
petriVM18	7cd048b03f	Added events for failure of config file handler functions	2022-06-08 09:18:17 +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
Robin Mueller	9f42ac9875	Merge branch 'mueller/scex-additions' into irini	2022-05-26 12:08:18 +02:00
Robin Mueller	a1faa3a73c	Merge remote-tracking branch 'origin/develop' into irini	2022-05-26 12:08:07 +02:00
Robin Mueller	1276cc2dc6	scex additions	2022-05-26 12:04:27 +02:00
Robin Mueller	97db44e500	fix raspberry pi build	2022-05-26 11:46:28 +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
Robin Mueller	c86e000f09	Update PL SS	2022-05-25 10:25:40 +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	c0da8aef2e	delete obsolete folder	2022-05-24 15:50:39 +02:00
Robin Mueller	3fff3ba21e	add and schedule PUS11	2022-05-24 15:21:37 +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	2fa1061c65	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-05-16 15:11:24 +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	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	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	646925c571	removed redundant SUS OBJ ID defs	2022-05-08 13:08:49 +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	6dd57a3f5e	fixed merge conflicts	2022-05-06 19:44:18 +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	22060b9b16	Merge remote-tracking branch 'origin/develop' into mueller/rw-ass	2022-05-06 01:12:07 +02:00
Robin Mueller	68938c3b42	remove duplicate object ID	2022-05-05 20:27:20 +02:00
Robin Mueller	a11a8c493d	Merge remote-tracking branch 'origin/develop' into mueller/heater-health-if	2022-05-05 19:53:18 +02:00
Robin Mueller	0c82d06ec4	Merge remote-tracking branch 'origin/develop' into mueller/rename-sus	2022-05-05 19:41:36 +02:00
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