408 Commits

Author	SHA1	Message	Date
Jakob.Meier	7b9023cb6f	Merge pull request 'Update for generator scripts' (#163) from mueller/generators-update into develop ... Reviewed-on: #163 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-03-04 09:56:08 +01:00
Robin Mueller	63c4095d4d	Merge remote-tracking branch 'origin/develop' into mueller/system-subsystems	2022-03-03 15:50:31 +01:00
Robin Mueller	ff0da65662	started SUS assembly ... fixes for PCDU code and switcher list handling	2022-03-03 15:37:36 +01:00
Robin Mueller	5ce46beebf	Merge remote-tracking branch 'origin/develop' into mueller/adis-optimization	2022-03-03 13:38:21 +01:00
Robin Mueller	0f60d82c06	Merge remote-tracking branch 'origin/develop' into mueller/generators-update	2022-03-03 13:37:51 +01:00
Ulrich Mohr	f413ed6f7d	Merge branch 'mohr/buildfix' into mohr/catch2	2022-03-02 17:52:41 +01:00
Ulrich Mohr	05bd1cc8c6	forgot one	2022-03-02 17:47:48 +01:00
Ulrich Mohr	2f51f58c7e	Merge branch 'develop' into mohr/catch2	2022-03-02 17:12:24 +01:00
Robin Mueller	33483b81a6	update generator scripts	2022-03-01 18:05:11 +01:00
Robin Mueller	3b1f088596	use OSAL define instead of dedicated define	2022-03-01 17:57:48 +01:00
Jakob Meier	f88674ed59	applied clang formatting	2022-02-27 15:48:42 +01:00
Jakob Meier	dfd817d27b	refactored star tracker handler	2022-02-27 15:46:06 +01:00
Jakob Meier	e61dfc0401	fixed conflicts	2022-02-25 14:39:18 +01:00
Robin Mueller	33ff05c558	Merge remote-tracking branch 'origin/develop' into mueller/pl-pcdu-prep	2022-02-24 23:46:06 +01:00
Robin Mueller	5bf4e50849	clean up includes	2022-02-24 12:02:23 +01:00
Robin Mueller	768bb14842	minor tweaks	2022-02-24 11:57:35 +01:00
Robin Mueller	0b215bf7e0	use radfet enable pin now	2022-02-24 11:47:32 +01:00
Robin Mueller	9f60c82725	intermediate PR	2022-02-23 19:26:02 +01:00
Jakob Meier	b822ee77bc	star tracker firmware update	2022-02-23 18:15:34 +01:00
Robin Mueller	f5c1263dd3	now it compiles	2022-02-22 20:47:09 +01:00
Ulrich Mohr	3400c538b3	added EventManagerMock, to be extended and moved into fsfw some day	2022-02-16 18:15:06 +01:00
Ulrich Mohr	91e0e9f233	Merge branch 'develop' into mohr/startracker ... Conflicts: CMakeLists.txt cmake/PreProjectConfig.cmake linux/fsfwconfig/events/translateEvents.cpp	2022-02-16 15:21:24 +01:00
Jakob Meier	7adff2c9a8	firmware update wip	2022-02-14 11:28:15 +01:00
Jakob Meier	685b9cd1fb	fixed conflicts	2022-02-11 15:09:45 +01:00
Ulrich Mohr	50cf01376f	Merge branch 'develop' into mohr/cmake	2022-02-10 16:22:28 +01:00
Ulrich Mohr	4d154b7cee	reworked cmake, unfortunately a big one due to interdependence ... - /mission is a library now, in preparation of unittests (which bring their own main) - eive-simple is now only available in bsp=arm/q7s (but is still not compiling) - watchdog and simple are their own executables, not configurations any more - moved some q7s specific code into /bsp-q7s to flatten if-hierarchy in main CMakeLists.txt - compiler and linker options are not globally applied to all targets - linux is the default fsfw osal now, as current code does not compile on hosted	2022-02-09 21:38:56 +01:00
Jakob Meier	328a3b2d02	define fix	2022-02-08 13:11:54 +01:00
Jakob Meier	92eb403e35	egse define fiX	2022-02-08 13:09:50 +01:00
Jakob Meier	4823496b58	fixed conflicts	2022-02-08 10:34:23 +01:00
Jakob Meier	83d99a6662	run clang format script	2022-02-05 18:08:54 +01:00
Jakob Meier	bb8ccd2842	fixed conflicts	2022-02-05 16:17:01 +01:00
Jakob Meier	b4d1046928	obsw configuration running on egse	2022-02-05 15:39:16 +01:00
Jakob Meier	e67bcd4e26	setup egse project	2022-02-05 13:19:20 +01:00
Robin Mueller	c42b3f56c3	applied clang-format	2022-02-04 17:48:05 +01:00
Robin Mueller	b8011717f7	fix which adds back descriptions	2022-02-03 17:31:33 +01:00
Robin Mueller	5aa800af6e	added back more events	2022-02-03 17:14:28 +01:00
Robin Mueller	4000c35299	added back more events	2022-02-03 17:10:11 +01:00
Robin Mueller	39471d8261	added back some events	2022-02-03 17:06:40 +01:00
Robin Mueller	2cdd192eeb	fix decode error with imtq defintions	2022-02-03 16:25:16 +01:00
Robin Mueller	a77d5f3669	tested cfg set request	2022-02-03 15:31:18 +01:00
Robin Mueller	9bf3e46e3c	tested some commands	2022-02-03 15:03:35 +01:00
Robin Mueller	e142408bb8	bpx handler now working	2022-02-03 13:37:48 +01:00
Robin Mueller	6440567585	update event list	2022-02-03 12:03:47 +01:00
Robin Mueller	344390da14	bugfixes	2022-02-03 12:02:25 +01:00
Robin Mueller	7d5b4325e2	add bpx handler in I2C PST	2022-02-02 17:38:14 +01:00
Robin Mueller	988a5e6b31	battery handler not created	2022-02-02 17:36:40 +01:00
Robin Mueller	9cdc67ad6c	Merge remote-tracking branch 'origin/develop' into mueller/master	2022-02-02 09:43:58 +01:00
Jakob Meier	d91ceb6fa7	idented preprocessor define	2022-02-01 11:47:04 +01:00
Jakob Meier	4edbbf223c	firmware update wip	2022-02-01 11:45:22 +01:00
Robin Mueller	4050521e5a	added GNSS select pin	2022-02-01 11:17:00 +01:00
Jakob Meier	c1726f897b	dynamic switching of cadu data sample time and clock manipulation	2022-01-30 17:16:17 +01:00
Robin Mueller	521b47d9fc	decoupled IMTQ handler from OBSWConfig.h	2022-01-27 15:29:58 +01:00
Robin Mueller	26d66d2a36	issues with IMTQ	2022-01-27 15:26:07 +01:00
Robin Mueller	a9c93db790	updated tmtc, IMTQ switch cmd added	2022-01-27 15:06:36 +01:00
Jakob.Meier	745526ce8a	Merge pull request 'PCDU switch callback' (#128) from mueller/pcdu-switch-callback into develop ... Reviewed-on: #128 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-01-19 19:46:56 +01:00
Robin Mueller	262837bf0b	Merge remote-tracking branch 'origin/develop' into mueller/pcdu-switch-callback	2022-01-19 18:18:41 +01:00
Robin Mueller	c88371b37a	Merge remote-tracking branch 'origin/develop' into flipped-tmtctest-preproc-define	2022-01-19 18:10:12 +01:00
Robin Mueller	1eb6017a9d	callback working	2022-01-19 18:05:17 +01:00
Robin Mueller	947134bfd1	reordered	2022-01-19 14:39:39 +01:00
Robin Mueller	32236f9864	and another name	2022-01-19 14:34:20 +01:00
Robin Mueller	eb23dc1b0f	better names	2022-01-19 14:29:03 +01:00
Robin Mueller	5bd4f56bc6	flipped preproc defines	2022-01-19 14:17:55 +01:00
Robin Mueller	a50f852b9d	Merge remote-tracking branch 'origin/develop' into mueller/clang-formatting-applied	2022-01-19 11:52:06 +01:00
Robin Mueller	5cc7331e90	applied clang formatting	2022-01-18 11:41:19 +01:00
Robin Mueller	77c45c0de9	applied formatting	2022-01-17 15:58:27 +01:00
Jakob Meier	870dd717e4	tmtc update	2022-01-17 15:48:13 +01:00
Jakob Meier	643584e1c5	rerun generator scripts	2022-01-17 15:36:37 +01:00
Jakob Meier	952dfde5b7	bug fixes in star tracker handler	2022-01-17 08:40:56 +01:00
Robin Mueller	3b9959b8b3	removed gps from pst	2022-01-15 13:51:27 +01:00
Robin Mueller	70ab486081	removed GPS flags	2022-01-15 13:50:21 +01:00
Jakob Meier	1133ea08c8	ploc mpsoc handler improved tc mem read	2022-01-11 17:58:59 +01:00
Robin Mueller	d8ec051e13	stuff	2022-01-11 10:55:26 +01:00
Jakob Meier	996a8a226e	flash write wip	2022-01-06 18:05:21 +01:00
Jakob Meier	ee0d3bb446	Merge branch 'meier/startracker' into meier/plocMPSoC	2022-01-03 09:14:42 +01:00
Jakob Meier	f6a0fcbe0b	merged develop	2022-01-03 08:07:47 +01:00
Jakob Meier	632759bf8a	improvements in ploc mpsoc handler	2022-01-03 08:01:55 +01:00
Robin Mueller	7a28cba71b	Merge branch 'mueller/master' into mueller/gnss-update	2022-01-02 10:38:22 +01:00
Jakob Meier	e26ffb6afd	fpga download image command	2021-12-29 20:33:20 +01:00
Robin Mueller	940c770b44	Merge remote-tracking branch 'origin/develop' into mueller/master	2021-12-22 15:25:06 +01:00
Robin Mueller	861d92f3c2	update uart device names	2021-12-21 18:13:20 +01:00
Jakob Meier	337a485fc1	rerun generators	2021-12-21 17:27:23 +01:00
Robin Mueller	636c1fdf26	added GNSS enable pin handling	2021-12-20 13:37:28 +01:00
Jakob Meier	e3841d180e	merged develop	2021-12-19 12:15:18 +01:00
Robin Mueller	e442a8c968	ACS and TCS board working together now	2021-12-17 14:20:22 +01:00
Robin Mueller	481756b014	fix script, experiment with timing	2021-12-15 11:49:50 +01:00
Robin Mueller	5ae6a61ec0	fixes for gyro adis handler	2021-12-15 10:15:06 +01:00
Jakob Meier	5067519b8a	fixed merge conflicts	2021-12-14 19:57:35 +01:00
Jakob Meier	717f2e21a0	star tracker improvements	2021-12-14 19:24:31 +01:00
Robin Mueller	5fadb8f86d	moved heater handler	2021-12-14 17:35:21 +01:00
Robin Mueller	af32941352	ADIS device handler can now handle multiple types ... - Added handling for ADIS16507 and ADIS16505 type	2021-12-10 17:46:52 +01:00
Jakob Meier	f9581f3100	command to reset error signal	2021-12-10 10:07:23 +01:00
Jakob Meier	e64a3fb645	rerun generators	2021-12-09 15:02:30 +01:00
Robin Mueller	54e5fef8fd	update to updated fsfw	2021-12-09 13:43:28 +01:00
Robin Mueller	11704ea908	enabled ACS board A side	2021-12-08 14:48:29 +01:00
Jakob Meier	fac6996a15	star tracker limits setting	2021-12-06 19:36:21 +01:00
Jakob Meier	077913400f	star tracker image helper	2021-11-29 11:04:56 +01:00
Robin Mueller	14ba11738b	adapted event name	2021-11-25 14:09:06 +01:00
Robin Mueller	fa89da4438	update event list	2021-11-25 14:07:05 +01:00
Robin Mueller	be75332be7	update event list	2021-11-25 14:03:21 +01:00
Jakob Meier	542aa994b7	link state now detected by bit and carrier lock flags	2021-11-24 15:55:25 +01:00
Jakob Meier	345ccf5392	transmit enable and timeout	2021-11-22 18:01:16 +01:00
Jakob Meier	ec7568337c	object parser	2021-11-22 17:58:24 +01:00
Jakob Meier	c2dbebe56b	gen events	2021-11-22 17:57:33 +01:00
Jakob Meier	63965e2f68	enabled rx lines of syrlinks rs485 transceiver chips	2021-11-21 13:59:18 +01:00
Robin Müller	0f3e9de2b0	Merge branch 'develop' into meier/pdec	2021-11-09 23:01:20 +01:00
Jakob Meier	556a3986c1	pdec handler	2021-11-01 12:41:20 +01:00
Jakob Meier	017e02e513	changes applied during flatsat debugging	2021-10-29 19:11:46 +02:00
Robin Mueller	dac3068437	updated object translations	2021-10-13 15:54:30 +02:00
Robin Mueller	0237a22ae9	using old names again	2021-10-13 15:42:55 +02:00
Robin Mueller	30cf0c7aad	ADIS devices working now	2021-10-12 18:34:04 +02:00
Robin Mueller	dcdf0c9843	updated object translation file	2021-10-12 18:03:00 +02:00
Robin Mueller	7c673d6e7f	bugfixes in max31685, indexing adapted	2021-10-12 17:55:36 +02:00
Robin Mueller	221012f790	hosted build compiling again	2021-10-11 19:34:34 +02:00
Jakob Meier	5da2a45881	gpios to enable rs485 tx clock and tx data	2021-10-08 14:15:33 +02:00
Jakob Meier	c5c7a895a4	fixed merge conflicts	2021-10-08 11:40:46 +02:00
Jakob Meier	18f7d3e3c9	tm now sent over PTME	2021-10-07 17:23:41 +02:00
Jakob Meier	7f70673625	Merge branch 'develop' into meier/ptme	2021-10-04 15:07:58 +02:00
Jakob Meier	3ca18a42ad	live tm variable	2021-09-30 09:34:01 +02:00
Jakob Meier	55d31d0dc2	ccsds handler	2021-09-29 14:47:20 +02:00
Robin Mueller	f61d0e83f0	refactoring for added unittests	2021-09-29 10:52:36 +02:00
Robin Mueller	7fd5b6b39e	Merge remote-tracking branch 'origin/develop' into mueller/master	2021-09-27 10:07:29 +02:00
Jakob Meier	5b26564058	ptme ip core packet insertion	2021-09-26 08:29:30 +02:00
Robin Mueller	c0dde1a005	define renamed	2021-09-25 16:38:39 +02:00
Jakob Meier	773627dc3d	fixed merge conflicts	2021-09-25 11:57:33 +02:00
Jakob Meier	9fd4c477f0	changed all gpio configurations to open by line name	2021-09-25 10:49:03 +02:00
Robin Mueller	0e43969b63	dont start empty PST	2021-09-23 17:34:01 +02:00
Jakob Meier	d6164971df	Merge branch 'develop' into meier/openGpioByName	2021-09-23 17:14:12 +02:00
Robin Mueller	aa71159a9a	A side enabled by default	2021-09-23 14:45:42 +02:00
Robin Mueller	e56a30df06	HW bug fixes, board should work cleanly now	2021-09-23 13:13:46 +02:00
Jakob Meier	c035a26051	gpio open by line name test on te0720	2021-09-23 10:51:47 +02:00
Jakob Meier	d54e2276d6	ccsds handler wip	2021-09-22 16:54:55 +02:00
Robin Mueller	ee878d9fe9	bugfix EIVE PST	2021-09-22 16:14:33 +02:00
Robin Mueller	0b50d9aedf	fix for ADIS device	2021-09-22 16:00:31 +02:00
Robin Mueller	4131084973	several tweaks and fixes	2021-09-22 15:43:11 +02:00
Robin Mueller	9a16544836	cleaning up RPi code	2021-09-22 14:04:39 +02:00
Robin Mueller	f9050ab185	fixes for RPi code	2021-09-22 12:19:45 +02:00
Robin Mueller	d6e22e7d4d	trying other timing	2021-09-22 11:48:56 +02:00
Robin Mueller	e1ae1c021a	made more spi devices optional	2021-09-22 11:45:25 +02:00
Robin Mueller	28040f85cc	fixes for new gpio update	2021-09-21 19:28:22 +02:00
Robin Mueller	3a76ee366d	Merge remote-tracking branch 'origin/develop' into mueller/master	2021-09-21 16:03:39 +02:00
Jakob Meier	e2c26efe4a	Merge branch 'meier/gpioNaming' into meier/ptme	2021-09-20 19:11:22 +02:00
Jakob Meier	804afa5d96	add test code now default 0	2021-09-20 18:15:35 +02:00
Jakob Meier	38903f647b	Merge branch 'develop' into meier/gpioNaming	2021-09-20 16:31:15 +02:00
Jakob Meier	cd92f4a611	open gpio by label test on te0720	2021-09-20 16:30:50 +02:00
Robin Mueller	cf9ff87560	bugfixes for new print commands	2021-09-20 14:34:39 +02:00
Jakob Meier	ddd8ff2180	ptme handling wip	2021-09-19 12:27:48 +02:00
Robin Mueller	87d00dbcee	some more acs board tests	2021-09-17 16:53:15 +02:00
Robin Mueller	5cb6ab8416	more acs tests	2021-09-17 13:08:03 +02:00
Robin Mueller	48a8a52b1c	moved lis3mdl to fsfw	2021-09-16 18:51:06 +02:00
Robin Mueller	8dcd2f0c95	some cfg improvements	2021-09-16 17:33:47 +02:00
Robin Mueller	00bafd98fe	obsw config, gps update	2021-09-16 17:24:34 +02:00
Robin Mueller	00711c148a	rm3100 changes	2021-09-16 13:40:29 +02:00
Robin Mueller	bdd5a7dd21	more storage for events	2021-09-15 18:50:23 +02:00
Robin Mueller	df5b0a19de	improved preprocessor defines	2021-09-15 17:38:26 +02:00
Robin Mueller	c7d0a9551e	small bugfix for rm3100	2021-09-15 17:26:23 +02:00
Robin Mueller	39acc24535	testing ADIS handler	2021-09-15 13:41:13 +02:00
Robin Mueller	3354f2a696	acd board tests continued	2021-09-13 18:07:07 +02:00
Robin Mueller	c67a7ef1d8	added more package pin comments	2021-09-13 11:48:11 +02:00
Robin Mueller	3b3b2ed8c3	preproc define to log NMEA data	2021-09-07 12:00:22 +02:00
Robin Mueller	ed6ee02861	Merge remote-tracking branch 'origin/develop' into mueller/gnss-acs-update	2021-09-06 11:12:14 +02:00
Robin Mueller	94979e3561	pulling reset pin gnss high	2021-09-02 20:27:12 +02:00
Robin Mueller	146035de5a	Merge remote-tracking branch 'origin/develop' into mueller/master	2021-09-02 09:14:28 +02:00
Jakob.Meier	0f79864446	ploc memory dumper complete	2021-08-31 11:20:21 +02:00
Robin Mueller	90622eb25a	important fixes	2021-08-23 20:38:18 +02:00
Robin Mueller	d1a25bfa65	bugfixes hyperion handler	2021-08-22 20:25:05 +02:00
Robin Mueller	dc0c8c704c	debugging GPS: uart is blocking!	2021-08-20 20:18:56 +02:00
Robin Mueller	bb58281fba	minor fix for gps	2021-08-20 18:48:05 +02:00
Robin Mueller	5b9811a950	disabled all devices except for ADIS device	2021-08-20 15:46:51 +02:00
Robin Mueller	e9849bfedd	some fixes	2021-08-20 15:25:02 +02:00
Robin Mueller	6ecd4ec2f3	pin fixes for ACS board	2021-08-20 14:50:40 +02:00
Jakob.Meier	333c46bdf8	adaptions to build ploc supervisor for trenz te0720	2021-08-20 14:48:22 +02:00
Robin Mueller	23782dc2fa	Device update ... 1. Sun sensors added but can be disabled with preprocessor defines 2. GPS Handler	2021-08-20 14:08:11 +02:00
Jakob.Meier	95b49ca49d	update tmtc and arcsec submodule	2021-08-20 13:56:43 +02:00
IRS Cleanroom Laptop	2f72b4e42a	cleaned up	2021-08-17 19:50:48 +02:00
IRS Cleanroom Laptop	e98b985d66	cleaning up preproc defines	2021-08-17 17:48:51 +02:00
IRS Cleanroom Laptop	aa248b7997	new busConf file, cleaning up	2021-08-17 17:11:59 +02:00
IRS Cleanroom Laptop	921e82f6d1	acs board tweaks	2021-08-17 16:35:41 +02:00
Jakob.Meier	be6056aadb	adaptions to build software for Trenz TE0720	2021-08-17 16:14:23 +02:00
Jakob.Meier	5204afca9e	pcdu debug output disabled now	2021-08-17 12:00:58 +02:00
Jakob.Meier	1722f14a60	added debug output for pcdu modules	2021-08-17 11:59:32 +02:00
Robin Mueller	0ae55e0783	no ARCSEC lib for Raspberry Pi	2021-08-11 18:13:43 +02:00
Robin Mueller	3b915f4c97	Merge remote-tracking branch 'origin/develop' into mueller/master	2021-08-09 16:45:32 +02:00
Robin Mueller	1d714ff85e	Moved PLOC components to q7s folder	2021-08-09 16:30:59 +02:00
Robin Mueller	444389a41c	Merge remote-tracking branch 'origin/develop' into mueller/non-blocking-sd-card-init	2021-08-09 11:20:28 +02:00
Jakob.Meier	dc3dfa1292	ploc updater	2021-08-08 15:02:59 +02:00
Robin Mueller	f0e282c6e1	continued a bit	2021-08-05 18:37:14 +02:00
Jakob.Meier	0315a2a3d5	merged develop	2021-08-04 13:22:44 +02:00
Jakob.Meier	c431deede0	ploc udpdater wip	2021-08-04 10:20:36 +02:00
Robin Mueller	9790b395e6	include replacements	2021-08-03 15:58:01 +02:00
Robin Mueller	9edd6fc3be	supplying project string now	2021-08-02 13:02:50 +02:00
Robin Mueller	009234612a	updated retval list	2021-08-02 12:50:36 +02:00
Robin Mueller	528b3c8610	updated object file generator	2021-08-02 11:49:00 +02:00
Robin Mueller	4b4cfc09c5	update fsfwgen	2021-08-02 11:43:49 +02:00
Robin Mueller	ff86c8af73	watchdog handling finished	2021-07-29 16:31:04 +02:00
Robin Mueller	261fc8b58f	moved config flag to cmmon config	2021-07-26 13:51:00 +02:00
Robin Mueller	2a5f824161	UDP remains default for now	2021-07-26 11:47:45 +02:00
Robin Mueller	be6ae6b7ae	added TCP support	2021-07-26 11:33:38 +02:00
Jakob.Meier	0ce55d5e62	fixed conflicts	2021-07-23 18:04:51 +02:00
Jakob.Meier	a2e62b28c3	fixed merge conflicts	2021-07-23 17:48:11 +02:00
Jakob.Meier	80665a3cc5	fixed merge conflicts	2021-07-23 14:36:15 +02:00