Skip to content
This repository has been archived by the owner on Dec 1, 2020. It is now read-only.

Feature: sound interface #436

Merged
merged 8 commits into from
Jan 17, 2020
Merged

Conversation

Olavhaasie
Copy link
Contributor

Closes PM-158

Description

This PR removes the march_sound_scheduler package and uses the ROS sound_play directly to play sounds. Since all the march_sound_scheduler package did was receive messages about sounds and passing them on to the sound_play node. sound_play has a good library interface for both Python and C++. The sounds are moved to the march_safety package which loads and plays them.

Changes

  • Removed march_sound_scheduler
  • Created sound directory in march_safety, which contains the fatal and non fatal sounds
  • Some small clang-tidy fixes while I was modifying the march_safety code anyway

@Olavhaasie Olavhaasie requested a review from a team as a code owner January 15, 2020 10:37
@Olavhaasie Olavhaasie self-assigned this Jan 15, 2020
@Ishadijcks
Copy link
Contributor

How will you schedule sounds to be played at a certain part of a gait?

@Olavhaasie
Copy link
Contributor Author

How will you schedule sounds to be played at a certain part of a gait?

This will still be possible from the state machine, gait selection or gait scheduler even.

@JorisWeeda JorisWeeda merged commit 4ebe8ad into develop Jan 17, 2020
@JorisWeeda JorisWeeda deleted the feature/PM-158-sound-interface branch January 17, 2020 10:43
@Olavhaasie Olavhaasie mentioned this pull request Jan 28, 2020
RutgerVanBeek pushed a commit that referenced this pull request Jan 28, 2020
* Feature: sound interface (#436)

* Added sound_play sounds to safety

* Removed sound scheduler

* Add sound_play_node to launch file

* Several small fixes

* Fix clang format

* Remove sound scheduler exec depend

* Clang tidy fixes

* Feature/pm246 stairs in sim (#439)

* Fix undefined value in xacro when launching on exo.

* Add stairs to simulation

Co-authored-by: Olav de Haas <olavh@protonmail.com>

* Feature/pm 249 add rockerswitch input (#438)

* Added rocker switch variable to the gait instruction msg generated by the (mock) input device.

The message can send a 1 which means that the rocker switch has been incremented and a -1 which means that the rocker switch has been decremented.

* Added two more variables to the gait instruction message to distinguish increment or decrement of the rocker switch.

* Removed the rocker switch argument and created the increment and decrement possibilities as instruction types.

Co-authored-by: Roelemans <47626418+Roelemans@users.noreply.github.com>
Co-authored-by: JorisWeeda <45165354+JorisWeeda@users.noreply.github.com>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants