936 Commits

Author	SHA1	Message	Date
Robin Mueller	9f60c82725	intermediate PR	2022-02-23 19:26:02 +01:00
Robin Mueller	7ae2d7117e	deleted former file ,inc fix	2022-02-23 19:12:41 +01:00
Robin Mueller	10e2600415	moved gps handler and deployment handler	2022-02-23 19:08:12 +01:00
Jakob.Meier	2551e673d8	Merge pull request 'adaptions to updated fsfw' (#150) from mueller/pass-mq-args into develop ... Reviewed-on: #150 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-02-23 18:48:16 +01:00
Robin Mueller	d5b22ca636	small fix in obj factory	2022-02-22 20:50:56 +01:00
Robin Mueller	f5c1263dd3	now it compiles	2022-02-22 20:47:09 +01:00
Robin Mueller	d27a57ab28	adaptions to updated fsfw	2022-02-22 20:27:13 +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
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	83d99a6662	run clang format script	2022-02-05 18:08:54 +01:00
Jakob Meier	68d56c4cd3	star tracker files moved to linux directory	2022-02-05 18:06:18 +01:00
Jakob Meier	bb8ccd2842	fixed conflicts	2022-02-05 16:17:01 +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	9456dc1a00	applied auto-formatter	2022-02-03 16:04:24 +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	344390da14	bugfixes	2022-02-03 12:02:25 +01:00
Robin Mueller	988a5e6b31	battery handler not created	2022-02-02 17:36:40 +01:00
Robin Mueller	dd822f9c44	apply clang script	2022-02-02 13:09:46 +01:00
Robin Mueller	d6e256a5d2	Merge branch 'mueller/master' into mueller/bpx-handler	2022-02-02 13:09:23 +01:00
Robin Mueller	9cdc67ad6c	Merge remote-tracking branch 'origin/develop' into mueller/master	2022-02-02 09:43:58 +01:00
Robin Mueller	4050521e5a	added GNSS select pin	2022-02-01 11:17:00 +01:00
Jakob Meier	bae1ea7c97	str helper progress print	2022-02-01 10:45:07 +01:00
Jakob Meier	1651926efa	applied clanf formatting	2022-01-31 08:09:58 +01:00
Jakob Meier	c1726f897b	dynamic switching of cadu data sample time and clock manipulation	2022-01-30 17:16:17 +01:00
Jakob Meier	ab4b397918	some fixed after blob set was removed	2022-01-29 12:42:40 +01:00
Jakob Meier	6043a827ed	removed blob command	2022-01-29 12:27:26 +01:00
Jakob.Meier	6be7cb4d0c	some adaptions to new firmware	2022-01-28 12:43:26 +01:00
Robin Mueller	3bd4c57b85	replaced all names	2022-01-27 18:32:54 +01:00
Robin Mueller	b1e716788a	renamed GPS controller	2022-01-27 18:29:31 +01:00
Robin Mueller	0a315f203b	renamed some deivces	2022-01-27 18:29:14 +01:00
Robin Mueller	8ee3e18327	updatre q7s-cp utility	2022-01-27 17:30:28 +01:00
Robin Mueller	0b9b24ca08	try new symlink for eive-i2c	2022-01-27 17:06:21 +01:00
Robin Mueller	ef48c8c6ad	correction for i2c device	2022-01-27 16:08:53 +01:00
Robin Mueller	3207d25bd3	weird errors when going to normal mode	2022-01-27 16:04:45 +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	5c535784e9	added back old GPS handler	2022-01-26 17:59:31 +01:00
Robin Mueller	bf73a2e442	increased the stack size for the GPS controller	2022-01-26 17:52:28 +01:00
Robin Mueller	9998b54f89	hyperion handler working now	2022-01-26 16:35:42 +01:00
Robin Mueller	604424c7ed	Merge remote-tracking branch 'origin/develop' into mueller/master	2022-01-26 16:00:22 +01:00
Jakob Meier	102385a707	introduced axi configuration interface for ptme ip core	2022-01-25 18:55:52 +01:00
Jakob Meier	38a1b496e7	papb interface no longer a system object	2022-01-25 14:33:06 +01:00
Jakob Meier	a07468f7b7	introduced uio mapper class	2022-01-24 16:33:22 +01:00
Jakob Meier	a56224c339	ptme axi interface	2022-01-24 07:43:14 +01:00
Robin Mueller	b3ca5ac6f2	Merge remote-tracking branch 'origin/mueller/pcdu-switch-callback' into mueller/master	2022-01-19 18:42:54 +01:00
Robin Mueller	c35c94f22b	Merge branch 'mueller/master' into mueller/bpx-handler	2022-01-19 18:28:38 +01:00
Robin Mueller	c9787f8e47	Merge remote-tracking branch 'origin/develop' into mueller/master	2022-01-19 18:27:37 +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	68eb7c9271	removed clang script in root	2022-01-19 18:11:35 +01:00
Robin Mueller	1eb6017a9d	callback working	2022-01-19 18:05:17 +01:00
Robin Mueller	f948905aa2	implemented first switch callback	2022-01-19 17:10:51 +01:00
Robin Mueller	dc6a2ffe56	minor ADIS updates	2022-01-19 14:08:30 +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	50e17bc160	disabled acs task, crashes..	2022-01-18 14:20:18 +01:00
Robin Mueller	77c45c0de9	applied formatting	2022-01-17 15:58:27 +01:00
Robin Mueller	975b3cd294	added clang script and forward declarations	2022-01-17 15:57:52 +01:00
Jakob Meier	870dd717e4	tmtc update	2022-01-17 15:48:13 +01:00
Robin Mueller	ce6c9d4613	Merge remote-tracking branch 'origin/develop' into mueller/gps-tests	2022-01-17 15:38:44 +01:00
Robin Mueller	3a274e7a9b	apply clang format	2022-01-17 15:35:46 +01:00
Jakob Meier	5a210e19e1	request limits, camera and blob parameters	2022-01-17 15:28:53 +01:00
Robin Mueller	384122f811	started BPX handler	2022-01-17 15:03:46 +01:00
Robin Mueller	9438ba8dcc	forward declaration fixes	2022-01-17 13:50:24 +01:00
Robin Mueller	e6d8d24cd5	applied clang formatting	2022-01-17 13:48:55 +01:00
Jakob Meier	abfc120633	command to request camera parameters	2022-01-17 13:15:18 +01:00
Robin Mueller	969251d9fa	new ACS ctrl task	2022-01-17 11:38:21 +01:00
Jakob Meier	952dfde5b7	bug fixes in star tracker handler	2022-01-17 08:40:56 +01:00
Robin Mueller	a706f6d9bd	using test booleans	2022-01-15 13:09:33 +01:00
Robin Mueller	e73dc2f191	gps test worked	2022-01-15 13:05:11 +01:00
Jakob Meier	3421c6fcbf	adapted to develop	2022-01-14 10:20:21 +01:00
Markus Koller	d0807ed262	Merge branch 'develop' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into develop	2022-01-13 14:02:51 +01:00
Jakob Meier	1133ea08c8	ploc mpsoc handler improved tc mem read	2022-01-11 17:58:59 +01:00
Jakob Meier	f0bf743f88	improved sequence count	2022-01-11 12:56:02 +01:00
Robin Mueller	64ac41d1fe	initialize variable	2022-01-11 11:04:23 +01:00
Robin Mueller	d8ec051e13	stuff	2022-01-11 10:55:26 +01:00
Robin Mueller	1f5553b571	convert gps handler base class ... - Is ExtendedControllerBase now	2022-01-11 10:16:26 +01:00
Jakob Meier	0f0f5e2fcb	mpsoc sequence count restructured	2022-01-10 16:18:18 +01:00
Jakob Meier	45c7f9555d	flash write wip	2022-01-07 09:50:04 +01:00
Jakob Meier	f8eebe2e7d	flash write wip	2022-01-07 09:48:56 +01:00
Jakob Meier	996a8a226e	flash write wip	2022-01-06 18:05:21 +01:00
Jakob Meier	7fae7afdf6	removed unsued variable	2022-01-06 10:22:18 +01:00
Jakob Meier	b0df5b9439	flash close command	2022-01-06 10:12:08 +01:00
Jakob Meier	305e63cf4e	mpsoc flash fopen command	2022-01-05 11:26:01 +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	7e0510115a	adapted uart device files	2022-01-01 15:53:44 +01:00
Jakob Meier	b59abb55fe	fixed device file number for mpsoc uart	2022-01-01 15:35:08 +01:00
Jakob Meier	8b8a1554a5	header fix issue with case sensitivity	2022-01-01 11:25:00 +01:00
Jakob Meier	1aca0b4499	typo	2022-01-01 11:16:11 +01:00
Jakob Meier	ac51ad7a4f	some improvements	2021-12-30 13:31:34 +01:00
Jakob Meier	29e7ac210a	upload fpga image command	2021-12-30 12:52:08 +01:00
Jakob Meier	e26ffb6afd	fpga download image command	2021-12-29 20:33:20 +01:00
Jakob Meier	2ea75d2a05	erase command	2021-12-24 07:31:21 +01:00
Jakob Meier	14dec1d700	checksum command	2021-12-23 18:33:31 +01:00
Jakob Meier	fa8cdb3241	changed star tracker uart	2021-12-23 18:33:06 +01:00
Jakob Meier	8cddbf86d9	flash read command	2021-12-23 11:07:19 +01:00
Jakob Meier	1331c9e7e9	flash read request	2021-12-22 16:06:30 +01:00
Robin Mueller	940c770b44	Merge remote-tracking branch 'origin/develop' into mueller/master	2021-12-22 15:25:06 +01:00
Jakob Meier	8a104c4af2	Merge branch 'meier/startrackerFlashread' into meier/startracker	2021-12-22 11:25:22 +01:00
Jakob Meier	72cc081098	fixed header names	2021-12-22 11:17:50 +01:00
Jakob Meier	38ad9f0da2	flash read wip	2021-12-22 11:14:27 +01:00
Robin Mueller	433b218227	added new GNSS mux select pin	2021-12-21 18:29:27 +01:00
Robin Mueller	433947824a	removed spi mux switching, not necessary anymore	2021-12-21 18:28:46 +01:00
Robin Mueller	861d92f3c2	update uart device names	2021-12-21 18:13:20 +01:00
Jakob Meier	421866b739	str write command fix	2021-12-21 17:28:24 +01:00
Jakob Meier	36d33711a7	flash write command	2021-12-21 15:46:09 +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
Jakob Meier	428d2562ac	Merge branch 'meier/startrackerActions' into meier/startracker	2021-12-19 11:29:58 +01:00
Jakob Meier	72c0503ac1	changed deserialization method for star tracker datasets	2021-12-19 11:29:40 +01:00
Jakob Meier	654e75fec8	histogram tm disabled validity buffer for deserialization	2021-12-18 11:33:29 +01:00
Robin Mueller	e442a8c968	ACS and TCS board working together now	2021-12-17 14:20:22 +01:00
Jakob Meier	2ed0bdf132	acu print stats	2021-12-17 10:45:55 +01:00
Jakob Meier	4dee8658fd	histogram and contrast telemetry set	2021-12-15 19:32:43 +01:00
Robin Mueller	64ab445f4e	initialize values	2021-12-15 11:55:47 +01:00
Robin Mueller	5a0563a7e8	reverted pst freq	2021-12-15 11:23:20 +01:00
Robin Mueller	9e6ad8807a	clear fault bit for max31865 devies	2021-12-15 11:20:28 +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
Jakob Meier	74f52632f6	increased frequency of pst tasks	2021-12-14 19:23:47 +01:00
Robin Mueller	1f6dbd181c	moved heater handler	2021-12-14 17:38:23 +01:00
Robin Mueller	985ef0f6bc	wrong object ID	2021-12-14 17:18:31 +01:00
Jakob Meier	86581d81c9	interpretation of empty value strings in json	2021-12-13 09:40:37 +01:00
Jakob Meier	9c42b861f4	timestamp for file creation	2021-12-11 11:56:47 +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	1895d7c3db	fix in image upload function	2021-12-09 15:02:58 +01:00
Robin Mueller	54e5fef8fd	update to updated fsfw	2021-12-09 13:43:28 +01:00
Jakob Meier	99c450933e	fix in validation command	2021-12-08 14:39:25 +01:00
Jakob Meier	b691a1e75d	parsing of arcsec json file complete	2021-12-08 12:50:55 +01:00
Jakob Meier	58c40695ae	star tracker commands, tracking, mounting, camera, blob	2021-12-07 16:30:17 +01:00
Jakob Meier	fac6996a15	star tracker limits setting	2021-12-06 19:36:21 +01:00
Jakob Meier	ed8399ef9a	Merge branch 'meier/syrlinks' into meier/StarTracker	2021-12-02 13:55:03 +01:00
Markus Koller	5c1c0dc515	Merge branch 'develop' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into develop	2021-12-02 09:34:47 +01:00
Jakob Meier	a7ab2bb93a	str img loader wip	2021-12-02 08:05:33 +01:00
Robin Mueller	77f6ac57e9	some reaction wheel fixes	2021-11-30 16:45:33 +01:00
Jakob Meier	8c649b3e70	str image loader wip	2021-11-30 16:01:02 +01:00
Jakob Meier	1affc1e1d3	str image helper, step failure handling	2021-11-29 15:02:14 +01:00
Jakob Meier	077913400f	star tracker image helper	2021-11-29 11:04:56 +01:00
Jakob Meier	007126feff	Merge branch 'develop' into meier/StarTracker	2021-11-26 09:15:38 +01:00
Robin Mueller	5b412bf072	implemented rename function	2021-11-25 21:38:13 +01:00
Robin Mueller	1886c69e0b	Merge remote-tracking branch 'origin/develop' into mueller/master	2021-11-25 13:55:40 +01:00
Jakob Meier	23d9f56308	star tracker startup immediately	2021-11-25 08:24:24 +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	dc0f435dbd	bit rate setter	2021-11-21 18:07:05 +01:00
Jakob Meier	63965e2f68	enabled rx lines of syrlinks rs485 transceiver chips	2021-11-21 13:59:18 +01:00
Robin Mueller	c1be4a1e83	changes for updated fsfw	2021-11-19 13:22:20 +01:00
Robin Müller	0f3e9de2b0	Merge branch 'develop' into meier/pdec	2021-11-09 23:01:20 +01:00
Jakob Meier	709661ff67	pdec handler print tc	2021-11-03 18:19:36 +01:00
Jakob Meier	3e2f4e7a10	class to generate pdec config words	2021-11-02 11:11:38 +01:00
Jakob Meier	556a3986c1	pdec handler	2021-11-01 12:41:20 +01:00
Jakob Meier	ca8e3f685a	improved chip select decoding	2021-10-29 19:13:48 +02:00
Jakob Meier	017e02e513	changes applied during flatsat debugging	2021-10-29 19:11:46 +02:00
Markus Koller	f8d5546a03	rw spi callback removed wrong continue	2021-10-14 15:50:50 +02:00
Robin Mueller	0237a22ae9	using old names again	2021-10-13 15:42:55 +02:00
Robin Mueller	7c673d6e7f	bugfixes in max31685, indexing adapted	2021-10-12 17:55:36 +02:00
Robin Mueller	01e9ef64c9	moved command executor	2021-10-11 20:05:59 +02:00
Robin Mueller	5e42618dfd	removed references to removed module	2021-10-11 19:44:58 +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	7f70673625	Merge branch 'develop' into meier/ptme	2021-10-04 15:07:58 +02:00
Jakob Meier	7ae02d43a7	added preprocessor defines to exclude CCSDS Handler	2021-10-04 14:47:32 +02:00
Jakob Meier	55d31d0dc2	ccsds handler	2021-09-29 14:47:20 +02:00
Robin Mueller	e5d0dac65e	tcpip components refactoring	2021-09-28 14:58:12 +02:00
Robin Mueller	3af5b8560d	have to user proper types now	2021-09-27 10:51:47 +02:00
Robin Mueller	7fd5b6b39e	Merge remote-tracking branch 'origin/develop' into mueller/master	2021-09-27 10:07:29 +02:00
Robin Mueller	3a606fdfc4	Merge remote-tracking branch 'origin/develop' into meier/openGpioByName	2021-09-27 09:59:36 +02:00
Jakob Meier	5b26564058	ptme ip core packet insertion	2021-09-26 08:29:30 +02:00
Jakob Meier	773627dc3d	fixed merge conflicts	2021-09-25 11:57:33 +02:00
Jakob Meier	f0885fcb2e	removed unused gpio definitions in busConf.h	2021-09-25 11:09:29 +02:00
Jakob Meier	9fd4c477f0	changed all gpio configurations to open by line name	2021-09-25 10:49:03 +02:00
Jakob Meier	11537f9988	mgm 2 lis3 chip select opened by name	2021-09-24 09:42:20 +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
Jakob Meier	0e68dbd86c	open mgm 2 lis3 chip select by name	2021-09-23 17:13:17 +02:00
Robin Mueller	8fc144b595	RW handler tweaks	2021-09-23 16:03:09 +02:00
Robin Mueller	b128455217	RW small improvements	2021-09-23 15:35:33 +02:00
Robin Mueller	0ccf062d51	transition delays	2021-09-23 15:20:55 +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	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	652cfa0986	gpio refactoring	2021-09-21 17:31:55 +02:00
Jakob Meier	e2c26efe4a	Merge branch 'meier/gpioNaming' into meier/ptme	2021-09-20 19:11:22 +02:00
Jakob Meier	c4ba578285	fixed warning	2021-09-20 18:46:48 +02:00
Jakob Meier	26162f8e78	gpio chips now opened by label	2021-09-20 17:47:29 +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
Jakob Meier	ddd8ff2180	ptme handling wip	2021-09-19 12:27:48 +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	2aa76766af	added print commands for PCDU	2021-09-16 14:51:14 +02:00
Robin Mueller	00711c148a	rm3100 changes	2021-09-16 13:40:29 +02:00
Robin Mueller	b8b6cd8872	moved RM3100 handler to framework	2021-09-16 11:34:07 +02:00
Robin Mueller	8af3a91b5a	correct RW pin	2021-09-16 11:11:25 +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	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	0343372910	very important bugfix for reset pin gnss	2021-09-08 19:27:49 +02:00
Robin Mueller	f7c6f16777	added gps reset callback	2021-09-07 16:11:02 +02:00
Robin Mueller	52d0182a52	Merge branch 'mueller/master' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into mueller/master	2021-09-07 09:46:01 +02:00
Robin Mueller	24c7a4e7e3	added additional comment	2021-09-07 09:45:12 +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	74e4415d58	updated busConf file	2021-09-02 20:04:41 +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
Jakob.Meier	89b68940be	ploc memory dumper wip	2021-08-29 07:31:34 +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	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	3acb61959a	mram dump standalone packet	2021-08-20 06:56:29 +02:00
Robin Mueller	ef75d92415	smaller tweaks	2021-08-19 18:26:00 +02:00
Robin Mueller	e821a9700a	refactoring and bugfix	2021-08-19 18:10:19 +02:00
Robin Mueller	d1afdfe578	bugfix core controller	2021-08-19 17:31:13 +02:00
Robin Mueller	24ecfe84ae	minor fix	2021-08-19 17:27:13 +02:00
Robin Mueller	7c828427e9	unix file guard diagnostic prefix adaption	2021-08-19 17:08:51 +02:00
Robin Mueller	8ddd7b02dc	renamed function and bugfix	2021-08-19 14:45:25 +02:00
Robin Mueller	963e40120f	added TODO	2021-08-19 14:35:36 +02:00
Robin Mueller	faee071edc	bugfixes, more tests	2021-08-19 14:34:24 +02:00
Robin Mueller	a6777067da	moved test	2021-08-19 14:16:26 +02:00
Robin Mueller	c1b22af695	several bugfixes for prot handler	2021-08-19 14:05:25 +02:00
Robin Mueller	7fc3285272	added functions to handle writeprotection	2021-08-19 13:34:44 +02:00
Jakob.Meier	124abf0213	crc for ploc update	2021-08-18 08:26:31 +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
Jakob.Meier	be6056aadb	adaptions to build software for Trenz TE0720	2021-08-17 16:14:23 +02:00
Jakob.Meier	1722f14a60	added debug output for pcdu modules	2021-08-17 11:59:32 +02:00
Robin Müller	fc22f7d86f	Merge branch 'develop' into mueller/core-controller-bugfix	2021-08-11 16:30:31 +02:00
Robin Mueller	cf355a0451	missing :	2021-08-11 16:29:11 +02:00
Robin Mueller	24b58e50d1	Merge core controller bugfix	2021-08-11 16:24:41 +02:00
Jakob.Meier	ae08d14626	Merge branch 'develop' into meier/firmwareChanges	2021-08-11 13:32:30 +02:00
Jakob.Meier	4fdcb5d7cd	minor changes to match software to updated fpga design	2021-08-11 09:41:29 +02:00
Robin Mueller	d604f8d3d1	one port is okay	2021-08-09 18:23:18 +02:00
Robin Mueller	e92af98f34	moved q7s specific code to q7s folder	2021-08-09 17:19:10 +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	6871cc597a	Merge remote-tracking branch 'origin/develop' into mueller/version-bump	2021-08-09 14:29:47 +02:00
Robin Mueller	f5f8df61ae	bumped subversion	2021-08-09 11:27:08 +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
Robin Mueller	f56c8ba1c0	minor fixes and additional printout	2021-08-09 11:00:58 +02:00
Jakob.Meier	dc3dfa1292	ploc updater	2021-08-08 15:02:59 +02:00
Robin Mueller	891ba6881b	reordered control operation	2021-08-08 13:00:11 +02:00
Robin Mueller	02a837c964	tweaks for no-init variant	2021-08-08 12:59:21 +02:00
Robin Mueller	8cdb877df6	removed endif block	2021-08-08 12:50:45 +02:00
Robin Mueller	22d7af4b78	always perform state machine ... in initAfterTaskCreation	2021-08-08 12:49:04 +02:00
Robin Mueller	0fecfab2f0	minor formatting changes	2021-08-08 12:46:24 +02:00
Robin Mueller	e05c52be85	always performing state machine now	2021-08-08 12:45:26 +02:00
Robin Mueller	ea56a5d536	includes reordered	2021-08-08 12:43:54 +02:00
Robin Mueller	365fa0adc4	tweaks and fixes for state machine	2021-08-08 12:43:02 +02:00
Robin Mueller	51dbc95750	fixes for NO_INIT code	2021-08-08 12:39:53 +02:00
Robin Mueller	f50b9de4a5	extneded state machine for commanding support	2021-08-08 01:24:18 +02:00
Robin Mueller	1c0ea5cbb1	tested hot redundant config as well	2021-08-08 00:37:07 +02:00
Robin Mueller	5a4d287f67	more testing and bugfixes	2021-08-08 00:11:21 +02:00
Robin Mueller	e186bff4e4	important bugfixes for core controller	2021-08-07 18:52:36 +02:00
Robin Mueller	2fb54f7de9	first successfull tests	2021-08-06 01:25:36 +02:00
Robin Mueller	f0e282c6e1	continued a bit	2021-08-05 18:37:14 +02:00
Robin Mueller	05088ce02c	SDC manager and core controller refactoring	2021-08-05 18:13:32 +02:00
Robin Mueller	7f327c3900	bugfixes for sdc manager	2021-08-05 16:02:35 +02:00
Robin Mueller	8104ac0df8	using new command executor	2021-08-05 15:43:19 +02:00
Robin Mueller	1cfb9250fa	SDC manager non-blocking mode	2021-08-05 10:14:17 +02:00
Jakob.Meier	0315a2a3d5	merged develop	2021-08-04 13:22:44 +02:00
Robin Mueller	b52aca643f	Merge remote-tracking branch 'origin/develop' into mueller/master	2021-08-04 13:16:59 +02:00
Jakob.Meier	acca10cc34	Merge branch 'develop' into meier/plocSupervisorHandler	2021-08-04 10:21:31 +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	3cc3786505	TCP default now, bugfixes in CoreController	2021-08-03 15:29:45 +02:00
Robin Mueller	59c4ed74e0	minor bugfix	2021-08-03 11:21:28 +02:00
Robin Mueller	f8f0032d1e	reboot feature finished	2021-08-03 11:18:24 +02:00
Jakob.Meier	72533f1d14	updated tmtc	2021-07-31 08:54:49 +02:00
Jakob.Meier	926e1e336a	mram dump reply	2021-07-31 08:32:57 +02:00
Robin Mueller	940d4965bc	small corrections	2021-07-29 18:32:02 +02:00
Robin Müller	bc1d236a85	Merge branch 'develop' into mueller/added-watchdog	2021-07-29 18:10:26 +02:00
Robin Mueller	34d3479e81	various bugfixes and improvements	2021-07-29 18:09:54 +02:00
Robin Mueller	dba620baf2	various bugfixes, watchdog working now	2021-07-29 17:21:27 +02:00
Robin Mueller	ff86c8af73	watchdog handling finished	2021-07-29 16:31:04 +02:00
Robin Mueller	983ce045a9	continued	2021-07-29 13:07:07 +02:00
Ulrich Mohr	6361fcb6bb	added Jenkinsfile, moved together with Dockerfile into automation folder ... having the automation files in an empty folder accelerates docker build. Also, I think these files are not related to the source code and as such should live in their own space	2021-07-29 12:06:14 +02:00
Robin Mueller	190590e1b5	new conf option	2021-07-28 20:11:22 +02:00
Robin Mueller	125593be21	reading chip and copy works	2021-07-28 19:46:19 +02:00
Robin Mueller	1a4f907925	moved sd card init, more functions static now	2021-07-28 17:48:08 +02:00
Robin Mueller	c0b91a4879	added functions to get current boot copy	2021-07-28 16:37:08 +02:00
Jakob.Meier	bd9dbc5fc8	ploc supervisor watchdog configure timeout command	2021-07-26 19:56:00 +02:00
Robin Mueller	261fc8b58f	moved config flag to cmmon config	2021-07-26 13:51:00 +02:00
Jakob.Meier	dc73036c7a	udp server port in UpdTmTcBridge	2021-07-26 12:24:21 +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
Robin Mueller	07f531a044	update core controller	2021-07-24 17:08:26 +02:00
Robin Mueller	2b45c1d407	another minor fix	2021-07-24 15:17:54 +02:00
Robin Mueller	082e820e92	minor fix	2021-07-24 15:15:49 +02:00
Robin Mueller	2554afd503	Merge remote-tracking branch 'origin/develop' into mueller/master	2021-07-24 15:13:56 +02:00
Robin Mueller	6d48f70269	all versions written to version.txt file now	2021-07-24 15:00:07 +02:00
Robin Mueller	9caa9451e1	printing FSFW version now	2021-07-24 13:47:09 +02:00
Robin Mueller	d419e31296	fixes for file system	2021-07-23 18:20:01 +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
Robin Mueller	46e2e40cb1	various bugfixes	2021-07-23 17:06:10 +02:00
Jakob.Meier	80665a3cc5	fixed merge conflicts	2021-07-23 14:36:15 +02:00
Jakob.Meier	995395d11e	ploc supervisor wip	2021-07-22 08:06:04 +02:00
Robin Mueller	33ad5e57ca	more documentation	2021-07-19 20:12:21 +02:00
Robin Mueller	5c01401042	added command to list directory into file	2021-07-19 20:06:28 +02:00
Robin Mueller	81ac5a3b2c	tested dir remove functionality	2021-07-19 19:21:34 +02:00
Robin Mueller	42578ba2ac	more tests added	2021-07-19 14:34:03 +02:00
Robin Mueller	d4e5919a21	bugfix for file system handler, running now	2021-07-19 14:02:17 +02:00
Robin Mueller	fb3b5582ad	some refactoring	2021-07-19 13:15:45 +02:00
Robin Mueller	20e8fc3400	cleaned up code a bit	2021-07-19 12:44:43 +02:00
Robin Mueller	d98313de6c	tested clear function	2021-07-16 22:22:24 +02:00
Robin Mueller	3f1fef4bdf	scratch buffer API finished	2021-07-16 22:20:53 +02:00
Robin Mueller	88a20a512a	corrections and tests	2021-07-16 21:51:30 +02:00
Robin Mueller	434a0f6a7a	added JSON lib, bugfixes in FileSystemHandler	2021-07-16 20:32:13 +02:00
Robin Mueller	b3dfbcf7fe	removed fsfw_hal	2021-07-15 19:06:57 +02:00
Jakob.Meier	ea2260a61d	few commands implemented for the ploc supervisor	2021-07-13 08:32:14 +02:00
Robin Mueller	6c2c1e6552	minor changes	2021-07-12 17:50:01 +02:00
Robin Mueller	d903da109e	added builder functions for full paths	2021-07-12 17:41:13 +02:00
Robin Mueller	64aadf5e1e	continued functions to create/delete dir	2021-07-12 17:39:36 +02:00
Robin Mueller	74fdd90c07	starting file system handler	2021-07-12 17:23:32 +02:00
Robin Mueller	91ff9f3f68	FS queue size configurable	2021-07-12 16:32:14 +02:00
Robin Mueller	89b6eb8943	some more fixes	2021-07-12 15:58:43 +02:00
Robin Mueller	ec2f15cf54	some refactoring	2021-07-12 15:52:13 +02:00
Robin Mueller	e0cf333a7d	more bugfixes	2021-07-12 15:19:06 +02:00
Robin Mueller	9284398b8b	cold redundant and hot redundant configuration	2021-07-12 14:32:20 +02:00
Robin Mueller	37feaa0a54	sd card is now mounted as well	2021-07-12 13:26:02 +02:00
Robin Mueller	bf2a4d0ad7	fix so it compiles	2021-07-12 11:49:19 +02:00
Robin Mueller	658e9a4907	added docs and improvements	2021-07-12 11:47:23 +02:00
Robin Mueller	4fc56417bc	mounting SD cards now as well	2021-07-12 11:37:10 +02:00
Robin Mueller	59112cae76	now a sd card will always be on	2021-07-09 17:54:32 +02:00
Robin Mueller	e9cfa0c117	testing scratch API	2021-07-09 17:21:26 +02:00
Robin Mueller	bef73d7357	writing api for scratch buffer	2021-07-09 16:57:34 +02:00
Robin Mueller	61ddc3a080	updated README	2021-07-08 12:36:41 +02:00
Robin Mueller	d5517b4d80	contd file system handler	2021-07-08 12:32:24 +02:00
Robin Mueller	ef3fb0457e	updated file system handler	2021-07-08 12:22:41 +02:00
Robin Mueller	1e2eb597d9	added core controller	2021-07-08 12:11:24 +02:00
Robin Mueller	1312fe2369	updated core controller	2021-07-08 12:07:39 +02:00
Robin Mueller	e5c3e2da53	continued sd card manager	2021-07-08 11:23:08 +02:00
Jakob.Meier	45804a8675	star tracker read temperature and included arcsec lib	2021-07-08 11:20:19 +02:00
Robin Mueller	7600e10f1b	continued sd card manager	2021-07-08 00:03:17 +02:00
Robin Mueller	834fa89e7b	cotninued sd card access manager	2021-07-07 20:50:11 +02:00
Jakob.Meier	4148a8c0bd	StarTrackerHandler wip	2021-07-07 12:12:01 +02:00
Robin Mueller	3d7607a5eb	moved printout	2021-07-06 18:23:28 +02:00
Robin Mueller	5db9989f63	disabled test task	2021-07-06 18:20:14 +02:00
Robin Mueller	8fefee803f	cleaning up	2021-07-06 18:18:57 +02:00
Robin Mueller	16a3ba1345	found issue root	2021-07-06 18:17:32 +02:00
Robin Mueller	a4c843e3e2	REAMDE update	2021-07-06 11:28:58 +02:00
Robin Mueller	0e288704d6	Merge remote-tracking branch 'origin/develop' into mueller/master	2021-07-05 15:46:21 +02:00
Robin Mueller	a6d69f28fe	Merge remote-tracking branch 'origin/develop' into meier/ReactionWheelHandler	2021-07-05 15:38:04 +02:00
Robin Mueller	08c5c5ebeb	added more sd card stubs	2021-07-05 12:09:31 +02:00
Robin Mueller	24c21d4895	updated README	2021-07-05 10:40:52 +02:00
Robin Mueller	8ab288a4ba	added small printout	2021-07-05 10:24:38 +02:00
Jakob.Meier	9f6378f001	fixed merge conflicts	2021-07-01 18:25:40 +02:00
Jakob.Meier	0e9c1831ed	reply fix in rad sensor handler	2021-07-01 17:27:51 +02:00
Robin Mueller	5fc18f444e	updated tmtc	2021-07-01 14:53:00 +02:00
Jakob.Meier	8e98de6f3c	added spi mux functionality to the rwSpiCallback	2021-07-01 10:53:50 +02:00
Jakob.Meier	d3198af5e9	Merge branch 'meier/ReactionWheelHandler' into meier/master	2021-07-01 07:42:24 +02:00
Robin Mueller	3895eea24b	added file system test	2021-06-30 16:15:46 +02:00
Robin Mueller	ddfa0b474b	deleted unneeded file	2021-06-30 15:40:49 +02:00
Robin Mueller	7d7b119d01	simple mode working	2021-06-30 15:32:15 +02:00
Robin Mueller	3f177d3321	simple mode implemented	2021-06-30 15:18:41 +02:00
Jakob.Meier	4cbaf04007	merge muller/master	2021-06-29 16:12:06 +02:00
Robin Mueller	e3d38f16e0	added event manager	2021-06-29 16:09:32 +02:00
Jakob.Meier	6e70f2254d	all reaction wheels working	2021-06-29 16:08:20 +02:00
Martin Zietz	703f29af26	created all rw objects	2021-06-29 09:50:50 +02:00
Jakob.Meier	cf7dd233ea	rw2 enable fix	2021-06-28 14:39:08 +02:00
Martin Zietz	23731e367c	added second reaction wheel	2021-06-28 14:07:37 +02:00
Jakob.Meier	b7ca1606f7	fixed merge conflicts	2021-06-24 18:01:09 +02:00
Jakob.Meier	bd7f15ebb6	fixed merge conflicts	2021-06-24 17:49:23 +02:00
Jakob.Meier	b5fdeb93bb	get temperature and status of reaction wheel	2021-06-24 17:32:42 +02:00
Martin Zietz	8284ebec9f	rw wip	2021-06-24 12:04:36 +02:00
Robin Mueller	56cabbc117	split up psts	2021-06-23 15:18:31 +02:00
Martin Zietz	cbdcc50cc9	rw enable wip	2021-06-22 13:48:30 +02:00
Jakob.Meier	0eb47967b5	fixed conflicts	2021-06-21 18:01:23 +02:00
Jakob.Meier	7795ad19d3	fixed merge conflicts	2021-06-21 17:51:08 +02:00
Robin Mueller	865f152bc6	Merge remote-tracking branch 'origin/develop' into meier/ImtqHandler	2021-06-21 17:45:56 +02:00
Jakob.Meier	72f7d6c88f	applied changes according to pr comments	2021-06-21 17:25:13 +02:00
Jakob.Meier	51dba9f2e9	rw chip select decoding	2021-06-21 17:15:19 +02:00
Robin Mueller	257a1611d0	small q7s fix	2021-06-21 17:00:34 +02:00
Robin Mueller	d591c2f1c4	q7s compiling	2021-06-21 16:46:49 +02:00
Martin Zietz	d704b389e4	reaction wheels testing	2021-06-21 14:46:46 +02:00
Jakob.Meier	33a55d7114	RwHandler first commands	2021-06-21 09:50:26 +02:00
Robin Mueller	bed7f0e2d6	compiling again	2021-06-16 17:19:14 +02:00
Jakob.Meier	0913442804	fixed merge conflicts	2021-06-15 15:39:39 +02:00
Jakob.Meier	5e7cdd9f7f	IMTQ handler complete	2021-06-15 15:13:47 +02:00
Jakob.Meier	595abf3899	IMTQ positive x dipole test	2021-06-12 15:45:24 +02:00
Jakob.Meier	61f3a3e1c6	fixed merge conflicts	2021-06-11 14:55:28 +02:00
Robin Mueller	28a8ecfcea	dockerifle update	2021-06-09 12:22:32 +02:00
Robin Mueller	8ee346c391	trying ipv6 curl	2021-06-09 12:09:13 +02:00
Robin Mueller	ab8aaba0f4	using configuration files now	2021-06-08 17:04:28 +02:00
Robin Mueller	b7e26be45e	object manager singleton now	2021-06-08 16:45:25 +02:00
Robin Mueller	4caf6e102c	docker file update	2021-06-08 16:10:15 +02:00
Robin Mueller	c8f7108906	updated docker files	2021-06-08 16:03:19 +02:00
Martin Zietz	ddd33e5752	some fixes in IMTQ Handler	2021-06-06 14:11:05 +02:00
Jakob.Meier	076c616496	fixed merge conflicts and added threshold configuration to Max31865Handler	2021-06-02 10:25:35 +02:00
Robin Mueller	385dbd977e	some stubs	2021-05-27 21:06:37 +02:00
Jakob.Meier	ff508c89d1	minor changes	2021-05-27 15:24:19 +02:00
Robin Mueller	a40310bb88	small include fix	2021-05-27 14:09:07 +02:00
Jakob.Meier	6fa9b65345	compile failure	2021-05-27 14:04:33 +02:00
Jakob.Meier	a7e71a7154	rtd update	2021-05-27 13:50:05 +02:00
Jakob.Meier	6a1611686d	fixed include names	2021-05-27 13:34:28 +02:00
Robin Mueller	d075495628	added core controller stub	2021-05-26 14:16:16 +02:00
Robin Mueller	a25cea8d4d	fixes dockerfiles	2021-05-24 15:45:57 +02:00
Robin Mueller	9b6ac2947d	updated all cloud links	2021-05-24 15:09:11 +02:00
Robin Mueller	9660b1fd38	q7s build working	2021-05-24 14:35:14 +02:00
Robin Mueller	622dd603db	trying out some stuff	2021-05-24 14:13:47 +02:00
Robin Mueller	dca6868a3f	fixed hosted dockerfile	2021-05-24 12:43:22 +02:00
Robin Mueller	260eb167f5	small fix for q7s	2021-05-24 01:28:31 +02:00
Robin Mueller	623f52398e	moved fsfwconfig into linux folder	2021-05-17 20:03:56 +02:00
Robin Mueller	1d0a4bca94	compiling with translation files	2021-05-17 19:49:29 +02:00
Robin Mueller	d380e3106a	q7s compiling	2021-05-17 16:53:06 +02:00
Robin Mueller	6f9a1853ff	host compiling again	2021-05-17 16:37:29 +02:00
Jakob.Meier	532fb3228a	Merge branch 'develop' into meier/master	2021-05-17 13:56:54 +02:00
Jakob.Meier	a39d47cff5	uio implementation	2021-05-16 19:22:04 +02:00
Jakob.Meier	d46007ba67	all sus initialized	2021-05-13 13:17:12 +02:00
Jakob.Meier	e337f97e62	solved merge conflicts	2021-05-12 17:01:11 +02:00
Jakob.Meier	79a5847b67	Sus handler complete	2021-05-12 16:38:20 +02:00
Jakob.Meier	48af7ef0fb	sus delay implementation	2021-05-12 13:06:56 +02:00
Jakob.Meier	20eb5be102	save before changing to internally clocked mode	2021-05-09 18:18:27 +02:00
Jakob.Meier	189bdb7c90	working SUS in externally clocked mode	2021-05-09 16:48:55 +02:00
Jakob.Meier	6861cd399e	some tries to get data from max1227 in externally clocked mode	2021-05-08 22:49:21 +02:00
Jakob.Meier	f4eb5d81ba	save before making change in spicomif	2021-05-07 18:48:42 +02:00
Jakob.Meier	931c17e971	save before implementing SusHandler with chip select	2021-05-06 18:00:58 +02:00
Jakob.Meier	ff4a156a45	rad sensor working	2021-05-03 12:49:14 +02:00
Jakob.Meier	8d2993f88d	rad sensor change wip	2021-05-03 11:59:33 +02:00
Jakob.Meier	b708028c61	spi decoder callbacks wip	2021-05-02 13:48:39 +02:00
Jakob.Meier	38d2864d7f	Merge branch 'meier/master' into develop	2021-04-29 17:45:43 +02:00
Jakob.Meier	34ad009707	integrated gyro and mgm handler	2021-04-29 17:45:19 +02:00
Jakob.Meier	f43dbba8e2	tmtc merge conflict	2021-04-27 17:39:14 +02:00
Jakob.Meier	0430579795	basic structure for ILH PLOC control	2021-04-27 17:34:50 +02:00
Jakob.Meier	d63c825c7f	fixed merge conflicts	2021-04-26 17:50:36 +02:00
Robin Mueller	57d457c43e	Merge remote-tracking branch 'origin/meier/mgtHandler' into mueller/master	2021-04-25 12:25:55 +02:00
Jakob.Meier	e26df38609	fsfw update	2021-04-25 11:33:32 +02:00
Robin Mueller	2e4a8e1f94	tmtc and obj factory update	2021-04-25 11:32:21 +02:00
Jakob.Meier	1a45d54383	fixed merge conflicts	2021-04-25 10:51:59 +02:00
Jakob.Meier	766c460629	merged mueller master	2021-04-25 09:33:21 +02:00
Jakob.Meier	edfebc8e06	deleted faulty header includes	2021-04-25 09:24:41 +02:00
Robin Mueller	fbfb3a8b83	Merge branch 'mueller/master' into meier/mgtHandler	2021-04-25 00:06:04 +02:00
Robin Mueller	fa192a353b	everything seems to work now	2021-04-24 23:41:27 +02:00
Robin Mueller	9ab9b2fdeb	added dns name	2021-04-24 23:17:45 +02:00
Robin Mueller	3befba560c	adaptions for new fsfw, using pus c now	2021-04-24 23:04:17 +02:00
Jakob.Meier	634ed99a54	issue with poolManager.subscribe in max handler	2021-04-24 22:55:26 +02:00