3434 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	3fd8230f03	Merge branch 'irini' into scex-additions	2022-09-27 19:18:12 +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	3240c843a1	Merge branch 'scex-additions' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into scex-additions	2022-09-27 19:09:31 +02:00
Irini Kosmidou	d3c7bae087	Merge branch 'irini' into scex-additions	2022-09-27 19:08: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	24062071c0	bump json dependency to concrete version v3.11.2	2022-09-27 14:56:32 +02:00
Robin Mueller	3673ae8e62	doc correction	2022-09-15 17:46:41 +02:00
Robin Mueller	57331380c3	small fix for ACS task	2022-09-15 11:38:29 +02:00
Robin Mueller	94a70aa2fc	update .cproject file	2022-09-15 11:36:04 +02:00
Robin Mueller	ea60767825	Merge branch 'irini' into scex-additions	2022-09-14 19:05:23 +02:00
Robin Müller	3fc97f9ee9	Merge pull request 'updated to new fsfw' (#299) from mohr/updated_fsfw into develop ... Reviewed-on: #299	2022-09-14 19:03:41 +02:00
Robin Müller	92e06352be	Merge branch 'develop' into mohr/updated_fsfw	2022-09-14 19:03:26 +02:00
Robin Mueller	63e4448178	run afmt, bump proj files	2022-09-14 16:47:58 +02:00
Ulrich Mohr	4d93368b4c	fixed for new fsfw	2022-09-14 13:44:43 +02:00
Ulrich Mohr	ff3bc7da73	fix for new fsfw	2022-09-14 13:18:50 +02:00
Ulrich Mohr	f7196a4791	updated to new fsfw	2022-09-14 12:55:53 +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
Irini Kosmidou	002f776bef	start RPiSdCardManager	2022-09-12 17:15:02 +02:00
Robin Mueller	7bc866a105	add RPI SD card manager	2022-09-12 17:09:27 +02:00
Robin Mueller	31b3de784b	stuff	2022-09-12 17:00:49 +02:00
Robin Müller	da739636f3	Merge branch 'develop' into scex-additions	2022-09-12 16:23:08 +02:00
Robin Mueller	e381b00a13	re-point tmtc	2022-09-02 13:19:55 +02:00
Robin Mueller	a76816f055	update changelog	2022-09-02 13:16:56 +02:00
Jakob Meier	983f073e54	Merge pull request 'GomSpace commands' (#293) from mueller/new-gomspace-commdsn into develop ... Reviewed-on: #293 Reviewed-by: Jakob Meier <meierj@irs.uni-stuttgart.de>	2022-09-02 12:40:44 +02:00
Robin Mueller	923adbdb1a	bump tmtc	2022-09-01 17:40:21 +02:00
Robin Mueller	6ae0249fdc	load table command	2022-09-01 17:31:43 +02:00
Robin Mueller	87f430fdee	some bugfixes for save table feature	2022-09-01 16:58:51 +02:00
Robin Mueller	4e92fd4421	some simplifications	2022-09-01 15:23:39 +02:00
Jakob Meier	aecbbfdc7d	Merge pull request 'increase number of allowed consecutive commands' (#294) from mueller/allow-more-service-8-consecutive-cmds into develop ... Reviewed-on: #294 Reviewed-by: Jakob Meier <meierj@irs.uni-stuttgart.de>	2022-09-01 11:29:54 +02:00
Robin Mueller	27129f3b66	increase number of allowed consecutive commands ... for service 8	2022-09-01 11:18:55 +02:00
Robin Mueller	3d71cce30b	bugfix	2022-09-01 11:04:24 +02:00
Robin Mueller	7dde1150e8	gom space commands	2022-08-31 22:52:32 +02:00
Robin Mueller	d295ca905e	Merge remote-tracking branch 'origin/irini' into mueller/test-new-cmd-handling	2022-08-31 16:39:16 +02:00
Robin Mueller	079fa04d69	Merge remote-tracking branch 'origin/develop' into irini	2022-08-31 16:37:32 +02:00
Robin Mueller	da7cedc910	perform finish in command builder	2022-08-31 16:37:15 +02:00
Robin Mueller	c3fb285f35	Merge remote-tracking branch 'origin/develop' into mueller/test-new-cmd-handling	2022-08-31 16:32:18 +02:00
Robin Mueller	7c15ecbad2	apply afmt	2022-08-31 16:12:32 +02:00
Robin Mueller	839851914a	update SCEX code	2022-08-31 16:07:38 +02:00
Irini Kosmidou	74d4741380	ScexDeviceHandler: adjusted comments	2022-08-31 11:06:37 +02:00
Irini Kosmidou	8c0e261f44	ScexDeviceHandler: fileId includes date and time	2022-08-31 10:58:21 +02:00
Jakob Meier	fd674b3d61	Merge pull request 'DHB TM better handling' (#291) from mueller/dhb-tm-even-better into develop ... Reviewed-on: #291 Reviewed-by: Jakob Meier <meierj@irs.uni-stuttgart.de>	2022-08-31 07:35:48 +02:00
Robin Mueller	20df16916a	bump fsfw	2022-08-31 00:03:00 +02:00
Robin Mueller	822e8eea4a	this is better	2022-08-30 23:54:05 +02:00
Robin Mueller	9319d58137	Merge branch 'develop' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into develop	2022-08-30 23:49:09 +02:00
Jakob Meier	2c6127d98b	Merge pull request 'Use new DHB TM handler' (#290) from mueller/use-new-dhb-tm-handler into develop ... Reviewed-on: #290 Reviewed-by: Jakob Meier <meierj@irs.uni-stuttgart.de>	2022-08-30 20:22:38 +02:00