added HEX string type and option to disable auto-subscribe #134
Conversation
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
- changed gzip to tar to ease build on Windows
shmuelzon
requested changes
Nov 20, 2021
main/config.c
Outdated
Comment on lines
180
to
189
| /* 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.
This can all be changed to simply
return !cJSON_IsFalse(subscribe);
main/ble2mqtt.c
Outdated
Comment on lines
459
to
460
| if (properties & (CHAR_PROP_NOTIFY | CHAR_PROP_INDICATE)) | ||
| { |
There was a problem hiding this comment.
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.
README.md
Outdated
| @@ -256,6 +256,8 @@ configuration: | |||
| http://www.bluetooth.org. Each characteristic can include a `name` field which | |||
| will be used in the MQTT topic instead of its UUID and a `types` array | |||
| defining how to parse the byte array reflecting the characteristic's value. | |||
| The `subscribe` attribute can be set to "false" if you don't want to automatically | |||
| subscribe for Notifications and Indications on a Characteristic. | |||
There was a problem hiding this comment.
No need to capitalize Notifications, Indications nor Characteristic.
shmuelzon
force-pushed
the
master
branch
2 times, most recently
from
7c19828
to
6ebee2a
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This adds an option to the config that disables the automatic notification subscription.
It also introduces an "Hex-String" type, in case you don't want to sent integer representations.