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

Edits - with a couple of comments #104

Merged
merged 21 commits into from
Nov 26, 2015
Merged

Edits - with a couple of comments #104

merged 21 commits into from
Nov 26, 2015

Conversation

iriark01
Copy link
Contributor

In blecommon.h: There are a few error messages without a comment (lines
125-127).

In DiscoveredCharacteristic.h: I changed the “else” to “or” a few
times, because it looked like the
distinction was unnecessary and using two different words can cause
confusion. If there’s really a reason the second return value is “else”
and all the rest are “or”, please reject those changes.

DiscoveredService.h: Looks like it could use some info.

I also sent lots of questions over e-mail.

Based on the main repo's master version, with edits to the API.
Based on the main repo's master version, with edits to the API.
Based on the main repo's master version, with edits to the API.
Based on the main repo's master version, with edits to the API.
Based on the main repo's master version, with edits to the API.
Based on the main repo's master version, with edits to the API.
Based on the main repo's master version, with edits to the API.
Based on the main repo's master version, with edits to the API.
Based on the main repo's master version, with edits to the API.
Based on the main repo's master version, with edits to the API.
Based on the main repo's master version, with edits to the API.
Based on the main repo's master version, with edits to the API.
Based on the main repo's master version, with edits to the API.
Based on the main repo's master version, with edits to the API.
Based on the main repo's master version, with edits to the API.
Based on the main repo's master version, with edits to the API.
Based on the main repo's master version, with edits to the API.
Based on the main repo's master version, with edits to the API.
Based on the main repo's master version, with edits to the API.
Based on the main repo's master version, with edits to the API.
Based on the main repo's master version, with edits to the API.
*/
class BLE
{
public:
typedef unsigned InstanceID_t; /** The type returned by BLE::getInstanceID(). */
Copy link
Contributor

Choose a reason for hiding this comment

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

These lines already exist in the latest BLE_API. Why is your pull request trying to add them? There seems to be a problem with the PR. Did you start out with a clean copy of 'master'? Please re-submit.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I did what you told me to do.

@rgrover
Copy link
Contributor

rgrover commented Nov 16, 2015

merged to the develop branch

@rgrover rgrover merged commit 45589c1 into ARMmbed:master Nov 26, 2015
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.

2 participants