diff --git a/check_dio.sh b/check_dio.sh new file mode 100755 index 0000000..3762fe5 --- /dev/null +++ b/check_dio.sh @@ -0,0 +1 @@ +/opt/advantech/tools/dndev diff --git a/config/label_designs/PROTOTIPI/Etichetta TAB.nlbl b/config/label_designs/PROTOTIPI/Etichetta TAB.nlbl new file mode 100644 index 0000000..79cc47e Binary files /dev/null and b/config/label_designs/PROTOTIPI/Etichetta TAB.nlbl differ diff --git a/config/label_templates/label_interoperazione.prn b/config/label_templates/label_interoperazione.prn new file mode 100644 index 0000000..9436898 --- /dev/null +++ b/config/label_templates/label_interoperazione.prn @@ -0,0 +1,10 @@ +CT~~CD,~CC^~CT~ +^XA~TA000~JSN^LT0^MNW^MTT^PON^PMN^LH0,0^JMA^PR4,4~SD20^JUS^LRN^CI0^XZ +^XA +^MMT +^PW240 +^LL0128 +^LS0 +^BY1,3,60^FT3,89^BCN,,Y,N +^FD>:98FB080CP-20B{N11}^FS +^PQ1,0,1,Y^XZ 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 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/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..58d52f5 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 @@ -23,16 +23,16 @@ 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 -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] @@ -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/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] 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) 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