4241 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Robin Mueller	73df54abb0	Merge remote-tracking branch 'origin/develop' into heater_handling	2022-12-22 16:22:53 +01:00
Robin Müller	39ac8c8422	Merge pull request 'added 5v stack command' (#334) from mueller_pcdu_handler_stack_command into develop ... Reviewed-on: #334	2022-12-22 16:06:17 +01:00
Robin Müller	7f29cf7e58	Merge branch 'develop' into mueller_pcdu_handler_stack_command	2022-12-22 16:06:09 +01:00
Robin Mueller	b53cc475fe	bugfix acs controller	2022-12-21 16:11:53 +01:00
Robin Mueller	9024460da3	changelog update	2022-12-21 13:44:48 +01:00
Robin Mueller	7df7ced43e	added 5v stack command	2022-12-21 13:40:31 +01:00
Irini Kosmidou	bac8166611	changes thermal control	2022-12-20 15:47:40 +01:00
Marius Eggert	b981878c58	Merge pull request 'use memset for zeroing' (#333) from mueller_use_memset_for_zeroing into develop ... Reviewed-on: #333	2022-12-20 15:14:49 +01:00
Marius Eggert	0507bf14b1	Merge branch 'develop' into mueller_use_memset_for_zeroing	2022-12-20 15:08:10 +01:00
Robin Mueller	c83a6a44c6	actually use those defines	2022-12-20 11:45:46 +01:00
Robin Mueller	de3b2cefb0	reinitiate reboot file disabled	2022-12-20 11:45:21 +01:00
Robin Mueller	98597b98d7	use memset for zeroing	2022-12-20 11:43:02 +01:00
Irini Kosmidou	20fd204aa9	changes thermal control	2022-12-19 18:45:08 +01:00
Irini Kosmidou	8bfe2405cd	changes thermal control	2022-12-19 18:30:22 +01:00
Irini Kosmidou	6365f497a7	changes thermal control	2022-12-19 10:51:31 +01:00
Irini Kosmidou	8a9ed28845	changes thermal control	2022-12-14 11:24:03 +01:00
Irini Kosmidou	0b1136ad28	changes thermal controller	2022-12-13 12:08:53 +01:00
Robin Mueller	b89e440fc4	added health getter function	2022-12-13 10:19:28 +01:00
Robin Mueller	7ea2fd67c7	Merge remote-tracking branch 'origin/develop' into heater_handling	2022-12-13 10:13:32 +01:00
Irini Kosmidou	873bb2f79e	new design heater control for camera body	2022-12-12 21:33:12 +01:00
Irini Kosmidou	762ae04bb2	missing tempLimits completed	2022-12-12 20:07:54 +01:00
Robin Mueller	25873da6c0	afmt	2022-12-12 10:06:55 +01:00
Robin Mueller	87b07384ad	bump tmtc	2022-12-12 09:00:57 +01:00
Robin Mueller	bc66a88d74	bump deps	2022-12-06 10:34:55 +01:00
Robin Mueller	2b2b14193f	fix merge conflicts	2022-12-02 18:08:49 +01:00
Robin Mueller	141a3e9be8	Merge remote-tracking branch 'origin/develop' into heater_handling	2022-12-02 18:05:55 +01:00
Robin Müller	ace8900ca4	Merge pull request 'allow consecutive tcp and udp server' (#331) from mueller_consecutive_tmtc_server into develop ... Reviewed-on: #331	2022-12-02 18:03:38 +01:00
Robin Mueller	46248a5b69	schedule all dummy components	2022-12-02 16:58:21 +01:00
Robin Mueller	60bf8df9ef	update BSP hosted	2022-12-02 16:47:28 +01:00
Robin Mueller	93cc7af5ee	bump tmtc	2022-12-02 16:39:54 +01:00
Robin Mueller	1c4e9c8db6	Merge remote-tracking branch 'origin/develop' into mueller_consecutive_tmtc_server	2022-12-02 16:39:45 +01:00
Robin Mueller	d36202d86b	Merge remote-tracking branch 'origin/develop' into heater_handling	2022-12-02 16:24:19 +01:00
Robin Mueller	a0dd3f585b	bump tmtc	2022-12-02 16:23:16 +01:00
Robin Müller	3c29a4fc55	Merge pull request 'First Version of ACS Controller' (#329) from acs-ctrl-v1 into develop ... Reviewed-on: #329	2022-12-02 16:21:46 +01:00
Robin Mueller	c6c2469487	allow consecutive tcp and udp server	2022-12-02 13:55:19 +01:00
Robin Müller	ee1fc8aa8b	Merge branch 'develop' into acs-ctrl-v1	2022-12-02 11:57:18 +01:00
Robin Mueller	d72052fe2a	bump tmtc	2022-12-02 11:39:30 +01:00
Robin Mueller	622ce1d4f3	Merge branch 'acs-ctrl-v1' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into acs-ctrl-v1	2022-12-02 11:39:18 +01:00
Robin Mueller	60418f6fdc	small compile fixes	2022-12-02 11:38:51 +01:00
Robin Mueller	1d0a13a79d	update generated files	2022-12-01 17:08:03 +01:00
Robin Mueller	266e1a8527	Merge remote-tracking branch 'origin/develop' into heater_handling	2022-12-01 16:40:18 +01:00
Robin Mueller	72300f0217	Merge remote-tracking branch 'origin/develop' into acs-ctrl-v1	2022-12-01 16:39:54 +01:00
Robin Müller	e51670f615	Merge pull request 'v1.18.0' (#330) from develop into main ... Reviewed-on: #330	2022-12-01 16:37:32 +01:00
Robin Mueller	7d99d8e805	bump minor version and changelog	2022-12-01 16:30:39 +01:00
Robin Mueller	a726f7535d	bump tmtc	2022-12-01 16:21:29 +01:00
Robin Mueller	b38afa5df3	repoint json dependency	2022-12-01 16:01:50 +01:00
Robin Mueller	0bbdd21d81	bump changelog	2022-12-01 15:58:39 +01:00
Robin Mueller	fb2325b9ea	Merge remote-tracking branch 'origin/develop' into acs-ctrl-v1	2022-12-01 15:57:09 +01:00
Robin Mueller	828738ba0e	afmt	2022-12-01 15:56:55 +01:00
Robin Mueller	a3a919437e	bump submodules	2022-12-01 15:56:40 +01:00