Merge remote-tracking branch 'origin/master'
# Conflicts: # src/ui/test/test.py
This commit is contained in:
commit
87818cace6
@ -73,7 +73,6 @@ class Test(Widget):
|
|||||||
"count": set(),
|
"count": set(),
|
||||||
"connector": {"multicomp", },
|
"connector": {"multicomp", },
|
||||||
"instruction": {"digital_io"},
|
"instruction": {"digital_io"},
|
||||||
"instruction_extra":{"digital_io"},
|
|
||||||
"screws": {"screwdriver", "tecna_t3", },
|
"screws": {"screwdriver", "tecna_t3", },
|
||||||
"resistance": {"multicomp", },
|
"resistance": {"multicomp", },
|
||||||
"leak_1": {self.tester_component, },
|
"leak_1": {self.tester_component, },
|
||||||
@ -455,7 +454,10 @@ class Test(Widget):
|
|||||||
if "leak_1" in step_types and "leak_2" in step_types:
|
if "leak_1" in step_types and "leak_2" in step_types:
|
||||||
leak1_index = step_types.index("leak_1")
|
leak1_index = step_types.index("leak_1")
|
||||||
leak2_index = step_types.index("leak_2")
|
leak2_index = step_types.index("leak_2")
|
||||||
|
if leak1_index + 1 == leak2_index: # Ensure 'leak_1' is immediately followed by 'leak_2'
|
||||||
|
if self.config["hardware_config"].get("second_leak_test", "yes") == "no":
|
||||||
|
steps.insert(leak2_index, Step(step_type="instruction_extra", spec={}))
|
||||||
|
inserted_instruction = True
|
||||||
|
|
||||||
# Insert 'instruction_extra' after the first 'instructions' if not inserted between leaks
|
# Insert 'instruction_extra' after the first 'instructions' if not inserted between leaks
|
||||||
if not inserted_instruction:
|
if not inserted_instruction:
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user