Merge remote-tracking branch 'origin/master'

This commit is contained in:
neo-dl 2022-07-06 12:10:26 +02:00
commit 9635c831a9
2 changed files with 10 additions and 5 deletions

View File

@ -11,8 +11,12 @@ class ModbusClient:
# print(__name__, unit, str(r) + "-" + str(r + count - 1), "read", flush=True)
return Readout([0] * count)
def write_register(self, r, d, unit=None):
print(__name__, unit, d, r, "write", flush=True)
def write_register(self, register, data, unit=None, **kwargs):
print(__name__, unit, register, data, kwargs, "write", flush=True)
return Readout()
def write_registers(self, registers, data, unit=None, **kwargs):
print(__name__, unit, registers, data, kwargs, "write", flush=True)
return Readout()
def close(self):

View File

@ -50,9 +50,10 @@ logging.basicConfig(
try:
# IMPORT PROJECT ONLY AFTER SETTING UP SIGNAL, FAULTHANDLER AND LOGGHING
from components import (ArchiveSynchronizer, NeoPixels, Os_Label_Printer,
RemoteAPI, TecnaMarpossProvasetT3, TestComponent,
Vision, VisionSaver)
from components import (ArchiveSynchronizer, GalaxyCamera, NeoPixels,
Os_Label_Printer, RemoteAPI,
TecnaMarpossProvasetT3, TestComponent, Vision,
VisionSaver)
from lib.db import Users
from lib.helpers import ConfigReader
from PyQt5.QtCore import QObject, QThread, pyqtSignal