Merge branch 'master' of ssh://git.gag.com/scm/git/hw/altusmetrum

diff --git a/datasheets/newhaven/NHD_C12832A1Z_FSB_FBW_3V3-2953331.pdf b/datasheets/newhaven/NHD_C12832A1Z_FSB_FBW_3V3-2953331.pdf
new file mode 100644 (file)
index 0000000..d730014
Binary files /dev/null and b/datasheets/newhaven/NHD_C12832A1Z_FSB_FBW_3V3-2953331.pdf differ

diff --git a/datasheets/newhaven/NHD_C12864LZ_FSW_FBW_3V3-2953298.pdf b/datasheets/newhaven/NHD_C12864LZ_FSW_FBW_3V3-2953298.pdf
new file mode 100644 (file)
index 0000000..ef38bc8
Binary files /dev/null and b/datasheets/newhaven/NHD_C12864LZ_FSW_FBW_3V3-2953298.pdf differ

diff --git a/packages/.gitignore b/packages/.gitignore
index 279db4b2562223256f346b9b9467093e77e05755..8333d022eeb415a32c5b3980a80f4cdf1fdc502e 100644 (file)
--- a/packages/.gitignore
+++ b/packages/.gitignore
@@ -44,6 +44,7 @@ ap.10g.fp
 BTM182.fp
 NHD-C0216.fp
 NHD-C12832A1Z.fp
+NHD-C12864LZ.fp
 AH3.fp
 KSCJ.fp
 ADXL78.fp

diff --git a/packages/Makefile b/packages/Makefile
index e96949733259f2d08d9e9a914d82c246edb46fca..356b38f4d0e399bb924e041701d1ef477959f531 100644 (file)
--- a/packages/Makefile
+++ b/packages/Makefile
@@ -60,6 +60,7 @@ FOOTPRINTS= \
        BTM182.fp \
        NHD-C0216.fp \
        NHD-C12832A1Z.fp \
+       NHD-C12864LZ.fp \
        AH3.fp \
        KSCJ.fp \
        ADXL78.fp \

diff --git a/packages/NHD-C12864LZ.py b/packages/NHD-C12864LZ.py
new file mode 100755 (executable)
index 0000000..a484aa8
--- /dev/null
+++ b/packages/NHD-C12864LZ.py
@@ -0,0 +1,177 @@
+#!/usr/bin/python3
+# Copyright 2022 by Keith Packard <keithp@keithp.com>.  GPLv3
+#
+# Program to emit PCB footprint for NHD-C12864LZ-FSW-FBW-3V3 graphic LCD
+#
+
+# dimensions in mm from NHD-C12864LZ-FSW-FBW-3V3.pdf datasheet
+BodyWidth = 77.4
+BodyHeight = 52.4
+PinDiam = 0.7
+PinSpacing = 1.27
+PinOffset = 1.05
+Pins = 28
+
+ViewWidth = 66.52
+ViewHeight = 33.24
+ViewHCtr = BodyHeight / 2 - (33.24 / 2 + 6.08)
+
+# centered pair of holes for alignment pins
+MntWidth = 72.40
+MntOffset = 3
+MntDiam = 1.6
+
+# contacts for LED backlight
+BLWidth = 60.0
+BLDiam = 1.9   # a 1.9 x 1.0 slot is called for
+BLOffset = 3.79
+
+import sys
+
+# we're going to use the 1/100 of a mil fundamental unit form
+def mm2mils100( mm ):
+       return int( mm / 25.4 * 1000.0 * 100.0 + 0.5 )
+
+print('# author: Keith Packard')
+print('# email: keithp@keithp.com')
+print('# dist-license: GPL 3')
+print('# use-license: unlimited')
+
+print('Element[0x0 "NHD-C12864LZ" "" "" 0 0 0 0 0 100 0x0]')
+print("(")
+
+# pins
+       # pin( x y thickness clearance mask drillhole name number flags)
+for pin in range (0,Pins):
+    if pin == Pins - 1:
+        Flags = '0x0101'
+    else:
+        Flags = '0x0001'
+
+    print('   Pin[',\
+       mm2mils100((13.5 - pin)*PinSpacing), \
+       mm2mils100(-BodyHeight/2+PinOffset), \
+       mm2mils100(PinDiam * 1.75), \
+       1200, \
+       mm2mils100(PinDiam * 1.75) + 600, \
+       mm2mils100(PinDiam), \
+       '"pin%i"' % (Pins-pin), '"%i"' % (Pins-pin), Flags, ']')
+
+print('   ElementLine[',\
+       -mm2mils100(BodyWidth/2), \
+       -mm2mils100(BodyHeight/2), \
+       mm2mils100(BodyWidth/2), \
+       -mm2mils100(BodyHeight/2), \
+       500, \
+       ']')
+print('   ElementLine[',\
+       -mm2mils100(BodyWidth/2), \
+       -mm2mils100(BodyHeight/2), \
+       -mm2mils100(BodyWidth/2), \
+       mm2mils100(BodyHeight/2), \
+       500, \
+       ']')
+print('   ElementLine[',\
+       -mm2mils100(BodyWidth/2), \
+       mm2mils100(BodyHeight/2), \
+       mm2mils100(BodyWidth/2), \
+       mm2mils100(BodyHeight/2), \
+       500, \
+       ']')
+print('   ElementLine[',\
+       mm2mils100(BodyWidth/2), \
+       mm2mils100(BodyHeight/2), \
+       mm2mils100(BodyWidth/2), \
+       -mm2mils100(BodyHeight/2), \
+       500, \
+       ']')
+
+# mark viewable area
+
+print('   ElementLine[',\
+       mm2mils100(-ViewWidth/2), \
+       mm2mils100(ViewHCtr + ViewHeight/2), \
+       mm2mils100(ViewWidth/2), \
+       mm2mils100(ViewHCtr + ViewHeight/2), \
+       500, \
+       ']')
+
+print('   ElementLine[',\
+       mm2mils100(-ViewWidth/2), \
+       mm2mils100(ViewHCtr - ViewHeight/2), \
+       mm2mils100(ViewWidth/2), \
+       mm2mils100(ViewHCtr - ViewHeight/2), \
+       500, \
+       ']')
+
+print('   ElementLine[',\
+       mm2mils100(-ViewWidth/2), \
+       mm2mils100(ViewHCtr - ViewHeight/2), \
+       mm2mils100(-ViewWidth/2), \
+       mm2mils100(ViewHCtr + ViewHeight/2), \
+       500, \
+       ']')
+
+print('   ElementLine[',\
+       mm2mils100(ViewWidth/2), \
+       mm2mils100(ViewHCtr - ViewHeight/2), \
+       mm2mils100(ViewWidth/2), \
+       mm2mils100(ViewHCtr + ViewHeight/2), \
+       500, \
+       ']')
+
+print('   ElementLine[',\
+       mm2mils100(ViewWidth/2), \
+       mm2mils100(ViewHCtr - ViewHeight/2), \
+       mm2mils100(-ViewWidth/2), \
+       mm2mils100(ViewHCtr + ViewHeight/2), \
+       500, \
+       ']')
+
+print('   ElementLine[',\
+       mm2mils100(-ViewWidth/2), \
+       mm2mils100(ViewHCtr - ViewHeight/2), \
+       mm2mils100(ViewWidth/2), \
+       mm2mils100(ViewHCtr + ViewHeight/2), \
+       500, \
+       ']')
+
+# holes for alignment pins
+print('   Pin[',\
+       mm2mils100(MntWidth/2), \
+       mm2mils100(-BodyHeight / 2 + MntOffset), \
+       mm2mils100(MntDiam * 1.75), \
+       1200, \
+       mm2mils100(MntDiam * 1.75) + 600, \
+       mm2mils100(MntDiam), \
+       '"G"', '"G"', '0x0001', ']')
+
+print('   Pin[',\
+       mm2mils100(-MntWidth/2), \
+       mm2mils100(-BodyHeight / 2 + MntOffset), \
+       mm2mils100(MntDiam * 1.75), \
+       1200, \
+       mm2mils100(MntDiam * 1.75) + 600, \
+       mm2mils100(MntDiam), \
+       '"G"', '"G"', '0x0001', ']')
+
+# backlight pins
+print('   Pin[',\
+       mm2mils100(-BLWidth/2), \
+       mm2mils100(-BodyHeight/2+BLOffset), \
+       mm2mils100(BLDiam * 1.75), \
+       1200, \
+       mm2mils100(BLDiam * 1.75) + 600, \
+       mm2mils100(BLDiam), \
+       '"K"', '"K"', '0x0001', ']')
+
+print('   Pin[',\
+       mm2mils100(BLWidth/2), \
+       mm2mils100(-BodyHeight/2+BLOffset), \
+       mm2mils100(BLDiam * 1.75), \
+       1200, \
+       mm2mils100(BLDiam * 1.75) + 600, \
+       mm2mils100(BLDiam), \
+       '"A"', '"A"', '0x0001', ']')
+
+print(")")

