Merge remote-tracking branch 'origin/master'

check_dio.sh

@@ -0,0 +1 @@
+/opt/advantech/tools/dndev

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

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

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
 

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]

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]

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]

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]

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]

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]

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]

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]

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]

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)

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 src.components import Os_Label_Printer
-from lib.helpers import ConfigReader
+from src.lib.helpers import ConfigReader
 
-config = ConfigReader(system_id="vm")
+config = ConfigReader(system_id="st-ten-15")
 time =datetime.now()
 context = {
     # RECIPE DATA