765 Commits

Author	SHA1	Message	Date
Robin Mueller	958abadd65	somethings buggy	2023-04-03 15:16:53 +02:00
Robin Müller	ba7a2c3ece	Merge branch 'develop' into thermal_controller	2023-04-03 15:12:30 +02:00
Robin Mueller	a31f8c934a	add compatible firmware	2023-04-02 15:51:55 +02:00
Robin Mueller	9360dad028	changelog	2023-04-02 15:34:52 +02:00
Robin Mueller	8eac0b5ebd	changelog	2023-04-02 15:33:49 +02:00
Robin Mueller	62952b89b1	Merge remote-tracking branch 'origin/develop' into thermal_controller	2023-04-01 16:00:15 +02:00
Robin Mueller	b205fb5269	bump changelog	2023-04-01 15:55:37 +02:00
Robin Mueller	959f37f25a	changelog format fix	2023-04-01 15:55:23 +02:00
Robin Mueller	601318d7eb	prep v1.42.0	2023-04-01 15:33:02 +02:00
Robin Mueller	f65cf23391	dobule GS polling frequency	2023-04-01 15:07:04 +02:00
Robin Mueller	409631fb0a	filename fixes scex	2023-04-01 14:23:11 +02:00
Robin Mueller	9b5fc8995c	changelog	2023-04-01 13:43:24 +02:00
Robin Mueller	d1775a52aa	Merge remote-tracking branch 'origin/develop' into thermal_controller	2023-03-31 19:18:05 +02:00
Robin Mueller	ff6ad60eed	changelog	2023-03-31 19:16:57 +02:00
Robin Mueller	55a22c840c	PTME_LOCK atomic boolean and related handling	2023-03-31 16:51:30 +02:00
Robin Mueller	6ee3fe2eef	changelog	2023-03-31 13:22:07 +02:00
Robin Mueller	a1380a6e3a	syrlinks bugfix	2023-03-31 12:11:55 +02:00
Robin Mueller	4b1221ab99	modes for VC/stores	2023-03-31 01:14:59 +02:00
Robin Mueller	5f6f85a778	done	2023-03-30 17:16:59 +02:00
Robin Mueller	b7c17fdf0f	scex update	2023-03-29 11:41:42 +02:00
Robin Mueller	0c3c61c686	prep v1.41.0	2023-03-28 22:26:23 +02:00
Robin Mueller	9c743eb0d9	bump fsfw and changelog	2023-03-28 22:17:54 +02:00
Robin Mueller	f29163e8a9	changelog note	2023-03-28 22:08:08 +02:00
Robin Mueller	28d7dcf177	Merge remote-tracking branch 'origin/develop' into thermal_controller	2023-03-28 16:37:09 +02:00
Robin Mueller	fcb5613aa8	changelog	2023-03-27 17:44:51 +02:00
Robin Mueller	80ad923181	SUS goes to MODE_ON in startup now	2023-03-27 15:03:54 +02:00
Robin Mueller	ec95792bc3	ACS board devs go to on first	2023-03-27 15:00:40 +02:00
Robin Mueller	3e7901f060	Merge remote-tracking branch 'origin/develop' into thermal_controller	2023-03-26 16:52:39 +02:00
Robin Mueller	58c343b8de	Merge remote-tracking branch 'origin/develop' into feature_set_up_periodic_hk	2023-03-26 16:45:28 +02:00
Robin Mueller	b92924881b	changelog	2023-03-26 16:43:36 +02:00
Robin Mueller	cb2fe300b2	enable periodic HK	2023-03-26 15:28:00 +02:00
Robin Mueller	c37f26021c	changelog	2023-03-24 21:36:31 +01:00
Robin Mueller	3d93431278	prep v1.40.0	2023-03-24 21:34:03 +01:00
Robin Mueller	f71972609c	Merge remote-tracking branch 'origin/develop' into thermal_controller	2023-03-24 21:15:29 +01:00
Robin Mueller	40c000b183	changelog	2023-03-24 21:10:59 +01:00
Robin Mueller	dd28767d68	changelog	2023-03-24 21:08:44 +01:00
Robin Mueller	fe1fb9425e	bugfix fsfwgen	2023-03-24 15:39:45 +01:00
Robin Mueller	b32e0ef4fb	Merge remote-tracking branch 'origin/develop' into mekf-invalid-reset-counter	2023-03-24 15:01:01 +01:00
Robin Mueller	74603f9969	Merge remote-tracking branch 'origin/develop' into refactoring_syrlinks_com_if	2023-03-24 14:22:12 +01:00
Robin Mueller	267f900545	changelog	2023-03-24 14:15:01 +01:00
Robin Mueller	91b83d477b	changelog	2023-03-24 13:28:27 +01:00
Robin Mueller	21159107d7	done	2023-03-24 02:34:38 +01:00
Robin Mueller	abf689872d	Merge remote-tracking branch 'origin/develop' into tweak_papb_busy_polling	2023-03-23 18:42:24 +01:00
Robin Mueller	0bb6c15b97	Merge remote-tracking branch 'origin/develop' into thermal_ctrl_local_vars_as_members	2023-03-23 18:39:09 +01:00
Robin Mueller	f622e1afe4	bump changelog	2023-03-23 12:14:46 +01:00
Robin Mueller	884462e793	changelog	2023-03-23 12:03:53 +01:00
Robin Mueller	7a0641b98c	Merge remote-tracking branch 'origin/develop' into tweak_papb_busy_polling	2023-03-23 12:02:55 +01:00
meggert	7bca418db8	changelog	2023-03-23 10:51:06 +01:00
Robin Mueller	b5d5dc5ad8	Merge remote-tracking branch 'origin/develop' into refactoring_str_use_ring_buff_for_rx	2023-03-23 09:28:24 +01:00
Robin Mueller	9b088a22b4	prep v1.39.1	2023-03-22 21:33:35 +01:00
Robin Mueller	d824f8ba9e	some more improvements for DLL	2023-03-22 10:38:41 +01:00
Robin Mueller	481b0361f9	changelog	2023-03-22 00:00:32 +01:00
Robin Mueller	a94e7ed17c	Merge remote-tracking branch 'origin/develop' into bugfix_str	2023-03-21 23:57:11 +01:00
Robin Mueller	e5f06fe19f	changelog	2023-03-21 23:56:59 +01:00
Robin Mueller	dec13c7d13	eive-tmtc version	2023-03-21 23:45:25 +01:00
Robin Mueller	9c8fc84053	Merge remote-tracking branch 'origin/develop' into thermal_controller	2023-03-21 23:44:25 +01:00
Robin Mueller	25de385766	pre v1.39.0	2023-03-21 23:32:41 +01:00
Robin Mueller	17b9086974	Merge remote-tracking branch 'origin/develop' into tweak_papb_busy_polling	2023-03-21 15:02:24 +01:00
Robin Mueller	0fdc79df5e	Merge remote-tracking branch 'origin/develop' into thermal_controller	2023-03-21 14:55:55 +01:00
Robin Mueller	0e5a3a2f6c	update changelog	2023-03-21 14:46:07 +01:00
Robin Mueller	1b05f45e24	Merge remote-tracking branch 'origin/develop' into ptme_bat_priority_enable	2023-03-21 15:07:11 +01:00
Robin Mueller	8464dd1eae	changelog	2023-03-21 14:12:00 +01:00
Robin Mueller	6a07471c3a	changelog	2023-03-21 14:11:19 +01:00
Robin Müller	3150261e3e	Merge branch 'develop' into stop-the-spam	2023-03-21 13:46:34 +01:00
Marius Eggert	bc6b492976	Merge branch 'develop' into bugfix_gps	2023-03-21 13:39:31 +01:00
meggert	b891198bee	Merge branch 'develop' into feature_i2c_fatal_error_counter	2023-03-21 13:38:29 +01:00
meggert	da831ff789	changelog	2023-03-21 13:25:22 +01:00
Robin Mueller	2694f0cbc8	changelog	2023-03-21 12:56:22 +01:00
Robin Mueller	6e4d27a454	bump tmtc, additonal changelog entry	2023-03-21 12:55:39 +01:00
Robin Mueller	ab74382c12	only set time valid if at least 1 sat in view	2023-03-21 12:54:14 +01:00
meggert	a92f664770	Merge branch 'develop' into acs-ctrl-finite-check	2023-03-21 11:30:26 +01:00
Robin Mueller	bb27700cc2	changelog	2023-03-20 18:02:59 +01:00
Robin Mueller	55d32a2bb0	Merge remote-tracking branch 'origin/develop' into ptme_bat_priority_enable	2023-03-20 18:01:13 +01:00
Robin Mueller	68e68afdd6	changelog	2023-03-20 17:59:46 +01:00
Robin Mueller	8482d56fd0	Merge remote-tracking branch 'origin/develop' into bugfix_str_mode_transitions	2023-03-20 17:56:10 +01:00
Robin Mueller	0bb5f08d23	Merge remote-tracking branch 'origin/develop' into bugfix_str_mode_transitions	2023-03-20 17:54:32 +01:00
Robin Mueller	0dbe6b9854	changelog	2023-03-20 17:53:33 +01:00
meggert	11c54e270f	changelog	2023-03-20 15:50:50 +01:00
Robin Mueller	22f8d256dd	changelog	2023-03-20 13:09:28 +01:00
Robin Mueller	f39d03afc2	changelog	2023-03-18 14:50:34 +01:00
Robin Mueller	0e8859c278	prep v1.38.0	2023-03-17 18:08:08 +01:00
Robin Müller	a4ba52e76d	Merge branch 'develop' into refactoring_bugfixes_power_switching	2023-03-17 16:30:22 +01:00
Robin Mueller	9cec20a550	scheduling tweaks for i2c	2023-03-17 16:27:00 +01:00
Robin Mueller	9a5901235c	changelog	2023-03-17 16:19:04 +01:00
Robin Mueller	2f0aed97dc	Merge remote-tracking branch 'origin/develop' into refactoring_bugfixes_power_switching	2023-03-16 17:44:46 +01:00
Robin Müller	4ff1548cf2	Merge branch 'develop' into feature_boot_sequence_eive_sys	2023-03-15 16:29:11 +01:00
Robin Müller	1623dd1c80	Merge branch 'develop' into feature_scheduling_tweaks	2023-03-15 16:28:26 +01:00
Robin Müller	94ae33a554	Merge branch 'develop' into refactoring_bugfixes_power_switching	2023-03-15 16:27:54 +01:00
Robin Müller	e3c41dd807	Merge pull request 'ACS Safe Ctrl Failure Event' (#484) from acs-safe-mode-failure into develop ... Reviewed-on: #484 Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>	2023-03-15 16:27:42 +01:00
Robin Müller	8c83ec78fd	Merge branch 'develop' into feature_boot_sequence_eive_sys	2023-03-15 15:51:38 +01:00
Robin Mueller	f229ebb141	Merge remote-tracking branch 'origin/develop' into feature_scheduling_tweaks	2023-03-15 14:16:21 +01:00
Robin Mueller	7c54e920ef	bump fsfw	2023-03-15 11:42:03 +01:00
Robin Mueller	be848ea5e4	changelog update	2023-03-15 11:32:58 +01:00
Robin Müller	8dd22b6ea0	Merge branch 'develop' into feature_scheduling_tweaks	2023-03-15 11:31:55 +01:00
Robin Mueller	53c38d9c05	Merge remote-tracking branch 'origin/develop' into acs-ctrl-finite-check	2023-03-15 11:31:31 +01:00
Robin Mueller	d894479f75	Merge remote-tracking branch 'origin/develop' into acs-safe-mode-failure	2023-03-15 11:29:06 +01:00
meggert	bab0bbf82d	changelog	2023-03-15 10:38:00 +01:00
meggert	c4fe772fe7	changelog	2023-03-15 10:08:58 +01:00
meggert	7ddfdc0978	post merge fix	2023-03-15 09:38:31 +01:00
meggert	bb895c9e12	Merge branch 'develop' into acs-ctrl-finite-check	2023-03-15 09:37:15 +01:00
Robin Mueller	005d5a5223	prep patch version	2023-03-14 20:02:27 +01:00
Robin Müller	2b12cc4fa2	Merge branch 'develop' into feature_boot_sequence_eive_sys	2023-03-14 18:49:25 +01:00
Robin Müller	ec2db69236	Merge branch 'develop' into feature_scheduling_tweaks	2023-03-14 18:49:16 +01:00
Robin Müller	263f4eb25f	Merge branch 'develop' into refactoring_bugfixes_power_switching	2023-03-14 18:49:06 +01:00
Robin Mueller	f966b517a4	prep v1.37.1	2023-03-14 18:44:50 +01:00
Robin Mueller	d322096573	changelog	2023-03-14 18:41:11 +01:00
Robin Mueller	a392e31f99	Merge remote-tracking branch 'origin/develop' into feature_boot_sequence_eive_sys	2023-03-14 18:39:08 +01:00
Robin Mueller	719ffcad2b	Merge remote-tracking branch 'origin/develop' into refactoring_bugfixes_power_switching	2023-03-14 18:36:43 +01:00
Robin Müller	8fa2d0be0b	Merge branch 'develop' into feature_scheduling_tweaks	2023-03-14 18:33:33 +01:00
Robin Mueller	8a6d292a48	bump fsfw, tmtc and allow spilling for pools	2023-03-14 18:29:21 +01:00
meggert	017171f221	changelog	2023-03-14 17:22:59 +01:00
Robin Mueller	77e39f3a92	new subsystem.csv	2023-03-14 17:12:05 +01:00
Robin Mueller	0d46349caa	bump fsfw	2023-03-14 16:52:03 +01:00
Robin Mueller	07394ddfc9	Merge remote-tracking branch 'origin/develop' into feature_scheduling_tweaks	2023-03-14 15:35:52 +01:00
Robin Mueller	306fe7a2d9	best PR	2023-03-14 15:30:26 +01:00
Robin Mueller	f8c9ddbc3c	changelog	2023-03-14 14:48:12 +01:00
meggert	66b38fa294	Merge branch 'develop' into acs-ctrl-finite-check	2023-03-14 14:19:30 +01:00
Robin Müller	7d6c6f03ef	Merge branch 'develop' into mekf-invalid-violation-parameter	2023-03-14 14:07:22 +01:00
Robin Mueller	fe9c8c50f2	changelog	2023-03-14 14:06:33 +01:00
Robin Mueller	6e049f3ee1	changelog update	2023-03-14 14:03:27 +01:00
Robin Mueller	157e7d2b4d	Merge remote-tracking branch 'origin/develop' into feature_scheduling_tweaks	2023-03-14 14:01:55 +01:00
Robin Mueller	882fb02600	Merge remote-tracking branch 'origin/develop' into refactoring_bugfixes_power_switching	2023-03-14 13:56:54 +01:00
Robin Mueller	6688499128	power updates	2023-03-14 13:56:19 +01:00
meggert	038a529b06	Merge branch 'develop' into acs-ctrl-finite-check	2023-03-14 13:40:26 +01:00
meggert	70806cffff	Merge branch 'develop' into mekf-invalid-violation-parameter	2023-03-14 13:37:08 +01:00
Robin Mueller	c9e16642c5	refactor power code	2023-03-14 13:32:13 +01:00
meggert	4664a9f4e7	changelog	2023-03-14 13:19:48 +01:00
Robin Mueller	1f9935cf22	tweak scheduling frequencies	2023-03-14 13:12:42 +01:00
Robin Mueller	b59a84b3d5	changelog	2023-03-14 13:07:22 +01:00
Robin Mueller	a0fda428bf	update changelog	2023-03-14 13:04:56 +01:00
Robin Mueller	870cc1da10	now it works	2023-03-14 11:44:51 +01:00
meggert	ee3926fe2a	Merge branch 'develop' into acs-ctrl-finite-check	2023-03-14 09:23:46 +01:00
meggert	4d74c8ec43	changelog	2023-03-13 16:24:13 +01:00
Robin Mueller	977235df87	changelog	2023-03-13 11:36:10 +01:00
Robin Mueller	bfd2ed5b6e	Merge remote-tracking branch 'origin/develop' into feature_add_cmd_to_execute_shell_cmd	2023-03-13 10:58:20 +01:00
meggert	f71fe274f4	changelog	2023-03-13 10:05:54 +01:00
Robin Mueller	a83136515c	command to execute shell command	2023-03-12 20:51:33 +01:00
Robin Mueller	eb861c9f01	bump eive-tmtc to v2.18.1	2023-03-11 15:24:43 +01:00
Robin Mueller	7fd2fbc481	prep v1.37.0	2023-03-11 15:09:31 +01:00
Robin Mueller	08ca196c74	Merge remote-tracking branch 'origin/develop' into refactor_tm_handling	2023-03-11 15:01:46 +01:00
meggert	0f7fd39d72	changelog	2023-03-11 10:22:21 +01:00
Robin Mueller	8c450596f6	Merge remote-tracking branch 'origin/develop' into refactor_tm_handling	2023-03-10 19:35:45 +01:00
Robin Mueller	939d7fd98e	Merge remote-tracking branch 'origin/develop' into refactor_tm_handling	2023-03-10 19:14:48 +01:00
Robin Mueller	5f9e0bf80a	tweaks and CHANGELOG	2023-03-10 18:17:04 +01:00
meggert	b6d18ef4d2	changelog fix	2023-03-10 17:41:18 +01:00
meggert	7b3393c5b2	Merge branch 'develop' into acs-bug-bash	2023-03-10 17:38:29 +01:00
meggert	342ff62837	fixed rw torque scaling	2023-03-10 17:31:12 +01:00
meggert	bce8df376a	changed antistiction	2023-03-10 17:21:52 +01:00
Robin Mueller	2e6962c29c	Merge remote-tracking branch 'origin/develop' into refactor_tm_handling	2023-03-10 15:37:03 +01:00
Robin Mueller	4a386ad3d1	simplification	2023-03-10 15:21:36 +01:00
Robin Mueller	79abd05820	Merge remote-tracking branch 'origin/develop' into feature_move_acs_event_handling_to_system	2023-03-10 15:05:11 +01:00
Robin Mueller	793d6feaaa	Merge remote-tracking branch 'origin/develop' into feature_move_acs_event_handling_to_system	2023-03-10 15:03:55 +01:00
Robin Mueller	b6fc9d65b7	changelog	2023-03-10 15:01:59 +01:00
Robin Mueller	2e431668dd	larger event queues now	2023-03-10 14:59:52 +01:00
meggert	555e0ce49d	changelog	2023-03-10 11:39:31 +01:00
Robin Mueller	ac6031364e	Merge remote-tracking branch 'origin/develop' into refactor_tm_handling	2023-03-10 11:37:02 +01:00
Robin Mueller	68c728cbdb	Merge remote-tracking branch 'origin/develop' into improve_sd_card_manager	2023-03-10 11:19:29 +01:00
Robin Mueller	3caa9dea75	changelog	2023-03-10 11:18:34 +01:00
Robin Mueller	86e48eea6d	changelog update	2023-03-10 11:16:02 +01:00
meggert	75a80b55ec	changelog	2023-03-10 10:29:27 +01:00
meggert	b6477e099d	Merge branch 'develop' into acs-bug-bash	2023-03-10 09:26:50 +01:00
Robin Mueller	3ebcbaa44f	added fixed entry	2023-03-09 19:44:24 +01:00
Robin Mueller	1dee29aabd	changelog typo	2023-03-09 19:43:38 +01:00
Robin Mueller	9d5f846658	Merge remote-tracking branch 'origin/develop' into refactor_tm_handling	2023-03-09 19:43:05 +01:00
Robin Mueller	b2fd2f5d83	now only scheduling is left	2023-03-09 19:42:20 +01:00
Robin Mueller	9f9b1e440a	changelog	2023-03-09 16:52:47 +01:00
Robin Mueller	2f5f47a02c	tmtc bump	2023-03-08 19:20:18 +01:00
Robin Mueller	8821cc1079	prep v1.36.0	2023-03-08 19:17:24 +01:00
Robin Mueller	4863dad1cd	changelog	2023-03-08 18:59:22 +01:00
Robin Mueller	1154c0e887	move acs event handling to system	2023-03-08 18:56:27 +01:00
Robin Mueller	c6289e27ae	Merge remote-tracking branch 'origin/develop' into bugfix_tcs_brd_assy	2023-03-08 18:54:52 +01:00
Robin Mueller	fa5883bdf3	this contains a bit more now	2023-03-08 18:12:37 +01:00
Robin Mueller	bf73f2ff04	Merge remote-tracking branch 'origin/develop' into feature_str_assy	2023-03-08 16:34:35 +01:00
Robin Mueller	ccf03b131b	avoid exceptions	2023-03-08 14:50:25 +01:00
Robin Mueller	c48268ffa9	Merge remote-tracking branch 'origin/develop' into feature_str_assy	2023-03-08 13:28:01 +01:00
Robin Mueller	97a78fc4c9	Merge remote-tracking branch 'origin/develop' into bugfix_tcs_brd_assy	2023-03-08 13:26:27 +01:00
Robin Müller	66583e8009	Merge branch 'develop' into bugfix_gps_fix_logic	2023-03-08 13:21:57 +01:00
Robin Mueller	6a15aa14a2	changelog and new action cmd	2023-03-08 11:37:11 +01:00
Robin Mueller	d30bab7bc0	Merge remote-tracking branch 'origin/develop' into feature_str_assy	2023-03-08 11:13:02 +01:00
Robin Mueller	a366ef0960	Merge remote-tracking branch 'origin/develop' into bugfix_gps_fix_logic	2023-03-08 11:11:34 +01:00
Robin Mueller	68f4323d14	changelog	2023-03-08 01:24:41 +01:00
Robin Mueller	f5c4e2b788	changelog	2023-03-07 21:07:58 +01:00
Robin Mueller	72ae6aee94	changelog update	2023-03-07 18:55:11 +01:00
Robin Mueller	e48d080673	small tweak	2023-03-07 17:08:33 +01:00
Robin Mueller	f84e7e42d6	Merge remote-tracking branch 'origin/develop' into update_fsfw_submode_mask	2023-03-07 16:05:42 +01:00
Robin Mueller	97888953ec	Merge remote-tracking branch 'origin/develop' into feature_always_create_new_active_file	2023-03-07 15:36:40 +01:00
Robin Mueller	112cfa3ee7	changelog update	2023-03-07 15:34:34 +01:00
Robin Mueller	5de7653600	TM store bugfixes	2023-03-07 15:34:08 +01:00
Robin Mueller	bf7e4b4b8c	changelog	2023-03-07 14:20:42 +01:00
meggert	5b0db43e0f	changelog	2023-03-07 14:15:33 +01:00
meggert	1cc39bb6d7	changelog	2023-03-07 13:57:45 +01:00
meggert	82966eed31	changelog	2023-03-07 11:13:00 +01:00
meggert	d8a07312f2	changelog	2023-03-07 10:36:00 +01:00
Robin Mueller	58db0d7184	Merge remote-tracking branch 'origin/develop' into bugfix_tcs_brd_assy	2023-03-07 10:16:49 +01:00
meggert	37673a2782	Merge branch 'develop' into acs-bug-bash	2023-03-07 09:54:53 +01:00
Robin Mueller	c169229107	Merge remote-tracking branch 'origin/develop' into feature_str_assy	2023-03-07 09:50:52 +01:00
Jakob Meier	ca7fbcf6a9	reduced transmitter timeout to 2 minutes	2023-03-07 07:26:09 +01:00
Robin Mueller	cee56f6d02	changelog update	2023-03-06 15:58:19 +01:00
Robin Mueller	f66777a23c	changelog	2023-03-06 15:56:37 +01:00
Robin Mueller	0dc26ec8b2	prep v1.35.1	2023-03-06 14:42:23 +01:00
Robin Mueller	ff9a5fc1bf	Merge remote-tracking branch 'origin/develop' into bugfix_acs_brd_ass	2023-03-06 14:04:32 +01:00
Robin Mueller	7f141aa1e8	Merge remote-tracking branch 'origin/develop' into bugfix_acs_brd_ass	2023-03-05 16:22:10 +01:00
Robin Mueller	c8d09debf7	Merge remote-tracking branch 'origin/develop' into feature_imtq_assy	2023-03-05 16:20:53 +01:00
Robin Mueller	e6b5ee65f3	prep v1.35.0	2023-03-04 17:19:36 +01:00
Robin Mueller	4d6ccaeb4b	changelog update	2023-03-04 17:12:56 +01:00
Robin Mueller	f96fbf707d	PR in changelog	2023-03-04 17:09:51 +01:00
Robin Mueller	80115640ba	changelog	2023-03-04 17:09:24 +01:00
Robin Mueller	f6f3f17505	changelog	2023-03-04 12:01:15 +01:00
Robin Müller	5b5489c8da	Merge branch 'develop' into feature_watchdog_extension	2023-03-04 10:45:37 +01:00
Robin Mueller	206c29bb25	changelog entry	2023-03-03 17:06:32 +01:00
Robin Mueller	f209ac6b2d	Merge remote-tracking branch 'origin/develop' into feature_imtq_assy	2023-03-03 17:03:55 +01:00
Robin Mueller	e6b0b4048c	changelog eive-tmtc version	2023-03-03 16:52:38 +01:00
Robin Mueller	0d175951ec	some missing changelog entries	2023-03-03 16:49:21 +01:00
Robin Mueller	3b383b98df	prep v1.34.0	2023-03-03 16:45:25 +01:00
Robin Mueller	05be170890	hotfixees	2023-03-03 16:06:38 +01:00
Jakob Meier	7a7f25a638	lets see if this fixes issues	2023-03-03 14:36:52 +01:00
Robin Mueller	04e3d2486d	Merge remote-tracking branch 'origin/develop' into feature_imtq_assy	2023-03-02 18:40:11 +01:00
Robin Müller	c4ef164f41	Merge branch 'develop' into rework_lock_handling	2023-03-02 18:29:45 +01:00
meggert	ca22904d32	Merge branch 'develop' into acs-units-fix	2023-03-02 17:57:34 +01:00
meggert	3ade660132	changelog	2023-03-02 17:53:59 +01:00
Robin Mueller	0919acf2d5	changelog update	2023-03-02 16:14:06 +01:00
Robin Mueller	25dfb54be0	bump changelog	2023-03-02 15:44:07 +01:00
Robin Mueller	718a440442	changelog update	2023-03-02 15:05:12 +01:00
Robin Müller	652326443b	Merge branch 'develop' into feature_allow_quicker_transition	2023-03-02 14:45:29 +01:00
Robin Mueller	0056ebcb62	bump changelog	2023-03-02 14:46:20 +01:00
Robin Müller	a2485a2195	Merge branch 'develop' into feature_allow_quicker_transition	2023-03-02 14:44:12 +01:00
Robin Mueller	eaa0fc6cbe	bump changelog	2023-03-02 14:43:50 +01:00
Robin Mueller	14188a4f3b	bugfixes imtq	2023-03-02 14:42:42 +01:00
Robin Mueller	7a8816e49a	Merge remote-tracking branch 'origin/develop' into feature_watchdog_extension	2023-03-02 10:18:00 +01:00
meggert	8ad1daa11f	changelog	2023-03-02 09:02:49 +01:00
Robin Mueller	f646566228	prep v1.33.0	2023-03-01 18:40:05 +01:00
Robin Mueller	22b2f137b4	changelog	2023-03-01 18:10:16 +01:00
Robin Mueller	543568be39	Merge remote-tracking branch 'origin/develop' into feature_watchdog_extension	2023-02-28 15:11:03 +01:00
Robin Mueller	c09d94f003	Merge remote-tracking branch 'origin/develop' into feature_watchdog_extension	2023-02-28 11:54:18 +01:00
meggert	309358f447	fixed updating wrong parameter set	2023-02-27 17:05:09 +01:00
meggert	7bf72e3c18	changelog	2023-02-27 16:43:31 +01:00
Robin Mueller	ea993ad2e9	Merge remote-tracking branch 'origin/develop' into rework_acs_board_polling	2023-02-26 18:25:13 +01:00
Robin Mueller	9ae43d83f9	this is okay for now	2023-02-26 18:21:05 +01:00
Robin Mueller	828b6adf77	vieles	2023-02-26 14:55:33 +01:00
Robin Mueller	cf42ca7835	Merge remote-tracking branch 'origin/develop' into feature_watchdog_extension	2023-02-24 19:16:29 +01:00
Robin Mueller	c99b9f5afa	v1.32.0	2023-02-24 19:13:00 +01:00
Robin Mueller	9501d0802f	changelog	2023-02-24 19:03:03 +01:00
Robin Mueller	1744f1aff0	Merge remote-tracking branch 'origin/develop' into mueller/pus-15-tm-storage	2023-02-24 17:01:31 +01:00
Robin Mueller	0206115abb	changelog	2023-02-24 16:52:37 +01:00
meggert	d2e3f14b72	Merge branch 'develop' into eggert/acs-ctrl-action-cmds	2023-02-24 15:49:32 +01:00
meggert	6d148307ae	changelog	2023-02-24 15:48:04 +01:00
Robin Mueller	862f8b3da3	bugfix in fsfw	2023-02-24 14:52:35 +01:00
Robin Mueller	cb1a98ccff	bump changelog	2023-02-24 11:12:16 +01:00
Robin Mueller	cb869fef0c	Merge remote-tracking branch 'origin/develop' into mueller/pus-15-tm-storage	2023-02-24 10:18:59 +01:00
Robin Mueller	d3fc9a4491	Merge remote-tracking branch 'origin/develop' into feature_watchdog_extension	2023-02-24 10:15:36 +01:00