1082 Commits

Author	SHA1	Message	Date
Robin Mueller	66c6f08447	connect acs ctrl to subsystem	2022-09-30 14:30:30 +02:00
Robin Mueller	57d37f14f3	fixed some bugs	2022-09-30 14:14:59 +02:00
Robin Mueller	dcd0a650f0	this should do the job	2022-09-30 13:30:22 +02:00
Robin Mueller	d10ff4efa6	compiles again	2022-09-30 12:09:03 +02:00
Robin Mueller	6af7ccc6a2	need to fix all of these TODOs	2022-09-29 19:40:00 +02:00
Robin Mueller	9512a7d280	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-09-29 17:50:09 +02:00
Robin Mueller	f27fccfd29	set DHB parents differently now	2022-09-29 17:06:19 +02:00
Robin Mueller	0f609fdaba	thats a bit tricky	2022-09-29 16:47:47 +02:00
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