2609 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jakob Meier	582d2db05f	fixed conflicts	2022-04-28 14:29:23 +02:00
Jakob Meier	898753f6e3	supervisor reset pl command	2022-04-28 11:27:28 +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
Jakob Meier	20a2aa73ae	tmtc update	2022-04-27 16:09:07 +02:00
Jakob Meier	8610e48b19	countdown based timeout	2022-04-27 16:08:17 +02:00
Jakob Meier	42194abb4a	commented in read function again	2022-04-25 13:36:30 +02:00
Jakob Meier	3e8429b34b	warning print when memory check command fails	2022-04-25 13:36:06 +02:00
Jakob Meier	311ec7b194	mpsoc shutdown after running update procedure	2022-04-25 11:03:02 +02:00
Jakob Meier	6876952bbd	regenerated events	2022-04-24 12:34:08 +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
Cleanroom Laptop L15	9301206485	fixes identified during tests	2022-04-22 18:05:03 +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 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
Cleanroom Laptop L15	ce41e4c219	tmtc update	2022-04-22 14:21:41 +02:00
Cleanroom Laptop L15	4a2ba043cb	fixed conflicts	2022-04-22 14:20:17 +02:00
Cleanroom Laptop L15	b63c3bb9c3	increased delay cycles of execution report	2022-04-22 14:17:16 +02:00
Cleanroom Laptop L15	8b612d9116	include fix	2022-04-22 14:16:40 +02:00
Robin Mueller	a416ca406b	git describe support finished	2022-04-22 14:09:08 +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
Jakob Meier	2ee9b09b27	logging command	2022-04-22 08:55:57 +02:00
Jakob.Meier	a24464f13e	Merge pull request 'v1.10.0' (#220) from develop into main ... Reviewed-on: #220 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-04-22 07:42:18 +02:00
Jakob Meier	a8f5a4054f	Merge branch 'develop' into meier/plocSupvUpdate	2022-04-21 17:34:26 +02:00
Robin Müller	e61fada99e	Merge pull request 'MPSoC Handler Update' (#219) from meier/plocMPSoC into develop ... Reviewed-on: #219 Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>	2022-04-21 16:36:02 +02:00
Jakob Meier	836a2327f9	tmtc update	2022-04-21 16:31:14 +02:00
Jakob Meier	cf37d74728	adc report	2022-04-21 16:30:23 +02:00
Robin Müller	333155b1a0	Merge branch 'develop' into meier/plocMPSoC	2022-04-21 14:32:22 +02:00
Jakob Meier	0bcb332ce9	tmtc update	2022-04-21 14:26:46 +02:00
Jakob Meier	52c539bc6b	fsfw update	2022-04-21 14:26:15 +02:00
Robin Mueller	2c491b27c0	update CHANGELOG	2022-04-21 14:21:02 +02:00
Robin Mueller	ae2cd52087	add changelog	2022-04-21 14:18:41 +02:00
Jakob Meier	47b9576c24	decreased pst uart frequency again	2022-04-21 14:04:46 +02:00
Jakob Meier	7ae8138a43	Merge branch 'develop' into meier/plocMPSoC	2022-04-21 14:03:27 +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
Jakob.Meier	4325eaa956	Merge pull request 'bugfix for inverse copying' (#213) from mueller/q7s-cp-bugfix into develop ... Reviewed-on: #213 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-04-21 11:23:33 +02:00
Jakob.Meier	daf50a83fd	Merge pull request 'fix initializer list order' (#215) from mueller/imtq-order-fix into develop ... Reviewed-on: #215 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-04-21 11:23:09 +02:00
Jakob.Meier	34c0ac3f05	Merge pull request 'fix and improvement for include handling in OBSW watchdog' (#216) from mueller/watchdog-fixes into develop ... Reviewed-on: #216 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-04-21 11:22:09 +02:00
Jakob.Meier	b68c58fd37	Merge pull request 'fix out-of-bounds read in PCDU Handler' (#218) from mueller/hotfix-pcdu-handler into develop ... Reviewed-on: #218 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-04-21 11:21:27 +02:00