Merge branch 'master' into server-argument

This commit is contained in:
William Pietri
2017-12-22 00:36:27 -05:00
committed by GitHub
+1 -6
View File
@@ -135,7 +135,7 @@ class VacBot():
self.battery_status = None self.battery_status = None
self.xmpp = EcoVacsXMPP(user, domain, resource, secret, continent, server_address) self.xmpp = EcoVacsXMPP(user, domain, resource, secret, continent, server_address)
self.xmpp.register_callback("error", self._handle_error)
self.xmpp.subscribe_to_ctls(self._handle_ctl) self.xmpp.subscribe_to_ctls(self._handle_ctl)
def connect_and_wait_until_ready(self): def connect_and_wait_until_ready(self):
@@ -171,11 +171,6 @@ class VacBot():
logging.warning("Unknown charging status '" + report + "'") logging.warning("Unknown charging status '" + report + "'")
logging.debug("*** charge_status = " + self.charge_status) logging.debug("*** charge_status = " + self.charge_status)
def _handle_error(self, iq):
error = iq.find('{com:ctl}query/{com:ctl}ctl').get('error')
error_no = iq.find('{com:ctl}query/{com:ctl}ctl').get('errno')
logging.debug("*** error = " + error_no + " " + error)
def _vacuum_address(self): def _vacuum_address(self):
return self.vacuum['did'] + '@' + self.vacuum['class'] + '.ecorobot.net/atom' return self.vacuum['did'] + '@' + self.vacuum['class'] + '.ecorobot.net/atom'