4218 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Robin Mueller	45b78a0100	Merge remote-tracking branch 'origin/develop' into mueller/master	2021-08-11 16:45:17 +02:00
Robin Müller	fc22f7d86f	Merge branch 'develop' into mueller/core-controller-bugfix	2021-08-11 16:30:31 +02:00
Robin Mueller	0622b78dde	Merge branch 'mueller/core-controller-bugfix' into mueller/master	2021-08-11 16:30:00 +02:00
Robin Mueller	cf355a0451	missing :	2021-08-11 16:29:11 +02:00
Robin Müller	337aa39ecc	Merge pull request 'meier/firmwareChanges' (#82) from meier/firmwareChanges into develop ... Reviewed-on: #82 Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>	2021-08-11 16:26:53 +02:00
Robin Mueller	24b58e50d1	Merge core controller bugfix	2021-08-11 16:24:41 +02:00
Robin Mueller	11c2efa733	bugfix core controller ... 1. Increaed robustness of CoreController against invalid state struct 2. Bugfix: If PREFSD not set, set SD card 0 properly now	2021-08-11 16:07:00 +02:00
Robin Mueller	0efaa13a9f	tmtc update	2021-08-11 15:53:27 +02:00
Jakob.Meier	ae08d14626	Merge branch 'develop' into meier/firmwareChanges	2021-08-11 13:32:30 +02:00
Robin Müller	681ad25847	Merge pull request 'v1.6.1' (#81) from develop into main ... Reviewed-on: #81	2021-08-11 10:47:37 +02:00
Robin Müller	53f6a0d3a6	Merge branch 'main' into develop	2021-08-11 10:47:16 +02:00
Jakob.Meier	4fdcb5d7cd	minor changes to match software to updated fpga design	2021-08-11 09:41:29 +02:00
Jakob.Meier	f3bc2958f9	Merge pull request 'Moved Q7S specific files' (#80) from mueller/moved-q7s-specific-files into develop ... Reviewed-on: #80 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2021-08-09 19:46:12 +02:00
Robin Mueller	d714f84df8	bumped revision	2021-08-09 18:30:20 +02:00
Robin Mueller	bda8550ef9	fixes for hosted	2021-08-09 18:26:34 +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	03510e5de9	updated TCP port	2021-08-09 16:34:06 +02:00
Robin Mueller	1d714ff85e	Moved PLOC components to q7s folder	2021-08-09 16:30:59 +02:00
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