8495 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Robin Mueller	5862c1bb40	auto-formatter	2023-11-07 09:12:44 +01:00
Robin Müller	6380a1def3	Merge pull request 'v7.3.0' (#820) from prep_v7.3.0 into main ... Reviewed-on: #820 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-11-07 09:11:46 +01:00
Marius Eggert	3fe2c44955	Merge branch 'main' into prep_v7.3.0	2023-11-06 15:36:04 +01:00
Marius Eggert	366a447b22	Merge pull request 'always add PLOC code' (#819) from always-add-ploc-code into main ... Reviewed-on: #819 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-11-06 15:34:57 +01:00
Robin Mueller	93c5e542bd	bump release date	2023-11-06 14:44:01 +01:00
Robin Mueller	4986955a0f	bump changelog	2023-11-06 14:43:31 +01:00
Robin Mueller	b081766829	always add PLOC code	2023-11-06 14:37:13 +01:00
meggert	60a348a08f	this gonna be fun	2023-11-02 16:59:09 +01:00
meggert	65f907448c	Merge branch 'make-robin-happy-about-timestuff' into higher-acs-modes-only-str	2023-11-02 16:30:54 +01:00
meggert	b29c9c6e9c	Merge branch 'make-robin-happy-about-timestuff' of egit.irs.uni-stuttgart.de:eive/eive-obsw into make-robin-happy-about-timestuff	2023-11-02 16:28:43 +01:00
Robin Mueller	3158f2341c	update version number	2023-10-30 16:11:51 +01:00
Robin Mueller	c11867323c	changelog	2023-10-30 16:11:36 +01:00
Robin Müller	43af25891c	Merge pull request 'Change PDEC addresses' (#813) from pdec-changed-addrs into main ... Reviewed-on: #813 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-10-30 15:54:37 +01:00
Robin Müller	b8672d3453	Merge branch 'main' into make-robin-happy-about-timestuff	2023-10-30 15:47:52 +01:00
Robin Müller	15f3a2ce42	Merge branch 'main' into pdec-changed-addrs	2023-10-30 15:02:34 +01:00
Robin Müller	872215ce61	Merge pull request 'PLOC SUPV debug mode' (#815) from ploc-supv-debug-mode into main ... Reviewed-on: #815 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-10-30 14:57:33 +01:00
Robin Müller	3c383f6d01	Merge branch 'main' into make-robin-happy-about-timestuff	2023-10-30 14:47:38 +01:00
Robin Mueller	e45f9899ff	changelog	2023-10-30 14:46:46 +01:00
Robin Mueller	b2791bb7db	Merge remote-tracking branch 'origin/main' into pdec-changed-addrs	2023-10-30 14:44:01 +01:00
Robin Mueller	2b1ed2be53	Merge remote-tracking branch 'origin/main' into ploc-supv-debug-mode	2023-10-30 14:43:44 +01:00
Robin Müller	3e5b9d6650	Merge pull request 'Prep v7.2.0' (#816) from prep_v7.2.0 into main ... Reviewed-on: #816 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-10-30 13:13:31 +01:00
Robin Müller	37853f8fe2	Merge branch 'main' into prep_v7.2.0	2023-10-30 10:32:12 +01:00
Robin Müller	bd60246f9a	Merge pull request 'Update Internal Resistance' (#817) from update-internal-resistance into main ... Reviewed-on: #817 Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>	2023-10-30 10:32:04 +01:00
meggert	a2090448ff	changelog	2023-10-30 08:52:18 +01:00
eggertm	ad6fa66daf	update internal resistance	2023-10-27 15:37:45 +02:00
Robin Mueller	647a394150	eive-tmtc version	2023-10-27 15:04:11 +02:00
Robin Mueller	dca6cade11	bump tmtc	2023-10-27 15:03:02 +02:00
Robin Mueller	43e981dfed	prep v7.2.0	2023-10-27 14:24:59 +02:00
Robin Müller	49b2bef8f4	Merge pull request 'PL PCDU JSON update' (#812) from plpcdu-json-file-update into main ... Reviewed-on: #812	2023-10-27 14:17:06 +02:00
Robin Müller	0c778b66f9	Merge pull request 'Reduce SUS FDIR Events' (#806) from sus-fdir-reduce-events into main ... Reviewed-on: #806 Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>	2023-10-27 14:16:46 +02:00
Robin Mueller	68763e327b	Merge remote-tracking branch 'origin/main' into plpcdu-json-file-update	2023-10-27 14:05:45 +02:00
Robin Müller	3c55a07404	Merge branch 'main' into sus-fdir-reduce-events	2023-10-27 14:05:05 +02:00
Robin Müller	2e7a1c1cb5	Merge pull request 'Swap RTD9 and RTD11 chip selects' (#814) from swap-rtd-9-and-11 into main ... Reviewed-on: #814 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-10-27 14:00:14 +02:00
Robin Müller	febb36f0eb	Merge branch 'main' into swap-rtd-9-and-11	2023-10-27 13:50:28 +02:00
Robin Müller	1ba1946728	Merge pull request 'STR extensions' (#798) from str-extensions into main ... Reviewed-on: #798 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-10-27 13:50:12 +02:00
Robin Mueller	d2b5384f05	make marius happy	2023-10-27 12:54:32 +02:00
Robin Mueller	5a67ce56aa	changelog	2023-10-27 12:43:32 +02:00
Robin Müller	65bb860fb2	Merge branch 'main' into sus-fdir-reduce-events	2023-10-27 12:39:39 +02:00
Robin Mueller	6459a945ea	Merge remote-tracking branch 'origin/main' into plpcdu-json-file-update	2023-10-27 12:35:55 +02:00
Robin Mueller	b30c85866f	Merge remote-tracking branch 'origin/main' into swap-rtd-9-and-11	2023-10-27 12:34:52 +02:00
Robin Mueller	a877edf40b	bump tmtc	2023-10-27 12:34:33 +02:00
Robin Mueller	656c69f858	bump tmtc	2023-10-27 12:32:59 +02:00
Robin Mueller	db582febb7	Merge remote-tracking branch 'origin/main' into str-extensions	2023-10-27 12:32:49 +02:00
Robin Müller	c48f0678f1	Merge pull request 'Added CFDP fault handler events' (#809) from cfdp-fault-handler-event into main ... Reviewed-on: #809 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-10-27 12:32:17 +02:00
Robin Mueller	dcdceba07e	wrapping up	2023-10-27 12:17:54 +02:00
Robin Mueller	f8eb4fdd6f	add contrast set	2023-10-27 11:24:51 +02:00
Robin Mueller	964d47b909	bugfix for reset function	2023-10-27 09:59:15 +02:00
meggert	35e7fba576	smoll fix	2023-10-27 09:50:40 +02:00
meggert	44d9541e52	Merge branch 'main' into sus-fdir-reduce-events	2023-10-27 09:41:50 +02:00
Robin Mueller	0beac793a1	some more important bugfixes	2023-10-26 20:45:36 +02:00