From 739443299a983c0b35768f5419372c8b842c1060 Mon Sep 17 00:00:00 2001 From: neo-1 Date: Wed, 29 Jan 2025 17:14:14 +0100 Subject: [PATCH 1/4] st-ten-15 --- check_dio.sh | 0 config/label_templates/st-ten-15/MCLAREN_353.prn | 0 config/label_templates/st-ten-15/Mclaren_barcode.prn | 0 config/label_templates/st-ten-15/Mclaren_label.prn | 0 4 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 check_dio.sh create mode 100644 config/label_templates/st-ten-15/MCLAREN_353.prn create mode 100644 config/label_templates/st-ten-15/Mclaren_barcode.prn create mode 100644 config/label_templates/st-ten-15/Mclaren_label.prn diff --git a/check_dio.sh b/check_dio.sh new file mode 100644 index 0000000..e69de29 diff --git a/config/label_templates/st-ten-15/MCLAREN_353.prn b/config/label_templates/st-ten-15/MCLAREN_353.prn new file mode 100644 index 0000000..e69de29 diff --git a/config/label_templates/st-ten-15/Mclaren_barcode.prn b/config/label_templates/st-ten-15/Mclaren_barcode.prn new file mode 100644 index 0000000..e69de29 diff --git a/config/label_templates/st-ten-15/Mclaren_label.prn b/config/label_templates/st-ten-15/Mclaren_label.prn new file mode 100644 index 0000000..e69de29 From b524bc55c57789bf09b1f051e9c9877db725cd09 Mon Sep 17 00:00:00 2001 From: neo-1 Date: Thu, 30 Jan 2025 10:32:31 +0100 Subject: [PATCH 2/4] st-ten-15 --- check_dio.sh | 1 + config/machine_settings/hostnames.ini | 1 + config/machine_settings/st-ten-1-linux.ini | 2 +- config/machine_settings/st-ten-1.ini | 2 +- config/machine_settings/st-ten-10.ini | 2 +- config/machine_settings/st-ten-11.ini | 1 - config/machine_settings/st-ten-15.ini | 4 ++-- config/machine_settings/st-ten-8-no-io.ini | 2 +- config/machine_settings/st-ten-8.ini | 2 +- config/machine_settings/st-ten-9.ini | 2 +- config/machine_settings/test-windows.ini | 2 +- 11 files changed, 11 insertions(+), 10 deletions(-) mode change 100644 => 100755 check_dio.sh diff --git a/check_dio.sh b/check_dio.sh old mode 100644 new mode 100755 index e69de29..3762fe5 --- a/check_dio.sh +++ b/check_dio.sh @@ -0,0 +1 @@ +/opt/advantech/tools/dndev diff --git a/config/machine_settings/hostnames.ini b/config/machine_settings/hostnames.ini index 481d08c..5c4954e 100644 --- a/config/machine_settings/hostnames.ini +++ b/config/machine_settings/hostnames.ini @@ -13,5 +13,6 @@ st-ten-11: st-ten-11 st-ten-12: st-ten-12 st-ten-13: st-ten-13 st-ten-14: st-ten-14 +st-ten-15: st-ten-15 test-linux: test-linux diff --git a/config/machine_settings/st-ten-1-linux.ini b/config/machine_settings/st-ten-1-linux.ini index b88254e..053e3dc 100644 --- a/config/machine_settings/st-ten-1-linux.ini +++ b/config/machine_settings/st-ten-1-linux.ini @@ -28,7 +28,7 @@ port: COM5 [digital_io] # OUTPUT MAP FOR FIXTURE CONNECTOR -id_fixture: USB-5862,BID#0 +id: USB-5862,BID#0 discard_idx:12 # BIT NUMBER OF THE I/0 MODULE USED FOR DISCARD SENSING [recipe] diff --git a/config/machine_settings/st-ten-1.ini b/config/machine_settings/st-ten-1.ini index ad06098..fc7089c 100644 --- a/config/machine_settings/st-ten-1.ini +++ b/config/machine_settings/st-ten-1.ini @@ -35,7 +35,7 @@ port: COM5 [digital_io] # OUTPUT MAP FOR FIXTURE CONNECTOR -id_fixture: USB-5862,BID#0 +id: USB-5862,BID#0 discard_idx:12 # BIT NUMBER OF THE I/0 MODULE USED FOR DISCARD SENSING [recipe] diff --git a/config/machine_settings/st-ten-10.ini b/config/machine_settings/st-ten-10.ini index 5763be8..7be3608 100644 --- a/config/machine_settings/st-ten-10.ini +++ b/config/machine_settings/st-ten-10.ini @@ -42,7 +42,7 @@ ch2_led:5 # CHANNEL 2 ACTIVE INDICATOR flush_led:4 # FLUSH INDICATOR # OUTPUT MAP FOR FIXTURE CONNECTOR -id_fixture: USB-5862,BID#0 +id: USB-5862,BID#0 discard_idx:12 # BIT NUMBER OF THE I/0 MODULE USED FOR DISCARD SENSING [fixture_rfid] diff --git a/config/machine_settings/st-ten-11.ini b/config/machine_settings/st-ten-11.ini index ad60d6a..2fbb3f8 100644 --- a/config/machine_settings/st-ten-11.ini +++ b/config/machine_settings/st-ten-11.ini @@ -33,7 +33,6 @@ printer: zd421b [digital_io] # OUTPUT MAP FOR FIXTURE CONNECTOR id: USB-5862,BID#0 -id_fixture: USB-5862,BID#0 [fixture_rfid] diff --git a/config/machine_settings/st-ten-15.ini b/config/machine_settings/st-ten-15.ini index 4ecb424..a642d08 100644 --- a/config/machine_settings/st-ten-15.ini +++ b/config/machine_settings/st-ten-15.ini @@ -1,5 +1,5 @@ [machine] -description = ST-TEN-15 AUTOMATICO +description = ST-TEN-15 MCLAREN 2 instruction_folder = st-ten-15 image_for_warning= st-ten-15 @@ -32,7 +32,7 @@ printer: zd421 [digital_io] # OUTPUT MAP FOR FIXTURE CONNECTOR -id_fixture: USB-5860,BID#0 +id: USB-5860,BID#0 discard_idx:12 # BIT NUMBER OF THE I/0 MODULE USED FOR DISCARD SENSING [fixture_rfid] diff --git a/config/machine_settings/st-ten-8-no-io.ini b/config/machine_settings/st-ten-8-no-io.ini index 8f4ef7a..b4125d1 100644 --- a/config/machine_settings/st-ten-8-no-io.ini +++ b/config/machine_settings/st-ten-8-no-io.ini @@ -31,7 +31,7 @@ printer: zd421 [digital_io] # OUTPUT MAP FOR FIXTURE CONNECTOR -id_fixture: USB-5862,BID#0 +id: USB-5862,BID#0 discard_idx:12 # BIT NUMBER OF THE I/0 MODULE USED FOR DISCARD SENSING [digital_io_flush_blow] diff --git a/config/machine_settings/st-ten-8.ini b/config/machine_settings/st-ten-8.ini index aee058a..8baa206 100644 --- a/config/machine_settings/st-ten-8.ini +++ b/config/machine_settings/st-ten-8.ini @@ -31,7 +31,7 @@ printer: zd421 [digital_io] # OUTPUT MAP FOR FIXTURE CONNECTOR -id_fixture: USB-5862,BID#0 +id: USB-5862,BID#0 discard_idx:12 # BIT NUMBER OF THE I/0 MODULE USED FOR DISCARD SENSING [digital_io_flush_blow] diff --git a/config/machine_settings/st-ten-9.ini b/config/machine_settings/st-ten-9.ini index 9d2da62..7d17328 100644 --- a/config/machine_settings/st-ten-9.ini +++ b/config/machine_settings/st-ten-9.ini @@ -36,7 +36,7 @@ ch2_led:5 # CHANNEL 2 ACTIVE INDICATOR flush_led:4 # FLUSH INDICATOR # OUTPUT MAP FOR FIXTURE CONNECTOR -id_fixture: USB-5862,BID#0 +id: USB-5862,BID#0 discard_idx:12 # BIT NUMBER OF THE I/0 MODULE USED FOR DISCARD SENSING [fixture_rfid] diff --git a/config/machine_settings/test-windows.ini b/config/machine_settings/test-windows.ini index c1cea82..9fa38aa 100644 --- a/config/machine_settings/test-windows.ini +++ b/config/machine_settings/test-windows.ini @@ -35,7 +35,7 @@ port: COM5 [digital_io] # OUTPUT MAP FOR FIXTURE CONNECTOR -id_fixture: USB-5862,BID#0 +id: USB-5862,BID#0 discard_idx:12 # BIT NUMBER OF THE I/0 MODULE USED FOR DISCARD SENSING [recipe] From f1f5aef5c82cef95eae7a32b773c8b630ac2ec18 Mon Sep 17 00:00:00 2001 From: eduardo Date: Thu, 30 Jan 2025 10:34:38 +0100 Subject: [PATCH 3/4] labels --- .../label_designs/PROTOTIPI/Etichetta TAB.nlbl | Bin 0 -> 2869 bytes config/label_templates/label_interoperazione.prn | 10 ++++++++++ src/scripts/print_labels.py | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 config/label_designs/PROTOTIPI/Etichetta TAB.nlbl create mode 100644 config/label_templates/label_interoperazione.prn diff --git a/config/label_designs/PROTOTIPI/Etichetta TAB.nlbl b/config/label_designs/PROTOTIPI/Etichetta TAB.nlbl new file mode 100644 index 0000000000000000000000000000000000000000..79cc47ee2f80c26215927837853b0895fb766ac5 GIT binary patch literal 2869 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:98FB080CP-20B{N11}^FS +^PQ1,0,1,Y^XZ diff --git a/src/scripts/print_labels.py b/src/scripts/print_labels.py index da03acc..3d4ff4a 100644 --- a/src/scripts/print_labels.py +++ b/src/scripts/print_labels.py @@ -9,7 +9,7 @@ from src.lib.helpers import ConfigReader SYSTEM_ID = "test-windows" START_SN=1 STOP_SN=6 -TEMPLATE="ferrari_flag_qr_only.prn" +TEMPLATE="f_flag_qr_only.prn" PRINTER_NAME="zd421" PN="055015378" config = ConfigReader(system_id=SYSTEM_ID) From cf831dc19e9bb5fa40424cff459ea7c0d3cf9edf Mon Sep 17 00:00:00 2001 From: neo-1 Date: Thu, 30 Jan 2025 12:56:01 +0100 Subject: [PATCH 4/4] fix --- .../st-ten-15/label_interoperazione.prn | 27 +++++++++++++++++++ config/machine_settings/st-ten-15.ini | 6 ++--- src/test/label_printer.py | 6 ++--- 3 files changed, 33 insertions(+), 6 deletions(-) create mode 100644 config/label_templates/st-ten-15/label_interoperazione.prn diff --git a/config/label_templates/st-ten-15/label_interoperazione.prn b/config/label_templates/st-ten-15/label_interoperazione.prn new file mode 100644 index 0000000..9a713d9 --- /dev/null +++ b/config/label_templates/st-ten-15/label_interoperazione.prn @@ -0,0 +1,27 @@ +CT~~CD,~CC^~CT~ +^XA +~TA000 +~JSN +^LT0 +^MNW +^MTT +^PON +^PMN +^LH0,0 +^JMA +^PR4,4 +~SD20 +^JUS +^LRN +^CI27 +^PA0,1,1,0 +^XZ +^XA +^MMT +^PW240 +^LL128 +^LS0 +^FT166,35^BXI,4,200,0,0,1,_,1 +^FH\^FD98FB080CP-20B{DD}{MO}{YY}{SN5}^FS +^PQ1,0,1,Y +^XZ diff --git a/config/machine_settings/st-ten-15.ini b/config/machine_settings/st-ten-15.ini index a642d08..58d52f5 100644 --- a/config/machine_settings/st-ten-15.ini +++ b/config/machine_settings/st-ten-15.ini @@ -23,11 +23,11 @@ dual_channel: absent [tecna_t3] port: /dev/ttyUSB0 -model: t3p +model: t3l [label_printer] platform: linux -printer: zd421 +printer: ZTC-ZD421-203dpi-ZPL [digital_io] # OUTPUT MAP FOR FIXTURE CONNECTOR @@ -76,7 +76,7 @@ tempo_svuotamento_2: 0 pressione_svuotamento_2: 100 canale_di_prova_2: 2 modello_etichetta: EtichettaR5_Montaggio_1prova.prn -pid_pressure_correction: 105 +pid_pressure_correction: 100 istruzione_abilitata_extra: [autotest_leak] diff --git a/src/test/label_printer.py b/src/test/label_printer.py index 9c2d22c..f149fe0 100644 --- a/src/test/label_printer.py +++ b/src/test/label_printer.py @@ -2,10 +2,10 @@ import sys from datetime import datetime from PyQt5.QtWidgets import QApplication -from components import Os_Label_Printer -from lib.helpers import ConfigReader +from src.components import Os_Label_Printer +from src.lib.helpers import ConfigReader -config = ConfigReader(system_id="vm") +config = ConfigReader(system_id="st-ten-15") time =datetime.now() context = { # RECIPE DATA