circuitscript 0.0.14 → 0.0.15

package/examples/example_arduino_uno.cst

@@ -3,50 +3,117 @@
 import lib
 
 def fuse(value):
+    width = 40
+    height = 20
     return create component:
         pins: 2
+        type: "F"
+        display: create graphic:
+            rect: 0, 0, width, height
+            pin: 1, -width/2-20, 0, -width/2, 0
+            pin: 2, width/2+20, 0, width/2, 0
+            hline: -width/2, 0, width
+            label: "refdes", -width/2, -height/2 - 5, "?"
+            label: "value", -width/2, height/2 + 2, "?", fontSize=8, vanchor="top"
         params:
             value: value
 
-def esd(value):
-    return create component:
-        pins: 2
+def esd():
+    width = 40
+    height = 20
 
-def ind(value):
     return create component:
         pins: 2
-        params:
-            value: value
+        type: "Z"
+        display: create graphic:
+            fill: "#333"
+            triangle: -width/2, 0, 0, 0, 20
+            triangle: width/2, 0, 0, 0, 20
+            path: "M", 5, -height/2-5, "L", 0, -height/2, "L", 0, height/2, "L", -5, height/2+5
+            pin: 1, -width/2 - 20, 0, -width/2, 0
+            pin: 2, width/2+20, 0, width/2, 0
+            label: "refdes", 0, -height/2 - 10, "?", anchor="middle"
+            label: "mpn", 0, height/2 + 15, "PGB1010604", anchor="middle"
 
+        
 def gnd_connect():
     return create component:
         pins: 2
 
-def diode():
-    return create component:
-        pins: 2
-
 def xtal(frequency):
+    width = 30
+    height = 10
+
     return create component:
-        pins:
-            1: "XT1"
-            2: "XT2"
-            3: "GND"
-        arrange:
-            right: 1,2
-            left: 3
+        type: "X"
+        pins: 3
+        display: create graphic:
+            rect: 0, 0, width, height
+            hline: -width/2 -2, -height/2-4, width + 4
+            hline: -width/2 -2, height/2+4, width + 4
+            hline: 0, -20, -10
+            vline: -10, -25, 10
+            vline: -15, -25, 10
+            hline: 0, 20, -10
+            vline: -10, 15, 10
+            vline: -15, 15, 10
+            hline: -15, -20, -25
+            hline: -15, 20, -25
+            vline: -40, -20, 40
+
+            label: "refdes", width/2 + 5, 0, "?"
+            label: "frequency", width/2 + 5, 10, "?"
+
+            pin: 1, 0, -20, 0, -height/2 - 4
+            pin: 2, 0, 20, 0, height/2 + 4
+            pin: 3, -60, 0, -40, 0
+
         params:
             frequency: frequency
 
+def xtal_2(freq):
+    # only have 2 pins
+    width = 20
+    height = 40
+
+    return create component:
+        type: "X"
+        pins: 2
+        display: create graphic:
+            rect: 0, 0, width, height
+            fill: "#333"
+            rect: -width/2 - 5, 0, 1, height
+            rect: width/2 + 5, 0, 1, height
+            fill: "none"
+            pin: 1, -width/2 - 20, 0, -width/2-5, 0
+            pin: 2, width/2 + 20, 0, width/2+5, 0
+            label: "refdes", 0, -height/2 - 5, "?", anchor="middle"
+            label: "freq", 0, height/2 + 5, freq, vanchor="top", anchor="middle"
+        params:
+            freq: freq
+
 def solder_bridge():
+    width = 20
+    height = 20
+    
     return create component:
+        type: "S"
         pins: 2
+        display: create graphic:
+            arc: -width/2+5, 0, 10, 90, 270
+            arc: width/2-5, 0, 10, 270, 90
+            vline: -width/2 + 5, -height/2, height
+            vline: width/2-5, -height/2, height
+            pin: 1, -width/2-20, 0, -width/2-5, 0
+            pin: 2, width/2+20, 0, width/2+5, 0
+            label: "refdes", 0, -width/2 - 5, "?", anchor="middle"
 
 gnd = dgnd()
 v3v3 = supply("3V3")
 v5v = supply("5V")
 
 atmega = create component:
