2249 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Robin Mueller	3f3bbfcde4	small changes to NVM JSON api, regenerate events	2022-02-25 17:29:06 +01:00
Robin Mueller	006e9e2229	Merge branch 'mueller/reboot-file-handling' into mueller/plpcdu-sus-updates	2022-02-25 16:34:10 +01:00
Robin Mueller	a36a6dc847	need to merge core controller changes as well..	2022-02-25 16:33:22 +01:00
Robin Mueller	f6e0487558	added processed values to dataset	2022-02-25 15:28:59 +01:00
Jakob Meier	e61dfc0401	fixed conflicts	2022-02-25 14:39:18 +01:00
Jakob Meier	e082f3973a	star tracker flash read	2022-02-25 14:24:51 +01:00
Robin Mueller	da78e57dd3	cleanDocker	2022-02-25 13:24:44 +01:00
Robin Mueller	dfaaae5512	cleanDocker	2022-02-25 13:24:34 +01:00
Robin Mueller	55618e381c	update README	2022-02-25 13:20:17 +01:00
Robin Mueller	9597e3868c	separate branch for new system components	2022-02-25 11:58:02 +01:00
Robin Mueller	3a6c7e3183	separate branch for reboot file handling	2022-02-25 11:34:42 +01:00
Robin Mueller	00bd6e260a	fsfw and tmtc update	2022-02-25 11:32:08 +01:00
Robin Mueller	8a0757dcef	Merge branch 'mueller/plpcdu-sus-updates' into mueller/master	2022-02-25 11:25:07 +01:00
Robin Mueller	a85aba92f9	Merge remote-tracking branch 'origin/develop' into mueller/plpcdu-sus-updates	2022-02-25 11:24:01 +01:00
Robin Müller	486fa9cae2	Merge pull request 'moved gps handler and deployment handler' (#152) from mueller/move-deply-handler into develop ... Reviewed-on: #152 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-02-25 11:22:52 +01:00
Robin Mueller	39f4ef6ccb	remove faulty include	2022-02-25 11:21:34 +01:00
Robin Mueller	cca0d5735e	Merge remote-tracking branch 'origin/develop' into mueller/move-deply-handler	2022-02-25 11:18:35 +01:00
Robin Mueller	fec2d718af	include fix	2022-02-25 11:17:35 +01:00
Robin Mueller	07da61d8c5	Merge remote-tracking branch 'origin/develop' into mueller/plpcdu-sus-updates	2022-02-25 11:16:04 +01:00
Jakob.Meier	9010f58636	Merge pull request 'PL PCDU Preparation + Update for new Devicetree' (#153) from mueller/pl-pcdu-prep into develop ... Reviewed-on: #153 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-02-25 11:12:09 +01:00
Robin Mueller	f959ffb6ee	Merge remote-tracking branch 'origin/develop' into mueller/plpcdu-sus-updates	2022-02-24 23:48:09 +01:00
Robin Mueller	33ff05c558	Merge remote-tracking branch 'origin/develop' into mueller/pl-pcdu-prep	2022-02-24 23:46:06 +01:00
Robin Müller	e01f2a8947	Merge branch 'develop' into mueller/move-deply-handler	2022-02-24 17:37:46 +01:00
Jakob Meier	3593f5ab8c	corrected output	2022-02-24 16:42:07 +01:00
Robin Mueller	203bb8f618	bugfix obj factory	2022-02-24 15:21:58 +01:00
Robin Mueller	11fb5f9e81	added subsystems	2022-02-24 15:21:13 +01:00
Jakob.Meier	9eb990b3a2	Merge pull request 'Use RADFET Enable Pin' (#149) from mueller/rad-sensor-update into develop ... Reviewed-on: #149 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-02-24 14:11:05 +01:00
Jakob Meier	2419e9fcc6	commands to disable and enable star tracker filename timestamping	2022-02-24 13:47:52 +01:00
Robin Mueller	6955d4a3d9	added new system folder	2022-02-24 12:51:22 +01:00
Robin Mueller	608d45f055	created back transition handler and channel enum	2022-02-24 12:44:50 +01:00
Robin Mueller	5bf4e50849	clean up includes	2022-02-24 12:02:23 +01:00
Robin Mueller	3edf7572b6	order	2022-02-24 11:58:11 +01:00
Robin Mueller	768bb14842	minor tweaks	2022-02-24 11:57:35 +01:00
Robin Mueller	446940f219	Merge branch 'mueller/rad-sensor-update' into mueller/master	2022-02-24 11:55:15 +01:00
Robin Mueller	e56532367f	check returnvalue	2022-02-24 11:55:06 +01:00
Robin Mueller	42da2f2153	Merge branch 'mueller/rad-sensor-update' into mueller/master	2022-02-24 11:52:16 +01:00
Robin Mueller	0b215bf7e0	use radfet enable pin now	2022-02-24 11:47:32 +01:00
Robin Mueller	be8734dd59	move execute action block	2022-02-24 11:17:05 +01:00
Robin Mueller	9f60c82725	intermediate PR	2022-02-23 19:26:02 +01:00
Robin Mueller	20074dcbd7	Merge branch 'mueller/move-deply-handler' into mueller/plpcdu-sus-updates	2022-02-23 19:15:29 +01:00
Robin Mueller	7ae2d7117e	deleted former file ,inc fix	2022-02-23 19:12:41 +01:00
Robin Mueller	69e36f4667	cleaned up includes a bit	2022-02-23 19:08:47 +01:00
Robin Mueller	10e2600415	moved gps handler and deployment handler	2022-02-23 19:08:12 +01:00
Robin Müller	a067014116	Merge branch 'develop' into mueller/rad-sensor-update	2022-02-23 19:03:08 +01:00
Robin Mueller	c7c2ae0ca3	Merge remote-tracking branch 'origin/develop' into mueller/plpcdu-sus-updates	2022-02-23 19:02:10 +01:00
Robin Mueller	75563d107b	introduced reboot events	2022-02-23 18:50:23 +01:00
Jakob.Meier	c83020d2c1	Merge pull request 'this fixes SCEX ping for RPi' (#147) from mueller/uart-test-task-update into develop ... Reviewed-on: #147 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-02-23 18:49:39 +01:00
Jakob.Meier	fd85ab3122	Merge pull request 'ctor fix for srv5' (#148) from mueller/srv5-ctor-fix into develop ... Reviewed-on: #148 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-02-23 18:49:01 +01:00
Jakob.Meier	2551e673d8	Merge pull request 'adaptions to updated fsfw' (#150) from mueller/pass-mq-args into develop ... Reviewed-on: #150 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-02-23 18:48:16 +01:00
Jakob.Meier	4ad3339331	Merge pull request 'moved and refactored sus handler' (#151) from mueller/sus-update into develop ... Reviewed-on: #151 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-02-23 18:46:45 +01:00