Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
9635c831a9
@ -11,8 +11,12 @@ class ModbusClient:
|
|||||||
# print(__name__, unit, str(r) + "-" + str(r + count - 1), "read", flush=True)
|
# print(__name__, unit, str(r) + "-" + str(r + count - 1), "read", flush=True)
|
||||||
return Readout([0] * count)
|
return Readout([0] * count)
|
||||||
|
|
||||||
def write_register(self, r, d, unit=None):
|
def write_register(self, register, data, unit=None, **kwargs):
|
||||||
print(__name__, unit, d, r, "write", flush=True)
|
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()
|
return Readout()
|
||||||
|
|
||||||
def close(self):
|
def close(self):
|
||||||
|
|||||||
@ -50,9 +50,10 @@ logging.basicConfig(
|
|||||||
|
|
||||||
try:
|
try:
|
||||||
# IMPORT PROJECT ONLY AFTER SETTING UP SIGNAL, FAULTHANDLER AND LOGGHING
|
# IMPORT PROJECT ONLY AFTER SETTING UP SIGNAL, FAULTHANDLER AND LOGGHING
|
||||||
from components import (ArchiveSynchronizer, NeoPixels, Os_Label_Printer,
|
from components import (ArchiveSynchronizer, GalaxyCamera, NeoPixels,
|
||||||
RemoteAPI, TecnaMarpossProvasetT3, TestComponent,
|
Os_Label_Printer, RemoteAPI,
|
||||||
Vision, VisionSaver)
|
TecnaMarpossProvasetT3, TestComponent, Vision,
|
||||||
|
VisionSaver)
|
||||||
from lib.db import Users
|
from lib.db import Users
|
||||||
from lib.helpers import ConfigReader
|
from lib.helpers import ConfigReader
|
||||||
from PyQt5.QtCore import QObject, QThread, pyqtSignal
|
from PyQt5.QtCore import QObject, QThread, pyqtSignal
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user