+    type: "ic"
     pins:
         1: "XTAL1"
         2: "XTAL2"
@@ -58,7 +125,7 @@ atmega = create component:
         5:  "PC2"
         26: "PC4"
         25: "PC5"
-        24: "PC6"
+        23: "PC6"
         22: "PC7"
 
         6:  "PD0"
@@ -94,9 +161,12 @@ atmega = create component:
     arrange:
         left: 24, [2], 2, [2], 1, [6], 32, 4, 3, [5], 27, 31, 30, 29, 28, [2], 100
         right: 21,20,19,18,17,16,15,14, [2], 22,23,25,26,5, [2], 13,12,11,10,9,8,7,6
+    params:
+        mpn: "ATMEGA8U2-MU"
 
 
 atmega8 = create component:
+    type: "ic"
     pins:
         1: "RESET"
     
@@ -137,56 +207,143 @@ atmega8 = create component:
     arrange:
         left: 1, [3], 10, [1], 9, [2], 21, 20, 22, [2], 7,8
         right: 19,18,17,16,15,14, [3], 28,27,26,25,24,23, [3], 13, 12, 11, 6,5,4,3,2
+    params:
+        mpn: "ATMEGA8"
 
 # Oscillator component
-osc1 = xtal(16000000)
-osc2 = xtal(16000000)
-osc3 = xtal(16000000)
+osc1 = xtal("16MHz")
+osc2 = xtal("16MHz")
+
+def conn3x2():
+    width = 60
+    height = 80
+
+    return create component:
+        pins: 6
+        display: create graphic:
+            rect: 0, 0, width, height
+            pin: 1, "1", -width/2 - 20, -20, -width/2, -20
+            pin: 3, "3", -width/2 - 20, 0,   -width/2, 0
+            pin: 5, "5", -width/2 - 20, 20,  -width/2, 20
+            pin: 2, "2", width/2 + 20, -20,   width/2, -20
+            pin: 4, "4", width/2 + 20, 0,    width/2, 0
+            pin: 6, "6", width/2 + 20, 20,  width/2, 20
+            label: "refdes", -width/2, -height/2 - 5, "?", fontSize=10, anchor="left", vanchor="bottom"
+            circle: -10, -20, 8 
+            circle: -10,  0,  8 
+            circle: -10,  20, 8 
+            circle: 10, -20, 8 
+            circle: 10,  0,  8 
+            circle: 10,  20, 8 
 
 # ICSP connector
-icsp_conn2 = create component:
-    pins: 6
-    arrange:
-        left: 1,3,5
-        right: 2,4,6
+icsp_conn2 = conn3x2()
+icsp_conn = conn3x2()
 
-icsp_conn = create component:
-    pins: 6
-    arrange:
-        left: 1,3,5
-        right: 2,4,6
+def usb_conn_():
+    width = 40
+    height = 100
 
-# USB connector
-usb_conn = create component:
-    pins:
-        1: 1
-        2: 2
-        3: 3
-        4: 4
-        5: "SHIELD1"
-        6: "SHIELD2"
-    type: "conn"
-    arrange:
-        right: 1,2,3,4
-        left: 5,6
+    return create component:
+        pins: 6
+        display: create graphic:
+            #rect: 0, 0, width, 100
+            path: "M", -20, -40, "L", 20, -40, "L", 20, 60, "L", -20, 60
 
+            label: "", 0, 15, "USB", anchor="middle", fontSize=20, angle=-90
 
-iol_conn = create component:
-    pins: 8
-    arrange: 
-        left: 8,7,6,5,4,3,2,1
+            pin: 1, width/2 + 20, -20, width/2, -20
+            pin: 2, width/2 + 20, 0, width/2, 0
+            pin: 3, width/2 + 20, 20, width/2, 20
+            pin: 4, width/2 + 20, 40, width/2, 40
 
-ad_conn = create component:
-    pins: 6
-    type: "conn"
-    arrange:
-        left: 6,5,4,3,2,1
+            pin: 5, -20, 60+ 20, -20, 60
+            pin: 6, 0,   60 + 20, 0,  60
 
