X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=symbols%2Fst%2FSTM32F103-64.sym;fp=symbols%2Fst%2FSTM32F103-64.sym;h=5d696a3dfd4dd1702ad4a66916879c0a888eedb5;hb=a83c89fb167e27427126c96d9ef4411080bf9286;hp=6a0eb548c86ee581a934e9e5904d54f8f5023313;hpb=4097716d21523d3bd5f337cb517951400e0148af;p=hw%2Faltusmetrum

diff --git a/symbols/st/STM32F103-64.sym b/symbols/st/STM32F103-64.sym
index 6a0eb54..5d696a3 100644
--- a/symbols/st/STM32F103-64.sym
+++ b/symbols/st/STM32F103-64.sym
@@ -4,10 +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
@@ -16,6 +21,12 @@ 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
@@ -32,6 +43,7 @@ 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
@@ -40,9 +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
@@ -51,9 +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
@@ -62,9 +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
@@ -73,9 +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
@@ -83,14 +111,26 @@ 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
@@ -98,6 +138,7 @@ 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
@@ -105,10 +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
@@ -117,9 +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
@@ -128,9 +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
@@ -139,9 +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
@@ -150,9 +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
@@ -161,9 +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
@@ -172,9 +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
@@ -183,9 +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
@@ -194,9 +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
@@ -205,9 +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
@@ -216,9 +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
@@ -227,9 +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
@@ -238,9 +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
@@ -249,9 +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
@@ -260,9 +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
@@ -271,9 +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
@@ -282,9 +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
@@ -293,9 +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
@@ -304,9 +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
@@ -315,9 +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
@@ -326,9 +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
@@ -337,9 +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
@@ -348,9 +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
@@ -359,9 +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
@@ -370,9 +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
@@ -381,9 +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
@@ -392,9 +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
@@ -403,9 +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
@@ -414,9 +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
@@ -425,9 +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
@@ -436,9 +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
@@ -447,9 +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
@@ -458,9 +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
@@ -469,9 +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
@@ -480,9 +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
@@ -491,9 +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
@@ -502,9 +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
@@ -513,9 +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
@@ -524,9 +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
@@ -535,9 +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
@@ -546,9 +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
@@ -557,9 +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
@@ -568,9 +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
@@ -579,9 +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
@@ -590,9 +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
@@ -601,9 +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
@@ -612,9 +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
@@ -623,9 +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
@@ -634,9 +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
@@ -644,10 +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
@@ -656,9 +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
@@ -667,9 +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
@@ -678,9 +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
@@ -689,9 +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
@@ -700,9 +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
@@ -711,8 +974,22 @@ 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
+}
+T 9108 20092 8 10 1 1 0 6 1
+value=STM32F103x8
+T 392 20392 8 10 0 0 0 0 1
+device=IC
+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