7918 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
meggert	2caf81640c	Merge branch 'main' into soc-calculator	2023-07-28 11:37:14 +02:00
meggert	a0025030f1	first bits of cleanup	2023-07-28 11:36:20 +02:00
Robin Mueller	85dc977796	changelog	2023-07-27 10:12:06 +02:00
Robin Mueller	5615f51ae7	Merge remote-tracking branch 'origin/main' into small-scex-fix	2023-07-27 10:11:12 +02:00
Robin Mueller	9219d2bc8c	small fix	2023-07-27 10:10:54 +02:00
meggert	88a8969142	basics	2023-07-26 17:01:48 +02:00
Robin Müller	85a12f071f	Merge pull request 'CHANGELOG: HK generation is countdown based' (#760) from fsfw-changelog into main ... Reviewed-on: #760	2023-07-26 15:00:58 +02:00
Robin Mueller	1ae2f692ba	HK generation is countdown based	2023-07-26 14:32:13 +02:00
Robin Müller	3f73ad86eb	Merge pull request 'bump minor version' (#759) from prep-v6.2.0 into main ... Reviewed-on: #759	2023-07-26 14:04:48 +02:00
Robin Mueller	a0735b4fff	bump minor version	2023-07-26 13:37:21 +02:00
Robin Müller	a71f773f63	Merge pull request 'ACS downwards compatibility' (#758) from acs-downwards-compat into main ... Reviewed-on: #758 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-07-26 13:27:42 +02:00
Robin Mueller	f7dccdc4c6	bump tmtc again	2023-07-26 13:20:32 +02:00
Robin Mueller	3ebb83b4c0	changelog	2023-07-26 13:18:36 +02:00
Robin Mueller	ee43c0fbd7	Merge remote-tracking branch 'origin/main' into acs-downwards-compat	2023-07-26 13:18:13 +02:00
Robin Mueller	91208c2808	bump tmtc, small tweak for definitions	2023-07-26 13:17:54 +02:00
Robin Müller	1dc545c5f0	Merge pull request 'Bump events and tmtc' (#757) from bump-events-and-tmtc into main ... Reviewed-on: #757 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-07-26 13:17:29 +02:00
Robin Mueller	55c5df0519	ensure downwards compatibilitiy for enum	2023-07-26 13:07:14 +02:00
Robin Müller	e74ae18763	Merge branch 'main' into bump-events-and-tmtc	2023-07-26 12:58:51 +02:00
Robin Müller	e5b19a4463	Merge pull request 'cmake.xml' (#756) from cmake-update into main ... Reviewed-on: #756 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-07-26 12:58:21 +02:00
Robin Mueller	1f658ceee3	changelog	2023-07-26 12:58:12 +02:00
Robin Mueller	6ef05767c5	events and tmtc	2023-07-26 12:57:39 +02:00
Robin Müller	9726c283ef	Merge branch 'main' into cmake-update	2023-07-26 12:48:09 +02:00
Robin Müller	2110c54d96	Merge pull request 'Simplify image protection code' (#755) from simplify-image-prot-code into main ... Reviewed-on: #755 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-07-26 11:54:03 +02:00
Robin Mueller	7c0ee9114b	changelog	2023-07-26 11:26:21 +02:00
Robin Mueller	e52195e195	bugfix in test	2023-07-26 11:25:28 +02:00
meggert	8c97ad0213	Merge branch 'main' into soc-calculator	2023-07-26 11:19:37 +02:00
meggert	5a69b52b20	datasets	2023-07-26 11:18:15 +02:00
Robin Mueller	4d195a1b8e	bugfix	2023-07-26 11:17:26 +02:00
Robin Mueller	8c54802e7a	Merge remote-tracking branch 'origin/main' into simplify-image-prot-code	2023-07-26 11:12:46 +02:00
Robin Müller	8cd959f55a	Merge pull request 'SD shutdown handling non-blocking' (#753) from sd-shutdown-non-blocking into main ... Reviewed-on: #753 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-07-26 11:09:47 +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 Müller	dbb3434cd9	Merge pull request 'New Safe Mode Controller' (#748) from acs-safe-flp-v2 into main ... Reviewed-on: #748 Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>	2023-07-26 11:08:11 +02:00
Robin Mueller	61e73a4be9	docs	2023-07-26 11:07:04 +02:00
Robin Mueller	81bb47a6d8	this is a lot better	2023-07-26 11:05:36 +02:00
meggert	2480229dcb	objectFactory and scheduling	2023-07-26 10:37:41 +02:00
meggert	72ca1be6e2	I was told this was not nice	2023-07-26 10:08:40 +02:00
meggert	56fb2c0e1e	Merge branch 'main' into soc-calculator	2023-07-26 09:57:13 +02:00
Robin Mueller	a5c799180e	bump tmtc	2023-07-26 09:51:56 +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	ff05181dd3	another evil bug found	2023-07-26 00:30:09 +02:00
Robin Mueller	7014ab517d	some info output	2023-07-25 23:53:39 +02:00
Robin Mueller	d59ea6eb3d	fixed some bugs	2023-07-25 23:48:22 +02:00
Robin Mueller	abbf170ce2	core controller doing weird things	2023-07-25 16:54:40 +02:00
Robin Mueller	6767e9a543	cmake.xml	2023-07-25 16:32:22 +02:00
Robin Mueller	bf730060b5	SD shutdown handling non-blocking	2023-07-25 16:25:00 +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
meggert	10dfa07cd9	aluli	2023-07-25 09:55:34 +02:00
meggert	61b3ef790a	lets pretend this makes it all better	2023-07-24 10:14:38 +02:00