EM SW Update #300

Merged

meierj merged 16 commits from mueller/em-sw-updates into develop 2022-10-10 11:00:19 +02:00

Conversation 0 Commits 16 Files Changed 27 +228 -66

muellerr commented 2022-09-15 13:42:00 +02:00

Owner

Copy Link

• Fixes to make ACS controller run on EM
• Extended dummies library a bit
• Update .cproject file for Eclipse

- Fixes to make ACS controller run on EM - Extended dummies library a bit - Update `.cproject` file for Eclipse

muellerr added 7 commits 2022-09-15 13:42:02 +02:00

create ACS controller in EM sw 2261ccb304

new dummy helper functions 3230efa4aa

update .cproject file again c616720095

move some dummy creation into separate function 3313604cb5

new ACS preproc defines 8ebc62cbe6

update EM code 8a6a69d230

ACS controller running in EM SW withour errors now 9ad649e43e

muellerr requested review from meierj 2022-09-15 13:42:09 +02:00

muellerr added this to the v1.14.0 milestone 2022-09-15 13:42:11 +02:00

muellerr added 1 commit 2022-09-15 13:44:40 +02:00

small update for .cproject file 2e03cfa116

muellerr added 1 commit 2022-09-15 18:21:47 +02:00

Merge branch 'develop' into mueller/em-sw-updates dac799bb97

muellerr added 2 commits 2022-09-16 14:01:52 +02:00

fix init error 54f73661fc

Merge branch 'mueller/em-sw-updates' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into mueller/em-sw-updates a827351a75

muellerr added 1 commit 2022-09-16 15:12:16 +02:00

move object ID definition 2f18347430

muellerr added 1 commit 2022-09-29 13:32:07 +02:00

Merge remote-tracking branch 'origin/develop' into mueller/em-sw-updates a152553d00

muellerr added 1 commit 2022-09-29 14:08:57 +02:00

Merge remote-tracking branch 'origin/develop' into mueller/em-sw-updates 2ad93f7735

muellerr added 1 commit 2022-10-10 10:15:55 +02:00

Merge remote-tracking branch 'origin/develop' into mueller/em-sw-updates 50d41215fa

muellerr added 1 commit 2022-10-10 10:26:12 +02:00

fix one merge conflict f4cceeb21e

meierj approved these changes 2022-10-10 11:00:11 +02:00

meierj referenced this issue from a commit 2022-10-10 11:00:19 +02:00

Merge pull request 'EM SW Update' (#300) from mueller/em-sw-updates into develop

meierj merged commit bba3ba7944 into develop 2022-10-10 11:00:19 +02:00

muellerr deleted branch mueller/em-sw-updates 2022-10-10 11:08:32 +02:00

Sign in to join this conversation.

Reviewers

No reviewers

meierj

Labels

Clear labels   

OPS TODO

Issues identified by OPS

  

api change

API change

  

breaking api change

API change which can break existing code

  

bug

Something is not working

  

documentation

Documentation

  

duplicate

This issue or pull request already exists

  

feature

New feature

  

help wanted

Need some help

  

invalid

Something is wrong

  

question

More information is needed

  

wontfix

This won't be fixed

No Label

OPS TODO

api change

breaking api change

bug

documentation

duplicate

feature

help wanted

invalid

question

wontfix

Milestone

Clear milestone

No items

No Milestone

v1.14.0

Assignees

Clear assignees

No Assignees

2 Participants

Notifications

Subscribe

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: eive/eive-obsw#300

No description provided.