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

Feature add rtttl frame #69

Merged
merged 10 commits into from Jun 6, 2019
17 changes: 17 additions & 0 deletions code/headers/frame_types.hpp
Expand Up @@ -38,6 +38,7 @@ namespace r2d2 {
COMMAND_ID,
TEMPERATURE,
GAS,
RTTTL_STRING,
REQUEST_MAP_OBSTACLES,
MAP_INFO,
MAP_OBSTACLE,
Expand Down Expand Up @@ -628,6 +629,16 @@ namespace r2d2 {
};

/*
* @brief This is a frame that will be send to the sound module.

Choose a reason for hiding this comment

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

The @brief and @details should be removed to conform the rest of the file

Copy link
Author

Choose a reason for hiding this comment

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

should be resolved

* @details It contains a simple rtttl string
* this was not my idea either
LRstudentHU marked this conversation as resolved.
Show resolved Hide resolved
*/
LRstudentHU marked this conversation as resolved.
Show resolved Hide resolved
R2D2_PACK_STRUCT
struct frame_rtttl_string_s {
// the rtttl string to be send
char rtttl_string[248];
};
LRstudentHU marked this conversation as resolved.
Show resolved Hide resolved
/*
* This frame will be sent from the navigation module.
* Refer to the wiki for more information:
* wiki page: https://github.com/R2D2-2019/R2D2-2019/wiki/Navigation
Expand Down Expand Up @@ -764,6 +775,12 @@ namespace r2d2 {
)

R2D2_INTERNAL_FRAME_HELPER(frame_temperature_s, TEMPERATURE)

R2D2_INTERNAL_FRAME_HELPER(
frame_rtttl_string_s,
RTTTL_STRING,
R2D2_OPTIMISE_STRING(frame_rtttl_string_s, rtttl_string)
)
Copy link

Choose a reason for hiding this comment

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

This has 8 spaces. Could you change it to 4?

Copy link
Author

Choose a reason for hiding this comment

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

should be resolved


R2D2_INTERNAL_FRAME_HELPER(
frame_request_map_obstacles_s,
Expand Down