scott

config_ats.js

@@ -429,18 +429,18 @@
 			"tl_name": [
 				{"orig_name" : ["top_enig","top-enig","enig_top"], "tl_name" : "enig_top" }, 
 				{"orig_name" : ["bot_enig","bot-enig","enig_bot"], "tl_name" : "enig_bot" }, 
-				{"orig_name" : ["^spt$","^past_top$"], "tl_name" : "past_top" }, 
-				{"orig_name" : ["^spb$","^past_botm$"], "tl_name" : "past_botm" },
-				{"orig_name" : ["^sst$","^silk_top$"], "tl_name" : "silk_top" },
-				{"orig_name" : ["^ssb$","^silk_bot$"], "tl_name" : "silk_bot" },
-				{"orig_name" : ["^smt$","^sm_top$"], "tl_name" : "sm_top" },
-				{"orig_name" : ["^smb$","^sm_botm$"], "tl_name" : "sm_botm" },
+				{"orig_name" : ["top_paste","^spt$","^past_top$"], "tl_name" : "past_top" }, 
+				{"orig_name" : ["bottom_paste","^spb$","^past_botm$"], "tl_name" : "past_botm" },
+				{"orig_name" : ["top_silk","^sst$","^silk_top$"], "tl_name" : "silk_top" },
+				{"orig_name" : ["bottom_silk","^ssb$","^silk_bot$"], "tl_name" : "silk_bot" },
+				{"orig_name" : ["top_solder","^smt$","^sm_top$"], "tl_name" : "sm_top" },
+				{"orig_name" : ["bottom_solder","^smb$","^sm_botm$"], "tl_name" : "sm_botm" },
 				{"orig_name" : "^top$", "tl_name" : "top" },
 				{"orig_name" : "^drill$", "tl_name" : "drill" },
-				{"orig_name" : ["outline.art","^outline$"], "tl_name" : "outline" },
+				{"orig_name" : ["^board_outline$","outline.art","^outline$"], "tl_name" : "outline" },
 				{"orig_name" : ["^rout$","\\.rou$"], "tl_name" : "rout" },
 				{"orig_name" : "^bottom$", "tl_name" : "bottom" },
-				{"orig_name" : ["^isl(\\d+)$","^layer_(\\d+)$"], "tl_name" : "l_($1)"},
+				{"orig_name" : ["^l(\\d+)","^isl(\\d+)$","^layer_(\\d+)$"], "tl_name" : "l_($1)"},
 				{"orig_name" : ["_isl(\\d+)_isl(\\d+)","d(\\d+)-(\\d+)"], "tl_name" : "d_($1)-($2)"},
 				{"orig_name" : ["_top_isl(\\d+)"], "tl_name" : "d_1-($1)"},
 				{"orig_name" : ["_isl(\\d+)_bottom"], "tl_name" : "d_($1)-($1+1)"}
@@ -572,13 +572,13 @@
 				{"orig_name" : ["mask_top\\.art","psm\\.art","sm_top"], "tl_name" : "sm_top" },
 				{"orig_name" : ["mask_bot\\.art","ssm\\.art","sm_bot"], "tl_name" : "sm_botm" },
 				{"orig_name" : ["^top$","^top.art$"], "tl_name" : "top" },
-				{"orig_name" : ["l(\\d)\\.art$","^0(\\d+).*ccp_ms","^s(\\d+)\\.art","lay(\\d+)\\.art","layer_(\\d+)"], "tl_name" : "l_($1)"},
+				{"orig_name" : ["^0?(\\d+)_.*\\.art$","^l(\\d+)\\.art$","^0(\\d+).*ccp_ms","^s(\\d+)\\.art","lay(\\d+)\\.art","layer_(\\d+)"], "tl_name" : "l_($1)"},
 				{"orig_name" : ["^bottom$","^bottom\\.art$"], "tl_name" : "bottom" },
 				{"orig_name" : ["-(\\d+)-(\\d+)\\.drl$","(\\d+)-(\\d+)-laser\\.drl$","d(\\d+)-(\\d+)"], "tl_name" : "d_($1)-($2)"},
 				{"orig_name" : ["\\.rou$","^rout$"], "tl_name" : "rout" },
 				{"orig_name" : "fab.art", "tl_name" : "fab.art" },
 				{"orig_name" : ["multipack.art","^array$"], "tl_name" : "array" },
-				{"orig_name" : ["^outline"], "tl_name" : "outline" },
+				{"orig_name" : ["outline"], "tl_name" : "outline" },
 				{"orig_name" : ["^pst\\.art$","top-enig","enig_top"], "tl_name" : "enig_top" },
 				{"orig_name" : ["^sst\\.art$","bot-enig","enig_bot"], "tl_name" : "enig_bot" },
 			],