-ioh_conn = create component:
-    pins: 8
-    type: "conn"
-    arrange:
-        left: 8,7,6,5,4,3,2,1
+def conn8():
+    return create component:
+        type: "conn"
+        pins: 8
+        display: create graphic:
+            rect: 0, -70, 40, 180
+            circle: 0, 0, 8
+            circle: 0, -20, 8
+            circle: 0, -40, 8
+            circle: 0, -60, 8
+            circle: 0, -80, 8
+            circle: 0, -100, 8
+            circle: 0, -120, 8
+            circle: 0, -140, 8
+
+            label: "refdes", -20, -160-4, "?"
+            label: "mpn", -20, 20 + 4, "?", vanchor="top"
+
+            pin: 1, -40, 0,   -20, 0
+            pin: 2, -40, -20, -20, -20
+            pin: 3, -40, -40, -20, -40
+            pin: 4, -40, -60, -20, -60
+            pin: 5, -40, -80, -20, -80
+            pin: 6, -40, -100, -20, -100
+            pin: 7, -40, -120, -20, -120
+            pin: 8, -40, -140, -20, -140
+
+def conn6_flipped():
+    return create component:
+        type: "conn"
+        pins: 6
+        display: create graphic:
+            rect: 0, 2.5 * -20, 40, (6+1) * 20
+            circle: 0, 0, 8
+            circle: 0, -20, 8
+            circle: 0, -40, 8
+            circle: 0, -60, 8
+            circle: 0, -80, 8
+            circle: 0, -100, 8
+
+            label: "refdes", -20, 6 * -20 - 5, "?"
+            label: "mpn", -20, 20 + 4, "?", vanchor="top"
+
+            pin: 6, -40, 0,   -20, 0
+            pin: 5, -40, -20, -20, -20
+            pin: 4, -40, -40, -20, -40
+            pin: 3, -40, -60, -20, -60
+            pin: 2, -40, -80, -20, -80
+            pin: 1, -40, -100, -20, -100
+
+def conn6():
+    return create component:
+        type: "conn"
+        pins: 6
+        display: create graphic:
+            rect: 0, 2.5 * -20, 40, (6+1) * 20
+            circle: 0, 0, 8
+            circle: 0, -20, 8
+            circle: 0, -40, 8
+            circle: 0, -60, 8
+            circle: 0, -80, 8
+            circle: 0, -100, 8
+
+            label: "refdes", -20, 6 * -20 - 5, "?"
+            label: "mpn", -20, 20 + 4, "?", vanchor="top"
+
+            pin: 1, -40, 0,   -20, 0
+            pin: 2, -40, -20, -20, -20
+            pin: 3, -40, -40, -20, -40
+            pin: 4, -40, -60, -20, -60
+            pin: 5, -40, -80, -20, -80
+            pin: 6, -40, -100, -20, -100
+
+iol_conn = conn8()
+iol_conn.mpn = "IOL"
+
+ioh_conn = conn8()
+ioh_conn.mpn = "IOH"
+
+ad_conn = conn6()
+ad_conn.mpn = "AD"
+
+# USB connector
+usb_conn = usb_conn_()
 
 at atmega:
     32:
@@ -200,6 +357,7 @@ at atmega:
             to atmega pin 4
         wire left 40 down 20
         add cap(100n)
+        wire down 20
         to gnd
 
     3:
@@ -213,6 +371,8 @@ at atmega:
         wire left 20
         
         add solder_bridge() pin 2
+        ..refdes = "GROUND"
+
         wire left 20
         branch:
             wire auto
@@ -223,12 +383,12 @@ at atmega:
     24:
         wire left 40
         branch:
-            wire left 240 up 200 right 40
+            wire left 160 up 200 right 20
             to icsp_conn2 pin 5
 
         branch:
             at v5v
-            wire down 20 left 20
+            wire down 20 left 40
             to icsp_conn2 pin 2
             point tmp4
 
@@ -244,7 +404,7 @@ at atmega:
     17:
         wire right 20
         add label("MISO2")
