901 Commits

Author	SHA1	Message	Date
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
Robin Mueller	104d9647fe	changelog	2023-02-24 01:09:40 +01:00
Robin Mueller	f789380343	reworked watchdog	2023-02-23 23:56:11 +01:00
Robin Mueller	e33a0fd60b	that was definitely a fix	2023-02-23 19:51:07 +01:00
Robin Mueller	b4ce9d2a22	Merge branch 'develop' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into develop	2023-02-23 18:55:56 +01:00
Robin Mueller	9b6c3964c6	Merge remote-tracking branch 'origin/develop' into bugfix_adis_cfg_set	2023-02-23 18:54:28 +01:00
Robin Mueller	089d04646a	prep v1.31.1	2023-02-23 18:53:29 +01:00
Robin Mueller	8da373542e	changelog	2023-02-23 18:51:31 +01:00
Robin Mueller	ee974d0e2d	register ADIS config set pool variables	2023-02-23 18:41:25 +01:00
Robin Mueller	43a2993f4d	Merge remote-tracking branch 'origin/develop' into mueller/pus-15-tm-storage	2023-02-23 15:59:24 +01:00
Robin Müller	33d552693f	Merge branch 'develop' into bugfix_shadowed_variables_dual_assys	2023-02-23 15:53:09 +01:00
Robin Mueller	152a9b2dce	bump eive-tmtc again	2023-02-23 15:46:53 +01:00
Robin Mueller	89f6314a18	prep v1.31.0	2023-02-23 15:32:40 +01:00
Robin Mueller	0ee7bdad0a	Merge remote-tracking branch 'origin/develop' into bugfix_shadowed_variables_dual_assys	2023-02-23 15:27:15 +01:00
Robin Müller	419864e5da	Merge pull request 'tweaks for ACS scheduling' (#395) from tweaks_acs_scheduling into develop ... Reviewed-on: #395 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-02-23 15:23:34 +01:00
Robin Mueller	9fc6386ac5	bump tmtc again	2023-02-23 15:19:56 +01:00
Robin Mueller	b60891ddd1	tmtc bump	2023-02-23 15:14:56 +01:00
Robin Mueller	66d3b06f9e	Merge remote-tracking branch 'origin/develop' into meier/com-ss	2023-02-23 13:06:22 +01:00
Robin Mueller	bd60255220	interior structure changes, use new sched block	2023-02-23 11:57:12 +01:00
Robin Mueller	ba9268aae6	changelog	2023-02-23 11:49:13 +01:00
Robin Mueller	d32ce3c563	changelog	2023-02-22 19:48:44 +01:00
Robin Mueller	90c1d45f20	correction for prefix handling on Q7S	2023-02-22 18:06:34 +01:00
meggert	eaceb32359	Merge branch 'develop' into eggert/acs-dataset-stuff	2023-02-22 16:03:36 +01:00
meggert	01d8eccdd2	changelog	2023-02-22 16:00:28 +01:00
Robin Mueller	721d38f758	Merge remote-tracking branch 'origin/develop' into mueller/pus-15-tm-storage	2023-02-22 15:15:25 +01:00
Robin Mueller	19d04c0023	v1.30.0	2023-02-22 15:03:07 +01:00
Robin Mueller	8b45786e5d	changelog	2023-02-22 14:49:54 +01:00
Robin Mueller	c9f16b223a	Merge remote-tracking branch 'origin/develop' into pdec_possible_fixes_and_fdir	2023-02-22 14:30:31 +01:00
Robin Mueller	f3fe65080b	Merge remote-tracking branch 'origin/develop' into bugfixes_code_review_msg_handling	2023-02-21 11:40:48 +01:00
Robin Mueller	d9ef0f9a9d	small tweak	2023-02-21 11:39:56 +01:00
Robin Mueller	7aa977efdf	move changelog entry	2023-02-21 11:32:51 +01:00
Robin Mueller	adda32854d	Merge remote-tracking branch 'origin/develop' into bugfixes_code_review_msg_handling	2023-02-21 11:32:17 +01:00
Robin Mueller	01ac2f4aff	Merge remote-tracking branch 'origin/develop' into pdec_possible_fixes_and_fdir	2023-02-21 11:32:05 +01:00
Robin Mueller	1bdfd5f8ea	prep v1.29.0	2023-02-21 11:29:18 +01:00
Steffen Gaisser	0f5e65e5ce	Merge branch 'develop' into bugfixes_code_review_msg_handling	2023-02-21 11:29:03 +01:00
Robin Mueller	b6558acdbc	Merge remote-tracking branch 'origin/develop' into pdec_possible_fixes_and_fdir	2023-02-21 11:20:01 +01:00
Robin Mueller	262e6d0b39	Merge remote-tracking branch 'origin/develop' into pdec_possible_fixes_and_fdir	2023-02-21 11:08:06 +01:00
Robin Mueller	7bda0dfb97	Merge remote-tracking branch 'origin/develop' into add_heater_info_set	2023-02-21 11:06:14 +01:00
Robin Mueller	6ea22b63df	Merge remote-tracking branch 'origin/develop' into add_heater_info_set	2023-02-21 10:46:10 +01:00
Robin Mueller	a91e6b7dfe	Merge remote-tracking branch 'origin/develop' into refactor_imtq_handling	2023-02-21 10:45:51 +01:00
Robin Mueller	b5b80cef97	fixed regression in max31865 code	2023-02-21 02:59:28 +01:00
Robin Mueller	ef24aba750	changelog	2023-02-21 00:52:52 +01:00
Robin Mueller	a864d51ddf	Merge remote-tracking branch 'origin/develop' into add_heater_info_set	2023-02-20 23:33:59 +01:00
Robin Mueller	682b528004	changelog tweask	2023-02-20 20:05:53 +01:00
Robin Mueller	124e08e80b	Merge remote-tracking branch 'origin/develop' into refactor_imtq_handling	2023-02-20 20:03:09 +01:00
Robin Mueller	03fbc6b23d	Merge branch 'develop' into pdec_possible_fixes_and_fdir	2023-02-20 19:59:58 +01:00
Robin Mueller	c149f3871a	changelog entry	2023-02-20 19:59:22 +01:00
Robin Mueller	e3d9614fae	Merge remote-tracking branch 'origin/develop' into refactor_imtq_handling	2023-02-20 19:45:45 +01:00
Robin Mueller	803c0b1a3e	changelog	2023-02-20 18:35:19 +01:00
Robin Mueller	6b931dce7f	important CFDP bugfix	2023-02-20 15:02:58 +01:00
Robin Mueller	4b6e0addf1	changelog	2023-02-19 17:07:48 +01:00
Robin Mueller	7cbc3fe06c	changelog	2023-02-19 13:43:18 +01:00
Robin Mueller	8d68d80eb2	changelog	2023-02-19 13:30:05 +01:00
Robin Mueller	0c78037fb8	move changelog entry	2023-02-17 19:27:28 +01:00
Robin Mueller	b3cdb05214	changelg update	2023-02-17 16:10:56 +01:00
Robin Mueller	e9104b7479	update changelog	2023-02-17 16:08:04 +01:00
Robin Mueller	1d541dcca5	Merge remote-tracking branch 'origin/develop' into add_heater_info_set	2023-02-17 13:13:56 +01:00
Marius Eggert	8e7c4b5da2	Merge branch 'develop' into add_shadow_warning_fix_all_of_them	2023-02-17 13:02:16 +01:00
Robin Mueller	7fa8a497f2	Merge remote-tracking branch 'origin/develop' into add_heater_info_set	2023-02-17 13:00:14 +01:00
Robin Mueller	8fbb058322	add git post checkout hook	2023-02-17 12:33:44 +01:00
Robin Mueller	706e3c8882	changelog	2023-02-17 12:20:29 +01:00
Robin Mueller	7f74cca11f	add more mode support for heaters	2023-02-17 11:50:14 +01:00
Robin Mueller	1e0c94246d	Merge remote-tracking branch 'origin/develop' into add_heater_info_set	2023-02-17 11:21:17 +01:00
Robin Mueller	d233dc9f82	bump minor version	2023-02-17 11:18:08 +01:00
Robin Mueller	03941472a8	Merge remote-tracking branch 'origin/develop' into rw_refactoring	2023-02-17 10:27:25 +01:00
Robin Mueller	e99819449a	add fsfw change	2023-02-17 10:04:51 +01:00
Robin Mueller	123db49c78	changelog	2023-02-17 10:04:14 +01:00
meggert	f54945de12	changelog	2023-02-17 09:46:20 +01:00
meggert	f784d4f248	changelog	2023-02-15 15:15:30 +01:00
meggert	9ddcc8dc14	Merge branch 'develop' into eggert/acs-scheduling-and-smaller-stuff	2023-02-15 09:23:46 +01:00
Robin Mueller	177b573cd4	prep v1.27.2	2023-02-14 18:54:43 +01:00
Robin Mueller	29e78a7ae3	Merge remote-tracking branch 'origin/develop' into eggert/rw-cmd-acs-ctrl	2023-02-14 17:33:37 +01:00
Robin Mueller	35b9c7a4df	bump changelog	2023-02-14 14:27:25 +01:00
Robin Mueller	14d70950f8	Merge remote-tracking branch 'origin/develop' into add_heater_info_set	2023-02-14 14:12:53 +01:00
Robin Mueller	92b3f740d5	Merge remote-tracking branch 'origin/develop' into eggert/rw-cmd-acs-ctrl	2023-02-14 14:10:21 +01:00
meggert	6d428859f2	changelog	2023-02-14 13:56:30 +01:00
Robin Mueller	e0c33b21e9	remove lwgps dependency	2023-02-14 13:11:52 +01:00
meggert	f864d73253	Merge branch 'develop' into eggert/rw-cmd-acs-ctrl	2023-02-13 16:06:46 +01:00
Robin Mueller	ebc32d1cc2	changelog	2023-02-13 15:42:45 +01:00
Robin Mueller	cec9ef6c5d	some fixes	2023-02-13 14:19:07 +01:00
meggert	068b31a3d6	changelog	2023-02-13 11:07:09 +01:00
meggert	1d20c3b472	changelog	2023-02-13 11:04:43 +01:00
meggert	ac22a00e09	Merge branch 'develop' into eggert/rw-cmd-acs-ctrl	2023-02-13 10:29:56 +01:00
Robin Mueller	c90d6f1f55	bump tmtc	2023-02-13 10:07:21 +01:00
Robin Mueller	3759b5d34a	I am happy with this version	2023-02-13 01:26:30 +01:00
Robin Mueller	bd455b750c	small fix in SD card manager	2023-02-10 14:09:39 +01:00
Robin Mueller	37b786898e	prep v1.26.4	2023-02-10 14:02:27 +01:00
meggert	fc5196f8da	Merge branch 'develop' into eggert/rw-cmd-acs-ctrl	2023-02-10 13:23:58 +01:00
meggert	285bd7116b	bump changelog	2023-02-10 13:17:52 +01:00
meggert	bc4c6c3a54	changelog	2023-02-10 12:07:45 +01:00
Robin Mueller	bcec465f9a	prev v1.26.3	2023-02-09 18:03:37 +01:00
Robin Mueller	99e5d3bb03	prep v1.27.0	2023-02-09 18:01:55 +01:00
Robin Mueller	ea7b43234e	gps bugfix	2023-02-09 17:56:20 +01:00
Robin Mueller	c34d32e65e	bump changelog	2023-02-09 15:59:19 +01:00
Robin Mueller	c496271a0e	Merge remote-tracking branch 'origin/develop' into add_heater_info_set	2023-02-08 21:42:20 +01:00
Robin Mueller	5542507024	changelog	2023-02-08 21:40:09 +01:00
Robin Mueller	fa62f07dce	Merge remote-tracking branch 'origin/develop' into add_heater_info_set	2023-02-08 21:39:27 +01:00
Robin Mueller	c843e34464	prep v1.26.2	2023-02-08 21:22:07 +01:00
Robin Mueller	7ec8ca3356	updates	2023-02-08 20:40:53 +01:00
Robin Mueller	cea0a28cee	bump changelog	2023-02-08 20:06:15 +01:00
Robin Mueller	4052534235	Merge remote-tracking branch 'origin/develop' into acs_update_scheduling_again	2023-02-08 17:55:07 +01:00
meggert	b943fee515	changelog	2023-02-08 17:17:19 +01:00
Robin Mueller	13b3fe03b8	afmt and changelog	2023-02-08 16:46:30 +01:00
Robin Mueller	4528e61fcd	initialize ACS controller	2023-02-08 15:02:56 +01:00
Robin Mueller	881f9ea7ea	prep v1.26.0	2023-02-08 14:52:11 +01:00
Robin Mueller	7e0b30e845	ACS section separate	2023-02-08 14:11:49 +01:00
Robin Mueller	80f48acb07	Merge remote-tracking branch 'origin/develop' into eggert/acs	2023-02-08 13:27:09 +01:00
Robin Mueller	6ae0ee5b26	small update	2023-02-08 13:23:05 +01:00
meggert	098fcc4f12	Merge branch 'develop' into eggert/acs	2023-02-08 13:21:49 +01:00
Robin Mueller	4412690652	Merge remote-tracking branch 'origin/develop' into acs_update_scheduling	2023-02-08 13:08:00 +01:00
Robin Müller	f2629f1b51	Merge pull request 'MGM calibration fix' (#357) from eggert/mgm-calibration-fix into develop ... Reviewed-on: #357 Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>	2023-02-08 13:02:40 +01:00
Robin Mueller	6fa1084d21	Merge remote-tracking branch 'origin/develop' into acs_update_scheduling	2023-02-08 13:01:21 +01:00
meggert	2a0ba039e6	Merge branch 'develop' into eggert/mgm-calibration-fix	2023-02-08 11:09:04 +01:00
Robin Mueller	c170bff720	add release checklist	2023-02-08 11:08:38 +01:00
Robin Mueller	d6a4048793	bump FSFW, TMTC and changelog	2023-02-08 01:32:18 +01:00
Robin Mueller	9373a24413	bump changelog	2023-02-07 19:40:32 +01:00
Robin Mueller	6cda616236	update changelog	2023-02-07 18:10:48 +01:00
meggert	36f20d235c	this was fun	2023-02-07 13:58:41 +01:00
Robin Mueller	b1ea53ef1e	Merge remote-tracking branch 'origin/develop' into acs_update_scheduling	2023-02-07 10:31:40 +01:00
meggert	b881b57a1b	Merge branch 'develop' into eggert/mgm-calibration-fix	2023-02-07 09:50:26 +01:00
meggert	a9fcb6a183	update changelog	2023-02-07 09:46:19 +01:00
Robin Mueller	7ae2b44806	prep v1.25.0	2023-02-06 20:19:08 +01:00
Robin Mueller	8ffd10cacc	update subsystem mode IDs	2023-02-06 20:15:45 +01:00
Robin Mueller	4d6d4dd44d	small tweak	2023-02-06 10:24:13 +01:00
Robin Mueller	c49580ea51	bump changelog	2023-02-06 10:22:28 +01:00
Robin Mueller	fd7709ea81	bump changelog	2023-02-06 09:20:20 +01:00
Robin Mueller	9bcc424d86	prepare for v1.24.0	2023-02-03 16:43:53 +01:00
Robin Mueller	3b8903b2e2	Merge remote-tracking branch 'origin/develop' into acs_update_scheduling	2023-02-03 16:13:40 +01:00
Robin Mueller	a9bd792194	changelog correction	2023-02-03 16:11:28 +01:00
Robin Mueller	6b36ba8323	Merge remote-tracking branch 'origin/develop' into eggert/mtq-cmd-fixes	2023-02-03 16:10:47 +01:00
Robin Mueller	d9514e4184	a lot of bugfixes	2023-02-03 16:08:34 +01:00
Robin Mueller	3a092fd920	Merge remote-tracking branch 'origin/develop' into acs_update_scheduling	2023-02-03 14:31:09 +01:00
Robin Mueller	777d673465	small fix	2023-02-03 14:24:27 +01:00
Robin Mueller	825365263f	update changelog	2023-02-03 14:23:39 +01:00
Robin Mueller	4ed1e2411a	works	2023-02-03 14:21:36 +01:00
Robin Mueller	4615b2fe16	bumpchangelog	2023-02-03 10:51:08 +01:00
Robin Mueller	daa7c6652d	update changelog	2023-02-03 10:21:17 +01:00
Robin Mueller	9f829f1c50	Merge remote-tracking branch 'origin/develop' into eggert/mtq-cmd-fixes	2023-02-03 10:16:17 +01:00
Robin Mueller	02f7b1ae4a	Merge branch 'acs_updates' into acs_update_scheduling	2023-02-03 10:15:12 +01:00
Robin Mueller	d9e142e1a8	Merge remote-tracking branch 'origin/develop' into acs_updates	2023-02-03 10:12:00 +01:00
Robin Mueller	e6bafd51dc	prepare v1.23.1	2023-02-02 18:37:56 +01:00
Robin Mueller	1e0d9561a2	changelog update	2023-02-02 17:16:15 +01:00
Robin Mueller	aaac3b24b2	update changelog	2023-02-02 17:14:48 +01:00
Robin Mueller	2b00d3a565	ACS updates ... - Adapt ACS subsystem to handle events from ACS CTRL - Some fixes and updates for ACS subsystem	2023-02-02 16:27:50 +01:00
meggert	8c03b2ec95	bump changelog	2023-02-02 10:56:14 +01:00
Robin Mueller	491b378ad3	bump fsfw	2023-02-01 20:47:50 +01:00
Robin Mueller	8a3fca4605	prepare release	2023-02-01 20:21:04 +01:00
Robin Mueller	78bc422004	prepare next version	2023-02-01 20:20:08 +01:00
Robin Mueller	3c9ce040cf	update generated files	2023-02-01 19:43:38 +01:00
Robin Mueller	20df025ccb	update fsfw	2023-02-01 18:44:00 +01:00
Robin Mueller	27f676a725	bump fsfw for Health service update	2023-02-01 17:44:45 +01:00
Robin Mueller	f5c5377a81	move to unreleased section	2023-02-01 13:43:29 +01:00
Jakob Meier	9768541c35	update changelog	2023-02-01 08:40:05 +01:00
Robin Mueller	bfc2aaedd8	new minor release	2023-01-30 14:35:31 +01:00
Robin Mueller	a6748f8034	fsfw update	2023-01-30 14:25:50 +01:00
Robin Mueller	01824f2f66	done	2023-01-28 15:02:35 +01:00
Robin Mueller	ddce821295	prepare for v1.22.0	2023-01-28 14:55:41 +01:00
Robin Mueller	7bbf40a5ab	update changelog	2023-01-27 19:04:31 +01:00
Robin Mueller	13f3963f69	Update ... - COM Subsystem now handles datarate config - torquer config and comCfg moved to mission/config folder - CCSDS Handler: Added default rate submode	2023-01-27 18:38:36 +01:00
Robin Mueller	1a7b4ded27	bump tmtc	2023-01-26 20:53:36 +01:00
Robin Mueller	0c595c5aeb	update changelog	2023-01-26 20:33:16 +01:00
Robin Mueller	0536522ed3	bump changelog	2023-01-26 20:04:50 +01:00
Robin Mueller	bc2a8cba94	Merge remote-tracking branch 'origin/develop' into refactor_syrlinks	2023-01-26 17:06:42 +01:00
Robin Mueller	fa8a2c7666	add new syrlinks events	2023-01-26 16:45:28 +01:00
Robin Mueller	311c2e947a	bump changelog	2023-01-26 16:22:15 +01:00
Robin Mueller	03a3c3a761	changelog correction	2023-01-26 14:39:23 +01:00
Robin Mueller	9410902454	go to startup immediately	2023-01-26 13:02:29 +01:00
Robin Mueller	bb18525ed9	Merge remote-tracking branch 'origin/develop' into add_heater_info_set	2023-01-25 14:06:32 +01:00
Robin Mueller	a4bf6d9872	Merge remote-tracking branch 'origin/develop' into refactor_syrlinks	2023-01-25 14:05:23 +01:00
Robin Mueller	fbab1a6aa9	Merge remote-tracking branch 'origin/develop' into add_ccsds_handler_modes	2023-01-25 14:02:03 +01:00
Robin Mueller	d71c522891	bump changelog	2023-01-25 13:47:29 +01:00
Robin Mueller	4611e32200	update changelog	2023-01-24 19:48:20 +01:00
Robin Mueller	ce12293dcc	update changelog	2023-01-24 19:47:30 +01:00
Robin Mueller	430e535fe9	update changelog	2023-01-24 15:48:06 +01:00
Robin Mueller	fbe0c35373	make some sets diagnostic	2023-01-24 13:18:29 +01:00
Robin Mueller	c2fd3b22f3	update changelog	2023-01-24 12:30:23 +01:00
Robin Mueller	c49bda449f	bump changelog	2023-01-24 12:25:16 +01:00
Robin Mueller	e3726a7078	Merge remote-tracking branch 'origin/develop' into syrlink_fixes_tweaks	2023-01-23 16:18:52 +01:00
Robin Mueller	c1b9a0f4ff	some improvements, docs and smaller stuff	2023-01-23 16:18:06 +01:00
Marius Eggert	1b0d86620e	Merge branch 'develop' into eggert/gyr-fix	2023-01-23 16:09:04 +01:00
Marius Eggert	ee5024f4ce	update changelog	2023-01-23 16:07:51 +01:00
Robin Mueller	3920671dd3	bump changelog	2023-01-23 11:55:49 +01:00
Robin Mueller	6e0f2c0dee	changelog	2023-01-20 14:25:21 +01:00
Robin Mueller	3d0ecadb1f	Merge remote-tracking branch 'origin/develop' into allow_switch_interval_specification	2023-01-20 12:30:39 +01:00
Robin Mueller	fecfa4b1c3	update changelog	2023-01-20 12:29:17 +01:00
Robin Mueller	fee8282cc5	bump changelog	2023-01-20 12:26:45 +01:00
Robin Mueller	09381ee86b	update changelog	2023-01-20 12:25:14 +01:00
Robin Mueller	f8196de089	update changelog	2023-01-20 12:24:19 +01:00
Robin Mueller	5670af7198	bump changelog	2023-01-20 10:44:44 +01:00
Robin Mueller	08a4491a15	Merge remote-tracking branch 'origin/develop' into gyr_sets_diagnostic_now	2023-01-19 16:35:42 +01:00
Robin Mueller	c7c66364dc	bump changelog	2023-01-18 16:10:14 +01:00
Robin Mueller	1546062433	update changelog	2023-01-18 14:24:17 +01:00
Robin Mueller	a70570f79d	always include syrlinks code now	2023-01-18 12:58:45 +01:00
Robin Mueller	f6706c4f9b	update changelog	2023-01-13 13:16:26 +01:00
Robin Mueller	3ae08a4a57	bump fsfw and tmtc, update changelog	2023-01-13 11:21:02 +01:00
Robin Mueller	ce9fac6b71	v1.19.0	2023-01-10 16:23:54 +01:00
Robin Mueller	27e2708b7b	update changelog	2023-01-10 15:41:09 +01:00
Robin Müller	88dcba7966	Merge branch 'develop' into mueller_5v_stack_cmd_for_devices	2023-01-10 10:56:19 +01:00
Robin Mueller	cb7608b4e6	bumpchangelog	2023-01-09 16:03:04 +01:00
Robin Mueller	8d0448341b	Merge remote-tracking branch 'origin/develop' into mueller_5v_stack_cmd_for_devices	2022-12-23 12:22:39 +01:00
Robin Mueller	2531de507a	bump changelog	2022-12-23 12:18:44 +01:00
Robin Mueller	099759c5f5	changelog update	2022-12-22 14:37:25 +01:00
Robin Mueller	9024460da3	changelog update	2022-12-21 13:44:48 +01:00
Robin Mueller	72300f0217	Merge remote-tracking branch 'origin/develop' into acs-ctrl-v1	2022-12-01 16:39:54 +01:00
Robin Mueller	7d99d8e805	bump minor version and changelog	2022-12-01 16:30:39 +01:00
Robin Mueller	0bbdd21d81	bump changelog	2022-12-01 15:58:39 +01:00
Robin Mueller	a1c9fece1e	bump changelog	2022-11-29 11:08:34 +01:00
Robin Mueller	d4acdb67bb	bump changelog	2022-11-29 11:07:02 +01:00
Robin Mueller	87ab84c649	bump changelog	2022-11-28 18:23:55 +01:00
Robin Mueller	acc7739958	bump changelog	2022-11-28 16:33:50 +01:00
Robin Mueller	28c662e6a7	update changelog	2022-11-18 14:26:40 +01:00
Robin Mueller	2bbe98a403	bump version and changelog	2022-11-18 14:22:00 +01:00
Robin Mueller	7384c5ce16	update changelog	2022-11-15 13:41:39 +01:00
Robin Mueller	d4de445112	update changelog	2022-11-11 16:26:16 +01:00
Robin Mueller	e3c245b99f	update changelog	2022-11-04 08:37:59 +01:00
Robin Mueller	9503b2ca93	Merge remote-tracking branch 'origin/develop' into mueller/pl-ss	2022-11-03 20:10:05 +01:00
Robin Mueller	6069948b4e	bump changelog again	2022-11-03 15:35:32 +01:00
Robin Mueller	60d81fac41	bump changelog	2022-11-03 15:34:07 +01:00
Robin Mueller	964f9dc688	Merge remote-tracking branch 'origin/develop' into mueller/pdec_irq_handling	2022-11-02 14:16:14 +01:00
Robin Mueller	802b851924	bump changelog	2022-11-02 10:59:21 +01:00
Robin Mueller	e1526f712e	bump changelog	2022-11-02 10:58:40 +01:00
Robin Mueller	d19ddaa46c	Merge branch 'mueller/acs-ss-init' into mueller/pl-ss	2022-10-27 17:00:14 +02:00
Robin Mueller	890fba18e1	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-10-27 09:18:12 +02:00
Robin Mueller	d6adde92fc	add dates to changelog	2022-10-27 09:11:10 +02:00
Robin Mueller	1d6b5cbda4	add missing changelog entry	2022-10-27 09:08:26 +02:00
Robin Mueller	b059e831c0	complete changelog	2022-10-27 09:02:55 +02:00
Robin Mueller	ae16dcc4a7	afmt + changelog	2022-10-27 09:00:21 +02:00
Robin Mueller	e1c0a451ee	update changelog	2022-10-27 08:56:20 +02:00
Robin Mueller	d190165bf3	Merge remote-tracking branch 'origin/mueller/acs-ss-init' into mueller/pl-ss	2022-10-17 10:52:05 +02:00
Robin Mueller	d3d29a3691	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-10-11 23:13:37 +02:00
Robin Mueller	bcf7fa216a	bump changelog	2022-10-11 23:10:09 +02:00
Robin Mueller	3d1d31c020	update changelog	2022-10-10 17:44:28 +02:00
Robin Mueller	63d660119e	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-10-10 17:39:47 +02:00
Robin Mueller	763fc54855	bump changelog	2022-10-04 14:54:39 +02:00
Robin Mueller	92cf4580ca	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-09-29 13:57:39 +02:00
Robin Mueller	151d27985f	Merge remote-tracking branch 'origin/develop' into scex-additions	2022-09-29 13:43:58 +02:00
Robin Mueller	5d0c07467f	update changelog	2022-09-28 10:05:36 +02:00
Irini Kosmidou	c7e06f8878	changelog update	2022-09-27 19:22:06 +02:00
Robin Mueller	2b41b3ee26	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-09-27 14:57:01 +02:00
Robin Mueller	57331380c3	small fix for ACS task	2022-09-15 11:38:29 +02:00
Robin Mueller	a76816f055	update changelog	2022-09-02 13:16:56 +02:00
Robin Mueller	3ad7a35f0e	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-08-29 15:53:57 +02:00
Robin Mueller	975f202ddb	Merge remote-tracking branch 'origin/develop' into mueller/pl-ss	2022-08-29 15:50:55 +02:00
Robin Mueller	c8c103e5e6	update changelog	2022-08-27 16:04:55 +02:00
Robin Mueller	691505ffa9	update changelog	2022-08-24 17:35:06 +02:00
Robin Mueller	049832d6cc	update changelog and cmakelists.txt	2022-08-24 16:38:38 +02:00
Robin Mueller	3c03471197	update changelog	2022-08-16 16:45:14 +02:00
Robin Mueller	4649c97205	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-08-08 17:12:12 +02:00
Robin Mueller	89b3b2ff42	Merge remote-tracking branch 'origin/develop' into mueller/pl-ss	2022-08-08 17:08:56 +02:00
Robin Mueller	76a217ffc2	bump changelog and version	2022-07-05 02:14:32 +02:00
Robin Mueller	62f725beea	bump changelog and version	2022-07-04 11:13:26 +02:00
Robin Mueller	5b0f1efefd	Merge remote-tracking branch 'origin/develop' into mueller/pl-ss	2022-05-25 15:48:00 +02:00
Robin Mueller	95121b5120	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-05-25 15:47:21 +02:00
Jakob.Meier	f50682b56a	Merge pull request 'Split ACU HK' (#256) from mueller/split-acu-hk into develop ... Reviewed-on: #256 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-05-25 15:23:19 +02:00
Robin Mueller	581423a40e	Merge branch 'mueller/acs-ss-init' into mueller/pl-ss	2022-05-25 10:09:24 +02:00
Robin Mueller	e1ed532f91	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-05-25 10:01:53 +02:00
Robin Mueller	7646b683b2	Merge remote-tracking branch 'origin/develop' into mueller/split-acu-hk	2022-05-25 09:59:14 +02:00
Robin Mueller	43fc1ab780	Merge remote-tracking branch 'origin/develop' into mueller/add-schedule-pus-11	2022-05-25 09:57:34 +02:00
Robin Mueller	3eb8525419	update changelog	2022-05-24 15:22:45 +02:00
Robin Mueller	3e9b337e31	changelog	2022-05-24 01:14:47 +02:00
Robin Mueller	a1d2ec3db4	Merge remote-tracking branch 'origin/develop' into mueller/split-acu-hk	2022-05-23 22:24:28 +02:00
Robin Mueller	2f155d8350	bump changelog	2022-05-23 18:39:13 +02:00
Robin Mueller	10e075efaf	update changelog	2022-05-23 17:52:44 +02:00
Robin Mueller	2fa1061c65	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-05-16 15:11:24 +02:00
Robin Mueller	b5821ec6dc	changelog update	2022-05-13 09:35:47 +02:00