v4.0.0 #699

Merged

muellerr merged 84 commits from v4.0.0-dev into main 2023-06-22 17:43:31 +02:00

Conversation 0 Commits 84 Files Changed 32 +250 -183

84 Commits

Author	SHA1	Message	Date
Robin Müller	4dad1df13b	Merge branch 'main' into v4.0.0-dev	2023-06-22 17:36:19 +02:00
Robin Mueller	f67d72a8dd	prep v4.0.0 final	2023-06-22 17:34:56 +02:00
Robin Müller	da79f24b33	Merge pull request 'reduce GNSS pin reset assertion time' (#703) from gnss-reset-adaptions into v4.0.0-dev ... Reviewed-on: #703	2023-06-22 17:31:12 +02:00
Robin Mueller	b2b7900720	reduce GNSS pin reset assertion time	2023-06-22 16:54:49 +02:00
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	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	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	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	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	2ae89769af	Merge remote-tracking branch 'origin/main' into v4.0.0-dev	2023-06-21 13:51:26 +02:00
Robin Mueller	9c0744ae02	minor improvements	2023-06-17 12:24:54 +02:00
Robin Müller	9544516cc4	Merge pull request 'Add PL I2C reset GPIO' (#683) from add-pl-i2c-resetn into v4.0.0-dev ... Reviewed-on: #683	2023-06-15 19:10:55 +02:00
Robin Müller	3dd7530c3d	Merge branch 'v4.0.0-dev' into add-pl-i2c-resetn	2023-06-15 10:08:06 +02:00
Robin Müller	931bb5ee28	Merge pull request 'dock hk improvements' (#676) from p60dock-hk-improvements into v4.0.0-dev ... Reviewed-on: #676	2023-06-15 10:04:15 +02:00
Robin Müller	d85a5975c0	Merge branch 'v4.0.0-dev' into p60dock-hk-improvements	2023-06-15 10:03: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	8da5f4dd44	add PS I2C resetn	2023-06-15 08:39:06 +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	c5b2b5c56c	Merge remote-tracking branch 'origin/v4.0.0-dev' into p60dock-hk-improvements	2023-06-11 21:49:45 +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	cf48a18733	bump fsfw	2023-06-09 18:12:32 +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 Mueller	b8064c4a39	bump fsfw	2023-06-07 13:50:11 +02:00
Robin Mueller	5058b8905d	let's not forget this	2023-06-06 14:05:44 +02:00
Robin Mueller	aec383b974	add force flag for cp helper	2023-06-06 11:11:16 +02:00
Robin Mueller	caa2800a7a	Merge branch 'v3.0.0-dev' into v4.0.0-dev	2023-06-06 11:10:03 +02:00
Jakob Meier	004a283163	Merge pull request 'PAPB VC Simplification' (#661) from papb-vc-if-simplification into v4.0.0-dev ... Reviewed-on: #661	2023-05-31 16:32:49 +02:00
Robin Mueller	a85b0a4a76	changelog	2023-05-31 16:31:50 +02:00
Robin Mueller	998110dea4	back to somethng simple	2023-05-31 16:10:52 +02:00
Marius Eggert	5c79d5e1f7	Merge pull request 'Update PTME code' (#635) from update-ptme-code-2 into v4.0.0-dev ... Reviewed-on: #635	2023-05-31 15:23:14 +02:00
Robin Mueller	442b1c94a6	small fix	2023-05-31 15:02:11 +02:00
Robin Mueller	8113a71c79	PAPB VC simplification	2023-05-31 14:15:54 +02:00
Robin Mueller	cc60847bd0	Merge branch 'v4.0.0-dev' into update-ptme-code-2	2023-05-31 11:53:04 +02:00
Robin Mueller	0b06bc4c8b	bump major version	2023-05-31 11:52:45 +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	ddcdc38310	try to get rid of the nanosleep	2023-05-30 19:22:23 +02:00
Robin Mueller	9921522ce0	working, remove some old unrequired code	2023-05-30 19:06:59 +02:00
Robin Mueller	f3cc406495	Merge branch 'v2.1.0-dev' into update-ptme-code-2	2023-05-27 17:03:58 +02:00
Robin Mueller	9c78362ac5	use read write permissions for uio	2023-05-27 17:00:41 +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	6cf488d0a6	Merge branch 'always-dump-into-vc' into update-ptme-code-2	2023-05-23 20:19:06 +02:00
Robin Mueller	15139d6944	Merge branch 'no-dump-cancel-on-tx-off' into update-ptme-code-2	2023-05-23 20:18:37 +02:00
Robin Mueller	50327fb614	get rid of the printouts and of the delay	2023-05-23 19:44:06 +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	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	8efbdf8279	Merge branch 'v2.2.0-dev' into update-ptme-code-2	2023-05-23 18:30:00 +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	ea9f72b9c4	Merge branch 'v2.2.0-dev' into update-ptme-code-2	2023-05-22 10:48:47 +02:00
Robin Mueller	148a876fc9	Merge branch 'v2.1.0-dev' into v2.2.0-dev	2023-05-22 10:48:30 +02:00
Robin Mueller	9804898d05	Merge remote-tracking branch 'origin/v2.2.0-dev' into update-ptme-code-2	2023-05-22 10:48:22 +02:00
Marius Eggert	e04f349e77	Merge pull request 'CFDP Bugfix' (#639) from cfdp-bugfix into v2.2.0-dev ... Reviewed-on: #639	2023-05-22 10:47:29 +02:00
Robin Mueller	8cc4431e22	Merge branch 'v2.2.0-dev' into update-ptme-code-2	2023-05-22 10:46:25 +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	8b467ec69e	dock hk improvements	2023-05-16 11:36:19 +02:00
Robin Mueller	97a7087827	bump tmtc	2023-05-15 16:45:14 +02:00
Robin Mueller	a615ed2d21	bump fsfw	2023-05-15 16:18:44 +02:00
Robin Mueller	3d7d01d6ab	bump tmtc	2023-05-15 16:17:08 +02:00
Robin Mueller	7e6c25901b	Squashed commit of the following: ... commit c137df64ab43e5b20fcf26c8821982fa71e43cff Merge: a919b3d1 4179e8e1 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 15:38:52 2023 +0200 Merge remote-tracking branch 'origin/main' into update_ptme_code commit 4179e8e124b3f9f425ac64b7df8b7e7395982dbf Merge: 26f5eff6 51f9d5e1 Author: Robin Müller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 15:35:54 2023 +0200 Merge pull request 'This bugfix might be super important' (#621) from possible_bugfix_dual_lane_assy into main Reviewed-on: #621 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de> Reviewed-by: Steffen Gaisser <gaisser@irs.uni-stuttgart.de> commit 51f9d5e1fe8e71445ec15b833020c4e30b254e72 Merge: a17f57cb 26f5eff6 Author: Robin Müller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 15:35:10 2023 +0200 Merge branch 'main' into possible_bugfix_dual_lane_assy commit a17f57cbb587f960366baae7059309d18619cdc4 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 15:34:45 2023 +0200 changelog commit 26f5eff6d5957e4898f6d5a84200e77b1bd6250c Merge: 4074e084 8a0f13ba Author: Robin Müller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 15:32:03 2023 +0200 Merge pull request 'More System Modes' (#612) from more-system-modes into main Reviewed-on: #612 commit 8a0f13bafbb995b724321a3936a674078d01882f Merge: 14baa356 4074e084 Author: Robin Müller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 15:31:51 2023 +0200 Merge branch 'main' into more-system-modes commit 14baa3563c3dc6499bac49bb83c08ba98bfad171 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 15:30:09 2023 +0200 hello commit 7045b6034afdb819f4978f91f697d7f23806ab89 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 15:18:47 2023 +0200 changelog commit 37b9615525637294118266910979236127f8a8ce Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 15:18:16 2023 +0200 changelog commit 4074e0848012042565047726b8c526c6b5809a2c Merge: 862a4f26 38686ac3 Author: Robin Müller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 15:12:46 2023 +0200 Merge pull request 'Adaption for EM: Add P60 dock without ACU' (#620) from adaption_em_p60_dock_without_acu into main Reviewed-on: #620 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de> commit 23796345d966787f6f43c1d89b9555413bfe583a Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 15:04:30 2023 +0200 changelog and stop payload tracking commit b10275ca43f13ee68be013c7ece3b63acf762130 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 14:28:05 2023 +0200 changelog commit 383849c5cb62b1543037ab07c904b2725c91be13 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 14:25:14 2023 +0200 that is more robust commit c66cef9129586e8708a8f2679ff86b3c9977c5f5 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 14:23:21 2023 +0200 changelog commit 02ea8a7298ff14c8acab55b2f693e8593c277624 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 14:22:21 2023 +0200 changelog commit 38686ac3f621e50ea76be023520167841d2e2c19 Merge: 189a3126 74d5d709 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 14:04:03 2023 +0200 Merge branch 'possible_bugfix_dual_lane_assy' into adaption_em_p60_dock_without_acu commit 74d5d70973b46c70d1483077e71e2820d3ca4ad6 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 13:58:08 2023 +0200 this bugfix might be super important commit 48355e82635b071b9347b62f2bd1da636bf4eae5 Merge: 5691fe8e 862a4f26 Author: Robin Müller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 10:25:50 2023 +0200 Merge branch 'main' into more-system-modes commit 189a312628e561f54491ec238a2d2d5e2f211b57 Merge: a1279428 862a4f26 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 10:23:46 2023 +0200 Merge remote-tracking branch 'origin/main' into adaption_em_p60_dock_without_acu commit a12794281bfc2ebb27a02bbc151696023e69a9f0 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 10:20:31 2023 +0200 changelog commit fcaabb4e421b5f792ede490b6dd135ce661c9db5 Merge: 6c326489 4aafca64 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 10:20:02 2023 +0200 Merge remote-tracking branch 'origin/main' into adaption_em_p60_dock_without_acu commit 6c326489cbc59f2d70993542f05676472ca0102f Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 10:18:46 2023 +0200 adapt EM SW: GS PCDU added, but use dummy for ACU commit 862a4f268510e04fc3cfb878b5eed9f0f9d62f05 Merge: 4aafca64 2daca272 Author: Robin Müller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 09:37:55 2023 +0200 Merge pull request 'Host SW bugfixes' (#618) from try_fix_host_obsw into main Reviewed-on: #618 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de> commit 5691fe8e72a2e3b008d6130f31be32d9d7aee9b7 Merge: 097be17a 4aafca64 Author: meggert <eggertm@irs.uni-stuttgart.de> Date: Thu Apr 27 15:40:31 2023 +0200 Merge branch 'main' into more-system-modes commit 2daca272f8f0397125349c0f6c193e22d0a26383 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Thu Apr 27 11:29:18 2023 +0200 changelog commit 03762f962020b55188d445ee3dd429b6e1a32135 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 17:38:06 2023 +0200 lower live TM handler frequency commit a296f16e5ce9d803ce5db54d9602e396dad7ebce Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 17:36:38 2023 +0200 host SW works properly again commit 83f07a6e16cbbf5fc4a9ccb2e7d92c3fdffb172b Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 17:26:32 2023 +0200 configurable event manager queue depth commit 00dab64628a53d2109fceb5f9a4ffc765a72fab6 Merge: 641b8e84 4aafca64 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 17:03:35 2023 +0200 Merge remote-tracking branch 'origin/main' into try_fix_host_obsw commit 4aafca64a67589826f1578865c92fa76141e8531 Merge: f271242d 6901eae8 Author: Robin Müller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 17:03:01 2023 +0200 Merge pull request 'EM adaptions' (#619) from em_adaptions into main Reviewed-on: #619 commit 6901eae81689981937e7eb49b98886f8c78b727b Merge: 7d630ebc f271242d Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 17:02:24 2023 +0200 Merge remote-tracking branch 'origin/main' into em_adaptions commit 7d630ebcf3894a9a9896d1c3f05548d5ef230333 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 17:00:04 2023 +0200 EM adaptions commit 641b8e847d2b63ad11f28c4a37434a6161443690 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 16:41:40 2023 +0200 add back tm funnel handler for hosted build commit 13142686823bedee1a79ae5f851f124968822a54 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 16:23:50 2023 +0200 host build requires dedicated live TM task.. commit 4040304ef09a172f9d2bef42547d6b1effb8ca76 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 13:15:42 2023 +0200 this is annoying commit a919b3d1645d5c4a6e20903d973ce96424508cae Merge: e22f2a53 9672d6d6 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 11:11:30 2023 +0200 Merge remote-tracking branch 'origin/develop' into update_ptme_code commit 9672d6d6cca3ad7369bb4b06fd91a7f17a0f9db9 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 11:11:09 2023 +0200 changelog commit e22f2a53ea7388cc5c75c2024953aab293c8d277 Merge: b076e80b 0eb6b7cc Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 11:05:58 2023 +0200 Merge remote-tracking branch 'origin/develop' into update_ptme_code commit b076e80b44e7ef2b2417def66ec1f1a684cfb228 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 11:04:10 2023 +0200 changelog commit 269aa6f7b0006125e9a516f8ecb6cdc32c91cbe5 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 11:03:42 2023 +0200 changelog commit caae2b4ba925747aa0ed1e2112582c6deff39d77 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 11:02:24 2023 +0200 update PTME code commit 097be17a2900e64021fcbb457c89d6d4756ab697 Author: meggert <eggertm@irs.uni-stuttgart.de> Date: Wed Apr 19 15:07:21 2023 +0200 added remaining acs modes as system modes	2023-05-12 09:13:02 +02:00