2725 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Robin Mueller	68938c3b42	remove duplicate object ID	2022-05-05 20:27:20 +02:00
Robin Mueller	a11a8c493d	Merge remote-tracking branch 'origin/develop' into mueller/heater-health-if	2022-05-05 19:53:18 +02:00
Robin Müller	a7b696884c	Merge pull request 'Rename sun sensors' (#245) from mueller/rename-sus into develop ... Reviewed-on: #245 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-05-05 19:52:30 +02:00
Robin Mueller	a2a7313016	Merge remote-tracking branch 'origin/develop' into mueller/rename-sus	2022-05-05 19:47:17 +02:00
Robin Müller	6893b895e3	Merge pull request 'Build unittest by default in host build' (#244) from mueller/ci-cd-build-host-and-unittest-by-default into develop ... Reviewed-on: #244 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-05-05 19:46:04 +02:00
Robin Mueller	8f9d84c293	Merge remote-tracking branch 'origin/develop' into mueller/ci-cd-build-host-and-unittest-by-default	2022-05-05 19:42:24 +02:00
Robin Mueller	0c82d06ec4	Merge remote-tracking branch 'origin/develop' into mueller/rename-sus	2022-05-05 19:41:36 +02:00
Jakob.Meier	a3419412cc	Merge pull request 'Rename RTDs' (#246) from mueller/rename-rtds into develop ... Reviewed-on: #246 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-05-05 17:13:11 +02:00
Robin Mueller	cc662738f2	update changelog	2022-05-05 16:55:51 +02:00
Robin Mueller	b426475ca4	better RTD names	2022-05-05 16:55:08 +02:00
Robin Mueller	957c8f5298	bump submodules	2022-05-05 16:50:16 +02:00
Robin Mueller	4445ac34ca	update changelog	2022-05-05 16:49:10 +02:00
Robin Mueller	b9535f46d9	bump tmtc again	2022-05-05 16:48:30 +02:00
Robin Mueller	a232b9bf98	assign better sus names	2022-05-05 16:46:04 +02:00
Robin Mueller	165963ed2d	bump submodules	2022-05-05 16:35:53 +02:00
Robin Mueller	4c809e354d	better heater obj id names	2022-05-05 16:23:46 +02:00
Robin Mueller	bcb6df87b0	update tmtc, gen files and formatting in config file	2022-05-05 00:47:50 +02:00
Robin Mueller	54a50beacb	Merge remote-tracking branch 'origin/main' into mueller/ci-cd-build-host-and-unittest-by-default	2022-05-04 17:46:19 +02:00
Robin Mueller	c24d5c05f0	Merge branch 'mueller/ci-cd-build-host-and-unittest-by-default' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into mueller/ci-cd-build-host-and-unittest-by-default	2022-05-04 17:46:09 +02:00
Robin Mueller	a2e22302fb	update changelog	2022-05-04 17:46:01 +02:00
Robin Müller	1a6fb52e1d	Merge branch 'develop' into mueller/ci-cd-build-host-and-unittest-by-default	2022-05-04 17:40:19 +02:00
Robin Mueller	c83a177061	Build unittest by default in host build ... - Also update CI/CD to build host build	2022-05-04 17:38:08 +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 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	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
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