1152 Commits

Author	SHA1	Message	Date
meggert	d0588b144a	Merge branch 'dev-7.5.0' into higher-acs-modes-only-str	2023-12-04 13:15:25 +01:00
meggert	aab705ca04	changelog	2023-12-01 14:22:10 +01:00
meggert	b86ee21da0	fix for failed handling	2023-12-01 12:56:31 +01:00
meggert	f9ab7962cd	Merge branch 'dev-7.5.0' into persistent-tle-store	2023-12-01 10:30:06 +01:00
meggert	03b43da57f	Merge branch 'main' into persistent-tle-store	2023-12-01 10:23:13 +01:00
meggert	c6d0357ac9	changelog fix	2023-12-01 10:22:52 +01:00
meggert	99195565f6	Merge branch 'main' into dev-7.5.0	2023-12-01 10:21:14 +01:00
Robin Mueller	fa727b1e44	bump tmtc to v5.11.0	2023-11-30 15:47:12 +01:00
Robin Mueller	325a6ff70b	prep v7.4.0	2023-11-30 15:20:50 +01:00
meggert	3c24dfad8c	Merge branch 'dev-7.5.0' into persistent-tle-store	2023-11-30 11:51:17 +01:00
meggert	7239b2e26d	small fixes	2023-11-30 11:43:12 +01:00
Robin Müller	c475c8fd8d	Merge branch 'dev-7.5.0' into acs-board-b-as-default	2023-11-29 18:51:25 +01:00
meggert	3969d05476	Merge branch 'main' into persistent-tle-store	2023-11-29 17:13:07 +01:00
meggert	f395c71fd0	changelog	2023-11-29 17:12:10 +01:00
meggert	882c5ce598	changelog	2023-11-29 17:03:34 +01:00
Robin Müller	e1e8b525b3	Merge branch 'main' into disable-order-check-plpcdu	2023-11-29 15:13:37 +01:00
Robin Müller	faf213d3b8	Merge branch 'main' into revert-str-com-if-changes	2023-11-29 15:13:19 +01:00
Robin Müller	d553afcc5b	Merge branch 'main' into revert-str-com-if-changes	2023-11-29 14:57:05 +01:00
Robin Mueller	6b6793d93f	Merge remote-tracking branch 'origin/main' into disable-order-check-plpcdu	2023-11-29 14:56:44 +01:00
Robin Mueller	30964a9648	Merge remote-tracking branch 'origin/main' into virt-channel-bugfix	2023-11-29 14:52:40 +01:00
Robin Mueller	210ee7b6d9	Merge remote-tracking branch 'origin/main' into ploc-supv-extensions	2023-11-29 14:24:01 +01:00
Robin Mueller	2fd30a2f38	Merge remote-tracking branch 'origin/main' into virt-channel-bugfix	2023-11-29 14:21:40 +01:00
Robin Mueller	e6278c7a23	Merge remote-tracking branch 'origin/main' into ploc-supv-extensions	2023-11-29 14:18:12 +01:00
Robin Mueller	178da2fec1	changelog update	2023-11-29 14:17:17 +01:00
Robin Mueller	5bad2a46a8	Merge remote-tracking branch 'origin/main' into persistent-tm-store-delete-time-range	2023-11-29 14:11:19 +01:00
meggert	6ed3dc1b50	one of those days ...	2023-11-29 10:43:10 +01:00
meggert	bd71446e05	changelog	2023-11-29 10:42:36 +01:00
Robin Mueller	14e545618c	typo	2023-11-28 15:42:36 +01:00
Robin Mueller	f92642623e	update changelog	2023-11-28 15:38:57 +01:00
Robin Mueller	b987566947	changelog	2023-11-27 15:41:58 +01:00
Robin Mueller	9e31c06563	changelog update	2023-11-23 17:47:44 +01:00
Robin Mueller	66619909a6	changelog	2023-11-21 17:44:51 +01:00
Robin Mueller	5348188f6b	changelog	2023-11-16 17:11:19 +01:00
Robin Mueller	9010d1d202	add new command to reload the JSON file	2023-11-16 17:07:47 +01:00
meggert	c465558543	Merge branch 'main' into higher-acs-modes-only-str	2023-11-14 16:07:22 +01:00
Robin Mueller	49a87224e7	changelog update	2023-11-07 09:13:21 +01:00
Marius Eggert	3fe2c44955	Merge branch 'main' into prep_v7.3.0	2023-11-06 15:36:04 +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
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	c11867323c	changelog	2023-10-30 16:11:36 +01:00
Robin Mueller	e45f9899ff	changelog	2023-10-30 14:46:46 +01:00
Robin Müller	37853f8fe2	Merge branch 'main' into prep_v7.2.0	2023-10-30 10:32:12 +01:00
meggert	a2090448ff	changelog	2023-10-30 08:52:18 +01:00
Robin Mueller	647a394150	eive-tmtc version	2023-10-27 15:04:11 +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 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	febb36f0eb	Merge branch 'main' into swap-rtd-9-and-11	2023-10-27 13:50:28 +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	db582febb7	Merge remote-tracking branch 'origin/main' into str-extensions	2023-10-27 12:32:49 +02:00
meggert	44d9541e52	Merge branch 'main' into sus-fdir-reduce-events	2023-10-27 09:41:50 +02:00
Robin Mueller	599ff256ff	Merge remote-tracking branch 'origin/main' into str-extensions	2023-10-26 19:18:28 +02:00
Robin Mueller	be9d00be04	Merge remote-tracking branch 'origin/main' into cfdp-fault-handler-event	2023-10-26 13:46:11 +02:00
Robin Mueller	c06cd710cf	Merge remote-tracking branch 'origin/main' into swap-rtd-9-and-11	2023-10-26 13:45:10 +02:00
Robin Mueller	ef2e62e418	changelog clarification	2023-10-25 17:51:41 +02:00
Robin Mueller	b7e33ebcb6	changelog	2023-10-25 17:49:31 +02:00
Robin Mueller	c67a9fa2c2	this might be a bugfix	2023-10-23 17:10:37 +02:00
Robin Mueller	3e5fae4458	Merge remote-tracking branch 'origin/main' into str-extensions	2023-10-23 13:53:01 +02:00
Robin Mueller	1f203e9f76	improvements for SoC FDIR	2023-10-19 14:20:40 +02:00
Robin Mueller	0854ec878b	added CFDP fault handler events	2023-10-19 11:27:21 +02:00
meggert	4295b6b987	Merge branch 'main' into str-extensions	2023-10-19 09:37:26 +02:00
Robin Mueller	b3f9a82064	changelog update	2023-10-18 18:16:32 +02:00
meggert	6621b20aef	changelog	2023-10-18 14:36:34 +02:00
meggert	8b6fa63c60	changelog	2023-10-18 14:29:33 +02:00
Robin Mueller	e194071936	Merge remote-tracking branch 'origin/main' into cfdp-source-handler	2023-10-17 10:47:53 +02:00
Robin Mueller	a66004044a	Merge remote-tracking branch 'origin/main' into str-extensions	2023-10-16 15:45:57 +02:00
Robin Mueller	c268977b3d	changelog	2023-10-16 15:30:17 +02:00
Robin Mueller	aaf99b52b4	changelog	2023-10-16 14:46:45 +02:00
Robin Mueller	ffba0b371c	added another fix	2023-10-13 17:28:31 +02:00
Robin Mueller	0f5f147b8d	changelog	2023-10-13 17:12:35 +02:00
Robin Mueller	5bc468f13f	Merge branch 'refactor-fix-ptme' into cfdp-source-handler	2023-10-13 09:45:21 +02:00
Robin Mueller	8dbc5cad48	more bugfixes	2023-10-13 09:39:50 +02:00
Robin Mueller	bb4e495199	changelog correcion	2023-10-11 19:40:16 +02:00
Robin Mueller	c35fe58b15	Merge remote-tracking branch 'origin/main' into add-xiphos-wdt-handling	2023-10-11 19:38:09 +02:00
Robin Mueller	a381efc5d9	prep next release	2023-10-11 18:16:36 +02:00
Robin Mueller	9265f27af9	changelog	2023-10-11 15:02:59 +02:00
Robin Mueller	78e70dafc3	Merge remote-tracking branch 'origin/main' into str-extensions	2023-10-11 14:48:06 +02:00
Robin Mueller	e12ce62f5c	Merge remote-tracking branch 'origin/main' into add-xiphos-wdt-handling	2023-10-11 14:28:32 +02:00
Robin Mueller	5283607441	changelog update	2023-10-11 13:59:11 +02:00
Robin Mueller	3cd9f2bfc7	Merge remote-tracking branch 'origin/main' into str-extensions	2023-10-11 13:57:45 +02:00
Robin Mueller	7b6d1c99ff	Merge remote-tracking branch 'origin/main' into cfdp-source-handler	2023-10-11 12:59:27 +02:00
Robin Mueller	b5cd64ea00	Merge remote-tracking branch 'origin/main' into add-xiphos-wdt-handling	2023-10-11 10:54:16 +02:00
Robin Mueller	0ee708f496	Merge remote-tracking branch 'origin/main' into scex-bugfix	2023-10-11 10:51:59 +02:00
meggert	6cada9bfc0	changelog	2023-10-11 09:31:32 +02:00
Robin Mueller	7f82dd91e2	changelog	2023-10-10 16:20:51 +02:00
Robin Mueller	e9e8a93cf4	changelog	2023-10-06 11:41:03 +02:00
Robin Mueller	5e7f0e729b	merge main	2023-10-04 09:53:04 +02:00
Robin Mueller	404a1009ed	that should get the job done	2023-10-02 14:47:41 +02:00
Robin Mueller	50809e35a9	some nullptr checks	2023-09-25 18:07:28 +02:00
Robin Mueller	eb538a789a	changelog	2023-09-25 17:53:25 +02:00
Robin Mueller	d4a87ee789	prep v6.6.0	2023-09-18 16:32:22 +02:00
Robin Mueller	592561b287	changelog	2023-09-14 12:29:11 +02:00
Robin Mueller	b753d32b2b	Merge remote-tracking branch 'origin/main' into cfdp-source-handler	2023-09-12 14:19:25 +02:00