4316 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Robin Mueller	79d48d9630	Merge remote-tracking branch 'origin/develop' into mueller/rw-ass	2022-05-04 17:25:11 +02:00
Robin Mueller	9c888e75bc	bump tmtc again	2022-05-04 17:23:56 +02:00
Robin Mueller	0d15694fc3	Merge remote-tracking branch 'origin/develop' into mueller/heater-health-if	2022-05-04 17:23:34 +02:00
Robin Mueller	be7cab6032	Merge remote-tracking branch 'origin/develop' into mueller/reboot-cmd	2022-05-04 17:22:19 +02:00
Robin Müller	4589b3b696	Merge pull request 'v1.11.0' (#243) from develop into main ... Reviewed-on: #243	2022-05-04 17:19:56 +02:00
Robin Müller	0271b4970c	Merge branch 'main' into develop	2022-05-04 17:13:09 +02:00
Robin Mueller	4db35e8641	bump tmtc submodule	2022-05-04 17:08:25 +02:00
Robin Mueller	d108f7bbda	Merge remote-tracking branch 'origin/develop' into mueller/reboot-cmd	2022-05-04 16:54:39 +02:00
Robin Mueller	3458c272ad	Merge remote-tracking branch 'origin/develop' into mueller/rw-ass	2022-05-04 16:47:49 +02:00
Robin Mueller	1508a1e147	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-05-04 16:43:31 +02:00
Robin Mueller	a6c6325d41	Merge remote-tracking branch 'origin/develop' into mueller/pl-ss	2022-05-04 16:41:08 +02:00
Robin Mueller	73e4b0cc81	bump tmtc	2022-05-04 16:38:02 +02:00
Robin Mueller	4311c5b6a7	Merge remote-tracking branch 'origin/develop' into mueller/heater-health-if	2022-05-04 16:37:53 +02:00
Robin Mueller	d59e71b056	Merge remote-tracking branch 'origin/develop' into mueller/heater-health-if	2022-05-04 16:37:47 +02:00
Jakob.Meier	8315a03efc	Merge pull request 'Building new EM config' (#238) from mueller/refactoring-conf-handling into develop ... Reviewed-on: #238 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-05-04 15:08:18 +02:00
Robin Mueller	2cf1da5478	Merge remote-tracking branch 'origin/develop' into mueller/refactoring-conf-handling	2022-05-04 14:51:55 +02:00
Robin Mueller	e06f459333	changelog correction	2022-05-04 14:43:27 +02:00
Robin Mueller	a3e33bb627	Merge remote-tracking branch 'origin/develop' into mueller/heater-health-if	2022-05-04 14:37:36 +02:00
Robin Mueller	535da53093	Merge remote-tracking branch 'origin/develop' into mueller/refactoring-conf-handling	2022-05-04 14:34:07 +02:00
Jakob.Meier	b10486052e	Merge pull request 'Update GPIO API' (#241) from mueller/update-gpio-api-without-em-split into develop ... Reviewed-on: #241 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-05-04 14:31:54 +02:00
Robin Mueller	bb2bd87541	repoint fsfw	2022-05-04 14:15:26 +02:00
Robin Mueller	afaeca7cf7	update changelog	2022-05-04 14:14:24 +02:00
Robin Mueller	86752417f2	changed for updated FSFW GPIO API	2022-05-04 14:14:17 +02:00
Robin Mueller	243d38f832	small form fix	2022-05-04 13:49:55 +02:00
Robin Mueller	79efc9de39	bump fsfw	2022-05-04 13:48:18 +02:00
Robin Mueller	92f95b2b97	comment out debug printout	2022-05-04 13:25:42 +02:00
Jakob Meier	475f6f1687	removed unused ploc commands, fix in logging report reply	2022-05-04 12:49:43 +02:00
Robin Mueller	d0e18f8b35	add mutex protections for switcher states	2022-05-04 11:11:29 +02:00
Robin Mueller	86dd67bf06	bump fsfw	2022-05-04 10:36:45 +02:00
Robin Mueller	50ca378318	update for updated gpio API	2022-05-04 10:34:11 +02:00
Robin Mueller	5f5c996cfd	bump tmtc IF	2022-05-04 09:26:11 +02:00
Robin Mueller	1536a0f94b	named heaters	2022-05-03 18:17:10 +02:00
Robin Mueller	d79323c6ca	small fix for generic factory header	2022-05-03 17:45:39 +02:00
Robin Mueller	ae0120f3ef	Merge branch 'mueller/refactoring-conf-handling' into mueller/heater-health-if	2022-05-03 17:44:02 +02:00
Robin Mueller	8f9e8fe3fb	ignore new build folder name	2022-05-03 17:39:02 +02:00
Robin Mueller	bc28ae4d1f	bump submodules	2022-05-03 17:38:37 +02:00
Robin Mueller	2470039dfb	Merge remote-tracking branch 'origin/develop' into mueller/heater-health-if	2022-05-03 17:38:10 +02:00
Robin Mueller	0ad13a473e	avoid compiler warning	2022-05-03 17:36:15 +02:00
Robin Mueller	4d13743b7f	remove faulty line	2022-05-03 17:30:36 +02:00
Robin Mueller	79aac89f36	update build instructions	2022-05-03 17:27:39 +02:00
Robin Mueller	6dde823d4c	improve dependency handling (same as fsfw)	2022-05-03 17:17:48 +02:00
Robin Mueller	4a637e79c6	update lauch cfg host	2022-05-03 17:11:17 +02:00
Robin Mueller	42247620c0	updated host and linux scripts, fix host build	2022-05-03 17:08:48 +02:00
Robin Mueller	115d2dea88	bump fsfw	2022-05-03 16:43:37 +02:00
Robin Mueller	47f4aebd15	update auto-generated file	2022-05-03 16:32:57 +02:00
Robin Mueller	fbd9e65398	Merge remote-tracking branch 'origin/develop' into mueller/refactoring-conf-handling	2022-05-03 16:18:37 +02:00
Robin Mueller	f598ac3daf	Merge remote-tracking branch 'origin/develop' into mueller/pl-ss	2022-05-03 16:15:45 +02:00
Robin Mueller	77704b3e79	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-05-03 16:15:23 +02:00
Robin Mueller	f0270b91d9	added system folder here	2022-05-03 16:09:30 +02:00
Robin Mueller	e8e3138fba	Merge remote-tracking branch 'origin/develop' into mueller/pl-ss	2022-05-03 16:05:01 +02:00