402 Commits

Author	SHA1	Message	Date
Jakob Meier	47a3804145	fixed conflicts	2022-03-26 10:41:30 +01:00
Cleanroom Laptop L15	9351c8285b	rerun generators	2022-03-25 18:53:48 +01:00
Cleanroom Laptop L15	2f6d9ab7f1	fixed merge conflicts	2022-03-25 18:49:34 +01:00
Cleanroom Laptop L15	931c53f1a6	corrections during e-band test	2022-03-25 12:57:42 +01:00
Robin Mueller	017eaf07f5	added new event	2022-03-22 20:43:34 +01:00
Robin Mueller	5fb4e468ba	update object list, bugfix	2022-03-22 19:33:49 +01:00
Robin Mueller	c21dae1afc	Merge remote-tracking branch 'origin/develop' into mueller/tcs-subsystem	2022-03-22 17:59:55 +01:00
Robin Mueller	1c7601aa1c	set test flag for rad sensor to 0	2022-03-22 14:31:24 +01:00
Robin Mueller	bcd97076e1	started TCS subsystem	2022-03-22 11:57:48 +01:00
Robin Mueller	e4d1cdafcc	various smaller bugfixes	2022-03-22 11:07:31 +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
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
Jakob Meier	b8fb5c289c	fix in mem write command	2022-03-17 19:51:00 +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	3c1055f988	.h.in file fix	2022-03-17 10:22:53 +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	40d9829700	Major update for power handling ... and various smaller updates	2022-03-16 20:13:21 +01:00
Jakob Meier	f8f7848200	run generator scripts	2022-03-14 18:43:16 +01:00
Robin Mueller	8e3f40a780	Merge remote-tracking branch 'origin/develop' into mueller/system-subsystems	2022-03-14 17:48:20 +01:00
Jakob Meier	9fc1e57943	fixed conflicts	2022-03-14 14:35:07 +01:00
Jakob Meier	d99825e20e	core housekeeping	2022-03-13 16:32:40 +01:00
Robin Mueller	dd37f90b47	update for gen scripts, small fixes	2022-03-11 14:33:09 +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	62229cb999	bugfixes for NORMAL to OFF transition	2022-03-07 18:39:33 +01:00
Robin Mueller	597ab9c74c	update event list again	2022-03-07 17:10:30 +01:00
Robin Mueller	b9139d5c40	update event list	2022-03-07 17:03:08 +01:00
Robin Mueller	e678b53452	switch initialization is now optional (default on)	2022-03-07 15:55:26 +01:00
Robin Mueller	a2fee43c8c	Merge remote-tracking branch 'origin/develop' into mueller/system-subsystems	2022-03-07 15:44:18 +01:00
Robin Mueller	2ef1befb9c	common gpioIds.h file	2022-03-07 15:29:27 +01:00
Robin Mueller	b53900071c	subsystem ID bugfix	2022-03-07 13:20:17 +01:00
Robin Mueller	d5c755a331	update events and objects	2022-03-07 11:36:40 +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	59b89b730d	bump fsfwgen dependency	2022-03-07 11:34:32 +01:00
Robin Mueller	debc72014a	regenerate object and events	2022-03-07 11:08:50 +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
Robin Mueller	cbb8103278	some more bugfixes	2022-03-04 18:33:23 +01:00
Robin Mueller	0904cadde5	continued ACS board assembly	2022-03-04 18:12:16 +01:00
Robin Mueller	4eb948c5ef	start acs task	2022-03-04 16:03:57 +01:00
Robin Mueller	8054694763	update for generator scripts ... - Generators will now copy csv files into tmtc folder - Bump fsfwgen dependency, some bugfixes - Rerun formatter - Rerun generator scripts	2022-03-04 15:14:02 +01:00
Robin Müller	c4ed263e6c	Merge branch 'develop' into mueller/system-subsystems	2022-03-04 14:52:12 +01:00
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