-        wire right 60 up 200 left 640 auto
+        wire right 60 up 200 left 560 auto
         to icsp_conn2 pin 1
 
     16:
@@ -256,7 +416,7 @@ at atmega:
     15:
         wire right 20
         add label("SCK2")
-        wire right 100 up 260 left 660 auto
+        wire right 100 up 260 left 580 auto
         to icsp_conn2 pin 3
 
         at icsp_conn2 pin 6
@@ -269,7 +429,7 @@ at atmega:
             wire left 20
             to osc1 pin 1
 
-        wire up 40 left 240 wire down 20
+        wire up 40 left 160 wire down 20
         add res(1M) ..angle=90
         point tmp5
 
@@ -293,18 +453,18 @@ at atmega:
         wire left 100
         add label("USBVCC")
 
-        wire left 280 up 220 left 100
+        wire left 160 up 220 left 60
         add fuse(500m) pin 2
         wire left 100 down 40 left 60
         add label("XUSB")
-        wire left 20
+        wire left 80
         to usb_conn pin 1
     
     30:
         wire left 100
         add label("RD-")
 
-        wire left 300 up 180 left 40
+        wire left 180 up 180 left 40
         add res(22) pin 2
         wire left 20
         add label("D-")
@@ -314,7 +474,7 @@ at atmega:
             to usb_conn pin 2
             
         wire down 100
-        add diode() ..angle=90
+        add esd() ..angle=90
         wire down 20 left 80
         point tmp3
 
@@ -322,7 +482,7 @@ at atmega:
         wire left 100 
         add label("RD+")
 
-        wire left 320 up 140 left 20
+        wire left 200 up 140 left 20
         add res(22) pin 2
         wire left 20
         add label("D+")
@@ -333,27 +493,27 @@ at atmega:
             wire auto
             to usb_conn pin 3
         wire down 80
-        add diode() ..angle=90
+        add esd() ..angle=90
         wire auto
         to tmp3
 
     27:
         wire left 100
         add label("VUCAP")
-        wire left 160
-        wire down 80
+        wire left 80 down 80
         add cap(1u)
+        wire down 20
         wire auto
         to tmp
 
 at usb_conn:
     5:
-        wire left 20 down 20
+        wire down 20
         branch:
-            wire right 20 
+            wire auto_ 
             to usb_conn pin 6
 
-        wire down 100
+        wire down 20
         add label("USHIELD") ..angle=90
         wire auto_
         to tmp3
@@ -374,9 +534,13 @@ at usb_conn:
 
 at atmega:
     8:
-        wire right 100 down 220 right 600
+        wire right 40
+        add label("M8TXD")
+        wire right 60 down 160 right 540
+        add label("M8TXD")
+        wire right 60
         add res(1k)
-        wire right 100 up 200 
+        wire right 100 up 140
         branch:
             wire left 40
             to atmega8 pin 3
@@ -385,22 +549,26 @@ at atmega:
         to iol_conn pin 2
         
     9:
-        wire right 120 down 200 right 580
+        wire right 40
+        add label("M8RXD")
+        wire right 80 down 140 right 520
+        add label("M8RXD")
+        wire right 60
         add res(1k)
         wire right 80 auto_
         to atmega8 pin 2
 
-        wire right 100
+        wire auto
         to iol_conn pin 1
 
     10:
         wire right 40
         add label("RXLED")
-        wire right 100 down 100 right 60
+        wire right 100 down 40 right 60
         add led("yellow") pin 2 right
         wire right 20
         add res(1k)
-        wire right 20 up 80 
+        wire right 20 up 60 
         point tmp6
         wire up 20 
         to v5v
@@ -408,18 +576,20 @@ at atmega:
     11:
         wire right 40
         add label("TXLED")
-        wire right 120 down 40 right 40
+        wire right 120 right 40
         add led("yellow") pin 2 right
         wire right 20
         add res(1k)
         wire auto 
         to tmp6
 
-power_conn2 = create component:
-    pins: 6
-    arrange:
-        left: 1,2,3,4,5,6
+#power_conn2 = create component:
+#    pins: 6
+#    arrange:
+#        left: 1,2,3,4,5,6
 
