1059 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jakob.Meier	66f38daf56	typo in include of ploc updater	2021-08-09 10:44:14 +02:00
Jakob.Meier	74dc04daeb	updated fsfw and tmtc	2021-08-08 16:18:49 +02:00
Jakob.Meier	dc3dfa1292	ploc updater	2021-08-08 15:02:59 +02:00
Jakob.Meier	f64356d75e	ploc udpater wip	2021-08-05 16:37:39 +02:00
Jakob.Meier	0315a2a3d5	merged develop	2021-08-04 13:22:44 +02:00
Jakob.Meier	0c13c32e82	Merge pull request 'Include corrections, correct tmtc branch' (#74) from mueller/master into develop ... Reviewed-on: #74	2021-08-04 13:21:11 +02:00
Jakob.Meier	2700d4d28c	ploc updater wip	2021-08-04 13:20:28 +02:00
Robin Mueller	3a88a43505	tmtc update	2021-08-04 13:18:09 +02:00
Robin Mueller	b52aca643f	Merge remote-tracking branch 'origin/develop' into mueller/master	2021-08-04 13:16:59 +02:00
Robin Müller	fcf2e363d8	Merge pull request 'meier/plocSupervisorHandler' (#73) from meier/plocSupervisorHandler into develop ... Reviewed-on: #73 Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>	2021-08-04 13:00:27 +02:00
Jakob.Meier	acca10cc34	Merge branch 'develop' into meier/plocSupervisorHandler	2021-08-04 10:21:31 +02:00
Jakob.Meier	c431deede0	ploc udpdater wip	2021-08-04 10:20:36 +02:00
Jakob.Meier	15c7493584	Merge pull request 'Reboot Feature' (#72) from mueller/reboot-feature into develop ... Reviewed-on: #72 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2021-08-04 10:03:13 +02:00
Robin Müller	addddb4342	Merge branch 'develop' into mueller/reboot-feature	2021-08-03 18:35:34 +02:00
Robin Mueller	9790b395e6	include replacements	2021-08-03 15:58:01 +02:00
Robin Mueller	3cc3786505	TCP default now, bugfixes in CoreController	2021-08-03 15:29:45 +02:00
Robin Mueller	59c4ed74e0	minor bugfix	2021-08-03 11:21:28 +02:00
Robin Mueller	f8f0032d1e	reboot feature finished	2021-08-03 11:18:24 +02:00
Jakob.Meier	ba51ca58f3	tmtc update	2021-08-02 15:58:17 +02:00
Jakob.Meier	9de28fdfc9	tmtc update	2021-08-02 15:57:14 +02:00
Jakob.Meier	aeecf33763	supervisor added debug TCs	2021-08-02 15:28:57 +02:00
Jakob.Meier	d6d60249c1	Merge pull request 'FSFW Gen and Build Scripts Update' (#71) from mueller/fsfwgen-update into develop ... Reviewed-on: #71 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2021-08-02 13:11:36 +02:00
Robin Mueller	9edd6fc3be	supplying project string now	2021-08-02 13:02:50 +02:00
Robin Mueller	009234612a	updated retval list	2021-08-02 12:50:36 +02:00
Robin Mueller	528b3c8610	updated object file generator	2021-08-02 11:49:00 +02:00
Robin Mueller	fe0a4844aa	Merge remote-tracking branch 'origin/develop' into mueller/master	2021-08-02 11:44:00 +02:00
Robin Mueller	4b4cfc09c5	update fsfwgen	2021-08-02 11:43:49 +02:00
Jakob.Meier	340ca0618c	supervisor mram dump	2021-08-01 17:11:32 +02:00
Robin Mueller	0b1b74e879	renamed cmake var, updated all shell scripts	2021-07-31 19:31:04 +02:00
Jakob.Meier	72533f1d14	updated tmtc	2021-07-31 08:54:49 +02:00
Jakob.Meier	298a87d349	Merge pull request 'Added OBSW Watchdog' (#67) from mueller/added-watchdog into develop ... Reviewed-on: #67 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2021-07-31 08:51:55 +02:00
Jakob.Meier	926e1e336a	mram dump reply	2021-07-31 08:32:57 +02:00
Robin Mueller	503d5923c4	making some stuff optional	2021-07-30 16:40:24 +02:00
Robin Mueller	8c3d25f62d	updated README	2021-07-29 19:43:00 +02:00
Robin Mueller	d8acf94a02	more corrections	2021-07-29 18:33:15 +02:00
Robin Mueller	940d4965bc	small corrections	2021-07-29 18:32:02 +02:00
Robin Mueller	df971d4ec5	dont need csp lib in watchdog	2021-07-29 18:21:05 +02:00
Robin Mueller	b4447b6d8c	Merge branch 'mueller/added-watchdog' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into mueller/added-watchdog	2021-07-29 18:17:25 +02:00
Robin Mueller	208aeb6640	added build scripts, updated proj files	2021-07-29 18:17:14 +02:00
Robin Müller	bc1d236a85	Merge branch 'develop' into mueller/added-watchdog	2021-07-29 18:10:26 +02:00
Robin Mueller	34d3479e81	various bugfixes and improvements	2021-07-29 18:09:54 +02:00
Robin Mueller	dba620baf2	various bugfixes, watchdog working now	2021-07-29 17:21:27 +02:00
Robin Müller	c9da184b7f	Merge pull request 'first steps in CI integration' (#66) from mohr_ci into develop ... Reviewed-on: #66 Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>	2021-07-29 16:45:12 +02:00
Robin Mueller	ff86c8af73	watchdog handling finished	2021-07-29 16:31:04 +02:00
Robin Mueller	983ce045a9	continued	2021-07-29 13:07:07 +02:00
Ulrich Mohr	4fbfbe8bb8	cleanCI	2021-07-29 12:38:24 +02:00
Ulrich Mohr	12be969ca2	jenkins seems to overwrite out PATH	2021-07-29 12:34:01 +02:00
Ulrich Mohr	93fa82c413	copy pasted wrong cmake line	2021-07-29 12:23:17 +02:00
Ulrich Mohr	6c8336bcfe	something's broken with the automatic docker build, reverting change, will look into it later	2021-07-29 12:20:02 +02:00
Ulrich Mohr	af6f24d668	forcing docker build #2	2021-07-29 12:18:32 +02:00