nixo
/
tuhi
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wacom: switch two exceptions to a the protocol types 

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2019-08-21 16:33:23 +10:00
parent 0b8d3773d7
commit 354c84d750
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tuhi/wacom.py
View File

@ -24,7 +24,7 @@ from gi.repository import GObject
from .drawing import Drawing from .drawing import Drawing
from .uhid import UHIDDevice from .uhid import UHIDDevice
import tuhi.protocol import tuhi.protocol
from tuhi.protocol import NordicData, Interactions, Mode, ProtocolVersion, StrokeFile from tuhi.protocol import NordicData, Interactions, Mode, ProtocolVersion, StrokeFile, UnexpectedDataError
from .util import list2hex, flatten from .util import list2hex, flatten
from tuhi.config import TuhiConfig from tuhi.config import TuhiConfig
@ -865,7 +865,7 @@ class WacomProtocolSlate(WacomProtocolSpark):
pen_data = self.pen_data_buffer pen_data = self.pen_data_buffer
self.pen_data_buffer = [] self.pen_data_buffer = []
if crc != binascii.crc32(bytes(pen_data)): if crc != binascii.crc32(bytes(pen_data)):
raise WacomCorruptDataException("CRCs don't match") raise UnexpectedDataError(pen_data, message='CRCs do not match')
return pen_data return pen_data
@ -983,7 +983,7 @@ class WacomDevice(GObject.Object):
} }
if protocol not in protocols: if protocol not in protocols:
raise WacomCorruptDataException(f'Protocol "{protocol}" not implemented') raise NotImplementedError(f'Protocol "{protocol}" not implemented')
pclass = protocols[protocol] pclass = protocols[protocol]
self._wacom_protocol = pclass(self._device, self._uuid) self._wacom_protocol = pclass(self._device, self._uuid)