improve routing mode compatibility with excellon specification

7 files changed, 47 insertions, 29 deletions

diff --git a/tests/data/ref_drill_inch.txt b/tests/data/ref_drill_inch.txt
index 6aea2e0..6af5494 100644
--- a/tests/data/ref_drill_inch.txt
+++ b/tests/data/ref_drill_inch.txt
@@ -1,7 +1,7 @@
 M48
 FMAT,2
 ICI,OFF
-INCH,TZ,00.0000
+INCH,TZ
 T01C0.0236
 T02C0.0275
 T03C0.0314
@@ -28,10 +28,12 @@ X1417Y2795
 T04
 G00X236Y669
 M15
-G03X630Y276A394
+G02X630Y276I0J-394
+G03X1024Y-118A394
+G03X1417Y276A394
 G01X2598Y276
-G01X2598Y1614
-G03X2205Y2008A394
+G01X2598Y1024
+G03X1614Y2008I-984J0
 G01X236Y2008
 G01X236Y669
 M16
diff --git a/tests/data/ref_drill_metric.txt b/tests/data/ref_drill_metric.txt
index 903fc48..3a50856 100644
--- a/tests/data/ref_drill_metric.txt
+++ b/tests/data/ref_drill_metric.txt
@@ -24,18 +24,24 @@ M15
 G01X2140Y2925
 M16
 G05
-
 X3600Y7100
 T04
-G00X600Y1700
+G00
+X600Y1700
 M15
-G03X1600Y700A1000
-G01X6600Y700
-G01X6600Y4100
-G03X5600Y5100A1000
-G01X600Y5100
-G01X600Y1700
+I0J-1000
+G02X1600Y700
+G03
+A1000
+I-2000J0
+X2600Y-300
+X3600Y700
+G01X6600
+Y2600
+G03X4100Y5100I-2500J0
+G01
+X600
+Y1700
 M16
 G05
-
 M30
diff --git a/tests/expects/excellon_offset.txt b/tests/expects/excellon_offset.txt
index 41dbf3e..9a0b430 100644
--- a/tests/expects/excellon_offset.txt
+++ b/tests/expects/excellon_offset.txt
@@ -28,10 +28,12 @@ X14600Y12100
 T04
 G00X11600Y6700
 M15
-G03X12600Y5700A1000
+G02X12600Y5700I0J-1000
+G03X13600Y4700A1000
+G03X14600Y5700A1000
 G01X17600Y5700
-G01X17600Y9100
-G03X16600Y10100A1000
+G01X17600Y7600
+G03X15100Y10100I-2500J0
 G01X11600Y10100
 G01X11600Y6700
 M16
diff --git a/tests/expects/excellon_rotate.txt b/tests/expects/excellon_rotate.txt
index 9983909..f33dcfd 100644
--- a/tests/expects/excellon_rotate.txt
+++ b/tests/expects/excellon_rotate.txt
@@ -28,10 +28,12 @@ X4978Y5086
 T04
 G00X4006Y-1014
 M15
-G03X5287Y-1612A1000
+G02X5287Y-1612I342J-940
+G03X6569Y-2210A1000
+G03X7167Y-928A1000
 G01X9986Y98
-G01X8823Y3293
-G03X7541Y3891A1000
+G01X9336Y1883
+G03X6132Y3378I-2349J-855
 G01X2843Y2181
 G01X4006Y-1014
 M16
diff --git a/tests/expects/excellon_save.txt b/tests/expects/excellon_save.txt
index 6a22a7d..18fdcc4 100644
--- a/tests/expects/excellon_save.txt
+++ b/tests/expects/excellon_save.txt
@@ -28,10 +28,12 @@ X3600Y7100
 T04
 G00X600Y1700
 M15
-G03X1600Y700A1000
+G02X1600Y700I0J-1000
+G03X2600Y-300A1000
+G03X3600Y700A1000
 G01X6600Y700
-G01X6600Y4100
-G03X5600Y5100A1000
+G01X6600Y2600
+G03X4100Y5100I-2500J0
 G01X600Y5100
 G01X600Y1700
 M16
diff --git a/tests/expects/excellon_to_inch.txt b/tests/expects/excellon_to_inch.txt
index 6aea2e0..6af5494 100644
--- a/tests/expects/excellon_to_inch.txt
+++ b/tests/expects/excellon_to_inch.txt
@@ -1,7 +1,7 @@
 M48
 FMAT,2
 ICI,OFF
-INCH,TZ,00.0000
+INCH,TZ
 T01C0.0236
 T02C0.0275
 T03C0.0314
@@ -28,10 +28,12 @@ X1417Y2795
 T04
 G00X236Y669
 M15
-G03X630Y276A394
+G02X630Y276I0J-394
+G03X1024Y-118A394
+G03X1417Y276A394
 G01X2598Y276
-G01X2598Y1614
-G03X2205Y2008A394
+G01X2598Y1024
+G03X1614Y2008I-984J0
 G01X236Y2008
 G01X236Y669
 M16
diff --git a/tests/expects/excellon_to_metric.txt b/tests/expects/excellon_to_metric.txt
index 1bb4287..20f698e 100644
--- a/tests/expects/excellon_to_metric.txt
+++ b/tests/expects/excellon_to_metric.txt
@@ -28,10 +28,12 @@ X3599Y7099
 T04
 G00X599Y1699
 M15
-G03X1600Y701A1001
+G02X1600Y701I0J-1001
+G03X2601Y-300A1001
+G03X3599Y701A1001
 G01X6599Y701
-G01X6599Y4100
-G03X5601Y5100A1001
+G01X6599Y2601
+G03X4100Y5100I-2499J0
 G01X599Y5100
 G01X599Y1699
 M16