Merge pull request #15 from MrSleeps/dev

- Removed the sensors tankname_manualcolorsimulationenabled and tankname_manualdaytimesimulationenabled
- Fixed Firmware / Software version bug
- Bumped manifest.json version to 2.0.1

Author: MrSleeps

README.md

@@ -18,13 +18,11 @@ These sensors are read only, if you want to do things like turn the aquarium lig
 * `tankname_white` (White light intensity, 0-100)
 * `tankname_current_profile` (Currently selected profile)
 * `tankname_profiles` (Count of available profiles)
-* `tankname_manualcolorsimulationenabled` **This will be removed in a future version**
-* `tankname_manualdaytimesimulationenabled` **This will be removed in a future version**
 * `tankname_device_time` (Time on the controller)
 * `tankname_tank_combined_sensor` (this combines all the above sensors into one)
 
 ## Other Entities/Devices
-* `select.tankname_profiles` (Allows you to choose a profile that the controller will use)
+* `select.tankname_profile` (Allows you to choose a profile that the controller will use)
 * `binary_sensor.tankname_manual_color_simulation_enabled` (Shows On/Off - used by the switch)
 * `binary_sensor.tankname_manual_daytime_simulation_enabled` (Shows On/Off - used by the switch)
 * `light.tankname_light` (The main light, allows you to control your tank light)
@@ -34,6 +32,8 @@ These sensors are read only, if you want to do things like turn the aquarium lig
 * `number.tank_name_manual_daytime_simulation_duration` (Sets the duration of the Manual Colour Simulation)
 * `Tank Device` (All sensors are linked to the relevant device)
 
+(tank_name will be replaced with whatever you named your fish tank)
+
 
 ## How to install
 
@@ -59,6 +59,10 @@ Also, Home Assistants way of dealing with colours on the colour wheel doesn't pl
 
 Any bugs you find, please post on GitHub (and provide logs!).
 
