2623 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	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	ea139d0657	added new revision	2022-04-22 16:16:25 +02:00
Robin Mueller	8bd7d00ab1	forgot to bump version	2022-04-22 16:15: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