Merge remote-tracking branch 'origin/master'

This commit is contained in:
stten7 2025-03-17 09:08:15 +01:00
commit 5dc3aed2a0
9 changed files with 98 additions and 96 deletions

View File

@ -21,18 +21,18 @@
^PW679
^LL200
^LS0
^FT137,147^A0B,42,41^FH\^CI28^FDMB 1^FS^CI27
^FO148,86^GB8,61,4^FS
^FT394,147^A0B,42,41^FH\^CI28^FDMB 1^FS^CI27
^FO405,86^GB8,61,4^FS
^FT239,34^A0R,42,41^FH\^CI28^FDMB 1^FS^CI27
^FO220,33^GB8,61,4^FS
^FT504,34^A0R,42,41^FH\^CI28^FDMB 1^FS^CI27
^FO485,33^GB8,61,4^FS
^FT137,171^A0B,42,41^FH\^CI28^FDMB 1^FS^CI27
^FO148,111^GB8,61,4^FS
^FT394,171^A0B,42,41^FH\^CI28^FDMB 1^FS^CI27
^FO405,111^GB8,61,4^FS
^FT239,59^A0R,42,41^FH\^CI28^FDMB 1^FS^CI27
^FO220,57^GB8,61,4^FS
^FT504,59^A0R,42,41^FH\^CI28^FDMB 1^FS^CI27
^FO485,57^GB8,61,4^FS
^LRY^FO2,1^GB676,0,198^FS^LRN
^LRY^FO100,33^GB56,0,53^FS^LRN
^LRY^FO357,33^GB56,0,53^FS^LRN
^LRY^FO220,94^GB56,0,53^FS^LRN
^LRY^FO485,94^GB56,0,53^FS^LRN
^LRY^FO100,57^GB56,0,53^FS^LRN
^LRY^FO357,57^GB56,0,53^FS^LRN
^LRY^FO220,119^GB56,0,53^FS^LRN
^LRY^FO485,119^GB56,0,53^FS^LRN
^PQ1,0,1,Y
^XZ

View File

@ -21,18 +21,18 @@
^PW679
^LL200
^LS0
^FT137,147^A0B,42,41^FH\^CI28^FDMB 2^FS^CI27
^FO148,86^GB8,61,4^FS
^FT394,147^A0B,42,41^FH\^CI28^FDMB 2^FS^CI27
^FO405,86^GB8,61,4^FS
^FT239,34^A0R,42,41^FH\^CI28^FDMB 2^FS^CI27
^FO220,33^GB8,61,4^FS
^FT504,34^A0R,42,41^FH\^CI28^FDMB 2^FS^CI27
^FO485,33^GB8,61,4^FS
^FT137,171^A0B,42,41^FH\^CI28^FDMB 2^FS^CI27
^FO148,111^GB8,61,4^FS
^FT394,171^A0B,42,41^FH\^CI28^FDMB 2^FS^CI27
^FO405,111^GB8,61,4^FS
^FT239,59^A0R,42,41^FH\^CI28^FDMB 2^FS^CI27
^FO220,57^GB8,61,4^FS
^FT504,59^A0R,42,41^FH\^CI28^FDMB 2^FS^CI27
^FO485,57^GB8,61,4^FS
^LRY^FO2,1^GB676,0,198^FS^LRN
^LRY^FO100,33^GB56,0,53^FS^LRN
^LRY^FO357,33^GB56,0,53^FS^LRN
^LRY^FO220,94^GB56,0,53^FS^LRN
^LRY^FO485,94^GB56,0,53^FS^LRN
^LRY^FO100,57^GB56,0,53^FS^LRN
^LRY^FO357,57^GB56,0,53^FS^LRN
^LRY^FO220,119^GB56,0,53^FS^LRN
^LRY^FO485,119^GB56,0,53^FS^LRN
^PQ1,0,1,Y
^XZ

View File

@ -21,18 +21,18 @@
^PW679
^LL200
^LS0
^FT137,137^A0B,42,41^FH\^CI28^FDMI 1^FS^CI27
^FO148,86^GB8,61,4^FS
^FT394,137^A0B,42,41^FH\^CI28^FDMI 1^FS^CI27
^FO405,86^GB8,61,4^FS
^FT239,40^A0R,42,41^FH\^CI28^FDMI 1^FS^CI27
^FO220,33^GB8,61,4^FS
^FT506,44^A0R,42,41^FH\^CI28^FDMI 1^FS^CI27
^FO487,35^GB8,61,4^FS
^FT137,161^A0B,42,41^FH\^CI28^FDMI 1^FS^CI27
^FO148,111^GB8,61,4^FS
^FT394,161^A0B,42,41^FH\^CI28^FDMI 1^FS^CI27
^FO405,111^GB8,61,4^FS
^FT239,64^A0R,42,41^FH\^CI28^FDMI 1^FS^CI27
^FO220,57^GB8,61,4^FS
^FT506,69^A0R,42,41^FH\^CI28^FDMI 1^FS^CI27
^FO487,60^GB8,61,4^FS
^LRY^FO2,1^GB676,0,198^FS^LRN
^LRY^FO100,33^GB56,0,53^FS^LRN
^LRY^FO357,33^GB56,0,53^FS^LRN
^LRY^FO220,94^GB56,0,53^FS^LRN
^LRY^FO487,97^GB56,0,53^FS^LRN
^LRY^FO100,57^GB56,0,53^FS^LRN
^LRY^FO357,57^GB56,0,53^FS^LRN
^LRY^FO220,119^GB56,0,53^FS^LRN
^LRY^FO487,121^GB56,0,53^FS^LRN
^PQ1,0,1,Y
^XZ