+## Upgrade Notes
+
+The sensors tankname_manualcolorsimulationenabled and tankname_manualdaytimesimulationenabled have been removed, you will need to manually remove them and update any scripts/automations to use the binary sensors instead.
+
 ## Bug Reports
 Please follow the template when submitting a bug report, to help logs will be needed. To turn on debug logging for the integration you will need to add something like the following to your configuration.yml
 ```

custom_components/juwel_helialux/coordinator.py

@@ -37,8 +37,21 @@ def __init__(self, hass, tank_host, tank_protocol, tank_name, update_interval):
 
     async def async_config_entry_first_refresh(self):
         """Fetch initial data and store device info."""
-        await self.async_refresh()  # ✅ Use async_refresh() instead of directly calling `_async_update_data`
-        _LOGGER.debug("Device Info Initialized: %s", self.device_info)
+        await self.async_refresh()  # Fetch initial data
+
+        # Fetch device info from the Helialux controller
+        _LOGGER.debug("Fetching device info from Helialux controller...")
+        device_info = await self.helialux.device_info()
+        _LOGGER.debug("Fetched device info: %s", device_info)  # Log fetched info
+
+        if device_info:
+            self.device_info["sw_version"] = device_info.get("firmware_version", "Unknown")
+            self.device_info["hw_version"] = device_info.get("hardware_version", "Unknown")
+            self.device_info["model"] = f"{device_info.get('device_type', 'Unknown')}"
+            _LOGGER.debug("Updated Device Info: %s", self.device_info)
+        else:
+            _LOGGER.error("Failed to fetch device info from Helialux controller.")
+
 
     async def _async_update_data(self):
         """Fetch the latest data from the Helialux device."""
@@ -59,7 +72,13 @@ async def _async_update_data(self):
                 _LOGGER.error("Invalid profile data format from Helialux, received: %s", type(profile_data))
                 profile_data = {}
 
-            _LOGGER.debug(f"Before updating HA: current_profile={self.data.get('current_profile', 'offline')}")
+            # Fetch device info and update the device_info dictionary
+            device_info = await self.helialux.device_info()
+            if device_info:
+                self.device_info["sw_version"] = device_info.get("firmware_version", "0.0.0.0")
+                self.device_info["hw_version"] = device_info.get("hardware_version", "0.0.0.0")
+                self.device_info["model"] = f"{device_info.get('device_type', 'Unknown')}"
+                _LOGGER.debug("Updated Device Info: %s", self.device_info)
 
             # Merge status and profile data
             merged_data = {
@@ -76,11 +95,13 @@ async def _async_update_data(self):
             }
 
             _LOGGER.debug("Merged data: %s", merged_data)
-            _LOGGER.debug(f"After updating HA: current_profile={merged_data.get('current_profile', 'offline')}")
-            _LOGGER.debug(f"Raw statusvars.js profile: {status_data.get('currentProfile', 'offline')}")
-
             return merged_data  # ✅ Always return a dictionary
 
         except Exception as e:
             _LOGGER.error("Error fetching data from Helialux device: %s", e)
-            return {}  # ✅ Always return an empty dictionary
+            return {}  # ✅ Always return an empty dictionary
+        
+    async def async_update(self):
+        """Update the entity's state."""
+        await self._async_update_data()  # Call the data update method
+        self.async_write_ha_state()  # Notify Home Assistant to refresh the entity state        

custom_components/juwel_helialux/manifest.json

@@ -10,5 +10,5 @@
   "issue_tracker": "https://github.com/MrSleeps/Juwel-HeliaLux-Home-Assistant-Custom-Component/issues",
   "platforms": ["sensor", "light", "select", "binary_sensor"],
   "requirements": ["aiohttp"],
-  "version": "2.0.0"
+  "version": "2.0.1"
 }

custom_components/juwel_helialux/pyhelialux/pyHelialux.py

@@ -197,14 +197,18 @@ async def device_info(self):
             return {}
 
         try:
-            return {
-                "device_type": parsed_devvars["info"][0] if len(parsed_devvars["info"]) > 0 else "Unknown",
-                "hardware_version": parsed_devvars["info"][1] if len(parsed_devvars["info"]) > 1 else "Unknown",
-                "firmware_version": parsed_devvars["info"][2] if len(parsed_devvars["info"]) > 2 else "Unknown",
+            device_type = f"{parsed_devvars['info'][0]} {parsed_statusvars.get('lamp', 'Unknown')}"
+            device_info = {
+#                "device_type": parsed_devvars["info"][0] if len(parsed_devvars["info"]) > 0 else "Unknown",
+                "device_type": device_type if len(parsed_devvars["info"]) > 0 else "Unknown",
+                "hardware_version": parsed_devvars["info"][1].lstrip('V') if len(parsed_devvars["info"]) > 1 else "Unknown",
+                "firmware_version": parsed_devvars["info"][2].lstrip('V') if len(parsed_devvars["info"]) > 2 else "Unknown",
                 "ip_address": parsed_devvars["info"][3] if len(parsed_devvars["info"]) > 3 else "Unknown",
                 "mac_address": parsed_devvars["info"][4] if len(parsed_devvars["info"]) > 4 else "Unknown",
                 "light_channels": parsed_statusvars.get("lamp", "Unknown"),
             }
+            _LOGGER.debug(f"Device info: {device_info}")  # Debug log
+            return device_info
         except KeyError as e:
             _LOGGER.error(f"Missing key in parsed data: {e}")
             return {}

custom_components/juwel_helialux/sensor.py

@@ -247,8 +247,6 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
         JuwelHelialuxAttributeSensor(coordinator, tank_name, "blue", default_value=0, SensorStateClass=SensorStateClass.MEASUREMENT, unit="%"),
         JuwelHelialuxAttributeSensor(coordinator, tank_name, "green", default_value=0, SensorStateClass=SensorStateClass.MEASUREMENT, unit="%"),
         JuwelHelialuxAttributeSensor(coordinator, tank_name, "red", default_value=0, SensorStateClass=SensorStateClass.MEASUREMENT, unit="%"),
-        JuwelHelialuxAttributeSensor(coordinator, tank_name, "manualColorSimulationEnabled", default_value=False),
-        JuwelHelialuxAttributeSensor(coordinator, tank_name, "manualDaytimeSimulationEnabled", default_value=False),
         JuwelHelialuxAttributeSensor(coordinator, tank_name, "device_time", default_value="00:00"),
     ]