s

config_ats.js

@@ -226,6 +226,26 @@
 			"signed_coords": "no",
 			"text_line_width": 0.0024
 		},
+		"Excellon2_7": { 
+			"nf1": 3,
+			"nf2": 4,
+			"units": "inch",
+			"zeroes": "none",
+			"decimal": "no",
+			"nf_comp": 0,
+			"break_sr": "yes",
+			"data_type": "ascii",
+			"separator": "nl",
+			"threshold": 200,
+			"drill_only": "no",
+			"multiplier": 1,
+			"resolution": 3,
+			"tool_units": "inch",
+			"coordinates": "absolute",
+			"merge_by_rule": "no",
+			"signed_coords": "no",
+			"text_line_width": 0.0024
+		},
 		"IPC356_1": {  
 			"nf1": 2,
 			"nf2": 4,
@@ -840,27 +860,35 @@
 				{
 					"valid": function(props){
 						var file = props.file;
-						return /.+\.ncd$|\.drl/ig.test(file.name) || /.+\.d\d+$/ig.test(file.name)
+						return /.+\.ncd$/ig.test(file.name) || /.+\.d\d+$/ig.test(file.name)
 					},  
 					"type": "Excellon2",		
 					"format": "Excellon2_5"
+				},
+				{
+					"valid": function(props){
+						var file = props.file;
+						return /.+\.drl/ig.test(file.name) || /.+\.d\d+$/ig.test(file.name)
+					},  
+					"type": "Excellon2",		
+					"format": "Excellon2_7"
 				}
 			],
 			"tl_name": [
-				{"orig_name" : ["OSP-Top\\.pho","solderpastetop","past_top"], "tl_name" : "past_top" },
-				{"orig_name" : ["OSP-Bottom\\.pho","solderpastebottom","past_botm"], "tl_name" : "past_botm" },
+				{"orig_name" : ["osp-top\\.pho","solderpastetop","past_top"], "tl_name" : "past_top" },
+				{"orig_name" : ["osp-bottom\\.pho","solderpastebottom","past_botm"], "tl_name" : "past_botm" },
 				{"orig_name" : ["pleg\\.art","^ss_top","silk_top"], "tl_name" : "silk_top" },
 				{"orig_name" : ["sleg\\.art","^ss_bot","silk_bot"], "tl_name" : "silk_bot" },
-				{"orig_name" : ["Top solder mask\\.pho","soldermasktop","sm_top"], "tl_name" : "sm_top" },
-				{"orig_name" : ["Bottom solder mask\\.pho","soldermaskbottom","sm_bot"], "tl_name" : "sm_botm" },
-				{"orig_name" : ["Top\\.pho","^top$","layertop"], "tl_name" : "top" },
-				{"orig_name" : ["^lay_(\\d+)","layer(\\d+)\\.gdo","layer_(\\d+)"], "tl_name" : "l_($1)"},
-				{"orig_name" : ["^Bottom\\.pho$","^bottom$","layerbottom"], "tl_name" : "bottom" },
-				{"orig_name" : ["(\\d)-(\\d)\\.drl$","drill(\\d+)-(\\d+)","d(\\d+)-(\\d+)"], "tl_name" : "d_($1)-($2)"},
+				{"orig_name" : ["soldermask-top","top-solder-mask\\.pho","soldermasktop","sm_top"], "tl_name" : "sm_top" },
+				{"orig_name" : ["soldermask-bottom","bottom-solder-mask\\.pho","soldermaskbottom","sm_bot"], "tl_name" : "sm_botm" },
+				{"orig_name" : ["top\\.pho","^top$","layertop"], "tl_name" : "top" },
+				{"orig_name" : ["^lay(\\d+)","layer(\\d+)\\.gdo","layer_(\\d+)"], "tl_name" : "l_($1)"},
+				{"orig_name" : ["^bottom\\.pho$","^bottom$","layerbottom"], "tl_name" : "bottom" },
+				{"orig_name" : ["^drill(\\d+)-(\\d+)$","^d(\\d+)-(\\d+)$"], "tl_name" : "d_($1)-($2)"},
 				{"orig_name" : ["^drill$"], "tl_name" : "drill" },
 				{"orig_name" : ["\\.rou$","^rout$"], "tl_name" : "rout" },
 				{"orig_name" : "fab.art", "tl_name" : "fab.art" },
-				{"orig_name" : ["PCB-SET\\.pho","^pcb-set$","^array$"], "tl_name" : "array" },
+				{"orig_name" : ["pcb-set\\.gdo","^pcb-set\\.pho$","^pcb-set$","^array$"], "tl_name" : "array" },
 				{"orig_name" : ["^outline"], "tl_name" : "outline" },
 				{"orig_name" : ["au_mask-bottom\\.gdo","au_mask_bottom\\.gdo","enig_top"], "tl_name" : "enig_top" },
 				{"orig_name" : ["au_mask-top\\.gdo","au_mask_top\\.gdo","enig_bot"], "tl_name" : "enig_bot" },
@@ -868,16 +896,17 @@
 				{"orig_name" : ["cavitybottom","cavity_bot"], "tl_name" : "cavity_bot" },
 			],
 			"mergerule" : {
+				drill_second: ["(\\d+)-(\\d+)\\.drl$"],
 				drill: [
 					{orig_rule:["contournonplated"],drill_type:"non_plated",shape:"slot"},
 					{orig_rule:["contourplated"],drill_type:"plated",shape:"slot"},
 					{orig_rule:["thruholenonplated"],drill_type:"non_plated",shape:"hole"},
 					{orig_rule:["thruholeplated"],drill_type:"plated",shape:"hole"},
 				],
-				profile:["enig_bot"],
+				profile:["enig_bot","past_top"],
 				laser : {
 					tl_name: "drill($1)-($2)",
-					regs: ["(\\d+)-(\\d+)plated\\.ncd$"]
+					regs: ["(\\d+)-(\\d+)plated\\.ncd$","(\\d+)-(\\d+)\\.drl$"]
 				}
 			}
 		},
