2705 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Robin Mueller	95a634ea7f	update .cproject file	2022-05-05 01:33:18 +02:00
Robin Müller	3a0cf0cb38	Merge branch 'develop' into mueller/rw-ass	2022-05-05 00:51:30 +02:00
Robin Mueller	79d48d9630	Merge remote-tracking branch 'origin/develop' into mueller/rw-ass	2022-05-04 17:25:11 +02:00
Robin Müller	4589b3b696	Merge pull request 'v1.11.0' (#243) from develop into main ... Reviewed-on: #243	2022-05-04 17:19:56 +02:00
Robin Müller	0271b4970c	Merge branch 'main' into develop	2022-05-04 17:13:09 +02:00
Robin Mueller	4db35e8641	bump tmtc submodule	2022-05-04 17:08:25 +02:00
Robin Mueller	3458c272ad	Merge remote-tracking branch 'origin/develop' into mueller/rw-ass	2022-05-04 16:47:49 +02:00
Jakob.Meier	8315a03efc	Merge pull request 'Building new EM config' (#238) from mueller/refactoring-conf-handling into develop ... Reviewed-on: #238 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-05-04 15:08:18 +02:00
Robin Mueller	2cf1da5478	Merge remote-tracking branch 'origin/develop' into mueller/refactoring-conf-handling	2022-05-04 14:51:55 +02:00
Robin Mueller	e06f459333	changelog correction	2022-05-04 14:43:27 +02:00
Robin Mueller	535da53093	Merge remote-tracking branch 'origin/develop' into mueller/refactoring-conf-handling	2022-05-04 14:34:07 +02:00
Jakob.Meier	b10486052e	Merge pull request 'Update GPIO API' (#241) from mueller/update-gpio-api-without-em-split into develop ... Reviewed-on: #241 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-05-04 14:31:54 +02:00
Robin Mueller	bb2bd87541	repoint fsfw	2022-05-04 14:15:26 +02:00
Robin Mueller	afaeca7cf7	update changelog	2022-05-04 14:14:24 +02:00
Robin Mueller	86752417f2	changed for updated FSFW GPIO API	2022-05-04 14:14:17 +02:00
Robin Mueller	243d38f832	small form fix	2022-05-04 13:49:55 +02:00
Robin Mueller	79efc9de39	bump fsfw	2022-05-04 13:48:18 +02:00
Robin Mueller	0ad13a473e	avoid compiler warning	2022-05-03 17:36:15 +02:00
Robin Mueller	4d13743b7f	remove faulty line	2022-05-03 17:30:36 +02:00
Robin Mueller	79aac89f36	update build instructions	2022-05-03 17:27:39 +02:00
Robin Mueller	6dde823d4c	improve dependency handling (same as fsfw)	2022-05-03 17:17:48 +02:00
Robin Mueller	4a637e79c6	update lauch cfg host	2022-05-03 17:11:17 +02:00
Robin Mueller	42247620c0	updated host and linux scripts, fix host build	2022-05-03 17:08:48 +02:00
Robin Mueller	115d2dea88	bump fsfw	2022-05-03 16:43:37 +02:00
Robin Mueller	47f4aebd15	update auto-generated file	2022-05-03 16:32:57 +02:00
Robin Mueller	fbd9e65398	Merge remote-tracking branch 'origin/develop' into mueller/refactoring-conf-handling	2022-05-03 16:18:37 +02:00
Robin Mueller	f0270b91d9	added system folder here	2022-05-03 16:09:30 +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	08046ef621	Merge remote-tracking branch 'origin/develop' into mueller/refactoring-conf-handling	2022-05-03 15:57:01 +02:00
Jakob.Meier	a9cf5f9ae9	Merge pull request 'update cp script' (#237) from mueller/update-q7s-cp-script into develop ... Reviewed-on: #237 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-05-03 13:42:08 +02:00
Jakob.Meier	e088bec582	Merge pull request 'GPS controller update' (#239) from mueller/gps-tests into develop ... Reviewed-on: #239 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-05-03 13:41:30 +02:00
Robin Mueller	5a52155065	updated win helper scripts	2022-05-03 12:55:05 +02:00
Robin Mueller	8b4d56cc0d	changelog improvements	2022-05-03 12:51:34 +02:00
Robin Mueller	4fdeccc3a8	update CHANGELOG	2022-05-03 12:48:30 +02:00
Robin Mueller	0543f6b425	update README and helper scripts	2022-05-03 12:44:15 +02:00
Robin Mueller	fdf7f03242	moved build helpers to script folder	2022-05-03 12:35:03 +02:00
Robin Mueller	9a73637b5e	update .cproject file again	2022-05-03 12:33:51 +02:00
Robin Mueller	4035cb1fcb	update gitignore	2022-05-03 12:31:43 +02:00
Robin Mueller	0d37272feb	separate EM build folder	2022-05-03 12:29:44 +02:00
Robin Mueller	b2ec1773e4	reworked helper scripts, renamed q7s build dirs	2022-05-03 12:27:34 +02:00
Robin Mueller	4149b08f3a	update CHANGELOG	2022-05-03 11:56:25 +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	08d7b3b859	update changelog	2022-05-03 11:34:47 +02:00
Robin Mueller	456dac6afd	SHM and socket readout working now	2022-05-03 11:33:07 +02:00
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