7387 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Robin Mueller	0a77ee0508	Merge remote-tracking branch 'origin/main' into only-reset-ptme-on-rate-change	2023-06-29 14:51:15 +02:00
Robin Mueller	51cbe46cf5	why indeed	2023-06-29 14:49:57 +02:00
Robin Müller	26fc4b8add	Merge pull request 'small fix for persistent TM store' (#722) from persistent-tm-stores-fixes into main ... Reviewed-on: #722 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-06-29 14:46:50 +02:00
Robin Mueller	825de04f3b	changelog	2023-06-29 10:15:36 +02:00
Robin Mueller	33985937b7	typo	2023-06-29 09:44:09 +02:00
Robin Müller	ba36b5f091	Merge branch 'main-v6' into live-channel-bugfix	2023-06-29 08:55:09 +02:00
Robin Mueller	4f5903227e	changelog	2023-06-29 08:54:58 +02:00
Robin Mueller	2173d89047	changelog	2023-06-29 08:54:34 +02:00
Robin Mueller	0a12dbf2be	changelog	2023-06-29 08:53:08 +02:00
Robin Mueller	ad3c0e2a0e	small fix for persistent TM store	2023-06-29 01:28:40 +02:00
Robin Mueller	03e772246f	less cycles..	2023-06-29 00:35:06 +02:00
Robin Mueller	25da131653	seems to work well	2023-06-29 00:33:58 +02:00
Robin Mueller	4c6b098f42	Merge branch 'live-channel-bugfix' into only-reset-ptme-on-rate-change-v6	2023-06-28 17:49:06 +02:00
Robin Mueller	b57283101b	important bugfix for live channel	2023-06-28 17:46:21 +02:00
Robin Mueller	9dfdf38822	important bugfix for live channel	2023-06-28 17:20:10 +02:00
Robin Mueller	c6240285e2	Merge branch 'core-ctrl-init-bugfix' into only-reset-ptme-on-rate-change-v6	2023-06-28 15:51:48 +02:00
Robin Mueller	87c05705ec	core ctrl bugfix	2023-06-28 15:43:44 +02:00
Robin Mueller	c881b36630	prevent warning	2023-06-28 15:28:27 +02:00
Robin Mueller	a380ff5ac9	Merge branch 'main-v6' into only-reset-ptme-on-rate-change-v6	2023-06-28 15:24:20 +02:00
Robin Mueller	4d17184fba	Merge remote-tracking branch 'origin/main' into only-reset-ptme-on-rate-change	2023-06-28 15:18:05 +02:00
Robin Mueller	d8efd05a88	Merge branch 'main' into main-v6	2023-06-28 15:08:38 +02:00
Robin Müller	109856eef8	Merge pull request 'prep v5.1.0' (#718) from prep_v5.1.0 into main ... Reviewed-on: #718	2023-06-28 13:57:04 +02:00
Robin Mueller	90bafa717b	prep v5.1.0	2023-06-28 13:41:51 +02:00
Robin Müller	0cdb850f69	Merge pull request 'Seq Count Persistent + MSG type counter' (#711) from sequence-counter-persistent-msg-type-count-support into main ... Reviewed-on: #711 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-06-28 13:37:14 +02:00
Robin Mueller	4c63fed69d	that is annoying	2023-06-28 13:35:38 +02:00
Robin Mueller	eb27ab4bb0	fix and optimization	2023-06-28 13:32:35 +02:00
Robin Mueller	b0a38136c1	Merge remote-tracking branch 'origin/main' into only-reset-ptme-on-rate-change	2023-06-28 13:28:00 +02:00
Robin Müller	6c2548fb56	Merge branch 'main' into sequence-counter-persistent-msg-type-count-support	2023-06-28 13:26:55 +02:00
Robin Müller	7d3f9ada18	Merge pull request 'higher rx set rate during pass' (#715) from rx-dataset-higher-rate-during-pass into main ... Reviewed-on: #715 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-06-28 13:26:42 +02:00
Robin Mueller	b5cc430b5b	Merge remote-tracking branch 'origin/main' into only-reset-ptme-on-rate-change	2023-06-28 13:21:33 +02:00
Robin Mueller	52fedb94e8	bump fsfw and tmtc	2023-06-28 13:20:50 +02:00
Robin Mueller	cdabf113ca	Merge remote-tracking branch 'origin/main' into rx-dataset-higher-rate-during-pass	2023-06-28 13:18:45 +02:00
Robin Mueller	c3e66f5320	changelogge	2023-06-28 13:18:00 +02:00
Robin Müller	2d2c1d8721	Merge branch 'main' into sequence-counter-persistent-msg-type-count-support	2023-06-28 10:07:51 +02:00
Robin Müller	9e8a417115	Merge pull request 'various improvements for heater handler' (#717) from only-one-heater-cmd-at-a-time into main ... Reviewed-on: #717 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-06-28 10:01:20 +02:00
Robin Mueller	fba87cc0e8	changelog typos	2023-06-27 18:09:38 +02:00
Robin Mueller	50a8a6fffe	more changelog	2023-06-27 18:02:49 +02:00
Robin Mueller	1e767afa11	only handle one message per cycle	2023-06-27 17:55:49 +02:00
Robin Mueller	15a67b81f9	various improvements	2023-06-27 17:36:52 +02:00
Robin Müller	bf25266055	Merge branch 'main' into rx-dataset-higher-rate-during-pass	2023-06-27 11:05:56 +02:00
Robin Mueller	ef08f348dc	Merge remote-tracking branch 'origin/main' into sequence-counter-persistent-msg-type-count-support	2023-06-26 18:26:08 +02:00
Robin Müller	47ff8a418e	Merge pull request 'Internal Error Reporter Set' (#702) from internal-error-reporter-set into main ... Reviewed-on: #702 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-06-26 18:25:13 +02:00
Robin Mueller	f0fbed1593	Merge remote-tracking branch 'origin/main' into internal-error-reporter-set	2023-06-26 18:13:44 +02:00
Robin Mueller	8b2bf21025	Merge remote-tracking branch 'origin/main' into sequence-counter-persistent-msg-type-count-support	2023-06-26 18:12:45 +02:00
Robin Müller	0764646d2b	Merge pull request 'Ordered dumps' (#706) from ordered-dumps into main ... Reviewed-on: #706 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-06-26 18:11:07 +02:00
Robin Mueller	e752cdcc67	bump fsfw	2023-06-26 18:10:41 +02:00
Robin Mueller	91c53df2c9	Merge remote-tracking branch 'origin/main' into internal-error-reporter-set	2023-06-26 18:03:06 +02:00
Robin Mueller	c6231d2337	Merge remote-tracking branch 'origin/main' into sequence-counter-persistent-msg-type-count-support	2023-06-26 17:59:26 +02:00
Robin Mueller	0dfe68eb8d	Merge remote-tracking branch 'origin/main' into ordered-dumps	2023-06-26 17:57:26 +02:00
Robin Müller	b273729b10	Merge pull request 'create a v5.0.0 snapshot' (#714) from prep_v5.0.0-release into main ... Reviewed-on: #714	2023-06-26 17:55:28 +02:00