Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sync develop branch with team-vigir #6

Merged
merged 65 commits into from
Jan 13, 2021

Conversation

benmaidel
Copy link

No description provided.

pschillinger and others added 30 commits February 19, 2020 20:57
Waiting for terminal state of flexbe before setting goal to a terminal state and accepting a new one.
Using event based action server instead of control loop.
Whenever behavior_onboard and be_launcher are launched together, there used to be a race condition of publishing the behavior in behavior_launcher, but the subscriber in behavior_onboard not being ready yet. Hence, behavior_launcher now waits for the READY status to appear on the flexbe/status topic before it actually attempts to launch the behavior.
wait for READY status from Behavior Engine before launching behavior to avoid race conditions on startup
@fmessmer
Copy link
Member

@benmaidel will test the team-vigir/flexbe_behavio_engine#develop branches together with the mojn_flexbe PRs and with kevin emulation....if he is happy we will merge this PR

@fmessmer
Copy link
Member

at least https://github.com/mojin-robotics/mojin_flexbe/pull/72 (probaly other states/behaviors) do not work (or their tests pass) with this update PR....
thus, we'll have to investigate the consequences of this sync a bit more...and keep mojin-robotics/flexbe_behavior_engine#develop at the current state until then...

@fmessmer fmessmer changed the title sync develop branch with team-vigir [WIP] sync develop branch with team-vigir Nov 17, 2020
@benmaidel
Copy link
Author

I've tested https://github.com/FlexBE/flexbe_app/tree/develop and https://github.com/team-vigir/flexbe_behavior_engine/tree/develop against the kevin emulation. These versions do not seem to fit to each other. The FlexBE app shows the wrong transition although the execution engine is proposing the right one. E.g. A State has two transitions succeeded and failed. Pressing on the succeeded transition will result in an failed outcome.
Could produce this error only on our custom states that use the usedata_or_member feature. Seems like the numerical order of the transitions changed and our custom changes to the flexbe_app do not fit to that. Need to further investigate the root of the problem. 

@LoyVanBeek
Copy link
Member

I think I've also observed this issue once of twice with Robotise. Had some other issues with userdata then too IIRC, so I did not look into this further. But I don't think it has anything to do with the userdata_or_member stuff, since AFAIK we don't use that for Robotise.

@LoyVanBeek
Copy link
Member

FYI: I'm currently running flexbe_behavior_engine on version 1.3.1 and flexbe_app on version mojin-devel@d2480083d28b92c6a6e7b3e668ba9e8f83edcff6

@fmessmer fmessmer mentioned this pull request Jan 7, 2021
@benmaidel
Copy link
Author

FYI: I'm currently running flexbe_behavior_engine on version 1.3.1 and flexbe_app on version mojin-devel@d2480083d28b92c6a6e7b3e668ba9e8f83edcff6

This combination works for me too. Or at least with the BMW Behavior. Needs to be checked against the other behaviors so the error I've described here #6 (comment) is not happening anymore.

@fmessmer
Copy link
Member

fmessmer commented Jan 8, 2021

here is the current branch combination - which I used for kinetic/noetic compatibility:

kinetic:

- git:
    local-name: flexbe_app
    uri: git@github.com:mojin-robotics/flexbe_app
    version: mojin-devel
- git:
    local-name: flexbe_behavior_engine
    uri: git@github.com:mojin-robotics/flexbe_behavior_engine
    version: develop
- git:
    local-name: generic_flexbe_states
    uri: git@github.com:mojin-robotics/generic_flexbe_states
    version: master
- git:
    local-name: mojin_flexbe
    uri: git@github.com:mojin-robotics/mojin_flexbe
    version: kinetic-devel

noetic:

- git:
    local-name: flexbe_app
    uri: git@github.com:mojin-robotics/flexbe_app
    version: mojin-devel
#- git: # use released version
#    local-name: flexbe_behavior_engine
#    uri: git@github.com:mojin-robotics/flexbe_behavior_engine
#    version: develop
- git:
    local-name: generic_flexbe_states
    uri: git@github.com:mojin-robotics/generic_flexbe_states
    version: master
- git:
    local-name: mojin_flexbe
    uri: git@github.com:mojin-robotics/mojin_flexbe
    version: kinetic-devel

@fmessmer
Copy link
Member

fmessmer commented Jan 8, 2021

as discussed:
@benmaidel will do some testing with #6 and mojin-robotics/flexbe_app#10 in order to get this merged

@fmessmer fmessmer changed the title [WIP] sync develop branch with team-vigir sync develop branch with team-vigir Jan 13, 2021
@fmessmer fmessmer merged commit d58e70a into mojin-robotics:develop Jan 13, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants