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

Add angry emotion and not fullscreem mode to ergoCubEmotions #258

Merged
merged 4 commits into from
Sep 2, 2024

Conversation

giotherobot
Copy link
Contributor

In this PR I add the angry emotion (just a recolor of the shy emotion), hopefully ergoCub will not be angy at us!

In addition, for testing purposes I added the fullscreen option to the configuration file. Setting this to false allows the emotion to show in a window, for ease of use on a laptop while testing.

Copy link
Member

@Nicogene Nicogene left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @giotherobot, thanks for your contribution, I would await @martinaxgloria review for merging it, since she is the author of ergoCubEmotions

@@ -31,6 +31,7 @@ bool ErgoCubEmotions::configure(ResourceFinder& rf)
Bottle &bGroup = rf.findGroup("general");
nExpressions = bGroup.find("num_expressions").asInt32();
nTransitions = bGroup.find("num_transitions").asInt32();
fullscreen = bGroup.find("fullscreen").asBool();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So fullscreen by default is false? Is it the intended behaviour?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the configuration file it is set to true, so the behaviour on the robot should be unchanged.

Copy link
Member

@martinaxgloria martinaxgloria left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice! Thanks @giotherobot

@Nicogene Nicogene merged commit ce662e4 into icub-tech-iit:master Sep 2, 2024
4 checks passed
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.

3 participants