2738 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Robin Müller	37e81d34c9	Merge branch 'develop' into mueller/heater-health-if	2022-05-07 22:50:13 +02:00
Robin Mueller	576f71304c	updated eclipse launch files	2022-05-06 10:45:53 +02:00
Robin Mueller	385d8df466	fix .cproject file	2022-05-06 10:43:04 +02:00
Robin Mueller	bfd7d9d82d	bump fsfw (hotfix)	2022-05-06 10:37:54 +02:00
Robin Müller	e6cbe3068d	Merge branch 'develop' into mueller/heater-health-if	2022-05-06 10:12:23 +02:00
Jakob.Meier	9918aae94a	Merge pull request 'install Catch2 for CI/CD' (#247) from mueller/install-catch2-docker into develop ... Reviewed-on: #247 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-05-06 10:00:12 +02:00
Robin Mueller	31425877b4	apparently python3 is needed	2022-05-06 01:09:25 +02:00
Robin Mueller	09f80f63b5	small dockerfile fix	2022-05-06 01:01:56 +02:00
Robin Mueller	68938c3b42	remove duplicate object ID	2022-05-05 20:27:20 +02:00
Robin Mueller	a945b3cae0	Merge remote-tracking branch 'origin/develop' into mueller/install-catch2-docker	2022-05-05 20:19:53 +02:00
Robin Mueller	81b29cfda6	lets hope this works	2022-05-05 20:16:42 +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	e98563d834	update changelog	2022-05-05 19:51:25 +02:00
Robin Mueller	a920f60c61	use newer docker container d5	2022-05-05 19:50:53 +02:00
Robin Mueller	b54641a2a1	install catch2 for CI/CD	2022-05-05 19:48:04 +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