This commit is contained in:
neo-dl 2023-06-23 19:25:41 +02:00
parent 79d99bd718
commit 2e6f3840e3
5 changed files with 40 additions and 14 deletions

View File

@ -31,8 +31,6 @@ platform: windows
printer: zd420
[recipes_defaults]
codice_ricetta: specificare ricetta
cliente: IVECO
part_number: specificare part number

View File

@ -16,11 +16,11 @@ class ModbusClient:
return Readout([0] * count)
def write_register(self, register, data, unit=None, **kwargs):
self.log.debug(f"{unit}->{register} ({kwargs}) write: {data}, ", flush=True)
self.log.debug(f"{unit}->{register} ({kwargs}) write: {data}, ")
return Readout()
def write_registers(self, registers, data, unit=None, **kwargs):
self.log.debug(f"{unit}->{registers} ({kwargs}) write: {data}, ", flush=True)
self.log.debug(f"{unit}->{registers} ({kwargs}) write: {data}, ")
return Readout()
def close(self):

View File

@ -3,6 +3,7 @@ import sys
import platform
from PyQt5.QtCore import QMutex, Qt, QTimer, pyqtSlot, pyqtSignal
from .component import Component
import ndef
import nfc
from nfc.clf import RemoteTarget
@ -10,7 +11,7 @@ from nfc.clf import RemoteTarget
class RFID_PN532(Component):
new_id_signal = pyqtSignal()
new_id_signal = pyqtSignal(str)
def __init__(self, config=None, name=None, period=1, lazy=True, paused=False, threaded=True):
super().__init__(config=config, name=name, period=period, lazy=lazy, paused=paused, threaded=threaded)
self.mutex = QMutex()
@ -20,13 +21,14 @@ class RFID_PN532(Component):
self.tag_present=False
self.current_data=None
self.is_win = platform.system() == "Windows"
self.dev_list = ["tty:USB0:pn532","tty:USB1:pn532"] if self.is_win else [f"{self.config['fixture_rfid']['port']}:pn532"]
self.dev_list = [f"{self.config['fixture_rfid']['port']}:pn532"] if self.is_win else ['tty:USB0:pn532','tty:USB1:pn532']
self._period = 1
def open_device(self):
clf = nfc.ContactlessFrontend()
self.clf = nfc.ContactlessFrontend()
for dev in self.dev_list:
connected = clf.open(dev)
if connected:
self.connected = self.clf.open(dev)
if self.connected:
self.log.info(f"CONNECTED TO {dev}")
break
else:
@ -40,7 +42,7 @@ class RFID_PN532(Component):
super().start()
@pyqtSlot()
def get(self):
def _get(self):
try:
if not self.connected:
self.open_device()
@ -62,6 +64,5 @@ class RFID_PN532(Component):
self.log.debug("no target present")
except Exception as e:
self.log.exception(f"{e}")
self.log.info(f"{e}")
self.connected = False

View File

@ -44,7 +44,7 @@ logging.basicConfig(
format="{asctime}:{name}:{levelname}:{message}",
datefmt="%Y-%m-%dT%H-%M-%S%z",
style="{",
level="INFO",
level="DEBUG" if "--debug" in sys.argv else "INFO",
handlers=[
logging.StreamHandler(stream=sys.stderr),
logging.FileHandler(
@ -103,7 +103,7 @@ try:
"screwdriver": {"c": TecnaScrewdriver, "k": {"paused": True}},
"tecna_t3": {"c": TecnaMarpossProvasetT3, "k": {"paused": True}},
"digital_io":{"c":USB_586x,"k":{"paused":True}},
"fixture_id":{"c":RFID_PN532,"k":{"paused":False}},
"fixture_id":{"c":RFID_PN532,"k":{"paused":False, "lazy":False}},
}
# VISION COMPONENT IS OPTIONAL AND DISABLED BY DEFAULT
if "--vision" in sys.argv:

View File

@ -1,8 +1,35 @@
import logging
import sys
import time
from datetime import datetime
from pathlib import Path
import serial
import ndef
import nfc
from nfc.clf import RemoteTarget
logging.basicConfig(
format="{asctime}:{name}:{levelname}:{message}",
datefmt="%Y-%m-%dT%H-%M-%S%z",
style="{",
level="INFO",
handlers=[
logging.StreamHandler(stream=sys.stderr),
logging.FileHandler(
Path("data/logs") / f"{datetime.now().isoformat().replace(':', '_')}.log",
mode="a",
encoding="utf-8",
delay=False,
**({"errors": "surrogateescape"} if sys.version_info.major >= 3 and sys.version_info.minor >= 10 else {}),
),
],
force=True,
**({"encoding": "utf-8"} if sys.version_info.major >= 3 and sys.version_info.minor >= 10 else {}),
**({"errors": "surrogateescape"} if sys.version_info.major >= 3 and sys.version_info.minor >= 10 else {}),
)
connected=False
while True:
try: