3352 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Marius Eggert	d9427c6112	added AcsParameters	2022-09-16 14:22:17 +02:00
Robin Müller	dac799bb97	Merge branch 'develop' into mueller/em-sw-updates	2022-09-15 18:21:44 +02:00
Robin Mueller	3673ae8e62	doc correction	2022-09-15 17:46:41 +02:00
Robin Mueller	2e03cfa116	small update for .cproject file	2022-09-15 13:44:54 +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	3313604cb5	move some dummy creation into separate function	2022-09-15 12:00:58 +02:00
Robin Mueller	c616720095	update .cproject file again	2022-09-15 11:58:00 +02:00
Robin Mueller	3230efa4aa	new dummy helper functions	2022-09-15 11:54:43 +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	94a70aa2fc	update .cproject file	2022-09-15 11:36:04 +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	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
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
Robin Mueller	4649ae2edb	minor tweaks	2022-08-30 16:06:17 +02:00
Robin Mueller	74b45f30a0	move to new DHB TM handler	2022-08-30 15:53:20 +02:00
Robin Mueller	04fb2b1261	bump tmtc	2022-08-29 15:44:40 +02:00
Robin Mueller	a70bfd319c	Merge remote-tracking branch 'origin/main' into develop	2022-08-29 13:40:16 +02:00
Robin Mueller	3a80c4cb0c	additional nullptr check	2022-08-29 13:32:49 +02:00
Robin Mueller	f308718256	safety check	2022-08-29 13:26:13 +02:00
Robin Mueller	f8ee516d46	bump dependencies	2022-08-29 13:21:00 +02:00
Jakob Meier	34ede28fda	Merge pull request 'Update Power Modules' (#287) from mueller/update-p60-module-code into develop ... Reviewed-on: #287 Reviewed-by: Jakob Meier <meierj@irs.uni-stuttgart.de>	2022-08-29 08:27:35 +02:00
Robin Mueller	108b7620b8	bump tmtc	2022-08-27 17:18:00 +02:00
Robin Mueller	c8c103e5e6	update changelog	2022-08-27 16:04:55 +02:00
Robin Mueller	3b2794735b	disable test	2022-08-27 15:54:52 +02:00
Robin Mueller	7de26586fb	need to link gs sw for hosted now	2022-08-27 15:51:45 +02:00
Robin Mueller	e8208a21a4	config table retrieval works	2022-08-27 01:02:08 +02:00
Robin Mueller	8c110460a6	added test to retrieve pdu config	2022-08-26 14:28:06 +02:00
Robin Mueller	e804d433aa	merge conflict	2022-08-26 13:46:18 +02:00