consistent naming, version bump

custom_components/ecovacs/__init__.py

@@ -13,15 +13,14 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import discovery
-import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.typing import ConfigType
+import homeassistant.helpers.config_validation as cv
 import voluptuous as vol
-#just included the modified sucks in component
-from .sucksbumper import EcoVacsAPI, VacBot
+#use local sucks
+from .sucks import EcoVacsAPI, VacBot
 from .const import (
     ECOVACS_DEVICES,
     DOMAIN,
-
     CONF_CONTINENT,
     LOGGER
 )

custom_components/ecovacs/manifest.json

@@ -1,7 +1,7 @@
 {
   "domain": "ecovacs",
   "name": "Ecovacs Bumper",
-  "version": "1.3.7",
+  "version": "1.4.0",
   "documentation": "https://github.com/bittles/ha_ecovacs_bumper",
   "issue_tracker": "https://github.com/bittles/ha_ecovacs_bumper/issues",
   "requirements": ["sleekxmppfs==1.4.1", "requests>=2.18", "pycryptodome>=3.4", "pycountry-convert>=0.5", "paho-mqtt>=1.4", "stringcase>=1.2"],

custom_components/ecovacs/sucks.py

@@ -7,8 +7,8 @@ from collections import OrderedDict
 from sleekxmppfs.xmlstream import ET
 from sleekxmppfs.exceptions import XMPPError
 
-from .mqtt_ecovacs import EcoVacsIOTMQ
-from .xmpp_ecovacs import EcoVacsXMPP
+from .sucks_mqtt import EcoVacsIOTMQ
+from .sucks_xmpp import EcoVacsXMPP
 
 from .const import LOGGER
 from .sucks_const import *

custom_components/ecovacs/sucks_mqtt.py

@@ -1,5 +1,4 @@
 import time
-
 import sched
 import threading
 import ssl