diff --git a/src/gerber/convert-soup-to-gerber-commands/defineAperturesForLayer.ts b/src/gerber/convert-soup-to-gerber-commands/defineAperturesForLayer.ts index d30e481..f0b179d 100644 --- a/src/gerber/convert-soup-to-gerber-commands/defineAperturesForLayer.ts +++ b/src/gerber/convert-soup-to-gerber-commands/defineAperturesForLayer.ts @@ -105,7 +105,6 @@ export const getApertureConfigFromCirclePcbPlatedHole = ( return { standard_template_code: "C", diameter: elm.outer_diameter, - hole_diameter: elm.hole_diameter, } } diff --git a/tests/excellon-drill/__snapshots__/excellon-drill-builder.test.ts.snap b/tests/excellon-drill/__snapshots__/excellon-drill-builder.test.ts.snap index 88c1520..6fdf1f0 100644 --- a/tests/excellon-drill/__snapshots__/excellon-drill-builder.test.ts.snap +++ b/tests/excellon-drill/__snapshots__/excellon-drill-builder.test.ts.snap @@ -431,3 +431,219 @@ exports[`test that we can recreate an example drill file: excellon-drill-builder }, ] `; + +exports[`test that we can recreate an example drill file: excellon-drill-builder 1`] = ` +[ + { + "command_code": "M48", + }, + { + "command_code": "header_comment", + "text": "DRILL file {tscircuit} date 2024-04-09T20:34:41-0700", + }, + { + "command_code": "header_comment", + "text": "FORMAT={-:-/ absolute / inch / decimal}", + }, + { + "attribute_name": "TF.CreationDate", + "attribute_value": "2024-04-09T20:34:41-07:00", + "command_code": "header_attribute", + }, + { + "attribute_name": "TF.GenerationSoftware", + "attribute_value": "Kicad,Pcbnew,8.0.1", + "command_code": "header_attribute", + }, + { + "attribute_name": "TF.FileFunction", + "attribute_value": "Plated,1,2,PTH", + "command_code": "header_attribute", + }, + { + "command_code": "FMAT", + "format": 2, + }, + { + "command_code": "header_comment", + "text": "TA.AperFunction,Plated,PTH,ComponentDrill", + }, + { + "command_code": "define_tool", + "diameter": 0.0394, + "tool_number": 1, + }, + { + "command_code": "header_comment", + "text": "End of header", + }, + { + "command_code": "G90", + }, + { + "command_code": "G05", + }, + { + "command_code": "define_tool", + "diameter": 0.0394, + "tool_number": 1, + }, + { + "command_code": "drill_at", + "x": 4.9197, + "y": -2.9724, + }, + { + "command_code": "drill_at", + "x": 5.0197, + "y": -2.9724, + }, + { + "command_code": "M30", + }, +] +`; + +exports[`test that we can recreate an example drill file: excellon-drill-builder 1`] = ` +[ + { + "command_code": "M48", + }, + { + "command_code": "header_comment", + "text": "DRILL file {tscircuit} date 2024-04-09T20:34:41-0700", + }, + { + "command_code": "header_comment", + "text": "FORMAT={-:-/ absolute / inch / decimal}", + }, + { + "attribute_name": "TF.CreationDate", + "attribute_value": "2024-04-09T20:34:41-07:00", + "command_code": "header_attribute", + }, + { + "attribute_name": "TF.GenerationSoftware", + "attribute_value": "Kicad,Pcbnew,8.0.1", + "command_code": "header_attribute", + }, + { + "attribute_name": "TF.FileFunction", + "attribute_value": "Plated,1,2,PTH", + "command_code": "header_attribute", + }, + { + "command_code": "FMAT", + "format": 2, + }, + { + "command_code": "header_comment", + "text": "TA.AperFunction,Plated,PTH,ComponentDrill", + }, + { + "command_code": "define_tool", + "diameter": 0.0394, + "tool_number": 1, + }, + { + "command_code": "header_comment", + "text": "End of header", + }, + { + "command_code": "G90", + }, + { + "command_code": "G05", + }, + { + "command_code": "define_tool", + "diameter": 0.0394, + "tool_number": 1, + }, + { + "command_code": "drill_at", + "x": 4.9197, + "y": -2.9724, + }, + { + "command_code": "drill_at", + "x": 5.0197, + "y": -2.9724, + }, + { + "command_code": "M30", + }, +] +`; + +exports[`test that we can recreate an example drill file: excellon-drill-builder 1`] = ` +[ + { + "command_code": "M48", + }, + { + "command_code": "header_comment", + "text": "DRILL file {tscircuit} date 2024-04-09T20:34:41-0700", + }, + { + "command_code": "header_comment", + "text": "FORMAT={-:-/ absolute / inch / decimal}", + }, + { + "attribute_name": "TF.CreationDate", + "attribute_value": "2024-04-09T20:34:41-07:00", + "command_code": "header_attribute", + }, + { + "attribute_name": "TF.GenerationSoftware", + "attribute_value": "Kicad,Pcbnew,8.0.1", + "command_code": "header_attribute", + }, + { + "attribute_name": "TF.FileFunction", + "attribute_value": "Plated,1,2,PTH", + "command_code": "header_attribute", + }, + { + "command_code": "FMAT", + "format": 2, + }, + { + "command_code": "header_comment", + "text": "TA.AperFunction,Plated,PTH,ComponentDrill", + }, + { + "command_code": "define_tool", + "diameter": 0.0394, + "tool_number": 1, + }, + { + "command_code": "header_comment", + "text": "End of header", + }, + { + "command_code": "G90", + }, + { + "command_code": "G05", + }, + { + "command_code": "define_tool", + "diameter": 0.0394, + "tool_number": 1, + }, + { + "command_code": "drill_at", + "x": 4.9197, + "y": -2.9724, + }, + { + "command_code": "drill_at", + "x": 5.0197, + "y": -2.9724, + }, + { + "command_code": "M30", + }, +] +`; diff --git a/tests/gerber/__snapshots__/simple1-bottom.snap.svg b/tests/gerber/__snapshots__/simple1-bottom.snap.svg index f9f00f4..d85b0bf 100644 --- a/tests/gerber/__snapshots__/simple1-bottom.snap.svg +++ b/tests/gerber/__snapshots__/simple1-bottom.snap.svg @@ -1,7 +1,7 @@ - + \ No newline at end of file diff --git a/tests/gerber/__snapshots__/simple1-top.snap.svg b/tests/gerber/__snapshots__/simple1-top.snap.svg index eca15f2..d8c8ab2 100644 --- a/tests/gerber/__snapshots__/simple1-top.snap.svg +++ b/tests/gerber/__snapshots__/simple1-top.snap.svg @@ -1,7 +1,7 @@ - + \ No newline at end of file diff --git a/tests/gerber/__snapshots__/simple2-bottom.snap.svg b/tests/gerber/__snapshots__/simple2-bottom.snap.svg index 8f8d383..f4d8fca 100644 --- a/tests/gerber/__snapshots__/simple2-bottom.snap.svg +++ b/tests/gerber/__snapshots__/simple2-bottom.snap.svg @@ -1,7 +1,7 @@ - + \ No newline at end of file diff --git a/tests/gerber/__snapshots__/simple2-top.snap.svg b/tests/gerber/__snapshots__/simple2-top.snap.svg index 7fb5631..5dfbe2e 100644 --- a/tests/gerber/__snapshots__/simple2-top.snap.svg +++ b/tests/gerber/__snapshots__/simple2-top.snap.svg @@ -1,7 +1,7 @@ - + \ No newline at end of file