4054 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Cleanroom Laptop L15	0e6d2354fc	thermal set fix	2022-05-30 14:32:50 +02:00
Cleanroom Laptop L15	23cabe4ca6	Merge branch 'develop' into mohr/thermal_controller	2022-05-30 12:10:19 +02:00
Irini Kosmidou	f5ee21334c	formatted	2022-05-29 17:54:17 +02:00
Irini Kosmidou	24cb555849	update	2022-05-29 17:52:13 +02:00
Robin Müller	3d1e104fa4	Merge pull request 'Adaptions for EM' (#264) from meier/q7s-em into develop ... Reviewed-on: #264 Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>	2022-05-28 12:21:49 +02:00
Jakob Meier	8106722a08	replaced EM preprocessor define	2022-05-27 16:24:41 +02:00
Robin Müller	4632a56346	Merge branch 'develop' into mueller/acs-ss-init	2022-05-27 15:28:41 +02:00
Robin Müller	10a82eca25	Merge branch 'develop' into mueller/pl-ss	2022-05-27 15:28:23 +02:00
Jakob Meier	9e93f1c814	adaptions for EM	2022-05-27 13:44:40 +02:00
Robin Müller	1f1e1e8eae	Merge pull request 'Bugfix SdCardManager' (#263) from meier/SdCardManager into develop ... Reviewed-on: #263 Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>	2022-05-26 12:15:32 +02:00
Robin Müller	6f9d3c2f63	Merge branch 'develop' into meier/SdCardManager	2022-05-26 12:15:14 +02:00
Robin Müller	25070d9543	Merge pull request 'MPSoC Status Codes' (#262) from meier/ploc into develop ... Reviewed-on: #262 Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>	2022-05-26 12:14:19 +02:00
Robin Müller	bbdfc0427a	Merge branch 'develop' into meier/ploc	2022-05-26 12:14:01 +02:00
Robin Mueller	1f616a101d	add scex preproc define to OBSWConfig.h.in	2022-05-26 12:10:56 +02:00
Robin Mueller	b306116eac	remove duplicate declarations	2022-05-26 12:09:36 +02:00
Robin Mueller	5c91697cf1	removed accidental typed stuff	2022-05-26 12:09:01 +02:00
Robin Mueller	9f42ac9875	Merge branch 'mueller/scex-additions' into irini	2022-05-26 12:08:18 +02:00
Robin Mueller	a1faa3a73c	Merge remote-tracking branch 'origin/develop' into irini	2022-05-26 12:08:07 +02:00
Robin Mueller	1276cc2dc6	scex additions	2022-05-26 12:04:27 +02:00
Robin Mueller	97db44e500	fix raspberry pi build	2022-05-26 11:46:28 +02:00
Jakob Meier	c588ec4a1a	bugfix SdCardManager	2022-05-26 01:56:19 +02:00
Cleanroom Laptop L15	09a6707c6c	run generator scripts	2022-05-25 18:42:40 +02:00
Cleanroom Laptop L15	ee9a13f59b	Merge branch 'develop' into meier/ploc	2022-05-25 18:40:39 +02:00
Cleanroom Laptop L15	e9ccb2fd4f	status code parsing, fix in cam command	2022-05-25 18:38:54 +02:00
Robin Mueller	e5459bb1f7	re-run generators	2022-05-25 18:15:44 +02:00
Robin Mueller	5b0f1efefd	Merge remote-tracking branch 'origin/develop' into mueller/pl-ss	2022-05-25 15:48:00 +02:00
Robin Mueller	95121b5120	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-05-25 15:47:21 +02:00
Robin Mueller	335d3ba3b0	bump submodules	2022-05-25 15:45:11 +02:00
Jakob.Meier	f50682b56a	Merge pull request 'Split ACU HK' (#256) from mueller/split-acu-hk into develop ... Reviewed-on: #256 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-05-25 15:23:19 +02:00
Jakob.Meier	ad679a810e	Merge pull request 'add and schedule PUS11' (#259) from mueller/add-schedule-pus-11 into develop ... Reviewed-on: #259 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-05-25 15:21:25 +02:00
Jakob.Meier	686ec4bffa	Merge pull request 'GPS Reset Pin Handling Update' (#261) from mueller/gps-reset-pin-update into develop ... Reviewed-on: #261 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-05-25 15:20:12 +02:00
Robin Mueller	ae434853aa	bump number stored packets	2022-05-25 13:14:36 +02:00
Robin Mueller	bb1e1d80cc	resolve merge conflict	2022-05-25 11:00:18 +02:00
Robin Mueller	01bac87afb	update reset pin handling	2022-05-25 10:59:20 +02:00
Irini Kosmidou	44d36587aa	precised printouts	2022-05-25 10:51:22 +02:00
Robin Mueller	5d2a70b6c6	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-05-25 10:28:06 +02:00
Robin Mueller	96564f890e	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-05-25 10:28:00 +02:00
Robin Müller	ffdd6bbc3c	Merge branch 'develop' into mueller/add-schedule-pus-11	2022-05-25 10:27:36 +02:00
Robin Müller	d870f5ab10	Merge pull request 'Core Controller Remount SD Handling' (#253) from mueller/core-controller-remount-sd-handling into develop ... Reviewed-on: #253 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-05-25 10:27:10 +02:00
Robin Mueller	c86e000f09	Update PL SS	2022-05-25 10:25:40 +02:00
Robin Mueller	f7d436dc6b	Merge remote-tracking branch 'origin/develop' into mueller/pl-ss	2022-05-25 10:23:22 +02:00
Robin Mueller	0b3fd65c9a	Merge remote-tracking branch 'origin/develop' into mueller/add-schedule-pus-11	2022-05-25 10:16:31 +02:00
Robin Mueller	0ac38e8490	Merge remote-tracking branch 'origin/develop' into mueller/split-acu-hk	2022-05-25 10:16:14 +02:00
Robin Mueller	d79177e544	Merge remote-tracking branch 'origin/develop' into mueller/core-controller-remount-sd-handling	2022-05-25 10:15:48 +02:00
Robin Müller	addcb2b21f	Merge pull request 'IMTQ improvements' (#260) from meier/imtq into develop ... Reviewed-on: #260 Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>	2022-05-25 10:15:13 +02:00
Robin Mueller	e537080166	Merge branch 'mueller/acs-ss-init' into mueller/pl-ss	2022-05-25 10:14:09 +02:00
Robin Mueller	83c7ec8067	solve merge conflicts	2022-05-25 10:12:37 +02:00
Robin Mueller	581423a40e	Merge branch 'mueller/acs-ss-init' into mueller/pl-ss	2022-05-25 10:09:24 +02:00
Robin Mueller	e1ed532f91	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-05-25 10:01:53 +02:00
Robin Mueller	7646b683b2	Merge remote-tracking branch 'origin/develop' into mueller/split-acu-hk	2022-05-25 09:59:14 +02:00