diff --git a/.veles_metadata b/.veles_metadata new file mode 100644 index 0000000..e69de29 diff --git a/src/veles/__init__.py b/src/veles/__init__.py index 11b0782..d948faf 100644 --- a/src/veles/__init__.py +++ b/src/veles/__init__.py @@ -1 +1 @@ -from . import devices +from . import device diff --git a/src/veles/devices/__init__.py b/src/veles/device/__init__.py similarity index 100% rename from src/veles/devices/__init__.py rename to src/veles/device/__init__.py diff --git a/src/veles/devices/find.py b/src/veles/device/find.py similarity index 100% rename from src/veles/devices/find.py rename to src/veles/device/find.py diff --git a/src/veles/devices/generic.py b/src/veles/device/generic.py similarity index 92% rename from src/veles/devices/generic.py rename to src/veles/device/generic.py index 83ae9d3..1097c6c 100644 --- a/src/veles/devices/generic.py +++ b/src/veles/device/generic.py @@ -1,6 +1,7 @@ """Module containing classes for generic wired/wireless devices""" from dataclasses import dataclass -from typing import Dict, Final +from typing import Dict, Final, Any +from abc import ABC, abstractmethod import minimalmodbus import serial @@ -26,8 +27,17 @@ class ReadoutErrorCounter: no_response: int = 0 -class Device: - """Base class for all devices""" +class Device(ABC): + """ + Base class for all devices + """ + + @abstractmethod + def get_data(self) -> Dict[str:Any]: + """ + Get dict with all data from sensor; + used for logging purposes + """ class ModbusRTUDevice(Device): @@ -89,7 +99,8 @@ class ModbusRTUDevice(Device): return ( self.comm_device.read_register( register_offset, 1, functioncode=function_code, signed=signed - ) * 10 + ) + * 10 ) except minimalmodbus.NoResponseError as exception: last_exception = exception @@ -158,5 +169,7 @@ class ModbusRTUDevice(Device): Return serial number """ serial_number_1 = self.device_code - serial_number_2 = int(self.read_register(self.input_registers["SERIAL_NUMBER_2"])) + serial_number_2 = int( + self.read_register(self.input_registers["SERIAL_NUMBER_2"]) + ) return (serial_number_1 << 16) + serial_number_2 diff --git a/src/veles/devices/sensor_wired_IAQ.py b/src/veles/device/sensor_wired_IAQ.py similarity index 100% rename from src/veles/devices/sensor_wired_IAQ.py rename to src/veles/device/sensor_wired_IAQ.py diff --git a/src/veles/devices/sensor_wired_RHT.py b/src/veles/device/sensor_wired_RHT.py similarity index 100% rename from src/veles/devices/sensor_wired_RHT.py rename to src/veles/device/sensor_wired_RHT.py