8087 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
meggert	c28ff551db	small fix	2023-12-01 11:41:35 +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 Müller	cdfdb9a053	Merge pull request 'prep v7.4.0' (#830) from prep_v7.4.0 into main ... Reviewed-on: #830	2023-11-30 15:45:28 +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
Marius Eggert	cf6c86fabc	Merge pull request 'Set B-Side as Default for ACS Board' (#822) from acs-board-b-as-default into dev-7.5.0 ... Reviewed-on: #822 Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>	2023-11-30 11:49:29 +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	a481fc23f2	bump fsfw	2023-11-29 17:11:46 +01:00
meggert	882c5ce598	changelog	2023-11-29 17:03:34 +01:00
meggert	370eff5204	get correct sd card	2023-11-29 16:59:03 +01:00
meggert	3c8b0d1a71	bump fsfw	2023-11-29 16:58:43 +01:00
Marius Eggert	bbcb10c2d9	Merge pull request 'run afmt, re-run generators' (#829) from afmt-generators into main ... Reviewed-on: #829 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-11-29 15:49:46 +01:00
Robin Mueller	89b6a2de2d	run afmt, re-run generators	2023-11-29 15:15:29 +01:00
Robin Müller	4d21d2761f	Merge pull request 'Disable Order Check PL PCDU' (#825) from disable-order-check-plpcdu into main ... Reviewed-on: #825 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-11-29 15:13:57 +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	64cb3c6a6c	Merge pull request 'revert some changes in com IF' (#826) from revert-str-com-if-changes into main ... Reviewed-on: #826 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-11-29 15:13:27 +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	a5bbc33e1c	Merge pull request 'bugfix for virt channel: clear invalid state' (#827) from virt-channel-bugfix into main ... Reviewed-on: #827 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-11-29 15:13:07 +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 Müller	66d4fa1806	Merge pull request 'PLOC SUPV extensions' (#821) from ploc-supv-extensions into main ... Reviewed-on: #821 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-11-29 14:52:08 +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	8c1e7ae418	bump fsfw and tmtc	2023-11-29 14:23:29 +01:00
Robin Mueller	2fd30a2f38	Merge remote-tracking branch 'origin/main' into virt-channel-bugfix	2023-11-29 14:21:40 +01:00
Robin Müller	f23debceac	Merge pull request 'Persistent TM store delete time range' (#823) from persistent-tm-store-delete-time-range into main ... Reviewed-on: #823 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-11-29 14:20:41 +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
Robin Müller	edf7b5325d	Merge pull request 'Variable STR CFG path' (#824) from str-variable-cfg-path-q7s into main ... Reviewed-on: #824 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-11-29 14:09:08 +01:00
meggert	3b4ff437c0	Merge branch 'main' into persistent-tle-store	2023-11-29 11:14: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	5714abda10	remove duplicate constants	2023-11-28 15:37:25 +01:00
Robin Mueller	a765e67b53	remove some printouts	2023-11-28 15:32:08 +01:00
Robin Mueller	112fa2b8ff	important bugfix	2023-11-28 15:31:37 +01:00
Robin Mueller	b987566947	changelog	2023-11-27 15:41:58 +01:00
Robin Mueller	f321d7f0b6	bump tmtc again	2023-11-27 12:20:14 +01:00
Robin Mueller	aef8db62b1	bump tmtc	2023-11-27 12:19:00 +01:00
Robin Mueller	b0f81d1cce	this should fix the param setting	2023-11-27 12:04:55 +01:00
Robin Mueller	c0b4761ba0	smaller bugfixes	2023-11-27 11:22:23 +01:00