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
@@ -38,6 +38,7 @@ namespace r2d2 {
COMMAND_ID,
TEMPERATURE,
GAS,
RTTTL_STRING,
REQUEST_MAP_OBSTACLES,
MAP_INFO,
MAP_OBSTACLE,
@@ -628,6 +629,16 @@ namespace r2d2 {
};

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

This comment has been minimized.

Copy link
@itzandroidtab

itzandroidtab Jun 3, 2019

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

This comment has been minimized.

Copy link
@PatrickDekker98

PatrickDekker98 Jun 4, 2019

Author

should be resolved

* @details It contains a simple rtttl string
*/
This conversation was marked as resolved by LRstudentHU

This comment has been minimized.

Copy link
@itzandroidtab

itzandroidtab Jun 4, 2019

This struct is missing a wiki link

This comment has been minimized.

Copy link
@PatrickDekker98

PatrickDekker98 Jun 4, 2019

Author

should be resolved

R2D2_PACK_STRUCT
struct frame_rtttl_string_s {
// the rtttl string to be send
char rtttl_string[248];
};
This conversation was marked as resolved by LRstudentHU

This comment has been minimized.

Copy link
@itzandroidtab

itzandroidtab May 30, 2019

Can you add a newline after your struct?

This comment has been minimized.

Copy link
@PatrickDekker98

PatrickDekker98 Jun 3, 2019

Author

yes yes should be 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
@@ -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)
)

R2D2_INTERNAL_FRAME_HELPER(
frame_request_map_obstacles_s,
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.