diff --git a/symbols/newhaven/NHD-C12864LZ.sym b/symbols/newhaven/NHD-C12864LZ.sym
new file mode 100644 (file)
index 0000000..e31b076
--- /dev/null
+++ b/symbols/newhaven/NHD-C12864LZ.sym
@@ -0,0 +1,288 @@
+v 20220529 2
+T 0 1300 8 10 1 1 0 0 1
+refdes=X?
+T 0 1750 5 10 0 0 0 0 1
+device=LCD
+T 0 1550 5 10 0 0 0 0 1
+footprint=NHD-C12864LZ
+P 200 0 200 300 1 0 0
+{
+T 150 200 5 8 1 1 90 6 1
+pinnumber=1
+T 200 350 9 8 1 1 90 0 1
+pinlabel=/CS1
+T 350 300 5 10 0 1 90 0 1
+pintype=in
+}
+P 600 0 600 300 1 0 0
+{
+T 550 200 5 8 1 1 90 6 1
+pinnumber=2
+T 600 350 9 8 1 1 90 0 1
+pinlabel=/RES
+T 600 350 5 8 0 1 90 2 1
+pintype=in
+}
+P 1400 0 1400 300 1 0 0
+{
+T 1350 200 5 8 1 1 90 6 1
+pinnumber=4
+T 1400 350 9 8 1 1 90 0 1
+pinlabel=/WR
+T 1400 350 5 8 0 1 90 2 1
+pintype=in
+}
+P 1000 0 1000 300 1 0 0
+{
+T 950 200 5 8 1 1 90 6 1
+pinnumber=3
+T 1000 350 9 8 1 1 90 0 1
+pinlabel=A0
+T 1000 350 5 8 0 1 90 2 1
+pintype=in
+}
+P 2200 0 2200 300 1 0 0
+{
+T 2150 200 5 8 1 1 90 6 1
+pinnumber=6
+T 2200 350 9 8 1 1 90 0 1
+pinlabel=DB0
+T 2200 350 5 8 0 1 90 2 1
+pintype=in
+}
+P 2600 0 2600 300 1 0 0
+{
+T 2550 200 5 8 1 1 90 6 1
+pinnumber=7
+T 2600 350 9 8 1 1 90 0 1
+pinlabel=DB1
+T 2600 350 5 8 0 1 90 2 1
+pintype=in
+}
+P 3000 0 3000 300 1 0 0
+{
+T 2950 200 5 8 1 1 90 6 1
+pinnumber=8
+T 3000 350 9 8 1 1 90 0 1
+pinlabel=DB2
+T 3000 350 5 8 0 1 90 2 1
+pintype=in
+}
+P 3400 0 3400 300 1 0 0
+{
+T 3350 200 5 8 1 1 90 6 1
+pinnumber=9
+T 3400 350 9 8 1 1 90 0 1
+pinlabel=DB3
+T 3400 350 5 8 0 1 90 2 1
+pintype=in
+}
+P 3800 0 3800 300 1 0 0
+{
+T 3750 200 5 8 1 1 90 6 1
+pinnumber=10
+T 3800 350 9 8 1 1 90 0 1
+pinlabel=DB4
+T 3800 350 5 8 0 1 90 2 1
+pintype=in
+}
+P 11400 0 11400 300 1 0 0
+{
+T 11350 200 5 8 1 1 90 6 1
+pinnumber=A
+T 11400 350 9 8 1 1 90 0 1
+pinlabel=Anode
+T 11400 350 5 8 0 1 90 2 1
+pintype=pwr
+}
+P 11800 0 11800 300 1 0 0
+{
+T 11750 200 5 8 1 1 90 6 1
+pinnumber=K
+T 11800 350 9 8 1 1 90 0 1
+pinlabel=Cathode
+T 11800 350 5 8 0 1 90 2 1
+pintype=pwr
+}
+B 0 300 12000 900 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
+T 0 1950 5 10 0 0 0 0 1
+use-license=unlimited
+T 0 2150 5 10 0 0 0 0 1
+dist-license=GPL3
+T 0 2350 5 10 0 0 0 0 1
+author=Keith Packard <keithp@keithp.com>
+T 0 2550 5 10 0 0 0 0 1
+datasheet=newhaven/NHD-C12864LZ-FSW-FBW-3V3.pdf
+T 4800 1250 9 10 1 0 0 6 1
+NHD 128x64 pixel COG LCD Module
+P 1800 0 1800 300 1 0 0
+{
+T 1750 200 5 8 1 1 90 6 1
+pinnumber=5
+T 1800 350 9 8 1 1 90 0 1
+pinlabel=/RD
+T 1800 350 5 8 0 1 90 2 1
+pintype=in
+}
+P 4200 0 4200 300 1 0 0
+{
+T 4150 200 5 8 1 1 90 6 1
+pinnumber=11
+T 4200 350 9 8 1 1 90 0 1
+pinlabel=DB5
+T 4350 300 5 10 0 1 90 0 1
+pintype=in
+}
+P 4600 0 4600 300 1 0 0
+{
+T 4550 200 5 8 1 1 90 6 1
+pinnumber=12
+T 4600 350 9 8 1 1 90 0 1
+pinlabel=DB6/SCL
+T 4750 300 5 10 0 1 90 0 1
+pintype=in
+}
+P 5400 0 5400 300 1 0 0
+{
+T 5400 350 5 8 0 1 90 2 1
+pintype=pwr
+T 5350 200 5 8 1 1 90 6 1
+pinnumber=14
+T 5400 350 9 8 1 1 90 0 1
+pinlabel=VCC
+}
+P 5000 0 5000 300 1 0 0
+{
+T 5000 350 5 8 0 1 90 2 1
+pintype=in
+T 4950 200 5 8 1 1 90 6 1
+pinnumber=13
+T 5100 350 9 8 1 1 90 0 1
+pinlabel=DB7/SI
+}
+P 6200 0 6200 300 1 0 0
+{
+T 6200 350 5 8 0 1 90 2 1
+pintype=pas
+T 6150 200 5 8 1 1 90 6 1
+pinnumber=16
+T 6200 350 9 8 1 1 90 0 1
+pinlabel=VOUT
+}
+P 6600 0 6600 300 1 0 0
+{
+T 6600 350 5 8 0 1 90 2 1
+pintype=pas
+T 6550 200 5 8 1 1 90 6 1
+pinnumber=17
+T 6600 350 9 8 1 1 90 0 1
+pinlabel=CAP3+
+}
+P 5800 0 5800 300 1 0 0
+{
+T 5800 350 5 8 0 1 90 2 1
+pintype=pwr
+T 5750 200 5 8 1 1 90 6 1
+pinnumber=15
+T 5800 350 9 8 1 1 90 0 1
+pinlabel=GND
+}
+P 7000 0 7000 300 1 0 0
+{
+T 7000 350 5 8 0 1 90 2 1
+pintype=pas
+T 6950 200 5 8 1 1 90 6 1
+pinnumber=18
+T 7000 350 9 8 1 1 90 0 1
+pinlabel=CAP1-
+}
+P 7400 0 7400 300 1 0 0
+{
+T 7400 350 5 8 0 1 90 2 1
+pintype=pas
+T 7350 200 5 8 1 1 90 6 1
+pinnumber=19
+T 7400 350 9 8 1 1 90 0 1
+pinlabel=CAP1+
+}
+P 7800 0 7800 300 1 0 0
+{
+T 7800 350 5 8 0 1 90 2 1
+pintype=pas
+T 7750 200 5 8 1 1 90 6 1
+pinnumber=20
+T 7800 350 9 8 1 1 90 0 1
+pinlabel=CAP2+
+}
+P 8200 0 8200 300 1 0 0
+{
+T 8200 350 5 8 0 1 90 2 1
+pintype=pas
+T 8150 200 5 8 1 1 90 6 1
+pinnumber=21
+T 8200 350 9 8 1 1 90 0 1
+pinlabel=CAP2-
+}
+P 8600 0 8600 300 1 0 0
+{
+T 8750 300 5 10 0 1 90 0 1
+pintype=pas
+T 8550 200 5 8 1 1 90 6 1
+pinnumber=22
+T 8600 350 9 8 1 1 90 0 1
+pinlabel=V4
+}
+P 9000 0 9000 300 1 0 0
+{
+T 9150 300 5 10 0 1 90 0 1
+pintype=pas
+T 8950 200 5 8 1 1 90 6 1
+pinnumber=23
+T 9000 350 9 8 1 1 90 0 1
+pinlabel=V3
+}
+P 9800 0 9800 300 1 0 0
+{
+T 9800 350 5 8 0 1 90 2 1
+pintype=pas
+T 9750 200 5 8 1 1 90 6 1
+pinnumber=25
+T 9800 350 9 8 1 1 90 0 1
+pinlabel=V1
+}
+P 9400 0 9400 300 1 0 0
+{
+T 9400 350 5 8 0 1 90 2 1
+pintype=pas
+T 9350 200 5 8 1 1 90 6 1
+pinnumber=24
+T 9400 350 9 8 1 1 90 0 1
+pinlabel=V2
+}
+P 10600 0 10600 300 1 0 0
+{
+T 10600 350 5 8 0 1 90 2 1
+pintype=in
+T 10550 200 5 8 1 1 90 6 1
+pinnumber=27
+T 10600 350 9 8 1 1 90 0 1
+pinlabel=C86
+}
+P 11000 0 11000 300 1 0 0
+{
+T 11000 350 5 8 0 1 90 2 1
+pintype=in
+T 10950 200 5 8 1 1 90 6 1
+pinnumber=28
+T 11000 350 9 8 1 1 90 0 1
+pinlabel=PS
+}
+P 10200 0 10200 300 1 0 0
+{
+T 10200 350 5 8 0 1 90 2 1
+pintype=pas
+T 10150 200 5 8 1 1 90 6 1
+pinnumber=26
+T 10200 350 9 8 1 1 90 0 1
+pinlabel=V0
+}

