From b358a69d4c469de1cbb0de41d7bd653e8e0d3b52 Mon Sep 17 00:00:00 2001 From: Aaron Holtzman Date: Tue, 12 Feb 2019 13:17:20 -0500 Subject: [PATCH] Updates to work with Eagle 9.x with new CAM generator - AMOC8 macro is slightly different - INCH,TZ now includes a 000.000 suffix - Excellon output now includes ICI,OFF --- gerbmerge/jobs.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gerbmerge/jobs.py b/gerbmerge/jobs.py index 586cdb3..1fe5b15 100644 --- a/gerbmerge/jobs.py +++ b/gerbmerge/jobs.py @@ -66,8 +66,8 @@ re.compile(r'^%OFA0B0\*%$'), re.compile(r'^%IPPOS\*%'), re.compile(r'^%AMOC8\*$'), # Eagle's octagon defined by macro with a $1 parameter - re.compile(r'^5,1,8,0,0,1\.08239X\$1,22\.5\*$'), # Eagle's octagon, 22.5 degree rotation - re.compile(r'^5,1,8,0,0,1\.08239X\$1,0\.0\*$'), # Eagle's octagon, 0.0 degree rotation + re.compile(r'^5,1,8,0,0,1\.08239X\$1,22\.5\*[%]$'), # Eagle's octagon, 22.5 degree rotation + re.compile(r'^5,1,8,0,0,1\.08239X\$1,0\.0\*[%]$'), # Eagle's octagon, 0.0 degree rotation re.compile(r'^\*?%$'), re.compile(r'^M0?2\*$'), @@ -95,7 +95,7 @@ # feed/speed (for Protel) xtdef2_pat = re.compile(r'^(T\d+)C([0-9.]+)(?:F\d+)?(?:S\d+)?$') # Tool+diameter definition with optional # feed/speed at the end (for OrCAD) -xzsup_pat = re.compile(r'^INCH(,([LT])Z)?$') # Leading/trailing zeros INCLUDED +xzsup_pat = re.compile(r'^INCH(,([LT])Z)?(,000\.000)?$') # Leading/trailing zeros INCLUDED XIgnoreList = ( \ re.compile(r'^%$'), @@ -103,6 +103,7 @@ re.compile(r'^M48$'), # Program header to first % re.compile(r'^M72$'), # Inches re.compile(r'^FMAT,2$'),# KiCad work-around + re.compile(r'^ICI,OFF$'), # Incremental mode off re.compile(r'^G05$'), # Drill Mode re.compile(r'^G90$') # Absolute Mode )