remove what i think are some unneeded changes

This commit is contained in:
bittles
2023-01-02 20:19:37 -05:00
parent 0d95ef7fac
commit 42356582cc
2 changed files with 14 additions and 9 deletions
+1 -1
View File
@@ -1,7 +1,7 @@
{ {
"domain": "ecovacs", "domain": "ecovacs",
"name": "Ecovacs Bumper", "name": "Ecovacs Bumper",
"version": "1.3.3", "version": "1.3.4",
"documentation": "https://github.com/bittles/ha_ecovacs_bumper", "documentation": "https://github.com/bittles/ha_ecovacs_bumper",
"issue_tracker": "https://github.com/bittles/ha_ecovacs_bumper/issues", "issue_tracker": "https://github.com/bittles/ha_ecovacs_bumper/issues",
"requirements": ["sleekxmppfs==1.4.1", "click>=6", "requests>=2.18", "pycryptodome>=3.4", "pycountry-convert>=0.5", "paho-mqtt>=1.4", "stringcase>=1.2"], "requirements": ["sleekxmppfs==1.4.1", "click>=6", "requests>=2.18", "pycryptodome>=3.4", "pycountry-convert>=0.5", "paho-mqtt>=1.4", "stringcase>=1.2"],
+13 -8
View File
@@ -108,11 +108,11 @@ CHARGE_MODE_TO_ECOVACS = {
CHARGE_MODE_FROM_ECOVACS = { CHARGE_MODE_FROM_ECOVACS = {
'going': CHARGE_MODE_RETURNING, 'going': CHARGE_MODE_RETURNING,
'Going': CHARGE_MODE_RETURNING, # 'Going': CHARGE_MODE_RETURNING,
'slot_charging': CHARGE_MODE_CHARGING, 'slot_charging': CHARGE_MODE_CHARGING,
'SlotCharging': CHARGE_MODE_CHARGING, # 'SlotCharging': CHARGE_MODE_CHARGING,
'idle': CHARGE_MODE_IDLE, 'idle': CHARGE_MODE_IDLE,
'Idle': CHARGE_MODE_IDLE, # 'Idle': CHARGE_MODE_IDLE,
} }
COMPONENT_TO_ECOVACS = { COMPONENT_TO_ECOVACS = {
@@ -123,11 +123,11 @@ COMPONENT_TO_ECOVACS = {
COMPONENT_FROM_ECOVACS = { COMPONENT_FROM_ECOVACS = {
'brush': COMPONENT_MAIN_BRUSH, 'brush': COMPONENT_MAIN_BRUSH,
'Brush': COMPONENT_MAIN_BRUSH, # 'Brush': COMPONENT_MAIN_BRUSH,
'side_brush': COMPONENT_SIDE_BRUSH, 'side_brush': COMPONENT_SIDE_BRUSH,
'SideBrush': COMPONENT_SIDE_BRUSH, # 'SideBrush': COMPONENT_SIDE_BRUSH,
'dust_case_heap': COMPONENT_FILTER, 'dust_case_heap': COMPONENT_FILTER,
'DustCaseHeap': COMPONENT_FILTER, # 'DustCaseHeap': COMPONENT_FILTER,
} }
def str_to_bool_or_cert(s): def str_to_bool_or_cert(s):
@@ -434,8 +434,13 @@ class VacBot():
self.xmpp.subscribe_to_ctls(self._handle_ctl) self.xmpp.subscribe_to_ctls(self._handle_ctl)
else: else:
self.iotmq = EcoVacsIOTMQ(user, domain, resource, secret, continent, vacuum, server_address, verify_ssl=verify_ssl) if self.server_address is not None:
self.iotmq.subscribe_to_ctls(self._handle_ctl) vacuum = {"did": "none", "class": "none"}
self.iotmq = EcoVacsIOTMQ("sucks", "ecouser.net", "", "", "", vacuum, server_address, verify_ssl=verify_ssl)
self.iotmq.subscribe_to_ctls(self._handle_ctl)
else:
self.iotmq = EcoVacsIOTMQ(user, domain, resource, secret, continent, vacuum, server_address, verify_ssl=verify_ssl)
self.iotmq.subscribe_to_ctls(self._handle_ctl)
#The app still connects to XMPP as well, but only issues ping commands. #The app still connects to XMPP as well, but only issues ping commands.
#Everything works without XMPP, so leaving the below commented out. #Everything works without XMPP, so leaving the below commented out.
#self.xmpp = EcoVacsXMPP(user, domain, resource, secret, continent, vacuum, server_address) #self.xmpp = EcoVacsXMPP(user, domain, resource, secret, continent, vacuum, server_address)