diff --git a/symbols/st/STM32F103-100.sym b/symbols/st/STM32F103-100.sym
new file mode 100644 (file)
index 0000000..811b33e
--- /dev/null
+++ b/symbols/st/STM32F103-100.sym
@@ -0,0 +1,1108 @@
+v 20220529 2
+P 9500 5200 9100 5200 1 0 0
+{
+T 9195 5245 5 10 1 1 0 0 1
+pinnumber=3
+T 9045 5195 3 10 1 1 0 6 1
+pinlabel=PE4/TRACED1
+T 9900 5300 5 10 0 1 0 6 1
+pinseq=18
+T 9500 5200 5 10 0 1 0 6 1
+pintype=io
+}
+P 9500 5600 9100 5600 1 0 0
+{
+T 9195 5645 5 10 1 1 0 0 1
+pinnumber=2
+T 9045 5595 3 10 1 1 0 6 1
+pinlabel=PE3/TRACED0
+T 9900 5700 5 10 0 1 0 6 1
+pinseq=4
+T 9500 5600 5 10 0 1 0 6 1
+pintype=io
+}
+P 9500 6000 9100 6000 1 0 0
+{
+T 9195 6045 5 10 1 1 0 0 1
+pinnumber=1
+T 9045 5995 3 10 1 1 0 6 1
+pinlabel=PE2/TRACECK
+T 9900 6100 5 10 0 1 0 6 1
+pinseq=20
+T 9500 6000 5 10 0 1 0 6 1
+pintype=io
+}
+P 9500 18400 9100 18400 1 0 0
+{
+T 9195 18445 5 10 1 1 0 0 1
+pinnumber=18
+T 9045 18395 3 10 1 1 0 6 1
+pinlabel=PC3/ADC_IN13
+T 9900 18500 5 10 0 1 0 6 1
+pinseq=3
+T 9500 18400 5 10 0 1 0 6 1
+pintype=io
+}
+P 5800 0 5800 400 1 0 0
+{
+T 5750 305 5 10 1 1 90 6 1
+pinnumber=19
+T 5800 455 3 10 1 1 90 0 1
+pinlabel=VSSA
+T 5700 -400 5 10 0 1 90 0 1
+pinseq=21
+T 5800 0 5 10 0 1 90 0 1
+pintype=pwr
+}
+B 400 400 8700 19600 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
+T 200 21000 8 10 0 0 0 0 1
+device=IC
+T 400 20100 8 10 1 1 0 0 1
+refdes=U?
+P 0 18800 400 18800 1 0 0
+{
+T 305 18845 5 10 1 1 0 6 1
+pinnumber=20
+T 455 18795 3 10 1 1 0 0 1
+pinlabel=VREF-
+T 0 18800 5 10 0 1 0 6 1
+pinseq=25
+T 0 18800 5 10 0 1 0 6 1
+pintype=pwr
+}
+P 0 15200 400 15200 1 0 0
+{
+T 305 15245 5 10 1 1 0 6 1
+pinnumber=14
+T 455 15195 3 10 1 1 0 0 1
+pinlabel=NRST
+T 0 15200 5 10 0 1 0 6 1
+pinseq=25
+T 0 15200 5 10 0 1 0 6 1
+pintype=io
+}
+P 9500 19600 9100 19600 1 0 0
+{
+T 9195 19645 5 10 1 1 0 0 1
+pinnumber=15
+T 9045 19595 3 10 1 1 0 6 1
+pinlabel=PC0/ADC12_IN10
+T 9500 19600 5 10 0 1 0 0 1
+pinseq=25
+T 9500 19600 5 10 0 1 0 0 1
+pintype=io
+}
+P 9500 18800 9100 18800 1 0 0
+{
+T 9195 18845 5 10 1 1 0 0 1
+pinnumber=17
+T 9045 18795 3 10 1 1 0 6 1
+pinlabel=PC2/ADC12_IN12
+T 9500 18800 5 10 0 1 0 0 1
+pinseq=25
+T 9500 18800 5 10 0 1 0 0 1
+pintype=io
+}
+P 9500 19200 9100 19200 1 0 0
+{
+T 9195 19245 5 10 1 1 0 0 1
+pinnumber=16
+T 9045 19195 3 10 1 1 0 6 1
+pinlabel=PC1/ADC12_IN11
+T 9500 19200 5 10 0 1 0 0 1
+pinseq=25
+T 9500 19200 5 10 0 1 0 0 1
+pintype=io
+}
+P 0 17600 400 17600 1 0 0
+{
+T 305 17645 5 10 1 1 0 6 1
+pinnumber=13
+T 455 17595 3 10 1 1 0 0 1
+pinlabel=OSC_OUT
+T 0 17600 5 10 0 1 0 6 1
+pinseq=25
+T 0 17600 5 10 0 1 0 6 1
+pintype=out
+}
+P 5400 0 5400 400 1 0 0
+{
+T 5350 305 5 10 1 1 90 6 1
+pinnumber=10
+T 5400 455 3 10 1 1 90 0 1
+pinlabel=VSS5
+T 5300 -400 5 10 0 1 90 0 1
+pinseq=20
+T 5400 0 5 10 0 1 90 0 1
+pintype=pwr
+}
+P 5200 20400 5200 20000 1 0 0
+{
+T 5150 20095 5 10 1 1 90 0 1
+pinnumber=11
+T 5200 19945 3 10 1 1 90 6 1
+pinlabel=VDD5
+T 5100 20800 5 10 0 1 270 2 1
+pinseq=20
+T 5200 20400 5 10 0 1 270 2 1
+pintype=pwr
+}
+P 0 18000 400 18000 1 0 0
+{
+T 100 18100 5 10 1 1 0 0 1
+pinnumber=12
+T 500 18000 3 10 1 1 0 0 1
+pinlabel=OSC_IN
+T -400 18100 5 10 0 1 0 0 1
+pinseq=20
+T 0 18000 5 10 0 1 0 0 1
+pintype=in
+}
+P 0 19200 400 19200 1 0 0
+{
+T 100 19300 5 10 1 1 0 0 1
+pinnumber=21
+T 500 19200 3 10 1 1 0 0 1
+pinlabel=VREF+
+T -400 19300 5 10 0 1 0 0 1
+pinseq=21
+T 0 19200 5 10 0 1 0 0 1
+pintype=pwr
+}
+P 9500 4800 9100 4800 1 0 0
+{
+T 9195 4845 5 10 1 1 0 0 1
+pinnumber=4
+T 9045 4795 3 10 1 1 0 6 1
+pinlabel=PE5/TRACED2
+T 9900 4900 5 10 0 1 0 6 1
+pinseq=18
+T 9500 4800 5 10 0 1 0 6 1
+pintype=io
+}
+P 9500 14400 9100 14400 1 0 0
+{
+T 9195 14445 5 10 1 1 0 0 1
+pinnumber=7
+T 9045 14395 3 10 1 1 0 6 1
+pinlabel=PC13/TAMPER/RTC
+T 9900 14500 5 10 0 1 0 6 1
+pinseq=18
+T 9500 14400 5 10 0 1 0 6 1
+pintype=io
+}
+P 5600 20400 5600 20000 1 0 0
+{
+T 5550 20095 5 10 1 1 90 0 1
+pinnumber=6
+T 5600 19945 3 10 1 1 90 6 1
+pinlabel=VBAT
+T 5500 20800 5 10 0 1 270 2 1
+pinseq=4
+T 5600 20400 5 10 0 1 270 2 1
+pintype=pwr
+}
+P 9500 4400 9100 4400 1 0 0
+{
+T 9195 4445 5 10 1 1 0 0 1
+pinnumber=5
+T 9045 4395 3 10 1 1 0 6 1
+pinlabel=PE6/TRACED3
+T 9900 4500 5 10 0 1 0 6 1
+pinseq=20
+T 9500 4400 5 10 0 1 0 6 1
+pintype=io
+}
+P 9500 14000 9100 14000 1 0 0
+{
+T 9195 14045 5 10 1 1 0 0 1
+pinnumber=8
+T 9045 13995 3 10 1 1 0 6 1
+pinlabel=PC14/OSC32_IN
+T 9900 14100 5 10 0 1 0 6 1
+pinseq=18
+T 9500 14000 5 10 0 1 0 6 1
+pintype=io
+}
+P 6000 20400 6000 20000 1 0 0
+{
+T 5950 20095 5 10 1 1 90 0 1
+pinnumber=22
+T 6000 19945 3 10 1 1 90 6 1
+pinlabel=VDDA
+T 5900 20800 5 10 0 1 270 2 1
+pinseq=3
+T 6000 20400 5 10 0 1 270 2 1
+pintype=pwr
+}
+P 0 14000 400 14000 1 0 0
+{
+T 100 14100 5 10 1 1 0 0 1
+pinnumber=23
+T 500 14000 3 10 1 1 0 0 1
+pinlabel=PA0/WKUP/USART2_CTS/ADC12_IN0/TIM2_CH1_ETR
+T -400 14100 5 10 0 1 0 0 1
+pinseq=21
+T 0 14000 5 10 0 1 0 0 1
+pintype=io
+}
+P 0 13600 400 13600 1 0 0
+{
+T 305 13645 5 10 1 1 0 6 1
+pinnumber=24
+T 455 13595 3 10 1 1 0 0 1
+pinlabel=PA1/USART2_RTS/ADC12_IN1/TIM2_CH2
+T 0 13600 5 10 0 1 0 6 1
+pinseq=25
+T 0 13600 5 10 0 1 0 6 1
+pintype=io
+}
+P 0 13200 400 13200 1 0 0
+{
+T 100 13300 5 10 1 1 0 0 1
+pinnumber=25
+T 500 13200 3 10 1 1 0 0 1
+pinlabel=PA2/USART2_TX/ADC12_IN2/TIM2_CH3
+T -400 13300 5 10 0 1 0 0 1
+pinseq=21
+T 0 13200 5 10 0 1 0 0 1
+pintype=io
+}
+P 9500 13600 9100 13600 1 0 0
+{
+T 9195 13645 5 10 1 1 0 0 1
+pinnumber=9
+T 9045 13595 3 10 1 1 0 6 1
+pinlabel=PC15/OSC32_OUT
+T 9900 13700 5 10 0 1 0 6 1
+pinseq=18
+T 9500 13600 5 10 0 1 0 6 1
+pintype=io
+}
+P 4800 20400 4800 20000 1 0 0
+{
+T 4750 20095 5 10 1 1 90 0 1
+pinnumber=28
+T 4800 19945 3 10 1 1 90 6 1
+pinlabel=VDD4
+T 4700 20800 5 10 0 1 270 2 1
+pinseq=18
+T 4800 20400 5 10 0 1 270 2 1
+pintype=pwr
+}
+P 5000 0 5000 400 1 0 0
+{
+T 4950 305 5 10 1 1 90 6 1
+pinnumber=27
+T 5000 455 3 10 1 1 90 0 1
+pinlabel=VSS4
+T 4900 -400 5 10 0 1 90 0 1
+pinseq=4
+T 5000 0 5 10 0 1 90 0 1
+pintype=pwr
+}
+P 0 12800 400 12800 1 0 0
+{
+T 100 12900 5 10 1 1 0 0 1
+pinnumber=26
+T 500 12800 3 10 1 1 0 0 1
+pinlabel=PA3/USART2_RX/ADC12_IN3/TIM2_CH4
+T -400 12900 5 10 0 1 0 0 1
+pinseq=20
+T 0 12800 5 10 0 1 0 0 1
+pintype=io
+}
+P 9500 2000 9100 2000 1 0 0
+{
+T 9195 2045 5 10 1 1 0 0 1
+pinnumber=43
+T 9045 1995 3 10 1 1 0 6 1
+pinlabel=PE12/TIM1_CH3N
+T 9900 2100 5 10 0 1 0 6 1
+pinseq=3
+T 9500 2000 5 10 0 1 0 6 1
+pintype=io
+}
+P 9500 1600 9100 1600 1 0 0
+{
+T 9195 1645 5 10 1 1 0 0 1
+pinnumber=44
+T 9045 1595 3 10 1 1 0 6 1
+pinlabel=PE13/TIM1_CH3
+T 9900 1700 5 10 0 1 0 6 1
+pinseq=21
+T 9500 1600 5 10 0 1 0 6 1
+pintype=io
+}
+P 9500 1200 9100 1200 1 0 0
+{
+T 9195 1245 5 10 1 1 0 0 1
+pinnumber=45
+T 9045 1195 3 10 1 1 0 6 1
+pinlabel=PE14/TIM1_CH4
+T 9500 1200 5 10 0 1 0 0 1
+pinseq=25
+T 9500 1200 5 10 0 1 0 0 1
+pintype=io
+}
+P 9500 3600 9100 3600 1 0 0
+{
+T 9195 3645 5 10 1 1 0 0 1
+pinnumber=39
+T 9045 3595 3 10 1 1 0 6 1
+pinlabel=PE8/TIM1_CH1N
+T 9500 3600 5 10 0 1 0 0 1
+pinseq=25
+T 9500 3600 5 10 0 1 0 0 1
+pintype=io
+}
+P 9500 3200 9100 3200 1 0 0
+{
+T 9195 3245 5 10 1 1 0 0 1
+pinnumber=40
+T 9045 3195 3 10 1 1 0 6 1
+pinlabel=PE9/TIM1_CH1
+T 9500 3200 5 10 0 1 0 0 1
+pinseq=25
+T 9500 3200 5 10 0 1 0 0 1
+pintype=io
+}
+P 9500 2400 9100 2400 1 0 0
+{
+T 9195 2445 5 10 1 1 0 0 1
+pinnumber=42
+T 9045 2395 3 10 1 1 0 6 1
+pinlabel=PE11/TIM1_CH2
+T 9500 2400 5 10 0 1 0 0 1
+pinseq=25
+T 9500 2400 5 10 0 1 0 0 1
+pintype=io
+}
+P 9500 2800 9100 2800 1 0 0
+{
+T 9195 2845 5 10 1 1 0 0 1
+pinnumber=41
+T 9045 2795 3 10 1 1 0 6 1
+pinlabel=PE10/TIM1_CH2N
+T 9500 2800 5 10 0 1 0 0 1
+pinseq=25
+T 9500 2800 5 10 0 1 0 0 1
+pintype=io
+}
+P 9500 4000 9100 4000 1 0 0
+{
+T 9195 4045 5 10 1 1 0 0 1
+pinnumber=38
+T 9045 3995 3 10 1 1 0 6 1
+pinlabel=PE7/TIM1_ETR
+T 9500 4000 5 10 0 1 0 0 1
+pinseq=25
+T 9500 4000 5 10 0 1 0 0 1
+pintype=io
+}
+P 0 7600 400 7600 1 0 0
+{
+T 305 7645 5 10 1 1 0 6 1
+pinnumber=35
+T 455 7595 3 10 1 1 0 0 1
+pinlabel=PB0/ADC12_IN8/TIM3_CH3/TIM1_CH2N
+T -400 7700 5 10 0 1 0 0 1
+pinseq=20
+T 0 7600 5 10 0 1 0 0 1
+pintype=io
+}
+P 0 7200 400 7200 1 0 0
+{
+T 305 7245 5 10 1 1 0 6 1
+pinnumber=36
+T 455 7195 3 10 1 1 0 0 1
+pinlabel=PB1/ADC12_IN9/TIM3_CH4/TIM1_CH3N
+T -400 7300 5 10 0 1 0 0 1
+pinseq=20
+T 0 7200 5 10 0 1 0 0 1
+pintype=io
+}
+P 0 6800 400 6800 1 0 0
+{
+T 305 6845 5 10 1 1 0 6 1
+pinnumber=37
+T 455 6795 3 10 1 1 0 0 1
+pinlabel=PB2/BOOT1
+T -400 6900 5 10 0 1 0 0 1
+pinseq=20
+T 0 6800 5 10 0 1 0 0 1
+pintype=io
+}
+P 9500 800 9100 800 1 0 0
+{
+T 9195 845 5 10 1 1 0 0 1
+pinnumber=46
+T 9045 795 3 10 1 1 0 6 1
+pinlabel=PE15/TIM1_BKIN
+T 9900 900 5 10 0 1 0 6 1
+pinseq=21
+T 9500 800 5 10 0 1 0 6 1
+pintype=io
+}
+P 0 12400 400 12400 1 0 0
+{
+T 100 12500 5 10 1 1 0 0 1
+pinnumber=29
+T 500 12400 3 10 1 1 0 0 1
+pinlabel=PA4/SPI1_NSS/USART2_CK/ADC12_IN4
+T -400 12500 5 10 0 1 0 0 1
+pinseq=18
+T 0 12400 5 10 0 1 0 0 1
+pintype=io
+}
+P 0 11200 400 11200 1 0 0
+{
+T 100 11300 5 10 1 1 0 0 1
+pinnumber=32
+T 500 11200 3 10 1 1 0 0 1
+pinlabel=PA7/SPI1_MOSI/ADC12_IN7/TIM3_CH2/TIM1_CH1N
+T -400 11300 5 10 0 1 0 0 1
+pinseq=18
+T 0 11200 5 10 0 1 0 0 1
+pintype=io
+}
+P 0 11600 400 11600 1 0 0
+{
+T 100 11700 5 10 1 1 0 0 1
+pinnumber=31
+T 500 11600 3 10 1 1 0 0 1
+pinlabel=PA6/SPI1_MISO/ADC12_IN6/TIM3_CH1/TIM1_BKIN
+T -400 11700 5 10 0 1 0 0 1
+pinseq=4
+T 0 11600 5 10 0 1 0 0 1
+pintype=io
+}
+P 0 12000 400 12000 1 0 0
+{
+T 100 12100 5 10 1 1 0 0 1
+pinnumber=30
+T 500 12000 3 10 1 1 0 0 1
+pinlabel=PA5/SPI1_SCK/ADC12_IN5
+T -400 12100 5 10 0 1 0 0 1
+pinseq=20
+T 0 12000 5 10 0 1 0 0 1
+pintype=io
+}
+P 9500 18000 9100 18000 1 0 0
+{
+T 9195 18045 5 10 1 1 0 0 1
+pinnumber=33
+T 9045 17995 3 10 1 1 0 6 1
+pinlabel=PC4/ADC12_IN14
+T 9900 18100 5 10 0 1 0 6 1
+pinseq=18
+T 9500 18000 5 10 0 1 0 6 1
+pintype=io
+}
+P 0 3600 400 3600 1 0 0
+{
+T 305 3645 5 10 1 1 0 6 1
+pinnumber=47
+T 455 3595 3 10 1 1 0 0 1
+pinlabel=PB10/I2C2_SCL/USART3_TX/TIM2_CH3
+T -400 3700 5 10 0 1 0 0 1
+pinseq=3
+T 0 3600 5 10 0 1 0 0 1
+pintype=io
+}
+P 0 3200 400 3200 1 0 0
+{
+T 305 3245 5 10 1 1 0 6 1
+pinnumber=48
+T 455 3195 3 10 1 1 0 0 1
+pinlabel=PB11/I2C2_SDA/USART3_RX/TIM2_CH4
+T -400 3300 5 10 0 1 0 0 1
+pinseq=21
+T 0 3200 5 10 0 1 0 0 1
+pintype=io
+}
+P 3800 0 3800 400 1 0 0
+{
+T 3750 305 5 10 1 1 90 6 1
+pinnumber=49
+T 3800 455 3 10 1 1 90 0 1
+pinlabel=VSS1
+T 3800 0 5 10 0 1 90 6 1
+pinseq=25
+T 3800 0 5 10 0 1 90 6 1
+pintype=pwr
+}
+P 3600 20400 3600 20000 1 0 0
+{
+T 3550 20095 5 10 1 1 90 0 1
+pinnumber=50
+T 3600 19945 3 10 1 1 90 6 1
+pinlabel=VDD1
+T 3500 20800 5 10 0 1 270 2 1
+pinseq=21
+T 3600 20400 5 10 0 1 270 2 1
+pintype=pwr
+}
+P 9500 17600 9100 17600 1 0 0
+{
+T 9195 17645 5 10 1 1 0 0 1
+pinnumber=34
+T 9045 17595 3 10 1 1 0 6 1
+pinlabel=PC5/ADC12_IN15
+T 9900 17700 5 10 0 1 0 6 1
+pinseq=18
+T 9500 17600 5 10 0 1 0 6 1
+pintype=io
+}
+P 0 2000 400 2000 1 0 0
+{
+T 305 2045 5 10 1 1 0 6 1
+pinnumber=53
+T 455 1995 3 10 1 1 0 0 1
+pinlabel=PB14/SPI2_MISO/USART3_RTS/TIM1_CH2N
+T -400 2100 5 10 0 1 0 0 1
+pinseq=18
+T 0 2000 5 10 0 1 0 0 1
+pintype=io
+}
+P 0 2400 400 2400 1 0 0
+{
+T 305 2445 5 10 1 1 0 6 1
+pinnumber=52
+T 455 2395 3 10 1 1 0 0 1
+pinlabel=PB13/SPI2_SCK/USART3_CTS/TIM1_CH1N
+T -400 2500 5 10 0 1 0 0 1
+pinseq=4
+T 0 2400 5 10 0 1 0 0 1
+pintype=io
+}
+P 0 2800 400 2800 1 0 0
+{
+T 305 2845 5 10 1 1 0 6 1
+pinnumber=51
+T 455 2795 3 10 1 1 0 0 1
+pinlabel=PB12/SPI2_NSS/I2C2_SMBAI/USART3_CK/TIM1_BKIN
+T -400 2900 5 10 0 1 0 0 1
+pinseq=20
+T 0 2800 5 10 0 1 0 0 1
+pintype=io
+}
+P 0 10400 400 10400 1 0 0
+{
+T 100 10500 5 10 1 1 0 0 1
+pinnumber=68
+T 500 10400 3 10 1 1 0 0 1
+pinlabel=PA9/USART1_TX/TIM1_CH2
+T -400 10500 5 10 0 1 0 0 1
+pinseq=3
+T 0 10400 5 10 0 1 0 0 1
+pintype=io
+}
+P 0 10000 400 10000 1 0 0
+{
+T 100 10100 5 10 1 1 0 0 1
+pinnumber=69
+T 500 10000 3 10 1 1 0 0 1
+pinlabel=PA10/USART1_RX/TIM1_CH3
+T -400 10100 5 10 0 1 0 0 1
+pinseq=21
+T 0 10000 5 10 0 1 0 0 1
+pintype=io
+}
+P 0 9600 400 9600 1 0 0
+{
+T 305 9645 5 10 1 1 0 6 1
+pinnumber=70
+T 455 9595 3 10 1 1 0 0 1
+pinlabel=PA11/USART1_CTS/CANRX/USBDM/TIM1_CH4
+T 0 9600 5 10 0 1 0 6 1
+pinseq=25
+T 0 9600 5 10 0 1 0 6 1
+pintype=io
+}
+P 9500 16800 9100 16800 1 0 0
+{
+T 9195 16845 5 10 1 1 0 0 1
+pinnumber=64
+T 9045 16795 3 10 1 1 0 6 1
+pinlabel=PC7/TIM3_CH2
+T 9500 16800 5 10 0 1 0 0 1
+pinseq=25
+T 9500 16800 5 10 0 1 0 0 1
+pintype=io
+}
+P 9500 16400 9100 16400 1 0 0
+{
+T 9195 16445 5 10 1 1 0 0 1
+pinnumber=65
+T 9045 16395 3 10 1 1 0 6 1
+pinlabel=PC8/TIM3_CH3
+T 9500 16400 5 10 0 1 0 0 1
+pinseq=25
+T 9500 16400 5 10 0 1 0 0 1
+pintype=io
+}
+P 0 10800 400 10800 1 0 0
+{
+T 305 10845 5 10 1 1 0 6 1
+pinnumber=67
+T 455 10795 3 10 1 1 0 0 1
+pinlabel=PA8/USART1_CK/TIM1_CH1/MCO
+T 0 10800 5 10 0 1 0 6 1
+pinseq=25
+T 0 10800 5 10 0 1 0 6 1
+pintype=io
+}
+P 9500 16000 9100 16000 1 0 0
+{
+T 9195 16045 5 10 1 1 0 0 1
+pinnumber=66
+T 9045 15995 3 10 1 1 0 6 1
+pinlabel=PC9/TIM3_CH4
+T 9500 16000 5 10 0 1 0 0 1
+pinseq=25
+T 9500 16000 5 10 0 1 0 0 1
+pintype=io
+}
+P 9500 17200 9100 17200 1 0 0
+{
+T 9195 17245 5 10 1 1 0 0 1
+pinnumber=63
+T 9045 17195 3 10 1 1 0 6 1
+pinlabel=PC6/TIM3_CH1
+T 9500 17200 5 10 0 1 0 0 1
+pinseq=25
+T 9500 17200 5 10 0 1 0 0 1
+pintype=io
+}
+P 9500 8000 9100 8000 1 0 0
+{
+T 9195 8045 5 10 1 1 0 0 1
+pinnumber=60
+T 9045 7995 3 10 1 1 0 6 1
+pinlabel=PD13/TIM4_CH2
+T 9900 8100 5 10 0 1 0 6 1
+pinseq=20
+T 9500 8000 5 10 0 1 0 6 1
+pintype=io
+}
+P 9500 7600 9100 7600 1 0 0
+{
+T 9195 7645 5 10 1 1 0 0 1
+pinnumber=61
+T 9045 7595 3 10 1 1 0 6 1
+pinlabel=PD14/TIM4_CH3
+T 9900 7700 5 10 0 1 0 6 1
+pinseq=20
+T 9500 7600 5 10 0 1 0 6 1
+pintype=io
+}
+P 9500 7200 9100 7200 1 0 0
+{
+T 9195 7245 5 10 1 1 0 0 1
+pinnumber=62
+T 9045 7195 3 10 1 1 0 6 1
+pinlabel=PD15/TIM4_CH4
+T 9900 7300 5 10 0 1 0 6 1
+pinseq=20
+T 9500 7200 5 10 0 1 0 6 1
+pintype=io
+}
+P 0 9200 400 9200 1 0 0
+{
+T 100 9300 5 10 1 1 0 0 1
+pinnumber=71
+T 500 9200 3 10 1 1 0 0 1
+pinlabel=PA12/USART1_RTS/CANTX/USBDP/TIM1_ETR
+T -400 9300 5 10 0 1 0 0 1
+pinseq=21
+T 0 9200 5 10 0 1 0 0 1
+pintype=io
+}
+P 0 1600 400 1600 1 0 0
+{
+T 305 1645 5 10 1 1 0 6 1
+pinnumber=54
+T 455 1595 3 10 1 1 0 0 1
+pinlabel=PB15/SPI2_MOSI/TIM1_CH3N
+T -400 1700 5 10 0 1 0 0 1
+pinseq=18
+T 0 1600 5 10 0 1 0 0 1
+pintype=io
+}
+P 9500 9200 9100 9200 1 0 0
+{
+T 9195 9245 5 10 1 1 0 0 1
+pinnumber=57
+T 9045 9195 3 10 1 1 0 6 1
+pinlabel=PD10/USART3_CK
+T 9900 9300 5 10 0 1 0 6 1
+pinseq=18
+T 9500 9200 5 10 0 1 0 6 1
+pintype=io
+}
+P 9500 9600 9100 9600 1 0 0
+{
+T 9195 9645 5 10 1 1 0 0 1
+pinnumber=56
+T 9045 9595 3 10 1 1 0 6 1
+pinlabel=PD9/USART3_RX
+T 9900 9700 5 10 0 1 0 6 1
+pinseq=4
+T 9500 9600 5 10 0 1 0 6 1
+pintype=io
+}
+P 9500 10000 9100 10000 1 0 0
+{
+T 9195 10045 5 10 1 1 0 0 1
+pinnumber=55
+T 9045 9995 3 10 1 1 0 6 1
+pinlabel=PD8/USART3_TX
+T 9900 10100 5 10 0 1 0 6 1
+pinseq=20
+T 9500 10000 5 10 0 1 0 6 1
+pintype=io
+}
+P 9500 8800 9100 8800 1 0 0
+{
+T 9195 8845 5 10 1 1 0 0 1
+pinnumber=58
+T 9045 8795 3 10 1 1 0 6 1
+pinlabel=PD11/USART3_CTS
+T 9900 8900 5 10 0 1 0 6 1
+pinseq=18
+T 9500 8800 5 10 0 1 0 6 1
+pintype=io
+}
+P 0 8800 400 8800 1 0 0
+{
+T 100 8900 5 10 1 1 0 0 1
+pinnumber=72
+T 500 8800 3 10 1 1 0 0 1
+pinlabel=PA13/JTMS/SWDIO
+T -400 8900 5 10 0 1 0 0 1
+pinseq=3
+T 0 8800 5 10 0 1 0 0 1
+pintype=io
+}
+P 0 16800 400 16800 1 0 0
+{
+T 100 16900 5 10 1 1 0 0 1
+pinnumber=73
+T 500 16800 3 10 1 1 0 0 1
+pinlabel=NC
+T -400 16900 5 10 0 1 0 0 1
+pinseq=21
+T 0 16800 5 10 0 1 0 0 1
+pintype=io
+}
+P 4200 0 4200 400 1 0 0
+{
+T 4150 305 5 10 1 1 90 6 1
+pinnumber=74
+T 4200 455 3 10 1 1 90 0 1
+pinlabel=VSS2
+T 4200 0 5 10 0 1 90 6 1
+pinseq=25
+T 4200 0 5 10 0 1 90 6 1
+pintype=pwr
+}
+P 4000 20400 4000 20000 1 0 0
+{
+T 3950 20095 5 10 1 1 90 0 1
+pinnumber=75
+T 4000 19945 3 10 1 1 90 6 1
+pinlabel=VDD2
+T 3900 20800 5 10 0 1 270 2 1
+pinseq=21
+T 4000 20400 5 10 0 1 270 2 1
+pintype=pwr
+}
+P 9500 8400 9100 8400 1 0 0
+{
+T 9195 8445 5 10 1 1 0 0 1
+pinnumber=59
+T 9045 8395 3 10 1 1 0 6 1
+pinlabel=PD12/TIM4_CH1/USART3_RTS
+T 9900 8500 5 10 0 1 0 6 1
+pinseq=18
+T 9500 8400 5 10 0 1 0 6 1
+pintype=io
+}
+P 9500 15600 9100 15600 1 0 0
+{
+T 9195 15645 5 10 1 1 0 0 1
+pinnumber=78
+T 9045 15595 3 10 1 1 0 6 1
+pinlabel=PC10/USART3_TX
+T 9900 15700 5 10 0 1 0 6 1
+pinseq=18
+T 9500 15600 5 10 0 1 0 6 1
+pintype=io
+}
+P 0 8000 400 8000 1 0 0
+{
+T 100 8100 5 10 1 1 0 0 1
+pinnumber=77
+T 500 8000 3 10 1 1 0 0 1
+pinlabel=PA15/JTDI/TIM2_CH1_ETR/SPI1_NSS
+T -400 8100 5 10 0 1 0 0 1
+pinseq=4
+T 0 8000 5 10 0 1 0 0 1
+pintype=io
+}
+P 0 8400 400 8400 1 0 0
+{
+T 100 8500 5 10 1 1 0 0 1
+pinnumber=76
+T 500 8400 3 10 1 1 0 0 1
+pinlabel=PA14/JTCK/SWCLK
+T -400 8500 5 10 0 1 0 0 1
+pinseq=20
+T 0 8400 5 10 0 1 0 0 1
+pintype=io
+}
+P 0 4800 400 4800 1 0 0
+{
+T 305 4845 5 10 1 1 0 6 1
+pinnumber=93
+T 455 4795 3 10 1 1 0 0 1
+pinlabel=PB7/I2C1_SDA/TIM4_CH2/USART1_RX
+T -400 4900 5 10 0 1 0 0 1
+pinseq=3
+T 0 4800 5 10 0 1 0 0 1
+pintype=io
+}
+P 0 16000 400 16000 1 0 0
+{
+T 100 16100 5 10 1 1 0 0 1
+pinnumber=94
+T 500 16000 3 10 1 1 0 0 1
+pinlabel=BOOT0
+T -400 16100 5 10 0 1 0 0 1
+pinseq=21
+T 0 16000 5 10 0 1 0 0 1
+pintype=in
+}
+P 0 4400 400 4400 1 0 0
+{
+T 305 4445 5 10 1 1 0 6 1
+pinnumber=95
+T 455 4395 3 10 1 1 0 0 1
+pinlabel=PB8/TIM4_CH3/I2C1_SCL/CANRX
+T 0 4400 5 10 0 1 0 6 1
+pinseq=25
+T 0 4400 5 10 0 1 0 6 1
+pintype=io
+}
+P 0 6400 400 6400 1 0 0
+{
+T 305 6445 5 10 1 1 0 6 1
+pinnumber=89
+T 455 6395 3 10 1 1 0 0 1
+pinlabel=PB3/JTDO/TIM2_CH2/TRACESWO/SPI1_SCK
+T 0 6400 5 10 0 1 0 6 1
+pinseq=25
+T 0 6400 5 10 0 1 0 6 1
+pintype=io
+}
+P 0 6000 400 6000 1 0 0
+{
+T 305 6045 5 10 1 1 0 6 1
+pinnumber=90
+T 455 5995 3 10 1 1 0 0 1
+pinlabel=PB4/JNTRST/TIM3_CH1/SPI1_MISO
+T 0 6000 5 10 0 1 0 6 1
+pinseq=25
+T 0 6000 5 10 0 1 0 6 1
+pintype=io
+}
+P 0 5200 400 5200 1 0 0
+{
+T 305 5245 5 10 1 1 0 6 1
+pinnumber=92
+T 455 5195 3 10 1 1 0 0 1
+pinlabel=PB6/I2C1_SCL/TIM4_CH1/USART1_TX
+T 0 5200 5 10 0 1 0 6 1
+pinseq=25
+T 0 5200 5 10 0 1 0 6 1
+pintype=io
+}
+P 0 5600 400 5600 1 0 0
+{
+T 305 5645 5 10 1 1 0 6 1
+pinnumber=91
+T 455 5595 3 10 1 1 0 0 1
+pinlabel=PB5/I2C1_SMBAI/TIM3_CH2/SPI1_MOSI
+T 0 5600 5 10 0 1 0 6 1
+pinseq=25
+T 0 5600 5 10 0 1 0 6 1
+pintype=io
+}
+P 9500 10400 9100 10400 1 0 0
+{
+T 9195 10445 5 10 1 1 0 0 1
+pinnumber=88
+T 9045 10395 3 10 1 1 0 6 1
+pinlabel=PD7/USART2_CK
+T 9500 10400 5 10 0 1 0 0 1
+pinseq=25
+T 9500 10400 5 10 0 1 0 0 1
+pintype=io
+}
+P 9500 11600 9100 11600 1 0 0
+{
+T 9195 11645 5 10 1 1 0 0 1
+pinnumber=85
+T 9045 11595 3 10 1 1 0 6 1
+pinlabel=PD4/USART2_RTS
+T 9900 11700 5 10 0 1 0 6 1
+pinseq=20
+T 9500 11600 5 10 0 1 0 6 1
+pintype=io
+}
+P 9500 11200 9100 11200 1 0 0
+{
+T 9195 11245 5 10 1 1 0 0 1
+pinnumber=86
+T 9045 11195 3 10 1 1 0 6 1
+pinlabel=PD5/USART2_TX
+T 9900 11300 5 10 0 1 0 6 1
+pinseq=20
+T 9500 11200 5 10 0 1 0 6 1
+pintype=io
+}
+P 9500 10800 9100 10800 1 0 0
+{
+T 9195 10845 5 10 1 1 0 0 1
+pinnumber=87
+T 9045 10795 3 10 1 1 0 6 1
+pinlabel=PD6/USART2_RX
+T 9900 10900 5 10 0 1 0 6 1
+pinseq=20
+T 9500 10800 5 10 0 1 0 6 1
+pintype=io
+}
+P 0 4000 400 4000 1 0 0
+{
+T 305 4045 5 10 1 1 0 6 1
+pinnumber=96
+T 455 3995 3 10 1 1 0 0 1
+pinlabel=PB9/TIM4_CH4/I2C1_SDA/CANTX
+T -400 4100 5 10 0 1 0 0 1
+pinseq=21
+T 0 4000 5 10 0 1 0 0 1
+pintype=io
+}
+P 9500 15200 9100 15200 1 0 0
+{
+T 9195 15245 5 10 1 1 0 0 1
+pinnumber=79
+T 9045 15195 3 10 1 1 0 6 1
+pinlabel=PC11/USART3_RX
+T 9900 15300 5 10 0 1 0 6 1
+pinseq=18
+T 9500 15200 5 10 0 1 0 6 1
+pintype=io
+}
+P 9500 12800 9100 12800 1 0 0
+{
+T 9195 12845 5 10 1 1 0 0 1
+pinnumber=82
+T 9045 12795 3 10 1 1 0 6 1
+pinlabel=PD1/OSC_OUT/CANTX
+T 9900 12900 5 10 0 1 0 6 1
+pinseq=18
+T 9500 12800 5 10 0 1 0 6 1
+pintype=io
+}
+P 9500 13200 9100 13200 1 0 0
+{
+T 9195 13245 5 10 1 1 0 0 1
+pinnumber=81
+T 9045 13195 3 10 1 1 0 6 1
+pinlabel=PD0/OSC_IN/CANRX
+T 9900 13300 5 10 0 1 0 6 1
+pinseq=4
+T 9500 13200 5 10 0 1 0 6 1
+pintype=io
+}
+P 9500 14800 9100 14800 1 0 0
+{
+T 9195 14845 5 10 1 1 0 0 1
+pinnumber=80
+T 9045 14795 3 10 1 1 0 6 1
+pinlabel=PC12/USART3_CK
+T 9900 14900 5 10 0 1 0 6 1
+pinseq=20
+T 9500 14800 5 10 0 1 0 6 1
+pintype=io
+}
+P 9500 12400 9100 12400 1 0 0
+{
+T 9195 12445 5 10 1 1 0 0 1
+pinnumber=83
+T 9045 12395 3 10 1 1 0 6 1
+pinlabel=PD2/TIM3_ETR
+T 9900 12500 5 10 0 1 0 6 1
+pinseq=18
+T 9500 12400 5 10 0 1 0 6 1
+pintype=io
+}
+P 9500 6800 9100 6800 1 0 0
+{
+T 9195 6845 5 10 1 1 0 0 1
+pinnumber=97
+T 9045 6795 3 10 1 1 0 6 1
+pinlabel=PE0/TIM4_ETR
+T 9900 6900 5 10 0 1 0 6 1
+pinseq=3
+T 9500 6800 5 10 0 1 0 6 1
+pintype=io
+}
+P 9500 6400 9100 6400 1 0 0
+{
+T 9195 6445 5 10 1 1 0 0 1
+pinnumber=98
+T 9045 6395 3 10 1 1 0 6 1
+pinlabel=PE1
+T 9900 6500 5 10 0 1 0 6 1
+pinseq=21
+T 9500 6400 5 10 0 1 0 6 1
+pintype=io
+}
+P 4600 0 4600 400 1 0 0
+{
+T 4550 305 5 10 1 1 90 6 1
+pinnumber=99
+T 4600 455 3 10 1 1 90 0 1
+pinlabel=VSS3
+T 4600 0 5 10 0 1 90 6 1
+pinseq=25
+T 4600 0 5 10 0 1 90 6 1
+pintype=pwr
+}
+P 4400 20400 4400 20000 1 0 0
+{
+T 4350 20095 5 10 1 1 90 0 1
+pinnumber=100
+T 4400 19945 3 10 1 1 90 6 1
+pinlabel=VDD3
+T 4300 20800 5 10 0 1 270 2 1
+pinseq=21
+T 4400 20400 5 10 0 1 270 2 1
+pintype=pwr
+}
+P 9500 12000 9100 12000 1 0 0
+{
+T 9195 12045 5 10 1 1 0 0 1
+pinnumber=84
+T 9045 11995 3 10 1 1 0 6 1
+pinlabel=PD3/USART2_CTS
+T 9900 12100 5 10 0 1 0 6 1
+pinseq=18
+T 9500 12000 5 10 0 1 0 6 1
+pintype=io
+}
+T 192 21292 8 10 0 0 0 0 1
+footprint=lqfp100

