From 9bf1dfd6e9a1d5b026f49ebf2a10d6f1e398aa96 Mon Sep 17 00:00:00 2001 From: j Date: Thu, 6 Dec 2018 13:24:45 +0100 Subject: [PATCH] cleanup --- camera.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/camera.py b/camera.py index e565381..959d4ad 100644 --- a/camera.py +++ b/camera.py @@ -228,13 +228,12 @@ class Camera: raise Exception('unknown preset %s' % id) preset = preset[0] i = preset['position'] - #info = etree_to_dict(xml.etree.ElementTree.fromstring(self.get('presets/%s' % id))) - #i = info['PTZPreset']['AbsoluteHigh'] if i['elevation'] < 0: i['elevation'] -= 1 i['azimuth'] += 1 print('goto preset', id, i['elevation'], i['azimuth'], i['absoluteZoom']) - return self.goto(i['elevation'], i['azimuth'], i['absoluteZoom'], pan=pan, tilt=tilt, zoom=zoom, zoom_last=zoom_last) + return self.goto(i['elevation'], i['azimuth'], i['absoluteZoom'], + pan=pan, tilt=tilt, zoom=zoom, zoom_last=zoom_last) def goto(self, elevation, azimuth, absoluteZoom, speed=1, pan=None, tilt=None, zoom=None, zoom_last=False): t0 = time.time() @@ -364,7 +363,6 @@ class Camera: def get_presets_xml(self): return self.get('presets') - def get_presets(self, details=False): system_presets = list(range(33, 47)) + list(range(90, 106)) presets = etree_to_list(xml.etree.ElementTree.fromstring(self.get('presets'))) @@ -377,6 +375,3 @@ class Camera: preset['position'] = preset.pop('AbsoluteHigh') preset['name'] = preset.pop('presetName') return presets - -#/PTZCtrl/channels//patterns//recordstart -#/PTZCtrl/channels//patterns//recordstop