From d7c1123fc63fd9ae0c3956738dfcf5d7ae2175b1 Mon Sep 17 00:00:00 2001 From: eduardo Date: Mon, 24 Mar 2025 10:57:39 +0100 Subject: [PATCH 1/4] texa label --- config/label_templates/203/Texa30x16.prn | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 config/label_templates/203/Texa30x16.prn diff --git a/config/label_templates/203/Texa30x16.prn b/config/label_templates/203/Texa30x16.prn new file mode 100644 index 0000000..6ab206c --- /dev/null +++ b/config/label_templates/203/Texa30x16.prn @@ -0,0 +1,14 @@ +CT~~CD,~CC^~CT~ +^XA~TA000~JSN^LT0^MNW^MTT^PON^PMN^LH0,0^JMA^PR2,2~SD20^JUS^LRN^CI0^XZ +^XA +^MMT +^PW256 +^LL0144 +^LS0 +^FT139,128^BQN,2,4 +^FH\^FDLA,{BCODE}^FS +^FT19,40^A0N,23,21^FH\^FD{PART}^FS +^FT19,71^A0N,23,21^FH\^FDNr.{SN5}^FS +^FT19,101^A0N,23,21^FH\^FD{DATE}^FS +^FT19,126^A0N,23,21^FH\^FD{TIME}^FS +^PQ1,0,1,Y^XZ From ef3f3d57a3c5b414be627162c44f3bf9d5af04fa Mon Sep 17 00:00:00 2001 From: eduardo Date: Mon, 24 Mar 2025 11:30:29 +0100 Subject: [PATCH 2/4] texa label --- config/label_designs/TEXA/TEXA30X16.nlbl | Bin 0 -> 2986 bytes config/label_templates/203/Texa30x16.prn | 17 +++++++---------- 2 files changed, 7 insertions(+), 10 deletions(-) create mode 100644 config/label_designs/TEXA/TEXA30X16.nlbl diff --git a/config/label_designs/TEXA/TEXA30X16.nlbl b/config/label_designs/TEXA/TEXA30X16.nlbl new file mode 100644 index 0000000000000000000000000000000000000000..ac1d884106484c043be3dc5657869b53dd1fce79 GIT binary patch literal 2986 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 Date: Mon, 24 Mar 2025 13:12:13 +0100 Subject: [PATCH 3/4] DEV TEXA --- config/label_templates/203/Texa30x16.prn | 4 +-- src/components/os_label_printer.py | 1 - src/scripts/print_labels.py | 34 +++++++++++++----------- src/ui/test/test.py | 2 ++ 4 files changed, 22 insertions(+), 19 deletions(-) diff --git a/config/label_templates/203/Texa30x16.prn b/config/label_templates/203/Texa30x16.prn index 29be5f1..42d7e3b 100644 --- a/config/label_templates/203/Texa30x16.prn +++ b/config/label_templates/203/Texa30x16.prn @@ -5,7 +5,7 @@ ^PW240 ^LL0128 ^LS0 -^FT6,19^A0N,13,12^FH\^FDF{SUPPLY}C{PART}D{YY}{WW}S{SN7}^FS -^BY70,70^FT81,101^BXN,5,200,0,0,1,~ +^FT6,35^A0N,17,17^FH\^FDF{SUPPLY}C{PART}D{YY}{WW}S{SN7}^FS +^BY70,70^FT71,131^BXN,5,200,0,0,1,~ ^FH\^FD{BCODE}^FS ^PQ1,0,1,Y^XZ diff --git a/src/components/os_label_printer.py b/src/components/os_label_printer.py index 0226428..f754f7c 100644 --- a/src/components/os_label_printer.py +++ b/src/components/os_label_printer.py @@ -55,7 +55,6 @@ class Os_Label_Printer(Component): label_file_contents = f.read() # LABEL PRINT #label = label.format(**context) - label_file_contents = label_file_contents.replace("{BCODE}", "{YY}{MO}{DD}{HH}{MI}{SN6}") for key, val in context.items(): key = "{" + key + "}" label_file_contents = label_file_contents.replace(key, val) diff --git a/src/scripts/print_labels.py b/src/scripts/print_labels.py index 3d4ff4a..3f44460 100644 --- a/src/scripts/print_labels.py +++ b/src/scripts/print_labels.py @@ -6,30 +6,27 @@ from PyQt5.QtWidgets import QApplication from src.components.os_label_printer import * from src.lib.helpers import ConfigReader -SYSTEM_ID = "test-windows" -START_SN=1 -STOP_SN=6 -TEMPLATE="f_flag_qr_only.prn" -PRINTER_NAME="zd421" -PN="055015378" +SYSTEM_ID = "test-linux" +START_SN = 1 +STOP_SN = 6 +TEMPLATE = "Texa30x16.prn" +PRINTER_NAME = "zd421" +PN = "3918423" config = ConfigReader(system_id=SYSTEM_ID) -printer=Os_Label_Printer(config=config,name="label_printer") +printer = Os_Label_Printer(config=config, name="label_printer") +barcode_format = "F{SUPPLY}C{PART}D{YY}{WW}S{SN7}" - -# timenow = datetime.now() app = QApplication(sys.argv) -for sn in range(START_SN,STOP_SN+1): +for sn in range(START_SN, STOP_SN + 1): timenow = datetime.now() print(f"PRINTING LABEL # {sn}") context = { - # RECIPE DATA "PART": PN, - # SERIAL DEFINITION "SN": str(sn), "SN4": f"{sn:0>4}", "SN5": f"{sn:0>5}", "SN6": f"{sn:0>6}", - # TIME DEFINITION + "SN7": f"{sn:0>7}", "DATETIME": timenow.strftime("%d/%m/%Y %H:%M:%S"), "DATE": timenow.strftime("%d/%m/%Y"), "TIME": timenow.strftime("%H:%M:%S"), @@ -41,7 +38,12 @@ for sn in range(START_SN,STOP_SN+1): "MI": timenow.strftime("%M"), "SS": timenow.strftime("%S"), "JJJ": timenow.strftime("%j"), + "WW": timenow.strftime("%W"), + "SUPPLY": "10231", } - printer.print_label(TEMPLATE,context) - - time.sleep(1) \ No newline at end of file + formatted_barcode = barcode_format.format(**context) + context['BCODE'] = formatted_barcode + + printer.print_label(TEMPLATE, context) + + time.sleep(1) diff --git a/src/ui/test/test.py b/src/ui/test/test.py index f0f6e62..74bf411 100755 --- a/src/ui/test/test.py +++ b/src/ui/test/test.py @@ -794,6 +794,7 @@ class Test(Widget): "SN4": f"{archived.id:0>4}", "SN5": f"{archived.id:0>5}", "SN6": f"{archived.id:0>6}", + "SN7": f"{archived.id:0>7}", # TIME DEFINITION "DATETIME": archived.time.strftime("%d/%m/%Y %H:%M:%S"), "DATE": archived.time.strftime("%d/%m/%Y"), @@ -806,6 +807,7 @@ class Test(Widget): "MI": archived.time.strftime("%M"), "SS": archived.time.strftime("%S"), "JJJ": archived.time.strftime("%j"), + "WW": archived.time.strftime("%W"), # EXTRA DATA "SHIFT": str(get_shift(archived.time)), "STATION": str(self.config.machine_id), From c22ca85f4dc10c49600afa2bc891e32277d35b8c Mon Sep 17 00:00:00 2001 From: st-ten-13 Date: Tue, 25 Mar 2025 09:54:52 +0100 Subject: [PATCH 4/4] fix label & modbus --- config/machine_settings/st-ten-13.ini | 8 ++++---- src/ui/test/test.py | 3 ++- src/ui/test_leak/test_leak.py | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/config/machine_settings/st-ten-13.ini b/config/machine_settings/st-ten-13.ini index f00d44f..f2eece2 100644 --- a/config/machine_settings/st-ten-13.ini +++ b/config/machine_settings/st-ten-13.ini @@ -20,7 +20,7 @@ discard_box: absent #enforce_piece_removal: yes [tecna_t3] -port: /dev/ttyUSB1 +port: /dev/ttyUSB0 model: t3l [label_printer] @@ -34,7 +34,7 @@ risoluzione:203 id: USB-5862,BID#0 [fixture_rfid] -port: ttyUSB0 #correct way to declare usb in linux +port: ttyUSB1 #correct way to declare usb in linux [recipe] recipe_name_field: codice_ricetta @@ -87,8 +87,8 @@ settling_pressure_min_percent: 5 settling_pressure_max_percent: 5 test_pressure: 5900 test_time: 10 -test_pressure_qpos: 3.5 #Q+ Upper test leak limit -test_pressure_qneg: 6.5 #Q- Lower test leak limit +test_pressure_qpos: 4.5 #Q+ Upper test leak limit +test_pressure_qneg: 7.3 #Q- Lower test leak limit test_pressure_tt_qpos: 1 # Q+ Upper test leak limit (tube-tube) test_pressure_tt_qneg: 5 # Q- Lower test leak limit (tube-tube) flush_time: 1 diff --git a/src/ui/test/test.py b/src/ui/test/test.py index 74bf411..4dcb552 100755 --- a/src/ui/test/test.py +++ b/src/ui/test/test.py @@ -827,7 +827,8 @@ class Test(Widget): barcode_format = self.print_step.spec.get("barcode", "-") self.printed_barcode = barcode_format.format_map(context) - self.archived.barcode = self.printed_barcode + if self.archived is not None: + self.archived.barcode = self.printed_barcode for n in range(5): diff --git a/src/ui/test_leak/test_leak.py b/src/ui/test_leak/test_leak.py index c26b3f3..1c37eb1 100644 --- a/src/ui/test_leak/test_leak.py +++ b/src/ui/test_leak/test_leak.py @@ -26,7 +26,7 @@ class Test_Leak(Test_Test): self.show_instruction_b.setVisible("show_instructions" in self.parent.config["hardware_config"].keys()) self.show_instruction_b.clicked.connect(self.show_instruction) - self.components[self.tester_component].tecna_error_signal.connect(self.handle_modbus_error) + #self.components[self.tester_component].tecna_error_signal.connect(self.handle_modbus_error) def show_instruction(self): dialog=Dialog()