6969 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Robin Müller	3dd7530c3d	Merge branch 'v4.0.0-dev' into add-pl-i2c-resetn	2023-06-15 10:08:06 +02:00
Robin Müller	931bb5ee28	Merge pull request 'dock hk improvements' (#676) from p60dock-hk-improvements into v4.0.0-dev ... Reviewed-on: #676	2023-06-15 10:04:15 +02:00
Robin Müller	d85a5975c0	Merge branch 'v4.0.0-dev' into p60dock-hk-improvements	2023-06-15 10:03: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	8da5f4dd44	add PS I2C resetn	2023-06-15 08:39:06 +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 Müller	07ca95205d	Merge pull request 'prep patch release' (#682) from prep_v3.1.1 into main ... Reviewed-on: #682 v3.1.1	2023-06-14 21:41:03 +02:00
Robin Mueller	b56f2b4b0e	prep patch release	2023-06-14 21:28:38 +02:00
Marius Eggert	05738d1e25	Merge pull request 'TMP1075 two's complement bugfix' (#681) from tmp-sign-bugfix into main ... Reviewed-on: #681 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-06-14 21:07:41 +02:00
Robin Mueller	12bc9268f7	perform proper sign extension	2023-06-14 18:51:06 +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	cf875f7883	bump minor version v3.1.0	2023-06-14 06:20:04 +02:00
Robin Mueller	4bef1bd567	bump tmtc to v4.1.0	2023-06-14 06:17:36 +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 Müller	693e11bcb2	Merge pull request 'extend bpx handler' (#680) from extend-bpx-handler into main ... Reviewed-on: #680	2023-06-14 06:08:02 +02:00
Robin Mueller	9196b8b0ed	bump tmtc	2023-06-14 06:07:46 +02:00
Robin Mueller	65815e4646	extend bpx handler	2023-06-14 05:17:27 +02:00
Robin Müller	57ecfadf43	Merge pull request 'Increase number of allowed parallel HK commands' (#678) from hk-service-increase-num-parallel-cmds into main ... Reviewed-on: #678 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-06-14 03:42:42 +02:00
Robin Mueller	71d417710e	changelog	2023-06-14 03:39:13 +02:00
Robin Müller	a66b503e57	Merge branch 'main' into hk-service-increase-num-parallel-cmds	2023-06-14 03:37:37 +02:00
Robin Müller	88f3d92dd8	Merge pull request 'Heater: Correction for switch enumeration' (#679) from heater-ordering-enum-fixes into main ... Reviewed-on: #679 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-06-14 03:35:24 +02:00
Robin Mueller	26199e7317	changelog	2023-06-14 03:18:47 +02:00
Robin Mueller	620dc60342	heater ordering enum fixes	2023-06-14 03:15:59 +02:00
Robin Mueller	38305e723f	changelog	2023-06-13 23:26:27 +02:00
Robin Mueller	cb879ea97f	tmp sign bugfix	2023-06-13 23:25:44 +02:00
Robin Mueller	f58f4c302c	bump fsfw	2023-06-13 09:02:38 +02:00
Robin Mueller	fdf3657cf6	Merge remote-tracking branch 'origin/main' into hk-service-increase-num-parallel-cmds	2023-06-13 08:08:15 +02:00
Robin Mueller	c5b2b5c56c	Merge remote-tracking branch 'origin/v4.0.0-dev' into p60dock-hk-improvements	2023-06-11 21:49:45 +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	20e920cde2	bump fsfw again v3.0.0	2023-06-11 18:49:28 +02:00
Robin Mueller	3fdd1feb94	prep release	2023-06-11 18:46:30 +02:00
Robin Mueller	a4391c0515	increase number of allowed parallel HK commands	2023-06-11 18:04:24 +02:00
Robin Müller	1acb7d2679	Merge pull request 'chonky' (#670) from v3.0.0-dev into main ... Reviewed-on: #670	2023-06-11 14:25:19 +02:00
meggert	ef40391c09	removed debug output	2023-06-10 15:34:45 +02:00
Robin Mueller	407901d990	bump tmtc	2023-06-10 14:48:10 +02:00
Robin Mueller	7132b0c53f	bump tmtc	2023-06-09 19:07:23 +02:00
Robin Mueller	df13fc2e80	Merge remote-tracking branch 'origin/main' into v3.0.0-dev	2023-06-09 18:43:15 +02:00
Robin Müller	8adbbf50b2	Merge pull request 'Route CFDP to live' (#674) from route-cfdp-to-live into v3.0.0-dev ... Reviewed-on: #674	2023-06-09 18:42:19 +02:00
Robin Müller	962c792679	Merge pull request 'Route CFDP to live' (#675) from route-cfdp-to-live-main into main ... Reviewed-on: #675	2023-06-09 18:41:59 +02:00
Robin Mueller	c44d8e6437	Merge branch 'main' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw	2023-06-09 18:37:22 +02:00
Robin Mueller	4146050807	changelog	2023-06-09 18:37:18 +02:00
Robin Mueller	bd2f1bf7f2	route CFDP to live VC0	2023-06-09 18:36:30 +02:00
Robin Müller	020daf9a77	Merge pull request 'minor tweaks to fix main build' (#673) from minor-tweaks into main ... Reviewed-on: #673 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-06-09 18:32:39 +02:00
Robin Mueller	e3ae6260ad	changelog	2023-06-09 18:26:41 +02:00
Robin Mueller	45b9e88915	route CFDP to live VC0	2023-06-09 18:25:59 +02:00
Robin Mueller	cf48a18733	bump fsfw	2023-06-09 18:12:32 +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 Mueller	9cd38a33d4	minor tweaks to fix main build	2023-06-09 17:16:01 +02:00