-
-
Notifications
You must be signed in to change notification settings - Fork 108
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
added HEX string type and option to disable auto-subscribe #134
Open
promd
wants to merge
6
commits into
shmuelzon:master
Choose a base branch
from
promd:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
afe0ad3
- added CHAR_TYPE_HEX to support Hexstrings on Set
promd e381c82
Added an optional parameter to surpress automatic subscriptions to no…
promd 93b12a5
reverted back to gzip command (which breaks support on Windows)
promd 4d64277
Update README.md
promd cfac624
Update ble2mqtt.c
promd 58bdec4
Update config.c
promd File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
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
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 |
---|---|---|
|
@@ -458,8 +458,13 @@ static void ble_on_characteristic_found(mac_addr_t mac, ble_uuid_t service_uuid, | |
/* Characteristic can notify / indicate on changes */ | ||
if (properties & (CHAR_PROP_NOTIFY | CHAR_PROP_INDICATE)) | ||
{ | ||
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. Please just change this condition to: if (properties & (CHAR_PROP_NOTIFY | CHAR_PROP_INDICATE) &&
config_ble_characteristic_should_subscribe(uuidtoa(characteristic_uuid)))
{ And leave the below as it was. |
||
ble_characteristic_notify_register(mac, service_uuid, | ||
characteristic_uuid); | ||
if (config_ble_characteristic_should_subscribe(uuidtoa(characteristic_uuid))) | ||
{ | ||
ESP_LOGI(TAG, "Register Notify characteristic: " UUID_FMT ".", | ||
UUID_PARAM(characteristic_uuid)); | ||
ble_characteristic_notify_register(mac, service_uuid, | ||
characteristic_uuid); | ||
} | ||
} | ||
} | ||
|
||
|
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 |
---|---|---|
|
@@ -173,6 +173,22 @@ uint8_t config_ble_characteristic_should_include(const char *uuid) | |
return json_is_in_lists(characteristics, uuid); | ||
} | ||
|
||
uint8_t config_ble_characteristic_should_subscribe(const char *uuid) | ||
{ | ||
cJSON *subscribe = config_ble_get_name_by_uuid(0, uuid, "subscribe"); | ||
|
||
/* Not defined, to subscribe is default */ | ||
if (cJSON_IsTrue(subscribe)) | ||
{ | ||
return true; | ||
} | ||
else if (cJSON_IsFalse(subscribe)) | ||
{ | ||
return false; | ||
} | ||
return true; | ||
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 can all be changed to simply return !cJSON_IsFalse(subscribe); |
||
} | ||
|
||
uint8_t config_ble_service_should_include(const char *uuid) | ||
{ | ||
cJSON *ble = cJSON_GetObjectItemCaseSensitive(config, "ble"); | ||
|
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
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.
No need to capitalize
Notifications
,Indications
norCharacteristic
.