gronod/ha_ecovacs_bumper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Stop capitilization adjustment on commands, allow None for args

Browse Source 
The capitalization adjustment was breaking any commands that required CamelCase, such as GetChargeState. Args are not needed for commands such as GetChargeState, so the xml will no longer build that array if it's set to None.
This commit is contained in:
Greg Laabs
2017-12-08 16:10:48 -08:00
parent 6450c31d43
commit 072db977ef
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sucks/__init__.py
+10 -8
View File
@@ -194,6 +194,7 @@ class VacBot(ClientXMPP):
def send_command(self, xml): def send_command(self, xml):
c = self.wrap_command(xml) c = self.wrap_command(xml)
logging.debug('Sending command {0}'.format(c))
c.send() c.send()
def wrap_command(self, ctl): def wrap_command(self, ctl):
@@ -227,7 +228,7 @@ class VacBot(ClientXMPP):
class VacBotCommand: class VacBotCommand:
def __init__(self, name, args, wait=None, terminal=False): def __init__(self, name, args=None, wait=None, terminal=False):
self.name = name self.name = name
self.args = args self.args = args
self.wait = wait self.wait = wait
@@ -239,9 +240,10 @@ class VacBotCommand:
time.sleep(self.wait) time.sleep(self.wait)
def to_xml(self): def to_xml(self):
ctl = ET.Element('ctl', {'td': self.name.capitalize()}) ctl = ET.Element('ctl', {'td': self.name})
inner = ET.Element(self.name, self.args) if self.args:
ctl.append(inner) inner = ET.Element(self.name, self.args)
ctl.append(inner)
return ctl return ctl
def __str__(self, *args, **kwargs): def __str__(self, *args, **kwargs):
@@ -253,17 +255,17 @@ class VacBotCommand:
class Clean(VacBotCommand): class Clean(VacBotCommand):
def __init__(self, wait): def __init__(self, wait):
super().__init__('clean', {'type': 'auto', 'speed': 'standard'}, wait) super().__init__('Clean', {'type': 'auto', 'speed': 'standard'}, wait)
class Edge(VacBotCommand): class Edge(VacBotCommand):
def __init__(self, wait): def __init__(self, wait):
super().__init__('clean', {'type': 'border', 'speed': 'strong'}, wait) super().__init__('Clean', {'type': 'border', 'speed': 'strong'}, wait)
class Charge(VacBotCommand): class Charge(VacBotCommand):
def __init__(self): def __init__(self):
super().__init__('charge', {'type': 'go'}, terminal=True) super().__init__('Charge', {'type': 'go'}, terminal=True)
def wait_for_completion(self, bot): def wait_for_completion(self, bot):
logging.debug("waiting in " + self.name) logging.debug("waiting in " + self.name)
@@ -275,7 +277,7 @@ class Charge(VacBotCommand):
class Stop(VacBotCommand): class Stop(VacBotCommand):
def __init__(self): def __init__(self):
super().__init__('clean', {'type': 'stop', 'speed': 'standard'}, terminal=True) super().__init__('Clean', {'type': 'stop', 'speed': 'standard'}, terminal=True)
def wait_for_completion(self, bot): def wait_for_completion(self, bot):
logging.debug("waiting in " + self.name) logging.debug("waiting in " + self.name)