A bit closer to get it working

Author: dala318

__init__.py

@@ -62,7 +62,7 @@ def setup(hass: HomeAssistant, base_config: ConfigType) -> bool:
     hass.data[DOMAIN].start()
 
     discovery.load_platform(hass, Platform.SENSOR, DOMAIN, {}, config)
-    discovery.load_platform(hass, Platform.BINARY_SENSOR, DOMAIN, {}, config)
+    # discovery.load_platform(hass, Platform.BINARY_SENSOR, DOMAIN, {}, config)
     return True
 
 
@@ -76,41 +76,13 @@ class DeviceData(threading.Thread):
 
     def __init__(self, hass, client: device.Device) -> None:
         super().__init__()
+        self.name = "Ph803wThread"
         self.hass = hass
         self.client = client
         self.unit = self.client.host
         self._shutdown = False
         self._fails = 0
 
-    # def _reconnect(self):
-    #     """Reconnect on a failure."""
-
-    #     self._fails += 1
-    #     if self._fails > MAX_FAILS:
-    #         _LOGGER.error("Failed to reconnect. Thread stopped")
-    #         persistent_notification.create(
-    #             self.hass,
-    #             "Error:<br/>Connection to PH-803W device failed "
-    #             "the maximum number of times. Thread has stopped",
-    #             title=NOTIFICATION_TITLE,
-    #             notification_id=NOTIFICATION_ID,
-    #         )
-
-    #         self._shutdown = True
-    #         return
-
-    #     # sleep first before the reconnect attempt
-    #     _LOGGER.debug("Sleeping for fail # %s", self._fails)
-    #     time.sleep(self._fails * ERROR_INTERVAL.total_seconds())
-
-    #     try:
-    #         self.client.run(once=False)
-    #     except:
-    #         _LOGGER.exception("Failed to reconnect attempt %s", self._fails)
-    #     else:
-    #         _LOGGER.debug("Reconnected to device")
-    #         self._fails = 0
-
     def run(self):
         """Thread run loop."""
 
@@ -163,46 +135,3 @@ def shutdown(event):
                 )
                 self.client.reset_socket()
                 time.sleep(sleep_time)
-
-        # while True:
-        #     if self._shutdown:
-        #         _LOGGER.debug("Graceful shutdown")
-        #         return
-
-        #     try:
-        #         self.data = self.client.run(once=False)
-
-        #     except WFException:
-        #         # WFExceptions are things the WF library understands
-        #         # that pretty much can all be solved by logging in and
-        #         # back out again.
-        #         _LOGGER.exception("Failed to read data, attempting to recover")
-        #         self._reconnect()
-
-        #     else:
-        #         dispatcher_send(self.hass, UPDATE_TOPIC)
-        #         time.sleep(SCAN_INTERVAL.total_seconds())
-
-
-# async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
-#     """Set up Hello World from a config entry."""
-#     # Store an instance of the "connecting" class that does the work of speaking
-#     # with your actual devices.
-#     hass.data.setdefault(DOMAIN, {})[entry.entry_id] = hub.Hub(hass, entry.data["host"])
-
-#     # This creates each HA object for each platform your device requires.
-#     # It's done by calling the `async_setup_entry` function in each platform module.
-#     hass.config_entries.async_setup_platforms(entry, PLATFORMS)
-#     return True
-
-
-# async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
-#     """Unload a config entry."""
-#     # This is called when an entry/configured device is to be removed. The class
-#     # needs to unload itself, and remove callbacks. See the classes for further
-#     # details
-#     unload_ok = await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
-#     if unload_ok:
-#         hass.data[DOMAIN].pop(entry.entry_id)
-
-#     return unload_ok

lib/device.py

@@ -22,6 +22,7 @@ def __init__(self, host):
         self.host = host
         self.passcode = ""
         self._measurements = []
+        self._latest_measurement = None
         self._socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         self._loop = True
         self._empty_counter = 0
@@ -38,10 +39,15 @@ async def run_async(self, once: bool = True) -> bool:
         return self.run(once)
 
     def run(self, once: bool = True) -> bool:
+        self._loop = True
         if once:
+            if self._socket.fileno() == -1:
+                self.reset_socket()
             self._connect()
             return self._run(once)
         else:
+            if self._socket.fileno() == -1:
+                self.reset_socket()
             self._connect()
             self._run(once)
             return not self._loop
@@ -165,7 +171,9 @@ def _handle_login_response(self, data):
     def _handle_data_response(self, data):
         if len(data) == 18:
             meas = Measurement(data)
+            _LOGGER.debug("Adding result: %s" % meas)
             self._measurements.append(meas)
+            self._latest_measurement = meas
             if len(self._measurements) > 100:
                 self._measurements.pop(0)
         else:
@@ -208,12 +216,13 @@ def close(self):
         except:
             pass
 
-    def get_latest_measurement_and_empty(self):
-        if len(self._measurements) > 0:
-            m = self._measurements.pop()
-            self._measurements.clear()
-            return m
-        return None
+    def get_measurements_and_empty(self):
+        meas = self._measurements
+        self._measurements.clear()
+        return meas
+
+    def get_latest_measurement(self):
+        return self._latest_measurement
 
     def __enter__(self):
         return self

sensor.py

@@ -1,5 +1,6 @@
 """Platform for sensor integration."""
 from __future__ import annotations
+import logging
 
 from homeassistant.components.sensor import (
     ENTITY_ID_FORMAT,
@@ -18,6 +19,8 @@
 from . import UPDATE_TOPIC
 from .const import DOMAIN
 
+_LOGGER = logging.getLogger(__name__)
+
 
 class DeviceSensorConfig:
     """PH-803W Device Sensor configuration."""
@@ -39,7 +42,7 @@ def __init__(
 
 
 SENSORS = [
-    DeviceSensorConfig("pH Sensor", "ph", "mdi:water-percent"),
+    DeviceSensorConfig("pH Sensor", "ph", "mdi:water-percent", ""),
     DeviceSensorConfig(
         "ORP Sensor",
         "orp",
@@ -77,6 +80,10 @@ def __init__(self, client, config):
         self._name = config.friendly_name
         self._attr = config.field
         self._state = None
+        if self.client.client.get_latest_measurement() is not None:
+            self._state = getattr(
+                self.client.client.get_latest_measurement(), self._attr, None
+            )
         self._icon = config.icon
         self._unit_of_measurement = config.unit_of_measurement
         self._attr_device_class = config.device_class
@@ -122,8 +129,9 @@ async def async_added_to_hass(self):
     @callback
     def async_update_callback(self):
         """Update state."""
-        if self.client.data is not None:
+        _LOGGER.info("Read sensor data: %s" % self.client.get_latest_measurement())
+        if self.client.client.get_latest_measurement() is not None:
             self._state = getattr(
-                self.client.get_latest_measurement_and_empty(), self._attr, None
+                self.client.client.get_latest_measurement(), self._attr, None
             )
             self.async_write_ha_state()