1932 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Jakob.Meier	e1e6657b48	Merge pull request 'update for generator scripts' (#171) from mueller/gen-update-formatter into develop ... Reviewed-on: #171 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-03-04 16:19:33 +01:00
Jakob.Meier	909a0e1c16	Merge pull request 'Payload PCDU' (#172) from mueller/plpcdu into develop ... Reviewed-on: #172 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-03-04 16:18:54 +01:00
Robin Müller	926888308d	Merge branch 'develop' into mueller/plpcdu	2022-03-04 15:31:21 +01:00
Robin Mueller	e7c0066d5d	added last small fixes for successfull compilation	2022-03-04 15:28:47 +01:00
Robin Mueller	7f42de1c82	added PL PCDU code	2022-03-04 15:26:36 +01:00
Robin Mueller	8054694763	update for generator scripts ... - Generators will now copy csv files into tmtc folder - Bump fsfwgen dependency, some bugfixes - Rerun formatter - Rerun generator scripts	2022-03-04 15:14:02 +01:00
Robin Müller	f419ac8fd7	Merge branch 'develop' into mueller/move-archive-folder	2022-03-04 15:05:27 +01:00
Robin Müller	392faa6664	Merge pull request 'building with -j4 instead of -j to limit load on buildserver' (#167) from mohr/slowbuild into develop ... Reviewed-on: #167	2022-03-04 15:05:07 +01:00
Robin Mueller	b71ea7c4c7	move archive folder	2022-03-04 15:00:14 +01:00
Robin Müller	f39a755815	Merge branch 'develop' into mohr/slowbuild	2022-03-04 14:53:18 +01:00
Robin Müller	535a2eea84	Merge pull request 'doge' (#169) from mueller/doge into develop ... Reviewed-on: #169	2022-03-04 14:53:05 +01:00
Robin Müller	e2d6202d56	Merge branch 'develop' into mueller/doge	2022-03-04 14:50:48 +01:00
Jakob.Meier	7b9023cb6f	Merge pull request 'Update for generator scripts' (#163) from mueller/generators-update into develop ... Reviewed-on: #163 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-03-04 09:56:08 +01:00
Jakob.Meier	6c51553f71	Merge pull request 'ADIS Gyro Handler: Use OSAL define instead of dedicated define' (#162) from mueller/adis-optimization into develop ... Reviewed-on: #162 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-03-04 09:55:43 +01:00
Jakob.Meier	b6de685ea2	Merge pull request 'Update for memory management' (#159) from mueller/sdcman-mg into develop ... Reviewed-on: #159 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-03-04 09:55:06 +01:00
Jakob.Meier	f6a69e2eca	Merge pull request 'added try catch for more safety' (#168) from mueller/catch-nlohmann-json into develop ... Reviewed-on: #168 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-03-04 09:54:17 +01:00
Robin Mueller	74c1bba814	doge	2022-03-03 19:21:56 +01:00
Robin Mueller	ebdd3914f4	added try catch for more safety	2022-03-03 19:13:43 +01:00
Ulrich Mohr	bb20b470ec	building with -j4 instead of -j to limit strain on buildserver	2022-03-03 15:59:44 +01:00
Robin Mueller	714167f112	Merge remote-tracking branch 'origin/develop' into mueller/sdcman-mg	2022-03-03 13:38:39 +01:00
Robin Mueller	5ce46beebf	Merge remote-tracking branch 'origin/develop' into mueller/adis-optimization	2022-03-03 13:38:21 +01:00
Robin Mueller	0f60d82c06	Merge remote-tracking branch 'origin/develop' into mueller/generators-update	2022-03-03 13:37:51 +01:00