v1.11.0 #243

Merged

muellerr merged 159 commits from develop into main 2022-05-04 17:19:57 +02:00

Conversation 0 Commits 159 Files Changed 144 +5431 -2306

159 Commits

Author	SHA1	Message	Date
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
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	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
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	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
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	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	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
Robin Mueller	584700a2ba	do not add ETL lib	2022-04-28 10:21:04 +02:00
Robin Mueller	a1c3b1786f	bump submodules	2022-04-28 10:07:42 +02:00
Robin Mueller	bed58a45e5	move catch2 load directive to bottom	2022-04-27 09:02:12 +02:00
Robin Mueller	5b2239cee6	repoint fsfw	2022-04-27 08:55:21 +02:00
Robin Mueller	b3f0d19bb9	CMakeLists.txt order fixes	2022-04-26 20:20:56 +02:00
Robin Mueller	00bbc86d39	update CMakeLists.txt file	2022-04-26 20:10:09 +02:00
Robin Mueller	49b3120ada	remove etl submodule , want to use the one provided by the fsfw	2022-04-26 11:15:35 +02:00
Robin Mueller	2b33d8772c	fixes most warnings for host build	2022-04-26 10:37:25 +02:00
Robin Mueller	ba2589c8d5	submodule updates	2022-04-23 12:30:49 +02:00
Robin Mueller	f421fd4dde	Merge remote-tracking branch 'origin/develop' into mueller/minor-tweaks-pcdu-handler	2022-04-23 12:30:45 +02:00
Robin Mueller	9ac5d0da67	submodule updates	2022-04-23 12:30:20 +02:00
Robin Mueller	c5ae12e10b	Merge remote-tracking branch 'origin/develop' into mueller/update-README	2022-04-23 12:30:11 +02:00
Robin Müller	25570cc631	Merge branch 'develop' into mueller/disable-warning-in-csp-lib	2022-04-23 12:29:51 +02:00
Robin Mueller	baf2e5fb39	submodule updates	2022-04-23 12:29:29 +02:00
Robin Mueller	957b067eac	Merge remote-tracking branch 'origin/develop' into mueller/obsw-config-infile-update	2022-04-23 12:28:51 +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	177b4305bb	Merge branch 'mueller/version-fix' into develop	2022-04-22 16:19:04 +02:00
Robin Mueller	417a6d8ea0	added missing character	2022-04-22 16:06:44 +02:00
Robin Mueller	17fd273d10	fix for toolchain file handling	2022-04-22 16:01:10 +02:00
Robin Mueller	772a829333	small improvement	2022-04-22 15:58:15 +02:00
Robin Müller	bf1f6887be	Merge branch 'develop' into mueller/minor-tweaks-pcdu-handler	2022-04-22 15:55:54 +02:00
Robin Müller	3c2092926e	Merge branch 'develop' into mueller/update-README	2022-04-22 15:55:44 +02:00
Robin Müller	f22644697e	Merge branch 'develop' into mueller/disable-warning-in-csp-lib	2022-04-22 15:55:35 +02:00
Robin Müller	48e0718b76	Merge branch 'develop' into mueller/obsw-config-infile-update	2022-04-22 15:55:12 +02:00
Robin Mueller	6f54129f60	Merge remote-tracking branch 'origin/develop' into mueller/cmake-git-describe-support	2022-04-22 15:54:42 +02:00
Robin Mueller	32f2cd60bb	Merge remote-tracking branch 'origin/main' into develop	2022-04-22 15:54:14 +02:00
Robin Mueller	0638c87f62	made version handling more robust	2022-04-22 15:47:47 +02:00
Robin Mueller	0f80501467	rename helpers file	2022-04-22 15:42:13 +02:00
Robin Mueller	a416ca406b	git describe support finished	2022-04-22 14:09:08 +02:00
Robin Mueller	aa84175382	pass power switcher for syrlinks handler creation	2022-04-22 11:29:19 +02:00
Robin Mueller	737d18135f	test flag for RW	2022-04-22 11:09:06 +02:00
Robin Mueller	0da74f1bf9	bump submodules, add some more devices by default	2022-04-22 11:08:27 +02:00
Robin Müller	85d8c2c471	Merge branch 'develop' into mueller/disable-warning-in-csp-lib	2022-04-22 11:01:34 +02:00
Robin Mueller	4a5ea4450f	update changelog	2022-04-22 10:59:43 +02:00
Robin Mueller	1485b14c7d	some more README updates	2022-04-22 10:55:52 +02:00
Robin Mueller	604d7ab228	Merge remote-tracking branch 'origin/develop' into mueller/minor-tweaks-pcdu-handler	2022-04-22 10:51:06 +02:00
Robin Mueller	d1814f9a49	submodule update	2022-04-22 10:50:40 +02:00
Robin Mueller	c4b1703b8e	update README	2022-04-22 10:48:31 +02:00
Jakob.Meier	d6532f8181	Merge pull request 'Update for new yocto rootfs' (#217) from mueller/yocto-rootfs into develop ... Reviewed-on: #217 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-04-22 10:21:52 +02:00
Robin Mueller	438957c466	update shell script to use default SDK sysroot	2022-04-21 13:52:27 +02:00
Robin Mueller	4f4a8930c8	repoint fsfw	2022-04-21 13:45:37 +02:00
Robin Mueller	20bb1d73f5	Merge remote-tracking branch 'origin/develop' into mueller/yocto-rootfs	2022-04-21 13:45:13 +02:00
Robin Mueller	6b08659a69	disable -Wformat-truncation error	2022-04-21 11:50:47 +02:00
Robin Mueller	707c318ab9	repoint fsfw again	2022-04-21 10:41:29 +02:00
Robin Mueller	e5d5af68c1	Important bugfix and improvement for PCDU Handler ... - Fixed out of bounds error - Handle multiple messages in queue handler - PCDU Handler now only called once in PST	2022-04-21 09:35:02 +02:00
Robin Mueller	17c440643f	Merge branch 'mueller/master' into mueller/yocto-rootfs	2022-04-20 13:44:07 +02:00
Robin Mueller	eb0e7c39e4	update README	2022-04-20 01:27:16 +02:00
Robin Mueller	f23ba7ab7b	always build watchdog for arm q7s now	2022-04-20 01:25:56 +02:00
Robin Mueller	c4220b37e5	add option for external toolchain file	2022-04-20 00:57:37 +02:00
Robin Mueller	69f39b765b	curl cant use wildcards	2022-04-19 18:30:21 +02:00
Robin Mueller	fa4ee7a84b	this is odd	2022-04-19 18:23:38 +02:00
Robin Mueller	0263d3adb5	newline at end	2022-04-19 18:20:07 +02:00
Robin Mueller	67fbabbd7c	update docker file and jenkins file	2022-04-19 18:18:07 +02:00
Robin Mueller	ec0a38ad25	update win q7s env script	2022-04-19 17:54:32 +02:00
Robin Mueller	5d8e8a9841	delete commented code	2022-04-19 17:52:43 +02:00
Robin Mueller	c3238ab154	update .cproject file	2022-04-19 17:51:53 +02:00
Robin Mueller	4956161701	support both gps versions	2022-04-19 17:47:05 +02:00
Robin Mueller	d12b5958b9	update q7s-evn script and generate stripped watchdog bin	2022-04-18 21:49:04 +02:00
Robin Mueller	a4c5d8de45	adaptions for gpsd 3.17	2022-04-18 00:25:33 +02:00
Robin Mueller	be2834cb1a	linux ctrl only print warning once	2022-04-17 11:48:06 +02:00
Robin Mueller	07d345183e	rename gps dev	2022-04-17 01:07:23 +02:00
Robin Mueller	d3403d341f	if gpssmm cant be opened, return prematurely	2022-04-17 01:06:37 +02:00
Robin Mueller	a14af7f728	update path setter	2022-04-17 01:04:53 +02:00
Robin Mueller	aa95aa185b	Merge remote-tracking branch 'origin/develop' into mueller/master	2022-04-17 01:01:08 +02:00
Robin Mueller	2e93d7300a	some more fixes	2022-04-17 01:00:06 +02:00
Robin Mueller	f6f51665a2	fix for script path	2022-04-17 00:56:31 +02:00
Robin Mueller	f08eb9b5ae	install directive for OBSW	2022-04-16 01:40:03 +02:00
Robin Mueller	b0006c2272	watchdog fixes and submodule updates	2022-04-16 01:04:06 +02:00
Robin Mueller	25138d8931	update	2022-04-14 09:42:59 +02:00
Robin Mueller	3e4d728b10	fsfw update	2022-04-13 18:44:35 +02:00
Robin Mueller	604870d1fe	split up op divider, assing imtq power switcher	2022-04-12 15:27:48 +02:00
Robin Mueller	5e0e8232df	dev conf update for updated fsfw	2022-04-11 14:54:44 +02:00
Robin Mueller	456f6ad6af	submodule updates	2022-04-11 14:43:24 +02:00
Robin Mueller	d5bdc00abf	start bpx batt immediately ... but defer it until the com mode was set to i2c	2022-04-09 18:56:32 +02:00
Robin Mueller	a5881a238b	store time file with lower frequency	2022-04-09 18:51:46 +02:00
Robin Mueller	d144f5bd11	Merge remote-tracking branch 'origin/develop' into mueller/master	2022-04-09 18:00:56 +02:00
Robin Mueller	a728a6d04b	tmtc update	2022-04-08 09:59:46 +02:00
Robin Mueller	26ff40ae0c	Merge remote-tracking branch 'origin/develop' into mueller/master	2022-04-08 09:07:38 +02:00
Robin Mueller	e7e810eb20	Merge remote-tracking branch 'origin/develop' into mueller/master	2022-04-07 11:02:01 +02:00