simplify config

custom_components/ecovacs/__init__.py

@@ -4,8 +4,10 @@ import string
 #import asyncio ## to do will need to convert to slixmpp to do this i believe
 
 from homeassistant.const import (
-    CONF_PASSWORD,
     CONF_USERNAME,
+    CONF_PASSWORD,
+    CONF_COUNTRY,
+    CONF_VERIFY_SSL,
     EVENT_HOMEASSISTANT_STOP,
     Platform,
 )
@@ -19,10 +21,8 @@ from .sucksbumper import EcoVacsAPI, VacBot
 from .const import (
     ECOVACS_DEVICES,
     DOMAIN,
-    CONF_COUNTRY,
+
     CONF_CONTINENT,
-    CONF_BUMPER,
-    CONF_BUMPER_SERVER,
     LOGGER
 )
 
@@ -34,8 +34,7 @@ CONFIG_SCHEMA = vol.Schema(
                 vol.Required(CONF_PASSWORD): cv.string,
                 vol.Required(CONF_COUNTRY): vol.All(vol.Lower, cv.string),
                 vol.Required(CONF_CONTINENT): vol.All(vol.Lower, cv.string),
-                vol.Optional(CONF_BUMPER, default=False): cv.boolean,
+                vol.Optional(CONF_VERIFY_SSL, default=True): cv.boolean, # can probably get rid of this and set verify ssl false if
-                vol.Optional(CONF_BUMPER_SERVER): cv.string
             }
         )
     },
@@ -50,18 +49,8 @@ ECOVACS_API_DEVICEID = "".join(
 def setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the Ecovacs component."""
     LOGGER.debug("Creating new Ecovacs component")
-    
-
     hass.data[ECOVACS_DEVICES] = []
-    # if we're using bumper then define the server address
+    SERVER_ADDRESS = None
-    if CONF_BUMPER == True:
-        SERVER_ADDRESS = (config[DOMAIN].get(CONF_BUMPER_SERVER), 5223)
-        VERIFY_SSL = False
-    else:
-        SERVER_ADDRESS = None
-        VERIFY_SSL = True
-        # if not server address is null and verify ssl true
-    LOGGER.info("Bumper is set to %s with server address %s and verify ssl %s", CONF_BUMPER, SERVER_ADDRESS, VERIFY_SSL)
 
     ecovacs_api = EcoVacsAPI(
         ECOVACS_API_DEVICEID,
@@ -69,7 +58,7 @@ def setup(hass: HomeAssistant, config: ConfigType) -> bool:
         EcoVacsAPI.md5(config[DOMAIN].get(CONF_PASSWORD)),
         config[DOMAIN].get(CONF_COUNTRY),
         config[DOMAIN].get(CONF_CONTINENT),
-        VERIFY_SSL # add to class call
+        config[DOMAIN].get(CONF_VERIFY_SSL), # add to class call
     )
 
     devices = ecovacs_api.devices()
@@ -88,8 +77,8 @@ def setup(hass: HomeAssistant, config: ConfigType) -> bool:
             ecovacs_api.user_access_token,
             device,
             config[DOMAIN].get(CONF_CONTINENT).lower(),
-            SERVER_ADDRESS, # include server address in class, if it's null shoul be no effect
+            SERVER_ADDRESS, # include server address in class, if it's null should be no effect
-            VERIFY_SSL, # verify ssl or not
+            config[DOMAIN].get(CONF_VERIFY_SSL), # add to class call
             monitor=True
         )
         hass.data[ECOVACS_DEVICES].append(vacbot)

custom_components/ecovacs/const.py

@@ -5,8 +5,4 @@ LOGGER = logging.getLogger(__name__)
 #init constants
 ECOVACS_DEVICES = "ecovacs_devices"
 DOMAIN = "ecovacs"
-CONF_COUNTRY = "country"
+CONF_CONTINENT = "continent"
-CONF_CONTINENT = "continent"
-#bumper config vars
-CONF_BUMPER = "bumper"
-CONF_BUMPER_SERVER = "bumper_server"

custom_components/ecovacs/manifest.json

@@ -1,7 +1,7 @@
 {
   "domain": "ecovacs",
   "name": "Ecovacs Bumper",
-  "version": "1.3.6",
+  "version": "1.3.7",
   "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"],