Compare commits
No commits in common. "546795c2b6939c7f02215cb09fa864883c7d1b95" and "f57dfcfaf7ded8469510bff92de380b6079905a0" have entirely different histories.
546795c2b6
...
f57dfcfaf7
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -1,2 +1 @@
|
||||||
camera.json
|
camera.json
|
||||||
__pycache__
|
|
||||||
|
|
17
server.py
17
server.py
|
@ -76,10 +76,10 @@ class ControlQueue:
|
||||||
self._worker = threading.Thread(target=self.worker)
|
self._worker = threading.Thread(target=self.worker)
|
||||||
self._worker.start()
|
self._worker.start()
|
||||||
|
|
||||||
def put(self, command):
|
def put(self, filename):
|
||||||
if self.q.empty():
|
if self.q.empty():
|
||||||
self.camera.abort = False
|
self.camera.abort = False
|
||||||
self.q.put(command)
|
self.q.put(filename)
|
||||||
|
|
||||||
def join(self):
|
def join(self):
|
||||||
self.shutdown = True
|
self.shutdown = True
|
||||||
|
@ -120,18 +120,6 @@ class API(object):
|
||||||
json.dump(data, fd, indent=4)
|
json.dump(data, fd, indent=4)
|
||||||
return result
|
return result
|
||||||
|
|
||||||
def move(self, **data):
|
|
||||||
result = {}
|
|
||||||
if data.get('direction') in (
|
|
||||||
'LEFT', 'RIGHT', 'UP', 'DOWN',
|
|
||||||
'LEFT_UP', 'LEFT_DOWN',
|
|
||||||
'RIGHT_UP', 'RIGHT_DOWN',
|
|
||||||
'IN', 'OUT',
|
|
||||||
):
|
|
||||||
direction = getattr(ctl.camera, data['direction'])
|
|
||||||
ctl.camera.momentary(direction, float(data.get('duration', 1)))
|
|
||||||
return result
|
|
||||||
|
|
||||||
def stop(self, **data):
|
def stop(self, **data):
|
||||||
result = {}
|
result = {}
|
||||||
ctl.camera.abort = True
|
ctl.camera.abort = True
|
||||||
|
@ -220,7 +208,6 @@ def main():
|
||||||
'gzip': True,
|
'gzip': True,
|
||||||
}
|
}
|
||||||
app = Application(handlers, **options)
|
app = Application(handlers, **options)
|
||||||
print('listening on http://%s:%s/' % (ADDRESS, PORT))
|
|
||||||
app.listen(PORT, ADDRESS)
|
app.listen(PORT, ADDRESS)
|
||||||
|
|
||||||
main = IOLoop.instance()
|
main = IOLoop.instance()
|
||||||
|
|
|
@ -662,4 +662,5 @@ function init_shift() {
|
||||||
updateShiftStatus()
|
updateShiftStatus()
|
||||||
setInterval(updateShiftStatus, 5000)
|
setInterval(updateShiftStatus, 5000)
|
||||||
})
|
})
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user