856 Commits

Author	SHA1	Message	Date
Robin Mueller	788fbb72f0	that should do the job	2023-06-22 14:25:11 +02:00
Robin Mueller	afcc0cc21d	changelog	2023-06-22 14:07:37 +02:00
Robin Mueller	d0a9460676	Merge remote-tracking branch 'origin/v4.0.0-dev' into set-more-temps-to-invalid-value	2023-06-22 11:36:49 +02:00
Robin Mueller	add083135e	changelog	2023-06-22 11:35:46 +02:00
Robin Mueller	f40348904c	Merge branch 'v4.0.0-dev' into sus-converter-h-fix	2023-06-21 19:39:37 +02:00
Robin Mueller	295da50bc7	sus convert bugfix	2023-06-21 17:46:59 +02:00
Robin Mueller	2ae89769af	Merge remote-tracking branch 'origin/main' into v4.0.0-dev	2023-06-21 13:51:26 +02:00
Robin Mueller	7ceb81f68d	Merge remote-tracking branch 'origin/main' into v3.3.0-dev	2023-06-21 13:47:46 +02:00
Robin Mueller	54328ff357	date correction	2023-06-21 13:44:44 +02:00
Robin Mueller	695a663a15	and put everything back	2023-06-20 20:52:01 +02:00
Robin Mueller	94cf42fbeb	changelog	2023-06-20 20:48:46 +02:00
Robin Mueller	6ed2fcd904	small changelog tweak	2023-06-20 18:22:43 +02:00
Robin Mueller	3ee9a914cc	Merge remote-tracking branch 'origin/main' into sus-vector-fix-new-v3.1.1	2023-06-20 18:21:12 +02:00
Robin Mueller	7a119bab6e	changelog	2023-06-19 17:34:47 +02:00
meggert	51a3a2f5cf	changelog	2023-06-15 17:58:35 +02:00
Robin Mueller	456ee156c3	finally have a firmware version	2023-06-15 10:02:12 +02:00
Robin Mueller	40eae48a1a	changelog	2023-06-15 09:51:34 +02:00
Robin Mueller	4bd3cf4d52	Merge remote-tracking branch 'origin/main' into v4.0.0-dev	2023-06-15 05:09:52 +02:00
Robin Mueller	a05a8ffb50	Merge remote-tracking branch 'origin/main' into tmp-sign-bugfix	2023-06-14 18:11:25 +02:00
Robin Mueller	885fddd45f	bump changelgo	2023-06-14 06:15:04 +02:00
Robin Mueller	fab4cdd0dc	changelog	2023-06-14 06:09:18 +02:00
Robin Mueller	71d417710e	changelog	2023-06-14 03:39:13 +02:00
Robin Mueller	26199e7317	changelog	2023-06-14 03:18:47 +02:00
Robin Mueller	38305e723f	changelog	2023-06-13 23:26:27 +02:00
Robin Mueller	55d6edcd66	Merge remote-tracking branch 'origin/main' into v4.0.0-dev	2023-06-11 18:54:04 +02:00
Robin Mueller	3fdd1feb94	prep release	2023-06-11 18:46:30 +02:00
Robin Mueller	e3ae6260ad	changelog	2023-06-09 18:26:41 +02:00
Robin Mueller	9e787a7e44	Merge branch 'v3.0.0-dev' into v4.0.0-dev	2023-06-09 18:10:38 +02:00
Robin Müller	b2535662e6	Merge branch 'v3.0.0-dev' into core-ctrl-dir-listing-fsm	2023-06-09 14:44:44 +02:00
Robin Mueller	3bdbc67e0d	Merge remote-tracking branch 'origin/v3.0.0-dev' into core-ctrl-dir-listing-fsm	2023-06-09 14:24:42 +02:00
Robin Mueller	fe1cc9444d	changelog	2023-06-09 14:10:06 +02:00
Robin Müller	9ec3eca10a	Merge branch 'v3.0.0-dev' into bump-fsfw-tmtc	2023-06-09 13:40:16 +02:00
Robin Mueller	6c1dfafb2e	changelog	2023-06-09 13:13:05 +02:00
Robin Mueller	c1f8512b01	changelog	2023-06-09 13:10:29 +02:00
Robin Mueller	08e7a8cf97	Merge branch 'v3.0.0-dev' into gyr-confg-rework-2	2023-06-09 12:48:36 +02:00
Robin Mueller	d90ccd62f8	bump changelog and tmtc	2023-06-09 12:47:07 +02:00
meggert	cab20a8c77	changelog	2023-06-08 09:55:46 +02:00
meggert	6fdd9da2a0	Merge branch 'v3.0.0-dev' into gyr-confg-rework-2	2023-06-08 09:36:07 +02:00
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