Eduardo_Scripniciuc/st-ten-1
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
gg 2024-06-18 13:29:21 +02:00
commit bd96cf59f7
5 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/machine_settings/defaults.ini
View File

@ -111,7 +111,7 @@ codice_a_barre:
avvitatura_abilitata: avvitatura_abilitata:
viti: 0 viti: 0
istruzione_abilitata: istruzione_abilitata:
n_componenti:1 n_componenti: 1
verifica_resistenza_connettore_abilitata: x verifica_resistenza_connettore_abilitata: x
scala_resistenza: 500 scala_resistenza: 500
r nominale: 1000000000 r nominale: 1000000000

2
config/machine_settings/st-ten-10.ini
View File

@ -77,7 +77,7 @@ pressione_di_test_delta_massimo: 30
tempo_svuotamento: 1 tempo_svuotamento: 1
pressione_svuotamento: 100 pressione_svuotamento: 100
canale_di_prova: 0 canale_di_prova: 0
n_componenti:1 n_componenti: 1
tester_discharge_enable: yes tester_discharge_enable: yes
[autotest_leak] [autotest_leak]

2
src/ui/recipe_selection/recipe_selection.py
View File

@ -202,11 +202,11 @@ class Recipe_Selection(Widget):
}, },
"barcodes": { "barcodes": {
"serial": row.get(barcode_serial_field, defaults["codice_a_barre"]), "serial": row.get(barcode_serial_field, defaults["codice_a_barre"]),
"n_pieces": row.get("n_componenti") or defaults["n_componenti"],
"barcode_input_2": row.get("barcode_input_2", "-"), "barcode_input_2": row.get("barcode_input_2", "-"),
"barcode_input_3": row.get("barcode_input_3", "-"), "barcode_input_3": row.get("barcode_input_3", "-"),
"barcode_input_4": row.get("barcode_input_4", "-"), "barcode_input_4": row.get("barcode_input_4", "-"),
"barcode_input_5": row.get("barcode_input_5", "-"), "barcode_input_5": row.get("barcode_input_5", "-"),
"n_pieces": row.get("n_componenti") if self.config["hardware_config"]["leak_disabled"] == "active" else defaults["n_componenti"],
}, },
"resistance": { "resistance": {
"scale": locale.atof(row.get("scala_resistenza", defaults["scala_resistenza"])), "scale": locale.atof(row.get("scala_resistenza", defaults["scala_resistenza"])),

8
src/ui/test/test.py
View File

@ -51,6 +51,7 @@ class Test(Widget):
# INIT RECIPE # INIT RECIPE
self.recipe = None self.recipe = None
if self.config["hardware_config"]["barcode_recipe_selection"] == "present": if self.config["hardware_config"]["barcode_recipe_selection"] == "present":
self.recipe_selection_mode = "barcode" self.recipe_selection_mode = "barcode"
else: else:
@ -97,7 +98,7 @@ class Test(Widget):
"count": Test_Assembly(img_path=None, text=u"INSERIRE IL NUMERO DI PEZZI ATTESI PER IL LOTTO", "count": Test_Assembly(img_path=None, text=u"INSERIRE IL NUMERO DI PEZZI ATTESI PER IL LOTTO",
widget=Test_Count(components=self.components, recipe=self.recipe, step=self.step, pieces=self.pieces, run_once=True)), widget=Test_Count(components=self.components, recipe=self.recipe, step=self.step, pieces=self.pieces, run_once=True)),
"warning_img": Test_Assembly(img_path=None, text=u"ATTENZIONE - PER QUESTO CODICE ESEGUIRE LE OPERAZIONI INDICATE IN FIGURA", "warning_img": Test_Assembly(img_path=None, text=u"ATTENZIONE - PER QUESTO CODICE ESEGUIRE LE OPERAZIONI INDICATE IN FIGURA",
widget=Test_Warning_Img(components=self.components, recipe=self.recipe,bench_name=self.config.machine_id, step=self.step, run_once=True)), widget=Test_Warning_Img(components=self.components, recipe=self.recipe,bench_name=self.config["machine"]["image_for_warning"], step=self.step, run_once=True)),
"count_end": Test_Assembly(img_path=None, text=u"LOTTO TERMINATO, PREMERE CONTINUA PERCOMINCIARNE UNO NUOVO", "count_end": Test_Assembly(img_path=None, text=u"LOTTO TERMINATO, PREMERE CONTINUA PERCOMINCIARNE UNO NUOVO",
widget=Test_Count_End(components=self.components, recipe=self.recipe, step=self.step, pieces=self.pieces)), widget=Test_Count_End(components=self.components, recipe=self.recipe, step=self.step, pieces=self.pieces)),
"done": Test_Assembly(img_path=self.select_step_img("success"), text=u"COLLAUDO COMPLETATO", widget=None), "done": Test_Assembly(img_path=self.select_step_img("success"), text=u"COLLAUDO COMPLETATO", widget=None),
@ -394,8 +395,9 @@ class Test(Widget):
else: else:
step.spec["barcode_name"] = barcode_names[(n_pieces_adapted - 1) % len(barcode_names)] step.spec["barcode_name"] = barcode_names[(n_pieces_adapted - 1) % len(barcode_names)]
n_pieces_adapted -= 1 n_pieces_adapted -= 1
step.spec["n_pieces"] = str(n_pieces_adapted) new_barcode_step = copy.deepcopy(step)
new_barcode_step = copy.deepcopy(step) # create a deep copy of the step new_barcode_step.spec["n_pieces"] = str(n_pieces_adapted)
n_pieces_adapted -= 1
steps.insert(i + 1, new_barcode_step) steps.insert(i + 1, new_barcode_step)
if i in skip: if i in skip:
continue continue

5
src/ui/test_barcodes/test_barcodes.py
View File

@ -33,9 +33,7 @@ class Test_Barcodes(Test_Test):
self.start_counter += 1 self.start_counter += 1
npieces = self.step.spec.get("n_pieces") npieces = self.step.spec.get("n_pieces")
npieces = int(npieces) if npieces is not None else 0 npieces = int(npieces) if npieces is not None else 0
if self.start_counter > npieces + 1: # If start_counter exceeds npieces + 1 display_str = "PEZZI RIMANENTI {}".format(npieces)
self.start_counter = 1
display_str = "{}/{}".format(self.start_counter, npieces + 1)
self.counter_l.setText(display_str) self.counter_l.setText(display_str)
if show is False: if show is False:
return show return show
@ -77,7 +75,6 @@ class Test_Barcodes(Test_Test):
barcode_ok = False barcode_ok = False
self.current_step_barcode_name = self.step.spec.get('barcode_name') # get current step's barcode name self.current_step_barcode_name = self.step.spec.get('barcode_name') # get current step's barcode name
barcode_check = self.barcodes_spec.get(self.current_step_barcode_name) barcode_check = self.barcodes_spec.get(self.current_step_barcode_name)
#self.expected_barcode.setText(self.step.spec.get(self.current_step_barcode_name))
# If the current step's barcode type exists in barcodes_spec and it's valid, store it # If the current step's barcode type exists in barcodes_spec and it's valid, store it
if barcode_check and barcode_check(data): if barcode_check and barcode_check(data):