View File

@ -21,18 +21,18 @@
^PW679
^LL200
^LS0
^FT137,137^A0B,42,41^FH\^CI28^FDMI 2^FS^CI27
^FO148,86^GB8,61,4^FS
^FT394,137^A0B,42,41^FH\^CI28^FDMI 2^FS^CI27
^FO405,86^GB8,61,4^FS
^FT239,40^A0R,42,41^FH\^CI28^FDMI 2^FS^CI27
^FO220,33^GB8,61,4^FS
^FT506,44^A0R,42,41^FH\^CI28^FDMI 2^FS^CI27
^FO487,35^GB8,61,4^FS
^FT137,161^A0B,42,41^FH\^CI28^FDMI 2^FS^CI27
^FO148,111^GB8,61,4^FS
^FT394,161^A0B,42,41^FH\^CI28^FDMI 2^FS^CI27
^FO405,111^GB8,61,4^FS
^FT239,64^A0R,42,41^FH\^CI28^FDMI 2^FS^CI27
^FO220,57^GB8,61,4^FS
^FT506,69^A0R,42,41^FH\^CI28^FDMI 2^FS^CI27
^FO487,60^GB8,61,4^FS
^LRY^FO2,1^GB676,0,198^FS^LRN
^LRY^FO100,33^GB56,0,53^FS^LRN
^LRY^FO357,33^GB56,0,53^FS^LRN
^LRY^FO220,94^GB56,0,53^FS^LRN
^LRY^FO487,97^GB56,0,53^FS^LRN
^LRY^FO100,57^GB56,0,53^FS^LRN
^LRY^FO357,57^GB56,0,53^FS^LRN
^LRY^FO220,119^GB56,0,53^FS^LRN
^LRY^FO487,121^GB56,0,53^FS^LRN
^PQ1,0,1,Y
^XZ

View File

@ -21,18 +21,18 @@
^PW679
^LL200
^LS0
^FT393,150^A0B,42,43^FH\^CI28^FDRB 1^FS^CI27
^FO404,89^GB8,61,4^FS
^FT138,150^A0B,42,43^FH\^CI28^FDRB 1^FS^CI27
^FO149,89^GB8,61,4^FS
^FT245,35^A0R,42,43^FH\^CI28^FDRB 1^FS^CI27
^FO226,32^GB8,61,4^FS
^FT501,35^A0R,42,43^FH\^CI28^FDRB 1^FS^CI27
^FO484,32^GB8,61,4^FS
^FT393,174^A0B,42,43^FH\^CI28^FDRB 1^FS^CI27
^FO404,113^GB8,61,4^FS
^FT138,174^A0B,42,43^FH\^CI28^FDRB 1^FS^CI27
^FO149,113^GB8,61,4^FS
^FT245,59^A0R,42,43^FH\^CI28^FDRB 1^FS^CI27
^FO226,57^GB8,61,4^FS
^FT501,59^A0R,42,43^FH\^CI28^FDRB 1^FS^CI27
^FO484,57^GB8,61,4^FS
^LRY^FO2,1^GB676,0,198^FS^LRN
^LRY^FO356,32^GB56,0,56^FS^LRN
^LRY^FO101,32^GB56,0,56^FS^LRN
^LRY^FO226,94^GB56,0,56^FS^LRN
^LRY^FO484,94^GB56,0,56^FS^LRN
^LRY^FO356,57^GB56,0,56^FS^LRN
^LRY^FO101,57^GB56,0,56^FS^LRN
^LRY^FO226,118^GB56,0,56^FS^LRN
^LRY^FO484,118^GB56,0,56^FS^LRN
^PQ1,0,1,Y
^XZ

View File

