forked from LRstudentHU/CAN_Bus
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
Changes from 5 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
b61031a
added a frame for a rtttl string
PatrickDekker98 df377c4
Merge branch 'master' into feature-rtttl_frame
419377b
changes requested in pr
4de85d6
added string optimisation for the rtttl-frame
2ad40ac
Merge branch 'master' into feature-rtttl_frame
PatrickDekker98 41c23a9
changes requested for pr
d8df730
Merge branch 'feature-rtttl_frame' of https://github.com/r2d2-2019/in…
698580f
removed doxygen @brief and @detail, added wiki link
60e5d47
Merge branch 'master' into feature-rtttl_frame
LRstudentHU 3c8df56
Merge branch 'master' into feature-rtttl_frame
itzandroidtab File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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. | ||
* @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 | ||
|
@@ -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) | ||
) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This has 8 spaces. Could you change it to 4? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. should be resolved |
||
|
||
R2D2_INTERNAL_FRAME_HELPER( | ||
frame_request_map_obstacles_s, | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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 fileThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
should be resolved