feat: bring in a lot more state types and data

Author: cryptk

pyomnilogic_local/api/api.py

@@ -215,7 +215,7 @@ async def async_get_filter_diagnostics(self, pool_id: int, equipment_id: int, ra
 
         _LOGGER.debug("Sending GetUIFilterDiagnosticInfo with body: %s", req_body)
 
-        resp = await self.async_send_and_receive(MessageType.GET_FILTER_DIAGNOSTIC_INFO, req_body)
+        resp = await self.async_send_and_receive(MessageType.GET_FILTER_DIAGNOSTIC, req_body)
 
         _LOGGER.debug("Received response for GetUIFilterDiagnosticInfo: %s", resp)
 
@@ -285,7 +285,7 @@ async def async_set_heater(
 
         _LOGGER.debug("Sending SetUIHeaterCmd with body: %s", req_body)
 
-        return await self.async_send(MessageType.SET_HEATER_COMMAND, req_body)
+        return await self.async_send(MessageType.SET_HEATER, req_body)
 
     async def async_set_solar_heater(
         self,
@@ -320,7 +320,7 @@ async def async_set_solar_heater(
 
         _LOGGER.debug("Sending SetUISolarSetPointCmd with body: %s", req_body)
 
-        return await self.async_send(MessageType.SET_SOLAR_SET_POINT_COMMAND, req_body)
+        return await self.async_send(MessageType.SET_SOLAR_SETPOINT, req_body)
 
     async def async_set_heater_mode(
         self,
@@ -355,7 +355,7 @@ async def async_set_heater_mode(
 
         _LOGGER.debug("Sending SetUIHeaterModeCmd with body: %s", req_body)
 
-        return await self.async_send(MessageType.SET_HEATER_MODE_COMMAND, req_body)
+        return await self.async_send(MessageType.SET_HEATER_MODE, req_body)
 
     async def async_set_heater_enable(
         self,
@@ -390,7 +390,7 @@ async def async_set_heater_enable(
 
         _LOGGER.debug("Sending SetHeaterEnable with body: %s", req_body)
 
-        return await self.async_send(MessageType.SET_HEATER_ENABLED, req_body)
+        return await self.async_send(MessageType.SET_HEATER_ENABLE, req_body)
 
     async def async_set_equipment(
         self,
@@ -552,7 +552,7 @@ async def async_set_light_show(
 
         _LOGGER.debug("Sending SetStandAloneLightShow with body: %s", req_body)
 
-        return await self.async_send(MessageType.SET_STANDALONE_LIGHT_SHOW, req_body)
+        return await self.async_send(MessageType.SET_LIGHT_SHOW, req_body)
 
     async def async_set_chlorinator_enable(self, pool_id: int, enabled: int | bool) -> None:
         body_element = ET.Element("Request", {"xmlns": XML_NAMESPACE})
@@ -570,7 +570,7 @@ async def async_set_chlorinator_enable(self, pool_id: int, enabled: int | bool)
 
         _LOGGER.debug("Sending SetCHLOREnable with body: %s", req_body)
 
-        return await self.async_send(MessageType.SET_CHLOR_ENABLED, req_body)
+        return await self.async_send(MessageType.SET_CHLOR_ENABLE, req_body)
 
     # This is used to set the ORP target value on a CSAD
     async def async_set_csad_orp_target_level(
@@ -596,7 +596,7 @@ async def async_set_csad_orp_target_level(
 
         _LOGGER.debug("Sending SetUICSADORPTargetLevel with body: %s", req_body)
 
-        return await self.async_send(MessageType.SET_CSAD_ORP_TARGET, req_body)
+        return await self.async_send(MessageType.SET_CSAD_ORP_TARGET_LEVEL, req_body)
 
     # This is used to set the pH target value on a CSAD
     async def async_set_csad_ph_target_value(
@@ -665,7 +665,7 @@ async def async_set_chlorinator_params(
 
         _LOGGER.debug("Sending SetCHLORParams with body: %s", req_body)
 
-        return await self.async_send(MessageType.SET_CHLOR_PARAMS, req_body)
+        return await self.async_send(MessageType.CHLOR_PARAMS_SET, req_body)
 
     async def async_set_chlorinator_superchlorinate(
         self,
@@ -690,7 +690,7 @@ async def async_set_chlorinator_superchlorinate(
 
         _LOGGER.debug("Sending SetUISuperCHLORCmd with body: %s", req_body)
 
-        return await self.async_send(MessageType.SET_SUPERCHLORINATE, req_body)
+        return await self.async_send(MessageType.CHLOR_SUPER_CHLOR_SET, req_body)
 
     async def async_restore_idle_state(self) -> None:
         body_element = ET.Element("Request", {"xmlns": XML_NAMESPACE})
@@ -747,7 +747,7 @@ async def async_set_spillover(
 
         _LOGGER.debug("Sending SetUISpilloverCmd with body: %s", req_body)
 
-        return await self.async_send(MessageType.SET_SPILLOVER, req_body)
+        return await self.async_send(MessageType.SET_SPILLOVER_CMD, req_body)
 
     async def async_set_group_enable(
         self,
@@ -790,7 +790,7 @@ async def async_set_group_enable(
 
         _LOGGER.debug("Sending RunGroupCmd with body: %s", req_body)
 
-        return await self.async_send(MessageType.RUN_GROUP_CMD, req_body)
+        return await self.async_send(MessageType.RUN_GROUP, req_body)
 
     async def async_edit_schedule(
         self,
@@ -863,4 +863,4 @@ async def async_edit_schedule(
 
         _LOGGER.debug("Sending EditUIScheduleCmd with body: %s", req_body)
 
-        return await self.async_send(MessageType.EDIT_SCHEDULE, req_body)
+        return await self.async_send(MessageType.EDIT_SCHEDULE_CMD, req_body)

pyomnilogic_local/api/protocol.py

@@ -28,7 +28,7 @@
 
 _ACK_PAYLOAD = f'<Request xmlns="{XML_NAMESPACE}">\n<Name>Ack</Name>\n</Request>'
 
-_ACK_TYPES = frozenset({MessageType.ACK, MessageType.XML_ACK})
+_ACK_TYPES = frozenset({MessageType.ACK, MessageType.MSP_ACK})
 
 # Type alias for items placed on the receive queue: either a parsed message or a parse error.
 _QueueItem = OmniLogicMessage | OmniMessageFormatError
@@ -110,7 +110,7 @@ def _send_xml_ack(self, msg_id: int) -> None:
         if self._transport is None:
             _LOGGER.warning("cannot send ACK for ID %d, transport unavailable", msg_id)
             return
-        ack = OmniLogicMessage(msg_id=msg_id, msg_type=MessageType.XML_ACK, payload=_ACK_PAYLOAD)
+        ack = OmniLogicMessage(msg_id=msg_id, msg_type=MessageType.ACK, payload=_ACK_PAYLOAD)
         self._transport.sendto(bytes(ack))
         _LOGGER.debug("sent XML_ACK for message ID %d", msg_id)
 

pyomnilogic_local/colorlogiclight.py

@@ -222,10 +222,10 @@ def is_ready(self) -> bool:
 
         # Then check light-specific readiness
         return self.state not in [
-            ColorLogicPowerState.FIFTEEN_SECONDS_WHITE,
-            ColorLogicPowerState.CHANGING_SHOW,
-            ColorLogicPowerState.POWERING_OFF,
-            ColorLogicPowerState.COOLDOWN,
+            ColorLogicPowerState.STARTING_APP,
+            ColorLogicPowerState.SHOW_ADVANCE,
+            ColorLogicPowerState.WAIT_POWER_DOWN,
+            ColorLogicPowerState.POWER_DOWN,
         ]
 
     @control_method

pyomnilogic_local/filter.py

@@ -179,8 +179,8 @@ def is_on(self) -> bool:
             FilterState.PRIMING,
             FilterState.HEATER_EXTEND,
             FilterState.CSAD_EXTEND,
-            FilterState.FILTER_FORCE_PRIMING,
-            FilterState.FILTER_SUPERCHLORINATE,
+            FilterState.FORCE_PRIMING,
+            FilterState.SUPERCHLORINATE,
         )
 
     @property
@@ -203,7 +203,7 @@ def is_ready(self) -> bool:
         # We need to consider the filter as ready in this state, otherwise we cannot control the
         # virtual filter to switch the physical filter back BoW
         # ref: https://github.com/cryptk/python-omnilogic-local/issues/100
-        return self.state in (FilterState.OFF, FilterState.ON, FilterState.SUSPEND)
+        return self.state in (FilterState.OFF, FilterState.ON, FilterState.SUSPENDED)
 
     # Control methods
     @control_method