7363 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Robin Mueller	de4562dd2f	changelog tweak 2	2023-06-22 16:53:24 +02:00
Robin Mueller	fb9303a8de	changelog	2023-06-22 16:52:46 +02:00
Robin Mueller	9b2b087d08	remove stray newline	2023-06-22 16:49:17 +02:00
Robin Mueller	1c27ba7261	bump tmtc and CHANGELOG	2023-06-22 16:47:45 +02:00
Robin Müller	3a59cd301b	Merge pull request 'Add force flag for cp helper' (#667) from extend-cp-helper into v4.0.0-dev ... Reviewed-on: #667	2023-06-22 16:45:14 +02:00
Robin Müller	4c66d8fb5f	Merge branch 'v4.0.0-dev' into extend-cp-helper	2023-06-22 16:44:39 +02:00
Robin Müller	b634543c5a	Merge pull request 'More Info on Reboot' (#701) from more-info-on-reboot into v4.0.0-dev ... Reviewed-on: #701	2023-06-22 16:44:22 +02:00
Robin Müller	ced812052d	Merge branch 'v4.0.0-dev' into extend-cp-helper	2023-06-22 16:33:58 +02:00
Robin Mueller	32b074b86e	that should fix the build	2023-06-22 16:29:52 +02:00
Robin Mueller	a0d559a5fd	Merge branch 'v4.0.0-dev' into extend-cp-helper	2023-06-22 16:24:24 +02:00
Robin Mueller	c7e554aebc	Merge branch 'more-info-on-reboot' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into more-info-on-reboot	2023-06-22 16:19:45 +02:00
Robin Mueller	e8bd3f447d	bump tmtc	2023-06-22 16:19:38 +02:00
Robin Müller	d1086bc9aa	Merge branch 'v4.0.0-dev' into more-info-on-reboot	2023-06-22 16:17:17 +02:00
Robin Müller	461782acdb	Merge branch 'v4.0.0-dev' into internal-error-reporter-set	2023-06-22 16:11:33 +02:00
Robin Müller	98a2338dcb	Merge pull request 'Set temperatures to invalid value when applicable' (#700) from set-more-temps-to-invalid-value into v4.0.0-dev ... Reviewed-on: #700	2023-06-22 16:10:34 +02:00
Robin Mueller	74e945ddff	changelog	2023-06-22 16:10:07 +02:00
Robin Mueller	a3b140b680	internal error reporter extension	2023-06-22 16:09:24 +02:00
Robin Mueller	880b8620ba	bump tmtc	2023-06-22 14:52:38 +02:00
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	db3a4955c2	core ctrl provides more info on reboot	2023-06-22 14:06:34 +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	3ae7dab8c7	those are the most important cases	2023-06-22 11:33:54 +02:00
Robin Mueller	0c394ad34d	set temperature invalid properly	2023-06-22 11:30:34 +02:00
Robin Müller	4de1932c8a	Merge pull request 'Increase FM and EM similarity' (#697) from increase-fm-em-similarity into main ... Reviewed-on: #697 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-06-21 20:26:09 +02:00
Robin Müller	1c74d39faf	Merge pull request 'sus convert bugfix' (#698) from sus-converter-h-fix into v4.0.0-dev ... Reviewed-on: #698 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-06-21 19:39:59 +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	2d4a3c0ee2	new FW info event	2023-06-21 19:01:44 +02:00
Robin Mueller	295da50bc7	sus convert bugfix	2023-06-21 17:46:59 +02:00
Robin Mueller	3f9bf8e173	make imtq dummy more similar	2023-06-21 14:29:00 +02:00
Robin Mueller	4893af07ae	extend RW dummy	2023-06-21 13:59:15 +02:00
Robin Mueller	af8b4d5bc8	remove commented code	2023-06-21 13:53:34 +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 Müller	4ed7689956	Merge pull request 'v3.3.0-dev for release' (#696) from v3.3.0-dev into main ... Reviewed-on: #696	2023-06-21 13:48:45 +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 Müller	6fa53e1869	Merge pull request 'v3.2.0-dev for release' (#695) from v3.2.0-dev into main ... Reviewed-on: #695	2023-06-21 13:45:54 +02:00
Robin Mueller	54328ff357	date correction	2023-06-21 13:44:44 +02:00
Robin Mueller	c43d9a5a9a	bump version	2023-06-21 13:44:04 +02:00
Robin Mueller	277a6ad33c	Merge branch 'v3.2.0-dev' into v3.3.0-dev	2023-06-20 20:59:12 +02:00
Robin Mueller	b655c03564	cmakelists	2023-06-20 20:58:31 +02:00
Robin Mueller	49e15de08a	Merge branch 'v3.2.0-dev' into v3.3.0-dev	2023-06-20 20:56:37 +02:00
Robin Mueller	6ef8c62aca	BPX batt handler	2023-06-20 20:53:49 +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	fe1e236466	bump fsfw	2023-06-20 20:36:13 +02:00
Robin Mueller	861ad9e62d	ithis is better	2023-06-20 20:14:08 +02:00
Robin Mueller	5e4032032f	that should do the job	2023-06-20 19:39:22 +02:00
Robin Müller	3a137762f3	Merge pull request 'sus-vector-fix-new-v3.1.1' (#690) from sus-vector-fix-new-v3.1.1 into main ... Reviewed-on: #690	2023-06-20 18:26:21 +02:00
Robin Müller	92a0752e18	Merge branch 'main' into sus-vector-fix-new-v3.1.1	2023-06-20 18:24:54 +02:00