2513 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Robin Mueller	01f812b932	reorder fix	2022-04-15 01:42:00 +02:00
Robin Mueller	ad12fa6060	repoint fsfw again	2022-04-15 01:40:53 +02:00
Robin Mueller	f52c2a32b7	repoint fsfw	2022-04-15 01:40:14 +02:00
Robin Mueller	5c3e91b5aa	Merge remote-tracking branch 'origin/develop' into irini	2022-04-15 01:40:00 +02:00
Robin Mueller	57cc77e197	fixed some tiny bugs	2022-04-15 01:39:47 +02:00
Robin Mueller	23730349b0	repoint fsfw again	2022-04-14 11:26:26 +02:00
Jakob.Meier	500c54e430	Merge pull request 'Extend Power Switch Handling' (#212) from mueller/extend-power-switch-handling into develop ... Reviewed-on: #212 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-04-14 11:21:34 +02:00
Robin Mueller	cf575f0d70	repoint fsfw	2022-04-14 11:19:31 +02:00
Robin Mueller	1db5d278f6	switcher handling extension	2022-04-14 11:17:07 +02:00
Robin Mueller	9fa745cfb2	update fsfwgen deps	2022-04-14 11:02:29 +02:00
Jakob.Meier	aefd8b696d	Merge pull request 'Add Empty Subsystem Impls' (#211) from mueller/add-subsystem-impls into develop ... Reviewed-on: #211 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-04-14 10:17:07 +02:00
Jakob Meier	0f7f17b591	Merge branch 'develop' into mueller/add-subsystem-impls	2022-04-14 10:16:34 +02:00
Jakob.Meier	6fdf7f704d	Merge pull request 'Assign power switcher to IMTQ and Star Tracker' (#210) from mueller/assign-more-power-switches into develop ... Reviewed-on: #210 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-04-14 10:13:16 +02:00
Jakob.Meier	17aa70f5e0	Merge pull request 'submodule and obj factory updates' (#209) from mueller/fsfw-update into develop ... Reviewed-on: #209 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-04-14 10:12:40 +02:00
Robin Mueller	fd9fbe4543	Merge remote-tracking branch 'origin/mueller/fsfw-update' into mueller/add-subsystem-impls	2022-04-14 09:54:14 +02:00
Robin Mueller	6c63356edc	add subsystem impls	2022-04-14 09:54:07 +02:00
Robin Mueller	94896c9e74	update submodules	2022-04-14 09:44:25 +02:00
Robin Mueller	655497934b	apply afmt	2022-04-13 18:55:49 +02:00
Robin Mueller	fd3313fc62	assign power switcher for imtq and star tracker	2022-04-13 18:55:07 +02:00
Robin Mueller	a72c2f7b7d	submodule and obj factory updates	2022-04-13 18:51:22 +02:00
Irini Kosmidou	bbdd3c052e	mutex	2022-04-13 17:47:24 +02:00
Irini Kosmidou	9f3f264eac	continued scex uart reader, some bugs	2022-04-13 17:43:16 +02:00
Irini Kosmidou	5b2cfd2c84	Merge remote-tracking branch 'origin' into irini	2022-04-13 14:47:12 +02:00
Jakob.Meier	9b6f254954	Merge pull request 'Release build warning fixes' (#208) from mueller/release-warning-fixes into develop ... Reviewed-on: #208 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-04-13 12:15:04 +02:00
Jakob Meier	42b7b4a7c4	Merge branch 'develop' into mueller/release-warning-fixes	2022-04-13 12:04:08 +02:00
Jakob.Meier	435f8164a1	Merge pull request 'Split up PDU1 and PDU2 sets' (#205) from mueller/split-pdu1-pdu2-sets into develop ... Reviewed-on: #205 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-04-13 12:02:07 +02:00
Jakob Meier	a807aab97e	fsfw update	2022-04-13 12:01:39 +02:00
Robin Müller	52885919d0	Merge branch 'develop' into mueller/release-warning-fixes	2022-04-13 08:43:29 +02:00
Jakob.Meier	b618302db0	Merge pull request 'Development fixes' (#207) from mueller/develop-fixes into develop ... Reviewed-on: #207 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-04-12 19:30:33 +02:00
Robin Mueller	a14ca283cc	using vector for convert enables	2022-04-12 16:36:04 +02:00
Robin Mueller	2529ed905c	some important bugfixes	2022-04-12 16:11:04 +02:00
Robin Mueller	2cd5450333	bugfix for pool ID	2022-04-12 16:00:54 +02:00
Robin Mueller	6e33af7a75	repoint fsfw again	2022-04-11 17:17:58 +02:00
Robin Mueller	e2e85c19e1	repoint fsfw	2022-04-11 17:16:43 +02:00
Robin Mueller	df38903fe9	some warning fixes for release build	2022-04-11 17:16:25 +02:00
Robin Mueller	d96ff72635	bump fsfw and tmtc deps	2022-04-11 15:02:04 +02:00
Robin Mueller	5e8262657f	fsfw update	2022-04-11 14:57:45 +02:00
Robin Mueller	8a0999851f	update for new fsfw API ... - Apply auto-formatter	2022-04-11 14:56:20 +02:00
Robin Mueller	1d98582bbd	update tmtc submodule	2022-04-11 08:56:04 +02:00
Robin Mueller	f05922e19e	Merge remote-tracking branch 'origin/develop' into mueller/split-pdu1-pdu2-sets	2022-04-11 08:55:25 +02:00
Robin Mueller	d00cb6d4a5	updates for new dle parser API	2022-04-09 15:38:09 +02:00
Robin Mueller	808e01dfd3	DLE FRAM packets can be read now	2022-04-09 14:43:06 +02:00
Robin Mueller	44c8f5f730	bugfix for SCEX	2022-04-09 01:00:42 +02:00
Robin Mueller	6071e34771	some refactoring	2022-04-08 21:16:02 +02:00
Robin Mueller	f6bc884edd	Merge remote-tracking branch 'origin/develop' into irini	2022-04-08 20:50:13 +02:00
Irini Kosmidou	01d86a0c7b	huge progress	2022-04-08 19:12:21 +02:00
Jakob.Meier	6a875d5f0b	Merge pull request 'PCDU P60 HK Set Update' (#204) from mueller/pcdu-hk-core-sets into develop ... Reviewed-on: #204 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-04-08 17:48:50 +02:00
Irini Kosmidou	35f2d2cb9c	solve merge comflioct	2022-04-08 15:25:07 +02:00
Irini Kosmidou	188f8863d0	Merge remote-tracking branch 'origin/develop' into irini	2022-04-08 15:21:31 +02:00
Robin Mueller	a9419cd328	tmtc update	2022-04-08 14:51:47 +02:00