@@ -810,6 +810,7 @@
 					"format": "Excellon2_4",
 					"format_params": function(props){
 						var params = props.params
+						if (params.ncdrill && !params.nc_param){params.nc_param = params.ncdrill}
 						if(params.nc_param){
 							var leading = params.nc_param["SUPPRESS_LEAD_ZEROES"]
 							var trailing = params.nc_param["SUPPRESS_TRAIL_ZEROES"]
@@ -847,12 +848,12 @@
 			"tl_name": [
 				{"orig_name" : ["^pmt\\.art$","\\.pma$","SoldPasteTop\\.ger","past_top"], "tl_name" : "past_top" },
 				{"orig_name" : ["^pmb\\.art$","\\.pmb$","SoldPasteBot\\.ger","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" : ["^smt\\.art$","\\.sma$","SoldMask1Top\\.ger","sm_top"], "tl_name" : "sm_top" },
-				{"orig_name" : ["^smb\\.art$","\\.smb$","SoldMask1Bot\\.ger","sm_bot"], "tl_name" : "sm_botm" },
+				{"orig_name" : ["tsilk","^sst\\.art$","\\.ssa$","SilkScrnTop\\.ger","silk_top"], "tl_name" : "silk_top" },
+				{"orig_name" : ["bsilk","^ssb\\.art$","\\.ssb$","SilkScrnBot\\.ger","silk_bot"], "tl_name" : "silk_bot" },
+				{"orig_name" : ["tmask","^smt\\.art$","\\.sma$","SoldMask1Top\\.ger","sm_top"], "tl_name" : "sm_top" },
+				{"orig_name" : ["bmask","^smb\\.art$","\\.smb$","SoldMask1Bot\\.ger","sm_bot"], "tl_name" : "sm_botm" },
 				{"orig_name" : ["^top$","^top.art$"], "tl_name" : "top" },
-				{"orig_name" : ["^v(\\d+)\\.art$","^g(\\d+)\\.art$","^s(\\d+)\\.art$","\\.l(\\d+)$","Copper(\\d+)\\.ger$","^layer_(\\d+)"], "tl_name" : "l_($1)"},
+				{"orig_name" : ["^l(\\d+).*\\.art$","^v(\\d+)\\.art$","^g(\\d+)\\.art$","^s(\\d+)\\.art$","\\.l(\\d+)$","Copper(\\d+)\\.ger$","^layer_(\\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" : ["thruHolePlated_(\\d+)_(\\d+)\\.ncd","(\\d+)-(\\d+)\\.drl$","^drill(\\d+)-(\\d+)$","^d_(\\d+)-(\\d+)$"], "tl_name" : "d_($1)-($2)"},
@@ -860,18 +861,10 @@
 				{"orig_name" : ["\\.rou$","^rout$"], "tl_name" : "rout" },
 				{"orig_name" : "fab.art", "tl_name" : "fab.art" },
 				{"orig_name" : ["multipack.art","^array$"], "tl_name" : "array" },
-				{"orig_name" : ["\\.bol$","PnlContourNonPlated\\.ger","^outline"], "tl_name" : "outline" },
+				{"orig_name" : ["outline\\.art$","\\.bol$","PnlContourNonPlated\\.ger","^outline"], "tl_name" : "outline" },
 				{"orig_name" : ["top-enig","enig_top"], "tl_name" : "enig_top" },
 				{"orig_name" : ["bot-enig","enig_bot"], "tl_name" : "enig_bot" },
-			],
-			"mergerule" : {
-				drill: ["(\\d+)-(\\d+)\\.drl$"],
-				profile:["^drill.\\art$"],  
-				laser : {
-					tl_name: "drill($1)-($2)",
-					regs: ["(\\d+)-(\\d+)\\.drl$"]
-				}
-			}
+			]
 		},
 		"Vivo":{
 			"step": "cad",

test/mytest.js

@@ -10,6 +10,8 @@ var Job = $.job;
 var JobId = $.job_id;
 
 try {
+
+    GEN.renameStep({job:'demo',name:'pcb_1',new_name:'pcb_a'})
     
     return "Done"
 } catch (e) {