From 241f669aa49e32bc0dfbe6d04bc5d9fbbdc2cd36 Mon Sep 17 00:00:00 2001 From: Utente Date: Sat, 1 Jul 2023 16:16:58 +0200 Subject: [PATCH] stten4 --- config/machine_settings/st-ten-4.ini | 13 +++-- src/components/tecna_marposs_provaset_t3.py | 8 +-- src/test/label_printerpreform.py | 55 +++++++++++++++++++++ 3 files changed, 65 insertions(+), 11 deletions(-) create mode 100644 src/test/label_printerpreform.py diff --git a/config/machine_settings/st-ten-4.ini b/config/machine_settings/st-ten-4.ini index b6a885e..b201a3f 100644 --- a/config/machine_settings/st-ten-4.ini +++ b/config/machine_settings/st-ten-4.ini @@ -3,26 +3,25 @@ description = ST-TEN-4 - REPARTO PREFORMATURA - MAPPANO [hardware_config] archive_synchronizer: present -; galaxy_camera: present -uvc_camera: present +uvc_camera: absent label_printer: present -neo_pixels: present +neo_pixels: absent remote_api: absent tecna_t3: present vision_saver: absent vision: absent -screwdriver: present +screwdriver: absent [tecna_t3] port: COM4 -model: t3l +model: t3p [neo_pixels] port: COM5 [label_printer] platform: windows -printer: zd420 +printer: zd421 [recipe] recipe_name_field: codice_ricetta @@ -69,7 +68,7 @@ filling_time: 10 settling_time: 10 settling_pressure_min_percent: 5 settling_pressure_max_percent: 5 -test_pressure: 7000 +test_pressure: 2000 test_time: 10 test_pressure_qpos: 5 #Q+ Upper test leak limit test_pressure_qneg: 15 #Q- Lower test leak limit diff --git a/src/components/tecna_marposs_provaset_t3.py b/src/components/tecna_marposs_provaset_t3.py index 93c45f2..b659e1b 100644 --- a/src/components/tecna_marposs_provaset_t3.py +++ b/src/components/tecna_marposs_provaset_t3.py @@ -24,7 +24,7 @@ class TecnaMarpossProvasetT3(ModbusComponent): elif self.model == "t3l": self.registers = t3l_registers else: - raise NotImplementedError(f"techna t3 model {self.model!r} not implemented.") + raise NotImplementedError(f"tecna t3 model {self.model!r} not implemented.") self.set_measure_units() self.units = self.get_measure_units() self.max_program_number = self.read("Max number of programs") @@ -67,7 +67,7 @@ class TecnaMarpossProvasetT3(ModbusComponent): }.items(): self.write(register, unit) # (decimals << 8) + unit) else: - raise NotImplementedError(f"techna t3 model {self.model!r} not implemented.") + raise NotImplementedError(f"tecna t3 model {self.model!r} not implemented.") def get_measure_units(self): units = {} @@ -105,7 +105,7 @@ class TecnaMarpossProvasetT3(ModbusComponent): for unit_name in unit_names: units[unit_name] = unit_spec else: - raise NotImplementedError(f"techna t3 model {self.model!r} not implemented.") + raise NotImplementedError(f"tecna t3 model {self.model!r} not implemented.") return units def _convert_from_format(self, data, formatting=None, decoding_map=None): @@ -305,7 +305,7 @@ class TecnaMarpossProvasetT3(ModbusComponent): "Pn - Nominal test pressure": step.spec["test_pressure"], }) else: - raise NotImplementedError(f"techna t3 model {self.model!r} not implemented.") + raise NotImplementedError(f"tecna t3 model {self.model!r} not implemented.") self.log.debug(str(spec)) for register, value in spec.items(): self.write(register, value) diff --git a/src/test/label_printerpreform.py b/src/test/label_printerpreform.py new file mode 100644 index 0000000..4d34bd6 --- /dev/null +++ b/src/test/label_printerpreform.py @@ -0,0 +1,55 @@ +import sys +from datetime import datetime +from PyQt5.QtWidgets import QApplication + +from components import Os_Label_Printer +from lib.helpers import ConfigReader + +config = ConfigReader(system_id="st-ten-4") +time =datetime.now() +context = { + # RECIPE DATA + "RECIPE": "000992752", + "PART": "000992752", + "TFILL": "5", + "TSET": "10", + "TTEST": "10", + "PSETMINP_A": "4750", + "PSETMAXP_A": "5250", + "PTEST": "5000", + "PMIN": "30", + "RESPSET": "5123", + "RESLEAK": "12.34", + "SN4": "1234", + # TIME DEFINITION + "DATETIME": time.strftime("%d/%m/%Y %H:%M:%S"), + "DATE": time.strftime("%d/%m/%Y"), + "TIME": time.strftime("%H:%M:%S"), + "YYYY": time.strftime("%Y"), + "YY": time.strftime("%y"), + "MO": time.strftime("%m"), + "DD": time.strftime("%d"), + "HH": time.strftime("%H"), + "MI": time.strftime("%M"), + "SS": time.strftime("%S"), + "JJJ": time.strftime("%j"), + # EXTRA DATA + "SHIFT": "1", + "STATION": "ST-TEN-1", + "OPERATOR": "MARIO", + "BADGE_NUM": "999", + +} + +app = QApplication(sys.argv) + +if "--extra" in sys.argv: + # TEST EXTRA PRINTER + printer = Os_Label_Printer(config=config, name="extra_label_printer") + printer.config_changed() + printer.print_label("MI1.prn") +else: + # TEST STANDARD PRINTER + printer = Os_Label_Printer(config=config, name="label_printer") + printer.config_changed() + printer.print_label("EtichettaR5_Montaggio_1prova.prn", context=context)