1892 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
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
Robin Müller	e07713a6f7	Merge pull request 'Adding Catch2 for unittests, reworked CI' (#165) from mohr/catch2 into develop ... Reviewed-on: #165 Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>	2022-03-03 13:34:24 +01:00
Robin Mueller	fd368343c4	submodule updates	2022-03-03 10:36:53 +01:00
Robin Mueller	97a0662adc	submodule updates	2022-03-03 10:36:33 +01:00
Robin Mueller	3f7fb259c9	submodule updates	2022-03-03 10:36:10 +01:00
Robin Mueller	458b33e5fd	submodule updates	2022-03-03 10:34:49 +01:00
Ulrich Mohr	221d7b408a	using new docker container name	2022-03-02 18:01:21 +01:00
Ulrich Mohr	f413ed6f7d	Merge branch 'mohr/buildfix' into mohr/catch2	2022-03-02 17:52:41 +01:00
Ulrich Mohr	05bd1cc8c6	forgot one	2022-03-02 17:47:48 +01:00
Ulrich Mohr	2f51f58c7e	Merge branch 'develop' into mohr/catch2	2022-03-02 17:12:24 +01:00
Ulrich Mohr	182b90ee6d	small fixes	2022-03-02 17:04:58 +01:00
Uli	606da48861	changing fs.mqueue.msg_max for docker to be able to run unit tests	2022-03-02 16:02:23 +01:00
Robin Mueller	33483b81a6	update generator scripts	2022-03-01 18:05:11 +01:00
Robin Mueller	2a730df2a8	update generator scripts	2022-03-01 18:03:50 +01:00
Robin Müller	193e2bb0f9	Merge branch 'develop' into mueller/adis-optimization	2022-03-01 17:58:53 +01:00
Robin Mueller	3b1f088596	use OSAL define instead of dedicated define	2022-03-01 17:57:48 +01:00
Jakob.Meier	b8a4384c91	Merge pull request 'use new cmake option' (#160) from mueller/small-rpi-fix into develop ... Reviewed-on: #160 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-03-01 17:56:17 +01:00
Jakob.Meier	6faea8a33b	Merge pull request 'updated API to take reference instead of pointer' (#161) from mueller/nvm-json-base-update into develop ... Reviewed-on: #161 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-03-01 17:55:45 +01:00
Robin Mueller	e0e0554fea	update Q7S test task for API change	2022-03-01 17:54:43 +01:00
Robin Mueller	b8bd211d8e	updated API to take reference instead of pointer	2022-03-01 17:52:39 +01:00
Robin Mueller	c23c36535c	Merge remote-tracking branch 'origin/develop' into mueller/sdcman-mg	2022-03-01 17:51:05 +01:00
Robin Mueller	54fb646ea1	Merge remote-tracking branch 'origin/develop' into mueller/small-rpi-fix	2022-03-01 17:50:33 +01:00
Robin Müller	dae901a45e	Merge pull request 'progress printer' (#158) from meier/startracker into develop ... Reviewed-on: #158 Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>	2022-03-01 17:50:11 +01:00
Robin Mueller	27f9c0223c	use new cmake option	2022-03-01 17:48:05 +01:00
Robin Mueller	db75f6d3bf	repoint fsfw	2022-03-01 17:45:41 +01:00
Robin Mueller	711732ccd6	Udated for memory management	2022-03-01 17:41:58 +01:00
Jakob Meier	f8942cd6c6	Merge branch 'develop' into meier/startracker	2022-03-01 17:25:05 +01:00
Jakob.Meier	81915f1772	Merge pull request 'Reboot File Handling' (#154) from mueller/reboot-file-handling into develop ... Reviewed-on: #154 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-03-01 17:24:27 +01:00
Jakob Meier	033bdb93ad	fixed conflict	2022-03-01 17:22:55 +01:00
Jakob Meier	57b815c8ee	progress printer	2022-03-01 17:17:15 +01:00
Robin Mueller	23e2c5ffc8	repoint fsfw	2022-03-01 15:23:01 +01:00
Robin Mueller	66ece6544e	Merge remote-tracking branch 'origin/develop' into mueller/reboot-file-handling	2022-03-01 15:22:43 +01:00
Jakob.Meier	7f71ee82ec	Merge pull request 'GPIO HAL Update' (#156) from mueller/gpio-hal-update into develop ... Reviewed-on: #156 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-03-01 15:19:57 +01:00
Robin Mueller	9e03f9babe	apply clang format to unittest folder as well	2022-03-01 15:06:59 +01:00
Robin Mueller	be122038ed	small but important bugfix	2022-03-01 14:56:19 +01:00
Robin Mueller	84367f8424	small tweak	2022-03-01 14:51:12 +01:00
Robin Mueller	e1112f1903	extension for additional safety	2022-03-01 14:44:50 +01:00
Robin Mueller	684d9b8059	repoint fsfw	2022-03-01 13:35:36 +01:00
Robin Mueller	4a5ad4fb4d	updated OBSW code	2022-03-01 13:34:12 +01:00
Robin Mueller	b279434ef0	update gitignore	2022-03-01 13:05:34 +01:00