1965 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jakob Meier	33b250562b	fixed conflicts	2022-03-17 20:03:04 +01:00
Jakob Meier	8d70560968	fixed conflicts	2022-03-17 19:52:37 +01:00
Jakob Meier	b8fb5c289c	fix in mem write command	2022-03-17 19:51:00 +01:00
Jakob Meier	9dc124004d	build configuration for trenz te0720-1cfa	2022-03-17 14:28:32 +01:00
Robin Mueller	e23687dd66	apply auto-formatter	2022-03-17 10:20:39 +01:00
Jakob.Meier	4e3562f9fe	Merge pull request 'Power Update' (#183) from mueller/power-handling-update into develop ... Reviewed-on: #183 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-03-17 10:13:38 +01:00
Robin Mueller	c212f0ad48	Obj Factory fixes	2022-03-17 10:04:51 +01:00
Robin Mueller	40d9829700	Major update for power handling ... and various smaller updates	2022-03-16 20:13:21 +01:00
Jakob Meier	b0b2854d44	added ploc helper objects	2022-03-16 17:00:07 +01:00
EIVE Cleanroom	8bf91f2645	ploc handler wip	2022-03-16 12:36:05 +01:00
Jakob Meier	dc7c48d211	tmtc	2022-03-16 09:04:56 +01:00
Jakob Meier	595b9aff6c	flash write wip	2022-03-16 09:01:36 +01:00
Jakob.Meier	037d68587b	Merge pull request 'Update FSFW version' (#182) from mueller/update-fsfw-version-handling into develop ... Reviewed-on: #182 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-03-14 18:58:32 +01:00
Jakob Meier	f8f7848200	run generator scripts	2022-03-14 18:43:16 +01:00
Robin Mueller	08a1101000	use develop Object Factory	2022-03-14 17:55:02 +01:00
Robin Mueller	197d1a4ce0	update obsw.cpp file	2022-03-14 17:53:48 +01:00
Robin Mueller	0063ce0ccd	update FSFW and related version handling	2022-03-14 17:52:31 +01:00
Jakob Meier	9fc1e57943	fixed conflicts	2022-03-14 14:35:07 +01:00
Robin Müller	e8ced3c4c4	Merge pull request 'meier/coreHk' (#181) from meier/coreHk into develop ... Reviewed-on: #181 Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>	2022-03-14 09:12:55 +01:00
Jakob Meier	fb162e3332	tmtc update	2022-03-13 21:37:06 +01:00
Jakob Meier	27063f102b	initialization of core pool variables	2022-03-13 18:29:14 +01:00
Jakob Meier	d99825e20e	core housekeeping	2022-03-13 16:32:40 +01:00
Jakob Meier	c3115fc974	fixed em tcf port	2022-03-13 16:31:30 +01:00
Jakob.Meier	a50be52f50	Merge pull request 'update cp script to allow copying multiple files' (#179) from mueller/update-cp-script into develop ... Reviewed-on: #179 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-03-11 17:35:56 +01:00
Jakob.Meier	b863dfb981	Merge pull request 'q7s-port.sh: Make FM default' (#180) from mueller/q7s-port-make-fm-default into develop ... Reviewed-on: #180 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-03-11 17:35:09 +01:00
Robin Mueller	245e3a0ff7	q7s-port.sh: Make FM default	2022-03-11 15:19:52 +01:00
Robin Mueller	99fa736947	update cp script to allow copying multiple files	2022-03-11 15:05:30 +01:00
Robin Mueller	3aa641f05c	extend q7s-port script	2022-03-11 14:47:48 +01:00
Jakob.Meier	636dbda36b	Merge pull request 'Catch2 hotfix' (#177) from mueller/suppress-catch2-warning into develop ... Reviewed-on: #177 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-03-09 10:47:58 +01:00
Robin Mueller	bfc8d8a7c4	fixes some issues	2022-03-09 10:14:59 +01:00
Robin Mueller	8cf3220cd0	added status message	2022-03-09 09:36:52 +01:00
Robin Mueller	39b4393b13	suppress Catch2 warning	2022-03-09 09:27:16 +01:00
Jakob.Meier	3dd6fcc75a	Merge pull request 'Hotfixes, bump to v1.9.1' (#176) from mueller/hotfixes into develop ... Reviewed-on: #176 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-03-08 17:47:34 +01:00
Robin Mueller	15151e0400	bump revision	2022-03-08 11:59:06 +01:00
Robin Mueller	b992058e00	hotfix for countdown in SDC manager	2022-03-08 11:58:13 +01:00
Robin Müller	48f972f7a2	Merge pull request 'v1.9.0' (#175) from develop into main ... Reviewed-on: #175	2022-03-08 10:32:40 +01:00
Robin Mueller	b6c34d11d2	Merge branch 'develop' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into develop	2022-03-08 10:26:00 +01:00
Robin Mueller	a73710088d	bump minor version	2022-03-08 10:25:47 +01:00
Robin Müller	3dad3f311b	Merge branch 'main' into develop	2022-03-08 10:25:01 +01:00
Robin Mueller	6b2d6609a3	fsfw update	2022-03-08 10:24:36 +01:00
Jakob.Meier	7b4f45b082	Merge pull request 'enabled more GCC warnings' (#174) from mueller/additional-gcc-warnings into develop ... Reviewed-on: #174 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-03-08 10:12:47 +01:00
Robin Mueller	d799e3768d	repoint tmtc	2022-03-08 09:50:47 +01:00
Robin Mueller	10a2973dc7	minor update in fsfw	2022-03-08 09:48:18 +01:00
Robin Mueller	6ccf16f56d	enabled more GCC warnings	2022-03-08 09:37:23 +01:00
Jakob.Meier	a145a868dc	Merge pull request 'move archive folder' (#170) from mueller/move-archive-folder into develop ... Reviewed-on: #170 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-03-08 07:51:26 +01:00
Robin Müller	7134401570	Merge branch 'develop' into mueller/move-archive-folder	2022-03-07 15:39:12 +01:00
Robin Müller	21d7d5b6f9	Merge pull request 'keeping unittests running' (#173) from mohr/unittests into develop ... Reviewed-on: #173 Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>	2022-03-07 15:38:58 +01:00
Robin Mueller	afb1c875da	fsfw update	2022-03-07 15:34:19 +01:00
Robin Mueller	2ef1befb9c	common gpioIds.h file	2022-03-07 15:29:27 +01:00
Ulrich Mohr	4e8ce4eb0a	keeping unittests running	2022-03-07 11:47:44 +01:00