+power_conn2 = conn6_flipped()
+power_conn2.mpn = "POWER"
 
 at power_conn2:
     2:
@@ -445,14 +615,16 @@ at power_conn2:
 at atmega8:
 
     1:
-        wire left 160 
+        wire left 20
+        point atmega8_1
+        wire left 120
         branch:
             wire up 20
             add res(10k) pin 2 ..angle=90
             wire up 20
             to v5v
         branch:
-            wire left 40 up 420 right 120
+            wire left 40 up 460 right 120
             to power_conn2 pin 1
 
             wire left 40
@@ -462,6 +634,7 @@ at atmega8:
         branch:
             wire left 20
             add solder_bridge() pin 2
+            ..refdes = "RESET-EN"
             point tmp7
         wire down 40 left 180
         branch:
@@ -474,6 +647,7 @@ at atmega8:
         branch:
             wire right 20
             add solder_bridge()
+            ..refdes = "UBOOT"
             wire right 20 down 20 to gnd
 
         wire auto 
@@ -602,7 +776,7 @@ at ioh_conn:
             wire up 20
             point tmp8
             wire up 20
-            add diode() ..angle=-90
+            add led("yellow") ..angle=-90
             wire up 40 right 40 down 20
             to gnd
 
@@ -618,11 +792,33 @@ at ioh_conn:
         wire left 80
         add label("MOSI")
 
-reset_button = create component:
-    pins: 5
-    arrange:
-        left: 1,2,5
-        right: 3,4
+def reset_btn():
+    return create component:
+        pins: 5
+        display: create graphic:
+
+            hline: 0, 0, 20
+            hline: 0, -40, 20
+            vline: 20, -30, 20
+            path: "M", 20, -20, "L", 40, -20, "L", 40, 0
+            path: "M", -15, -30, "L", -20, -30, "L", -20, -10, "L", -15, -10
+            hline: -20, -20, 3
+            hline: -15, -20, 3
+            hline: -10, -20, 3
+            hline: -5, -20, 2
+            path: "M", 0, 0, "L", -5, -30
+
+            fill: "#333"
+            circle: 0, 0, 2
+            fill: "none"
+
+            pin: 1, 0, 20, 0, 0
+            pin: 2, 20, 20, 20, 0
+            pin: 5, 40, 20, 40, 0
+            pin: 3, 0, -60, 0, -40
+            pin: 4, 20, -60, 20, -40
+
+reset_button = reset_btn()
 
 at icsp_conn:
     6:
@@ -636,25 +832,28 @@ at icsp_conn:
         wire left 140
         branch:
             wire auto_
-            to atmega8 pin 1
-        wire left 100 up 80
+            to atmega8_1
+        wire left 60 up 20
         branch:
-            wire up 20 right 20
+            wire up 20
             to reset_button pin 1
-        wire right 20
+        wire auto_
         to reset_button pin 2
 
         at reset_button pin 4
-        wire right 20 up 20
+        wire up 20
+
         branch:
-            wire left 20
+            wire auto_
             to reset_button pin 3
-        wire up 40 right 40 down 20
+
+        wire up 20 right 40 down 20
         to gnd
 
 
 # 3V3 output converter
 dcdc_3v3 = create component:
+    type: "ic"
     pins:
         1: "IN"
         2: "GND"
@@ -668,6 +867,7 @@ dcdc_3v3 = create component:
         right: 5, [1], 4
 
 dcdc_5V = create component:
+    type: "ic"
     pins:
         1: input, "ADJ"
         2: power, "VO"
@@ -679,6 +879,7 @@ dcdc_5V = create component:
         manufacturer_pn: "MC33269D-5.0"
 
 dcdc_5V_2 = create component:
+    type: "ic"
     pins:
         1: power, "GND"
         2: power, "OUT"
@@ -690,27 +891,65 @@ dcdc_5V_2 = create component:
     params:
         manufacturer_pn: "MC33269ST-5.0T3"
 
