1068 Commits

Author	SHA1	Message	Date
Robin Mueller	26ed774806	changelog	2023-06-07 14:25:13 +02:00
Robin Müller	376c359d6e	Merge branch 'v3.0.0-dev' into acs-ptg-ctrl-fixes-2	2023-06-07 11:47:57 +02:00
Robin Mueller	7d1b99c3f4	Merge branch 'v3.0.0-dev' into acs-ptg-ctrl-fixes-2	2023-06-06 11:13:42 +02:00
Robin Mueller	8052734028	tiny tweak	2023-06-06 11:12:41 +02:00
Robin Mueller	b7eb693295	Merge branch 'v3.0.0-dev' into str-invalid-off-transition	2023-06-06 11:12:30 +02:00
Robin Mueller	caa2800a7a	Merge branch 'v3.0.0-dev' into v4.0.0-dev	2023-06-06 11:10:03 +02:00
meggert	58dee642a6	changelog	2023-06-05 16:06:36 +02:00
meggert	3be495fc30	Merge branch 'v3.0.0-dev' into gyr-confg-rework-2	2023-06-05 09:54:23 +02:00
meggert	73981006a2	changelog	2023-06-05 09:25:31 +02:00
meggert	6915f0e003	changelog	2023-06-02 17:45:08 +02:00
Robin Mueller	a85b0a4a76	changelog	2023-05-31 16:31:50 +02:00
Robin Mueller	9711bb6300	Merge branch 'v4.0.0-dev' into update-ptme-code-2	2023-05-31 11:50:59 +02:00
Robin Mueller	68e4d9be07	Merge branch 'v3.0.0-dev' into v4.0.0-dev	2023-05-31 11:50:11 +02:00
Robin Mueller	170cb4d99c	changelog	2023-05-31 10:45:40 +02:00
Robin Mueller	0aa617d440	switch info fix	2023-05-30 16:54:56 +02:00
Robin Mueller	6aa856563e	Merge branch 'tcs-heater-event-fix' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into tcs-heater-event-fix	2023-05-30 16:45:36 +02:00
Robin Mueller	ebf5609680	changelog	2023-05-30 16:45:09 +02:00
Robin Mueller	b135e2f6a1	changelog	2023-05-30 15:14:47 +02:00
Robin Mueller	f3cc406495	Merge branch 'v2.1.0-dev' into update-ptme-code-2	2023-05-27 17:03:58 +02:00
meggert	a7c6cd017d	changelog	2023-05-26 13:53:46 +02:00
meggert	a6787538f2	changelog	2023-05-25 11:21:28 +02:00
Robin Mueller	016e9dd2df	Merge branch 'v2.2.0-dev' into update-ptme-code-2	2023-05-25 10:34:04 +02:00
Robin Mueller	351ca1154b	Merge branch 'v2.1.0-dev' into v2.2.0-dev	2023-05-25 09:10:34 +02:00
Robin Mueller	e1aff4c641	another small logic fix	2023-05-25 08:48:03 +02:00
Robin Mueller	8d041c6753	changelog	2023-05-25 08:45:20 +02:00
Robin Müller	075c750e4a	Merge branch 'v2.1.0-dev' into acu-enable-hk-sets	2023-05-24 14:14:07 +02:00
Robin Müller	832140935f	Merge branch 'v2.1.0-dev' into imtq-enable-hk-sets	2023-05-24 14:13:29 +02:00
Robin Mueller	86bc6c4e0e	Merge branch 'imtq-enable-hk-sets' into acu-enable-hk-sets	2023-05-24 11:53:34 +02:00
Robin Mueller	ce9d00a42a	Merge remote-tracking branch 'origin/v2.1.0-dev' into tm-store-task-base-bugfix	2023-05-24 11:34:39 +02:00
Robin Mueller	3641dc3bfa	Merge branch 'imtq-enable-hk-sets' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into imtq-enable-hk-sets	2023-05-24 11:17:08 +02:00
Robin Mueller	b899bad0a8	IMTQ HK sets	2023-05-24 11:17:00 +02:00
Robin Mueller	9e0989915c	changelog	2023-05-24 11:16:35 +02:00
Robin Müller	8f4bba6fd1	Merge branch 'v2.1.0-dev' into oh-no-no-no-bug	2023-05-24 11:04:48 +02:00
Robin Müller	a38f5c78ae	Merge branch 'v2.1.0-dev' into tm-store-task-base-bugfix	2023-05-24 11:04:35 +02:00
Robin Müller	a831ec7bda	Merge branch 'v2.1.0-dev' into oh-no-no-no-bug	2023-05-24 09:30:10 +02:00
Robin Mueller	efa9c42345	Merge remote-tracking branch 'origin/v2.1.0-dev' into always-dump-into-vc	2023-05-24 09:27:26 +02:00
Marius Eggert	30bb2da570	Merge branch 'v2.1.0-dev' into no-dump-cancel-on-tx-off	2023-05-24 09:09:33 +02:00
Robin Mueller	c45f267e94	Merge remote-tracking branch 'origin/v2.1.0-dev' into oh-no-no-no-bug	2023-05-23 20:32:43 +02:00
Robin Mueller	13fdaf731c	Merge remote-tracking branch 'origin/v2.1.0-dev' into tm-store-task-base-bugfix	2023-05-23 20:31:45 +02:00
Robin Mueller	6cf488d0a6	Merge branch 'always-dump-into-vc' into update-ptme-code-2	2023-05-23 20:19:06 +02:00
Robin Mueller	266abad3b3	no dump cancel on TX OFF	2023-05-23 20:15:36 +02:00
Robin Mueller	042b8fb3c3	changelog	2023-05-23 20:13:02 +02:00
Robin Mueller	7bd2fce86f	Merge branch 'tm-store-task-base-bugfix' into update-ptme-code-2	2023-05-23 19:40:17 +02:00
Robin Mueller	28beb006b2	thats an annoying bug	2023-05-23 19:37:01 +02:00
Robin Mueller	7222475985	changelog, remove unnecessary logic	2023-05-23 19:18:42 +02:00
Robin Mueller	f5a7fd2ffe	Merge branch 'oh-no-no-no-bug' into update-ptme-code-2	2023-05-23 19:16:36 +02:00
Robin Mueller	6bfb0d4fb0	changelog	2023-05-23 19:14:03 +02:00
Robin Mueller	8efbdf8279	Merge branch 'v2.2.0-dev' into update-ptme-code-2	2023-05-23 18:30:00 +02:00
meggert	631a1aec42	Merge branch 'v2.1.0-dev' into gyr-confg-rework-2	2023-05-23 15:42:30 +02:00
meggert	04571bbd7a	Merge branch 'v2.1.0-dev' into acs-params-fix	2023-05-23 15:08:56 +02:00
meggert	5390e947ca	changelog	2023-05-23 15:02:35 +02:00
Robin Mueller	4763ec84fa	Merge remote-tracking branch 'origin/v2.1.0-dev' into v2.2.0-dev	2023-05-23 14:46:44 +02:00
Robin Mueller	e4fc6e3d2a	Merge branch 'v2.2.0-dev' into update-ptme-code-2	2023-05-22 11:46:48 +02:00
Robin Mueller	2543cdf5b7	changelog	2023-05-22 11:44:42 +02:00
Robin Mueller	d23082283d	changelog	2023-05-22 11:42:08 +02:00
Robin Mueller	22dcf10207	Merge branch 'v2.1.0-dev' into update-ptme-code-2	2023-05-22 10:46:14 +02:00
Robin Mueller	a814746c53	Merge branch 'ploc_mpsoc_read_file_2' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into ploc_mpsoc_read_file_2	2023-05-19 09:41:51 +02:00
Robin Mueller	ed74367f01	changelog	2023-05-19 09:41:44 +02:00
Robin Mueller	a0e305fe1f	changelog	2023-05-17 18:55:53 +02:00
Robin Mueller	fabc6da562	changelog	2023-05-15 15:16:44 +02:00
Robin Mueller	af77d083fa	Merge remote-tracking branch 'origin/v2.1.0-dev' into ploc_mpsoc_read_file_2	2023-05-15 10:15:16 +02:00
Robin Mueller	07d9ab0dd9	Merge branch 'ploc_mpsoc_update_2' into ploc_mpsoc_dir_content_report_2	2023-05-12 13:31:13 +02:00
Robin Mueller	a3b119fda6	update changelog	2023-05-12 13:26:15 +02:00
Robin Mueller	86241a0052	Merge remote-tracking branch 'origin/v2.1.0-dev' into ploc_mpsoc_update_2	2023-05-12 13:24:49 +02:00
Robin Mueller	9715612e46	changelog	2023-05-12 13:24:14 +02:00
Robin Mueller	af20a36634	Merge branch 'ploc_mpsoc_update_2' into ploc_mpsoc_dir_content_report_2	2023-05-12 11:48:43 +02:00
meggert	f71a363385	changelog	2023-05-12 11:08:41 +02:00
Robin Mueller	412aaf93bd	Merge branch 'ploc-code-improvenemts-2' into ploc_mpsoc_update_2	2023-05-12 09:37:13 +02:00
Robin Mueller	0156533385	changelog	2023-05-12 09:35:58 +02:00
Robin Mueller	7e6c25901b	Squashed commit of the following: ... commit c137df64ab Merge: a919b3d1 4179e8e1 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 15:38:52 2023 +0200 Merge remote-tracking branch 'origin/main' into update_ptme_code commit 4179e8e124 Merge: 26f5eff6 51f9d5e1 Author: Robin Müller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 15:35:54 2023 +0200 Merge pull request 'This bugfix might be super important' (#621) from possible_bugfix_dual_lane_assy into main Reviewed-on: #621 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de> Reviewed-by: Steffen Gaisser <gaisser@irs.uni-stuttgart.de> commit 51f9d5e1fe Merge: a17f57cb 26f5eff6 Author: Robin Müller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 15:35:10 2023 +0200 Merge branch 'main' into possible_bugfix_dual_lane_assy commit a17f57cbb5 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 15:34:45 2023 +0200 changelog commit 26f5eff6d5 Merge: 4074e084 8a0f13ba Author: Robin Müller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 15:32:03 2023 +0200 Merge pull request 'More System Modes' (#612) from more-system-modes into main Reviewed-on: #612 commit 8a0f13bafb Merge: 14baa356 4074e084 Author: Robin Müller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 15:31:51 2023 +0200 Merge branch 'main' into more-system-modes commit 14baa3563c Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 15:30:09 2023 +0200 hello commit 7045b6034a Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 15:18:47 2023 +0200 changelog commit 37b9615525 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 15:18:16 2023 +0200 changelog commit 4074e08480 Merge: 862a4f26 38686ac3 Author: Robin Müller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 15:12:46 2023 +0200 Merge pull request 'Adaption for EM: Add P60 dock without ACU' (#620) from adaption_em_p60_dock_without_acu into main Reviewed-on: #620 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de> commit 23796345d9 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 15:04:30 2023 +0200 changelog and stop payload tracking commit b10275ca43 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 14:28:05 2023 +0200 changelog commit 383849c5cb Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 14:25:14 2023 +0200 that is more robust commit c66cef9129 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 14:23:21 2023 +0200 changelog commit 02ea8a7298 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 14:22:21 2023 +0200 changelog commit 38686ac3f6 Merge: 189a3126 74d5d709 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 14:04:03 2023 +0200 Merge branch 'possible_bugfix_dual_lane_assy' into adaption_em_p60_dock_without_acu commit 74d5d70973 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 13:58:08 2023 +0200 this bugfix might be super important commit 48355e8263 Merge: 5691fe8e 862a4f26 Author: Robin Müller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 10:25:50 2023 +0200 Merge branch 'main' into more-system-modes commit 189a312628 Merge: a1279428 862a4f26 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 10:23:46 2023 +0200 Merge remote-tracking branch 'origin/main' into adaption_em_p60_dock_without_acu commit a12794281b Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 10:20:31 2023 +0200 changelog commit fcaabb4e42 Merge: 6c326489 4aafca64 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 10:20:02 2023 +0200 Merge remote-tracking branch 'origin/main' into adaption_em_p60_dock_without_acu commit 6c326489cb Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 10:18:46 2023 +0200 adapt EM SW: GS PCDU added, but use dummy for ACU commit 862a4f2685 Merge: 4aafca64 2daca272 Author: Robin Müller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 09:37:55 2023 +0200 Merge pull request 'Host SW bugfixes' (#618) from try_fix_host_obsw into main Reviewed-on: #618 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de> commit 5691fe8e72 Merge: 097be17a 4aafca64 Author: meggert <eggertm@irs.uni-stuttgart.de> Date: Thu Apr 27 15:40:31 2023 +0200 Merge branch 'main' into more-system-modes commit 2daca272f8 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Thu Apr 27 11:29:18 2023 +0200 changelog commit 03762f9620 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 17:38:06 2023 +0200 lower live TM handler frequency commit a296f16e5c Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 17:36:38 2023 +0200 host SW works properly again commit 83f07a6e16 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 17:26:32 2023 +0200 configurable event manager queue depth commit 00dab64628 Merge: 641b8e84 4aafca64 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 17:03:35 2023 +0200 Merge remote-tracking branch 'origin/main' into try_fix_host_obsw commit 4aafca64a6 Merge: f271242d 6901eae8 Author: Robin Müller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 17:03:01 2023 +0200 Merge pull request 'EM adaptions' (#619) from em_adaptions into main Reviewed-on: #619 commit 6901eae816 Merge: 7d630ebc f271242d Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 17:02:24 2023 +0200 Merge remote-tracking branch 'origin/main' into em_adaptions commit 7d630ebcf3 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 17:00:04 2023 +0200 EM adaptions commit 641b8e847d Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 16:41:40 2023 +0200 add back tm funnel handler for hosted build commit 1314268682 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 16:23:50 2023 +0200 host build requires dedicated live TM task.. commit 4040304ef0 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 13:15:42 2023 +0200 this is annoying commit a919b3d164 Merge: e22f2a53 9672d6d6 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 11:11:30 2023 +0200 Merge remote-tracking branch 'origin/develop' into update_ptme_code commit 9672d6d6cc Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 11:11:09 2023 +0200 changelog commit e22f2a53ea Merge: b076e80b 0eb6b7cc Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 11:05:58 2023 +0200 Merge remote-tracking branch 'origin/develop' into update_ptme_code commit b076e80b44 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 11:04:10 2023 +0200 changelog commit 269aa6f7b0 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 11:03:42 2023 +0200 changelog commit caae2b4ba9 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 11:02:24 2023 +0200 update PTME code commit 097be17a29 Author: meggert <eggertm@irs.uni-stuttgart.de> Date: Wed Apr 19 15:07:21 2023 +0200 added remaining acs modes as system modes	2023-05-12 09:13:02 +02:00
Robin Mueller	50d5180076	changelog	2023-05-11 21:29:15 +02:00
Robin Mueller	dbdcf0b0d6	changelog	2023-05-11 21:28:50 +02:00
Robin Mueller	4a3af32a65	MPSoC HK packet	2023-05-11 21:28:46 +02:00
Robin Mueller	9b5fac828b	changelog	2023-05-11 21:17:06 +02:00
Robin Mueller	07dd84ff1e	changelog	2023-05-11 20:25:26 +02:00
Robin Mueller	d5a6feb347	changelog	2023-05-11 20:25:26 +02:00
Robin Mueller	5728d916ef	changelog	2023-05-11 20:25:26 +02:00
Robin Mueller	e762cc5fb3	changelog	2023-05-11 20:25:26 +02:00
Robin Mueller	f72c797f53	this should do the job	2023-05-11 20:21:44 +02:00
Robin Mueller	71ef1edb68	changelog	2023-05-11 20:21:07 +02:00
Robin Mueller	fa13703394	changelog	2023-05-11 20:18:39 +02:00
Robin Mueller	09ece30304	changelog	2023-05-11 20:17:50 +02:00
Robin Mueller	c3604085c2	changelog	2023-05-11 20:17:50 +02:00
Robin Mueller	1274993428	changelog	2023-05-11 20:17:41 +02:00
Robin Mueller	a7ccfae04e	changelog	2023-05-11 20:17:41 +02:00
Robin Mueller	2c9da6a1e4	changelog	2023-05-11 20:14:17 +02:00
Robin Mueller	30fba0456b	MPSoC HK packet	2023-05-11 20:14:12 +02:00
Robin Mueller	32d2ad8f1d	changelog	2023-05-11 20:13:26 +02:00
Robin Mueller	b34767c870	changelog	2023-05-11 20:12:15 +02:00
Robin Mueller	97567736fb	changelog	2023-05-11 20:12:15 +02:00
Robin Mueller	621a6fd401	changelog	2023-05-11 20:12:13 +02:00
Robin Mueller	04b6c7006e	changelog	2023-05-11 20:12:13 +02:00
meggert	e78d458f06	changelog	2023-05-11 19:54:44 +02:00
Robin Mueller	ef039c47b8	update changelog again	2023-05-11 19:35:57 +02:00
Robin Mueller	d4b7411de1	I guess no patch version	2023-05-11 19:34:37 +02:00
Robin Mueller	2e6a93c479	ACS board and init payload	2023-05-11 19:33:06 +02:00
Robin Mueller	f3a651602b	this should be robust	2023-05-11 19:33:06 +02:00
Robin Mueller	6c00404ca7	changelog	2023-05-11 19:33:06 +02:00
Robin Mueller	1412dd4fb6	changelog readme etc.	2023-05-11 19:33:06 +02:00
Robin Mueller	1870bf6405	changelog	2023-05-11 19:33:02 +02:00
Robin Mueller	670c753a75	hello	2023-05-11 19:32:37 +02:00
Robin Mueller	26e48f2f46	changelog	2023-05-11 19:32:37 +02:00
Robin Mueller	a352f25029	changelog	2023-05-11 19:32:37 +02:00
Robin Mueller	141438bd24	changelog and stop payload tracking	2023-05-11 19:32:37 +02:00
Robin Mueller	1cbb7d0af8	changelog	2023-05-11 19:32:33 +02:00
Robin Mueller	09ffcc8804	changelog	2023-05-11 19:32:10 +02:00
Robin Mueller	fb062bb4e8	changelog	2023-05-11 19:32:04 +02:00
Robin Mueller	2f58ca8534	changelog	2023-05-11 19:32:04 +02:00
Robin Mueller	5747f73dfe	changelog	2023-05-11 19:31:50 +02:00
Robin Mueller	a75f9553be	okay lets see if this works	2023-05-11 18:38:41 +02:00
Robin Mueller	f46a705900	changelog	2023-04-19 18:12:32 +02:00
Robin Mueller	74ee291983	add tmtc release version	2023-04-17 11:58:13 +02:00
Robin Mueller	ab588b4844	fixes and tweaks TCS and EM build	2023-04-17 11:35:10 +02:00
meggert	9097a3f3c7	changelog	2023-04-17 09:35:23 +02:00
Robin Mueller	07e8f95a31	of course something else was missing	2023-04-16 12:05:41 +02:00
Robin Mueller	babea226ab	thats an annoying patch release	2023-04-16 11:54:27 +02:00
Robin Mueller	8f5982fd72	added additional note	2023-04-16 11:48:24 +02:00
Robin Mueller	611a2c0b45	update CHANGELOG and CMakeLists.txt	2023-04-16 11:41:30 +02:00
Robin Mueller	b8d010cd39	CHANGELOG + FS helpers	2023-04-15 13:01:41 +02:00
Robin Mueller	b98f91f6c1	hopefully last EM fix for v2.0	2023-04-14 21:44:23 +02:00
Robin Mueller	d24a983985	some EM fixes	2023-04-14 21:02:39 +02:00
Robin Mueller	f0d55f9e5b	prep v1.45.0	2023-04-14 20:35:00 +02:00
Robin Mueller	fa746f910d	Merge remote-tracking branch 'origin/develop' into acs-flp-safe	2023-04-14 20:13:50 +02:00
Robin Mueller	379fd6046e	ge-generate files	2023-04-14 20:08:05 +02:00
Robin Mueller	756ea6d90d	Merge remote-tracking branch 'origin/develop' into feature_com_pdec_fdir	2023-04-14 19:01:22 +02:00
Robin Müller	716f2b2832	Merge branch 'develop' into acs-flp-safe	2023-04-14 18:56:11 +02:00
Robin Müller	5e53795cbe	Merge branch 'develop' into tmp_dev_custom_fdir	2023-04-14 18:55:36 +02:00
Robin Mueller	f7be454dae	changelog	2023-04-14 18:55:20 +02:00
Robin Mueller	ca30fed4c3	Merge remote-tracking branch 'origin/develop' into str_update_v10.7	2023-04-14 18:53:45 +02:00
Robin Mueller	54f742bf19	addition to changelog	2023-04-14 18:53:17 +02:00
Robin Mueller	4bfd675073	Merge remote-tracking branch 'origin/develop' into tmp_dev_custom_fdir	2023-04-14 18:48:20 +02:00
Robin Mueller	b0a2b5886f	hotfix ACS/SUS	2023-04-14 18:45:58 +02:00
Robin Mueller	33d60ccf7f	v10.7	2023-04-14 18:31:56 +02:00
meggert	e68ac9cc2d	changelog	2023-04-14 16:55:28 +02:00
Robin Mueller	9b1d4de9c5	Merge remote-tracking branch 'origin/develop' into tmp_dev_custom_fdir	2023-04-14 14:44:40 +02:00
Robin Mueller	998f93e3fa	Merge remote-tracking branch 'origin/develop' into heater_health_device	2023-04-14 14:32:27 +02:00
Robin Müller	b5e1e0c31b	Merge branch 'develop' into feature_com_pdec_fdir	2023-04-14 14:29:59 +02:00
Robin Müller	b2a52b0bfc	Merge branch 'develop' into str_update_arcsec_lib	2023-04-14 13:28:22 +02:00
Robin Mueller	213dba1e75	changelog	2023-04-14 13:12:03 +02:00
Robin Mueller	bc6531f7a5	bugfix for shell cmd executors	2023-04-14 00:29:21 +02:00
Robin Mueller	e79e13416e	changelog	2023-04-13 23:56:22 +02:00
Robin Mueller	28eaf8461a	changelog	2023-04-13 23:32:08 +02:00
Robin Mueller	ae66820b52	Merge remote-tracking branch 'origin/develop' into str_update_arcsec_lib	2023-04-13 21:05:20 +02:00
Robin Mueller	600d0c580d	another changelog entry	2023-04-13 18:20:23 +02:00
Robin Mueller	2722e471ef	changelog	2023-04-13 18:14:30 +02:00
Robin Mueller	cebe6e1423	Merge branch 'str_small_fixes' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into str_small_fixes	2023-04-13 18:13:18 +02:00
Robin Mueller	906aedc911	changelog	2023-04-13 18:13:12 +02:00
Robin Müller	f14677ec4e	Merge branch 'develop' into continue_tcs_tests	2023-04-13 18:10:24 +02:00
Robin Müller	94431cfdb8	Merge branch 'develop' into continue_tcs_tests	2023-04-12 18:07:41 +02:00
Robin Mueller	41ec6dc0f2	set pref sd as param	2023-04-12 18:06:04 +02:00
Robin Mueller	ae80eac9a2	changelog	2023-04-12 17:25:54 +02:00
Robin Mueller	2808079444	add q7s-package update in changelog	2023-04-12 16:29:34 +02:00
Robin Mueller	3ba81d19a7	changelog	2023-04-12 13:40:59 +02:00
Robin Mueller	f4c156479a	prep v1.44.1	2023-04-12 13:26:23 +02:00
Robin Mueller	d9e38d97ee	Merge remote-tracking branch 'origin/develop' into continue_tcs_tests	2023-04-12 13:00:58 +02:00
Robin Mueller	98d1da428a	Merge remote-tracking branch 'origin/develop' into continue_tcs_tests	2023-04-12 10:53:59 +02:00
Robin Mueller	c9cc1d4cfe	done	2023-04-11 22:58:13 +02:00
Robin Mueller	b3f5e74609	typo	2023-04-11 18:18:33 +02:00
Robin Mueller	5925de94e7	changelog	2023-04-11 18:16:58 +02:00
Robin Mueller	d42b6798e0	better reply result handling	2023-04-11 17:29:32 +02:00
Robin Mueller	4e9a074e82	changelog	2023-04-11 17:19:16 +02:00
Robin Mueller	8d9755c17f	Merge remote-tracking branch 'origin/develop' into continue_tcs_tests	2023-04-11 16:14:53 +02:00
Robin Müller	52620f3dda	Merge branch 'develop' into feature_custom_obsw_update_path	2023-04-11 16:12:28 +02:00
Robin Mueller	4afddad503	typo	2023-04-08 17:48:45 +02:00
Robin Mueller	cc39acd436	changelog	2023-04-08 17:47:56 +02:00
Robin Mueller	aa43912279	everything except SDC switch looking good..	2023-04-08 17:13:42 +02:00
Robin Mueller	ece053e5c3	Merge remote-tracking branch 'origin/develop' into continue_tcs_tests	2023-04-08 15:57:06 +02:00
Robin Mueller	1c0fbace4d	Merge remote-tracking branch 'origin/develop' into feature_custom_obsw_update_path	2023-04-08 15:56:08 +02:00
Robin Mueller	c89e332843	changelog	2023-04-08 13:25:31 +02:00
Robin Mueller	584b6e3038	changelog and tmtc bump	2023-04-08 11:40:23 +02:00
Robin Mueller	6b671cfa65	bump eive-tmtc, compile fix	2023-04-07 18:19:33 +02:00
Robin Mueller	3408624056	prep v1.44.9	2023-04-07 17:43:48 +02:00
Robin Mueller	f4951385fd	changelog	2023-04-07 17:27:51 +02:00
Robin Mueller	014ac8b8c2	changelog	2023-04-07 17:04:33 +02:00
Robin Mueller	d98873c9a6	that should do it	2023-04-07 11:37:17 +02:00
Robin Mueller	5243f304af	Merge remote-tracking branch 'origin/develop' into continue_tcs_tests	2023-04-06 19:17:56 +02:00
Robin Mueller	5bdb7414bf	changelog	2023-04-06 19:12:15 +02:00
Robin Mueller	77b8c6eb3e	bugfix RW asyy	2023-04-06 19:11:26 +02:00
Robin Mueller	c5e18957f5	changelog	2023-04-06 13:03:28 +02:00
Robin Mueller	44325ee176	changelog	2023-04-06 12:15:12 +02:00
Robin Mueller	3e54bc9c3f	preparing v1.43.2	2023-04-05 17:29:09 +02:00
Robin Mueller	f031c46cb5	ACS Board assy	2023-04-05 17:10:50 +02:00
Robin Müller	b11ed219a2	Merge branch 'develop' into bugfix_syrlinks	2023-04-05 16:47:53 +02:00
Robin Mueller	36d5f8fd31	changelog, updates	2023-04-05 16:41:49 +02:00
meggert	cdba7985ea	Merge branch 'develop' into acs-safe-no-rw-cmd	2023-04-05 16:26:31 +02:00
meggert	38b7593900	changelog	2023-04-05 16:23:29 +02:00
Robin Mueller	c65b402361	changelog	2023-04-05 15:29:44 +02:00
Robin Mueller	3299260653	fix GPS HK enabling	2023-04-04 20:59:25 +02:00
Robin Mueller	52c69f05e6	prep next patch release	2023-04-04 20:39:13 +02:00
Robin Mueller	f2a2c73984	Merge remote-tracking branch 'origin/develop' into tweak_syrlinks_hk	2023-04-04 18:53:14 +02:00
Robin Mueller	04178b8831	changelog	2023-04-04 18:04:09 +02:00
Robin Mueller	c9bd922711	Merge remote-tracking branch 'origin/develop' into tweak_syrlinks_hk	2023-04-04 18:02:29 +02:00
Robin Mueller	fd8317acd7	Merge remote-tracking branch 'origin/develop' into feature_set_health_overrides	2023-04-04 17:54:43 +02:00
Robin Mueller	a76074acf5	changelog	2023-04-04 17:53:38 +02:00
Robin Mueller	697dcab345	changelog	2023-04-04 17:52:03 +02:00
Robin Mueller	01081cbb29	set health overrides	2023-04-04 14:45:09 +02:00
Robin Mueller	39a3b4aa6f	prep v1.43.0	2023-04-04 13:32:41 +02:00
Robin Mueller	83e0627548	Merge remote-tracking branch 'origin/develop' into bugfixes_tweaks_str	2023-04-04 11:22:07 +02:00
Robin Mueller	f5588e9c62	Merge remote-tracking branch 'origin/develop' into feature_3v3_stack_switching	2023-04-03 19:58:35 +02:00
Robin Mueller	6d0bd88cd9	changelog	2023-04-03 19:57:16 +02:00
Robin Mueller	53c88f85d5	changelog update	2023-04-03 16:58:48 +02:00
Robin Mueller	6b37d292c6	add 3v3 stack switching	2023-04-03 16:25:32 +02:00
Robin Mueller	99eae0df51	update changelog	2023-04-03 15:31:46 +02:00
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