Merge remote-tracking branch 'origin/master'

# Conflicts:
#	config/instruction_images/st-ten-5/5803036734.svg
#	config/instruction_images/st-ten-5/5803036735.svg

config/instruction_images/st-ten-11/DEFAULT.svg

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="1200"
+   height="700"
+   viewBox="0 0 1200 700"
+   version="1.1"
+   id="svg5"
+   xml:space="preserve"
+   inkscape:version="1.2.2 (1:1.2.2+202212051550+b0a8486541)"
+   sodipodi:docname="DEFAULT.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><sodipodi:namedview
+     id="namedview7"
+     pagecolor="#505050"
+     bordercolor="#eeeeee"
+     borderopacity="1"
+     inkscape:showpageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#505050"
+     inkscape:document-units="mm"
+     showgrid="false"
+     inkscape:zoom="1.0570734"
+     inkscape:cx="365.15913"
+     inkscape:cy="357.59106"
+     inkscape:window-width="2560"
+     inkscape:window-height="1023"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1" /><defs
+     id="defs2" /><g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"><text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ff7f2a;fill-opacity:1;stroke:#aa4400"
+       x="277.31964"
+       y="373.9111"
+       id="text226"><tspan
+         sodipodi:role="line"
+         id="tspan224"
+         x="277.31964"
+         y="373.9111"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:53.3333px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;stroke:#aa4400;fill:#ff7f2a">DISEGNO NON DISPONIBILE</tspan></text></g></svg>

config/instruction_images/st-ten-5/5803034027.svg

@@ -8,7 +8,7 @@
    version="1.1"
    id="svg5"
    xml:space="preserve"
-   inkscape:version="1.3.2 (1:1.3.2+202311252150+091e20ef0f)"
+   inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)"
    sodipodi:docname="5803034027.svg"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
@@ -29,12 +29,12 @@
      inkscape:document-units="mm"
      showgrid="false"
      inkscape:zoom="0.74746377"
-     inkscape:cx="557.21764"
-     inkscape:cy="157.86718"
-     inkscape:window-width="2490"
-     inkscape:window-height="1016"
-     inkscape:window-x="70"
-     inkscape:window-y="27"
+     inkscape:cx="556.54871"
+     inkscape:cy="158.53611"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
      inkscape:window-maximized="1"
      inkscape:current-layer="layer1" /><metadata
      id="metadata11"><rdf:RDF><cc:Work
@@ -55,20 +55,10 @@
        xlink:href="img/arw-yel-down.png"
        inkscape:label="sensor_4"
        inkscape:svg-dpi="1"
-       y="276.89706"
-       x="473.19138"
+       y="185.92274"
+       x="324.68918"
        id="sensor_4"
        preserveAspectRatio="none"
        height="62.298107"
-       width="64.190125" /><image
-       xlink:href="img/arw-yel-down.png"
-       inkscape:label="sensor_3"
-       inkscape:svg-dpi="1"
-       y="195.4939"
-       x="325.5499"
-       id="sensor_3"
-       preserveAspectRatio="none"
-       height="62.298107"
        width="64.190125"
-       inkscape:transform-center-x="111.41632"
-       inkscape:transform-center-y="16.838762" /></g></svg>
+       style="stroke-width:1.00157;stroke-dasharray:none" /></g></svg>

config/instruction_images/st-ten-5/5803034028.svg

@@ -53,15 +53,6 @@
        x="-69.333839"
        y="-24.57136" /><image
        xlink:href="img/arw-yel-down.png"
-       inkscape:label="sensor_4"
-       inkscape:svg-dpi="1"
-       y="169.13637"
-       x="497.30814"
-       id="sensor_4"
-       preserveAspectRatio="none"
-       height="62.298107"
-       width="64.190125" /><image
-       xlink:href="img/arw-yel-down.png"
        inkscape:label="sensor_3"
        inkscape:svg-dpi="1"
        y="97.074028"

config/instruction_images/st-ten-5/5803036733.svg

@@ -54,15 +54,6 @@
        preserveAspectRatio="none"
        height="62.298107"
        width="64.190125" />
-    <image
-       xlink:href="img/arw-yel-down.png"
-       inkscape:label="sensor_4"
-       inkscape:svg-dpi="1"
-       y="46.962872"
-       x="749.03607"
-       id="sensor_4"
-       preserveAspectRatio="none"
-       height="62.298107"
-       width="64.190125" />
+
   </g>
 </svg>

config/instruction_images/st-ten-5/5803036742.svg

@@ -94,16 +94,6 @@
        preserveAspectRatio="none"
        height="62.298107"
        width="64.190125" />
