diff --git a/README.md b/README.md
index 60aa0100..55775e02 100644
--- a/README.md
+++ b/README.md
@@ -6,12 +6,12 @@
-### Current Release: [![GitHub Latest Release][releases_shield]][latest_release]
+## Current Release: [![GitHub Latest Release][releases_shield]][latest_release]
-## Valetudo Vacuums maps in Home Assistant was never so easy.
+# Valetudo Vacuums maps in Home Assistant was never so easy.
**About:**
Extract the maps of Vacuum Cleaners connected via MQTT to Home Assistant such as Valetudo [Hypfer](https://valetudo.cloud/) or [RE(rand256)](https://github.com/rand256/valetudo) firmwares, [easy setup](./docs/install.md) thanks to [HACS](https://hacs.xyz/) and guided Home Assistant GUI configuration.
@@ -33,57 +33,22 @@ Our current focus is evolving beyond map rendering to provide full vacuum contro
Planned in the next Release
-#### 2024.12.0 - **Fully implement Coordinator**
+In the last releases we did start to implement the Actions for Rand256 and Hypfer.
+We can now see the Obstacles Images when available, and somehow we start to organize the code.
+The camera is stable and updated to all requirements of Home Assistant.
+Will be also time to take a brake and work in the background, so I do not expect unless required releases in January.
+
+#### 2025.2.0 - **Refactoring and some add**
+- **Changes**
+ - Exporting libraries to PyPi to reduce the code lines.
+ - Refactoring the code to make it more readable and easy to maintain.
+ - Fully Coordinated implementation of the cameras and sensors.
+ - Remove files operations (not for logging).
- **Features:**
- Added on 2024.11.0 the Actions for Rand256 to load and save maps fully integrate [MapLoader](https://github.com/pkoehlers/maploader).
- - Fix #263: The init process will be coordinated as we have Cameras and Sensors that need to be initialized.
- - Fix #276 "Unknown error" when some vacuum data is not reachable (refactoring).
-### Limitations and Compatibility:
-
-
- Please Read the "Limitations and Compatibility" before to install the camera.
-
-
-I kindly ask for your understanding regarding any limitations you may encounter with this custom component (please read also
-our [**notice**](./NOTICE.txt)).
-While it's been extensively tested on a PI4 8GB and now also on ProxMox VE, hardware below PI4 8GB may face issues. **Your feedback on such platforms is invaluable**;
-please report any problems you encounter.
-As a team of one, I'm diligently working to address compatibility across all environments, but this process takes time. In the interim, you can utilize [ValetudoPNG](https://github.com/erkexzcx/valetudopng) as an alternative on unsupported platforms.
-Your support in making this component compatible with all environments is greatly appreciated. If you'd like to contribute, whether through code or time, please consider joining our efforts.
-For further details on how the camera operates and how you can contribute, refer to the Wiki section of this project. Your patience and assistance are crucial as we strive toward our goal of universal compatibility.
-
-- PI3 4GB: The camera is working on PI3 4GB, anyhow no chance there to run two vacuums cameras at the same time.
-- PI4 4GB: The camera is working on PI4 4GB, anyhow run two vacuums cameras at the same time isn't advised even if possible.
-
-
-
-### Known Supported Vacuums:
-We here list, thanks to our users and tests done, the known working vacuums.
-
-- Dreame D9
-- Dreame Z10 Pro
-- Dreame L10s Ultra
-- Mi Robot Vacuum-Mop P
-- Roborock.S5 / S50 / S55 (Gen.2)
-- Roborock.S6
-- Roborock.S7
-- Roborock.S8
-- Roborock.V1 (Gen.1)
-- Xiaomi C1
-- In general, **it works with all flashed Valetudo Hypfer or RE(rand256) vacuums**.
-
- We here List what this camera offers as futures.
@@ -115,10 +80,41 @@ Our setup guide also includes **important** informations on how to setup the [lo
12) Support Actions "reload" and "reset_trims" implemented for changing the camera settings without restarting Home Assistant.
13) Rand256 sensors are pre-configured from the integration, this will allow you to have all the sensors available in Home Assistant.
14) Added the [**Actions**](./docs/actions.md) for Rand256 / Hypfer to control the vacuums without to format the MQTT messages.
+15) [Obstacles](./docs/obstacles_detection.md) are displayed on the map when available. When the vacuum support ```ObstaclesImage``` is also possible to view the obstacles images.
+
+ Please Read the "Limitations and Compatibility" before to install the camera.
+
+
+I kindly ask for your understanding regarding any limitations you may encounter with this custom component (please read also
+our [**notice**](./NOTICE.txt)).
+While it's been extensively tested on a PI4 8GB and now also on ProxMox VE, hardware below PI4 8GB may face issues. **Your feedback on such platforms is invaluable**;
+please report any problems you encounter.
+As a team of one, I'm diligently working to address compatibility across all environments, but this process takes time. In the interim, you can utilize [ValetudoPNG](https://github.com/erkexzcx/valetudopng) as an alternative on unsupported platforms.
+Your support in making this component compatible with all environments is greatly appreciated. If you'd like to contribute, whether through code or time, please consider joining our efforts.
+For further details on how the camera operates and how you can contribute, refer to the Wiki section of this project. Your patience and assistance are crucial as we strive toward our goal of universal compatibility.
+
+#### Compatibility:
+- PI3 4GB: The camera is working on PI3 4GB, anyhow no chance there to run two vacuums cameras at the same time.
+- PI4 4GB: The camera is working on PI4 4GB, anyhow run two vacuums cameras at the same time isn't advised even if possible.
+- All Vacuums with Valetudo Hypfer or Rand256 firmware are supported.
+- If you have a vacuum with a different firmware connected via MQTT, please let us know, we will try to add the support for it.
+
+
+
+### Notes:
- This integration is developed and tested using a PI4 with Home Assistant OS fully updated [to the last version](https://www.home-assistant.io/faq/release/), this allows us to confirm that the component is working properly with Home Assistant. Tested also on ProxMox and Docker Supervised "production" enviroment (fully setup home installation).
### Tanks to:
- [@PiotrMachowski](https://github.com/PiotrMachowski) inspiring this integration and his amazing work.
@@ -127,5 +123,5 @@ Our setup guide also includes **important** informations on how to setup the [lo
- [@rohankapoorcom](https://github.com/rohankapoorcom) autor of the v1.4.0 that make really easy to set up this integration.
- [@gunjambi](https://github.com/gunjambi) that found a solution to re-draw the robot and also implemented the snapshots png to be enabled or disabled from the options.
- [@T0ytoy](https://github.com/T0ytoy) for the amazing cooperation in testing our Camera that improved [using the threading](https://github.com/sca075/valetudo_vacuum_camera/discussions/71).
+- [@borgqueenx](https://github.com/borgqueenx) for the amazing cooperation in testing our Camera and helping us to improve it, [see more here](https://github.com/sca075/mqtt_vacuum_camera/discussions/296#:~:text=Edit-,borgqueenx,-2%20weeks%20ago)
- And to all of you using this integration and reporting any issues, improvements and vacuums used with it.
-
diff --git a/custom_components/mqtt_vacuum_camera/const.py b/custom_components/mqtt_vacuum_camera/const.py
index 39309215..a9a66f3c 100755
--- a/custom_components/mqtt_vacuum_camera/const.py
+++ b/custom_components/mqtt_vacuum_camera/const.py
@@ -327,18 +327,6 @@
COLOR_WALL = "color_wall"
COLOR_TEXT = "color_text"
-"""Base Colours RGB array, not in use"""
-CONF_COLORS = [
- COLOR_WALL,
- COLOR_ZONE_CLEAN,
- COLOR_ROBOT,
- COLOR_BACKGROUND,
- COLOR_MOVE,
- COLOR_CHARGER,
- COLOR_NO_GO,
- COLOR_GO_TO,
-]
-
"Rooms Colours RGB"
COLOR_ROOM_0 = "color_room_0"
COLOR_ROOM_1 = "color_room_1"
diff --git a/custom_components/mqtt_vacuum_camera/manifest.json b/custom_components/mqtt_vacuum_camera/manifest.json
index 932987a2..7fc81dfb 100755
--- a/custom_components/mqtt_vacuum_camera/manifest.json
+++ b/custom_components/mqtt_vacuum_camera/manifest.json
@@ -7,6 +7,6 @@
"documentation": "https://github.com/sca075/mqtt_vacuum_camera",
"iot_class": "local_polling",
"issue_tracker": "https://github.com/sca075/mqtt_vacuum_camera/issues",
- "requirements": ["pillow>=10.3.0,<=11.0.0", "numpy"],
- "version": "2024.12.2b1"
+ "requirements": ["pillow>=10.3.0,<=11.5.0", "numpy"],
+ "version": "2024.12.2"
}
diff --git a/custom_components/mqtt_vacuum_camera/utils/vacuum/mqtt_vacuum_services.py b/custom_components/mqtt_vacuum_camera/utils/vacuum/mqtt_vacuum_services.py
index 1e73c43d..0bc8d3ff 100644
--- a/custom_components/mqtt_vacuum_camera/utils/vacuum/mqtt_vacuum_services.py
+++ b/custom_components/mqtt_vacuum_camera/utils/vacuum/mqtt_vacuum_services.py
@@ -72,11 +72,16 @@ async def vacuum_clean_zone(call: ServiceCall, coordinator) -> None:
try:
# Retrieve coordinates
zone_lists = call.data.get("zone")
- zone_ids = call.data.get("zone_ids")
repeats = call.data.get("repeats")
-
+ zone_ids = call.data.get("zone_ids")
+ if zone_lists:
+ if not isinstance(zone_lists, list):
+ raise ServiceValidationError("Zone must be a list.")
if zone_ids:
- zone_lists = zone_ids
+ if isinstance(zone_ids, list):
+ zone_lists = zone_ids
+ else:
+ raise ServiceValidationError("ZoneIds must be a list.")
# Attempt to get entity_id or device_id
entity_ids = call.data.get("entity_id")
diff --git a/custom_components/mqtt_vacuum_camera/valetudo/MQTT/connector.py b/custom_components/mqtt_vacuum_camera/valetudo/MQTT/connector.py
index 8da318a9..7355b689 100755
--- a/custom_components/mqtt_vacuum_camera/valetudo/MQTT/connector.py
+++ b/custom_components/mqtt_vacuum_camera/valetudo/MQTT/connector.py
@@ -11,12 +11,13 @@
from homeassistant.core import EventOrigin, HomeAssistant, callback
from isal import igzip, isal_zlib
-from ...common import build_full_topic_set
+from ...common import build_full_topic_set, RedactIPFilter
from ...const import DECODED_TOPICS, NON_DECODED_TOPICS, CameraModes
from ...types import RoomStore
from ...valetudo.rand256.rrparser import RRMapParser
_LOGGER = logging.getLogger(__name__)
+_LOGGER.addFilter(RedactIPFilter())
_QOS = 0