5681 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Robin Mueller	1f7ab7c2ce	Merge remote-tracking branch 'origin/develop' into feature_imtq_assy	2023-03-06 11:35:12 +01:00
Robin Müller	9d8991491a	Merge pull request 'Watchdog Bugfixes' (#432) from bugfix_watchdog_init into develop ... Reviewed-on: #432	2023-03-06 11:34:38 +01:00
Robin Müller	b64cc8f404	Merge branch 'develop' into bugfix_watchdog_init	2023-03-06 11:34:27 +01:00
Robin Müller	acae88c67c	Merge pull request 'More buffer time' (#433) from bugfix_imtq_timing into develop ... Reviewed-on: #433	2023-03-06 11:33:39 +01:00
Robin Mueller	4fa5aa6b84	remove printout and re-polling	2023-03-06 11:28:25 +01:00
Robin Mueller	b48a6e2318	24 ms it takes..	2023-03-06 11:11:35 +01:00
Robin Mueller	193ed01bce	fix printouts	2023-03-06 11:06:38 +01:00
Robin Mueller	d18a0e98a5	why do we need so much buffer time?	2023-03-06 11:02:56 +01:00
Robin Mueller	6e10ccd2d6	More buffer time	2023-03-06 09:17:03 +01:00
Robin Mueller	3b61697615	refactored FIFO handling	2023-03-06 00:55:12 +01:00
Robin Mueller	f82cc2aeda	probably contains app name as well	2023-03-05 20:06:06 +01:00
Robin Mueller	0b2aff56e5	remove non-generic function	2023-03-05 20:05:37 +01:00
Robin Mueller	7f141aa1e8	Merge remote-tracking branch 'origin/develop' into bugfix_acs_brd_ass	2023-03-05 16:22:10 +01:00
Robin Mueller	c8d09debf7	Merge remote-tracking branch 'origin/develop' into feature_imtq_assy	2023-03-05 16:20:53 +01:00
Robin Müller	1938addaa8	Merge pull request 'v1.35.0' (#431) from prep_next_release into develop ... Reviewed-on: #431	2023-03-04 17:17:05 +01:00
Robin Mueller	e6b5ee65f3	prep v1.35.0	2023-03-04 17:19:36 +01:00
Robin Mueller	4d6ccaeb4b	changelog update	2023-03-04 17:12:56 +01:00
Robin Müller	3003a4c4d1	Merge pull request 'IMTQ Commanding Fix' (#430) from imtq-cmd-fix into develop ... Reviewed-on: #430 Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>	2023-03-04 17:07:06 +01:00
Robin Mueller	f96fbf707d	PR in changelog	2023-03-04 17:09:51 +01:00
Robin Mueller	80115640ba	changelog	2023-03-04 17:09:24 +01:00
Robin Mueller	4c1b79fd66	that was an evil bug	2023-03-04 17:06:23 +01:00
Robin Mueller	c8a2395d61	a lot of bugfixes for IMTQ	2023-03-04 14:32:18 +01:00
Robin Mueller	f6f3f17505	changelog	2023-03-04 12:01:15 +01:00
Robin Mueller	300f3230d1	bump fsfw	2023-03-04 12:00:38 +01:00
Robin Müller	c71a1a29f3	Merge branch 'develop' into imtq-cmd-fix	2023-03-04 10:46:02 +01:00
Robin Müller	cfbc53792d	Merge pull request 'Watchdog Extension' (#404) from feature_watchdog_extension into develop ... Reviewed-on: #404 Reviewed-by: Jakob Meier <meierj@irs.uni-stuttgart.de>	2023-03-04 10:45:48 +01:00
Robin Müller	5b5489c8da	Merge branch 'develop' into feature_watchdog_extension	2023-03-04 10:45:37 +01:00
meggert	773e1c9ecc	fixed UB on startup	2023-03-04 10:33:47 +01:00
meggert	f041655378	use dipoleSet or overwrite it in case of external command	2023-03-04 10:15:51 +01:00
Robin Mueller	206c29bb25	changelog entry	2023-03-03 17:06:32 +01:00
Robin Mueller	e8da0885eb	Merge remote-tracking branch 'origin/develop' into bugfix_acs_brd_ass	2023-03-03 17:05:49 +01:00
Robin Mueller	f209ac6b2d	Merge remote-tracking branch 'origin/develop' into feature_imtq_assy	2023-03-03 17:03:55 +01:00
Robin Müller	b20266f153	Merge pull request 'v1.34.0' (#429) from prep_v1.34.0 into develop ... Reviewed-on: #429	2023-03-03 16:50:10 +01:00
Robin Mueller	e6b0b4048c	changelog eive-tmtc version	2023-03-03 16:52:38 +01:00
Robin Mueller	982db82ddb	bump tmtc	2023-03-03 16:52:10 +01:00
Robin Mueller	0d175951ec	some missing changelog entries	2023-03-03 16:49:21 +01:00
Robin Mueller	3b383b98df	prep v1.34.0	2023-03-03 16:45:25 +01:00
Robin Müller	41f1eaec44	Merge pull request 'hotfixees' (#428) from hotfixees into develop ... Reviewed-on: #428	2023-03-03 16:03:55 +01:00
Robin Mueller	05be170890	hotfixees	2023-03-03 16:06:38 +01:00
Robin Müller	1e4766ddfc	Merge pull request 'lockfix' (#427) from hotfix_acs_brd_polling into develop ... Reviewed-on: #427	2023-03-03 15:36:45 +01:00
Robin Müller	8720dacb7f	Merge branch 'develop' into hotfix_acs_brd_polling	2023-03-03 15:36:35 +01:00
Robin Müller	39bf9f9b5b	Merge pull request 'Possible Bugfix: Use system clock in Countdown' (#426) from bugfix_countdown_uses_sysclock into develop ... Reviewed-on: #426	2023-03-03 15:31:29 +01:00
Robin Mueller	2165f34a28	Merge remote-tracking branch 'origin/develop' into bugfix_countdown_uses_sysclock	2023-03-03 15:30:18 +01:00
Robin Müller	70e1d41a08	Merge pull request 'rework lock handling in rtd handler' (#424) from tweaks_rtd_locks into develop ... Reviewed-on: #424	2023-03-03 15:21:57 +01:00
Robin Müller	3b0490835c	Merge branch 'develop' into tweaks_rtd_locks	2023-03-03 15:21:46 +01:00
Robin Müller	6c7d1e674c	Merge pull request 'Smaller lock tweaks' (#423) from smaller_lock_tweaks into develop ... Reviewed-on: #423	2023-03-03 15:21:35 +01:00
Robin Müller	cc3bcdfaeb	Merge branch 'develop' into smaller_lock_tweaks	2023-03-03 15:21:24 +01:00
Robin Müller	26f9c499d8	Merge pull request 'acs hotfix v2' (#425) from acs-hotfix-the-second into develop ... Reviewed-on: #425	2023-03-03 15:20:59 +01:00
Jakob Meier	59e165be4f	lockfix	2023-03-03 15:10:52 +01:00
Jakob Meier	53133573e1	measurement base code and comment	2023-03-03 14:58:03 +01:00