USB energy refactor

CHANGELOG.md

@@ -1,33 +1,47 @@
 # Changelog
 
 # v0.16.0 - Smile - Change output format, allowing full use of Core DataUpdateCoordintor in plugwise-beta
-  - Change from list- to dict-format for binary_sensors, sensors and switches
-  - Provide gateway-devices for Legacy Anna and Stretch
-  - Code-optimizations
+
+- Change from list- to dict-format for binary_sensors, sensors and switches
+- Provide gateway-devices for Legacy Anna and Stretch
+- Code-optimizations
+
+# v0.15.8 - Stick - Improve performance and energy monitoring
+
+- Improved timeout message handling based on response messages of USB-stick
+- More frequent energy monitoring polling when Stick is idle
+- Full rewrite of energy collection code. No dependency to fixed log interval. Should fix
+  - [#149]https://github.com/plugwise/plugwise-beta/issues/149
+  - [157]https://github.com/plugwise/plugwise-beta/issues/157
+- Added ability to change energy log interval
+- Added full support for energy production [#39](https://github.com/plugwise/python-plugwise/issues/39)
 
 # v0.15.7 - Smile - Improve implementation of cooling-function-detection
- - Anna: add two sensors related to automatic switching between heating and cooling and add a heating/cooling-mode active indication
- - Adam: also provide a heating/cooling-mode active indication
- - Fixing #171
- - Improved dependency handling (@dependabot)
+
+- Anna: add two sensors related to automatic switching between heating and cooling and add a heating/cooling-mode active indication
+- Adam: also provide a heating/cooling-mode active indication
+- Fixing #171
+- Improved dependency handling (@dependabot)
 
 # v0.15.6 - Smile - Various fixes and improvements
-  - Adam: collect `control_state` from master thermostats, allows showing the thermostat state as on the Plugwise App
-  - Adam: collect `allowed_modes` and look for `cooling`, indicating cooling capability being available
-  - Optimize code: use `_all_appliances()` once instead of 3 times, by updating/changing `single_master_thermostat()`,
-  - Protect several more variables,
-  - Change/improve how `illuminance` and `outdoor_temperature` are obtained,
-  - Use walrus operator where applicable,
-  - Various small code improvements,
-  - Add and adapt testcode
-  - Add testing for python 3.10, improve dependencies (github workflow)
-  - Bump aiohttp to 3.8.1, remove fixed dependencies
+
+- Adam: collect `control_state` from master thermostats, allows showing the thermostat state as on the Plugwise App
+- Adam: collect `allowed_modes` and look for `cooling`, indicating cooling capability being available
+- Optimize code: use `_all_appliances()` once instead of 3 times, by updating/changing `single_master_thermostat()`,
+- Protect several more variables,
+- Change/improve how `illuminance` and `outdoor_temperature` are obtained,
+- Use walrus operator where applicable,
+- Various small code improvements,
+- Add and adapt testcode
+- Add testing for python 3.10, improve dependencies (github workflow)
+- Bump aiohttp to 3.8.1, remove fixed dependencies
 
 # v0.15.5 - Skipping, not released
 
 ## v0.15.4 - Smile - Bugfix: handle removed thermostats
-  - Recognize when a thermostat has been removed from a zone and don't show it in Core
-  - Rename Group Switch to Switchgroup, remove vendor name
+
+- Recognize when a thermostat has been removed from a zone and don't show it in Core
+- Rename Group Switch to Switchgroup, remove vendor name
 
 ## v0.15.3 - Skipping, not released
 
@@ -48,7 +62,7 @@
 
 ## v0.14.1 - Smile: removing further `last_reset`s
 
- - As per https://developers.home-assistant.io/blog/2021/08/16/state_class_total
+- As per <https://developers.home-assistant.io/blog/2021/08/16/state_class_total>
 
 ## v0.14.0 - Smile: sensor-platform updates - 2021.9 compatible
 

plugwise/__init__.py

@@ -1,6 +1,6 @@
 """Plugwise module."""
 
-__version__ = "0.16.0"
+__version__ = "0.15.8"
 
 from plugwise.smile import Smile
 from plugwise.stick import Stick

plugwise/connections/__init__.py

@@ -5,7 +5,7 @@
 import time
 
 from ..constants import SLEEP_TIME
-from ..messages.requests import NodeRequest
+from ..messages.requests import PlugwiseRequest
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -96,7 +96,7 @@ def _writer_daemon(self):
     def _write_data(self, data):
         """Placeholder."""
 
-    def send(self, message: NodeRequest, callback=None):
+    def send(self, message: PlugwiseRequest, callback=None):
         """Add message to write queue."""
         self._write_queue.put_nowait((message, callback))