diff --git a/symbols/st/STM32F103-64.sym b/symbols/st/STM32F103-64.sym
index 7fe432377599abbccadb1358184ecc218467a178..5d696a3dfd4dd1702ad4a66916879c0a888eedb5 100644 (file)
--- a/symbols/st/STM32F103-64.sym
+++ b/symbols/st/STM32F103-64.sym
@@ -4,8 +4,15 @@ P 9500 18400 9100 18400 1 0 0
 T 9195 18445 5 10 1 1 0 0 1
 pinnumber=11
 T 9045 18395 3 10 1 1 0 6 1
+<<<<<<< HEAD
 pinlabel=PC3/ADC12_IN13
 T 9600 18400 5 10 0 0 0 0 1
+=======
+pinlabel=PC3/ADC_IN13
+T 9900 18500 5 10 0 1 0 6 1
+pinseq=3
+T 9500 18400 5 10 0 1 0 6 1
+>>>>>>> 4097716d21523d3bd5f337cb517951400e0148af
 pintype=io
 }
 P 5800 0 5800 400 1 0 0
@@ -14,10 +21,29 @@ T 5750 305 5 10 1 1 90 6 1
 pinnumber=12
 T 5800 455 3 10 1 1 90 0 1
 pinlabel=VSSA
+<<<<<<< HEAD
 T 5800 -100 5 10 0 0 90 6 1
 pintype=pwr
 }
 B 400 400 8700 19600 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
