From fab355e36c0049556e3742276298f538b994b2bf Mon Sep 17 00:00:00 2001 From: neo Date: Tue, 18 Mar 2025 19:17:01 +0100 Subject: [PATCH 01/15] fix periodic autotest, test it with --test-autotest --- src/components/os_label_printer.py | 2 +- src/ui/test/test.py | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/components/os_label_printer.py b/src/components/os_label_printer.py index fc1abd3..0226428 100644 --- a/src/components/os_label_printer.py +++ b/src/components/os_label_printer.py @@ -16,7 +16,7 @@ class Os_Label_Printer(Component): def __init__(self, config=None, name=None): super().__init__(config=config, name=name, threaded=False) self.simulate = False - if "--sim-os-label-printer" in sys.argv: + if "--sim-printer" in sys.argv: self.simulate = True def config_changed(self): diff --git a/src/ui/test/test.py b/src/ui/test/test.py index 252fb62..b7c7b18 100755 --- a/src/ui/test/test.py +++ b/src/ui/test/test.py @@ -170,7 +170,10 @@ class Test(Widget): self.autotesting_reason = None self.autotest_cycle_steps = None if "--no-autotest" not in sys.argv: - self.autotest_period = int(8.5 * 60 * 60 * 1000) # 8.5 HOURS + if "--test-autotest" in sys.argv: + self.autotest_period = int(60 * 1000) # 1 min + else: + self.autotest_period = int(8.5 * 60 * 60 * 1000) # 8.5 HOURS # self.autotest_period = 12 * 60 * 60 * 1000 # 12 HOURS # if not self.config["autotest_done"]: # self.request_autotest("init") @@ -335,6 +338,7 @@ class Test(Widget): if self.autotest_request is not False and self.autotest_cycle_steps is not None and not self.autotesting and (self.cycle_index == -1 or self.cycle_index + 1 >= len(self.cycle_steps)): # if autotest was requested # and if cycle_steps is not started or has ended + self.cycle_index = -1 self.autotesting = True self.autotesting_reason = self.autotest_request self.autotest_request = False From 9c4dbb45fd5ecba482231980b800758c4fce80e8 Mon Sep 17 00:00:00 2001 From: neo Date: Tue, 18 Mar 2025 19:24:10 +0100 Subject: [PATCH 02/15] new admin password --- src/lib/db/__init__.py | 2 +- src/ui/login/login.py | 2 +- src/ui/test_admin_permission/test_admin_permission.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/db/__init__.py b/src/lib/db/__init__.py index 8e2ccf7..33830e0 100644 --- a/src/lib/db/__init__.py +++ b/src/lib/db/__init__.py @@ -55,7 +55,7 @@ init_db() # register or reset admin admin = Users.get_user("ADMIN") if admin is None or not admin.is_admin: - Users.register(username="ADMIN", password="123123", roles=["admin"]) + Users.register(username="ADMIN", password="78900987", roles=["admin"]) # register or reset user Users.register(username="USER", password="user") diff --git a/src/ui/login/login.py b/src/ui/login/login.py index f101a71..c01a251 100755 --- a/src/ui/login/login.py +++ b/src/ui/login/login.py @@ -32,7 +32,7 @@ class Login(Widget): # TESTING if "--auto-login-admin" in sys.argv: self.user_cb.setCurrentText("ADMIN") - self.password_le.setText("123123") + self.password_le.setText("78900987") elif "--auto-login-user" in sys.argv or "--test" in sys.argv: self.user_cb.setCurrentText("USER") self.password_le.setText("user") diff --git a/src/ui/test_admin_permission/test_admin_permission.py b/src/ui/test_admin_permission/test_admin_permission.py index 79d0656..f12fe15 100644 --- a/src/ui/test_admin_permission/test_admin_permission.py +++ b/src/ui/test_admin_permission/test_admin_permission.py @@ -22,7 +22,7 @@ class Test_Admin_Permission(Widget): self.cancel_b.clicked.connect(self.cancel) # TESTING if "--auto-accept-test-admin-permission" in sys.argv or "--test" in sys.argv: - self.password_le.setText("123123") + self.password_le.setText("78900987") self.test_timer = QTimer() self.test_timer.setSingleShot(True) self.test_timer.timeout.connect(self.continue_b.clicked.emit) From 36c74e0dcc34224a2722713f38682e13c73285e7 Mon Sep 17 00:00:00 2001 From: ST-TEN-11 Date: Wed, 19 Mar 2025 00:35:42 +0100 Subject: [PATCH 03/15] stten11 --- .../st-ten-11/18JA709CP.svg | 36 +++++++++++------ .../st-ten-11/18JA712CP.svg | 18 ++++----- .../st-ten-11/18JA713CP.svg | 32 +++++---------- .../st-ten-11/18JA757CP.svg | 38 ++++++++++++++---- .../MCLAREN/Mclaren_barcode.nlbl | Bin 3627 -> 3610 bytes .../st-ten-11/{ => 203}/ETA30x16.prn | 0 .../st-ten-11/{ => 203}/ETA30x16_203dpi.prn | 0 .../st-ten-11/{ => 203}/ETACL-40_130.prn | 0 .../st-ten-11/{ => 203}/ETACL.prn | 0 .../{ => 203}/EtichettaR5_Pitesti.prn | 0 .../st-ten-11/{ => 203}/Lamborghini_label.prn | 0 .../st-ten-11/{ => 203}/Lamborghini_lable.prn | 0 .../st-ten-11/{ => 203}/MCLAREN_353.prn | 0 .../st-ten-11/203/Mclaren_barcode.prn | 33 +++++++++++++++ .../st-ten-11/{ => 203}/Mclaren_label.prn | 0 .../st-ten-11/{ => 203}/ferrari_30x16_203.prn | 0 .../st-ten-11/{ => 203}/ferrari_c01.prn | 0 .../{ => 203}/ferrari_flag_qr_only.prn | 2 +- .../203/ferrari_flag_qr_only_black.prn | 18 +++++++++ .../st-ten-11/{ => 203}/ferrari_stten8.prn | 0 .../{ => 203}/label_interoperazione.prn | 0 .../st-ten-11/Mclaren_barcode.prn | 34 ---------------- 22 files changed, 126 insertions(+), 85 deletions(-) rename config/label_templates/st-ten-11/{ => 203}/ETA30x16.prn (100%) rename config/label_templates/st-ten-11/{ => 203}/ETA30x16_203dpi.prn (100%) rename config/label_templates/st-ten-11/{ => 203}/ETACL-40_130.prn (100%) rename config/label_templates/st-ten-11/{ => 203}/ETACL.prn (100%) rename config/label_templates/st-ten-11/{ => 203}/EtichettaR5_Pitesti.prn (100%) rename config/label_templates/st-ten-11/{ => 203}/Lamborghini_label.prn (100%) rename config/label_templates/st-ten-11/{ => 203}/Lamborghini_lable.prn (100%) rename config/label_templates/st-ten-11/{ => 203}/MCLAREN_353.prn (100%) create mode 100644 config/label_templates/st-ten-11/203/Mclaren_barcode.prn rename config/label_templates/st-ten-11/{ => 203}/Mclaren_label.prn (100%) rename config/label_templates/st-ten-11/{ => 203}/ferrari_30x16_203.prn (100%) rename config/label_templates/st-ten-11/{ => 203}/ferrari_c01.prn (100%) rename config/label_templates/st-ten-11/{ => 203}/ferrari_flag_qr_only.prn (98%) create mode 100644 config/label_templates/st-ten-11/203/ferrari_flag_qr_only_black.prn rename config/label_templates/st-ten-11/{ => 203}/ferrari_stten8.prn (100%) rename config/label_templates/st-ten-11/{ => 203}/label_interoperazione.prn (100%) delete mode 100644 config/label_templates/st-ten-11/Mclaren_barcode.prn diff --git a/config/instruction_images/st-ten-11/18JA709CP.svg b/config/instruction_images/st-ten-11/18JA709CP.svg index a91c6be..c9872b6 100644 --- a/config/instruction_images/st-ten-11/18JA709CP.svg +++ b/config/instruction_images/st-ten-11/18JA709CP.svg @@ -8,7 +8,7 @@ height="404" viewBox="0 0 919 404" sodipodi:docname="18JA709CP.svg" - inkscape:version="1.3.2 (1:1.3.2+202311252150+091e20ef0f)" + inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:xlink="http://www.w3.org/1999/xlink" @@ -26,12 +26,12 @@ inkscape:pagecheckerboard="0" inkscape:deskcolor="#d1d1d1" inkscape:zoom="1.6789989" - inkscape:cx="459.5" - inkscape:cy="201.90603" - inkscape:window-width="2490" - inkscape:window-height="1016" - inkscape:window-x="70" - inkscape:window-y="27" + inkscape:cx="459.20221" + inkscape:cy="202.20383" + inkscape:window-width="1920" + inkscape:window-height="1009" + inkscape:window-x="-8" + inkscape:window-y="-8" inkscape:window-maximized="1" inkscape:current-layer="g1" /> + diff --git a/config/instruction_images/st-ten-11/18JA712CP.svg b/config/instruction_images/st-ten-11/18JA712CP.svg index 8343eb1..2108d0f 100644 --- a/config/instruction_images/st-ten-11/18JA712CP.svg +++ b/config/instruction_images/st-ten-11/18JA712CP.svg @@ -8,7 +8,7 @@ height="590" viewBox="0 0 902 590" sodipodi:docname="18JA712CP.svg" - inkscape:version="1.3.2 (1:1.3.2+202311252150+091e20ef0f)" + inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:xlink="http://www.w3.org/1999/xlink" @@ -26,12 +26,12 @@ inkscape:pagecheckerboard="0" inkscape:deskcolor="#d1d1d1" inkscape:zoom="1.3830508" - inkscape:cx="450.81495" - inkscape:cy="295" - inkscape:window-width="2490" - inkscape:window-height="1016" - inkscape:window-x="70" - inkscape:window-y="27" + inkscape:cx="450.45345" + inkscape:cy="294.63849" + inkscape:window-width="1920" + inkscape:window-height="1009" + inkscape:window-x="-8" + inkscape:window-y="-8" inkscape:window-maximized="1" inkscape:current-layer="g1" /> diff --git a/config/instruction_images/st-ten-11/18JA713CP.svg b/config/instruction_images/st-ten-11/18JA713CP.svg index 7739628..885473a 100644 --- a/config/instruction_images/st-ten-11/18JA713CP.svg +++ b/config/instruction_images/st-ten-11/18JA713CP.svg @@ -8,7 +8,7 @@ height="483" viewBox="0 0 852 483" sodipodi:docname="18JA713CP.svg" - inkscape:version="1.3.2 (1:1.3.2+202311252150+091e20ef0f)" + inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:xlink="http://www.w3.org/1999/xlink" @@ -26,12 +26,12 @@ inkscape:pagecheckerboard="0" inkscape:deskcolor="#d1d1d1" inkscape:zoom="1.689441" - inkscape:cx="425.88051" - inkscape:cy="241.5" - inkscape:window-width="2490" - inkscape:window-height="1016" - inkscape:window-x="70" - inkscape:window-y="27" + inkscape:cx="425.2886" + inkscape:cy="241.20404" + inkscape:window-width="1920" + inkscape:window-height="1009" + inkscape:window-x="-8" + inkscape:window-y="-8" inkscape:window-maximized="1" inkscape:current-layer="g1" /> - + + diff --git a/config/label_designs/MCLAREN/Mclaren_barcode.nlbl b/config/label_designs/MCLAREN/Mclaren_barcode.nlbl index 3acdc683536209d6d1f702eefdb769de107a9d90..e181859f4b0d5dfb5bfc5640f97983347003760e 100644 GIT binary patch literal 3610 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 literal 3627 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:{RECIPE}^FS +^BY2,3,54^FT82,282^BCN,,Y,N +^FH\^FD>:{SN}^FS +^FT34,357^A0N,24,23^FH\^CI28^FD{DATE}{SN}^FS^CI27 +^PQ1,0,1,Y +^XZ diff --git a/config/label_templates/st-ten-11/Mclaren_label.prn b/config/label_templates/st-ten-11/203/Mclaren_label.prn similarity index 100% rename from config/label_templates/st-ten-11/Mclaren_label.prn rename to config/label_templates/st-ten-11/203/Mclaren_label.prn diff --git a/config/label_templates/st-ten-11/ferrari_30x16_203.prn b/config/label_templates/st-ten-11/203/ferrari_30x16_203.prn similarity index 100% rename from config/label_templates/st-ten-11/ferrari_30x16_203.prn rename to config/label_templates/st-ten-11/203/ferrari_30x16_203.prn diff --git a/config/label_templates/st-ten-11/ferrari_c01.prn b/config/label_templates/st-ten-11/203/ferrari_c01.prn similarity index 100% rename from config/label_templates/st-ten-11/ferrari_c01.prn rename to config/label_templates/st-ten-11/203/ferrari_c01.prn diff --git a/config/label_templates/st-ten-11/ferrari_flag_qr_only.prn b/config/label_templates/st-ten-11/203/ferrari_flag_qr_only.prn similarity index 98% rename from config/label_templates/st-ten-11/ferrari_flag_qr_only.prn rename to config/label_templates/st-ten-11/203/ferrari_flag_qr_only.prn index bb80f3f..248b58e 100644 --- a/config/label_templates/st-ten-11/ferrari_flag_qr_only.prn +++ b/config/label_templates/st-ten-11/203/ferrari_flag_qr_only.prn @@ -10,7 +10,7 @@ ^LH0,0 ^JMA ^PR2,2 -~SD15 +~SD30 ^JUS ^LRN ^CI27 diff --git a/config/label_templates/st-ten-11/203/ferrari_flag_qr_only_black.prn b/config/label_templates/st-ten-11/203/ferrari_flag_qr_only_black.prn new file mode 100644 index 0000000..76099d6 --- /dev/null +++ b/config/label_templates/st-ten-11/203/ferrari_flag_qr_only_black.prn @@ -0,0 +1,18 @@ +CT~~CD,~CC^~CT~ +^XA~TA000~JSN^LT0^MNW^MTT^PON^PMN^LH0,0^JMA^PR2,2~SD25^JUS^LRN^CI0^XZ +^XA +^MMT +^PW325 +^LL1119 +^LS0 +^FT293,694^A0I,25,21^FH\^FD{DD}/{MO}/{YY}^FS +^FT145,694^A0I,25,21^FH\^FD{HH}:{MI}:{SS}^FS +^FT291,1032^A0I,25,24^FH\^FDNumero Disegno^FS +^FT293,725^A0I,25,24^FH\^FDData/Ora Prova^FS +^FT293,771^A0I,25,24^FH\^FDN. Pezzo:^FS +^FT185,770^A0I,25,24^FH\^FD{SN5}^FS +^BY120,120^FT289,883^BXI,6,200,0,0,1,~ +^FH\^FD{PART}{MO}{YY}{SN5}^FS +^FT291,832^A0I,25,24^FH\^FD{PART}{MO}{YY}{SN5}^FS +^LRY^FO144,863^GB168,0,163^FS^LRN +^PQ1,0,1,Y^XZ diff --git a/config/label_templates/st-ten-11/ferrari_stten8.prn b/config/label_templates/st-ten-11/203/ferrari_stten8.prn similarity index 100% rename from config/label_templates/st-ten-11/ferrari_stten8.prn rename to config/label_templates/st-ten-11/203/ferrari_stten8.prn diff --git a/config/label_templates/st-ten-11/label_interoperazione.prn b/config/label_templates/st-ten-11/203/label_interoperazione.prn similarity index 100% rename from config/label_templates/st-ten-11/label_interoperazione.prn rename to config/label_templates/st-ten-11/203/label_interoperazione.prn diff --git a/config/label_templates/st-ten-11/Mclaren_barcode.prn b/config/label_templates/st-ten-11/Mclaren_barcode.prn deleted file mode 100644 index 4958d48..0000000 --- a/config/label_templates/st-ten-11/Mclaren_barcode.prn +++ /dev/null @@ -1,34 +0,0 @@ -CT~~CD,~CC^~CT~ -^XA -~TA000 -~JSN -^LT0 -^MNW -^MTT -^PON -^PMN -^LH0,0 -^JMA -^PR2,2 -~SD20 -^JUS -^LRN -^CI27 -^PA0,1,1,0 -^XZ -^XA -^MMT -^PW320 -^LL1039 -^LS0 -^FT9,46^A0N,24,23^FH\^CI28^FD{RECIPE}^FS^CI27 -^FT250,38^A0N,16,15^FH\^CI28^FDVEROX^FS^CI27 -^FT9,80^A0N,24,23^FH\^CI28^FDFED^FS^CI27 -^BY2,3,58^FT65,166^BCN,,Y,N -^FH\^FD>:{RECIPE}^FS -^BY2,3,54^FT131,259^BCN,,Y,N -^FH\^FD>:{SN}^FS -^FT9,316^A0N,24,23^FH\^CI28^FD{DATE}^FS^CI27 -^FT109,321^A0N,24,23^FH\^CI28^FD{SN}^FS^CI27 -^PQ1,0,1,Y -^XZ From d54f0b7cae8dd278f69957b018f6b8e6115ce547 Mon Sep 17 00:00:00 2001 From: ST-TEN-11 Date: Wed, 19 Mar 2025 09:20:23 +0100 Subject: [PATCH 04/15] stten11 tmp fix --- config/machine_settings/st-ten-11.ini | 4 ++-- src/components/tecna_marposs_provaset_t3.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/machine_settings/st-ten-11.ini b/config/machine_settings/st-ten-11.ini index e0e1c93..5031d97 100644 --- a/config/machine_settings/st-ten-11.ini +++ b/config/machine_settings/st-ten-11.ini @@ -92,8 +92,8 @@ 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_qpos: 22 #Q+ Upper test leak limit +test_pressure_qneg: 32 #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 diff --git a/src/components/tecna_marposs_provaset_t3.py b/src/components/tecna_marposs_provaset_t3.py index 25b0704..a22d206 100644 --- a/src/components/tecna_marposs_provaset_t3.py +++ b/src/components/tecna_marposs_provaset_t3.py @@ -302,7 +302,7 @@ class TecnaMarpossProvasetT3(ModbusComponent): recipe_barcode = f"j{recipe.part_number}"[:16].encode("ascii") recipe_barcode += b"\x00" * (24 - len(recipe_barcode)) test_flags = 0b0110100001010000 if (step.spec.get("autotest", False) in ["ko_check"]) else 0b0110000001010000 - pid_mode_text = step.spec["pid_mod_config"] # Get the selected text from the combobox + pid_mode_text = step.spec.get("pid_mod_config","AUTO") # Get the selected text from the combobox pid_mode_value = { # Mapping of text to numeric values "AUTO": 5, "FAST": 0, From 43d41487f5782b3061a55a742ca007a1e8ec86f4 Mon Sep 17 00:00:00 2001 From: ST-TEN-11 Date: Wed, 19 Mar 2025 09:21:45 +0100 Subject: [PATCH 05/15] stten11 tmp fix --- src/ui/test/test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui/test/test.py b/src/ui/test/test.py index b7c7b18..fe0b7ed 100755 --- a/src/ui/test/test.py +++ b/src/ui/test/test.py @@ -812,7 +812,7 @@ class Test(Widget): "OPERATOR": str(archived.user.username), "BADGE_NUM": str(archived.user.badge_number), #BARCODE - "BCODE": str(self.step.spec["barcode"]), + "BCODE": str(self.step.spec.get("barcode","")), # RESULT "RESULT": str("CONFORME" if leak_test_1.get("ok", False) else "SCARTO") + str(" FORZATO" if self.data.get("overridden", False) else ""), From 474075db7d41ec5845a9bbc818611137676f7431 Mon Sep 17 00:00:00 2001 From: st-ten-13 Date: Wed, 19 Mar 2025 09:44:08 +0100 Subject: [PATCH 06/15] fix --- .../st-ten-13/07N131597.svg | 148 ++++++++++++++++++ .../st-ten-13/203/Errecinque_standard.prn | 4 +- config/machine_settings/st-ten-13.ini | 8 +- 3 files changed, 154 insertions(+), 6 deletions(-) create mode 100644 config/instruction_images/st-ten-13/07N131597.svg diff --git a/config/instruction_images/st-ten-13/07N131597.svg b/config/instruction_images/st-ten-13/07N131597.svg new file mode 100644 index 0000000..be47551 --- /dev/null +++ b/config/instruction_images/st-ten-13/07N131597.svg @@ -0,0 +1,148 @@ + + + + + + + + + + + + + + + + + + + diff --git a/config/label_templates/st-ten-13/203/Errecinque_standard.prn b/config/label_templates/st-ten-13/203/Errecinque_standard.prn index f1aebb6..7cce14f 100644 --- a/config/label_templates/st-ten-13/203/Errecinque_standard.prn +++ b/config/label_templates/st-ten-13/203/Errecinque_standard.prn @@ -47,7 +47,7 @@ ^FT207,888^A0N,25,25^FH\^CI28^FD{TSET} s^FS^CI27 ^FT145,705^A0N,25,25^FH\^CI28^FD{PTEST} mbar^FS^CI27 ^FT31,236^BXN,6,200,0,0,1,_,1 -^FH\^FD{BCODE}^FS -^FT29,287^A0N,25,25^FH\^CI28^FD{BCODE}^FS^CI27 +^FH\^FD{PART}{MO}{YY}{SN5}^FS +^FT29,287^A0N,25,25^FH\^CI28^FD{PART}{MO}{YY}{SN5}^FS^CI27 ^PQ1,0,1,Y ^XZ diff --git a/config/machine_settings/st-ten-13.ini b/config/machine_settings/st-ten-13.ini index 75a5f5d..9c3f898 100644 --- a/config/machine_settings/st-ten-13.ini +++ b/config/machine_settings/st-ten-13.ini @@ -20,7 +20,7 @@ discard_box: absent #enforce_piece_removal: yes [tecna_t3] -port: /dev/ttyUSB0 +port: /dev/ttyUSB1 model: t3l [label_printer] @@ -34,7 +34,7 @@ risoluzione:203 id: USB-5862,BID#0 [fixture_rfid] -port: ttyUSB1 #correct way to declare usb in linux +port: ttyUSB0 #correct way to declare usb in linux [recipe] recipe_name_field: codice_ricetta @@ -73,8 +73,8 @@ 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 +modello_etichetta: Errecinque_standard.prn +pid_pressure_correction: 98 barcode_format: {PART}{MO}{YY}{SN5} [autotest_leak] From 92be5a6e09cb527cbc81505fe496645ab9049b08 Mon Sep 17 00:00:00 2001 From: st-ten-13 Date: Wed, 19 Mar 2025 09:54:47 +0100 Subject: [PATCH 07/15] fix --- config/machine_settings/st-ten-13.ini | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/machine_settings/st-ten-13.ini b/config/machine_settings/st-ten-13.ini index 9c3f898..f00d44f 100644 --- a/config/machine_settings/st-ten-13.ini +++ b/config/machine_settings/st-ten-13.ini @@ -85,10 +85,10 @@ filling_time: 10 settling_time: 10 settling_pressure_min_percent: 5 settling_pressure_max_percent: 5 -test_pressure: 7000 +test_pressure: 5900 test_time: 10 -test_pressure_qpos: 5 #Q+ Upper test leak limit -test_pressure_qneg: 17 #Q- Lower test leak limit +test_pressure_qpos: 3.5 #Q+ Upper test leak limit +test_pressure_qneg: 6.5 #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 From 6c77989a67d27d2ca55a279f66ce70fdc3059981 Mon Sep 17 00:00:00 2001 From: edo-neo Date: Wed, 19 Mar 2025 10:03:32 +0100 Subject: [PATCH 08/15] Set template text and visibility based on autotest mode Introduced a conditional check to update the template label text when in autotest mode. Ensured the template label is visible during specific UI states to enhance user feedback and clarity. --- src/ui/test_leak/test_leak.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/ui/test_leak/test_leak.py b/src/ui/test_leak/test_leak.py index 2a2c0d0..d335b26 100644 --- a/src/ui/test_leak/test_leak.py +++ b/src/ui/test_leak/test_leak.py @@ -103,7 +103,10 @@ class Test_Leak(Test_Test): self.test_num_l.setText("2/2") else: self.test_num_l.setText("1/1") - self.template_print_l.setText(f"{self.parent.print_template}") + if self.step.spec.get("autotest", False): + self.template_print_l.setText(f"AUTOTEST") + else: + self.template_print_l.setText(f"{self.parent.print_template}") self.recipe_pressure_l.setText(f"{self.step.spec['test_pressure']}") self.leak_min_l.setText(f"{self.step.spec['test_pressure_qneg']}") self.leak_max_l.setText(f"{self.step.spec['test_pressure_qpos']}") @@ -144,7 +147,7 @@ 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.template_print_l.setVisible(True) if self.simulate: QApplication.processEvents() time.sleep(2) From bd8045906ffadf1e4101b3af2218e68df47e36ed Mon Sep 17 00:00:00 2001 From: edo-neo Date: Wed, 19 Mar 2025 11:16:03 +0100 Subject: [PATCH 09/15] fix label to print --- src/ui/test_leak/test_leak.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/ui/test_leak/test_leak.py b/src/ui/test_leak/test_leak.py index d335b26..c26b3f3 100644 --- a/src/ui/test_leak/test_leak.py +++ b/src/ui/test_leak/test_leak.py @@ -148,6 +148,7 @@ class Test_Leak(Test_Test): else: self.display_text(text="COLLEGARE GLI ATTACCHI PNEUMATICI E PREMERE START PER INIZIARE LA PROVA TENUTA") self.template_print_l.setVisible(True) + self.template_label.setVisible(True) if self.simulate: QApplication.processEvents() time.sleep(2) From c6455ed2ff9c76973e85b230cfd3151c890aef44 Mon Sep 17 00:00:00 2001 From: edo-neo Date: Wed, 19 Mar 2025 11:25:56 +0100 Subject: [PATCH 10/15] fix tag show on user --- src/main.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main.py b/src/main.py index 0daeb6e..faf5266 100644 --- a/src/main.py +++ b/src/main.py @@ -255,9 +255,11 @@ try: if session is not None: if session.is_admin: self.main_window.admin_m.menuAction().setVisible(True) + self.main_window.tag_a.setVisible(True) else: self.main_window.admin_m.menuAction().setVisible(False) - # open test + self.main_window.tag_a.setVisible(False) + # open test self.main_window.open_tab(Test(self.config, self.components, self)) self.main_window.centralWidget().request_autotest("login") else: From 3e3322123c78423886c359a4218f98bdc1a26da2 Mon Sep 17 00:00:00 2001 From: STTEN8 Date: Wed, 19 Mar 2025 11:31:04 +0100 Subject: [PATCH 11/15] stten8 --- config/machine_settings/st-ten-8.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/machine_settings/st-ten-8.ini b/config/machine_settings/st-ten-8.ini index 10c8085..7575b16 100644 --- a/config/machine_settings/st-ten-8.ini +++ b/config/machine_settings/st-ten-8.ini @@ -98,10 +98,10 @@ settling_pressure_max_percent: 5 test_pressure: 7000 test_time: 10 test_pressure_qpos: 8 #Q+ Upper test leak limit -test_pressure_qneg: 12 #Q- Lower test leak limit +test_pressure_qneg: 13 #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 -pid_pressure_correction: 100 +pid_pressure_correction: 93 From a08625f9dfed912830473fc24752e78b66fb9bd1 Mon Sep 17 00:00:00 2001 From: STTEN8 Date: Wed, 19 Mar 2025 11:45:22 +0100 Subject: [PATCH 12/15] stten8 --- config/machine_settings/st-ten-8.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/machine_settings/st-ten-8.ini b/config/machine_settings/st-ten-8.ini index 7575b16..2c0f673 100644 --- a/config/machine_settings/st-ten-8.ini +++ b/config/machine_settings/st-ten-8.ini @@ -104,4 +104,4 @@ test_pressure_tt_qneg: 5 # Q- Lower test leak limit (tube-tube) flush_time: 1 flush_pressure: 100 relay_config: 1 -pid_pressure_correction: 93 +pid_pressure_correction: 100 From 01b1ff2cb0f114441be28733ba6b807d5c4e0855 Mon Sep 17 00:00:00 2001 From: STTEN8 Date: Wed, 19 Mar 2025 12:38:24 +0100 Subject: [PATCH 13/15] stten8 fix --- src/ui/test_instructions/test_instructions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui/test_instructions/test_instructions.py b/src/ui/test_instructions/test_instructions.py index e9fba04..479aa8d 100644 --- a/src/ui/test_instructions/test_instructions.py +++ b/src/ui/test_instructions/test_instructions.py @@ -58,7 +58,7 @@ class Test_Instructions(Test_Test): self.svg_root = etree.parse(svg_path) self.svg_str = etree.tostring(self.svg_root) self.svg_str=etree.tostring(self.svg_root) - self.expected_input_state = True if step.step_type == "instruction" or "instruction_extra" else False + self.expected_input_state = True if step.step_type in ("instruction","instruction_extra") else False self.monitored_ids=self.svg_root.xpath(f'''.//*[starts-with(@id, 'sensor_')]''') self.warning_ids=self.svg_root.xpath(f'''.//*[starts-with(@id, 'warning_')]''') From 14a83d692884cc93921764bbae1e153015cbc310 Mon Sep 17 00:00:00 2001 From: edo-neo Date: Thu, 20 Mar 2025 15:23:21 +0100 Subject: [PATCH 14/15] fix --- config/label_templates/203/PAL.prn | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 config/label_templates/203/PAL.prn diff --git a/config/label_templates/203/PAL.prn b/config/label_templates/203/PAL.prn new file mode 100644 index 0000000..f081d67 --- /dev/null +++ b/config/label_templates/203/PAL.prn @@ -0,0 +1,29 @@ +CT~~CD,~CC^~CT~ +^XA +~TA000 +~JSN +^LT0 +^MNW +^MTT +^PON +^PMN +^LH0,0 +^JMA +^PR2,2 +~SD15 +^JUS +^LRN +^CI27 +^PA0,1,1,0 +^XZ +^XA +^MMT +^PW679 +^LL200 +^LS0 +^FO24,33^GE96,96,48^FS +^FO184,33^GE96,96,48^FS +^FO344,33^GE96,96,48^FS +^FO504,33^GE96,96,48^FS +^PQ1,0,1,Y +^XZ From e9a1e5a6c14c79eaa1a836f893bd5215e896d7f4 Mon Sep 17 00:00:00 2001 From: stten5 Date: Thu, 20 Mar 2025 15:36:03 +0100 Subject: [PATCH 15/15] stten5 fix extra label --- config/label_templates/203/PAL.prn | 10 +++++----- src/ui/test/test.py | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/config/label_templates/203/PAL.prn b/config/label_templates/203/PAL.prn index f081d67..b589e9a 100644 --- a/config/label_templates/203/PAL.prn +++ b/config/label_templates/203/PAL.prn @@ -10,7 +10,7 @@ ^LH0,0 ^JMA ^PR2,2 -~SD15 +~SD22 ^JUS ^LRN ^CI27 @@ -21,9 +21,9 @@ ^PW679 ^LL200 ^LS0 -^FO24,33^GE96,96,48^FS -^FO184,33^GE96,96,48^FS -^FO344,33^GE96,96,48^FS -^FO504,33^GE96,96,48^FS +^FO24,83^GE96,96,48^FS +^FO184,83^GE96,96,48^FS +^FO344,83^GE96,96,48^FS +^FO504,83^GE96,96,48^FS ^PQ1,0,1,Y ^XZ diff --git a/src/ui/test/test.py b/src/ui/test/test.py index fe0b7ed..f0f6e62 100755 --- a/src/ui/test/test.py +++ b/src/ui/test/test.py @@ -845,7 +845,7 @@ class Test(Widget): def print_extra_labels(self): # PRINT EXTRA LABELS IF NEEDED (BEFORE LEAK TEST) - if "extra_label_printer" in self.components.keys() and self.print_step is not None: + if "extra_label_printer" in self.components.keys() and self.print_step is not None and self.autotesting is False: printer_fields = self.print_step.spec if len(printer_fields["extra_label"]) > 0: labels = printer_fields["extra_label"].split(",")