eive/eive-obsw

EM SW Update #300

Merged

meierj merged 16 commits from mueller/em-sw-updates into develop

2022-10-10 11:00:19 +02:00

Author	SHA1	Message	Date
Robin Mueller	f4cceeb21e	fix one merge conflict All checks were successful EIVE/eive-obsw/pipeline/pr-develop This commit looks good Details EIVE/eive-obsw/pipeline/head This commit looks good Details	2022-10-10 10:26:26 +02:00
Robin Mueller	50d41215fa	Merge remote-tracking branch 'origin/develop' into mueller/em-sw-updates Some checks failed EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit Details	2022-10-10 10:15:55 +02:00
Robin Mueller	2ad93f7735	Merge remote-tracking branch 'origin/develop' into mueller/em-sw-updates All checks were successful EIVE/eive-obsw/pipeline/pr-develop This commit looks good Details	2022-09-29 14:09:02 +02:00
Robin Mueller	a152553d00	Merge remote-tracking branch 'origin/develop' into mueller/em-sw-updates All checks were successful EIVE/eive-obsw/pipeline/pr-develop This commit looks good Details	2022-09-29 13:32:10 +02:00
Robin Mueller	2f18347430	move object ID definition All checks were successful EIVE/eive-obsw/pipeline/pr-develop This commit looks good Details	2022-09-16 15:12:32 +02:00
Robin Mueller	a827351a75	Merge branch 'mueller/em-sw-updates' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into mueller/em-sw-updates Some checks failed EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit Details	2022-09-16 14:02:11 +02:00
Robin Mueller	54f73661fc	fix init error	2022-09-16 14:01:54 +02:00
Robin Müller	dac799bb97	Merge branch 'develop' into mueller/em-sw-updates All checks were successful EIVE/eive-obsw/pipeline/pr-develop This commit looks good Details	2022-09-15 18:21:44 +02:00
Robin Mueller	2e03cfa116	small update for .cproject file All checks were successful EIVE/eive-obsw/pipeline/pr-develop This commit looks good Details	2022-09-15 13:44:54 +02:00
Robin Mueller	9ad649e43e	ACS controller running in EM SW withour errors now Some checks are pending EIVE/eive-obsw/pipeline/head Build started... Details EIVE/eive-obsw/pipeline/pr-develop This commit looks good Details	2022-09-15 13:40:57 +02:00
Robin Mueller	8a6a69d230	update EM code All checks were successful EIVE/eive-obsw/pipeline/head This commit looks good Details	2022-09-15 13:15:39 +02:00
Robin Mueller	8ebc62cbe6	new ACS preproc defines Some checks failed EIVE/eive-obsw/pipeline/head There was a failure building this commit Details	2022-09-15 13:03:22 +02:00
Robin Mueller	3313604cb5	move some dummy creation into separate function Some checks failed EIVE/eive-obsw/pipeline/head There was a failure building this commit Details	2022-09-15 12:00:58 +02:00
Robin Mueller	c616720095	update .cproject file again All checks were successful EIVE/eive-obsw/pipeline/head This commit looks good Details	2022-09-15 11:58:00 +02:00
Robin Mueller	3230efa4aa	new dummy helper functions	2022-09-15 11:54:43 +02:00
Robin Mueller	2261ccb304	create ACS controller in EM sw All checks were successful EIVE/eive-obsw/pipeline/head This commit looks good Details	2022-09-15 11:40:10 +02:00