1224 Commits

Author	SHA1	Message	Date
Robin Mueller	541b44cea7	re-run afmt	2022-09-29 14:10:21 +02:00
Robin Mueller	49efbc4725	some bugfixes	2022-09-29 13:53:42 +02:00
Robin Mueller	151d27985f	Merge remote-tracking branch 'origin/develop' into scex-additions	2022-09-29 13:43:58 +02:00
Robin Mueller	a152553d00	Merge remote-tracking branch 'origin/develop' into mueller/em-sw-updates	2022-09-29 13:32:10 +02:00
Robin Mueller	97f02401fe	bugfix for SCEX code	2022-09-28 17:01:40 +02:00
Robin Mueller	269de1782a	Merge branch 'mueller/obsw-update-cmds' into mueller/acs-ss-init	2022-09-27 19:26:23 +02:00
Irini Kosmidou	5f2a0e107d	Merge branch 'scex-additions' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into scex-additions	2022-09-27 19:18:19 +02:00
Irini Kosmidou	071e00e0ef	dog fixed	2022-09-27 19:17:24 +02:00
ikosmidou	aab2dc6367	Merge branch 'develop' into scex-additions	2022-09-27 19:14:40 +02:00
Irini Kosmidou	32c2b2038c	constructor correction	2022-09-27 19:06:55 +02:00
Irini Kosmidou	308a855d8c	bugfix for scex testcode	2022-09-27 18:54:48 +02:00
Irini Kosmidou	a1cc5b0ca7	Merge remote-tracking branch 'origin/develop' into irini	2022-09-27 17:36:19 +02:00
Robin Mueller	2b41b3ee26	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-09-27 14:57:01 +02:00
Robin Mueller	3c746e954b	updates on same image are problematic..	2022-09-27 14:29:39 +02:00
Robin Mueller	ff243fa46c	some bugfixes	2022-09-27 12:19:42 +02:00
Robin Mueller	51976730aa	important bugfix	2022-09-27 11:14:54 +02:00
Robin Mueller	caca7f5da8	small bugfix	2022-09-27 10:55:00 +02:00
Robin Mueller	8c0fd8d9e2	some informative docs	2022-09-27 10:51:56 +02:00
Robin Mueller	90962c9f8e	rudimentary SD commanding interface	2022-09-27 10:51:07 +02:00
Robin Mueller	2614239fe4	this should work for the same chip/copy as well	2022-09-27 09:27:40 +02:00
Robin Mueller	d87baa8da9	successfull SW update	2022-09-26 23:17:12 +02:00
Robin Mueller	9d440838e9	set correct owner for SW update procedure	2022-09-26 18:40:31 +02:00
Robin Mueller	8161d1cd88	finished update cmd impl	2022-09-26 12:26:08 +02:00
Robin Mueller	eb0ace3bc6	continuing SW update impl	2022-09-26 12:00:57 +02:00
Robin Mueller	b3275d015f	start update handler impl	2022-09-26 11:50:35 +02:00
Robin Mueller	05adc91f94	moved definitions	2022-09-26 11:39:17 +02:00
Robin Mueller	7d824f5448	updated helper scripts	2022-09-26 11:31:29 +02:00
Robin Mueller	ec91d9977a	move shell scripts helpers to root	2022-09-26 11:20:03 +02:00
Robin Mueller	80f0664139	added some more fixed file names	2022-09-26 11:15:37 +02:00
Robin Mueller	65a7d38f54	adaptions for update sequence	2022-09-26 11:12:41 +02:00
Robin Mueller	15641c61ea	these commands make more sense	2022-09-26 10:56:57 +02:00
Robin Mueller	0fc639cc11	added action IDs for new commands	2022-09-16 18:48:05 +02:00
Robin Mueller	8aa412e865	add CFDP APID to TCP parse list	2022-09-16 18:10:23 +02:00
Robin Mueller	9411b740ae	CFDP integration almost complete	2022-09-16 17:28:43 +02:00
Robin Mueller	54f73661fc	fix init error	2022-09-16 14:01:54 +02:00
Robin Mueller	65f4daf305	move config define	2022-09-16 12:35:10 +02:00
Robin Mueller	68039d5d4a	clean up config code	2022-09-16 12:28:39 +02:00
Robin Mueller	0b43c3137f	add new constants for CFDP, clean up	2022-09-16 12:22:46 +02:00
Robin Mueller	6b48fb64d8	start integrating cfdp code	2022-09-16 12:14:27 +02:00
Robin Mueller	547fcf22dd	add very basic test in Q7S Test task for FS helpers	2022-09-16 12:05:50 +02:00
Robin Mueller	26216eca88	new fs helper module	2022-09-16 11:53:33 +02:00
Robin Mueller	38f435d1ae	update for new FSFW code	2022-09-16 11:43:11 +02:00
Robin Mueller	9ad649e43e	ACS controller running in EM SW withour errors now	2022-09-15 13:40:57 +02:00
Robin Mueller	8a6a69d230	update EM code	2022-09-15 13:15:39 +02:00
Robin Mueller	8ebc62cbe6	new ACS preproc defines	2022-09-15 13:03:22 +02:00
Robin Mueller	2261ccb304	create ACS controller in EM sw	2022-09-15 11:40:10 +02:00
Robin Mueller	57331380c3	small fix for ACS task	2022-09-15 11:38:29 +02:00
Robin Mueller	fb3214fef9	swap order	2022-09-12 17:25:20 +02:00
Robin Mueller	4649a75d40	update to new API	2022-09-12 17:23:43 +02:00
Robin Mueller	31b3de784b	stuff	2022-09-12 17:00:49 +02:00
Robin Mueller	86d3732f65	retval replacements	2022-08-29 15:57:26 +02:00
Robin Mueller	aa86bc722f	retval corrections	2022-08-29 15:56:18 +02:00
Robin Mueller	3ad7a35f0e	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-08-29 15:53:57 +02:00
Robin Mueller	975f202ddb	Merge remote-tracking branch 'origin/develop' into mueller/pl-ss	2022-08-29 15:50:55 +02:00
Robin Mueller	aa0da618ca	Merge remote-tracking branch 'origin/develop' into irini	2022-08-29 15:49:23 +02:00
Robin Mueller	3b2794735b	disable test	2022-08-27 15:54:52 +02:00
Robin Mueller	8c110460a6	added test to retrieve pdu config	2022-08-26 14:28:06 +02:00
Robin Mueller	0f553e3431	Merge remote-tracking branch 'origin/develop' into mueller/update-p60-module-code	2022-08-26 13:45:53 +02:00
Robin Mueller	a7482b657a	changed all table parsing to use gom space API	2022-08-26 13:42:58 +02:00
Robin Mueller	efb0bce718	finally it works	2022-08-26 03:20:44 +02:00
Robin Mueller	d098ed6403	gomspace lib working	2022-08-26 00:39:06 +02:00
Robin Mueller	7a1dbf8456	add gom space client code	2022-08-25 23:22:17 +02:00
Robin Mueller	447c4d5c88	all retval replacements	2022-08-24 17:27:47 +02:00
Robin Mueller	bddaf120f4	Merge remote-tracking branch 'origin/develop' into irini	2022-08-24 16:54:39 +02:00
Robin Mueller	a134f3f100	Merge remote-tracking branch 'origin/develop' into irini	2022-08-16 18:52:16 +02:00
Robin Mueller	6ead94b5f4	this is even better	2022-08-16 17:49:50 +02:00
Robin Mueller	7e3517d309	it compiles again	2022-08-15 18:34:26 +02:00
Robin Mueller	c99cb4a81e	schedule ACS controller	2022-08-15 09:58:18 +02:00
Robin Mueller	4649c97205	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-08-08 17:12:12 +02:00
Robin Mueller	bd40af34c8	Merge branch 'develop' into irini	2022-08-08 17:10:57 +02:00
Robin Mueller	89b3b2ff42	Merge remote-tracking branch 'origin/develop' into mueller/pl-ss	2022-08-08 17:08:56 +02:00
Robin Mueller	722d7a67f5	important bugfix for FM SW	2022-08-04 01:45:49 +02:00
Robin Mueller	8b39f65472	modify oss to append at end	2022-07-13 11:25:53 +02:00
Robin Mueller	563e13765d	Merge remote-tracking branch 'origin/develop' into irini	2022-07-08 16:27:50 +02:00
Robin Mueller	b133a0538c	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-07-04 10:47:23 +02:00
Robin Mueller	9e89a0689f	Merge remote-tracking branch 'origin/develop' into mueller/pl-ss	2022-07-04 10:46:47 +02:00
meierj	d78155fd79	remove ccsds components from em object factory	2022-06-27 14:56:46 +02:00
meierj	a2e7c6cca6	moved ccsds object creation back to core object factory and run auto formatter	2022-06-27 10:58:46 +02:00
meierj	95da2372c9	run generators	2022-06-27 09:15:29 +02:00
Jakob Meier	ed0eb4fe9c	adaptions for setup with ccsds testbed	2022-06-23 20:12:56 +02:00
Jakob Meier	89757c447c	run auto-formatter	2022-06-17 08:31:36 +02:00
Jakob Meier	1ebae7f938	fixes for te0720 build	2022-06-08 07:16:12 +02:00
Jakob Meier	8c850614e5	fixed merge conflicts	2022-06-05 10:54:46 +02:00
Jakob Meier	52d94f44d4	device temeprature set	2022-06-01 10:48:18 +02:00
Cleanroom Laptop L15	593cc68b84	rtd dataset	2022-05-31 16:44:57 +02:00
Cleanroom Laptop L15	0e6d2354fc	thermal set fix	2022-05-30 14:32:50 +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	6f9d3c2f63	Merge branch 'develop' into meier/SdCardManager	2022-05-26 12:15:14 +02:00
Robin Mueller	1f616a101d	add scex preproc define to OBSWConfig.h.in	2022-05-26 12:10:56 +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
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
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
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
Robin Mueller	5d2a70b6c6	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-05-25 10:28:06 +02:00
Robin Müller	ffdd6bbc3c	Merge branch 'develop' into mueller/add-schedule-pus-11	2022-05-25 10:27:36 +02:00
Robin Mueller	c86e000f09	Update PL SS	2022-05-25 10:25:40 +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	3eca96fef5	Merge remote-tracking branch 'origin/develop' into mueller/core-controller-remount-sd-handling	2022-05-25 09:58:06 +02:00
Robin Mueller	43fc1ab780	Merge remote-tracking branch 'origin/develop' into mueller/add-schedule-pus-11	2022-05-25 09:57:34 +02:00
Robin Mueller	3fff3ba21e	add and schedule PUS11	2022-05-24 15:21:37 +02:00
Robin Mueller	633fe00cd6	run afmt, minor improvements	2022-05-24 01:14:04 +02:00
Robin Mueller	f7075a1397	Merge remote-tracking branch 'origin/develop' into mueller/reboot-cmd	2022-05-24 00:54:39 +02:00
Robin Mueller	2ebdb5c797	tweak sd card check countdown	2022-05-24 00:53:29 +02:00
Robin Mueller	1519b13b78	appears to work now	2022-05-24 00:52:08 +02:00
Robin Mueller	b2c286cd7e	improve and optimize SD card handling	2022-05-24 00:20:23 +02:00
Robin Müller	e9908139e7	Merge branch 'develop' into mueller/core-controller-remount-sd-handling	2022-05-23 18:37:50 +02:00
Robin Mueller	7d9ef6f887	run afmt	2022-05-23 18:37:04 +02:00
Robin Müller	dc6fa57c03	Merge branch 'develop' into mueller/core-controller-remount-sd-handling	2022-05-20 08:20:13 +02:00
Robin Mueller	49a06772d2	Merge remote-tracking branch 'origin/develop' into mueller/rtds-update	2022-05-20 08:18:57 +02:00
Robin Mueller	a63e87f5f4	subscribe for periodic core ctrl packet	2022-05-19 18:46:49 +02:00
Robin Mueller	e73bfc2c64	dev string for FM/EM	2022-05-19 16:00:26 +02:00
Robin Mueller	d274f5647d	fix EM cofig	2022-05-19 15:28:02 +02:00
Robin Mueller	377f762ca5	fixed for new SPI HAL API	2022-05-19 14:54:44 +02:00
Robin Mueller	e49a1af9b7	bump fsfw	2022-05-18 14:51:33 +02:00
Robin Mueller	28a4f782f9	Merge remote-tracking branch 'origin/develop' into mueller/rtds-update	2022-05-17 17:55:25 +02:00
Robin Mueller	8a5090b8ee	apply new auto-formatter on all files	2022-05-17 13:40:19 +02:00
Robin Mueller	7080758c67	Merge remote-tracking branch 'origin/develop' into mueller/core-controller-remount-sd-handling	2022-05-16 15:18:55 +02:00
Robin Mueller	2fa1061c65	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-05-16 15:11:24 +02:00
Robin Mueller	036024db7e	perm loop not necessary anymore	2022-05-14 17:22:57 +02:00
Robin Mueller	f20fcd9a72	Merge remote-tracking branch 'origin/develop' into mueller/rtds-update	2022-05-14 17:07:27 +02:00
Robin Mueller	017cfb9d56	a lot of fixes, but some stuff doesnt work..	2022-05-14 17:04:51 +02:00
Robin Mueller	478975db26	spi setup more stable now	2022-05-14 11:34:25 +02:00
Robin Mueller	1c9f411e75	new RTD handler working	2022-05-14 09:41:28 +02:00
Robin Mueller	e81ddaa1a5	added auto-shutdown for faulty heaters	2022-05-12 20:44:36 +02:00
Robin Mueller	e25c492aa4	create and schedule health PUS service	2022-05-12 19:22:20 +02:00
Robin Mueller	82f75bde97	fix for heater creation call	2022-05-12 19:12:12 +02:00
Jakob Meier	919141ae10	ccsds handler sending command to enable transmitter	2022-05-12 18:32:19 +02:00
Robin Mueller	d7316eff66	remove merge conflict markers	2022-05-12 14:23:10 +02:00
Robin Mueller	51466e68d7	Merge remote-tracking branch 'origin/develop' into mueller/heater-health-if	2022-05-12 14:11:46 +02:00
Robin Mueller	dd67191044	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-05-12 14:02:15 +02:00
Robin Mueller	c1faf65409	schedule new rtd reader component	2022-05-12 12:35:05 +02:00
Robin Mueller	382d93863f	create and pass correct comIF	2022-05-12 12:21:47 +02:00
Jakob Meier	e5710784b9	Merge branch 'develop' into meier/ccsds	2022-05-12 07:47:28 +02:00
Robin Mueller	c1992f59d6	Merge remote-tracking branch 'origin/develop' into mueller/reboot-cmd	2022-05-11 17:04:19 +02:00
Robin Mueller	5a82fe93d9	core ctrl remount sd handling	2022-05-11 17:02:57 +02:00
Robin Müller	1d1f04f57b	Merge branch 'develop' into mueller/reboot-cmd	2022-05-11 15:48:34 +02:00
Robin Mueller	625abcfd5b	important bugfixes	2022-05-11 15:45:38 +02:00
Robin Mueller	c043375ae3	RW Refactoring ... - FSFW update: SPI device is part of ComIF now - Only set RW mode (speed is set a side effect but not necessary) once - Release SPI bus in the 70 ms delay duration	2022-05-11 11:13:00 +02:00
Robin Mueller	91b69eacf6	A lot of stuff ... - refactored and simplified RW assemblies - create separate SPI Com IF for RWs - Update .cproject file: Fixed to decrease indexer parsing times	2022-05-11 01:48:26 +02:00
Robin Mueller	df7e0007d0	schedule RW ASS	2022-05-11 01:02:29 +02:00
Robin Mueller	8ccd55dd06	update .cproject file	2022-05-11 00:58:19 +02:00
Robin Mueller	4e78ee85c8	continued rw ass creation	2022-05-11 00:54:29 +02:00
Robin Mueller	db7dcc7e32	start creating rw ass in obj factory	2022-05-10 18:39:23 +02:00
Robin Mueller	45c1ac0f61	update	2022-05-10 18:34:39 +02:00
Jakob Meier	907b8f4a5d	ccsds config for te0720-1cfa	2022-05-10 07:48:36 +02:00
Robin Mueller	4864394590	renamed heaters	2022-05-09 16:13:33 +02:00
Robin Mueller	71d9553f90	Merge remote-tracking branch 'origin/develop' into mueller/rw-ass	2022-05-08 13:11:56 +02:00
Robin Mueller	d9085e81a1	Merge remote-tracking branch 'origin/develop' into mueller/heater-health-if	2022-05-08 13:06:47 +02:00
Jakob Meier	421237bfb7	fixed ploc supervisor build error which was hidden by prerocessor define	2022-05-08 12:01:35 +02:00
Jakob Meier	2bc2325b1f	removed unused includes	2022-05-07 13:59:53 +02:00
Jakob Meier	f8addd9365	preprocessor define fixes	2022-05-07 13:38:09 +02:00
Jakob Meier	43b0ed4b04	preprocessor define adjustments	2022-05-06 20:33:46 +02:00
Jakob Meier	322db3d617	removed ploc updater	2022-05-06 19:52:43 +02:00
Jakob Meier	6dd57a3f5e	fixed merge conflicts	2022-05-06 19:44:18 +02:00
Robin Müller	99a8cd0f2d	Merge branch 'develop' into mueller/reboot-cmd	2022-05-06 10:11:58 +02:00
Robin Mueller	355ca27d31	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-05-06 08:58:31 +02:00
Robin Mueller	b426475ca4	better RTD names	2022-05-05 16:55:08 +02:00
Robin Mueller	cf4edac604	maybe this fixes the timing issue?	2022-05-05 16:32:09 +02:00
Robin Mueller	4c809e354d	better heater obj id names	2022-05-05 16:23:46 +02:00
Robin Mueller	1f6aab8124	apply afmt, some more renaming	2022-05-05 13:40:43 +02:00
Robin Mueller	28c9e33d1c	separate PST for RWs	2022-05-05 02:00:56 +02:00
Robin Mueller	d108f7bbda	Merge remote-tracking branch 'origin/develop' into mueller/reboot-cmd	2022-05-04 16:54:39 +02:00
Robin Mueller	3458c272ad	Merge remote-tracking branch 'origin/develop' into mueller/rw-ass	2022-05-04 16:47:49 +02:00
Robin Mueller	1508a1e147	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-05-04 16:43:31 +02:00
Robin Mueller	a6c6325d41	Merge remote-tracking branch 'origin/develop' into mueller/pl-ss	2022-05-04 16:41:08 +02:00
Robin Mueller	d0e18f8b35	add mutex protections for switcher states	2022-05-04 11:11:29 +02:00
Robin Mueller	ae0120f3ef	Merge branch 'mueller/refactoring-conf-handling' into mueller/heater-health-if	2022-05-03 17:44:02 +02:00
Robin Mueller	e8e3138fba	Merge remote-tracking branch 'origin/develop' into mueller/pl-ss	2022-05-03 16:05:01 +02:00
Robin Mueller	3b40e622fe	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-05-03 16:02:45 +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	88842d4f07	Merge remote-tracking branch 'origin/develop' into mueller/heater-health-if	2022-05-03 15:59:28 +02:00
Robin Mueller	08046ef621	Merge remote-tracking branch 'origin/develop' into mueller/refactoring-conf-handling	2022-05-03 15:57:01 +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	cce0d5448d	support both SHM and socket read	2022-05-03 00:55:01 +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 Mueller	9449919b2b	Heaters are own objects with HealthIF now	2022-05-02 22:45:27 +02:00
Robin Mueller	b98c691c2b	added health helper to heater handler	2022-05-02 17:51:00 +02:00
Robin Mueller	238afbaa8b	add health IF to heater handler	2022-05-02 17:37:00 +02:00
Robin Mueller	0e97c4ad9a	Merge branch 'mueller/acs-ss-init' into mueller/pl-ss	2022-05-02 12:55:15 +02:00
Robin Mueller	7db0872ee3	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-05-02 12:49:53 +02:00
Robin Mueller	bab8412f10	Merge remote-tracking branch 'origin/develop' into mueller/rw-ass	2022-05-02 12:41:45 +02:00
Jakob Meier	be752997eb	fixed merge conflicts	2022-04-30 19:12:21 +02:00
Jakob Meier	20138d52b1	decreased stack size of supervisor helper task	2022-04-30 16:23:51 +02:00
Jakob Meier	6d322c6e78	run clang format script	2022-04-30 16:21:59 +02:00
Jakob Meier	016ca8cb7e	decreased acs handler task stack size	2022-04-30 16:20:33 +02:00
Jakob Meier	729b8f547c	time file writing commended in again	2022-04-30 16:19:00 +02:00
Jakob Meier	e1ffa97232	improved acknowledgment and execution handling in supervisor handler	2022-04-30 11:08:36 +02:00
Robin Mueller	c1248dd4e1	building new EM config	2022-04-29 15:47:54 +02:00
Robin Mueller	5888d90fbc	continued reboot command	2022-04-29 11:16:53 +02:00
Robin Mueller	0b64999ce2	added generic GPIO checker	2022-04-28 18:38:38 +02:00
Cleanroom Laptop L15	7c770b5aec	fixed conflicts	2022-04-28 18:33:27 +02:00
Robin Mueller	73fbdfeb25	remove etl::pair usage	2022-04-28 18:27:40 +02:00
Robin Mueller	31fa2f0d8d	include fix	2022-04-28 18:27:13 +02:00
Robin Mueller	1527b60fd6	Merge remote-tracking branch 'origin/develop' into mueller/rw-ass	2022-04-28 18:26:34 +02:00
Robin Mueller	cb47667d01	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-04-28 17:56:33 +02:00
Robin Mueller	f01f63d8e8	Merge remote-tracking branch 'origin/develop' into mueller/gomspace-fdir	2022-04-28 17:55:40 +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
Robin Mueller	d0b7531e48	create and assign gomspace power fdir	2022-04-28 15:58:31 +02:00
Robin Mueller	7e230b64ea	create and add syrlinks fdir	2022-04-28 15:29:57 +02:00
Jakob Meier	582d2db05f	fixed conflicts	2022-04-28 14:29:23 +02:00
Cleanroom Laptop L15	7682a1d214	fixed conflicts	2022-04-27 16:56:16 +02:00
Cleanroom Laptop L15	7543a92dd9	added test code	2022-04-27 16:44:03 +02:00
Jakob Meier	8610e48b19	countdown based timeout	2022-04-27 16:08:17 +02:00
Robin Mueller	2b33d8772c	fixes most warnings for host build	2022-04-26 10:37:25 +02:00
Robin Mueller	0697cca88a	started acs subsystem	2022-04-25 13:36:11 +02:00
Jakob Meier	311ec7b194	mpsoc shutdown after running update procedure	2022-04-25 11:03:02 +02:00
Robin Mueller	f9dd77b8ec	create and schedule ACS SS	2022-04-25 10:50:59 +02:00
Robin Mueller	f014e2d5c7	system folder restructuring	2022-04-25 10:36:03 +02:00
Robin Mueller	9ba65b04fd	add IDLE charge mode	2022-04-25 10:30:47 +02:00
Robin Mueller	bbb4ba2191	baseline acs mode tree done	2022-04-25 10:08:29 +02:00
Robin Mueller	baa6f05f8e	neat	2022-04-25 08:48:22 +02:00
Jakob Meier	6876952bbd	regenerated events	2022-04-24 12:34:08 +02:00
Robin Mueller	9f3a56e5e6	Merge remote-tracking branch 'origin/develop' into mueller/rw-ass	2022-04-23 12:37:25 +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
Robin Mueller	c262d1ef90	Merge remote-tracking branch 'origin/develop' into mueller/hand-written-subsystem	2022-04-23 12:21:04 +02:00
Robin Mueller	874e06baa1	continued acs subsystem	2022-04-22 17:49:28 +02:00
Robin Mueller	a0db5dcc7c	add first mode sequence for acs ss	2022-04-22 17:00:23 +02:00
Robin Mueller	772a829333	small improvement	2022-04-22 15:58:15 +02:00
Cleanroom Laptop L15	4a2ba043cb	fixed conflicts	2022-04-22 14:20:17 +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	d29dd48d1e	update project file: changed default unix sysroot	2022-04-22 11:18:10 +02:00
Jakob Meier	a8f5a4054f	Merge branch 'develop' into meier/plocSupvUpdate	2022-04-21 17:34:26 +02:00
Robin Mueller	4956161701	support both gps versions	2022-04-19 17:47:05 +02:00
Robin Mueller	850722eae5	include improvements	2022-04-19 17:24:04 +02:00
Jakob Meier	ffd64d0463	improvements in supervisor helper	2022-04-19 13:33:37 +02:00
Robin Mueller	a4c5d8de45	adaptions for gpsd 3.17	2022-04-18 00:25:33 +02:00
Jakob Meier	1ce45acba3	merged develop	2022-04-17 14:52:43 +02:00
Robin Mueller	07d345183e	rename gps dev	2022-04-17 01:07:23 +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
Jakob Meier	7b54855397	supervisor fixes detected during testing	2022-04-16 17:19:32 +02:00
Robin Mueller	1db5d278f6	switcher handling extension	2022-04-14 11:17:07 +02:00
Robin Mueller	25138d8931	update	2022-04-14 09:42:59 +02:00
Robin Mueller	655497934b	apply afmt	2022-04-13 18:55:49 +02:00
Robin Mueller	fd3313fc62	assign power switcher for imtq and star tracker	2022-04-13 18:55:07 +02:00
Robin Mueller	a72c2f7b7d	submodule and obj factory updates	2022-04-13 18:51:22 +02:00
Jakob Meier	bd8cd49117	event buffer request wip	2022-04-13 11:56:37 +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	f05922e19e	Merge remote-tracking branch 'origin/develop' into mueller/split-pdu1-pdu2-sets	2022-04-11 08:55:25 +02:00
Jakob Meier	b440fc3df6	ploc update	2022-04-10 18:46:39 +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	6ae9e539a6	more useful printout	2022-04-08 11:40:35 +02:00
Robin Mueller	351920aa7b	some tweaks	2022-04-08 11:31:29 +02:00
Robin Mueller	4a6840f098	bugfixes and improvements ... - Tests finished	2022-04-08 11:22:16 +02:00
Robin Mueller	59d58da4f2	splitting pdu1 and pdu2 sets done	2022-04-07 19:48:09 +02:00
Robin Mueller	796b814b49	Add time file handling	2022-04-07 17:23:50 +02:00
Cleanroom Laptop L15	3f6a534db5	fixes identified during tests	2022-04-06 17:27:44 +02:00
Jakob Meier	d48ec92d09	fixed conflicts	2022-04-05 13:57:16 +02:00
Jakob Meier	d2f54f033f	syrlinks	2022-04-04 14:58:35 +02:00
Robin Mueller	ec880d4232	apply auto-formatter	2022-04-04 13:40:45 +02:00
Robin Mueller	007badc324	bugfix in SUS device handler	2022-04-03 20:35:49 +02:00
Robin Mueller	8a4de72713	update header file as well	2022-04-01 14:13:37 +02:00
Robin Mueller	c231a775b3	Merge remote-tracking branch 'origin/develop' into mueller/move-gnss-nreset-handling	2022-04-01 14:05:32 +02:00
Robin Mueller	1eb5a428cb	move GNSS NReset handling to assembly ... - Also update fsfwgen dependency	2022-04-01 14:01:12 +02:00
Robin Mueller	d769d3ce22	Merge remote-tracking branch 'origin/develop' into meier/deviceHandlerUpdate	2022-04-01 13:41:04 +02:00
Jakob Meier	ca1e8f3dc1	syrlinks fault flag	2022-04-01 09:20:35 +02:00
Robin Mueller	33ec092998	ported RTD code as well	2022-03-31 17:58:16 +02:00
Jakob Meier	b29a0cd0fb	syrlinks temperature set and temperature protection	2022-03-31 17:44:29 +02:00
Robin Mueller	053c65b6cd	Merge remote-tracking branch 'origin/develop' into mueller/rpi-sus-port	2022-03-31 16:42:52 +02:00
Jakob Meier	222f17edcc	Merge branch 'develop' into meier/deviceHandlerUpdate	2022-03-31 15:48:58 +02:00
Jakob Meier	2dca9d598d	mpsoc startup command	2022-03-30 09:19:30 +02:00
Robin Mueller	9f937781b7	Merge remote-tracking branch 'origin/develop' into mueller/rpi-sus-port	2022-03-29 15:43:35 +02:00
Robin Mueller	b5363604bc	Merge remote-tracking branch 'origin/develop' into mueller/plpcdu-refactoring	2022-03-29 15:40:02 +02:00
Cleanroom Laptop L15	618d7a3358	Merge branch 'meier/plocMPSoC' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into meier/plocMPSoC	2022-03-28 17:39:38 +02:00
Cleanroom Laptop L15	991f864375	star tracker fixes	2022-03-28 17:38:57 +02:00
Robin Mueller	e6ad0978de	run auto-formatter	2022-03-28 13:54:46 +02:00
Cleanroom Laptop L15	d6ed952fa9	use power switcher to turn on supervisor	2022-03-28 11:34:06 +02:00
Robin Mueller	0c889f9492	Merge remote-tracking branch 'origin/develop' into mueller/plpcdu-refactoring	2022-03-28 10:33:49 +02:00
Cleanroom Laptop L15	a9a6bbd948	fixed conflicts	2022-03-28 10:10:01 +02:00
Jakob Meier	758c4e6f4f	uart isolator switch handling	2022-03-28 09:08:11 +02:00
Jakob Meier	e2c9bece05	adding uart isolator switches wip	2022-03-27 14:42:20 +02:00
Jakob Meier	6d04c278c3	run clang formatting script	2022-03-27 13:07:18 +02:00
Jakob Meier	44a0d4af61	removed te0720 code form q7s files	2022-03-27 10:56:40 +02:00
Jakob Meier	ceb7f40d35	fixed merge conflicts	2022-03-27 10:44:32 +02:00
Jakob Meier	471a981ccf	mpsoc flash write command	2022-03-26 20:47:25 +01:00
Robin Mueller	2410c6ccc6	added SUS component creation to RPi	2022-03-26 16:38:42 +01:00
Robin Mueller	ac0326a944	various improvements	2022-03-26 13:54:05 +01:00
Jakob Meier	47a3804145	fixed conflicts	2022-03-26 10:41:30 +01:00
Cleanroom Laptop L15	2f6d9ab7f1	fixed merge conflicts	2022-03-25 18:49:34 +01:00
Cleanroom Laptop L15	4bf0521a5d	increased pl pcdu debug divider	2022-03-25 17:02:21 +01:00
Robin Mueller	74fa98d161	add dual lane power switcher for PL PCDU	2022-03-25 15:56:44 +01:00
Cleanroom Laptop L15	931c53f1a6	corrections during e-band test	2022-03-25 12:57:42 +01:00
Robin Mueller	6e91462cba	better rtd printout	2022-03-23 15:02:48 +01:00
Robin Mueller	1cd98c5604	Merge remote-tracking branch 'origin/mueller/tcs-subsystem' into mueller/master	2022-03-23 13:39:25 +01:00
Cleanroom Laptop L15	368b01c081	include fixes	2022-03-23 11:13:59 +01:00
Robin Mueller	4afacbe82b	new system ctl task	2022-03-22 19:15:13 +01:00
Robin Mueller	5b7dd7c432	assign rtd fdir , create TCS BOARD ASS	2022-03-22 19:10:28 +01:00
Robin Mueller	1d712854bf	Merge remote-tracking branch 'origin/develop' into mueller/master	2022-03-22 17:59:05 +01:00
Robin Mueller	ce8253b940	TCS subsystem continued	2022-03-22 15:49:22 +01:00
Robin Mueller	bcd97076e1	started TCS subsystem	2022-03-22 11:57:48 +01:00
Robin Mueller	c95374bfbd	refresh events, objects, retvals	2022-03-22 10:15:04 +01:00
Jakob Meier	a18a752b8e	rerun generators	2022-03-18 11:37:44 +01:00
Jakob Meier	253e2731bd	only include lxiphos when building for q7s	2022-03-18 06:45:40 +01:00
Jakob Meier	33b250562b	fixed conflicts	2022-03-17 20:03:04 +01:00
Robin Mueller	e5a4065055	add and instantiate SUS ASS + SUS FDIR	2022-03-17 19:59:47 +01:00
Jakob Meier	8d70560968	fixed conflicts	2022-03-17 19:52:37 +01:00
Robin Mueller	acd0307591	continued ACS board + SUS board assemblies ... - Handling and Testing of basic FDIR	2022-03-17 19:23:39 +01:00
Jakob Meier	9dc124004d	build configuration for trenz te0720-1cfa	2022-03-17 14:28:32 +01:00
Robin Mueller	4fef5781a8	small fix in power state machine	2022-03-17 10:48:35 +01:00
Robin Mueller	e23687dd66	apply auto-formatter	2022-03-17 10:20:39 +01:00
Robin Mueller	1c5c15bdc7	Merge remote-tracking branch 'origin/mueller/system-subsystems' into mueller/master	2022-03-17 10:20:13 +01:00
Robin Mueller	72acab599a	Merge remote-tracking branch 'origin/develop' into mueller/system-subsystems	2022-03-17 10:17:04 +01:00
Robin Mueller	c212f0ad48	Obj Factory fixes	2022-03-17 10:04:51 +01:00
Robin Mueller	bbf3a4df91	Merge remote-tracking branch 'origin/develop' into mueller/system-subsystems	2022-03-16 19:56:39 +01:00
Robin Mueller	1edfc48acf	small form changes	2022-03-16 18:45:11 +01:00
Jakob Meier	b0b2854d44	added ploc helper objects	2022-03-16 17:00:07 +01:00
EIVE Cleanroom	8bf91f2645	ploc handler wip	2022-03-16 12:36:05 +01:00
Jakob Meier	595b9aff6c	flash write wip	2022-03-16 09:01:36 +01:00
Jakob Meier	f8f7848200	run generator scripts	2022-03-14 18:43:16 +01:00
Robin Mueller	08a1101000	use develop Object Factory	2022-03-14 17:55:02 +01:00
Robin Mueller	197d1a4ce0	update obsw.cpp file	2022-03-14 17:53:48 +01:00
Robin Mueller	0063ce0ccd	update FSFW and related version handling	2022-03-14 17:52:31 +01:00
Robin Mueller	8e3f40a780	Merge remote-tracking branch 'origin/develop' into mueller/system-subsystems	2022-03-14 17:48:20 +01:00
Robin Mueller	1a0f9164ef	Add Latchup print commands	2022-03-14 14:46:26 +01:00
Jakob Meier	9fc1e57943	fixed conflicts	2022-03-14 14:35:07 +01:00
Robin Mueller	819f5f3680	Merge remote-tracking branch 'origin/develop' into mueller/master	2022-03-14 09:39:13 +01:00
Robin Mueller	4415cb4eda	make SW more robust	2022-03-14 09:38:58 +01:00
Jakob Meier	27063f102b	initialization of core pool variables	2022-03-13 18:29:14 +01:00
Jakob Meier	d99825e20e	core housekeeping	2022-03-13 16:32:40 +01:00
Robin Mueller	47beaad58c	Merge branch 'mueller/system-subsystems' into mueller/master	2022-03-11 14:34:10 +01:00
Robin Mueller	1742371c14	created new dual lane assembly base	2022-03-10 10:54:27 +01:00
Robin Mueller	03aba8b080	fixes where FSFW version is used	2022-03-10 10:04:26 +01:00
Robin Mueller	406f44ae26	update for version handling	2022-03-09 19:26:49 +01:00
Robin Mueller	62348bb37d	reworked fsfw version handling	2022-03-09 19:05:54 +01:00
Robin Mueller	b992058e00	hotfix for countdown in SDC manager	2022-03-08 11:58:13 +01:00
Robin Mueller	3dbf66383a	minor fixes	2022-03-08 11:57:27 +01:00
Robin Mueller	b66b1e0fff	use new version getter function	2022-03-08 10:17:24 +01:00
Robin Mueller	39c47a1abf	Merge branch 'mueller/additional-gcc-warnings' into mueller/system-subsystems	2022-03-08 09:44:38 +01:00
Robin Mueller	6ccf16f56d	enabled more GCC warnings	2022-03-08 09:37:23 +01:00
Robin Mueller	a1ea5db4f0	improved preproc handling in obj factory	2022-03-07 15:27:21 +01:00
Robin Mueller	f83153934c	command init switch state	2022-03-07 14:46:46 +01:00
Robin Mueller	970b8c33e5	Merge remote-tracking branch 'origin/develop' into mueller/system-subsystems	2022-03-07 11:35:28 +01:00
Robin Mueller	32def71502	first version of ACS board ASS working ... - Testes transition OFF to NORMAL for A side - Refactored power switching so it can be used by SUS ass as well - Generate events for sending switch command - Generate event if switch state changes - Deny Q7S switch commanding	2022-03-05 03:02:09 +01:00