@@ -918,14 +947,14 @@
 				}
 			],
 			"tl_name": [
-				{"orig_name" : ["pasttop.art","past_top"], "tl_name" : "past_top" },
-				{"orig_name" : ["pastbotm.art","past_botm"], "tl_name" : "past_botm" },
-				{"orig_name" : ["^sst\\.art$","\\.ssa$","SilkScrnTop\\.ger","silk_top"], "tl_name" : "silk_top" },
-				{"orig_name" : ["^ssb\\.art$","\\.ssb$","SilkScrnBot\\.ger","silk_bot"], "tl_name" : "silk_bot" },
+				{"orig_name" : ["pasttop\\.art","past_top"], "tl_name" : "past_top" },
+				{"orig_name" : ["pastbotm\\.art","past_botm"], "tl_name" : "past_botm" },
+				{"orig_name" : ["^silktop\\.art$","silk_top"], "tl_name" : "silk_top" },
+				{"orig_name" : ["^silkbotm\\.art$","silk_bot"], "tl_name" : "silk_bot" },
 				{"orig_name" : ["soldtop.art","sm_top"], "tl_name" : "sm_top" },
 				{"orig_name" : ["soldbotm\\.art","sm_bot"], "tl_name" : "sm_botm" },
 				{"orig_name" : ["^top$","^top.art$"], "tl_name" : "top" },
-				{"orig_name" : ["^art(\\d+)\\.art$","^l_(\\d+)"], "tl_name" : "l_($1)"},
+				{"orig_name" : ["^pgp(\\d+)\\.art$","^art(\\d+)\\.art$","^l_(\\d+)"], "tl_name" : "l_($1)"},
 				{"orig_name" : ["^bot\\.art$","^bottom$","^bottom.art$"], "tl_name" : "bottom" },
 				{"orig_name" : ["\\.d(\\d+)$"], "tl_name" : "d_($1)-($1+1)"},
 				{"orig_name" : ["^drill(\\d+)-(\\d+)$","^d_(\\d+)-(\\d+)$"], "tl_name" : "d_($1)-($2)"},