Handle up since oscillation (#14)

* Handle up_since oscillation on devices
* Rename private initialization variables for clarity
* Update changelog

CHANGELOG.md

@@ -1,3 +1,8 @@
+# unreleased
+
+- Handle up_since oscillation on devices
+- Rename private initialization variables in device class for clarity
+
 # 1.3.0 (2021-12-22)
 
 - Add cloud base and freezing level calculations

pyweatherflowudp/device.py

@@ -82,7 +82,7 @@ def __init__(self, serial_number: str, data: dict[str, Any] | None = None) -> No
  self._rssi: int = 0
  self._timestamp: int | None = None
  self._uptime: int = 0
- self._initial_status: bool = False
+ self._initial_status_complete: bool = False
 
  self._listeners: dict[str, list[Callable]] = {}
  self._parse_message_map: dict[str, Callable | tuple[Callable, str]] = {}
@@ -95,7 +95,7 @@ def firmware_revision(self) -> str:
  @property
  def load_complete(self) -> bool:
  """Return `True` if the device has been completely loaded."""
- return self._initial_status
+ return self._initial_status_complete
 
  @property
  def model(self) -> str:
@@ -192,8 +192,8 @@ def parse_hub_status(self, data: dict[str, Any]) -> None:
 
  assert self._timestamp
 
- if not self._initial_status:
- self._initial_status = True
+ if not self._initial_status_complete:
+ self._initial_status_complete = True
  self.emit(
  EVENT_LOAD_COMPLETE,
  CustomEvent(self._timestamp, EVENT_LOAD_COMPLETE),
@@ -234,7 +234,7 @@ def __init__(self, serial_number: str, data: dict[str, Any] | None = None) -> No
  self._hub_rssi: int = 0
  self._sensor_status: int = 0
  self._debug: bool = False
- self._initial_observation: bool = False
+ self._initial_observation_complete: bool = False
 
  self.register_parse_handlers(
  {
@@ -260,7 +260,7 @@ def hub_sn(self) -> str | None:
  @property
  def load_complete(self) -> bool:
  """Return `True` if the device has been completely loaded."""
- return self._initial_status and self._initial_observation
+ return self._initial_status_complete and self._initial_observation_complete
 
  @property
  def sensor_status(self) -> list[str]:
@@ -278,17 +278,25 @@ def sensor_status(self) -> list[str]:
 
  def parse_device_status(self, data: dict[str, Any]) -> None:
  """Parse the device status."""
+ old_up_since = (self._timestamp or 0) - self._uptime
  self._timestamp = data.get(DATA_TIMESTAMP)
  self._uptime = data.get(DATA_UPTIME, 0)
+ # Tempest devices seem to have a timestamp/uptime combo that oscillates +/- a few seconds.
+ # Attempt to correct this by adjusting the uptime if the difference is less than 60 seconds.
+ if (
+ self._initial_status_complete
+ and 0 < abs(dif := (self._timestamp - self._uptime) - old_up_since) < 60
+ ):
+ self._uptime += dif
  self._voltage = data.get(DATA_VOLTAGE, 0)
  self._firmware_revision = data.get(DATA_FIRMWARE_REVISION)
  self._rssi = data.get(DATA_RSSI, 0)
  self._hub_rssi = data.get(DATA_HUB_RSSI, 0)
  self._sensor_status = data.get(DATA_SENSOR_STATUS, 0)
  self._debug = truebool(data.get(DATA_DEBUG))
 
- if not self._initial_status:
- self._initial_status = True
+ if not self._initial_status_complete:
+ self._initial_status_complete = True
  self._send_load_complete_event()
 
  assert self._timestamp
@@ -302,15 +310,15 @@ def parse_observation(self, data: list[list]) -> None:
  for idx, field in self.OBSERVATION_VALUES_MAP.items():
  setattr(self, field, observation[idx])
 
- if not self._initial_observation:
- self._initial_observation = True
+ if not self._initial_observation_complete:
+ self._initial_observation_complete = True
  self._send_load_complete_event()
 
  assert self._last_report
  self.emit(EVENT_OBSERVATION, CustomEvent(self._last_report, EVENT_OBSERVATION))
 
  def _send_load_complete_event(self) -> None:
- if self._initial_status and self._initial_observation:
+ if self._initial_status_complete and self._initial_observation_complete:
  assert self._last_report
  assert self._timestamp
  self.emit(

test/conftest.py

@@ -1,4 +1,6 @@
 """Provide common pytest fixtures."""
+from __future__ import annotations
+
 import json
 from typing import Any
 

test/test_device.py

@@ -143,6 +143,18 @@ def load_complete(event):
  device.parse_message(device_status)
  assert device.rssi == -21 * UNIT_DECIBELS
 
+ # check up_since field
+ original_up_since = datetime.fromtimestamp(
+ device_status["timestamp"] - device_status["uptime"], timezone.utc
+ )
+ assert device.up_since == original_up_since
+ device_status.update({"uptime": device_status["uptime"] + 59})
+ device.parse_message(device_status)
+ assert device.up_since == original_up_since
+ device_status.update({"uptime": device_status["uptime"] + 1})
+ device.parse_message(device_status)
+ assert device.up_since < original_up_since
+
  assert not device.last_rain_start_event
  device.parse_message(evt_precip)
  assert device.last_rain_start_event