+=======
+T 5700 -400 5 10 0 1 90 0 1
+pinseq=21
+T 5800 0 5 10 0 1 90 0 1
+pintype=pwr
+}
+B 400 400 8700 19600 3 0 0 0 -1 -1 0 -1 -1 -1 -1 -1
+T -6400 -2200 8 10 0 0 0 0 1
+description=ST Medium-density performance-line ARM MCU
+T -6400 -1300 8 10 0 0 0 0 1
+numslots=1
+T -6400 -1600 8 10 0 0 0 0 1
+device=STM32F103RBT
+T 2750 17450 9 30 1 0 0 0 1
+STM32F103RBT
+T -6400 -1000 8 10 0 0 0 0 1
+slot=1
+>>>>>>> 4097716d21523d3bd5f337cb517951400e0148af
 T 400 20100 8 10 1 1 0 0 1
 refdes=U?
 P 0 15200 400 15200 1 0 0
@@ -26,7 +52,13 @@ T 305 15245 5 10 1 1 0 6 1
 pinnumber=7
 T 455 15195 3 10 1 1 0 0 1
 pinlabel=NRST
+<<<<<<< HEAD
 T -100 15200 5 10 0 0 0 6 1
+=======
+T 0 15200 5 10 0 1 0 6 1
+pinseq=25
+T 0 15200 5 10 0 1 0 6 1
+>>>>>>> 4097716d21523d3bd5f337cb517951400e0148af
 pintype=io
 }
 P 9500 19600 9100 19600 1 0 0
@@ -35,7 +67,13 @@ T 9195 19645 5 10 1 1 0 0 1
 pinnumber=8
 T 9045 19595 3 10 1 1 0 6 1
 pinlabel=PC0/ADC12_IN10
+<<<<<<< HEAD
 T 9600 19600 5 10 0 0 0 0 1
