1191 Commits

Author	SHA1	Message	Date
meggert	6048ffe656	prep	2023-08-21 16:01:56 +02:00
meggert	26bf178b2a	changelog	2023-08-21 14:41:16 +02:00
meggert	a1d360502f	changelog	2023-08-21 09:14:16 +02:00
Robin Mueller	df397f6dee	changelog	2023-08-17 10:28:55 +02:00
Robin Mueller	2b5dcf99dc	changelog	2023-08-16 13:36:34 +02:00
Robin Mueller	1748d18852	missing changelog entry	2023-08-16 10:57:02 +02:00
Robin Mueller	72fc99dc49	date correction	2023-08-16 10:54:02 +02:00
Robin Mueller	e64e9daed1	bump eive-tmtc	2023-08-15 14:42:12 +02:00
Robin Mueller	2d18ce4ff1	adapt changelog	2023-08-15 13:59:59 +02:00
Robin Mueller	0b35585449	Merge branch 'prep_v6.4.0' into ploc-supv-periodic-hk	2023-08-15 13:59:47 +02:00
Robin Mueller	af5f51928b	PLOC SUPV periodic HK	2023-08-15 13:49:06 +02:00
Robin Mueller	fb2995575b	prep next version	2023-08-15 13:26:45 +02:00
Robin Mueller	63b483b71a	Merge remote-tracking branch 'origin/main' into meier/pdec-config-readback	2023-08-15 13:22:42 +02:00
Robin Mueller	e24212207f	Merge remote-tracking branch 'origin/main' into meier/pdec-config-readback	2023-08-15 13:21:53 +02:00
Robin Mueller	0fb57064d3	Merge remote-tracking branch 'origin/main' into safe-strat-improvement	2023-08-15 13:16:58 +02:00
Robin Mueller	bda57d9bd1	Merge remote-tracking branch 'origin/main' into meier/pdec-config-readback	2023-08-15 10:50:02 +02:00
Robin Mueller	6fc50f164e	Merge remote-tracking branch 'origin/main' into rework-pdec-fdir	2023-08-15 10:49:17 +02:00
Robin Mueller	41ff0cc9ac	Merge remote-tracking branch 'origin/main' into safe-strat-improvement	2023-08-15 10:48:49 +02:00
meggert	196781ed4a	changelog	2023-08-15 09:39:59 +02:00
meggert	0a42093de3	changelog	2023-08-15 09:20:00 +02:00
Robin Mueller	fe0d2bf832	Merge remote-tracking branch 'origin/main' into meier/pdec-config-readback	2023-08-14 16:06:59 +02:00
Robin Mueller	37b6c32d15	Merge remote-tracking branch 'origin/main' into rework-pdec-fdir	2023-08-14 16:06:27 +02:00
meggert	36b38dd5bf	Merge branch 'main' into use-sgp4-propagator	2023-08-14 15:34:20 +02:00
Robin Müller	6f8484be2a	Merge branch 'main' into mgm-sus-rate-calc	2023-08-14 15:28:22 +02:00
Robin Mueller	424f3c5247	changelog and re-run generators	2023-08-14 15:09:45 +02:00
Robin Mueller	dd5b858666	changelog	2023-08-14 14:59:56 +02:00
Robin Mueller	84f7642411	Merge remote-tracking branch 'origin/main' into use-sgp4-propagator	2023-08-14 12:21:53 +02:00
Robin Müller	d65c63b58f	Merge branch 'main' into use-sgp4-propagator	2023-08-14 10:50:04 +02:00
Robin Müller	819f5c299d	Merge branch 'main' into mgm-sus-rate-calc	2023-08-14 10:40:29 +02:00
Robin Müller	2af1b6b698	Merge branch 'main' into more-gps-tm	2023-08-14 10:40:07 +02:00
Robin Mueller	73e9bc9598	Merge remote-tracking branch 'origin/main' into rework-pdec-fdir	2023-08-14 10:32:55 +02:00
meggert	9ba8c02e91	changelog	2023-08-14 10:20:28 +02:00
meggert	9201095644	typos	2023-08-09 13:44:10 +02:00
meggert	b4c3553965	changelog	2023-08-09 13:41:41 +02:00
meggert	a467dd790f	CHANGELOG	2023-08-09 11:32:05 +02:00
meggert	f3e18f1313	changelog	2023-08-09 11:04:59 +02:00
meggert	04dde604db	Merge branch 'main' into more-gps-tm	2023-08-08 09:32:55 +02:00
meggert	8f8c3fd4a2	changelog	2023-08-07 17:00:19 +02:00
meggert	1e9d772d37	changelog	2023-08-04 16:28:06 +02:00
Robin Mueller	e4632b2538	changelog	2023-08-04 14:26:13 +02:00
Robin Mueller	05fbff2e6d	Merge remote-tracking branch 'origin/main' into relax-sus-fdir	2023-08-03 13:37:36 +02:00
Robin Mueller	155bf9eed0	prep v6.3.0	2023-08-03 13:15:57 +02:00
Robin Müller	d07568bbe1	Merge branch 'main' into fused-rot-rate-fix	2023-08-03 13:10:15 +02:00
meggert	e258193713	changelog	2023-08-03 11:32:16 +02:00
Robin Mueller	97f40232d7	changelog typo	2023-08-03 10:16:51 +02:00
Robin Mueller	6f8ad08e9b	changelog	2023-08-03 10:06:10 +02:00
Robin Müller	a0e4f0a438	Merge branch 'main' into pl-pcdu-tweaks	2023-08-03 09:23:54 +02:00
Robin Mueller	eae63a8dc9	add PL PCDU for EM	2023-08-02 14:08:10 +02:00
Robin Mueller	39c299e55d	Merge remote-tracking branch 'origin/main' into scex-fs-usage-improvements	2023-08-02 13:13:55 +02:00
Robin Mueller	0bbcfb34e8	tweaks for pin handling	2023-08-02 11:14:35 +02:00
meggert	03e0cb4ca4	Merge branch 'main' into acs-detumble-bugfixes	2023-08-02 10:28:58 +02:00
meggert	5f82b05d3e	how many changelog commits will it be	2023-08-02 10:27:14 +02:00
meggert	004c60030b	changelog	2023-08-02 10:24:24 +02:00
meggert	c08024bd0b	changelog	2023-08-02 10:23:02 +02:00
Robin Mueller	2fda3e127e	changelog	2023-08-02 09:42:24 +02:00
Robin Mueller	c120ce8617	remove newline	2023-08-02 09:29:55 +02:00
Robin Mueller	58c19e90eb	changelog fix	2023-08-02 09:29:28 +02:00
Robin Mueller	833166cc78	Merge remote-tracking branch 'origin/main' into scex-fs-usage-improvements	2023-08-02 09:29:04 +02:00
Robin Mueller	d9a010f6bd	changelog	2023-08-02 09:21:53 +02:00
meggert	77ffc62236	changelog	2023-08-01 16:41:37 +02:00
Robin Mueller	b27694321f	update changelog	2023-08-01 09:29:34 +02:00
Robin Mueller	85dc977796	changelog	2023-07-27 10:12:06 +02:00
Robin Mueller	1ae2f692ba	HK generation is countdown based	2023-07-26 14:32:13 +02:00
Robin Mueller	3ebb83b4c0	changelog	2023-07-26 13:18:36 +02:00
Robin Müller	e74ae18763	Merge branch 'main' into bump-events-and-tmtc	2023-07-26 12:58:51 +02:00
Robin Mueller	1f658ceee3	changelog	2023-07-26 12:58:12 +02:00
Robin Mueller	7c0ee9114b	changelog	2023-07-26 11:26:21 +02:00
Robin Mueller	001630cece	Merge remote-tracking branch 'origin/main' into sd-shutdown-non-blocking	2023-07-26 11:09:24 +02:00
Robin Mueller	f5a9a4973c	Merge remote-tracking branch 'origin/main' into acs-safe-flp-v2	2023-07-26 09:51:24 +02:00
Robin Mueller	f60c754c61	changelog typo	2023-07-26 00:33:49 +02:00
Robin Mueller	d59ea6eb3d	fixed some bugs	2023-07-25 23:48:22 +02:00
meggert	011f4bf5d9	Merge branch 'main' into acs-safe-flp-v2	2023-07-25 09:58:23 +02:00
meggert	942b459066	changelog	2023-07-25 09:56:35 +02:00
Robin Müller	4539d25518	Merge branch 'main' into active-sd-info-event	2023-07-21 11:52:32 +02:00
Robin Mueller	5f75b22cec	new event	2023-07-21 11:36:39 +02:00
Robin Mueller	7ac19c8ea8	Merge remote-tracking branch 'origin/main' into active-sd-info-event	2023-07-21 10:27:27 +02:00
Robin Mueller	8251f28cda	re-run generators	2023-07-21 10:26:57 +02:00
Robin Müller	59e07d9b47	Merge branch 'main' into rad-sensor-delay-after-gpio	2023-07-20 17:16:06 +02:00
Robin Mueller	880c09c510	changelog	2023-07-20 17:16:14 +02:00
Robin Müller	b80c96a02c	Merge branch 'main' into rad-sensor-polling-update	2023-07-19 16:14:03 +02:00
Robin Mueller	f61301db13	changelog	2023-07-19 15:34:16 +02:00
Robin Mueller	b2d2c38c58	changelog	2023-07-18 18:24:36 +02:00
Robin Müller	4fe921b2cc	Merge branch 'main' into add-rad-sensor-dummy	2023-07-18 10:14:33 +02:00
Robin Mueller	c9a4cf53ca	changelog	2023-07-18 10:06:35 +02:00
Robin Mueller	5102bd4d69	changelog	2023-07-18 10:03:15 +02:00
Robin Mueller	88d1f9940f	changelog	2023-07-14 15:16:08 +02:00
Robin Mueller	1d4e2a70a2	changelog	2023-07-14 12:49:24 +02:00
Robin Mueller	4e58614c56	changelog	2023-07-13 21:21:42 +02:00
Robin Mueller	6d220692d5	changelog	2023-07-13 17:33:04 +02:00
Robin Mueller	e9d4104f88	some further investigation	2023-07-13 17:03:56 +02:00
Robin Mueller	1f44533b3e	bump minor version	2023-07-13 12:00:57 +02:00
Robin Mueller	86f7d05526	changelog	2023-07-12 17:03:17 +02:00
Robin Mueller	72dbc34936	Merge remote-tracking branch 'origin/main' into tcs-observability	2023-07-11 11:00:03 +02:00
Robin Müller	914a22f642	Merge branch 'main' into tcs-heater-upper-limit	2023-07-11 10:46:02 +02:00
Robin Mueller	8800b20409	Merge remote-tracking branch 'origin/main' into tcs-heater-upper-limit	2023-07-11 09:45:01 +02:00
Robin Mueller	690f8cb49a	Merge remote-tracking branch 'origin/main' into bump-fsfw	2023-07-11 09:41:44 +02:00
Robin Mueller	852f1203c6	changelog	2023-07-11 09:39:21 +02:00
Robin Mueller	cf582dd6a4	Merge branch 'bump-fsfw' into tcs-observability	2023-07-10 17:52:56 +02:00
Robin Mueller	c7f716c433	fsfw bump and changelog	2023-07-10 17:51:37 +02:00
Robin Mueller	a61d7901bf	Merge branch 'tcs-heater-upper-limit' into tcs-observability	2023-07-10 14:58:16 +02:00
Robin Mueller	7e01a9602e	TCS improvements	2023-07-10 14:46:35 +02:00
Robin Mueller	106d73238b	Merge remote-tracking branch 'origin/main' into tcs-heater-upper-limit	2023-07-10 13:07:26 +02:00
Robin Mueller	2210ec3737	Merge branch 'tcs-heater-upper-limit' into tcs-observability	2023-07-07 16:21:42 +02:00
Robin Mueller	df3755d6cc	done	2023-07-07 16:18:16 +02:00
Robin Mueller	a351dcf99e	changelog	2023-07-07 15:59:15 +02:00
Robin Mueller	6bf9fd5969	changelog	2023-07-07 11:51:11 +02:00
Robin Mueller	7388c4f661	Merge remote-tracking branch 'origin/main' into tcs-heater-upper-limit	2023-07-07 11:47:05 +02:00
Robin Mueller	a6461fcaf8	Merge remote-tracking branch 'origin/main' into another-tcs-fix	2023-07-07 11:45:22 +02:00
Robin Müller	3087049726	Merge branch 'main' into tcs-ctrl-bugfix	2023-07-07 11:44:27 +02:00
Robin Mueller	0b673fcdec	Merge remote-tracking branch 'origin/main' into tcs-heater-upper-limit	2023-07-07 11:07:35 +02:00
Robin Mueller	908cf8dcc3	Merge remote-tracking branch 'origin/main' into another-tcs-fix	2023-07-07 11:03:20 +02:00
Robin Mueller	ec39dc05ae	Merge remote-tracking branch 'origin/main' into tcs-ctrl-bugfix	2023-07-07 11:02:43 +02:00
Robin Mueller	bd33a51bf1	Merge remote-tracking branch 'origin/main' into some-more-tcs-tweaks	2023-07-07 11:00:45 +02:00
Robin Mueller	2bad2a142b	changelog	2023-07-07 10:58:42 +02:00
Robin Mueller	c1a23e0d73	Merge remote-tracking branch 'origin/main' into add-tcs-ctrl-heater-events	2023-07-07 10:56:38 +02:00
Robin Mueller	351c33e504	changelog	2023-07-07 10:55:13 +02:00
Robin Mueller	7b611810df	there are actually 8 heaters	2023-07-06 20:13:33 +02:00
Robin Mueller	64ca329d5a	update changelog	2023-07-06 19:58:24 +02:00
Robin Mueller	12ff365433	TCS ctrl bugfix	2023-07-06 19:57:23 +02:00
Robin Mueller	5630ae4962	changelog	2023-07-06 17:28:12 +02:00
Robin Mueller	bda2ba79bf	Merge remote-tracking branch 'origin/main' into swap-pl-ps-i2c ... make marius extremely happy	2023-07-06 14:34:12 +02:00
Robin Mueller	52eba5cae6	small fix/tweaks	2023-07-05 17:20:42 +02:00
Robin Mueller	25c7058da5	changelog	2023-07-03 16:56:36 +02:00
Robin Mueller	697a3e8577	Merge remote-tracking branch 'origin/main' into swap-pl-ps-i2c	2023-07-03 16:34:04 +02:00
Robin Mueller	dea3077f29	changelog, prep v6.0.0	2023-07-02 14:44:15 +02:00
Robin Mueller	e2cd822e9c	Merge branch 'main' into main-v6	2023-07-02 14:30:50 +02:00
Robin Mueller	0e9035d6c1	changelog, prep v5.2.0	2023-07-02 14:21:35 +02:00
Robin Mueller	a5c9e1481b	changelog	2023-07-02 14:04:29 +02:00
Robin Mueller	9cdcd47b1a	Merge remote-tracking branch 'origin/main-v6' into complete-fw-tests	2023-06-30 10:45:16 +02:00
Robin Mueller	4fc999e102	changelog	2023-06-29 15:03:45 +02:00
Robin Mueller	04d24e74b1	q7s-package version specification	2023-06-29 15:01:54 +02:00
Robin Mueller	8cff2fd6f7	Merge remote-tracking branch 'origin/main' into live-channel-bugfix	2023-06-29 15:00:11 +02:00
Robin Mueller	59d542ab39	Merge remote-tracking branch 'origin/main' into core-ctrl-init-bugfix	2023-06-29 14:58:13 +02:00
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	825de04f3b	changelog	2023-06-29 10:15:36 +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	90bafa717b	prep v5.1.0	2023-06-28 13:41:51 +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 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 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	15a67b81f9	various improvements	2023-06-27 17:36:52 +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 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 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 Mueller	67024ec933	that was already pulled in	2023-06-26 17:39:41 +02:00
Robin Mueller	3a20748ff6	create a v5.0.0 snapshot	2023-06-26 17:36:47 +02:00
Robin Mueller	73498ac9af	prepare v5.0.0, revert firmware interfacing changes	2023-06-26 16:53:54 +02:00
Robin Mueller	1703f7a714	Merge remote-tracking branch 'origin/main' into internal-error-reporter-set	2023-06-26 15:36:23 +02:00
Robin Mueller	3e21f9c259	Merge remote-tracking branch 'origin/main' into ordered-dumps	2023-06-26 15:34:58 +02:00
Robin Mueller	05a5c63765	changelog	2023-06-26 11:20:33 +02:00
Robin Mueller	0db7b5251c	Merge branch 'total-boot-counter-file' into sequence-counter-persistent-msg-type-count-support	2023-06-25 12:45:34 +02:00
Robin Mueller	873316d012	sequence counter isn ow persistent, msg type count support	2023-06-25 12:41:20 +02:00
Robin Mueller	0f818a5596	Merge remote-tracking branch 'origin/main' into internal-error-reporter-set	2023-06-25 11:12:10 +02:00
Robin Mueller	76933671a6	changelog	2023-06-25 11:07:41 +02:00
Robin Müller	7a68188140	Merge branch 'main' into total-boot-counter-file	2023-06-25 10:30:28 +02:00
Robin Mueller	facfad3367	v3.1.1 changelog	2023-06-24 20:12:37 +02:00
Robin Mueller	d95ecc3678	changelog	2023-06-24 19:57:16 +02:00
Robin Mueller	2901ebc15c	prep v4.0.1 patch	2023-06-24 01:21:46 +02:00
Robin Mueller	a95ab49690	changelog	2023-06-23 17:56:54 +02:00
Robin Mueller	3d07814efb	Merge remote-tracking branch 'origin/main' into internal-error-reporter-set	2023-06-22 18:39:34 +02:00
Robin Mueller	f67d72a8dd	prep v4.0.0 final	2023-06-22 17:34:56 +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	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 Mueller	74e945ddff	changelog	2023-06-22 16:10:07 +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	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	f40348904c	Merge branch 'v4.0.0-dev' into sus-converter-h-fix	2023-06-21 19:39:37 +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	7ceb81f68d	Merge remote-tracking branch 'origin/main' into v3.3.0-dev	2023-06-21 13:47:46 +02:00
Robin Mueller	54328ff357	date correction	2023-06-21 13:44:44 +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	6ed2fcd904	small changelog tweak	2023-06-20 18:22:43 +02:00
Robin Mueller	3ee9a914cc	Merge remote-tracking branch 'origin/main' into sus-vector-fix-new-v3.1.1	2023-06-20 18:21:12 +02:00
Robin Mueller	7a119bab6e	changelog	2023-06-19 17:34:47 +02:00
Robin Mueller	8f7d3dd815	changelog	2023-06-18 17:24:19 +02:00
Robin Mueller	31fdbac8c0	Merge remote-tracking branch 'origin/main' into swap-pl-ps-i2c	2023-06-17 14:29:38 +02:00
meggert	51a3a2f5cf	changelog	2023-06-15 17:58: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	4bd3cf4d52	Merge remote-tracking branch 'origin/main' into v4.0.0-dev	2023-06-15 05:09:52 +02:00
Robin Mueller	a05a8ffb50	Merge remote-tracking branch 'origin/main' into tmp-sign-bugfix	2023-06-14 18:11:25 +02:00
Robin Mueller	885fddd45f	bump changelgo	2023-06-14 06:15:04 +02:00
Robin Mueller	fab4cdd0dc	changelog	2023-06-14 06:09:18 +02:00
Robin Mueller	a023fe2c7d	Merge remote-tracking branch 'origin/main' into relax-sus-fdir	2023-06-14 03:43:38 +02:00
Robin Mueller	2a4d86de54	Merge remote-tracking branch 'origin/main' into relax-sus-fdir	2023-06-14 03:41:34 +02:00
Robin Mueller	71d417710e	changelog	2023-06-14 03:39:13 +02:00
Robin Mueller	26199e7317	changelog	2023-06-14 03:18:47 +02:00
Robin Mueller	38305e723f	changelog	2023-06-13 23:26:27 +02:00
Robin Mueller	0788a3d551	changelog typo	2023-06-13 07:57:28 +02:00
Robin Mueller	5e79293d38	Merge remote-tracking branch 'origin/main' into relax-sus-fdir	2023-06-13 07:49:28 +02:00
Robin Mueller	196823b2e0	relax sus fdir	2023-06-13 07:48:32 +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	3fdd1feb94	prep release	2023-06-11 18:46:30 +02:00
Robin Mueller	e3ae6260ad	changelog	2023-06-09 18:26:41 +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 Müller	b2535662e6	Merge branch 'v3.0.0-dev' into core-ctrl-dir-listing-fsm	2023-06-09 14:44:44 +02:00
Robin Mueller	3bdbc67e0d	Merge remote-tracking branch 'origin/v3.0.0-dev' into core-ctrl-dir-listing-fsm	2023-06-09 14:24:42 +02:00
Robin Mueller	fe1cc9444d	changelog	2023-06-09 14:10:06 +02:00
Robin Müller	9ec3eca10a	Merge branch 'v3.0.0-dev' into bump-fsfw-tmtc	2023-06-09 13:40:16 +02:00
Robin Mueller	6c1dfafb2e	changelog	2023-06-09 13:13:05 +02:00
Robin Mueller	c1f8512b01	changelog	2023-06-09 13:10:29 +02:00
Robin Mueller	08e7a8cf97	Merge branch 'v3.0.0-dev' into gyr-confg-rework-2	2023-06-09 12:48:36 +02:00
Robin Mueller	d90ccd62f8	bump changelog and tmtc	2023-06-09 12:47:07 +02:00
meggert	cab20a8c77	changelog	2023-06-08 09:55:46 +02:00
meggert	6fdd9da2a0	Merge branch 'v3.0.0-dev' into gyr-confg-rework-2	2023-06-08 09:36:07 +02:00
Robin Mueller	26ed774806	changelog	2023-06-07 14:25:13 +02:00
Robin Müller	376c359d6e	Merge branch 'v3.0.0-dev' into acs-ptg-ctrl-fixes-2	2023-06-07 11:47:57 +02:00
Robin Mueller	7d1b99c3f4	Merge branch 'v3.0.0-dev' into acs-ptg-ctrl-fixes-2	2023-06-06 11:13:42 +02:00
Robin Mueller	8052734028	tiny tweak	2023-06-06 11:12:41 +02:00
Robin Mueller	b7eb693295	Merge branch 'v3.0.0-dev' into str-invalid-off-transition	2023-06-06 11:12:30 +02:00
Robin Mueller	caa2800a7a	Merge branch 'v3.0.0-dev' into v4.0.0-dev	2023-06-06 11:10:03 +02:00
meggert	58dee642a6	changelog	2023-06-05 16:06:36 +02:00
meggert	3be495fc30	Merge branch 'v3.0.0-dev' into gyr-confg-rework-2	2023-06-05 09:54:23 +02:00
meggert	73981006a2	changelog	2023-06-05 09:25:31 +02:00
meggert	6915f0e003	changelog	2023-06-02 17:45:08 +02:00
Robin Mueller	a85b0a4a76	changelog	2023-05-31 16:31:50 +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	170cb4d99c	changelog	2023-05-31 10:45:40 +02:00
Robin Mueller	0aa617d440	switch info fix	2023-05-30 16:54:56 +02:00
Robin Mueller	6aa856563e	Merge branch 'tcs-heater-event-fix' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into tcs-heater-event-fix	2023-05-30 16:45:36 +02:00
Robin Mueller	ebf5609680	changelog	2023-05-30 16:45:09 +02:00
Robin Mueller	b135e2f6a1	changelog	2023-05-30 15:14:47 +02:00
Robin Mueller	f3cc406495	Merge branch 'v2.1.0-dev' into update-ptme-code-2	2023-05-27 17:03:58 +02:00
meggert	a7c6cd017d	changelog	2023-05-26 13:53:46 +02:00
meggert	a6787538f2	changelog	2023-05-25 11:21:28 +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	e1aff4c641	another small logic fix	2023-05-25 08:48:03 +02:00
Robin Mueller	8d041c6753	changelog	2023-05-25 08:45:20 +02:00
Robin Müller	075c750e4a	Merge branch 'v2.1.0-dev' into acu-enable-hk-sets	2023-05-24 14:14:07 +02:00
Robin Müller	832140935f	Merge branch 'v2.1.0-dev' into imtq-enable-hk-sets	2023-05-24 14:13:29 +02:00