Added datacontainer to save energy measurement data for Crownstones.

Author: RicArch97

crownstone_cloud/cloud_models/crownstones.py

@@ -1,11 +1,13 @@
 """Crownstone handler for Crownstone cloud data"""
+import logging
+from typing import Dict, Any
+
 from crownstone_cloud.const import DIMMING_ABILITY
 from crownstone_cloud.exceptions import (
     CrownstoneAbilityError,
     AbilityError
 )
-from typing import Dict, Any
-import logging
+from crownstone_cloud.helpers.containers import EnergyData
 
 _LOGGER = logging.Logger(__name__)
 
@@ -113,8 +115,9 @@ def __init__(self, cloud, data: Dict[str, Any]) -> None:
         self.abilities: Dict[str, CrownstoneAbility] = {}
         # power usage (W)
         self.power_usage = 0
-        # energy usage (kWh)
-        self.energy_usage = 0
+        # energy usage data object
+        # initially defined with 0 Joule and no timestamp
+        self.energy_usage = EnergyData(0, None)
 
     @property
     def name(self) -> str:

crownstone_cloud/helpers/containers.py

@@ -0,0 +1,16 @@
+"""Contains classes that only hold data."""
+
+
+class EnergyData:
+    """Data class that holds energy measurements"""
+
+    def __init__(self, accumulated_energy: int, utc_timestamp: int) -> None:
+        """Initialize the object."""
+        # new value obtained from Crownstone USB Dongle (or other source)
+        self.energy_usage = accumulated_energy
+
+        # the new energy usage value (after adding the offset or previous value)
+        self.corrected_energy_usage = 0
+
+        # timestamp of the measurement in UTC
+        self.timestamp = utc_timestamp