-    <image
-       xlink:href="img/arw-yel-down.png"
-       inkscape:label="sensor_5"
-       inkscape:svg-dpi="1"
-       y="19.962202"
-       x="854.75916"
-       id="sensor_5"
-       preserveAspectRatio="none"
-       height="62.298107"
-       width="64.190125" />
     <image
        xlink:href="img/arw-yel-down.png"
        inkscape:label="sensor_4"
@@ -114,15 +104,5 @@
        preserveAspectRatio="none"
        height="62.298107"
        width="64.190125" />
-    <image
-       xlink:href="img/arw-yel-down.png"
-       inkscape:label="sensor_6"
-       inkscape:svg-dpi="1"
-       y="148.2662"
-       x="825.11084"
-       id="sensor_6"
-       preserveAspectRatio="none"
-       height="62.298107"
-       width="64.190125" />
   </g>
 </svg>

config/machine_settings/hostnames.ini

@@ -9,3 +9,4 @@ st-ten-7: st-ten-7
 st-ten-8: st-ten-8
 ST-TEN-9: st-ten-9
 st-ten-10: st-ten-10
+st-ten-11: st-ten-11

config/machine_settings/st-ten-1.ini

@@ -5,23 +5,31 @@ image_for_warning= st-ten-1
 
 [hardware_config]
 archive_synchronizer: present
-# galaxy_camera: present
-uvc_camera: present
+galaxy_camera: absent
+uvc_camera: absent
 label_printer: present
-neo_pixels: present
+neo_pixels: absent
 remote_api: absent
 tecna_t3: present
-vision_saver: present
-vision: present
-screwdriver: present
+vision_saver: absent
+vision: absent
+screwdriver: absent
+fixture_id: present
+digital_io: present
+external_flush_blow: absent
 
 [tecna_t3]
 port: COM4
 model: t3l
 
-[neo_pixels]
+[fixture_rfid]
 port: COM5
 
+[digital_io]
+# OUTPUT MAP FOR FIXTURE CONNECTOR
+id_fixture: USB-5862,BID#0
+discard_idx:12 # BIT NUMBER OF THE I/0 MODULE USED FOR DISCARD SENSING
+
 [recipe]
 recipe_name_field: codice_ricetta
 part_number_field: codice_prodotto
@@ -33,6 +41,7 @@ platform: windows
 printer: zd420
 
 [recipes_defaults]
+tester_discharge_enable: yes
 codice_ricetta: specificare ricetta
 cliente: IVECO
 part_number: specificare part number
@@ -89,7 +98,7 @@ settling_pressure_max_percent: 5
 test_pressure: 7000
 test_time: 10
 test_pressure_qpos: 10 #Q+ Upper test leak limit
-test_pressure_qneg: 20 #Q- Lower test leak limit
+test_pressure_qneg: 30 #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

config/machine_settings/st-ten-10.ini

@@ -48,12 +48,13 @@ discard_idx:12 # BIT NUMBER OF THE I/0 MODULE USED FOR DISCARD SENSING
 port: COM5
 
 [recipe]
-recipe_name_field: cod semilavorato raccordato e cablato
-part_number_field: cod finito cliente
-label_template_field: etichetta interoperazionale
+recipe_name_field: cod finito cliente
+part_number_field: cod finito r5
 barcode_enable_field: verifica_codice_a_barre_abilitata
 barcode_serial_field: barcode_input_guaina
+label_template_field: etichetta interoperazionale
 warning_image_field: immagine_guaina
+description_field: cod semilavorato costampato
 #R56400/1-19032400265
 #R56411/1-19032400265
 #R56500/1-19032400265

config/machine_settings/st-ten-11.ini