@ -21,18 +21,18 @@
^PW679
^LL200
^LS0
^FT393,150^A0B,42,43^FH\^CI28^FDRB 2^FS^CI27
^FO404,89^GB8,61,4^FS
^FT138,150^A0B,42,43^FH\^CI28^FDRB 2^FS^CI27
^FO149,89^GB8,61,4^FS
^FT245,35^A0R,42,43^FH\^CI28^FDRB 2^FS^CI27
^FO226,32^GB8,61,4^FS
^FT501,35^A0R,42,43^FH\^CI28^FDRB 2^FS^CI27
^FO484,32^GB8,61,4^FS
^FT393,174^A0B,42,43^FH\^CI28^FDRB 2^FS^CI27
^FO404,113^GB8,61,4^FS
^FT138,174^A0B,42,43^FH\^CI28^FDRB 2^FS^CI27
^FO149,113^GB8,61,4^FS
^FT245,59^A0R,42,43^FH\^CI28^FDRB 2^FS^CI27
^FO226,57^GB8,61,4^FS
^FT501,59^A0R,42,43^FH\^CI28^FDRB 2^FS^CI27
^FO484,57^GB8,61,4^FS
^LRY^FO2,1^GB676,0,198^FS^LRN
^LRY^FO356,32^GB56,0,56^FS^LRN
^LRY^FO101,32^GB56,0,56^FS^LRN
^LRY^FO226,94^GB56,0,56^FS^LRN
^LRY^FO484,94^GB56,0,56^FS^LRN
^LRY^FO356,57^GB56,0,56^FS^LRN
^LRY^FO101,57^GB56,0,56^FS^LRN
^LRY^FO226,118^GB56,0,56^FS^LRN
^LRY^FO484,118^GB56,0,56^FS^LRN
^PQ1,0,1,Y
^XZ

View File

@ -21,18 +21,18 @@
^PW679
^LL200
^LS0
^FT139,151^A0B,42,43^FH\^CI28^FDRM 1^FS^CI27
^FO149,85^GB8,66,4^FS
^FT245,26^A0R,42,43^FH\^CI28^FDRM 1^FS^CI27
^FO226,29^GB8,66,4^FS
^FT397,151^A0B,42,43^FH\^CI28^FDRM 1^FS^CI27
^FO407,85^GB8,66,4^FS
^FT503,26^A0R,42,43^FH\^CI28^FDRM 1^FS^CI27
^FO484,29^GB8,66,4^FS
^FT139,175^A0B,42,43^FH\^CI28^FDRM 1^FS^CI27
^FO149,109^GB8,66,4^FS
^FT245,50^A0R,42,43^FH\^CI28^FDRM 1^FS^CI27
^FO226,53^GB8,66,4^FS
^FT397,175^A0B,42,43^FH\^CI28^FDRM 1^FS^CI27
^FO407,109^GB8,66,4^FS
^FT503,50^A0R,42,43^FH\^CI28^FDRM 1^FS^CI27
^FO484,53^GB8,66,4^FS
^LRY^FO2,1^GB676,0,198^FS^LRN
^LRY^FO101,29^GB56,0,56^FS^LRN
^LRY^FO226,95^GB56,0,56^FS^LRN
^LRY^FO359,29^GB56,0,56^FS^LRN
^LRY^FO484,95^GB56,0,56^FS^LRN
^LRY^FO101,54^GB56,0,56^FS^LRN
^LRY^FO226,119^GB56,0,56^FS^LRN
^LRY^FO359,54^GB56,0,56^FS^LRN
^LRY^FO484,119^GB56,0,56^FS^LRN
^PQ1,0,1,Y
^XZ

View File

@ -21,18 +21,18 @@
^PW679
^LL200
^LS0
^FT139,151^A0B,42,43^FH\^CI28^FDRM 2^FS^CI27
^FO149,85^GB8,66,4^FS
^FT245,26^A0R,42,43^FH\^CI28^FDRM 2^FS^CI27
^FO226,29^GB8,66,4^FS
^FT397,151^A0B,42,43^FH\^CI28^FDRM 2^FS^CI27
^FO407,85^GB8,66,4^FS
^FT503,26^A0R,42,43^FH\^CI28^FDRM 2^FS^CI27
^FO484,29^GB8,66,4^FS
^FT139,175^A0B,42,43^FH\^CI28^FDRM 2^FS^CI27
^FO149,109^GB8,66,4^FS
^FT245,50^A0R,42,43^FH\^CI28^FDRM 2^FS^CI27
^FO226,53^GB8,66,4^FS
^FT397,175^A0B,42,43^FH\^CI28^FDRM 2^FS^CI27
^FO407,109^GB8,66,4^FS
^FT503,50^A0R,42,43^FH\^CI28^FDRM 2^FS^CI27
^FO484,53^GB8,66,4^FS
^LRY^FO2,1^GB676,0,198^FS^LRN
^LRY^FO101,29^GB56,0,56^FS^LRN
^LRY^FO226,95^GB56,0,56^FS^LRN
^LRY^FO359,29^GB56,0,56^FS^LRN
^LRY^FO484,95^GB56,0,56^FS^LRN
^LRY^FO101,54^GB56,0,56^FS^LRN
^LRY^FO226,119^GB56,0,56^FS^LRN
^LRY^FO359,54^GB56,0,56^FS^LRN
^LRY^FO484,119^GB56,0,56^FS^LRN
^PQ1,0,1,Y
^XZ

View File

@ -494,8 +494,10 @@ class Test(Widget):
if self.config["hardware_config"].get("enforce_piece_removal", "no") == "yes":
if recipe.spec.get("instruction",False) is not False:
steps.append(Step(step_type="piece_removal", spec={}))
skip.add(i + 1)
if count_found:
steps.append(Step(step_type="count_end", spec={}))
skip.add(i + 1)
if step.step_type in ("leak_1", "leak_2"):
self.leak_step = step