+=======
+T 9500 19600 5 10 0 1 0 0 1
+pinseq=25
+T 9500 19600 5 10 0 1 0 0 1
+>>>>>>> 4097716d21523d3bd5f337cb517951400e0148af
 pintype=io
 }
 P 9500 18800 9100 18800 1 0 0
@@ -44,7 +82,13 @@ T 9195 18845 5 10 1 1 0 0 1
 pinnumber=10
 T 9045 18795 3 10 1 1 0 6 1
 pinlabel=PC2/ADC12_IN12
+<<<<<<< HEAD
 T 9600 18800 5 10 0 0 0 0 1
+=======
+T 9500 18800 5 10 0 1 0 0 1
+pinseq=25
+T 9500 18800 5 10 0 1 0 0 1
+>>>>>>> 4097716d21523d3bd5f337cb517951400e0148af
 pintype=io
 }
 P 9500 19200 9100 19200 1 0 0
@@ -53,7 +97,13 @@ T 9195 19245 5 10 1 1 0 0 1
 pinnumber=9
 T 9045 19195 3 10 1 1 0 6 1
 pinlabel=PC1/ADC12_IN11
+<<<<<<< HEAD
 T 9600 19200 5 10 0 0 0 0 1
+=======
+T 9500 19200 5 10 0 1 0 0 1
+pinseq=25
+T 9500 19200 5 10 0 1 0 0 1
+>>>>>>> 4097716d21523d3bd5f337cb517951400e0148af
 pintype=io
 }
 P 0 17600 400 17600 1 0 0
@@ -61,17 +111,34 @@ P 0 17600 400 17600 1 0 0
 T 305 17645 5 10 1 1 0 6 1
 pinnumber=6
 T 455 17595 3 10 1 1 0 0 1
+<<<<<<< HEAD
 pinlabel=PD1/OSC_OUT
 T -100 17600 5 10 0 0 0 6 1
+=======
+pinlabel=OSC_OUT/CANTX
+T 0 17600 5 10 0 1 0 6 1
+pinseq=25
+T 0 17600 5 10 0 1 0 6 1
+>>>>>>> 4097716d21523d3bd5f337cb517951400e0148af
 pintype=out
 }
 P 0 18000 400 18000 1 0 0
 {
+<<<<<<< HEAD
 T 300 18100 5 10 1 1 0 6 1
 pinnumber=5
 T 500 18000 3 10 1 1 0 0 1
 pinlabel=PD0/OSC_IN
 T -100 18000 5 10 0 0 0 6 1
+=======
+T 100 18100 5 10 1 1 0 0 1
+pinnumber=5
+T 500 18000 3 10 1 1 0 0 1
+pinlabel=OSC_IN/CANRX
+T -400 18100 5 10 0 1 0 0 1
+pinseq=20
+T 0 18000 5 10 0 1 0 0 1
+>>>>>>> 4097716d21523d3bd5f337cb517951400e0148af
 pintype=in
 }
 P 9500 14400 9100 14400 1 0 0
@@ -79,8 +146,15 @@ P 9500 14400 9100 14400 1 0 0
 T 9195 14445 5 10 1 1 0 0 1
 pinnumber=2
 T 9045 14395 3 10 1 1 0 6 1
+<<<<<<< HEAD
 pinlabel=PC13/TAMPER/RTC
 T 9600 14400 5 10 0 0 0 0 1
+=======
+pinlabel=PC13/RTC_AF1/TAMPER
+T 9900 14500 5 10 0 1 0 6 1
+pinseq=18
+T 9500 14400 5 10 0 1 0 6 1
+>>>>>>> 4097716d21523d3bd5f337cb517951400e0148af
 pintype=io
 }
 P 5600 20400 5600 20000 1 0 0
@@ -89,7 +163,13 @@ T 5550 20095 5 10 1 1 90 0 1
 pinnumber=1
 T 5600 19945 3 10 1 1 90 6 1
 pinlabel=VBAT
+<<<<<<< HEAD
 T 5400 20500 5 10 0 0 90 2 1
+=======
+T 5500 20800 5 10 0 1 270 2 1
+pinseq=4
+T 5600 20400 5 10 0 1 270 2 1
+>>>>>>> 4097716d21523d3bd5f337cb517951400e0148af
 pintype=pwr
 }
 P 9500 14000 9100 14000 1 0 0
@@ -98,7 +178,13 @@ T 9195 14045 5 10 1 1 0 0 1
 pinnumber=3
 T 9045 13995 3 10 1 1 0 6 1
 pinlabel=PC14/OSC32_IN
+<<<<<<< HEAD
 T 9600 14000 5 10 0 0 0 0 1
+=======
+T 9900 14100 5 10 0 1 0 6 1
+pinseq=18
+T 9500 14000 5 10 0 1 0 6 1
+>>>>>>> 4097716d21523d3bd5f337cb517951400e0148af
 pintype=io
 }
 P 6000 20400 6000 20000 1 0 0
@@ -107,7 +193,13 @@ T 5950 20095 5 10 1 1 90 0 1
 pinnumber=13
 T 6000 19945 3 10 1 1 90 6 1
 pinlabel=VDDA
+<<<<<<< HEAD
 T 5800 20500 5 10 0 0 90 2 1
+=======
+T 5900 20800 5 10 0 1 270 2 1
+pinseq=3
+T 6000 20400 5 10 0 1 270 2 1
+>>>>>>> 4097716d21523d3bd5f337cb517951400e0148af
 pintype=pwr
 }
 P 0 14000 400 14000 1 0 0
@@ -116,7 +208,13 @@ T 100 14100 5 10 1 1 0 0 1
 pinnumber=14
 T 500 14000 3 10 1 1 0 0 1
 pinlabel=PA0/WKUP/USART2_CTS/ADC12_IN0/TIM2_CH1_ETR
+<<<<<<< HEAD
 T -100 14000 5 10 0 0 0 6 1
+=======
+T -400 14100 5 10 0 1 0 0 1
+pinseq=21
+T 0 14000 5 10 0 1 0 0 1
+>>>>>>> 4097716d21523d3bd5f337cb517951400e0148af
 pintype=io
 }
 P 0 13600 400 13600 1 0 0
@@ -125,7 +223,13 @@ T 305 13645 5 10 1 1 0 6 1
 pinnumber=15
 T 455 13595 3 10 1 1 0 0 1
 pinlabel=PA1/USART2_RTS/ADC12_IN1/TIM2_CH2
+<<<<<<< HEAD
 T -100 13600 5 10 0 0 0 6 1
+=======
+T 0 13600 5 10 0 1 0 6 1
+pinseq=25
+T 0 13600 5 10 0 1 0 6 1
+>>>>>>> 4097716d21523d3bd5f337cb517951400e0148af
 pintype=io
 }
 P 0 13200 400 13200 1 0 0
@@ -134,7 +238,13 @@ T 100 13300 5 10 1 1 0 0 1
 pinnumber=16
 T 500 13200 3 10 1 1 0 0 1
 pinlabel=PA2/USART2_TX/ADC12_IN2/TIM2_CH3
+<<<<<<< HEAD
 T -100 13200 5 10 0 0 0 6 1
+=======
+T -400 13300 5 10 0 1 0 0 1
+pinseq=21
+T 0 13200 5 10 0 1 0 0 1
+>>>>>>> 4097716d21523d3bd5f337cb517951400e0148af
 pintype=io
 }
 P 9500 13600 9100 13600 1 0 0
@@ -143,7 +253,13 @@ T 9195 13645 5 10 1 1 0 0 1
 pinnumber=4
 T 9045 13595 3 10 1 1 0 6 1
 pinlabel=PC15/OSC32_OUT
+<<<<<<< HEAD
 T 9600 13600 5 10 0 0 0 0 1
+=======
+T 9900 13700 5 10 0 1 0 6 1
+pinseq=18
+T 9500 13600 5 10 0 1 0 6 1
+>>>>>>> 4097716d21523d3bd5f337cb517951400e0148af
 pintype=io
 }
 P 4800 20400 4800 20000 1 0 0
@@ -152,7 +268,13 @@ T 4750 20095 5 10 1 1 90 0 1
 pinnumber=19
 T 4800 19945 3 10 1 1 90 6 1
 pinlabel=VDD4
+<<<<<<< HEAD
 T 4600 20500 5 10 0 0 90 2 1
+=======
+T 4700 20800 5 10 0 1 270 2 1
+pinseq=18
+T 4800 20400 5 10 0 1 270 2 1
+>>>>>>> 4097716d21523d3bd5f337cb517951400e0148af
 pintype=pwr
 }
 P 5000 0 5000 400 1 0 0
@@ -161,7 +283,13 @@ T 4950 305 5 10 1 1 90 6 1
 pinnumber=18
 T 5000 455 3 10 1 1 90 0 1
 pinlabel=VSS4
+<<<<<<< HEAD
 T 5000 -100 5 10 0 0 90 6 1
+=======
+T 4900 -400 5 10 0 1 90 0 1
+pinseq=4
+T 5000 0 5 10 0 1 90 0 1
+>>>>>>> 4097716d21523d3bd5f337cb517951400e0148af
 pintype=pwr
 }
 P 0 12800 400 12800 1 0 0
@@ -170,7 +298,13 @@ T 100 12900 5 10 1 1 0 0 1
 pinnumber=17
 T 500 12800 3 10 1 1 0 0 1
 pinlabel=PA3/USART2_RX/ADC12_IN3/TIM2_CH4
+<<<<<<< HEAD
 T -100 12800 5 10 0 0 0 6 1
+=======
+T -400 12900 5 10 0 1 0 0 1
+pinseq=20
+T 0 12800 5 10 0 1 0 0 1
+>>>>>>> 4097716d21523d3bd5f337cb517951400e0148af
 pintype=io
 }
 P 0 7600 400 7600 1 0 0
@@ -179,7 +313,13 @@ T 305 7645 5 10 1 1 0 6 1
 pinnumber=26
 T 455 7595 3 10 1 1 0 0 1
 pinlabel=PB0/ADC12_IN8/TIM3_CH3/TIM1_CH2N
+<<<<<<< HEAD
 T -100 7600 5 10 0 0 0 6 1
+=======
+T -400 7700 5 10 0 1 0 0 1
+pinseq=20
+T 0 7600 5 10 0 1 0 0 1
+>>>>>>> 4097716d21523d3bd5f337cb517951400e0148af
 pintype=io
 }
 P 0 7200 400 7200 1 0 0
@@ -188,7 +328,13 @@ T 305 7245 5 10 1 1 0 6 1
 pinnumber=27
 T 455 7195 3 10 1 1 0 0 1
 pinlabel=PB1/ADC12_IN9/TIM3_CH4/TIM1_CH3N
+<<<<<<< HEAD
 T -100 7200 5 10 0 0 0 6 1
+=======
+T -400 7300 5 10 0 1 0 0 1
+pinseq=20
+T 0 7200 5 10 0 1 0 0 1
+>>>>>>> 4097716d21523d3bd5f337cb517951400e0148af
 pintype=io
 }
 P 0 6800 400 6800 1 0 0
@@ -197,7 +343,13 @@ T 305 6845 5 10 1 1 0 6 1
 pinnumber=28
 T 455 6795 3 10 1 1 0 0 1
 pinlabel=PB2/BOOT1
+<<<<<<< HEAD
 T -100 6800 5 10 0 0 0 6 1
+=======
+T -400 6900 5 10 0 1 0 0 1
+pinseq=20
+T 0 6800 5 10 0 1 0 0 1
+>>>>>>> 4097716d21523d3bd5f337cb517951400e0148af
 pintype=io
 }
 P 0 12400 400 12400 1 0 0
@@ -206,7 +358,13 @@ T 100 12500 5 10 1 1 0 0 1
 pinnumber=20
 T 500 12400 3 10 1 1 0 0 1
 pinlabel=PA4/SPI1_NSS/USART2_CK/ADC12_IN4
+<<<<<<< HEAD
 T -100 12400 5 10 0 0 0 6 1
+=======
+T -400 12500 5 10 0 1 0 0 1
+pinseq=18
+T 0 12400 5 10 0 1 0 0 1
+>>>>>>> 4097716d21523d3bd5f337cb517951400e0148af
 pintype=io
 }
 P 0 11200 400 11200 1 0 0
@@ -215,7 +373,13 @@ T 100 11300 5 10 1 1 0 0 1
 pinnumber=23
 T 500 11200 3 10 1 1 0 0 1
 pinlabel=PA7/SPI1_MOSI/ADC12_IN7/TIM3_CH2/TIM1_CH1N
+<<<<<<< HEAD
 T -100 11200 5 10 0 0 0 6 1
