3919 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Irini Kosmidou	68fdb68fe6	Merge branch 'irini' into scex-additions	2022-09-29 23:38:59 +02:00
Irini Kosmidou	612426ce3b	Merge branch 'scex-additions' into irini	2022-09-29 23:36:15 +02:00
Irini Kosmidou	9c07a26615	commets removed	2022-09-29 19:50:12 +02:00
Robin Mueller	6af7ccc6a2	need to fix all of these TODOs	2022-09-29 19:40:00 +02:00
Irini Kosmidou	43cda300e3	scex directory	2022-09-29 19:38:19 +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	82cb87abae	re-point fsfw	2022-09-29 17:47:09 +02:00
Robin Mueller	08c03520f5	bump tmtc	2022-09-29 17:41:50 +02:00
Robin Mueller	30dd6f1778	bump fsfw	2022-09-29 17:24:58 +02:00
Robin Mueller	3e5a717845	bump fsfw	2022-09-29 17:22: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 Müller	ee6d13abcc	Merge branch 'develop' into petri_dev	2022-09-29 14:21:08 +02:00
Robin Mueller	0f081e52bd	bump tmtc	2022-09-29 14:20:44 +02:00
Robin Mueller	660d42f615	Merge remote-tracking branch 'origin/develop' into scex-additions	2022-09-29 14:10:29 +02:00
Robin Mueller	541b44cea7	re-run afmt	2022-09-29 14:10:21 +02:00
Robin Mueller	b3f4eaa0f2	Merge remote-tracking branch 'origin/develop' into petri_dev	2022-09-29 14:09:33 +02:00
Robin Mueller	2ad93f7735	Merge remote-tracking branch 'origin/develop' into mueller/em-sw-updates	2022-09-29 14:09:02 +02:00
Robin Mueller	865ca46974	Merge remote-tracking branch 'origin/develop' into scex-additions	2022-09-29 14:08:22 +02:00
Robin Mueller	e161eeb537	re-run generators and bump dependencies	2022-09-29 14:06:46 +02:00
Robin Mueller	8a5248a46d	include fix	2022-09-29 14:03:09 +02:00
Robin Mueller	a215657f4e	small bugfix	2022-09-29 14:01:04 +02:00
Robin Mueller	92cf4580ca	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-09-29 13:57:39 +02:00
Robin Mueller	49efbc4725	some bugfixes	2022-09-29 13:53:42 +02:00
Robin Mueller	96497df7ba	bump tmtc	2022-09-29 13:49:39 +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
Jakob Meier	ffb9e5e03c	Merge pull request 'OBSW Update Commands' (#302) from mueller/obsw-update-cmds into develop ... Reviewed-on: #302 Reviewed-by: Jakob Meier <meierj@irs.uni-stuttgart.de>	2022-09-29 13:24:16 +02:00
Robin Mueller	fcef7e42a5	some unittest fixes	2022-09-29 13:23:55 +02:00
Robin Mueller	1463963532	unittest builds now	2022-09-29 13:20:05 +02:00
Robin Mueller	6bdc0b23de	bump fsfw and tmtc	2022-09-29 13:13:38 +02:00
Robin Mueller	b9f48a533a	Merge remote-tracking branch 'origin/develop' into scex-additions	2022-09-28 17:02:21 +02:00
Robin Mueller	97f02401fe	bugfix for SCEX code	2022-09-28 17:01:40 +02:00
Robin Mueller	02333d8267	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-09-28 10:13:53 +02:00
Robin Mueller	5d0c07467f	update changelog	2022-09-28 10:05:36 +02:00
Robin Mueller	103d53181c	Merge remote-tracking branch 'origin/develop' into mueller/obsw-update-cmds	2022-09-28 10:04:22 +02:00
Robin Mueller	c602d7bb28	clean up the dependency mess	2022-09-28 00:19:29 +02:00
Robin Mueller	0bae128536	bump fsfw again	2022-09-28 00:03:28 +02:00
Robin Mueller	e2b83f9222	update .cproject file	2022-09-28 00:02:03 +02:00
Robin Mueller	6888df5c44	afmt	2022-09-27 23:59:38 +02:00
Robin Mueller	0c75997ba0	now it compiles for windows again	2022-09-27 23:59:17 +02:00
Robin Mueller	1aa3cc3595	cant build GW SW of windows	2022-09-27 21:45:22 +02:00
Irini Kosmidou	26dc4ba56e	fixes for compilation	2022-09-27 19:38:35 +02:00
Irini Kosmidou	a04372ff55	Merge remote-tracking branch 'origin/develop' into petri_dev	2022-09-27 19:31:57 +02:00
Irini Kosmidou	f415adccc2	repoint fsfw	2022-09-27 19:30:42 +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	c7e06f8878	changelog update	2022-09-27 19:22:06 +02:00