Merge branch 'release/0.0.4'

This commit is contained in:
Juergen Edelbluth 2019-01-18 20:15:31 +01:00
commit 62334a1c54
5 changed files with 21 additions and 8 deletions

4
.idea/encodings.xml Normal file
View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding" addBOMForNewFiles="with NO BOM" />
</project>

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.6 (raumklima)" project-jdk-type="Python SDK" />
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.7 (raumklima)" project-jdk-type="Python SDK" />
</project>

View File

@ -5,7 +5,7 @@
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<excludeFolder url="file://$MODULE_DIR$/venv" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="jdk" jdkName="Python 3.7 (raumklima)" jdkType="Python SDK" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
<component name="TestRunnerService">

View File

@ -1,9 +1,11 @@
language: python
dist: xenial
python:
- 3.5
- 3.6
- 3.7-dev
- 3.7
cache: pip

View File

@ -13,7 +13,7 @@ class Rs500Reader(object):
self.__vendor = vendor_id
self.__product = product_id
def __query(self) -> Optional[list]:
def __query(self) -> list:
try:
rs500_hid = hid.device()
rs500_hid.open(self.__vendor, self.__product)
@ -31,13 +31,20 @@ class Rs500Reader(object):
rs500_hid.close()
return data
except IOError as e:
print(e, file=stderr)
return None
print(
'Lesefehler beim Lesen von des HID Devices: "{}"; entweder ist die Hardware nicht vorhanden oder '
'defekt, oder es liegt ein Rechteproblem vor.'.format(e),
file=stderr
)
raise
def get_data(self) -> Optional[Response]:
data = self.__query()
try:
data = self.__query()
except IOError:
return None
if len(data) != 64:
print('ungültige Länge: ' + len(data), file=stderr)
print('ungültige Länge: {}'.format(len(data)), file=stderr)
return None
response = Response()
channel = 0