+=======
+T -400 11300 5 10 0 1 0 0 1
+pinseq=18
+T 0 11200 5 10 0 1 0 0 1
+>>>>>>> 4097716d21523d3bd5f337cb517951400e0148af
 pintype=io
 }
 P 0 11600 400 11600 1 0 0
@@ -224,7 +388,13 @@ T 100 11700 5 10 1 1 0 0 1
 pinnumber=22
 T 500 11600 3 10 1 1 0 0 1
 pinlabel=PA6/SPI1_MISO/ADC12_IN6/TIM3_CH1/TIM1_BKIN
+<<<<<<< HEAD
 T -100 11600 5 10 0 0 0 6 1
+=======
+T -400 11700 5 10 0 1 0 0 1
+pinseq=4
+T 0 11600 5 10 0 1 0 0 1
+>>>>>>> 4097716d21523d3bd5f337cb517951400e0148af
 pintype=io
 }
 P 0 12000 400 12000 1 0 0
@@ -233,7 +403,13 @@ T 100 12100 5 10 1 1 0 0 1
 pinnumber=21
 T 500 12000 3 10 1 1 0 0 1
 pinlabel=PA5/SPI1_SCK/ADC12_IN5
+<<<<<<< HEAD
 T -100 12000 5 10 0 0 0 6 1
+=======
+T -400 12100 5 10 0 1 0 0 1
+pinseq=20
+T 0 12000 5 10 0 1 0 0 1
+>>>>>>> 4097716d21523d3bd5f337cb517951400e0148af
 pintype=io
 }
 P 9500 18000 9100 18000 1 0 0
@@ -242,7 +418,13 @@ T 9195 18045 5 10 1 1 0 0 1
 pinnumber=24
 T 9045 17995 3 10 1 1 0 6 1
 pinlabel=PC4/ADC12_IN14
+<<<<<<< HEAD
 T 9600 18000 5 10 0 0 0 0 1
+=======
+T 9900 18100 5 10 0 1 0 6 1
+pinseq=18
+T 9500 18000 5 10 0 1 0 6 1
+>>>>>>> 4097716d21523d3bd5f337cb517951400e0148af
 pintype=io
 }
 P 0 3600 400 3600 1 0 0
@@ -251,7 +433,13 @@ T 305 3645 5 10 1 1 0 6 1
 pinnumber=29
 T 455 3595 3 10 1 1 0 0 1
 pinlabel=PB10/I2C2_SCL/USART3_TX/TIM2_CH3
+<<<<<<< HEAD
 T -100 3600 5 10 0 0 0 6 1
+=======
+T -400 3700 5 10 0 1 0 0 1
+pinseq=3
+T 0 3600 5 10 0 1 0 0 1
+>>>>>>> 4097716d21523d3bd5f337cb517951400e0148af
 pintype=io
 }
 P 0 3200 400 3200 1 0 0
@@ -260,7 +448,13 @@ T 305 3245 5 10 1 1 0 6 1
 pinnumber=30
 T 455 3195 3 10 1 1 0 0 1
 pinlabel=PB11/I2C2_SDA/USART3_RX/TIM2_CH4
+<<<<<<< HEAD
 T -100 3200 5 10 0 0 0 6 1
+=======
+T -400 3300 5 10 0 1 0 0 1
+pinseq=21
+T 0 3200 5 10 0 1 0 0 1
+>>>>>>> 4097716d21523d3bd5f337cb517951400e0148af
 pintype=io
 }
 P 3800 0 3800 400 1 0 0
@@ -269,7 +463,13 @@ T 3750 305 5 10 1 1 90 6 1
 pinnumber=31
 T 3800 455 3 10 1 1 90 0 1
 pinlabel=VSS1
+<<<<<<< HEAD
 T 3800 -100 5 10 0 0 90 6 1
+=======
+T 3800 0 5 10 0 1 90 6 1
+pinseq=25
+T 3800 0 5 10 0 1 90 6 1
+>>>>>>> 4097716d21523d3bd5f337cb517951400e0148af
 pintype=pwr
 }
 P 3600 20400 3600 20000 1 0 0
@@ -278,7 +478,13 @@ T 3550 20095 5 10 1 1 90 0 1
 pinnumber=32
 T 3600 19945 3 10 1 1 90 6 1
 pinlabel=VDD1
+<<<<<<< HEAD
 T 3400 20500 5 10 0 0 90 2 1
+=======
+T 3500 20800 5 10 0 1 270 2 1
+pinseq=21
+T 3600 20400 5 10 0 1 270 2 1
+>>>>>>> 4097716d21523d3bd5f337cb517951400e0148af
 pintype=pwr
 }
 P 9500 17600 9100 17600 1 0 0
@@ -287,7 +493,13 @@ T 9195 17645 5 10 1 1 0 0 1
 pinnumber=25
 T 9045 17595 3 10 1 1 0 6 1
 pinlabel=PC5/ADC12_IN15
+<<<<<<< HEAD
 T 9600 17600 5 10 0 0 0 0 1
+=======
+T 9900 17700 5 10 0 1 0 6 1
+pinseq=18
+T 9500 17600 5 10 0 1 0 6 1
+>>>>>>> 4097716d21523d3bd5f337cb517951400e0148af
 pintype=io
 }
 P 0 2000 400 2000 1 0 0
@@ -296,7 +508,13 @@ T 305 2045 5 10 1 1 0 6 1
 pinnumber=35
 T 455 1995 3 10 1 1 0 0 1
 pinlabel=PB14/SPI2_MISO/USART3_RTS/TIM1_CH2N
+<<<<<<< HEAD
 T -100 2000 5 10 0 0 0 6 1
+=======
+T -400 2100 5 10 0 1 0 0 1
+pinseq=18
+T 0 2000 5 10 0 1 0 0 1
+>>>>>>> 4097716d21523d3bd5f337cb517951400e0148af
 pintype=io
 }
 P 0 2400 400 2400 1 0 0
@@ -305,7 +523,13 @@ T 305 2445 5 10 1 1 0 6 1
 pinnumber=34
 T 455 2395 3 10 1 1 0 0 1
 pinlabel=PB13/SPI2_SCK/USART3_CTS/TIM1_CH1N
+<<<<<<< HEAD
 T -100 2400 5 10 0 0 0 6 1
+=======
+T -400 2500 5 10 0 1 0 0 1
+pinseq=4
+T 0 2400 5 10 0 1 0 0 1
+>>>>>>> 4097716d21523d3bd5f337cb517951400e0148af
 pintype=io
 }
 P 0 2800 400 2800 1 0 0
@@ -314,7 +538,13 @@ T 305 2845 5 10 1 1 0 6 1
 pinnumber=33
 T 455 2795 3 10 1 1 0 0 1
 pinlabel=PB12/SPI2_NSS/I2C2_SMBAI/USART3_CK/TIM1_BKIN
+<<<<<<< HEAD
 T -100 2800 5 10 0 0 0 6 1
+=======
+T -400 2900 5 10 0 1 0 0 1
+pinseq=20
+T 0 2800 5 10 0 1 0 0 1
+>>>>>>> 4097716d21523d3bd5f337cb517951400e0148af
 pintype=io
 }
 P 0 10400 400 10400 1 0 0
@@ -323,7 +553,13 @@ T 100 10500 5 10 1 1 0 0 1
 pinnumber=42
 T 500 10400 3 10 1 1 0 0 1
 pinlabel=PA9/USART1_TX/TIM1_CH2
+<<<<<<< HEAD
 T -100 10400 5 10 0 0 0 6 1
+=======
+T -400 10500 5 10 0 1 0 0 1
+pinseq=3
+T 0 10400 5 10 0 1 0 0 1
+>>>>>>> 4097716d21523d3bd5f337cb517951400e0148af
 pintype=io
 }
 P 0 10000 400 10000 1 0 0
@@ -332,7 +568,13 @@ T 100 10100 5 10 1 1 0 0 1
 pinnumber=43
 T 500 10000 3 10 1 1 0 0 1
 pinlabel=PA10/USART1_RX/TIM1_CH3
+<<<<<<< HEAD
 T -100 10000 5 10 0 0 0 6 1
+=======
+T -400 10100 5 10 0 1 0 0 1
+pinseq=21
+T 0 10000 5 10 0 1 0 0 1
+>>>>>>> 4097716d21523d3bd5f337cb517951400e0148af
 pintype=io
 }
 P 0 9600 400 9600 1 0 0
@@ -341,7 +583,13 @@ T 305 9645 5 10 1 1 0 6 1
 pinnumber=44
 T 455 9595 3 10 1 1 0 0 1
 pinlabel=PA11/USART1_CTS/CANRX/USBDM/TIM1_CH4
+<<<<<<< HEAD
 T -100 9600 5 10 0 0 0 6 1
+=======
+T 0 9600 5 10 0 1 0 6 1
+pinseq=25
+T 0 9600 5 10 0 1 0 6 1
+>>>>>>> 4097716d21523d3bd5f337cb517951400e0148af
 pintype=io
 }
 P 9500 16800 9100 16800 1 0 0
@@ -350,7 +598,13 @@ T 9195 16845 5 10 1 1 0 0 1
 pinnumber=38
 T 9045 16795 3 10 1 1 0 6 1
 pinlabel=PC7/TIM3_CH2
+<<<<<<< HEAD
 T 9600 16800 5 10 0 0 0 0 1
+=======
+T 9500 16800 5 10 0 1 0 0 1
+pinseq=25
+T 9500 16800 5 10 0 1 0 0 1
+>>>>>>> 4097716d21523d3bd5f337cb517951400e0148af
 pintype=io
 }
 P 9500 16400 9100 16400 1 0 0
@@ -359,7 +613,13 @@ T 9195 16445 5 10 1 1 0 0 1
 pinnumber=39
 T 9045 16395 3 10 1 1 0 6 1
 pinlabel=PC8/TIM3_CH3
+<<<<<<< HEAD
 T 9600 16400 5 10 0 0 0 0 1
+=======
+T 9500 16400 5 10 0 1 0 0 1
+pinseq=25
+T 9500 16400 5 10 0 1 0 0 1
+>>>>>>> 4097716d21523d3bd5f337cb517951400e0148af
 pintype=io
 }
 P 0 10800 400 10800 1 0 0
@@ -368,7 +628,13 @@ T 305 10845 5 10 1 1 0 6 1
 pinnumber=41
 T 455 10795 3 10 1 1 0 0 1
 pinlabel=PA8/USART1_CK/TIM1_CH1/MCO
+<<<<<<< HEAD
 T -100 10800 5 10 0 0 0 6 1
+=======
+T 0 10800 5 10 0 1 0 6 1
+pinseq=25
+T 0 10800 5 10 0 1 0 6 1
+>>>>>>> 4097716d21523d3bd5f337cb517951400e0148af
 pintype=io
 }
 P 9500 16000 9100 16000 1 0 0
@@ -377,7 +643,13 @@ T 9195 16045 5 10 1 1 0 0 1
 pinnumber=40
 T 9045 15995 3 10 1 1 0 6 1
 pinlabel=PC9/TIM3_CH4
+<<<<<<< HEAD
 T 9600 16000 5 10 0 0 0 0 1
+=======
+T 9500 16000 5 10 0 1 0 0 1
+pinseq=25
+T 9500 16000 5 10 0 1 0 0 1
+>>>>>>> 4097716d21523d3bd5f337cb517951400e0148af
 pintype=io
 }
 P 9500 17200 9100 17200 1 0 0
@@ -386,7 +658,13 @@ T 9195 17245 5 10 1 1 0 0 1
 pinnumber=37
 T 9045 17195 3 10 1 1 0 6 1
 pinlabel=PC6/TIM3_CH1
+<<<<<<< HEAD
 T 9600 17200 5 10 0 0 0 0 1
+=======
+T 9500 17200 5 10 0 1 0 0 1
+pinseq=25
+T 9500 17200 5 10 0 1 0 0 1
+>>>>>>> 4097716d21523d3bd5f337cb517951400e0148af
 pintype=io
 }
 P 0 9200 400 9200 1 0 0
@@ -395,7 +673,13 @@ T 100 9300 5 10 1 1 0 0 1
 pinnumber=45
 T 500 9200 3 10 1 1 0 0 1
 pinlabel=PA12/USART1_RTS/CANTX/USBDP/TIM1_ETR
+<<<<<<< HEAD
 T -100 9200 5 10 0 0 0 6 1
+=======
+T -400 9300 5 10 0 1 0 0 1
+pinseq=21
+T 0 9200 5 10 0 1 0 0 1
+>>>>>>> 4097716d21523d3bd5f337cb517951400e0148af
 pintype=io
 }
 P 0 1600 400 1600 1 0 0