+def opamp():
+    width = 60
+    height = 60
+
+    return create component:
+        type: "ic"
+        pins: 3
+        params:
+            manufacturer_pn: "LM358D"
+        display: create graphic:
+            triangle: -width/2, 0, width/2, 0, height
+            pin: 1, width/2 + 20, 0, width/2, 0
+            pin: 2, "-", -width/2 - 20, 20, -width/2, 20
+            pin: 3, "+", -width/2 - 20, -20, -width/2, -20
+            label: "refdes", 0, -height/2, "?"
+            label: "manufacturer_pn", 0, height/2, "?"
+
 # Block for power
-opamp_1 = create component:
-    pins: 
-        1: "OUT"
-        2: "-"
-        3: "+"
-    arrange:
-        left: 3,[1],2
-        right: [1], 1
-    width: 40
-    param:
-        manufacturer_pn: "LM358D"
+opamp_1 = opamp()
+
+def fet_():
+    return create component:
+        pins: 3
+        type: "T"
+        display: create graphic:
+            hline: -15, -5, 35
+            fill: "#333"
+            rect: 0, 0, 10, 3
+            rect: 15, 0, 10, 3
+            rect: -15, 0, 10, 3
+            vline: 15, 0, 20
+            vline: -15, 0, 20
+            vline: 0, 0, 20
+            triangle: 0, 15, 0, 20, 5
+            hline: 0, 20, 20
+            hline: -20, 20, 5
+            path: "M", -20, 20, "L", -20, 30, "L", 20, 30, "L", 20, 20
+            triangle: -2.5, 30, 2.5, 30, 5
+            vline: 2.5, 30-4, 8
+
+            label: "refdes", 0, 45, "?", anchor="middle"
+            label: "manufacturer_pn", 0, 55, "?", anchor="middle"
+
+            pin: 1, -40, 20, -20, 20
+            pin: 2, 40, 20, 20, 20
+            pin: 3, 20, -20, 20, -5
+        params:
+            manufacturer_pn: "FDN304V"
 
-fet = create component:
+fetx = create component:
     pins: 3
     arrange:
         left: 1
         right: 2,3
-    param:
+    params:
         manufacturer_pn: "FDN304V"
 
+fet = fet_()
+
 frame: 
     ..title = "Supply generation"
     ..direction = "row"
@@ -756,7 +995,7 @@ frame:
 
         at dcdc_3v3:
             2:
-                wire left 20 down 20
+                wire left 20 down 40
                 to gnd
 
             5:
@@ -766,6 +1005,7 @@ frame:
                     to v3v3
                 wire down 20
                 add cap(1u)
+                wire down 20
                 to gnd
         
 
@@ -774,16 +1014,20 @@ frame:
 
         # Block for 5V power
         power_conn = create component:
+            type: "conn"
             pins: 3
-            arrange:
-                left: 1,3
-                right: 2
+            display: create graphic:
+                rect: 0, 0, 80, 40
+                pin: 1, -20, 40, -20, 20
+                pin: 2, 20, 40, 20, 20
+                pin: 3, 60, 0, 40, 0
+                label: "refdes", -40, -20 - 4, "?"
 
         at power_conn:
             1:
-                wire left 20 down 20
+                wire down 20
                 branch:
-                    wire auto
+                    wire auto_
                     to power_conn pin 3
                 wire down 20
                 to gnd
@@ -792,7 +1036,7 @@ frame:
                 add label("PWRIN")
                 wire right 40
                 add diode()
-                wire right 40
+                wire right 20
                 branch:
                     wire down 20
                     add cap(47u)
@@ -865,3 +1109,29 @@ frame:
             add res(1k)
             wire auto_
             to tmp9
+
+def osc_block(frequency, net1, net2):
+    at xtal_2(frequency):
+        1:
+            wire left 40
+            add label(net1)
+            wire left 20 down 20
+            add cap(22p)
+            wire down 20
+            point tmp
+            wire down 20
+            to gnd
+        2: 
+            wire right 20
+            add label(net2) 
+            wire right 20 down 20
+            add cap(22p)
+            wire auto
+            to tmp
+
+frame:
+    ..title = "Alternative XTALs"
+    ..direction = "row"
+
+    osc_block("16MHz", "XT2", "XT1")
+    osc_block("16MHz", "XTAL2", "XTAL1")