4348 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Robin Müller	b3f2a05385	Merge pull request 'v1.6.0' (#78) from develop into main ... Reviewed-on: #78	2021-08-09 16:08:25 +02:00
Robin Müller	ec27521c35	Merge branch 'main' into develop	2021-08-09 16:01:51 +02:00
Robin Mueller	cd7bc466ae	tmtc update	2021-08-09 15:53:48 +02:00
Jakob.Meier	12dbc5569e	mode power down sus	2021-08-09 14:44:06 +02:00
Jakob.Meier	8f124de79c	set all devices to mode power down in doShutDown	2021-08-09 14:41:46 +02:00
Robin Müller	9fd0009c7b	Merge pull request 'bumped subversion for release' (#77) from mueller/version-bump into develop ... Reviewed-on: #77	2021-08-09 14:34:39 +02:00
Robin Mueller	74dbfae225	tmtc update	2021-08-09 14:30:14 +02:00
Robin Mueller	6871cc597a	Merge remote-tracking branch 'origin/develop' into mueller/version-bump	2021-08-09 14:29:47 +02:00
Jakob.Meier	ce1124472a	Merge branch 'develop' into meier/develop	2021-08-09 14:23:27 +02:00
Jakob.Meier	6e22c3e017	Merge pull request 'Non Blocking SD Card Initialization' (#75) from mueller/non-blocking-sd-card-init into develop ... Reviewed-on: #75 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2021-08-09 14:18:49 +02:00
Robin Mueller	f5f8df61ae	bumped subversion	2021-08-09 11:27:08 +02:00
Robin Mueller	4a74a3ac37	API change fix	2021-08-09 11:24: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
Robin Müller	f4ef0cb7ab	Merge pull request 'meier/plocUpdater' (#76) from meier/plocUpdater into develop ... Reviewed-on: #76 Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>	2021-08-09 11:10:30 +02:00
Robin Mueller	f56c8ba1c0	minor fixes and additional printout	2021-08-09 11:00:58 +02:00
Jakob.Meier	66f38daf56	typo in include of ploc updater	2021-08-09 10:44:14 +02:00
Jakob.Meier	0580784d16	added mode power down in star tracker	2021-08-09 10:41:28 +02:00
Jakob.Meier	74dc04daeb	updated fsfw and tmtc	2021-08-08 16:18:49 +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	106228c2ee	Merge branch 'mueller/non-blocking-sd-card-init' into mueller/master	2021-08-08 12:43:17 +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	a3eb6b2093	Merge remote-tracking branch 'origin/develop' into mueller/non-blocking-sd-card-init	2021-08-08 12:37:45 +02:00
Robin Mueller	5045eeb867	Merge remote-tracking branch 'origin/develop' into mueller/master	2021-08-08 12:37:26 +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
Jakob.Meier	f64356d75e	ploc udpater wip	2021-08-05 16:37:39 +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
Jakob.Meier	0c13c32e82	Merge pull request 'Include corrections, correct tmtc branch' (#74) from mueller/master into develop ... Reviewed-on: #74	2021-08-04 13:21:11 +02:00
Jakob.Meier	2700d4d28c	ploc updater wip	2021-08-04 13:20:28 +02:00
Robin Mueller	3a88a43505	tmtc update	2021-08-04 13:18:09 +02:00
Robin Mueller	b52aca643f	Merge remote-tracking branch 'origin/develop' into mueller/master	2021-08-04 13:16:59 +02:00
Robin Müller	fcf2e363d8	Merge pull request 'meier/plocSupervisorHandler' (#73) from meier/plocSupervisorHandler into develop ... Reviewed-on: #73 Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>	2021-08-04 13:00:27 +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