@@ -0,0 +1,93 @@
+[machine]
+description = ST-TEN-11 AUTOMATICO
+instruction_folder = st-ten-11
+image_for_warning= st-ten-11
+
+[hardware_config]
+archive_synchronizer: present
+uvc_camera: absent
+label_printer: present
+neo_pixels: absent
+remote_api: absent
+tecna_t3: present
+vision_saver: absent
+vision: absent
+screwdriver: absent
+digital_io: present
+barcode_recipe_selection: present
+fixture_id: present
+discard_box: absent
+enforce_piece_removal: yes
+
+[tecna_t3]
+port: COM4
+model: t3p
+
+[label_printer]
+platform: windows
+printer: zd421
+
+[digital_io]
+# OUTPUT MAP FOR FIXTURE CONNECTOR
+id: USB-5862,BID#0
+
+[fixture_rfid]
+port: COM5
+
+[recipe]
+recipe_name_field: codice_ricetta
+part_number_field: codice_prodotto
+label_template_field: modello_etichetta
+description_field: descrizione
+
+[recipes_defaults]
+tester_discharge_enable: yes
+dimensione_lotto_abilitata: x
+tempo_pre_riempimento: 0
+pressione_pre_riempimento: 1000
+tempo_riempimento: 15
+tempo_assestamento: 15
+tempo_di_test: 10
+n_componenti:1
+percentuale_minima_pressione_assestamento: 5
+percentuale_massima_pressione_assestamento: 5
+pressione_di_test_delta_minimo: 30
+pressione_di_test: 7000
+pressione_di_test_delta_massimo: 30
+tempo_svuotamento: 0
+pressione_svuotamento: 100
+canale_di_prova: 1
+prova_tenuta_abilitata_2:
+tempo_pre_riempimento_2: 0
+pressione_pre_riempimento_2: 1000
+tempo_riempimento_2: 20
+tempo_assestamento_2: 20
+tempo_di_test_2: 10
+percentuale_minima_pressione_assestamento_2: 5
+percentuale_massima_pressione_assestamento_2: 5
+pressione_di_test_delta_minimo_2: 30
+pressione_di_test_2: 15000
+pressione_di_test_delta_massimo_2: 30
+tempo_svuotamento_2: 0
+pressione_svuotamento_2: 100
+canale_di_prova_2: 2
+modello_etichetta: EtichettaR5_Montaggio_1prova.prn
+pid_pressure_correction: 105
+
+[autotest_leak]
+enabled: true
+pre_filling_time: 0
+pre_filling_pressure: 1000
+filling_time: 10
+settling_time: 10
+settling_pressure_min_percent: 5
+settling_pressure_max_percent: 5
+test_pressure: 7000
+test_time: 10
+test_pressure_qpos: 10 #Q+ Upper test leak limit
+test_pressure_qneg: 30 #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
+flush_pressure: 100
+relay_config: 1

src/requirements.txt

@@ -17,7 +17,8 @@ pyserial
 pyserial-asyncio
 qrcode
 requests
-tensorflow
+#tensorflow
 #tflite-runtime
 zebra
 pylibdmtx~=0.1.10
+pandas~=1.3.3

src/ui/test_instructions/test_instructions.py

@@ -63,18 +63,44 @@ class Test_Instructions(Test_Test):
         self.done = False
         return show
 
-    def toggle_icons(self):
+    def toggle_icons(self, step=None):
+        self.flag = not self.flag
 
-                self.flag = not self.flag
+        for elem in self.tape_ids:
+            if self.flag:
+                self.show_tape(elem)
+            else:
+                self.hide_tape(elem)
 
-                for elem in self.tape_ids:
-                    if self.flag:
-                        self.show_tape(elem)
+        for elem in self.monitored_ids:
+            sensor_name = elem.attrib['id']
+            sensor_index = int(sensor_name.split("_")[1]) - 3
+            inverse = '_inv' in sensor_name
+            stat = '_stat' in sensor_name
+
+            if sensor_index not in self.inputs:
+                pass
+            if stat:
+                if inverse and not self.inputs[sensor_index]:
+                    self.expected_input_state = False if step and step.type == "instruction" else True
+                    self.show_ok(elem)
+                    self.show_icon(elem)
+                else:
+                    self.expected_input_state = True if step and step.type == "instruction" else False
+                    self.show_ok(elem)
+                    self.show_icon(elem)
+            else:
+                if inverse:
+                    if not self.inputs[sensor_index]:
+                        self.show_ok(elem)
+                        self.show_icon(elem)
                     else:
-                        self.hide_tape(elem)
-
-                for elem in self.monitored_ids:
-                    sensor_index = int(elem.attrib['id'].split("_")[1]) - 3
+                        self.show_ko(elem)
+                        if self.flag:
+                            self.show_icon(elem)
+                        else:
+                            self.hide_icon(elem)
+                else:
                     if self.inputs[sensor_index]:
                         self.show_ok(elem)
                         self.show_icon(elem)
@@ -85,8 +111,7 @@ class Test_Instructions(Test_Test):
                         else:
                             self.hide_icon(elem)
 
-                self.show_svg()
-
+        self.show_svg()
     def print_button(self):
         super().get([{
             "time": timing(),
@@ -145,6 +170,7 @@ class Test_Instructions(Test_Test):
             else:
                 self.inputs[sensor_index] = False
                 ok = False
+
         if ok:
             self.stop()
             super().get([{