-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #78 from jamesremuscat/feature/datavideo-dvip
Support Datavideo DVIP protocol
- Loading branch information
Showing
9 changed files
with
503 additions
and
202 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| from avx.devices.Device import Device | ||
| from threading import Thread | ||
| from time import sleep | ||
|
|
||
| import socket | ||
|
|
||
|
|
||
| class TCPDevice(Device): | ||
| def __init__(self, deviceID, ipAddress, port, **kwargs): | ||
| super(TCPDevice, self).__init__(deviceID, *kwargs) | ||
| self.remote = (ipAddress, port) | ||
| self._recv_thread = None | ||
| self._connect_thread = None | ||
| self._isConnected = False | ||
| self.socket = None | ||
|
|
||
| def initialise(self): | ||
| self.socket = socket.socket() | ||
| self.socket.settimeout(1) | ||
| self._run_recv_thread = True | ||
|
|
||
| if not (self._connect_thread and self._connect_thread.is_alive()) and not self._isConnected: | ||
| self._connect_thread = Thread(target=self._connect) | ||
| self._connect_thread.daemon = True | ||
| self._connect_thread.start() | ||
|
|
||
| def _connect(self): | ||
| while not self._isConnected and self._run_recv_thread: | ||
| try: | ||
| self.socket.connect(self.remote) | ||
| if not (self._recv_thread and self._recv_thread.is_alive()): | ||
| self._recv_thread = Thread(target=self._receive) | ||
| self._recv_thread.daemon = True | ||
| self._recv_thread.start() | ||
| self._isConnected = True | ||
| except socket.error: | ||
| self.log.warn("Could not connect to {}, will retry.".format(self.remote)) | ||
| sleep(5) | ||
|
|
||
| def deinitialise(self): | ||
| self._run_recv_thread = False | ||
| self._isConnected = False | ||
| if self.socket: | ||
| self.socket.close() | ||
|
|
||
| def _receive(self): | ||
| while self._run_recv_thread: | ||
| try: | ||
| data = self.socket.recv(4096) | ||
| if data == '': | ||
| self.log.warn("Connection closed - attempting to reconnect") | ||
| sleep(5) | ||
| self.initialise() | ||
| else: | ||
| self.on_receive(data) | ||
| except socket.timeout: | ||
| pass | ||
|
|
||
| def send(self, data): | ||
| if self.socket: | ||
| self.socket.send(data) | ||
| else: | ||
| self.log.warn("Tried to send data without a socket: {}".format(data)) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| ''' | ||
| Created on 21 Mar 2018 | ||
| @author: james | ||
| ''' | ||
| from avx.devices.net import TCPDevice | ||
| from avx.devices.serial.SerialDevice import SerialDevice | ||
| from avx.devices.serial.VISCACamera import VISCACommandsMixin | ||
| from threading import Event, Lock, ThreadError | ||
|
|
||
|
|
||
| def _split_response(response_bytes): | ||
| packets = [] | ||
|
|
||
| remaining = map(ord, response_bytes[2:]) | ||
| while True: | ||
| try: | ||
| idx = remaining.index(0xFF) | ||
| packet, remaining = remaining[0:idx + 1], remaining[idx + 1:] | ||
| packets.append(packet) | ||
| except ValueError: | ||
| return packets | ||
|
|
||
|
|
||
| class DVIPCamera(TCPDevice, VISCACommandsMixin): | ||
|
|
||
| ACK_TIMEOUT = 0.25 # If we don't get an ack in this time, we're probably not getting one. | ||
|
|
||
| def __init__(self, deviceID, ipAddress, port=5002, **kwargs): | ||
| super(DVIPCamera, self).__init__(deviceID, ipAddress, port, **kwargs) | ||
| self._ack = Event() | ||
| self._await_response = Lock() | ||
| self._response_received = Event() | ||
| self._last_response = None | ||
|
|
||
| def on_receive(self, data): | ||
| self.log.debug("Received: {}".format(data.encode('hex_codec'))) | ||
| packets = _split_response(data) | ||
| for packet in packets: | ||
| response_type = (packet[1] & 0x70) >> 4 | ||
| if response_type in [4, 5, 6]: # 4 = ack, 5 = response, 6 = nack | ||
| try: | ||
| self._ack.set() | ||
| except ThreadError: | ||
| pass | ||
| if response_type == 5: | ||
| self._last_response = packet | ||
| self._response_received.set() | ||
|
|
||
| def sendVISCA(self, data): | ||
| self._ack.clear() | ||
| data_bytes = [0x81] + data + [0xFF] | ||
| length = len(data_bytes) + 2 | ||
|
|
||
| self.send( | ||
| SerialDevice.byteArrayToString([ | ||
| length >> 8, | ||
| length & 0xFF | ||
| ] + data_bytes) | ||
| ) | ||
| self._ack.wait(self.ACK_TIMEOUT) | ||
|
|
||
| def getVISCA(self, commandBytes): | ||
| with self._await_response: | ||
| self._response_received.clear() | ||
| self.sendVISCA(commandBytes) | ||
| self._response_received.wait() | ||
| response = self._last_response | ||
| self._last_response = None | ||
| self._response_received.clear() | ||
| return response |
Oops, something went wrong.