@@ -404,7 +688,13 @@ T 305 1645 5 10 1 1 0 6 1
 pinnumber=36
 T 455 1595 3 10 1 1 0 0 1
 pinlabel=PB15/SPI2_MOSI/TIM1_CH3N
+<<<<<<< HEAD
 T -100 1600 5 10 0 0 0 6 1
+=======
+T -400 1700 5 10 0 1 0 0 1
+pinseq=18
+T 0 1600 5 10 0 1 0 0 1
+>>>>>>> 4097716d21523d3bd5f337cb517951400e0148af
 pintype=io
 }
 P 0 8800 400 8800 1 0 0
@@ -413,7 +703,13 @@ T 100 8900 5 10 1 1 0 0 1
 pinnumber=46
 T 500 8800 3 10 1 1 0 0 1
 pinlabel=PA13/JTMS/SWDIO
+<<<<<<< HEAD
 T -100 8800 5 10 0 0 0 6 1
+=======
+T -400 8900 5 10 0 1 0 0 1
+pinseq=3
+T 0 8800 5 10 0 1 0 0 1
+>>>>>>> 4097716d21523d3bd5f337cb517951400e0148af
 pintype=io
 }
 P 4200 0 4200 400 1 0 0
@@ -422,7 +718,13 @@ T 4150 305 5 10 1 1 90 6 1
 pinnumber=47
 T 4200 455 3 10 1 1 90 0 1
 pinlabel=VSS2
+<<<<<<< HEAD
 T 4200 -100 5 10 0 0 90 6 1
+=======
+T 4200 0 5 10 0 1 90 6 1
+pinseq=25
+T 4200 0 5 10 0 1 90 6 1
+>>>>>>> 4097716d21523d3bd5f337cb517951400e0148af
 pintype=pwr
 }
 P 4000 20400 4000 20000 1 0 0
@@ -431,7 +733,13 @@ T 3950 20095 5 10 1 1 90 0 1
 pinnumber=48
 T 4000 19945 3 10 1 1 90 6 1
 pinlabel=VDD2
+<<<<<<< HEAD
 T 3800 20500 5 10 0 0 90 2 1
+=======
+T 3900 20800 5 10 0 1 270 2 1
+pinseq=21
+T 4000 20400 5 10 0 1 270 2 1
+>>>>>>> 4097716d21523d3bd5f337cb517951400e0148af
 pintype=pwr
 }
 P 9500 15600 9100 15600 1 0 0
@@ -440,7 +748,13 @@ T 9195 15645 5 10 1 1 0 0 1
 pinnumber=51
 T 9045 15595 3 10 1 1 0 6 1
 pinlabel=PC10/USART3_TX
+<<<<<<< HEAD
 T 9600 15600 5 10 0 0 0 0 1
+=======
+T 9900 15700 5 10 0 1 0 6 1
+pinseq=18
+T 9500 15600 5 10 0 1 0 6 1
+>>>>>>> 4097716d21523d3bd5f337cb517951400e0148af
 pintype=io
 }
 P 0 8000 400 8000 1 0 0
@@ -449,7 +763,13 @@ T 100 8100 5 10 1 1 0 0 1
 pinnumber=50
 T 500 8000 3 10 1 1 0 0 1
 pinlabel=PA15/JTDI/TIM2_CH1_ETR/SPI1_NSS
+<<<<<<< HEAD
 T -100 8000 5 10 0 0 0 6 1
+=======
+T -400 8100 5 10 0 1 0 0 1
+pinseq=4
+T 0 8000 5 10 0 1 0 0 1
+>>>>>>> 4097716d21523d3bd5f337cb517951400e0148af
 pintype=io
 }
 P 0 8400 400 8400 1 0 0
@@ -458,7 +778,13 @@ T 100 8500 5 10 1 1 0 0 1
 pinnumber=49
 T 500 8400 3 10 1 1 0 0 1
 pinlabel=PA14/JTCK/SWCLK
+<<<<<<< HEAD
 T -100 8400 5 10 0 0 0 6 1
+=======
+T -400 8500 5 10 0 1 0 0 1
+pinseq=20
+T 0 8400 5 10 0 1 0 0 1
+>>>>>>> 4097716d21523d3bd5f337cb517951400e0148af
 pintype=io
 }
 P 0 4800 400 4800 1 0 0
@@ -467,7 +793,13 @@ T 305 4845 5 10 1 1 0 6 1
 pinnumber=59
 T 455 4795 3 10 1 1 0 0 1
 pinlabel=PB7/I2C1_SDA/TIM4_CH2/USART1_RX
+<<<<<<< HEAD
 T -100 4800 5 10 0 0 0 6 1
+=======
+T -400 4900 5 10 0 1 0 0 1
+pinseq=3
+T 0 4800 5 10 0 1 0 0 1
+>>>>>>> 4097716d21523d3bd5f337cb517951400e0148af
 pintype=io
 }
 P 0 16000 400 16000 1 0 0
@@ -476,7 +808,13 @@ T 100 16100 5 10 1 1 0 0 1
 pinnumber=60
 T 500 16000 3 10 1 1 0 0 1
 pinlabel=BOOT0
+<<<<<<< HEAD
 T -100 16000 5 10 0 0 0 6 1
+=======
+T -400 16100 5 10 0 1 0 0 1
+pinseq=21
+T 0 16000 5 10 0 1 0 0 1
+>>>>>>> 4097716d21523d3bd5f337cb517951400e0148af
 pintype=in
 }
 P 0 4400 400 4400 1 0 0
@@ -485,7 +823,13 @@ T 305 4445 5 10 1 1 0 6 1
 pinnumber=61
 T 455 4395 3 10 1 1 0 0 1
 pinlabel=PB8/TIM4_CH3/I2C1_SCL/CANRX
+<<<<<<< HEAD
 T -100 4400 5 10 0 0 0 6 1
+=======
+T 0 4400 5 10 0 1 0 6 1
+pinseq=25
+T 0 4400 5 10 0 1 0 6 1
+>>>>>>> 4097716d21523d3bd5f337cb517951400e0148af
 pintype=io
 }
 P 0 6400 400 6400 1 0 0
@@ -494,7 +838,13 @@ T 305 6445 5 10 1 1 0 6 1
 pinnumber=55
 T 455 6395 3 10 1 1 0 0 1
 pinlabel=PB3/JTDO/TIM2_CH2/TRACESWO/SPI1_SCK
+<<<<<<< HEAD
 T -100 6400 5 10 0 0 0 6 1
+=======
+T 0 6400 5 10 0 1 0 6 1
+pinseq=25
+T 0 6400 5 10 0 1 0 6 1
+>>>>>>> 4097716d21523d3bd5f337cb517951400e0148af
 pintype=io
 }
 P 0 6000 400 6000 1 0 0
@@ -503,7 +853,13 @@ T 305 6045 5 10 1 1 0 6 1
 pinnumber=56
 T 455 5995 3 10 1 1 0 0 1
 pinlabel=PB4/JNTRST/TIM3_CH1/SPI1_MISO
+<<<<<<< HEAD
 T -100 6000 5 10 0 0 0 6 1
+=======
+T 0 6000 5 10 0 1 0 6 1
+pinseq=25
+T 0 6000 5 10 0 1 0 6 1
+>>>>>>> 4097716d21523d3bd5f337cb517951400e0148af
 pintype=io
 }
 P 0 5200 400 5200 1 0 0
@@ -512,7 +868,13 @@ T 305 5245 5 10 1 1 0 6 1
 pinnumber=58
 T 455 5195 3 10 1 1 0 0 1
 pinlabel=PB6/I2C1_SCL/TIM4_CH1/USART1_TX
+<<<<<<< HEAD
 T -100 5200 5 10 0 0 0 6 1
+=======
+T 0 5200 5 10 0 1 0 6 1
+pinseq=25
+T 0 5200 5 10 0 1 0 6 1
+>>>>>>> 4097716d21523d3bd5f337cb517951400e0148af
 pintype=io
 }
 P 0 5600 400 5600 1 0 0
@@ -520,8 +882,15 @@ P 0 5600 400 5600 1 0 0
 T 305 5645 5 10 1 1 0 6 1
 pinnumber=57
 T 455 5595 3 10 1 1 0 0 1
+<<<<<<< HEAD
 pinlabel=PB5/I2C1_SMBAI/TIM3_CH2/SPI1_MOSI
 T -100 5600 5 10 0 0 0 6 1
+=======
+pinlabel=PB5/I2C1_SMBA/TIM3_CH2/SPI1_MOSI
+T 0 5600 5 10 0 1 0 6 1
+pinseq=25
+T 0 5600 5 10 0 1 0 6 1
+>>>>>>> 4097716d21523d3bd5f337cb517951400e0148af
 pintype=io
 }
 P 0 4000 400 4000 1 0 0
@@ -530,7 +899,13 @@ T 305 4045 5 10 1 1 0 6 1
 pinnumber=62
 T 455 3995 3 10 1 1 0 0 1
 pinlabel=PB9/TIM4_CH4/I2C1_SDA/CANTX
+<<<<<<< HEAD
 T -100 4000 5 10 0 0 0 6 1
+=======
+T -400 4100 5 10 0 1 0 0 1
+pinseq=21
+T 0 4000 5 10 0 1 0 0 1
+>>>>>>> 4097716d21523d3bd5f337cb517951400e0148af
 pintype=io
 }
 P 9500 15200 9100 15200 1 0 0
@@ -539,7 +914,13 @@ T 9195 15245 5 10 1 1 0 0 1
 pinnumber=52
 T 9045 15195 3 10 1 1 0 6 1
 pinlabel=PC11/USART3_RX
+<<<<<<< HEAD
 T 9600 15200 5 10 0 0 0 0 1
+=======
+T 9900 15300 5 10 0 1 0 6 1
+pinseq=18
+T 9500 15200 5 10 0 1 0 6 1
+>>>>>>> 4097716d21523d3bd5f337cb517951400e0148af
 pintype=io
 }
 P 9500 14800 9100 14800 1 0 0
@@ -548,7 +929,13 @@ T 9195 14845 5 10 1 1 0 0 1
 pinnumber=53
 T 9045 14795 3 10 1 1 0 6 1
 pinlabel=PC12/USART3_CK
+<<<<<<< HEAD
 T 9600 14800 5 10 0 0 0 0 1
+=======
+T 9900 14900 5 10 0 1 0 6 1
+pinseq=20
+T 9500 14800 5 10 0 1 0 6 1
+>>>>>>> 4097716d21523d3bd5f337cb517951400e0148af
 pintype=io
 }
 P 9500 12400 9100 12400 1 0 0
@@ -557,7 +944,13 @@ T 9195 12445 5 10 1 1 0 0 1
 pinnumber=54
 T 9045 12395 3 10 1 1 0 6 1
 pinlabel=PD2/TIM3_ETR
+<<<<<<< HEAD
 T 9600 12400 5 10 0 0 0 0 1
+=======
+T 9900 12500 5 10 0 1 0 6 1
+pinseq=18
+T 9500 12400 5 10 0 1 0 6 1
+>>>>>>> 4097716d21523d3bd5f337cb517951400e0148af
 pintype=io
 }
 P 4600 0 4600 400 1 0 0
@@ -566,7 +959,13 @@ T 4550 305 5 10 1 1 90 6 1
 pinnumber=63
 T 4600 455 3 10 1 1 90 0 1
 pinlabel=VSS3
+<<<<<<< HEAD
 T 4600 -100 5 10 0 0 90 6 1
+=======
+T 4600 0 5 10 0 1 90 6 1
+pinseq=25
+T 4600 0 5 10 0 1 90 6 1
+>>>>>>> 4097716d21523d3bd5f337cb517951400e0148af
 pintype=pwr
 }
 P 4400 20400 4400 20000 1 0 0
@@ -575,6 +974,7 @@ T 4350 20095 5 10 1 1 90 0 1
 pinnumber=64
 T 4400 19945 3 10 1 1 90 6 1
 pinlabel=VDD3
+<<<<<<< HEAD
 T 4200 20500 5 10 0 0 90 2 1
 pintype=pwr
 }
@@ -586,3 +986,10 @@ T 392 20692 8 10 0 0 0 0 1
 footprint=lqfp64
 T 392 20992 8 10 0 0 0 0 1
 datasheet=st/stm32f103/stm32f103c8.pdf
+=======
+T 4300 20800 5 10 0 1 270 2 1
+pinseq=21
+T 4400 20400 5 10 0 1 270 2 1
+pintype=pwr
+}
+>>>>>>> 4097716d21523d3bd5f337cb517951400e0148af