diff --git a/config/machine_settings/st-ten-8.ini b/config/machine_settings/st-ten-8.ini index 5744b12..759c74f 100644 --- a/config/machine_settings/st-ten-8.ini +++ b/config/machine_settings/st-ten-8.ini @@ -14,7 +14,7 @@ screwdriver: absent digital_io: present barcode_recipe_selection: present fixture_id: present -#discard_box: present +discard_box: present enforce_piece_removal: yes [tecna_t3] @@ -27,7 +27,7 @@ printer: zd421 [digital_io] id: USB-5862,BID#0 -discard_idx:15 # BIT NUMBER OF THE I/0 MODULE USED FOR DISCARD SENSING +discard_idx:12 # BIT NUMBER OF THE I/0 MODULE USED FOR DISCARD SENSING [fixture_rfid] port: COM5 diff --git a/src/ui/test_assembly/test_assembly.ui b/src/ui/test_assembly/test_assembly.ui index ad12a3e..60830cf 100755 --- a/src/ui/test_assembly/test_assembly.ui +++ b/src/ui/test_assembly/test_assembly.ui @@ -6,8 +6,8 @@ 0 0 - 627 - 332 + 663 + 496 @@ -26,31 +26,6 @@ 0 - - - - - 0 - 0 - - - - - 100 - 100 - - - - - - - true - - - Qt::AlignCenter - - - @@ -103,6 +78,31 @@ + + + + + 0 + 0 + + + + + 100 + 100 + + + + + + + false + + + Qt::AlignCenter + + + diff --git a/src/ui/test_fail/test_fail.py b/src/ui/test_fail/test_fail.py index a602a68..7ec80ee 100644 --- a/src/ui/test_fail/test_fail.py +++ b/src/ui/test_fail/test_fail.py @@ -22,7 +22,7 @@ class Test_Fail(Test_Test): if show is False: return show if "discard_box" in self.parent.config["hardware_config"].keys(): - if self.recipe["count"]["require_discard_piece"]: + if self.recipe.part_number in ("5803112815","5803112816"): if self.parent_assembly_widget is not None : self.continue_b.setVisible(False) self.discard_timer.start(100) @@ -51,6 +51,6 @@ class Test_Fail(Test_Test): sensor_index = int(self.parent.config["digital_io"]["discard_idx"]) byte_idx = int(sensor_index / 8) bit_idx = sensor_index % 8 - if data[0]["digital_io"][byte_idx][bit_idx]: + if not data[0]["digital_io"][byte_idx][bit_idx]: self.ok.emit(None) diff --git a/src/ui/test_leak/test_leak.py b/src/ui/test_leak/test_leak.py index 384e02b..9c51ce8 100644 --- a/src/ui/test_leak/test_leak.py +++ b/src/ui/test_leak/test_leak.py @@ -121,7 +121,6 @@ class Test_Leak(Test_Test): super().visualize(None, img=self.status_imgs_full["calibrated-leak"]) else: self.display_text(text="COLLEGARE GLI ATTACCHI PNEUMATICI E PREMERE START PER INIZIARE LA PROVA TENUTA") - self.display_image(img="wait") if self.simulate: QApplication.processEvents() diff --git a/src/ui/test_leak/test_leak.ui b/src/ui/test_leak/test_leak.ui index a9844d9..f796fd9 100644 --- a/src/ui/test_leak/test_leak.ui +++ b/src/ui/test_leak/test_leak.ui @@ -2075,6 +2075,12 @@ border: 1px solid black; 0 + + + 400 + 400 + + -