2708 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Robin Mueller	cce0d5448d	support both SHM and socket read	2022-05-03 00:55:01 +02:00
Robin Mueller	ef4f713883	bump submodules	2022-05-03 00:02:16 +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 Müller	7aa900e6d5	Merge branch 'develop' into mueller/update-q7s-cp-script	2022-05-02 23:59:31 +02:00
Robin Mueller	c1d754d8ff	gps improvements	2022-05-02 23:52:53 +02:00
Robin Mueller	10d0bf1550	mini fix	2022-05-02 23:51:39 +02:00
Robin Müller	a54d89c90f	Merge branch 'develop' into mueller/rw-ass	2022-05-02 15:55:41 +02:00
Robin Müller	9dc382706a	Merge pull request 'Bugfix PCDU Handler' (#235) from meier/pcduhandler-bugfix into develop ... Reviewed-on: #235	2022-05-02 15:51:54 +02:00
Jakob Meier	2f90c3e937	removed debug print	2022-05-02 13:51:56 +02:00
Jakob Meier	5f6a8fa37d	bugfix pcdu handler command queue reading	2022-05-02 13:50:44 +02:00
Robin Mueller	eb6b166662	bump fsfw	2022-05-02 12:56:42 +02:00
Robin Mueller	3a52540d0e	bump tmtc	2022-05-02 12:53:43 +02:00
Robin Mueller	bab8412f10	Merge remote-tracking branch 'origin/develop' into mueller/rw-ass	2022-05-02 12:41:45 +02:00
Robin Mueller	9e2eca3e36	re-generate event list	2022-05-02 12:41:20 +02:00
Jakob.Meier	2f3d60e974	Merge pull request 'Syrlinks FDIR' (#232) from mueller/syrlinks-fdir into develop ... Reviewed-on: #232 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-04-30 19:03:16 +02:00
Robin Mueller	c1fb7ce0df	update fsfw submodule	2022-04-30 16:38:43 +02:00
Robin Mueller	e919d3b7ef	delete ETL submodule	2022-04-30 16:36:45 +02:00
Jakob Meier	52bfcd7039	tmtc update	2022-04-30 15:55:45 +02:00
Cleanroom Laptop L15	3d817363e6	fixed conflicts	2022-04-29 18:26:20 +02:00
Jakob.Meier	7e36edc41c	Merge pull request 'GOMSPACE Power components FDIR' (#233) from mueller/gomspace-fdir into develop ... Reviewed-on: #233 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-04-29 18:24:18 +02:00
Robin Mueller	074e2d8517	update cp script	2022-04-29 16:05:40 +02:00
Robin Mueller	c1248dd4e1	building new EM config	2022-04-29 15:47:54 +02:00
Robin Mueller	0b64999ce2	added generic GPIO checker	2022-04-28 18:38:38 +02:00
Robin Mueller	73fbdfeb25	remove etl::pair usage	2022-04-28 18:27:40 +02:00
Robin Mueller	31fa2f0d8d	include fix	2022-04-28 18:27:13 +02:00
Robin Mueller	1527b60fd6	Merge remote-tracking branch 'origin/develop' into mueller/rw-ass	2022-04-28 18:26:34 +02:00
Robin Mueller	3a03d6ca55	update CHANGELOG	2022-04-28 17:56:06 +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	e16f5e68d6	update changelog	2022-04-28 17:54:47 +02:00
Robin Mueller	517aaf2146	Merge remote-tracking branch 'origin/develop' into mueller/syrlinks-fdir	2022-04-28 17:54:07 +02:00
Jakob.Meier	bbe1e996e6	Merge pull request 'Host Fixes and CMakeLists.txt update' (#229) from mueller/host-fixes-fsfw-update into develop ... Reviewed-on: #229 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-04-28 17:16:03 +02:00
Jakob.Meier	6d326137fb	Merge pull request 'OBSW Config in file update' (#225) from mueller/obsw-config-infile-update into develop ... Reviewed-on: #225 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-04-28 17:15:37 +02:00
Jakob.Meier	b40ceafbe0	Merge pull request 'disable -Wformat-truncation error' (#223) from mueller/disable-warning-in-csp-lib into develop ... Reviewed-on: #223 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-04-28 17:15:06 +02:00
Jakob.Meier	a9e106bb71	Merge pull request 'Update README' (#222) from mueller/update-README into develop ... Reviewed-on: #222 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-04-28 17:14:42 +02:00
Jakob.Meier	199acec3b5	Merge pull request 'Improvement for PCDU Handler' (#221) from mueller/minor-tweaks-pcdu-handler into develop ... Reviewed-on: #221 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-04-28 17:14:09 +02:00
Robin Mueller	d0b7531e48	create and assign gomspace power fdir	2022-04-28 15:58:31 +02:00
Robin Mueller	b97604d7d2	override event confirmed as well	2022-04-28 15:36:56 +02:00
Robin Mueller	7e230b64ea	create and add syrlinks fdir	2022-04-28 15:29:57 +02:00
Robin Mueller	7e2a993211	create rudimentary syrlinks fdir	2022-04-28 15:25:03 +02:00
Robin Mueller	4f72fb355c	update fsfwgen	2022-04-28 13:08:44 +02:00
Robin Mueller	ca1365df5b	Merge remote-tracking branch 'origin/develop' into mueller/rw-ass	2022-04-28 13:08:34 +02:00
Robin Mueller	ab85ebf83e	update CHANGELOG	2022-04-28 11:37:06 +02:00
Robin Mueller	b40302210f	Merge remote-tracking branch 'origin/develop' into mueller/update-README	2022-04-28 11:33:54 +02:00
Robin Mueller	713bfbd7dc	Merge remote-tracking branch 'origin/develop' into mueller/minor-tweaks-pcdu-handler	2022-04-28 11:33:35 +02:00
Robin Müller	40168bcd5f	Merge branch 'develop' into mueller/disable-warning-in-csp-lib	2022-04-28 11:33:13 +02:00
Robin Mueller	9ce7a28cff	Merge remote-tracking branch 'origin/develop' into mueller/obsw-config-infile-update	2022-04-28 11:32:59 +02:00
Robin Mueller	9bb6c41134	Merge branch 'mueller/host-fixes-fsfw-update' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into mueller/host-fixes-fsfw-update	2022-04-28 11:32:15 +02:00
Robin Mueller	e836ed8a2d	Merge remote-tracking branch 'origin/develop' into mueller/host-fixes-fsfw-update	2022-04-28 11:31:50 +02:00
Jakob.Meier	a45f298505	Merge pull request 'GPSD test' (#230) from mueller/gps-test into develop ... Reviewed-on: #230 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-04-28 11:12:52 +02:00
Robin Mueller	234a6b7ac3	switch gps ctrl to socket API	2022-04-28 10:50:39 +02:00