2840 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Robin Mueller	4864394590	renamed heaters	2022-05-09 16:13:33 +02:00
Robin Mueller	646925c571	removed redundant SUS OBJ ID defs	2022-05-08 13:08:49 +02:00
Robin Mueller	d9085e81a1	Merge remote-tracking branch 'origin/develop' into mueller/heater-health-if	2022-05-08 13:06:47 +02:00
Robin Müller	9f9fa9b41b	Merge pull request 'PLOC Handler Update' (#234) from meier/plocSupv into develop ... Reviewed-on: #234 Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>	2022-05-08 12:32:47 +02:00
Jakob Meier	421237bfb7	fixed ploc supervisor build error which was hidden by prerocessor define	2022-05-08 12:01:35 +02:00
Robin Müller	37e81d34c9	Merge branch 'develop' into mueller/heater-health-if	2022-05-07 22:50:13 +02:00
Jakob Meier	2bc2325b1f	removed unused includes	2022-05-07 13:59:53 +02:00
Jakob Meier	d9024b6c22	adaption in DummyGpioIF due to API change in GpioIF	2022-05-07 13:50:36 +02:00
Jakob Meier	f8addd9365	preprocessor define fixes	2022-05-07 13:38:09 +02:00
Jakob Meier	2ff8923c81	fixed reorder warning in imtq handler	2022-05-07 13:19:59 +02:00
Jakob Meier	631bc61d6c	changed set ids	2022-05-07 12:01:05 +02:00
Jakob Meier	43b0ed4b04	preprocessor define adjustments	2022-05-06 20:33:46 +02:00
Jakob Meier	d9c7cccf76	run clang format script	2022-05-06 19:53:33 +02:00
Jakob Meier	322db3d617	removed ploc updater	2022-05-06 19:52:43 +02:00
Jakob Meier	6dd57a3f5e	fixed merge conflicts	2022-05-06 19:44:18 +02:00
Jakob Meier	4ba26f057d	Merge branch 'meier/ploc' into meier/plocSupv	2022-05-06 19:36:03 +02:00
Jakob Meier	97222cafd9	increased mram dump execution timeout	2022-05-06 19:34:12 +02:00
Jakob Meier	cbb3c92885	tmtc update	2022-05-06 19:31:09 +02:00
Jakob Meier	132751893b	bugfix in missed reply hanling of supervsior MRAM dump	2022-05-06 19:30:20 +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
Cleanroom Laptop L15	5c7c5b468a	tmtc update	2022-05-05 19:21:42 +02:00
Cleanroom Laptop L15	fabd81365b	supervisor do startup set time	2022-05-05 19:20:14 +02:00
Cleanroom Laptop L15	5911ca79b5	nvm enable command	2022-05-05 19:18:39 +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