4347 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Robin Mueller	20b7f8b46b	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-10-10 11:10:07 +02:00
Robin Mueller	d8757ede0e	bump submodules	2022-10-10 11:09:28 +02:00
Jakob Meier	bba3ba7944	Merge pull request 'EM SW Update' (#300) from mueller/em-sw-updates into develop ... Reviewed-on: #300 Reviewed-by: Jakob Meier <meierj@irs.uni-stuttgart.de>	2022-10-10 11:00:18 +02:00
Robin Mueller	454c2f0ad1	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-10-10 10:30:45 +02:00
Robin Mueller	8e9a91f32a	bump fsfw	2022-10-10 10:29:47 +02:00
Robin Mueller	f4cceeb21e	fix one merge conflict	2022-10-10 10:26:26 +02:00
Robin Mueller	fd1d53aa23	Merge remote-tracking branch 'origin/develop' into scex-additions	2022-10-10 10:18:29 +02:00
Robin Mueller	50d41215fa	Merge remote-tracking branch 'origin/develop' into mueller/em-sw-updates	2022-10-10 10:15:55 +02:00
Robin Müller	7cf91a8ac3	Merge pull request 'Global Config Handler' (#271) from petri_dev into develop ... Reviewed-on: #271 Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>	2022-10-10 10:14:21 +02:00
Marius Eggert	f77b3498ec	fixed inputs. removed outputs. minor fixes	2022-10-10 09:54:06 +02:00
Marius Eggert	bbf4be1cfe	removed reduntant parts. fixed integers messing up divisions	2022-10-10 09:53:33 +02:00
Marius Eggert	5cbbf4ceb2	corrected SUS dummy outputs to match student project	2022-10-10 09:44:28 +02:00
Marius Eggert	d726ce4e49	permanently activated ACS_CTRL	2022-10-10 09:43:52 +02:00
Robin Mueller	4d97a82206	Merge remote-tracking branch 'origin/develop' into scex-additions	2022-10-06 18:09:44 +02:00
Robin Mueller	9173c4d2cb	missing commandActive reset	2022-10-06 18:05:06 +02:00
Robin Mueller	36c9feaf3f	parity helps for some reason	2022-10-06 17:01:04 +02:00
Robin Mueller	f20acf417e	some fixes	2022-10-06 16:58:43 +02:00
Marius Eggert	3079dabc20	combined SensorProcessing and SusConverter	2022-10-06 15:38:23 +02:00
Marius Eggert	84e960a9ef	enabled performSafe	2022-10-06 15:37:41 +02:00
Robin Mueller	6d9999292c	Merge branch 'mueller/scex-em-tests' into scex-additions	2022-10-06 15:36:26 +02:00
Marius Eggert	1844df2195	SusDummy output matched to student test case	2022-10-06 15:33:01 +02:00
Robin Mueller	8b35bbd241	use new SCEX uart dev name	2022-10-06 15:08:33 +02:00
Robin Mueller	0341865e98	this seems to work	2022-10-06 11:15:55 +02:00
Robin Mueller	adbece25aa	add code to get frame, parity and overrun errors	2022-10-05 19:18:25 +02:00
Robin Mueller	9e81384c5e	two stop bits and even parity helps	2022-10-05 18:44:52 +02:00
Robin Mueller	c5e5df03d9	new Uart16550 for SCEX, try stop bits	2022-10-05 18:13:49 +02:00
Robin Mueller	3fa2c63a03	add EM code	2022-10-05 14:38:48 +02:00
Robin Mueller	1a192cd8fb	found the bug	2022-10-04 23:04:50 +02:00
Robin Mueller	a44141c476	something is still wrong	2022-10-04 21:17:54 +02:00
Robin Mueller	b930af52b0	simplified DLE parser	2022-10-04 20:52:11 +02:00
Robin Mueller	0c389177e3	refactor DLE parsing and move semaphore release up top	2022-10-04 18:38:53 +02:00
Robin Mueller	763fc54855	bump changelog	2022-10-04 14:54:39 +02:00
Robin Mueller	3f12d3500e	re-generate csvs	2022-10-04 14:51:15 +02:00
Marius Eggert	9d0e10eb1e	fixed dummies, scheduled dummies as part of acsTask	2022-10-04 13:45:13 +02:00
Robin Mueller	797ed9200f	bump tmtc	2022-10-04 13:34:15 +02:00
Robin Müller	526ddd0208	Merge branch 'develop' into petri_dev	2022-10-04 13:18:34 +02:00
Robin Mueller	353cda832d	unittest fix	2022-09-30 15:32:46 +02:00
Robin Mueller	54a3d31c00	TCS ctrl bugfix	2022-09-30 15:30:31 +02:00
Robin Mueller	a562d7e4ca	improved retval checker	2022-09-30 15:07:20 +02:00
Robin Mueller	470b236008	fixed some of the acs ss code	2022-09-30 15:05:48 +02:00
Robin Mueller	66c6f08447	connect acs ctrl to subsystem	2022-09-30 14:30:30 +02:00
Robin Mueller	f0e4d5a61e	bump tmtc	2022-09-30 14:22:23 +02:00
Robin Mueller	57d37f14f3	fixed some bugs	2022-09-30 14:14:59 +02:00
Robin Mueller	dcd0a650f0	this should do the job	2022-09-30 13:30:22 +02:00
Robin Mueller	d10ff4efa6	compiles again	2022-09-30 12:09:03 +02:00
Marius Eggert	abe5f43ae9	added performDetumble and implemented ckeckModeCommand	2022-09-30 11:06:17 +02:00
Marius Eggert	16429009b4	added LocalDataPool entries	2022-09-30 10:13:27 +02:00
Irini Kosmidou	68fdb68fe6	Merge branch 'irini' into scex-additions	2022-09-29 23:38:59 +02:00
Irini Kosmidou	612426ce3b	Merge branch 'scex-additions' into irini	2022-09-29 23:36:15 +02:00
Irini Kosmidou	9c07a26615	commets removed	2022-09-29 19:50:12 +02:00