6905 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Robin Mueller	2a4d86de54	Merge remote-tracking branch 'origin/main' into relax-sus-fdir	2023-06-14 03:41:34 +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	8062c5edad	removed old comment	2023-06-13 07:58:40 +02:00
Robin Mueller	0788a3d551	changelog typo	2023-06-13 07:57:28 +02:00
Robin Mueller	b2b6e2e797	comment	2023-06-13 07:55:00 +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	20e920cde2	bump fsfw again	2023-06-11 18:49:28 +02:00
Robin Mueller	3fdd1feb94	prep release	2023-06-11 18:46:30 +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	9cd38a33d4	minor tweaks to fix main build	2023-06-09 17:16:01 +02:00
Robin Müller	9740435d65	Merge pull request 'Core Controller Dir Listing FSM' (#669) from core-ctrl-dir-listing-fsm into v3.0.0-dev ... Reviewed-on: #669	2023-06-09 14:45:39 +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 Müller	1cf318fca1	Merge pull request 'Remove TCP IP components' (#672) from remove-tcp-ip-components into v3.0.0-dev ... Reviewed-on: #672	2023-06-09 14:44:35 +02:00
Robin Mueller	171d4976c3	removing printout	2023-06-09 14:40:47 +02:00
Robin Mueller	e13fee75d0	this is dumb	2023-06-09 14:38:54 +02:00
Robin Mueller	8e1af9cfba	include stuff	2023-06-09 14:36:10 +02:00
Robin Mueller	cd6b7d90be	add one more cfg constant	2023-06-09 14:25:59 +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 Mueller	019d1a7b0d	that should do the job	2023-06-09 13:51:10 +02:00
Robin Mueller	1453b2abdc	afmt	2023-06-09 13:48:57 +02:00
Robin Müller	fe70d2e047	Merge pull request 'Bump FSFW and TMTC: CFDP bugfix' (#671) from bump-fsfw-tmtc into v3.0.0-dev ... Reviewed-on: #671	2023-06-09 13:42:39 +02:00
Robin Mueller	900cb060e4	Merge branch 'bump-fsfw-tmtc' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into bump-fsfw-tmtc	2023-06-09 13:42:22 +02:00
Robin Mueller	bd7f28152a	bump fsfw	2023-06-09 13:42:16 +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 Müller	4212fbef02	Merge pull request 'Move 2 pool variables' (#659) from move-pdu-datavar into v3.0.0-dev ... Reviewed-on: #659	2023-06-09 13:40:01 +02:00
Robin Mueller	6c1dfafb2e	changelog	2023-06-09 13:13:05 +02:00
Robin Mueller	18ba3a711a	bump fsfw	2023-06-09 13:11:50 +02:00
Robin Mueller	c1f8512b01	changelog	2023-06-09 13:10:29 +02:00
Robin Müller	c14bbe4a93	Merge branch 'v3.0.0-dev' into move-pdu-datavar	2023-06-09 13:09:34 +02:00
Robin Müller	0e171997d7	Merge pull request 'Rework config of GYRs' (#630) from gyr-confg-rework-2 into v3.0.0-dev ... Reviewed-on: #630	2023-06-09 13:09:19 +02:00
Robin Müller	e08a2b76b9	Merge branch 'v3.0.0-dev' into move-pdu-datavar	2023-06-09 13:05:32 +02:00
Robin Mueller	6ef593d8f3	bump fsfw	2023-06-09 13:04:16 +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