5395 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ulrich Mohr	8001158c82	Merge pull request 'Odd' (#758) from development-doc-deployment into development ... Reviewed-on: #758	2023-10-25 12:39:36 +02:00
Ulrich Mohr	515c66a780	switching to new docker image	2023-10-25 12:16:32 +02:00
Ulrich Mohr	8c20417af9	wrong path	2023-10-25 12:01:40 +02:00
Ulrich Mohr	ac817f296b	missing COPY in Dockerfile	2023-10-25 11:51:57 +02:00
Robin Mueller	622ad9ff18	typo	2023-10-25 11:40:56 +02:00
Robin Mueller	f0e4eacac5	this should work	2023-10-25 11:30:19 +02:00
Robin Müller	acc737feb2	Merge branch 'development' into development-doc-test0	2023-10-25 11:12:28 +02:00
Robin Mueller	c9281a3760	should be in docker now	2023-10-25 11:11:38 +02:00
Robin Mueller	cc97c7f82d	next test	2023-10-25 11:10:49 +02:00
Robin Mueller	a3b102c0d0	this might work better	2023-10-25 11:07:49 +02:00
Ulrich Mohr	5dd4f15b39	Merge pull request 'lets check this out' (#756) from switch-doc-theme-to-rtd into development ... Reviewed-on: #756	2023-10-25 11:06:23 +02:00
Robin Müller	b5a3c0226e	Merge branch 'development' into switch-doc-theme-to-rtd	2023-10-25 11:04:58 +02:00
Robin Mueller	e925b8595c	lets check this out	2023-10-25 11:04:19 +02:00
Ulrich Mohr	c5bf5389b8	Merge pull request 'switch documentation theme' (#755) from switch-doc-theme-to-rtd into development ... Reviewed-on: #755	2023-10-25 10:35:15 +02:00
Robin Mueller	7285dd6bac	update automation files	2023-10-25 10:31:17 +02:00
Robin Müller	b53bf2ea12	Merge branch 'development' into switch-doc-theme-to-rtd	2023-10-25 10:28:57 +02:00
Ulrich Mohr	610c196f6d	Merge pull request 'added new object ID' (#753) from persistent-tm-store-obj-id into development ... Reviewed-on: #753	2023-10-25 10:18:53 +02:00
Ulrich Mohr	ece47b4f2f	Merge branch 'development' into persistent-tm-store-obj-id	2023-10-25 10:18:37 +02:00
Ulrich Mohr	3f777c54fe	Merge pull request 'ActionHelper update' (#752) from action-update into development ... Reviewed-on: #752	2023-10-25 10:13:10 +02:00
Robin Mueller	3d54895251	switch documentation theme	2023-09-21 20:02:22 +02:00
Ulrich Mohr	d91e1ecc0a	Merge pull request 'bugfix for local pool' (#754) from local-pool-bugfix into development ... Reviewed-on: #754	2023-09-08 11:22:08 +02:00
Robin Mueller	e5910c77e9	bugfix for local pool	2023-09-06 20:51:53 +02:00
Robin Mueller	1569416a8f	fix action helper tests	2023-09-01 12:33:25 +02:00
Robin Mueller	278c8f1186	added new object ID	2023-09-01 12:32:06 +02:00
Robin Mueller	60f6ef5f1f	ActionHelper update	2023-09-01 12:18:55 +02:00
Ulrich Mohr	4ecd9eb62e	Merge pull request 'important bugfix for PUS TM creator' (#751) from bugfix-tm-creator into development ... Reviewed-on: #751	2023-07-10 21:36:49 +02:00
Robin Mueller	fb89d7a3b6	important bugfix for PUS TM creator	2023-07-10 17:47:05 +02:00
Ulrich Mohr	146c3471d0	Merge pull request 'fixes for GCC13' (#750) from mohr/GCC13 into development ... Reviewed-on: #750	2023-06-02 13:40:35 +02:00
Ulrich Mohr	1816c3f623	Merge pull request 'CFDP bugfix' (#749) from eive/fsfw:cfdp-bugfix-unittest-fixes into development ... Reviewed-on: #749	2023-06-02 13:30:54 +02:00
Ulrich Mohr	d03d5aa74c	fixing host osal for GCC13	2023-06-02 12:02:37 +02:00
Ulrich Mohr	26e97ddf89	overload vs override clarification for GCC13; Also, cmake-format	2023-06-02 11:33:20 +02:00
Ulrich Mohr	be3a57a795	bump ETL and Catch2 version	2023-06-01 17:54:38 +02:00
Ulrich Mohr	13b97abf0d	fixing build failure for master and development branch	2023-06-01 17:06:19 +02:00
Ulrich Mohr	f95c373076	Merge pull request 'TCP/IP server fixes and improvements' (#747) from eive/fsfw:tcpip_server_fixes_improvements into development ... Reviewed-on: #747	2023-05-25 16:04:28 +02:00
Ulrich Mohr	e03731bcf8	Merge pull request 'event manager improvements' (#741) from eive/fsfw:event_manager_improvements into development ... Reviewed-on: #741	2023-05-25 15:46:42 +02:00
Robin Mueller	9fe8579377	CFDP bugfix	2023-05-25 15:11:56 +02:00
Robin Mueller	2714e588d7	improvements	2023-05-25 15:01:53 +02:00
Robin Mueller	e905288adc	Merge remote-tracking branch 'upstream/development' into tcpip_server_fixes_improvements	2023-05-25 15:00:42 +02:00
Robin Mueller	3805ea50a7	remove unused constant	2023-05-25 14:58:18 +02:00
Robin Müller	699bd694cd	Merge branch 'development' into event_manager_improvements	2023-05-25 14:44:22 +02:00
Ulrich Mohr	4518fec65c	CHANGELOG	2023-05-08 15:25:47 +02:00
Ulrich Mohr	dac1aacab2	Merge pull request 'Update Power Switch IF' (#743) from eive/fsfw:update_power_switch_if into development ... Reviewed-on: #743	2023-05-08 15:00:47 +02:00
Ulrich Mohr	0042f92fdf	Merge pull request 'bump ETL version' (#748) from KSat/fsfw:bump_etl_dep into development ... Reviewed-on: #748	2023-05-08 14:53:02 +02:00
Ulrich Mohr	656faf8169	Merge remote-tracking branch 'upstream/development' into update_power_switch_if	2023-05-08 14:44:27 +02:00
Ulrich Mohr	f84431e965	Merge pull request 'bugfix and changelog for Linux getUptime' (#745) from eive/fsfw:important_bugfix_linux_get_uptime into development ... Reviewed-on: #745	2023-05-08 14:29:55 +02:00
Ulrich Mohr	0cec9ebb73	Merge pull request 'small tweak for version getter' (#744) from eive/fsfw:small_version_getter_tweak into development ... Reviewed-on: #744	2023-05-08 14:13:06 +02:00
Ulrich Mohr	a440b7c394	Merge pull request 'add CFDP subsystem ID' (#742) from eive/fsfw:add_cfdp_subsystem_id into development ... Reviewed-on: #742	2023-05-08 14:09:04 +02:00
Ulrich Mohr	bbfc1b2b34	Merge pull request 'FixedArrayList compile time assert' (#740) from eive/fsfw:container_additional_assert into development ... Reviewed-on: #740	2023-05-08 14:04:56 +02:00
Robin Mueller	025b379e8b	bump ETL version	2023-05-04 14:04:55 +02:00
Robin Mueller	c35a0a8541	TCP/IP server fixes and improvements	2023-03-15 12:40:44 +01:00