diff --git a/crlcore/etc/c35b4/technology.conf b/crlcore/etc/c35b4/technology.conf index 785291a9..7bb5b2b0 100644 --- a/crlcore/etc/c35b4/technology.conf +++ b/crlcore/etc/c35b4/technology.conf @@ -21,6 +21,7 @@ gdsLayersTable = \ , ("metal1" , "MET1" , 35) , ("cut1" , "VIA1" , 36) , ("metal2" , "MET2" , 37) + , ("metcap" , "METCAP" , 55) , ("cut2" , "VIA2" , 38) , ("metal3" , "MET3" , 39) , ("cut3" , "VIA3" , 41) diff --git a/crlcore/etc/common/display.conf b/crlcore/etc/common/display.conf index 9e9ace2d..729d415a 100644 --- a/crlcore/etc/common/display.conf +++ b/crlcore/etc/common/display.conf @@ -142,15 +142,16 @@ stylesTable = \ # Routing Layers. , (Group , 'Routing Layers') - #, (Drawing, 'metal1', { 'color':'Blue' , 'pattern':'light_antislash0.8', 'border':1, 'threshold':0.80*scale }) - , (Drawing, 'metal1', { 'color':'Blue' , 'pattern':'slash.8' , 'border':1, 'threshold':0.80*scale }) - , (Drawing, 'metal2', { 'color':'Aqua' , 'pattern':'poids4.8' , 'border':1, 'threshold':0.02*scale }) - , (Drawing, 'metal3', { 'color':'LightPink', 'pattern':'poids4.8' , 'border':1, 'threshold':0.02*scale }) - , (Drawing, 'metal4', { 'color':'Green' , 'pattern':'poids4.8' , 'border':1, 'threshold':0.02*scale }) - , (Drawing, 'metal5', { 'color':'Yellow' , 'pattern':'poids4.8' , 'border':1, 'threshold':0.02*scale }) - , (Drawing, 'metal6', { 'color':'Violet' , 'pattern':'poids4.8' , 'border':1, 'threshold':0.02*scale }) - , (Drawing, 'metal7', { 'color':'Red' , 'pattern':'poids4.8' , 'border':1, 'threshold':0.02*scale }) - , (Drawing, 'metal8', { 'color':'Blue' , 'pattern':'poids4.8' , 'border':1, 'threshold':0.02*scale }) + #, (Drawing, 'metal1', { 'color':'Blue' , 'pattern':'light_antislash0.8', 'border':1, 'threshold':0.80*scale }) + , (Drawing, 'metal1', { 'color':'Blue' , 'pattern':'slash.8' , 'border':1, 'threshold':0.80*scale }) + , (Drawing, 'metal2', { 'color':'Aqua' , 'pattern':'poids4.8' , 'border':1, 'threshold':0.02*scale }) + , (Drawing, 'metcap', { 'color':'DarkTurquoise', 'pattern':'poids2.8' , 'border':2, 'threshold':0.02*scale }) + , (Drawing, 'metal3', { 'color':'LightPink' , 'pattern':'poids4.8' , 'border':1, 'threshold':0.02*scale }) + , (Drawing, 'metal4', { 'color':'Green' , 'pattern':'poids4.8' , 'border':1, 'threshold':0.02*scale }) + , (Drawing, 'metal5', { 'color':'Yellow' , 'pattern':'poids4.8' , 'border':1, 'threshold':0.02*scale }) + , (Drawing, 'metal6', { 'color':'Violet' , 'pattern':'poids4.8' , 'border':1, 'threshold':0.02*scale }) + , (Drawing, 'metal7', { 'color':'Red' , 'pattern':'poids4.8' , 'border':1, 'threshold':0.02*scale }) + , (Drawing, 'metal8', { 'color':'Blue' , 'pattern':'poids4.8' , 'border':1, 'threshold':0.02*scale }) # Cuts (VIA holes). , (Group , 'Cuts (VIA holes)') @@ -320,12 +321,13 @@ stylesTable = \ # Group: Routing Layers. , (Group , 'Routing Layers') - , (Drawing, 'metal1', { 'color':'Blue' , 'pattern':'slash.32' , 'border':1, 'threshold':0.02*scale }) - , (Drawing, 'metal2', { 'color':'Aqua' , 'pattern':'antislash2.32', 'border':1, 'threshold':0.02*scale }) - , (Drawing, 'metal3', { 'color':'LightPink', 'pattern':'antislash3.32', 'border':1, 'threshold':0.02*scale }) - , (Drawing, 'metal4', { 'color':'Green' , 'pattern':'antislash4.32', 'border':1, 'threshold':0.02*scale }) - , (Drawing, 'metal5', { 'color':'Yellow' , 'pattern':'antislash5.32', 'border':1, 'threshold':0.02*scale }) - , (Drawing, 'metal6', { 'color':'Violet' , 'pattern':'antislash2.32', 'border':1, 'threshold':0.02*scale }) + , (Drawing, 'metal1', { 'color':'Blue' , 'pattern':'slash.32' , 'border':1, 'threshold':0.02*scale }) + , (Drawing, 'metal2', { 'color':'Aqua' , 'pattern':'antislash2.32', 'border':1, 'threshold':0.02*scale }) + , (Drawing, 'metcap', { 'color':'DarkTurquoise', 'pattern':'poids2.32' , 'border':2, 'threshold':0.02*scale }) + , (Drawing, 'metal3', { 'color':'LightPink' , 'pattern':'antislash3.32', 'border':1, 'threshold':0.02*scale }) + , (Drawing, 'metal4', { 'color':'Green' , 'pattern':'antislash4.32', 'border':1, 'threshold':0.02*scale }) + , (Drawing, 'metal5', { 'color':'Yellow' , 'pattern':'antislash5.32', 'border':1, 'threshold':0.02*scale }) + , (Drawing, 'metal6', { 'color':'Violet' , 'pattern':'antislash2.32', 'border':1, 'threshold':0.02*scale }) # Group: Cuts (VIA holes) , (Group , 'Cuts (VIA holes)') diff --git a/crlcore/etc/common/patterns.conf b/crlcore/etc/common/patterns.conf index ffb8f7b6..5a789783 100644 --- a/crlcore/etc/common/patterns.conf +++ b/crlcore/etc/common/patterns.conf @@ -1,7 +1,16 @@ # -*- Mode:Python; explicit-buffer-name: "patterns.conf" -*- -patternsTable = ( { 'name':'slash.8' , 'bits':[ ' X X' +patternsTable = ( { 'name':'crux.8' , 'bits':[ ' ' + , ' X ' + , ' X ' + , ' XXXXX ' + , ' X ' + , ' X ' + , ' ' + , ' ' ] } + + , { 'name':'slash.8' , 'bits':[ ' X X' , ' X X ' , ' X X ' , 'X X ' diff --git a/crlcore/etc/common/technology.conf b/crlcore/etc/common/technology.conf index 7814e731..42c7349d 100644 --- a/crlcore/etc/common/technology.conf +++ b/crlcore/etc/common/technology.conf @@ -40,6 +40,7 @@ realLayersTable = \ , ('metal1' , BasicLayer.Material.metal ) # WARNING: order *is* meaningful. , ('cut1' , BasicLayer.Material.cut ) , ('metal2' , BasicLayer.Material.metal ) + , ('metcap' , BasicLayer.Material.other ) , ('cut2' , BasicLayer.Material.cut ) , ('metal3' , BasicLayer.Material.metal ) , ('cut3' , BasicLayer.Material.cut ) @@ -96,6 +97,8 @@ symbolicLayersTable = \ , ('POLY2' , TypeRegular , ('poly2' ,)) , ('METAL1' , TypeRegular , ('metal1' ,)) , ('METAL2' , TypeRegular , ('metal2' ,)) + , ('metcapdum' , TypeRegular , ('metcap' ,)) + , ('metbot' , TypeRegular , ('metal2' ,)) , ('METAL3' , TypeRegular , ('metal3' ,)) , ('METAL4' , TypeRegular , ('metal4' ,)) , ('METAL5' , TypeRegular , ('metal5' ,)) @@ -109,6 +112,7 @@ symbolicLayersTable = \ , ('CONT_POLY' , TypeVia , ( 'poly' , 'cut0', 'metal1')) , ('VIA12' , TypeVia , ( 'metal1', 'cut1', 'metal2')) , ('VIA23' , TypeVia , ( 'metal2', 'cut2', 'metal3')) + , ('VIA23cap' , TypeVia , ( 'metcap', 'cut2', 'metal3')) , ('VIA34' , TypeVia , ( 'metal3', 'cut3', 'metal4')) , ('VIA45' , TypeVia , ( 'metal4', 'cut4', 'metal5')) , ('VIA56' , TypeVia , ( 'metal5', 'cut5', 'metal6')) @@ -126,7 +130,7 @@ symbolicLayersTable = \ ) -# Format of : +# Format of : # This is a simple list of Real & Symbolic layers. workingLayersTable = \ @@ -135,5 +139,5 @@ workingLayersTable = \ , 'METAL1' , 'METAL2' , 'METAL3' , 'METAL4' , 'METAL5' , 'METAL6' , 'METAL7' , 'METAL8' , 'BLOCKAGE1', 'BLOCKAGE2', 'BLOCKAGE3', 'BLOCKAGE4', 'BLOCKAGE5', 'BLOCKAGE6', 'BLOCKAGE7', 'BLOCKAGE8' , 'VIA12' , 'VIA23' , 'VIA34' , 'VIA45' , 'VIA56' - , 'gcut', 'gmetalh', 'gmetalv', 'gcontact' + , 'gcut' , 'gmetalh' , 'gmetalv' , 'gcontact' ] diff --git a/crlcore/python/helpers/Display.py b/crlcore/python/helpers/Display.py index 2941f3db..adb28d16 100644 --- a/crlcore/python/helpers/Display.py +++ b/crlcore/python/helpers/Display.py @@ -17,28 +17,29 @@ displayFile = '' stdColors = \ - { 'Black' : '0,0,0' - , 'Gray50' : '050,050,050' - , 'Gray238' : '238,238,238' - , 'White' : '255,255,255' - , 'Seashell4' : '139,134,130' - , 'Red' : '255,0,0' # Shade of Reds. - , 'OrangeRed' : "255,69,0" - , 'DarkOrange' : "255,140,0" - , 'Orange' : "255,165,0" - , 'Wheat' : "245,222,179" - , 'LightPink' : '255,182,193' - , 'Green' : '0,255,0' # Shade of Green. - , 'LawnGreen' : '124,252,0' - , 'Blue' : '0,0,255' # Shade of Blue. - , 'Aqua' : '0,255,255' - , 'BlueViolet' : '138,43,226' - , 'Violet' : '238;130;238' # Shade of Violets. - , 'Magenta' : '255,0,255' - , 'Magenta4' : '139,0,139' - , 'Tan' : '210,180,140' # Shade of Browns - , 'Yellow' : '255,255,0' # Shade of Yellows. - , 'LightYellow' : '255,255,224' + { 'Black' : '0,0,0' + , 'Gray50' : '050,050,050' + , 'Gray238' : '238,238,238' + , 'White' : '255,255,255' + , 'Seashell4' : '139,134,130' + , 'Red' : '255,0,0' # Shade of Reds. + , 'OrangeRed' : "255,69,0" + , 'DarkOrange' : "255,140,0" + , 'Orange' : "255,165,0" + , 'Wheat' : "245,222,179" + , 'LightPink' : '255,182,193' + , 'Green' : '0,255,0' # Shade of Green. + , 'LawnGreen' : '124,252,0' + , 'Blue' : '0,0,255' # Shade of Blue. + , 'Aqua' : '0,255,255' + , 'DarkTurquoise' : '0,206,209' + , 'BlueViolet' : '138,43,226' + , 'Violet' : '238;130;238' # Shade of Violets. + , 'Magenta' : '255,0,255' + , 'Magenta4' : '139,0,139' + , 'Tan' : '210,180,140' # Shade of Browns + , 'Yellow' : '255,255,0' # Shade of Yellows. + , 'LightYellow' : '255,255,224' }