PowerMeter fixes #342
Merged
PowerMeter fixes #342
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
update the timestampt only if the topic actually matched any subscription and if the value could be parsed as a float.
this allows for a slightly more elegant code and reduced amount of code overall.
* move private methods to private section of class declaration. * remove unused member variable.
|
This might fix #340. |
|
This pull request has been automatically locked since there has not been any recent activity after it was closed. Please open a new discussion or issue for related concerns. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
When subscribing to a topic whose payload cannot be parsed as a float value, an exception would be triggered in the PowerMeter implementation. The code in this PR catches the exception and handles it gracefully:
Make sure that the timestamp
_lastPowerMeterUpdateis only updated by the MQTT callback if a topic was processed that actually matches one of the subscribed topics.Upon changing the MQTT settings and submitting the new settings through the web application, PowerMeter::init() is called. That probably makes sense so it can be ensured that the topics are subscribed to using a possible new broker. However, the old subscriptions were not cancelled, resulting in the callback being called
n+1times afternchanges to the MQTT settings.This problem is resolved by unsubscribing from all subscribed topics, if any, before resubscribing.
The subscriptions are organized in a std::map, which allows iterating them, which in turn allows for slightly more elegant code and less code overall.
Removed an unused member variable and moved private function to the private section of the class declaration.
Use a switch-case-statement over an if-else construct in
init().