diff --git a/.github/lockdown.yml b/.github/lockdown.yml
index 2ec0777a32..1d0e1e34c7 100644
--- a/.github/lockdown.yml
+++ b/.github/lockdown.yml
@@ -5,7 +5,7 @@
 skipCreatedBefore: 2020-09-01
 
 # Issues and pull requests with these labels will be ignored. Set to `[]` to disable
-exemptLabels: []
+exemptLabels: [ garlic ]
 
 # Comment to post before closing or locking. Set to `false` to disable
 comment: >
diff --git a/74xGxx.dcm b/74xGxx.dcm
index cb32bb5038..e369a0f924 100644
--- a/74xGxx.dcm
+++ b/74xGxx.dcm
@@ -591,7 +591,7 @@ $ENDCMP
 $CMP 74LVC1G123
 D Single Retrigerrable Monostabile Multivibrator, Low-Voltage CMOS
 K Single Mono Multivibrator CMOS
-F http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf
+F http://www.ti.com/lit/ds/symlink/sn74lvc1g123.pdf
 $ENDCMP
 #
 $CMP 74LVC1G125
diff --git a/74xGxx.lib b/74xGxx.lib
index 635103dc3a..ca0d959849 100644
--- a/74xGxx.lib
+++ b/74xGxx.lib
@@ -313,25 +313,26 @@ ENDDEF
 #
 # 74LVC1G123
 #
-DEF 74LVC1G123 U 0 40 Y Y 1 F N
-F0 "U" -150 250 50 H V C CNN
-F1 "74LVC1G123" 0 -250 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- SSOP*
- VSSOP*
-$ENDFPLIST
-DRAW
-S -200 200 200 -200 0 1 10 N
-X ~A 1 -300 100 100 R 40 40 1 1 I
-X B 2 -300 0 100 R 40 40 1 1 I
-X ~CLR 3 -300 -150 100 R 40 40 1 1 I
-X GND 4 200 -200 0 D 40 40 1 1 W N
-X Q 5 300 100 100 L 40 40 1 1 O
-X Cext 6 50 300 100 D 40 25 1 1 I
-X Rext 7 -50 300 100 D 40 25 1 1 I
-X VCC 8 200 200 0 U 40 40 1 1 W N
+DEF 74LVC1G123 U 0 20 Y Y 2 F N
+F0 "U" -200 350 50 H V C CNN
+F1 "74LVC1G123" -50 350 50 H V L CNN
+F2 "" 0 -100 50 H I C CNN
+F3 "" 0 -100 50 H I C CNN
+$FPLIST
+ SSOP*2.95x2.8mm*P0.65*
+ VSSOP*2.3x2mm*P0.5mm*
+$ENDFPLIST
+DRAW
+S -300 300 300 -300 1 1 10 f
+S -200 300 200 -300 2 1 10 f
+X ~A 1 -500 -100 200 R 50 50 1 1 I
+X B 2 -500 -200 200 R 50 50 1 1 I
+X CLR 3 0 -500 200 U 50 50 1 1 I I
+X Q 5 500 200 200 L 50 50 1 1 O
+X Cext 6 -500 100 200 R 50 50 1 1 I
+X RCext 7 -500 200 200 R 50 50 1 1 I
+X GND 4 0 -500 200 U 50 50 2 1 W
+X VCC 8 0 500 200 D 50 50 2 1 W
 ENDDRAW
 ENDDEF
 #
diff --git a/Amplifier_Audio.dcm b/Amplifier_Audio.dcm
index 1897f36d4e..668f92c5b9 100644
--- a/Amplifier_Audio.dcm
+++ b/Amplifier_Audio.dcm
@@ -534,6 +534,12 @@ K audio amplifier 2ch
 F http://www.st.com/resource/en/datasheet/tda7297.pdf
 $ENDCMP
 #
+$CMP TFA9879HN
+D Mono BTL class-D audio amplifier for portable applications with digital input, HVQFN-24
+K Audio Amplifier Class D NXP Semiconductors
+F https://www.nxp.com/docs/en/data-sheet/TFA9879.pdf
+$ENDCMP
+#
 $CMP THAT2180
 D Blackmer Pre-Trimmed IC Voltage Controlled Amplifiers, SIP-8
 K audio vca
@@ -546,6 +552,12 @@ K audio vca
 F http://www.thatcorp.com/datashts/THAT_2181-Series_Datasheet.pdf
 $ENDCMP
 #
+$CMP TPA3251
+D 175-W Stereo, 350-W Mono PurePath Ultra-HD Analog-Input Class-D Amplifier, HTSSOP-44
+K stereo class d amplifier
+F http://www.ti.com/lit/ds/symlink/tpa3251.pdf
+$ENDCMP
+#
 $CMP TPA6132A2RTE
 D 25mW, Stereo, DirectPath Audio Amplifier, WQFN-16
 K DirectPath audio amplifier Stereo
diff --git a/Amplifier_Audio.lib b/Amplifier_Audio.lib
index c5a2f33924..2fba1db082 100644
--- a/Amplifier_Audio.lib
+++ b/Amplifier_Audio.lib
@@ -865,14 +865,17 @@ DRAW
 P 3 0 1 0 150 -25 150 -100 200 -100 N
 P 3 0 1 0 200 100 150 100 150 25 N
 P 4 0 1 10 -200 200 200 0 -200 -200 -200 200 f
+P 2 1 1 0 150 -130 190 -130 N
+P 2 1 1 0 170 150 170 110 N
+P 2 1 1 0 190 130 150 130 N
 X - A1 -300 -100 100 R 50 50 1 1 I
-X ~ A2 300 100 100 L 50 50 1 1 O
+X ~ A2 300 -100 100 L 50 50 1 1 O
 X + A3 -300 100 100 R 50 50 1 1 I
 X GND B1 -100 -300 150 U 50 50 1 1 W
 X GND B2 -100 -300 150 U 50 50 1 1 P N
 X V+ B3 -100 300 150 D 50 50 1 1 W
 X BYP C1 0 -300 200 U 50 20 1 1 I
-X ~ C2 300 -100 100 L 50 50 1 1 O
+X ~ C2 300 100 100 L 50 50 1 1 O
 X ~SHDN C3 0 300 200 D 50 20 1 1 O
 X ~ 5 300 0 100 L 50 50 2 1 O
 ENDDRAW
@@ -892,14 +895,17 @@ DRAW
 P 3 0 1 0 150 -25 150 -100 200 -100 N
 P 3 0 1 0 200 100 150 100 150 25 N
 P 4 0 1 10 -200 200 200 0 -200 -200 -200 200 f
+P 2 1 1 0 150 -130 190 -130 N
+P 2 1 1 0 170 150 170 110 N
+P 2 1 1 0 190 130 150 130 N
 X SHDN 1 0 300 200 D 50 20 1 1 O
-X ~ 10 300 -100 100 L 50 50 1 1 O
+X ~ 10 300 100 100 L 50 50 1 1 O
 X ~ 11 100 -300 250 U 50 50 1 1 W
 X BYP 2 0 -300 200 U 50 20 1 1 I
 X SD 3 100 300 250 D 50 20 1 1 I
 X + 4 -300 100 100 R 50 50 1 1 I
 X - 5 -300 -100 100 R 50 50 1 1 I
-X ~ 6 300 100 100 L 50 50 1 1 O
+X ~ 6 300 -100 100 L 50 50 1 1 O
 X NC 7 0 100 100 D 50 50 1 1 N N
 X V+ 8 -100 300 150 D 50 50 1 1 W
 X GND 9 -100 -300 150 U 50 50 1 1 W
@@ -920,14 +926,17 @@ DRAW
 P 3 0 1 0 150 -25 150 -100 200 -100 N
 P 3 0 1 0 200 100 150 100 150 25 N
 P 4 0 1 10 -200 200 200 0 -200 -200 -200 200 f
+P 2 1 1 0 150 -130 190 -130 N
+P 2 1 1 0 170 150 170 110 N
+P 2 1 1 0 190 130 150 130 N
 X ~SHDN 1 0 300 200 D 50 20 1 1 O
-X ~ 10 300 -100 100 L 50 50 1 1 O
+X ~ 10 300 100 100 L 50 50 1 1 O
 X ~ 11 100 -300 250 U 50 50 1 1 W
 X BYP 2 0 -300 200 U 50 20 1 1 I
 X SD 3 100 300 250 D 50 20 1 1 I
 X + 4 -300 100 100 R 50 50 1 1 I
 X - 5 -300 -100 100 R 50 50 1 1 I
-X ~ 6 300 100 100 L 50 50 1 1 O
+X ~ 6 300 -100 100 L 50 50 1 1 O
 X NC 7 0 100 100 D 50 50 1 1 N N
 X V+ 8 -100 300 150 D 50 50 1 1 W
 X GND 9 -100 -300 150 U 50 50 1 1 W
@@ -948,14 +957,17 @@ DRAW
 P 3 0 1 0 150 -25 150 -100 200 -100 N
 P 3 0 1 0 200 100 150 100 150 25 N
 P 4 0 1 10 -200 200 200 0 -200 -200 -200 200 f
+P 2 1 1 0 150 -130 190 -130 N
+P 2 1 1 0 170 150 170 110 N
+P 2 1 1 0 190 130 150 130 N
 X ~SHDN 1 0 300 200 D 50 20 1 1 O
 X BYP 2 0 -300 200 U 50 20 1 1 I
 X + 3 -300 100 100 R 50 50 1 1 I
 X - 4 -300 -100 100 R 50 50 1 1 I
-X ~ 5 300 100 100 L 50 50 1 1 O
+X ~ 5 300 -100 100 L 50 50 1 1 O
 X V+ 6 -100 300 150 D 50 50 1 1 W
 X GND 7 -100 -300 150 U 50 50 1 1 W
-X ~ 8 300 -100 100 L 50 50 1 1 O
+X ~ 8 300 100 100 L 50 50 1 1 O
 ENDDRAW
 ENDDEF
 #
@@ -1838,9 +1850,12 @@ $FPLIST
  DIP*W7.62mm*
 $ENDFPLIST
 DRAW
+P 2 0 1 0 50 -125 100 -125 N
 P 2 0 1 0 100 -50 100 -100 N
 P 2 0 1 0 100 100 100 50 N
 P 4 0 1 10 200 0 -200 200 -200 -200 200 0 f
+P 2 1 1 0 70 150 70 110 N
+P 2 1 1 0 90 130 50 130 N
 X VP 1 -100 300 150 D 50 50 1 1 W
 X + 2 -300 100 100 R 50 50 1 1 I
 X GND 3 -100 -300 150 U 50 50 1 1 W
@@ -1916,9 +1931,15 @@ $FPLIST
  TO?220*StaggerOdd*
 $ENDFPLIST
 DRAW
+P 2 1 1 0 120 125 150 125 N
+P 2 1 1 0 125 -125 150 -125 N
+P 2 1 1 0 135 110 135 140 N
 P 2 1 1 0 150 -25 150 -100 N
 P 2 1 1 0 150 100 150 25 N
 P 4 1 1 10 200 0 -200 200 -200 -200 200 0 f
+P 2 2 1 0 120 125 150 125 N
+P 2 2 1 0 125 -125 150 -125 N
+P 2 2 1 0 135 110 135 140 N
 P 2 2 1 0 150 -25 150 -100 N
 P 2 2 1 0 150 100 150 25 N
 P 4 2 1 10 200 0 -200 200 -200 -200 200 0 f
@@ -2118,6 +2139,46 @@ X SG 8 -100 -300 150 U 50 50 3 1 W
 ENDDRAW
 ENDDEF
 #
+# TFA9879HN
+#
+DEF TFA9879HN U 0 20 Y Y 1 F N
+F0 "U" -300 1100 50 H V C CNN
+F1 "TFA9879HN" -500 1000 50 H V C CNN
+F2 "Package_DFN_QFN:HVQFN-24-1EP_4x4mm_P0.5mm_EP2.6x2.6mm_ThermalVias" 300 -1500 50 H I C CNN
+F3 "" -500 1100 50 H I C CNN
+$FPLIST
+ HVQFN*1EP*4x4mm*P0.5mm*
+$ENDFPLIST
+DRAW
+P 5 0 1 10 -400 900 400 900 400 -900 -400 -900 -400 900 f
+X SDA 1 -500 -100 100 R 50 50 1 1 B
+X OUTA 10 500 300 100 L 50 50 1 1 O
+X GNDP 11 100 -1000 100 U 50 50 1 1 P N
+X GNDP 12 100 -1000 100 U 50 50 1 1 W
+X STABA 13 500 -100 100 L 50 50 1 1 O
+X NC 14 400 -400 100 L 50 50 1 1 N N
+X TEST2 15 -500 -700 100 R 50 50 1 1 I
+X ADSEL1 16 -500 -300 100 R 50 50 1 1 I
+X SDI2 17 -500 200 100 R 50 50 1 1 I
+X SCK2 18 -500 300 100 R 50 50 1 1 I
+X LRCK2 19 -500 400 100 R 50 50 1 1 I
+X SCL 2 -500 0 100 R 50 50 1 1 I
+X SDI1 20 -500 600 100 R 50 50 1 1 I
+X SCK1 21 -500 700 100 R 50 50 1 1 I
+X LRCK1 22 -500 800 100 R 50 50 1 1 I
+X VDD 23 0 1000 100 D 50 50 1 1 W
+X GNDD 24 0 -1000 100 U 50 50 1 1 W
+X EP 25 -100 -1000 100 U 50 50 1 1 P
+X TEST1 3 -500 -600 100 R 50 50 1 1 I
+X ADSEL2 4 -500 -400 100 R 50 50 1 1 I
+X TEST3 5 -500 -800 100 R 50 50 1 1 I
+X NC 6 400 -500 100 L 50 50 1 1 N N
+X VDDP 7 100 1000 100 D 50 50 1 1 P N
+X VDDP 8 100 1000 100 D 50 50 1 1 W
+X OUTB 9 500 100 100 L 50 50 1 1 O
+ENDDRAW
+ENDDEF
+#
 # THAT2180
 #
 DEF THAT2180 U 0 5 Y Y 1 F N
@@ -2165,6 +2226,65 @@ X ~ 8 300 0 100 L 50 50 1 1 O
 ENDDRAW
 ENDDEF
 #
+# TPA3251
+#
+DEF TPA3251 U 0 20 Y Y 2 L N
+F0 "U" -350 750 50 H V L CNN
+F1 "TPA3251" 150 750 50 H V L CNN
+F2 "Package_SO:HTSSOP-44_6.1x14mm_P0.635mm_TopEP4.14x7.01mm" 0 0 50 H I C CIN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ HTSSOP*6.1x14mm*P0.635mm*
+$ENDFPLIST
+DRAW
+S -400 -700 400 700 0 1 10 f
+X GVDD_AB 1 0 800 100 D 50 50 1 1 W
+X OSC_IOP 10 -500 100 100 R 50 50 1 1 B
+X DVDD 11 -500 -300 100 R 50 50 1 1 P
+X GND 12 0 -800 100 U 50 50 1 1 W
+X GND 13 0 -800 100 U 50 50 1 1 P N
+X AVDD 14 -500 -400 100 R 50 50 1 1 P
+X C_START 15 -500 -500 100 R 50 50 1 1 P
+X VDD 2 -100 800 100 D 50 50 1 1 W
+X VBG 20 -500 -600 100 R 50 50 1 1 P
+X GND 25 0 -800 100 U 50 50 1 1 P N
+X GND 26 0 -800 100 U 50 50 1 1 P N
+X GND 33 0 -800 100 U 50 50 1 1 P N
+X GND 34 0 -800 100 U 50 50 1 1 P N
+X OUT_B 35 500 -300 100 L 50 50 1 1 O
+X PVDD_AB 36 100 800 100 D 50 50 1 1 W
+X PVDD_AB 37 100 800 100 D 50 50 1 1 P N
+X PVDD_AB 38 100 800 100 D 50 50 1 1 P N
+X OUT_A 39 500 300 100 L 50 50 1 1 O
+X OUT_A 40 500 300 100 L 50 50 1 1 P N
+X GND 41 0 -800 100 U 50 50 1 1 P N
+X GND 42 0 -800 100 U 50 50 1 1 P N
+X BST_B 43 500 -600 100 L 50 50 1 1 P
+X BST_A 44 500 600 100 L 50 50 1 1 P
+X INPUT_A 5 -500 500 100 R 50 50 1 1 I
+X INPUT_B 6 -500 400 100 R 50 50 1 1 I
+X OC_ADJ 7 -500 0 100 R 50 50 1 1 P
+X FREQ_ADJ 8 -500 -100 100 R 50 50 1 1 P
+X OSC_IOM 9 -500 200 100 R 50 50 1 1 B
+X INPUT_C 16 -500 500 100 R 50 50 2 1 I
+X INPUT_D 17 -500 400 100 R 50 50 2 1 I
+X ~RESET 18 -500 -400 100 R 50 50 2 1 I
+X ~FAULT 19 -500 -500 100 R 50 50 2 1 C
+X ~CLIP_OTW 21 -500 -600 100 R 50 50 2 1 C
+X GVDD_CD 22 0 800 100 D 50 50 2 1 W
+X BST_D 23 500 -600 100 L 50 50 2 1 P
+X BST_C 24 500 600 100 L 50 50 2 1 P
+X OUT_D 27 500 -300 100 L 50 50 2 1 O
+X OUT_D 28 500 -300 100 L 50 50 2 1 P N
+X PVDD_CD 29 100 800 100 D 50 50 2 1 W
+X M1 3 -500 -100 100 R 50 50 2 1 I
+X PVDD_CD 30 100 800 100 D 50 50 2 1 P N
+X PVDD_CD 31 100 800 100 D 50 50 2 1 P N
+X OUT_C 32 500 300 100 L 50 50 2 1 O
+X M2 4 -500 -200 100 R 50 50 2 1 I
+ENDDRAW
+ENDDEF
+#
 # TPA6132A2RTE
 #
 DEF TPA6132A2RTE U 0 20 Y Y 1 F N
diff --git a/Amplifier_Difference.dcm b/Amplifier_Difference.dcm
index 3916739e17..06bae560b9 100644
--- a/Amplifier_Difference.dcm
+++ b/Amplifier_Difference.dcm
@@ -42,6 +42,18 @@ K differential amplifier
 F https://www.analog.com/media/en/technical-documentation/data-sheets/ADA4940-1_4940-2.pdf
 $ENDCMP
 #
+$CMP AMC1100DWV
+D Fully-Differential Isolation Amplifier, Fixed Gain = 8, UL1577/IEC60747-5-2 Approved, SOIC-8
+K isolated difference amplifier
+F http://www.ti.com/lit/ds/symlink/amc1100.pdf
+$ENDCMP
+#
+$CMP AMC1300DWV
+D Precision, ±250-mV Input, Reinforced Isolated Amplifier, Fixed Gain = 8.2, UL1577/VDE V 0884-11 Approved, SOIC-8
+K isolated difference amplifier
+F http://www.ti.com/lit/ds/symlink/amc1300.pdf
+$ENDCMP
+#
 $CMP LM733CH
 D Single Differential Amplifier, TO-5-10
 K single differential video opamp
diff --git a/Amplifier_Difference.lib b/Amplifier_Difference.lib
index 5c52e9ee54..c3fd2240da 100644
--- a/Amplifier_Difference.lib
+++ b/Amplifier_Difference.lib
@@ -203,6 +203,34 @@ X +FB2 9 100 300 150 D 30 20 4 1 I
 ENDDRAW
 ENDDEF
 #
+# AMC1100DWV
+#
+DEF AMC1100DWV U 0 5 Y Y 1 F N
+F0 "U" 300 350 50 H V R CNN
+F1 "AMC1100DWV" 50 250 50 H V L CNN
+F2 "Package_SO:SOIC-8_7.5x5.85mm_P1.27mm" 0 0 50 H I C CNN
+F3 "" 650 -700 50 H I C CNN
+ALIAS AMC1300DWV
+$FPLIST
+ SOIC*7.5x5.85mm*P1.27mm*
+$ENDFPLIST
+DRAW
+P 2 0 1 0 -50 -125 -50 -175 N
+P 2 0 1 0 -50 -25 -50 -75 N
+P 2 0 1 0 -50 75 -50 25 N
+P 2 0 1 0 -50 175 -50 125 N
+P 4 0 1 10 -300 -300 -300 300 300 0 -300 -300 f
+X V+ 1 -100 300 100 D 50 50 1 1 W
+X + 2 -400 100 100 R 50 50 1 1 I
+X - 3 -400 -100 100 R 50 50 1 1 I
+X V- 4 -100 -300 100 U 50 50 1 1 W
+X V- 5 0 -300 150 U 50 50 1 1 W
+X - 6 300 -100 200 L 50 50 1 1 O
+X + 7 300 100 200 L 50 50 1 1 O
+X V+ 8 0 300 150 D 50 50 1 1 W
+ENDDRAW
+ENDDEF
+#
 # LM733CH
 #
 DEF LM733CH U 0 5 Y Y 1 F N
diff --git a/Amplifier_Operational.dcm b/Amplifier_Operational.dcm
index 966c6ef1a4..43654e9de4 100644
--- a/Amplifier_Operational.dcm
+++ b/Amplifier_Operational.dcm
@@ -54,12 +54,66 @@ K dual low-power opamp
 F https://www.analog.com/static/imported-files/data_sheets/ADA4075-2.pdf
 $ENDCMP
 #
+$CMP ADA4077-1xR
+D 4MHz, 7nV/sqrtHz, Low Offset and Drift, High Precision Amplifier, SOIC-8
+K single opamp
+F https://www.analog.com/media/en/technical-documentation/data-sheets/ADA4077-1_4077-2_4077-4.pdf
+$ENDCMP
+#
+$CMP ADA4077-1xRM
+D 4MHz, 7nV/sqrtHz, Low Offset and Drift, High Precision Amplifier, MSOP-8
+K single opamp
+F https://www.analog.com/media/en/technical-documentation/data-sheets/ADA4077-1_4077-2_4077-4.pdf
+$ENDCMP
+#
 $CMP ADA4530-1
 D Femtoampere Input Bias Current Electrometer Amplifier, SOIC-8
 K single opamp
 F https://www.analog.com/media/en/technical-documentation/data-sheets/ADA4530-1.pdf
 $ENDCMP
 #
+$CMP ADA4610-1xR
+D Low Noise, Precision, Rail-to-Rail Output, JFET Single Op Amp, SOIC-8
+K single opamp
+F https://www.analog.com/media/en/technical-documentation/data-sheets/ADA4610-1_4610-2_4610-4.pdf
+$ENDCMP
+#
+$CMP ADA4610-1xRJ
+D Low Noise, Precision, Rail-to-Rail Output, JFET Single Op Amp, SOT-23-5
+K single opamp
+F https://www.analog.com/media/en/technical-documentation/data-sheets/ADA4610-1_4610-2_4610-4.pdf
+$ENDCMP
+#
+$CMP ADA4610-2xCP
+D Dual Low Noise, Precision, Rail-to-Rail Output, JFET Op Amp, LFCSP-8
+K dual opamp
+F https://www.analog.com/media/en/technical-documentation/data-sheets/ADA4610-1_4610-2_4610-4.pdf
+$ENDCMP
+#
+$CMP ADA4610-2xR
+D Dual Low Noise, Precision, Rail-to-Rail Output, JFET Op Amp, SOIC-8
+K dual opamp
+F https://www.analog.com/media/en/technical-documentation/data-sheets/ADA4610-1_4610-2_4610-4.pdf
+$ENDCMP
+#
+$CMP ADA4610-2xRM
+D Dual Low Noise, Precision, Rail-to-Rail Output, JFET Op Amp, MSOP-8
+K dual opamp
+F https://www.analog.com/media/en/technical-documentation/data-sheets/ADA4610-1_4610-2_4610-4.pdf
+$ENDCMP
+#
+$CMP ADA4610-4xCP
+D Quad Low Noise, Precision, Rail-to-Rail Output, JFET Op Amp, LFCSP-16
+K quad opamp
+F https://www.analog.com/media/en/technical-documentation/data-sheets/ADA4610-1_4610-2_4610-4.pdf
+$ENDCMP
+#
+$CMP ADA4610-4xR
+D Quad Low Noise, Precision, Rail-to-Rail Output, JFET Single Op Amp, SOIC-14
+K quad opamp low-power
+F https://www.analog.com/media/en/technical-documentation/data-sheets/ADA4610-1_4610-2_4610-4.pdf
+$ENDCMP
+#
 $CMP ADA4807-1
 D Single Rail-to-Rail Input/Output Amplifiers, with disable, SC-70-6/SOT-23-6
 K single opamp
@@ -600,6 +654,18 @@ K dual opamp low-power
 F https://www.analog.com/media/en/technical-documentation/data-sheets/625234fc.pdf
 $ENDCMP
 #
+$CMP LTC6268xS6-10
+D 4GHz, Ultra-Low Bias Current, FET Input, Op Amp, TSOT-23
+K single opamp transimpedance
+F https://www.analog.com/media/en/technical-documentation/data-sheets/626810f.pdf
+$ENDCMP
+#
+$CMP LTC6268xS8-10
+D 4GHz, Ultra-Low Bias Current, FET Input, Op Amp, SOIC-8
+K single opamp transimpedance
+F https://www.analog.com/media/en/technical-documentation/data-sheets/626810f.pdf
+$ENDCMP
+#
 $CMP LTC6362xDD
 D Precision, Low Power, Rail-to-Rail Input/Output, Differential Op Amp/SAR ADC Driver, DFN-8
 K single differential opamp
@@ -1518,6 +1584,12 @@ K single opamp
 F http://www.ti.com/lit/ds/symlink/opa552.pdf
 $ENDCMP
 #
+$CMP OPA569DWP
+D Rail-to-Rail I/O, 2A, Power Amplifier, SO-20
+K opamp single high current
+F http://www.ti.com/lit/ds/symlink/opa569.pdf
+$ENDCMP
+#
 $CMP OPA842xD
 D 200MHz, Low Distortion, Unity-Gain Stable, Voltage Feedback Operational Amplifier, SOIC-8
 K single opamp
diff --git a/Amplifier_Operational.lib b/Amplifier_Operational.lib
index d121b18ad6..9d4e55d003 100644
--- a/Amplifier_Operational.lib
+++ b/Amplifier_Operational.lib
@@ -74,6 +74,66 @@ X - 8 -300 -100 100 R 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
+# ADA4610-2xCP
+#
+DEF ADA4610-2xCP U 0 5 Y Y 3 L N
+F0 "U" 0 200 50 H V L CNN
+F1 "ADA4610-2xCP" 0 -200 50 H V L CNN
+F2 "Package_CSP:LFCSP-8-1EP_3x3mm_P0.5mm_EP1.6x2.34mm" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ LFCSP*3x3mm*P0.5mm*EP1.6x2.34mm*
+$ENDFPLIST
+DRAW
+P 4 1 1 10 -200 200 200 0 -200 -200 -200 200 f
+P 4 2 1 10 -200 200 200 0 -200 -200 -200 200 f
+X ~ 1 300 0 100 L 50 50 1 1 O
+X - 2 -300 -100 100 R 50 50 1 1 I
+X + 3 -300 100 100 R 50 50 1 1 I
+X + 5 -300 100 100 R 50 50 2 1 I
+X - 6 -300 -100 100 R 50 50 2 1 I
+X ~ 7 300 0 100 L 50 50 2 1 O
+X V- 4 -100 -300 150 U 50 50 3 1 W
+X V+ 8 -100 300 150 D 50 50 3 1 W
+X V- 9 -100 -300 150 U 50 50 3 1 P N
+ENDDRAW
+ENDDEF
+#
+# ADA4610-4xCP
+#
+DEF ADA4610-4xCP U 0 5 Y Y 5 L N
+F0 "U" 100 250 50 H V L CNN
+F1 "ADA4610-4xCP" 100 150 50 H V L CNN
+F2 "Package_CSP:LFCSP-16-1EP_4x4mm_P0.65mm_EP2.1x2.1mm" 100 0 50 H I C CNN
+F3 "" 250 150 50 H I C CNN
+$FPLIST
+ LFCSP*4x4mm*P0.65mm*EP2.1x2.1mm*
+$ENDFPLIST
+DRAW
+P 4 1 1 10 200 0 -200 200 -200 -200 200 0 f
+P 4 2 1 10 -200 200 -200 -200 200 0 -200 200 f
+P 4 3 1 10 200 0 -200 200 -200 -200 200 0 f
+P 4 4 1 10 -200 200 200 0 -200 -200 -200 200 f
+X - 1 -300 -100 100 R 50 50 1 1 I
+X NIC 13 0 100 100 D 50 50 1 1 N N
+X ~ 15 300 0 100 L 50 50 1 1 O
+X NIC 16 0 -100 100 U 50 50 1 1 N N
+X + 2 -300 100 100 R 50 50 1 1 I
+X + 4 -300 100 100 R 50 50 2 1 I
+X - 5 -300 -100 100 R 50 50 2 1 I
+X ~ 6 300 0 100 L 50 50 2 1 O
+X ~ 7 300 0 100 L 50 50 3 1 O
+X - 8 -300 -100 100 R 50 50 3 1 I
+X + 9 -300 100 100 R 50 50 3 1 I
+X + 11 -300 100 100 R 50 50 4 1 I
+X - 12 -300 -100 100 R 50 50 4 1 I
+X ~ 14 300 0 100 L 50 50 4 1 O
+X V- 10 0 -300 150 U 50 50 5 1 W
+X V- 17 0 -300 150 U 50 50 5 1 P N
+X V+ 3 0 300 150 D 50 50 5 1 W
+ENDDRAW
+ENDDEF
+#
 # ADA4807-1
 #
 DEF ADA4807-1 U 0 5 Y Y 1 F N
@@ -1245,6 +1305,50 @@ X V- 9 -100 -300 150 U 50 50 3 1 P N
 ENDDRAW
 ENDDEF
 #
+# LTC6268xS6-10
+#
+DEF LTC6268xS6-10 U 0 5 Y Y 1 F N
+F0 "U" 150 425 50 H V C CNN
+F1 "LTC6268xS6-10" 0 525 50 H V C CNN
+F2 "Package_TO_SOT_SMD:TSOT-23-6" 0 -525 50 H I C CNN
+F3 "" -1975 725 50 H I C CNN
+$FPLIST
+ TSOT?23*
+$ENDFPLIST
+DRAW
+P 4 1 1 10 -200 200 -200 -200 200 0 -200 200 f
+X ~ 1 300 0 100 L 50 50 1 1 O
+X V- 2 -100 -300 150 U 50 50 1 1 W
+X + 3 -300 100 100 R 50 50 1 1 I
+X - 4 -300 -100 100 R 50 50 1 1 I
+X ~SHDN 5 0 300 200 D 50 20 1 1 I
+X V+ 6 -100 300 150 D 50 50 1 1 W
+ENDDRAW
+ENDDEF
+#
+# LTC6268xS8-10
+#
+DEF LTC6268xS8-10 U 0 5 Y Y 1 F N
+F0 "U" 150 425 50 H V C CNN
+F1 "LTC6268xS8-10" 0 525 50 H V C CNN
+F2 "Package_SO:SO-8_3.9x4.9mm_P1.27mm" 0 -525 50 H I C CNN
+F3 "" -1975 725 50 H I C CNN
+$FPLIST
+ SO*3.9x4.9mm*P1.27mm*
+$ENDFPLIST
+DRAW
+P 4 1 1 10 -200 200 -200 -200 200 0 -200 200 f
+X NC 1 0 -300 200 U 50 20 1 1 P
+X - 2 -300 -100 100 R 50 50 1 1 I
+X + 3 -300 100 100 R 50 50 1 1 I
+X NC 4 0 -300 200 U 50 20 1 1 P N
+X V- 5 -100 -300 150 U 50 50 1 1 W
+X ~ 6 300 0 100 L 50 50 1 1 O
+X V+ 7 -100 300 150 D 50 50 1 1 W
+X ~SHDN 8 0 300 200 D 50 20 1 1 I
+ENDDRAW
+ENDDEF
+#
 # LTC6362xDD
 #
 DEF LTC6362xDD U 0 5 Y Y 1 F N
@@ -1485,6 +1589,7 @@ F0 "U" 0 250 50 H V L CNN
 F1 "MCP6L91RT-EMS" 0 150 50 H V L CNN
 F2 "Package_SO:MSOP-8_3x3mm_P0.65mm" -100 -200 50 H I L CNN
 F3 "" 150 150 50 H I C CNN
+ALIAS ADA4077-1xRM
 $FPLIST
  MSOP*3x3mm*P0.65mm*
 $ENDFPLIST
@@ -1529,7 +1634,7 @@ F0 "U" -50 250 50 H V L CNN
 F1 "MCP6L91T-EOT" -50 150 50 H V L CNN
 F2 "Package_TO_SOT_SMD:SOT-23-5" -100 -200 50 H I L CNN
 F3 "" 0 200 50 H I C CNN
-ALIAS MCP6401T-xOT MCP6001-OT MCP601-xOT OPA333xxDBV OPA340NA OPA376xxDBV TS881xLx TSV911xxLx OPA330xxDBV OPA356xxDBV LMH6702MF LMH6609MF TLV2371DBV OPA842xDBV OPA843xDBV OPA846xDBV LT6015xS5 OPA197xDBV OPA196xDBV LPV811DBV MCP6L01x-xOT OPA365xxDBV
+ALIAS MCP6401T-xOT MCP6001-OT MCP601-xOT OPA333xxDBV OPA340NA OPA376xxDBV TS881xLx TSV911xxLx OPA330xxDBV OPA356xxDBV LMH6702MF LMH6609MF TLV2371DBV OPA842xDBV OPA843xDBV OPA846xDBV LT6015xS5 OPA197xDBV OPA196xDBV LPV811DBV MCP6L01x-xOT OPA365xxDBV ADA4610-1xRJ
 $FPLIST
  SOT?23*
 $ENDFPLIST
@@ -1671,7 +1776,7 @@ F0 "U" 100 250 50 H V L CNN
 F1 "NCS2325D" 100 150 50 H V L CNN
 F2 "Package_SO:SOIC-8_3.9x4.9mm_P1.27mm" 100 0 50 H I C CNN
 F3 "" 250 150 50 H I C CNN
-ALIAS OPA2197xD OPA2196xD AD8676xR OPA1692xD MCP6L02x-xSN NCS20072D OPA2156xD
+ALIAS OPA2197xD OPA2196xD AD8676xR OPA1692xD MCP6L02x-xSN NCS20072D OPA2156xD ADA4610-2xR
 $FPLIST
  SOIC*3.9x4.9mm*P1.27mm*
 $ENDFPLIST
@@ -1696,7 +1801,7 @@ F0 "U" 100 250 50 H V L CNN
 F1 "NCS2325DM" 100 150 50 H V L CNN
 F2 "Package_SO:MSOP-8_3x3mm_P0.65mm" 100 0 50 H I C CNN
 F3 "" 250 150 50 H I C CNN
-ALIAS MCP6L02x-xMS NCS20072DM LTC6253xMS8
+ALIAS MCP6L02x-xMS NCS20072DM LTC6253xMS8 ADA4610-2xRM
 $FPLIST
  MSOP*3x3mm*P0.65mm*
 $ENDFPLIST
@@ -2216,7 +2321,7 @@ F0 "U" 0 250 50 H V L CNN
 F1 "OPA333xxD" 0 150 50 H V L CNN
 F2 "Package_SO:SOIC-8_3.9x4.9mm_P1.27mm" -100 -200 50 H I L CNN
 F3 "" 150 150 50 H I C CNN
-ALIAS OPA340UA OPA376xxD MCP6L91RT-ESN TSV911IDT THS4631D OPA330xxD MCP601-xSN LM6171D OPA356xxD AD8001AR LMH6702MA LMH6609MA OPA188xxD TLV2371D OPA842xD OPA843xD OPA846xD OPA197xD OPA196xD OPA365xxD
+ALIAS OPA340UA OPA376xxD MCP6L91RT-ESN TSV911IDT THS4631D OPA330xxD MCP601-xSN LM6171D OPA356xxD AD8001AR LMH6702MA LMH6609MA OPA188xxD TLV2371D OPA842xD OPA843xD OPA846xD OPA197xD OPA196xD OPA365xxD ADA4077-1xR ADA4610-1xR
 $FPLIST
  SOIC*3.9x4.9mm*P1.27mm*
 $ENDFPLIST
@@ -2261,7 +2366,7 @@ F0 "U" 0 150 50 H V L CNN
 F1 "OPA4197xD" 0 -150 50 H V L CNN
 F2 "Package_SO:SOIC-14_3.9x8.7mm_P1.27mm" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
-ALIAS OPA4196xD MCP6L04x-xSL
+ALIAS OPA4196xD MCP6L04x-xSL ADA4610-4xR
 $FPLIST
  SOIC*3.9x8.7mm*P1.27mm*
 $ENDFPLIST
@@ -2368,6 +2473,43 @@ X Flag 8 0 -300 200 U 50 50 1 1 O
 ENDDRAW
 ENDDEF
 #
+# OPA569DWP
+#
+DEF OPA569DWP U 0 20 Y Y 1 F N
+F0 "U" 250 450 50 H V C CNN
+F1 "OPA569DWP" 400 350 50 H V C CNN
+F2 "Package_SO:SO-20-1EP_7.52x12.825mm_P1.27mm_EP6.045x12.09mm_Mask3.56x4.47mm" -300 1000 50 H I C CNN
+F3 "" -200 0 50 H I C CNN
+$FPLIST
+ SO*1EP*7.52x12.825mm*P1.27mm*
+$ENDFPLIST
+DRAW
+P 2 0 1 6 400 200 400 -200 N
+P 4 0 1 10 400 0 -500 -540 -500 540 400 0 f
+X NC 16 -500 0 100 R 50 50 0 0 N N
+X PAD 21 -400 -600 120 U 50 50 0 0 P N
+X PAD 1 -400 -600 120 U 50 50 1 1 W
+X PAD 10 -400 -600 120 U 50 50 1 1 P N
+X PAD 11 -400 -600 120 U 50 50 1 1 P N
+X V+ 12 -300 600 180 D 50 50 1 1 W
+X V+ 13 -300 600 180 D 50 50 1 1 P N
+X OUT 14 600 0 200 L 50 50 1 1 O
+X OUT 15 600 0 200 L 50 50 1 1 P N
+X V- 17 -300 -600 180 U 50 50 1 1 W
+X V- 18 -300 -600 180 U 50 50 1 1 P N
+X IMON 19 0 -600 360 U 50 50 1 1 O
+X POUT1 2 600 200 200 L 50 50 1 1 O
+X PAD 20 -400 -600 120 U 50 50 1 1 P N
+X ISET 3 -100 -600 300 U 50 50 1 1 O
+X ~IFLAG 4 -100 600 300 D 50 50 1 1 O
+X -IN 5 -600 200 100 R 50 50 1 1 I
+X +IN 6 -600 -200 100 R 50 50 1 1 I
+X ~TFLAG 7 -200 600 240 D 50 50 1 1 O
+X ENA 8 0 600 360 D 50 50 1 1 I
+X POUT2 9 600 -200 200 L 50 50 1 1 O
+ENDDRAW
+ENDDEF
+#
 # OPA858xDSG
 #
 DEF OPA858xDSG U 0 5 Y Y 1 F N
diff --git a/Audio.dcm b/Audio.dcm
index d14f1875f3..4364867804 100644
--- a/Audio.dcm
+++ b/Audio.dcm
@@ -288,6 +288,12 @@ K Codec
 F https://www.nxp.com/docs/en/data-sheet/SGTL5000.pdf
 $ENDCMP
 #
+$CMP SRC4392xPFB
+D Two-Channel, Asynchronous Sample Rate Converter with Integrated Digital Audio Interface Receiver and Transmitter, TQFP-48
+K audio sample rate converter
+F http://www.ti.com/lit/ds/symlink/src4392.pdf
+$ENDCMP
+#
 $CMP SSI2144
 D Four-pole VCF, SSOP-16
 K Sound Semiconductor VCF SSM2044
@@ -372,6 +378,12 @@ K audio codec 2ch 96kHz headphone amplifier
 F http://www.ti.com/lit/ds/symlink/tlv320aic23b.pdf
 $ENDCMP
 #
+$CMP TLV320AIC3100
+D Low Power Audio Codec with Audio Processing and Mono Class‑D Amplifier, VQFN-32
+K audio codec 2ch 192kHz class-d amplifier
+F http://www.ti.com/lit/ds/symlink/tlv320aic3100.pdf
+$ENDCMP
+#
 $CMP TPA5050
 D Stereo Digital Audio Lip-Sync Delay Processor With I2C Control, QFN-16
 K audio delay
diff --git a/Audio.lib b/Audio.lib
index 9233cb3cc4..5727178344 100644
--- a/Audio.lib
+++ b/Audio.lib
@@ -1685,6 +1685,69 @@ X LINEIN_L 9 -600 500 100 R 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
+# SRC4392xPFB
+#
+DEF SRC4392xPFB U 0 20 Y Y 1 F N
+F0 "U" -600 1250 50 H V C CNN
+F1 "SRC4392xPFB" 600 1250 50 H V C CNN
+F2 "Package_QFP:TQFP-48_7x7mm_P0.5mm" 50 -1150 50 H I C CNN
+F3 "" 0 -50 50 H I C CNN
+$FPLIST
+ TQFP*7x7mm*P0.5mm*
+$ENDFPLIST
+DRAW
+S -600 1200 600 -1100 0 1 10 f
+X RX1+ 1 -700 100 100 R 50 50 1 1 I
+X AGND 10 100 -1200 100 U 50 50 1 1 W
+X ~LOCK~ 11 700 -300 100 L 50 50 1 1 O
+X RXCKO 12 -700 -1000 100 R 50 50 1 1 O
+X RXCKI 13 -700 -900 100 R 50 50 1 1 I
+X MUTE 14 700 -400 100 L 50 50 1 1 I
+X ~RDY~ 15 700 -200 100 L 50 50 1 1 O
+X DGND1 16 -200 -1200 100 U 50 50 1 1 W
+X VDD18 17 200 1300 100 D 50 50 1 1 W
+X CPM 18 700 -1000 100 L 50 50 1 1 I
+X ~CS~/A0 19 700 -700 100 L 50 50 1 1 I
+X RX1– 2 -700 0 100 R 50 50 1 1 I
+X CCLK/SCL 20 700 -600 100 L 50 50 1 1 I
+X CDIN/A1 21 700 -800 100 L 50 50 1 1 I
+X CDOUT/SDA 22 700 -500 100 L 50 50 1 1 B
+X ~INT~ 23 700 -100 100 L 50 50 1 1 C
+X ~RST~ 24 700 0 100 L 50 50 1 1 I
+X MCLK 25 -700 -800 100 R 50 50 1 1 I
+X GPO1 26 700 500 100 L 50 50 1 1 O
+X GPO2 27 700 400 100 L 50 50 1 1 O
+X GPO3 28 700 300 100 L 50 50 1 1 O
+X GPO4 29 700 200 100 L 50 50 1 1 O
+X RX2+ 3 -700 -100 100 R 50 50 1 1 I
+X DGND2 30 -100 -1200 100 U 50 50 1 1 W
+X TX– 31 700 700 100 L 50 50 1 1 O
+X TX+ 32 700 800 100 L 50 50 1 1 O
+X VDD33 33 -100 1300 100 D 50 50 1 1 W
+X AESOUT 34 700 900 100 L 50 50 1 1 O
+X BLS 35 700 1000 100 L 50 50 1 1 B
+X SYNC 36 700 1100 100 L 50 50 1 1 O
+X BCKA 37 -700 1100 100 R 50 50 1 1 B
+X LRCKA 38 -700 1000 100 R 50 50 1 1 B
+X SDINA 39 -700 900 100 R 50 50 1 1 I
+X RX2– 4 -700 -200 100 R 50 50 1 1 I
+X SDOUTA 40 -700 800 100 R 50 50 1 1 O
+X NC 41 400 -1100 100 U 50 50 1 1 N N
+X VIO 42 -200 1300 100 D 50 50 1 1 W
+X DGND3 43 0 -1200 100 U 50 50 1 1 W
+X BGND 44 200 -1200 100 U 50 50 1 1 W
+X SDOUTB 45 -700 300 100 R 50 50 1 1 O
+X SDINB 46 -700 400 100 R 50 50 1 1 I
+X LRCKB 47 -700 500 100 R 50 50 1 1 B
+X BCKB 48 -700 600 100 R 50 50 1 1 B
+X RX3+ 5 -700 -300 100 R 50 50 1 1 I
+X RX3– 6 -700 -400 100 R 50 50 1 1 I
+X RX4+ 7 -700 -500 100 R 50 50 1 1 I
+X RX4– 8 -700 -600 100 R 50 50 1 1 I
+X VCC 9 0 1300 100 D 50 50 1 1 W
+ENDDRAW
+ENDDEF
+#
 # SSI2144
 #
 DEF SSI2144 U 0 20 Y Y 1 F N
@@ -2212,6 +2275,54 @@ X NC J9 -300 -900 100 U 50 50 1 1 N N
 ENDDRAW
 ENDDEF
 #
+# TLV320AIC3100
+#
+DEF TLV320AIC3100 U 0 20 Y Y 1 F N
+F0 "U" -600 800 50 H V C CNN
+F1 "TLV320AIC3100" 0 0 50 H V C CNN
+F2 "Package_DFN_QFN:VQFN-32-1EP_5x5mm_P0.5mm_EP3.5x3.5mm" 0 -1200 50 H I C CNN
+F3 "" -1200 -1500 50 H I C CNN
+$FPLIST
+ VQFN*1EP*5x5mm*P0.5mm*
+$ENDFPLIST
+DRAW
+S -700 700 700 -700 0 1 10 f
+X IOVSS 1 0 -800 100 U 50 50 1 1 W
+X SCL 10 -800 400 100 R 50 50 1 1 I
+X VOL/MICDET 11 800 -200 100 L 50 50 1 1 I
+X MICBIAS 12 800 -400 100 L 50 50 1 1 w
+X MIC1LP 13 800 -500 100 L 50 50 1 1 I
+X MIC1RP 14 800 -600 100 L 50 50 1 1 I
+X MIC1LM 15 800 -300 100 L 50 50 1 1 I
+X AVSS 16 -300 -800 100 U 50 50 1 1 W
+X AVDD 17 -300 800 100 D 50 50 1 1 W
+X DVSS 18 -200 -800 100 U 50 50 1 1 W
+X SPKM 19 800 400 100 L 50 50 1 1 O
+X IOVDD 2 0 800 100 D 50 50 1 1 W
+X SPKVSS 20 100 -800 100 U 50 50 1 1 W
+X SPKVDD 21 100 800 100 D 50 50 1 1 W
+X SPKP 22 800 600 100 L 50 50 1 1 O
+X SPKM 23 800 400 100 L 50 50 1 1 P N
+X SPKVDD 24 200 800 100 D 50 50 1 1 W
+X SPKVSS 25 100 -800 100 U 50 50 1 1 P N
+X SPKP 26 800 600 100 L 50 50 1 1 P N
+X HPL 27 800 100 100 L 50 50 1 1 O
+X HPVDD 28 -100 800 100 D 50 50 1 1 W
+X HPVSS 29 -100 -800 100 U 50 50 1 1 W
+X DVDD 3 -200 800 100 D 50 50 1 1 W
+X HPR 30 800 0 100 L 50 50 1 1 O
+X ~RESET 31 -800 600 100 R 50 50 1 1 I
+X GPIO1 32 -800 -600 100 R 50 50 1 1 B
+X EP 33 200 -800 100 U 50 50 1 1 W
+X DOUT 4 -800 0 100 R 50 50 1 1 O
+X DIN 5 -800 100 100 R 50 50 1 1 I
+X WCLK 6 -800 -200 100 R 50 50 1 1 B
+X BCLK 7 -800 -100 100 R 50 50 1 1 B
+X MCLK 8 -800 -400 100 R 50 50 1 1 I
+X SDA 9 -800 300 100 R 50 50 1 1 B
+ENDDRAW
+ENDDEF
+#
 # TPA5050
 #
 DEF TPA5050 U 0 20 Y Y 1 F N
diff --git a/Battery_Management.dcm b/Battery_Management.dcm
index 31386fdd08..f5865a0c50 100644
--- a/Battery_Management.dcm
+++ b/Battery_Management.dcm
@@ -102,6 +102,12 @@ K USB Charge
 F http://www.ti.com/lit/ds/symlink/bq24079.pdf
 $ENDCMP
 #
+$CMP BQ24090DGQ
+D 1A, Single-Input, SingleCell Li-Ion and Li-Pol BatteryCharger, HVSSOP-10
+K battery charger singlecell li-ion li-poly, 1A
+F http://www.ti.com/lit/ds/symlink/bq24090.pdf
+$ENDCMP
+#
 $CMP BQ24133RGY
 D Synchronous switched mode Li-Ion and Li-Polymer battery charger, integrated MOSFETs and power path selector, Texas R-PVQFN-N24
 K Battery, Charger, Li-Ion, Li-Poly
@@ -240,18 +246,24 @@ K lithium battery balance charge afe
 F http://www.ti.com/lit/ds/symlink/bq76930.pdf
 $ENDCMP
 #
-$CMP BQ76940
-D Lithium battery monitor, 9-15 cells, integrated balancing, I2C interface
+$CMP BQ76940DBT
+D Lithium battery monitor, 9-15 cells, integrated balancing, I2C interface, TSSOP-44
 K lithium battery balance charge afe
-F http://www.ti.com/lit/gpn/bq76940
+F http://www.ti.com/lit/ds/symlink/bq76940.pdf
 $ENDCMP
 #
-$CMP BQ78350
-D Lithium battery fuel gauge, companion controller for BQ769x0
-K lithium battery
+$CMP BQ78350DBT
+D Lithium battery fuel gauge, battery management controller for BQ769x0, TSSOP-30
+K battery, management, Li-Ion, Gauge, controller
 F http://www.ti.com/lit/ds/symlink/bq78350.pdf
 $ENDCMP
 #
+$CMP BQ78350DBT-R1
+D Lithium battery fuel gauge, battery management controller for BQ769x0, TSSOP-30
+K battery, management, Li-Ion, gauge, controller
+F http://www.ti.com/lit/ds/symlink/bq78350-r1.pdf
+$ENDCMP
+#
 $CMP DS2745U
 D Current-flow, voltage and temperature  measurement to support batterycapacity monitoring, 2.5V to 4.5V VDD, -40 to +85 degree Celcius, TSSOP-8
 K Current-flow, voltage and temperature  measurement to support batterycapacity monitoring, 2.5V to 4.5V VDD, -40 to +85 degree Celcius, TSSOP-8
@@ -444,6 +456,12 @@ K battery balance afe
 F https://www.analog.com/media/en/technical-documentation/data-sheets/680324fa.pdf
 $ENDCMP
 #
+$CMP LTC6804-1
+D Multicell Battery Stack Monitor, 12-cell max, multi-chemistry, integrated balancing, stackable, serial interface, SSOP-48
+K battery balance afe
+F https://www.analog.com/media/en/technical-documentation/data-sheets/680412fc.pdf
+$ENDCMP
+#
 $CMP MAX1647
 D Smart Battery Charger, 18V battery, 28V input, SMBus serial interface
 K battery charger
@@ -456,6 +474,18 @@ K battery charger
 F https://datasheets.maximintegrated.com/en/ds/MAX1647-MAX1648.pdf
 $ENDCMP
 #
+$CMP MAX17261xxTD
+D 5.1μA Multi-Cell Fuel Gauge with ModelGauge m5 EZ, TDFN-14
+K Charge pump, battery
+F https://datasheets.maximintegrated.com/en/ds/MAX17261.pdf
+$ENDCMP
+#
+$CMP MAX17261xxWL
+D 5.1μA Multi-Cell Fuel Gauge with ModelGauge m5 EZ, WLP-9
+K Charge pump, battery
+F https://datasheets.maximintegrated.com/en/ds/MAX17261.pdf
+$ENDCMP
+#
 $CMP MAX17263xxTE
 D Single/Multi-Cell Fuel Gauge, ModelGauge m5 EZ, Integrated LED Control, TDFN-14
 K fuel-gauge
diff --git a/Battery_Management.lib b/Battery_Management.lib
index 6a694d210d..8b1c5b0226 100644
--- a/Battery_Management.lib
+++ b/Battery_Management.lib
@@ -510,6 +510,32 @@ X ~CHG 9 500 -400 100 L 50 50 1 1 C
 ENDDRAW
 ENDDEF
 #
+# BQ24090DGQ
+#
+DEF BQ24090DGQ U 0 20 Y Y 1 F N
+F0 "U" -370 530 50 H V C CNN
+F1 "BQ24090DGQ" -150 450 50 H V C CNN
+F2 "Package_SO:HVSSOP-10-1EP_3x3mm_P0.5mm_EP1.57x1.88mm_ThermalVias" 0 0 50 H I C CNN
+F3 "" -300 750 50 H I C CNN
+$FPLIST
+ HVSSOP*1EP*3x3mm*P0.5mm*
+$ENDFPLIST
+DRAW
+S -400 400 400 -400 0 1 10 f
+X IN 1 -500 300 100 R 50 50 1 1 W
+X OUT 10 500 300 100 L 50 50 1 1 w
+X VSS 11 0 -500 100 U 50 50 1 1 P N
+X ISET 2 -500 100 100 R 50 50 1 1 P
+X VSS 3 0 -500 100 U 50 50 1 1 W
+X PRETERM 4 -500 -300 100 R 50 50 1 1 P
+X ~PG 5 500 -300 100 L 50 50 1 1 C
+X NC 6 200 -400 100 U 50 50 1 1 N N
+X ISET2 7 -500 -100 100 R 50 50 1 1 P
+X ~CHG 8 500 -100 100 L 50 50 1 1 C
+X TS 9 500 100 100 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
 # BQ24133RGY
 #
 DEF BQ24133RGY U 0 20 Y Y 1 F N
@@ -1045,107 +1071,108 @@ X SCL 5 -500 800 100 R 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
-# BQ76940
+# BQ76940DBT
 #
-DEF BQ76940 U 0 40 Y Y 1 F N
-F0 "U" -700 1400 50 H V L CNN
-F1 "BQ76940" 700 1400 50 H V R CNN
-F2 "Package_SO:TSSOP-44_4.4x11.2mm_P0.5mm" 0 0 50 H I C CNN
+DEF BQ76940DBT U 0 20 Y Y 1 F N
+F0 "U" -400 1350 50 H V L CNN
+F1 "BQ76940DBT" 500 1350 50 H V R CNN
+F2 "Package_SO:TSSOP-44_4.4x11.2mm_P0.5mm" 900 -1350 50 H I C CNN
 F3 "" 700 1150 50 H I C CNN
 $FPLIST
  TSSOP*4.4x11.2mm*P0.5mm*
 $ENDFPLIST
 DRAW
-S -700 1300 700 -1300 0 1 10 f
-X VC5X 10 -800 -100 100 R 50 50 1 0 P
-X NC(CAP2) 11 -800 -400 100 R 50 50 1 0 P
-X NC(CAP2) 12 -800 -500 100 R 50 50 1 0 P
-X TS2 13 -800 0 100 R 50 50 1 0 P
-X CAP2 14 -800 -300 100 R 50 50 1 0 P
-X VC10X 15 -800 600 100 R 50 50 1 0 P
-X NC(CAP3) 16 -800 300 100 R 50 50 1 0 P
-X NC(CAP3) 17 -800 200 100 R 50 50 1 0 P
-X TS3 18 -800 700 100 R 50 50 1 0 P
-X CAP3 19 -800 400 100 R 50 50 1 0 P
-X BAT 20 800 1000 100 L 50 50 1 0 I
-X NC 21 200 -1300 100 U 50 50 1 0 N N
-X NC 22 300 -1300 100 U 50 50 1 0 N N
-X NC 23 400 -1300 100 U 50 50 1 0 N N
-X VC15 24 800 800 100 L 50 50 1 0 I
-X VC14 25 800 700 100 L 50 50 1 0 I
-X VC13 26 800 600 100 L 50 50 1 0 I
-X VC12 27 800 500 100 L 50 50 1 0 I
-X VC11 28 800 400 100 L 50 50 1 0 I
-X VC10B 29 800 300 100 L 50 50 1 0 I
-X VC10 30 800 200 100 L 50 50 1 0 I
-X VC9 31 800 100 100 L 50 50 1 0 I
-X VC8 32 800 0 100 L 50 50 1 0 I
-X VC7 33 800 -100 100 L 50 50 1 0 I
-X VC6 34 800 -200 100 L 50 50 1 0 I
-X VC5B 35 800 -300 100 L 50 50 1 0 I
-X VC5 36 800 -400 100 L 50 50 1 0 I
-X VC4 37 800 -500 100 L 50 50 1 0 I
-X VC3 38 800 -600 100 L 50 50 1 0 I
-X VC2 39 800 -700 100 L 50 50 1 0 I
-X VC1 40 800 -800 100 L 50 50 1 0 I
-X VC0 41 800 -900 100 L 50 50 1 0 I
-X SRP 42 800 -1100 100 L 50 50 1 0 I
-X SRN 43 800 -1200 100 L 50 50 1 0 I
-X ALERT 44 -800 900 100 R 50 50 1 0 B
-X TS1 6 -800 -700 100 R 50 50 1 0 P
-X CAP1 7 -800 -900 100 R 50 50 1 0 P
-X REGOUT 8 800 1200 100 L 50 50 1 0 w
+S -400 1300 400 -1300 0 1 10 f
+X VC5X 10 -500 -100 100 R 50 50 1 0 P
+X NC(CAP2) 11 -500 -400 100 R 50 50 1 0 P
+X NC(CAP2) 12 -500 -500 100 R 50 50 1 0 P
+X TS2 13 -500 0 100 R 50 50 1 0 P
+X CAP2 14 -500 -300 100 R 50 50 1 0 P
+X VC10X 15 -500 600 100 R 50 50 1 0 P
+X NC(CAP3) 16 -500 300 100 R 50 50 1 0 P
+X NC(CAP3) 17 -500 200 100 R 50 50 1 0 P
+X TS3 18 -500 700 100 R 50 50 1 0 P
+X CAP3 19 -500 400 100 R 50 50 1 0 P
+X BAT 20 500 1000 100 L 50 50 1 0 I
+X NC 21 -200 -1300 100 U 50 50 1 0 N N
+X NC 22 -100 -1300 100 U 50 50 1 0 N N
+X NC 23 100 -1300 100 U 50 50 1 0 N N
+X VC15 24 500 800 100 L 50 50 1 0 I
+X VC14 25 500 700 100 L 50 50 1 0 I
+X VC13 26 500 600 100 L 50 50 1 0 I
+X VC12 27 500 500 100 L 50 50 1 0 I
+X VC11 28 500 400 100 L 50 50 1 0 I
+X VC10B 29 500 300 100 L 50 50 1 0 I
+X VC10 30 500 200 100 L 50 50 1 0 I
+X VC9 31 500 100 100 L 50 50 1 0 I
+X VC8 32 500 0 100 L 50 50 1 0 I
+X VC7 33 500 -100 100 L 50 50 1 0 I
+X VC6 34 500 -200 100 L 50 50 1 0 I
+X VC5B 35 500 -300 100 L 50 50 1 0 I
+X VC5 36 500 -400 100 L 50 50 1 0 I
+X VC4 37 500 -500 100 L 50 50 1 0 I
+X VC3 38 500 -600 100 L 50 50 1 0 I
+X VC2 39 500 -700 100 L 50 50 1 0 I
+X VC1 40 500 -800 100 L 50 50 1 0 I
+X VC0 41 500 -900 100 L 50 50 1 0 I
+X SRP 42 500 -1100 100 L 50 50 1 0 I
+X SRN 43 500 -1200 100 L 50 50 1 0 I
+X ALERT 44 -500 900 100 R 50 50 1 0 B
+X TS1 6 -500 -700 100 R 50 50 1 0 P
+X CAP1 7 -500 -900 100 R 50 50 1 0 P
+X REGOUT 8 500 1200 100 L 50 50 1 0 w
 X REGSRC 9 0 1400 100 D 50 50 1 0 W
-X DSG 1 -800 -1100 100 R 50 50 1 1 O
-X CHG 2 -800 -1200 100 R 50 50 1 1 O
+X DSG 1 -500 -1100 100 R 50 50 1 1 O
+X CHG 2 -500 -1200 100 R 50 50 1 1 O
 X VSS 3 0 -1400 100 U 50 50 1 1 W
-X SDA 4 -800 1200 100 R 50 50 1 1 B
-X SCL 5 -800 1100 100 R 50 50 1 1 I
+X SDA 4 -500 1200 100 R 50 50 1 1 B
+X SCL 5 -500 1100 100 R 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
-# BQ78350
+# BQ78350DBT
 #
-DEF BQ78350 U 0 40 Y Y 1 F N
-F0 "U" -700 1150 50 H V L CNN
-F1 "BQ78350" 700 1150 50 H V R CNN
-F2 "Package_SO:TSSOP-30_4.4x7.8mm_P0.5mm" 0 0 50 H I C CNN
+DEF BQ78350DBT U 0 20 Y Y 1 F N
+F0 "U" -400 1050 50 H V L CNN
+F1 "BQ78350DBT" 550 1050 50 H V R CNN
+F2 "Package_SO:TSSOP-30_4.4x7.8mm_P0.5mm" 850 -1050 50 H I C CNN
 F3 "" -700 1150 50 H I C CNN
+ALIAS BQ78350DBT-R1
 $FPLIST
  TSSOP*4.4x7.8mm*P0.5mm*
 $ENDFPLIST
 DRAW
-S 700 1100 -700 -1100 0 1 10 f
-X COM 1 900 400 200 L 50 50 1 1 C
-X SAFE 10 -900 -600 200 R 50 50 1 1 O
-X SMBD 11 900 0 200 L 50 50 1 1 C
-X VEN 12 -900 500 200 R 50 50 1 1 C
-X SMBC 13 900 -100 200 L 50 50 1 1 C
-X ~DISP 14 900 300 200 L 50 50 1 1 I
-X PWRM 15 900 200 200 L 50 50 1 1 C
-X LED1 16 900 900 200 L 50 50 1 1 O
-X LED2 17 900 800 200 L 50 50 1 1 O
-X LED3 18 900 700 200 L 50 50 1 1 O
-X LED4 19 900 600 200 L 50 50 1 1 O
-X ALERT 2 -900 0 200 R 50 50 1 1 B
-X LED5 20 900 500 200 L 50 50 1 1 O
-X GPIO_A 21 -900 -800 200 R 50 50 1 1 B
-X VSS 22 0 -1300 200 U 50 50 1 1 P N
-X VSS 23 0 -1300 200 U 50 50 1 1 W
-X ~MRST 24 -900 900 200 R 50 50 1 1 I
-X VSS 25 0 -1300 200 U 50 50 1 1 P N
-X VCC 26 0 1300 200 D 50 50 1 1 W
-X RBI 27 900 -600 200 L 50 50 1 1 P
-X GPIO_B 28 -900 -900 200 R 50 50 1 1 B
-X ADREN 29 900 -300 200 L 50 50 1 1 O
-X SDA 3 -900 200 200 R 50 50 1 1 B
-X SMBA 30 900 -400 200 L 50 50 1 1 I
-X SCL 4 -900 100 200 R 50 50 1 1 B
-X ~PRECHG 5 -900 -200 200 R 50 50 1 1 C
-X VAUX 6 -900 400 200 R 50 50 1 1 I
-X BAT 7 -900 700 200 R 50 50 1 1 I
-X ~PRES 8 -900 -400 200 R 50 50 1 1 I
-X ~KEYIN 9 -900 -500 200 R 50 50 1 1 I
+S -400 1000 400 -1000 0 1 10 f
+X COM 1 500 400 100 L 50 50 1 1 C
+X SAFE 10 -500 -600 100 R 50 50 1 1 O
+X SMBD 11 500 0 100 L 50 50 1 1 B
+X VEN 12 -500 500 100 R 50 50 1 1 C
+X SMBC 13 500 -100 100 L 50 50 1 1 B
+X ~DISP 14 500 300 100 L 50 50 1 1 I
+X PWRM 15 500 200 100 L 50 50 1 1 C
+X LED1 16 500 900 100 L 50 50 1 1 O
+X LED2 17 500 800 100 L 50 50 1 1 O
+X LED3 18 500 700 100 L 50 50 1 1 O
+X LED4 19 500 600 100 L 50 50 1 1 O
+X ALERT 2 -500 0 100 R 50 50 1 1 B
+X LED5 20 500 500 100 L 50 50 1 1 O
+X GPIO_A 21 -500 -800 100 R 50 50 1 1 B
+X VSS 22 0 -1100 100 U 50 50 1 1 P N
+X VSS 23 0 -1100 100 U 50 50 1 1 W
+X ~MRST 24 -500 900 100 R 50 50 1 1 I
+X VSS 25 0 -1100 100 U 50 50 1 1 P N
+X VCC 26 0 1100 100 D 50 50 1 1 W
+X RBI 27 500 -600 100 L 50 50 1 1 P
+X GPIO_B 28 -500 -900 100 R 50 50 1 1 B
+X ADREN 29 500 -300 100 L 50 50 1 1 O
+X SDA 3 -500 200 100 R 50 50 1 1 B
+X SMBA 30 500 -400 100 L 50 50 1 1 I
+X SCL 4 -500 100 100 R 50 50 1 1 O
+X ~PRECHG 5 -500 -200 100 R 50 50 1 1 O
+X VAUX 6 -500 400 100 R 50 50 1 1 I
+X BAT 7 -500 700 100 R 50 50 1 1 I
+X ~PRES 8 -500 -400 100 R 50 50 1 1 I
+X ~KEYIN 9 -500 -500 100 R 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
@@ -1791,6 +1818,69 @@ X S9 9 500 500 100 L 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
+# LTC6804-1
+#
+DEF LTC6804-1 U 0 20 Y Y 1 F N
+F0 "U" -400 1350 50 H V L CNN
+F1 "LTC6804-1" -650 -1350 50 H V L CNN
+F2 "Package_SO:SSOP-48_5.3x12.8mm_P0.5mm" -50 100 50 H I C CNN
+F3 "" 550 1350 50 H I C CNN
+$FPLIST
+ SSOP*5.3x12.8mm*P0.5mm*
+$ENDFPLIST
+DRAW
+S 400 -1300 -400 1300 0 1 10 f
+X V+ 1 0 1400 100 D 50 50 1 1 W
+X C8 10 500 400 100 L 50 50 1 1 I
+X S8 11 500 300 100 L 50 50 1 1 B
+X C7 12 500 200 100 L 50 50 1 1 I
+X S7 13 500 100 100 L 50 50 1 1 B
+X C6 14 500 0 100 L 50 50 1 1 I
+X S6 15 500 -100 100 L 50 50 1 1 B
+X C5 16 500 -200 100 L 50 50 1 1 I
+X S5 17 500 -300 100 L 50 50 1 1 B
+X C4 18 500 -400 100 L 50 50 1 1 I
+X S4 19 500 -500 100 L 50 50 1 1 B
+X C12 2 500 1200 100 L 50 50 1 1 I
+X C3 20 500 -600 100 L 50 50 1 1 I
+X S3 21 500 -700 100 L 50 50 1 1 B
+X C2 22 500 -800 100 L 50 50 1 1 I
+X S2 23 500 -900 100 L 50 50 1 1 B
+X C1 24 500 -1000 100 L 50 50 1 1 I
+X S1 25 500 -1100 100 L 50 50 1 1 B
+X C0 26 500 -1200 100 L 50 50 1 1 I
+X GPIO1 27 -500 -800 100 R 50 50 1 1 B
+X GPIO2 28 -500 -900 100 R 50 50 1 1 B
+X GPIO3 29 -500 -1000 100 R 50 50 1 1 B
+X S12 3 500 1100 100 L 50 50 1 1 B
+X V- 30 0 -1400 100 U 50 50 1 1 P N
+X V- 31 0 -1400 100 U 50 50 1 1 P
+X GPIO4 32 -500 -1100 100 R 50 50 1 1 B
+X GPIO5 33 -500 -1200 100 R 50 50 1 1 B
+X VREF2 34 -500 600 100 R 50 50 1 1 O
+X VREF1 35 -500 700 100 R 50 50 1 1 O
+X SWTEN 36 -500 900 100 R 50 50 1 1 I
+X VREG 37 -500 1100 100 R 50 50 1 1 I
+X DRIVE 38 -500 1200 100 R 50 50 1 1 O
+X WDT 39 -500 200 100 R 50 50 1 1 O
+X C11 4 500 1000 100 L 50 50 1 1 I
+X ISOMD 40 -500 1000 100 R 50 50 1 1 I
+X CSB(IMA) 41 -500 -300 100 R 50 50 1 1 B
+X SCK(IPA) 42 -500 -400 100 R 50 50 1 1 B
+X SDI(NC) 43 -500 -500 100 R 50 50 1 1 I
+X SDO(NC) 44 -500 -600 100 R 50 50 1 1 C
+X IBIAS 45 -500 300 100 R 50 50 1 1 P
+X ICMP 46 -500 400 100 R 50 50 1 1 P
+X IMB 47 -500 0 100 R 50 50 1 1 B
+X IPB 48 -500 -100 100 R 50 50 1 1 B
+X S11 5 500 900 100 L 50 50 1 1 B
+X C10 6 500 800 100 L 50 50 1 1 I
+X S10 7 500 700 100 L 50 50 1 1 B
+X C9 8 500 600 100 L 50 50 1 1 I
+X S9 9 500 500 100 L 50 50 1 1 B
+ENDDRAW
+ENDDEF
+#
 # MAX1647
 #
 DEF MAX1647 U 0 40 Y Y 1 F N
@@ -1857,6 +1947,60 @@ X THM 9 600 200 100 L 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
+# MAX17261xxTD
+#
+DEF MAX17261xxTD U 0 20 Y Y 1 F N
+F0 "U" -275 450 50 H V C CNN
+F1 "MAX17261xxTD" 325 450 50 H V C CNN
+F2 "Package_DFN_QFN:TDFN-14-1EP_3x3mm_P0.4mm_EP1.78x2.35mm" 0 -1200 50 H I C CNN
+F3 "" 600 100 50 H I C CNN
+$FPLIST
+ TDFN*1EP*3x3mm*P0.4mm*
+$ENDFPLIST
+DRAW
+S -300 400 300 -400 0 1 10 f
+X TH 1 -400 0 100 R 50 50 1 1 P
+X CELLX 10 -400 200 100 R 50 50 1 1 I
+X REG 11 400 -200 100 L 50 50 1 1 w
+X ALRT 12 400 100 100 L 50 50 1 1 C
+X SDA 13 400 200 100 L 50 50 1 1 B
+X SCL 14 400 300 100 L 50 50 1 1 I
+X GND 15 0 -500 100 U 50 50 1 1 P N
+X NC 2 100 -400 100 U 50 50 1 1 N N
+X SW 3 -400 300 100 R 50 50 1 1 O
+X NC 4 -100 -400 100 U 50 50 1 1 N N
+X NC 5 200 -400 100 U 50 50 1 1 N N
+X BATT 6 0 500 100 D 50 50 1 1 W
+X CSN 7 -400 -200 100 R 50 50 1 1 P
+X GND 8 0 -500 100 U 50 50 1 1 W
+X CSPL 9 -400 -300 100 R 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# MAX17261xxWL
+#
+DEF MAX17261xxWL U 0 20 Y Y 1 F N
+F0 "U" -275 450 50 H V C CNN
+F1 "MAX17261xxWL" 325 450 50 H V C CNN
+F2 "Package_BGA:Maxim_WLP-9_1.595x1.415_Layout3x3_P0.4mm_Ball0.27mm_Pad0.25mm_NSMD" 1100 -800 50 H I C CNN
+F3 "" 0 100 50 H I C CNN
+$FPLIST
+ Maxim*WLP*1.595x1.415*Layout3x3*P0.4mm*
+$ENDFPLIST
+DRAW
+S -300 400 300 -400 0 1 10 f
+X TH A1 -400 0 100 R 50 50 1 1 P
+X SCL A2 400 300 100 L 50 50 1 1 I
+X CSN A3 -400 -200 100 R 50 50 1 1 P
+X BATT B1 0 500 100 D 50 50 1 1 W
+X ALRT B2 400 100 100 L 50 50 1 1 C
+X REG B3 400 -200 100 L 50 50 1 1 w
+X SDA C1 400 200 100 L 50 50 1 1 B
+X CELLX C2 -400 200 100 R 50 50 1 1 I
+X GND/CSPL C3 0 -500 100 U 50 50 1 1 W
+ENDDRAW
+ENDDEF
+#
 # MAX17263xxTE
 #
 DEF MAX17263xxTE U 0 20 Y Y 1 F N
diff --git a/CPU_WDC_6500.dcm b/CPU_WDC_6500.dcm
new file mode 100644
index 0000000000..9bde048229
--- /dev/null
+++ b/CPU_WDC_6500.dcm
@@ -0,0 +1,39 @@
+EESchema-DOCLIB  Version 2.0
+#
+$CMP W65C02SxxPLx-14
+D 8-Bit Microprocessing unit 14.0MHz, PLCC-44
+K PLCC-44, 6502, 65C02, CPU
+F http://westerndesigncenter.com/wdc/documentation/w65c02s.pdf
+$ENDCMP
+#
+$CMP W65C02SxxPQx-14
+D 8-Bit Microprocessing unit 14.0MHz, QFP-44
+K QFP-44, 6502, 65C02, CPU
+F http://westerndesigncenter.com/wdc/documentation/w65c02s.pdf
+$ENDCMP
+#
+$CMP W65C02SxxPx-14
+D 8-Bit Microprocessing unit 14.0MHz, DIP-40
+K DIP-40, 6502, 65C02, CPU
+F http://westerndesigncenter.com/wdc/documentation/w65c02s.pdf
+$ENDCMP
+#
+$CMP W65C816SxxPLx-14
+D 16-Bit Microprocessing unit 14MHz, PLCC-44
+K 65816, 65C816, CPU
+F http://www.westerndesigncenter.com/wdc/documentation/w65c816s.pdf
+$ENDCMP
+#
+$CMP W65C816SxxPQx-14
+D 16-Bit Microprocessing unit 14MHz, QFP-44
+K 65816, 65C816, CPU
+F http://www.westerndesigncenter.com/wdc/documentation/w65c816s.pdf
+$ENDCMP
+#
+$CMP W65C816SxxPx-14
+D 16-Bit Microprocessing unit 14MHz, DIP-40
+K 65816, 65C816, CPU
+F http://www.westerndesigncenter.com/wdc/documentation/w65c816s.pdf
+$ENDCMP
+#
+#End Doc Library
diff --git a/CPU_WDC_6500.lib b/CPU_WDC_6500.lib
new file mode 100644
index 0000000000..1889f6902a
--- /dev/null
+++ b/CPU_WDC_6500.lib
@@ -0,0 +1,350 @@
+EESchema-LIBRARY Version 2.4
+#encoding utf-8
+#
+# W65C02SxxPLx-14
+#
+DEF W65C02SxxPLx-14 U 0 20 Y Y 1 F N
+F0 "U" 400 1300 50 H V C CNN
+F1 "W65C02SxxPLx-14" 400 1200 50 H V C CNN
+F2 "Package_LCC:PLCC-44_THT-Socket" 0 0 50 H I C CNN
+F3 "" -450 300 50 H I C CNN
+$FPLIST
+ PLCC*
+$ENDFPLIST
+DRAW
+S -300 1100 300 -1100 1 1 10 f
+X VSS 1 0 -1200 100 U 50 50 1 1 W
+X A0 10 400 1000 100 L 50 50 1 1 O
+X A1 11 400 900 100 L 50 50 1 1 O
+X NC 12 300 -1200 100 L 50 50 1 1 N NX
+X A2 13 400 800 100 L 50 50 1 1 O
+X A3 14 400 700 100 L 50 50 1 1 O
+X A4 15 400 600 100 L 50 50 1 1 O
+X A5 16 400 500 100 L 50 50 1 1 O
+X A6 17 400 400 100 L 50 50 1 1 O
+X A7 18 400 300 100 L 50 50 1 1 O
+X A8 19 400 200 100 L 50 50 1 1 O
+X ~VP 2 400 -900 100 L 50 50 1 1 O
+X A9 20 400 100 100 L 50 50 1 1 O
+X A10 21 400 0 100 L 50 50 1 1 O
+X A11 22 400 -100 100 L 50 50 1 1 O
+X VSS 23 0 -1200 100 U 50 50 1 1 P N
+X VSS 24 0 -1200 100 U 50 50 1 1 P N
+X A12 25 400 -200 100 L 50 50 1 1 O
+X A13 26 400 -300 100 L 50 50 1 1 O
+X A14 27 400 -400 100 L 50 50 1 1 O
+X A15 28 400 -500 100 L 50 50 1 1 O
+X D7 29 -400 300 100 R 50 50 1 1 B
+X RDY 3 -400 -300 100 R 50 50 1 1 B
+X D6 30 -400 400 100 R 50 50 1 1 B
+X D5 31 -400 500 100 R 50 50 1 1 B
+X D4 32 -400 600 100 R 50 50 1 1 B
+X D3 33 -400 700 100 R 50 50 1 1 B
+X D2 34 -400 800 100 R 50 50 1 1 B
+X D1 35 -400 900 100 R 50 50 1 1 B
+X D0 36 -400 1000 100 R 50 50 1 1 B
+X VDD 37 0 1200 100 D 50 50 1 1 P N
+X R/~W 38 400 -800 100 L 50 50 1 1 O
+X NC 39 300 -1300 100 L 50 50 1 1 N NX
+X PHI1O 4 400 -600 100 L 50 50 1 1 O C
+X BE 40 -400 -100 100 R 50 50 1 1 I
+X PHI2 41 -400 -700 100 R 50 50 1 1 I C
+X ~SO 42 -400 -200 100 R 50 50 1 1 I
+X PHI2O 43 400 -700 100 L 50 50 1 1 O C
+X ~RES 44 -400 -900 100 R 50 50 1 1 I
+X ~IRQ 5 -400 100 100 R 50 50 1 1 I
+X ~ML 6 400 -1000 100 L 50 50 1 1 O
+X ~NMI 7 -400 0 100 R 50 50 1 1 I
+X SYNC 8 -400 -400 100 R 50 50 1 1 O
+X VDD 9 0 1200 100 D 50 50 1 1 W
+ENDDRAW
+ENDDEF
+#
+# W65C02SxxPQx-14
+#
+DEF W65C02SxxPQx-14 U 0 20 Y Y 1 F N
+F0 "U" 400 1300 50 H V C CNN
+F1 "W65C02SxxPQx-14" 400 1200 50 H V C CNN
+F2 "Package_QFP:PQFP-44_10x10mm_P0.8mm" 0 0 50 H I C CNN
+F3 "" -450 300 50 H I C CNN
+$FPLIST
+ *QFP*
+$ENDFPLIST
+DRAW
+S -300 1100 300 -1100 1 1 10 f
+X ~NMI 1 -400 0 100 R 50 50 1 1 I
+X A5 10 400 500 100 L 50 50 1 1 O
+X A6 11 400 400 100 L 50 50 1 1 O
+X A7 12 400 300 100 L 50 50 1 1 O
+X A8 13 400 200 100 L 50 50 1 1 O
+X A9 14 400 100 100 L 50 50 1 1 O
+X A10 15 400 0 100 L 50 50 1 1 O
+X A11 16 400 -100 100 L 50 50 1 1 O
+X VSS 17 0 -1200 100 U 50 50 1 1 P N
+X VSS 18 0 -1200 100 U 50 50 1 1 P N
+X A12 19 400 -200 100 L 50 50 1 1 O
+X SYNC 2 -400 -400 100 R 50 50 1 1 O
+X A13 20 400 -300 100 L 50 50 1 1 O
+X A14 21 400 -400 100 L 50 50 1 1 O
+X A15 22 400 -500 100 L 50 50 1 1 O
+X D7 23 -400 300 100 R 50 50 1 1 B
+X D6 24 -400 400 100 R 50 50 1 1 B
+X D5 25 -400 500 100 R 50 50 1 1 B
+X D4 26 -400 600 100 R 50 50 1 1 B
+X D3 27 -400 700 100 R 50 50 1 1 B
+X D2 28 -400 800 100 R 50 50 1 1 B
+X D1 29 -400 900 100 R 50 50 1 1 B
+X VDD 3 0 1200 100 D 50 50 1 1 W
+X D0 30 -400 1000 100 R 50 50 1 1 B
+X VDD 31 0 1200 100 D 50 50 1 1 P N
+X R/~W 32 400 -800 100 L 50 50 1 1 O
+X NC 33 300 -1300 100 L 50 50 1 1 N NX
+X BE 34 -400 -100 100 R 50 50 1 1 I
+X PHI2 35 -400 -700 100 R 50 50 1 1 I C
+X ~SO 36 -400 -200 100 R 50 50 1 1 I
+X PHI2O 37 400 -700 100 L 50 50 1 1 O C
+X ~RES 38 -400 -900 100 R 50 50 1 1 I
+X VSS 39 0 -1200 100 U 50 50 1 1 W
+X A0 4 400 1000 100 L 50 50 1 1 O
+X ~VP 40 400 -900 100 L 50 50 1 1 O
+X RDY 41 -400 -300 100 R 50 50 1 1 B
+X PHI1O 42 400 -600 100 L 50 50 1 1 O C
+X ~IRQ 43 -400 100 100 R 50 50 1 1 I
+X ~ML 44 400 -1000 100 L 50 50 1 1 O
+X A1 5 400 900 100 L 50 50 1 1 O
+X NC 6 300 -1200 100 L 50 50 1 1 N NX
+X A2 7 400 800 100 L 50 50 1 1 O
+X A3 8 400 700 100 L 50 50 1 1 O
+X A4 9 400 600 100 L 50 50 1 1 O
+ENDDRAW
+ENDDEF
+#
+# W65C02SxxPx-14
+#
+DEF W65C02SxxPx-14 U 0 20 Y Y 1 F N
+F0 "U" 400 1300 50 H V C CNN
+F1 "W65C02SxxPx-14" 400 1200 50 H V C CNN
+F2 "Package_DIP:DIP-40_W15.24mm" 0 0 50 H I C CNN
+F3 "" -1150 400 50 H I C CNN
+$FPLIST
+ DIP*W15.24mm*
+$ENDFPLIST
+DRAW
+S -300 1100 300 -1100 1 1 10 f
+X ~VP 1 400 -900 100 L 50 50 1 1 O
+X A1 10 400 900 100 L 50 50 1 1 O
+X A2 11 400 800 100 L 50 50 1 1 O
+X A3 12 400 700 100 L 50 50 1 1 O
+X A4 13 400 600 100 L 50 50 1 1 O
+X A5 14 400 500 100 L 50 50 1 1 O
+X A6 15 400 400 100 L 50 50 1 1 O
+X A7 16 400 300 100 L 50 50 1 1 O
+X A8 17 400 200 100 L 50 50 1 1 O
+X A9 18 400 100 100 L 50 50 1 1 O
+X A10 19 400 0 100 L 50 50 1 1 O
+X RDY 2 -400 -300 100 R 50 50 1 1 B
+X A11 20 400 -100 100 L 50 50 1 1 O
+X VSS 21 0 -1200 100 U 50 50 1 1 W
+X A12 22 400 -200 100 L 50 50 1 1 O
+X A13 23 400 -300 100 L 50 50 1 1 O
+X A14 24 400 -400 100 L 50 50 1 1 O
+X A15 25 400 -500 100 L 50 50 1 1 O
+X D7 26 -400 300 100 R 50 50 1 1 B
+X D6 27 -400 400 100 R 50 50 1 1 B
+X D5 28 -400 500 100 R 50 50 1 1 B
+X D4 29 -400 600 100 R 50 50 1 1 B
+X PHI1O 3 400 -600 100 L 50 50 1 1 O C
+X D3 30 -400 700 100 R 50 50 1 1 B
+X D2 31 -400 800 100 R 50 50 1 1 B
+X D1 32 -400 900 100 R 50 50 1 1 B
+X D0 33 -400 1000 100 R 50 50 1 1 B
+X R/~W 34 400 -800 100 L 50 50 1 1 O
+X NC 35 300 -1200 100 L 50 50 1 1 N NX
+X BE 36 -400 -100 100 R 50 50 1 1 I
+X PHI2 37 -400 -700 100 R 50 50 1 1 I C
+X ~SO 38 -400 -200 100 R 50 50 1 1 I
+X PHI2O 39 400 -700 100 L 50 50 1 1 O C
+X ~IRQ 4 -400 100 100 R 50 50 1 1 I
+X ~RES 40 -400 -900 100 R 50 50 1 1 I
+X ~ML 5 400 -1000 100 L 50 50 1 1 O
+X ~NMI 6 -400 0 100 R 50 50 1 1 I
+X SYNC 7 -400 -400 100 R 50 50 1 1 O
+X VDD 8 0 1200 100 D 50 50 1 1 W
+X A0 9 400 1000 100 L 50 50 1 1 O
+ENDDRAW
+ENDDEF
+#
+# W65C816SxxPLx-14
+#
+DEF W65C816SxxPLx-14 U 0 20 Y Y 1 F N
+F0 "U" 400 1300 50 H V C CNN
+F1 "W65C816SxxPLx-14" 400 1200 50 H V C CNN
+F2 "Package_LCC:PLCC-44_THT-Socket" 0 -1600 50 H I C CIN
+F3 "" -500 -1250 50 H I C CNN
+$FPLIST
+ PLCC*
+$ENDFPLIST
+DRAW
+S -300 1100 300 -1100 0 1 10 f
+X VSS 1 0 -1200 100 U 50 50 1 1 W
+X A0 10 400 1000 100 L 50 50 1 1 O
+X A1 11 400 900 100 L 50 50 1 1 O
+X NC 12 400 -1200 100 L 50 50 1 1 N NX
+X A2 13 400 800 100 L 50 50 1 1 O
+X A3 14 400 700 100 L 50 50 1 1 O
+X A4 15 400 600 100 L 50 50 1 1 O
+X A5 16 400 500 100 L 50 50 1 1 O
+X A6 17 400 400 100 L 50 50 1 1 O
+X A7 18 400 300 100 L 50 50 1 1 O
+X A8 19 400 200 100 L 50 50 1 1 O
+X ~VP 2 400 -900 100 L 50 50 1 1 O
+X A9 20 400 100 100 L 50 50 1 1 O
+X A10 21 400 0 100 L 50 50 1 1 O
+X A11 22 400 -100 100 L 50 50 1 1 O
+X VSS 23 0 -1200 100 U 50 50 1 1 P N
+X VSS 24 0 -1200 100 U 50 50 1 1 P N
+X A12 25 400 -200 100 L 50 50 1 1 O
+X A13 26 400 -300 100 L 50 50 1 1 O
+X A14 27 400 -400 100 L 50 50 1 1 O
+X A15 28 400 -500 100 L 50 50 1 1 O
+X D7 29 -400 300 100 R 50 50 1 1 B
+X RDY 3 -400 -300 100 R 50 50 1 1 B
+X D6 30 -400 400 100 R 50 50 1 1 B
+X D5 31 -400 500 100 R 50 50 1 1 B
+X D4 32 -400 600 100 R 50 50 1 1 B
+X D3 33 -400 700 100 R 50 50 1 1 B
+X D2 34 -400 800 100 R 50 50 1 1 B
+X D1 35 -400 900 100 R 50 50 1 1 B
+X D0 36 -400 1000 100 R 50 50 1 1 B
+X VDD 37 0 1200 100 D 50 50 1 1 P N
+X R/~W 38 400 -800 100 L 50 50 1 1 O
+X E 39 400 -700 100 L 50 50 1 1 O
+X ~ABORT 4 -400 -200 100 R 50 50 1 1 I
+X BE 40 -400 -100 100 R 50 50 1 1 I
+X PHI2 41 -400 -700 100 R 50 50 1 1 I C
+X MX 42 -400 -400 100 R 50 50 1 1 O
+X VDA 43 -400 -600 100 R 50 50 1 1 O
+X ~RESET 44 -400 -900 100 R 50 50 1 1 I
+X ~IRQ 5 -400 100 100 R 50 50 1 1 I
+X ~ML 6 400 -1000 100 L 50 50 1 1 O
+X ~NMI 7 -400 0 100 R 50 50 1 1 I
+X VPA 8 -400 -500 100 R 50 50 1 1 O
+X VDD 9 0 1200 100 D 50 50 1 1 W
+ENDDRAW
+ENDDEF
+#
+# W65C816SxxPQx-14
+#
+DEF W65C816SxxPQx-14 U 0 20 Y Y 1 F N
+F0 "U" 400 1300 50 H V C CNN
+F1 "W65C816SxxPQx-14" 400 1200 50 H V C CNN
+F2 "Package_QFP:LQFP-44_10x10mm_P0.8mm" 0 -1600 50 H I C CIN
+F3 "" -500 -1250 50 H I C CNN
+$FPLIST
+ *QFP*
+$ENDFPLIST
+DRAW
+S -300 1100 300 -1100 0 1 10 f
+X ~NMI 1 -400 0 100 R 50 50 1 1 I
+X A5 10 400 500 100 L 50 50 1 1 O
+X A6 11 400 400 100 L 50 50 1 1 O
+X A7 12 400 300 100 L 50 50 1 1 O
+X A8 13 400 200 100 L 50 50 1 1 O
+X A9 14 400 100 100 L 50 50 1 1 O
+X A10 15 400 0 100 L 50 50 1 1 O
+X A11 16 400 -100 100 L 50 50 1 1 O
+X VSS 17 0 -1200 100 U 50 50 1 1 P N
+X VSS 18 0 -1200 100 U 50 50 1 1 P N
+X A12 19 400 -200 100 L 50 50 1 1 O
+X VPA 2 -400 -500 100 R 50 50 1 1 O
+X A13 20 400 -300 100 L 50 50 1 1 O
+X A14 21 400 -400 100 L 50 50 1 1 O
+X A15 22 400 -500 100 L 50 50 1 1 O
+X D7 23 -400 300 100 R 50 50 1 1 B
+X D6 24 -400 400 100 R 50 50 1 1 B
+X D5 25 -400 500 100 R 50 50 1 1 B
+X D4 26 -400 600 100 R 50 50 1 1 B
+X D3 27 -400 700 100 R 50 50 1 1 B
+X D2 28 -400 800 100 R 50 50 1 1 B
+X D1 29 -400 900 100 R 50 50 1 1 B
+X VDD 3 0 1200 100 D 50 50 1 1 W
+X D0 30 -400 1000 100 R 50 50 1 1 B
+X VDD 31 0 1200 100 D 50 50 1 1 P N
+X R/~W 32 400 -800 100 L 50 50 1 1 O
+X E 33 400 -700 100 L 50 50 1 1 O
+X BE 34 -400 -100 100 R 50 50 1 1 I
+X PHI2 35 -400 -700 100 R 50 50 1 1 I C
+X MX 36 -400 -400 100 R 50 50 1 1 O
+X VDA 37 -400 -600 100 R 50 50 1 1 O
+X ~RESET 38 -400 -900 100 R 50 50 1 1 I
+X VSS 39 0 -1200 100 U 50 50 1 1 W
+X A0 4 400 1000 100 L 50 50 1 1 O
+X ~VP 40 400 -900 100 L 50 50 1 1 O
+X RDY 41 -400 -300 100 R 50 50 1 1 B
+X ~ABORT 42 -400 -200 100 R 50 50 1 1 I
+X ~IRQ 43 -400 100 100 R 50 50 1 1 I
+X ~ML 44 400 -1000 100 L 50 50 1 1 O
+X A1 5 400 900 100 L 50 50 1 1 O
+X NC 6 400 -1200 100 L 50 50 1 1 N NX
+X A2 7 400 800 100 L 50 50 1 1 O
+X A3 8 400 700 100 L 50 50 1 1 O
+X A4 9 400 600 100 L 50 50 1 1 O
+ENDDRAW
+ENDDEF
+#
+# W65C816SxxPx-14
+#
+DEF W65C816SxxPx-14 U 0 20 Y Y 1 F N
+F0 "U" 400 1300 50 H V C CNN
+F1 "W65C816SxxPx-14" 400 1200 50 H V C CNN
+F2 "Package_DIP:DIP-40_W15.24mm" 0 -1600 50 H I C CIN
+F3 "" -250 200 50 H I C CNN
+$FPLIST
+ DIP*W15.24mm*
+$ENDFPLIST
+DRAW
+S -300 1100 300 -1100 1 1 10 f
+X ~VP 1 400 -900 100 L 50 50 1 1 O
+X A1 10 400 900 100 L 50 50 1 1 O
+X A2 11 400 800 100 L 50 50 1 1 O
+X A3 12 400 700 100 L 50 50 1 1 O
+X A4 13 400 600 100 L 50 50 1 1 O
+X A5 14 400 500 100 L 50 50 1 1 O
+X A6 15 400 400 100 L 50 50 1 1 O
+X A7 16 400 300 100 L 50 50 1 1 O
+X A8 17 400 200 100 L 50 50 1 1 O
+X A9 18 400 100 100 L 50 50 1 1 O
+X A10 19 400 0 100 L 50 50 1 1 O
+X RDY 2 -400 -300 100 R 50 50 1 1 B
+X A11 20 400 -100 100 L 50 50 1 1 O
+X VSS 21 0 -1200 100 U 50 50 1 1 W
+X A12 22 400 -200 100 L 50 50 1 1 O
+X A13 23 400 -300 100 L 50 50 1 1 O
+X A14 24 400 -400 100 L 50 50 1 1 O
+X A15 25 400 -500 100 L 50 50 1 1 O
+X D7 26 -400 300 100 R 50 50 1 1 B
+X D6 27 -400 400 100 R 50 50 1 1 B
+X D5 28 -400 500 100 R 50 50 1 1 B
+X D4 29 -400 600 100 R 50 50 1 1 B
+X ~ABORT 3 -400 -200 100 R 50 50 1 1 I
+X D3 30 -400 700 100 R 50 50 1 1 B
+X D2 31 -400 800 100 R 50 50 1 1 B
+X D1 32 -400 900 100 R 50 50 1 1 B
+X D0 33 -400 1000 100 R 50 50 1 1 B
+X R/~W 34 400 -800 100 L 50 50 1 1 O
+X E 35 400 -700 100 L 50 50 1 1 O
+X BE 36 -400 -100 100 R 50 50 1 1 I
+X PHI2 37 -400 -700 100 R 50 50 1 1 I C
+X MX 38 -400 -400 100 R 50 50 1 1 O
+X VDA 39 -400 -600 100 R 50 50 1 1 O
+X ~IRQ 4 -400 100 100 R 50 50 1 1 I
+X ~RESET 40 -400 -900 100 R 50 50 1 1 I
+X ~ML 5 400 -1000 100 L 50 50 1 1 O
+X ~NMI 6 -400 0 100 R 50 50 1 1 I
+X VPA 7 -400 -500 100 R 50 50 1 1 O
+X VDD 8 0 1200 100 D 50 50 1 1 W
+X A0 9 400 1000 100 L 50 50 1 1 O
+ENDDRAW
+ENDDEF
+#
+#End Library
diff --git a/Comparator.dcm b/Comparator.dcm
index c70fd36265..13703049a7 100644
--- a/Comparator.dcm
+++ b/Comparator.dcm
@@ -72,6 +72,12 @@ K cmp push-pull complementary
 F http://www.ti.com/lit/ds/symlink/lmh7324.pdf
 $ENDCMP
 #
+$CMP LM397
+D Single General-Purpose Voltage Comparator with Open-Collector Output, SOT-23-5
+K single comparator
+F http://www.ti.com/lit/ds/symlink/lm397.pdf
+$ENDCMP
+#
 $CMP LMV331
 D Single General-Purpose Low-Voltage Comparator, SOT-23-5/SC-70-5
 K single comparator
@@ -186,6 +192,24 @@ K cmp r2r rtr push-pull complementary
 F https://www.analog.com/media/en/technical-documentation/data-sheets/6754f.pdf
 $ENDCMP
 #
+$CMP MAX941xPA
+D High-Speed, Low-Power, 3V/5V, Rail-to-Rail, Single-Supply Comparator, PDIP-8
+K single comparator
+F https://datasheets.maximintegrated.com/en/ds/MAX941-MAX944.pdf
+$ENDCMP
+#
+$CMP MAX941xSA
+D High-Speed, Low-Power, 3V/5V, Rail-to-Rail, Single-Supply Comparator, SOIC-8
+K single comparator
+F https://datasheets.maximintegrated.com/en/ds/MAX941-MAX944.pdf
+$ENDCMP
+#
+$CMP MAX941xUA
+D High-Speed, Low-Power, 3V/5V, Rail-to-Rail, Single-Supply Comparator, MSOP-8
+K single comparator
+F https://datasheets.maximintegrated.com/en/ds/MAX941-MAX944.pdf
+$ENDCMP
+#
 $CMP MCP6561-OT
 D Single 1.8V Low-Power Push-Pull Output Comparator, SOT-23-5
 K cmp
@@ -282,6 +306,12 @@ K cmp push-pull complementary
 F http://www.ti.com/lit/ds/symlink/tl3116.pdf
 $ENDCMP
 #
+$CMP TL331
+D Single Differential Comparator with Open-Collector Output, SOT-23-5
+K single comparator
+F http://www.ti.com/lit/ds/symlink/tl331.pdf
+$ENDCMP
+#
 $CMP TLV7031DBV
 D Single, 1.6V-6.5V, 315nA Quiescent, Push-Pull Output, Comparator, SOT-23-5/SC-70
 K cmp
diff --git a/Comparator.lib b/Comparator.lib
index 778820aaf6..da13ebec84 100644
--- a/Comparator.lib
+++ b/Comparator.lib
@@ -273,6 +273,27 @@ X V+ 3 -100 300 150 D 50 50 5 1 W
 ENDDRAW
 ENDDEF
 #
+# LM397
+#
+DEF LM397 U 0 5 Y Y 1 F N
+F0 "U" 50 200 50 H V C CNN
+F1 "LM397" 150 -200 50 H V C CNN
+F2 "Package_TO_SOT_SMD:SOT-23-5" 50 -600 50 H I C CNN
+F3 "" 0 200 50 H I C CNN
+ALIAS TL331
+$FPLIST
+ SOT?23*
+$ENDFPLIST
+DRAW
+P 4 0 1 10 -200 200 200 0 -200 -200 -200 200 f
+X - 1 -300 -100 100 R 50 50 1 1 I
+X V- 2 -100 -300 150 U 50 50 1 1 W
+X + 3 -300 100 100 R 50 50 1 1 I
+X ~ 4 300 0 100 L 50 50 1 1 C
+X V+ 5 -100 300 150 D 50 50 1 1 W
+ENDDRAW
+ENDDEF
+#
 # LMH7324
 #
 DEF LMH7324 U 0 5 Y Y 5 L N
@@ -633,6 +654,75 @@ X VEE 9 -100 -300 150 U 50 40 1 1 P N
 ENDDRAW
 ENDDEF
 #
+# MAX941xPA
+#
+DEF MAX941xPA U 0 5 Y Y 1 F N
+F0 "U" 150 250 50 H V L CNN
+F1 "MAX941xPA" 150 150 50 H V L CNN
+F2 "Package_DIP:DIP-8_W7.62mm" 100 0 50 H I C CNN
+F3 "" 100 0 50 H I C CNN
+$FPLIST
+ DIP*W7.62mm*
+$ENDFPLIST
+DRAW
+P 4 0 1 10 -200 200 -200 -200 200 0 -200 200 f
+X V+ 1 -100 300 150 D 50 50 1 1 W
+X + 2 -300 100 100 R 50 50 1 1 I
+X - 3 -300 -100 100 R 50 50 1 1 I
+X ~SHDN 4 100 300 250 D 50 20 1 1 I
+X ~LATCH 5 0 300 200 D 50 20 1 1 I
+X V- 6 -100 -300 150 U 50 50 1 1 W
+X ~ 7 300 0 100 L 50 50 1 1 O
+X NC 8 0 -100 100 U 50 20 1 1 N N
+ENDDRAW
+ENDDEF
+#
+# MAX941xSA
+#
+DEF MAX941xSA U 0 5 Y Y 1 F N
+F0 "U" 150 250 50 H V L CNN
+F1 "MAX941xSA" 150 150 50 H V L CNN
+F2 "Package_SO:SOIC-8_3.9x4.9mm_P1.27mm" 100 0 50 H I C CNN
+F3 "" 100 0 50 H I C CNN
+$FPLIST
+ SOIC*3.9x4.9mm*P1.27mm*
+$ENDFPLIST
+DRAW
+P 4 0 1 10 -200 200 -200 -200 200 0 -200 200 f
+X V+ 1 -100 300 150 D 50 50 1 1 W
+X + 2 -300 100 100 R 50 50 1 1 I
+X - 3 -300 -100 100 R 50 50 1 1 I
+X ~SHDN 4 100 300 250 D 50 20 1 1 I
+X ~LATCH 5 0 300 200 D 50 20 1 1 I
+X V- 6 -100 -300 150 U 50 50 1 1 W
+X ~ 7 300 0 100 L 50 50 1 1 O
+X NC 8 0 -100 100 U 50 20 1 1 N N
+ENDDRAW
+ENDDEF
+#
+# MAX941xUA
+#
+DEF MAX941xUA U 0 5 Y Y 1 F N
+F0 "U" 150 250 50 H V L CNN
+F1 "MAX941xUA" 150 150 50 H V L CNN
+F2 "Package_SO:MSOP-8_3x3mm_P0.65mm" 100 0 50 H I C CNN
+F3 "" 100 0 50 H I C CNN
+$FPLIST
+ MSOP*3x3mm*P0.65mm*
+$ENDFPLIST
+DRAW
+P 4 0 1 10 -200 200 -200 -200 200 0 -200 200 f
+X V+ 1 -100 300 150 D 50 50 1 1 W
+X + 2 -300 100 100 R 50 50 1 1 I
+X - 3 -300 -100 100 R 50 50 1 1 I
+X ~SHDN 4 100 300 250 D 50 20 1 1 I
+X ~LATCH 5 0 300 200 D 50 20 1 1 I
+X V- 6 -100 -300 150 U 50 50 1 1 W
+X ~ 7 300 0 100 L 50 50 1 1 O
+X NC 8 0 -100 100 U 50 20 1 1 N N
+ENDDRAW
+ENDDEF
+#
 # MCP6561-OT
 #
 DEF MCP6561-OT U 0 5 Y Y 1 F N
diff --git a/Connector.dcm b/Connector.dcm
index 7d7170ddbf..17fdb1359d 100644
--- a/Connector.dcm
+++ b/Connector.dcm
@@ -342,6 +342,30 @@ K ISA
 F https://en.wikipedia.org/wiki/Industry_Standard_Architecture
 $ENDCMP
 #
+$CMP Bus_M.2_Socket_A
+D M.2 Socket 1-DP Mechanical Key A
+K M2 NGNF PCI-E
+F http://read.pudn.com/downloads794/doc/project/3133918/PCIe_M.2_Electromechanical_Spec_Rev1.0_Final_11012013_RS_Clean.pdf#page=148
+$ENDCMP
+#
+$CMP Bus_M.2_Socket_B
+D M.2 Socket 2 Mechanical Key B
+K M2 NGNF PCI-E
+F http://read.pudn.com/downloads794/doc/project/3133918/PCIe_M.2_Electromechanical_Spec_Rev1.0_Final_11012013_RS_Clean.pdf#page=154
+$ENDCMP
+#
+$CMP Bus_M.2_Socket_E
+D M.2 Socket 1-SD Mechanical Key E
+K M2 NGNF PCI-E
+F http://read.pudn.com/downloads794/doc/project/3133918/PCIe_M.2_Electromechanical_Spec_Rev1.0_Final_11012013_RS_Clean.pdf#page=150
+$ENDCMP
+#
+$CMP Bus_M.2_Socket_M
+D M.2 Socket 3 Mechanical Key M
+K M2 NGNF PCI-E
+F http://read.pudn.com/downloads794/doc/project/3133918/PCIe_M.2_Electromechanical_Spec_Rev1.0_Final_11012013_RS_Clean.pdf#page=155
+$ENDCMP
+#
 $CMP Bus_PCI_32bit_5V
 D PCI bus connector for 5V cards
 K PCI 5V
@@ -360,22 +384,28 @@ K mini pcie
 F ~
 $ENDCMP
 #
-$CMP C64AB
-D Connector Europe 64 contacts ranges A,B
-K connector DIN
-F  ~
+$CMP Bus_PCI_Express_x1
+D PCI Express bus connector x1
+K pcie
+F http://www.ritrontek.com/uploadfile/2016/1026/20161026105231124.pdf#page=63
 $ENDCMP
 #
-$CMP C64AC
-D Connector Europe 64 contacts, ranges A,B,C
-K connector DIN
-F  ~
+$CMP Bus_PCI_Express_x16
+D PCI Express bus connector x16
+K pcie
+F http://www.ritrontek.com/uploadfile/2016/1026/20161026105231124.pdf#page=63
 $ENDCMP
 #
-$CMP C96ABC
-D Connector Europe, 96 contacts, ranges A,B,C
-K connector
-F  ~
+$CMP Bus_PCI_Express_x4
+D PCI Express bus connector x4
+K pcie
+F http://www.ritrontek.com/uploadfile/2016/1026/20161026105231124.pdf#page=63
+$ENDCMP
+#
+$CMP Bus_PCI_Express_x8
+D PCI Express bus connector x8
+K pcie
+F http://www.ritrontek.com/uploadfile/2016/1026/20161026105231124.pdf#page=63
 $ENDCMP
 #
 $CMP CUI_PD-30
@@ -1116,6 +1146,156 @@ K circular DIN connector
 F http://www.mouser.com/ds/2/18/40_c091_abd_e-75918.pdf
 $ENDCMP
 #
+$CMP DIN41612_01x32_A
+D DIN41612 connector, single row (A), 01x32, script generated (kicad-library-utils/schlib/autogen/connector/)
+K connector
+F ~
+$ENDCMP
+#
+$CMP DIN41612_02x05_AB_EvenPins
+D DIN41612 connector, double row (AB) even pins only, 02x05, script generated (kicad-library-utils/schlib/autogen/connector/)
+K connector
+F ~
+$ENDCMP
+#
+$CMP DIN41612_02x05_AC_EvenPins
+D DIN41612 connector, double row (AC) even pins only, 02x05, script generated (kicad-library-utils/schlib/autogen/connector/)
+K connector
+F ~
+$ENDCMP
+#
+$CMP DIN41612_02x05_AE_EvenPins
+D DIN41612 connector, double row (AE) even pins only, 02x05, script generated (kicad-library-utils/schlib/autogen/connector/)
+K connector
+F ~
+$ENDCMP
+#
+$CMP DIN41612_02x05_ZB_EvenPins
+D DIN41612 connector, double row (ZB) even pins only, 02x05, script generated (kicad-library-utils/schlib/autogen/connector/)
+K connector
+F ~
+$ENDCMP
+#
+$CMP DIN41612_02x08_AB_EvenPins
+D DIN41612 connector, double row (AB) even pins only, 02x08, script generated (kicad-library-utils/schlib/autogen/connector/)
+K connector
+F ~
+$ENDCMP
+#
+$CMP DIN41612_02x08_AC_EvenPins
+D DIN41612 connector, double row (AC) even pins only, 02x08, script generated (kicad-library-utils/schlib/autogen/connector/)
+K connector
+F ~
+$ENDCMP
+#
+$CMP DIN41612_02x08_AE_EvenPins
+D DIN41612 connector, double row (AE) even pins only, 02x08, script generated (kicad-library-utils/schlib/autogen/connector/)
+K connector
+F ~
+$ENDCMP
+#
+$CMP DIN41612_02x08_ZB_EvenPins
+D DIN41612 connector, double row (ZB) even pins only, 02x08, script generated (kicad-library-utils/schlib/autogen/connector/)
+K connector
+F ~
+$ENDCMP
+#
+$CMP DIN41612_02x10_AB
+D DIN41612 connector, double row (AB), 02x10, script generated (kicad-library-utils/schlib/autogen/connector/)
+K connector
+F ~
+$ENDCMP
+#
+$CMP DIN41612_02x10_AC
+D DIN41612 connector, double row (AC), 02x10, script generated (kicad-library-utils/schlib/autogen/connector/)
+K connector
+F ~
+$ENDCMP
+#
+$CMP DIN41612_02x10_AE
+D DIN41612 connector, double row (AE), 02x10, script generated (kicad-library-utils/schlib/autogen/connector/)
+K connector
+F ~
+$ENDCMP
+#
+$CMP DIN41612_02x10_ZB
+D DIN41612 connector, double row (ZB), 02x10, script generated (kicad-library-utils/schlib/autogen/connector/)
+K connector
+F ~
+$ENDCMP
+#
+$CMP DIN41612_02x16_AB
+D DIN41612 connector, double row (AB), 02x16, script generated (kicad-library-utils/schlib/autogen/connector/)
+K connector
+F ~
+$ENDCMP
+#
+$CMP DIN41612_02x16_AB_EvenPins
+D DIN41612 connector, double row (AB) even pins only, 02x16, script generated (kicad-library-utils/schlib/autogen/connector/)
+K connector
+F ~
+$ENDCMP
+#
+$CMP DIN41612_02x16_AC
+D DIN41612 connector, double row (AC), 02x16, script generated (kicad-library-utils/schlib/autogen/connector/)
+K connector
+F ~
+$ENDCMP
+#
+$CMP DIN41612_02x16_AC_EvenPins
+D DIN41612 connector, double row (AC) even pins only, 02x16, script generated (kicad-library-utils/schlib/autogen/connector/)
+K connector
+F ~
+$ENDCMP
+#
+$CMP DIN41612_02x16_AE
+D DIN41612 connector, double row (AE), 02x16, script generated (kicad-library-utils/schlib/autogen/connector/)
+K connector
+F ~
+$ENDCMP
+#
+$CMP DIN41612_02x16_AE_EvenPins
+D DIN41612 connector, double row (AE) even pins only, 02x16, script generated (kicad-library-utils/schlib/autogen/connector/)
+K connector
+F ~
+$ENDCMP
+#
+$CMP DIN41612_02x16_ZB
+D DIN41612 connector, double row (ZB), 02x16, script generated (kicad-library-utils/schlib/autogen/connector/)
+K connector
+F ~
+$ENDCMP
+#
+$CMP DIN41612_02x16_ZB_EvenPins
+D DIN41612 connector, double row (ZB) even pins only, 02x16, script generated (kicad-library-utils/schlib/autogen/connector/)
+K connector
+F ~
+$ENDCMP
+#
+$CMP DIN41612_02x32_AB
+D DIN41612 connector, double row (AB), 02x32, script generated (kicad-library-utils/schlib/autogen/connector/)
+K connector
+F ~
+$ENDCMP
+#
+$CMP DIN41612_02x32_AC
+D DIN41612 connector, double row (AC), 02x32, script generated (kicad-library-utils/schlib/autogen/connector/)
+K connector
+F ~
+$ENDCMP
+#
+$CMP DIN41612_02x32_AE
+D DIN41612 connector, double row (AE), 02x32, script generated (kicad-library-utils/schlib/autogen/connector/)
+K connector
+F ~
+$ENDCMP
+#
+$CMP DIN41612_02x32_ZB
+D DIN41612 connector, double row (ZB), 02x32, script generated (kicad-library-utils/schlib/autogen/connector/)
+K connector
+F ~
+$ENDCMP
+#
 $CMP ExpressCard
 D ExpressCard connector
 K expresscard pci express
@@ -1596,6 +1776,12 @@ K SODIMM SO-DIMM DDR1 DDR2
 F ~
 $ENDCMP
 #
+$CMP Samtec_ASP-134486-01
+D Connector array, 10x40, 1.27mm pitch, female pins, gold finish, VITA 57.1 FMC, SMD
+K FPGA Mezzanine Card FMC Terminal Connector Header
+F http://suddendocs.samtec.com/prints/asp-134486-01-mkt.pdf
+$ENDCMP
+#
 $CMP Samtec_ASP-134602-01
 D Connector array, 10x40, 1.27mm pitch, male pins, gold finish, VITA 57.1 FMC, SMD
 K FPGA Mezzanine Card FMC Terminal Connector Header
@@ -1860,6 +2046,12 @@ K connector USB
 F  ~
 $ENDCMP
 #
+$CMP Wuerth_74980111211
+D LAN Transformer Jack, RJ45, 10/100 BaseT
+K lan jack transformer smt
+F https://www.we-online.de/katalog/datasheet/74980111211.pdf
+$ENDCMP
+#
 $CMP Wuerth_7499010121A
 D LAN Transformer Jack, RJ45, 10/100 BaseT
 K lan jack transformer
diff --git a/Connector.lib b/Connector.lib
index 60a88786b5..943bd23bbe 100644
--- a/Connector.lib
+++ b/Connector.lib
@@ -1876,6 +1876,334 @@ X +12V 9 -700 700 100 R 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
+# Bus_M.2_Socket_A
+#
+DEF Bus_M.2_Socket_A J 0 20 Y Y 1 F N
+F0 "J" -900 1850 50 H V L CNN
+F1 "Bus_M.2_Socket_A" 650 1850 50 H V C CNN
+F2 "" 0 1050 50 H I C CNN
+F3 "" 0 1050 50 H I C CNN
+$FPLIST
+ *M*2*A*
+$ENDFPLIST
+DRAW
+S -900 1800 900 -1800 0 1 10 f
+X GND 1 0 -1900 100 U 50 50 1 1 W
+X ~LED_2 16 1000 -900 100 L 50 50 1 1 C
+X MLDIR_Sense 17 -1000 -600 100 R 50 50 1 1 I
+X GND 18 0 -1900 100 U 50 50 1 1 P N
+X DP_ML3n 19 1000 -400 100 L 50 50 1 1 B
+X 3.3V 2 0 1900 100 D 50 50 1 1 W
+X DP_AUXn 20 1000 400 100 L 50 50 1 1 B
+X DP_ML3p 21 1000 -500 100 L 50 50 1 1 B
+X DP_AUXp 22 1000 300 100 L 50 50 1 1 B
+X GND 23 0 -1900 100 U 50 50 1 1 P N
+X GND 24 0 -1900 100 U 50 50 1 1 P N
+X DP_ML2n 25 1000 -200 100 L 50 50 1 1 B
+X DP_ML1n 26 1000 0 100 L 50 50 1 1 B
+X DP_ML2p 27 1000 -300 100 L 50 50 1 1 B
+X DP_ML1p 28 1000 -100 100 L 50 50 1 1 B
+X GND 29 0 -1900 100 U 50 50 1 1 P N
+X USB_D+ 3 -1000 400 100 R 50 50 1 1 B
+X GND 30 0 -1900 100 U 50 50 1 1 P N
+X DP_HPD 31 1000 -600 100 L 50 50 1 1 B
+X DP_ML0n 32 1000 200 100 L 50 50 1 1 B
+X GND 33 0 -1900 100 U 50 50 1 1 P N
+X DP_ML0p 34 1000 100 100 L 50 50 1 1 B
+X PETp0 35 -1000 1300 100 R 50 50 1 1 O
+X GND 36 0 -1900 100 U 50 50 1 1 P N
+X PETn0 37 -1000 1200 100 R 50 50 1 1 O
+X VENDOR_DEFINED 38 1000 1500 100 L 50 50 1 1 P
+X GND 39 0 -1900 100 U 50 50 1 1 P N
+X 3.3V 4 0 1900 100 D 50 50 1 1 P N
+X VENDOR_DEFINED 40 1000 1400 100 L 50 50 1 1 P
+X PERp0 41 -1000 1100 100 R 50 50 1 1 I
+X VENDOR_DEFINED 42 1000 1300 100 L 50 50 1 1 P
+X PERn0 43 -1000 1000 100 R 50 50 1 1 I
+X COEX3 44 1000 -1500 100 L 50 50 1 1 B
+X GND 45 0 -1900 100 U 50 50 1 1 P N
+X COEX2 46 1000 -1400 100 L 50 50 1 1 B
+X REFCLKp0 47 -1000 -1400 100 R 50 50 1 1 O
+X COEX1 48 1000 -1300 100 L 50 50 1 1 B
+X REFCLKn0 49 -1000 -1500 100 R 50 50 1 1 O
+X USB_D- 5 -1000 300 100 R 50 50 1 1 B
+X SUSCLK 50 1000 -1100 100 L 50 50 1 1 O
+X GND 51 0 -1900 100 U 50 50 1 1 P N
+X ~PERST0 52 -1000 1700 100 R 50 50 1 1 O
+X ~CLKREQ0 53 -1000 1600 100 R 50 50 1 1 B
+X ~W_DISABLE2 54 1000 600 100 L 50 50 1 1 O
+X ~PEWAKE0 55 -1000 1500 100 R 50 50 1 1 B
+X ~W_DISABLE1 56 1000 700 100 L 50 50 1 1 O
+X GND 57 0 -1900 100 U 50 50 1 1 P N
+X I2C_DATA 58 1000 1100 100 L 50 50 1 1 B
+X PETp1 59 -1000 900 100 R 50 50 1 1 O
+X ~LED_1 6 1000 -800 100 L 50 50 1 1 C
+X I2C_CLK 60 1000 1000 100 L 50 50 1 1 O
+X PETn1 61 -1000 800 100 R 50 50 1 1 O
+X ~ALERT 62 1000 900 100 L 50 50 1 1 I
+X GND 63 0 -1900 100 U 50 50 1 1 P N
+X RESERVED 64 1000 1700 100 L 50 50 1 1 P
+X PERp1 65 -1000 700 100 R 50 50 1 1 I
+X ~PERST1 66 -1000 -100 100 R 50 50 1 1 O
+X PERn1 67 -1000 600 100 R 50 50 1 1 I
+X ~CLKREQ1 68 -1000 -200 100 R 50 50 1 1 B
+X GND 69 0 -1900 100 U 50 50 1 1 P N
+X GND 7 0 -1900 100 U 50 50 1 1 P N
+X ~PEWAKE1 70 -1000 -300 100 R 50 50 1 1 B
+X REFCLKp1 71 -1000 -1600 100 R 50 50 1 1 O
+X 3.3V 72 0 1900 100 D 50 50 1 1 P N
+X REFCLKn1 73 -1000 -1700 100 R 50 50 1 1 O
+X 3.3V 74 0 1900 100 D 50 50 1 1 P N
+X GND 75 0 -1900 100 U 50 50 1 1 P N
+ENDDRAW
+ENDDEF
+#
+# Bus_M.2_Socket_B
+#
+DEF Bus_M.2_Socket_B J 0 20 Y Y 1 F N
+F0 "J" -900 1850 50 H V L CNN
+F1 "Bus_M.2_Socket_B" 650 1850 50 H V C CNN
+F2 "" 0 1050 50 H I C CNN
+F3 "" 0 1050 50 H I C CNN
+$FPLIST
+ *M*2*B*
+$ENDFPLIST
+DRAW
+S -900 1800 900 -1800 0 1 10 f
+X CONFIG_3 1 1000 1400 100 L 50 50 1 1 I
+X GPIO_9/DAS/~DSS~/~LED1 10 1000 -400 100 L 50 50 1 1 B
+X GND 11 0 -1900 100 U 50 50 1 1 P N
+X 3.3V 2 0 1900 100 D 50 50 1 1 W
+X GPIO_5 20 1000 0 100 L 50 50 1 1 B
+X CONFIG_0 21 1000 1700 100 L 50 50 1 1 I
+X GPIO_6 22 1000 -100 100 L 50 50 1 1 B
+X GPIO_11 23 1000 -600 100 L 50 50 1 1 B
+X GPIO_7 24 1000 -200 100 L 50 50 1 1 B
+X DPR 25 1000 -800 100 L 50 50 1 1 O
+X GPIO_10 26 1000 -500 100 L 50 50 1 1 B
+X GND 27 0 -1900 100 U 50 50 1 1 P N
+X GPIO_8 28 1000 -300 100 L 50 50 1 1 B
+X PERn1/USB3.0-Rx-/SSIC-RxN 29 -1000 600 100 R 50 50 1 1 I
+X GND 3 0 -1900 100 U 50 50 1 1 W
+X UIM-RESET 30 -1000 -700 100 R 50 50 1 1 I
+X PERp1/USB3.0-Rx+/SSIC-RxP 31 -1000 700 100 R 50 50 1 1 I
+X UIM-CLK 32 -1000 -600 100 R 50 50 1 1 I
+X GND 33 0 -1900 100 U 50 50 1 1 P N
+X UIM-DATA 34 -1000 -500 100 R 50 50 1 1 B
+X PETn1/USB3.0-Tx-/SSIC-TxN 35 -1000 800 100 R 50 50 1 1 O
+X UIM-PWR 36 -1000 -400 100 R 50 50 1 1 I
+X PETp1/USB3.0-Tx+/SSIC-TxP 37 -1000 900 100 R 50 50 1 1 O
+X DEVSLP 38 -1000 -900 100 R 50 50 1 1 O
+X GND 39 0 -1900 100 U 50 50 1 1 P N
+X 3.3V 4 0 1900 100 D 50 50 1 1 P N
+X GPIO_0 40 1000 500 100 L 50 50 1 1 B
+X PERn0/SATA-B+ 41 -1000 1000 100 R 50 50 1 1 I
+X GPIO_1 42 1000 400 100 L 50 50 1 1 B
+X PERp0/SATA-B- 43 -1000 1100 100 R 50 50 1 1 I
+X GPIO_2 44 1000 300 100 L 50 50 1 1 B
+X GND 45 0 -1900 100 U 50 50 1 1 P N
+X GPIO_3 46 1000 200 100 L 50 50 1 1 B
+X PETn0/SATA-A- 47 -1000 1200 100 R 50 50 1 1 O
+X GPIO_4 48 1000 100 100 L 50 50 1 1 B
+X PETp0/SATA-A+ 49 -1000 1300 100 R 50 50 1 1 O
+X GND 5 0 -1900 100 U 50 50 1 1 P N
+X ~PERST 50 -1000 1700 100 R 50 50 1 1 O
+X GND 51 0 -1900 100 U 50 50 1 1 P N
+X ~CLKREQ 52 -1000 1600 100 R 50 50 1 1 B
+X REFCLKn 53 -1000 -1500 100 R 50 50 1 1 O
+X ~PEWAKE 54 -1000 1500 100 R 50 50 1 1 B
+X REFCLKp 55 -1000 -1400 100 R 50 50 1 1 O
+X NC 56 900 -1700 100 L 50 50 1 1 N N
+X GND 57 0 -1900 100 U 50 50 1 1 P N
+X NC 58 900 -1600 100 L 50 50 1 1 N N
+X ANTCTL0 59 1000 1200 100 L 50 50 1 1 I
+X ~FULL_CARD_POWER_OFF 6 -1000 -1100 100 R 50 50 1 1 O
+X COEX3 60 1000 -1500 100 L 50 50 1 1 B
+X ANTCTL1 61 1000 1100 100 L 50 50 1 1 I
+X COEX2 62 1000 -1400 100 L 50 50 1 1 B
+X ANTCTL2 63 1000 1000 100 L 50 50 1 1 I
+X COEX1 64 1000 -1300 100 L 50 50 1 1 B
+X ANTCTL3 65 1000 900 100 L 50 50 1 1 I
+X SIM_DETECT 66 -1000 -200 100 R 50 50 1 1 O
+X ~RESET 67 -1000 -1200 100 R 50 50 1 1 O
+X SUSCLK 68 1000 -1100 100 L 50 50 1 1 O
+X CONFIG_1 69 1000 1600 100 L 50 50 1 1 I
+X USB_D+ 7 -1000 400 100 R 50 50 1 1 B
+X 3.3V 70 0 1900 100 D 50 50 1 1 P N
+X GND 71 0 -1900 100 U 50 50 1 1 P N
+X 3.3V 72 0 1900 100 D 50 50 1 1 P N
+X GND 73 0 -1900 100 U 50 50 1 1 P N
+X 3.3V 74 0 1900 100 D 50 50 1 1 P N
+X CONFIG_2 75 1000 1500 100 L 50 50 1 1 I
+X ~W_DISABLE1 8 1000 700 100 L 50 50 1 1 O
+X USB_D- 9 -1000 300 100 R 50 50 1 1 B
+ENDDRAW
+ENDDEF
+#
+# Bus_M.2_Socket_E
+#
+DEF Bus_M.2_Socket_E J 0 20 Y Y 1 F N
+F0 "J" -900 1850 50 H V L CNN
+F1 "Bus_M.2_Socket_E" 650 1850 50 H V C CNN
+F2 "" 0 1050 50 H I C CNN
+F3 "" 0 1050 50 H I C CNN
+$FPLIST
+ *M*2*E*
+$ENDFPLIST
+DRAW
+S -900 1800 900 -1800 0 1 10 f
+X GND 1 0 -1900 100 U 50 50 1 1 W
+X PCM_SYNC/I2S_WS 10 1000 200 100 L 50 50 1 1 B
+X SDIO_CMD 11 -1000 -600 100 R 50 50 1 1 B
+X PCM_IN/I2S_SD_IN 12 1000 100 100 L 50 50 1 1 I
+X SDIO_DATA0 13 -1000 -700 100 R 50 50 1 1 B
+X PCM_OUT/I2S_SD_OUT 14 1000 0 100 L 50 50 1 1 O
+X SDIO_DATA1 15 -1000 -800 100 R 50 50 1 1 B
+X ~LED_2 16 1000 -900 100 L 50 50 1 1 C
+X SDIO_DATA2 17 -1000 -900 100 R 50 50 1 1 B
+X GND 18 0 -1900 100 U 50 50 1 1 P N
+X SDIO_DATA3 19 -1000 -1000 100 R 50 50 1 1 B
+X 3.3V 2 0 1900 100 D 50 50 1 1 W
+X ~UART_WAKE 20 1000 -200 100 L 50 50 1 1 I
+X ~SDIO_WAKE 21 -1000 -1100 100 R 50 50 1 1 I
+X UART_RXD 22 1000 -300 100 L 50 50 1 1 I
+X ~SDIO_RESET 23 -1000 -1200 100 R 50 50 1 1 O
+X USB_D+ 3 -1000 400 100 R 50 50 1 1 B
+X UART_TXD 32 1000 -400 100 L 50 50 1 1 O
+X GND 33 0 -1900 100 U 50 50 1 1 P N
+X UART_CTS 34 1000 -500 100 L 50 50 1 1 I
+X PETp0 35 -1000 1300 100 R 50 50 1 1 O
+X UART_RTS 36 1000 -600 100 L 50 50 1 1 O
+X PETn0 37 -1000 1200 100 R 50 50 1 1 O
+X VENDOR_DEFINED 38 1000 1500 100 L 50 50 1 1 P
+X GND 39 0 -1900 100 U 50 50 1 1 P N
+X 3.3V 4 0 1900 100 D 50 50 1 1 P N
+X VENDOR_DEFINED 40 1000 1400 100 L 50 50 1 1 P
+X PERp0 41 -1000 1100 100 R 50 50 1 1 I
+X VENDOR_DEFINED 42 1000 1300 100 L 50 50 1 1 P
+X PERn0 43 -1000 1000 100 R 50 50 1 1 I
+X COEX3 44 1000 -1500 100 L 50 50 1 1 B
+X GND 45 0 -1900 100 U 50 50 1 1 P N
+X COEX2 46 1000 -1400 100 L 50 50 1 1 B
+X REFCLKp0 47 -1000 -1400 100 R 50 50 1 1 O
+X COEX1 48 1000 -1300 100 L 50 50 1 1 B
+X REFCLKn0 49 -1000 -1500 100 R 50 50 1 1 O
+X USB_D- 5 -1000 300 100 R 50 50 1 1 B
+X SUSCLK 50 1000 -1100 100 L 50 50 1 1 O
+X GND 51 0 -1900 100 U 50 50 1 1 P N
+X ~PERST0 52 -1000 1700 100 R 50 50 1 1 O
+X ~CLKREQ0 53 -1000 1600 100 R 50 50 1 1 B
+X ~W_DISABLE2 54 1000 600 100 L 50 50 1 1 O
+X ~PEWAKE0 55 -1000 1500 100 R 50 50 1 1 B
+X ~W_DISABLE1 56 1000 700 100 L 50 50 1 1 O
+X GND 57 0 -1900 100 U 50 50 1 1 P N
+X I2C_DATA 58 1000 1100 100 L 50 50 1 1 B
+X RESERVED/PETp1 59 -1000 900 100 R 50 50 1 1 O
+X ~LED_1 6 1000 -800 100 L 50 50 1 1 C
+X I2C_CLK 60 1000 1000 100 L 50 50 1 1 O
+X RESERVED/PETn1 61 -1000 800 100 R 50 50 1 1 O
+X ~ALERT 62 1000 900 100 L 50 50 1 1 I
+X GND 63 0 -1900 100 U 50 50 1 1 P N
+X RESERVED 64 1000 1700 100 L 50 50 1 1 P
+X RESERVED/PERp1 65 -1000 700 100 R 50 50 1 1 I
+X UIM_SWP/~PERST1 66 -1000 -100 100 R 50 50 1 1 O
+X RESERVED/PERn1 67 -1000 600 100 R 50 50 1 1 I
+X UIM_POWER_SNK/~CLKREQ1 68 -1000 -200 100 R 50 50 1 1 B
+X GND 69 0 -1900 100 U 50 50 1 1 P N
+X GND 7 0 -1900 100 U 50 50 1 1 P N
+X UIM_POWER_SRC/GPIO1/~PEWAKE1 70 -1000 -300 100 R 50 50 1 1 B
+X RESERVED/REFCLKp1 71 -1000 -1600 100 R 50 50 1 1 O
+X 3.3V 72 0 1900 100 D 50 50 1 1 P N
+X RESERVED/REFCLKn1 73 -1000 -1700 100 R 50 50 1 1 O
+X 3.3V 74 0 1900 100 D 50 50 1 1 P N
+X GND 75 0 -1900 100 U 50 50 1 1 P N
+X PCM_CLK/I2S_SCK 8 1000 300 100 L 50 50 1 1 B
+X SDIO_CLK 9 -1000 -500 100 R 50 50 1 1 O
+ENDDRAW
+ENDDEF
+#
+# Bus_M.2_Socket_M
+#
+DEF Bus_M.2_Socket_M J 0 20 Y Y 1 F N
+F0 "J" -900 1850 50 H V L CNN
+F1 "Bus_M.2_Socket_M" 650 1850 50 H V C CNN
+F2 "" 0 1050 50 H I C CNN
+F3 "" 0 1050 50 H I C CNN
+$FPLIST
+ *M*2*M*
+$ENDFPLIST
+DRAW
+S -900 1800 900 -1800 0 1 10 f
+X GND 1 0 -1900 100 U 50 50 1 1 W
+X DAS/~DSS~/~LED1 10 1000 -400 100 L 50 50 1 1 B
+X PETn3 11 -1000 0 100 R 50 50 1 1 O
+X 3.3V 12 0 1900 100 D 50 50 1 1 P N
+X PETp3 13 -1000 100 100 R 50 50 1 1 O
+X 3.3V 14 0 1900 100 D 50 50 1 1 P N
+X GND 15 0 -1900 100 U 50 50 1 1 P N
+X 3.3V 16 0 1900 100 D 50 50 1 1 P N
+X PERn2 17 -1000 200 100 R 50 50 1 1 I
+X 3.3V 18 0 1900 100 D 50 50 1 1 P N
+X PERp2 19 -1000 300 100 R 50 50 1 1 I
+X 3.3V 2 0 1900 100 D 50 50 1 1 W
+X NC 20 900 100 100 L 50 50 1 1 N N
+X GND 21 0 -1900 100 U 50 50 1 1 P N
+X NC 22 900 200 100 L 50 50 1 1 N N
+X PETn2 23 -1000 400 100 R 50 50 1 1 O
+X NC 24 900 300 100 L 50 50 1 1 N N
+X PETp2 25 -1000 500 100 R 50 50 1 1 O
+X NC 26 900 400 100 L 50 50 1 1 N N
+X GND 27 0 -1900 100 U 50 50 1 1 P N
+X NC 28 900 500 100 L 50 50 1 1 N N
+X PERn1 29 -1000 600 100 R 50 50 1 1 I
+X GND 3 0 -1900 100 U 50 50 1 1 P N
+X NC 30 900 600 100 L 50 50 1 1 N N
+X PERp1 31 -1000 700 100 R 50 50 1 1 I
+X NC 32 900 700 100 L 50 50 1 1 N N
+X GND 33 0 -1900 100 U 50 50 1 1 P N
+X NC 34 900 800 100 L 50 50 1 1 N N
+X PETn1 35 -1000 800 100 R 50 50 1 1 O
+X NC 36 900 900 100 L 50 50 1 1 N N
+X PETp1 37 -1000 900 100 R 50 50 1 1 O
+X DEVSLP 38 -1000 -900 100 R 50 50 1 1 O
+X GND 39 0 -1900 100 U 50 50 1 1 P N
+X 3.3V 4 0 1900 100 D 50 50 1 1 P N
+X NC 40 900 1000 100 L 50 50 1 1 N N
+X PERn0/SATA-B+ 41 -1000 1000 100 R 50 50 1 1 I
+X NC 42 900 1100 100 L 50 50 1 1 N N
+X PERp0/SATA-B- 43 -1000 1100 100 R 50 50 1 1 I
+X NC 44 900 1200 100 L 50 50 1 1 N N
+X GND 45 0 -1900 100 U 50 50 1 1 P N
+X NC 46 900 1300 100 L 50 50 1 1 N N
+X PETn0/SATA-A- 47 -1000 1200 100 R 50 50 1 1 O
+X NC 48 900 1400 100 L 50 50 1 1 N N
+X PETp0/SATA-A+ 49 -1000 1300 100 R 50 50 1 1 O
+X PERn3 5 -1000 -200 100 R 50 50 1 1 I
+X ~PERST 50 -1000 1700 100 R 50 50 1 1 O
+X GND 51 0 -1900 100 U 50 50 1 1 P N
+X ~CLKREQ 52 -1000 1600 100 R 50 50 1 1 B
+X REFCLKn 53 -1000 -1500 100 R 50 50 1 1 O
+X ~PEWAKE 54 -1000 1500 100 R 50 50 1 1 B
+X REFCLKp 55 -1000 -1400 100 R 50 50 1 1 O
+X NC 56 900 1500 100 L 50 50 1 1 N N
+X GND 57 0 -1900 100 U 50 50 1 1 P N
+X NC 58 900 1600 100 L 50 50 1 1 N N
+X NC 6 900 -100 100 L 50 50 1 1 N N
+X NC 67 900 -200 100 L 50 50 1 1 N N
+X SUSCLK 68 1000 -1100 100 L 50 50 1 1 O
+X PEDET 69 1000 -800 100 L 50 50 1 1 P
+X PERp3 7 -1000 -100 100 R 50 50 1 1 I
+X 3.3V 70 0 1900 100 D 50 50 1 1 P N
+X GND 71 0 -1900 100 U 50 50 1 1 P N
+X 3.3V 72 0 1900 100 D 50 50 1 1 P N
+X GND 73 0 -1900 100 U 50 50 1 1 P N
+X 3.3V 74 0 1900 100 D 50 50 1 1 P N
+X GND 75 0 -1900 100 U 50 50 1 1 P N
+X NC 8 900 0 100 L 50 50 1 1 N N
+X GND 9 0 -1900 100 U 50 50 1 1 P N
+ENDDRAW
+ENDDEF
+#
 # Bus_PCI_32bit_5V
 #
 DEF Bus_PCI_32bit_5V J 0 20 Y Y 1 F N
@@ -2204,263 +2532,425 @@ X MP MP 100 -1200 100 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# C64AB
-#
-DEF C64AB J 0 20 Y Y 1 F N
-F0 "J" 0 3350 50 H V C CNN
-F1 "C64AB" 250 50 50 V V C CNN
-F2 "" 0 50 50 H I C CNN
-F3 "" 0 50 50 H I C CNN
-DRAW
-S -150 -3200 150 3300 0 1 10 f
-X 1A A1 -300 3200 150 R 50 50 1 1 P
-X 10A A10 -300 1400 150 R 50 50 1 1 P
-X 11A A11 -300 1200 150 R 50 50 1 1 P
-X 12A A12 -300 1000 150 R 50 50 1 1 P
-X 13A A13 -300 800 150 R 50 50 1 1 P
-X 14A A14 -300 600 150 R 50 50 1 1 P
-X 15A A15 -300 400 150 R 50 50 1 1 P
-X 16A A16 -300 200 150 R 50 50 1 1 P
-X 17A A17 -300 0 150 R 50 50 1 1 P
-X 18A A18 -300 -200 150 R 50 50 1 1 P
-X 19A A19 -300 -400 150 R 50 50 1 1 P
-X 2A A2 -300 3000 150 R 50 50 1 1 P
-X 20A A20 -300 -600 150 R 50 50 1 1 P
-X 21A A21 -300 -800 150 R 50 50 1 1 P
-X 22A A22 -300 -1000 150 R 50 50 1 1 P
-X 23A A23 -300 -1200 150 R 50 50 1 1 P
-X 24A A24 -300 -1400 150 R 50 50 1 1 P
-X 25A A25 -300 -1600 150 R 50 50 1 1 P
-X 26A A26 -300 -1800 150 R 50 50 1 1 P
-X 27A A27 -300 -2000 150 R 50 50 1 1 P
-X 28A A28 -300 -2200 150 R 50 50 1 1 P
-X 29A A29 -300 -2400 150 R 50 50 1 1 P
-X 3A A3 -300 2800 150 R 50 50 1 1 P
-X 30A A30 -300 -2600 150 R 50 50 1 1 P
-X 31A A31 -300 -2800 150 R 50 50 1 1 P
-X 32A A32 -300 -3000 150 R 50 50 1 1 P
-X 4A A4 -300 2600 150 R 50 50 1 1 P
-X 5A A5 -300 2400 150 R 50 50 1 1 P
-X 6A A6 -300 2200 150 R 50 50 1 1 P
-X 7A A7 -300 2000 150 R 50 50 1 1 P
-X 8A A8 -300 1800 150 R 50 50 1 1 P
-X 9A A9 -300 1600 150 R 50 50 1 1 P
-X 1B B1 -300 3100 150 R 50 50 1 1 P
-X 10B B10 -300 1300 150 R 50 50 1 1 P
-X 11B B11 -300 1100 150 R 50 50 1 1 P
-X 12B B12 -300 900 150 R 50 50 1 1 P
-X 13B B13 -300 700 150 R 50 50 1 1 P
-X 14B B14 -300 500 150 R 50 50 1 1 P
-X 15B B15 -300 300 150 R 50 50 1 1 P
-X 16B B16 -300 100 150 R 50 50 1 1 P
-X 17B B17 -300 -100 150 R 50 50 1 1 P
-X 18B B18 -300 -300 150 R 50 50 1 1 P
-X 19B B19 -300 -500 150 R 50 50 1 1 P
-X 2B B2 -300 2900 150 R 50 50 1 1 P
-X 20B B20 -300 -700 150 R 50 50 1 1 P
-X 21B B21 -300 -900 150 R 50 50 1 1 P
-X 22B B22 -300 -1100 150 R 50 50 1 1 P
-X 23B B23 -300 -1300 150 R 50 50 1 1 P
-X 24B B24 -300 -1500 150 R 50 50 1 1 P
-X 25B B25 -300 -1700 150 R 50 50 1 1 P
-X 26B B26 -300 -1900 150 R 50 50 1 1 P
-X 27B B27 -300 -2100 150 R 50 50 1 1 P
-X 28B B28 -300 -2300 150 R 50 50 1 1 P
-X 29B B29 -300 -2500 150 R 50 50 1 1 P
-X 3B B3 -300 2700 150 R 50 50 1 1 P
-X 30B B30 -300 -2700 150 R 50 50 1 1 P
-X 31B B31 -300 -2900 150 R 50 50 1 1 P
-X 32B B32 -300 -3100 150 R 50 50 1 1 P
-X 4B B4 -300 2500 150 R 50 50 1 1 P
-X 5B B5 -300 2300 150 R 50 50 1 1 P
-X 6B B6 -300 2100 150 R 50 50 1 1 P
-X 7B B7 -300 1900 150 R 50 50 1 1 P
-X 8B B8 -300 1700 150 R 50 50 1 1 P
-X 9B B9 -300 1500 150 R 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# C64AC
-#
-DEF C64AC J 0 20 Y Y 1 F N
-F0 "J" 0 3350 50 H V C CNN
-F1 "C64AC" 250 50 50 V V C CNN
-F2 "" 0 50 50 H I C CNN
-F3 "" 0 50 50 H I C CNN
-DRAW
-S -150 -3200 150 3300 0 1 10 f
-X 1A A1 -300 3200 150 R 50 50 1 1 P
-X 10A A10 -300 1400 150 R 50 50 1 1 P
-X 11A A11 -300 1200 150 R 50 50 1 1 P
-X 12A A12 -300 1000 150 R 50 50 1 1 P
-X 13A A13 -300 800 150 R 50 50 1 1 P
-X 14A A14 -300 600 150 R 50 50 1 1 P
-X 15A A15 -300 400 150 R 50 50 1 1 P
-X 16A A16 -300 200 150 R 50 50 1 1 P
-X 17A A17 -300 0 150 R 50 50 1 1 P
-X 18A A18 -300 -200 150 R 50 50 1 1 P
-X 19A A19 -300 -400 150 R 50 50 1 1 P
-X 2A A2 -300 3000 150 R 50 50 1 1 P
-X 20A A20 -300 -600 150 R 50 50 1 1 P
-X 21A A21 -300 -800 150 R 50 50 1 1 P
-X 22A A22 -300 -1000 150 R 50 50 1 1 P
-X 23A A23 -300 -1200 150 R 50 50 1 1 P
-X 24A A24 -300 -1400 150 R 50 50 1 1 P
-X 25A A25 -300 -1600 150 R 50 50 1 1 P
-X 26A A26 -300 -1800 150 R 50 50 1 1 P
-X 27A A27 -300 -2000 150 R 50 50 1 1 P
-X 28A A28 -300 -2200 150 R 50 50 1 1 P
-X 29A A29 -300 -2400 150 R 50 50 1 1 P
-X 3A A3 -300 2800 150 R 50 50 1 1 P
-X 30A A30 -300 -2600 150 R 50 50 1 1 P
-X 31A A31 -300 -2800 150 R 50 50 1 1 P
-X 32A A32 -300 -3000 150 R 50 50 1 1 P
-X 4A A4 -300 2600 150 R 50 50 1 1 P
-X 5A A5 -300 2400 150 R 50 50 1 1 P
-X 6A A6 -300 2200 150 R 50 50 1 1 P
-X 7A A7 -300 2000 150 R 50 50 1 1 P
-X 8A A8 -300 1800 150 R 50 50 1 1 P
-X 9A A9 -300 1600 150 R 50 50 1 1 P
-X 1C C1 -300 3100 150 R 50 50 1 1 P
-X 10C C10 -300 1300 150 R 50 50 1 1 P
-X 11C C11 -300 1100 150 R 50 50 1 1 P
-X 12C C12 -300 900 150 R 50 50 1 1 P
-X 13C C13 -300 700 150 R 50 50 1 1 P
-X 14C C14 -300 500 150 R 50 50 1 1 P
-X 15C C15 -300 300 150 R 50 50 1 1 P
-X 16C C16 -300 100 150 R 50 50 1 1 P
-X 17C C17 -300 -100 150 R 50 50 1 1 P
-X 18C C18 -300 -300 150 R 50 50 1 1 P
-X 19C C19 -300 -500 150 R 50 50 1 1 P
-X 2C C2 -300 2900 150 R 50 50 1 1 P
-X 20C C20 -300 -700 150 R 50 50 1 1 P
-X 21C C21 -300 -900 150 R 50 50 1 1 P
-X 22C C22 -300 -1100 150 R 50 50 1 1 P
-X 23C C23 -300 -1300 150 R 50 50 1 1 P
-X 24C C24 -300 -1500 150 R 50 50 1 1 P
-X 25C C25 -300 -1700 150 R 50 50 1 1 P
-X 26C C26 -300 -1900 150 R 50 50 1 1 P
-X 27C C27 -300 -2100 150 R 50 50 1 1 P
-X 28C C28 -300 -2300 150 R 50 50 1 1 P
-X 29C C29 -300 -2500 150 R 50 50 1 1 P
-X 3C C3 -300 2700 150 R 50 50 1 1 P
-X 30C C30 -300 -2700 150 R 50 50 1 1 P
-X 31C C31 -300 -2900 150 R 50 50 1 1 P
-X 32C C32 -300 -3100 150 R 50 50 1 1 P
-X 4C C4 -300 2500 150 R 50 50 1 1 P
-X 5C C5 -300 2300 150 R 50 50 1 1 P
-X 6C C6 -300 2100 150 R 50 50 1 1 P
-X 7C C7 -300 1900 150 R 50 50 1 1 P
-X 8C C8 -300 1700 150 R 50 50 1 1 P
-X 9C C9 -300 1500 150 R 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# C96ABC
-#
-DEF C96ABC J 0 20 Y Y 1 F N
-F0 "J" 0 4950 50 H V C CNN
-F1 "C96ABC" 250 50 50 V V C CNN
-F2 "" 0 50 50 H I C CNN
-F3 "" 0 50 50 H I C CNN
-DRAW
-S -150 -4800 150 4900 0 1 10 f
-X 1A A1 -300 4800 150 R 50 50 1 1 P
-X 10A A10 -300 2100 150 R 50 50 1 1 P
-X 11A A11 -300 1800 150 R 50 50 1 1 P
-X 12A A12 -300 1500 150 R 50 50 1 1 P
-X 13A A13 -300 1200 150 R 50 50 1 1 P
-X 14A A14 -300 900 150 R 50 50 1 1 P
-X 15A A15 -300 600 150 R 50 50 1 1 P
-X 16A A16 -300 300 150 R 50 50 1 1 P
-X 17A A17 -300 0 150 R 50 50 1 1 P
-X 18A A18 -300 -300 150 R 50 50 1 1 P
-X 19A A19 -300 -600 150 R 50 50 1 1 P
-X 2A A2 -300 4500 150 R 50 50 1 1 P
-X 20A A20 -300 -900 150 R 50 50 1 1 P
-X 21A A21 -300 -1200 150 R 50 50 1 1 T
-X 22A A22 -300 -1500 150 R 50 50 1 1 P
-X 23A A23 -300 -1800 150 R 50 50 1 1 P
-X 24A A24 -300 -2100 150 R 50 50 1 1 P
-X 25A A25 -300 -2400 150 R 50 50 1 1 P
-X 26A A26 -300 -2700 150 R 50 50 1 1 P
-X 27A A27 -300 -3000 150 R 50 50 1 1 P
-X 28A A28 -300 -3300 150 R 50 50 1 1 P
-X 29A A29 -300 -3600 150 R 50 50 1 1 P
-X 3A A3 -300 4200 150 R 50 50 1 1 P
-X 30A A30 -300 -3900 150 R 50 50 1 1 P
-X 31A A31 -300 -4200 150 R 50 50 1 1 P
-X 32A A32 -300 -4500 150 R 50 50 1 1 P
-X 4A A4 -300 3900 150 R 50 50 1 1 P
-X 5A A5 -300 3600 150 R 50 50 1 1 P
-X 6A A6 -300 3300 150 R 50 50 1 1 P
-X 7A A7 -300 3000 150 R 50 50 1 1 P
-X 8A A8 -300 2700 150 R 50 50 1 1 P
-X 9A A9 -300 2400 150 R 50 50 1 1 P
-X 1B B1 -300 4700 150 R 50 50 1 1 P
-X 10B B10 -300 2000 150 R 50 50 1 1 P
-X 11B B11 -300 1700 150 R 50 50 1 1 P
-X 12B B12 -300 1400 150 R 50 50 1 1 P
-X 13B B13 -300 1100 150 R 50 50 1 1 P
-X 14B B14 -300 800 150 R 50 50 1 1 P
-X 15B B15 -300 500 150 R 50 50 1 1 P
-X 16B B16 -300 200 150 R 50 50 1 1 P
-X 17B B17 -300 -100 150 R 50 50 1 1 P
-X 18B B18 -300 -400 150 R 50 50 1 1 P
-X 19B B19 -300 -700 150 R 50 50 1 1 P
-X 2B B2 -300 4400 150 R 50 50 1 1 P
-X 20B B20 -300 -1000 150 R 50 50 1 1 P
-X 21B B21 -300 -1300 150 R 50 50 1 1 P
-X 22B B22 -300 -1600 150 R 50 50 1 1 P
-X 23B B23 -300 -1900 150 R 50 50 1 1 P
-X 24B B24 -300 -2200 150 R 50 50 1 1 P
-X 25B B25 -300 -2500 150 R 50 50 1 1 P
-X 26B B26 -300 -2800 150 R 50 50 1 1 P
-X 27B B27 -300 -3100 150 R 50 50 1 1 P
-X 28B B28 -300 -3400 150 R 50 50 1 1 P
-X 29B B29 -300 -3700 150 R 50 50 1 1 P
-X 3B B3 -300 4100 150 R 50 50 1 1 P
-X 30B B30 -300 -4000 150 R 50 50 1 1 P
-X 31B B31 -300 -4300 150 R 50 50 1 1 P
-X 32B B32 -300 -4600 150 R 50 50 1 1 P
-X 4B B4 -300 3800 150 R 50 50 1 1 P
-X 5B B5 -300 3500 150 R 50 50 1 1 P
-X 6B B6 -300 3200 150 R 50 50 1 1 P
-X 7B B7 -300 2900 150 R 50 50 1 1 P
-X 8B B8 -300 2600 150 R 50 50 1 1 P
-X 9B B9 -300 2300 150 R 50 50 1 1 P
-X 1C C1 -300 4600 150 R 50 50 1 1 P
-X 10C C10 -300 1900 150 R 50 50 1 1 P
-X 11C C11 -300 1600 150 R 50 50 1 1 P
-X 12C C12 -300 1300 150 R 50 50 1 1 P
-X 13C C13 -300 1000 150 R 50 50 1 1 P
-X 14C C14 -300 700 150 R 50 50 1 1 P
-X 15C C15 -300 400 150 R 50 50 1 1 P
-X 16C C16 -300 100 150 R 50 50 1 1 P
-X 17C C17 -300 -200 150 R 50 50 1 1 P
-X 18C C18 -300 -500 150 R 50 50 1 1 P
-X 19C C19 -300 -800 150 R 50 50 1 1 P
-X 2C C2 -300 4300 150 R 50 50 1 1 P
-X 20C C20 -300 -1100 150 R 50 50 1 1 P
-X 21C C21 -300 -1400 150 R 50 50 1 1 P
-X 22C C22 -300 -1700 150 R 50 50 1 1 P
-X 23C C23 -300 -2000 150 R 50 50 1 1 P
-X 24C C24 -300 -2300 150 R 50 50 1 1 P
-X 25C C25 -300 -2600 150 R 50 50 1 1 P
-X 26C C26 -300 -2900 150 R 50 50 1 1 P
-X 27C C27 -300 -3200 150 R 50 50 1 1 P
-X 28C C28 -300 -3500 150 R 50 50 1 1 P
-X 29C C29 -300 -3800 150 R 50 50 1 1 P
-X 3C C3 -300 4000 150 R 50 50 1 1 P
-X 30C C30 -300 -4100 150 R 50 50 1 1 P
-X 31C C31 -300 -4400 150 R 50 50 1 1 P
-X 32C C32 -300 -4700 150 R 50 50 1 1 P
-X 4C C4 -300 3700 150 R 50 50 1 1 P
-X 5C C5 -300 3400 150 R 50 50 1 1 P
-X 6C C6 -300 3100 150 R 50 50 1 1 P
-X 7C C7 -300 2800 150 R 50 50 1 1 P
-X 8C C8 -300 2500 150 R 50 50 1 1 P
-X 9C C9 -300 2200 150 R 50 50 1 1 P
+# Bus_PCI_Express_x1
+#
+DEF Bus_PCI_Express_x1 J 0 20 Y Y 1 F N
+F0 "J" -350 900 50 H V C CNN
+F1 "Bus_PCI_Express_x1" 500 900 50 H V C CNN
+F2 "Connector_PCBEdge:BUS_PCIexpress_x1" 0 -300 50 H I C CNN
+F3 "" -250 -750 50 H I C CNN
+$FPLIST
+ *PCIexpress*
+$ENDFPLIST
+DRAW
+S -450 850 450 -750 0 1 10 f
+X ~PRSNT1 A1 -600 100 150 R 50 50 1 1 P
+X +3.3V A10 100 1000 150 D 50 50 1 1 P N
+X ~PERST A11 600 300 150 L 50 50 1 1 I
+X GND A12 0 -900 150 U 50 50 1 1 P N
+X REFCLK+ A13 -600 400 150 R 50 50 1 1 I
+X REFCLK- A14 -600 300 150 R 50 50 1 1 I
+X GND A15 0 -900 150 U 50 50 1 1 P N
+X PERp0 A16 600 -500 150 L 50 50 1 1 O
+X PERn0 A17 600 -600 150 L 50 50 1 1 O
+X GND A18 0 -900 150 U 50 50 1 1 P N
+X +12V A2 -100 1000 150 D 50 50 1 1 P N
+X +12V A3 -100 1000 150 D 50 50 1 1 P N
+X GND A4 0 -900 150 U 50 50 1 1 P N
+X JTAG2 A5 600 0 150 L 50 50 1 1 I
+X JTAG3 A6 600 -100 150 L 50 50 1 1 I
+X JTAG4 A7 600 -200 150 L 50 50 1 1 O
+X JTAG5 A8 600 -300 150 L 50 50 1 1 I
+X +3.3V A9 100 1000 150 D 50 50 1 1 P N
+X +12V B1 -100 1000 150 D 50 50 1 1 W
+X 3.3Vaux B10 0 1000 150 D 50 50 1 1 W
+X ~WAKE B11 600 400 150 L 50 50 1 1 C
+X RSVD B12 600 600 150 L 50 50 1 1 P
+X GND B13 0 -900 150 U 50 50 1 1 P N
+X PETp0 B14 -600 -500 150 R 50 50 1 1 I
+X PETn0 B15 -600 -600 150 R 50 50 1 1 I
+X GND B16 0 -900 150 U 50 50 1 1 P N
+X ~PRSNT2 B17 -600 0 150 R 50 50 1 1 P
+X GND B18 0 -900 150 U 50 50 1 1 P N
+X +12V B2 -100 1000 150 D 50 50 1 1 P N
+X +12V B3 -100 1000 150 D 50 50 1 1 P N
+X GND B4 0 -900 150 U 50 50 1 1 W
+X SMCLK B5 -600 700 150 R 50 50 1 1 I
+X SMDAT B6 -600 600 150 R 50 50 1 1 B
+X GND B7 0 -900 150 U 50 50 1 1 P N
+X +3.3V B8 100 1000 150 D 50 50 1 1 W
+X JTAG1 B9 600 100 150 L 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# Bus_PCI_Express_x16
+#
+DEF Bus_PCI_Express_x16 J 0 20 Y Y 1 F N
+F0 "J" -350 2600 50 H V C CNN
+F1 "Bus_PCI_Express_x16" 550 2600 50 H V C CNN
+F2 "Connector_PCBEdge:BUS_PCIexpress_x16" 0 900 50 H I C CNN
+F3 "" -50 -250 50 H I C CNN
+$FPLIST
+ *PCIexpress*
+$ENDFPLIST
+DRAW
+S -450 2550 450 -2550 0 1 10 f
+X ~PRSNT1 A1 -600 1300 150 R 50 50 1 1 P
+X +3.3V A10 100 2700 150 D 50 50 1 1 P N
+X ~PERST A11 600 1500 150 L 50 50 1 1 I
+X GND A12 0 -2700 150 U 50 50 1 1 P N
+X REFCLK+ A13 -600 1600 150 R 50 50 1 1 I
+X REFCLK- A14 -600 1500 150 R 50 50 1 1 I
+X GND A15 0 -2700 150 U 50 50 1 1 P N
+X PERp0 A16 600 700 150 L 50 50 1 1 O
+X PERn0 A17 600 600 150 L 50 50 1 1 O
+X GND A18 0 -2700 150 U 50 50 1 1 P N
+X RSVD A19 600 1900 150 L 50 50 1 1 P
+X +12V A2 -100 2700 150 D 50 50 1 1 P N
+X GND A20 0 -2700 150 U 50 50 1 1 P N
+X PERp1 A21 600 500 150 L 50 50 1 1 O
+X PERn1 A22 600 400 150 L 50 50 1 1 O
+X GND A23 0 -2700 150 U 50 50 1 1 P N
+X GND A24 0 -2700 150 U 50 50 1 1 P N
+X PERp2 A25 600 300 150 L 50 50 1 1 O
+X PERn2 A26 600 200 150 L 50 50 1 1 O
+X GND A27 0 -2700 150 U 50 50 1 1 P N
+X GND A28 0 -2700 150 U 50 50 1 1 P N
+X PERp3 A29 600 100 150 L 50 50 1 1 O
+X +12V A3 -100 2700 150 D 50 50 1 1 P N
+X PERn3 A30 600 0 150 L 50 50 1 1 O
+X GND A31 0 -2700 150 U 50 50 1 1 P N
+X RSVD A32 600 2000 150 L 50 50 1 1 P
+X RSVD A33 600 2200 150 L 50 50 1 1 P
+X GND A34 0 -2700 150 U 50 50 1 1 P N
+X PERp4 A35 600 -100 150 L 50 50 1 1 O
+X PERn4 A36 600 -200 150 L 50 50 1 1 O
+X GND A37 0 -2700 150 U 50 50 1 1 P N
+X GND A38 0 -2700 150 U 50 50 1 1 P N
+X PERp5 A39 600 -300 150 L 50 50 1 1 O
+X GND A4 0 -2700 150 U 50 50 1 1 P N
+X PERn5 A40 600 -400 150 L 50 50 1 1 O
+X GND A41 0 -2700 150 U 50 50 1 1 P N
+X GND A42 0 -2700 150 U 50 50 1 1 P N
+X PERp6 A43 600 -500 150 L 50 50 1 1 O
+X PERn6 A44 600 -600 150 L 50 50 1 1 O
+X GND A45 0 -2700 150 U 50 50 1 1 P N
+X GND A46 0 -2700 150 U 50 50 1 1 P N
+X PERp7 A47 600 -700 150 L 50 50 1 1 O
+X PERn7 A48 600 -800 150 L 50 50 1 1 O
+X GND A49 0 -2700 150 U 50 50 1 1 P N
+X JTAG2 A5 600 1200 150 L 50 50 1 1 I
+X RSVD A50 600 2300 150 L 50 50 1 1 P
+X GND A51 0 -2700 150 U 50 50 1 1 P N
+X PERp8 A52 600 -900 150 L 50 50 1 1 O
+X PERn8 A53 600 -1000 150 L 50 50 1 1 O
+X GND A54 0 -2700 150 U 50 50 1 1 P N
+X GND A55 0 -2700 150 U 50 50 1 1 P N
+X PERp9 A56 600 -1100 150 L 50 50 1 1 O
+X PERn9 A57 600 -1200 150 L 50 50 1 1 O
+X GND A58 0 -2700 150 U 50 50 1 1 P N
+X GND A59 0 -2700 150 U 50 50 1 1 P N
+X JTAG3 A6 600 1100 150 L 50 50 1 1 I
+X PERp10 A60 600 -1300 150 L 50 50 1 1 O
+X PERn10 A61 600 -1400 150 L 50 50 1 1 O
+X GND A62 0 -2700 150 U 50 50 1 1 P N
+X GND A63 0 -2700 150 U 50 50 1 1 P N
+X PERp11 A64 600 -1500 150 L 50 50 1 1 O
+X PERn11 A65 600 -1600 150 L 50 50 1 1 O
+X GND A66 0 -2700 150 U 50 50 1 1 P N
+X GND A67 0 -2700 150 U 50 50 1 1 P N
+X PERp12 A68 600 -1700 150 L 50 50 1 1 O
+X PERn12 A69 600 -1800 150 L 50 50 1 1 O
+X JTAG4 A7 600 1000 150 L 50 50 1 1 O
+X GND A70 0 -2700 150 U 50 50 1 1 P N
+X GND A71 0 -2700 150 U 50 50 1 1 P N
+X PERp13 A72 600 -1900 150 L 50 50 1 1 O
+X PERn13 A73 600 -2000 150 L 50 50 1 1 O
+X GND A74 0 -2700 150 U 50 50 1 1 P N
+X GND A75 0 -2700 150 U 50 50 1 1 P N
+X PERp14 A76 600 -2100 150 L 50 50 1 1 O
+X PERn14 A77 600 -2200 150 L 50 50 1 1 O
+X GND A78 0 -2700 150 U 50 50 1 1 P N
+X GND A79 0 -2700 150 U 50 50 1 1 P N
+X JTAG5 A8 600 900 150 L 50 50 1 1 I
+X PERp15 A80 600 -2300 150 L 50 50 1 1 O
+X PERn15 A81 600 -2400 150 L 50 50 1 1 O
+X GND A82 0 -2700 150 U 50 50 1 1 P N
+X +3.3V A9 100 2700 150 D 50 50 1 1 P N
+X +12V B1 -100 2700 150 D 50 50 1 1 W
+X 3.3Vaux B10 0 2700 150 D 50 50 1 1 W
+X ~WAKE B11 600 1600 150 L 50 50 1 1 C
+X RSVD B12 600 1800 150 L 50 50 1 1 P
+X GND B13 0 -2700 150 U 50 50 1 1 P N
+X PETp0 B14 -600 700 150 R 50 50 1 1 I
+X PETn0 B15 -600 600 150 R 50 50 1 1 I
+X GND B16 0 -2700 150 U 50 50 1 1 P N
+X ~PRSNT2 B17 -600 1200 150 R 50 50 1 1 P
+X GND B18 0 -2700 150 U 50 50 1 1 P N
+X PETp1 B19 -600 500 150 R 50 50 1 1 I
+X +12V B2 -100 2700 150 D 50 50 1 1 P N
+X PETn1 B20 -600 400 150 R 50 50 1 1 I
+X GND B21 0 -2700 150 U 50 50 1 1 P N
+X GND B22 0 -2700 150 U 50 50 1 1 P N
+X PETp2 B23 -600 300 150 R 50 50 1 1 I
+X PETn2 B24 -600 200 150 R 50 50 1 1 I
+X GND B25 0 -2700 150 U 50 50 1 1 P N
+X GND B26 0 -2700 150 U 50 50 1 1 P N
+X PETp3 B27 -600 100 150 R 50 50 1 1 I
+X PETn3 B28 -600 0 150 R 50 50 1 1 I
+X GND B29 0 -2700 150 U 50 50 1 1 P N
+X +12V B3 -100 2700 150 D 50 50 1 1 P N
+X RSVD B30 600 2100 150 L 50 50 1 1 P
+X ~PRSNT2 B31 -600 1100 150 R 50 50 1 1 P
+X GND B32 0 -2700 150 U 50 50 1 1 P N
+X PETp4 B33 -600 -100 150 R 50 50 1 1 I
+X PETn4 B34 -600 -200 150 R 50 50 1 1 I
+X GND B35 0 -2700 150 U 50 50 1 1 P N
+X GND B36 0 -2700 150 U 50 50 1 1 P N
+X PETp5 B37 -600 -300 150 R 50 50 1 1 I
+X PETn5 B38 -600 -400 150 R 50 50 1 1 I
+X GND B39 0 -2700 150 U 50 50 1 1 P N
+X GND B4 0 -2700 150 U 50 50 1 1 W
+X GND B40 0 -2700 150 U 50 50 1 1 P N
+X PETp6 B41 -600 -500 150 R 50 50 1 1 I
+X PETn6 B42 -600 -600 150 R 50 50 1 1 I
+X GND B43 0 -2700 150 U 50 50 1 1 P N
+X GND B44 0 -2700 150 U 50 50 1 1 P N
+X PETp7 B45 -600 -700 150 R 50 50 1 1 I
+X PETn7 B46 -600 -800 150 R 50 50 1 1 I
+X GND B47 0 -2700 150 U 50 50 1 1 P N
+X ~PRSNT2 B48 -600 1000 150 R 50 50 1 1 P
+X GND B49 0 -2700 150 U 50 50 1 1 P N
+X SMCLK B5 -600 1900 150 R 50 50 1 1 I
+X PETp8 B50 -600 -900 150 R 50 50 1 1 I
+X PETn8 B51 -600 -1000 150 R 50 50 1 1 I
+X GND B52 0 -2700 150 U 50 50 1 1 P N
+X GND B53 0 -2700 150 U 50 50 1 1 P N
+X PETp9 B54 -600 -1100 150 R 50 50 1 1 I
+X PETn9 B55 -600 -1200 150 R 50 50 1 1 I
+X GND B56 0 -2700 150 U 50 50 1 1 P N
+X GND B57 0 -2700 150 U 50 50 1 1 P N
+X PETp10 B58 -600 -1300 150 R 50 50 1 1 I
+X PETn10 B59 -600 -1400 150 R 50 50 1 1 I
+X SMDAT B6 -600 1800 150 R 50 50 1 1 B
+X GND B60 0 -2700 150 U 50 50 1 1 P N
+X GND B61 0 -2700 150 U 50 50 1 1 P N
+X PETp11 B62 -600 -1500 150 R 50 50 1 1 I
+X PETn11 B63 -600 -1600 150 R 50 50 1 1 I
+X GND B64 0 -2700 150 U 50 50 1 1 P N
+X GND B65 0 -2700 150 U 50 50 1 1 P N
+X PETp12 B66 -600 -1700 150 R 50 50 1 1 I
+X PETn12 B67 -600 -1800 150 R 50 50 1 1 I
+X GND B68 0 -2700 150 U 50 50 1 1 P N
+X GND B69 0 -2700 150 U 50 50 1 1 P N
+X GND B7 0 -2700 150 U 50 50 1 1 P N
+X PETp13 B70 -600 -1900 150 R 50 50 1 1 I
+X PETn13 B71 -600 -2000 150 R 50 50 1 1 I
+X GND B72 0 -2700 150 U 50 50 1 1 P N
+X GND B73 0 -2700 150 U 50 50 1 1 P N
+X PETp14 B74 -600 -2100 150 R 50 50 1 1 I
+X PETn14 B75 -600 -2200 150 R 50 50 1 1 I
+X GND B76 0 -2700 150 U 50 50 1 1 P N
+X GND B77 0 -2700 150 U 50 50 1 1 P N
+X PETp15 B78 -600 -2300 150 R 50 50 1 1 I
+X PETn15 B79 -600 -2400 150 R 50 50 1 1 I
+X +3.3V B8 100 2700 150 D 50 50 1 1 W
+X GND B80 0 -2700 150 U 50 50 1 1 P N
+X ~PRSNT2 B81 -600 900 150 R 50 50 1 1 P
+X RSVD B82 600 2400 150 L 50 50 1 1 P
+X JTAG1 B9 600 1300 150 L 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# Bus_PCI_Express_x4
+#
+DEF Bus_PCI_Express_x4 J 0 20 Y Y 1 F N
+F0 "J" -350 1300 50 H V C CNN
+F1 "Bus_PCI_Express_x4" 500 1300 50 H V C CNN
+F2 "Connector_PCBEdge:BUS_PCIexpress_x4" 0 -100 50 H I C CNN
+F3 "" -250 -1250 50 H I C CNN
+$FPLIST
+ *PCIexpress*
+$ENDFPLIST
+DRAW
+S -450 1250 450 -1150 0 1 10 f
+X ~PRSNT1 A1 -600 300 150 R 50 50 1 1 P
+X +3.3V A10 100 1400 150 D 50 50 1 1 P N
+X ~PERST A11 600 500 150 L 50 50 1 1 I
+X GND A12 0 -1300 150 U 50 50 1 1 P N
+X REFCLK+ A13 -600 600 150 R 50 50 1 1 I
+X REFCLK- A14 -600 500 150 R 50 50 1 1 I
+X GND A15 0 -1300 150 U 50 50 1 1 P N
+X PERp0 A16 600 -300 150 L 50 50 1 1 O
+X PERn0 A17 600 -400 150 L 50 50 1 1 O
+X GND A18 0 -1300 150 U 50 50 1 1 P N
+X RSVD A19 600 900 150 L 50 50 1 1 P
+X +12V A2 -100 1400 150 D 50 50 1 1 P N
+X GND A20 0 -1300 150 U 50 50 1 1 P N
+X PERp1 A21 600 -500 150 L 50 50 1 1 O
+X PERn1 A22 600 -600 150 L 50 50 1 1 O
+X GND A23 0 -1300 150 U 50 50 1 1 P N
+X GND A24 0 -1300 150 U 50 50 1 1 P N
+X PERp2 A25 600 -700 150 L 50 50 1 1 O
+X PERn2 A26 600 -800 150 L 50 50 1 1 O
+X GND A27 0 -1300 150 U 50 50 1 1 P N
+X GND A28 0 -1300 150 U 50 50 1 1 P N
+X PERp3 A29 600 -900 150 L 50 50 1 1 O
+X +12V A3 -100 1400 150 D 50 50 1 1 P N
+X PERn3 A30 600 -1000 150 L 50 50 1 1 O
+X GND A31 0 -1300 150 U 50 50 1 1 P N
+X RSVD A32 600 1000 150 L 50 50 1 1 P
+X GND A4 0 -1300 150 U 50 50 1 1 P N
+X JTAG2 A5 600 200 150 L 50 50 1 1 I
+X JTAG3 A6 600 100 150 L 50 50 1 1 I
+X JTAG4 A7 600 0 150 L 50 50 1 1 O
+X JTAG5 A8 600 -100 150 L 50 50 1 1 I
+X +3.3V A9 100 1400 150 D 50 50 1 1 P N
+X +12V B1 -100 1400 150 D 50 50 1 1 W
+X 3.3Vaux B10 0 1400 150 D 50 50 1 1 W
+X ~WAKE B11 600 600 150 L 50 50 1 1 C
+X RSVD B12 600 800 150 L 50 50 1 1 P
+X GND B13 0 -1300 150 U 50 50 1 1 P N
+X PETp0 B14 -600 -300 150 R 50 50 1 1 I
+X PETn0 B15 -600 -400 150 R 50 50 1 1 I
+X GND B16 0 -1300 150 U 50 50 1 1 P N
+X ~PRSNT2 B17 -600 200 150 R 50 50 1 1 P
+X GND B18 0 -1300 150 U 50 50 1 1 P N
+X PETp1 B19 -600 -500 150 R 50 50 1 1 I
+X +12V B2 -100 1400 150 D 50 50 1 1 P N
+X PETn1 B20 -600 -600 150 R 50 50 1 1 I
+X GND B21 0 -1300 150 U 50 50 1 1 P N
+X GND B22 0 -1300 150 U 50 50 1 1 P N
+X PETp2 B23 -600 -700 150 R 50 50 1 1 I
+X PETn2 B24 -600 -800 150 R 50 50 1 1 I
+X GND B25 0 -1300 150 U 50 50 1 1 P N
+X GND B26 0 -1300 150 U 50 50 1 1 P N
+X PETp3 B27 -600 -900 150 R 50 50 1 1 I
+X PETn3 B28 -600 -1000 150 R 50 50 1 1 I
+X GND B29 0 -1300 150 U 50 50 1 1 P N
+X +12V B3 -100 1400 150 D 50 50 1 1 P N
+X RSVD B30 600 1100 150 L 50 50 1 1 P
+X ~PRSNT2 B31 -600 100 150 R 50 50 1 1 P
+X GND B32 0 -1300 150 U 50 50 1 1 P N
+X GND B4 0 -1300 150 U 50 50 1 1 W
+X SMCLK B5 -600 900 150 R 50 50 1 1 I
+X SMDAT B6 -600 800 150 R 50 50 1 1 B
+X GND B7 0 -1300 150 U 50 50 1 1 P N
+X +3.3V B8 100 1400 150 D 50 50 1 1 W
+X JTAG1 B9 600 300 150 L 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# Bus_PCI_Express_x8
+#
+DEF Bus_PCI_Express_x8 J 0 20 Y Y 1 F N
+F0 "J" -350 1700 50 H V C CNN
+F1 "Bus_PCI_Express_x8" 500 1700 50 H V C CNN
+F2 "Connector_PCBEdge:BUS_PCIexpress_x8" 0 200 50 H I C CNN
+F3 "" -50 -950 50 H I C CNN
+$FPLIST
+ *PCIexpress*
+$ENDFPLIST
+DRAW
+S -450 1650 450 -1650 0 1 10 f
+X ~PRSNT1 A1 -600 600 150 R 50 50 1 1 P
+X +3.3V A10 100 1800 150 D 50 50 1 1 P N
+X ~PERST A11 600 800 150 L 50 50 1 1 I
+X GND A12 0 -1800 150 U 50 50 1 1 P N
+X REFCLK+ A13 -600 900 150 R 50 50 1 1 I
+X REFCLK- A14 -600 800 150 R 50 50 1 1 I
+X GND A15 0 -1800 150 U 50 50 1 1 P N
+X PERp0 A16 600 0 150 L 50 50 1 1 O
+X PERn0 A17 600 -100 150 L 50 50 1 1 O
+X GND A18 0 -1800 150 U 50 50 1 1 P N
+X RSVD A19 600 1200 150 L 50 50 1 1 P
+X +12V A2 -100 1800 150 D 50 50 1 1 P N
+X GND A20 0 -1800 150 U 50 50 1 1 P N
+X PERp1 A21 600 -200 150 L 50 50 1 1 O
+X PERn1 A22 600 -300 150 L 50 50 1 1 O
+X GND A23 0 -1800 150 U 50 50 1 1 P N
+X GND A24 0 -1800 150 U 50 50 1 1 P N
+X PERp2 A25 600 -400 150 L 50 50 1 1 O
+X PERn2 A26 600 -500 150 L 50 50 1 1 O
+X GND A27 0 -1800 150 U 50 50 1 1 P N
+X GND A28 0 -1800 150 U 50 50 1 1 P N
+X PERp3 A29 600 -600 150 L 50 50 1 1 O
+X +12V A3 -100 1800 150 D 50 50 1 1 P N
+X PERn3 A30 600 -700 150 L 50 50 1 1 O
+X GND A31 0 -1800 150 U 50 50 1 1 P N
+X RSVD A32 600 1300 150 L 50 50 1 1 P
+X RSVD A33 600 1500 150 L 50 50 1 1 P
+X GND A34 0 -1800 150 U 50 50 1 1 P N
+X PERp4 A35 600 -800 150 L 50 50 1 1 O
+X PERn4 A36 600 -900 150 L 50 50 1 1 O
+X GND A37 0 -1800 150 U 50 50 1 1 P N
+X GND A38 0 -1800 150 U 50 50 1 1 P N
+X PERp5 A39 600 -1000 150 L 50 50 1 1 O
+X GND A4 0 -1800 150 U 50 50 1 1 P N
+X PERn5 A40 600 -1100 150 L 50 50 1 1 O
+X GND A41 0 -1800 150 U 50 50 1 1 P N
+X GND A42 0 -1800 150 U 50 50 1 1 P N
+X PERp6 A43 600 -1200 150 L 50 50 1 1 O
+X PERn6 A44 600 -1300 150 L 50 50 1 1 O
+X GND A45 0 -1800 150 U 50 50 1 1 P N
+X GND A46 0 -1800 150 U 50 50 1 1 P N
+X PERp7 A47 600 -1400 150 L 50 50 1 1 O
+X PERn7 A48 600 -1500 150 L 50 50 1 1 O
+X GND A49 0 -1800 150 U 50 50 1 1 P N
+X JTAG2 A5 600 500 150 L 50 50 1 1 I
+X JTAG3 A6 600 400 150 L 50 50 1 1 I
+X JTAG4 A7 600 300 150 L 50 50 1 1 O
+X JTAG5 A8 600 200 150 L 50 50 1 1 I
+X +3.3V A9 100 1800 150 D 50 50 1 1 P N
+X +12V B1 -100 1800 150 D 50 50 1 1 W
+X 3.3Vaux B10 0 1800 150 D 50 50 1 1 W
+X ~WAKE B11 600 900 150 L 50 50 1 1 C
+X RSVD B12 600 1100 150 L 50 50 1 1 P
+X GND B13 0 -1800 150 U 50 50 1 1 P N
+X PETp0 B14 -600 0 150 R 50 50 1 1 I
+X PETn0 B15 -600 -100 150 R 50 50 1 1 I
+X GND B16 0 -1800 150 U 50 50 1 1 P N
+X ~PRSNT2 B17 -600 500 150 R 50 50 1 1 P
+X GND B18 0 -1800 150 U 50 50 1 1 P N
+X PETp1 B19 -600 -200 150 R 50 50 1 1 I
+X +12V B2 -100 1800 150 D 50 50 1 1 P N
+X PETn1 B20 -600 -300 150 R 50 50 1 1 I
+X GND B21 0 -1800 150 U 50 50 1 1 P N
+X GND B22 0 -1800 150 U 50 50 1 1 P N
+X PETp2 B23 -600 -400 150 R 50 50 1 1 I
+X PETn2 B24 -600 -500 150 R 50 50 1 1 I
+X GND B25 0 -1800 150 U 50 50 1 1 P N
+X GND B26 0 -1800 150 U 50 50 1 1 P N
+X PETp3 B27 -600 -600 150 R 50 50 1 1 I
+X PETn3 B28 -600 -700 150 R 50 50 1 1 I
+X GND B29 0 -1800 150 U 50 50 1 1 P N
+X +12V B3 -100 1800 150 D 50 50 1 1 P N
+X RSVD B30 600 1400 150 L 50 50 1 1 P
+X ~PRSNT2 B31 -600 400 150 R 50 50 1 1 P
+X GND B32 0 -1800 150 U 50 50 1 1 P N
+X PETp4 B33 -600 -800 150 R 50 50 1 1 I
+X PETn4 B34 -600 -900 150 R 50 50 1 1 I
+X GND B35 0 -1800 150 U 50 50 1 1 P N
+X GND B36 0 -1800 150 U 50 50 1 1 P N
+X PETp5 B37 -600 -1000 150 R 50 50 1 1 I
+X PETn5 B38 -600 -1100 150 R 50 50 1 1 I
+X GND B39 0 -1800 150 U 50 50 1 1 P N
+X GND B4 0 -1800 150 U 50 50 1 1 W
+X GND B40 0 -1800 150 U 50 50 1 1 P N
+X PETp6 B41 -600 -1200 150 R 50 50 1 1 I
+X PETn6 B42 -600 -1300 150 R 50 50 1 1 I
+X GND B43 0 -1800 150 U 50 50 1 1 P N
+X GND B44 0 -1800 150 U 50 50 1 1 P N
+X PETp7 B45 -600 -1400 150 R 50 50 1 1 I
+X PETn7 B46 -600 -1500 150 R 50 50 1 1 I
+X GND B47 0 -1800 150 U 50 50 1 1 P N
+X ~PRSNT2 B48 -600 300 150 R 50 50 1 1 P
+X GND B49 0 -1800 150 U 50 50 1 1 P N
+X SMCLK B5 -600 1200 150 R 50 50 1 1 I
+X SMDAT B6 -600 1100 150 R 50 50 1 1 B
+X GND B7 0 -1800 150 U 50 50 1 1 P N
+X +3.3V B8 100 1800 150 D 50 50 1 1 W
+X JTAG1 B9 600 600 150 L 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
@@ -10734,6 +11224,1837 @@ X ~ 8 0 -300 100 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
+# DIN41612_01x32_A
+#
+DEF DIN41612_01x32_A J 0 40 Y N 1 F N
+F0 "J" 0 1600 50 H V C CNN
+F1 "DIN41612_01x32_A" 0 -1700 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ DIN41612*1x*
+$ENDFPLIST
+DRAW
+S -50 -1595 0 -1605 1 1 6 N
+S -50 -1495 0 -1505 1 1 6 N
+S -50 -1395 0 -1405 1 1 6 N
+S -50 -1295 0 -1305 1 1 6 N
+S -50 -1195 0 -1205 1 1 6 N
+S -50 -1095 0 -1105 1 1 6 N
+S -50 -995 0 -1005 1 1 6 N
+S -50 -895 0 -905 1 1 6 N
+S -50 -795 0 -805 1 1 6 N
+S -50 -695 0 -705 1 1 6 N
+S -50 -595 0 -605 1 1 6 N
+S -50 -495 0 -505 1 1 6 N
+S -50 -395 0 -405 1 1 6 N
+S -50 -295 0 -305 1 1 6 N
+S -50 -195 0 -205 1 1 6 N
+S -50 -95 0 -105 1 1 6 N
+S -50 5 0 -5 1 1 6 N
+S -50 105 0 95 1 1 6 N
+S -50 205 0 195 1 1 6 N
+S -50 305 0 295 1 1 6 N
+S -50 405 0 395 1 1 6 N
+S -50 505 0 495 1 1 6 N
+S -50 605 0 595 1 1 6 N
+S -50 705 0 695 1 1 6 N
+S -50 805 0 795 1 1 6 N
+S -50 905 0 895 1 1 6 N
+S -50 1005 0 995 1 1 6 N
+S -50 1105 0 1095 1 1 6 N
+S -50 1205 0 1195 1 1 6 N
+S -50 1305 0 1295 1 1 6 N
+S -50 1405 0 1395 1 1 6 N
+S -50 1505 0 1495 1 1 6 N
+S -50 1550 50 -1650 1 1 10 f
+X Pin_a1 a1 -200 1500 150 R 50 50 1 1 P
+X Pin_a10 a10 -200 600 150 R 50 50 1 1 P
+X Pin_a11 a11 -200 500 150 R 50 50 1 1 P
+X Pin_a12 a12 -200 400 150 R 50 50 1 1 P
+X Pin_a13 a13 -200 300 150 R 50 50 1 1 P
+X Pin_a14 a14 -200 200 150 R 50 50 1 1 P
+X Pin_a15 a15 -200 100 150 R 50 50 1 1 P
+X Pin_a16 a16 -200 0 150 R 50 50 1 1 P
+X Pin_a17 a17 -200 -100 150 R 50 50 1 1 P
+X Pin_a18 a18 -200 -200 150 R 50 50 1 1 P
+X Pin_a19 a19 -200 -300 150 R 50 50 1 1 P
+X Pin_a2 a2 -200 1400 150 R 50 50 1 1 P
+X Pin_a20 a20 -200 -400 150 R 50 50 1 1 P
+X Pin_a21 a21 -200 -500 150 R 50 50 1 1 P
+X Pin_a22 a22 -200 -600 150 R 50 50 1 1 P
+X Pin_a23 a23 -200 -700 150 R 50 50 1 1 P
+X Pin_a24 a24 -200 -800 150 R 50 50 1 1 P
+X Pin_a25 a25 -200 -900 150 R 50 50 1 1 P
+X Pin_a26 a26 -200 -1000 150 R 50 50 1 1 P
+X Pin_a27 a27 -200 -1100 150 R 50 50 1 1 P
+X Pin_a28 a28 -200 -1200 150 R 50 50 1 1 P
+X Pin_a29 a29 -200 -1300 150 R 50 50 1 1 P
+X Pin_a3 a3 -200 1300 150 R 50 50 1 1 P
+X Pin_a30 a30 -200 -1400 150 R 50 50 1 1 P
+X Pin_a31 a31 -200 -1500 150 R 50 50 1 1 P
+X Pin_a32 a32 -200 -1600 150 R 50 50 1 1 P
+X Pin_a4 a4 -200 1200 150 R 50 50 1 1 P
+X Pin_a5 a5 -200 1100 150 R 50 50 1 1 P
+X Pin_a6 a6 -200 1000 150 R 50 50 1 1 P
+X Pin_a7 a7 -200 900 150 R 50 50 1 1 P
+X Pin_a8 a8 -200 800 150 R 50 50 1 1 P
+X Pin_a9 a9 -200 700 150 R 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# DIN41612_02x05_AB_EvenPins
+#
+DEF DIN41612_02x05_AB_EvenPins J 0 40 Y N 1 F N
+F0 "J" 50 300 50 H V C CNN
+F1 "DIN41612_02x05_AB_EvenPins" 50 -300 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ DIN41612*2x*
+$ENDFPLIST
+DRAW
+S -50 -195 0 -205 1 1 6 N
+S -50 -95 0 -105 1 1 6 N
+S -50 5 0 -5 1 1 6 N
+S -50 105 0 95 1 1 6 N
+S -50 205 0 195 1 1 6 N
+S -50 250 150 -250 1 1 10 f
+S 150 -195 100 -205 1 1 6 N
+S 150 -95 100 -105 1 1 6 N
+S 150 5 100 -5 1 1 6 N
+S 150 105 100 95 1 1 6 N
+S 150 205 100 195 1 1 6 N
+X Pin_a10 a10 -200 -200 150 R 50 50 1 1 P
+X Pin_a2 a2 -200 200 150 R 50 50 1 1 P
+X Pin_a4 a4 -200 100 150 R 50 50 1 1 P
+X Pin_a6 a6 -200 0 150 R 50 50 1 1 P
+X Pin_a8 a8 -200 -100 150 R 50 50 1 1 P
+X Pin_b10 b10 300 -200 150 L 50 50 1 1 P
+X Pin_b2 b2 300 200 150 L 50 50 1 1 P
+X Pin_b4 b4 300 100 150 L 50 50 1 1 P
+X Pin_b6 b6 300 0 150 L 50 50 1 1 P
+X Pin_b8 b8 300 -100 150 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# DIN41612_02x05_AC_EvenPins
+#
+DEF DIN41612_02x05_AC_EvenPins J 0 40 Y N 1 F N
+F0 "J" 50 300 50 H V C CNN
+F1 "DIN41612_02x05_AC_EvenPins" 50 -300 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ DIN41612*2x*
+$ENDFPLIST
+DRAW
+S -50 -195 0 -205 1 1 6 N
+S -50 -95 0 -105 1 1 6 N
+S -50 5 0 -5 1 1 6 N
+S -50 105 0 95 1 1 6 N
+S -50 205 0 195 1 1 6 N
+S -50 250 150 -250 1 1 10 f
+S 150 -195 100 -205 1 1 6 N
+S 150 -95 100 -105 1 1 6 N
+S 150 5 100 -5 1 1 6 N
+S 150 105 100 95 1 1 6 N
+S 150 205 100 195 1 1 6 N
+X Pin_a10 a10 -200 -200 150 R 50 50 1 1 P
+X Pin_a2 a2 -200 200 150 R 50 50 1 1 P
+X Pin_a4 a4 -200 100 150 R 50 50 1 1 P
+X Pin_a6 a6 -200 0 150 R 50 50 1 1 P
+X Pin_a8 a8 -200 -100 150 R 50 50 1 1 P
+X Pin_c10 c10 300 -200 150 L 50 50 1 1 P
+X Pin_c2 c2 300 200 150 L 50 50 1 1 P
+X Pin_c4 c4 300 100 150 L 50 50 1 1 P
+X Pin_c6 c6 300 0 150 L 50 50 1 1 P
+X Pin_c8 c8 300 -100 150 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# DIN41612_02x05_AE_EvenPins
+#
+DEF DIN41612_02x05_AE_EvenPins J 0 40 Y N 1 F N
+F0 "J" 50 300 50 H V C CNN
+F1 "DIN41612_02x05_AE_EvenPins" 50 -300 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ DIN41612*2x*
+$ENDFPLIST
+DRAW
+S -50 -195 0 -205 1 1 6 N
+S -50 -95 0 -105 1 1 6 N
+S -50 5 0 -5 1 1 6 N
+S -50 105 0 95 1 1 6 N
+S -50 205 0 195 1 1 6 N
+S -50 250 150 -250 1 1 10 f
+S 150 -195 100 -205 1 1 6 N
+S 150 -95 100 -105 1 1 6 N
+S 150 5 100 -5 1 1 6 N
+S 150 105 100 95 1 1 6 N
+S 150 205 100 195 1 1 6 N
+X Pin_a10 a10 -200 -200 150 R 50 50 1 1 P
+X Pin_a2 a2 -200 200 150 R 50 50 1 1 P
+X Pin_a4 a4 -200 100 150 R 50 50 1 1 P
+X Pin_a6 a6 -200 0 150 R 50 50 1 1 P
+X Pin_a8 a8 -200 -100 150 R 50 50 1 1 P
+X Pin_e10 e10 300 -200 150 L 50 50 1 1 P
+X Pin_e2 e2 300 200 150 L 50 50 1 1 P
+X Pin_e4 e4 300 100 150 L 50 50 1 1 P
+X Pin_e6 e6 300 0 150 L 50 50 1 1 P
+X Pin_e8 e8 300 -100 150 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# DIN41612_02x05_ZB_EvenPins
+#
+DEF DIN41612_02x05_ZB_EvenPins J 0 40 Y N 1 F N
+F0 "J" 50 300 50 H V C CNN
+F1 "DIN41612_02x05_ZB_EvenPins" 50 -300 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ DIN41612*2x*
+$ENDFPLIST
+DRAW
+S -50 -195 0 -205 1 1 6 N
+S -50 -95 0 -105 1 1 6 N
+S -50 5 0 -5 1 1 6 N
+S -50 105 0 95 1 1 6 N
+S -50 205 0 195 1 1 6 N
+S -50 250 150 -250 1 1 10 f
+S 150 -195 100 -205 1 1 6 N
+S 150 -95 100 -105 1 1 6 N
+S 150 5 100 -5 1 1 6 N
+S 150 105 100 95 1 1 6 N
+S 150 205 100 195 1 1 6 N
+X Pin_b10 b10 300 -200 150 L 50 50 1 1 P
+X Pin_b2 b2 300 200 150 L 50 50 1 1 P
+X Pin_b4 b4 300 100 150 L 50 50 1 1 P
+X Pin_b6 b6 300 0 150 L 50 50 1 1 P
+X Pin_b8 b8 300 -100 150 L 50 50 1 1 P
+X Pin_z10 z10 -200 -200 150 R 50 50 1 1 P
+X Pin_z2 z2 -200 200 150 R 50 50 1 1 P
+X Pin_z4 z4 -200 100 150 R 50 50 1 1 P
+X Pin_z6 z6 -200 0 150 R 50 50 1 1 P
+X Pin_z8 z8 -200 -100 150 R 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# DIN41612_02x08_AB_EvenPins
+#
+DEF DIN41612_02x08_AB_EvenPins J 0 40 Y N 1 F N
+F0 "J" 50 400 50 H V C CNN
+F1 "DIN41612_02x08_AB_EvenPins" 50 -500 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ DIN41612*2x*
+$ENDFPLIST
+DRAW
+S -50 -395 0 -405 1 1 6 N
+S -50 -295 0 -305 1 1 6 N
+S -50 -195 0 -205 1 1 6 N
+S -50 -95 0 -105 1 1 6 N
+S -50 5 0 -5 1 1 6 N
+S -50 105 0 95 1 1 6 N
+S -50 205 0 195 1 1 6 N
+S -50 305 0 295 1 1 6 N
+S -50 350 150 -450 1 1 10 f
+S 150 -395 100 -405 1 1 6 N
+S 150 -295 100 -305 1 1 6 N
+S 150 -195 100 -205 1 1 6 N
+S 150 -95 100 -105 1 1 6 N
+S 150 5 100 -5 1 1 6 N
+S 150 105 100 95 1 1 6 N
+S 150 205 100 195 1 1 6 N
+S 150 305 100 295 1 1 6 N
+X Pin_a10 a10 -200 -100 150 R 50 50 1 1 P
+X Pin_a12 a12 -200 -200 150 R 50 50 1 1 P
+X Pin_a14 a14 -200 -300 150 R 50 50 1 1 P
+X Pin_a16 a16 -200 -400 150 R 50 50 1 1 P
+X Pin_a2 a2 -200 300 150 R 50 50 1 1 P
+X Pin_a4 a4 -200 200 150 R 50 50 1 1 P
+X Pin_a6 a6 -200 100 150 R 50 50 1 1 P
+X Pin_a8 a8 -200 0 150 R 50 50 1 1 P
+X Pin_b10 b10 300 -100 150 L 50 50 1 1 P
+X Pin_b12 b12 300 -200 150 L 50 50 1 1 P
+X Pin_b14 b14 300 -300 150 L 50 50 1 1 P
+X Pin_b16 b16 300 -400 150 L 50 50 1 1 P
+X Pin_b2 b2 300 300 150 L 50 50 1 1 P
+X Pin_b4 b4 300 200 150 L 50 50 1 1 P
+X Pin_b6 b6 300 100 150 L 50 50 1 1 P
+X Pin_b8 b8 300 0 150 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# DIN41612_02x08_AC_EvenPins
+#
+DEF DIN41612_02x08_AC_EvenPins J 0 40 Y N 1 F N
+F0 "J" 50 400 50 H V C CNN
+F1 "DIN41612_02x08_AC_EvenPins" 50 -500 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ DIN41612*2x*
+$ENDFPLIST
+DRAW
+S -50 -395 0 -405 1 1 6 N
+S -50 -295 0 -305 1 1 6 N
+S -50 -195 0 -205 1 1 6 N
+S -50 -95 0 -105 1 1 6 N
+S -50 5 0 -5 1 1 6 N
+S -50 105 0 95 1 1 6 N
+S -50 205 0 195 1 1 6 N
+S -50 305 0 295 1 1 6 N
+S -50 350 150 -450 1 1 10 f
+S 150 -395 100 -405 1 1 6 N
+S 150 -295 100 -305 1 1 6 N
+S 150 -195 100 -205 1 1 6 N
+S 150 -95 100 -105 1 1 6 N
+S 150 5 100 -5 1 1 6 N
+S 150 105 100 95 1 1 6 N
+S 150 205 100 195 1 1 6 N
+S 150 305 100 295 1 1 6 N
+X Pin_a10 a10 -200 -100 150 R 50 50 1 1 P
+X Pin_a12 a12 -200 -200 150 R 50 50 1 1 P
+X Pin_a14 a14 -200 -300 150 R 50 50 1 1 P
+X Pin_a16 a16 -200 -400 150 R 50 50 1 1 P
+X Pin_a2 a2 -200 300 150 R 50 50 1 1 P
+X Pin_a4 a4 -200 200 150 R 50 50 1 1 P
+X Pin_a6 a6 -200 100 150 R 50 50 1 1 P
+X Pin_a8 a8 -200 0 150 R 50 50 1 1 P
+X Pin_c10 c10 300 -100 150 L 50 50 1 1 P
+X Pin_c12 c12 300 -200 150 L 50 50 1 1 P
+X Pin_c14 c14 300 -300 150 L 50 50 1 1 P
+X Pin_c16 c16 300 -400 150 L 50 50 1 1 P
+X Pin_c2 c2 300 300 150 L 50 50 1 1 P
+X Pin_c4 c4 300 200 150 L 50 50 1 1 P
+X Pin_c6 c6 300 100 150 L 50 50 1 1 P
+X Pin_c8 c8 300 0 150 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# DIN41612_02x08_AE_EvenPins
+#
+DEF DIN41612_02x08_AE_EvenPins J 0 40 Y N 1 F N
+F0 "J" 50 400 50 H V C CNN
+F1 "DIN41612_02x08_AE_EvenPins" 50 -500 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ DIN41612*2x*
+$ENDFPLIST
+DRAW
+S -50 -395 0 -405 1 1 6 N
+S -50 -295 0 -305 1 1 6 N
+S -50 -195 0 -205 1 1 6 N
+S -50 -95 0 -105 1 1 6 N
+S -50 5 0 -5 1 1 6 N
+S -50 105 0 95 1 1 6 N
+S -50 205 0 195 1 1 6 N
+S -50 305 0 295 1 1 6 N
+S -50 350 150 -450 1 1 10 f
+S 150 -395 100 -405 1 1 6 N
+S 150 -295 100 -305 1 1 6 N
+S 150 -195 100 -205 1 1 6 N
+S 150 -95 100 -105 1 1 6 N
+S 150 5 100 -5 1 1 6 N
+S 150 105 100 95 1 1 6 N
+S 150 205 100 195 1 1 6 N
+S 150 305 100 295 1 1 6 N
+X Pin_a10 a10 -200 -100 150 R 50 50 1 1 P
+X Pin_a12 a12 -200 -200 150 R 50 50 1 1 P
+X Pin_a14 a14 -200 -300 150 R 50 50 1 1 P
+X Pin_a16 a16 -200 -400 150 R 50 50 1 1 P
+X Pin_a2 a2 -200 300 150 R 50 50 1 1 P
+X Pin_a4 a4 -200 200 150 R 50 50 1 1 P
+X Pin_a6 a6 -200 100 150 R 50 50 1 1 P
+X Pin_a8 a8 -200 0 150 R 50 50 1 1 P
+X Pin_e10 e10 300 -100 150 L 50 50 1 1 P
+X Pin_e12 e12 300 -200 150 L 50 50 1 1 P
+X Pin_e14 e14 300 -300 150 L 50 50 1 1 P
+X Pin_e16 e16 300 -400 150 L 50 50 1 1 P
+X Pin_e2 e2 300 300 150 L 50 50 1 1 P
+X Pin_e4 e4 300 200 150 L 50 50 1 1 P
+X Pin_e6 e6 300 100 150 L 50 50 1 1 P
+X Pin_e8 e8 300 0 150 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# DIN41612_02x08_ZB_EvenPins
+#
+DEF DIN41612_02x08_ZB_EvenPins J 0 40 Y N 1 F N
+F0 "J" 50 400 50 H V C CNN
+F1 "DIN41612_02x08_ZB_EvenPins" 50 -500 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ DIN41612*2x*
+$ENDFPLIST
+DRAW
+S -50 -395 0 -405 1 1 6 N
+S -50 -295 0 -305 1 1 6 N
+S -50 -195 0 -205 1 1 6 N
+S -50 -95 0 -105 1 1 6 N
+S -50 5 0 -5 1 1 6 N
+S -50 105 0 95 1 1 6 N
+S -50 205 0 195 1 1 6 N
+S -50 305 0 295 1 1 6 N
+S -50 350 150 -450 1 1 10 f
+S 150 -395 100 -405 1 1 6 N
+S 150 -295 100 -305 1 1 6 N
+S 150 -195 100 -205 1 1 6 N
+S 150 -95 100 -105 1 1 6 N
+S 150 5 100 -5 1 1 6 N
+S 150 105 100 95 1 1 6 N
+S 150 205 100 195 1 1 6 N
+S 150 305 100 295 1 1 6 N
+X Pin_b10 b10 300 -100 150 L 50 50 1 1 P
+X Pin_b12 b12 300 -200 150 L 50 50 1 1 P
+X Pin_b14 b14 300 -300 150 L 50 50 1 1 P
+X Pin_b16 b16 300 -400 150 L 50 50 1 1 P
+X Pin_b2 b2 300 300 150 L 50 50 1 1 P
+X Pin_b4 b4 300 200 150 L 50 50 1 1 P
+X Pin_b6 b6 300 100 150 L 50 50 1 1 P
+X Pin_b8 b8 300 0 150 L 50 50 1 1 P
+X Pin_z10 z10 -200 -100 150 R 50 50 1 1 P
+X Pin_z12 z12 -200 -200 150 R 50 50 1 1 P
+X Pin_z14 z14 -200 -300 150 R 50 50 1 1 P
+X Pin_z16 z16 -200 -400 150 R 50 50 1 1 P
+X Pin_z2 z2 -200 300 150 R 50 50 1 1 P
+X Pin_z4 z4 -200 200 150 R 50 50 1 1 P
+X Pin_z6 z6 -200 100 150 R 50 50 1 1 P
+X Pin_z8 z8 -200 0 150 R 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# DIN41612_02x10_AB
+#
+DEF DIN41612_02x10_AB J 0 40 Y N 1 F N
+F0 "J" 50 500 50 H V C CNN
+F1 "DIN41612_02x10_AB" 50 -600 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ DIN41612*2x*
+$ENDFPLIST
+DRAW
+S -50 -495 0 -505 1 1 6 N
+S -50 -395 0 -405 1 1 6 N
+S -50 -295 0 -305 1 1 6 N
+S -50 -195 0 -205 1 1 6 N
+S -50 -95 0 -105 1 1 6 N
+S -50 5 0 -5 1 1 6 N
+S -50 105 0 95 1 1 6 N
+S -50 205 0 195 1 1 6 N
+S -50 305 0 295 1 1 6 N
+S -50 405 0 395 1 1 6 N
+S -50 450 150 -550 1 1 10 f
+S 150 -495 100 -505 1 1 6 N
+S 150 -395 100 -405 1 1 6 N
+S 150 -295 100 -305 1 1 6 N
+S 150 -195 100 -205 1 1 6 N
+S 150 -95 100 -105 1 1 6 N
+S 150 5 100 -5 1 1 6 N
+S 150 105 100 95 1 1 6 N
+S 150 205 100 195 1 1 6 N
+S 150 305 100 295 1 1 6 N
+S 150 405 100 395 1 1 6 N
+X Pin_a1 a1 -200 400 150 R 50 50 1 1 P
+X Pin_a10 a10 -200 -500 150 R 50 50 1 1 P
+X Pin_a2 a2 -200 300 150 R 50 50 1 1 P
+X Pin_a3 a3 -200 200 150 R 50 50 1 1 P
+X Pin_a4 a4 -200 100 150 R 50 50 1 1 P
+X Pin_a5 a5 -200 0 150 R 50 50 1 1 P
+X Pin_a6 a6 -200 -100 150 R 50 50 1 1 P
+X Pin_a7 a7 -200 -200 150 R 50 50 1 1 P
+X Pin_a8 a8 -200 -300 150 R 50 50 1 1 P
+X Pin_a9 a9 -200 -400 150 R 50 50 1 1 P
+X Pin_b1 b1 300 400 150 L 50 50 1 1 P
+X Pin_b10 b10 300 -500 150 L 50 50 1 1 P
+X Pin_b2 b2 300 300 150 L 50 50 1 1 P
+X Pin_b3 b3 300 200 150 L 50 50 1 1 P
+X Pin_b4 b4 300 100 150 L 50 50 1 1 P
+X Pin_b5 b5 300 0 150 L 50 50 1 1 P
+X Pin_b6 b6 300 -100 150 L 50 50 1 1 P
+X Pin_b7 b7 300 -200 150 L 50 50 1 1 P
+X Pin_b8 b8 300 -300 150 L 50 50 1 1 P
+X Pin_b9 b9 300 -400 150 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# DIN41612_02x10_AC
+#
+DEF DIN41612_02x10_AC J 0 40 Y N 1 F N
+F0 "J" 50 500 50 H V C CNN
+F1 "DIN41612_02x10_AC" 50 -600 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ DIN41612*2x*
+$ENDFPLIST
+DRAW
+S -50 -495 0 -505 1 1 6 N
+S -50 -395 0 -405 1 1 6 N
+S -50 -295 0 -305 1 1 6 N
+S -50 -195 0 -205 1 1 6 N
+S -50 -95 0 -105 1 1 6 N
+S -50 5 0 -5 1 1 6 N
+S -50 105 0 95 1 1 6 N
+S -50 205 0 195 1 1 6 N
+S -50 305 0 295 1 1 6 N
+S -50 405 0 395 1 1 6 N
+S -50 450 150 -550 1 1 10 f
+S 150 -495 100 -505 1 1 6 N
+S 150 -395 100 -405 1 1 6 N
+S 150 -295 100 -305 1 1 6 N
+S 150 -195 100 -205 1 1 6 N
+S 150 -95 100 -105 1 1 6 N
+S 150 5 100 -5 1 1 6 N
+S 150 105 100 95 1 1 6 N
+S 150 205 100 195 1 1 6 N
+S 150 305 100 295 1 1 6 N
+S 150 405 100 395 1 1 6 N
+X Pin_a1 a1 -200 400 150 R 50 50 1 1 P
+X Pin_a10 a10 -200 -500 150 R 50 50 1 1 P
+X Pin_a2 a2 -200 300 150 R 50 50 1 1 P
+X Pin_a3 a3 -200 200 150 R 50 50 1 1 P
+X Pin_a4 a4 -200 100 150 R 50 50 1 1 P
+X Pin_a5 a5 -200 0 150 R 50 50 1 1 P
+X Pin_a6 a6 -200 -100 150 R 50 50 1 1 P
+X Pin_a7 a7 -200 -200 150 R 50 50 1 1 P
+X Pin_a8 a8 -200 -300 150 R 50 50 1 1 P
+X Pin_a9 a9 -200 -400 150 R 50 50 1 1 P
+X Pin_c1 c1 300 400 150 L 50 50 1 1 P
+X Pin_c10 c10 300 -500 150 L 50 50 1 1 P
+X Pin_c2 c2 300 300 150 L 50 50 1 1 P
+X Pin_c3 c3 300 200 150 L 50 50 1 1 P
+X Pin_c4 c4 300 100 150 L 50 50 1 1 P
+X Pin_c5 c5 300 0 150 L 50 50 1 1 P
+X Pin_c6 c6 300 -100 150 L 50 50 1 1 P
+X Pin_c7 c7 300 -200 150 L 50 50 1 1 P
+X Pin_c8 c8 300 -300 150 L 50 50 1 1 P
+X Pin_c9 c9 300 -400 150 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# DIN41612_02x10_AE
+#
+DEF DIN41612_02x10_AE J 0 40 Y N 1 F N
+F0 "J" 50 500 50 H V C CNN
+F1 "DIN41612_02x10_AE" 50 -600 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ DIN41612*2x*
+$ENDFPLIST
+DRAW
+S -50 -495 0 -505 1 1 6 N
+S -50 -395 0 -405 1 1 6 N
+S -50 -295 0 -305 1 1 6 N
+S -50 -195 0 -205 1 1 6 N
+S -50 -95 0 -105 1 1 6 N
+S -50 5 0 -5 1 1 6 N
+S -50 105 0 95 1 1 6 N
+S -50 205 0 195 1 1 6 N
+S -50 305 0 295 1 1 6 N
+S -50 405 0 395 1 1 6 N
+S -50 450 150 -550 1 1 10 f
+S 150 -495 100 -505 1 1 6 N
+S 150 -395 100 -405 1 1 6 N
+S 150 -295 100 -305 1 1 6 N
+S 150 -195 100 -205 1 1 6 N
+S 150 -95 100 -105 1 1 6 N
+S 150 5 100 -5 1 1 6 N
+S 150 105 100 95 1 1 6 N
+S 150 205 100 195 1 1 6 N
+S 150 305 100 295 1 1 6 N
+S 150 405 100 395 1 1 6 N
+X Pin_a1 a1 -200 400 150 R 50 50 1 1 P
+X Pin_a10 a10 -200 -500 150 R 50 50 1 1 P
+X Pin_a2 a2 -200 300 150 R 50 50 1 1 P
+X Pin_a3 a3 -200 200 150 R 50 50 1 1 P
+X Pin_a4 a4 -200 100 150 R 50 50 1 1 P
+X Pin_a5 a5 -200 0 150 R 50 50 1 1 P
+X Pin_a6 a6 -200 -100 150 R 50 50 1 1 P
+X Pin_a7 a7 -200 -200 150 R 50 50 1 1 P
+X Pin_a8 a8 -200 -300 150 R 50 50 1 1 P
+X Pin_a9 a9 -200 -400 150 R 50 50 1 1 P
+X Pin_e1 e1 300 400 150 L 50 50 1 1 P
+X Pin_e10 e10 300 -500 150 L 50 50 1 1 P
+X Pin_e2 e2 300 300 150 L 50 50 1 1 P
+X Pin_e3 e3 300 200 150 L 50 50 1 1 P
+X Pin_e4 e4 300 100 150 L 50 50 1 1 P
+X Pin_e5 e5 300 0 150 L 50 50 1 1 P
+X Pin_e6 e6 300 -100 150 L 50 50 1 1 P
+X Pin_e7 e7 300 -200 150 L 50 50 1 1 P
+X Pin_e8 e8 300 -300 150 L 50 50 1 1 P
+X Pin_e9 e9 300 -400 150 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# DIN41612_02x10_ZB
+#
+DEF DIN41612_02x10_ZB J 0 40 Y N 1 F N
+F0 "J" 50 500 50 H V C CNN
+F1 "DIN41612_02x10_ZB" 50 -600 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ DIN41612*2x*
+$ENDFPLIST
+DRAW
+S -50 -495 0 -505 1 1 6 N
+S -50 -395 0 -405 1 1 6 N
+S -50 -295 0 -305 1 1 6 N
+S -50 -195 0 -205 1 1 6 N
+S -50 -95 0 -105 1 1 6 N
+S -50 5 0 -5 1 1 6 N
+S -50 105 0 95 1 1 6 N
+S -50 205 0 195 1 1 6 N
+S -50 305 0 295 1 1 6 N
+S -50 405 0 395 1 1 6 N
+S -50 450 150 -550 1 1 10 f
+S 150 -495 100 -505 1 1 6 N
+S 150 -395 100 -405 1 1 6 N
+S 150 -295 100 -305 1 1 6 N
+S 150 -195 100 -205 1 1 6 N
+S 150 -95 100 -105 1 1 6 N
+S 150 5 100 -5 1 1 6 N
+S 150 105 100 95 1 1 6 N
+S 150 205 100 195 1 1 6 N
+S 150 305 100 295 1 1 6 N
+S 150 405 100 395 1 1 6 N
+X Pin_b1 b1 300 400 150 L 50 50 1 1 P
+X Pin_b10 b10 300 -500 150 L 50 50 1 1 P
+X Pin_b2 b2 300 300 150 L 50 50 1 1 P
+X Pin_b3 b3 300 200 150 L 50 50 1 1 P
+X Pin_b4 b4 300 100 150 L 50 50 1 1 P
+X Pin_b5 b5 300 0 150 L 50 50 1 1 P
+X Pin_b6 b6 300 -100 150 L 50 50 1 1 P
+X Pin_b7 b7 300 -200 150 L 50 50 1 1 P
+X Pin_b8 b8 300 -300 150 L 50 50 1 1 P
+X Pin_b9 b9 300 -400 150 L 50 50 1 1 P
+X Pin_z1 z1 -200 400 150 R 50 50 1 1 P
+X Pin_z10 z10 -200 -500 150 R 50 50 1 1 P
+X Pin_z2 z2 -200 300 150 R 50 50 1 1 P
+X Pin_z3 z3 -200 200 150 R 50 50 1 1 P
+X Pin_z4 z4 -200 100 150 R 50 50 1 1 P
+X Pin_z5 z5 -200 0 150 R 50 50 1 1 P
+X Pin_z6 z6 -200 -100 150 R 50 50 1 1 P
+X Pin_z7 z7 -200 -200 150 R 50 50 1 1 P
+X Pin_z8 z8 -200 -300 150 R 50 50 1 1 P
+X Pin_z9 z9 -200 -400 150 R 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# DIN41612_02x16_AB
+#
+DEF DIN41612_02x16_AB J 0 40 Y N 1 F N
+F0 "J" 50 800 50 H V C CNN
+F1 "DIN41612_02x16_AB" 50 -900 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ DIN41612*2x*
+$ENDFPLIST
+DRAW
+S -50 -795 0 -805 1 1 6 N
+S -50 -695 0 -705 1 1 6 N
+S -50 -595 0 -605 1 1 6 N
+S -50 -495 0 -505 1 1 6 N
+S -50 -395 0 -405 1 1 6 N
+S -50 -295 0 -305 1 1 6 N
+S -50 -195 0 -205 1 1 6 N
+S -50 -95 0 -105 1 1 6 N
+S -50 5 0 -5 1 1 6 N
+S -50 105 0 95 1 1 6 N
+S -50 205 0 195 1 1 6 N
+S -50 305 0 295 1 1 6 N
+S -50 405 0 395 1 1 6 N
+S -50 505 0 495 1 1 6 N
+S -50 605 0 595 1 1 6 N
+S -50 705 0 695 1 1 6 N
+S -50 750 150 -850 1 1 10 f
+S 150 -795 100 -805 1 1 6 N
+S 150 -695 100 -705 1 1 6 N
+S 150 -595 100 -605 1 1 6 N
+S 150 -495 100 -505 1 1 6 N
+S 150 -395 100 -405 1 1 6 N
+S 150 -295 100 -305 1 1 6 N
+S 150 -195 100 -205 1 1 6 N
+S 150 -95 100 -105 1 1 6 N
+S 150 5 100 -5 1 1 6 N
+S 150 105 100 95 1 1 6 N
+S 150 205 100 195 1 1 6 N
+S 150 305 100 295 1 1 6 N
+S 150 405 100 395 1 1 6 N
+S 150 505 100 495 1 1 6 N
+S 150 605 100 595 1 1 6 N
+S 150 705 100 695 1 1 6 N
+X Pin_a1 a1 -200 700 150 R 50 50 1 1 P
+X Pin_a10 a10 -200 -200 150 R 50 50 1 1 P
+X Pin_a11 a11 -200 -300 150 R 50 50 1 1 P
+X Pin_a12 a12 -200 -400 150 R 50 50 1 1 P
+X Pin_a13 a13 -200 -500 150 R 50 50 1 1 P
+X Pin_a14 a14 -200 -600 150 R 50 50 1 1 P
+X Pin_a15 a15 -200 -700 150 R 50 50 1 1 P
+X Pin_a16 a16 -200 -800 150 R 50 50 1 1 P
+X Pin_a2 a2 -200 600 150 R 50 50 1 1 P
+X Pin_a3 a3 -200 500 150 R 50 50 1 1 P
+X Pin_a4 a4 -200 400 150 R 50 50 1 1 P
+X Pin_a5 a5 -200 300 150 R 50 50 1 1 P
+X Pin_a6 a6 -200 200 150 R 50 50 1 1 P
+X Pin_a7 a7 -200 100 150 R 50 50 1 1 P
+X Pin_a8 a8 -200 0 150 R 50 50 1 1 P
+X Pin_a9 a9 -200 -100 150 R 50 50 1 1 P
+X Pin_b1 b1 300 700 150 L 50 50 1 1 P
+X Pin_b10 b10 300 -200 150 L 50 50 1 1 P
+X Pin_b11 b11 300 -300 150 L 50 50 1 1 P
+X Pin_b12 b12 300 -400 150 L 50 50 1 1 P
+X Pin_b13 b13 300 -500 150 L 50 50 1 1 P
+X Pin_b14 b14 300 -600 150 L 50 50 1 1 P
+X Pin_b15 b15 300 -700 150 L 50 50 1 1 P
+X Pin_b16 b16 300 -800 150 L 50 50 1 1 P
+X Pin_b2 b2 300 600 150 L 50 50 1 1 P
+X Pin_b3 b3 300 500 150 L 50 50 1 1 P
+X Pin_b4 b4 300 400 150 L 50 50 1 1 P
+X Pin_b5 b5 300 300 150 L 50 50 1 1 P
+X Pin_b6 b6 300 200 150 L 50 50 1 1 P
+X Pin_b7 b7 300 100 150 L 50 50 1 1 P
+X Pin_b8 b8 300 0 150 L 50 50 1 1 P
+X Pin_b9 b9 300 -100 150 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# DIN41612_02x16_AB_EvenPins
+#
+DEF DIN41612_02x16_AB_EvenPins J 0 40 Y N 1 F N
+F0 "J" 50 800 50 H V C CNN
+F1 "DIN41612_02x16_AB_EvenPins" 50 -900 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ DIN41612*2x*
+$ENDFPLIST
+DRAW
+S -50 -795 0 -805 1 1 6 N
+S -50 -695 0 -705 1 1 6 N
+S -50 -595 0 -605 1 1 6 N
+S -50 -495 0 -505 1 1 6 N
+S -50 -395 0 -405 1 1 6 N
+S -50 -295 0 -305 1 1 6 N
+S -50 -195 0 -205 1 1 6 N
+S -50 -95 0 -105 1 1 6 N
+S -50 5 0 -5 1 1 6 N
+S -50 105 0 95 1 1 6 N
+S -50 205 0 195 1 1 6 N
+S -50 305 0 295 1 1 6 N
+S -50 405 0 395 1 1 6 N
+S -50 505 0 495 1 1 6 N
+S -50 605 0 595 1 1 6 N
+S -50 705 0 695 1 1 6 N
+S -50 750 150 -850 1 1 10 f
+S 150 -795 100 -805 1 1 6 N
+S 150 -695 100 -705 1 1 6 N
+S 150 -595 100 -605 1 1 6 N
+S 150 -495 100 -505 1 1 6 N
+S 150 -395 100 -405 1 1 6 N
+S 150 -295 100 -305 1 1 6 N
+S 150 -195 100 -205 1 1 6 N
+S 150 -95 100 -105 1 1 6 N
+S 150 5 100 -5 1 1 6 N
+S 150 105 100 95 1 1 6 N
+S 150 205 100 195 1 1 6 N
+S 150 305 100 295 1 1 6 N
+S 150 405 100 395 1 1 6 N
+S 150 505 100 495 1 1 6 N
+S 150 605 100 595 1 1 6 N
+S 150 705 100 695 1 1 6 N
+X Pin_a10 a10 -200 300 150 R 50 50 1 1 P
+X Pin_a12 a12 -200 200 150 R 50 50 1 1 P
+X Pin_a14 a14 -200 100 150 R 50 50 1 1 P
+X Pin_a16 a16 -200 0 150 R 50 50 1 1 P
+X Pin_a18 a18 -200 -100 150 R 50 50 1 1 P
+X Pin_a2 a2 -200 700 150 R 50 50 1 1 P
+X Pin_a20 a20 -200 -200 150 R 50 50 1 1 P
+X Pin_a22 a22 -200 -300 150 R 50 50 1 1 P
+X Pin_a24 a24 -200 -400 150 R 50 50 1 1 P
+X Pin_a26 a26 -200 -500 150 R 50 50 1 1 P
+X Pin_a28 a28 -200 -600 150 R 50 50 1 1 P
+X Pin_a30 a30 -200 -700 150 R 50 50 1 1 P
+X Pin_a32 a32 -200 -800 150 R 50 50 1 1 P
+X Pin_a4 a4 -200 600 150 R 50 50 1 1 P
+X Pin_a6 a6 -200 500 150 R 50 50 1 1 P
+X Pin_a8 a8 -200 400 150 R 50 50 1 1 P
+X Pin_b10 b10 300 300 150 L 50 50 1 1 P
+X Pin_b12 b12 300 200 150 L 50 50 1 1 P
+X Pin_b14 b14 300 100 150 L 50 50 1 1 P
+X Pin_b16 b16 300 0 150 L 50 50 1 1 P
+X Pin_b18 b18 300 -100 150 L 50 50 1 1 P
+X Pin_b2 b2 300 700 150 L 50 50 1 1 P
+X Pin_b20 b20 300 -200 150 L 50 50 1 1 P
+X Pin_b22 b22 300 -300 150 L 50 50 1 1 P
+X Pin_b24 b24 300 -400 150 L 50 50 1 1 P
+X Pin_b26 b26 300 -500 150 L 50 50 1 1 P
+X Pin_b28 b28 300 -600 150 L 50 50 1 1 P
+X Pin_b30 b30 300 -700 150 L 50 50 1 1 P
+X Pin_b32 b32 300 -800 150 L 50 50 1 1 P
+X Pin_b4 b4 300 600 150 L 50 50 1 1 P
+X Pin_b6 b6 300 500 150 L 50 50 1 1 P
+X Pin_b8 b8 300 400 150 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# DIN41612_02x16_AC
+#
+DEF DIN41612_02x16_AC J 0 40 Y N 1 F N
+F0 "J" 50 800 50 H V C CNN
+F1 "DIN41612_02x16_AC" 50 -900 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ DIN41612*2x*
+$ENDFPLIST
+DRAW
+S -50 -795 0 -805 1 1 6 N
+S -50 -695 0 -705 1 1 6 N
+S -50 -595 0 -605 1 1 6 N
+S -50 -495 0 -505 1 1 6 N
+S -50 -395 0 -405 1 1 6 N
+S -50 -295 0 -305 1 1 6 N
+S -50 -195 0 -205 1 1 6 N
+S -50 -95 0 -105 1 1 6 N
+S -50 5 0 -5 1 1 6 N
+S -50 105 0 95 1 1 6 N
+S -50 205 0 195 1 1 6 N
+S -50 305 0 295 1 1 6 N
+S -50 405 0 395 1 1 6 N
+S -50 505 0 495 1 1 6 N
+S -50 605 0 595 1 1 6 N
+S -50 705 0 695 1 1 6 N
+S -50 750 150 -850 1 1 10 f
+S 150 -795 100 -805 1 1 6 N
+S 150 -695 100 -705 1 1 6 N
+S 150 -595 100 -605 1 1 6 N
+S 150 -495 100 -505 1 1 6 N
+S 150 -395 100 -405 1 1 6 N
+S 150 -295 100 -305 1 1 6 N
+S 150 -195 100 -205 1 1 6 N
+S 150 -95 100 -105 1 1 6 N
+S 150 5 100 -5 1 1 6 N
+S 150 105 100 95 1 1 6 N
+S 150 205 100 195 1 1 6 N
+S 150 305 100 295 1 1 6 N
+S 150 405 100 395 1 1 6 N
+S 150 505 100 495 1 1 6 N
+S 150 605 100 595 1 1 6 N
+S 150 705 100 695 1 1 6 N
+X Pin_a1 a1 -200 700 150 R 50 50 1 1 P
+X Pin_a10 a10 -200 -200 150 R 50 50 1 1 P
+X Pin_a11 a11 -200 -300 150 R 50 50 1 1 P
+X Pin_a12 a12 -200 -400 150 R 50 50 1 1 P
+X Pin_a13 a13 -200 -500 150 R 50 50 1 1 P
+X Pin_a14 a14 -200 -600 150 R 50 50 1 1 P
+X Pin_a15 a15 -200 -700 150 R 50 50 1 1 P
+X Pin_a16 a16 -200 -800 150 R 50 50 1 1 P
+X Pin_a2 a2 -200 600 150 R 50 50 1 1 P
+X Pin_a3 a3 -200 500 150 R 50 50 1 1 P
+X Pin_a4 a4 -200 400 150 R 50 50 1 1 P
+X Pin_a5 a5 -200 300 150 R 50 50 1 1 P
+X Pin_a6 a6 -200 200 150 R 50 50 1 1 P
+X Pin_a7 a7 -200 100 150 R 50 50 1 1 P
+X Pin_a8 a8 -200 0 150 R 50 50 1 1 P
+X Pin_a9 a9 -200 -100 150 R 50 50 1 1 P
+X Pin_c1 c1 300 700 150 L 50 50 1 1 P
+X Pin_c10 c10 300 -200 150 L 50 50 1 1 P
+X Pin_c11 c11 300 -300 150 L 50 50 1 1 P
+X Pin_c12 c12 300 -400 150 L 50 50 1 1 P
+X Pin_c13 c13 300 -500 150 L 50 50 1 1 P
+X Pin_c14 c14 300 -600 150 L 50 50 1 1 P
+X Pin_c15 c15 300 -700 150 L 50 50 1 1 P
+X Pin_c16 c16 300 -800 150 L 50 50 1 1 P
+X Pin_c2 c2 300 600 150 L 50 50 1 1 P
+X Pin_c3 c3 300 500 150 L 50 50 1 1 P
+X Pin_c4 c4 300 400 150 L 50 50 1 1 P
+X Pin_c5 c5 300 300 150 L 50 50 1 1 P
+X Pin_c6 c6 300 200 150 L 50 50 1 1 P
+X Pin_c7 c7 300 100 150 L 50 50 1 1 P
+X Pin_c8 c8 300 0 150 L 50 50 1 1 P
+X Pin_c9 c9 300 -100 150 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# DIN41612_02x16_AC_EvenPins
+#
+DEF DIN41612_02x16_AC_EvenPins J 0 40 Y N 1 F N
+F0 "J" 50 800 50 H V C CNN
+F1 "DIN41612_02x16_AC_EvenPins" 50 -900 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ DIN41612*2x*
+$ENDFPLIST
+DRAW
+S -50 -795 0 -805 1 1 6 N
+S -50 -695 0 -705 1 1 6 N
+S -50 -595 0 -605 1 1 6 N
+S -50 -495 0 -505 1 1 6 N
+S -50 -395 0 -405 1 1 6 N
+S -50 -295 0 -305 1 1 6 N
+S -50 -195 0 -205 1 1 6 N
+S -50 -95 0 -105 1 1 6 N
+S -50 5 0 -5 1 1 6 N
+S -50 105 0 95 1 1 6 N
+S -50 205 0 195 1 1 6 N
+S -50 305 0 295 1 1 6 N
+S -50 405 0 395 1 1 6 N
+S -50 505 0 495 1 1 6 N
+S -50 605 0 595 1 1 6 N
+S -50 705 0 695 1 1 6 N
+S -50 750 150 -850 1 1 10 f
+S 150 -795 100 -805 1 1 6 N
+S 150 -695 100 -705 1 1 6 N
+S 150 -595 100 -605 1 1 6 N
+S 150 -495 100 -505 1 1 6 N
+S 150 -395 100 -405 1 1 6 N
+S 150 -295 100 -305 1 1 6 N
+S 150 -195 100 -205 1 1 6 N
+S 150 -95 100 -105 1 1 6 N
+S 150 5 100 -5 1 1 6 N
+S 150 105 100 95 1 1 6 N
+S 150 205 100 195 1 1 6 N
+S 150 305 100 295 1 1 6 N
+S 150 405 100 395 1 1 6 N
+S 150 505 100 495 1 1 6 N
+S 150 605 100 595 1 1 6 N
+S 150 705 100 695 1 1 6 N
+X Pin_a10 a10 -200 300 150 R 50 50 1 1 P
+X Pin_a12 a12 -200 200 150 R 50 50 1 1 P
+X Pin_a14 a14 -200 100 150 R 50 50 1 1 P
+X Pin_a16 a16 -200 0 150 R 50 50 1 1 P
+X Pin_a18 a18 -200 -100 150 R 50 50 1 1 P
+X Pin_a2 a2 -200 700 150 R 50 50 1 1 P
+X Pin_a20 a20 -200 -200 150 R 50 50 1 1 P
+X Pin_a22 a22 -200 -300 150 R 50 50 1 1 P
+X Pin_a24 a24 -200 -400 150 R 50 50 1 1 P
+X Pin_a26 a26 -200 -500 150 R 50 50 1 1 P
+X Pin_a28 a28 -200 -600 150 R 50 50 1 1 P
+X Pin_a30 a30 -200 -700 150 R 50 50 1 1 P
+X Pin_a32 a32 -200 -800 150 R 50 50 1 1 P
+X Pin_a4 a4 -200 600 150 R 50 50 1 1 P
+X Pin_a6 a6 -200 500 150 R 50 50 1 1 P
+X Pin_a8 a8 -200 400 150 R 50 50 1 1 P
+X Pin_c10 c10 300 300 150 L 50 50 1 1 P
+X Pin_c12 c12 300 200 150 L 50 50 1 1 P
+X Pin_c14 c14 300 100 150 L 50 50 1 1 P
+X Pin_c16 c16 300 0 150 L 50 50 1 1 P
+X Pin_c18 c18 300 -100 150 L 50 50 1 1 P
+X Pin_c2 c2 300 700 150 L 50 50 1 1 P
+X Pin_c20 c20 300 -200 150 L 50 50 1 1 P
+X Pin_c22 c22 300 -300 150 L 50 50 1 1 P
+X Pin_c24 c24 300 -400 150 L 50 50 1 1 P
+X Pin_c26 c26 300 -500 150 L 50 50 1 1 P
+X Pin_c28 c28 300 -600 150 L 50 50 1 1 P
+X Pin_c30 c30 300 -700 150 L 50 50 1 1 P
+X Pin_c32 c32 300 -800 150 L 50 50 1 1 P
+X Pin_c4 c4 300 600 150 L 50 50 1 1 P
+X Pin_c6 c6 300 500 150 L 50 50 1 1 P
+X Pin_c8 c8 300 400 150 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# DIN41612_02x16_AE
+#
+DEF DIN41612_02x16_AE J 0 40 Y N 1 F N
+F0 "J" 50 800 50 H V C CNN
+F1 "DIN41612_02x16_AE" 50 -900 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ DIN41612*2x*
+$ENDFPLIST
+DRAW
+S -50 -795 0 -805 1 1 6 N
+S -50 -695 0 -705 1 1 6 N
+S -50 -595 0 -605 1 1 6 N
+S -50 -495 0 -505 1 1 6 N
+S -50 -395 0 -405 1 1 6 N
+S -50 -295 0 -305 1 1 6 N
+S -50 -195 0 -205 1 1 6 N
+S -50 -95 0 -105 1 1 6 N
+S -50 5 0 -5 1 1 6 N
+S -50 105 0 95 1 1 6 N
+S -50 205 0 195 1 1 6 N
+S -50 305 0 295 1 1 6 N
+S -50 405 0 395 1 1 6 N
+S -50 505 0 495 1 1 6 N
+S -50 605 0 595 1 1 6 N
+S -50 705 0 695 1 1 6 N
+S -50 750 150 -850 1 1 10 f
+S 150 -795 100 -805 1 1 6 N
+S 150 -695 100 -705 1 1 6 N
+S 150 -595 100 -605 1 1 6 N
+S 150 -495 100 -505 1 1 6 N
+S 150 -395 100 -405 1 1 6 N
+S 150 -295 100 -305 1 1 6 N
+S 150 -195 100 -205 1 1 6 N
+S 150 -95 100 -105 1 1 6 N
+S 150 5 100 -5 1 1 6 N
+S 150 105 100 95 1 1 6 N
+S 150 205 100 195 1 1 6 N
+S 150 305 100 295 1 1 6 N
+S 150 405 100 395 1 1 6 N
+S 150 505 100 495 1 1 6 N
+S 150 605 100 595 1 1 6 N
+S 150 705 100 695 1 1 6 N
+X Pin_a1 a1 -200 700 150 R 50 50 1 1 P
+X Pin_a10 a10 -200 -200 150 R 50 50 1 1 P
+X Pin_a11 a11 -200 -300 150 R 50 50 1 1 P
+X Pin_a12 a12 -200 -400 150 R 50 50 1 1 P
+X Pin_a13 a13 -200 -500 150 R 50 50 1 1 P
+X Pin_a14 a14 -200 -600 150 R 50 50 1 1 P
+X Pin_a15 a15 -200 -700 150 R 50 50 1 1 P
+X Pin_a16 a16 -200 -800 150 R 50 50 1 1 P
+X Pin_a2 a2 -200 600 150 R 50 50 1 1 P
+X Pin_a3 a3 -200 500 150 R 50 50 1 1 P
+X Pin_a4 a4 -200 400 150 R 50 50 1 1 P
+X Pin_a5 a5 -200 300 150 R 50 50 1 1 P
+X Pin_a6 a6 -200 200 150 R 50 50 1 1 P
+X Pin_a7 a7 -200 100 150 R 50 50 1 1 P
+X Pin_a8 a8 -200 0 150 R 50 50 1 1 P
+X Pin_a9 a9 -200 -100 150 R 50 50 1 1 P
+X Pin_e1 e1 300 700 150 L 50 50 1 1 P
+X Pin_e10 e10 300 -200 150 L 50 50 1 1 P
+X Pin_e11 e11 300 -300 150 L 50 50 1 1 P
+X Pin_e12 e12 300 -400 150 L 50 50 1 1 P
+X Pin_e13 e13 300 -500 150 L 50 50 1 1 P
+X Pin_e14 e14 300 -600 150 L 50 50 1 1 P
+X Pin_e15 e15 300 -700 150 L 50 50 1 1 P
+X Pin_e16 e16 300 -800 150 L 50 50 1 1 P
+X Pin_e2 e2 300 600 150 L 50 50 1 1 P
+X Pin_e3 e3 300 500 150 L 50 50 1 1 P
+X Pin_e4 e4 300 400 150 L 50 50 1 1 P
+X Pin_e5 e5 300 300 150 L 50 50 1 1 P
+X Pin_e6 e6 300 200 150 L 50 50 1 1 P
+X Pin_e7 e7 300 100 150 L 50 50 1 1 P
+X Pin_e8 e8 300 0 150 L 50 50 1 1 P
+X Pin_e9 e9 300 -100 150 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# DIN41612_02x16_AE_EvenPins
+#
+DEF DIN41612_02x16_AE_EvenPins J 0 40 Y N 1 F N
+F0 "J" 50 800 50 H V C CNN
+F1 "DIN41612_02x16_AE_EvenPins" 50 -900 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ DIN41612*2x*
+$ENDFPLIST
+DRAW
+S -50 -795 0 -805 1 1 6 N
+S -50 -695 0 -705 1 1 6 N
+S -50 -595 0 -605 1 1 6 N
+S -50 -495 0 -505 1 1 6 N
+S -50 -395 0 -405 1 1 6 N
+S -50 -295 0 -305 1 1 6 N
+S -50 -195 0 -205 1 1 6 N
+S -50 -95 0 -105 1 1 6 N
+S -50 5 0 -5 1 1 6 N
+S -50 105 0 95 1 1 6 N
+S -50 205 0 195 1 1 6 N
+S -50 305 0 295 1 1 6 N
+S -50 405 0 395 1 1 6 N
+S -50 505 0 495 1 1 6 N
+S -50 605 0 595 1 1 6 N
+S -50 705 0 695 1 1 6 N
+S -50 750 150 -850 1 1 10 f
+S 150 -795 100 -805 1 1 6 N
+S 150 -695 100 -705 1 1 6 N
+S 150 -595 100 -605 1 1 6 N
+S 150 -495 100 -505 1 1 6 N
+S 150 -395 100 -405 1 1 6 N
+S 150 -295 100 -305 1 1 6 N
+S 150 -195 100 -205 1 1 6 N
+S 150 -95 100 -105 1 1 6 N
+S 150 5 100 -5 1 1 6 N
+S 150 105 100 95 1 1 6 N
+S 150 205 100 195 1 1 6 N
+S 150 305 100 295 1 1 6 N
+S 150 405 100 395 1 1 6 N
+S 150 505 100 495 1 1 6 N
+S 150 605 100 595 1 1 6 N
+S 150 705 100 695 1 1 6 N
+X Pin_a10 a10 -200 300 150 R 50 50 1 1 P
+X Pin_a12 a12 -200 200 150 R 50 50 1 1 P
+X Pin_a14 a14 -200 100 150 R 50 50 1 1 P
+X Pin_a16 a16 -200 0 150 R 50 50 1 1 P
+X Pin_a18 a18 -200 -100 150 R 50 50 1 1 P
+X Pin_a2 a2 -200 700 150 R 50 50 1 1 P
+X Pin_a20 a20 -200 -200 150 R 50 50 1 1 P
+X Pin_a22 a22 -200 -300 150 R 50 50 1 1 P
+X Pin_a24 a24 -200 -400 150 R 50 50 1 1 P
+X Pin_a26 a26 -200 -500 150 R 50 50 1 1 P
+X Pin_a28 a28 -200 -600 150 R 50 50 1 1 P
+X Pin_a30 a30 -200 -700 150 R 50 50 1 1 P
+X Pin_a32 a32 -200 -800 150 R 50 50 1 1 P
+X Pin_a4 a4 -200 600 150 R 50 50 1 1 P
+X Pin_a6 a6 -200 500 150 R 50 50 1 1 P
+X Pin_a8 a8 -200 400 150 R 50 50 1 1 P
+X Pin_e10 e10 300 300 150 L 50 50 1 1 P
+X Pin_e12 e12 300 200 150 L 50 50 1 1 P
+X Pin_e14 e14 300 100 150 L 50 50 1 1 P
+X Pin_e16 e16 300 0 150 L 50 50 1 1 P
+X Pin_e18 e18 300 -100 150 L 50 50 1 1 P
+X Pin_e2 e2 300 700 150 L 50 50 1 1 P
+X Pin_e20 e20 300 -200 150 L 50 50 1 1 P
+X Pin_e22 e22 300 -300 150 L 50 50 1 1 P
+X Pin_e24 e24 300 -400 150 L 50 50 1 1 P
+X Pin_e26 e26 300 -500 150 L 50 50 1 1 P
+X Pin_e28 e28 300 -600 150 L 50 50 1 1 P
+X Pin_e30 e30 300 -700 150 L 50 50 1 1 P
+X Pin_e32 e32 300 -800 150 L 50 50 1 1 P
+X Pin_e4 e4 300 600 150 L 50 50 1 1 P
+X Pin_e6 e6 300 500 150 L 50 50 1 1 P
+X Pin_e8 e8 300 400 150 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# DIN41612_02x16_ZB
+#
+DEF DIN41612_02x16_ZB J 0 40 Y N 1 F N
+F0 "J" 50 800 50 H V C CNN
+F1 "DIN41612_02x16_ZB" 50 -900 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ DIN41612*2x*
+$ENDFPLIST
+DRAW
+S -50 -795 0 -805 1 1 6 N
+S -50 -695 0 -705 1 1 6 N
+S -50 -595 0 -605 1 1 6 N
+S -50 -495 0 -505 1 1 6 N
+S -50 -395 0 -405 1 1 6 N
+S -50 -295 0 -305 1 1 6 N
+S -50 -195 0 -205 1 1 6 N
+S -50 -95 0 -105 1 1 6 N
+S -50 5 0 -5 1 1 6 N
+S -50 105 0 95 1 1 6 N
+S -50 205 0 195 1 1 6 N
+S -50 305 0 295 1 1 6 N
+S -50 405 0 395 1 1 6 N
+S -50 505 0 495 1 1 6 N
+S -50 605 0 595 1 1 6 N
+S -50 705 0 695 1 1 6 N
+S -50 750 150 -850 1 1 10 f
+S 150 -795 100 -805 1 1 6 N
+S 150 -695 100 -705 1 1 6 N
+S 150 -595 100 -605 1 1 6 N
+S 150 -495 100 -505 1 1 6 N
+S 150 -395 100 -405 1 1 6 N
+S 150 -295 100 -305 1 1 6 N
+S 150 -195 100 -205 1 1 6 N
+S 150 -95 100 -105 1 1 6 N
+S 150 5 100 -5 1 1 6 N
+S 150 105 100 95 1 1 6 N
+S 150 205 100 195 1 1 6 N
+S 150 305 100 295 1 1 6 N
+S 150 405 100 395 1 1 6 N
+S 150 505 100 495 1 1 6 N
+S 150 605 100 595 1 1 6 N
+S 150 705 100 695 1 1 6 N
+X Pin_b1 b1 300 700 150 L 50 50 1 1 P
+X Pin_b10 b10 300 -200 150 L 50 50 1 1 P
+X Pin_b11 b11 300 -300 150 L 50 50 1 1 P
+X Pin_b12 b12 300 -400 150 L 50 50 1 1 P
+X Pin_b13 b13 300 -500 150 L 50 50 1 1 P
+X Pin_b14 b14 300 -600 150 L 50 50 1 1 P
+X Pin_b15 b15 300 -700 150 L 50 50 1 1 P
+X Pin_b16 b16 300 -800 150 L 50 50 1 1 P
+X Pin_b2 b2 300 600 150 L 50 50 1 1 P
+X Pin_b3 b3 300 500 150 L 50 50 1 1 P
+X Pin_b4 b4 300 400 150 L 50 50 1 1 P
+X Pin_b5 b5 300 300 150 L 50 50 1 1 P
+X Pin_b6 b6 300 200 150 L 50 50 1 1 P
+X Pin_b7 b7 300 100 150 L 50 50 1 1 P
+X Pin_b8 b8 300 0 150 L 50 50 1 1 P
+X Pin_b9 b9 300 -100 150 L 50 50 1 1 P
+X Pin_z1 z1 -200 700 150 R 50 50 1 1 P
+X Pin_z10 z10 -200 -200 150 R 50 50 1 1 P
+X Pin_z11 z11 -200 -300 150 R 50 50 1 1 P
+X Pin_z12 z12 -200 -400 150 R 50 50 1 1 P
+X Pin_z13 z13 -200 -500 150 R 50 50 1 1 P
+X Pin_z14 z14 -200 -600 150 R 50 50 1 1 P
+X Pin_z15 z15 -200 -700 150 R 50 50 1 1 P
+X Pin_z16 z16 -200 -800 150 R 50 50 1 1 P
+X Pin_z2 z2 -200 600 150 R 50 50 1 1 P
+X Pin_z3 z3 -200 500 150 R 50 50 1 1 P
+X Pin_z4 z4 -200 400 150 R 50 50 1 1 P
+X Pin_z5 z5 -200 300 150 R 50 50 1 1 P
+X Pin_z6 z6 -200 200 150 R 50 50 1 1 P
+X Pin_z7 z7 -200 100 150 R 50 50 1 1 P
+X Pin_z8 z8 -200 0 150 R 50 50 1 1 P
+X Pin_z9 z9 -200 -100 150 R 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# DIN41612_02x16_ZB_EvenPins
+#
+DEF DIN41612_02x16_ZB_EvenPins J 0 40 Y N 1 F N
+F0 "J" 50 800 50 H V C CNN
+F1 "DIN41612_02x16_ZB_EvenPins" 50 -900 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ DIN41612*2x*
+$ENDFPLIST
+DRAW
+S -50 -795 0 -805 1 1 6 N
+S -50 -695 0 -705 1 1 6 N
+S -50 -595 0 -605 1 1 6 N
+S -50 -495 0 -505 1 1 6 N
+S -50 -395 0 -405 1 1 6 N
+S -50 -295 0 -305 1 1 6 N
+S -50 -195 0 -205 1 1 6 N
+S -50 -95 0 -105 1 1 6 N
+S -50 5 0 -5 1 1 6 N
+S -50 105 0 95 1 1 6 N
+S -50 205 0 195 1 1 6 N
+S -50 305 0 295 1 1 6 N
+S -50 405 0 395 1 1 6 N
+S -50 505 0 495 1 1 6 N
+S -50 605 0 595 1 1 6 N
+S -50 705 0 695 1 1 6 N
+S -50 750 150 -850 1 1 10 f
+S 150 -795 100 -805 1 1 6 N
+S 150 -695 100 -705 1 1 6 N
+S 150 -595 100 -605 1 1 6 N
+S 150 -495 100 -505 1 1 6 N
+S 150 -395 100 -405 1 1 6 N
+S 150 -295 100 -305 1 1 6 N
+S 150 -195 100 -205 1 1 6 N
+S 150 -95 100 -105 1 1 6 N
+S 150 5 100 -5 1 1 6 N
+S 150 105 100 95 1 1 6 N
+S 150 205 100 195 1 1 6 N
+S 150 305 100 295 1 1 6 N
+S 150 405 100 395 1 1 6 N
+S 150 505 100 495 1 1 6 N
+S 150 605 100 595 1 1 6 N
+S 150 705 100 695 1 1 6 N
+X Pin_b10 b10 300 300 150 L 50 50 1 1 P
+X Pin_b12 b12 300 200 150 L 50 50 1 1 P
+X Pin_b14 b14 300 100 150 L 50 50 1 1 P
+X Pin_b16 b16 300 0 150 L 50 50 1 1 P
+X Pin_b18 b18 300 -100 150 L 50 50 1 1 P
+X Pin_b2 b2 300 700 150 L 50 50 1 1 P
+X Pin_b20 b20 300 -200 150 L 50 50 1 1 P
+X Pin_b22 b22 300 -300 150 L 50 50 1 1 P
+X Pin_b24 b24 300 -400 150 L 50 50 1 1 P
+X Pin_b26 b26 300 -500 150 L 50 50 1 1 P
+X Pin_b28 b28 300 -600 150 L 50 50 1 1 P
+X Pin_b30 b30 300 -700 150 L 50 50 1 1 P
+X Pin_b32 b32 300 -800 150 L 50 50 1 1 P
+X Pin_b4 b4 300 600 150 L 50 50 1 1 P
+X Pin_b6 b6 300 500 150 L 50 50 1 1 P
+X Pin_b8 b8 300 400 150 L 50 50 1 1 P
+X Pin_z10 z10 -200 300 150 R 50 50 1 1 P
+X Pin_z12 z12 -200 200 150 R 50 50 1 1 P
+X Pin_z14 z14 -200 100 150 R 50 50 1 1 P
+X Pin_z16 z16 -200 0 150 R 50 50 1 1 P
+X Pin_z18 z18 -200 -100 150 R 50 50 1 1 P
+X Pin_z2 z2 -200 700 150 R 50 50 1 1 P
+X Pin_z20 z20 -200 -200 150 R 50 50 1 1 P
+X Pin_z22 z22 -200 -300 150 R 50 50 1 1 P
+X Pin_z24 z24 -200 -400 150 R 50 50 1 1 P
+X Pin_z26 z26 -200 -500 150 R 50 50 1 1 P
+X Pin_z28 z28 -200 -600 150 R 50 50 1 1 P
+X Pin_z30 z30 -200 -700 150 R 50 50 1 1 P
+X Pin_z32 z32 -200 -800 150 R 50 50 1 1 P
+X Pin_z4 z4 -200 600 150 R 50 50 1 1 P
+X Pin_z6 z6 -200 500 150 R 50 50 1 1 P
+X Pin_z8 z8 -200 400 150 R 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# DIN41612_02x32_AB
+#
+DEF DIN41612_02x32_AB J 0 40 Y N 1 F N
+F0 "J" 50 1600 50 H V C CNN
+F1 "DIN41612_02x32_AB" 50 -1700 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ DIN41612*2x*
+$ENDFPLIST
+DRAW
+S -50 -1595 0 -1605 1 1 6 N
+S -50 -1495 0 -1505 1 1 6 N
+S -50 -1395 0 -1405 1 1 6 N
+S -50 -1295 0 -1305 1 1 6 N
+S -50 -1195 0 -1205 1 1 6 N
+S -50 -1095 0 -1105 1 1 6 N
+S -50 -995 0 -1005 1 1 6 N
+S -50 -895 0 -905 1 1 6 N
+S -50 -795 0 -805 1 1 6 N
+S -50 -695 0 -705 1 1 6 N
+S -50 -595 0 -605 1 1 6 N
+S -50 -495 0 -505 1 1 6 N
+S -50 -395 0 -405 1 1 6 N
+S -50 -295 0 -305 1 1 6 N
+S -50 -195 0 -205 1 1 6 N
+S -50 -95 0 -105 1 1 6 N
+S -50 5 0 -5 1 1 6 N
+S -50 105 0 95 1 1 6 N
+S -50 205 0 195 1 1 6 N
+S -50 305 0 295 1 1 6 N
+S -50 405 0 395 1 1 6 N
+S -50 505 0 495 1 1 6 N
+S -50 605 0 595 1 1 6 N
+S -50 705 0 695 1 1 6 N
+S -50 805 0 795 1 1 6 N
+S -50 905 0 895 1 1 6 N
+S -50 1005 0 995 1 1 6 N
+S -50 1105 0 1095 1 1 6 N
+S -50 1205 0 1195 1 1 6 N
+S -50 1305 0 1295 1 1 6 N
+S -50 1405 0 1395 1 1 6 N
+S -50 1505 0 1495 1 1 6 N
+S -50 1550 150 -1650 1 1 10 f
+S 150 -1595 100 -1605 1 1 6 N
+S 150 -1495 100 -1505 1 1 6 N
+S 150 -1395 100 -1405 1 1 6 N
+S 150 -1295 100 -1305 1 1 6 N
+S 150 -1195 100 -1205 1 1 6 N
+S 150 -1095 100 -1105 1 1 6 N
+S 150 -995 100 -1005 1 1 6 N
+S 150 -895 100 -905 1 1 6 N
+S 150 -795 100 -805 1 1 6 N
+S 150 -695 100 -705 1 1 6 N
+S 150 -595 100 -605 1 1 6 N
+S 150 -495 100 -505 1 1 6 N
+S 150 -395 100 -405 1 1 6 N
+S 150 -295 100 -305 1 1 6 N
+S 150 -195 100 -205 1 1 6 N
+S 150 -95 100 -105 1 1 6 N
+S 150 5 100 -5 1 1 6 N
+S 150 105 100 95 1 1 6 N
+S 150 205 100 195 1 1 6 N
+S 150 305 100 295 1 1 6 N
+S 150 405 100 395 1 1 6 N
+S 150 505 100 495 1 1 6 N
+S 150 605 100 595 1 1 6 N
+S 150 705 100 695 1 1 6 N
+S 150 805 100 795 1 1 6 N
+S 150 905 100 895 1 1 6 N
+S 150 1005 100 995 1 1 6 N
+S 150 1105 100 1095 1 1 6 N
+S 150 1205 100 1195 1 1 6 N
+S 150 1305 100 1295 1 1 6 N
+S 150 1405 100 1395 1 1 6 N
+S 150 1505 100 1495 1 1 6 N
+X Pin_a1 a1 -200 1500 150 R 50 50 1 1 P
+X Pin_a10 a10 -200 600 150 R 50 50 1 1 P
+X Pin_a11 a11 -200 500 150 R 50 50 1 1 P
+X Pin_a12 a12 -200 400 150 R 50 50 1 1 P
+X Pin_a13 a13 -200 300 150 R 50 50 1 1 P
+X Pin_a14 a14 -200 200 150 R 50 50 1 1 P
+X Pin_a15 a15 -200 100 150 R 50 50 1 1 P
+X Pin_a16 a16 -200 0 150 R 50 50 1 1 P
+X Pin_a17 a17 -200 -100 150 R 50 50 1 1 P
+X Pin_a18 a18 -200 -200 150 R 50 50 1 1 P
+X Pin_a19 a19 -200 -300 150 R 50 50 1 1 P
+X Pin_a2 a2 -200 1400 150 R 50 50 1 1 P
+X Pin_a20 a20 -200 -400 150 R 50 50 1 1 P
+X Pin_a21 a21 -200 -500 150 R 50 50 1 1 P
+X Pin_a22 a22 -200 -600 150 R 50 50 1 1 P
+X Pin_a23 a23 -200 -700 150 R 50 50 1 1 P
+X Pin_a24 a24 -200 -800 150 R 50 50 1 1 P
+X Pin_a25 a25 -200 -900 150 R 50 50 1 1 P
+X Pin_a26 a26 -200 -1000 150 R 50 50 1 1 P
+X Pin_a27 a27 -200 -1100 150 R 50 50 1 1 P
+X Pin_a28 a28 -200 -1200 150 R 50 50 1 1 P
+X Pin_a29 a29 -200 -1300 150 R 50 50 1 1 P
+X Pin_a3 a3 -200 1300 150 R 50 50 1 1 P
+X Pin_a30 a30 -200 -1400 150 R 50 50 1 1 P
+X Pin_a31 a31 -200 -1500 150 R 50 50 1 1 P
+X Pin_a32 a32 -200 -1600 150 R 50 50 1 1 P
+X Pin_a4 a4 -200 1200 150 R 50 50 1 1 P
+X Pin_a5 a5 -200 1100 150 R 50 50 1 1 P
+X Pin_a6 a6 -200 1000 150 R 50 50 1 1 P
+X Pin_a7 a7 -200 900 150 R 50 50 1 1 P
+X Pin_a8 a8 -200 800 150 R 50 50 1 1 P
+X Pin_a9 a9 -200 700 150 R 50 50 1 1 P
+X Pin_b1 b1 300 1500 150 L 50 50 1 1 P
+X Pin_b10 b10 300 600 150 L 50 50 1 1 P
+X Pin_b11 b11 300 500 150 L 50 50 1 1 P
+X Pin_b12 b12 300 400 150 L 50 50 1 1 P
+X Pin_b13 b13 300 300 150 L 50 50 1 1 P
+X Pin_b14 b14 300 200 150 L 50 50 1 1 P
+X Pin_b15 b15 300 100 150 L 50 50 1 1 P
+X Pin_b16 b16 300 0 150 L 50 50 1 1 P
+X Pin_b17 b17 300 -100 150 L 50 50 1 1 P
+X Pin_b18 b18 300 -200 150 L 50 50 1 1 P
+X Pin_b19 b19 300 -300 150 L 50 50 1 1 P
+X Pin_b2 b2 300 1400 150 L 50 50 1 1 P
+X Pin_b20 b20 300 -400 150 L 50 50 1 1 P
+X Pin_b21 b21 300 -500 150 L 50 50 1 1 P
+X Pin_b22 b22 300 -600 150 L 50 50 1 1 P
+X Pin_b23 b23 300 -700 150 L 50 50 1 1 P
+X Pin_b24 b24 300 -800 150 L 50 50 1 1 P
+X Pin_b25 b25 300 -900 150 L 50 50 1 1 P
+X Pin_b26 b26 300 -1000 150 L 50 50 1 1 P
+X Pin_b27 b27 300 -1100 150 L 50 50 1 1 P
+X Pin_b28 b28 300 -1200 150 L 50 50 1 1 P
+X Pin_b29 b29 300 -1300 150 L 50 50 1 1 P
+X Pin_b3 b3 300 1300 150 L 50 50 1 1 P
+X Pin_b30 b30 300 -1400 150 L 50 50 1 1 P
+X Pin_b31 b31 300 -1500 150 L 50 50 1 1 P
+X Pin_b32 b32 300 -1600 150 L 50 50 1 1 P
+X Pin_b4 b4 300 1200 150 L 50 50 1 1 P
+X Pin_b5 b5 300 1100 150 L 50 50 1 1 P
+X Pin_b6 b6 300 1000 150 L 50 50 1 1 P
+X Pin_b7 b7 300 900 150 L 50 50 1 1 P
+X Pin_b8 b8 300 800 150 L 50 50 1 1 P
+X Pin_b9 b9 300 700 150 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# DIN41612_02x32_AC
+#
+DEF DIN41612_02x32_AC J 0 40 Y N 1 F N
+F0 "J" 50 1600 50 H V C CNN
+F1 "DIN41612_02x32_AC" 50 -1700 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ DIN41612*2x*
+$ENDFPLIST
+DRAW
+S -50 -1595 0 -1605 1 1 6 N
+S -50 -1495 0 -1505 1 1 6 N
+S -50 -1395 0 -1405 1 1 6 N
+S -50 -1295 0 -1305 1 1 6 N
+S -50 -1195 0 -1205 1 1 6 N
+S -50 -1095 0 -1105 1 1 6 N
+S -50 -995 0 -1005 1 1 6 N
+S -50 -895 0 -905 1 1 6 N
+S -50 -795 0 -805 1 1 6 N
+S -50 -695 0 -705 1 1 6 N
+S -50 -595 0 -605 1 1 6 N
+S -50 -495 0 -505 1 1 6 N
+S -50 -395 0 -405 1 1 6 N
+S -50 -295 0 -305 1 1 6 N
+S -50 -195 0 -205 1 1 6 N
+S -50 -95 0 -105 1 1 6 N
+S -50 5 0 -5 1 1 6 N
+S -50 105 0 95 1 1 6 N
+S -50 205 0 195 1 1 6 N
+S -50 305 0 295 1 1 6 N
+S -50 405 0 395 1 1 6 N
+S -50 505 0 495 1 1 6 N
+S -50 605 0 595 1 1 6 N
+S -50 705 0 695 1 1 6 N
+S -50 805 0 795 1 1 6 N
+S -50 905 0 895 1 1 6 N
+S -50 1005 0 995 1 1 6 N
+S -50 1105 0 1095 1 1 6 N
+S -50 1205 0 1195 1 1 6 N
+S -50 1305 0 1295 1 1 6 N
+S -50 1405 0 1395 1 1 6 N
+S -50 1505 0 1495 1 1 6 N
+S -50 1550 150 -1650 1 1 10 f
+S 150 -1595 100 -1605 1 1 6 N
+S 150 -1495 100 -1505 1 1 6 N
+S 150 -1395 100 -1405 1 1 6 N
+S 150 -1295 100 -1305 1 1 6 N
+S 150 -1195 100 -1205 1 1 6 N
+S 150 -1095 100 -1105 1 1 6 N
+S 150 -995 100 -1005 1 1 6 N
+S 150 -895 100 -905 1 1 6 N
+S 150 -795 100 -805 1 1 6 N
+S 150 -695 100 -705 1 1 6 N
+S 150 -595 100 -605 1 1 6 N
+S 150 -495 100 -505 1 1 6 N
+S 150 -395 100 -405 1 1 6 N
+S 150 -295 100 -305 1 1 6 N
+S 150 -195 100 -205 1 1 6 N
+S 150 -95 100 -105 1 1 6 N
+S 150 5 100 -5 1 1 6 N
+S 150 105 100 95 1 1 6 N
+S 150 205 100 195 1 1 6 N
+S 150 305 100 295 1 1 6 N
+S 150 405 100 395 1 1 6 N
+S 150 505 100 495 1 1 6 N
+S 150 605 100 595 1 1 6 N
+S 150 705 100 695 1 1 6 N
+S 150 805 100 795 1 1 6 N
+S 150 905 100 895 1 1 6 N
+S 150 1005 100 995 1 1 6 N
+S 150 1105 100 1095 1 1 6 N
+S 150 1205 100 1195 1 1 6 N
+S 150 1305 100 1295 1 1 6 N
+S 150 1405 100 1395 1 1 6 N
+S 150 1505 100 1495 1 1 6 N
+X Pin_a1 a1 -200 1500 150 R 50 50 1 1 P
+X Pin_a10 a10 -200 600 150 R 50 50 1 1 P
+X Pin_a11 a11 -200 500 150 R 50 50 1 1 P
+X Pin_a12 a12 -200 400 150 R 50 50 1 1 P
+X Pin_a13 a13 -200 300 150 R 50 50 1 1 P
+X Pin_a14 a14 -200 200 150 R 50 50 1 1 P
+X Pin_a15 a15 -200 100 150 R 50 50 1 1 P
+X Pin_a16 a16 -200 0 150 R 50 50 1 1 P
+X Pin_a17 a17 -200 -100 150 R 50 50 1 1 P
+X Pin_a18 a18 -200 -200 150 R 50 50 1 1 P
+X Pin_a19 a19 -200 -300 150 R 50 50 1 1 P
+X Pin_a2 a2 -200 1400 150 R 50 50 1 1 P
+X Pin_a20 a20 -200 -400 150 R 50 50 1 1 P
+X Pin_a21 a21 -200 -500 150 R 50 50 1 1 P
+X Pin_a22 a22 -200 -600 150 R 50 50 1 1 P
+X Pin_a23 a23 -200 -700 150 R 50 50 1 1 P
+X Pin_a24 a24 -200 -800 150 R 50 50 1 1 P
+X Pin_a25 a25 -200 -900 150 R 50 50 1 1 P
+X Pin_a26 a26 -200 -1000 150 R 50 50 1 1 P
+X Pin_a27 a27 -200 -1100 150 R 50 50 1 1 P
+X Pin_a28 a28 -200 -1200 150 R 50 50 1 1 P
+X Pin_a29 a29 -200 -1300 150 R 50 50 1 1 P
+X Pin_a3 a3 -200 1300 150 R 50 50 1 1 P
+X Pin_a30 a30 -200 -1400 150 R 50 50 1 1 P
+X Pin_a31 a31 -200 -1500 150 R 50 50 1 1 P
+X Pin_a32 a32 -200 -1600 150 R 50 50 1 1 P
+X Pin_a4 a4 -200 1200 150 R 50 50 1 1 P
+X Pin_a5 a5 -200 1100 150 R 50 50 1 1 P
+X Pin_a6 a6 -200 1000 150 R 50 50 1 1 P
+X Pin_a7 a7 -200 900 150 R 50 50 1 1 P
+X Pin_a8 a8 -200 800 150 R 50 50 1 1 P
+X Pin_a9 a9 -200 700 150 R 50 50 1 1 P
+X Pin_c1 c1 300 1500 150 L 50 50 1 1 P
+X Pin_c10 c10 300 600 150 L 50 50 1 1 P
+X Pin_c11 c11 300 500 150 L 50 50 1 1 P
+X Pin_c12 c12 300 400 150 L 50 50 1 1 P
+X Pin_c13 c13 300 300 150 L 50 50 1 1 P
+X Pin_c14 c14 300 200 150 L 50 50 1 1 P
+X Pin_c15 c15 300 100 150 L 50 50 1 1 P
+X Pin_c16 c16 300 0 150 L 50 50 1 1 P
+X Pin_c17 c17 300 -100 150 L 50 50 1 1 P
+X Pin_c18 c18 300 -200 150 L 50 50 1 1 P
+X Pin_c19 c19 300 -300 150 L 50 50 1 1 P
+X Pin_c2 c2 300 1400 150 L 50 50 1 1 P
+X Pin_c20 c20 300 -400 150 L 50 50 1 1 P
+X Pin_c21 c21 300 -500 150 L 50 50 1 1 P
+X Pin_c22 c22 300 -600 150 L 50 50 1 1 P
+X Pin_c23 c23 300 -700 150 L 50 50 1 1 P
+X Pin_c24 c24 300 -800 150 L 50 50 1 1 P
+X Pin_c25 c25 300 -900 150 L 50 50 1 1 P
+X Pin_c26 c26 300 -1000 150 L 50 50 1 1 P
+X Pin_c27 c27 300 -1100 150 L 50 50 1 1 P
+X Pin_c28 c28 300 -1200 150 L 50 50 1 1 P
+X Pin_c29 c29 300 -1300 150 L 50 50 1 1 P
+X Pin_c3 c3 300 1300 150 L 50 50 1 1 P
+X Pin_c30 c30 300 -1400 150 L 50 50 1 1 P
+X Pin_c31 c31 300 -1500 150 L 50 50 1 1 P
+X Pin_c32 c32 300 -1600 150 L 50 50 1 1 P
+X Pin_c4 c4 300 1200 150 L 50 50 1 1 P
+X Pin_c5 c5 300 1100 150 L 50 50 1 1 P
+X Pin_c6 c6 300 1000 150 L 50 50 1 1 P
+X Pin_c7 c7 300 900 150 L 50 50 1 1 P
+X Pin_c8 c8 300 800 150 L 50 50 1 1 P
+X Pin_c9 c9 300 700 150 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# DIN41612_02x32_AE
+#
+DEF DIN41612_02x32_AE J 0 40 Y N 1 F N
+F0 "J" 50 1600 50 H V C CNN
+F1 "DIN41612_02x32_AE" 50 -1700 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ DIN41612*2x*
+$ENDFPLIST
+DRAW
+S -50 -1595 0 -1605 1 1 6 N
+S -50 -1495 0 -1505 1 1 6 N
+S -50 -1395 0 -1405 1 1 6 N
+S -50 -1295 0 -1305 1 1 6 N
+S -50 -1195 0 -1205 1 1 6 N
+S -50 -1095 0 -1105 1 1 6 N
+S -50 -995 0 -1005 1 1 6 N
+S -50 -895 0 -905 1 1 6 N
+S -50 -795 0 -805 1 1 6 N
+S -50 -695 0 -705 1 1 6 N
+S -50 -595 0 -605 1 1 6 N
+S -50 -495 0 -505 1 1 6 N
+S -50 -395 0 -405 1 1 6 N
+S -50 -295 0 -305 1 1 6 N
+S -50 -195 0 -205 1 1 6 N
+S -50 -95 0 -105 1 1 6 N
+S -50 5 0 -5 1 1 6 N
+S -50 105 0 95 1 1 6 N
+S -50 205 0 195 1 1 6 N
+S -50 305 0 295 1 1 6 N
+S -50 405 0 395 1 1 6 N
+S -50 505 0 495 1 1 6 N
+S -50 605 0 595 1 1 6 N
+S -50 705 0 695 1 1 6 N
+S -50 805 0 795 1 1 6 N
+S -50 905 0 895 1 1 6 N
+S -50 1005 0 995 1 1 6 N
+S -50 1105 0 1095 1 1 6 N
+S -50 1205 0 1195 1 1 6 N
+S -50 1305 0 1295 1 1 6 N
+S -50 1405 0 1395 1 1 6 N
+S -50 1505 0 1495 1 1 6 N
+S -50 1550 150 -1650 1 1 10 f
+S 150 -1595 100 -1605 1 1 6 N
+S 150 -1495 100 -1505 1 1 6 N
+S 150 -1395 100 -1405 1 1 6 N
+S 150 -1295 100 -1305 1 1 6 N
+S 150 -1195 100 -1205 1 1 6 N
+S 150 -1095 100 -1105 1 1 6 N
+S 150 -995 100 -1005 1 1 6 N
+S 150 -895 100 -905 1 1 6 N
+S 150 -795 100 -805 1 1 6 N
+S 150 -695 100 -705 1 1 6 N
+S 150 -595 100 -605 1 1 6 N
+S 150 -495 100 -505 1 1 6 N
+S 150 -395 100 -405 1 1 6 N
+S 150 -295 100 -305 1 1 6 N
+S 150 -195 100 -205 1 1 6 N
+S 150 -95 100 -105 1 1 6 N
+S 150 5 100 -5 1 1 6 N
+S 150 105 100 95 1 1 6 N
+S 150 205 100 195 1 1 6 N
+S 150 305 100 295 1 1 6 N
+S 150 405 100 395 1 1 6 N
+S 150 505 100 495 1 1 6 N
+S 150 605 100 595 1 1 6 N
+S 150 705 100 695 1 1 6 N
+S 150 805 100 795 1 1 6 N
+S 150 905 100 895 1 1 6 N
+S 150 1005 100 995 1 1 6 N
+S 150 1105 100 1095 1 1 6 N
+S 150 1205 100 1195 1 1 6 N
+S 150 1305 100 1295 1 1 6 N
+S 150 1405 100 1395 1 1 6 N
+S 150 1505 100 1495 1 1 6 N
+X Pin_a1 a1 -200 1500 150 R 50 50 1 1 P
+X Pin_a10 a10 -200 600 150 R 50 50 1 1 P
+X Pin_a11 a11 -200 500 150 R 50 50 1 1 P
+X Pin_a12 a12 -200 400 150 R 50 50 1 1 P
+X Pin_a13 a13 -200 300 150 R 50 50 1 1 P
+X Pin_a14 a14 -200 200 150 R 50 50 1 1 P
+X Pin_a15 a15 -200 100 150 R 50 50 1 1 P
+X Pin_a16 a16 -200 0 150 R 50 50 1 1 P
+X Pin_a17 a17 -200 -100 150 R 50 50 1 1 P
+X Pin_a18 a18 -200 -200 150 R 50 50 1 1 P
+X Pin_a19 a19 -200 -300 150 R 50 50 1 1 P
+X Pin_a2 a2 -200 1400 150 R 50 50 1 1 P
+X Pin_a20 a20 -200 -400 150 R 50 50 1 1 P
+X Pin_a21 a21 -200 -500 150 R 50 50 1 1 P
+X Pin_a22 a22 -200 -600 150 R 50 50 1 1 P
+X Pin_a23 a23 -200 -700 150 R 50 50 1 1 P
+X Pin_a24 a24 -200 -800 150 R 50 50 1 1 P
+X Pin_a25 a25 -200 -900 150 R 50 50 1 1 P
+X Pin_a26 a26 -200 -1000 150 R 50 50 1 1 P
+X Pin_a27 a27 -200 -1100 150 R 50 50 1 1 P
+X Pin_a28 a28 -200 -1200 150 R 50 50 1 1 P
+X Pin_a29 a29 -200 -1300 150 R 50 50 1 1 P
+X Pin_a3 a3 -200 1300 150 R 50 50 1 1 P
+X Pin_a30 a30 -200 -1400 150 R 50 50 1 1 P
+X Pin_a31 a31 -200 -1500 150 R 50 50 1 1 P
+X Pin_a32 a32 -200 -1600 150 R 50 50 1 1 P
+X Pin_a4 a4 -200 1200 150 R 50 50 1 1 P
+X Pin_a5 a5 -200 1100 150 R 50 50 1 1 P
+X Pin_a6 a6 -200 1000 150 R 50 50 1 1 P
+X Pin_a7 a7 -200 900 150 R 50 50 1 1 P
+X Pin_a8 a8 -200 800 150 R 50 50 1 1 P
+X Pin_a9 a9 -200 700 150 R 50 50 1 1 P
+X Pin_e1 e1 300 1500 150 L 50 50 1 1 P
+X Pin_e10 e10 300 600 150 L 50 50 1 1 P
+X Pin_e11 e11 300 500 150 L 50 50 1 1 P
+X Pin_e12 e12 300 400 150 L 50 50 1 1 P
+X Pin_e13 e13 300 300 150 L 50 50 1 1 P
+X Pin_e14 e14 300 200 150 L 50 50 1 1 P
+X Pin_e15 e15 300 100 150 L 50 50 1 1 P
+X Pin_e16 e16 300 0 150 L 50 50 1 1 P
+X Pin_e17 e17 300 -100 150 L 50 50 1 1 P
+X Pin_e18 e18 300 -200 150 L 50 50 1 1 P
+X Pin_e19 e19 300 -300 150 L 50 50 1 1 P
+X Pin_e2 e2 300 1400 150 L 50 50 1 1 P
+X Pin_e20 e20 300 -400 150 L 50 50 1 1 P
+X Pin_e21 e21 300 -500 150 L 50 50 1 1 P
+X Pin_e22 e22 300 -600 150 L 50 50 1 1 P
+X Pin_e23 e23 300 -700 150 L 50 50 1 1 P
+X Pin_e24 e24 300 -800 150 L 50 50 1 1 P
+X Pin_e25 e25 300 -900 150 L 50 50 1 1 P
+X Pin_e26 e26 300 -1000 150 L 50 50 1 1 P
+X Pin_e27 e27 300 -1100 150 L 50 50 1 1 P
+X Pin_e28 e28 300 -1200 150 L 50 50 1 1 P
+X Pin_e29 e29 300 -1300 150 L 50 50 1 1 P
+X Pin_e3 e3 300 1300 150 L 50 50 1 1 P
+X Pin_e30 e30 300 -1400 150 L 50 50 1 1 P
+X Pin_e31 e31 300 -1500 150 L 50 50 1 1 P
+X Pin_e32 e32 300 -1600 150 L 50 50 1 1 P
+X Pin_e4 e4 300 1200 150 L 50 50 1 1 P
+X Pin_e5 e5 300 1100 150 L 50 50 1 1 P
+X Pin_e6 e6 300 1000 150 L 50 50 1 1 P
+X Pin_e7 e7 300 900 150 L 50 50 1 1 P
+X Pin_e8 e8 300 800 150 L 50 50 1 1 P
+X Pin_e9 e9 300 700 150 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# DIN41612_02x32_ZB
+#
+DEF DIN41612_02x32_ZB J 0 40 Y N 1 F N
+F0 "J" 50 1600 50 H V C CNN
+F1 "DIN41612_02x32_ZB" 50 -1700 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ DIN41612*2x*
+$ENDFPLIST
+DRAW
+S -50 -1595 0 -1605 1 1 6 N
+S -50 -1495 0 -1505 1 1 6 N
+S -50 -1395 0 -1405 1 1 6 N
+S -50 -1295 0 -1305 1 1 6 N
+S -50 -1195 0 -1205 1 1 6 N
+S -50 -1095 0 -1105 1 1 6 N
+S -50 -995 0 -1005 1 1 6 N
+S -50 -895 0 -905 1 1 6 N
+S -50 -795 0 -805 1 1 6 N
+S -50 -695 0 -705 1 1 6 N
+S -50 -595 0 -605 1 1 6 N
+S -50 -495 0 -505 1 1 6 N
+S -50 -395 0 -405 1 1 6 N
+S -50 -295 0 -305 1 1 6 N
+S -50 -195 0 -205 1 1 6 N
+S -50 -95 0 -105 1 1 6 N
+S -50 5 0 -5 1 1 6 N
+S -50 105 0 95 1 1 6 N
+S -50 205 0 195 1 1 6 N
+S -50 305 0 295 1 1 6 N
+S -50 405 0 395 1 1 6 N
+S -50 505 0 495 1 1 6 N
+S -50 605 0 595 1 1 6 N
+S -50 705 0 695 1 1 6 N
+S -50 805 0 795 1 1 6 N
+S -50 905 0 895 1 1 6 N
+S -50 1005 0 995 1 1 6 N
+S -50 1105 0 1095 1 1 6 N
+S -50 1205 0 1195 1 1 6 N
+S -50 1305 0 1295 1 1 6 N
+S -50 1405 0 1395 1 1 6 N
+S -50 1505 0 1495 1 1 6 N
+S -50 1550 150 -1650 1 1 10 f
+S 150 -1595 100 -1605 1 1 6 N
+S 150 -1495 100 -1505 1 1 6 N
+S 150 -1395 100 -1405 1 1 6 N
+S 150 -1295 100 -1305 1 1 6 N
+S 150 -1195 100 -1205 1 1 6 N
+S 150 -1095 100 -1105 1 1 6 N
+S 150 -995 100 -1005 1 1 6 N
+S 150 -895 100 -905 1 1 6 N
+S 150 -795 100 -805 1 1 6 N
+S 150 -695 100 -705 1 1 6 N
+S 150 -595 100 -605 1 1 6 N
+S 150 -495 100 -505 1 1 6 N
+S 150 -395 100 -405 1 1 6 N
+S 150 -295 100 -305 1 1 6 N
+S 150 -195 100 -205 1 1 6 N
+S 150 -95 100 -105 1 1 6 N
+S 150 5 100 -5 1 1 6 N
+S 150 105 100 95 1 1 6 N
+S 150 205 100 195 1 1 6 N
+S 150 305 100 295 1 1 6 N
+S 150 405 100 395 1 1 6 N
+S 150 505 100 495 1 1 6 N
+S 150 605 100 595 1 1 6 N
+S 150 705 100 695 1 1 6 N
+S 150 805 100 795 1 1 6 N
+S 150 905 100 895 1 1 6 N
+S 150 1005 100 995 1 1 6 N
+S 150 1105 100 1095 1 1 6 N
+S 150 1205 100 1195 1 1 6 N
+S 150 1305 100 1295 1 1 6 N
+S 150 1405 100 1395 1 1 6 N
+S 150 1505 100 1495 1 1 6 N
+X Pin_b1 b1 300 1500 150 L 50 50 1 1 P
+X Pin_b10 b10 300 600 150 L 50 50 1 1 P
+X Pin_b11 b11 300 500 150 L 50 50 1 1 P
+X Pin_b12 b12 300 400 150 L 50 50 1 1 P
+X Pin_b13 b13 300 300 150 L 50 50 1 1 P
+X Pin_b14 b14 300 200 150 L 50 50 1 1 P
+X Pin_b15 b15 300 100 150 L 50 50 1 1 P
+X Pin_b16 b16 300 0 150 L 50 50 1 1 P
+X Pin_b17 b17 300 -100 150 L 50 50 1 1 P
+X Pin_b18 b18 300 -200 150 L 50 50 1 1 P
+X Pin_b19 b19 300 -300 150 L 50 50 1 1 P
+X Pin_b2 b2 300 1400 150 L 50 50 1 1 P
+X Pin_b20 b20 300 -400 150 L 50 50 1 1 P
+X Pin_b21 b21 300 -500 150 L 50 50 1 1 P
+X Pin_b22 b22 300 -600 150 L 50 50 1 1 P
+X Pin_b23 b23 300 -700 150 L 50 50 1 1 P
+X Pin_b24 b24 300 -800 150 L 50 50 1 1 P
+X Pin_b25 b25 300 -900 150 L 50 50 1 1 P
+X Pin_b26 b26 300 -1000 150 L 50 50 1 1 P
+X Pin_b27 b27 300 -1100 150 L 50 50 1 1 P
+X Pin_b28 b28 300 -1200 150 L 50 50 1 1 P
+X Pin_b29 b29 300 -1300 150 L 50 50 1 1 P
+X Pin_b3 b3 300 1300 150 L 50 50 1 1 P
+X Pin_b30 b30 300 -1400 150 L 50 50 1 1 P
+X Pin_b31 b31 300 -1500 150 L 50 50 1 1 P
+X Pin_b32 b32 300 -1600 150 L 50 50 1 1 P
+X Pin_b4 b4 300 1200 150 L 50 50 1 1 P
+X Pin_b5 b5 300 1100 150 L 50 50 1 1 P
+X Pin_b6 b6 300 1000 150 L 50 50 1 1 P
+X Pin_b7 b7 300 900 150 L 50 50 1 1 P
+X Pin_b8 b8 300 800 150 L 50 50 1 1 P
+X Pin_b9 b9 300 700 150 L 50 50 1 1 P
+X Pin_z1 z1 -200 1500 150 R 50 50 1 1 P
+X Pin_z10 z10 -200 600 150 R 50 50 1 1 P
+X Pin_z11 z11 -200 500 150 R 50 50 1 1 P
+X Pin_z12 z12 -200 400 150 R 50 50 1 1 P
+X Pin_z13 z13 -200 300 150 R 50 50 1 1 P
+X Pin_z14 z14 -200 200 150 R 50 50 1 1 P
+X Pin_z15 z15 -200 100 150 R 50 50 1 1 P
+X Pin_z16 z16 -200 0 150 R 50 50 1 1 P
+X Pin_z17 z17 -200 -100 150 R 50 50 1 1 P
+X Pin_z18 z18 -200 -200 150 R 50 50 1 1 P
+X Pin_z19 z19 -200 -300 150 R 50 50 1 1 P
+X Pin_z2 z2 -200 1400 150 R 50 50 1 1 P
+X Pin_z20 z20 -200 -400 150 R 50 50 1 1 P
+X Pin_z21 z21 -200 -500 150 R 50 50 1 1 P
+X Pin_z22 z22 -200 -600 150 R 50 50 1 1 P
+X Pin_z23 z23 -200 -700 150 R 50 50 1 1 P
+X Pin_z24 z24 -200 -800 150 R 50 50 1 1 P
+X Pin_z25 z25 -200 -900 150 R 50 50 1 1 P
+X Pin_z26 z26 -200 -1000 150 R 50 50 1 1 P
+X Pin_z27 z27 -200 -1100 150 R 50 50 1 1 P
+X Pin_z28 z28 -200 -1200 150 R 50 50 1 1 P
+X Pin_z29 z29 -200 -1300 150 R 50 50 1 1 P
+X Pin_z3 z3 -200 1300 150 R 50 50 1 1 P
+X Pin_z30 z30 -200 -1400 150 R 50 50 1 1 P
+X Pin_z31 z31 -200 -1500 150 R 50 50 1 1 P
+X Pin_z32 z32 -200 -1600 150 R 50 50 1 1 P
+X Pin_z4 z4 -200 1200 150 R 50 50 1 1 P
+X Pin_z5 z5 -200 1100 150 R 50 50 1 1 P
+X Pin_z6 z6 -200 1000 150 R 50 50 1 1 P
+X Pin_z7 z7 -200 900 150 R 50 50 1 1 P
+X Pin_z8 z8 -200 800 150 R 50 50 1 1 P
+X Pin_z9 z9 -200 700 150 R 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
 # ExpressCard
 #
 DEF ExpressCard J 0 20 Y Y 1 F N
@@ -13387,10 +15708,12 @@ ENDDEF
 DEF Samtec_ASP-134602-01 J 0 40 Y N 10 F N
 F0 "J" 0 2000 50 H V C CNN
 F1 "Samtec_ASP-134602-01" 0 -2100 50 H V C CNN
-F2 "Connector_Samtec:Samtec_FMC_ASP-134602-01_10x40_P1.27mm_Vertical" 50 2150 50 H I C CNN
+F2 "" 50 2150 50 H I C CNN
 F3 "" 150 2100 50 H I C CNN
+ALIAS Samtec_ASP-134486-01
 $FPLIST
  *FMC*ASP*134602?01*10x40*P1.27mm*
+ *FMC*ASP*134486?01*10x40*P1.27mm*
 $ENDFPLIST
 DRAW
 S -34 -1995 0 -2005 1 1 6 F
@@ -16054,11 +18377,11 @@ X SHIELD 10 -200 -700 100 U 50 50 1 1 P
 X D- 2 500 200 100 L 50 50 1 1 B
 X D+ 3 500 100 100 L 50 50 1 1 B
 X GND 4 0 -700 100 U 50 50 1 1 W
-X SSRX- 5 500 -100 100 L 50 50 1 1 B
-X SSRX+ 6 500 -200 100 L 50 50 1 1 B
-X DRAIN 7 -100 -700 100 U 50 50 1 1 W
-X SSTX- 8 500 -400 100 L 50 50 1 1 B
-X SSTX+ 9 500 -500 100 L 50 50 1 1 B
+X SSRX- 5 500 -100 100 L 50 50 1 1 O
+X SSRX+ 6 500 -200 100 L 50 50 1 1 O
+X DRAIN 7 -100 -700 100 U 50 50 1 1 P
+X SSTX- 8 500 -400 100 L 50 50 1 1 I
+X SSTX+ 9 500 -500 100 L 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
@@ -16072,12 +18395,6 @@ F3 "" 150 100 50 H I C CNN
 DRAW
 C -100 45 25 1 1 10 F
 C 0 -230 50 1 1 0 F
-S -360 340 -200 -150 0 0 20 N
-S -310 290 -260 -90 0 0 20 F
-S -250 0 -240 -30 0 0 20 N
-S -250 70 -240 40 0 0 20 N
-S -250 140 -240 110 0 0 20 N
-S -250 210 -240 180 0 0 20 N
 S -110 -600 -90 -560 0 0 0 N
 S -10 -600 10 -560 0 0 0 N
 S 400 -490 360 -510 0 0 0 N
@@ -16088,21 +18405,24 @@ S 400 110 360 90 0 0 0 N
 S 400 210 360 190 0 0 0 N
 S 400 410 360 390 0 0 0 N
 S -400 550 400 -600 0 1 10 f
+S -255 330 -195 305 0 1 10 F
+S -175 175 -275 255 0 1 10 F
 S 75 70 125 120 1 1 10 F
+P 10 0 1 20 -275 350 -275 295 -300 270 -300 150 -150 150 -150 270 -175 295 -175 350 -270 350 -275 350 N
 P 2 1 1 20 0 -230 0 170 N
 P 3 1 1 20 0 -130 -100 -30 -100 20 N
 P 3 1 1 20 0 -80 100 20 100 70 N
 P 4 1 1 10 -50 170 0 270 50 170 -50 170 F
-X VBUS 1 500 400 100 L 50 50 1 1 W
+X VBUS 1 500 400 100 L 50 50 1 1 w
 X SHIELD 10 -200 -700 100 U 50 50 1 1 P
 X D- 2 500 200 100 L 50 50 1 1 B
 X D+ 3 500 100 100 L 50 50 1 1 B
-X GND 4 0 -700 100 U 50 50 1 1 W
-X SSTX- 5 500 -100 100 L 50 50 1 1 B
-X SSTX+ 6 500 -200 100 L 50 50 1 1 B
-X DRAIN 7 -100 -700 100 U 50 50 1 1 W
-X SSRX- 8 500 -400 100 L 50 50 1 1 B
-X SSRX+ 9 500 -500 100 L 50 50 1 1 B
+X GND 4 0 -700 100 U 50 50 1 1 w
+X SSTX- 5 500 -100 100 L 50 50 1 1 O
+X SSTX+ 6 500 -200 100 L 50 50 1 1 O
+X DRAIN 7 -100 -700 100 U 50 50 1 1 P
+X SSRX- 8 500 -400 100 L 50 50 1 1 I
+X SSRX+ 9 500 -500 100 L 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
@@ -16132,8 +18452,8 @@ P 4 0 1 10 -100 85 -75 85 -50 35 0 35 N
 P 4 0 1 10 25 110 25 60 75 85 25 110 F
 P 2 1 1 10 -75 85 25 85 N
 X VBUS 1 300 200 100 L 50 50 1 1 W
-X D- 2 300 -100 100 L 50 50 1 1 P
-X D+ 3 300 0 100 L 50 50 1 1 P
+X D- 2 300 -100 100 L 50 50 1 1 B
+X D+ 3 300 0 100 L 50 50 1 1 B
 X GND 4 0 -400 100 U 50 50 1 1 W
 X Shield 5 -100 -400 100 U 50 50 1 1 P
 ENDDRAW
@@ -16165,8 +18485,8 @@ P 4 0 1 10 -100 85 -75 85 -50 35 0 35 N
 P 4 0 1 10 25 110 25 60 75 85 25 110 F
 P 7 0 1 0 -160 170 -90 170 -90 225 -105 240 -145 240 -160 225 -160 170 N
 X VBUS 1 300 200 100 L 50 50 1 1 w
-X D- 2 300 -100 100 L 50 50 1 1 P
-X D+ 3 300 0 100 L 50 50 1 1 P
+X D- 2 300 -100 100 L 50 50 1 1 B
+X D+ 3 300 0 100 L 50 50 1 1 B
 X GND 4 0 -400 100 U 50 50 1 1 w
 X Shield 5 -100 -400 100 U 50 50 1 1 P
 ENDDRAW
@@ -16200,8 +18520,8 @@ P 4 0 1 10 25 110 25 60 75 85 25 110 F
 P 5 0 1 0 -170 220 -70 220 -80 190 -160 190 -170 220 F
 P 9 0 1 0 -185 230 -185 220 -175 190 -175 180 -65 180 -65 190 -55 220 -55 230 -185 230 N
 X VBUS 1 300 200 100 L 50 50 1 1 w
-X D- 2 300 -100 100 L 50 50 1 1 P
-X D+ 3 300 0 100 L 50 50 1 1 P
+X D- 2 300 -100 100 L 50 50 1 1 B
+X D+ 3 300 0 100 L 50 50 1 1 B
 X ID 4 300 -200 100 L 50 50 1 1 P
 X GND 5 0 -400 100 U 50 50 1 1 w
 X Shield 6 -100 -400 100 U 50 50 1 1 P
@@ -16252,13 +18572,13 @@ P 2 1 1 20 0 -230 0 170 N
 P 3 1 1 20 0 -130 -100 -30 -100 20 N
 P 3 1 1 20 0 -80 100 20 100 70 N
 P 4 1 1 10 -50 170 0 270 50 170 -50 170 F
-X GND A1 0 -1600 200 U 50 50 1 1 W
+X GND A1 0 -1600 200 U 50 50 1 1 P
 X RX2- A10 600 -600 200 L 50 50 1 1 B
 X RX2+ A11 600 -700 200 L 50 50 1 1 B
 X GND A12 0 -1600 200 U 50 50 1 1 P N
 X TX1+ A2 600 -400 200 L 50 50 1 1 B
 X TX1- A3 600 -300 200 L 50 50 1 1 B
-X VBUS A4 600 1000 200 L 50 50 1 1 W
+X VBUS A4 600 1000 200 L 50 50 1 1 P
 X CC A5 600 800 200 L 50 50 1 1 B
 X D+ A6 600 300 200 L 50 50 1 1 B
 X D- A7 600 500 200 L 50 50 1 1 B
@@ -16312,9 +18632,9 @@ P 2 0 1 20 0 -230 0 170 N
 P 3 0 1 20 0 -130 -100 -30 -100 20 N
 P 3 0 1 20 0 -80 100 20 100 70 N
 P 4 0 1 10 -50 170 0 270 50 170 -50 170 F
-X GND A1 0 -900 200 U 50 50 1 1 W
+X GND A1 0 -900 200 U 50 50 1 1 P
 X GND A12 0 -900 200 U 50 50 1 1 P N
-X VBUS A4 600 600 200 L 50 50 1 1 W
+X VBUS A4 600 600 200 L 50 50 1 1 P
 X CC A5 600 400 200 L 50 50 1 1 B
 X D+ A6 600 -100 200 L 50 50 1 1 B
 X D- A7 600 100 200 L 50 50 1 1 B
@@ -16374,13 +18694,13 @@ P 2 1 1 20 0 -230 0 170 N
 P 3 1 1 20 0 -130 -100 -30 -100 20 N
 P 3 1 1 20 0 -80 100 20 100 70 N
 P 4 1 1 10 -50 170 0 270 50 170 -50 170 F
-X GND A1 0 -1600 200 U 50 50 1 1 W
+X GND A1 0 -1600 200 U 50 50 1 1 P
 X RX2- A10 600 -600 200 L 50 50 1 1 B
 X RX2+ A11 600 -700 200 L 50 50 1 1 B
 X GND A12 0 -1600 200 U 50 50 1 1 P N
 X TX1+ A2 600 -400 200 L 50 50 1 1 B
 X TX1- A3 600 -300 200 L 50 50 1 1 B
-X VBUS A4 600 1000 200 L 50 50 1 1 W
+X VBUS A4 600 1000 200 L 50 50 1 1 P
 X CC1 A5 600 800 200 L 50 50 1 1 B
 X D+ A6 600 300 200 L 50 50 1 1 B
 X D- A7 600 500 200 L 50 50 1 1 B
@@ -16440,9 +18760,9 @@ P 2 0 1 20 0 -230 0 170 N
 P 3 0 1 20 0 -130 -100 -30 -100 20 N
 P 3 0 1 20 0 -80 100 20 100 70 N
 P 4 0 1 10 -50 170 0 270 50 170 -50 170 F
-X GND A1 0 -900 200 U 50 50 1 1 W
+X GND A1 0 -900 200 U 50 50 1 1 P
 X GND A12 0 -900 200 U 50 50 1 1 P N
-X VBUS A4 600 600 200 L 50 50 1 1 W
+X VBUS A4 600 600 200 L 50 50 1 1 P
 X CC1 A5 600 400 200 L 50 50 1 1 B
 X D+ A6 600 -100 200 L 50 50 1 1 B
 X D- A7 600 100 200 L 50 50 1 1 B
@@ -16486,15 +18806,178 @@ P 4 0 1 10 -100 85 -75 85 -50 35 0 35 N
 P 4 0 1 10 25 110 25 60 75 85 25 110 F
 P 5 0 1 0 -170 220 -70 220 -80 190 -160 190 -170 220 F
 P 9 0 1 0 -185 230 -185 220 -175 190 -175 180 -65 180 -65 190 -55 220 -55 230 -185 230 N
-X VBUS 1 300 200 100 L 50 50 1 1 W
-X D- 2 300 -100 100 L 50 50 1 1 P
-X D+ 3 300 0 100 L 50 50 1 1 P
+X VBUS 1 300 200 100 L 50 50 1 1 P
+X D- 2 300 -100 100 L 50 50 1 1 B
+X D+ 3 300 0 100 L 50 50 1 1 B
 X ID 4 300 -200 100 L 50 50 1 1 P
-X GND 5 0 -400 100 U 50 50 1 1 W
+X GND 5 0 -400 100 U 50 50 1 1 P
 X Shield 6 -100 -400 100 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
+# Wuerth_74980111211
+#
+DEF Wuerth_74980111211 J 0 20 Y Y 1 F N
+F0 "J" 500 550 50 H V R CNN
+F1 "Wuerth_74980111211" 0 -650 50 H V C CNN
+F2 "Connector_RJ:RJ45_Wuerth_74980111211_Horizontal" 0 -750 50 H I C CNN
+F3 "" -415 -235 50 H I L TNN
+$FPLIST
+ RJ45*Wuerth*74980111211*
+$ENDFPLIST
+DRAW
+A 35 -230 10 1 1799 0 1 0 N 45 -230 25 -230
+A 35 -170 10 -1799 -1 0 1 0 N 25 -170 45 -170
+A 35 170 10 1 1799 0 1 0 N 45 170 25 170
+A 35 230 10 -1799 -1 0 1 0 N 25 230 45 230
+A 55 -230 10 1 1799 0 1 0 N 65 -230 45 -230
+A 55 -170 10 -1799 -1 0 1 0 N 45 -170 65 -170
+A 55 170 10 1 1799 0 1 0 N 65 170 45 170
+A 55 230 10 -1799 -1 0 1 0 N 45 230 65 230
+A 75 -230 10 1 1799 0 1 0 N 85 -230 65 -230
+A 75 -170 10 -1799 -1 0 1 0 N 65 -170 85 -170
+A 75 170 10 1 1799 0 1 0 N 85 170 65 170
+A 75 230 10 -1799 -1 0 1 0 N 65 230 85 230
+A 95 -230 10 1 1799 0 1 0 N 105 -230 85 -230
+A 95 -170 10 -1799 -1 0 1 0 N 85 -170 105 -170
+A 95 170 10 1 1799 0 1 0 N 105 170 85 170
+A 95 230 10 -1799 -1 0 1 0 N 85 230 105 230
+A 225 -270 10 -899 899 0 1 0 N 225 -280 225 -260
+A 225 -250 10 -899 899 0 1 0 N 225 -260 225 -240
+A 225 -230 10 -899 899 0 1 0 N 225 -240 225 -220
+A 225 -210 10 -899 899 0 1 0 N 225 -220 225 -200
+A 225 -190 10 -899 899 0 1 0 N 225 -200 225 -180
+A 225 -170 10 -899 899 0 1 0 N 225 -180 225 -160
+A 225 -150 10 -899 899 0 1 0 N 225 -160 225 -140
+A 225 -130 10 -899 899 0 1 0 N 225 -140 225 -120
+A 225 130 10 -899 899 0 1 0 N 225 120 225 140
+A 225 150 10 -899 899 0 1 0 N 225 140 225 160
+A 225 170 10 -899 899 0 1 0 N 225 160 225 180
+A 225 190 10 -899 899 0 1 0 N 225 180 225 200
+A 225 210 10 -899 899 0 1 0 N 225 200 225 220
+A 225 230 10 -899 899 0 1 0 N 225 220 225 240
+A 225 250 10 -899 899 0 1 0 N 225 240 225 260
+A 225 270 10 -899 899 0 1 0 N 225 260 225 280
+A 275 -270 10 901 -901 0 1 0 N 275 -260 275 -280
+A 275 -250 10 901 -901 0 1 0 N 275 -240 275 -260
+A 275 -230 10 901 -901 0 1 0 N 275 -220 275 -240
+A 275 -210 10 901 -901 0 1 0 N 275 -200 275 -220
+A 275 -190 10 901 -901 0 1 0 N 275 -180 275 -200
+A 275 -170 10 901 -901 0 1 0 N 275 -160 275 -180
+A 275 -150 10 901 -901 0 1 0 N 275 -140 275 -160
+A 275 -130 10 901 -901 0 1 0 N 275 -120 275 -140
+A 275 130 10 901 -901 0 1 0 N 275 140 275 120
+A 275 150 10 901 -901 0 1 0 N 275 160 275 140
+A 275 170 10 901 -901 0 1 0 N 275 180 275 160
+A 275 190 10 901 -901 0 1 0 N 275 200 275 180
+A 275 210 10 901 -901 0 1 0 N 275 220 275 200
+A 275 230 10 901 -901 0 1 0 N 275 240 275 220
+A 275 250 10 901 -901 0 1 0 N 275 260 275 240
+A 275 270 10 901 -901 0 1 0 N 275 280 275 260
+C -275 -270 10 0 1 0 F
+C -275 130 10 0 1 0 F
+C -25 -270 10 0 1 0 F
+C -25 130 10 0 1 0 F
+C 95 -231 3 0 1 1 F
+C 95 -169 3 0 1 1 F
+C 95 169 3 0 1 1 F
+C 95 231 3 0 1 1 F
+C 224 -210 3 0 1 1 F
+C 224 -130 3 0 1 1 F
+C 224 190 3 0 1 1 F
+C 224 270 3 0 1 1 F
+C 276 -210 3 0 1 1 F
+C 276 -130 3 0 1 1 F
+C 276 190 3 0 1 1 F
+C 276 270 3 0 1 1 F
+T 0 125 -345 25 0 0 0 "1000pF 2kV" Normal 0 C C
+T 0 -105 -270 25 0 0 0 75 Normal 0 C C
+T 0 -105 130 25 0 0 0 75 Normal 0 C C
+T 0 55 -270 25 0 0 0 75 Normal 0 C C
+T 0 55 130 25 0 0 0 75 Normal 0 C C
+T 0 150 350 25 0 0 0 GREEN Normal 0 C C
+T 0 -425 335 50 0 0 0 J1 Normal 0 L C
+T 0 -425 35 50 0 0 0 J2 Normal 0 L C
+T 0 -425 -65 50 0 0 0 J3 Normal 0 L C
+T 0 -425 230 50 0 0 0 J4 Normal 0 L C
+T 0 -425 130 50 0 0 0 J5 Normal 0 L C
+T 0 -425 -370 50 0 0 0 J6 Normal 0 L C
+T 0 -425 -170 50 0 0 0 J7 Normal 0 L C
+T 0 -425 -270 50 0 0 0 J8 Normal 0 L C
+T 0 -150 350 25 0 0 0 YELLOW Normal 0 C C
+S -500 500 500 -500 0 0 10 f
+S -330 -415 -430 400 0 1 0 N
+S -155 -290 -55 -250 0 1 8 N
+S -155 110 -55 150 0 1 8 N
+S 5 -290 105 -250 0 1 8 N
+S 5 110 105 150 0 1 8 N
+P 2 0 0 0 -155 -270 -325 -270 N
+P 2 0 0 0 -155 130 -325 130 N
+P 2 0 0 0 -25 -400 500 -400 N
+P 2 0 0 0 325 -200 275 -200 N
+P 2 0 0 0 350 200 275 200 N
+P 4 0 0 0 25 -170 -225 -170 -225 -70 -325 -70 N
+P 4 0 0 0 25 230 -225 230 -225 330 -325 330 N
+P 4 0 0 0 105 -270 175 -270 175 -200 225 -200 N
+P 4 0 0 0 105 130 175 130 175 200 225 200 N
+P 2 0 1 0 -225 -370 -325 -370 N
+P 2 0 1 0 -225 30 -325 30 N
+P 2 0 1 0 -140 370 -160 390 N
+P 2 0 1 0 -130 440 -130 400 N
+P 2 0 1 0 -120 370 -140 390 N
+P 2 0 1 13 -55 -355 5 -355 N
+P 2 0 1 12 -55 -335 5 -335 N
+P 2 0 1 0 -25 130 -55 130 N
+P 2 0 1 0 5 -270 -55 -270 N
+P 2 0 1 0 25 -210 105 -210 N
+P 2 0 1 0 25 190 105 190 N
+P 2 0 1 0 105 -190 25 -190 N
+P 2 0 1 0 105 210 25 210 N
+P 2 0 1 0 160 370 140 390 N
+P 2 0 1 0 170 440 170 400 N
+P 2 0 1 0 180 370 160 390 N
+P 2 0 1 0 245 -120 245 -280 N
+P 2 0 1 0 245 280 245 120 N
+P 2 0 1 0 255 -280 255 -120 N
+P 2 0 1 0 255 120 255 280 N
+P 3 0 1 0 -275 -270 -275 -170 -325 -170 N
+P 3 0 1 0 -275 130 -275 230 -325 230 N
+P 3 0 1 0 -200 500 -200 420 -170 420 N
+P 3 0 1 0 -140 380 -140 370 -150 370 N
+P 3 0 1 0 -120 380 -120 370 -130 370 N
+P 3 0 1 0 -100 500 -100 420 -130 420 N
+P 3 0 1 0 -25 -400 -25 130 0 130 N
+P 3 0 1 0 25 -230 -225 -230 -225 -370 N
+P 3 0 1 0 25 170 -225 170 -225 30 N
+P 3 0 1 0 100 500 100 420 130 420 N
+P 3 0 1 0 160 380 160 370 150 370 N
+P 3 0 1 0 180 380 180 370 170 370 N
+P 3 0 1 0 200 500 200 420 170 420 N
+P 3 0 1 0 275 -280 275 -300 300 -300 N
+P 3 0 1 0 275 -120 275 -100 300 -100 N
+P 3 0 1 0 275 120 275 100 325 100 N
+P 3 0 1 0 275 280 275 300 325 300 N
+P 4 0 1 0 -130 420 -170 440 -170 400 -130 420 N
+P 4 0 1 0 170 420 130 440 130 400 170 420 N
+P 5 0 1 0 105 -170 125 -170 125 -100 225 -100 225 -120 N
+P 5 0 1 0 105 230 125 230 125 300 225 300 225 280 N
+P 5 0 1 0 225 -280 225 -300 125 -300 125 -230 105 -230 N
+P 5 0 1 0 225 120 225 100 125 100 125 170 105 170 N
+X ~ 1 100 600 100 D 50 50 1 1 P
+X ~ 10 600 -400 100 L 50 50 1 1 P
+X ~ 11 -100 600 100 D 50 50 1 1 P
+X ~ 12 -200 600 100 D 50 50 1 1 P
+X ~ 2 200 600 100 D 50 50 1 1 P
+X TD+ 3 600 300 100 L 50 50 1 1 P
+X TCT 4 600 200 100 L 50 50 1 1 P
+X TD- 5 600 100 100 L 50 50 1 1 P
+X RD+ 6 600 -100 100 L 50 50 1 1 P
+X RCT 7 600 -200 100 L 50 50 1 1 P
+X RD- 8 600 -300 100 L 50 50 1 1 P
+X ~ SH 0 -600 100 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
 # Wuerth_7499010121A
 #
 DEF Wuerth_7499010121A J 0 20 Y Y 1 F N
diff --git a/Converter_DCDC.dcm b/Converter_DCDC.dcm
index cc2e4d6a83..faf450eda3 100644
--- a/Converter_DCDC.dcm
+++ b/Converter_DCDC.dcm
@@ -3210,4 +3210,22 @@ K Traco isolated isolation dc-dc converter transformer
 F https://www.tracopower.com/products/tmr2wi.pdf
 $ENDCMP
 #
+$CMP TPSM53602RDA
+D  36-V, 2A input, stepdown, DC/DC converter, Texas B3QFN-14
+K step down DCDC converter regulator
+F https://www.ti.com/lit/ds/symlink/tpsm53602.pdf
+$ENDCMP
+#
+$CMP TPSM53603RDA
+D  36-V, 3A input, stepdown, DC/DC converter, Texas B3QFN-14
+K step down DCDC converter regulator
+F https://www.ti.com/lit/ds/symlink/tpsm53603.pdf
+$ENDCMP
+#
+$CMP TPSM53604RDA
+D  36-V, 4A input, stepdown, DC/DC converter, Texas B3QFN-14
+K step down DCDC converter regulator
+F https://www.ti.com/lit/ds/symlink/tpsm53604.pdf
+$ENDCMP
+#
 #End Doc Library
diff --git a/Converter_DCDC.lib b/Converter_DCDC.lib
index f780a82a60..e4cd3dc42c 100644
--- a/Converter_DCDC.lib
+++ b/Converter_DCDC.lib
@@ -1111,4 +1111,35 @@ X -VOUT 9 500 -200 100 L 50 50 1 1 w
 ENDDRAW
 ENDDEF
 #
+# TPSM53602RDA
+#
+DEF TPSM53602RDA U 0 20 Y Y 1 F N
+F0 "U" 0 600 50 H V L CNN
+F1 "TPSM53602RDA" 0 500 50 H V L CNN
+F2 "Package_DFN_QFN:Texas_B3QFN-14-1EP_5x5.5mm_P0.65mm_ThermalVia" 0 700 50 H I L CNN
+F3 "" 100 600 50 H I C CNN
+ALIAS TPSM53603RDA TPSM53604RDA
+$FPLIST
+ Texas*B3QFN*1EP*5x5.5mm*P0.65mm*
+$ENDFPLIST
+DRAW
+S 300 400 -300 -400 0 1 10 f
+X VIN 1 -400 300 100 R 50 50 1 1 W
+X PGND 10 0 -500 100 U 50 50 1 1 P N
+X PGND 11 0 -500 100 U 50 50 1 1 P N
+X AGND 12 -100 -500 100 U 50 50 1 1 W
+X V5V 13 400 100 100 L 50 50 1 1 O
+X VIN 14 -400 300 100 R 50 50 1 1 P N
+X PGND 15 0 -500 100 U 50 50 1 1 W
+X EN 2 -400 -100 100 R 50 50 1 1 I
+X PGND 3 0 -500 100 U 50 50 1 1 P N
+X DNC 4 -300 100 100 R 50 50 1 1 N N
+X DNC 5 -300 0 100 R 50 50 1 1 N N
+X PGOOD 6 400 -100 100 L 50 50 1 1 C
+X VOUT 7 400 300 100 L 50 50 1 1 w
+X VOUT 8 400 300 100 L 50 50 1 1 P N
+X FB 9 400 0 100 L 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
 #End Library
diff --git a/DSP_Microchip_DSPIC33.dcm b/DSP_Microchip_DSPIC33.dcm
index 9aa65d24da..1d6d1e0a17 100644
--- a/DSP_Microchip_DSPIC33.dcm
+++ b/DSP_Microchip_DSPIC33.dcm
@@ -1,5 +1,11 @@
 EESchema-DOCLIB  Version 2.0
 #
+$CMP DSPIC33EP256MU810-xPT
+D High-Performance, 16-bit Digital Signal Controller, 40MIPS, 256k Flash, 30k SRAM, TQFP-100
+K 16-bit Digital Signal Controller Microchip dsPIC
+F http://ww1.microchip.com/downloads/en/DeviceDoc/70616g.pdf
+$ENDCMP
+#
 $CMP DSPIC33FJ128GP204
 D 40MIPS, 128k Flash, 8k SRAM
 K 16-bit Digital Signal Controller Microchip dsPIC
diff --git a/DSP_Microchip_DSPIC33.lib b/DSP_Microchip_DSPIC33.lib
index 4bb61dafb6..35b44fcf9d 100644
--- a/DSP_Microchip_DSPIC33.lib
+++ b/DSP_Microchip_DSPIC33.lib
@@ -1,6 +1,121 @@
 EESchema-LIBRARY Version 2.4
 #encoding utf-8
 #
+# DSPIC33EP256MU810-xPT
+#
+DEF DSPIC33EP256MU810-xPT U 0 20 Y Y 1 F N
+F0 "U" 750 2750 50 H V C CNN
+F1 "DSPIC33EP256MU810-xPT" 0 -100 50 V V C CNN
+F2 "Package_QFP:TQFP-100_14x14mm_P0.5mm" -100 300 50 H I C CNN
+F3 "" -100 300 50 H I C CNN
+$FPLIST
+ TQFP*14x14mm*P0.5mm*
+$ENDFPLIST
+DRAW
+S -900 2700 900 -2700 0 1 10 f
+X RG15 1 1000 -2500 100 L 50 50 1 1 B
+X SCK2/PMA5/RG6 10 1000 -1800 100 L 50 50 1 1 B
+X AN28/PWM3L/PMD4/RE4 100 1000 500 100 L 50 50 1 1 B
+X SDI2/PMA4/RG7 11 1000 -1900 100 L 50 50 1 1 B
+X SDO2/PMA3/RG8 12 1000 -2000 100 L 50 50 1 1 B
+X ~MCLR 13 -1000 2300 100 R 50 50 1 1 I
+X PMA2/RG9 14 1000 -2100 100 L 50 50 1 1 B
+X VSS 15 -100 -2800 100 U 50 50 1 1 W
+X VDD 16 -300 2800 100 D 50 50 1 1 W
+X RA0/TMS 17 -1000 2000 100 R 50 50 1 1 B
+X AN20/RE8 18 1000 100 100 L 50 50 1 1 B
+X AN21/RE9 19 1000 0 100 L 50 50 1 1 B
+X VDD 2 -400 2800 100 D 50 50 1 1 W
+X RB5/AN5 20 -1000 200 100 R 50 50 1 1 B
+X RB4/AN4 21 -1000 300 100 R 50 50 1 1 B
+X RB3/AN3 22 -1000 400 100 R 50 50 1 1 B
+X RB2/AN2 23 -1000 500 100 R 50 50 1 1 B
+X RB1/AN1/PGEC3 24 -1000 600 100 R 50 50 1 1 B
+X RB0/AN0/PGED3 25 -1000 700 100 R 50 50 1 1 B
+X RB6/AN6/PGEC1 26 -1000 100 100 R 50 50 1 1 B
+X RB7/AN7/PGED1 27 -1000 0 100 R 50 50 1 1 B
+X RA9/VREF- 28 -1000 1200 100 R 50 50 1 1 B
+X RA10/VREF+ 29 -1000 1100 100 R 50 50 1 1 B
+X PWM3H/RE5 3 1000 400 100 L 50 50 1 1 B
+X AVDD 30 400 2800 100 D 50 50 1 1 W
+X AVSS 31 400 -2800 100 U 50 50 1 1 W
+X RB8/PMA6/AN8 32 -1000 -100 100 R 50 50 1 1 B
+X RB9/PMA7/AN9 33 -1000 -200 100 R 50 50 1 1 B
+X RB10/PMA13/AN10 34 -1000 -300 100 R 50 50 1 1 B
+X RB11/PMA12/AN11 35 -1000 -400 100 R 50 50 1 1 B
+X VSS 36 -100 -2800 100 U 50 50 1 1 P N
+X VDD 37 -200 2800 100 D 50 50 1 1 W
+X RA1/TCK 38 -1000 1900 100 R 50 50 1 1 B
+X RF13 39 1000 -1000 100 L 50 50 1 1 B
+X PWM4L/RE6 4 1000 300 100 L 50 50 1 1 B
+X RF12 40 1000 -900 100 L 50 50 1 1 B
+X RB12/PMA11/AN12 41 -1000 -500 100 R 50 50 1 1 B
+X RB13/PMA10/AN13 42 -1000 -600 100 R 50 50 1 1 B
+X RB14/PMA1/AN14 43 -1000 -700 100 R 50 50 1 1 B
+X RB15/PMA0/AN15 44 -1000 -800 100 R 50 50 1 1 B
+X VSS 45 -100 -2800 100 U 50 50 1 1 P N
+X VDD 46 -100 2800 100 D 50 50 1 1 W
+X RD14 47 1000 1200 100 L 50 50 1 1 B
+X RD15 48 1000 1100 100 L 50 50 1 1 B
+X SDA2/PMA9/RF4 49 1000 -600 100 L 50 50 1 1 B
+X PWM4H/RE7 5 1000 200 100 L 50 50 1 1 B
+X SCL2/PMA8/RF5 50 1000 -700 100 L 50 50 1 1 B
+X RF3 51 1000 -500 100 L 50 50 1 1 B
+X RF2 52 1000 -400 100 L 50 50 1 1 B
+X RF8 53 1000 -800 100 L 50 50 1 1 B
+X VBUS 54 1000 -1700 100 L 50 50 1 1 B
+X VUSB3V3 55 1000 -1600 100 L 50 50 1 1 B
+X D-/RG3 56 1000 -1500 100 L 50 50 1 1 B
+X D+/RG2 57 1000 -1400 100 L 50 50 1 1 B
+X RA2/ASCL2 58 -1000 1800 100 R 50 50 1 1 B
+X RA3/ASDA2 59 -1000 1700 100 R 50 50 1 1 B
+X RC1/PWM5L/AN16 6 -1000 -1000 100 R 50 50 1 1 B
+X RA4/TDI 60 -1000 1600 100 R 50 50 1 1 B
+X RA5/TDO 61 -1000 1500 100 R 50 50 1 1 B
+X VDD 62 0 2800 100 D 50 50 1 1 W
+X RC12/OSC1 63 -1000 -1400 100 R 50 50 1 1 B
+X RC15/CLKO/OSC2 64 -1000 -1700 100 R 50 50 1 1 B
+X VSS 65 -100 -2800 100 U 50 50 1 1 P N
+X RA14 66 -1000 1000 100 R 50 50 1 1 B
+X RA15 67 -1000 900 100 R 50 50 1 1 B
+X RTCC/RD8 68 1000 1800 100 L 50 50 1 1 B
+X ASDA1/RD9 69 1000 1700 100 L 50 50 1 1 B
+X RC2/PWM5H/AN17 7 -1000 -1100 100 R 50 50 1 1 B
+X ASCL1/RD10 70 1000 1600 100 L 50 50 1 1 B
+X RD11 71 1000 1500 100 L 50 50 1 1 B
+X INT0/RD0 72 1000 2600 100 L 50 50 1 1 B
+X RC13/SOSCI/PGED2 73 -1000 -1500 100 R 50 50 1 1 B
+X RC14/T1CK/SOSCO/PGEC2 74 -1000 -1600 100 R 50 50 1 1 B
+X VSS 75 -100 -2800 100 U 50 50 1 1 P N
+X RD1 76 1000 2500 100 L 50 50 1 1 B
+X DPH/RD2 77 1000 2400 100 L 50 50 1 1 B
+X PMBE/RD3 78 1000 2300 100 L 50 50 1 1 B
+X RD12 79 1000 1400 100 L 50 50 1 1 B
+X RC3/PWM6L/AN18 8 -1000 -1200 100 R 50 50 1 1 B
+X RD13 80 1000 1300 100 L 50 50 1 1 B
+X PMWR/RD4 81 1000 2200 100 L 50 50 1 1 B
+X PMRD/RD5 82 1000 2100 100 L 50 50 1 1 B
+X RD6 83 1000 2000 100 L 50 50 1 1 B
+X RD7 84 1000 1900 100 L 50 50 1 1 B
+X VCAP 85 -700 2800 100 D 50 50 1 1 P
+X VDD 86 100 2800 100 D 50 50 1 1 W
+X RF0 87 1000 -200 100 L 50 50 1 1 B
+X RF1 88 1000 -300 100 L 50 50 1 1 B
+X RG1 89 1000 -1300 100 L 50 50 1 1 B
+X RC4/PWM6H/AN19 9 -1000 -1300 100 R 50 50 1 1 B
+X RG0 90 1000 -1200 100 L 50 50 1 1 B
+X RA6/AN22 91 -1000 1400 100 R 50 50 1 1 B
+X RA7/AN23 92 -1000 1300 100 R 50 50 1 1 B
+X AN24/PWM1L/RE0 93 1000 900 100 L 50 50 1 1 B
+X AN25/PWM1H/RE1 94 1000 800 100 L 50 50 1 1 B
+X RG14 95 1000 -2400 100 L 50 50 1 1 B
+X RG12 96 1000 -2200 100 L 50 50 1 1 B
+X RG13 97 1000 -2300 100 L 50 50 1 1 B
+X AN26/PWM2L/PMD2/RE2 98 1000 700 100 L 50 50 1 1 B
+X AN27/PWM2H/PMD3/RE3 99 1000 600 100 L 50 50 1 1 B
+ENDDRAW
+ENDDEF
+#
 # DSPIC33FJ128GP204
 #
 DEF DSPIC33FJ128GP204 U 0 20 Y Y 1 F N
diff --git a/Device.dcm b/Device.dcm
index ea6b2ccb67..b5c60c6ea7 100644
--- a/Device.dcm
+++ b/Device.dcm
@@ -1,12 +1,12 @@
 EESchema-DOCLIB  Version 2.0
 #
-$CMP Amperemeter_AC
+$CMP Ammeter_AC
 D AC ammeter
 K ammeter AC ampere meter
 F ~
 $ENDCMP
 #
-$CMP Amperemeter_DC
+$CMP Ammeter_DC
 D DC ammeter
 K ammeter DC ampere meter
 F ~
@@ -66,60 +66,60 @@ K cap capacitor
 F ~
 $ENDCMP
 #
-$CMP CP
+$CMP C_Feedthrough
+D Feedthrough capacitor
+K EMI filter feedthrough capacitor
+F ~
+$ENDCMP
+#
+$CMP C_Polarized
 D Polarized capacitor
 K cap capacitor
 F ~
 $ENDCMP
 #
-$CMP CP1
-D Polarized capacitor, US symbol
+$CMP C_Polarized_Small
+D Polarized capacitor, small symbol
 K cap capacitor
 F ~
 $ENDCMP
 #
-$CMP CP1_Small
+$CMP C_Polarized_Small_US
 D Polarized capacitor, small US symbol
 K cap capacitor
 F ~
 $ENDCMP
 #
-$CMP CP_Small
-D Polarized capacitor, small symbol
+$CMP C_Polarized_US
+D Polarized capacitor, US symbol
 K cap capacitor
 F ~
 $ENDCMP
 #
-$CMP CTRIM
+$CMP C_Small
+D Unpolarized capacitor, small symbol
+K capacitor cap
+F ~
+$ENDCMP
+#
+$CMP C_Trim
 D Trimmable capacitor
 K trimmer variable capacitor
 F ~
 $ENDCMP
 #
-$CMP CTRIM_DIF
+$CMP C_Trim_Differential
 D Differential variable capacitor with two stators
 K trimmer capacitor
 F ~
 $ENDCMP
 #
-$CMP CTRIM_Small
+$CMP C_Trim_Small
 D Trimmable capacitor, small symbol
 K trimmer variable capacitor
 F ~
 $ENDCMP
 #
-$CMP C_Feedthrough
-D Feedthrough capacitor
-K EMI filter feedthrough capacitor
-F ~
-$ENDCMP
-#
-$CMP C_Small
-D Unpolarized capacitor, small symbol
-K capacitor cap
-F ~
-$ENDCMP
-#
 $CMP C_Variable
 D Variable capacitor
 K trimmer capacitor
@@ -234,7 +234,7 @@ K AC diode DIAC
 F ~
 $ENDCMP
 #
-$CMP DIAC_ALT
+$CMP DIAC_Filled
 D Diode for alternating current, filled shape
 K AC diode DIAC
 F ~
@@ -246,12 +246,6 @@ K diode
 F ~
 $ENDCMP
 #
-$CMP D_ALT
-D Diode, filled shape
-K diode
-F ~
-$ENDCMP
-#
 $CMP D_Bridge_+-AA
 D Diode bridge, +ve/-ve/AC/AC
 K rectifier ACDC
@@ -288,835 +282,871 @@ K capacitance diode varicap varactor
 F ~
 $ENDCMP
 #
-$CMP D_Capacitance_ALT
+$CMP D_Capacitance_Filled
 D Variable capacitance diode, filled shape
 K capacitance diode varicap varactor
 F ~
 $ENDCMP
 #
-$CMP D_KAA
-D Diode, anode on pins 2 and 3
+$CMP D_Dual_CommonAnode_AKK
+D Dual diode, common anode on pin 1
 K diode
 F ~
 $ENDCMP
 #
-$CMP D_KAK
-D Diode, cathode on pins 1 and 3
+$CMP D_Dual_CommonAnode_AKK_Parallel
+D Dual diode, common anode on pin 1
 K diode
 F ~
 $ENDCMP
 #
-$CMP D_KKA
-D Diode, cathode on pins 1 and 2
+$CMP D_Dual_CommonAnode_AKK_Split
+D Dual diode, common anode on pin 1
 K diode
 F ~
 $ENDCMP
 #
-$CMP D_Photo
-D Photodiode
-K photodiode diode opto
+$CMP D_Dual_CommonAnode_KAK
+D Dual diode, common anode on pin 2
+K diode
 F ~
 $ENDCMP
 #
-$CMP D_Photo_ALT
-D Photodiode, filled shape
-K photodiode diode opto
+$CMP D_Dual_CommonAnode_KAK_Parallel
+D Dual diode, common anode on pin 1
+K diode
 F ~
 $ENDCMP
 #
-$CMP D_Radiation
-D Semiconductor radiation detector
-K radiation detector diode
+$CMP D_Dual_CommonAnode_KAK_Split
+D Dual diode, common anode on pin 1
+K diode
 F ~
 $ENDCMP
 #
-$CMP D_Radiation_ALT
-D Semiconductor radiation detector, filled shape
-K radiation detector diode
+$CMP D_Dual_CommonAnode_KKA
+D Dual diode, common anode on pin 3
+K diode
 F ~
 $ENDCMP
 #
-$CMP D_Schottky
-D Schottky diode
-K diode Schottky
+$CMP D_Dual_CommonAnode_KKA_Parallel
+D Dual diode, common anode on pin 1
+K diode
 F ~
 $ENDCMP
 #
-$CMP D_Schottky_AAK
-D Schottky diode, anode on pins 1 and 2
-K diode Schottky SCHDPAK
+$CMP D_Dual_CommonAnode_KKA_Split
+D Dual diode, common anode on pin 1
+K diode
 F ~
 $ENDCMP
 #
-$CMP D_Schottky_AKA
-D Schottky diode, anode on pins 1 and 3
-K diode Schottky SCHDPAK
+$CMP D_Dual_CommonCathode_AAK
+D Dual diode, common cathode on pin 3
+K diode
 F ~
 $ENDCMP
 #
-$CMP D_Schottky_AKK
-D Schottky diode, cathode on pins 2 and 3
-K diode Schottky SCHDPAK
+$CMP D_Dual_CommonCathode_AAK_Parallel
+D Dual diode, common anode on pin 1
+K diode
 F ~
 $ENDCMP
 #
-$CMP D_Schottky_ALT
-D Schottky diode, filled shape
-K diode Schottky
+$CMP D_Dual_CommonCathode_AAK_Split
+D Dual diode, common anode on pin 1
+K diode
 F ~
 $ENDCMP
 #
-$CMP D_Schottky_KAA
-D Schottky diode, anode on pins 2 and 3
-K diode Schottky SCHDPAK
+$CMP D_Dual_CommonCathode_AKA
+D Dual diode, common cathode on pin 2
+K diode
 F ~
 $ENDCMP
 #
-$CMP D_Schottky_KAK
-D Schottky diode, cathode on pins 1 and 3
-K diode Schottky SCHDPAK
+$CMP D_Dual_CommonCathode_AKA_Parallel
+D Dual diode, common anode on pin 1
+K diode
 F ~
 $ENDCMP
 #
-$CMP D_Schottky_KKA
-D Schottky diode, cathode on pins 1 and 2
-K diode Schottky SCHDPAK
+$CMP D_Dual_CommonCathode_AKA_Split
+D Dual diode, common anode on pin 1
+K diode
 F ~
 $ENDCMP
 #
-$CMP D_Schottky_Small
-D Schottky diode, small symbol
-K diode Schottky
+$CMP D_Dual_CommonCathode_KAA
+D Dual diode, common cathode on pin 1
+K diode
 F ~
 $ENDCMP
 #
-$CMP D_Schottky_Small_ALT
-D Schottky diode, small symbol, filled shape
-K diode Schottky
+$CMP D_Dual_CommonCathode_KAA_Parallel
+D Dual diode, common anode on pin 1
+K diode
 F ~
 $ENDCMP
 #
-$CMP D_Schottky_x2_ACom_AKK
-D Dual Schottky diode, common anode on pin 1
+$CMP D_Dual_CommonCathode_KAA_Split
+D Dual diode, common anode on pin 1
 K diode
 F ~
 $ENDCMP
 #
-$CMP D_Schottky_x2_ACom_AKK_Parallel
-D Dual Schottky diode, common anode on pin 1
+$CMP D_Dual_Serial_ACK
+D Dual diode, anode/center/cathode
 K diode
 F ~
 $ENDCMP
 #
-$CMP D_Schottky_x2_ACom_AKK_Split
-D Dual Schottky diode, common anode on pin 1
+$CMP D_Dual_Serial_AKC
+D Dual diode, anode/cathode/center
 K diode
 F ~
 $ENDCMP
 #
-$CMP D_Schottky_x2_ACom_KAK
-D Dual Schottky diode, common anode on pin 2
+$CMP D_Dual_Serial_CAK
+D Dual diode, center/anode/cathode
 K diode
 F ~
 $ENDCMP
 #
-$CMP D_Schottky_x2_ACom_KAK_Parallel
-D Dual Schottky diode, common anode on pin 1
+$CMP D_Dual_Serial_CKA
+D Dual diode, center/cathode/anode
 K diode
 F ~
 $ENDCMP
 #
-$CMP D_Schottky_x2_ACom_KAK_Split
-D Dual Schottky diode, common anode on pin 1
+$CMP D_Dual_Serial_KAC
+D Dual diode, cathode/anode/center
 K diode
 F ~
 $ENDCMP
 #
-$CMP D_Schottky_x2_ACom_KKA
-D Dual Schottky diode, common anode on pin 3
+$CMP D_Dual_Serial_KCA
+D Dual diode, cathode/center/anode
 K diode
 F ~
 $ENDCMP
 #
-$CMP D_Schottky_x2_ACom_KKA_Parallel
-D Dual Schottky diode, common anode on pin 1
+$CMP D_Dual_Series_ACK_Parallel
+D Dual diode, common anode on pin 1
 K diode
 F ~
 $ENDCMP
 #
-$CMP D_Schottky_x2_ACom_KKA_Split
-D Dual Schottky diode, common anode on pin 1
+$CMP D_Dual_Series_ACK_Split
+D Dual diode, common anode on pin 1
 K diode
 F ~
 $ENDCMP
 #
-$CMP D_Schottky_x2_KCom_AAK
-D Dual Schottky diode, common cathode on pin 3
+$CMP D_Dual_Series_AKC_Parallel
+D Dual diode, common anode on pin 1
 K diode
 F ~
 $ENDCMP
 #
-$CMP D_Schottky_x2_KCom_AAK_Parallel
-D Dual Schottky diode, common anode on pin 1
+$CMP D_Dual_Series_AKC_Split
+D Dual diode, common anode on pin 1
 K diode
 F ~
 $ENDCMP
 #
-$CMP D_Schottky_x2_KCom_AAK_Split
-D Dual Schottky diode, common anode on pin 1
+$CMP D_Dual_Series_CAK_Parallel
+D Dual diode, common anode on pin 1
 K diode
 F ~
 $ENDCMP
 #
-$CMP D_Schottky_x2_KCom_AKA
-D Dual Schottky diode, common cathode on pin 2
+$CMP D_Dual_Series_CAK_Split
+D Dual diode, common anode on pin 1
 K diode
 F ~
 $ENDCMP
 #
-$CMP D_Schottky_x2_KCom_AKA_Parallel
-D Dual Schottky diode, common anode on pin 1
+$CMP D_Dual_Series_CKA_Parallel
+D Dual diode, common anode on pin 1
 K diode
 F ~
 $ENDCMP
 #
-$CMP D_Schottky_x2_KCom_AKA_Split
-D Dual Schottky diode, common anode on pin 1
+$CMP D_Dual_Series_CKA_Split
+D Dual diode, common anode on pin 1
 K diode
 F ~
 $ENDCMP
 #
-$CMP D_Schottky_x2_KCom_KAA
-D Dual Schottky diode, common cathode on pin 1
+$CMP D_Dual_Series_KAC_Parallel
+D Dual diode, common anode on pin 1
 K diode
 F ~
 $ENDCMP
 #
-$CMP D_Schottky_x2_KCom_KAA_Parallel
-D Dual Schottky diode, common anode on pin 1
+$CMP D_Dual_Series_KAC_Split
+D Dual diode, common anode on pin 1
 K diode
 F ~
 $ENDCMP
 #
-$CMP D_Schottky_x2_KCom_KAA_Split
-D Dual Schottky diode, common anode on pin 1
+$CMP D_Dual_Series_KCA_Parallel
+D Dual diode, common anode on pin 1
 K diode
 F ~
 $ENDCMP
 #
-$CMP D_Schottky_x2_Serial_ACK
-D Dual Schottky diode, anode/center/cathode
+$CMP D_Dual_Series_KCA_Split
+D Dual diode, common anode on pin 1
 K diode
 F ~
 $ENDCMP
 #
-$CMP D_Schottky_x2_Serial_AKC
-D Dual Schottky diode, anode/cathode/center
+$CMP D_Filled
+D Diode, filled shape
 K diode
 F ~
 $ENDCMP
 #
-$CMP D_Schottky_x2_Serial_CAK
-D Dual Schottky diode, center/anode/cathode
+$CMP D_KAA
+D Diode, anode on pins 2 and 3
 K diode
 F ~
 $ENDCMP
 #
-$CMP D_Schottky_x2_Serial_CKA
-D Dual Schottky diode, center/cathode/anode
+$CMP D_KAK
+D Diode, cathode on pins 1 and 3
 K diode
 F ~
 $ENDCMP
 #
-$CMP D_Schottky_x2_Serial_KAC
-D Dual Schottky diode, cathode/anode/center
+$CMP D_KKA
+D Diode, cathode on pins 1 and 2
 K diode
 F ~
 $ENDCMP
 #
-$CMP D_Schottky_x2_Serial_KCA
-D Dual Schottky diode, cathode/center/anode
-K diode
+$CMP D_Laser_1A3C
+D Laser diode, cathode on pin 3, anode on pin 1
+K opto laserdiode
 F ~
 $ENDCMP
 #
-$CMP D_Schottky_x2_Series_ACK_Parallel
-D Dual Schottky diode, common anode on pin 1
-K diode
+$CMP D_Laser_1C2A
+D Laser diode, cathode on pin 1, anode on pin 2
+K opto laserdiode
 F ~
 $ENDCMP
 #
-$CMP D_Schottky_x2_Series_ACK_Split
-D Dual Schottky diode, common anode on pin 1
-K diode
+$CMP D_Laser_Photo_MType
+D Laser diode with photodiode, common cathode on pin 2
+K opto laserdiode photodiode
+F http://www.egismos.disonhu.com/laser/diode-package.htm
+$ENDCMP
+#
+$CMP D_Laser_Photo_NType
+D Laser diode with photodiode, center on pin 2, LD cathode on pin 1
+K opto laserdiode photodiode
+F http://www.egismos.disonhu.com/laser/diode-package.htm
+$ENDCMP
+#
+$CMP D_Laser_Photo_PType
+D Laser diode with photodiode, center on pin 2, PD cathode on pin 3
+K opto laserdiode photodiode
+F http://www.egismos.disonhu.com/laser/diode-package.htm
+$ENDCMP
+#
+$CMP D_Photo
+D Photodiode
+K photodiode diode opto
 F ~
 $ENDCMP
 #
-$CMP D_Schottky_x2_Series_AKC_Parallel
-D Dual Schottky diode, common anode on pin 1
-K diode
+$CMP D_Photo_Filled
+D Photodiode, filled shape
+K photodiode diode opto
+F ~
+$ENDCMP
+#
+$CMP D_Radiation
+D Semiconductor radiation detector
+K radiation detector diode
+F ~
+$ENDCMP
+#
+$CMP D_Radiation_Filled
+D Semiconductor radiation detector, filled shape
+K radiation detector diode
+F ~
+$ENDCMP
+#
+$CMP D_Schottky
+D Schottky diode
+K diode Schottky
+F ~
+$ENDCMP
+#
+$CMP D_Schottky_AAK
+D Schottky diode, anode on pins 1 and 2
+K diode Schottky SCHDPAK
+F ~
+$ENDCMP
+#
+$CMP D_Schottky_AKA
+D Schottky diode, anode on pins 1 and 3
+K diode Schottky SCHDPAK
 F ~
 $ENDCMP
 #
-$CMP D_Schottky_x2_Series_AKC_Split
+$CMP D_Schottky_AKK
+D Schottky diode, cathode on pins 2 and 3
+K diode Schottky SCHDPAK
+F ~
+$ENDCMP
+#
+$CMP D_Schottky_Dual_CommonAnode_AKK
 D Dual Schottky diode, common anode on pin 1
 K diode
 F ~
 $ENDCMP
 #
-$CMP D_Schottky_x2_Series_CAK_Parallel
+$CMP D_Schottky_Dual_CommonAnode_AKK_Parallel
 D Dual Schottky diode, common anode on pin 1
 K diode
 F ~
 $ENDCMP
 #
-$CMP D_Schottky_x2_Series_CAK_Split
+$CMP D_Schottky_Dual_CommonAnode_AKK_Split
 D Dual Schottky diode, common anode on pin 1
 K diode
 F ~
 $ENDCMP
 #
-$CMP D_Schottky_x2_Series_CKA_Parallel
-D Dual Schottky diode, common anode on pin 1
+$CMP D_Schottky_Dual_CommonAnode_KAK
+D Dual Schottky diode, common anode on pin 2
 K diode
 F ~
 $ENDCMP
 #
-$CMP D_Schottky_x2_Series_CKA_Split
+$CMP D_Schottky_Dual_CommonAnode_KAK_Parallel
 D Dual Schottky diode, common anode on pin 1
 K diode
 F ~
 $ENDCMP
 #
-$CMP D_Schottky_x2_Series_KAC_Parallel
+$CMP D_Schottky_Dual_CommonAnode_KAK_Split
 D Dual Schottky diode, common anode on pin 1
 K diode
 F ~
 $ENDCMP
 #
-$CMP D_Schottky_x2_Series_KAC_Split
-D Dual Schottky diode, common anode on pin 1
+$CMP D_Schottky_Dual_CommonAnode_KKA
+D Dual Schottky diode, common anode on pin 3
 K diode
 F ~
 $ENDCMP
 #
-$CMP D_Schottky_x2_Series_KCA_Parallel
+$CMP D_Schottky_Dual_CommonAnode_KKA_Parallel
 D Dual Schottky diode, common anode on pin 1
 K diode
 F ~
 $ENDCMP
 #
-$CMP D_Schottky_x2_Series_KCA_Split
+$CMP D_Schottky_Dual_CommonAnode_KKA_Split
 D Dual Schottky diode, common anode on pin 1
 K diode
 F ~
 $ENDCMP
 #
-$CMP D_Shockley
-D Shockley (PNPN) diode
-K Shockley diode PNPN
+$CMP D_Schottky_Dual_CommonCathode_AAK
+D Dual Schottky diode, common cathode on pin 3
+K diode
 F ~
 $ENDCMP
 #
-$CMP D_SiPM
-D Silicon photomultiplier
-K SiPM MPPC SPAD photon counting
+$CMP D_Schottky_Dual_CommonCathode_AAK_Parallel
+D Dual Schottky diode, common anode on pin 1
+K diode
 F ~
 $ENDCMP
 #
-$CMP D_Small
-D Diode, small symbol
+$CMP D_Schottky_Dual_CommonCathode_AAK_Split
+D Dual Schottky diode, common anode on pin 1
 K diode
 F ~
 $ENDCMP
 #
-$CMP D_Small_ALT
-D Diode, small symbol, filled shape
+$CMP D_Schottky_Dual_CommonCathode_AKA
+D Dual Schottky diode, common cathode on pin 2
 K diode
 F ~
 $ENDCMP
 #
-$CMP D_TVS
-D Bidirectional transient-voltage-suppression diode
-K diode TVS thyrector
+$CMP D_Schottky_Dual_CommonCathode_AKA_Parallel
+D Dual Schottky diode, common anode on pin 1
+K diode
 F ~
 $ENDCMP
 #
-$CMP D_TVS_ALT
-D Bidirectional transient-voltage-suppression diode, filled shape
-K diode TVS thyrector
+$CMP D_Schottky_Dual_CommonCathode_AKA_Split
+D Dual Schottky diode, common anode on pin 1
+K diode
 F ~
 $ENDCMP
 #
-$CMP D_TVS_x2_AAC
-D Bidirectional dual transient-voltage-suppression diode, center on pin 3
-K diode TVS thyrector
+$CMP D_Schottky_Dual_CommonCathode_KAA
+D Dual Schottky diode, common cathode on pin 1
+K diode
 F ~
 $ENDCMP
 #
-$CMP D_TVS_x2_ACA
-D Bidirectional dual transient-voltage-suppression diode, center on pin 2
-K diode TVS thyrector
+$CMP D_Schottky_Dual_CommonCathode_KAA_Parallel
+D Dual Schottky diode, common anode on pin 1
+K diode
 F ~
 $ENDCMP
 #
-$CMP D_TVS_x2_CAA
-D Bidirectional dual transient-voltage-suppression diode, center on pin 1
-K diode TVS thyrector
+$CMP D_Schottky_Dual_CommonCathode_KAA_Split
+D Dual Schottky diode, common anode on pin 1
+K diode
 F ~
 $ENDCMP
 #
-$CMP D_Temperature_Dependent
-D Temperature dependent diode
-K temperature sensor diode
+$CMP D_Schottky_Dual_Serial_ACK
+D Dual Schottky diode, anode/center/cathode
+K diode
 F ~
 $ENDCMP
 #
-$CMP D_Temperature_Dependent_ALT
-D Temperature dependent diode, filled shape
-K temperature sensor diode
+$CMP D_Schottky_Dual_Serial_AKC
+D Dual Schottky diode, anode/cathode/center
+K diode
 F ~
 $ENDCMP
 #
-$CMP D_Tunnel
-D Tunnel diode (Esaki diode)
-K tunnel diode
+$CMP D_Schottky_Dual_Serial_CAK
+D Dual Schottky diode, center/anode/cathode
+K diode
 F ~
 $ENDCMP
 #
-$CMP D_Tunnel_ALT
-D Tunnel diode (Esaki diode), filled shape
-K tunnel diode
+$CMP D_Schottky_Dual_Serial_CKA
+D Dual Schottky diode, center/cathode/anode
+K diode
 F ~
 $ENDCMP
 #
-$CMP D_Unitunnel
-D Unitunnel diode
-K unitunnel diode
+$CMP D_Schottky_Dual_Serial_KAC
+D Dual Schottky diode, cathode/anode/center
+K diode
 F ~
 $ENDCMP
 #
-$CMP D_Unitunnel_ALT
-D Unitunnel diode, filled shape
-K unitunnel diode
+$CMP D_Schottky_Dual_Serial_KCA
+D Dual Schottky diode, cathode/center/anode
+K diode
 F ~
 $ENDCMP
 #
-$CMP D_Zener
-D Zener diode
+$CMP D_Schottky_Dual_Series_ACK_Parallel
+D Dual Schottky diode, common anode on pin 1
 K diode
 F ~
 $ENDCMP
 #
-$CMP D_Zener_ALT
-D Zener diode, filled shape
+$CMP D_Schottky_Dual_Series_ACK_Split
+D Dual Schottky diode, common anode on pin 1
 K diode
 F ~
 $ENDCMP
 #
-$CMP D_Zener_Small
-D Zener diode, small symbol
+$CMP D_Schottky_Dual_Series_AKC_Parallel
+D Dual Schottky diode, common anode on pin 1
 K diode
 F ~
 $ENDCMP
 #
-$CMP D_Zener_Small_ALT
-D Zener diode, small symbol, filled shape
+$CMP D_Schottky_Dual_Series_AKC_Split
+D Dual Schottky diode, common anode on pin 1
 K diode
 F ~
 $ENDCMP
 #
-$CMP D_Zener_x2_ACom_AKK
-D Dual Zener diode, common anode on pin 1
-K diode zener dual
+$CMP D_Schottky_Dual_Series_CAK_Parallel
+D Dual Schottky diode, common anode on pin 1
+K diode
 F ~
 $ENDCMP
 #
-$CMP D_Zener_x2_ACom_AKK_Parallel
-D Dual Zener diode, common anode on pin 1
+$CMP D_Schottky_Dual_Series_CAK_Split
+D Dual Schottky diode, common anode on pin 1
 K diode
 F ~
 $ENDCMP
 #
-$CMP D_Zener_x2_ACom_AKK_Split
-D Dual Zener diode, common anode on pin 1
+$CMP D_Schottky_Dual_Series_CKA_Parallel
+D Dual Schottky diode, common anode on pin 1
 K diode
 F ~
 $ENDCMP
 #
-$CMP D_Zener_x2_ACom_KAK
-D Dual Zener diode, common anode on pin 2
-K diode zener dual
+$CMP D_Schottky_Dual_Series_CKA_Split
+D Dual Schottky diode, common anode on pin 1
+K diode
 F ~
 $ENDCMP
 #
-$CMP D_Zener_x2_ACom_KAK_Parallel
-D Dual Zener diode, common anode on pin 1
+$CMP D_Schottky_Dual_Series_KAC_Parallel
+D Dual Schottky diode, common anode on pin 1
 K diode
 F ~
 $ENDCMP
 #
-$CMP D_Zener_x2_ACom_KAK_Split
-D Dual Zener diode, common anode on pin 1
+$CMP D_Schottky_Dual_Series_KAC_Split
+D Dual Schottky diode, common anode on pin 1
 K diode
 F ~
 $ENDCMP
 #
-$CMP D_Zener_x2_ACom_KKA
-D Dual Zener diode, common anode on pin 3
-K diode zener dual
+$CMP D_Schottky_Dual_Series_KCA_Parallel
+D Dual Schottky diode, common anode on pin 1
+K diode
 F ~
 $ENDCMP
 #
-$CMP D_Zener_x2_ACom_KKA_Parallel
-D Dual Zener diode, common anode on pin 1
+$CMP D_Schottky_Dual_Series_KCA_Split
+D Dual Schottky diode, common anode on pin 1
 K diode
 F ~
 $ENDCMP
 #
-$CMP D_Zener_x2_ACom_KKA_Split
-D Dual Zener diode, common anode on pin 1
-K diode
+$CMP D_Schottky_Filled
+D Schottky diode, filled shape
+K diode Schottky
 F ~
 $ENDCMP
 #
-$CMP D_Zener_x2_KCom_AAK
-D Dual Zener diode, common cathode on pin 3
-K diode zener dual
+$CMP D_Schottky_KAA
+D Schottky diode, anode on pins 2 and 3
+K diode Schottky SCHDPAK
 F ~
 $ENDCMP
 #
-$CMP D_Zener_x2_KCom_AAK_Parallel
-D Dual Zener diode, common anode on pin 1
-K diode
+$CMP D_Schottky_KAK
+D Schottky diode, cathode on pins 1 and 3
+K diode Schottky SCHDPAK
 F ~
 $ENDCMP
 #
-$CMP D_Zener_x2_KCom_AAK_Split
-D Dual Zener diode, common anode on pin 1
-K diode
+$CMP D_Schottky_KKA
+D Schottky diode, cathode on pins 1 and 2
+K diode Schottky SCHDPAK
 F ~
 $ENDCMP
 #
-$CMP D_Zener_x2_KCom_AKA
-D Dual Zener diode, common cathode on pin 2
-K diode zener dual
+$CMP D_Schottky_Small
+D Schottky diode, small symbol
+K diode Schottky
 F ~
 $ENDCMP
 #
-$CMP D_Zener_x2_KCom_AKA_Parallel
-D Dual Zener diode, common anode on pin 1
-K diode
+$CMP D_Schottky_Small_Filled
+D Schottky diode, small symbol, filled shape
+K diode Schottky
 F ~
 $ENDCMP
 #
-$CMP D_Zener_x2_KCom_AKA_Split
-D Dual Zener diode, common anode on pin 1
-K diode
+$CMP D_Shockley
+D Shockley (PNPN) diode
+K Shockley diode PNPN
 F ~
 $ENDCMP
 #
-$CMP D_Zener_x2_KCom_KAA
-D Dual Zener diode, common cathode on pin 1
-K diode zener dual
+$CMP D_SiPM
+D Silicon photomultiplier
+K SiPM MPPC SPAD photon counting
 F ~
 $ENDCMP
 #
-$CMP D_Zener_x2_KCom_KAA_Parallel
-D Dual Zener diode, common anode on pin 1
+$CMP D_Small
+D Diode, small symbol
 K diode
 F ~
 $ENDCMP
 #
-$CMP D_Zener_x2_KCom_KAA_Split
-D Dual Zener diode, common anode on pin 1
+$CMP D_Small_Filled
+D Diode, small symbol, filled shape
 K diode
 F ~
 $ENDCMP
 #
-$CMP D_x2_ACom_AKK
-D Dual diode, common anode on pin 1
-K diode
+$CMP D_TVS
+D Bidirectional transient-voltage-suppression diode
+K diode TVS thyrector
 F ~
 $ENDCMP
 #
-$CMP D_x2_ACom_AKK_Parallel
-D Dual diode, common anode on pin 1
-K diode
+$CMP D_TVS_Dual_AAC
+D Bidirectional dual transient-voltage-suppression diode, center on pin 3
+K diode TVS thyrector
 F ~
 $ENDCMP
 #
-$CMP D_x2_ACom_AKK_Split
-D Dual diode, common anode on pin 1
-K diode
+$CMP D_TVS_Dual_ACA
+D Bidirectional dual transient-voltage-suppression diode, center on pin 2
+K diode TVS thyrector
 F ~
 $ENDCMP
 #
-$CMP D_x2_ACom_KAK
-D Dual diode, common anode on pin 2
-K diode
+$CMP D_TVS_Dual_CAA
+D Bidirectional dual transient-voltage-suppression diode, center on pin 1
+K diode TVS thyrector
+F ~
+$ENDCMP
+#
+$CMP D_TVS_Filled
+D Bidirectional transient-voltage-suppression diode, filled shape
+K diode TVS thyrector
 F ~
 $ENDCMP
 #
-$CMP D_x2_ACom_KAK_Parallel
-D Dual diode, common anode on pin 1
-K diode
+$CMP D_TemperatureDependent
+D Temperature dependent diode
+K temperature sensor diode
 F ~
 $ENDCMP
 #
-$CMP D_x2_ACom_KAK_Split
-D Dual diode, common anode on pin 1
-K diode
+$CMP D_TemperatureDependent_Filled
+D Temperature dependent diode, filled shape
+K temperature sensor diode
 F ~
 $ENDCMP
 #
-$CMP D_x2_ACom_KKA
-D Dual diode, common anode on pin 3
-K diode
+$CMP D_Tunnel
+D Tunnel diode (Esaki diode)
+K tunnel diode
 F ~
 $ENDCMP
 #
-$CMP D_x2_ACom_KKA_Parallel
-D Dual diode, common anode on pin 1
-K diode
+$CMP D_Tunnel_Filled
+D Tunnel diode (Esaki diode), filled shape
+K tunnel diode
 F ~
 $ENDCMP
 #
-$CMP D_x2_ACom_KKA_Split
-D Dual diode, common anode on pin 1
-K diode
+$CMP D_Unitunnel
+D Unitunnel diode
+K unitunnel diode
 F ~
 $ENDCMP
 #
-$CMP D_x2_KCom_AAK
-D Dual diode, common cathode on pin 3
-K diode
+$CMP D_Unitunnel_Filled
+D Unitunnel diode, filled shape
+K unitunnel diode
 F ~
 $ENDCMP
 #
-$CMP D_x2_KCom_AAK_Parallel
-D Dual diode, common anode on pin 1
+$CMP D_Zener
+D Zener diode
 K diode
 F ~
 $ENDCMP
 #
-$CMP D_x2_KCom_AAK_Split
-D Dual diode, common anode on pin 1
-K diode
+$CMP D_Zener_Dual_CommonAnode_AKK
+D Dual Zener diode, common anode on pin 1
+K diode zener dual
 F ~
 $ENDCMP
 #
-$CMP D_x2_KCom_AKA
-D Dual diode, common cathode on pin 2
+$CMP D_Zener_Dual_CommonAnode_AKK_Parallel
+D Dual Zener diode, common anode on pin 1
 K diode
 F ~
 $ENDCMP
 #
-$CMP D_x2_KCom_AKA_Parallel
-D Dual diode, common anode on pin 1
+$CMP D_Zener_Dual_CommonAnode_AKK_Split
+D Dual Zener diode, common anode on pin 1
 K diode
 F ~
 $ENDCMP
 #
-$CMP D_x2_KCom_AKA_Split
-D Dual diode, common anode on pin 1
-K diode
+$CMP D_Zener_Dual_CommonAnode_KAK
+D Dual Zener diode, common anode on pin 2
+K diode zener dual
 F ~
 $ENDCMP
 #
-$CMP D_x2_KCom_KAA
-D Dual diode, common cathode on pin 1
+$CMP D_Zener_Dual_CommonAnode_KAK_Parallel
+D Dual Zener diode, common anode on pin 1
 K diode
 F ~
 $ENDCMP
 #
-$CMP D_x2_KCom_KAA_Parallel
-D Dual diode, common anode on pin 1
+$CMP D_Zener_Dual_CommonAnode_KAK_Split
+D Dual Zener diode, common anode on pin 1
 K diode
 F ~
 $ENDCMP
 #
-$CMP D_x2_KCom_KAA_Split
-D Dual diode, common anode on pin 1
-K diode
+$CMP D_Zener_Dual_CommonAnode_KKA
+D Dual Zener diode, common anode on pin 3
+K diode zener dual
 F ~
 $ENDCMP
 #
-$CMP D_x2_Serial_ACK
-D Dual diode, anode/center/cathode
+$CMP D_Zener_Dual_CommonAnode_KKA_Parallel
+D Dual Zener diode, common anode on pin 1
 K diode
 F ~
 $ENDCMP
 #
-$CMP D_x2_Serial_AKC
-D Dual diode, anode/cathode/center
+$CMP D_Zener_Dual_CommonAnode_KKA_Split
+D Dual Zener diode, common anode on pin 1
 K diode
 F ~
 $ENDCMP
 #
-$CMP D_x2_Serial_CAK
-D Dual diode, center/anode/cathode
-K diode
+$CMP D_Zener_Dual_CommonCathode_AAK
+D Dual Zener diode, common cathode on pin 3
+K diode zener dual
 F ~
 $ENDCMP
 #
-$CMP D_x2_Serial_CKA
-D Dual diode, center/cathode/anode
+$CMP D_Zener_Dual_CommonCathode_AAK_Parallel
+D Dual Zener diode, common anode on pin 1
 K diode
 F ~
 $ENDCMP
 #
-$CMP D_x2_Serial_KAC
-D Dual diode, cathode/anode/center
+$CMP D_Zener_Dual_CommonCathode_AAK_Split
+D Dual Zener diode, common anode on pin 1
 K diode
 F ~
 $ENDCMP
 #
-$CMP D_x2_Serial_KCA
-D Dual diode, cathode/center/anode
-K diode
+$CMP D_Zener_Dual_CommonCathode_AKA
+D Dual Zener diode, common cathode on pin 2
+K diode zener dual
 F ~
 $ENDCMP
 #
-$CMP D_x2_Series_ACK_Parallel
-D Dual diode, common anode on pin 1
+$CMP D_Zener_Dual_CommonCathode_AKA_Parallel
+D Dual Zener diode, common anode on pin 1
 K diode
 F ~
 $ENDCMP
 #
-$CMP D_x2_Series_ACK_Split
-D Dual diode, common anode on pin 1
+$CMP D_Zener_Dual_CommonCathode_AKA_Split
+D Dual Zener diode, common anode on pin 1
 K diode
 F ~
 $ENDCMP
 #
-$CMP D_x2_Series_AKC_Parallel
-D Dual diode, common anode on pin 1
-K diode
+$CMP D_Zener_Dual_CommonCathode_KAA
+D Dual Zener diode, common cathode on pin 1
+K diode zener dual
 F ~
 $ENDCMP
 #
-$CMP D_x2_Series_AKC_Split
-D Dual diode, common anode on pin 1
+$CMP D_Zener_Dual_CommonCathode_KAA_Parallel
+D Dual Zener diode, common anode on pin 1
 K diode
 F ~
 $ENDCMP
 #
-$CMP D_x2_Series_CAK_Parallel
-D Dual diode, common anode on pin 1
+$CMP D_Zener_Dual_CommonCathode_KAA_Split
+D Dual Zener diode, common anode on pin 1
 K diode
 F ~
 $ENDCMP
 #
-$CMP D_x2_Series_CAK_Split
-D Dual diode, common anode on pin 1
+$CMP D_Zener_Filled
+D Zener diode, filled shape
 K diode
 F ~
 $ENDCMP
 #
-$CMP D_x2_Series_CKA_Parallel
-D Dual diode, common anode on pin 1
+$CMP D_Zener_Small
+D Zener diode, small symbol
 K diode
 F ~
 $ENDCMP
 #
-$CMP D_x2_Series_CKA_Split
-D Dual diode, common anode on pin 1
+$CMP D_Zener_Small_Filled
+D Zener diode, small symbol, filled shape
 K diode
 F ~
 $ENDCMP
 #
-$CMP D_x2_Series_KAC_Parallel
-D Dual diode, common anode on pin 1
-K diode
+$CMP DelayLine
+D Delay line
+K delay propagation retard impedance
 F ~
 $ENDCMP
 #
-$CMP D_x2_Series_KAC_Split
-D Dual diode, common anode on pin 1
-K diode
+$CMP Earphone
+D Earphone, polarized
+K earphone speaker headphone
 F ~
 $ENDCMP
 #
-$CMP D_x2_Series_KCA_Parallel
-D Dual diode, common anode on pin 1
-K diode
+$CMP ElectromagneticActor
+D Electromagnetic actor
+K electromagnet coil inductor
 F ~
 $ENDCMP
 #
-$CMP D_x2_Series_KCA_Split
-D Dual diode, common anode on pin 1
-K diode
+$CMP FerriteBead
+D Ferrite bead
+K L ferrite bead inductor filter
 F ~
 $ENDCMP
 #
-$CMP Delay_Line
-D Delay line
-K delay propagation retard impedance
+$CMP FerriteBead_Small
+D Ferrite bead, small symbol
+K L ferrite bead inductor filter
 F ~
 $ENDCMP
 #
-$CMP EMI_Filter_C
+$CMP Filter_EMI_C
 D EMI filter, single capacitor
 K EMI filter feedthrough capacitor
 F http://www.murata.com/~/media/webrenewal/support/library/catalog/products/emc/emifil/c31e.ashx?la=en-gb
 $ENDCMP
 #
-$CMP EMI_Filter_CLC
+$CMP Filter_EMI_CLC
 D EMI T-filter (CLC)
 K EMI T-filter
 F http://www.murata.com/~/media/webrenewal/support/library/catalog/products/emc/emifil/c31e.ashx?la=en-gb
 $ENDCMP
 #
-$CMP EMI_Filter_CommonMode
+$CMP Filter_EMI_CommonMode
 D EMI 2-inductor common mode filter
 K EMI common mode filter
 F ~
 $ENDCMP
 #
-$CMP EMI_Filter_LCL
+$CMP Filter_EMI_LCL
 D EMI T-filter (LCL)
 K EMI T-filter
 F http://www.murata.com/~/media/webrenewal/support/library/catalog/products/emc/emifil/c31e.ashx?la=en-gb
 $ENDCMP
 #
-$CMP EMI_Filter_LL
+$CMP Filter_EMI_LL
 D EMI 2-inductor filter
 K EMI filter
 F ~
 $ENDCMP
 #
-$CMP EMI_Filter_LL_1423
+$CMP Filter_EMI_LL_1423
 D EMI 2-inductor filter, pin-connections 1-4 and 2-3
 K EMI filter common-mode choke
 F ~
 $ENDCMP
 #
-$CMP Earphone
-D Earphone, polarized
-K earphone speaker headphone
-F ~
-$ENDCMP
-#
-$CMP Electromagnetic_Actor
-D Electromagnetic actor
-K electromagnet coil inductor
-F ~
-$ENDCMP
-#
-$CMP Ferrite_Bead
-D Ferrite bead
-K L ferrite bead inductor filter
-F ~
-$ENDCMP
-#
-$CMP Ferrite_Bead_Small
-D Ferrite bead, small symbol
-K L ferrite bead inductor filter
-F ~
-$ENDCMP
-#
-$CMP Frequency_Counter
+$CMP FrequencyCounter
 D Frequency counter
 K frequency counter
 F ~
@@ -1146,13 +1176,13 @@ K fuse
 F ~
 $ENDCMP
 #
-$CMP GDT_2pin
+$CMP GDT_2Pin
 D Gas Discharge Tube with 2 Pins
 K gdt
 F ~
 $ENDCMP
 #
-$CMP GDT_3pin
+$CMP GDT_3Pin
 D Gas Discharge Tube with 3 Pins
 K gdt
 F ~
@@ -1164,7 +1194,7 @@ K galvanometer
 F ~
 $ENDCMP
 #
-$CMP Hall_Generator
+$CMP HallGenerator
 D Hall effect generator
 K Hall generator magnet
 F ~
@@ -1176,30 +1206,6 @@ K heater R resistor
 F ~
 $ENDCMP
 #
-$CMP Jumper
-D Jumper, normally closed
-K jumper bridge link NC
-F ~
-$ENDCMP
-#
-$CMP Jumper_NC_Dual
-D Dual jumper, normally closed
-K jumper bridge link NC
-F ~
-$ENDCMP
-#
-$CMP Jumper_NC_Small
-D Jumper, normally closed, small symbol
-K jumper link bridge NC
-F ~
-$ENDCMP
-#
-$CMP Jumper_NO_Small
-D Jumper, normally open, small symbol
-K jumper link bridge NO
-F ~
-$ENDCMP
-#
 $CMP L
 D Inductor
 K inductor choke coil reactor magnetic
@@ -1236,12 +1242,6 @@ K LED RGB diode
 F ~
 $ENDCMP
 #
-$CMP LED_ALT
-D Light emitting diode, filled shape
-K LED diode
-F ~
-$ENDCMP
-#
 $CMP LED_ARBG
 D RGB LED, anode/red/blue/green
 K LED RGB diode
@@ -1266,25 +1266,13 @@ K LED RGB diode
 F ~
 $ENDCMP
 #
-$CMP LED_BCGR
-D RGB LED, blue/cathode/green/red
-K LED RGB diode
-F ~
-$ENDCMP
-#
-$CMP LED_BCRG
-D RGB LED, blue/cathode/red/green
-K LED RGB diode
-F ~
-$ENDCMP
-#
 $CMP LED_BGAR
 D RGB LED, blue/green/anode/red
 K LED RGB diode
 F ~
 $ENDCMP
 #
-$CMP LED_BGCR
+$CMP LED_BGKR
 D RGB LED, blue/green/cathode/red
 K LED RGB diode
 F ~
@@ -1296,120 +1284,102 @@ K LED RGB diode
 F ~
 $ENDCMP
 #
-$CMP LED_BGRC
+$CMP LED_BGRK
 D RGB LED, blue/green/red/cathode
 K LED RGB diode
 F ~
 $ENDCMP
 #
-$CMP LED_BRAG
-D RGB LED, blue/red/anode/green
-K LED RGB diode
-F ~
-$ENDCMP
-#
-$CMP LED_BRCG
-D RGB LED, blue/red/cathode/green
-K LED RGB diode
-F ~
-$ENDCMP
-#
-$CMP LED_BRGA
-D RGB LED, blue/red/green/anode
-K LED RGB diode
-F ~
-$ENDCMP
-#
-$CMP LED_BRGC
-D RGB LED, blue/red/green/cathode
-K LED RGB diode
-F ~
-$ENDCMP
-#
-$CMP LED_CBGR
-D RGB LED, cathode/blue/green/red
+$CMP LED_BKGR
+D RGB LED, blue/cathode/green/red
 K LED RGB diode
 F ~
 $ENDCMP
 #
-$CMP LED_CBRG
-D RGB LED, cathode/blue/red/green
+$CMP LED_BKRG
+D RGB LED, blue/cathode/red/green
 K LED RGB diode
 F ~
 $ENDCMP
 #
-$CMP LED_CGBR
-D RGB LED, cathode/green/blue/red
+$CMP LED_BRAG
+D RGB LED, blue/red/anode/green
 K LED RGB diode
 F ~
 $ENDCMP
 #
-$CMP LED_CGRB
-D RGB LED, cathode/green/red/blue
+$CMP LED_BRGA
+D RGB LED, blue/red/green/anode
 K LED RGB diode
 F ~
 $ENDCMP
 #
-$CMP LED_CRBG
-D RGB LED, cathode/red/blue/green
+$CMP LED_BRGK
+D RGB LED, blue/red/green/cathode
 K LED RGB diode
 F ~
 $ENDCMP
 #
-$CMP LED_CRGB
-D RGB LED, cathode/red/green/blue
+$CMP LED_BRKG
+D RGB LED, blue/red/cathode/green
 K LED RGB diode
 F ~
 $ENDCMP
 #
-$CMP LED_Dual_2pin
-D Dual LED, bidirectional
-K LED diode bicolor dual
-F ~
-$ENDCMP
-#
-$CMP LED_Dual_AAC
+$CMP LED_Dual_AAK
 D Dual LED, common cathode on pin 3
 K LED diode bicolor dual
 F ~
 $ENDCMP
 #
-$CMP LED_Dual_AACC
+$CMP LED_Dual_AAKK
 D Dual LED, cathodes on pins 3 and 4
 K LED diode bicolor dual
 F ~
 $ENDCMP
 #
-$CMP LED_Dual_ACA
+$CMP LED_Dual_AKA
 D Dual LED, common cathode on pin 2
 K LED diode bicolor dual
 F ~
 $ENDCMP
 #
-$CMP LED_Dual_ACAC
+$CMP LED_Dual_AKAK
 D Dual LED, cathodes on pins 2 and 4
 K LED diode bicolor dual
 F ~
 $ENDCMP
 #
-$CMP LED_Dual_CAC
+$CMP LED_Dual_Bidirectional
+D Dual LED, bidirectional
+K LED diode bicolor dual
+F ~
+$ENDCMP
+#
+$CMP LED_Dual_KAK
 D Dual LED, common anode on pin 2
 K LED diode bicolor dual
 F ~
 $ENDCMP
 #
-$CMP LED_Dual_CACA
+$CMP LED_Dual_KAKA
 D Dual LED, cathodes on pins 1 and 3
 K LED diode bicolor dual
 F ~
 $ENDCMP
 #
-$CMP LED_Dual_CCA
+$CMP LED_Dual_KKA
 D Dual LED, common anode on pin 3
 K LED diode bicolor dual
 F ~
 $ENDCMP
 #
+$CMP LED_Filled
+D Light emitting diode, filled shape
+K LED diode
+F ~
+$ENDCMP
+#
 $CMP LED_GABR
 D RGB LED, green/anode/blue/red
 K LED RGB diode
@@ -1428,7 +1398,7 @@ K LED RGB diode
 F ~
 $ENDCMP
 #
-$CMP LED_GBCR
+$CMP LED_GBKR
 D RGB LED, green/blue/cathode/red
 K LED RGB diode
 F ~
@@ -1440,19 +1410,19 @@ K LED RGB diode
 F ~
 $ENDCMP
 #
-$CMP LED_GBRC
+$CMP LED_GBRK
 D RGB LED, green/blue/red/cathode
 K LED RGB diode
 F ~
 $ENDCMP
 #
-$CMP LED_GCBR
+$CMP LED_GKBR
 D RGB LED, green/cathode/blue/red
 K LED RGB diode
 F ~
 $ENDCMP
 #
-$CMP LED_GCRB
+$CMP LED_GKRB
 D RGB LED, green/cathode/red/blue
 K LED RGB diode
 F ~
@@ -1470,19 +1440,55 @@ K LED RGB diode
 F ~
 $ENDCMP
 #
-$CMP LED_GRBC
+$CMP LED_GRBK
 D RGB LED, green/red/blue/cathode
 K LED RGB diode
 F ~
 $ENDCMP
 #
-$CMP LED_GRCB
+$CMP LED_GRKB
 D RGB LED, green/red/cathode/blue
 K LED RGB diode
 F ~
 $ENDCMP
 #
-$CMP LED_PAD
+$CMP LED_KBGR
+D RGB LED, cathode/blue/green/red
+K LED RGB diode
+F ~
+$ENDCMP
+#
+$CMP LED_KBRG
+D RGB LED, cathode/blue/red/green
+K LED RGB diode
+F ~
+$ENDCMP
+#
+$CMP LED_KGBR
+D RGB LED, cathode/green/blue/red
+K LED RGB diode
+F ~
+$ENDCMP
+#
+$CMP LED_KGRB
+D RGB LED, cathode/green/red/blue
+K LED RGB diode
+F ~
+$ENDCMP
+#
+$CMP LED_KRBG
+D RGB LED, cathode/red/blue/green
+K LED RGB diode
+F ~
+$ENDCMP
+#
+$CMP LED_KRGB
+D RGB LED, cathode/red/green/blue
+K LED RGB diode
+F ~
+$ENDCMP
+#
+$CMP LED_Pad
 D Light emitting diode with pad
 K LED diode pad
 F ~
@@ -1506,68 +1512,68 @@ K LED RGB diode
 F ~
 $ENDCMP
 #
-$CMP LED_RBCG
-D RGB LED, red/blue/cathode/green
+$CMP LED_RBGA
+D RGB LED, red/blue/green/anode
 K LED RGB diode
 F ~
 $ENDCMP
 #
-$CMP LED_RBGA
-D RGB LED, red/blue/green/anode
+$CMP LED_RBGK
+D RGB LED, red/blue/green/cathode
 K LED RGB diode
 F ~
 $ENDCMP
 #
-$CMP LED_RBGC
-D RGB LED, red/blue/green/cathode
+$CMP LED_RBKG
+D RGB LED, red/blue/cathode/green
 K LED RGB diode
 F ~
 $ENDCMP
 #
-$CMP LED_RCBG
-D RGB LED, red/cathode/blue/green
+$CMP LED_RGAB
+D RGB LED, red/green/anode/blue
 K LED RGB diode
 F ~
 $ENDCMP
 #
-$CMP LED_RCGB
-D RGB LED, red/cathode/green/blue
+$CMP LED_RGB
+D RGB LED, 6 pin package
 K LED RGB diode
 F ~
 $ENDCMP
 #
-$CMP LED_RGAB
-D RGB LED, red/green/anode/blue
+$CMP LED_RGBA
+D RGB LED, red/green/blue/anode
 K LED RGB diode
 F ~
 $ENDCMP
 #
-$CMP LED_RGB
-D RGB LED, 6 pin package
+$CMP LED_RGBK
+D RGB LED, red/green/blue/cathode
 K LED RGB diode
 F ~
 $ENDCMP
 #
-$CMP LED_RGBA
-D RGB LED, red/green/blue/anode
+$CMP LED_RGB_EP
+D RGB LED, 6 pin package with exposed pad
 K LED RGB diode
 F ~
 $ENDCMP
 #
-$CMP LED_RGBC
-D RGB LED, red/green/blue/cathode
+$CMP LED_RGKB
+D RGB LED, red/green/cathode/blue
 K LED RGB diode
 F ~
 $ENDCMP
 #
-$CMP LED_RGCB
-D RGB LED, red/green/cathode/blue
+$CMP LED_RKBG
+D RGB LED, red/cathode/blue/green
 K LED RGB diode
 F ~
 $ENDCMP
 #
-$CMP LED_RGB_EP
-D RGB LED, 6 pin package with exposed pad
+$CMP LED_RKGB
+D RGB LED, red/cathode/green/blue
 K LED RGB diode
 F ~
 $ENDCMP
@@ -1578,7 +1584,7 @@ K LED diode
 F ~
 $ENDCMP
 #
-$CMP LED_Series_PAD
+$CMP LED_Series_Pad
 D Several LEDs in series with exposed pad
 K LED diode pad
 F ~
@@ -1590,228 +1596,228 @@ K LED diode light-emitting-diode
 F ~
 $ENDCMP
 #
-$CMP LED_Small_ALT
+$CMP LED_Small_Filled
 D Light emitting diode, small symbol, filled shape
 K LED diode light-emitting-diode
 F ~
 $ENDCMP
 #
-$CMP LTRIM
-D Variable inductor
-K inductor choke coil reactor magnetic
-F ~
-$ENDCMP
-#
-$CMP L_Core_Ferrite
-D Inductor with ferrite core
-K inductor choke coil reactor magnetic
-F ~
-$ENDCMP
-#
-$CMP L_Core_Ferrite_Coupled
-D Coupled inductor with ferrite core
+$CMP L_Coupled
+D Coupled inductor
 K inductor choke coil reactor magnetic coupled
 F ~
 $ENDCMP
 #
-$CMP L_Core_Ferrite_Coupled_1243
-D Coupled inductor with ferrite core
+$CMP L_Coupled_1243
+D Coupled inductor
 K inductor choke coil reactor magnetic coupled
 F ~
 $ENDCMP
 #
-$CMP L_Core_Ferrite_Coupled_1324
-D Coupled inductor with ferrite core
+$CMP L_Coupled_1324
+D Coupled inductor
 K inductor choke coil reactor magnetic coupled
 F ~
 $ENDCMP
 #
-$CMP L_Core_Ferrite_Coupled_1342
-D Coupled inductor with ferrite core
+$CMP L_Coupled_1342
+D Coupled inductor
 K inductor choke coil reactor magnetic coupled
 F ~
 $ENDCMP
 #
-$CMP L_Core_Ferrite_Coupled_1423
-D Coupled inductor with ferrite core
+$CMP L_Coupled_1423
+D Coupled inductor
 K inductor choke coil reactor magnetic coupled
 F ~
 $ENDCMP
 #
-$CMP L_Core_Ferrite_Coupled_Small
-D Coupled inductor with ferrite core, small symbol
+$CMP L_Coupled_Small
+D Coupled inductor, small symbol
 K inductor choke coil reactor magnetic coupled
 F ~
 $ENDCMP
 #
-$CMP L_Core_Ferrite_Coupled_Small_1243
-D Coupled inductor with ferrite core, small symbol
+$CMP L_Coupled_Small_1243
+D Coupled inductor, small symbol
 K inductor choke coil reactor magnetic coupled
 F ~
 $ENDCMP
 #
-$CMP L_Core_Ferrite_Coupled_Small_1324
-D Coupled inductor with ferrite core, small symbol
+$CMP L_Coupled_Small_1324
+D Coupled inductor, small symbol
 K inductor choke coil reactor magnetic coupled
 F ~
 $ENDCMP
 #
-$CMP L_Core_Ferrite_Coupled_Small_1342
-D Coupled inductor with ferrite core, small symbol
+$CMP L_Coupled_Small_1342
+D Coupled inductor, small symbol
 K inductor choke coil reactor magnetic coupled
 F ~
 $ENDCMP
 #
-$CMP L_Core_Ferrite_Coupled_Small_1423
-D Coupled inductor with ferrite core, small symbol
+$CMP L_Coupled_Small_1423
+D Coupled inductor, small symbol
 K inductor choke coil reactor magnetic coupled
 F ~
 $ENDCMP
 #
-$CMP L_Core_Ferrite_Small
-D Inductor with ferrite core, small symbol
+$CMP L_Ferrite
+D Inductor with ferrite core
 K inductor choke coil reactor magnetic
 F ~
 $ENDCMP
 #
-$CMP L_Core_Iron
-D Inductor with iron core
-K inductor choke coil reactor magnetic
+$CMP L_Ferrite_Coupled
+D Coupled inductor with ferrite core
+K inductor choke coil reactor magnetic coupled
 F ~
 $ENDCMP
 #
-$CMP L_Core_Iron_Coupled
-D Coupled inductor with iron core
+$CMP L_Ferrite_Coupled_1243
+D Coupled inductor with ferrite core
 K inductor choke coil reactor magnetic coupled
 F ~
 $ENDCMP
 #
-$CMP L_Core_Iron_Coupled_1243
-D Coupled inductor with iron core
+$CMP L_Ferrite_Coupled_1324
+D Coupled inductor with ferrite core
 K inductor choke coil reactor magnetic coupled
 F ~
 $ENDCMP
 #
-$CMP L_Core_Iron_Coupled_1324
-D Coupled inductor with iron core
+$CMP L_Ferrite_Coupled_1342
+D Coupled inductor with ferrite core
 K inductor choke coil reactor magnetic coupled
 F ~
 $ENDCMP
 #
-$CMP L_Core_Iron_Coupled_1342
-D Coupled inductor with iron core
+$CMP L_Ferrite_Coupled_1423
+D Coupled inductor with ferrite core
 K inductor choke coil reactor magnetic coupled
 F ~
 $ENDCMP
 #
-$CMP L_Core_Iron_Coupled_1423
-D Coupled inductor with iron core
+$CMP L_Ferrite_Coupled_Small
+D Coupled inductor with ferrite core, small symbol
 K inductor choke coil reactor magnetic coupled
 F ~
 $ENDCMP
 #
-$CMP L_Core_Iron_Coupled_Small
-D Coupled inductor with iron core, small symbol
+$CMP L_Ferrite_Coupled_Small_1243
+D Coupled inductor with ferrite core, small symbol
 K inductor choke coil reactor magnetic coupled
 F ~
 $ENDCMP
 #
-$CMP L_Core_Iron_Coupled_Small_1243
-D Coupled inductor with iron core, small symbol
+$CMP L_Ferrite_Coupled_Small_1324
+D Coupled inductor with ferrite core, small symbol
 K inductor choke coil reactor magnetic coupled
 F ~
 $ENDCMP
 #
-$CMP L_Core_Iron_Coupled_Small_1324
-D Coupled inductor with iron core, small symbol
+$CMP L_Ferrite_Coupled_Small_1342
+D Coupled inductor with ferrite core, small symbol
 K inductor choke coil reactor magnetic coupled
 F ~
 $ENDCMP
 #
-$CMP L_Core_Iron_Coupled_Small_1342
-D Coupled inductor with iron core, small symbol
+$CMP L_Ferrite_Coupled_Small_1423
+D Coupled inductor with ferrite core, small symbol
 K inductor choke coil reactor magnetic coupled
 F ~
 $ENDCMP
 #
-$CMP L_Core_Iron_Coupled_Small_1423
-D Coupled inductor with iron core, small symbol
-K inductor choke coil reactor magnetic coupled
+$CMP L_Ferrite_Small
+D Inductor with ferrite core, small symbol
+K inductor choke coil reactor magnetic
 F ~
 $ENDCMP
 #
-$CMP L_Core_Iron_Small
-D Inductor with iron core, small symbol
+$CMP L_Iron
+D Inductor with iron core
 K inductor choke coil reactor magnetic
 F ~
 $ENDCMP
 #
-$CMP L_Coupled
-D Coupled inductor
+$CMP L_Iron_Coupled
+D Coupled inductor with iron core
 K inductor choke coil reactor magnetic coupled
 F ~
 $ENDCMP
 #
-$CMP L_Coupled_1243
-D Coupled inductor
+$CMP L_Iron_Coupled_1243
+D Coupled inductor with iron core
 K inductor choke coil reactor magnetic coupled
 F ~
 $ENDCMP
 #
-$CMP L_Coupled_1324
-D Coupled inductor
+$CMP L_Iron_Coupled_1324
+D Coupled inductor with iron core
 K inductor choke coil reactor magnetic coupled
 F ~
 $ENDCMP
 #
-$CMP L_Coupled_1342
-D Coupled inductor
+$CMP L_Iron_Coupled_1342
+D Coupled inductor with iron core
 K inductor choke coil reactor magnetic coupled
 F ~
 $ENDCMP
 #
-$CMP L_Coupled_1423
-D Coupled inductor
+$CMP L_Iron_Coupled_1423
+D Coupled inductor with iron core
 K inductor choke coil reactor magnetic coupled
 F ~
 $ENDCMP
 #
-$CMP L_Coupled_Small
-D Coupled inductor, small symbol
+$CMP L_Iron_Coupled_Small
+D Coupled inductor with iron core, small symbol
 K inductor choke coil reactor magnetic coupled
 F ~
 $ENDCMP
 #
-$CMP L_Coupled_Small_1243
-D Coupled inductor, small symbol
+$CMP L_Iron_Coupled_Small_1243
+D Coupled inductor with iron core, small symbol
 K inductor choke coil reactor magnetic coupled
 F ~
 $ENDCMP
 #
-$CMP L_Coupled_Small_1324
-D Coupled inductor, small symbol
+$CMP L_Iron_Coupled_Small_1324
+D Coupled inductor with iron core, small symbol
 K inductor choke coil reactor magnetic coupled
 F ~
 $ENDCMP
 #
-$CMP L_Coupled_Small_1342
-D Coupled inductor, small symbol
+$CMP L_Iron_Coupled_Small_1342
+D Coupled inductor with iron core, small symbol
 K inductor choke coil reactor magnetic coupled
 F ~
 $ENDCMP
 #
-$CMP L_Coupled_Small_1423
-D Coupled inductor, small symbol
+$CMP L_Iron_Coupled_Small_1423
+D Coupled inductor with iron core, small symbol
 K inductor choke coil reactor magnetic coupled
 F ~
 $ENDCMP
 #
+$CMP L_Iron_Small
+D Inductor with iron core, small symbol
+K inductor choke coil reactor magnetic
+F ~
+$ENDCMP
+#
 $CMP L_Small
 D Inductor, small symbol
 K inductor choke coil reactor magnetic
 F ~
 $ENDCMP
 #
+$CMP L_Trim
+D Variable inductor
+K inductor choke coil reactor magnetic
+F ~
+$ENDCMP
+#
 $CMP Lamp
 D Lamp
 K lamp
@@ -1830,37 +1836,7 @@ K neon lamp
 F ~
 $ENDCMP
 #
-$CMP Laserdiode_1A3C
-D Laser diode, cathode on pin 3, anode on pin 1
-K opto laserdiode
-F ~
-$ENDCMP
-#
-$CMP Laserdiode_1C2A
-D Laser diode, cathode on pin 1, anode on pin 2
-K opto laserdiode
-F ~
-$ENDCMP
-#
-$CMP Laserdiode_M_TYPE
-D Laser diode with photodiode, common cathode on pin 2
-K opto laserdiode photodiode
-F http://www.egismos.disonhu.com/laser/diode-package.htm
-$ENDCMP
-#
-$CMP Laserdiode_N_TYPE
-D Laser diode with photodiode, center on pin 2, LD cathode on pin 1
-K opto laserdiode photodiode
-F http://www.egismos.disonhu.com/laser/diode-package.htm
-$ENDCMP
-#
-$CMP Laserdiode_P_TYPE
-D Laser diode with photodiode, center on pin 2, PD cathode on pin 3
-K opto laserdiode photodiode
-F http://www.egismos.disonhu.com/laser/diode-package.htm
-$ENDCMP
-#
-$CMP MEMRISTOR
+$CMP Memristor
 D Memristor
 K memristor
 F ~
@@ -1890,31 +1866,31 @@ K microphone ultrasound crystal
 F ~
 $ENDCMP
 #
-$CMP Net-Tie_2
+$CMP NetTie_2
 D Net tie, 2 pins
 K net tie short
 F ~
 $ENDCMP
 #
-$CMP Net-Tie_3
+$CMP NetTie_3
 D Net tie, 3 pins
 K net tie short
 F ~
 $ENDCMP
 #
-$CMP Net-Tie_3_Tee
+$CMP NetTie_3_Tee
 D Net tie, 3 pins, tee
 K net tie short
 F ~
 $ENDCMP
 #
-$CMP Net-Tie_4
+$CMP NetTie_4
 D Net tie, 4 pins
 K net tie short
 F ~
 $ENDCMP
 #
-$CMP Net-Tie_4_Cross
+$CMP NetTie_4_Cross
 D Net tie, 4 pins, cross
 K net tie short
 F ~
@@ -1926,13 +1902,13 @@ K ohmmeter resistance
 F ~
 $ENDCMP
 #
-$CMP Opamp_Dual_Generic
+$CMP Opamp_Dual
 D Dual operational amplifier
 K dual opamp
 F ~
 $ENDCMP
 #
-$CMP Opamp_Quad_Generic
+$CMP Opamp_Quad
 D Quad operational amplifier
 K quad opamp
 F ~
@@ -1944,7 +1920,7 @@ K oscilloscope
 F ~
 $ENDCMP
 #
-$CMP Peltier_Element
+$CMP PeltierElement
 D Peltier element, thermoelectric cooler
 K Peltier TEC
 F ~
@@ -1962,109 +1938,109 @@ K resettable fuse PTC PPTC polyfuse polyswitch
 F ~
 $ENDCMP
 #
-$CMP Q_DUAL_NMOS_G1S2G2D2S1D1
+$CMP Q_Dual_NMOS_G1S2G2D2S1D1
 D Dual NMOS transistor, 6 pin package
 K transistor NMOS N-MOS N-MOSFET
 F ~
 $ENDCMP
 #
-$CMP Q_DUAL_NMOS_S1G1D2S2G2D1
+$CMP Q_Dual_NMOS_S1G1D2S2G2D1
 D Dual NMOS transistor, 6 pin package
 K transistor NMOS N-MOS N-MOSFET
 F ~
 $ENDCMP
 #
-$CMP Q_DUAL_NMOS_S1G1S2G2D2D2D1D1
+$CMP Q_Dual_NMOS_S1G1S2G2D2D2D1D1
 D Dual NMOS transistor, 8 pin package
 K transistor NMOS N-MOS N-MOSFET
 F ~
 $ENDCMP
 #
-$CMP Q_DUAL_NPN_C2C1E1E2
+$CMP Q_Dual_NPN_C2C1E1E2
 D Double NPN transistors, current mirror configuration
 K transistor NPN
 F ~
 $ENDCMP
 #
-$CMP Q_DUAL_NPN_NPN_BRT_E1B1C2E2B2C1
+$CMP Q_Dual_NPN_NPN_BRT_E1B1C2E2B2C1
 D Dual NPN bias resistor transistor, 6 pin package
 K transistor NPN
 F ~
 $ENDCMP
 #
-$CMP Q_DUAL_NPN_NPN_C2E2C1E1B1B2
+$CMP Q_Dual_NPN_NPN_C2E2C1E1B1B2
 D Dual NPN transistor, 6 pin package
 K transistor NPN
 F ~
 $ENDCMP
 #
-$CMP Q_DUAL_NPN_NPN_E1B1C2E2B2C1
+$CMP Q_Dual_NPN_NPN_E1B1C2E2B2C1
 D Dual NPN transistor, 6 pin package
 K transistor NPN
 F ~
 $ENDCMP
 #
-$CMP Q_DUAL_NPN_PNP_BRT_E1B1C2E2B2C1
+$CMP Q_Dual_NPN_PNP_BRT_E1B1C2E2B2C1
 D Dual NPN/PNP bias resistor transistor, 6 pin package
 K transistor NPN
 F ~
 $ENDCMP
 #
-$CMP Q_DUAL_NPN_PNP_E1B1C2E2B2C1
+$CMP Q_Dual_NPN_PNP_E1B1C2E2B2C1
 D Dual NPN/PNP transistor, 6 pin package
 K transistor NPN PNP
 F ~
 $ENDCMP
 #
-$CMP Q_DUAL_PMOS_G1S2G2D2S1D1
+$CMP Q_Dual_PMOS_G1S2G2D2S1D1
 D Dual PMOS transistor, 6 pin package
 K transistor PMOS P-MOS P-MOSFET
 F ~
 $ENDCMP
 #
-$CMP Q_DUAL_PMOS_S1G1D2S2G2D1
+$CMP Q_Dual_PMOS_S1G1D2S2G2D1
 D Dual PMOS transistor, 6 pin package
 K transistor PMOS P-MOS P-MOSFET
 F ~
 $ENDCMP
 #
-$CMP Q_DUAL_PMOS_S1G1S2G2D2D2D1D1
+$CMP Q_Dual_PMOS_S1G1S2G2D2D2D1D1
 D Dual PMOS transistor, 8 pin package
 K transistor PMOS P-MOS P-MOSFET
 F ~
 $ENDCMP
 #
-$CMP Q_DUAL_PNP_C2C1E1E2
+$CMP Q_Dual_PNP_C2C1E1E2
 D Double PNP transistors, current mirror configuration
 K transistor PNP
 F ~
 $ENDCMP
 #
-$CMP Q_DUAL_PNP_NPN_BRT_E1B1C2E2B2C1
+$CMP Q_Dual_PNP_NPN_BRT_E1B1C2E2B2C1
 D Dual PNP/NPN bias resistor transistor, 6 pin package
 K transistor NPN
 F ~
 $ENDCMP
 #
-$CMP Q_DUAL_PNP_PNP_BRT_E1B1C2E2B2C1
+$CMP Q_Dual_PNP_PNP_BRT_E1B1C2E2B2C1
 D Dual PNP bias resistor transistor, 6 pin package
 K transistor NPN
 F ~
 $ENDCMP
 #
-$CMP Q_DUAL_PNP_PNP_C1B1B2C2E2E1
+$CMP Q_Dual_PNP_PNP_C1B1B2C2E2E1
 D Dual PNP transistor, 6 pin package
 K transistor PNP
 F https://www.diodes.com/assets/Datasheets/ds30437.pdf
 $ENDCMP
 #
-$CMP Q_DUAL_PNP_PNP_C2E2C1E1B1B2
+$CMP Q_Dual_PNP_PNP_C2E2C1E1B1B2
 D Dual PNP transistor, 6 pin package
 K transistor PNP
 F ~
 $ENDCMP
 #
-$CMP Q_DUAL_PNP_PNP_E1B1C2E2B2C1
+$CMP Q_Dual_PNP_PNP_E1B1C2E2B2C1
 D Dual PNP transistor, 6 pin package
 K transistor PNP
 F ~
@@ -2622,24 +2598,18 @@ K R res resistor
 F ~
 $ENDCMP
 #
-$CMP RF_Shield_One_Piece
+$CMP RFShield_OnePiece
 D One-piece EMI RF shielding cabinet
 K RF EMI shielding cabinet
 F ~
 $ENDCMP
 #
-$CMP RF_Shield_Two_Pieces
+$CMP RFShield_TwoPieces
 D Two-piece EMI RF shielding cabinet
 K RF EMI shielding cabinet
 F ~
 $ENDCMP
 #
-$CMP RTRIM
-D Trimmable resistor (preset resistor)
-K R res resistor variable potentiometer trimmer
-F ~
-$ENDCMP
-#
 $CMP R_Network03
 D 3 resistor network, star topology, bussed resistors, small symbol
 K R network star-topology
@@ -2898,60 +2868,6 @@ K R network divider topology
 F http://www.vishay.com/docs/31509/csc.pdf
 $ENDCMP
 #
-$CMP R_PHOTO
-D Photoresistor
-K resistor variable light sensitive opto LDR
-F ~
-$ENDCMP
-#
-$CMP R_POT
-D Potentiometer
-K resistor variable
-F ~
-$ENDCMP
-#
-$CMP R_POT_Dual
-D Dual potentiometer
-K resistor variable
-F ~
-$ENDCMP
-#
-$CMP R_POT_Dual_Separate
-D Dual potentiometer, separate units
-K resistor variable
-F ~
-$ENDCMP
-#
-$CMP R_POT_MountingPin
-D Potentiometer with a mounting pin
-K resistor variable
-F ~
-$ENDCMP
-#
-$CMP R_POT_Small
-D Potentiometer
-K resistor variable
-F ~
-$ENDCMP
-#
-$CMP R_POT_TRIM
-D Trim-potentiometer
-K resistor variable trimpot trimmer
-F ~
-$ENDCMP
-#
-$CMP R_POT_TRIM_US
-D Trim-potentiometer, US symbol
-K resistor variable trimpot trimmer
-F ~
-$ENDCMP
-#
-$CMP R_POT_US
-D Potentiometer, US symbol
-K resistor variable
-F ~
-$ENDCMP
-#
 $CMP R_Pack02
 D 2 resistor network, parallel topology
 K R network parallel topology isolated
@@ -3144,6 +3060,60 @@ K R network parallel topology isolated
 F ~
 $ENDCMP
 #
+$CMP R_Photo
+D Photoresistor
+K resistor variable light sensitive opto LDR
+F ~
+$ENDCMP
+#
+$CMP R_Potentiometer
+D Potentiometer
+K resistor variable
+F ~
+$ENDCMP
+#
+$CMP R_Potentiometer_Dual
+D Dual potentiometer
+K resistor variable
+F ~
+$ENDCMP
+#
+$CMP R_Potentiometer_Dual_Separate
+D Dual potentiometer, separate units
+K resistor variable
+F ~
+$ENDCMP
+#
+$CMP R_Potentiometer_MountingPin
+D Potentiometer with a mounting pin
+K resistor variable
+F ~
+$ENDCMP
+#
+$CMP R_Potentiometer_Small
+D Potentiometer
+K resistor variable
+F ~
+$ENDCMP
+#
+$CMP R_Potentiometer_Trim
+D Trim-potentiometer
+K resistor variable trimpot trimmer
+F ~
+$ENDCMP
+#
+$CMP R_Potentiometer_Trim_US
+D Trim-potentiometer, US symbol
+K resistor variable trimpot trimmer
+F ~
+$ENDCMP
+#
+$CMP R_Potentiometer_US
+D Potentiometer, US symbol
+K resistor variable
+F ~
+$ENDCMP
+#
 $CMP R_Shunt
 D Shunt resistor
 K R res shunt resistor
@@ -3168,6 +3138,12 @@ K r resistor
 F ~
 $ENDCMP
 #
+$CMP R_Trim
+D Trimmable resistor (preset resistor)
+K R res resistor variable potentiometer trimmer
+F ~
+$ENDCMP
+#
 $CMP R_US
 D Resistor, US symbol
 K R res resistor
@@ -3198,24 +3174,18 @@ K ceramic resonator
 F ~
 $ENDCMP
 #
-$CMP Rotary_Encoder
+$CMP RotaryEncoder
 D Rotary encoder, dual channel, incremental quadrate outputs
 K rotary switch encoder
 F ~
 $ENDCMP
 #
-$CMP Rotary_Encoder_Switch
+$CMP RotaryEncoder_Switch
 D Rotary encoder, dual channel, incremental quadrate outputs, with switch
 K rotary switch encoder switch push button
 F ~
 $ENDCMP
 #
-$CMP SPARK_GAP
-D Spark gap
-K spark gap ESD electrostatic suppression
-F ~
-$ENDCMP
-#
 $CMP Solar_Cell
 D Single solar cell
 K solar cell
@@ -3228,6 +3198,12 @@ K solar cell
 F ~
 $ENDCMP
 #
+$CMP SparkGap
+D Spark gap
+K spark gap ESD electrostatic suppression
+F ~
+$ENDCMP
+#
 $CMP Speaker
 D Speaker
 K speaker sound
@@ -3258,13 +3234,13 @@ K thermistor NTC resistor sensor RTD
 F ~
 $ENDCMP
 #
-$CMP Thermistor_NTC_3wire
+$CMP Thermistor_NTC_3Wire
 D Temperature dependent resistor, negative temperature coefficient, 3-wire interface
 K thermistor NTC resistor sensor RTD
 F ~
 $ENDCMP
 #
-$CMP Thermistor_NTC_4wire
+$CMP Thermistor_NTC_4Wire
 D Temperature dependent resistor, negative temperature coefficient, 4-wire interface
 K thermistor NTC resistor sensor RTD
 F ~
@@ -3282,13 +3258,13 @@ K resistor PTC thermistor sensor RTD
 F ~
 $ENDCMP
 #
-$CMP Thermistor_PTC_3wire
+$CMP Thermistor_PTC_3Wire
 D Temperature dependent resistor, positive temperature coefficient, 3-wire interface
 K resistor PTC thermistor sensor RTD
 F ~
 $ENDCMP
 #
-$CMP Thermistor_PTC_4wire
+$CMP Thermistor_PTC_4Wire
 D Temperature dependent resistor, positive temperature coefficient, 3-wire interface
 K resistor PTC thermistor sensor RTD
 F ~
@@ -3312,7 +3288,7 @@ K thermocouple temperature sensor cold junction
 F ~
 $ENDCMP
 #
-$CMP Thermocouple_ALT
+$CMP Thermocouple_Alt
 D Thermocouple with connector block
 K thermocouple temperature sensor cold junction
 F ~
@@ -3348,7 +3324,7 @@ K transformer coil magnet
 F ~
 $ENDCMP
 #
-$CMP Transformer_AUDIO
+$CMP Transformer_Audio
 D Audio transformer
 K transformer coil magnet sound
 F ~
@@ -3378,19 +3354,19 @@ K VDR resistance
 F ~
 $ENDCMP
 #
-$CMP Voltage_Divider
+$CMP VoltageDivider
 D Voltage divider
 K R network voltage divider
 F ~
 $ENDCMP
 #
-$CMP Voltage_Divider_CenterPin1
+$CMP VoltageDivider_CenterPin1
 D Voltage divider, center on pin 1
 K R network voltage divider
 F ~
 $ENDCMP
 #
-$CMP Voltage_Divider_CenterPin3
+$CMP VoltageDivider_CenterPin3
 D Voltage divider, center on pin 3
 K R network voltage divider
 F ~
diff --git a/Device.lib b/Device.lib
index 4b4ddf5e14..751ba51176 100644
--- a/Device.lib
+++ b/Device.lib
@@ -1,11 +1,11 @@
 EESchema-LIBRARY Version 2.4
 #encoding utf-8
 #
-# Amperemeter_AC
+# Ammeter_AC
 #
-DEF Amperemeter_AC MES 0 1 N N 1 F N
+DEF Ammeter_AC MES 0 1 N N 1 F N
 F0 "MES" -130 40 50 H V R CNN
-F1 "Amperemeter_AC" -130 -30 50 H V R CNN
+F1 "Ammeter_AC" -130 -30 50 H V R CNN
 F2 "" 0 100 50 V I C CNN
 F3 "" 0 100 50 V I C CNN
 DRAW
@@ -21,11 +21,11 @@ X ~ 2 0 200 100 D 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Amperemeter_DC
+# Ammeter_DC
 #
-DEF Amperemeter_DC MES 0 1 N N 1 F N
+DEF Ammeter_DC MES 0 1 N N 1 F N
 F0 "MES" -130 40 50 H V R CNN
-F1 "Amperemeter_DC" -130 -30 50 H V R CNN
+F1 "Ammeter_DC" -130 -30 50 H V R CNN
 F2 "" 0 100 50 V I C CNN
 F3 "" 0 100 50 V I C CNN
 DRAW
@@ -208,11 +208,30 @@ X ~ 2 0 -150 110 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# CP
+# C_Feedthrough
+#
+DEF C_Feedthrough C 0 10 Y N 1 F N
+F0 "C" 0 300 50 H V C CNN
+F1 "C_Feedthrough" 0 225 50 H V C CNN
+F2 "" 0 0 50 V I C CNN
+F3 "" 0 0 50 V I C CNN
+ALIAS Filter_EMI_C
+DRAW
+S -65 60 60 80 0 1 0 F
+S 60 120 -65 140 0 1 0 F
+P 2 0 1 0 -100 100 100 100 N
+P 2 0 1 0 0 0 0 70 N
+X 1 1 -200 100 100 R 50 50 1 1 P
+X 2 2 0 -100 100 U 50 50 1 1 P
+X 3 3 200 100 100 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# C_Polarized
 #
-DEF CP C 0 10 N Y 1 F N
+DEF C_Polarized C 0 10 N Y 1 F N
 F0 "C" 25 100 50 H V L CNN
-F1 "CP" 25 -100 50 H V L CNN
+F1 "C_Polarized" 25 -100 50 H V L CNN
 F2 "" 38 -150 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -228,31 +247,31 @@ X ~ 2 0 -150 110 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# CP1
+# C_Polarized_Small
 #
-DEF CP1 C 0 10 N N 1 F N
-F0 "C" 25 100 50 H V L CNN
-F1 "CP1" 25 -100 50 H V L CNN
+DEF C_Polarized_Small C 0 10 N N 1 F N
+F0 "C" 10 70 50 H V L CNN
+F1 "C_Polarized_Small" 10 -80 50 H V L CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
  CP_*
 $ENDFPLIST
 DRAW
-A 0 -150 128 1287 513 0 1 20 N -80 -50 80 -50
-P 2 0 1 20 -80 30 80 30 N
-P 2 0 1 0 -70 90 -30 90 N
-P 2 0 1 0 -50 70 -50 110 N
-X ~ 1 0 150 110 D 50 50 1 1 P
-X ~ 2 0 -150 130 U 50 50 1 1 P
+S -60 -12 60 -27 0 1 0 F
+S -60 27 60 12 0 1 0 N
+P 2 0 1 0 -50 60 -30 60 N
+P 2 0 1 0 -40 50 -40 70 N
+X ~ 1 0 100 73 D 50 50 1 1 P
+X ~ 2 0 -100 73 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# CP1_Small
+# C_Polarized_Small_US
 #
-DEF CP1_Small C 0 10 N N 1 F N
+DEF C_Polarized_Small_US C 0 10 N N 1 F N
 F0 "C" 10 70 50 H V L CNN
-F1 "CP1_Small" 10 -80 50 H V L CNN
+F1 "C_Polarized_Small_US" 10 -80 50 H V L CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -268,31 +287,49 @@ X ~ 2 0 -100 80 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# CP_Small
+# C_Polarized_US
 #
-DEF CP_Small C 0 10 N N 1 F N
-F0 "C" 10 70 50 H V L CNN
-F1 "CP_Small" 10 -80 50 H V L CNN
+DEF C_Polarized_US C 0 10 N N 1 F N
+F0 "C" 25 100 50 H V L CNN
+F1 "C_Polarized_US" 25 -100 50 H V L CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
  CP_*
 $ENDFPLIST
 DRAW
-S -60 -12 60 -27 0 1 0 F
-S -60 27 60 12 0 1 0 N
-P 2 0 1 0 -50 60 -30 60 N
-P 2 0 1 0 -40 50 -40 70 N
-X ~ 1 0 100 73 D 50 50 1 1 P
-X ~ 2 0 -100 73 U 50 50 1 1 P
+A 0 -150 128 1287 513 0 1 20 N -80 -50 80 -50
+P 2 0 1 20 -80 30 80 30 N
+P 2 0 1 0 -70 90 -30 90 N
+P 2 0 1 0 -50 70 -50 110 N
+X ~ 1 0 150 110 D 50 50 1 1 P
+X ~ 2 0 -150 130 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# C_Small
+#
+DEF C_Small C 0 10 N N 1 F N
+F0 "C" 10 70 50 H V L CNN
+F1 "C_Small" 10 -80 50 H V L CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ C_*
+$ENDFPLIST
+DRAW
+P 2 0 1 13 -60 -20 60 -20 N
+P 2 0 1 12 -60 20 60 20 N
+X ~ 1 0 100 80 D 50 50 1 1 P
+X ~ 2 0 -100 80 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# CTRIM
+# C_Trim
 #
-DEF CTRIM C 0 10 N N 1 F N
+DEF C_Trim C 0 10 N N 1 F N
 F0 "C" 60 -80 50 H V C CNN
-F1 "CTRIM" 120 -140 50 H V C CNN
+F1 "C_Trim" 120 -140 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 DRAW
@@ -306,11 +343,11 @@ X ~ 2 0 -150 120 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# CTRIM_DIF
+# C_Trim_Differential
 #
-DEF CTRIM_DIF C 0 10 Y N 1 F N
+DEF C_Trim_Differential C 0 10 Y N 1 F N
 F0 "C" 200 50 50 H V L CNN
-F1 "CTRIM_DIF" 200 -25 50 H V L CNN
+F1 "C_Trim_Differential" 200 -25 50 H V L CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 DRAW
@@ -328,11 +365,11 @@ X ~ 3 100 150 100 D 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# CTRIM_Small
+# C_Trim_Small
 #
-DEF CTRIM_Small C 0 10 N N 1 F N
+DEF C_Trim_Small C 0 10 N N 1 F N
 F0 "C" 60 -80 50 H V C CNN
-F1 "CTRIM_Small" 120 -140 50 H V C CNN
+F1 "C_Trim_Small" 120 -140 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -348,43 +385,6 @@ X ~ 2 0 -100 80 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# C_Feedthrough
-#
-DEF C_Feedthrough C 0 10 Y N 1 F N
-F0 "C" 0 300 50 H V C CNN
-F1 "C_Feedthrough" 0 225 50 H V C CNN
-F2 "" 0 0 50 V I C CNN
-F3 "" 0 0 50 V I C CNN
-ALIAS EMI_Filter_C
-DRAW
-S -65 60 60 80 0 1 0 F
-S 60 120 -65 140 0 1 0 F
-P 2 0 1 0 -100 100 100 100 N
-P 2 0 1 0 0 0 0 70 N
-X 1 1 -200 100 100 R 50 50 1 1 P
-X 2 2 0 -100 100 U 50 50 1 1 P
-X 3 3 200 100 100 L 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# C_Small
-#
-DEF C_Small C 0 10 N N 1 F N
-F0 "C" 10 70 50 H V L CNN
-F1 "C_Small" 10 -80 50 H V L CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- C_*
-$ENDFPLIST
-DRAW
-P 2 0 1 13 -60 -20 60 -20 N
-P 2 0 1 12 -60 20 60 20 N
-X ~ 1 0 100 80 D 50 50 1 1 P
-X ~ 2 0 -100 80 U 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
 # C_Variable
 #
 DEF C_Variable C 0 10 N N 1 F N
@@ -834,11 +834,11 @@ X A 2 150 0 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# DIAC_ALT
+# DIAC_Filled
 #
-DEF DIAC_ALT D 0 40 N N 1 F N
+DEF DIAC_Filled D 0 40 N N 1 F N
 F0 "D" 0 150 50 H V C CNN
-F1 "DIAC_ALT" 0 -150 50 H V C CNN
+F1 "DIAC_Filled" 0 -150 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -879,28 +879,6 @@ X K 3 -150 0 100 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# D_ALT
-#
-DEF D_ALT D 0 40 N N 1 F N
-F0 "D" 0 100 50 H V C CNN
-F1 "D_ALT" 0 -100 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- TO-???*
- *_Diode_*
- *SingleDiode*
- D_*
-$ENDFPLIST
-DRAW
-P 2 0 1 10 -50 50 -50 -50 N
-P 2 0 1 0 50 0 -50 0 N
-P 4 0 1 10 50 50 50 -50 -50 0 50 50 F
-X K 1 -150 0 100 R 50 50 1 1 P
-X A 2 150 0 100 L 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
 # D_Bridge_+-AA
 #
 DEF D_Bridge_+-AA D 0 0 Y Y 1 F N
@@ -1087,11 +1065,11 @@ X A 2 150 0 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# D_Capacitance_ALT
+# D_Capacitance_Filled
 #
-DEF D_Capacitance_ALT D 0 40 N N 1 F N
+DEF D_Capacitance_Filled D 0 40 N N 1 F N
 F0 "D" 0 100 50 H V C CNN
-F1 "D_Capacitance_ALT" 0 -130 50 H V C CNN
+F1 "D_Capacitance_Filled" 0 -130 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -1113,1239 +1091,1139 @@ X A 2 150 0 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# D_KAA
+# D_Dual_CommonAnode_AKK
 #
-DEF D_KAA D 0 0 Y N 1 F N
-F0 "D" 0 100 50 H V C CNN
-F1 "D_KAA" 0 -100 50 H V C CNN
+DEF D_Dual_CommonAnode_AKK D 0 30 Y N 1 F N
+F0 "D" 50 -100 50 H V C CNN
+F1 "D_Dual_CommonAnode_AKK" 0 100 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
-$FPLIST
- TO-???*
- *_Diode_*
- *SingleDiode*
- D_*
-$ENDFPLIST
 DRAW
-C 100 0 10 0 1 0 F
-P 2 0 1 10 -50 50 -50 -50 N
-P 4 0 1 10 50 50 50 -50 -50 0 50 50 N
-P 4 0 1 0 150 100 100 100 100 0 -50 0 N
-X K 1 -150 0 100 R 50 50 1 1 P
-X A 2 200 100 100 L 50 50 1 1 I
-X A 3 200 0 100 L 50 50 1 1 P
+C 0 0 10 0 1 0 F
+P 2 0 1 0 -140 0 150 0 N
+P 2 0 1 0 0 0 0 -100 N
+P 3 0 1 10 -150 50 -150 -50 -150 -50 N
+P 3 0 1 10 150 50 150 -50 150 -50 N
+P 6 0 1 10 -50 -50 -150 0 -50 50 -50 -50 -50 -50 -50 -50 N
+P 6 0 1 10 50 50 150 0 50 -50 50 50 50 50 50 50 N
+X A 1 0 -200 100 U 50 50 0 1 P
+X K 2 -300 0 150 R 50 50 0 1 P
+X K 3 300 0 150 L 50 50 0 1 P
 ENDDRAW
 ENDDEF
 #
-# D_KAK
+# D_Dual_CommonAnode_AKK_Parallel
 #
-DEF D_KAK D 0 0 Y N 1 F N
-F0 "D" 0 100 50 H V C CNN
-F1 "D_KAK" 0 -100 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- TO-???*
- *_Diode_*
- *SingleDiode*
- D_*
-$ENDFPLIST
+DEF D_Dual_CommonAnode_AKK_Parallel D 0 30 Y N 1 F N
+F0 "D" 0 200 50 H V C CNN
+F1 "D_Dual_CommonAnode_AKK_Parallel" 0 -200 50 H V C CNN
+F2 "" -50 0 50 H I C CNN
+F3 "" -50 0 50 H I C CNN
 DRAW
-C -150 0 10 0 1 0 F
-P 2 0 1 10 -50 50 -50 -50 N
-P 3 0 1 0 -150 100 -150 0 100 0 N
-P 4 0 1 10 50 50 50 -50 -50 0 50 50 N
-X K 1 -250 100 100 R 50 50 1 1 P
-X A 2 200 0 100 L 50 50 1 1 P
-X K 3 -250 0 100 R 50 50 1 1 P
+C -50 0 10 0 1 0 F
+P 2 0 0 10 100 -50 100 -150 N
+P 2 0 0 10 100 150 100 50 N
+P 2 0 1 0 -50 0 -100 0 N
+P 4 0 1 0 100 100 -50 100 -50 -100 100 -100 N
+P 6 0 1 10 0 -50 100 -100 0 -150 0 -50 0 -50 0 -50 N
+P 6 0 1 10 0 150 100 100 0 50 0 150 0 150 0 150 N
+X A 1 -200 0 100 R 50 50 0 1 P
+X K 2 200 100 100 L 50 50 0 1 P
+X K 3 200 -100 100 L 50 50 0 1 P
 ENDDRAW
 ENDDEF
 #
-# D_KKA
+# D_Dual_CommonAnode_AKK_Split
 #
-DEF D_KKA D 0 0 Y N 1 F N
+DEF D_Dual_CommonAnode_AKK_Split D 0 30 Y N 2 L N
 F0 "D" 0 100 50 H V C CNN
-F1 "D_KKA" 0 -100 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- TO-???*
- *_Diode_*
- *SingleDiode*
- D_*
-$ENDFPLIST
+F1 "D_Dual_CommonAnode_AKK_Split" 0 -100 50 H V C CNN
+F2 "" -100 -100 50 H I C CNN
+F3 "" -100 -100 50 H I C CNN
 DRAW
-C -150 0 10 0 1 0 F
-P 2 0 1 10 -50 50 -50 -50 N
-P 4 0 1 0 -200 100 -150 100 -150 0 100 0 N
-P 4 0 1 10 50 50 50 -50 -50 0 50 50 N
-X K 1 -250 100 100 R 50 50 1 1 I
-X K 2 -250 0 100 R 50 50 1 1 P
-X A 3 200 0 100 L 50 50 1 1 P
+T 0 -100 50 50 0 2 0 1 Normal 0 C C
+P 2 0 0 10 50 50 50 -50 N
+P 2 2 0 0 50 0 -150 0 N
+P 6 0 1 10 -50 50 50 0 -50 -50 -50 50 -50 50 -50 50 N
+P 2 1 1 0 50 0 -50 0 N
+X A 1 -150 0 100 R 50 50 1 1 P
+X K 2 150 0 100 L 50 50 1 1 P
+X K 3 150 0 100 L 50 50 2 1 P
 ENDDRAW
 ENDDEF
 #
-# D_Photo
+# D_Dual_CommonAnode_KAK
 #
-DEF D_Photo D 0 20 N N 1 F N
-F0 "D" 20 70 50 H V L CNN
-F1 "D_Photo" -40 -110 50 H V C CNN
-F2 "" -50 0 50 H I C CNN
-F3 "" -50 0 50 H I C CNN
+DEF D_Dual_CommonAnode_KAK D 0 30 Y N 1 F N
+F0 "D" 50 -100 50 H V C CNN
+F1 "D_Dual_CommonAnode_KAK" 0 100 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
 DRAW
-P 2 0 1 10 -100 50 -100 -50 N
-P 2 0 1 0 -80 70 -60 70 N
-P 2 0 1 0 0 0 -100 0 N
-P 3 0 1 0 -20 130 -80 70 -80 90 N
-P 4 0 1 10 0 -50 0 50 -100 0 0 -50 N
-P 5 0 1 0 30 130 -30 70 -30 90 -30 70 -10 70 N
-X K 1 -200 0 100 R 50 50 1 1 P
-X A 2 100 0 100 L 50 50 1 1 P
+C 0 0 10 0 1 0 F
+P 2 0 1 0 0 0 0 -100 N
+P 2 0 1 0 150 0 -150 0 N
+P 3 0 1 10 -150 50 -150 -50 -150 -50 N
+P 3 0 1 10 150 50 150 -50 150 -50 N
+P 6 0 1 10 -50 -50 -150 0 -50 50 -50 -50 -50 -50 -50 -50 N
+P 6 0 1 10 50 50 150 0 50 -50 50 50 50 50 50 50 N
+X K 1 -300 0 150 R 50 50 0 1 P
+X A 2 0 -200 100 U 50 50 0 1 P
+X K 3 300 0 150 L 50 50 0 1 P
 ENDDRAW
 ENDDEF
 #
-# D_Photo_ALT
+# D_Dual_CommonAnode_KAK_Parallel
 #
-DEF D_Photo_ALT D 0 20 N N 1 F N
-F0 "D" 20 70 50 H V L CNN
-F1 "D_Photo_ALT" -40 -110 50 H V C CNN
+DEF D_Dual_CommonAnode_KAK_Parallel D 0 30 Y N 1 F N
+F0 "D" 0 200 50 H V C CNN
+F1 "D_Dual_CommonAnode_KAK_Parallel" 0 -200 50 H V C CNN
 F2 "" -50 0 50 H I C CNN
 F3 "" -50 0 50 H I C CNN
 DRAW
-P 2 0 1 10 -100 50 -100 -50 N
-P 2 0 1 0 -80 70 -60 70 N
-P 2 0 1 0 0 0 -100 0 N
-P 3 0 1 0 -20 130 -80 70 -80 90 N
-P 4 0 1 10 0 -50 0 50 -100 0 0 -50 F
-P 5 0 1 0 30 130 -30 70 -30 90 -30 70 -10 70 N
-X K 1 -200 0 100 R 50 50 1 1 P
-X A 2 100 0 100 L 50 50 1 1 P
+C -50 0 10 0 1 0 F
+P 2 0 0 10 100 -50 100 -150 N
+P 2 0 0 10 100 150 100 50 N
+P 2 0 1 0 -50 0 -100 0 N
+P 4 0 1 0 100 100 -50 100 -50 -100 100 -100 N
+P 6 0 1 10 0 -50 100 -100 0 -150 0 -50 0 -50 0 -50 N
+P 6 0 1 10 0 150 100 100 0 50 0 150 0 150 0 150 N
+X K 1 200 100 100 L 50 50 0 1 P
+X A 2 -200 0 100 R 50 50 0 1 P
+X K 3 200 -100 100 L 50 50 0 1 P
 ENDDRAW
 ENDDEF
 #
-# D_Radiation
+# D_Dual_CommonAnode_KAK_Split
 #
-DEF D_Radiation D 0 40 N N 1 F N
-F0 "D" -50 -90 50 H V C CNN
-F1 "D_Radiation" -50 -160 50 H V C CNN
-F2 "" -50 0 50 H I C CNN
-F3 "" -50 0 50 H I C CNN
+DEF D_Dual_CommonAnode_KAK_Split D 0 30 Y N 2 L N
+F0 "D" 0 100 50 H V C CNN
+F1 "D_Dual_CommonAnode_KAK_Split" 0 -100 50 H V C CNN
+F2 "" -100 -100 50 H I C CNN
+F3 "" -100 -100 50 H I C CNN
 DRAW
-A -30 130 22 634 -1534 0 1 0 N -20 150 -50 120
-A -10 170 22 -1166 266 0 1 0 N -20 150 10 180
-A 10 110 22 634 -1534 0 1 0 N 20 130 -10 100
-A 30 150 22 -1166 266 0 1 0 N 20 130 50 160
-A 30 190 22 -1534 634 0 1 0 N 10 180 40 210
-A 70 170 22 -1534 634 0 1 0 N 50 160 80 190
-P 2 0 1 10 -100 50 -100 -50 N
-P 2 0 1 0 -80 90 -50 90 N
-P 2 0 1 0 -80 90 -50 120 N
-P 2 0 1 0 -80 120 -80 90 N
-P 2 0 1 0 -40 70 -10 70 N
-P 2 0 1 0 -40 70 -10 100 N
-P 2 0 1 0 -40 100 -40 70 N
-P 2 0 1 0 0 0 -100 0 N
-P 4 0 1 10 0 50 0 -50 -100 0 0 50 N
-X K 1 -200 0 100 R 50 50 1 1 P
-X A 2 100 0 100 L 50 50 1 1 P
+T 0 -100 50 50 0 2 0 2 Normal 0 C C
+P 2 0 0 10 50 50 50 -50 N
+P 2 2 0 0 50 0 -150 0 N
+P 6 0 1 10 -50 50 50 0 -50 -50 -50 50 -50 50 -50 50 N
+P 2 1 1 0 50 0 -50 0 N
+X K 1 150 0 100 L 50 50 1 1 P
+X A 2 -150 0 100 R 50 50 1 1 P
+X K 3 150 0 100 L 50 50 2 1 P
 ENDDRAW
 ENDDEF
 #
-# D_Radiation_ALT
+# D_Dual_CommonAnode_KKA
 #
-DEF D_Radiation_ALT D 0 40 N N 1 F N
-F0 "D" -50 -90 50 H V C CNN
-F1 "D_Radiation_ALT" -50 -160 50 H V C CNN
+DEF D_Dual_CommonAnode_KKA D 0 30 Y N 1 F N
+F0 "D" 50 -100 50 H V C CNN
+F1 "D_Dual_CommonAnode_KKA" 0 100 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+DRAW
+C 0 0 10 0 1 0 F
+P 2 0 1 0 -150 0 150 0 N
+P 2 0 1 0 0 0 0 -100 N
+P 3 0 1 10 -150 50 -150 -50 -150 -50 N
+P 3 0 1 10 150 50 150 -50 150 -50 N
+P 6 0 1 10 -50 -50 -150 0 -50 50 -50 -50 -50 -50 -50 -50 N
+P 6 0 1 10 50 50 150 0 50 -50 50 50 50 50 50 50 N
+X K 1 -300 0 150 R 50 50 0 1 P
+X K 2 300 0 150 L 50 50 0 1 P
+X A 3 0 -200 100 U 50 50 0 1 P
+ENDDRAW
+ENDDEF
+#
+# D_Dual_CommonAnode_KKA_Parallel
+#
+DEF D_Dual_CommonAnode_KKA_Parallel D 0 30 Y N 1 F N
+F0 "D" 0 200 50 H V C CNN
+F1 "D_Dual_CommonAnode_KKA_Parallel" 0 -200 50 H V C CNN
 F2 "" -50 0 50 H I C CNN
 F3 "" -50 0 50 H I C CNN
 DRAW
-A -30 130 22 634 -1534 0 1 0 N -20 150 -50 120
-A -10 170 22 -1166 266 0 1 0 N -20 150 10 180
-A 10 110 22 634 -1534 0 1 0 N 20 130 -10 100
-A 30 150 22 -1166 266 0 1 0 N 20 130 50 160
-A 30 190 22 -1534 634 0 1 0 N 10 180 40 210
-A 70 170 22 -1534 634 0 1 0 N 50 160 80 190
-P 2 0 1 10 -100 50 -100 -50 N
-P 2 0 1 0 -80 90 -50 90 N
-P 2 0 1 0 -80 90 -50 120 N
-P 2 0 1 0 -80 120 -80 90 N
-P 2 0 1 0 -40 70 -10 70 N
-P 2 0 1 0 -40 70 -10 100 N
-P 2 0 1 0 -40 100 -40 70 N
-P 2 0 1 0 0 0 -100 0 N
-P 4 0 1 10 0 50 0 -50 -100 0 0 50 F
-X K 1 -200 0 100 R 50 50 1 1 P
-X A 2 100 0 100 L 50 50 1 1 P
+C -50 0 10 0 1 0 F
+P 2 0 0 10 100 -150 100 -50 N
+P 2 0 0 10 100 50 100 150 N
+P 2 0 1 0 -50 0 -100 0 N
+P 4 0 1 0 100 100 -50 100 -50 -100 100 -100 N
+P 6 0 1 10 0 -50 100 -100 0 -150 0 -50 0 -50 0 -50 N
+P 6 0 1 10 0 150 100 100 0 50 0 150 0 150 0 150 N
+X K 1 200 100 100 L 50 50 0 1 P
+X K 2 200 -100 100 L 50 50 0 1 P
+X A 3 -200 0 100 R 50 50 0 1 P
 ENDDRAW
 ENDDEF
 #
-# D_Schottky
+# D_Dual_CommonAnode_KKA_Split
 #
-DEF D_Schottky D 0 40 N N 1 F N
+DEF D_Dual_CommonAnode_KKA_Split D 0 30 Y N 2 L N
 F0 "D" 0 100 50 H V C CNN
-F1 "D_Schottky" 0 -100 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- TO-???*
- *_Diode_*
- *SingleDiode*
- D_*
-$ENDFPLIST
+F1 "D_Dual_CommonAnode_KKA_Split" 0 -100 50 H V C CNN
+F2 "" -100 -100 50 H I C CNN
+F3 "" -100 -100 50 H I C CNN
 DRAW
-P 2 0 1 0 50 0 -50 0 N
-P 4 0 1 10 50 50 50 -50 -50 0 50 50 N
-P 6 0 1 10 -75 25 -75 50 -50 50 -50 -50 -25 -50 -25 -25 N
-X K 1 -150 0 100 R 50 50 1 1 P
-X A 2 150 0 100 L 50 50 1 1 P
+T 0 -100 50 50 0 2 0 3 Normal 0 C C
+P 2 0 0 10 50 50 50 -50 N
+P 2 2 0 0 50 0 -150 0 N
+P 6 0 1 10 -50 50 50 0 -50 -50 -50 50 -50 50 -50 50 N
+P 2 1 1 0 50 0 -50 0 N
+X K 1 150 0 100 L 50 50 1 1 P
+X A 3 -150 0 100 R 50 50 1 1 P
+X K 2 150 0 100 L 50 50 2 1 P
 ENDDRAW
 ENDDEF
 #
-# D_Schottky_AAK
+# D_Dual_CommonCathode_AAK
 #
-DEF D_Schottky_AAK D 0 0 Y N 1 F N
-F0 "D" 0 100 50 H V C CNN
-F1 "D_Schottky_AAK" 0 -100 50 H V C CNN
+DEF D_Dual_CommonCathode_AAK D 0 30 Y N 1 F N
+F0 "D" 50 -100 50 H V C CNN
+F1 "D_Dual_CommonCathode_AAK" 0 100 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
-$FPLIST
- TO-???*
- *_Diode_*
- *SingleDiode*
- D_*
-$ENDFPLIST
 DRAW
-C 100 0 10 0 1 0 F
-P 4 0 1 10 50 50 50 -50 -50 0 50 50 N
-P 4 0 1 0 150 100 100 100 100 0 -50 0 N
-P 6 0 1 10 -75 25 -75 50 -50 50 -50 -50 -25 -50 -25 -25 N
-X A 1 200 100 100 L 50 50 1 1 P
-X A 2 200 0 100 L 50 50 1 1 P
-X K 3 -150 0 100 R 50 50 1 1 P
+C 0 0 10 0 1 0 F
+P 2 0 1 0 -150 0 150 0 N
+P 2 0 1 0 0 0 0 -100 N
+P 3 0 1 10 -50 -50 -50 50 -50 50 N
+P 3 0 1 10 50 -50 50 50 50 50 N
+P 6 0 1 10 -150 50 -50 0 -150 -50 -150 50 -150 50 -150 50 N
+P 6 0 1 10 150 -50 50 0 150 50 150 -50 150 -50 150 -50 N
+X A 1 -300 0 150 R 50 50 0 1 P
+X A 2 300 0 150 L 50 50 0 1 P
+X K 3 0 -200 100 U 50 50 0 1 P
 ENDDRAW
 ENDDEF
 #
-# D_Schottky_AKA
+# D_Dual_CommonCathode_AAK_Parallel
 #
-DEF D_Schottky_AKA D 0 0 Y N 1 F N
-F0 "D" 0 100 50 H V C CNN
-F1 "D_Schottky_AKA" 0 -100 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- TO-???*
- *_Diode_*
- *SingleDiode*
- D_*
-$ENDFPLIST
+DEF D_Dual_CommonCathode_AAK_Parallel D 0 30 Y N 1 F N
+F0 "D" 0 200 50 H V C CNN
+F1 "D_Dual_CommonCathode_AAK_Parallel" 0 -200 50 H V C CNN
+F2 "" 50 0 50 H I C CNN
+F3 "" 50 0 50 H I C CNN
 DRAW
-C 100 0 10 0 1 0 F
-P 4 0 1 10 50 50 50 -50 -50 0 50 50 N
-P 4 0 1 0 150 100 100 100 100 0 -50 0 N
-P 6 0 1 10 -75 25 -75 50 -50 50 -50 -50 -25 -50 -25 -25 N
-X A 1 200 100 100 L 50 50 1 1 I
-X K 2 -150 0 100 R 50 50 1 1 P
-X A 3 200 0 100 L 50 50 1 1 P
+C 50 0 10 0 1 0 F
+P 2 0 0 10 0 -50 0 -150 N
+P 2 0 0 10 0 50 0 150 N
+P 2 0 1 0 50 0 100 0 N
+P 4 0 1 0 -100 -100 50 -100 50 100 -100 100 N
+P 6 0 1 10 -100 -50 0 -100 -100 -150 -100 -50 -100 -50 -100 -50 N
+P 6 0 1 10 -100 150 0 100 -100 50 -100 150 -100 150 -100 150 N
+X K 1 -200 100 100 R 50 50 0 1 P
+X K 2 -200 -100 100 R 50 50 0 1 P
+X A 3 200 0 100 L 50 50 0 1 P
 ENDDRAW
 ENDDEF
 #
-# D_Schottky_AKK
+# D_Dual_CommonCathode_AAK_Split
 #
-DEF D_Schottky_AKK D 0 0 Y N 1 F N
+DEF D_Dual_CommonCathode_AAK_Split D 0 30 Y N 2 L N
 F0 "D" 0 100 50 H V C CNN
-F1 "D_Schottky_AKK" 0 -100 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- TO-???*
- *_Diode_*
- *SingleDiode*
- D_*
-$ENDFPLIST
+F1 "D_Dual_CommonCathode_AAK_Split" 0 -100 50 H V C CNN
+F2 "" -100 -100 50 H I C CNN
+F3 "" -100 -100 50 H I C CNN
 DRAW
-C -150 0 10 0 1 0 F
-P 4 0 1 0 -200 100 -150 100 -150 0 100 0 N
-P 4 0 1 10 50 50 50 -50 -50 0 50 50 N
-P 6 0 1 10 -75 25 -75 50 -50 50 -50 -50 -25 -50 -25 -25 N
-X A 1 200 0 100 L 50 50 1 1 P
-X K 2 -250 100 100 R 50 50 1 1 I
-X K 3 -250 0 100 R 50 50 1 1 P
+T 0 100 50 50 0 2 0 3 Normal 0 C C
+P 2 0 0 10 50 50 50 -50 N
+P 2 2 0 0 150 0 -50 0 N
+P 6 0 1 10 -50 50 50 0 -50 -50 -50 50 -50 50 -50 50 N
+P 2 1 1 0 50 0 -50 0 N
+X A 1 -150 0 100 R 50 50 1 1 P
+X K 3 150 0 100 L 50 50 1 1 P
+X K 2 -150 0 100 R 50 50 2 1 P
 ENDDRAW
 ENDDEF
 #
-# D_Schottky_ALT
+# D_Dual_CommonCathode_AKA
 #
-DEF D_Schottky_ALT D 0 40 N N 1 F N
-F0 "D" 0 100 50 H V C CNN
-F1 "D_Schottky_ALT" 0 -100 50 H V C CNN
+DEF D_Dual_CommonCathode_AKA D 0 30 Y N 1 F N
+F0 "D" 50 -100 50 H V C CNN
+F1 "D_Dual_CommonCathode_AKA" 0 100 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
-$FPLIST
- TO-???*
- *_Diode_*
- *SingleDiode*
- D_*
-$ENDFPLIST
 DRAW
-P 2 0 1 0 50 0 -50 0 N
-P 4 0 1 10 50 50 50 -50 -50 0 50 50 F
-P 6 0 1 10 -75 25 -75 50 -50 50 -50 -50 -25 -50 -25 -25 N
-X K 1 -150 0 100 R 50 50 1 1 P
-X A 2 150 0 100 L 50 50 1 1 P
+C 0 0 10 0 1 0 F
+P 2 0 1 0 0 0 0 -100 N
+P 2 0 1 0 150 0 -150 0 N
+P 3 0 1 10 -50 -50 -50 50 -50 50 N
+P 3 0 1 10 50 -50 50 50 50 50 N
+P 6 0 1 10 -150 50 -50 0 -150 -50 -150 50 -150 50 -150 50 N
+P 6 0 1 10 150 -50 50 0 150 50 150 -50 150 -50 150 -50 N
+X A 1 -300 0 150 R 50 50 0 1 P
+X K 2 0 -200 100 U 50 50 0 1 P
+X A 3 300 0 150 L 50 50 0 1 P
 ENDDRAW
 ENDDEF
 #
-# D_Schottky_KAA
+# D_Dual_CommonCathode_AKA_Parallel
 #
-DEF D_Schottky_KAA D 0 0 Y N 1 F N
-F0 "D" 0 100 50 H V C CNN
-F1 "D_Schottky_KAA" 0 -100 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- TO-???*
- *_Diode_*
- *SingleDiode*
- D_*
-$ENDFPLIST
+DEF D_Dual_CommonCathode_AKA_Parallel D 0 30 Y N 1 F N
+F0 "D" 0 200 50 H V C CNN
+F1 "D_Dual_CommonCathode_AKA_Parallel" 0 -200 50 H V C CNN
+F2 "" 50 0 50 H I C CNN
+F3 "" 50 0 50 H I C CNN
 DRAW
-C 100 0 10 0 1 0 F
-P 4 0 1 10 50 50 50 -50 -50 0 50 50 N
-P 4 0 1 0 150 100 100 100 100 0 -50 0 N
-P 6 0 1 10 -75 25 -75 50 -50 50 -50 -50 -25 -50 -25 -25 N
-X K 1 -150 0 100 R 50 50 1 1 P
-X A 2 200 100 100 L 50 50 1 1 I
-X A 3 200 0 100 L 50 50 1 1 P
+C 50 0 10 0 1 0 F
+P 2 0 0 10 0 -50 0 -150 N
+P 2 0 0 10 0 150 0 50 N
+P 2 0 1 0 50 0 100 0 N
+P 4 0 1 0 -100 -100 50 -100 50 100 -100 100 N
+P 6 0 1 10 -100 -50 0 -100 -100 -150 -100 -50 -100 -50 -100 -50 N
+P 6 0 1 10 -100 150 0 100 -100 50 -100 150 -100 150 -100 150 N
+X K 1 -200 100 100 R 50 50 0 1 P
+X A 2 200 0 100 L 50 50 0 1 P
+X K 3 -200 -100 100 R 50 50 0 1 P
 ENDDRAW
 ENDDEF
 #
-# D_Schottky_KAK
+# D_Dual_CommonCathode_AKA_Split
 #
-DEF D_Schottky_KAK D 0 0 Y N 1 F N
+DEF D_Dual_CommonCathode_AKA_Split D 0 30 Y N 2 L N
 F0 "D" 0 100 50 H V C CNN
-F1 "D_Schottky_KAK" 0 -100 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- TO-???*
- *_Diode_*
- *SingleDiode*
- D_*
-$ENDFPLIST
+F1 "D_Dual_CommonCathode_AKA_Split" 0 -100 50 H V C CNN
+F2 "" -100 -100 50 H I C CNN
+F3 "" -100 -100 50 H I C CNN
 DRAW
-C -150 0 10 0 1 0 F
-P 3 0 1 0 -150 100 -150 0 100 0 N
-P 4 0 1 10 50 50 50 -50 -50 0 50 50 N
-P 6 0 1 10 -75 25 -75 50 -50 50 -50 -50 -25 -50 -25 -25 N
-X K 1 -250 100 100 R 50 50 1 1 P
-X A 2 200 0 100 L 50 50 1 1 P
-X K 3 -250 0 100 R 50 50 1 1 P
+T 0 100 50 50 0 2 0 2 Normal 0 C C
+P 2 0 0 10 50 50 50 -50 N
+P 2 2 0 0 150 0 -50 0 N
+P 6 0 1 10 -50 50 50 0 -50 -50 -50 50 -50 50 -50 50 N
+P 2 1 1 0 50 0 -50 0 N
+X A 1 -150 0 100 R 50 50 1 1 P
+X K 2 150 0 100 L 50 50 1 1 P
+X K 3 -150 0 100 R 50 50 2 1 P
 ENDDRAW
 ENDDEF
 #
-# D_Schottky_KKA
+# D_Dual_CommonCathode_KAA
 #
-DEF D_Schottky_KKA D 0 0 Y N 1 F N
-F0 "D" 0 100 50 H V C CNN
-F1 "D_Schottky_KKA" 0 -100 50 H V C CNN
+DEF D_Dual_CommonCathode_KAA D 0 30 Y N 1 F N
+F0 "D" 50 -100 50 H V C CNN
+F1 "D_Dual_CommonCathode_KAA" 0 100 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
-$FPLIST
- TO-???*
- *_Diode_*
- *SingleDiode*
- D_*
-$ENDFPLIST
 DRAW
-C -150 0 10 0 1 0 F
-P 4 0 1 0 -200 100 -150 100 -150 0 100 0 N
-P 4 0 1 10 50 50 50 -50 -50 0 50 50 N
-P 6 0 1 10 -75 25 -75 50 -50 50 -50 -50 -25 -50 -25 -25 N
-X K 1 -250 100 100 R 50 50 1 1 I
-X K 2 -250 0 100 R 50 50 1 1 P
-X A 3 200 0 100 L 50 50 1 1 P
+C 0 0 10 0 1 0 F
+P 2 0 1 0 -150 0 150 0 N
+P 2 0 1 0 0 0 0 -100 N
+P 3 0 1 10 -50 -50 -50 50 -50 50 N
+P 3 0 1 10 50 -50 50 50 50 50 N
+P 6 0 1 10 -150 50 -50 0 -150 -50 -150 50 -150 50 -150 50 N
+P 6 0 1 10 150 -50 50 0 150 50 150 -50 150 -50 150 -50 N
+X K 1 0 -200 100 U 50 50 0 1 P
+X A 2 -300 0 150 R 50 50 0 1 P
+X A 3 300 0 150 L 50 50 0 1 P
 ENDDRAW
 ENDDEF
 #
-# D_Schottky_Small
+# D_Dual_CommonCathode_KAA_Parallel
 #
-DEF D_Schottky_Small D 0 10 N N 1 F N
-F0 "D" -50 80 50 H V L CNN
-F1 "D_Schottky_Small" -280 -80 50 H V L CNN
-F2 "" 0 0 50 V I C CNN
-F3 "" 0 0 50 V I C CNN
-$FPLIST
- TO-???*
- *_Diode_*
- *SingleDiode*
- D_*
-$ENDFPLIST
+DEF D_Dual_CommonCathode_KAA_Parallel D 0 30 Y N 1 F N
+F0 "D" 0 200 50 H V C CNN
+F1 "D_Dual_CommonCathode_KAA_Parallel" 0 -200 50 H V C CNN
+F2 "" 50 0 50 H I C CNN
+F3 "" 50 0 50 H I C CNN
 DRAW
-P 2 0 1 0 -30 0 30 0 N
-P 4 0 1 10 30 -40 -30 0 30 40 30 -40 N
-P 6 0 1 10 -50 30 -50 40 -30 40 -30 -40 -10 -40 -10 -30 N
-X K 1 -100 0 70 R 50 50 1 1 P
-X A 2 100 0 70 L 50 50 1 1 P
+C 50 0 10 0 1 0 F
+P 2 0 0 10 0 -50 0 -150 N
+P 2 0 0 10 0 150 0 50 N
+P 2 0 1 0 50 0 100 0 N
+P 4 0 1 0 -100 -100 50 -100 50 100 -100 100 N
+P 6 0 1 10 -100 -50 0 -100 -100 -150 -100 -50 -100 -50 -100 -50 N
+P 6 0 1 10 -100 150 0 100 -100 50 -100 150 -100 150 -100 150 N
+X A 1 200 0 100 L 50 50 0 1 P
+X K 2 -200 100 100 R 50 50 0 1 P
+X K 3 -200 -100 100 R 50 50 0 1 P
 ENDDRAW
 ENDDEF
 #
-# D_Schottky_Small_ALT
+# D_Dual_CommonCathode_KAA_Split
 #
-DEF D_Schottky_Small_ALT D 0 10 N N 1 F N
-F0 "D" -50 80 50 H V L CNN
-F1 "D_Schottky_Small_ALT" -280 -80 50 H V L CNN
-F2 "" 0 0 50 V I C CNN
-F3 "" 0 0 50 V I C CNN
-$FPLIST
- TO-???*
- *_Diode_*
- *SingleDiode*
- D_*
-$ENDFPLIST
+DEF D_Dual_CommonCathode_KAA_Split D 0 30 Y N 2 L N
+F0 "D" 0 100 50 H V C CNN
+F1 "D_Dual_CommonCathode_KAA_Split" 0 -100 50 H V C CNN
+F2 "" -100 -100 50 H I C CNN
+F3 "" -100 -100 50 H I C CNN
 DRAW
-P 2 0 1 0 -30 0 30 0 N
-P 4 0 1 10 30 -40 -30 0 30 40 30 -40 F
-P 6 0 1 10 -50 30 -50 40 -30 40 -30 -40 -10 -40 -10 -30 N
-X K 1 -100 0 70 R 50 50 1 1 P
-X A 2 100 0 70 L 50 50 1 1 P
+T 0 100 50 50 0 2 0 1 Normal 0 C C
+P 2 1 0 10 50 50 50 -50 N
+P 2 2 0 0 150 0 -50 0 N
+P 6 0 1 10 -50 50 50 0 -50 -50 -50 50 -50 50 -50 50 N
+P 2 1 1 0 50 0 -50 0 N
+X K 1 150 0 100 L 50 50 1 1 P
+X A 2 -150 0 100 R 50 50 1 1 P
+X K 3 -150 0 100 R 50 50 2 1 P
 ENDDRAW
 ENDDEF
 #
-# D_Schottky_x2_ACom_AKK
+# D_Dual_Serial_ACK
 #
-DEF D_Schottky_x2_ACom_AKK D 0 30 Y N 1 F N
+DEF D_Dual_Serial_ACK D 0 30 Y N 1 F N
 F0 "D" 50 -100 50 H V C CNN
-F1 "D_Schottky_x2_ACom_AKK" 0 100 50 H V C CNN
+F1 "D_Dual_Serial_ACK" 0 100 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 DRAW
 C 0 0 10 0 1 0 F
-P 2 0 1 0 -140 0 150 0 N
 P 2 0 1 0 0 0 0 -100 N
-P 3 0 1 10 -150 50 -150 -50 -150 -50 N
+P 2 0 1 0 150 0 -150 0 N
+P 2 0 1 0 250 0 300 0 N
+P 3 0 1 10 -50 -50 -50 50 -50 50 N
 P 3 0 1 10 150 50 150 -50 150 -50 N
-P 4 0 1 10 -150 50 -170 50 -170 40 -170 40 N
-P 4 0 1 10 150 -50 170 -50 170 -40 170 -40 N
-P 4 0 1 10 150 50 130 50 130 40 130 40 N
-P 5 0 1 10 -130 -40 -130 -50 -150 -50 -150 -50 -150 -50 N
-P 6 0 1 10 -50 -50 -150 0 -50 50 -50 -50 -50 -50 -50 -50 N
+P 6 0 1 10 -150 50 -50 0 -150 -50 -150 50 -150 50 -150 50 N
 P 6 0 1 10 50 50 150 0 50 -50 50 50 50 50 50 50 N
-X A 1 0 -200 100 U 50 50 0 1 P
-X K 2 -300 0 150 R 50 50 0 1 P
+X A 1 -300 0 150 R 50 50 0 1 P
+X common 2 0 -200 100 U 50 50 0 1 P
 X K 3 300 0 150 L 50 50 0 1 P
 ENDDRAW
 ENDDEF
 #
-# D_Schottky_x2_ACom_AKK_Parallel
-#
-DEF D_Schottky_x2_ACom_AKK_Parallel D 0 30 Y N 1 F N
-F0 "D" 0 200 50 H V C CNN
-F1 "D_Schottky_x2_ACom_AKK_Parallel" 0 -200 50 H V C CNN
-F2 "" -50 0 50 H I C CNN
-F3 "" -50 0 50 H I C CNN
-DRAW
-C -50 0 10 0 1 0 F
-P 2 0 1 0 -50 0 -100 0 N
-P 4 0 1 0 100 100 -50 100 -50 -100 100 -100 N
-P 6 0 1 10 0 -50 100 -100 0 -150 0 -50 0 -50 0 -50 N
-P 6 0 1 10 0 150 100 100 0 50 0 150 0 150 0 150 N
-P 6 0 1 10 120 -60 120 -50 100 -50 100 -150 80 -150 80 -140 N
-P 6 0 1 10 120 140 120 150 100 150 100 50 80 50 80 60 N
-X A 1 -200 0 100 R 50 50 0 1 P
-X K 2 200 100 100 L 50 50 0 1 P
-X K 3 200 -100 100 L 50 50 0 1 P
-ENDDRAW
-ENDDEF
-#
-# D_Schottky_x2_ACom_AKK_Split
+# D_Dual_Serial_AKC
 #
-DEF D_Schottky_x2_ACom_AKK_Split D 0 30 Y N 2 L N
-F0 "D" 0 100 50 H V C CNN
-F1 "D_Schottky_x2_ACom_AKK_Split" 0 -100 50 H V C CNN
-F2 "" -100 -100 50 H I C CNN
-F3 "" -100 -100 50 H I C CNN
+DEF D_Dual_Serial_AKC D 0 30 Y N 1 F N
+F0 "D" 50 -100 50 H V C CNN
+F1 "D_Dual_Serial_AKC" 0 100 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
 DRAW
-T 0 -100 50 50 0 2 0 1 Normal 0 C C
-P 2 2 0 0 50 0 -150 0 N
-P 6 0 1 10 -50 50 50 0 -50 -50 -50 50 -50 50 -50 50 N
-P 6 0 1 10 70 40 70 50 50 50 50 -50 30 -50 30 -40 N
-P 2 1 1 0 50 0 -50 0 N
-X A 1 -150 0 100 R 50 50 1 1 P
-X K 2 150 0 100 L 50 50 1 1 P
-X K 3 150 0 100 L 50 50 2 1 P
+C 0 0 10 0 1 0 F
+P 2 0 1 0 -150 0 150 0 N
+P 2 0 1 0 0 0 0 -100 N
+P 2 0 1 0 250 0 300 0 N
+P 3 0 1 10 -50 -50 -50 50 -50 50 N
+P 3 0 1 10 150 50 150 -50 150 -50 N
+P 6 0 1 10 -150 50 -50 0 -150 -50 -150 50 -150 50 -150 50 N
+P 6 0 1 10 50 50 150 0 50 -50 50 50 50 50 50 50 N
+X A 1 -300 0 150 R 50 50 0 1 P
+X K 2 300 0 150 L 50 50 0 1 P
+X common 3 0 -200 100 U 50 50 0 1 P
 ENDDRAW
 ENDDEF
 #
-# D_Schottky_x2_ACom_KAK
+# D_Dual_Serial_CAK
 #
-DEF D_Schottky_x2_ACom_KAK D 0 30 Y N 1 F N
+DEF D_Dual_Serial_CAK D 0 30 Y N 1 F N
 F0 "D" 50 -100 50 H V C CNN
-F1 "D_Schottky_x2_ACom_KAK" 0 100 50 H V C CNN
+F1 "D_Dual_Serial_CAK" 0 100 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 DRAW
 C 0 0 10 0 1 0 F
-P 2 0 1 0 -140 0 150 0 N
 P 2 0 1 0 0 0 0 -100 N
-P 3 0 1 10 -150 50 -150 -50 -150 -50 N
+P 2 0 1 0 150 0 -150 0 N
+P 3 0 1 10 -50 -50 -50 50 -50 50 N
 P 3 0 1 10 150 50 150 -50 150 -50 N
-P 4 0 1 10 -150 50 -170 50 -170 40 -170 40 N
-P 4 0 1 10 150 -50 170 -50 170 -40 170 -40 N
-P 4 0 1 10 150 50 130 50 130 40 130 40 N
-P 5 0 1 10 -130 -40 -130 -50 -150 -50 -150 -50 -150 -50 N
-P 6 0 1 10 -50 -50 -150 0 -50 50 -50 -50 -50 -50 -50 -50 N
+P 6 0 1 10 -150 50 -50 0 -150 -50 -150 50 -150 50 -150 50 N
 P 6 0 1 10 50 50 150 0 50 -50 50 50 50 50 50 50 N
-X K 1 -300 0 150 R 50 50 0 1 P
-X A 2 0 -200 100 U 50 50 0 1 P
+X common 1 0 -200 100 U 50 50 0 1 P
+X A 2 -300 0 150 R 50 50 0 1 P
 X K 3 300 0 150 L 50 50 0 1 P
 ENDDRAW
 ENDDEF
 #
-# D_Schottky_x2_ACom_KAK_Parallel
+# D_Dual_Serial_CKA
 #
-DEF D_Schottky_x2_ACom_KAK_Parallel D 0 30 Y N 1 F N
-F0 "D" 0 200 50 H V C CNN
-F1 "D_Schottky_x2_ACom_KAK_Parallel" 0 -200 50 H V C CNN
-F2 "" -50 0 50 H I C CNN
-F3 "" -50 0 50 H I C CNN
+DEF D_Dual_Serial_CKA D 0 30 Y N 1 F N
+F0 "D" 50 -100 50 H V C CNN
+F1 "D_Dual_Serial_CKA" 0 100 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
 DRAW
-C -50 0 10 0 1 0 F
-P 2 0 1 0 -50 0 -100 0 N
-P 4 0 1 0 100 100 -50 100 -50 -100 100 -100 N
-P 6 0 1 10 0 -50 100 -100 0 -150 0 -50 0 -50 0 -50 N
-P 6 0 1 10 0 150 100 100 0 50 0 150 0 150 0 150 N
-P 6 0 1 10 120 -60 120 -50 100 -50 100 -150 80 -150 80 -140 N
-P 6 0 1 10 120 140 120 150 100 150 100 50 80 50 80 60 N
-X K 1 200 100 100 L 50 50 0 1 P
-X A 2 -200 0 100 R 50 50 0 1 P
-X K 3 200 -100 100 L 50 50 0 1 P
+C 0 0 10 0 1 0 F
+P 2 0 1 0 -150 0 150 0 N
+P 2 0 1 0 0 0 0 -100 N
+P 3 0 1 10 -50 -50 -50 50 -50 50 N
+P 3 0 1 10 150 50 150 -50 150 -50 N
+P 6 0 1 10 -150 50 -50 0 -150 -50 -150 50 -150 50 -150 50 N
+P 6 0 1 10 50 50 150 0 50 -50 50 50 50 50 50 50 N
+X common 1 0 -200 100 U 50 50 0 1 P
+X K 2 300 0 150 L 50 50 0 1 P
+X A 3 -300 0 150 R 50 50 0 1 P
 ENDDRAW
 ENDDEF
 #
-# D_Schottky_x2_ACom_KAK_Split
+# D_Dual_Serial_KAC
 #
-DEF D_Schottky_x2_ACom_KAK_Split D 0 30 Y N 2 L N
-F0 "D" 0 100 50 H V C CNN
-F1 "D_Schottky_x2_ACom_KAK_Split" 0 -100 50 H V C CNN
-F2 "" -100 -100 50 H I C CNN
-F3 "" -100 -100 50 H I C CNN
+DEF D_Dual_Serial_KAC D 0 30 Y N 1 F N
+F0 "D" 50 -100 50 H V C CNN
+F1 "D_Dual_Serial_KAC" 0 100 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
 DRAW
-T 0 -100 50 50 0 2 0 2 Normal 0 C C
-P 2 2 0 0 50 0 -150 0 N
-P 6 0 1 10 -50 50 50 0 -50 -50 -50 50 -50 50 -50 50 N
-P 6 0 1 10 70 40 70 50 50 50 50 -50 30 -50 30 -40 N
-P 2 1 1 0 50 0 -50 0 N
-X K 1 150 0 100 L 50 50 1 1 P
-X A 2 -150 0 100 R 50 50 1 1 P
-X K 3 150 0 100 L 50 50 2 1 P
+C 0 0 10 0 1 0 F
+P 2 0 1 0 0 0 0 -100 N
+P 2 0 1 0 150 0 -150 0 N
+P 3 0 1 10 -50 -50 -50 50 -50 50 N
+P 3 0 1 10 150 50 150 -50 150 -50 N
+P 6 0 1 10 -150 50 -50 0 -150 -50 -150 50 -150 50 -150 50 N
+P 6 0 1 10 50 50 150 0 50 -50 50 50 50 50 50 50 N
+X K 1 300 0 150 L 50 50 0 1 P
+X A 2 -300 0 150 R 50 50 0 1 P
+X common 3 0 -200 100 U 50 50 0 1 P
 ENDDRAW
 ENDDEF
 #
-# D_Schottky_x2_ACom_KKA
+# D_Dual_Serial_KCA
 #
-DEF D_Schottky_x2_ACom_KKA D 0 30 Y N 1 F N
+DEF D_Dual_Serial_KCA D 0 30 Y N 1 F N
 F0 "D" 50 -100 50 H V C CNN
-F1 "D_Schottky_x2_ACom_KKA" 0 100 50 H V C CNN
+F1 "D_Dual_Serial_KCA" 0 100 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 DRAW
 C 0 0 10 0 1 0 F
-P 2 0 1 0 -140 0 150 0 N
 P 2 0 1 0 0 0 0 -100 N
-P 3 0 1 10 -150 50 -150 -50 -150 -50 N
+P 2 0 1 0 150 0 -150 0 N
+P 2 0 1 0 250 0 300 0 N
+P 3 0 1 10 -50 -50 -50 50 -50 50 N
 P 3 0 1 10 150 50 150 -50 150 -50 N
-P 4 0 1 10 -150 50 -170 50 -170 40 -170 40 N
-P 4 0 1 10 150 -50 170 -50 170 -40 170 -40 N
-P 4 0 1 10 150 50 130 50 130 40 130 40 N
-P 5 0 1 10 -130 -40 -130 -50 -150 -50 -150 -50 -150 -50 N
-P 6 0 1 10 -50 -50 -150 0 -50 50 -50 -50 -50 -50 -50 -50 N
+P 6 0 1 10 -150 50 -50 0 -150 -50 -150 50 -150 50 -150 50 N
 P 6 0 1 10 50 50 150 0 50 -50 50 50 50 50 50 50 N
-X K 1 -300 0 150 R 50 50 0 1 P
-X K 2 300 0 150 L 50 50 0 1 P
-X A 3 0 -200 100 U 50 50 0 1 P
+X K 1 300 0 150 L 50 50 0 1 P
+X common 2 0 -200 100 U 50 50 0 1 P
+X A 3 -300 0 150 R 50 50 0 1 P
 ENDDRAW
 ENDDEF
 #
-# D_Schottky_x2_ACom_KKA_Parallel
+# D_Dual_Series_ACK_Parallel
 #
-DEF D_Schottky_x2_ACom_KKA_Parallel D 0 30 Y N 1 F N
+DEF D_Dual_Series_ACK_Parallel D 0 30 Y N 1 F N
 F0 "D" 0 200 50 H V C CNN
-F1 "D_Schottky_x2_ACom_KKA_Parallel" 0 -200 50 H V C CNN
+F1 "D_Dual_Series_ACK_Parallel" 0 -200 50 H V C CNN
 F2 "" -50 0 50 H I C CNN
 F3 "" -50 0 50 H I C CNN
 DRAW
 C -50 0 10 0 1 0 F
+P 2 0 0 10 0 -50 0 -150 N
+P 2 0 0 10 100 150 100 50 N
 P 2 0 1 0 -50 0 -100 0 N
 P 4 0 1 0 100 100 -50 100 -50 -100 100 -100 N
-P 6 0 1 10 0 -50 100 -100 0 -150 0 -50 0 -50 0 -50 N
 P 6 0 1 10 0 150 100 100 0 50 0 150 0 150 0 150 N
-P 6 0 1 10 120 -60 120 -50 100 -50 100 -150 80 -150 80 -140 N
-P 6 0 1 10 120 140 120 150 100 150 100 50 80 50 80 60 N
-X K 1 200 100 100 L 50 50 0 1 P
-X K 2 200 -100 100 L 50 50 0 1 P
-X A 3 -200 0 100 R 50 50 0 1 P
+P 6 0 1 10 100 -50 0 -100 100 -150 100 -50 100 -50 100 -50 N
+X K 1 200 -100 100 L 50 50 0 1 P
+X A 2 -200 0 100 R 50 50 0 1 P
+X K 3 200 100 100 L 50 50 0 1 P
 ENDDRAW
 ENDDEF
 #
-# D_Schottky_x2_ACom_KKA_Split
+# D_Dual_Series_ACK_Split
 #
-DEF D_Schottky_x2_ACom_KKA_Split D 0 30 Y N 2 L N
+DEF D_Dual_Series_ACK_Split D 0 30 Y N 2 L N
 F0 "D" 0 100 50 H V C CNN
-F1 "D_Schottky_x2_ACom_KKA_Split" 0 -100 50 H V C CNN
+F1 "D_Dual_Series_ACK_Split" 0 -100 50 H V C CNN
 F2 "" -100 -100 50 H I C CNN
 F3 "" -100 -100 50 H I C CNN
 DRAW
-T 0 -100 50 50 0 2 0 3 Normal 0 C C
-P 2 2 0 0 50 0 -150 0 N
+T 0 -100 50 50 0 2 0 2 Normal 0 C C
+P 2 0 0 10 50 50 50 -50 N
+P 2 2 0 0 50 0 -150 0 N
 P 6 0 1 10 -50 50 50 0 -50 -50 -50 50 -50 50 -50 50 N
-P 6 0 1 10 70 40 70 50 50 50 50 -50 30 -50 30 -40 N
 P 2 1 1 0 50 0 -50 0 N
-X K 1 150 0 100 L 50 50 1 1 P
-X A 3 -150 0 100 R 50 50 1 1 P
-X K 2 150 0 100 L 50 50 2 1 P
-ENDDRAW
-ENDDEF
-#
-# D_Schottky_x2_KCom_AAK
-#
-DEF D_Schottky_x2_KCom_AAK D 0 30 Y N 1 F N
-F0 "D" 50 -100 50 H V C CNN
-F1 "D_Schottky_x2_KCom_AAK" 0 100 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-DRAW
-C 0 0 10 0 1 0 F
-P 2 0 1 0 -150 0 150 0 N
-P 2 0 1 0 0 0 0 -100 N
-P 3 0 1 10 -50 -50 -50 50 -50 50 N
-P 3 0 1 10 50 -50 50 50 50 50 N
-P 4 0 1 10 -50 -50 -30 -50 -30 -40 -30 -40 N
-P 4 0 1 10 50 -50 70 -50 70 -40 70 -40 N
-P 4 0 1 10 50 50 30 50 30 40 30 40 N
-P 5 0 1 10 -70 40 -70 50 -50 50 -50 50 -50 50 N
-P 6 0 1 10 -150 50 -50 0 -150 -50 -150 50 -150 50 -150 50 N
-P 6 0 1 10 150 -50 50 0 150 50 150 -50 150 -50 150 -50 N
-X A 1 -300 0 150 R 50 50 0 1 P
-X A 2 300 0 150 L 50 50 0 1 P
-X K 3 0 -200 100 U 50 50 0 1 P
+X A 1 -150 0 100 R 50 50 1 1 P
+X K 2 150 0 100 L 50 50 1 1 P
+X K 3 150 0 100 L 50 50 2 1 P
 ENDDRAW
 ENDDEF
 #
-# D_Schottky_x2_KCom_AAK_Parallel
+# D_Dual_Series_AKC_Parallel
 #
-DEF D_Schottky_x2_KCom_AAK_Parallel D 0 30 Y N 1 F N
+DEF D_Dual_Series_AKC_Parallel D 0 30 Y N 1 F N
 F0 "D" 0 200 50 H V C CNN
-F1 "D_Schottky_x2_KCom_AAK_Parallel" 0 -200 50 H V C CNN
-F2 "" 50 0 50 H I C CNN
-F3 "" 50 0 50 H I C CNN
+F1 "D_Dual_Series_AKC_Parallel" 0 -200 50 H V C CNN
+F2 "" -50 0 50 H I C CNN
+F3 "" -50 0 50 H I C CNN
 DRAW
-C 50 0 10 0 1 0 F
-P 2 0 1 0 50 0 100 0 N
-P 4 0 1 0 -100 -100 50 -100 50 100 -100 100 N
-P 6 0 1 10 -100 -50 0 -100 -100 -150 -100 -50 -100 -50 -100 -50 N
-P 6 0 1 10 -100 150 0 100 -100 50 -100 150 -100 150 -100 150 N
-P 6 0 1 10 20 -60 20 -50 0 -50 0 -150 -20 -150 -20 -140 N
-P 6 0 1 10 20 140 20 150 0 150 0 50 -20 50 -20 60 N
-X K 1 -200 100 100 R 50 50 0 1 P
-X K 2 -200 -100 100 R 50 50 0 1 P
-X A 3 200 0 100 L 50 50 0 1 P
+C -50 0 10 0 1 0 F
+P 2 0 0 10 0 -50 0 -150 N
+P 2 0 0 10 100 150 100 50 N
+P 2 0 1 0 -50 0 -100 0 N
+P 4 0 1 0 100 100 -50 100 -50 -100 100 -100 N
+P 6 0 1 10 0 150 100 100 0 50 0 150 0 150 0 150 N
+P 6 0 1 10 100 -50 0 -100 100 -150 100 -50 100 -50 100 -50 N
+X K 1 200 -100 100 L 50 50 0 1 P
+X K 2 200 100 100 L 50 50 0 1 P
+X A 3 -200 0 100 R 50 50 0 1 P
 ENDDRAW
 ENDDEF
 #
-# D_Schottky_x2_KCom_AAK_Split
+# D_Dual_Series_AKC_Split
 #
-DEF D_Schottky_x2_KCom_AAK_Split D 0 30 Y N 2 L N
+DEF D_Dual_Series_AKC_Split D 0 30 Y N 2 L N
 F0 "D" 0 100 50 H V C CNN
-F1 "D_Schottky_x2_KCom_AAK_Split" 0 -100 50 H V C CNN
+F1 "D_Dual_Series_AKC_Split" 0 -100 50 H V C CNN
 F2 "" -100 -100 50 H I C CNN
 F3 "" -100 -100 50 H I C CNN
 DRAW
-T 0 100 50 50 0 2 0 3 Normal 0 C C
-P 2 2 0 0 150 0 -50 0 N
+T 0 -100 50 50 0 2 0 3 Normal 0 C C
+P 2 0 0 10 50 50 50 -50 N
+P 2 2 0 0 50 0 -150 0 N
 P 6 0 1 10 -50 50 50 0 -50 -50 -50 50 -50 50 -50 50 N
-P 6 0 1 10 70 40 70 50 50 50 50 -50 30 -50 30 -40 N
 P 2 1 1 0 50 0 -50 0 N
 X A 1 -150 0 100 R 50 50 1 1 P
 X K 3 150 0 100 L 50 50 1 1 P
-X K 2 -150 0 100 R 50 50 2 1 P
+X K 2 150 0 100 L 50 50 2 1 P
 ENDDRAW
 ENDDEF
 #
-# D_Schottky_x2_KCom_AKA
+# D_Dual_Series_CAK_Parallel
 #
-DEF D_Schottky_x2_KCom_AKA D 0 30 Y N 1 F N
-F0 "D" 50 -100 50 H V C CNN
-F1 "D_Schottky_x2_KCom_AKA" 0 100 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
+DEF D_Dual_Series_CAK_Parallel D 0 30 Y N 1 F N
+F0 "D" 0 200 50 H V C CNN
+F1 "D_Dual_Series_CAK_Parallel" 0 -200 50 H V C CNN
+F2 "" -50 0 50 H I C CNN
+F3 "" -50 0 50 H I C CNN
 DRAW
-C 0 0 10 0 1 0 F
-P 2 0 1 0 0 0 0 -100 N
-P 2 0 1 0 150 0 -150 0 N
-P 3 0 1 10 -50 -50 -50 50 -50 50 N
-P 3 0 1 10 50 -50 50 50 50 50 N
-P 4 0 1 10 -50 -50 -30 -50 -30 -40 -30 -40 N
-P 4 0 1 10 50 -50 70 -50 70 -40 70 -40 N
-P 4 0 1 10 50 50 30 50 30 40 30 40 N
-P 5 0 1 10 -70 40 -70 50 -50 50 -50 50 -50 50 N
-P 6 0 1 10 -150 50 -50 0 -150 -50 -150 50 -150 50 -150 50 N
-P 6 0 1 10 150 -50 50 0 150 50 150 -50 150 -50 150 -50 N
-X A 1 -300 0 150 R 50 50 0 1 P
-X K 2 0 -200 100 U 50 50 0 1 P
-X A 3 300 0 150 L 50 50 0 1 P
+C -50 0 10 0 1 0 F
+P 2 0 0 10 0 -50 0 -150 N
+P 2 0 0 10 100 150 100 50 N
+P 2 0 1 0 -50 0 -100 0 N
+P 4 0 1 0 100 100 -50 100 -50 -100 100 -100 N
+P 6 0 1 10 0 150 100 100 0 50 0 150 0 150 0 150 N
+P 6 0 1 10 100 -50 0 -100 100 -150 100 -50 100 -50 100 -50 N
+X A 1 -200 0 100 R 50 50 0 1 P
+X K 2 200 -100 100 L 50 50 0 1 P
+X K 3 200 100 100 L 50 50 0 1 P
+ENDDRAW
+ENDDEF
+#
+# D_Dual_Series_CAK_Split
+#
+DEF D_Dual_Series_CAK_Split D 0 30 Y N 2 L N
+F0 "D" 0 100 50 H V C CNN
+F1 "D_Dual_Series_CAK_Split" 0 -100 50 H V C CNN
+F2 "" -100 -100 50 H I C CNN
+F3 "" -100 -100 50 H I C CNN
+DRAW
+T 0 -100 50 50 0 2 0 1 Normal 0 C C
+P 2 0 0 10 50 50 50 -50 N
+P 2 2 0 0 50 0 -150 0 N
+P 6 0 1 10 -50 50 50 0 -50 -50 -50 50 -50 50 -50 50 N
+P 2 1 1 0 50 0 -50 0 N
+X K 1 150 0 100 L 50 50 1 1 P
+X A 2 -150 0 100 R 50 50 1 1 P
+X K 3 150 0 100 L 50 50 2 1 P
 ENDDRAW
 ENDDEF
 #
-# D_Schottky_x2_KCom_AKA_Parallel
+# D_Dual_Series_CKA_Parallel
 #
-DEF D_Schottky_x2_KCom_AKA_Parallel D 0 30 Y N 1 F N
+DEF D_Dual_Series_CKA_Parallel D 0 30 Y N 1 F N
 F0 "D" 0 200 50 H V C CNN
-F1 "D_Schottky_x2_KCom_AKA_Parallel" 0 -200 50 H V C CNN
-F2 "" 50 0 50 H I C CNN
-F3 "" 50 0 50 H I C CNN
+F1 "D_Dual_Series_CKA_Parallel" 0 -200 50 H V C CNN
+F2 "" -50 0 50 H I C CNN
+F3 "" -50 0 50 H I C CNN
 DRAW
-C 50 0 10 0 1 0 F
-P 2 0 1 0 50 0 100 0 N
-P 4 0 1 0 -100 -100 50 -100 50 100 -100 100 N
-P 6 0 1 10 -100 -50 0 -100 -100 -150 -100 -50 -100 -50 -100 -50 N
-P 6 0 1 10 -100 150 0 100 -100 50 -100 150 -100 150 -100 150 N
-P 6 0 1 10 20 -60 20 -50 0 -50 0 -150 -20 -150 -20 -140 N
-P 6 0 1 10 20 140 20 150 0 150 0 50 -20 50 -20 60 N
-X K 1 -200 100 100 R 50 50 0 1 P
-X A 2 200 0 100 L 50 50 0 1 P
-X K 3 -200 -100 100 R 50 50 0 1 P
+C -50 0 10 0 1 0 F
+P 2 0 0 10 0 -50 0 -150 N
+P 2 0 0 10 100 150 100 50 N
+P 2 0 1 0 -50 0 -100 0 N
+P 4 0 1 0 100 100 -50 100 -50 -100 100 -100 N
+P 6 0 1 10 0 150 100 100 0 50 0 150 0 150 0 150 N
+P 6 0 1 10 100 -50 0 -100 100 -150 100 -50 100 -50 100 -50 N
+X A 1 -200 0 100 R 50 50 0 1 P
+X K 2 200 100 100 L 50 50 0 1 P
+X K 3 200 -100 100 L 50 50 0 1 P
 ENDDRAW
 ENDDEF
 #
-# D_Schottky_x2_KCom_AKA_Split
+# D_Dual_Series_CKA_Split
 #
-DEF D_Schottky_x2_KCom_AKA_Split D 0 30 Y N 2 L N
+DEF D_Dual_Series_CKA_Split D 0 30 Y N 2 L N
 F0 "D" 0 100 50 H V C CNN
-F1 "D_Schottky_x2_KCom_AKA_Split" 0 -100 50 H V C CNN
+F1 "D_Dual_Series_CKA_Split" 0 -100 50 H V C CNN
 F2 "" -100 -100 50 H I C CNN
 F3 "" -100 -100 50 H I C CNN
 DRAW
-T 0 100 50 50 0 2 0 2 Normal 0 C C
-P 2 2 0 0 150 0 -50 0 N
+T 0 -100 50 50 0 2 0 1 Normal 0 C C
+P 2 0 0 10 50 50 50 -50 N
+P 2 2 0 0 50 0 -150 0 N
 P 6 0 1 10 -50 50 50 0 -50 -50 -50 50 -50 50 -50 50 N
-P 6 0 1 10 70 40 70 50 50 50 50 -50 30 -50 30 -40 N
 P 2 1 1 0 50 0 -50 0 N
-X A 1 -150 0 100 R 50 50 1 1 P
-X K 2 150 0 100 L 50 50 1 1 P
-X K 3 -150 0 100 R 50 50 2 1 P
+X K 1 150 0 100 L 50 50 1 1 P
+X A 3 -150 0 100 R 50 50 1 1 P
+X K 2 150 0 100 L 50 50 2 1 P
 ENDDRAW
 ENDDEF
 #
-# D_Schottky_x2_KCom_KAA
+# D_Dual_Series_KAC_Parallel
 #
-DEF D_Schottky_x2_KCom_KAA D 0 30 Y N 1 F N
-F0 "D" 50 -100 50 H V C CNN
-F1 "D_Schottky_x2_KCom_KAA" 0 100 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
+DEF D_Dual_Series_KAC_Parallel D 0 30 Y N 1 F N
+F0 "D" 0 200 50 H V C CNN
+F1 "D_Dual_Series_KAC_Parallel" 0 -200 50 H V C CNN
+F2 "" -50 0 50 H I C CNN
+F3 "" -50 0 50 H I C CNN
 DRAW
-C 0 0 10 0 1 0 F
-P 2 0 1 0 -150 0 150 0 N
-P 2 0 1 0 0 0 0 -100 N
-P 3 0 1 10 -50 -50 -50 50 -50 50 N
-P 3 0 1 10 50 -50 50 50 50 50 N
-P 4 0 1 10 -50 -50 -30 -50 -30 -40 -30 -40 N
-P 4 0 1 10 50 -50 70 -50 70 -40 70 -40 N
-P 4 0 1 10 50 50 30 50 30 40 30 40 N
-P 5 0 1 10 -70 40 -70 50 -50 50 -50 50 -50 50 N
-P 6 0 1 10 -150 50 -50 0 -150 -50 -150 50 -150 50 -150 50 N
-P 6 0 1 10 150 -50 50 0 150 50 150 -50 150 -50 150 -50 N
-X K 1 0 -200 100 U 50 50 0 1 P
-X A 2 -300 0 150 R 50 50 0 1 P
-X A 3 300 0 150 L 50 50 0 1 P
+C -50 0 10 0 1 0 F
+P 2 0 0 10 0 -50 0 -150 N
+P 2 0 0 10 100 150 100 50 N
+P 2 0 1 0 -50 0 -100 0 N
+P 4 0 1 0 100 100 -50 100 -50 -100 100 -100 N
+P 6 0 1 10 0 150 100 100 0 50 0 150 0 150 0 150 N
+P 6 0 1 10 100 -50 0 -100 100 -150 100 -50 100 -50 100 -50 N
+X K 1 200 100 100 L 50 50 0 1 P
+X K 2 200 -100 100 L 50 50 0 1 P
+X A 3 -200 0 100 R 50 50 0 1 P
+ENDDRAW
+ENDDEF
+#
+# D_Dual_Series_KAC_Split
+#
+DEF D_Dual_Series_KAC_Split D 0 30 Y N 2 L N
+F0 "D" 0 100 50 H V C CNN
+F1 "D_Dual_Series_KAC_Split" 0 -100 50 H V C CNN
+F2 "" -100 -100 50 H I C CNN
+F3 "" -100 -100 50 H I C CNN
+DRAW
+T 0 -100 50 50 0 2 0 3 Normal 0 C C
+P 2 0 0 10 50 50 50 -50 N
+P 2 2 0 0 50 0 -150 0 N
+P 6 0 1 10 -50 50 50 0 -50 -50 -50 50 -50 50 -50 50 N
+P 2 1 1 0 50 0 -50 0 N
+X A 2 -150 0 100 R 50 50 1 1 P
+X K 3 150 0 100 L 50 50 1 1 P
+X K 1 150 0 100 L 50 50 2 1 P
 ENDDRAW
 ENDDEF
 #
-# D_Schottky_x2_KCom_KAA_Parallel
+# D_Dual_Series_KCA_Parallel
 #
-DEF D_Schottky_x2_KCom_KAA_Parallel D 0 30 Y N 1 F N
+DEF D_Dual_Series_KCA_Parallel D 0 30 Y N 1 F N
 F0 "D" 0 200 50 H V C CNN
-F1 "D_Schottky_x2_KCom_KAA_Parallel" 0 -200 50 H V C CNN
-F2 "" 50 0 50 H I C CNN
-F3 "" 50 0 50 H I C CNN
+F1 "D_Dual_Series_KCA_Parallel" 0 -200 50 H V C CNN
+F2 "" -50 0 50 H I C CNN
+F3 "" -50 0 50 H I C CNN
 DRAW
-C 50 0 10 0 1 0 F
-P 2 0 1 0 50 0 100 0 N
-P 4 0 1 0 -100 -100 50 -100 50 100 -100 100 N
-P 6 0 1 10 -100 -50 0 -100 -100 -150 -100 -50 -100 -50 -100 -50 N
-P 6 0 1 10 -100 150 0 100 -100 50 -100 150 -100 150 -100 150 N
-P 6 0 1 10 20 -60 20 -50 0 -50 0 -150 -20 -150 -20 -140 N
-P 6 0 1 10 20 140 20 150 0 150 0 50 -20 50 -20 60 N
-X A 1 200 0 100 L 50 50 0 1 P
-X K 2 -200 100 100 R 50 50 0 1 P
-X K 3 -200 -100 100 R 50 50 0 1 P
+C -50 0 10 0 1 0 F
+P 2 0 0 10 0 -50 0 -150 N
+P 2 0 0 10 100 150 100 50 N
+P 2 0 1 0 -50 0 -100 0 N
+P 4 0 1 0 100 100 -50 100 -50 -100 100 -100 N
+P 6 0 1 10 0 150 100 100 0 50 0 150 0 150 0 150 N
+P 6 0 1 10 100 -50 0 -100 100 -150 100 -50 100 -50 100 -50 N
+X K 1 200 100 100 L 50 50 0 1 P
+X A 2 -200 0 100 R 50 50 0 1 P
+X K 3 200 -100 100 L 50 50 0 1 P
 ENDDRAW
 ENDDEF
 #
-# D_Schottky_x2_KCom_KAA_Split
+# D_Dual_Series_KCA_Split
 #
-DEF D_Schottky_x2_KCom_KAA_Split D 0 30 Y N 2 L N
+DEF D_Dual_Series_KCA_Split D 0 30 Y N 2 L N
 F0 "D" 0 100 50 H V C CNN
-F1 "D_Schottky_x2_KCom_KAA_Split" 0 -100 50 H V C CNN
+F1 "D_Dual_Series_KCA_Split" 0 -100 50 H V C CNN
 F2 "" -100 -100 50 H I C CNN
 F3 "" -100 -100 50 H I C CNN
 DRAW
-T 0 100 50 50 0 2 0 1 Normal 0 C C
-P 2 2 0 0 150 0 -50 0 N
+T 0 -100 50 50 0 2 0 2 Normal 0 C C
+P 2 0 0 10 50 50 50 -50 N
+P 2 2 0 0 50 0 -150 0 N
 P 6 0 1 10 -50 50 50 0 -50 -50 -50 50 -50 50 -50 50 N
-P 6 0 1 10 70 40 70 50 50 50 50 -50 30 -50 30 -40 N
 P 2 1 1 0 50 0 -50 0 N
-X K 1 150 0 100 L 50 50 1 1 P
-X A 2 -150 0 100 R 50 50 1 1 P
-X K 3 -150 0 100 R 50 50 2 1 P
+X K 2 150 0 100 L 50 50 1 1 P
+X A 3 -150 0 100 R 50 50 1 1 P
+X K 1 150 0 100 L 50 50 2 1 P
 ENDDRAW
 ENDDEF
 #
-# D_Schottky_x2_Serial_ACK
+# D_Filled
 #
-DEF D_Schottky_x2_Serial_ACK D 0 30 Y N 1 F N
-F0 "D" 50 -100 50 H V C CNN
-F1 "D_Schottky_x2_Serial_ACK" 0 100 50 H V C CNN
+DEF D_Filled D 0 40 N N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "D_Filled" 0 -100 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
+$FPLIST
+ TO-???*
+ *_Diode_*
+ *SingleDiode*
+ D_*
+$ENDFPLIST
 DRAW
-C 0 0 10 0 1 0 F
-P 2 0 1 0 0 0 0 -100 N
-P 2 0 1 0 150 0 -150 0 N
-P 2 0 1 0 250 0 300 0 N
-P 3 0 1 10 -50 -50 -50 50 -50 50 N
-P 3 0 1 10 150 50 150 -50 150 -50 N
-P 4 0 1 10 -50 -50 -30 -50 -30 -40 -30 -40 N
-P 4 0 1 10 150 -50 170 -50 170 -40 170 -40 N
-P 4 0 1 10 150 50 130 50 130 40 130 40 N
-P 5 0 1 10 -70 40 -70 50 -50 50 -50 50 -50 50 N
-P 6 0 1 10 -150 50 -50 0 -150 -50 -150 50 -150 50 -150 50 N
-P 6 0 1 10 50 50 150 0 50 -50 50 50 50 50 50 50 N
-X A 1 -300 0 150 R 50 50 0 1 P
-X common 2 0 -200 100 U 50 50 0 1 P
-X K 3 300 0 150 L 50 50 0 1 P
+P 2 0 1 10 -50 50 -50 -50 N
+P 2 0 1 0 50 0 -50 0 N
+P 4 0 1 10 50 50 50 -50 -50 0 50 50 F
+X K 1 -150 0 100 R 50 50 1 1 P
+X A 2 150 0 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# D_Schottky_x2_Serial_AKC
-#
-DEF D_Schottky_x2_Serial_AKC D 0 30 Y N 1 F N
-F0 "D" 50 -100 50 H V C CNN
-F1 "D_Schottky_x2_Serial_AKC" 0 100 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-DRAW
-C 0 0 10 0 1 0 F
-P 2 0 1 0 -150 0 150 0 N
-P 2 0 1 0 0 0 0 -100 N
-P 2 0 1 0 250 0 300 0 N
-P 3 0 1 10 -50 -50 -50 50 -50 50 N
-P 3 0 1 10 150 50 150 -50 150 -50 N
-P 4 0 1 10 -50 -50 -30 -50 -30 -40 -30 -40 N
-P 4 0 1 10 150 -50 170 -50 170 -40 170 -40 N
-P 4 0 1 10 150 50 130 50 130 40 130 40 N
-P 5 0 1 10 -70 40 -70 50 -50 50 -50 50 -50 50 N
-P 6 0 1 10 -150 50 -50 0 -150 -50 -150 50 -150 50 -150 50 N
-P 6 0 1 10 50 50 150 0 50 -50 50 50 50 50 50 50 N
-X A 1 -300 0 150 R 50 50 0 1 P
-X K 2 300 0 150 L 50 50 0 1 P
-X common 3 0 -200 100 U 50 50 0 1 P
-ENDDRAW
-ENDDEF
-#
-# D_Schottky_x2_Serial_CAK
+# D_KAA
 #
-DEF D_Schottky_x2_Serial_CAK D 0 30 Y N 1 F N
-F0 "D" 50 -100 50 H V C CNN
-F1 "D_Schottky_x2_Serial_CAK" 0 100 50 H V C CNN
+DEF D_KAA D 0 0 Y N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "D_KAA" 0 -100 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
+$FPLIST
+ TO-???*
+ *_Diode_*
+ *SingleDiode*
+ D_*
+$ENDFPLIST
 DRAW
-C 0 0 10 0 1 0 F
-P 2 0 1 0 -150 0 150 0 N
-P 2 0 1 0 0 0 0 -100 N
-P 3 0 1 10 -50 -50 -50 50 -50 50 N
-P 3 0 1 10 150 50 150 -50 150 -50 N
-P 4 0 1 10 -50 -50 -30 -50 -30 -40 -30 -40 N
-P 4 0 1 10 150 -50 170 -50 170 -40 170 -40 N
-P 4 0 1 10 150 50 130 50 130 40 130 40 N
-P 5 0 1 10 -70 40 -70 50 -50 50 -50 50 -50 50 N
-P 6 0 1 10 -150 50 -50 0 -150 -50 -150 50 -150 50 -150 50 N
-P 6 0 1 10 50 50 150 0 50 -50 50 50 50 50 50 50 N
-X common 1 0 -200 100 U 50 50 0 1 P
-X A 2 -300 0 150 R 50 50 0 1 P
-X K 3 300 0 150 L 50 50 0 1 P
+C 100 0 10 0 1 0 F
+P 2 0 1 10 -50 50 -50 -50 N
+P 4 0 1 10 50 50 50 -50 -50 0 50 50 N
+P 4 0 1 0 150 100 100 100 100 0 -50 0 N
+X K 1 -150 0 100 R 50 50 1 1 P
+X A 2 200 100 100 L 50 50 1 1 I
+X A 3 200 0 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# D_Schottky_x2_Serial_CKA
+# D_KAK
 #
-DEF D_Schottky_x2_Serial_CKA D 0 30 Y N 1 F N
-F0 "D" 50 -100 50 H V C CNN
-F1 "D_Schottky_x2_Serial_CKA" 0 100 50 H V C CNN
+DEF D_KAK D 0 0 Y N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "D_KAK" 0 -100 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
+$FPLIST
+ TO-???*
+ *_Diode_*
+ *SingleDiode*
+ D_*
+$ENDFPLIST
 DRAW
-C 0 0 10 0 1 0 F
-P 2 0 1 0 -150 0 150 0 N
-P 2 0 1 0 0 0 0 -100 N
-P 3 0 1 10 -50 -50 -50 50 -50 50 N
-P 3 0 1 10 150 50 150 -50 150 -50 N
-P 4 0 1 10 -50 -50 -30 -50 -30 -40 -30 -40 N
-P 4 0 1 10 150 -50 170 -50 170 -40 170 -40 N
-P 4 0 1 10 150 50 130 50 130 40 130 40 N
-P 5 0 1 10 -70 40 -70 50 -50 50 -50 50 -50 50 N
-P 6 0 1 10 -150 50 -50 0 -150 -50 -150 50 -150 50 -150 50 N
-P 6 0 1 10 50 50 150 0 50 -50 50 50 50 50 50 50 N
-X common 1 0 -200 100 U 50 50 0 1 P
-X K 2 300 0 150 L 50 50 0 1 P
-X A 3 -300 0 150 R 50 50 0 1 P
+C -150 0 10 0 1 0 F
+P 2 0 1 10 -50 50 -50 -50 N
+P 3 0 1 0 -150 100 -150 0 100 0 N
+P 4 0 1 10 50 50 50 -50 -50 0 50 50 N
+X K 1 -250 100 100 R 50 50 1 1 P
+X A 2 200 0 100 L 50 50 1 1 P
+X K 3 -250 0 100 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# D_Schottky_x2_Serial_KAC
+# D_KKA
 #
-DEF D_Schottky_x2_Serial_KAC D 0 30 Y N 1 F N
-F0 "D" 50 -100 50 H V C CNN
-F1 "D_Schottky_x2_Serial_KAC" 0 100 50 H V C CNN
+DEF D_KKA D 0 0 Y N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "D_KKA" 0 -100 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
+$FPLIST
+ TO-???*
+ *_Diode_*
+ *SingleDiode*
+ D_*
+$ENDFPLIST
 DRAW
-C 0 0 10 0 1 0 F
-P 2 0 1 0 -150 0 150 0 N
-P 2 0 1 0 0 0 0 -100 N
-P 3 0 1 10 -50 -50 -50 50 -50 50 N
-P 3 0 1 10 150 50 150 -50 150 -50 N
-P 4 0 1 10 -50 -50 -30 -50 -30 -40 -30 -40 N
-P 4 0 1 10 150 -50 170 -50 170 -40 170 -40 N
-P 4 0 1 10 150 50 130 50 130 40 130 40 N
-P 5 0 1 10 -70 40 -70 50 -50 50 -50 50 -50 50 N
-P 6 0 1 10 -150 50 -50 0 -150 -50 -150 50 -150 50 -150 50 N
-P 6 0 1 10 50 50 150 0 50 -50 50 50 50 50 50 50 N
-X K 1 300 0 150 L 50 50 0 1 P
-X A 2 -300 0 150 R 50 50 0 1 P
-X common 3 0 -200 100 U 50 50 0 1 P
+C -150 0 10 0 1 0 F
+P 2 0 1 10 -50 50 -50 -50 N
+P 4 0 1 0 -200 100 -150 100 -150 0 100 0 N
+P 4 0 1 10 50 50 50 -50 -50 0 50 50 N
+X K 1 -250 100 100 R 50 50 1 1 I
+X K 2 -250 0 100 R 50 50 1 1 P
+X A 3 200 0 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# D_Schottky_x2_Serial_KCA
+# D_Laser_1A3C
 #
-DEF D_Schottky_x2_Serial_KCA D 0 30 Y N 1 F N
-F0 "D" 50 -100 50 H V C CNN
-F1 "D_Schottky_x2_Serial_KCA" 0 100 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
+DEF D_Laser_1A3C LD 0 40 Y N 1 F N
+F0 "LD" -50 175 50 H V C CNN
+F1 "D_Laser_1A3C" -50 -100 50 H V C CNN
+F2 "" -100 -25 50 H I C CNN
+F3 "" 30 -200 50 H I C CNN
+$FPLIST
+ *LaserDiode*
+$ENDFPLIST
 DRAW
-C 0 0 10 0 1 0 F
-P 2 0 1 0 -150 0 150 0 N
-P 2 0 1 0 0 0 0 -100 N
-P 2 0 1 0 250 0 300 0 N
-P 3 0 1 10 -50 -50 -50 50 -50 50 N
-P 3 0 1 10 150 50 150 -50 150 -50 N
-P 4 0 1 10 -50 -50 -30 -50 -30 -40 -30 -40 N
-P 4 0 1 10 150 -50 170 -50 170 -40 170 -40 N
-P 4 0 1 10 150 50 130 50 130 40 130 40 N
-P 5 0 1 10 -70 40 -70 50 -50 50 -50 50 -50 50 N
-P 6 0 1 10 -150 50 -50 0 -150 -50 -150 50 -150 50 -150 50 N
-P 6 0 1 10 50 50 150 0 50 -50 50 50 50 50 50 50 N
-X K 1 300 0 150 L 50 50 0 1 P
-X common 2 0 -200 100 U 50 50 0 1 P
-X A 3 -300 0 150 R 50 50 0 1 P
+P 2 0 1 0 -160 50 -100 110 N
+P 2 0 1 0 -160 70 -100 90 N
+P 2 0 1 0 -160 90 -100 70 N
+P 2 0 1 0 -160 110 -100 50 N
+P 2 0 1 0 -140 110 -120 50 N
+P 2 0 1 0 -130 80 -130 40 N
+P 2 0 1 0 -130 80 -130 120 N
+P 2 0 1 0 -120 110 -140 50 N
+P 2 0 1 0 -70 80 -170 80 N
+P 2 0 1 8 -60 50 -60 -50 N
+P 2 0 1 0 50 120 30 120 N
+P 2 0 1 0 100 0 -200 0 N
+P 3 0 1 0 -10 60 50 120 50 100 N
+P 4 0 1 8 40 50 40 -50 -60 0 40 50 N
+P 5 0 1 0 -60 60 0 120 0 100 0 120 -20 120 N
+X A 1 200 0 100 L 50 50 1 1 P
+X K 3 -300 0 100 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# D_Schottky_x2_Series_ACK_Parallel
+# D_Laser_1C2A
 #
-DEF D_Schottky_x2_Series_ACK_Parallel D 0 30 Y N 1 F N
-F0 "D" 0 200 50 H V C CNN
-F1 "D_Schottky_x2_Series_ACK_Parallel" 0 -200 50 H V C CNN
-F2 "" -50 0 50 H I C CNN
-F3 "" -50 0 50 H I C CNN
+DEF D_Laser_1C2A LD 0 40 Y N 1 F N
+F0 "LD" -50 175 50 H V C CNN
+F1 "D_Laser_1C2A" -50 -100 50 H V C CNN
+F2 "" -100 -25 50 H I C CNN
+F3 "" 30 -200 50 H I C CNN
+$FPLIST
+ *LaserDiode*
+$ENDFPLIST
 DRAW
-C -50 0 10 0 1 0 F
-P 2 0 1 0 -50 0 -100 0 N
-P 4 0 1 0 100 100 -50 100 -50 -100 100 -100 N
-P 6 0 1 10 -20 -60 -20 -50 0 -50 0 -150 20 -150 20 -140 N
-P 6 0 1 10 0 150 100 100 0 50 0 150 0 150 0 150 N
-P 6 0 1 10 100 -50 0 -100 100 -150 100 -50 100 -50 100 -50 N
-P 6 0 1 10 120 140 120 150 100 150 100 50 80 50 80 60 N
-X K 1 200 -100 100 L 50 50 0 1 P
-X A 2 -200 0 100 R 50 50 0 1 P
-X K 3 200 100 100 L 50 50 0 1 P
+P 2 0 1 0 -160 50 -100 110 N
+P 2 0 1 0 -160 70 -100 90 N
+P 2 0 1 0 -160 90 -100 70 N
+P 2 0 1 0 -160 110 -100 50 N
+P 2 0 1 0 -140 110 -120 50 N
+P 2 0 1 0 -130 80 -130 40 N
+P 2 0 1 0 -130 80 -130 120 N
+P 2 0 1 0 -120 110 -140 50 N
+P 2 0 1 0 -70 80 -170 80 N
+P 2 0 1 8 -60 50 -60 -50 N
+P 2 0 1 0 50 120 30 120 N
+P 2 0 1 0 100 0 -200 0 N
+P 3 0 1 0 -10 60 50 120 50 100 N
+P 4 0 1 8 40 50 40 -50 -60 0 40 50 N
+P 5 0 1 0 -60 60 0 120 0 100 0 120 -20 120 N
+X K 1 -300 0 100 R 50 50 1 1 P
+X A 2 200 0 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# D_Schottky_x2_Series_ACK_Split
+# D_Laser_Photo_MType
 #
-DEF D_Schottky_x2_Series_ACK_Split D 0 30 Y N 2 L N
-F0 "D" 0 100 50 H V C CNN
-F1 "D_Schottky_x2_Series_ACK_Split" 0 -100 50 H V C CNN
-F2 "" -100 -100 50 H I C CNN
-F3 "" -100 -100 50 H I C CNN
+DEF D_Laser_Photo_MType LD 0 20 Y N 1 F N
+F0 "LD" 40 280 50 H V C CNN
+F1 "D_Laser_Photo_MType" 40 -220 50 H V C CNN
+F2 "" 40 75 50 H I C CNN
+F3 "" 90 -100 50 H I C CNN
+$FPLIST
+ *LaserDiode*
+$ENDFPLIST
 DRAW
-T 0 -100 50 50 0 2 0 2 Normal 0 C C
-P 2 2 0 0 50 0 -150 0 N
-P 6 0 1 10 -50 50 50 0 -50 -50 -50 50 -50 50 -50 50 N
-P 6 0 1 10 70 40 70 50 50 50 50 -50 30 -50 30 -40 N
-P 2 1 1 0 50 0 -50 0 N
-X A 1 -150 0 100 R 50 50 1 1 P
-X K 2 150 0 100 L 50 50 1 1 P
-X K 3 150 0 100 L 50 50 2 1 P
+A -20 -63 7 -899 899 0 1 0 N -20 -70 -20 -55
+A 0 -70 15 -899 899 0 1 0 N 0 -85 0 -55
+A 0 65 15 -899 899 0 1 0 N 0 50 0 80
+C -60 0 10 0 1 0 F
+S 170 240 -90 -170 0 1 10 f
+P 2 0 1 0 -100 0 -60 0 N
+P 2 0 1 0 -60 150 0 210 N
+P 2 0 1 0 -60 170 0 190 N
+P 2 0 1 0 -60 190 0 170 N
+P 2 0 1 0 -60 210 0 150 N
+P 2 0 1 0 -40 210 -20 150 N
+P 2 0 1 0 -30 180 -30 140 N
+P 2 0 1 0 -30 180 -30 220 N
+P 2 0 1 0 -25 -55 -25 -85 N
+P 2 0 1 0 -20 210 -40 150 N
+P 2 0 1 0 0 -55 0 -85 N
+P 2 0 1 0 0 80 0 50 N
+P 2 0 1 0 30 180 -70 180 N
+P 2 0 1 8 40 -50 40 -150 N
+P 2 0 1 0 40 -30 60 -30 N
+P 2 0 1 8 40 150 40 50 N
+P 2 0 1 0 150 220 130 220 N
+P 3 0 1 0 -25 80 -25 50 -10 50 N
+P 3 0 1 0 90 160 150 220 150 200 N
+P 3 0 1 0 100 30 40 -30 40 -10 N
+P 4 0 1 8 140 -50 140 -150 40 -100 140 -50 N
+P 4 0 1 8 140 150 140 50 40 100 140 150 N
+P 4 0 1 0 200 100 -60 100 -60 -100 200 -100 N
+P 5 0 1 0 40 160 100 220 100 200 100 220 80 220 N
+P 5 0 1 0 150 30 90 -30 90 -10 90 -30 110 -30 N
+X ~ 1 300 100 100 L 50 50 1 1 P
+X ~ 2 -200 0 100 R 50 50 1 1 P
+X ~ 3 300 -100 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# D_Schottky_x2_Series_AKC_Parallel
+# D_Laser_Photo_NType
 #
-DEF D_Schottky_x2_Series_AKC_Parallel D 0 30 Y N 1 F N
-F0 "D" 0 200 50 H V C CNN
-F1 "D_Schottky_x2_Series_AKC_Parallel" 0 -200 50 H V C CNN
-F2 "" -50 0 50 H I C CNN
-F3 "" -50 0 50 H I C CNN
+DEF D_Laser_Photo_NType LD 0 20 Y N 1 F N
+F0 "LD" 40 280 50 H V C CNN
+F1 "D_Laser_Photo_NType" 40 -220 50 H V C CNN
+F2 "" 0 75 50 H I C CNN
+F3 "" 50 -100 50 H I C CNN
+$FPLIST
+ *LaserDiode*
+$ENDFPLIST
 DRAW
-C -50 0 10 0 1 0 F
-P 2 0 1 0 -50 0 -100 0 N
-P 4 0 1 0 100 100 -50 100 -50 -100 100 -100 N
-P 6 0 1 10 -20 -60 -20 -50 0 -50 0 -150 20 -150 20 -140 N
-P 6 0 1 10 0 150 100 100 0 50 0 150 0 150 0 150 N
-P 6 0 1 10 100 -50 0 -100 100 -150 100 -50 100 -50 100 -50 N
-P 6 0 1 10 120 140 120 150 100 150 100 50 80 50 80 60 N
-X K 1 200 -100 100 L 50 50 0 1 P
-X K 2 200 100 100 L 50 50 0 1 P
-X A 3 -200 0 100 R 50 50 0 1 P
+A -20 -63 7 -899 899 0 1 0 N -20 -70 -20 -55
+A 0 -70 15 -899 899 0 1 0 N 0 -85 0 -55
+A 0 65 15 -899 899 0 1 0 N 0 50 0 80
+C -60 0 10 0 1 0 F
+S 170 240 -90 -170 0 1 10 f
+P 2 0 1 0 -100 0 -60 0 N
+P 2 0 1 0 -60 150 0 210 N
+P 2 0 1 0 -60 170 0 190 N
+P 2 0 1 0 -60 190 0 170 N
+P 2 0 1 0 -60 210 0 150 N
+P 2 0 1 0 -40 210 -20 150 N
+P 2 0 1 0 -30 180 -30 140 N
+P 2 0 1 0 -30 180 -30 220 N
+P 2 0 1 0 -25 -55 -25 -85 N
+P 2 0 1 0 -20 210 -40 150 N
+P 2 0 1 0 0 -55 0 -85 N
+P 2 0 1 0 0 80 0 50 N
+P 2 0 1 0 30 180 -70 180 N
+P 2 0 1 0 30 220 50 220 N
+P 2 0 1 8 40 -50 40 -150 N
+P 2 0 1 0 40 -30 60 -30 N
+P 2 0 1 8 140 150 140 50 N
+P 3 0 1 0 -25 80 -25 50 -10 50 N
+P 3 0 1 0 90 160 30 220 30 200 N
+P 3 0 1 0 100 30 40 -30 40 -10 N
+P 4 0 1 8 140 -50 140 -150 40 -100 140 -50 N
+P 4 0 1 0 200 100 -60 100 -60 -100 200 -100 N
+P 5 0 1 0 140 160 80 220 80 200 80 220 100 220 N
+P 5 0 1 0 150 30 90 -30 90 -10 90 -30 110 -30 N
+P 4 1 1 8 40 150 40 50 140 100 40 150 N
+X ~ 1 300 100 100 L 50 50 1 1 P
+X ~ 2 -200 0 100 R 50 50 1 1 P
+X ~ 3 300 -100 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# D_Schottky_x2_Series_AKC_Split
+# D_Laser_Photo_PType
 #
-DEF D_Schottky_x2_Series_AKC_Split D 0 30 Y N 2 L N
-F0 "D" 0 100 50 H V C CNN
-F1 "D_Schottky_x2_Series_AKC_Split" 0 -100 50 H V C CNN
-F2 "" -100 -100 50 H I C CNN
-F3 "" -100 -100 50 H I C CNN
+DEF D_Laser_Photo_PType LD 0 20 Y N 1 F N
+F0 "LD" 40 280 50 H V C CNN
+F1 "D_Laser_Photo_PType" 40 -220 50 H V C CNN
+F2 "" 0 75 50 H I C CNN
+F3 "" 130 -100 50 H I C CNN
+$FPLIST
+ *LaserDiode*
+$ENDFPLIST
 DRAW
-T 0 -100 50 50 0 2 0 3 Normal 0 C C
-P 2 2 0 0 50 0 -150 0 N
-P 6 0 1 10 -50 50 50 0 -50 -50 -50 50 -50 50 -50 50 N
-P 6 0 1 10 70 40 70 50 50 50 50 -50 30 -50 30 -40 N
-P 2 1 1 0 50 0 -50 0 N
-X A 1 -150 0 100 R 50 50 1 1 P
-X K 3 150 0 100 L 50 50 1 1 P
-X K 2 150 0 100 L 50 50 2 1 P
+A -20 -63 7 -899 899 0 1 0 N -20 -70 -20 -55
+A 0 -70 15 -899 899 0 1 0 N 0 -85 0 -55
+A 0 65 15 -899 899 0 1 0 N 0 50 0 80
+C -60 0 10 0 1 0 F
+S 170 240 -90 -170 0 1 10 f
+P 2 0 1 0 -100 0 -60 0 N
+P 2 0 1 0 -60 150 0 210 N
+P 2 0 1 0 -60 170 0 190 N
+P 2 0 1 0 -60 190 0 170 N
+P 2 0 1 0 -60 210 0 150 N
+P 2 0 1 0 -40 210 -20 150 N
+P 2 0 1 0 -30 180 -30 140 N
+P 2 0 1 0 -30 180 -30 220 N
+P 2 0 1 0 -25 -55 -25 -85 N
+P 2 0 1 0 -20 210 -40 150 N
+P 2 0 1 0 0 -55 0 -85 N
+P 2 0 1 0 0 80 0 50 N
+P 2 0 1 0 30 180 -70 180 N
+P 2 0 1 8 40 150 40 50 N
+P 2 0 1 8 140 -50 140 -150 N
+P 2 0 1 0 140 -30 120 -30 N
+P 2 0 1 0 150 220 130 220 N
+P 3 0 1 0 -25 80 -25 50 -10 50 N
+P 3 0 1 0 80 30 140 -30 140 -10 N
+P 3 0 1 0 90 160 150 220 150 200 N
+P 4 0 1 8 40 -50 40 -150 140 -100 40 -50 N
+P 4 0 1 8 140 150 140 50 40 100 140 150 N
+P 4 0 1 0 200 100 -60 100 -60 -100 200 -100 N
+P 5 0 1 0 30 30 90 -30 90 -10 90 -30 70 -30 N
+P 5 0 1 0 40 160 100 220 100 200 100 220 80 220 N
+X ~ 1 300 100 100 L 50 50 1 1 P
+X ~ 2 -200 0 100 R 50 50 1 1 P
+X ~ 3 300 -100 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# D_Schottky_x2_Series_CAK_Parallel
+# D_Photo
 #
-DEF D_Schottky_x2_Series_CAK_Parallel D 0 30 Y N 1 F N
-F0 "D" 0 200 50 H V C CNN
-F1 "D_Schottky_x2_Series_CAK_Parallel" 0 -200 50 H V C CNN
+DEF D_Photo D 0 20 N N 1 F N
+F0 "D" 20 70 50 H V L CNN
+F1 "D_Photo" -40 -110 50 H V C CNN
 F2 "" -50 0 50 H I C CNN
 F3 "" -50 0 50 H I C CNN
 DRAW
-C -50 0 10 0 1 0 F
-P 2 0 1 0 -50 0 -100 0 N
-P 4 0 1 0 100 100 -50 100 -50 -100 100 -100 N
-P 6 0 1 10 -20 -60 -20 -50 0 -50 0 -150 20 -150 20 -140 N
-P 6 0 1 10 0 150 100 100 0 50 0 150 0 150 0 150 N
-P 6 0 1 10 100 -50 0 -100 100 -150 100 -50 100 -50 100 -50 N
-P 6 0 1 10 120 140 120 150 100 150 100 50 80 50 80 60 N
-X A 1 -200 0 100 R 50 50 0 1 P
-X K 2 200 -100 100 L 50 50 0 1 P
-X K 3 200 100 100 L 50 50 0 1 P
-ENDDRAW
-ENDDEF
-#
-# D_Schottky_x2_Series_CAK_Split
-#
-DEF D_Schottky_x2_Series_CAK_Split D 0 30 Y N 2 L N
-F0 "D" 0 100 50 H V C CNN
-F1 "D_Schottky_x2_Series_CAK_Split" 0 -100 50 H V C CNN
-F2 "" -100 -100 50 H I C CNN
-F3 "" -100 -100 50 H I C CNN
-DRAW
-T 0 -100 50 50 0 2 0 1 Normal 0 C C
-P 2 2 0 0 50 0 -150 0 N
-P 6 0 1 10 -50 50 50 0 -50 -50 -50 50 -50 50 -50 50 N
-P 6 0 1 10 70 40 70 50 50 50 50 -50 30 -50 30 -40 N
-P 2 1 1 0 50 0 -50 0 N
-X K 1 150 0 100 L 50 50 1 1 P
-X A 2 -150 0 100 R 50 50 1 1 P
-X K 3 150 0 100 L 50 50 2 1 P
+P 2 0 1 10 -100 50 -100 -50 N
+P 2 0 1 0 -80 70 -60 70 N
+P 2 0 1 0 0 0 -100 0 N
+P 3 0 1 0 -20 130 -80 70 -80 90 N
+P 4 0 1 10 0 -50 0 50 -100 0 0 -50 N
+P 5 0 1 0 30 130 -30 70 -30 90 -30 70 -10 70 N
+X K 1 -200 0 100 R 50 50 1 1 P
+X A 2 100 0 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# D_Schottky_x2_Series_CKA_Parallel
+# D_Photo_Filled
 #
-DEF D_Schottky_x2_Series_CKA_Parallel D 0 30 Y N 1 F N
-F0 "D" 0 200 50 H V C CNN
-F1 "D_Schottky_x2_Series_CKA_Parallel" 0 -200 50 H V C CNN
+DEF D_Photo_Filled D 0 20 N N 1 F N
+F0 "D" 20 70 50 H V L CNN
+F1 "D_Photo_Filled" -40 -110 50 H V C CNN
 F2 "" -50 0 50 H I C CNN
 F3 "" -50 0 50 H I C CNN
 DRAW
-C -50 0 10 0 1 0 F
-P 2 0 1 0 -50 0 -100 0 N
-P 4 0 1 0 100 100 -50 100 -50 -100 100 -100 N
-P 6 0 1 10 -20 -60 -20 -50 0 -50 0 -150 20 -150 20 -140 N
-P 6 0 1 10 0 150 100 100 0 50 0 150 0 150 0 150 N
-P 6 0 1 10 100 -50 0 -100 100 -150 100 -50 100 -50 100 -50 N
-P 6 0 1 10 120 140 120 150 100 150 100 50 80 50 80 60 N
-X A 1 -200 0 100 R 50 50 0 1 P
-X K 2 200 100 100 L 50 50 0 1 P
-X K 3 200 -100 100 L 50 50 0 1 P
-ENDDRAW
-ENDDEF
-#
-# D_Schottky_x2_Series_CKA_Split
-#
-DEF D_Schottky_x2_Series_CKA_Split D 0 30 Y N 2 L N
-F0 "D" 0 100 50 H V C CNN
-F1 "D_Schottky_x2_Series_CKA_Split" 0 -100 50 H V C CNN
-F2 "" -100 -100 50 H I C CNN
-F3 "" -100 -100 50 H I C CNN
-DRAW
-T 0 -100 50 50 0 2 0 1 Normal 0 C C
-P 2 2 0 0 50 0 -150 0 N
-P 6 0 1 10 -50 50 50 0 -50 -50 -50 50 -50 50 -50 50 N
-P 6 0 1 10 70 40 70 50 50 50 50 -50 30 -50 30 -40 N
-P 2 1 1 0 50 0 -50 0 N
-X K 1 150 0 100 L 50 50 1 1 P
-X A 3 -150 0 100 R 50 50 1 1 P
-X K 2 150 0 100 L 50 50 2 1 P
+P 2 0 1 10 -100 50 -100 -50 N
+P 2 0 1 0 -80 70 -60 70 N
+P 2 0 1 0 0 0 -100 0 N
+P 3 0 1 0 -20 130 -80 70 -80 90 N
+P 4 0 1 10 0 -50 0 50 -100 0 0 -50 F
+P 5 0 1 0 30 130 -30 70 -30 90 -30 70 -10 70 N
+X K 1 -200 0 100 R 50 50 1 1 P
+X A 2 100 0 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# D_Schottky_x2_Series_KAC_Parallel
+# D_Radiation
 #
-DEF D_Schottky_x2_Series_KAC_Parallel D 0 30 Y N 1 F N
-F0 "D" 0 200 50 H V C CNN
-F1 "D_Schottky_x2_Series_KAC_Parallel" 0 -200 50 H V C CNN
+DEF D_Radiation D 0 40 N N 1 F N
+F0 "D" -50 -90 50 H V C CNN
+F1 "D_Radiation" -50 -160 50 H V C CNN
 F2 "" -50 0 50 H I C CNN
 F3 "" -50 0 50 H I C CNN
 DRAW
-C -50 0 10 0 1 0 F
-P 2 0 1 0 -50 0 -100 0 N
-P 4 0 1 0 100 100 -50 100 -50 -100 100 -100 N
-P 6 0 1 10 -20 -60 -20 -50 0 -50 0 -150 20 -150 20 -140 N
-P 6 0 1 10 0 150 100 100 0 50 0 150 0 150 0 150 N
-P 6 0 1 10 100 -50 0 -100 100 -150 100 -50 100 -50 100 -50 N
-P 6 0 1 10 120 140 120 150 100 150 100 50 80 50 80 60 N
-X K 1 200 100 100 L 50 50 0 1 P
-X K 2 200 -100 100 L 50 50 0 1 P
-X A 3 -200 0 100 R 50 50 0 1 P
-ENDDRAW
-ENDDEF
-#
-# D_Schottky_x2_Series_KAC_Split
-#
-DEF D_Schottky_x2_Series_KAC_Split D 0 30 Y N 2 L N
-F0 "D" 0 100 50 H V C CNN
-F1 "D_Schottky_x2_Series_KAC_Split" 0 -100 50 H V C CNN
-F2 "" -100 -100 50 H I C CNN
-F3 "" -100 -100 50 H I C CNN
-DRAW
-T 0 -100 50 50 0 2 0 3 Normal 0 C C
-P 2 2 0 0 50 0 -150 0 N
-P 6 0 1 10 -50 50 50 0 -50 -50 -50 50 -50 50 -50 50 N
-P 6 0 1 10 70 40 70 50 50 50 50 -50 30 -50 30 -40 N
-P 2 1 1 0 50 0 -50 0 N
-X A 2 -150 0 100 R 50 50 1 1 P
-X K 3 150 0 100 L 50 50 1 1 P
-X K 1 150 0 100 L 50 50 2 1 P
+A -30 130 22 634 -1534 0 1 0 N -20 150 -50 120
+A -10 170 22 -1166 266 0 1 0 N -20 150 10 180
+A 10 110 22 634 -1534 0 1 0 N 20 130 -10 100
+A 30 150 22 -1166 266 0 1 0 N 20 130 50 160
+A 30 190 22 -1534 634 0 1 0 N 10 180 40 210
+A 70 170 22 -1534 634 0 1 0 N 50 160 80 190
+P 2 0 1 10 -100 50 -100 -50 N
+P 2 0 1 0 -80 90 -50 90 N
+P 2 0 1 0 -80 90 -50 120 N
+P 2 0 1 0 -80 120 -80 90 N
+P 2 0 1 0 -40 70 -10 70 N
+P 2 0 1 0 -40 70 -10 100 N
+P 2 0 1 0 -40 100 -40 70 N
+P 2 0 1 0 0 0 -100 0 N
+P 4 0 1 10 0 50 0 -50 -100 0 0 50 N
+X K 1 -200 0 100 R 50 50 1 1 P
+X A 2 100 0 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# D_Schottky_x2_Series_KCA_Parallel
+# D_Radiation_Filled
 #
-DEF D_Schottky_x2_Series_KCA_Parallel D 0 30 Y N 1 F N
-F0 "D" 0 200 50 H V C CNN
-F1 "D_Schottky_x2_Series_KCA_Parallel" 0 -200 50 H V C CNN
+DEF D_Radiation_Filled D 0 40 N N 1 F N
+F0 "D" -50 -90 50 H V C CNN
+F1 "D_Radiation_Filled" -50 -160 50 H V C CNN
 F2 "" -50 0 50 H I C CNN
 F3 "" -50 0 50 H I C CNN
 DRAW
-C -50 0 10 0 1 0 F
-P 2 0 1 0 -50 0 -100 0 N
-P 4 0 1 0 100 100 -50 100 -50 -100 100 -100 N
-P 6 0 1 10 -20 -60 -20 -50 0 -50 0 -150 20 -150 20 -140 N
-P 6 0 1 10 0 150 100 100 0 50 0 150 0 150 0 150 N
-P 6 0 1 10 100 -50 0 -100 100 -150 100 -50 100 -50 100 -50 N
-P 6 0 1 10 120 140 120 150 100 150 100 50 80 50 80 60 N
-X K 1 200 100 100 L 50 50 0 1 P
-X A 2 -200 0 100 R 50 50 0 1 P
-X K 3 200 -100 100 L 50 50 0 1 P
-ENDDRAW
-ENDDEF
-#
-# D_Schottky_x2_Series_KCA_Split
-#
-DEF D_Schottky_x2_Series_KCA_Split D 0 30 Y N 2 L N
-F0 "D" 0 100 50 H V C CNN
-F1 "D_Schottky_x2_Series_KCA_Split" 0 -100 50 H V C CNN
-F2 "" -100 -100 50 H I C CNN
-F3 "" -100 -100 50 H I C CNN
-DRAW
-T 0 -100 50 50 0 2 0 2 Normal 0 C C
-P 2 2 0 0 50 0 -150 0 N
-P 6 0 1 10 -50 50 50 0 -50 -50 -50 50 -50 50 -50 50 N
-P 6 0 1 10 70 40 70 50 50 50 50 -50 30 -50 30 -40 N
-P 2 1 1 0 50 0 -50 0 N
-X K 2 150 0 100 L 50 50 1 1 P
-X A 3 -150 0 100 R 50 50 1 1 P
-X K 1 150 0 100 L 50 50 2 1 P
-ENDDRAW
-ENDDEF
-#
-# D_Shockley
-#
-DEF D_Shockley D 0 40 N N 1 F N
-F0 "D" 0 100 50 H V C CNN
-F1 "D_Shockley" 0 -100 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- TO-???*
- *_Diode_*
- *SingleDiode*
- D_*
-$ENDFPLIST
-DRAW
-P 2 0 1 0 -50 0 50 0 N
-P 2 0 1 10 -50 50 -50 -50 N
-P 3 0 1 10 -50 0 50 50 50 -50 N
-X K 1 -150 0 100 R 50 50 1 1 P
-X A 2 150 0 100 L 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# D_SiPM
-#
-DEF D_SiPM D 0 20 N N 1 F N
-F0 "D" 70 70 50 H V L CNN
-F1 "D_SiPM" 10 -110 50 H V C CNN
-F2 "" 50 175 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- MPPC*
-$ENDFPLIST
-DRAW
-P 2 0 1 0 -50 0 50 0 N
-P 2 0 1 10 -50 50 -50 -50 N
-P 2 0 1 0 -30 70 -10 70 N
-P 2 0 1 10 50 50 50 -50 N
-P 3 0 1 0 30 130 -30 70 -30 90 N
-P 3 0 1 10 50 50 -50 0 50 -50 N
-P 5 0 1 0 80 130 20 70 20 90 20 70 40 70 N
-X K 1 -150 0 100 R 50 50 1 1 P
-X A 2 150 0 100 L 50 50 1 1 P
+A -30 130 22 634 -1534 0 1 0 N -20 150 -50 120
+A -10 170 22 -1166 266 0 1 0 N -20 150 10 180
+A 10 110 22 634 -1534 0 1 0 N 20 130 -10 100
+A 30 150 22 -1166 266 0 1 0 N 20 130 50 160
+A 30 190 22 -1534 634 0 1 0 N 10 180 40 210
+A 70 170 22 -1534 634 0 1 0 N 50 160 80 190
+P 2 0 1 10 -100 50 -100 -50 N
+P 2 0 1 0 -80 90 -50 90 N
+P 2 0 1 0 -80 90 -50 120 N
+P 2 0 1 0 -80 120 -80 90 N
+P 2 0 1 0 -40 70 -10 70 N
+P 2 0 1 0 -40 70 -10 100 N
+P 2 0 1 0 -40 100 -40 70 N
+P 2 0 1 0 0 0 -100 0 N
+P 4 0 1 10 0 50 0 -50 -100 0 0 50 F
+X K 1 -200 0 100 R 50 50 1 1 P
+X A 2 100 0 100 L 50 50 1 1 P
 ENDDRAW
-ENDDEF
-#
-# D_Small
-#
-DEF D_Small D 0 10 N N 1 F N
-F0 "D" -50 80 50 H V L CNN
-F1 "D_Small" -150 -80 50 H V L CNN
-F2 "" 0 0 50 V I C CNN
-F3 "" 0 0 50 V I C CNN
+ENDDEF
+#
+# D_Schottky
+#
+DEF D_Schottky D 0 40 N N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "D_Schottky" 0 -100 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
 $FPLIST
  TO-???*
  *_Diode_*
@@ -2353,21 +2231,21 @@ $FPLIST
  D_*
 $ENDFPLIST
 DRAW
-P 2 0 1 10 -30 -40 -30 40 N
-P 2 0 1 0 -30 0 30 0 N
-P 4 0 1 10 30 -40 -30 0 30 40 30 -40 N
-X K 1 -100 0 70 R 50 50 1 1 P
-X A 2 100 0 70 L 50 50 1 1 P
+P 2 0 1 0 50 0 -50 0 N
+P 4 0 1 10 50 50 50 -50 -50 0 50 50 N
+P 6 0 1 10 -75 25 -75 50 -50 50 -50 -50 -25 -50 -25 -25 N
+X K 1 -150 0 100 R 50 50 1 1 P
+X A 2 150 0 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# D_Small_ALT
+# D_Schottky_AAK
 #
-DEF D_Small_ALT D 0 10 N N 1 F N
-F0 "D" -50 80 50 H V L CNN
-F1 "D_Small_ALT" -150 -80 50 H V L CNN
-F2 "" 0 0 50 V I C CNN
-F3 "" 0 0 50 V I C CNN
+DEF D_Schottky_AAK D 0 0 Y N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "D_Schottky_AAK" 0 -100 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
 $FPLIST
  TO-???*
  *_Diode_*
@@ -2375,19 +2253,21 @@ $FPLIST
  D_*
 $ENDFPLIST
 DRAW
-P 2 0 1 10 -30 -40 -30 40 N
-P 2 0 1 0 -30 0 30 0 N
-P 4 0 1 10 30 -40 -30 0 30 40 30 -40 F
-X K 1 -100 0 70 R 50 50 1 1 P
-X A 2 100 0 70 L 50 50 1 1 P
+C 100 0 10 0 1 0 F
+P 4 0 1 10 50 50 50 -50 -50 0 50 50 N
+P 4 0 1 0 150 100 100 100 100 0 -50 0 N
+P 6 0 1 10 -75 25 -75 50 -50 50 -50 -50 -25 -50 -25 -25 N
+X A 1 200 100 100 L 50 50 1 1 P
+X A 2 200 0 100 L 50 50 1 1 P
+X K 3 -150 0 100 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# D_TVS
+# D_Schottky_AKA
 #
-DEF D_TVS D 0 40 N N 1 F N
+DEF D_Schottky_AKA D 0 0 Y N 1 F N
 F0 "D" 0 100 50 H V C CNN
-F1 "D_TVS" 0 -100 50 H V C CNN
+F1 "D_Schottky_AKA" 0 -100 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -2397,19 +2277,21 @@ $FPLIST
  D_*
 $ENDFPLIST
 DRAW
-P 2 0 1 0 50 0 -50 0 N
-P 4 0 1 10 20 50 0 50 0 -50 -20 -50 N
-P 5 0 1 10 -100 50 -100 -50 100 50 100 -50 -100 50 N
-X A1 1 -150 0 100 R 50 50 1 1 P
-X A2 2 150 0 100 L 50 50 1 1 P
+C 100 0 10 0 1 0 F
+P 4 0 1 10 50 50 50 -50 -50 0 50 50 N
+P 4 0 1 0 150 100 100 100 100 0 -50 0 N
+P 6 0 1 10 -75 25 -75 50 -50 50 -50 -50 -25 -50 -25 -25 N
+X A 1 200 100 100 L 50 50 1 1 I
+X K 2 -150 0 100 R 50 50 1 1 P
+X A 3 200 0 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# D_TVS_ALT
+# D_Schottky_AKK
 #
-DEF D_TVS_ALT D 0 40 N N 1 F N
+DEF D_Schottky_AKK D 0 0 Y N 1 F N
 F0 "D" 0 100 50 H V C CNN
-F1 "D_TVS_ALT" 0 -100 50 H V C CNN
+F1 "D_Schottky_AKK" 0 -100 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -2419,1445 +2301,1766 @@ $FPLIST
  D_*
 $ENDFPLIST
 DRAW
-P 2 0 1 0 50 0 -50 0 N
-P 4 0 1 10 -100 -50 0 0 -100 50 -100 -50 F
-P 4 0 1 10 20 50 0 50 0 -50 -20 -50 N
-P 4 0 1 10 100 50 100 -50 0 0 100 50 F
-X A1 1 -150 0 100 R 50 50 1 1 P
-X A2 2 150 0 100 L 50 50 1 1 P
+C -150 0 10 0 1 0 F
+P 4 0 1 0 -200 100 -150 100 -150 0 100 0 N
+P 4 0 1 10 50 50 50 -50 -50 0 50 50 N
+P 6 0 1 10 -75 25 -75 50 -50 50 -50 -50 -25 -50 -25 -25 N
+X A 1 200 0 100 L 50 50 1 1 P
+X K 2 -250 100 100 R 50 50 1 1 I
+X K 3 -250 0 100 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# D_TVS_x2_AAC
+# D_Schottky_Dual_CommonAnode_AKK
 #
-DEF D_TVS_x2_AAC D 0 40 Y N 1 F N
-F0 "D" 0 175 50 H V C CNN
-F1 "D_TVS_x2_AAC" 0 100 50 H V C CNN
-F2 "" -150 0 50 H I C CNN
-F3 "" -150 0 50 H I C CNN
+DEF D_Schottky_Dual_CommonAnode_AKK D 0 30 Y N 1 F N
+F0 "D" 50 -100 50 H V C CNN
+F1 "D_Schottky_Dual_CommonAnode_AKK" 0 100 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
 DRAW
 C 0 0 10 0 1 0 F
-P 2 0 0 0 0 -50 0 0 N
-P 2 0 1 0 -250 0 250 0 N
-P 4 0 1 10 -130 50 -150 50 -150 -50 -170 -50 N
-P 4 0 1 10 170 50 150 50 150 -50 130 -50 N
-P 5 0 1 10 -250 50 -50 -50 -50 50 -250 -50 -250 50 N
-P 5 0 1 10 250 50 50 -50 50 50 250 -50 250 50 N
-X A1 1 -350 0 100 R 50 50 1 1 P
-X A2 2 350 0 100 L 50 50 1 1 P
-X common 3 0 -150 100 U 50 50 1 1 I
+P 2 0 1 0 -140 0 150 0 N
+P 2 0 1 0 0 0 0 -100 N
+P 3 0 1 10 -150 50 -150 -50 -150 -50 N
+P 3 0 1 10 150 50 150 -50 150 -50 N
+P 4 0 1 10 -150 50 -170 50 -170 40 -170 40 N
+P 4 0 1 10 150 -50 170 -50 170 -40 170 -40 N
+P 4 0 1 10 150 50 130 50 130 40 130 40 N
+P 5 0 1 10 -130 -40 -130 -50 -150 -50 -150 -50 -150 -50 N
+P 6 0 1 10 -50 -50 -150 0 -50 50 -50 -50 -50 -50 -50 -50 N
+P 6 0 1 10 50 50 150 0 50 -50 50 50 50 50 50 50 N
+X A 1 0 -200 100 U 50 50 0 1 P
+X K 2 -300 0 150 R 50 50 0 1 P
+X K 3 300 0 150 L 50 50 0 1 P
 ENDDRAW
 ENDDEF
 #
-# D_TVS_x2_ACA
+# D_Schottky_Dual_CommonAnode_AKK_Parallel
 #
-DEF D_TVS_x2_ACA D 0 40 Y N 1 F N
-F0 "D" 0 175 50 H V C CNN
-F1 "D_TVS_x2_ACA" 0 100 50 H V C CNN
-F2 "" -150 0 50 H I C CNN
-F3 "" -150 0 50 H I C CNN
+DEF D_Schottky_Dual_CommonAnode_AKK_Parallel D 0 30 Y N 1 F N
+F0 "D" 0 200 50 H V C CNN
+F1 "D_Schottky_Dual_CommonAnode_AKK_Parallel" 0 -200 50 H V C CNN
+F2 "" -50 0 50 H I C CNN
+F3 "" -50 0 50 H I C CNN
 DRAW
-C 0 0 10 0 1 0 F
-P 5 0 0 10 -250 -50 -50 50 -50 -50 -250 50 -250 -50 N
-P 5 0 0 10 50 50 50 -50 250 50 250 -50 50 50 N
-P 2 0 1 0 -250 0 250 0 N
-P 2 0 1 0 0 0 0 -50 N
-P 4 0 1 10 -130 50 -150 50 -150 -50 -170 -50 N
-P 4 0 1 10 170 50 150 50 150 -50 130 -50 N
-X A1 1 -350 0 100 R 50 50 1 1 P
-X common 2 0 -150 100 U 50 50 1 1 I
-X A2 3 350 0 100 L 50 50 1 1 P
+C -50 0 10 0 1 0 F
+P 2 0 1 0 -50 0 -100 0 N
+P 4 0 1 0 100 100 -50 100 -50 -100 100 -100 N
+P 6 0 1 10 0 -50 100 -100 0 -150 0 -50 0 -50 0 -50 N
+P 6 0 1 10 0 150 100 100 0 50 0 150 0 150 0 150 N
+P 6 0 1 10 120 -60 120 -50 100 -50 100 -150 80 -150 80 -140 N
+P 6 0 1 10 120 140 120 150 100 150 100 50 80 50 80 60 N
+X A 1 -200 0 100 R 50 50 0 1 P
+X K 2 200 100 100 L 50 50 0 1 P
+X K 3 200 -100 100 L 50 50 0 1 P
 ENDDRAW
 ENDDEF
 #
-# D_TVS_x2_CAA
+# D_Schottky_Dual_CommonAnode_AKK_Split
 #
-DEF D_TVS_x2_CAA D 0 40 Y N 1 F N
-F0 "D" 0 175 50 H V C CNN
-F1 "D_TVS_x2_CAA" 0 100 50 H V C CNN
-F2 "" -150 0 50 H I C CNN
-F3 "" -150 0 50 H I C CNN
+DEF D_Schottky_Dual_CommonAnode_AKK_Split D 0 30 Y N 2 L N
+F0 "D" 0 100 50 H V C CNN
+F1 "D_Schottky_Dual_CommonAnode_AKK_Split" 0 -100 50 H V C CNN
+F2 "" -100 -100 50 H I C CNN
+F3 "" -100 -100 50 H I C CNN
+DRAW
+T 0 -100 50 50 0 2 0 1 Normal 0 C C
+P 2 2 0 0 50 0 -150 0 N
+P 6 0 1 10 -50 50 50 0 -50 -50 -50 50 -50 50 -50 50 N
+P 6 0 1 10 70 40 70 50 50 50 50 -50 30 -50 30 -40 N
+P 2 1 1 0 50 0 -50 0 N
+X A 1 -150 0 100 R 50 50 1 1 P
+X K 2 150 0 100 L 50 50 1 1 P
+X K 3 150 0 100 L 50 50 2 1 P
+ENDDRAW
+ENDDEF
+#
+# D_Schottky_Dual_CommonAnode_KAK
+#
+DEF D_Schottky_Dual_CommonAnode_KAK D 0 30 Y N 1 F N
+F0 "D" 50 -100 50 H V C CNN
+F1 "D_Schottky_Dual_CommonAnode_KAK" 0 100 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
 DRAW
 C 0 0 10 0 1 0 F
-P 2 0 1 0 -250 0 250 0 N
-P 2 0 1 0 0 0 0 -50 N
-P 4 0 1 10 -130 50 -150 50 -150 -50 -170 -50 N
-P 4 0 1 10 170 50 150 50 150 -50 130 -50 N
-P 5 0 1 10 -250 -50 -50 50 -50 -50 -250 50 -250 -50 N
-P 6 0 1 10 50 40 50 -50 250 50 250 -50 50 50 50 40 N
-X common 1 0 -150 100 U 50 50 1 1 I
-X A1 2 -350 0 100 R 50 50 1 1 P
-X A2 3 350 0 100 L 50 50 1 1 P
+P 2 0 1 0 -140 0 150 0 N
+P 2 0 1 0 0 0 0 -100 N
+P 3 0 1 10 -150 50 -150 -50 -150 -50 N
+P 3 0 1 10 150 50 150 -50 150 -50 N
+P 4 0 1 10 -150 50 -170 50 -170 40 -170 40 N
+P 4 0 1 10 150 -50 170 -50 170 -40 170 -40 N
+P 4 0 1 10 150 50 130 50 130 40 130 40 N
+P 5 0 1 10 -130 -40 -130 -50 -150 -50 -150 -50 -150 -50 N
+P 6 0 1 10 -50 -50 -150 0 -50 50 -50 -50 -50 -50 -50 -50 N
+P 6 0 1 10 50 50 150 0 50 -50 50 50 50 50 50 50 N
+X K 1 -300 0 150 R 50 50 0 1 P
+X A 2 0 -200 100 U 50 50 0 1 P
+X K 3 300 0 150 L 50 50 0 1 P
+ENDDRAW
+ENDDEF
+#
+# D_Schottky_Dual_CommonAnode_KAK_Parallel
+#
+DEF D_Schottky_Dual_CommonAnode_KAK_Parallel D 0 30 Y N 1 F N
+F0 "D" 0 200 50 H V C CNN
+F1 "D_Schottky_Dual_CommonAnode_KAK_Parallel" 0 -200 50 H V C CNN
+F2 "" -50 0 50 H I C CNN
+F3 "" -50 0 50 H I C CNN
+DRAW
+C -50 0 10 0 1 0 F
+P 2 0 1 0 -50 0 -100 0 N
+P 4 0 1 0 100 100 -50 100 -50 -100 100 -100 N
+P 6 0 1 10 0 -50 100 -100 0 -150 0 -50 0 -50 0 -50 N
+P 6 0 1 10 0 150 100 100 0 50 0 150 0 150 0 150 N
+P 6 0 1 10 120 -60 120 -50 100 -50 100 -150 80 -150 80 -140 N
+P 6 0 1 10 120 140 120 150 100 150 100 50 80 50 80 60 N
+X K 1 200 100 100 L 50 50 0 1 P
+X A 2 -200 0 100 R 50 50 0 1 P
+X K 3 200 -100 100 L 50 50 0 1 P
 ENDDRAW
 ENDDEF
 #
-# D_Temperature_Dependent
+# D_Schottky_Dual_CommonAnode_KAK_Split
 #
-DEF D_Temperature_Dependent D 0 40 N N 1 F N
+DEF D_Schottky_Dual_CommonAnode_KAK_Split D 0 30 Y N 2 L N
 F0 "D" 0 100 50 H V C CNN
-F1 "D_Temperature_Dependent" 0 -125 50 H V C CNN
+F1 "D_Schottky_Dual_CommonAnode_KAK_Split" 0 -100 50 H V C CNN
+F2 "" -100 -100 50 H I C CNN
+F3 "" -100 -100 50 H I C CNN
+DRAW
+T 0 -100 50 50 0 2 0 2 Normal 0 C C
+P 2 2 0 0 50 0 -150 0 N
+P 6 0 1 10 -50 50 50 0 -50 -50 -50 50 -50 50 -50 50 N
+P 6 0 1 10 70 40 70 50 50 50 50 -50 30 -50 30 -40 N
+P 2 1 1 0 50 0 -50 0 N
+X K 1 150 0 100 L 50 50 1 1 P
+X A 2 -150 0 100 R 50 50 1 1 P
+X K 3 150 0 100 L 50 50 2 1 P
+ENDDRAW
+ENDDEF
+#
+# D_Schottky_Dual_CommonAnode_KKA
+#
+DEF D_Schottky_Dual_CommonAnode_KKA D 0 30 Y N 1 F N
+F0 "D" 50 -100 50 H V C CNN
+F1 "D_Schottky_Dual_CommonAnode_KKA" 0 100 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
-$FPLIST
- TO-???*
- *_Diode_*
- *SingleDiode*
- D_*
-$ENDFPLIST
 DRAW
-A -104 -54 7 -265 818 0 1 0 N -98 -57 -103 -47
-A -88 -57 10 1800 -900 0 1 0 N -98 -57 -88 -67
-A -88 -57 10 -900 0 0 1 0 N -88 -67 -78 -57
-A -88 -32 10 0 900 0 1 0 N -78 -32 -88 -22
-A -88 -32 10 900 1800 0 1 0 N -88 -22 -98 -32
-A -88 -32 10 1800 -900 0 1 0 N -98 -32 -88 -42
-A -82 -23 20 -1075 -253 0 1 0 N -88 -42 -63 -32
-P 2 0 1 0 -78 -56 -78 -32 N
-P 2 0 1 10 -50 50 -50 -50 N
-P 2 0 1 0 50 0 -50 0 N
-P 4 0 1 10 50 -50 50 50 -50 0 50 -50 N
-X K 1 -150 0 100 R 50 50 1 1 P
-X A 2 150 0 100 L 50 50 1 1 P
+C 0 0 10 0 1 0 F
+P 2 0 1 0 -140 0 150 0 N
+P 2 0 1 0 0 0 0 -100 N
+P 3 0 1 10 -150 50 -150 -50 -150 -50 N
+P 3 0 1 10 150 50 150 -50 150 -50 N
+P 4 0 1 10 -150 50 -170 50 -170 40 -170 40 N
+P 4 0 1 10 150 -50 170 -50 170 -40 170 -40 N
+P 4 0 1 10 150 50 130 50 130 40 130 40 N
+P 5 0 1 10 -130 -40 -130 -50 -150 -50 -150 -50 -150 -50 N
+P 6 0 1 10 -50 -50 -150 0 -50 50 -50 -50 -50 -50 -50 -50 N
+P 6 0 1 10 50 50 150 0 50 -50 50 50 50 50 50 50 N
+X K 1 -300 0 150 R 50 50 0 1 P
+X K 2 300 0 150 L 50 50 0 1 P
+X A 3 0 -200 100 U 50 50 0 1 P
+ENDDRAW
+ENDDEF
+#
+# D_Schottky_Dual_CommonAnode_KKA_Parallel
+#
+DEF D_Schottky_Dual_CommonAnode_KKA_Parallel D 0 30 Y N 1 F N
+F0 "D" 0 200 50 H V C CNN
+F1 "D_Schottky_Dual_CommonAnode_KKA_Parallel" 0 -200 50 H V C CNN
+F2 "" -50 0 50 H I C CNN
+F3 "" -50 0 50 H I C CNN
+DRAW
+C -50 0 10 0 1 0 F
+P 2 0 1 0 -50 0 -100 0 N
+P 4 0 1 0 100 100 -50 100 -50 -100 100 -100 N
+P 6 0 1 10 0 -50 100 -100 0 -150 0 -50 0 -50 0 -50 N
+P 6 0 1 10 0 150 100 100 0 50 0 150 0 150 0 150 N
+P 6 0 1 10 120 -60 120 -50 100 -50 100 -150 80 -150 80 -140 N
+P 6 0 1 10 120 140 120 150 100 150 100 50 80 50 80 60 N
+X K 1 200 100 100 L 50 50 0 1 P
+X K 2 200 -100 100 L 50 50 0 1 P
+X A 3 -200 0 100 R 50 50 0 1 P
 ENDDRAW
 ENDDEF
 #
-# D_Temperature_Dependent_ALT
+# D_Schottky_Dual_CommonAnode_KKA_Split
 #
-DEF D_Temperature_Dependent_ALT D 0 40 N N 1 F N
+DEF D_Schottky_Dual_CommonAnode_KKA_Split D 0 30 Y N 2 L N
 F0 "D" 0 100 50 H V C CNN
-F1 "D_Temperature_Dependent_ALT" 0 -125 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- TO-???*
- *_Diode_*
- *SingleDiode*
- D_*
-$ENDFPLIST
+F1 "D_Schottky_Dual_CommonAnode_KKA_Split" 0 -100 50 H V C CNN
+F2 "" -100 -100 50 H I C CNN
+F3 "" -100 -100 50 H I C CNN
 DRAW
-A -104 -54 7 -265 818 0 1 0 N -98 -57 -103 -47
-A -88 -57 10 1800 -900 0 1 0 N -98 -57 -88 -67
-A -88 -57 10 -900 0 0 1 0 N -88 -67 -78 -57
-A -88 -32 10 0 900 0 1 0 N -78 -32 -88 -22
-A -88 -32 10 900 1800 0 1 0 N -88 -22 -98 -32
-A -88 -32 10 1800 -900 0 1 0 N -98 -32 -88 -42
-A -82 -23 20 -1075 -253 0 1 0 N -88 -42 -63 -32
-P 2 0 1 0 -78 -56 -78 -32 N
-P 2 0 1 10 -50 50 -50 -50 N
-P 2 0 1 0 50 0 -50 0 N
-P 4 0 1 10 50 -50 50 50 -50 0 50 -50 F
-X K 1 -150 0 100 R 50 50 1 1 P
-X A 2 150 0 100 L 50 50 1 1 P
+T 0 -100 50 50 0 2 0 3 Normal 0 C C
+P 2 2 0 0 50 0 -150 0 N
+P 6 0 1 10 -50 50 50 0 -50 -50 -50 50 -50 50 -50 50 N
+P 6 0 1 10 70 40 70 50 50 50 50 -50 30 -50 30 -40 N
+P 2 1 1 0 50 0 -50 0 N
+X K 1 150 0 100 L 50 50 1 1 P
+X A 3 -150 0 100 R 50 50 1 1 P
+X K 2 150 0 100 L 50 50 2 1 P
 ENDDRAW
 ENDDEF
 #
-# D_Tunnel
+# D_Schottky_Dual_CommonCathode_AAK
 #
-DEF D_Tunnel D 0 40 N N 1 F N
-F0 "D" 0 100 50 H V C CNN
-F1 "D_Tunnel" 0 -100 50 H V C CNN
+DEF D_Schottky_Dual_CommonCathode_AAK D 0 30 Y N 1 F N
+F0 "D" 50 -100 50 H V C CNN
+F1 "D_Schottky_Dual_CommonCathode_AAK" 0 100 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
-$FPLIST
- TO-???*
- *_Diode_*
- *SingleDiode*
- D_*
-$ENDFPLIST
 DRAW
-P 2 0 1 0 50 0 -50 0 N
-P 4 0 1 10 -30 50 -50 50 -50 -50 -30 -50 N
-P 4 0 1 10 50 -50 50 50 -50 0 50 -50 N
-X K 1 -150 0 100 R 50 50 1 1 P
-X A 2 150 0 100 L 50 50 1 1 P
+C 0 0 10 0 1 0 F
+P 2 0 1 0 -150 0 150 0 N
+P 2 0 1 0 0 0 0 -100 N
+P 3 0 1 10 -50 -50 -50 50 -50 50 N
+P 3 0 1 10 50 -50 50 50 50 50 N
+P 4 0 1 10 -50 -50 -30 -50 -30 -40 -30 -40 N
+P 4 0 1 10 50 -50 70 -50 70 -40 70 -40 N
+P 4 0 1 10 50 50 30 50 30 40 30 40 N
+P 5 0 1 10 -70 40 -70 50 -50 50 -50 50 -50 50 N
+P 6 0 1 10 -150 50 -50 0 -150 -50 -150 50 -150 50 -150 50 N
+P 6 0 1 10 150 -50 50 0 150 50 150 -50 150 -50 150 -50 N
+X A 1 -300 0 150 R 50 50 0 1 P
+X A 2 300 0 150 L 50 50 0 1 P
+X K 3 0 -200 100 U 50 50 0 1 P
 ENDDRAW
 ENDDEF
 #
-# D_Tunnel_ALT
+# D_Schottky_Dual_CommonCathode_AAK_Parallel
 #
-DEF D_Tunnel_ALT D 0 40 N N 1 F N
-F0 "D" 0 100 50 H V C CNN
-F1 "D_Tunnel_ALT" 0 -100 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- TO-???*
- *_Diode_*
- *SingleDiode*
- D_*
-$ENDFPLIST
+DEF D_Schottky_Dual_CommonCathode_AAK_Parallel D 0 30 Y N 1 F N
+F0 "D" 0 200 50 H V C CNN
+F1 "D_Schottky_Dual_CommonCathode_AAK_Parallel" 0 -200 50 H V C CNN
+F2 "" 50 0 50 H I C CNN
+F3 "" 50 0 50 H I C CNN
 DRAW
-P 2 0 1 0 50 0 -50 0 N
-P 4 0 1 10 -30 50 -50 50 -50 -50 -30 -50 N
-P 4 0 1 10 50 -50 50 50 -50 0 50 -50 F
-X K 1 -150 0 100 R 50 50 1 1 P
-X A 2 150 0 100 L 50 50 1 1 P
+C 50 0 10 0 1 0 F
+P 2 0 1 0 50 0 100 0 N
+P 4 0 1 0 -100 -100 50 -100 50 100 -100 100 N
+P 6 0 1 10 -100 -50 0 -100 -100 -150 -100 -50 -100 -50 -100 -50 N
+P 6 0 1 10 -100 150 0 100 -100 50 -100 150 -100 150 -100 150 N
+P 6 0 1 10 20 -60 20 -50 0 -50 0 -150 -20 -150 -20 -140 N
+P 6 0 1 10 20 140 20 150 0 150 0 50 -20 50 -20 60 N
+X K 1 -200 100 100 R 50 50 0 1 P
+X K 2 -200 -100 100 R 50 50 0 1 P
+X A 3 200 0 100 L 50 50 0 1 P
 ENDDRAW
 ENDDEF
 #
-# D_Unitunnel
+# D_Schottky_Dual_CommonCathode_AAK_Split
 #
-DEF D_Unitunnel D 0 40 N N 1 F N
+DEF D_Schottky_Dual_CommonCathode_AAK_Split D 0 30 Y N 2 L N
 F0 "D" 0 100 50 H V C CNN
-F1 "D_Unitunnel" 0 -100 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- TO-???*
- *_Diode_*
- *SingleDiode*
- D_*
-$ENDFPLIST
+F1 "D_Schottky_Dual_CommonCathode_AAK_Split" 0 -100 50 H V C CNN
+F2 "" -100 -100 50 H I C CNN
+F3 "" -100 -100 50 H I C CNN
 DRAW
-P 2 0 1 0 50 0 -50 0 N
-P 4 0 1 10 50 -50 50 50 -50 0 50 -50 N
-P 6 0 1 10 -70 -50 -30 -50 -50 -50 -50 50 -30 50 -70 50 N
-X K 1 -150 0 100 R 50 50 1 1 P
-X A 2 150 0 100 L 50 50 1 1 P
+T 0 100 50 50 0 2 0 3 Normal 0 C C
+P 2 2 0 0 150 0 -50 0 N
+P 6 0 1 10 -50 50 50 0 -50 -50 -50 50 -50 50 -50 50 N
+P 6 0 1 10 70 40 70 50 50 50 50 -50 30 -50 30 -40 N
+P 2 1 1 0 50 0 -50 0 N
+X A 1 -150 0 100 R 50 50 1 1 P
+X K 3 150 0 100 L 50 50 1 1 P
+X K 2 -150 0 100 R 50 50 2 1 P
 ENDDRAW
 ENDDEF
 #
-# D_Unitunnel_ALT
+# D_Schottky_Dual_CommonCathode_AKA
 #
-DEF D_Unitunnel_ALT D 0 40 N N 1 F N
-F0 "D" 0 100 50 H V C CNN
-F1 "D_Unitunnel_ALT" 0 -100 50 H V C CNN
+DEF D_Schottky_Dual_CommonCathode_AKA D 0 30 Y N 1 F N
+F0 "D" 50 -100 50 H V C CNN
+F1 "D_Schottky_Dual_CommonCathode_AKA" 0 100 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
-$FPLIST
- TO-???*
- *_Diode_*
- *SingleDiode*
- D_*
-$ENDFPLIST
 DRAW
-P 2 0 1 0 50 0 -50 0 N
-P 4 0 1 10 50 -50 50 50 -50 0 50 -50 F
-P 6 0 1 10 -70 -50 -30 -50 -50 -50 -50 50 -30 50 -70 50 N
-X K 1 -150 0 100 R 50 50 1 1 P
-X A 2 150 0 100 L 50 50 1 1 P
+C 0 0 10 0 1 0 F
+P 2 0 1 0 0 0 0 -100 N
+P 2 0 1 0 150 0 -150 0 N
+P 3 0 1 10 -50 -50 -50 50 -50 50 N
+P 3 0 1 10 50 -50 50 50 50 50 N
+P 4 0 1 10 -50 -50 -30 -50 -30 -40 -30 -40 N
+P 4 0 1 10 50 -50 70 -50 70 -40 70 -40 N
+P 4 0 1 10 50 50 30 50 30 40 30 40 N
+P 5 0 1 10 -70 40 -70 50 -50 50 -50 50 -50 50 N
+P 6 0 1 10 -150 50 -50 0 -150 -50 -150 50 -150 50 -150 50 N
+P 6 0 1 10 150 -50 50 0 150 50 150 -50 150 -50 150 -50 N
+X A 1 -300 0 150 R 50 50 0 1 P
+X K 2 0 -200 100 U 50 50 0 1 P
+X A 3 300 0 150 L 50 50 0 1 P
 ENDDRAW
 ENDDEF
 #
-# D_Zener
+# D_Schottky_Dual_CommonCathode_AKA_Parallel
 #
-DEF D_Zener D 0 40 N N 1 F N
-F0 "D" 0 100 50 H V C CNN
-F1 "D_Zener" 0 -100 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- TO-???*
- *_Diode_*
- *SingleDiode*
- D_*
-$ENDFPLIST
+DEF D_Schottky_Dual_CommonCathode_AKA_Parallel D 0 30 Y N 1 F N
+F0 "D" 0 200 50 H V C CNN
+F1 "D_Schottky_Dual_CommonCathode_AKA_Parallel" 0 -200 50 H V C CNN
+F2 "" 50 0 50 H I C CNN
+F3 "" 50 0 50 H I C CNN
 DRAW
-P 2 0 1 0 50 0 -50 0 N
-P 3 0 1 10 -50 -50 -50 50 -30 50 N
-P 4 0 1 10 50 -50 50 50 -50 0 50 -50 N
-X K 1 -150 0 100 R 50 50 1 1 P
-X A 2 150 0 100 L 50 50 1 1 P
+C 50 0 10 0 1 0 F
+P 2 0 1 0 50 0 100 0 N
+P 4 0 1 0 -100 -100 50 -100 50 100 -100 100 N
+P 6 0 1 10 -100 -50 0 -100 -100 -150 -100 -50 -100 -50 -100 -50 N
+P 6 0 1 10 -100 150 0 100 -100 50 -100 150 -100 150 -100 150 N
+P 6 0 1 10 20 -60 20 -50 0 -50 0 -150 -20 -150 -20 -140 N
+P 6 0 1 10 20 140 20 150 0 150 0 50 -20 50 -20 60 N
+X K 1 -200 100 100 R 50 50 0 1 P
+X A 2 200 0 100 L 50 50 0 1 P
+X K 3 -200 -100 100 R 50 50 0 1 P
 ENDDRAW
 ENDDEF
 #
-# D_Zener_ALT
+# D_Schottky_Dual_CommonCathode_AKA_Split
 #
-DEF D_Zener_ALT D 0 40 N N 1 F N
+DEF D_Schottky_Dual_CommonCathode_AKA_Split D 0 30 Y N 2 L N
 F0 "D" 0 100 50 H V C CNN
-F1 "D_Zener_ALT" 0 -100 50 H V C CNN
+F1 "D_Schottky_Dual_CommonCathode_AKA_Split" 0 -100 50 H V C CNN
+F2 "" -100 -100 50 H I C CNN
+F3 "" -100 -100 50 H I C CNN
+DRAW
+T 0 100 50 50 0 2 0 2 Normal 0 C C
+P 2 2 0 0 150 0 -50 0 N
+P 6 0 1 10 -50 50 50 0 -50 -50 -50 50 -50 50 -50 50 N
+P 6 0 1 10 70 40 70 50 50 50 50 -50 30 -50 30 -40 N
+P 2 1 1 0 50 0 -50 0 N
+X A 1 -150 0 100 R 50 50 1 1 P
+X K 2 150 0 100 L 50 50 1 1 P
+X K 3 -150 0 100 R 50 50 2 1 P
+ENDDRAW
+ENDDEF
+#
+# D_Schottky_Dual_CommonCathode_KAA
+#
+DEF D_Schottky_Dual_CommonCathode_KAA D 0 30 Y N 1 F N
+F0 "D" 50 -100 50 H V C CNN
+F1 "D_Schottky_Dual_CommonCathode_KAA" 0 100 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
-$FPLIST
- TO-???*
- *_Diode_*
- *SingleDiode*
- D_*
-$ENDFPLIST
 DRAW
-P 2 0 1 0 50 0 -50 0 N
-P 3 0 1 10 -50 -50 -50 50 -30 50 N
-P 4 0 1 10 50 -50 50 50 -50 0 50 -50 F
-X K 1 -150 0 100 R 50 50 1 1 P
-X A 2 150 0 100 L 50 50 1 1 P
+C 0 0 10 0 1 0 F
+P 2 0 1 0 -150 0 150 0 N
+P 2 0 1 0 0 0 0 -100 N
+P 3 0 1 10 -50 -50 -50 50 -50 50 N
+P 3 0 1 10 50 -50 50 50 50 50 N
+P 4 0 1 10 -50 -50 -30 -50 -30 -40 -30 -40 N
+P 4 0 1 10 50 -50 70 -50 70 -40 70 -40 N
+P 4 0 1 10 50 50 30 50 30 40 30 40 N
+P 5 0 1 10 -70 40 -70 50 -50 50 -50 50 -50 50 N
+P 6 0 1 10 -150 50 -50 0 -150 -50 -150 50 -150 50 -150 50 N
+P 6 0 1 10 150 -50 50 0 150 50 150 -50 150 -50 150 -50 N
+X K 1 0 -200 100 U 50 50 0 1 P
+X A 2 -300 0 150 R 50 50 0 1 P
+X A 3 300 0 150 L 50 50 0 1 P
 ENDDRAW
 ENDDEF
 #
-# D_Zener_Small
+# D_Schottky_Dual_CommonCathode_KAA_Parallel
 #
-DEF D_Zener_Small D 0 10 N N 1 F N
-F0 "D" 0 90 50 H V C CNN
-F1 "D_Zener_Small" 0 -90 50 H V C CNN
-F2 "" 0 0 50 V I C CNN
-F3 "" 0 0 50 V I C CNN
-$FPLIST
- TO-???*
- *_Diode_*
- *SingleDiode*
- D_*
-$ENDFPLIST
+DEF D_Schottky_Dual_CommonCathode_KAA_Parallel D 0 30 Y N 1 F N
+F0 "D" 0 200 50 H V C CNN
+F1 "D_Schottky_Dual_CommonCathode_KAA_Parallel" 0 -200 50 H V C CNN
+F2 "" 50 0 50 H I C CNN
+F3 "" 50 0 50 H I C CNN
+DRAW
+C 50 0 10 0 1 0 F
+P 2 0 1 0 50 0 100 0 N
+P 4 0 1 0 -100 -100 50 -100 50 100 -100 100 N
+P 6 0 1 10 -100 -50 0 -100 -100 -150 -100 -50 -100 -50 -100 -50 N
+P 6 0 1 10 -100 150 0 100 -100 50 -100 150 -100 150 -100 150 N
+P 6 0 1 10 20 -60 20 -50 0 -50 0 -150 -20 -150 -20 -140 N
+P 6 0 1 10 20 140 20 150 0 150 0 50 -20 50 -20 60 N
+X A 1 200 0 100 L 50 50 0 1 P
+X K 2 -200 100 100 R 50 50 0 1 P
+X K 3 -200 -100 100 R 50 50 0 1 P
+ENDDRAW
+ENDDEF
+#
+# D_Schottky_Dual_CommonCathode_KAA_Split
+#
+DEF D_Schottky_Dual_CommonCathode_KAA_Split D 0 30 Y N 2 L N
+F0 "D" 0 100 50 H V C CNN
+F1 "D_Schottky_Dual_CommonCathode_KAA_Split" 0 -100 50 H V C CNN
+F2 "" -100 -100 50 H I C CNN
+F3 "" -100 -100 50 H I C CNN
+DRAW
+T 0 100 50 50 0 2 0 1 Normal 0 C C
+P 2 2 0 0 150 0 -50 0 N
+P 6 0 1 10 -50 50 50 0 -50 -50 -50 50 -50 50 -50 50 N
+P 6 0 1 10 70 40 70 50 50 50 50 -50 30 -50 30 -40 N
+P 2 1 1 0 50 0 -50 0 N
+X K 1 150 0 100 L 50 50 1 1 P
+X A 2 -150 0 100 R 50 50 1 1 P
+X K 3 -150 0 100 R 50 50 2 1 P
+ENDDRAW
+ENDDEF
+#
+# D_Schottky_Dual_Serial_ACK
+#
+DEF D_Schottky_Dual_Serial_ACK D 0 30 Y N 1 F N
+F0 "D" 50 -100 50 H V C CNN
+F1 "D_Schottky_Dual_Serial_ACK" 0 100 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
 DRAW
-P 2 0 1 0 30 0 -30 0 N
-P 3 0 1 10 -10 40 -30 40 -30 -40 N
-P 4 0 1 10 30 40 -30 0 30 -40 30 40 N
-X K 1 -100 0 70 R 50 50 1 1 P
-X A 2 100 0 70 L 50 50 1 1 P
+C 0 0 10 0 1 0 F
+P 2 0 1 0 0 0 0 -100 N
+P 2 0 1 0 150 0 -150 0 N
+P 2 0 1 0 250 0 300 0 N
+P 3 0 1 10 -50 -50 -50 50 -50 50 N
+P 3 0 1 10 150 50 150 -50 150 -50 N
+P 4 0 1 10 -50 -50 -30 -50 -30 -40 -30 -40 N
+P 4 0 1 10 150 -50 170 -50 170 -40 170 -40 N
+P 4 0 1 10 150 50 130 50 130 40 130 40 N
+P 5 0 1 10 -70 40 -70 50 -50 50 -50 50 -50 50 N
+P 6 0 1 10 -150 50 -50 0 -150 -50 -150 50 -150 50 -150 50 N
+P 6 0 1 10 50 50 150 0 50 -50 50 50 50 50 50 50 N
+X A 1 -300 0 150 R 50 50 0 1 P
+X common 2 0 -200 100 U 50 50 0 1 P
+X K 3 300 0 150 L 50 50 0 1 P
 ENDDRAW
 ENDDEF
 #
-# D_Zener_Small_ALT
+# D_Schottky_Dual_Serial_AKC
 #
-DEF D_Zener_Small_ALT D 0 10 N N 1 F N
-F0 "D" 0 90 50 H V C CNN
-F1 "D_Zener_Small_ALT" 0 -90 50 H V C CNN
-F2 "" 0 0 50 V I C CNN
-F3 "" 0 0 50 V I C CNN
-$FPLIST
- TO-???*
- *_Diode_*
- *SingleDiode*
- D_*
-$ENDFPLIST
+DEF D_Schottky_Dual_Serial_AKC D 0 30 Y N 1 F N
+F0 "D" 50 -100 50 H V C CNN
+F1 "D_Schottky_Dual_Serial_AKC" 0 100 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
 DRAW
-P 2 0 1 0 30 0 -30 0 N
-P 3 0 1 10 -10 40 -30 40 -30 -40 N
-P 4 0 1 10 30 40 -30 0 30 -40 30 40 F
-X K 1 -100 0 70 R 50 50 1 1 P
-X A 2 100 0 70 L 50 50 1 1 P
+C 0 0 10 0 1 0 F
+P 2 0 1 0 -150 0 150 0 N
+P 2 0 1 0 0 0 0 -100 N
+P 2 0 1 0 250 0 300 0 N
+P 3 0 1 10 -50 -50 -50 50 -50 50 N
+P 3 0 1 10 150 50 150 -50 150 -50 N
+P 4 0 1 10 -50 -50 -30 -50 -30 -40 -30 -40 N
+P 4 0 1 10 150 -50 170 -50 170 -40 170 -40 N
+P 4 0 1 10 150 50 130 50 130 40 130 40 N
+P 5 0 1 10 -70 40 -70 50 -50 50 -50 50 -50 50 N
+P 6 0 1 10 -150 50 -50 0 -150 -50 -150 50 -150 50 -150 50 N
+P 6 0 1 10 50 50 150 0 50 -50 50 50 50 50 50 50 N
+X A 1 -300 0 150 R 50 50 0 1 P
+X K 2 300 0 150 L 50 50 0 1 P
+X common 3 0 -200 100 U 50 50 0 1 P
 ENDDRAW
 ENDDEF
 #
-# D_Zener_x2_ACom_AKK
+# D_Schottky_Dual_Serial_CAK
 #
-DEF D_Zener_x2_ACom_AKK D 0 30 Y N 1 F N
+DEF D_Schottky_Dual_Serial_CAK D 0 30 Y N 1 F N
 F0 "D" 50 -100 50 H V C CNN
-F1 "D_Zener_x2_ACom_AKK" 0 100 50 H V C CNN
+F1 "D_Schottky_Dual_Serial_CAK" 0 100 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
-$FPLIST
- SOT*
- SC*
-$ENDFPLIST
 DRAW
 C 0 0 10 0 1 0 F
-P 2 0 1 0 -140 0 150 0 N
+P 2 0 1 0 -150 0 150 0 N
 P 2 0 1 0 0 0 0 -100 N
-P 3 0 1 10 -150 -50 -150 50 -130 50 N
-P 3 0 1 10 150 50 150 -50 130 -50 N
-P 6 0 1 10 -50 -50 -150 0 -50 50 -50 -50 -50 -50 -50 -50 N
+P 3 0 1 10 -50 -50 -50 50 -50 50 N
+P 3 0 1 10 150 50 150 -50 150 -50 N
+P 4 0 1 10 -50 -50 -30 -50 -30 -40 -30 -40 N
+P 4 0 1 10 150 -50 170 -50 170 -40 170 -40 N
+P 4 0 1 10 150 50 130 50 130 40 130 40 N
+P 5 0 1 10 -70 40 -70 50 -50 50 -50 50 -50 50 N
+P 6 0 1 10 -150 50 -50 0 -150 -50 -150 50 -150 50 -150 50 N
 P 6 0 1 10 50 50 150 0 50 -50 50 50 50 50 50 50 N
-X A 1 0 -200 100 U 50 50 0 1 P
-X K 2 -300 0 150 R 50 50 0 1 P
+X common 1 0 -200 100 U 50 50 0 1 P
+X A 2 -300 0 150 R 50 50 0 1 P
 X K 3 300 0 150 L 50 50 0 1 P
 ENDDRAW
 ENDDEF
 #
-# D_Zener_x2_ACom_AKK_Parallel
+# D_Schottky_Dual_Serial_CKA
 #
-DEF D_Zener_x2_ACom_AKK_Parallel D 0 30 Y N 1 F N
-F0 "D" 0 200 50 H V C CNN
-F1 "D_Zener_x2_ACom_AKK_Parallel" 0 -200 50 H V C CNN
-F2 "" -50 0 50 H I C CNN
-F3 "" -50 0 50 H I C CNN
+DEF D_Schottky_Dual_Serial_CKA D 0 30 Y N 1 F N
+F0 "D" 50 -100 50 H V C CNN
+F1 "D_Schottky_Dual_Serial_CKA" 0 100 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
 DRAW
-C -50 0 10 0 1 0 F
-P 3 0 0 10 80 50 100 50 100 150 N
-P 3 0 0 10 100 -50 100 -150 80 -150 N
-P 2 0 1 0 -50 0 -100 0 N
-P 4 0 1 0 100 100 -50 100 -50 -100 100 -100 N
-P 6 0 1 10 0 -50 100 -100 0 -150 0 -50 0 -50 0 -50 N
-P 6 0 1 10 0 150 100 100 0 50 0 150 0 150 0 150 N
-X A 1 -200 0 100 R 50 50 0 1 P
-X K 2 200 100 100 L 50 50 0 1 P
-X K 3 200 -100 100 L 50 50 0 1 P
+C 0 0 10 0 1 0 F
+P 2 0 1 0 -150 0 150 0 N
+P 2 0 1 0 0 0 0 -100 N
+P 3 0 1 10 -50 -50 -50 50 -50 50 N
+P 3 0 1 10 150 50 150 -50 150 -50 N
+P 4 0 1 10 -50 -50 -30 -50 -30 -40 -30 -40 N
+P 4 0 1 10 150 -50 170 -50 170 -40 170 -40 N
+P 4 0 1 10 150 50 130 50 130 40 130 40 N
+P 5 0 1 10 -70 40 -70 50 -50 50 -50 50 -50 50 N
+P 6 0 1 10 -150 50 -50 0 -150 -50 -150 50 -150 50 -150 50 N
+P 6 0 1 10 50 50 150 0 50 -50 50 50 50 50 50 50 N
+X common 1 0 -200 100 U 50 50 0 1 P
+X K 2 300 0 150 L 50 50 0 1 P
+X A 3 -300 0 150 R 50 50 0 1 P
 ENDDRAW
 ENDDEF
 #
-# D_Zener_x2_ACom_AKK_Split
+# D_Schottky_Dual_Serial_KAC
 #
-DEF D_Zener_x2_ACom_AKK_Split D 0 30 Y N 2 L N
-F0 "D" 0 100 50 H V C CNN
-F1 "D_Zener_x2_ACom_AKK_Split" 0 -100 50 H V C CNN
-F2 "" -100 -100 50 H I C CNN
-F3 "" -100 -100 50 H I C CNN
+DEF D_Schottky_Dual_Serial_KAC D 0 30 Y N 1 F N
+F0 "D" 50 -100 50 H V C CNN
+F1 "D_Schottky_Dual_Serial_KAC" 0 100 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
 DRAW
-T 0 -100 50 50 0 2 0 1 Normal 0 C C
-P 3 0 0 10 50 50 50 -50 30 -50 N
-P 2 2 0 0 50 0 -150 0 N
-P 6 0 1 10 -50 50 50 0 -50 -50 -50 50 -50 50 -50 50 N
-P 2 1 1 0 50 0 -50 0 N
-X A 1 -150 0 100 R 50 50 1 1 P
-X K 2 150 0 100 L 50 50 1 1 P
-X K 3 150 0 100 L 50 50 2 1 P
+C 0 0 10 0 1 0 F
+P 2 0 1 0 -150 0 150 0 N
+P 2 0 1 0 0 0 0 -100 N
+P 3 0 1 10 -50 -50 -50 50 -50 50 N
+P 3 0 1 10 150 50 150 -50 150 -50 N
+P 4 0 1 10 -50 -50 -30 -50 -30 -40 -30 -40 N
+P 4 0 1 10 150 -50 170 -50 170 -40 170 -40 N
+P 4 0 1 10 150 50 130 50 130 40 130 40 N
+P 5 0 1 10 -70 40 -70 50 -50 50 -50 50 -50 50 N
+P 6 0 1 10 -150 50 -50 0 -150 -50 -150 50 -150 50 -150 50 N
+P 6 0 1 10 50 50 150 0 50 -50 50 50 50 50 50 50 N
+X K 1 300 0 150 L 50 50 0 1 P
+X A 2 -300 0 150 R 50 50 0 1 P
+X common 3 0 -200 100 U 50 50 0 1 P
 ENDDRAW
 ENDDEF
 #
-# D_Zener_x2_ACom_KAK
+# D_Schottky_Dual_Serial_KCA
 #
-DEF D_Zener_x2_ACom_KAK D 0 30 Y N 1 F N
+DEF D_Schottky_Dual_Serial_KCA D 0 30 Y N 1 F N
 F0 "D" 50 -100 50 H V C CNN
-F1 "D_Zener_x2_ACom_KAK" 0 100 50 H V C CNN
+F1 "D_Schottky_Dual_Serial_KCA" 0 100 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
-$FPLIST
- SOT*
- SC*
-$ENDFPLIST
 DRAW
 C 0 0 10 0 1 0 F
-P 2 0 1 0 -140 0 150 0 N
+P 2 0 1 0 -150 0 150 0 N
 P 2 0 1 0 0 0 0 -100 N
-P 3 0 1 10 -150 -50 -150 50 -130 50 N
-P 3 0 1 10 130 -50 150 -50 150 50 N
-P 6 0 1 10 -50 -50 -150 0 -50 50 -50 -50 -50 -50 -50 -50 N
+P 2 0 1 0 250 0 300 0 N
+P 3 0 1 10 -50 -50 -50 50 -50 50 N
+P 3 0 1 10 150 50 150 -50 150 -50 N
+P 4 0 1 10 -50 -50 -30 -50 -30 -40 -30 -40 N
+P 4 0 1 10 150 -50 170 -50 170 -40 170 -40 N
+P 4 0 1 10 150 50 130 50 130 40 130 40 N
+P 5 0 1 10 -70 40 -70 50 -50 50 -50 50 -50 50 N
+P 6 0 1 10 -150 50 -50 0 -150 -50 -150 50 -150 50 -150 50 N
 P 6 0 1 10 50 50 150 0 50 -50 50 50 50 50 50 50 N
-X K 1 -300 0 150 R 50 50 0 1 P
-X A 2 0 -200 100 U 50 50 0 1 P
-X K 3 300 0 150 L 50 50 0 1 P
+X K 1 300 0 150 L 50 50 0 1 P
+X common 2 0 -200 100 U 50 50 0 1 P
+X A 3 -300 0 150 R 50 50 0 1 P
 ENDDRAW
 ENDDEF
 #
-# D_Zener_x2_ACom_KAK_Parallel
+# D_Schottky_Dual_Series_ACK_Parallel
 #
-DEF D_Zener_x2_ACom_KAK_Parallel D 0 30 Y N 1 F N
+DEF D_Schottky_Dual_Series_ACK_Parallel D 0 30 Y N 1 F N
 F0 "D" 0 200 50 H V C CNN
-F1 "D_Zener_x2_ACom_KAK_Parallel" 0 -200 50 H V C CNN
+F1 "D_Schottky_Dual_Series_ACK_Parallel" 0 -200 50 H V C CNN
 F2 "" -50 0 50 H I C CNN
 F3 "" -50 0 50 H I C CNN
 DRAW
 C -50 0 10 0 1 0 F
-P 3 0 0 10 80 50 100 50 100 150 N
-P 3 0 0 10 100 -50 100 -150 80 -150 N
 P 2 0 1 0 -50 0 -100 0 N
 P 4 0 1 0 100 100 -50 100 -50 -100 100 -100 N
-P 6 0 1 10 0 -50 100 -100 0 -150 0 -50 0 -50 0 -50 N
+P 6 0 1 10 -20 -60 -20 -50 0 -50 0 -150 20 -150 20 -140 N
 P 6 0 1 10 0 150 100 100 0 50 0 150 0 150 0 150 N
-X K 1 200 100 100 L 50 50 0 1 P
+P 6 0 1 10 100 -50 0 -100 100 -150 100 -50 100 -50 100 -50 N
+P 6 0 1 10 120 140 120 150 100 150 100 50 80 50 80 60 N
+X K 1 200 -100 100 L 50 50 0 1 P
 X A 2 -200 0 100 R 50 50 0 1 P
-X K 3 200 -100 100 L 50 50 0 1 P
+X K 3 200 100 100 L 50 50 0 1 P
 ENDDRAW
 ENDDEF
 #
-# D_Zener_x2_ACom_KAK_Split
+# D_Schottky_Dual_Series_ACK_Split
 #
-DEF D_Zener_x2_ACom_KAK_Split D 0 30 Y N 2 L N
+DEF D_Schottky_Dual_Series_ACK_Split D 0 30 Y N 2 L N
 F0 "D" 0 100 50 H V C CNN
-F1 "D_Zener_x2_ACom_KAK_Split" 0 -100 50 H V C CNN
+F1 "D_Schottky_Dual_Series_ACK_Split" 0 -100 50 H V C CNN
 F2 "" -100 -100 50 H I C CNN
 F3 "" -100 -100 50 H I C CNN
 DRAW
 T 0 -100 50 50 0 2 0 2 Normal 0 C C
-P 3 0 0 10 50 50 50 -50 30 -50 N
 P 2 2 0 0 50 0 -150 0 N
 P 6 0 1 10 -50 50 50 0 -50 -50 -50 50 -50 50 -50 50 N
+P 6 0 1 10 70 40 70 50 50 50 50 -50 30 -50 30 -40 N
 P 2 1 1 0 50 0 -50 0 N
-X K 1 150 0 100 L 50 50 1 1 P
-X A 2 -150 0 100 R 50 50 1 1 P
+X A 1 -150 0 100 R 50 50 1 1 P
+X K 2 150 0 100 L 50 50 1 1 P
 X K 3 150 0 100 L 50 50 2 1 P
 ENDDRAW
 ENDDEF
 #
-# D_Zener_x2_ACom_KKA
-#
-DEF D_Zener_x2_ACom_KKA D 0 30 Y N 1 F N
-F0 "D" 50 -100 50 H V C CNN
-F1 "D_Zener_x2_ACom_KKA" 0 100 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- SOT*
- SC*
-$ENDFPLIST
-DRAW
-C 0 0 10 0 1 0 F
-P 2 0 1 0 -140 0 150 0 N
-P 2 0 1 0 0 0 0 -100 N
-P 3 0 1 10 -150 -50 -150 50 -130 50 N
-P 3 0 1 10 130 -50 150 -50 150 50 N
-P 6 0 1 10 -50 -50 -150 0 -50 50 -50 -50 -50 -50 -50 -50 N
-P 6 0 1 10 50 50 150 0 50 -50 50 50 50 50 50 50 N
-X K 1 -300 0 150 R 50 50 0 1 P
-X K 2 300 0 150 L 50 50 0 1 P
-X A 3 0 -200 100 U 50 50 0 1 P
-ENDDRAW
-ENDDEF
-#
-# D_Zener_x2_ACom_KKA_Parallel
+# D_Schottky_Dual_Series_AKC_Parallel
 #
-DEF D_Zener_x2_ACom_KKA_Parallel D 0 30 Y N 1 F N
+DEF D_Schottky_Dual_Series_AKC_Parallel D 0 30 Y N 1 F N
 F0 "D" 0 200 50 H V C CNN
-F1 "D_Zener_x2_ACom_KKA_Parallel" 0 -200 50 H V C CNN
+F1 "D_Schottky_Dual_Series_AKC_Parallel" 0 -200 50 H V C CNN
 F2 "" -50 0 50 H I C CNN
 F3 "" -50 0 50 H I C CNN
 DRAW
 C -50 0 10 0 1 0 F
-P 3 0 0 10 80 50 100 50 100 150 N
-P 3 0 0 10 100 -50 100 -150 80 -150 N
 P 2 0 1 0 -50 0 -100 0 N
 P 4 0 1 0 100 100 -50 100 -50 -100 100 -100 N
-P 6 0 1 10 0 -50 100 -100 0 -150 0 -50 0 -50 0 -50 N
+P 6 0 1 10 -20 -60 -20 -50 0 -50 0 -150 20 -150 20 -140 N
 P 6 0 1 10 0 150 100 100 0 50 0 150 0 150 0 150 N
-X K 1 200 100 100 L 50 50 0 1 P
-X K 2 200 -100 100 L 50 50 0 1 P
+P 6 0 1 10 100 -50 0 -100 100 -150 100 -50 100 -50 100 -50 N
+P 6 0 1 10 120 140 120 150 100 150 100 50 80 50 80 60 N
+X K 1 200 -100 100 L 50 50 0 1 P
+X K 2 200 100 100 L 50 50 0 1 P
 X A 3 -200 0 100 R 50 50 0 1 P
 ENDDRAW
 ENDDEF
 #
-# D_Zener_x2_ACom_KKA_Split
+# D_Schottky_Dual_Series_AKC_Split
 #
-DEF D_Zener_x2_ACom_KKA_Split D 0 30 Y N 2 L N
+DEF D_Schottky_Dual_Series_AKC_Split D 0 30 Y N 2 L N
 F0 "D" 0 100 50 H V C CNN
-F1 "D_Zener_x2_ACom_KKA_Split" 0 -100 50 H V C CNN
+F1 "D_Schottky_Dual_Series_AKC_Split" 0 -100 50 H V C CNN
 F2 "" -100 -100 50 H I C CNN
 F3 "" -100 -100 50 H I C CNN
 DRAW
 T 0 -100 50 50 0 2 0 3 Normal 0 C C
-P 3 0 0 10 50 50 50 -50 30 -50 N
 P 2 2 0 0 50 0 -150 0 N
 P 6 0 1 10 -50 50 50 0 -50 -50 -50 50 -50 50 -50 50 N
+P 6 0 1 10 70 40 70 50 50 50 50 -50 30 -50 30 -40 N
 P 2 1 1 0 50 0 -50 0 N
-X K 1 150 0 100 L 50 50 1 1 P
-X A 3 -150 0 100 R 50 50 1 1 P
+X A 1 -150 0 100 R 50 50 1 1 P
+X K 3 150 0 100 L 50 50 1 1 P
 X K 2 150 0 100 L 50 50 2 1 P
 ENDDRAW
 ENDDEF
 #
-# D_Zener_x2_KCom_AAK
-#
-DEF D_Zener_x2_KCom_AAK D 0 30 Y N 1 F N
-F0 "D" 50 -100 50 H V C CNN
-F1 "D_Zener_x2_KCom_AAK" 0 100 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- SOT*
- SC*
-$ENDFPLIST
-DRAW
-C 0 0 10 0 1 0 F
-P 2 0 1 0 -150 0 150 0 N
-P 2 0 1 0 0 0 0 -100 N
-P 3 0 1 10 -50 50 -50 -50 -70 -50 N
-P 3 0 1 10 50 -50 50 50 70 50 N
-P 6 0 1 10 -150 50 -50 0 -150 -50 -150 50 -150 50 -150 50 N
-P 6 0 1 10 150 -50 50 0 150 50 150 -50 150 -50 150 -50 N
-X A 1 -300 0 150 R 50 50 0 1 P
-X A 2 300 0 150 L 50 50 0 1 P
-X K 3 0 -200 100 U 50 50 0 1 P
-ENDDRAW
-ENDDEF
-#
-# D_Zener_x2_KCom_AAK_Parallel
+# D_Schottky_Dual_Series_CAK_Parallel
 #
-DEF D_Zener_x2_KCom_AAK_Parallel D 0 30 Y N 1 F N
+DEF D_Schottky_Dual_Series_CAK_Parallel D 0 30 Y N 1 F N
 F0 "D" 0 200 50 H V C CNN
-F1 "D_Zener_x2_KCom_AAK_Parallel" 0 -200 50 H V C CNN
-F2 "" 50 0 50 H I C CNN
-F3 "" 50 0 50 H I C CNN
+F1 "D_Schottky_Dual_Series_CAK_Parallel" 0 -200 50 H V C CNN
+F2 "" -50 0 50 H I C CNN
+F3 "" -50 0 50 H I C CNN
 DRAW
-C 50 0 10 0 1 0 F
-P 3 0 0 10 0 -50 0 -150 -20 -150 N
-P 3 0 0 10 0 150 0 50 -20 50 N
-P 2 0 1 0 50 0 100 0 N
-P 4 0 1 0 -100 -100 50 -100 50 100 -100 100 N
-P 6 0 1 10 -100 -50 0 -100 -100 -150 -100 -50 -100 -50 -100 -50 N
-P 6 0 1 10 -100 150 0 100 -100 50 -100 150 -100 150 -100 150 N
-X K 1 -200 100 100 R 50 50 0 1 P
-X K 2 -200 -100 100 R 50 50 0 1 P
-X A 3 200 0 100 L 50 50 0 1 P
+C -50 0 10 0 1 0 F
+P 2 0 1 0 -50 0 -100 0 N
+P 4 0 1 0 100 100 -50 100 -50 -100 100 -100 N
+P 6 0 1 10 -20 -60 -20 -50 0 -50 0 -150 20 -150 20 -140 N
+P 6 0 1 10 0 150 100 100 0 50 0 150 0 150 0 150 N
+P 6 0 1 10 100 -50 0 -100 100 -150 100 -50 100 -50 100 -50 N
+P 6 0 1 10 120 140 120 150 100 150 100 50 80 50 80 60 N
+X A 1 -200 0 100 R 50 50 0 1 P
+X K 2 200 -100 100 L 50 50 0 1 P
+X K 3 200 100 100 L 50 50 0 1 P
 ENDDRAW
 ENDDEF
 #
-# D_Zener_x2_KCom_AAK_Split
+# D_Schottky_Dual_Series_CAK_Split
 #
-DEF D_Zener_x2_KCom_AAK_Split D 0 30 Y N 2 L N
+DEF D_Schottky_Dual_Series_CAK_Split D 0 30 Y N 2 L N
 F0 "D" 0 100 50 H V C CNN
-F1 "D_Zener_x2_KCom_AAK_Split" 0 -100 50 H V C CNN
+F1 "D_Schottky_Dual_Series_CAK_Split" 0 -100 50 H V C CNN
 F2 "" -100 -100 50 H I C CNN
 F3 "" -100 -100 50 H I C CNN
 DRAW
-T 0 100 50 50 0 2 0 3 Normal 0 C C
-P 3 0 0 10 50 50 50 -50 30 -50 N
-P 2 2 0 0 150 0 -50 0 N
+T 0 -100 50 50 0 2 0 1 Normal 0 C C
+P 2 2 0 0 50 0 -150 0 N
 P 6 0 1 10 -50 50 50 0 -50 -50 -50 50 -50 50 -50 50 N
+P 6 0 1 10 70 40 70 50 50 50 50 -50 30 -50 30 -40 N
 P 2 1 1 0 50 0 -50 0 N
-X A 1 -150 0 100 R 50 50 1 1 P
-X K 3 150 0 100 L 50 50 1 1 P
-X K 2 -150 0 100 R 50 50 2 1 P
-ENDDRAW
-ENDDEF
-#
-# D_Zener_x2_KCom_AKA
-#
-DEF D_Zener_x2_KCom_AKA D 0 30 Y N 1 F N
-F0 "D" 50 -100 50 H V C CNN
-F1 "D_Zener_x2_KCom_AKA" 0 100 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- SOT*
- SC*
-$ENDFPLIST
-DRAW
-C 0 0 10 0 1 0 F
-P 2 0 1 0 0 0 0 -100 N
-P 2 0 1 10 70 50 70 50 N
-P 2 0 1 0 150 0 -150 0 N
-P 3 0 1 10 -70 -50 -50 -50 -50 50 N
-P 3 0 1 10 50 -50 50 50 70 50 N
-P 6 0 1 10 -150 50 -50 0 -150 -50 -150 50 -150 50 -150 50 N
-P 6 0 1 10 150 -50 50 0 150 50 150 -50 150 -50 150 -50 N
-X A 1 -300 0 150 R 50 50 0 1 P
-X K 2 0 -200 100 U 50 50 0 1 P
-X A 3 300 0 150 L 50 50 0 1 P
+X K 1 150 0 100 L 50 50 1 1 P
+X A 2 -150 0 100 R 50 50 1 1 P
+X K 3 150 0 100 L 50 50 2 1 P
 ENDDRAW
 ENDDEF
 #
-# D_Zener_x2_KCom_AKA_Parallel
+# D_Schottky_Dual_Series_CKA_Parallel
 #
-DEF D_Zener_x2_KCom_AKA_Parallel D 0 30 Y N 1 F N
+DEF D_Schottky_Dual_Series_CKA_Parallel D 0 30 Y N 1 F N
 F0 "D" 0 200 50 H V C CNN
-F1 "D_Zener_x2_KCom_AKA_Parallel" 0 -200 50 H V C CNN
-F2 "" 50 0 50 H I C CNN
-F3 "" 50 0 50 H I C CNN
+F1 "D_Schottky_Dual_Series_CKA_Parallel" 0 -200 50 H V C CNN
+F2 "" -50 0 50 H I C CNN
+F3 "" -50 0 50 H I C CNN
 DRAW
-C 50 0 10 0 1 0 F
-P 3 0 0 10 0 -50 0 -150 -20 -150 N
-P 3 0 0 10 0 150 0 50 -20 50 N
-P 2 0 1 0 50 0 100 0 N
-P 4 0 1 0 -100 -100 50 -100 50 100 -100 100 N
-P 6 0 1 10 -100 -50 0 -100 -100 -150 -100 -50 -100 -50 -100 -50 N
-P 6 0 1 10 -100 150 0 100 -100 50 -100 150 -100 150 -100 150 N
-X K 1 -200 100 100 R 50 50 0 1 P
-X A 2 200 0 100 L 50 50 0 1 P
-X K 3 -200 -100 100 R 50 50 0 1 P
+C -50 0 10 0 1 0 F
+P 2 0 1 0 -50 0 -100 0 N
+P 4 0 1 0 100 100 -50 100 -50 -100 100 -100 N
+P 6 0 1 10 -20 -60 -20 -50 0 -50 0 -150 20 -150 20 -140 N
+P 6 0 1 10 0 150 100 100 0 50 0 150 0 150 0 150 N
+P 6 0 1 10 100 -50 0 -100 100 -150 100 -50 100 -50 100 -50 N
+P 6 0 1 10 120 140 120 150 100 150 100 50 80 50 80 60 N
+X A 1 -200 0 100 R 50 50 0 1 P
+X K 2 200 100 100 L 50 50 0 1 P
+X K 3 200 -100 100 L 50 50 0 1 P
 ENDDRAW
 ENDDEF
 #
-# D_Zener_x2_KCom_AKA_Split
+# D_Schottky_Dual_Series_CKA_Split
 #
-DEF D_Zener_x2_KCom_AKA_Split D 0 30 Y N 2 L N
+DEF D_Schottky_Dual_Series_CKA_Split D 0 30 Y N 2 L N
 F0 "D" 0 100 50 H V C CNN
-F1 "D_Zener_x2_KCom_AKA_Split" 0 -100 50 H V C CNN
+F1 "D_Schottky_Dual_Series_CKA_Split" 0 -100 50 H V C CNN
 F2 "" -100 -100 50 H I C CNN
 F3 "" -100 -100 50 H I C CNN
 DRAW
-T 0 100 50 50 0 2 0 2 Normal 0 C C
-P 3 0 0 10 50 50 50 -50 30 -50 N
-P 2 2 0 0 150 0 -50 0 N
+T 0 -100 50 50 0 2 0 1 Normal 0 C C
+P 2 2 0 0 50 0 -150 0 N
 P 6 0 1 10 -50 50 50 0 -50 -50 -50 50 -50 50 -50 50 N
+P 6 0 1 10 70 40 70 50 50 50 50 -50 30 -50 30 -40 N
 P 2 1 1 0 50 0 -50 0 N
-X A 1 -150 0 100 R 50 50 1 1 P
-X K 2 150 0 100 L 50 50 1 1 P
-X K 3 -150 0 100 R 50 50 2 1 P
-ENDDRAW
-ENDDEF
-#
-# D_Zener_x2_KCom_KAA
-#
-DEF D_Zener_x2_KCom_KAA D 0 30 Y N 1 F N
-F0 "D" 50 -100 50 H V C CNN
-F1 "D_Zener_x2_KCom_KAA" 0 100 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- SOT*
- SC*
-$ENDFPLIST
-DRAW
-C 0 0 10 0 1 0 F
-P 2 0 1 0 -150 0 150 0 N
-P 2 0 1 0 0 0 0 -100 N
-P 3 0 1 10 -50 50 -50 -50 -70 -50 N
-P 3 0 1 10 50 -50 50 50 70 50 N
-P 6 0 1 10 -150 50 -50 0 -150 -50 -150 50 -150 50 -150 50 N
-P 6 0 1 10 150 -50 50 0 150 50 150 -50 150 -50 150 -50 N
-X K 1 0 -200 100 U 50 50 0 1 P
-X A 2 -300 0 150 R 50 50 0 1 P
-X A 3 300 0 150 L 50 50 0 1 P
+X K 1 150 0 100 L 50 50 1 1 P
+X A 3 -150 0 100 R 50 50 1 1 P
+X K 2 150 0 100 L 50 50 2 1 P
 ENDDRAW
 ENDDEF
 #
-# D_Zener_x2_KCom_KAA_Parallel
+# D_Schottky_Dual_Series_KAC_Parallel
 #
-DEF D_Zener_x2_KCom_KAA_Parallel D 0 30 Y N 1 F N
+DEF D_Schottky_Dual_Series_KAC_Parallel D 0 30 Y N 1 F N
 F0 "D" 0 200 50 H V C CNN
-F1 "D_Zener_x2_KCom_KAA_Parallel" 0 -200 50 H V C CNN
-F2 "" 50 0 50 H I C CNN
-F3 "" 50 0 50 H I C CNN
+F1 "D_Schottky_Dual_Series_KAC_Parallel" 0 -200 50 H V C CNN
+F2 "" -50 0 50 H I C CNN
+F3 "" -50 0 50 H I C CNN
 DRAW
-C 50 0 10 0 1 0 F
-P 3 0 0 10 0 -50 0 -150 -20 -150 N
-P 3 0 0 10 0 150 0 50 -20 50 N
-P 2 0 1 0 50 0 100 0 N
-P 4 0 1 0 -100 -100 50 -100 50 100 -100 100 N
-P 6 0 1 10 -100 -50 0 -100 -100 -150 -100 -50 -100 -50 -100 -50 N
-P 6 0 1 10 -100 150 0 100 -100 50 -100 150 -100 150 -100 150 N
-X A 1 200 0 100 L 50 50 0 1 P
-X K 2 -200 100 100 R 50 50 0 1 P
-X K 3 -200 -100 100 R 50 50 0 1 P
+C -50 0 10 0 1 0 F
+P 2 0 1 0 -50 0 -100 0 N
+P 4 0 1 0 100 100 -50 100 -50 -100 100 -100 N
+P 6 0 1 10 -20 -60 -20 -50 0 -50 0 -150 20 -150 20 -140 N
+P 6 0 1 10 0 150 100 100 0 50 0 150 0 150 0 150 N
+P 6 0 1 10 100 -50 0 -100 100 -150 100 -50 100 -50 100 -50 N
+P 6 0 1 10 120 140 120 150 100 150 100 50 80 50 80 60 N
+X K 1 200 100 100 L 50 50 0 1 P
+X K 2 200 -100 100 L 50 50 0 1 P
+X A 3 -200 0 100 R 50 50 0 1 P
 ENDDRAW
 ENDDEF
 #
-# D_Zener_x2_KCom_KAA_Split
+# D_Schottky_Dual_Series_KAC_Split
 #
-DEF D_Zener_x2_KCom_KAA_Split D 0 30 Y N 2 L N
+DEF D_Schottky_Dual_Series_KAC_Split D 0 30 Y N 2 L N
 F0 "D" 0 100 50 H V C CNN
-F1 "D_Zener_x2_KCom_KAA_Split" 0 -100 50 H V C CNN
+F1 "D_Schottky_Dual_Series_KAC_Split" 0 -100 50 H V C CNN
 F2 "" -100 -100 50 H I C CNN
 F3 "" -100 -100 50 H I C CNN
 DRAW
-T 0 100 50 50 0 2 0 1 Normal 0 C C
-P 3 0 0 10 50 50 50 -50 30 -50 N
-P 2 2 0 0 150 0 -50 0 N
+T 0 -100 50 50 0 2 0 3 Normal 0 C C
+P 2 2 0 0 50 0 -150 0 N
 P 6 0 1 10 -50 50 50 0 -50 -50 -50 50 -50 50 -50 50 N
+P 6 0 1 10 70 40 70 50 50 50 50 -50 30 -50 30 -40 N
 P 2 1 1 0 50 0 -50 0 N
-X K 1 150 0 100 L 50 50 1 1 P
 X A 2 -150 0 100 R 50 50 1 1 P
-X K 3 -150 0 100 R 50 50 2 1 P
-ENDDRAW
-ENDDEF
-#
-# D_x2_ACom_AKK
-#
-DEF D_x2_ACom_AKK D 0 30 Y N 1 F N
-F0 "D" 50 -100 50 H V C CNN
-F1 "D_x2_ACom_AKK" 0 100 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-DRAW
-C 0 0 10 0 1 0 F
-P 2 0 1 0 -140 0 150 0 N
-P 2 0 1 0 0 0 0 -100 N
-P 3 0 1 10 -150 50 -150 -50 -150 -50 N
-P 3 0 1 10 150 50 150 -50 150 -50 N
-P 6 0 1 10 -50 -50 -150 0 -50 50 -50 -50 -50 -50 -50 -50 N
-P 6 0 1 10 50 50 150 0 50 -50 50 50 50 50 50 50 N
-X A 1 0 -200 100 U 50 50 0 1 P
-X K 2 -300 0 150 R 50 50 0 1 P
-X K 3 300 0 150 L 50 50 0 1 P
+X K 3 150 0 100 L 50 50 1 1 P
+X K 1 150 0 100 L 50 50 2 1 P
 ENDDRAW
 ENDDEF
 #
-# D_x2_ACom_AKK_Parallel
+# D_Schottky_Dual_Series_KCA_Parallel
 #
-DEF D_x2_ACom_AKK_Parallel D 0 30 Y N 1 F N
+DEF D_Schottky_Dual_Series_KCA_Parallel D 0 30 Y N 1 F N
 F0 "D" 0 200 50 H V C CNN
-F1 "D_x2_ACom_AKK_Parallel" 0 -200 50 H V C CNN
+F1 "D_Schottky_Dual_Series_KCA_Parallel" 0 -200 50 H V C CNN
 F2 "" -50 0 50 H I C CNN
 F3 "" -50 0 50 H I C CNN
 DRAW
 C -50 0 10 0 1 0 F
-P 2 0 0 10 100 -50 100 -150 N
-P 2 0 0 10 100 150 100 50 N
 P 2 0 1 0 -50 0 -100 0 N
 P 4 0 1 0 100 100 -50 100 -50 -100 100 -100 N
-P 6 0 1 10 0 -50 100 -100 0 -150 0 -50 0 -50 0 -50 N
+P 6 0 1 10 -20 -60 -20 -50 0 -50 0 -150 20 -150 20 -140 N
 P 6 0 1 10 0 150 100 100 0 50 0 150 0 150 0 150 N
-X A 1 -200 0 100 R 50 50 0 1 P
-X K 2 200 100 100 L 50 50 0 1 P
+P 6 0 1 10 100 -50 0 -100 100 -150 100 -50 100 -50 100 -50 N
+P 6 0 1 10 120 140 120 150 100 150 100 50 80 50 80 60 N
+X K 1 200 100 100 L 50 50 0 1 P
+X A 2 -200 0 100 R 50 50 0 1 P
 X K 3 200 -100 100 L 50 50 0 1 P
 ENDDRAW
 ENDDEF
 #
-# D_x2_ACom_AKK_Split
+# D_Schottky_Dual_Series_KCA_Split
 #
-DEF D_x2_ACom_AKK_Split D 0 30 Y N 2 L N
+DEF D_Schottky_Dual_Series_KCA_Split D 0 30 Y N 2 L N
 F0 "D" 0 100 50 H V C CNN
-F1 "D_x2_ACom_AKK_Split" 0 -100 50 H V C CNN
+F1 "D_Schottky_Dual_Series_KCA_Split" 0 -100 50 H V C CNN
 F2 "" -100 -100 50 H I C CNN
 F3 "" -100 -100 50 H I C CNN
 DRAW
-T 0 -100 50 50 0 2 0 1 Normal 0 C C
-P 2 0 0 10 50 50 50 -50 N
+T 0 -100 50 50 0 2 0 2 Normal 0 C C
 P 2 2 0 0 50 0 -150 0 N
 P 6 0 1 10 -50 50 50 0 -50 -50 -50 50 -50 50 -50 50 N
+P 6 0 1 10 70 40 70 50 50 50 50 -50 30 -50 30 -40 N
 P 2 1 1 0 50 0 -50 0 N
-X A 1 -150 0 100 R 50 50 1 1 P
 X K 2 150 0 100 L 50 50 1 1 P
-X K 3 150 0 100 L 50 50 2 1 P
+X A 3 -150 0 100 R 50 50 1 1 P
+X K 1 150 0 100 L 50 50 2 1 P
+ENDDRAW
+ENDDEF
+#
+# D_Schottky_Filled
+#
+DEF D_Schottky_Filled D 0 40 N N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "D_Schottky_Filled" 0 -100 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ TO-???*
+ *_Diode_*
+ *SingleDiode*
+ D_*
+$ENDFPLIST
+DRAW
+P 2 0 1 0 50 0 -50 0 N
+P 4 0 1 10 50 50 50 -50 -50 0 50 50 F
+P 6 0 1 10 -75 25 -75 50 -50 50 -50 -50 -25 -50 -25 -25 N
+X K 1 -150 0 100 R 50 50 1 1 P
+X A 2 150 0 100 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# D_Schottky_KAA
+#
+DEF D_Schottky_KAA D 0 0 Y N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "D_Schottky_KAA" 0 -100 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ TO-???*
+ *_Diode_*
+ *SingleDiode*
+ D_*
+$ENDFPLIST
+DRAW
+C 100 0 10 0 1 0 F
+P 4 0 1 10 50 50 50 -50 -50 0 50 50 N
+P 4 0 1 0 150 100 100 100 100 0 -50 0 N
+P 6 0 1 10 -75 25 -75 50 -50 50 -50 -50 -25 -50 -25 -25 N
+X K 1 -150 0 100 R 50 50 1 1 P
+X A 2 200 100 100 L 50 50 1 1 I
+X A 3 200 0 100 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# D_Schottky_KAK
+#
+DEF D_Schottky_KAK D 0 0 Y N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "D_Schottky_KAK" 0 -100 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ TO-???*
+ *_Diode_*
+ *SingleDiode*
+ D_*
+$ENDFPLIST
+DRAW
+C -150 0 10 0 1 0 F
+P 3 0 1 0 -150 100 -150 0 100 0 N
+P 4 0 1 10 50 50 50 -50 -50 0 50 50 N
+P 6 0 1 10 -75 25 -75 50 -50 50 -50 -50 -25 -50 -25 -25 N
+X K 1 -250 100 100 R 50 50 1 1 P
+X A 2 200 0 100 L 50 50 1 1 P
+X K 3 -250 0 100 R 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# D_Schottky_KKA
+#
+DEF D_Schottky_KKA D 0 0 Y N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "D_Schottky_KKA" 0 -100 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ TO-???*
+ *_Diode_*
+ *SingleDiode*
+ D_*
+$ENDFPLIST
+DRAW
+C -150 0 10 0 1 0 F
+P 4 0 1 0 -200 100 -150 100 -150 0 100 0 N
+P 4 0 1 10 50 50 50 -50 -50 0 50 50 N
+P 6 0 1 10 -75 25 -75 50 -50 50 -50 -50 -25 -50 -25 -25 N
+X K 1 -250 100 100 R 50 50 1 1 I
+X K 2 -250 0 100 R 50 50 1 1 P
+X A 3 200 0 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# D_x2_ACom_KAK
+# D_Schottky_Small
 #
-DEF D_x2_ACom_KAK D 0 30 Y N 1 F N
-F0 "D" 50 -100 50 H V C CNN
-F1 "D_x2_ACom_KAK" 0 100 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
+DEF D_Schottky_Small D 0 10 N N 1 F N
+F0 "D" -50 80 50 H V L CNN
+F1 "D_Schottky_Small" -280 -80 50 H V L CNN
+F2 "" 0 0 50 V I C CNN
+F3 "" 0 0 50 V I C CNN
+$FPLIST
+ TO-???*
+ *_Diode_*
+ *SingleDiode*
+ D_*
+$ENDFPLIST
 DRAW
-C 0 0 10 0 1 0 F
-P 2 0 1 0 0 0 0 -100 N
-P 2 0 1 0 150 0 -150 0 N
-P 3 0 1 10 -150 50 -150 -50 -150 -50 N
-P 3 0 1 10 150 50 150 -50 150 -50 N
-P 6 0 1 10 -50 -50 -150 0 -50 50 -50 -50 -50 -50 -50 -50 N
-P 6 0 1 10 50 50 150 0 50 -50 50 50 50 50 50 50 N
-X K 1 -300 0 150 R 50 50 0 1 P
-X A 2 0 -200 100 U 50 50 0 1 P
-X K 3 300 0 150 L 50 50 0 1 P
+P 2 0 1 0 -30 0 30 0 N
+P 4 0 1 10 30 -40 -30 0 30 40 30 -40 N
+P 6 0 1 10 -50 30 -50 40 -30 40 -30 -40 -10 -40 -10 -30 N
+X K 1 -100 0 70 R 50 50 1 1 P
+X A 2 100 0 70 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# D_x2_ACom_KAK_Parallel
+# D_Schottky_Small_Filled
 #
-DEF D_x2_ACom_KAK_Parallel D 0 30 Y N 1 F N
-F0 "D" 0 200 50 H V C CNN
-F1 "D_x2_ACom_KAK_Parallel" 0 -200 50 H V C CNN
-F2 "" -50 0 50 H I C CNN
-F3 "" -50 0 50 H I C CNN
+DEF D_Schottky_Small_Filled D 0 10 N N 1 F N
+F0 "D" -50 80 50 H V L CNN
+F1 "D_Schottky_Small_Filled" -280 -80 50 H V L CNN
+F2 "" 0 0 50 V I C CNN
+F3 "" 0 0 50 V I C CNN
+$FPLIST
+ TO-???*
+ *_Diode_*
+ *SingleDiode*
+ D_*
+$ENDFPLIST
 DRAW
-C -50 0 10 0 1 0 F
-P 2 0 0 10 100 -50 100 -150 N
-P 2 0 0 10 100 150 100 50 N
-P 2 0 1 0 -50 0 -100 0 N
-P 4 0 1 0 100 100 -50 100 -50 -100 100 -100 N
-P 6 0 1 10 0 -50 100 -100 0 -150 0 -50 0 -50 0 -50 N
-P 6 0 1 10 0 150 100 100 0 50 0 150 0 150 0 150 N
-X K 1 200 100 100 L 50 50 0 1 P
-X A 2 -200 0 100 R 50 50 0 1 P
-X K 3 200 -100 100 L 50 50 0 1 P
+P 2 0 1 0 -30 0 30 0 N
+P 4 0 1 10 30 -40 -30 0 30 40 30 -40 F
+P 6 0 1 10 -50 30 -50 40 -30 40 -30 -40 -10 -40 -10 -30 N
+X K 1 -100 0 70 R 50 50 1 1 P
+X A 2 100 0 70 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# D_x2_ACom_KAK_Split
+# D_Shockley
 #
-DEF D_x2_ACom_KAK_Split D 0 30 Y N 2 L N
+DEF D_Shockley D 0 40 N N 1 F N
 F0 "D" 0 100 50 H V C CNN
-F1 "D_x2_ACom_KAK_Split" 0 -100 50 H V C CNN
-F2 "" -100 -100 50 H I C CNN
-F3 "" -100 -100 50 H I C CNN
+F1 "D_Shockley" 0 -100 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ TO-???*
+ *_Diode_*
+ *SingleDiode*
+ D_*
+$ENDFPLIST
 DRAW
-T 0 -100 50 50 0 2 0 2 Normal 0 C C
-P 2 0 0 10 50 50 50 -50 N
-P 2 2 0 0 50 0 -150 0 N
-P 6 0 1 10 -50 50 50 0 -50 -50 -50 50 -50 50 -50 50 N
-P 2 1 1 0 50 0 -50 0 N
-X K 1 150 0 100 L 50 50 1 1 P
-X A 2 -150 0 100 R 50 50 1 1 P
-X K 3 150 0 100 L 50 50 2 1 P
+P 2 0 1 0 -50 0 50 0 N
+P 2 0 1 10 -50 50 -50 -50 N
+P 3 0 1 10 -50 0 50 50 50 -50 N
+X K 1 -150 0 100 R 50 50 1 1 P
+X A 2 150 0 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# D_x2_ACom_KKA
+# D_SiPM
 #
-DEF D_x2_ACom_KKA D 0 30 Y N 1 F N
-F0 "D" 50 -100 50 H V C CNN
-F1 "D_x2_ACom_KKA" 0 100 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
+DEF D_SiPM D 0 20 N N 1 F N
+F0 "D" 70 70 50 H V L CNN
+F1 "D_SiPM" 10 -110 50 H V C CNN
+F2 "" 50 175 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
+$FPLIST
+ MPPC*
+$ENDFPLIST
 DRAW
-C 0 0 10 0 1 0 F
-P 2 0 1 0 -150 0 150 0 N
-P 2 0 1 0 0 0 0 -100 N
-P 3 0 1 10 -150 50 -150 -50 -150 -50 N
-P 3 0 1 10 150 50 150 -50 150 -50 N
-P 6 0 1 10 -50 -50 -150 0 -50 50 -50 -50 -50 -50 -50 -50 N
-P 6 0 1 10 50 50 150 0 50 -50 50 50 50 50 50 50 N
-X K 1 -300 0 150 R 50 50 0 1 P
-X K 2 300 0 150 L 50 50 0 1 P
-X A 3 0 -200 100 U 50 50 0 1 P
+P 2 0 1 0 -50 0 50 0 N
+P 2 0 1 10 -50 50 -50 -50 N
+P 2 0 1 0 -30 70 -10 70 N
+P 2 0 1 10 50 50 50 -50 N
+P 3 0 1 0 30 130 -30 70 -30 90 N
+P 3 0 1 10 50 50 -50 0 50 -50 N
+P 5 0 1 0 80 130 20 70 20 90 20 70 40 70 N
+X K 1 -150 0 100 R 50 50 1 1 P
+X A 2 150 0 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# D_x2_ACom_KKA_Parallel
+# D_Small
 #
-DEF D_x2_ACom_KKA_Parallel D 0 30 Y N 1 F N
-F0 "D" 0 200 50 H V C CNN
-F1 "D_x2_ACom_KKA_Parallel" 0 -200 50 H V C CNN
-F2 "" -50 0 50 H I C CNN
-F3 "" -50 0 50 H I C CNN
+DEF D_Small D 0 10 N N 1 F N
+F0 "D" -50 80 50 H V L CNN
+F1 "D_Small" -150 -80 50 H V L CNN
+F2 "" 0 0 50 V I C CNN
+F3 "" 0 0 50 V I C CNN
+$FPLIST
+ TO-???*
+ *_Diode_*
+ *SingleDiode*
+ D_*
+$ENDFPLIST
 DRAW
-C -50 0 10 0 1 0 F
-P 2 0 0 10 100 -150 100 -50 N
-P 2 0 0 10 100 50 100 150 N
-P 2 0 1 0 -50 0 -100 0 N
-P 4 0 1 0 100 100 -50 100 -50 -100 100 -100 N
-P 6 0 1 10 0 -50 100 -100 0 -150 0 -50 0 -50 0 -50 N
-P 6 0 1 10 0 150 100 100 0 50 0 150 0 150 0 150 N
-X K 1 200 100 100 L 50 50 0 1 P
-X K 2 200 -100 100 L 50 50 0 1 P
-X A 3 -200 0 100 R 50 50 0 1 P
+P 2 0 1 10 -30 -40 -30 40 N
+P 2 0 1 0 -30 0 30 0 N
+P 4 0 1 10 30 -40 -30 0 30 40 30 -40 N
+X K 1 -100 0 70 R 50 50 1 1 P
+X A 2 100 0 70 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# D_x2_ACom_KKA_Split
+# D_Small_Filled
 #
-DEF D_x2_ACom_KKA_Split D 0 30 Y N 2 L N
-F0 "D" 0 100 50 H V C CNN
-F1 "D_x2_ACom_KKA_Split" 0 -100 50 H V C CNN
-F2 "" -100 -100 50 H I C CNN
-F3 "" -100 -100 50 H I C CNN
+DEF D_Small_Filled D 0 10 N N 1 F N
+F0 "D" -50 80 50 H V L CNN
+F1 "D_Small_Filled" -150 -80 50 H V L CNN
+F2 "" 0 0 50 V I C CNN
+F3 "" 0 0 50 V I C CNN
+$FPLIST
+ TO-???*
+ *_Diode_*
+ *SingleDiode*
+ D_*
+$ENDFPLIST
 DRAW
-T 0 -100 50 50 0 2 0 3 Normal 0 C C
-P 2 0 0 10 50 50 50 -50 N
-P 2 2 0 0 50 0 -150 0 N
-P 6 0 1 10 -50 50 50 0 -50 -50 -50 50 -50 50 -50 50 N
-P 2 1 1 0 50 0 -50 0 N
-X K 1 150 0 100 L 50 50 1 1 P
-X A 3 -150 0 100 R 50 50 1 1 P
-X K 2 150 0 100 L 50 50 2 1 P
+P 2 0 1 10 -30 -40 -30 40 N
+P 2 0 1 0 -30 0 30 0 N
+P 4 0 1 10 30 -40 -30 0 30 40 30 -40 F
+X K 1 -100 0 70 R 50 50 1 1 P
+X A 2 100 0 70 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# D_x2_KCom_AAK
+# D_TVS
 #
-DEF D_x2_KCom_AAK D 0 30 Y N 1 F N
-F0 "D" 50 -100 50 H V C CNN
-F1 "D_x2_KCom_AAK" 0 100 50 H V C CNN
+DEF D_TVS D 0 40 N N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "D_TVS" 0 -100 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
+$FPLIST
+ TO-???*
+ *_Diode_*
+ *SingleDiode*
+ D_*
+$ENDFPLIST
+DRAW
+P 2 0 1 0 50 0 -50 0 N
+P 4 0 1 10 20 50 0 50 0 -50 -20 -50 N
+P 5 0 1 10 -100 50 -100 -50 100 50 100 -50 -100 50 N
+X A1 1 -150 0 100 R 50 50 1 1 P
+X A2 2 150 0 100 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# D_TVS_Dual_AAC
+#
+DEF D_TVS_Dual_AAC D 0 40 Y N 1 F N
+F0 "D" 0 175 50 H V C CNN
+F1 "D_TVS_Dual_AAC" 0 100 50 H V C CNN
+F2 "" -150 0 50 H I C CNN
+F3 "" -150 0 50 H I C CNN
 DRAW
 C 0 0 10 0 1 0 F
-P 2 0 1 0 -150 0 150 0 N
-P 2 0 1 0 0 0 0 -100 N
-P 3 0 1 10 -50 -50 -50 50 -50 50 N
-P 3 0 1 10 50 -50 50 50 50 50 N
-P 6 0 1 10 -150 50 -50 0 -150 -50 -150 50 -150 50 -150 50 N
-P 6 0 1 10 150 -50 50 0 150 50 150 -50 150 -50 150 -50 N
-X A 1 -300 0 150 R 50 50 0 1 P
-X A 2 300 0 150 L 50 50 0 1 P
-X K 3 0 -200 100 U 50 50 0 1 P
+P 2 0 0 0 0 -50 0 0 N
+P 2 0 1 0 -250 0 250 0 N
+P 4 0 1 10 -130 50 -150 50 -150 -50 -170 -50 N
+P 4 0 1 10 170 50 150 50 150 -50 130 -50 N
+P 5 0 1 10 -250 50 -50 -50 -50 50 -250 -50 -250 50 N
+P 5 0 1 10 250 50 50 -50 50 50 250 -50 250 50 N
+X A1 1 -350 0 100 R 50 50 1 1 P
+X A2 2 350 0 100 L 50 50 1 1 P
+X common 3 0 -150 100 U 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
-# D_x2_KCom_AAK_Parallel
+# D_TVS_Dual_ACA
 #
-DEF D_x2_KCom_AAK_Parallel D 0 30 Y N 1 F N
-F0 "D" 0 200 50 H V C CNN
-F1 "D_x2_KCom_AAK_Parallel" 0 -200 50 H V C CNN
-F2 "" 50 0 50 H I C CNN
-F3 "" 50 0 50 H I C CNN
+DEF D_TVS_Dual_ACA D 0 40 Y N 1 F N
+F0 "D" 0 175 50 H V C CNN
+F1 "D_TVS_Dual_ACA" 0 100 50 H V C CNN
+F2 "" -150 0 50 H I C CNN
+F3 "" -150 0 50 H I C CNN
 DRAW
-C 50 0 10 0 1 0 F
-P 2 0 0 10 0 -50 0 -150 N
-P 2 0 0 10 0 50 0 150 N
-P 2 0 1 0 50 0 100 0 N
-P 4 0 1 0 -100 -100 50 -100 50 100 -100 100 N
-P 6 0 1 10 -100 -50 0 -100 -100 -150 -100 -50 -100 -50 -100 -50 N
-P 6 0 1 10 -100 150 0 100 -100 50 -100 150 -100 150 -100 150 N
-X K 1 -200 100 100 R 50 50 0 1 P
-X K 2 -200 -100 100 R 50 50 0 1 P
-X A 3 200 0 100 L 50 50 0 1 P
+C 0 0 10 0 1 0 F
+P 5 0 0 10 -250 -50 -50 50 -50 -50 -250 50 -250 -50 N
+P 5 0 0 10 50 50 50 -50 250 50 250 -50 50 50 N
+P 2 0 1 0 -250 0 250 0 N
+P 2 0 1 0 0 0 0 -50 N
+P 4 0 1 10 -130 50 -150 50 -150 -50 -170 -50 N
+P 4 0 1 10 170 50 150 50 150 -50 130 -50 N
+X A1 1 -350 0 100 R 50 50 1 1 P
+X common 2 0 -150 100 U 50 50 1 1 I
+X A2 3 350 0 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# D_x2_KCom_AAK_Split
+# D_TVS_Dual_CAA
 #
-DEF D_x2_KCom_AAK_Split D 0 30 Y N 2 L N
-F0 "D" 0 100 50 H V C CNN
-F1 "D_x2_KCom_AAK_Split" 0 -100 50 H V C CNN
-F2 "" -100 -100 50 H I C CNN
-F3 "" -100 -100 50 H I C CNN
+DEF D_TVS_Dual_CAA D 0 40 Y N 1 F N
+F0 "D" 0 175 50 H V C CNN
+F1 "D_TVS_Dual_CAA" 0 100 50 H V C CNN
+F2 "" -150 0 50 H I C CNN
+F3 "" -150 0 50 H I C CNN
 DRAW
-T 0 100 50 50 0 2 0 3 Normal 0 C C
-P 2 0 0 10 50 50 50 -50 N
-P 2 2 0 0 150 0 -50 0 N
-P 6 0 1 10 -50 50 50 0 -50 -50 -50 50 -50 50 -50 50 N
-P 2 1 1 0 50 0 -50 0 N
-X A 1 -150 0 100 R 50 50 1 1 P
-X K 3 150 0 100 L 50 50 1 1 P
-X K 2 -150 0 100 R 50 50 2 1 P
+C 0 0 10 0 1 0 F
+P 2 0 1 0 -250 0 250 0 N
+P 2 0 1 0 0 0 0 -50 N
+P 4 0 1 10 -130 50 -150 50 -150 -50 -170 -50 N
+P 4 0 1 10 170 50 150 50 150 -50 130 -50 N
+P 5 0 1 10 -250 -50 -50 50 -50 -50 -250 50 -250 -50 N
+P 6 0 1 10 50 40 50 -50 250 50 250 -50 50 50 50 40 N
+X common 1 0 -150 100 U 50 50 1 1 I
+X A1 2 -350 0 100 R 50 50 1 1 P
+X A2 3 350 0 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# D_x2_KCom_AKA
+# D_TVS_Filled
 #
-DEF D_x2_KCom_AKA D 0 30 Y N 1 F N
-F0 "D" 50 -100 50 H V C CNN
-F1 "D_x2_KCom_AKA" 0 100 50 H V C CNN
+DEF D_TVS_Filled D 0 40 N N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "D_TVS_Filled" 0 -100 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
+$FPLIST
+ TO-???*
+ *_Diode_*
+ *SingleDiode*
+ D_*
+$ENDFPLIST
 DRAW
-C 0 0 10 0 1 0 F
-P 2 0 1 0 0 0 0 -100 N
-P 2 0 1 0 150 0 -150 0 N
-P 3 0 1 10 -50 -50 -50 50 -50 50 N
-P 3 0 1 10 50 -50 50 50 50 50 N
-P 6 0 1 10 -150 50 -50 0 -150 -50 -150 50 -150 50 -150 50 N
-P 6 0 1 10 150 -50 50 0 150 50 150 -50 150 -50 150 -50 N
-X A 1 -300 0 150 R 50 50 0 1 P
-X K 2 0 -200 100 U 50 50 0 1 P
-X A 3 300 0 150 L 50 50 0 1 P
+P 2 0 1 0 50 0 -50 0 N
+P 4 0 1 10 -100 -50 0 0 -100 50 -100 -50 F
+P 4 0 1 10 20 50 0 50 0 -50 -20 -50 N
+P 4 0 1 10 100 50 100 -50 0 0 100 50 F
+X A1 1 -150 0 100 R 50 50 1 1 P
+X A2 2 150 0 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# D_x2_KCom_AKA_Parallel
+# D_TemperatureDependent
 #
-DEF D_x2_KCom_AKA_Parallel D 0 30 Y N 1 F N
-F0 "D" 0 200 50 H V C CNN
-F1 "D_x2_KCom_AKA_Parallel" 0 -200 50 H V C CNN
-F2 "" 50 0 50 H I C CNN
-F3 "" 50 0 50 H I C CNN
+DEF D_TemperatureDependent D 0 40 N N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "D_TemperatureDependent" 0 -125 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ TO-???*
+ *_Diode_*
+ *SingleDiode*
+ D_*
+$ENDFPLIST
 DRAW
-C 50 0 10 0 1 0 F
-P 2 0 0 10 0 -50 0 -150 N
-P 2 0 0 10 0 150 0 50 N
-P 2 0 1 0 50 0 100 0 N
-P 4 0 1 0 -100 -100 50 -100 50 100 -100 100 N
-P 6 0 1 10 -100 -50 0 -100 -100 -150 -100 -50 -100 -50 -100 -50 N
-P 6 0 1 10 -100 150 0 100 -100 50 -100 150 -100 150 -100 150 N
-X K 1 -200 100 100 R 50 50 0 1 P
-X A 2 200 0 100 L 50 50 0 1 P
-X K 3 -200 -100 100 R 50 50 0 1 P
+A -104 -54 7 -265 818 0 1 0 N -98 -57 -103 -47
+A -88 -57 10 1800 -900 0 1 0 N -98 -57 -88 -67
+A -88 -57 10 -900 0 0 1 0 N -88 -67 -78 -57
+A -88 -32 10 0 900 0 1 0 N -78 -32 -88 -22
+A -88 -32 10 900 1800 0 1 0 N -88 -22 -98 -32
+A -88 -32 10 1800 -900 0 1 0 N -98 -32 -88 -42
+A -82 -23 20 -1075 -253 0 1 0 N -88 -42 -63 -32
+P 2 0 1 0 -78 -56 -78 -32 N
+P 2 0 1 10 -50 50 -50 -50 N
+P 2 0 1 0 50 0 -50 0 N
+P 4 0 1 10 50 -50 50 50 -50 0 50 -50 N
+X K 1 -150 0 100 R 50 50 1 1 P
+X A 2 150 0 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# D_x2_KCom_AKA_Split
+# D_TemperatureDependent_Filled
 #
-DEF D_x2_KCom_AKA_Split D 0 30 Y N 2 L N
+DEF D_TemperatureDependent_Filled D 0 40 N N 1 F N
 F0 "D" 0 100 50 H V C CNN
-F1 "D_x2_KCom_AKA_Split" 0 -100 50 H V C CNN
-F2 "" -100 -100 50 H I C CNN
-F3 "" -100 -100 50 H I C CNN
+F1 "D_TemperatureDependent_Filled" 0 -125 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ TO-???*
+ *_Diode_*
+ *SingleDiode*
+ D_*
+$ENDFPLIST
 DRAW
-T 0 100 50 50 0 2 0 2 Normal 0 C C
-P 2 0 0 10 50 50 50 -50 N
-P 2 2 0 0 150 0 -50 0 N
-P 6 0 1 10 -50 50 50 0 -50 -50 -50 50 -50 50 -50 50 N
-P 2 1 1 0 50 0 -50 0 N
-X A 1 -150 0 100 R 50 50 1 1 P
-X K 2 150 0 100 L 50 50 1 1 P
-X K 3 -150 0 100 R 50 50 2 1 P
+A -104 -54 7 -265 818 0 1 0 N -98 -57 -103 -47
+A -88 -57 10 1800 -900 0 1 0 N -98 -57 -88 -67
+A -88 -57 10 -900 0 0 1 0 N -88 -67 -78 -57
+A -88 -32 10 0 900 0 1 0 N -78 -32 -88 -22
+A -88 -32 10 900 1800 0 1 0 N -88 -22 -98 -32
+A -88 -32 10 1800 -900 0 1 0 N -98 -32 -88 -42
+A -82 -23 20 -1075 -253 0 1 0 N -88 -42 -63 -32
+P 2 0 1 0 -78 -56 -78 -32 N
+P 2 0 1 10 -50 50 -50 -50 N
+P 2 0 1 0 50 0 -50 0 N
+P 4 0 1 10 50 -50 50 50 -50 0 50 -50 F
+X K 1 -150 0 100 R 50 50 1 1 P
+X A 2 150 0 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# D_x2_KCom_KAA
+# D_Tunnel
 #
-DEF D_x2_KCom_KAA D 0 30 Y N 1 F N
-F0 "D" 50 -100 50 H V C CNN
-F1 "D_x2_KCom_KAA" 0 100 50 H V C CNN
+DEF D_Tunnel D 0 40 N N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "D_Tunnel" 0 -100 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
+$FPLIST
+ TO-???*
+ *_Diode_*
+ *SingleDiode*
+ D_*
+$ENDFPLIST
 DRAW
-C 0 0 10 0 1 0 F
-P 2 0 1 0 -150 0 150 0 N
-P 2 0 1 0 0 0 0 -100 N
-P 3 0 1 10 -50 -50 -50 50 -50 50 N
-P 3 0 1 10 50 -50 50 50 50 50 N
-P 6 0 1 10 -150 50 -50 0 -150 -50 -150 50 -150 50 -150 50 N
-P 6 0 1 10 150 -50 50 0 150 50 150 -50 150 -50 150 -50 N
-X K 1 0 -200 100 U 50 50 0 1 P
-X A 2 -300 0 150 R 50 50 0 1 P
-X A 3 300 0 150 L 50 50 0 1 P
+P 2 0 1 0 50 0 -50 0 N
+P 4 0 1 10 -30 50 -50 50 -50 -50 -30 -50 N
+P 4 0 1 10 50 -50 50 50 -50 0 50 -50 N
+X K 1 -150 0 100 R 50 50 1 1 P
+X A 2 150 0 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# D_x2_KCom_KAA_Parallel
+# D_Tunnel_Filled
 #
-DEF D_x2_KCom_KAA_Parallel D 0 30 Y N 1 F N
-F0 "D" 0 200 50 H V C CNN
-F1 "D_x2_KCom_KAA_Parallel" 0 -200 50 H V C CNN
-F2 "" 50 0 50 H I C CNN
-F3 "" 50 0 50 H I C CNN
+DEF D_Tunnel_Filled D 0 40 N N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "D_Tunnel_Filled" 0 -100 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ TO-???*
+ *_Diode_*
+ *SingleDiode*
+ D_*
+$ENDFPLIST
 DRAW
-C 50 0 10 0 1 0 F
-P 2 0 0 10 0 -50 0 -150 N
-P 2 0 0 10 0 150 0 50 N
-P 2 0 1 0 50 0 100 0 N
-P 4 0 1 0 -100 -100 50 -100 50 100 -100 100 N
-P 6 0 1 10 -100 -50 0 -100 -100 -150 -100 -50 -100 -50 -100 -50 N
-P 6 0 1 10 -100 150 0 100 -100 50 -100 150 -100 150 -100 150 N
-X A 1 200 0 100 L 50 50 0 1 P
-X K 2 -200 100 100 R 50 50 0 1 P
-X K 3 -200 -100 100 R 50 50 0 1 P
+P 2 0 1 0 50 0 -50 0 N
+P 4 0 1 10 -30 50 -50 50 -50 -50 -30 -50 N
+P 4 0 1 10 50 -50 50 50 -50 0 50 -50 F
+X K 1 -150 0 100 R 50 50 1 1 P
+X A 2 150 0 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# D_x2_KCom_KAA_Split
+# D_Unitunnel
 #
-DEF D_x2_KCom_KAA_Split D 0 30 Y N 2 L N
+DEF D_Unitunnel D 0 40 N N 1 F N
 F0 "D" 0 100 50 H V C CNN
-F1 "D_x2_KCom_KAA_Split" 0 -100 50 H V C CNN
-F2 "" -100 -100 50 H I C CNN
-F3 "" -100 -100 50 H I C CNN
+F1 "D_Unitunnel" 0 -100 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ TO-???*
+ *_Diode_*
+ *SingleDiode*
+ D_*
+$ENDFPLIST
 DRAW
-T 0 100 50 50 0 2 0 1 Normal 0 C C
-P 2 1 0 10 50 50 50 -50 N
-P 2 2 0 0 150 0 -50 0 N
-P 6 0 1 10 -50 50 50 0 -50 -50 -50 50 -50 50 -50 50 N
-P 2 1 1 0 50 0 -50 0 N
-X K 1 150 0 100 L 50 50 1 1 P
-X A 2 -150 0 100 R 50 50 1 1 P
-X K 3 -150 0 100 R 50 50 2 1 P
+P 2 0 1 0 50 0 -50 0 N
+P 4 0 1 10 50 -50 50 50 -50 0 50 -50 N
+P 6 0 1 10 -70 -50 -30 -50 -50 -50 -50 50 -30 50 -70 50 N
+X K 1 -150 0 100 R 50 50 1 1 P
+X A 2 150 0 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# D_x2_Serial_ACK
+# D_Unitunnel_Filled
 #
-DEF D_x2_Serial_ACK D 0 30 Y N 1 F N
-F0 "D" 50 -100 50 H V C CNN
-F1 "D_x2_Serial_ACK" 0 100 50 H V C CNN
+DEF D_Unitunnel_Filled D 0 40 N N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "D_Unitunnel_Filled" 0 -100 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
+$FPLIST
+ TO-???*
+ *_Diode_*
+ *SingleDiode*
+ D_*
+$ENDFPLIST
 DRAW
-C 0 0 10 0 1 0 F
-P 2 0 1 0 0 0 0 -100 N
-P 2 0 1 0 150 0 -150 0 N
-P 2 0 1 0 250 0 300 0 N
-P 3 0 1 10 -50 -50 -50 50 -50 50 N
-P 3 0 1 10 150 50 150 -50 150 -50 N
-P 6 0 1 10 -150 50 -50 0 -150 -50 -150 50 -150 50 -150 50 N
-P 6 0 1 10 50 50 150 0 50 -50 50 50 50 50 50 50 N
-X A 1 -300 0 150 R 50 50 0 1 P
-X common 2 0 -200 100 U 50 50 0 1 P
-X K 3 300 0 150 L 50 50 0 1 P
+P 2 0 1 0 50 0 -50 0 N
+P 4 0 1 10 50 -50 50 50 -50 0 50 -50 F
+P 6 0 1 10 -70 -50 -30 -50 -50 -50 -50 50 -30 50 -70 50 N
+X K 1 -150 0 100 R 50 50 1 1 P
+X A 2 150 0 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# D_x2_Serial_AKC
+# D_Zener
 #
-DEF D_x2_Serial_AKC D 0 30 Y N 1 F N
-F0 "D" 50 -100 50 H V C CNN
-F1 "D_x2_Serial_AKC" 0 100 50 H V C CNN
+DEF D_Zener D 0 40 N N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "D_Zener" 0 -100 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
+$FPLIST
+ TO-???*
+ *_Diode_*
+ *SingleDiode*
+ D_*
+$ENDFPLIST
 DRAW
-C 0 0 10 0 1 0 F
-P 2 0 1 0 -150 0 150 0 N
-P 2 0 1 0 0 0 0 -100 N
-P 2 0 1 0 250 0 300 0 N
-P 3 0 1 10 -50 -50 -50 50 -50 50 N
-P 3 0 1 10 150 50 150 -50 150 -50 N
-P 6 0 1 10 -150 50 -50 0 -150 -50 -150 50 -150 50 -150 50 N
-P 6 0 1 10 50 50 150 0 50 -50 50 50 50 50 50 50 N
-X A 1 -300 0 150 R 50 50 0 1 P
-X K 2 300 0 150 L 50 50 0 1 P
-X common 3 0 -200 100 U 50 50 0 1 P
+P 2 0 1 0 50 0 -50 0 N
+P 3 0 1 10 -50 -50 -50 50 -30 50 N
+P 4 0 1 10 50 -50 50 50 -50 0 50 -50 N
+X K 1 -150 0 100 R 50 50 1 1 P
+X A 2 150 0 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# D_x2_Serial_CAK
+# D_Zener_Dual_CommonAnode_AKK
 #
-DEF D_x2_Serial_CAK D 0 30 Y N 1 F N
+DEF D_Zener_Dual_CommonAnode_AKK D 0 30 Y N 1 F N
 F0 "D" 50 -100 50 H V C CNN
-F1 "D_x2_Serial_CAK" 0 100 50 H V C CNN
+F1 "D_Zener_Dual_CommonAnode_AKK" 0 100 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
+$FPLIST
+ SOT*
+ SC*
+$ENDFPLIST
 DRAW
 C 0 0 10 0 1 0 F
+P 2 0 1 0 -140 0 150 0 N
 P 2 0 1 0 0 0 0 -100 N
-P 2 0 1 0 150 0 -150 0 N
-P 3 0 1 10 -50 -50 -50 50 -50 50 N
-P 3 0 1 10 150 50 150 -50 150 -50 N
-P 6 0 1 10 -150 50 -50 0 -150 -50 -150 50 -150 50 -150 50 N
+P 3 0 1 10 -150 -50 -150 50 -130 50 N
+P 3 0 1 10 150 50 150 -50 130 -50 N
+P 6 0 1 10 -50 -50 -150 0 -50 50 -50 -50 -50 -50 -50 -50 N
 P 6 0 1 10 50 50 150 0 50 -50 50 50 50 50 50 50 N
-X common 1 0 -200 100 U 50 50 0 1 P
-X A 2 -300 0 150 R 50 50 0 1 P
+X A 1 0 -200 100 U 50 50 0 1 P
+X K 2 -300 0 150 R 50 50 0 1 P
 X K 3 300 0 150 L 50 50 0 1 P
 ENDDRAW
 ENDDEF
 #
-# D_x2_Serial_CKA
+# D_Zener_Dual_CommonAnode_AKK_Parallel
 #
-DEF D_x2_Serial_CKA D 0 30 Y N 1 F N
-F0 "D" 50 -100 50 H V C CNN
-F1 "D_x2_Serial_CKA" 0 100 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-DRAW
-C 0 0 10 0 1 0 F
-P 2 0 1 0 -150 0 150 0 N
-P 2 0 1 0 0 0 0 -100 N
-P 3 0 1 10 -50 -50 -50 50 -50 50 N
-P 3 0 1 10 150 50 150 -50 150 -50 N
-P 6 0 1 10 -150 50 -50 0 -150 -50 -150 50 -150 50 -150 50 N
-P 6 0 1 10 50 50 150 0 50 -50 50 50 50 50 50 50 N
-X common 1 0 -200 100 U 50 50 0 1 P
-X K 2 300 0 150 L 50 50 0 1 P
-X A 3 -300 0 150 R 50 50 0 1 P
+DEF D_Zener_Dual_CommonAnode_AKK_Parallel D 0 30 Y N 1 F N
+F0 "D" 0 200 50 H V C CNN
+F1 "D_Zener_Dual_CommonAnode_AKK_Parallel" 0 -200 50 H V C CNN
+F2 "" -50 0 50 H I C CNN
+F3 "" -50 0 50 H I C CNN
+DRAW
+C -50 0 10 0 1 0 F
+P 3 0 0 10 80 50 100 50 100 150 N
+P 3 0 0 10 100 -50 100 -150 80 -150 N
+P 2 0 1 0 -50 0 -100 0 N
+P 4 0 1 0 100 100 -50 100 -50 -100 100 -100 N
+P 6 0 1 10 0 -50 100 -100 0 -150 0 -50 0 -50 0 -50 N
+P 6 0 1 10 0 150 100 100 0 50 0 150 0 150 0 150 N
+X A 1 -200 0 100 R 50 50 0 1 P
+X K 2 200 100 100 L 50 50 0 1 P
+X K 3 200 -100 100 L 50 50 0 1 P
 ENDDRAW
 ENDDEF
 #
-# D_x2_Serial_KAC
+# D_Zener_Dual_CommonAnode_AKK_Split
 #
-DEF D_x2_Serial_KAC D 0 30 Y N 1 F N
-F0 "D" 50 -100 50 H V C CNN
-F1 "D_x2_Serial_KAC" 0 100 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
+DEF D_Zener_Dual_CommonAnode_AKK_Split D 0 30 Y N 2 L N
+F0 "D" 0 100 50 H V C CNN
+F1 "D_Zener_Dual_CommonAnode_AKK_Split" 0 -100 50 H V C CNN
+F2 "" -100 -100 50 H I C CNN
+F3 "" -100 -100 50 H I C CNN
 DRAW
-C 0 0 10 0 1 0 F
-P 2 0 1 0 0 0 0 -100 N
-P 2 0 1 0 150 0 -150 0 N
-P 3 0 1 10 -50 -50 -50 50 -50 50 N
-P 3 0 1 10 150 50 150 -50 150 -50 N
-P 6 0 1 10 -150 50 -50 0 -150 -50 -150 50 -150 50 -150 50 N
-P 6 0 1 10 50 50 150 0 50 -50 50 50 50 50 50 50 N
-X K 1 300 0 150 L 50 50 0 1 P
-X A 2 -300 0 150 R 50 50 0 1 P
-X common 3 0 -200 100 U 50 50 0 1 P
+T 0 -100 50 50 0 2 0 1 Normal 0 C C
+P 3 0 0 10 50 50 50 -50 30 -50 N
+P 2 2 0 0 50 0 -150 0 N
+P 6 0 1 10 -50 50 50 0 -50 -50 -50 50 -50 50 -50 50 N
+P 2 1 1 0 50 0 -50 0 N
+X A 1 -150 0 100 R 50 50 1 1 P
+X K 2 150 0 100 L 50 50 1 1 P
+X K 3 150 0 100 L 50 50 2 1 P
 ENDDRAW
 ENDDEF
 #
-# D_x2_Serial_KCA
+# D_Zener_Dual_CommonAnode_KAK
 #
-DEF D_x2_Serial_KCA D 0 30 Y N 1 F N
+DEF D_Zener_Dual_CommonAnode_KAK D 0 30 Y N 1 F N
 F0 "D" 50 -100 50 H V C CNN
-F1 "D_x2_Serial_KCA" 0 100 50 H V C CNN
+F1 "D_Zener_Dual_CommonAnode_KAK" 0 100 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
+$FPLIST
+ SOT*
+ SC*
+$ENDFPLIST
 DRAW
 C 0 0 10 0 1 0 F
+P 2 0 1 0 -140 0 150 0 N
 P 2 0 1 0 0 0 0 -100 N
-P 2 0 1 0 150 0 -150 0 N
-P 2 0 1 0 250 0 300 0 N
-P 3 0 1 10 -50 -50 -50 50 -50 50 N
-P 3 0 1 10 150 50 150 -50 150 -50 N
-P 6 0 1 10 -150 50 -50 0 -150 -50 -150 50 -150 50 -150 50 N
+P 3 0 1 10 -150 -50 -150 50 -130 50 N
+P 3 0 1 10 130 -50 150 -50 150 50 N
+P 6 0 1 10 -50 -50 -150 0 -50 50 -50 -50 -50 -50 -50 -50 N
 P 6 0 1 10 50 50 150 0 50 -50 50 50 50 50 50 50 N
-X K 1 300 0 150 L 50 50 0 1 P
-X common 2 0 -200 100 U 50 50 0 1 P
-X A 3 -300 0 150 R 50 50 0 1 P
+X K 1 -300 0 150 R 50 50 0 1 P
+X A 2 0 -200 100 U 50 50 0 1 P
+X K 3 300 0 150 L 50 50 0 1 P
 ENDDRAW
 ENDDEF
 #
-# D_x2_Series_ACK_Parallel
+# D_Zener_Dual_CommonAnode_KAK_Parallel
 #
-DEF D_x2_Series_ACK_Parallel D 0 30 Y N 1 F N
+DEF D_Zener_Dual_CommonAnode_KAK_Parallel D 0 30 Y N 1 F N
 F0 "D" 0 200 50 H V C CNN
-F1 "D_x2_Series_ACK_Parallel" 0 -200 50 H V C CNN
+F1 "D_Zener_Dual_CommonAnode_KAK_Parallel" 0 -200 50 H V C CNN
 F2 "" -50 0 50 H I C CNN
 F3 "" -50 0 50 H I C CNN
 DRAW
 C -50 0 10 0 1 0 F
-P 2 0 0 10 0 -50 0 -150 N
-P 2 0 0 10 100 150 100 50 N
+P 3 0 0 10 80 50 100 50 100 150 N
+P 3 0 0 10 100 -50 100 -150 80 -150 N
 P 2 0 1 0 -50 0 -100 0 N
 P 4 0 1 0 100 100 -50 100 -50 -100 100 -100 N
+P 6 0 1 10 0 -50 100 -100 0 -150 0 -50 0 -50 0 -50 N
 P 6 0 1 10 0 150 100 100 0 50 0 150 0 150 0 150 N
-P 6 0 1 10 100 -50 0 -100 100 -150 100 -50 100 -50 100 -50 N
-X K 1 200 -100 100 L 50 50 0 1 P
+X K 1 200 100 100 L 50 50 0 1 P
 X A 2 -200 0 100 R 50 50 0 1 P
-X K 3 200 100 100 L 50 50 0 1 P
+X K 3 200 -100 100 L 50 50 0 1 P
 ENDDRAW
 ENDDEF
 #
-# D_x2_Series_ACK_Split
+# D_Zener_Dual_CommonAnode_KAK_Split
 #
-DEF D_x2_Series_ACK_Split D 0 30 Y N 2 L N
+DEF D_Zener_Dual_CommonAnode_KAK_Split D 0 30 Y N 2 L N
 F0 "D" 0 100 50 H V C CNN
-F1 "D_x2_Series_ACK_Split" 0 -100 50 H V C CNN
+F1 "D_Zener_Dual_CommonAnode_KAK_Split" 0 -100 50 H V C CNN
 F2 "" -100 -100 50 H I C CNN
 F3 "" -100 -100 50 H I C CNN
 DRAW
 T 0 -100 50 50 0 2 0 2 Normal 0 C C
-P 2 0 0 10 50 50 50 -50 N
+P 3 0 0 10 50 50 50 -50 30 -50 N
 P 2 2 0 0 50 0 -150 0 N
 P 6 0 1 10 -50 50 50 0 -50 -50 -50 50 -50 50 -50 50 N
 P 2 1 1 0 50 0 -50 0 N
-X A 1 -150 0 100 R 50 50 1 1 P
-X K 2 150 0 100 L 50 50 1 1 P
+X K 1 150 0 100 L 50 50 1 1 P
+X A 2 -150 0 100 R 50 50 1 1 P
 X K 3 150 0 100 L 50 50 2 1 P
 ENDDRAW
 ENDDEF
 #
-# D_x2_Series_AKC_Parallel
+# D_Zener_Dual_CommonAnode_KKA
+#
+DEF D_Zener_Dual_CommonAnode_KKA D 0 30 Y N 1 F N
+F0 "D" 50 -100 50 H V C CNN
+F1 "D_Zener_Dual_CommonAnode_KKA" 0 100 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ SOT*
+ SC*
+$ENDFPLIST
+DRAW
+C 0 0 10 0 1 0 F
+P 2 0 1 0 -140 0 150 0 N
+P 2 0 1 0 0 0 0 -100 N
+P 3 0 1 10 -150 -50 -150 50 -130 50 N
+P 3 0 1 10 130 -50 150 -50 150 50 N
+P 6 0 1 10 -50 -50 -150 0 -50 50 -50 -50 -50 -50 -50 -50 N
+P 6 0 1 10 50 50 150 0 50 -50 50 50 50 50 50 50 N
+X K 1 -300 0 150 R 50 50 0 1 P
+X K 2 300 0 150 L 50 50 0 1 P
+X A 3 0 -200 100 U 50 50 0 1 P
+ENDDRAW
+ENDDEF
+#
+# D_Zener_Dual_CommonAnode_KKA_Parallel
 #
-DEF D_x2_Series_AKC_Parallel D 0 30 Y N 1 F N
+DEF D_Zener_Dual_CommonAnode_KKA_Parallel D 0 30 Y N 1 F N
 F0 "D" 0 200 50 H V C CNN
-F1 "D_x2_Series_AKC_Parallel" 0 -200 50 H V C CNN
+F1 "D_Zener_Dual_CommonAnode_KKA_Parallel" 0 -200 50 H V C CNN
 F2 "" -50 0 50 H I C CNN
 F3 "" -50 0 50 H I C CNN
 DRAW
 C -50 0 10 0 1 0 F
-P 2 0 0 10 0 -50 0 -150 N
-P 2 0 0 10 100 150 100 50 N
+P 3 0 0 10 80 50 100 50 100 150 N
+P 3 0 0 10 100 -50 100 -150 80 -150 N
 P 2 0 1 0 -50 0 -100 0 N
 P 4 0 1 0 100 100 -50 100 -50 -100 100 -100 N
+P 6 0 1 10 0 -50 100 -100 0 -150 0 -50 0 -50 0 -50 N
 P 6 0 1 10 0 150 100 100 0 50 0 150 0 150 0 150 N
-P 6 0 1 10 100 -50 0 -100 100 -150 100 -50 100 -50 100 -50 N
-X K 1 200 -100 100 L 50 50 0 1 P
-X K 2 200 100 100 L 50 50 0 1 P
+X K 1 200 100 100 L 50 50 0 1 P
+X K 2 200 -100 100 L 50 50 0 1 P
 X A 3 -200 0 100 R 50 50 0 1 P
 ENDDRAW
 ENDDEF
 #
-# D_x2_Series_AKC_Split
+# D_Zener_Dual_CommonAnode_KKA_Split
 #
-DEF D_x2_Series_AKC_Split D 0 30 Y N 2 L N
+DEF D_Zener_Dual_CommonAnode_KKA_Split D 0 30 Y N 2 L N
 F0 "D" 0 100 50 H V C CNN
-F1 "D_x2_Series_AKC_Split" 0 -100 50 H V C CNN
+F1 "D_Zener_Dual_CommonAnode_KKA_Split" 0 -100 50 H V C CNN
 F2 "" -100 -100 50 H I C CNN
 F3 "" -100 -100 50 H I C CNN
 DRAW
 T 0 -100 50 50 0 2 0 3 Normal 0 C C
-P 2 0 0 10 50 50 50 -50 N
+P 3 0 0 10 50 50 50 -50 30 -50 N
 P 2 2 0 0 50 0 -150 0 N
 P 6 0 1 10 -50 50 50 0 -50 -50 -50 50 -50 50 -50 50 N
 P 2 1 1 0 50 0 -50 0 N
-X A 1 -150 0 100 R 50 50 1 1 P
-X K 3 150 0 100 L 50 50 1 1 P
+X K 1 150 0 100 L 50 50 1 1 P
+X A 3 -150 0 100 R 50 50 1 1 P
 X K 2 150 0 100 L 50 50 2 1 P
 ENDDRAW
 ENDDEF
 #
-# D_x2_Series_CAK_Parallel
+# D_Zener_Dual_CommonCathode_AAK
+#
+DEF D_Zener_Dual_CommonCathode_AAK D 0 30 Y N 1 F N
+F0 "D" 50 -100 50 H V C CNN
+F1 "D_Zener_Dual_CommonCathode_AAK" 0 100 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ SOT*
+ SC*
+$ENDFPLIST
+DRAW
+C 0 0 10 0 1 0 F
+P 2 0 1 0 -150 0 150 0 N
+P 2 0 1 0 0 0 0 -100 N
+P 3 0 1 10 -50 50 -50 -50 -70 -50 N
+P 3 0 1 10 50 -50 50 50 70 50 N
+P 6 0 1 10 -150 50 -50 0 -150 -50 -150 50 -150 50 -150 50 N
+P 6 0 1 10 150 -50 50 0 150 50 150 -50 150 -50 150 -50 N
+X A 1 -300 0 150 R 50 50 0 1 P
+X A 2 300 0 150 L 50 50 0 1 P
+X K 3 0 -200 100 U 50 50 0 1 P
+ENDDRAW
+ENDDEF
+#
+# D_Zener_Dual_CommonCathode_AAK_Parallel
 #
-DEF D_x2_Series_CAK_Parallel D 0 30 Y N 1 F N
+DEF D_Zener_Dual_CommonCathode_AAK_Parallel D 0 30 Y N 1 F N
 F0 "D" 0 200 50 H V C CNN
-F1 "D_x2_Series_CAK_Parallel" 0 -200 50 H V C CNN
-F2 "" -50 0 50 H I C CNN
-F3 "" -50 0 50 H I C CNN
+F1 "D_Zener_Dual_CommonCathode_AAK_Parallel" 0 -200 50 H V C CNN
+F2 "" 50 0 50 H I C CNN
+F3 "" 50 0 50 H I C CNN
 DRAW
-C -50 0 10 0 1 0 F
-P 2 0 0 10 0 -50 0 -150 N
-P 2 0 0 10 100 150 100 50 N
-P 2 0 1 0 -50 0 -100 0 N
-P 4 0 1 0 100 100 -50 100 -50 -100 100 -100 N
-P 6 0 1 10 0 150 100 100 0 50 0 150 0 150 0 150 N
-P 6 0 1 10 100 -50 0 -100 100 -150 100 -50 100 -50 100 -50 N
-X A 1 -200 0 100 R 50 50 0 1 P
-X K 2 200 -100 100 L 50 50 0 1 P
-X K 3 200 100 100 L 50 50 0 1 P
+C 50 0 10 0 1 0 F
+P 3 0 0 10 0 -50 0 -150 -20 -150 N
+P 3 0 0 10 0 150 0 50 -20 50 N
+P 2 0 1 0 50 0 100 0 N
+P 4 0 1 0 -100 -100 50 -100 50 100 -100 100 N
+P 6 0 1 10 -100 -50 0 -100 -100 -150 -100 -50 -100 -50 -100 -50 N
+P 6 0 1 10 -100 150 0 100 -100 50 -100 150 -100 150 -100 150 N
+X K 1 -200 100 100 R 50 50 0 1 P
+X K 2 -200 -100 100 R 50 50 0 1 P
+X A 3 200 0 100 L 50 50 0 1 P
 ENDDRAW
 ENDDEF
 #
-# D_x2_Series_CAK_Split
+# D_Zener_Dual_CommonCathode_AAK_Split
 #
-DEF D_x2_Series_CAK_Split D 0 30 Y N 2 L N
+DEF D_Zener_Dual_CommonCathode_AAK_Split D 0 30 Y N 2 L N
 F0 "D" 0 100 50 H V C CNN
-F1 "D_x2_Series_CAK_Split" 0 -100 50 H V C CNN
+F1 "D_Zener_Dual_CommonCathode_AAK_Split" 0 -100 50 H V C CNN
 F2 "" -100 -100 50 H I C CNN
 F3 "" -100 -100 50 H I C CNN
 DRAW
-T 0 -100 50 50 0 2 0 1 Normal 0 C C
-P 2 0 0 10 50 50 50 -50 N
-P 2 2 0 0 50 0 -150 0 N
+T 0 100 50 50 0 2 0 3 Normal 0 C C
+P 3 0 0 10 50 50 50 -50 30 -50 N
+P 2 2 0 0 150 0 -50 0 N
 P 6 0 1 10 -50 50 50 0 -50 -50 -50 50 -50 50 -50 50 N
 P 2 1 1 0 50 0 -50 0 N
-X K 1 150 0 100 L 50 50 1 1 P
-X A 2 -150 0 100 R 50 50 1 1 P
-X K 3 150 0 100 L 50 50 2 1 P
+X A 1 -150 0 100 R 50 50 1 1 P
+X K 3 150 0 100 L 50 50 1 1 P
+X K 2 -150 0 100 R 50 50 2 1 P
+ENDDRAW
+ENDDEF
+#
+# D_Zener_Dual_CommonCathode_AKA
+#
+DEF D_Zener_Dual_CommonCathode_AKA D 0 30 Y N 1 F N
+F0 "D" 50 -100 50 H V C CNN
+F1 "D_Zener_Dual_CommonCathode_AKA" 0 100 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ SOT*
+ SC*
+$ENDFPLIST
+DRAW
+C 0 0 10 0 1 0 F
+P 2 0 1 0 0 0 0 -100 N
+P 2 0 1 10 70 50 70 50 N
+P 2 0 1 0 150 0 -150 0 N
+P 3 0 1 10 -70 -50 -50 -50 -50 50 N
+P 3 0 1 10 50 -50 50 50 70 50 N
+P 6 0 1 10 -150 50 -50 0 -150 -50 -150 50 -150 50 -150 50 N
+P 6 0 1 10 150 -50 50 0 150 50 150 -50 150 -50 150 -50 N
+X A 1 -300 0 150 R 50 50 0 1 P
+X K 2 0 -200 100 U 50 50 0 1 P
+X A 3 300 0 150 L 50 50 0 1 P
 ENDDRAW
 ENDDEF
 #
-# D_x2_Series_CKA_Parallel
+# D_Zener_Dual_CommonCathode_AKA_Parallel
 #
-DEF D_x2_Series_CKA_Parallel D 0 30 Y N 1 F N
+DEF D_Zener_Dual_CommonCathode_AKA_Parallel D 0 30 Y N 1 F N
 F0 "D" 0 200 50 H V C CNN
-F1 "D_x2_Series_CKA_Parallel" 0 -200 50 H V C CNN
-F2 "" -50 0 50 H I C CNN
-F3 "" -50 0 50 H I C CNN
+F1 "D_Zener_Dual_CommonCathode_AKA_Parallel" 0 -200 50 H V C CNN
+F2 "" 50 0 50 H I C CNN
+F3 "" 50 0 50 H I C CNN
 DRAW
-C -50 0 10 0 1 0 F
-P 2 0 0 10 0 -50 0 -150 N
-P 2 0 0 10 100 150 100 50 N
-P 2 0 1 0 -50 0 -100 0 N
-P 4 0 1 0 100 100 -50 100 -50 -100 100 -100 N
-P 6 0 1 10 0 150 100 100 0 50 0 150 0 150 0 150 N
-P 6 0 1 10 100 -50 0 -100 100 -150 100 -50 100 -50 100 -50 N
-X A 1 -200 0 100 R 50 50 0 1 P
-X K 2 200 100 100 L 50 50 0 1 P
-X K 3 200 -100 100 L 50 50 0 1 P
+C 50 0 10 0 1 0 F
+P 3 0 0 10 0 -50 0 -150 -20 -150 N
+P 3 0 0 10 0 150 0 50 -20 50 N
+P 2 0 1 0 50 0 100 0 N
+P 4 0 1 0 -100 -100 50 -100 50 100 -100 100 N
+P 6 0 1 10 -100 -50 0 -100 -100 -150 -100 -50 -100 -50 -100 -50 N
+P 6 0 1 10 -100 150 0 100 -100 50 -100 150 -100 150 -100 150 N
+X K 1 -200 100 100 R 50 50 0 1 P
+X A 2 200 0 100 L 50 50 0 1 P
+X K 3 -200 -100 100 R 50 50 0 1 P
 ENDDRAW
 ENDDEF
 #
-# D_x2_Series_CKA_Split
+# D_Zener_Dual_CommonCathode_AKA_Split
 #
-DEF D_x2_Series_CKA_Split D 0 30 Y N 2 L N
+DEF D_Zener_Dual_CommonCathode_AKA_Split D 0 30 Y N 2 L N
 F0 "D" 0 100 50 H V C CNN
-F1 "D_x2_Series_CKA_Split" 0 -100 50 H V C CNN
+F1 "D_Zener_Dual_CommonCathode_AKA_Split" 0 -100 50 H V C CNN
 F2 "" -100 -100 50 H I C CNN
 F3 "" -100 -100 50 H I C CNN
 DRAW
-T 0 -100 50 50 0 2 0 1 Normal 0 C C
-P 2 0 0 10 50 50 50 -50 N
-P 2 2 0 0 50 0 -150 0 N
+T 0 100 50 50 0 2 0 2 Normal 0 C C
+P 3 0 0 10 50 50 50 -50 30 -50 N
+P 2 2 0 0 150 0 -50 0 N
 P 6 0 1 10 -50 50 50 0 -50 -50 -50 50 -50 50 -50 50 N
 P 2 1 1 0 50 0 -50 0 N
-X K 1 150 0 100 L 50 50 1 1 P
-X A 3 -150 0 100 R 50 50 1 1 P
-X K 2 150 0 100 L 50 50 2 1 P
+X A 1 -150 0 100 R 50 50 1 1 P
+X K 2 150 0 100 L 50 50 1 1 P
+X K 3 -150 0 100 R 50 50 2 1 P
 ENDDRAW
 ENDDEF
 #
-# D_x2_Series_KAC_Parallel
+# D_Zener_Dual_CommonCathode_KAA
 #
-DEF D_x2_Series_KAC_Parallel D 0 30 Y N 1 F N
-F0 "D" 0 200 50 H V C CNN
-F1 "D_x2_Series_KAC_Parallel" 0 -200 50 H V C CNN
-F2 "" -50 0 50 H I C CNN
-F3 "" -50 0 50 H I C CNN
+DEF D_Zener_Dual_CommonCathode_KAA D 0 30 Y N 1 F N
+F0 "D" 50 -100 50 H V C CNN
+F1 "D_Zener_Dual_CommonCathode_KAA" 0 100 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ SOT*
+ SC*
+$ENDFPLIST
 DRAW
-C -50 0 10 0 1 0 F
-P 2 0 0 10 0 -50 0 -150 N
-P 2 0 0 10 100 150 100 50 N
-P 2 0 1 0 -50 0 -100 0 N
-P 4 0 1 0 100 100 -50 100 -50 -100 100 -100 N
-P 6 0 1 10 0 150 100 100 0 50 0 150 0 150 0 150 N
-P 6 0 1 10 100 -50 0 -100 100 -150 100 -50 100 -50 100 -50 N
-X K 1 200 100 100 L 50 50 0 1 P
-X K 2 200 -100 100 L 50 50 0 1 P
-X A 3 -200 0 100 R 50 50 0 1 P
+C 0 0 10 0 1 0 F
+P 2 0 1 0 -150 0 150 0 N
+P 2 0 1 0 0 0 0 -100 N
+P 3 0 1 10 -50 50 -50 -50 -70 -50 N
+P 3 0 1 10 50 -50 50 50 70 50 N
+P 6 0 1 10 -150 50 -50 0 -150 -50 -150 50 -150 50 -150 50 N
+P 6 0 1 10 150 -50 50 0 150 50 150 -50 150 -50 150 -50 N
+X K 1 0 -200 100 U 50 50 0 1 P
+X A 2 -300 0 150 R 50 50 0 1 P
+X A 3 300 0 150 L 50 50 0 1 P
 ENDDRAW
 ENDDEF
 #
-# D_x2_Series_KAC_Split
+# D_Zener_Dual_CommonCathode_KAA_Parallel
 #
-DEF D_x2_Series_KAC_Split D 0 30 Y N 2 L N
+DEF D_Zener_Dual_CommonCathode_KAA_Parallel D 0 30 Y N 1 F N
+F0 "D" 0 200 50 H V C CNN
+F1 "D_Zener_Dual_CommonCathode_KAA_Parallel" 0 -200 50 H V C CNN
+F2 "" 50 0 50 H I C CNN
+F3 "" 50 0 50 H I C CNN
+DRAW
+C 50 0 10 0 1 0 F
+P 3 0 0 10 0 -50 0 -150 -20 -150 N
+P 3 0 0 10 0 150 0 50 -20 50 N
+P 2 0 1 0 50 0 100 0 N
+P 4 0 1 0 -100 -100 50 -100 50 100 -100 100 N
+P 6 0 1 10 -100 -50 0 -100 -100 -150 -100 -50 -100 -50 -100 -50 N
+P 6 0 1 10 -100 150 0 100 -100 50 -100 150 -100 150 -100 150 N
+X A 1 200 0 100 L 50 50 0 1 P
+X K 2 -200 100 100 R 50 50 0 1 P
+X K 3 -200 -100 100 R 50 50 0 1 P
+ENDDRAW
+ENDDEF
+#
+# D_Zener_Dual_CommonCathode_KAA_Split
+#
+DEF D_Zener_Dual_CommonCathode_KAA_Split D 0 30 Y N 2 L N
 F0 "D" 0 100 50 H V C CNN
-F1 "D_x2_Series_KAC_Split" 0 -100 50 H V C CNN
+F1 "D_Zener_Dual_CommonCathode_KAA_Split" 0 -100 50 H V C CNN
 F2 "" -100 -100 50 H I C CNN
 F3 "" -100 -100 50 H I C CNN
 DRAW
-T 0 -100 50 50 0 2 0 3 Normal 0 C C
-P 2 0 0 10 50 50 50 -50 N
-P 2 2 0 0 50 0 -150 0 N
+T 0 100 50 50 0 2 0 1 Normal 0 C C
+P 3 0 0 10 50 50 50 -50 30 -50 N
+P 2 2 0 0 150 0 -50 0 N
 P 6 0 1 10 -50 50 50 0 -50 -50 -50 50 -50 50 -50 50 N
 P 2 1 1 0 50 0 -50 0 N
+X K 1 150 0 100 L 50 50 1 1 P
 X A 2 -150 0 100 R 50 50 1 1 P
-X K 3 150 0 100 L 50 50 1 1 P
-X K 1 150 0 100 L 50 50 2 1 P
+X K 3 -150 0 100 R 50 50 2 1 P
 ENDDRAW
 ENDDEF
 #
-# D_x2_Series_KCA_Parallel
+# D_Zener_Filled
 #
-DEF D_x2_Series_KCA_Parallel D 0 30 Y N 1 F N
-F0 "D" 0 200 50 H V C CNN
-F1 "D_x2_Series_KCA_Parallel" 0 -200 50 H V C CNN
-F2 "" -50 0 50 H I C CNN
-F3 "" -50 0 50 H I C CNN
+DEF D_Zener_Filled D 0 40 N N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "D_Zener_Filled" 0 -100 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ TO-???*
+ *_Diode_*
+ *SingleDiode*
+ D_*
+$ENDFPLIST
 DRAW
-C -50 0 10 0 1 0 F
-P 2 0 0 10 0 -50 0 -150 N
-P 2 0 0 10 100 150 100 50 N
-P 2 0 1 0 -50 0 -100 0 N
-P 4 0 1 0 100 100 -50 100 -50 -100 100 -100 N
-P 6 0 1 10 0 150 100 100 0 50 0 150 0 150 0 150 N
-P 6 0 1 10 100 -50 0 -100 100 -150 100 -50 100 -50 100 -50 N
-X K 1 200 100 100 L 50 50 0 1 P
-X A 2 -200 0 100 R 50 50 0 1 P
-X K 3 200 -100 100 L 50 50 0 1 P
+P 2 0 1 0 50 0 -50 0 N
+P 3 0 1 10 -50 -50 -50 50 -30 50 N
+P 4 0 1 10 50 -50 50 50 -50 0 50 -50 F
+X K 1 -150 0 100 R 50 50 1 1 P
+X A 2 150 0 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# D_x2_Series_KCA_Split
+# D_Zener_Small
 #
-DEF D_x2_Series_KCA_Split D 0 30 Y N 2 L N
-F0 "D" 0 100 50 H V C CNN
-F1 "D_x2_Series_KCA_Split" 0 -100 50 H V C CNN
-F2 "" -100 -100 50 H I C CNN
-F3 "" -100 -100 50 H I C CNN
+DEF D_Zener_Small D 0 10 N N 1 F N
+F0 "D" 0 90 50 H V C CNN
+F1 "D_Zener_Small" 0 -90 50 H V C CNN
+F2 "" 0 0 50 V I C CNN
+F3 "" 0 0 50 V I C CNN
+$FPLIST
+ TO-???*
+ *_Diode_*
+ *SingleDiode*
+ D_*
+$ENDFPLIST
 DRAW
-T 0 -100 50 50 0 2 0 2 Normal 0 C C
-P 2 0 0 10 50 50 50 -50 N
-P 2 2 0 0 50 0 -150 0 N
-P 6 0 1 10 -50 50 50 0 -50 -50 -50 50 -50 50 -50 50 N
-P 2 1 1 0 50 0 -50 0 N
-X K 2 150 0 100 L 50 50 1 1 P
-X A 3 -150 0 100 R 50 50 1 1 P
-X K 1 150 0 100 L 50 50 2 1 P
+P 2 0 1 0 30 0 -30 0 N
+P 3 0 1 10 -10 40 -30 40 -30 -40 N
+P 4 0 1 10 30 40 -30 0 30 -40 30 40 N
+X K 1 -100 0 70 R 50 50 1 1 P
+X A 2 100 0 70 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# D_Zener_Small_Filled
+#
+DEF D_Zener_Small_Filled D 0 10 N N 1 F N
+F0 "D" 0 90 50 H V C CNN
+F1 "D_Zener_Small_Filled" 0 -90 50 H V C CNN
+F2 "" 0 0 50 V I C CNN
+F3 "" 0 0 50 V I C CNN
+$FPLIST
+ TO-???*
+ *_Diode_*
+ *SingleDiode*
+ D_*
+$ENDFPLIST
+DRAW
+P 2 0 1 0 30 0 -30 0 N
+P 3 0 1 10 -10 40 -30 40 -30 -40 N
+P 4 0 1 10 30 40 -30 0 30 -40 30 40 F
+X K 1 -100 0 70 R 50 50 1 1 P
+X A 2 100 0 70 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Delay_Line
+# DelayLine
 #
-DEF Delay_Line L 0 40 Y N 1 F N
+DEF DelayLine L 0 40 Y N 1 F N
 F0 "L" 100 50 50 H V L CNN
-F1 "Delay_Line" 100 -50 50 H V L CNN
+F1 "DelayLine" 100 -50 50 H V L CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 DRAW
@@ -3876,11 +4079,87 @@ X COMMUN 3 -200 0 100 R 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
-# EMI_Filter_CLC
+# Earphone
+#
+DEF Earphone LS 0 1 Y N 1 F N
+F0 "LS" 100 150 50 H V L CNN
+F1 "Earphone" 100 75 50 H V L CNN
+F2 "" 0 100 50 V I C CNN
+F3 "" 0 100 50 V I C CNN
+DRAW
+S 50 -25 75 125 0 1 0 F
+S 50 0 -50 100 0 1 0 N
+X - 1 0 -100 100 U 50 50 1 1 P
+X + 2 0 200 100 D 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# ElectromagneticActor
+#
+DEF ElectromagneticActor L 0 1 N N 1 F N
+F0 "L" 50 150 50 H V L CNN
+F1 "ElectromagneticActor" 50 -50 50 H V L CNN
+F2 "" -25 100 50 V I C CNN
+F3 "" -25 100 50 V I C CNN
+$FPLIST
+ Inductor_*
+ L_*
+$ENDFPLIST
+DRAW
+S -100 100 100 0 0 1 10 N
+P 2 0 1 10 -50 100 50 0 N
+X - 1 0 200 100 D 50 50 1 1 P
+X + 2 0 -100 100 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# FerriteBead
+#
+DEF FerriteBead FB 0 0 N Y 1 F N
+F0 "FB" -150 25 50 V V C CNN
+F1 "FerriteBead" 150 0 50 V V C CNN
+F2 "" -70 0 50 V I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ Inductor_*
+ L_*
+ *Ferrite*
+$ENDFPLIST
+DRAW
+P 2 0 1 0 0 -50 0 -48 N
+P 2 0 1 0 0 50 0 51 N
+P 5 0 1 0 -109 16 -67 89 109 -12 66 -85 -109 16 N
+X ~ 1 0 150 100 D 50 50 1 1 P
+X ~ 2 0 -150 100 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# FerriteBead_Small
+#
+DEF FerriteBead_Small FB 0 0 N Y 1 F N
+F0 "FB" 75 50 50 H V L CNN
+F1 "FerriteBead_Small" 75 -50 50 H V L CNN
+F2 "" -70 0 50 V I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ Inductor_*
+ L_*
+ *Ferrite*
+$ENDFPLIST
+DRAW
+P 2 0 1 0 0 -50 0 -31 N
+P 2 0 1 0 0 35 0 51 N
+P 5 0 1 0 -72 11 -44 59 72 -8 44 -56 -72 11 N
+X ~ 1 0 100 50 D 50 50 1 1 P
+X ~ 2 0 -100 50 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Filter_EMI_CLC
 #
-DEF EMI_Filter_CLC FL 0 10 Y N 1 F N
+DEF Filter_EMI_CLC FL 0 10 Y N 1 F N
 F0 "FL" 0 275 50 H V C CNN
-F1 "EMI_Filter_CLC" 0 200 50 H V C CNN
+F1 "Filter_EMI_CLC" 0 200 50 H V C CNN
 F2 "" 0 0 50 V I C CNN
 F3 "" 0 0 50 V I C CNN
 $FPLIST
@@ -3912,11 +4191,11 @@ X 3 3 300 100 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# EMI_Filter_LCL
+# Filter_EMI_LCL
 #
-DEF EMI_Filter_LCL FL 0 10 Y N 1 F N
+DEF Filter_EMI_LCL FL 0 10 Y N 1 F N
 F0 "FL" 0 275 50 H V C CNN
-F1 "EMI_Filter_LCL" 0 200 50 H V C CNN
+F1 "Filter_EMI_LCL" 0 200 50 H V C CNN
 F2 "" 0 0 50 V I C CNN
 F3 "" 0 0 50 V I C CNN
 $FPLIST
@@ -3945,14 +4224,14 @@ X 3 3 300 100 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# EMI_Filter_LL
+# Filter_EMI_LL
 #
-DEF EMI_Filter_LL FL 0 10 Y N 1 F N
+DEF Filter_EMI_LL FL 0 10 Y N 1 F N
 F0 "FL" 0 175 50 H V C CNN
-F1 "EMI_Filter_LL" 0 -175 50 H V C CNN
+F1 "Filter_EMI_LL" 0 -175 50 H V C CNN
 F2 "" 0 40 50 H I C CNN
 F3 "" 0 40 50 H I C CNN
-ALIAS EMI_Filter_CommonMode
+ALIAS Filter_EMI_CommonMode
 $FPLIST
  L_*
  L_CommonMode*
@@ -3982,124 +4261,48 @@ X 3 3 -200 -100 100 R 50 50 1 1 P
 X 4 4 200 -100 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
-#
-# EMI_Filter_LL_1423
-#
-DEF EMI_Filter_LL_1423 FL 0 20 Y N 1 F N
-F0 "FL" 0 175 50 H V C CNN
-F1 "EMI_Filter_LL_1423" 0 -175 50 H V C CNN
-F2 "" 0 -250 50 H I C CNN
-F3 "" 0 40 50 V I C CNN
-$FPLIST
- Bourns*SRF0905*
-$ENDFPLIST
-DRAW
-A -80 -80 20 1 1799 0 1 0 N -60 -80 -100 -80
-A -80 80 20 -1799 -1 0 1 0 N -100 80 -60 80
-A -40 -80 20 1 1799 0 1 0 N -20 -80 -60 -80
-A -40 80 20 -1799 -1 0 1 0 N -60 80 -20 80
-A 0 -80 20 1 1799 0 1 0 N 20 -80 -20 -80
-A 0 80 20 -1799 -1 0 1 0 N -20 80 20 80
-A 40 -80 20 1 1799 0 1 0 N 60 -80 20 -80
-A 40 80 20 -1799 -1 0 1 0 N 20 80 60 80
-A 80 -80 20 1 1799 0 1 0 N 100 -80 60 -80
-A 80 80 20 -1799 -1 0 1 0 N 60 80 100 80
-C -120 -50 10 0 1 0 F
-C -120 60 10 0 1 0 F
-P 2 0 1 0 -100 -80 -100 -100 N
-P 2 0 1 0 -100 20 100 20 N
-P 2 0 1 0 -100 80 -100 100 N
-P 2 0 1 0 100 -80 100 -100 N
-P 2 0 1 0 100 -20 -100 -20 N
-P 2 0 1 0 100 100 100 80 N
-X 1 1 -200 -100 100 R 50 50 1 1 P
-X 2 2 -200 100 100 R 50 50 1 1 P
-X 3 3 200 100 100 L 50 50 1 1 P
-X 4 4 200 -100 100 L 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# Earphone
-#
-DEF Earphone LS 0 1 Y N 1 F N
-F0 "LS" 100 150 50 H V L CNN
-F1 "Earphone" 100 75 50 H V L CNN
-F2 "" 0 100 50 V I C CNN
-F3 "" 0 100 50 V I C CNN
-DRAW
-S 50 -25 75 125 0 1 0 F
-S 50 0 -50 100 0 1 0 N
-X - 1 0 -100 100 U 50 50 1 1 P
-X + 2 0 200 100 D 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# Electromagnetic_Actor
-#
-DEF Electromagnetic_Actor L 0 1 N N 1 F N
-F0 "L" 50 150 50 H V L CNN
-F1 "Electromagnetic_Actor" 50 -50 50 H V L CNN
-F2 "" -25 100 50 V I C CNN
-F3 "" -25 100 50 V I C CNN
-$FPLIST
- Inductor_*
- L_*
-$ENDFPLIST
-DRAW
-S -100 100 100 0 0 1 10 N
-P 2 0 1 10 -50 100 50 0 N
-X - 1 0 200 100 D 50 50 1 1 P
-X + 2 0 -100 100 U 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# Ferrite_Bead
-#
-DEF Ferrite_Bead FB 0 0 N Y 1 F N
-F0 "FB" -150 25 50 V V C CNN
-F1 "Ferrite_Bead" 150 0 50 V V C CNN
-F2 "" -70 0 50 V I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- Inductor_*
- L_*
- *Ferrite*
-$ENDFPLIST
-DRAW
-P 2 0 1 0 0 -50 0 -48 N
-P 2 0 1 0 0 50 0 51 N
-P 5 0 1 0 -109 16 -67 89 109 -12 66 -85 -109 16 N
-X ~ 1 0 150 100 D 50 50 1 1 P
-X ~ 2 0 -150 100 U 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# Ferrite_Bead_Small
-#
-DEF Ferrite_Bead_Small FB 0 0 N Y 1 F N
-F0 "FB" 75 50 50 H V L CNN
-F1 "Ferrite_Bead_Small" 75 -50 50 H V L CNN
-F2 "" -70 0 50 V I C CNN
-F3 "" 0 0 50 H I C CNN
+#
+# Filter_EMI_LL_1423
+#
+DEF Filter_EMI_LL_1423 FL 0 20 Y N 1 F N
+F0 "FL" 0 175 50 H V C CNN
+F1 "Filter_EMI_LL_1423" 0 -175 50 H V C CNN
+F2 "" 0 -250 50 H I C CNN
+F3 "" 0 40 50 V I C CNN
 $FPLIST
- Inductor_*
- L_*
- *Ferrite*
+ Bourns*SRF0905*
 $ENDFPLIST
 DRAW
-P 2 0 1 0 0 -50 0 -31 N
-P 2 0 1 0 0 35 0 51 N
-P 5 0 1 0 -72 11 -44 59 72 -8 44 -56 -72 11 N
-X ~ 1 0 100 50 D 50 50 1 1 P
-X ~ 2 0 -100 50 U 50 50 1 1 P
+A -80 -80 20 1 1799 0 1 0 N -60 -80 -100 -80
+A -80 80 20 -1799 -1 0 1 0 N -100 80 -60 80
+A -40 -80 20 1 1799 0 1 0 N -20 -80 -60 -80
+A -40 80 20 -1799 -1 0 1 0 N -60 80 -20 80
+A 0 -80 20 1 1799 0 1 0 N 20 -80 -20 -80
+A 0 80 20 -1799 -1 0 1 0 N -20 80 20 80
+A 40 -80 20 1 1799 0 1 0 N 60 -80 20 -80
+A 40 80 20 -1799 -1 0 1 0 N 20 80 60 80
+A 80 -80 20 1 1799 0 1 0 N 100 -80 60 -80
+A 80 80 20 -1799 -1 0 1 0 N 60 80 100 80
+C -120 -50 10 0 1 0 F
+C -120 60 10 0 1 0 F
+P 2 0 1 0 -100 -80 -100 -100 N
+P 2 0 1 0 -100 20 100 20 N
+P 2 0 1 0 -100 80 -100 100 N
+P 2 0 1 0 100 -80 100 -100 N
+P 2 0 1 0 100 -20 -100 -20 N
+P 2 0 1 0 100 100 100 80 N
+X 1 1 -200 -100 100 R 50 50 1 1 P
+X 2 2 -200 100 100 R 50 50 1 1 P
+X 3 3 200 100 100 L 50 50 1 1 P
+X 4 4 200 -100 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Frequency_Counter
+# FrequencyCounter
 #
-DEF Frequency_Counter MES 0 1 N N 1 F N
+DEF FrequencyCounter MES 0 1 N N 1 F N
 F0 "MES" -130 40 50 H V R CNN
-F1 "Frequency_Counter" -130 -30 50 H V R CNN
+F1 "FrequencyCounter" -130 -30 50 H V R CNN
 F2 "" 0 100 50 V I C CNN
 F3 "" 0 100 50 V I C CNN
 DRAW
@@ -4187,11 +4390,11 @@ X ~ 2 100 0 50 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# GDT_2pin
+# GDT_2Pin
 #
-DEF GDT_2pin GD 0 20 N Y 1 F N
+DEF GDT_2Pin GD 0 20 N Y 1 F N
 F0 "GD" 200 0 50 V V C CNN
-F1 "GDT_2pin" 300 0 50 V V C CNN
+F1 "GDT_2Pin" 300 0 50 V V C CNN
 F2 "" 0 0 50 V I C CNN
 F3 "" 0 0 50 V I C CNN
 DRAW
@@ -4211,11 +4414,11 @@ X ~ 3 0 200 100 D 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# GDT_3pin
+# GDT_3Pin
 #
-DEF GDT_3pin GD 0 20 N Y 1 F N
+DEF GDT_3Pin GD 0 20 N Y 1 F N
 F0 "GD" 200 0 50 V V C CNN
-F1 "GDT_3pin" 300 0 50 V V C CNN
+F1 "GDT_3Pin" 300 0 50 V V C CNN
 F2 "" 0 0 50 V I C CNN
 F3 "" 0 0 50 V I C CNN
 DRAW
@@ -4256,11 +4459,11 @@ X + 2 0 200 100 D 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Hall_Generator
+# HallGenerator
 #
-DEF Hall_Generator HG 0 0 Y N 1 F N
+DEF HallGenerator HG 0 0 Y N 1 F N
 F0 "HG" 100 175 50 H V L CNN
-F1 "Hall_Generator" 100 100 50 H V L CNN
+F1 "HallGenerator" 100 100 50 H V L CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 DRAW
@@ -4294,96 +4497,6 @@ X ~ 2 0 -150 50 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Jumper
-#
-DEF Jumper JP 0 30 Y N 1 F N
-F0 "JP" 0 150 50 H V C CNN
-F1 "Jumper" 0 -80 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- SolderJumper*
- Jumper*
- TestPoint*2Pads*
- TestPoint*Bridge*
-$ENDFPLIST
-DRAW
-A 0 -26 125 1426 373 0 1 0 N -98 50 99 50
-C -100 0 35 0 1 0 N
-C 100 0 35 0 1 0 N
-X 1 1 -300 0 165 R 50 50 0 1 P
-X 2 2 300 0 165 L 50 50 0 1 P
-ENDDRAW
-ENDDEF
-#
-# Jumper_NC_Dual
-#
-DEF Jumper_NC_Dual JP 0 30 Y N 1 F N
-F0 "JP" 50 -100 50 H V L CNN
-F1 "Jumper_NC_Dual" 0 100 50 H V C BNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- SolderJumper*Bridged*
- Jumper*
- TestPoint*2Pads*
- TestPoint*Bridge*
-$ENDFPLIST
-DRAW
-A -60 10 64 386 1413 0 1 0 N -10 50 -110 50
-A 60 10 64 386 1413 0 1 0 N 110 50 10 50
-C -120 0 35 0 1 0 N
-C 0 0 36 0 1 0 N
-C 120 0 35 0 1 0 N
-X 1 1 -250 0 95 R 50 50 0 1 P
-X 2 2 0 -100 60 U 50 50 0 1 P
-X 3 3 250 0 95 L 50 50 0 1 P
-ENDDRAW
-ENDDEF
-#
-# Jumper_NC_Small
-#
-DEF Jumper_NC_Small JP 0 30 N N 1 F N
-F0 "JP" 0 80 50 H V C CNN
-F1 "Jumper_NC_Small" 10 -60 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- SolderJumper*Bridged*
- Jumper*
- TestPoint*2Pads*
- TestPoint*Bridge*
-$ENDFPLIST
-DRAW
-A 0 -10 57 450 1350 0 1 0 N 40 30 -40 30
-C -40 0 20 0 1 0 N
-C 40 0 20 0 1 0 N
-X 1 1 -100 0 40 R 50 50 0 1 P
-X 2 2 100 0 40 L 50 50 0 1 P
-ENDDRAW
-ENDDEF
-#
-# Jumper_NO_Small
-#
-DEF Jumper_NO_Small JP 0 30 N N 1 F N
-F0 "JP" 0 80 50 H V C CNN
-F1 "Jumper_NO_Small" 10 -60 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- SolderJumper*Open*
- Jumper*
- TestPoint*2Pads*
- TestPoint*Bridge*
-$ENDFPLIST
-DRAW
-C -40 0 20 0 1 0 N
-C 40 0 20 0 1 0 N
-X 1 1 -100 0 40 R 50 50 0 1 P
-X 2 2 100 0 40 L 50 50 0 1 P
-ENDDRAW
-ENDDEF
-#
 # L
 #
 DEF L L 0 40 N N 1 F N
@@ -4634,29 +4747,6 @@ X BK 4 -200 -200 100 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# LED_ALT
-#
-DEF LED_ALT D 0 40 N N 1 F N
-F0 "D" 0 100 50 H V C CNN
-F1 "LED_ALT" 0 -100 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- LED*
- LED_SMD:*
- LED_THT:*
-$ENDFPLIST
-DRAW
-P 2 0 1 10 -50 -50 -50 50 N
-P 2 0 1 0 -50 0 50 0 N
-P 4 0 1 10 50 -50 50 50 -50 0 50 -50 F
-P 5 0 1 0 -120 -30 -180 -90 -150 -90 -180 -90 -180 -60 N
-P 5 0 1 0 -70 -30 -130 -90 -100 -90 -130 -90 -130 -60 N
-X K 1 -150 0 100 R 50 50 1 1 P
-X A 2 150 0 100 L 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
 # LED_ARBG
 #
 DEF LED_ARBG D 0 0 Y N 1 F N
@@ -4861,11 +4951,62 @@ X GK 4 -200 0 100 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# LED_BCGR
+# LED_BGAR
+#
+DEF LED_BGAR D 0 0 Y N 1 F N
+F0 "D" 0 370 50 H V C CNN
+F1 "LED_BGAR" 0 -350 50 H V C CNN
+F2 "" 0 -50 50 H I C CNN
+F3 "" 0 -50 50 H I C CNN
+$FPLIST
+ LED*
+ LED_SMD:*
+ LED_THT:*
+$ENDFPLIST
+DRAW
+C 80 0 10 0 1 0 F
+T 0 -75 -250 50 0 0 0 B Normal 0 C C
+T 0 -75 -50 50 0 0 0 G Normal 0 C C
+T 0 -75 150 50 0 0 0 R Normal 0 C C
+S 50 -50 50 50 0 1 0 N
+S 50 50 50 50 0 1 0 N
+S 50 150 50 250 0 1 0 N
+S 50 250 50 250 0 1 0 N
+S 110 330 -110 -300 0 1 10 f
+P 2 0 1 0 -50 -200 -100 -200 N
+P 2 0 1 0 -50 -200 50 -200 N
+P 2 0 1 10 -50 -150 -50 -250 N
+P 2 0 1 0 -50 0 -100 0 N
+P 2 0 1 10 -50 50 -50 -50 N
+P 2 0 1 0 -50 200 -100 200 N
+P 2 0 1 0 -50 200 50 200 N
+P 2 0 1 10 -50 250 -50 150 N
+P 2 0 1 0 50 0 -50 0 N
+P 2 0 1 0 50 0 100 0 N
+P 3 0 1 0 -50 50 -50 -50 -50 -50 N
+P 3 0 1 0 -50 250 -50 150 -50 150 N
+P 4 0 1 0 50 -200 80 -200 80 200 50 200 N
+P 4 0 1 10 50 -150 50 -250 -50 -200 50 -150 N
+P 4 0 1 10 50 50 50 -50 -50 0 50 50 N
+P 4 0 1 10 50 250 50 150 -50 200 50 250 N
+P 5 0 1 0 -40 -150 20 -90 -10 -90 20 -90 20 -120 N
+P 5 0 1 0 -40 50 20 110 -10 110 20 110 20 80 N
+P 5 0 1 0 -40 250 20 310 -10 310 20 310 20 280 N
+P 5 0 1 0 0 -150 60 -90 30 -90 60 -90 60 -120 N
+P 5 0 1 0 0 50 60 110 30 110 60 110 60 80 N
+P 5 0 1 0 0 250 60 310 30 310 60 310 60 280 N
+X BK 1 -200 -200 100 R 50 50 1 1 P
+X GK 2 -200 0 100 R 50 50 1 1 P
+X A 3 200 0 100 L 50 50 1 1 P
+X RK 4 -200 200 100 R 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# LED_BGKR
 #
-DEF LED_BCGR D 0 0 Y N 1 F N
+DEF LED_BGKR D 0 0 Y N 1 F N
 F0 "D" 0 370 50 H V C CNN
-F1 "LED_BCGR" 0 -350 50 H V C CNN
+F1 "LED_BGKR" 0 -350 50 H V C CNN
 F2 "" 0 -50 50 H I C CNN
 F3 "" 0 -50 50 H I C CNN
 $FPLIST
@@ -4906,17 +5047,68 @@ P 5 0 1 0 0 -150 60 -90 30 -90 60 -90 60 -120 N
 P 5 0 1 0 0 50 60 110 30 110 60 110 60 80 N
 P 5 0 1 0 0 250 60 310 30 310 60 310 60 280 N
 X BA 1 200 -200 100 L 50 50 1 1 P
-X K 2 -200 0 100 R 50 50 1 1 P
-X GA 3 200 0 100 L 50 50 1 1 P
+X GA 2 200 0 100 L 50 50 1 1 P
+X K 3 -200 0 100 R 50 50 1 1 P
 X RA 4 200 200 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# LED_BCRG
+# LED_BGRA
+#
+DEF LED_BGRA D 0 0 Y N 1 F N
+F0 "D" 0 370 50 H V C CNN
+F1 "LED_BGRA" 0 -350 50 H V C CNN
+F2 "" 0 -50 50 H I C CNN
+F3 "" 0 -50 50 H I C CNN
+$FPLIST
+ LED*
+ LED_SMD:*
+ LED_THT:*
+$ENDFPLIST
+DRAW
+C 80 0 10 0 1 0 F
+T 0 -75 -250 50 0 0 0 B Normal 0 C C
+T 0 -75 -50 50 0 0 0 G Normal 0 C C
+T 0 -75 150 50 0 0 0 R Normal 0 C C
+S 50 -50 50 50 0 1 0 N
+S 50 50 50 50 0 1 0 N
+S 50 150 50 250 0 1 0 N
+S 50 250 50 250 0 1 0 N
+S 110 330 -110 -300 0 1 10 f
+P 2 0 1 0 -50 -200 -100 -200 N
+P 2 0 1 0 -50 -200 50 -200 N
+P 2 0 1 10 -50 -150 -50 -250 N
+P 2 0 1 0 -50 0 -100 0 N
+P 2 0 1 10 -50 50 -50 -50 N
+P 2 0 1 0 -50 200 -100 200 N
+P 2 0 1 0 -50 200 50 200 N
+P 2 0 1 10 -50 250 -50 150 N
+P 2 0 1 0 50 0 -50 0 N
+P 2 0 1 0 50 0 100 0 N
+P 3 0 1 0 -50 50 -50 -50 -50 -50 N
+P 3 0 1 0 -50 250 -50 150 -50 150 N
+P 4 0 1 0 50 -200 80 -200 80 200 50 200 N
+P 4 0 1 10 50 -150 50 -250 -50 -200 50 -150 N
+P 4 0 1 10 50 50 50 -50 -50 0 50 50 N
+P 4 0 1 10 50 250 50 150 -50 200 50 250 N
+P 5 0 1 0 -40 -150 20 -90 -10 -90 20 -90 20 -120 N
+P 5 0 1 0 -40 50 20 110 -10 110 20 110 20 80 N
+P 5 0 1 0 -40 250 20 310 -10 310 20 310 20 280 N
+P 5 0 1 0 0 -150 60 -90 30 -90 60 -90 60 -120 N
+P 5 0 1 0 0 50 60 110 30 110 60 110 60 80 N
+P 5 0 1 0 0 250 60 310 30 310 60 310 60 280 N
+X BK 1 -200 -200 100 R 50 50 1 1 P
+X GK 2 -200 0 100 R 50 50 1 1 P
+X RK 3 -200 200 100 R 50 50 1 1 P
+X A 4 200 0 100 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# LED_BGRK
 #
-DEF LED_BCRG D 0 0 Y N 1 F N
+DEF LED_BGRK D 0 0 Y N 1 F N
 F0 "D" 0 370 50 H V C CNN
-F1 "LED_BCRG" 0 -350 50 H V C CNN
+F1 "LED_BGRK" 0 -350 50 H V C CNN
 F2 "" 0 -50 50 H I C CNN
 F3 "" 0 -50 50 H I C CNN
 $FPLIST
@@ -4957,17 +5149,17 @@ P 5 0 1 0 0 -150 60 -90 30 -90 60 -90 60 -120 N
 P 5 0 1 0 0 50 60 110 30 110 60 110 60 80 N
 P 5 0 1 0 0 250 60 310 30 310 60 310 60 280 N
 X BA 1 200 -200 100 L 50 50 1 1 P
-X K 2 -200 0 100 R 50 50 1 1 P
+X GA 2 200 0 100 L 50 50 1 1 P
 X RA 3 200 200 100 L 50 50 1 1 P
-X GA 4 200 0 100 L 50 50 1 1 P
+X K 4 -200 0 100 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# LED_BGAR
+# LED_BKGR
 #
-DEF LED_BGAR D 0 0 Y N 1 F N
+DEF LED_BKGR D 0 0 Y N 1 F N
 F0 "D" 0 370 50 H V C CNN
-F1 "LED_BGAR" 0 -350 50 H V C CNN
+F1 "LED_BKGR" 0 -350 50 H V C CNN
 F2 "" 0 -50 50 H I C CNN
 F3 "" 0 -50 50 H I C CNN
 $FPLIST
@@ -4976,28 +5168,79 @@ $FPLIST
  LED_THT:*
 $ENDFPLIST
 DRAW
-C 80 0 10 0 1 0 F
-T 0 -75 -250 50 0 0 0 B Normal 0 C C
-T 0 -75 -50 50 0 0 0 G Normal 0 C C
-T 0 -75 150 50 0 0 0 R Normal 0 C C
+C -80 0 10 0 1 0 F
+T 0 75 -250 50 0 0 0 B Normal 0 C C
+T 0 75 -50 50 0 0 0 G Normal 0 C C
+T 0 75 150 50 0 0 0 R Normal 0 C C
+S 50 -50 50 50 0 1 0 N
+S 50 50 50 50 0 1 0 N
+S 50 150 50 250 0 1 0 N
+S 50 250 50 250 0 1 0 N
+S 110 330 -110 -300 0 1 10 f
+P 2 0 1 0 -50 -200 50 -200 N
+P 2 0 1 10 -50 -150 -50 -250 N
+P 2 0 1 0 -50 0 -100 0 N
+P 2 0 1 10 -50 50 -50 -50 N
+P 2 0 1 0 -50 200 50 200 N
+P 2 0 1 10 -50 250 -50 150 N
+P 2 0 1 0 50 -200 100 -200 N
+P 2 0 1 0 50 0 -50 0 N
+P 2 0 1 0 50 0 100 0 N
+P 2 0 1 0 50 200 100 200 N
+P 3 0 1 0 -50 50 -50 -50 -50 -50 N
+P 3 0 1 0 -50 250 -50 150 -50 150 N
+P 4 0 1 0 -50 200 -80 200 -80 -200 -40 -200 N
+P 4 0 1 10 50 -150 50 -250 -50 -200 50 -150 N
+P 4 0 1 10 50 50 50 -50 -50 0 50 50 N
+P 4 0 1 10 50 250 50 150 -50 200 50 250 N
+P 5 0 1 0 -40 -150 20 -90 -10 -90 20 -90 20 -120 N
+P 5 0 1 0 -40 50 20 110 -10 110 20 110 20 80 N
+P 5 0 1 0 -40 250 20 310 -10 310 20 310 20 280 N
+P 5 0 1 0 0 -150 60 -90 30 -90 60 -90 60 -120 N
+P 5 0 1 0 0 50 60 110 30 110 60 110 60 80 N
+P 5 0 1 0 0 250 60 310 30 310 60 310 60 280 N
+X BA 1 200 -200 100 L 50 50 1 1 P
+X K 2 -200 0 100 R 50 50 1 1 P
+X GA 3 200 0 100 L 50 50 1 1 P
+X RA 4 200 200 100 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# LED_BKRG
+#
+DEF LED_BKRG D 0 0 Y N 1 F N
+F0 "D" 0 370 50 H V C CNN
+F1 "LED_BKRG" 0 -350 50 H V C CNN
+F2 "" 0 -50 50 H I C CNN
+F3 "" 0 -50 50 H I C CNN
+$FPLIST
+ LED*
+ LED_SMD:*
+ LED_THT:*
+$ENDFPLIST
+DRAW
+C -80 0 10 0 1 0 F
+T 0 75 -250 50 0 0 0 B Normal 0 C C
+T 0 75 -50 50 0 0 0 G Normal 0 C C
+T 0 75 150 50 0 0 0 R Normal 0 C C
 S 50 -50 50 50 0 1 0 N
 S 50 50 50 50 0 1 0 N
 S 50 150 50 250 0 1 0 N
 S 50 250 50 250 0 1 0 N
 S 110 330 -110 -300 0 1 10 f
-P 2 0 1 0 -50 -200 -100 -200 N
 P 2 0 1 0 -50 -200 50 -200 N
 P 2 0 1 10 -50 -150 -50 -250 N
 P 2 0 1 0 -50 0 -100 0 N
 P 2 0 1 10 -50 50 -50 -50 N
-P 2 0 1 0 -50 200 -100 200 N
 P 2 0 1 0 -50 200 50 200 N
 P 2 0 1 10 -50 250 -50 150 N
+P 2 0 1 0 50 -200 100 -200 N
 P 2 0 1 0 50 0 -50 0 N
 P 2 0 1 0 50 0 100 0 N
+P 2 0 1 0 50 200 100 200 N
 P 3 0 1 0 -50 50 -50 -50 -50 -50 N
 P 3 0 1 0 -50 250 -50 150 -50 150 N
-P 4 0 1 0 50 -200 80 -200 80 200 50 200 N
+P 4 0 1 0 -50 200 -80 200 -80 -200 -40 -200 N
 P 4 0 1 10 50 -150 50 -250 -50 -200 50 -150 N
 P 4 0 1 10 50 50 50 -50 -50 0 50 50 N
 P 4 0 1 10 50 250 50 150 -50 200 50 250 N
@@ -5007,18 +5250,18 @@ P 5 0 1 0 -40 250 20 310 -10 310 20 310 20 280 N
 P 5 0 1 0 0 -150 60 -90 30 -90 60 -90 60 -120 N
 P 5 0 1 0 0 50 60 110 30 110 60 110 60 80 N
 P 5 0 1 0 0 250 60 310 30 310 60 310 60 280 N
-X BK 1 -200 -200 100 R 50 50 1 1 P
-X GK 2 -200 0 100 R 50 50 1 1 P
-X A 3 200 0 100 L 50 50 1 1 P
-X RK 4 -200 200 100 R 50 50 1 1 P
+X BA 1 200 -200 100 L 50 50 1 1 P
+X K 2 -200 0 100 R 50 50 1 1 P
+X RA 3 200 200 100 L 50 50 1 1 P
+X GA 4 200 0 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# LED_BGCR
+# LED_BRAG
 #
-DEF LED_BGCR D 0 0 Y N 1 F N
+DEF LED_BRAG D 0 0 Y N 1 F N
 F0 "D" 0 370 50 H V C CNN
-F1 "LED_BGCR" 0 -350 50 H V C CNN
+F1 "LED_BRAG" 0 -350 50 H V C CNN
 F2 "" 0 -50 50 H I C CNN
 F3 "" 0 -50 50 H I C CNN
 $FPLIST
@@ -5027,28 +5270,28 @@ $FPLIST
  LED_THT:*
 $ENDFPLIST
 DRAW
-C -80 0 10 0 1 0 F
-T 0 75 -250 50 0 0 0 B Normal 0 C C
-T 0 75 -50 50 0 0 0 G Normal 0 C C
-T 0 75 150 50 0 0 0 R Normal 0 C C
+C 80 0 10 0 1 0 F
+T 0 -75 -250 50 0 0 0 B Normal 0 C C
+T 0 -75 -50 50 0 0 0 G Normal 0 C C
+T 0 -75 150 50 0 0 0 R Normal 0 C C
 S 50 -50 50 50 0 1 0 N
 S 50 50 50 50 0 1 0 N
 S 50 150 50 250 0 1 0 N
 S 50 250 50 250 0 1 0 N
 S 110 330 -110 -300 0 1 10 f
+P 2 0 1 0 -50 -200 -100 -200 N
 P 2 0 1 0 -50 -200 50 -200 N
 P 2 0 1 10 -50 -150 -50 -250 N
 P 2 0 1 0 -50 0 -100 0 N
 P 2 0 1 10 -50 50 -50 -50 N
+P 2 0 1 0 -50 200 -100 200 N
 P 2 0 1 0 -50 200 50 200 N
 P 2 0 1 10 -50 250 -50 150 N
-P 2 0 1 0 50 -200 100 -200 N
 P 2 0 1 0 50 0 -50 0 N
 P 2 0 1 0 50 0 100 0 N
-P 2 0 1 0 50 200 100 200 N
 P 3 0 1 0 -50 50 -50 -50 -50 -50 N
 P 3 0 1 0 -50 250 -50 150 -50 150 N
-P 4 0 1 0 -50 200 -80 200 -80 -200 -40 -200 N
+P 4 0 1 0 50 -200 80 -200 80 200 50 200 N
 P 4 0 1 10 50 -150 50 -250 -50 -200 50 -150 N
 P 4 0 1 10 50 50 50 -50 -50 0 50 50 N
 P 4 0 1 10 50 250 50 150 -50 200 50 250 N
@@ -5058,18 +5301,18 @@ P 5 0 1 0 -40 250 20 310 -10 310 20 310 20 280 N
 P 5 0 1 0 0 -150 60 -90 30 -90 60 -90 60 -120 N
 P 5 0 1 0 0 50 60 110 30 110 60 110 60 80 N
 P 5 0 1 0 0 250 60 310 30 310 60 310 60 280 N
-X BA 1 200 -200 100 L 50 50 1 1 P
-X GA 2 200 0 100 L 50 50 1 1 P
-X K 3 -200 0 100 R 50 50 1 1 P
-X RA 4 200 200 100 L 50 50 1 1 P
+X BK 1 -200 -200 100 R 50 50 1 1 P
+X RK 2 -200 200 100 R 50 50 1 1 P
+X A 3 200 0 100 L 50 50 1 1 P
+X GK 4 -200 0 100 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# LED_BGRA
+# LED_BRGA
 #
-DEF LED_BGRA D 0 0 Y N 1 F N
+DEF LED_BRGA D 0 0 Y N 1 F N
 F0 "D" 0 370 50 H V C CNN
-F1 "LED_BGRA" 0 -350 50 H V C CNN
+F1 "LED_BRGA" 0 -350 50 H V C CNN
 F2 "" 0 -50 50 H I C CNN
 F3 "" 0 -50 50 H I C CNN
 $FPLIST
@@ -5110,17 +5353,17 @@ P 5 0 1 0 0 -150 60 -90 30 -90 60 -90 60 -120 N
 P 5 0 1 0 0 50 60 110 30 110 60 110 60 80 N
 P 5 0 1 0 0 250 60 310 30 310 60 310 60 280 N
 X BK 1 -200 -200 100 R 50 50 1 1 P
-X GK 2 -200 0 100 R 50 50 1 1 P
-X RK 3 -200 200 100 R 50 50 1 1 P
+X RK 2 -200 200 100 R 50 50 1 1 P
+X GK 3 -200 0 100 R 50 50 1 1 P
 X A 4 200 0 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# LED_BGRC
+# LED_BRGK
 #
-DEF LED_BGRC D 0 0 Y N 1 F N
+DEF LED_BRGK D 0 0 Y N 1 F N
 F0 "D" 0 370 50 H V C CNN
-F1 "LED_BGRC" 0 -350 50 H V C CNN
+F1 "LED_BRGK" 0 -350 50 H V C CNN
 F2 "" 0 -50 50 H I C CNN
 F3 "" 0 -50 50 H I C CNN
 $FPLIST
@@ -5161,17 +5404,17 @@ P 5 0 1 0 0 -150 60 -90 30 -90 60 -90 60 -120 N
 P 5 0 1 0 0 50 60 110 30 110 60 110 60 80 N
 P 5 0 1 0 0 250 60 310 30 310 60 310 60 280 N
 X BA 1 200 -200 100 L 50 50 1 1 P
-X GA 2 200 0 100 L 50 50 1 1 P
-X RA 3 200 200 100 L 50 50 1 1 P
+X RA 2 200 200 100 L 50 50 1 1 P
+X GA 3 200 0 100 L 50 50 1 1 P
 X K 4 -200 0 100 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# LED_BRAG
+# LED_BRKG
 #
-DEF LED_BRAG D 0 0 Y N 1 F N
+DEF LED_BRKG D 0 0 Y N 1 F N
 F0 "D" 0 370 50 H V C CNN
-F1 "LED_BRAG" 0 -350 50 H V C CNN
+F1 "LED_BRKG" 0 -350 50 H V C CNN
 F2 "" 0 -50 50 H I C CNN
 F3 "" 0 -50 50 H I C CNN
 $FPLIST
@@ -5180,28 +5423,28 @@ $FPLIST
  LED_THT:*
 $ENDFPLIST
 DRAW
-C 80 0 10 0 1 0 F
-T 0 -75 -250 50 0 0 0 B Normal 0 C C
-T 0 -75 -50 50 0 0 0 G Normal 0 C C
-T 0 -75 150 50 0 0 0 R Normal 0 C C
+C -80 0 10 0 1 0 F
+T 0 75 -250 50 0 0 0 B Normal 0 C C
+T 0 75 -50 50 0 0 0 G Normal 0 C C
+T 0 75 150 50 0 0 0 R Normal 0 C C
 S 50 -50 50 50 0 1 0 N
 S 50 50 50 50 0 1 0 N
 S 50 150 50 250 0 1 0 N
 S 50 250 50 250 0 1 0 N
 S 110 330 -110 -300 0 1 10 f
-P 2 0 1 0 -50 -200 -100 -200 N
 P 2 0 1 0 -50 -200 50 -200 N
 P 2 0 1 10 -50 -150 -50 -250 N
 P 2 0 1 0 -50 0 -100 0 N
 P 2 0 1 10 -50 50 -50 -50 N
-P 2 0 1 0 -50 200 -100 200 N
 P 2 0 1 0 -50 200 50 200 N
 P 2 0 1 10 -50 250 -50 150 N
+P 2 0 1 0 50 -200 100 -200 N
 P 2 0 1 0 50 0 -50 0 N
 P 2 0 1 0 50 0 100 0 N
+P 2 0 1 0 50 200 100 200 N
 P 3 0 1 0 -50 50 -50 -50 -50 -50 N
 P 3 0 1 0 -50 250 -50 150 -50 150 N
-P 4 0 1 0 50 -200 80 -200 80 200 50 200 N
+P 4 0 1 0 -50 200 -80 200 -80 -200 -40 -200 N
 P 4 0 1 10 50 -150 50 -250 -50 -200 50 -150 N
 P 4 0 1 10 50 50 50 -50 -50 0 50 50 N
 P 4 0 1 10 50 250 50 150 -50 200 50 250 N
@@ -5211,171 +5454,291 @@ P 5 0 1 0 -40 250 20 310 -10 310 20 310 20 280 N
 P 5 0 1 0 0 -150 60 -90 30 -90 60 -90 60 -120 N
 P 5 0 1 0 0 50 60 110 30 110 60 110 60 80 N
 P 5 0 1 0 0 250 60 310 30 310 60 310 60 280 N
-X BK 1 -200 -200 100 R 50 50 1 1 P
-X RK 2 -200 200 100 R 50 50 1 1 P
-X A 3 200 0 100 L 50 50 1 1 P
-X GK 4 -200 0 100 R 50 50 1 1 P
+X BA 1 200 -200 100 L 50 50 1 1 P
+X RA 2 200 200 100 L 50 50 1 1 P
+X K 3 -200 0 100 R 50 50 1 1 P
+X GA 4 200 0 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# LED_BRCG
+# LED_Dual_AAK
 #
-DEF LED_BRCG D 0 0 Y N 1 F N
-F0 "D" 0 370 50 H V C CNN
-F1 "LED_BRCG" 0 -350 50 H V C CNN
-F2 "" 0 -50 50 H I C CNN
-F3 "" 0 -50 50 H I C CNN
+DEF LED_Dual_AAK D 0 0 Y N 1 F N
+F0 "D" 0 225 50 H V C CNN
+F1 "LED_Dual_AAK" 0 -250 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ LED*
+ LED_SMD:*
+ LED_THT:*
+$ENDFPLIST
+DRAW
+C -100 0 11 0 1 0 F
+C 0 0 180 0 1 10 f
+P 2 0 1 0 -180 0 -100 0 N
+P 2 0 1 10 -50 -50 -50 -150 N
+P 2 0 1 10 -50 50 -50 150 N
+P 2 0 1 0 150 -100 75 -100 N
+P 2 0 1 0 150 100 75 100 N
+P 4 0 1 10 50 -150 50 -50 -50 -100 50 -150 N
+P 4 0 1 10 50 50 50 150 -50 100 50 50 N
+P 4 0 1 0 80 100 -100 100 -100 -100 80 -100 N
+P 5 0 1 0 80 200 140 260 110 260 140 260 140 230 N
+P 5 0 1 0 130 160 190 220 160 220 190 220 190 190 N
+X A1 1 300 100 150 L 50 50 1 1 I
+X A2 2 300 -100 150 L 50 50 1 1 I
+X K 3 -300 0 120 R 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# LED_Dual_AAKK
+#
+DEF LED_Dual_AAKK D 0 0 Y N 1 F N
+F0 "D" 0 225 50 H V C CNN
+F1 "LED_Dual_AAKK" 0 -250 50 H V C CNN
+F2 "" 30 0 50 H I C CNN
+F3 "" 30 0 50 H I C CNN
+$FPLIST
+ LED*
+ LED_SMD:*
+ LED_THT:*
+$ENDFPLIST
+DRAW
+C 0 0 180 0 1 10 f
+P 2 0 1 0 -200 -100 80 -100 N
+P 2 0 1 0 -200 100 80 100 N
+P 2 0 1 10 50 -50 50 -150 N
+P 2 0 1 10 50 150 50 50 N
+P 2 0 1 0 150 -100 75 -100 N
+P 2 0 1 0 150 100 75 100 N
+P 4 0 1 10 -50 -50 -50 -150 50 -100 -50 -50 N
+P 4 0 1 10 -50 150 -50 50 50 100 -50 150 N
+P 5 0 1 0 80 200 140 260 110 260 140 260 140 230 N
+P 5 0 1 0 130 160 190 220 160 220 190 220 190 190 N
+X A1 1 -300 100 120 R 50 50 1 1 I
+X A2 2 -300 -100 120 R 50 50 1 1 I
+X K1 3 300 100 150 L 50 50 1 1 I
+X K2 4 300 -100 150 L 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# LED_Dual_AKA
+#
+DEF LED_Dual_AKA D 0 0 Y N 1 F N
+F0 "D" 0 225 50 H V C CNN
+F1 "LED_Dual_AKA" 0 -250 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ LED*
+ LED_SMD:*
+ LED_THT:*
+$ENDFPLIST
+DRAW
+C -100 0 11 0 1 0 F
+C 0 0 180 0 1 10 f
+P 2 0 1 0 -180 0 -100 0 N
+P 2 0 1 10 -50 -50 -50 -150 N
+P 2 0 1 10 -50 50 -50 150 N
+P 2 0 1 0 150 -100 75 -100 N
+P 2 0 1 0 150 100 75 100 N
+P 4 0 1 10 50 -150 50 -50 -50 -100 50 -150 N
+P 4 0 1 10 50 50 50 150 -50 100 50 50 N
+P 4 0 1 0 80 100 -100 100 -100 -100 80 -100 N
+P 5 0 1 0 80 200 140 260 110 260 140 260 140 230 N
+P 5 0 1 0 130 160 190 220 160 220 190 220 190 190 N
+X A1 1 300 100 150 L 50 50 1 1 I
+X K 2 -300 0 120 R 50 50 1 1 I
+X A2 3 300 -100 150 L 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# LED_Dual_AKAK
+#
+DEF LED_Dual_AKAK D 0 0 Y N 1 F N
+F0 "D" 0 225 50 H V C CNN
+F1 "LED_Dual_AKAK" 0 -250 50 H V C CNN
+F2 "" 30 0 50 H I C CNN
+F3 "" 30 0 50 H I C CNN
+$FPLIST
+ LED*
+ LED_SMD:*
+ LED_THT:*
+$ENDFPLIST
+DRAW
+C 0 0 180 0 1 10 f
+P 2 0 1 0 -200 -100 80 -100 N
+P 2 0 1 0 -200 100 80 100 N
+P 2 0 1 10 50 -50 50 -150 N
+P 2 0 1 10 50 150 50 50 N
+P 2 0 1 0 150 -100 75 -100 N
+P 2 0 1 0 150 100 75 100 N
+P 4 0 1 10 -50 -50 -50 -150 50 -100 -50 -50 N
+P 4 0 1 10 -50 150 -50 50 50 100 -50 150 N
+P 5 0 1 0 80 200 140 260 110 260 140 260 140 230 N
+P 5 0 1 0 130 160 190 220 160 220 190 220 190 190 N
+X A1 1 -300 100 120 R 50 50 1 1 I
+X K1 2 300 100 150 L 50 50 1 1 I
+X A2 3 -300 -100 120 R 50 50 1 1 I
+X K2 4 300 -100 150 L 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# LED_Dual_Bidirectional
+#
+DEF LED_Dual_Bidirectional D 0 0 Y N 1 F N
+F0 "D" 0 225 50 H V C CNN
+F1 "LED_Dual_Bidirectional" 0 -250 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ LED*
+ LED_SMD:*
+ LED_THT:*
+$ENDFPLIST
+DRAW
+C -80 0 10 0 1 0 F
+C 0 0 180 0 1 10 f
+C 90 0 10 0 1 0 F
+P 2 0 1 0 -180 0 -100 0 N
+P 2 0 1 0 -80 0 -100 0 N
+P 2 0 1 10 -40 150 -40 50 N
+P 2 0 1 10 50 -50 50 -150 N
+P 2 0 1 0 160 0 90 0 F
+P 2 0 1 8 170 230 170 200 N
+P 2 0 1 8 220 180 220 150 N
+P 3 0 1 8 110 170 170 230 140 230 N
+P 3 0 1 8 160 120 220 180 190 180 N
+P 4 0 1 10 -40 -50 -40 -150 50 -100 -40 -50 N
+P 4 0 1 10 50 150 50 50 -40 100 50 150 N
+P 5 0 1 0 90 100 -80 100 -80 -100 90 -100 90 100 N
+X KA 1 300 0 150 L 50 50 1 1 I
+X AK 2 -300 0 120 R 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# LED_Dual_KAK
+#
+DEF LED_Dual_KAK D 0 0 Y Y 1 F N
+F0 "D" 0 225 50 H V C CNN
+F1 "LED_Dual_KAK" 0 -250 50 H V C CNN
+F2 "" 50 0 50 H I C CNN
+F3 "" 50 0 50 H I C CNN
+$FPLIST
+ LED*
+ LED_SMD:*
+ LED_THT:*
+$ENDFPLIST
+DRAW
+C -100 0 11 0 1 0 F
+C 0 0 180 0 1 10 f
+P 2 0 1 0 -180 0 -100 0 N
+P 2 0 1 10 50 -50 50 -150 N
+P 2 0 1 10 50 150 50 50 N
+P 2 0 1 0 150 -100 75 -100 N
+P 2 0 1 0 150 100 75 100 N
+P 4 0 1 10 -50 -50 -50 -150 50 -100 -50 -50 N
+P 4 0 1 10 -50 150 -50 50 50 100 -50 150 N
+P 4 0 1 0 80 100 -100 100 -100 -100 80 -100 N
+P 5 0 1 0 80 200 140 260 110 260 140 260 140 230 N
+P 5 0 1 0 130 160 190 220 160 220 190 220 190 190 N
+X K1 1 300 100 150 L 50 50 1 1 I
+X A 2 -300 0 120 R 50 50 1 1 I
+X K2 3 300 -100 150 L 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# LED_Dual_KAKA
+#
+DEF LED_Dual_KAKA D 0 0 Y N 1 F N
+F0 "D" 0 225 50 H V C CNN
+F1 "LED_Dual_KAKA" 0 -250 50 H V C CNN
+F2 "" 30 0 50 H I C CNN
+F3 "" 30 0 50 H I C CNN
 $FPLIST
  LED*
  LED_SMD:*
  LED_THT:*
 $ENDFPLIST
 DRAW
-C -80 0 10 0 1 0 F
-T 0 75 -250 50 0 0 0 B Normal 0 C C
-T 0 75 -50 50 0 0 0 G Normal 0 C C
-T 0 75 150 50 0 0 0 R Normal 0 C C
-S 50 -50 50 50 0 1 0 N
-S 50 50 50 50 0 1 0 N
-S 50 150 50 250 0 1 0 N
-S 50 250 50 250 0 1 0 N
-S 110 330 -110 -300 0 1 10 f
-P 2 0 1 0 -50 -200 50 -200 N
-P 2 0 1 10 -50 -150 -50 -250 N
-P 2 0 1 0 -50 0 -100 0 N
-P 2 0 1 10 -50 50 -50 -50 N
-P 2 0 1 0 -50 200 50 200 N
-P 2 0 1 10 -50 250 -50 150 N
-P 2 0 1 0 50 -200 100 -200 N
-P 2 0 1 0 50 0 -50 0 N
-P 2 0 1 0 50 0 100 0 N
-P 2 0 1 0 50 200 100 200 N
-P 3 0 1 0 -50 50 -50 -50 -50 -50 N
-P 3 0 1 0 -50 250 -50 150 -50 150 N
-P 4 0 1 0 -50 200 -80 200 -80 -200 -40 -200 N
-P 4 0 1 10 50 -150 50 -250 -50 -200 50 -150 N
-P 4 0 1 10 50 50 50 -50 -50 0 50 50 N
-P 4 0 1 10 50 250 50 150 -50 200 50 250 N
-P 5 0 1 0 -40 -150 20 -90 -10 -90 20 -90 20 -120 N
-P 5 0 1 0 -40 50 20 110 -10 110 20 110 20 80 N
-P 5 0 1 0 -40 250 20 310 -10 310 20 310 20 280 N
-P 5 0 1 0 0 -150 60 -90 30 -90 60 -90 60 -120 N
-P 5 0 1 0 0 50 60 110 30 110 60 110 60 80 N
-P 5 0 1 0 0 250 60 310 30 310 60 310 60 280 N
-X BA 1 200 -200 100 L 50 50 1 1 P
-X RA 2 200 200 100 L 50 50 1 1 P
-X K 3 -200 0 100 R 50 50 1 1 P
-X GA 4 200 0 100 L 50 50 1 1 P
+C 0 0 180 0 1 10 f
+P 2 0 1 0 -200 -100 80 -100 N
+P 2 0 1 0 -200 100 80 100 N
+P 2 0 1 10 -50 -50 -50 -150 N
+P 2 0 1 10 -50 150 -50 50 N
+P 2 0 1 0 150 -100 75 -100 N
+P 2 0 1 0 150 100 75 100 N
+P 4 0 1 10 50 -50 50 -150 -50 -100 50 -50 N
+P 4 0 1 10 50 150 50 50 -50 100 50 150 N
+P 5 0 1 0 80 200 140 260 110 260 140 260 140 230 N
+P 5 0 1 0 130 160 190 220 160 220 190 220 190 190 N
+X A1 1 -300 100 120 R 50 50 1 1 I
+X K1 2 300 100 150 L 50 50 1 1 I
+X A2 3 -300 -100 120 R 50 50 1 1 I
+X K2 4 300 -100 150 L 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
-# LED_BRGA
+# LED_Dual_KKA
 #
-DEF LED_BRGA D 0 0 Y N 1 F N
-F0 "D" 0 370 50 H V C CNN
-F1 "LED_BRGA" 0 -350 50 H V C CNN
-F2 "" 0 -50 50 H I C CNN
-F3 "" 0 -50 50 H I C CNN
+DEF LED_Dual_KKA D 0 0 Y Y 1 F N
+F0 "D" 0 225 50 H V C CNN
+F1 "LED_Dual_KKA" 0 -250 50 H V C CNN
+F2 "" 50 0 50 H I C CNN
+F3 "" 50 0 50 H I C CNN
 $FPLIST
  LED*
  LED_SMD:*
  LED_THT:*
 $ENDFPLIST
 DRAW
-C 80 0 10 0 1 0 F
-T 0 -75 -250 50 0 0 0 B Normal 0 C C
-T 0 -75 -50 50 0 0 0 G Normal 0 C C
-T 0 -75 150 50 0 0 0 R Normal 0 C C
-S 50 -50 50 50 0 1 0 N
-S 50 50 50 50 0 1 0 N
-S 50 150 50 250 0 1 0 N
-S 50 250 50 250 0 1 0 N
-S 110 330 -110 -300 0 1 10 f
-P 2 0 1 0 -50 -200 -100 -200 N
-P 2 0 1 0 -50 -200 50 -200 N
-P 2 0 1 10 -50 -150 -50 -250 N
-P 2 0 1 0 -50 0 -100 0 N
-P 2 0 1 10 -50 50 -50 -50 N
-P 2 0 1 0 -50 200 -100 200 N
-P 2 0 1 0 -50 200 50 200 N
-P 2 0 1 10 -50 250 -50 150 N
-P 2 0 1 0 50 0 -50 0 N
-P 2 0 1 0 50 0 100 0 N
-P 3 0 1 0 -50 50 -50 -50 -50 -50 N
-P 3 0 1 0 -50 250 -50 150 -50 150 N
-P 4 0 1 0 50 -200 80 -200 80 200 50 200 N
-P 4 0 1 10 50 -150 50 -250 -50 -200 50 -150 N
-P 4 0 1 10 50 50 50 -50 -50 0 50 50 N
-P 4 0 1 10 50 250 50 150 -50 200 50 250 N
-P 5 0 1 0 -40 -150 20 -90 -10 -90 20 -90 20 -120 N
-P 5 0 1 0 -40 50 20 110 -10 110 20 110 20 80 N
-P 5 0 1 0 -40 250 20 310 -10 310 20 310 20 280 N
-P 5 0 1 0 0 -150 60 -90 30 -90 60 -90 60 -120 N
-P 5 0 1 0 0 50 60 110 30 110 60 110 60 80 N
-P 5 0 1 0 0 250 60 310 30 310 60 310 60 280 N
-X BK 1 -200 -200 100 R 50 50 1 1 P
-X RK 2 -200 200 100 R 50 50 1 1 P
-X GK 3 -200 0 100 R 50 50 1 1 P
-X A 4 200 0 100 L 50 50 1 1 P
+C -100 0 11 0 1 0 F
+C 0 0 180 0 1 10 f
+P 2 0 1 0 -180 0 -100 0 N
+P 2 0 1 10 50 -50 50 -150 N
+P 2 0 1 10 50 150 50 50 N
+P 2 0 1 0 150 -100 75 -100 N
+P 2 0 1 0 150 100 75 100 N
+P 4 0 1 10 -50 -50 -50 -150 50 -100 -50 -50 N
+P 4 0 1 10 -50 150 -50 50 50 100 -50 150 N
+P 4 0 1 0 80 100 -100 100 -100 -100 80 -100 N
+P 5 0 1 0 80 200 140 260 110 260 140 260 140 230 N
+P 5 0 1 0 130 160 190 220 160 220 190 220 190 190 N
+X K1 1 300 100 150 L 50 50 1 1 I
+X K2 2 300 -100 150 L 50 50 1 1 I
+X A 3 -300 0 120 R 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
-# LED_BRGC
+# LED_Filled
 #
-DEF LED_BRGC D 0 0 Y N 1 F N
-F0 "D" 0 370 50 H V C CNN
-F1 "LED_BRGC" 0 -350 50 H V C CNN
-F2 "" 0 -50 50 H I C CNN
-F3 "" 0 -50 50 H I C CNN
+DEF LED_Filled D 0 40 N N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "LED_Filled" 0 -100 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
 $FPLIST
  LED*
  LED_SMD:*
  LED_THT:*
 $ENDFPLIST
 DRAW
-C -80 0 10 0 1 0 F
-T 0 75 -250 50 0 0 0 B Normal 0 C C
-T 0 75 -50 50 0 0 0 G Normal 0 C C
-T 0 75 150 50 0 0 0 R Normal 0 C C
-S 50 -50 50 50 0 1 0 N
-S 50 50 50 50 0 1 0 N
-S 50 150 50 250 0 1 0 N
-S 50 250 50 250 0 1 0 N
-S 110 330 -110 -300 0 1 10 f
-P 2 0 1 0 -50 -200 50 -200 N
-P 2 0 1 10 -50 -150 -50 -250 N
-P 2 0 1 0 -50 0 -100 0 N
-P 2 0 1 10 -50 50 -50 -50 N
-P 2 0 1 0 -50 200 50 200 N
-P 2 0 1 10 -50 250 -50 150 N
-P 2 0 1 0 50 -200 100 -200 N
-P 2 0 1 0 50 0 -50 0 N
-P 2 0 1 0 50 0 100 0 N
-P 2 0 1 0 50 200 100 200 N
-P 3 0 1 0 -50 50 -50 -50 -50 -50 N
-P 3 0 1 0 -50 250 -50 150 -50 150 N
-P 4 0 1 0 -50 200 -80 200 -80 -200 -40 -200 N
-P 4 0 1 10 50 -150 50 -250 -50 -200 50 -150 N
-P 4 0 1 10 50 50 50 -50 -50 0 50 50 N
-P 4 0 1 10 50 250 50 150 -50 200 50 250 N
-P 5 0 1 0 -40 -150 20 -90 -10 -90 20 -90 20 -120 N
-P 5 0 1 0 -40 50 20 110 -10 110 20 110 20 80 N
-P 5 0 1 0 -40 250 20 310 -10 310 20 310 20 280 N
-P 5 0 1 0 0 -150 60 -90 30 -90 60 -90 60 -120 N
-P 5 0 1 0 0 50 60 110 30 110 60 110 60 80 N
-P 5 0 1 0 0 250 60 310 30 310 60 310 60 280 N
-X BA 1 200 -200 100 L 50 50 1 1 P
-X RA 2 200 200 100 L 50 50 1 1 P
-X GA 3 200 0 100 L 50 50 1 1 P
-X K 4 -200 0 100 R 50 50 1 1 P
+P 2 0 1 10 -50 -50 -50 50 N
+P 2 0 1 0 -50 0 50 0 N
+P 4 0 1 10 50 -50 50 50 -50 0 50 -50 F
+P 5 0 1 0 -120 -30 -180 -90 -150 -90 -180 -90 -180 -60 N
+P 5 0 1 0 -70 -30 -130 -90 -100 -90 -130 -90 -130 -60 N
+X K 1 -150 0 100 R 50 50 1 1 P
+X A 2 150 0 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# LED_CBGR
+# LED_GABR
 #
-DEF LED_CBGR D 0 0 Y N 1 F N
+DEF LED_GABR D 0 0 Y N 1 F N
 F0 "D" 0 370 50 H V C CNN
-F1 "LED_CBGR" 0 -350 50 H V C CNN
+F1 "LED_GABR" 0 -350 50 H V C CNN
 F2 "" 0 -50 50 H I C CNN
 F3 "" 0 -50 50 H I C CNN
 $FPLIST
@@ -5384,28 +5747,28 @@ $FPLIST
  LED_THT:*
 $ENDFPLIST
 DRAW
-C -80 0 10 0 1 0 F
-T 0 75 -250 50 0 0 0 B Normal 0 C C
-T 0 75 -50 50 0 0 0 G Normal 0 C C
-T 0 75 150 50 0 0 0 R Normal 0 C C
+C 80 0 10 0 1 0 F
+T 0 -75 -250 50 0 0 0 B Normal 0 C C
+T 0 -75 -50 50 0 0 0 G Normal 0 C C
+T 0 -75 150 50 0 0 0 R Normal 0 C C
 S 50 -50 50 50 0 1 0 N
 S 50 50 50 50 0 1 0 N
 S 50 150 50 250 0 1 0 N
 S 50 250 50 250 0 1 0 N
 S 110 330 -110 -300 0 1 10 f
+P 2 0 1 0 -50 -200 -100 -200 N
 P 2 0 1 0 -50 -200 50 -200 N
 P 2 0 1 10 -50 -150 -50 -250 N
 P 2 0 1 0 -50 0 -100 0 N
 P 2 0 1 10 -50 50 -50 -50 N
+P 2 0 1 0 -50 200 -100 200 N
 P 2 0 1 0 -50 200 50 200 N
 P 2 0 1 10 -50 250 -50 150 N
-P 2 0 1 0 50 -200 100 -200 N
 P 2 0 1 0 50 0 -50 0 N
 P 2 0 1 0 50 0 100 0 N
-P 2 0 1 0 50 200 100 200 N
 P 3 0 1 0 -50 50 -50 -50 -50 -50 N
 P 3 0 1 0 -50 250 -50 150 -50 150 N
-P 4 0 1 0 -50 200 -80 200 -80 -200 -40 -200 N
+P 4 0 1 0 50 -200 80 -200 80 200 50 200 N
 P 4 0 1 10 50 -150 50 -250 -50 -200 50 -150 N
 P 4 0 1 10 50 50 50 -50 -50 0 50 50 N
 P 4 0 1 10 50 250 50 150 -50 200 50 250 N
@@ -5415,18 +5778,18 @@ P 5 0 1 0 -40 250 20 310 -10 310 20 310 20 280 N
 P 5 0 1 0 0 -150 60 -90 30 -90 60 -90 60 -120 N
 P 5 0 1 0 0 50 60 110 30 110 60 110 60 80 N
 P 5 0 1 0 0 250 60 310 30 310 60 310 60 280 N
-X K 1 -200 0 100 R 50 50 1 1 P
-X BA 2 200 -200 100 L 50 50 1 1 P
-X GA 3 200 0 100 L 50 50 1 1 P
-X RA 4 200 200 100 L 50 50 1 1 P
+X GK 1 -200 0 100 R 50 50 1 1 P
+X A 2 200 0 100 L 50 50 1 1 P
+X BK 3 -200 -200 100 R 50 50 1 1 P
+X RK 4 -200 200 100 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# LED_CBRG
+# LED_GARB
 #
-DEF LED_CBRG D 0 0 Y N 1 F N
+DEF LED_GARB D 0 0 Y N 1 F N
 F0 "D" 0 370 50 H V C CNN
-F1 "LED_CBRG" 0 -350 50 H V C CNN
+F1 "LED_GARB" 0 -350 50 H V C CNN
 F2 "" 0 -50 50 H I C CNN
 F3 "" 0 -50 50 H I C CNN
 $FPLIST
@@ -5435,28 +5798,28 @@ $FPLIST
  LED_THT:*
 $ENDFPLIST
 DRAW
-C -80 0 10 0 1 0 F
-T 0 75 -250 50 0 0 0 B Normal 0 C C
-T 0 75 -50 50 0 0 0 G Normal 0 C C
-T 0 75 150 50 0 0 0 R Normal 0 C C
+C 80 0 10 0 1 0 F
+T 0 -75 -250 50 0 0 0 B Normal 0 C C
+T 0 -75 -50 50 0 0 0 G Normal 0 C C
+T 0 -75 150 50 0 0 0 R Normal 0 C C
 S 50 -50 50 50 0 1 0 N
 S 50 50 50 50 0 1 0 N
 S 50 150 50 250 0 1 0 N
 S 50 250 50 250 0 1 0 N
 S 110 330 -110 -300 0 1 10 f
+P 2 0 1 0 -50 -200 -100 -200 N
 P 2 0 1 0 -50 -200 50 -200 N
 P 2 0 1 10 -50 -150 -50 -250 N
 P 2 0 1 0 -50 0 -100 0 N
 P 2 0 1 10 -50 50 -50 -50 N
+P 2 0 1 0 -50 200 -100 200 N
 P 2 0 1 0 -50 200 50 200 N
 P 2 0 1 10 -50 250 -50 150 N
-P 2 0 1 0 50 -200 100 -200 N
 P 2 0 1 0 50 0 -50 0 N
 P 2 0 1 0 50 0 100 0 N
-P 2 0 1 0 50 200 100 200 N
 P 3 0 1 0 -50 50 -50 -50 -50 -50 N
 P 3 0 1 0 -50 250 -50 150 -50 150 N
-P 4 0 1 0 -50 200 -80 200 -80 -200 -40 -200 N
+P 4 0 1 0 50 -200 80 -200 80 200 50 200 N
 P 4 0 1 10 50 -150 50 -250 -50 -200 50 -150 N
 P 4 0 1 10 50 50 50 -50 -50 0 50 50 N
 P 4 0 1 10 50 250 50 150 -50 200 50 250 N
@@ -5466,18 +5829,18 @@ P 5 0 1 0 -40 250 20 310 -10 310 20 310 20 280 N
 P 5 0 1 0 0 -150 60 -90 30 -90 60 -90 60 -120 N
 P 5 0 1 0 0 50 60 110 30 110 60 110 60 80 N
 P 5 0 1 0 0 250 60 310 30 310 60 310 60 280 N
-X K 1 -200 0 100 R 50 50 1 1 P
-X BA 2 200 -200 100 L 50 50 1 1 P
-X RA 3 200 200 100 L 50 50 1 1 P
-X GA 4 200 0 100 L 50 50 1 1 P
+X GK 1 -200 0 100 R 50 50 1 1 P
+X A 2 200 0 100 L 50 50 1 1 P
+X RK 3 -200 200 100 R 50 50 1 1 P
+X BK 4 -200 -200 100 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# LED_CGBR
+# LED_GBAR
 #
-DEF LED_CGBR D 0 0 Y N 1 F N
+DEF LED_GBAR D 0 0 Y N 1 F N
 F0 "D" 0 370 50 H V C CNN
-F1 "LED_CGBR" 0 -350 50 H V C CNN
+F1 "LED_GBAR" 0 -350 50 H V C CNN
 F2 "" 0 -50 50 H I C CNN
 F3 "" 0 -50 50 H I C CNN
 $FPLIST
@@ -5486,28 +5849,28 @@ $FPLIST
  LED_THT:*
 $ENDFPLIST
 DRAW
-C -80 0 10 0 1 0 F
-T 0 75 -250 50 0 0 0 B Normal 0 C C
-T 0 75 -50 50 0 0 0 G Normal 0 C C
-T 0 75 150 50 0 0 0 R Normal 0 C C
+C 80 0 10 0 1 0 F
+T 0 -75 -250 50 0 0 0 B Normal 0 C C
+T 0 -75 -50 50 0 0 0 G Normal 0 C C
+T 0 -75 150 50 0 0 0 R Normal 0 C C
 S 50 -50 50 50 0 1 0 N
 S 50 50 50 50 0 1 0 N
 S 50 150 50 250 0 1 0 N
 S 50 250 50 250 0 1 0 N
 S 110 330 -110 -300 0 1 10 f
+P 2 0 1 0 -50 -200 -100 -200 N
 P 2 0 1 0 -50 -200 50 -200 N
 P 2 0 1 10 -50 -150 -50 -250 N
 P 2 0 1 0 -50 0 -100 0 N
 P 2 0 1 10 -50 50 -50 -50 N
+P 2 0 1 0 -50 200 -100 200 N
 P 2 0 1 0 -50 200 50 200 N
 P 2 0 1 10 -50 250 -50 150 N
-P 2 0 1 0 50 -200 100 -200 N
 P 2 0 1 0 50 0 -50 0 N
 P 2 0 1 0 50 0 100 0 N
-P 2 0 1 0 50 200 100 200 N
 P 3 0 1 0 -50 50 -50 -50 -50 -50 N
 P 3 0 1 0 -50 250 -50 150 -50 150 N
-P 4 0 1 0 -50 200 -80 200 -80 -200 -40 -200 N
+P 4 0 1 0 50 -200 80 -200 80 200 50 200 N
 P 4 0 1 10 50 -150 50 -250 -50 -200 50 -150 N
 P 4 0 1 10 50 50 50 -50 -50 0 50 50 N
 P 4 0 1 10 50 250 50 150 -50 200 50 250 N
@@ -5517,18 +5880,18 @@ P 5 0 1 0 -40 250 20 310 -10 310 20 310 20 280 N
 P 5 0 1 0 0 -150 60 -90 30 -90 60 -90 60 -120 N
 P 5 0 1 0 0 50 60 110 30 110 60 110 60 80 N
 P 5 0 1 0 0 250 60 310 30 310 60 310 60 280 N
-X K 1 -200 0 100 R 50 50 1 1 P
-X GA 2 200 0 100 L 50 50 1 1 P
-X BA 3 200 -200 100 L 50 50 1 1 P
-X RA 4 200 200 100 L 50 50 1 1 P
+X GK 1 -200 0 100 R 50 50 1 1 P
+X BK 2 -200 -200 100 R 50 50 1 1 P
+X A 3 200 0 100 L 50 50 1 1 P
+X RK 4 -200 200 100 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# LED_CGRB
+# LED_GBKR
 #
-DEF LED_CGRB D 0 0 Y N 1 F N
+DEF LED_GBKR D 0 0 Y N 1 F N
 F0 "D" 0 370 50 H V C CNN
-F1 "LED_CGRB" 0 -350 50 H V C CNN
+F1 "LED_GBKR" 0 -350 50 H V C CNN
 F2 "" 0 -50 50 H I C CNN
 F3 "" 0 -50 50 H I C CNN
 $FPLIST
@@ -5568,18 +5931,18 @@ P 5 0 1 0 -40 250 20 310 -10 310 20 310 20 280 N
 P 5 0 1 0 0 -150 60 -90 30 -90 60 -90 60 -120 N
 P 5 0 1 0 0 50 60 110 30 110 60 110 60 80 N
 P 5 0 1 0 0 250 60 310 30 310 60 310 60 280 N
-X K 1 -200 0 100 R 50 50 1 1 P
-X GA 2 200 0 100 L 50 50 1 1 P
-X RA 3 200 200 100 L 50 50 1 1 P
-X BA 4 200 -200 100 L 50 50 1 1 P
+X GA 1 200 0 100 L 50 50 1 1 P
+X BA 2 200 -200 100 L 50 50 1 1 P
+X K 3 -200 0 100 R 50 50 1 1 P
+X RA 4 200 200 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# LED_CRBG
+# LED_GBRA
 #
-DEF LED_CRBG D 0 0 Y N 1 F N
+DEF LED_GBRA D 0 0 Y N 1 F N
 F0 "D" 0 370 50 H V C CNN
-F1 "LED_CRBG" 0 -350 50 H V C CNN
+F1 "LED_GBRA" 0 -350 50 H V C CNN
 F2 "" 0 -50 50 H I C CNN
 F3 "" 0 -50 50 H I C CNN
 $FPLIST
@@ -5588,28 +5951,28 @@ $FPLIST
  LED_THT:*
 $ENDFPLIST
 DRAW
-C -80 0 10 0 1 0 F
-T 0 75 -250 50 0 0 0 B Normal 0 C C
-T 0 75 -50 50 0 0 0 G Normal 0 C C
-T 0 75 150 50 0 0 0 R Normal 0 C C
+C 80 0 10 0 1 0 F
+T 0 -75 -250 50 0 0 0 B Normal 0 C C
+T 0 -75 -50 50 0 0 0 G Normal 0 C C
+T 0 -75 150 50 0 0 0 R Normal 0 C C
 S 50 -50 50 50 0 1 0 N
 S 50 50 50 50 0 1 0 N
 S 50 150 50 250 0 1 0 N
 S 50 250 50 250 0 1 0 N
 S 110 330 -110 -300 0 1 10 f
+P 2 0 1 0 -50 -200 -100 -200 N
 P 2 0 1 0 -50 -200 50 -200 N
 P 2 0 1 10 -50 -150 -50 -250 N
 P 2 0 1 0 -50 0 -100 0 N
 P 2 0 1 10 -50 50 -50 -50 N
+P 2 0 1 0 -50 200 -100 200 N
 P 2 0 1 0 -50 200 50 200 N
 P 2 0 1 10 -50 250 -50 150 N
-P 2 0 1 0 50 -200 100 -200 N
 P 2 0 1 0 50 0 -50 0 N
 P 2 0 1 0 50 0 100 0 N
-P 2 0 1 0 50 200 100 200 N
 P 3 0 1 0 -50 50 -50 -50 -50 -50 N
 P 3 0 1 0 -50 250 -50 150 -50 150 N
-P 4 0 1 0 -50 200 -80 200 -80 -200 -40 -200 N
+P 4 0 1 0 50 -200 80 -200 80 200 50 200 N
 P 4 0 1 10 50 -150 50 -250 -50 -200 50 -150 N
 P 4 0 1 10 50 50 50 -50 -50 0 50 50 N
 P 4 0 1 10 50 250 50 150 -50 200 50 250 N
@@ -5619,18 +5982,18 @@ P 5 0 1 0 -40 250 20 310 -10 310 20 310 20 280 N
 P 5 0 1 0 0 -150 60 -90 30 -90 60 -90 60 -120 N
 P 5 0 1 0 0 50 60 110 30 110 60 110 60 80 N
 P 5 0 1 0 0 250 60 310 30 310 60 310 60 280 N
-X K 1 -200 0 100 R 50 50 1 1 P
-X RA 2 200 200 100 L 50 50 1 1 P
-X BA 3 200 -200 100 L 50 50 1 1 P
-X GA 4 200 0 100 L 50 50 1 1 P
+X GK 1 -200 0 100 R 50 50 1 1 P
+X BK 2 -200 -200 100 R 50 50 1 1 P
+X RK 3 -200 200 100 R 50 50 1 1 P
+X A 4 200 0 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# LED_CRGB
+# LED_GBRK
 #
-DEF LED_CRGB D 0 0 Y N 1 F N
+DEF LED_GBRK D 0 0 Y N 1 F N
 F0 "D" 0 370 50 H V C CNN
-F1 "LED_CRGB" 0 -350 50 H V C CNN
+F1 "LED_GBRK" 0 -350 50 H V C CNN
 F2 "" 0 -50 50 H I C CNN
 F3 "" 0 -50 50 H I C CNN
 $FPLIST
@@ -5656,282 +6019,32 @@ P 2 0 1 0 -50 200 50 200 N
 P 2 0 1 10 -50 250 -50 150 N
 P 2 0 1 0 50 -200 100 -200 N
 P 2 0 1 0 50 0 -50 0 N
-P 2 0 1 0 50 0 100 0 N
-P 2 0 1 0 50 200 100 200 N
-P 3 0 1 0 -50 50 -50 -50 -50 -50 N
-P 3 0 1 0 -50 250 -50 150 -50 150 N
-P 4 0 1 0 -50 200 -80 200 -80 -200 -40 -200 N
-P 4 0 1 10 50 -150 50 -250 -50 -200 50 -150 N
-P 4 0 1 10 50 50 50 -50 -50 0 50 50 N
-P 4 0 1 10 50 250 50 150 -50 200 50 250 N
-P 5 0 1 0 -40 -150 20 -90 -10 -90 20 -90 20 -120 N
-P 5 0 1 0 -40 50 20 110 -10 110 20 110 20 80 N
-P 5 0 1 0 -40 250 20 310 -10 310 20 310 20 280 N
-P 5 0 1 0 0 -150 60 -90 30 -90 60 -90 60 -120 N
-P 5 0 1 0 0 50 60 110 30 110 60 110 60 80 N
-P 5 0 1 0 0 250 60 310 30 310 60 310 60 280 N
-X K 1 -200 0 100 R 50 50 1 1 P
-X RA 2 200 200 100 L 50 50 1 1 P
-X GA 3 200 0 100 L 50 50 1 1 P
-X BA 4 200 -200 100 L 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# LED_Dual_2pin
-#
-DEF LED_Dual_2pin D 0 0 Y N 1 F N
-F0 "D" 0 225 50 H V C CNN
-F1 "LED_Dual_2pin" 0 -250 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- LED*
- LED_SMD:*
- LED_THT:*
-$ENDFPLIST
-DRAW
-C -80 0 10 0 1 0 F
-C 0 0 180 0 1 10 f
-C 90 0 10 0 1 0 F
-P 2 0 1 0 -180 0 -100 0 N
-P 2 0 1 0 -80 0 -100 0 N
-P 2 0 1 10 -40 150 -40 50 N
-P 2 0 1 10 50 -50 50 -150 N
-P 2 0 1 0 160 0 90 0 F
-P 2 0 1 8 170 230 170 200 N
-P 2 0 1 8 220 180 220 150 N
-P 3 0 1 8 110 170 170 230 140 230 N
-P 3 0 1 8 160 120 220 180 190 180 N
-P 4 0 1 10 -40 -50 -40 -150 50 -100 -40 -50 N
-P 4 0 1 10 50 150 50 50 -40 100 50 150 N
-P 5 0 1 0 90 100 -80 100 -80 -100 90 -100 90 100 N
-X KA 1 300 0 150 L 50 50 1 1 I
-X AK 2 -300 0 120 R 50 50 1 1 I
-ENDDRAW
-ENDDEF
-#
-# LED_Dual_AAC
-#
-DEF LED_Dual_AAC D 0 0 Y N 1 F N
-F0 "D" 0 225 50 H V C CNN
-F1 "LED_Dual_AAC" 0 -250 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- LED*
- LED_SMD:*
- LED_THT:*
-$ENDFPLIST
-DRAW
-C -100 0 11 0 1 0 F
-C 0 0 180 0 1 10 f
-P 2 0 1 0 -180 0 -100 0 N
-P 2 0 1 10 -50 -50 -50 -150 N
-P 2 0 1 10 -50 50 -50 150 N
-P 2 0 1 0 150 -100 75 -100 N
-P 2 0 1 0 150 100 75 100 N
-P 4 0 1 10 50 -150 50 -50 -50 -100 50 -150 N
-P 4 0 1 10 50 50 50 150 -50 100 50 50 N
-P 4 0 1 0 80 100 -100 100 -100 -100 80 -100 N
-P 5 0 1 0 80 200 140 260 110 260 140 260 140 230 N
-P 5 0 1 0 130 160 190 220 160 220 190 220 190 190 N
-X A1 1 300 100 150 L 50 50 1 1 I
-X A2 2 300 -100 150 L 50 50 1 1 I
-X K 3 -300 0 120 R 50 50 1 1 I
-ENDDRAW
-ENDDEF
-#
-# LED_Dual_AACC
-#
-DEF LED_Dual_AACC D 0 0 Y N 1 F N
-F0 "D" 0 225 50 H V C CNN
-F1 "LED_Dual_AACC" 0 -250 50 H V C CNN
-F2 "" 30 0 50 H I C CNN
-F3 "" 30 0 50 H I C CNN
-$FPLIST
- LED*
- LED_SMD:*
- LED_THT:*
-$ENDFPLIST
-DRAW
-C 0 0 180 0 1 10 f
-P 2 0 1 0 -200 -100 80 -100 N
-P 2 0 1 0 -200 100 80 100 N
-P 2 0 1 10 50 -50 50 -150 N
-P 2 0 1 10 50 150 50 50 N
-P 2 0 1 0 150 -100 75 -100 N
-P 2 0 1 0 150 100 75 100 N
-P 4 0 1 10 -50 -50 -50 -150 50 -100 -50 -50 N
-P 4 0 1 10 -50 150 -50 50 50 100 -50 150 N
-P 5 0 1 0 80 200 140 260 110 260 140 260 140 230 N
-P 5 0 1 0 130 160 190 220 160 220 190 220 190 190 N
-X A1 1 -300 100 120 R 50 50 1 1 I
-X A2 2 -300 -100 120 R 50 50 1 1 I
-X K1 3 300 100 150 L 50 50 1 1 I
-X K2 4 300 -100 150 L 50 50 1 1 I
-ENDDRAW
-ENDDEF
-#
-# LED_Dual_ACA
-#
-DEF LED_Dual_ACA D 0 0 Y N 1 F N
-F0 "D" 0 225 50 H V C CNN
-F1 "LED_Dual_ACA" 0 -250 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- LED*
- LED_SMD:*
- LED_THT:*
-$ENDFPLIST
-DRAW
-C -100 0 11 0 1 0 F
-C 0 0 180 0 1 10 f
-P 2 0 1 0 -180 0 -100 0 N
-P 2 0 1 10 -50 -50 -50 -150 N
-P 2 0 1 10 -50 50 -50 150 N
-P 2 0 1 0 150 -100 75 -100 N
-P 2 0 1 0 150 100 75 100 N
-P 4 0 1 10 50 -150 50 -50 -50 -100 50 -150 N
-P 4 0 1 10 50 50 50 150 -50 100 50 50 N
-P 4 0 1 0 80 100 -100 100 -100 -100 80 -100 N
-P 5 0 1 0 80 200 140 260 110 260 140 260 140 230 N
-P 5 0 1 0 130 160 190 220 160 220 190 220 190 190 N
-X A1 1 300 100 150 L 50 50 1 1 I
-X K 2 -300 0 120 R 50 50 1 1 I
-X A2 3 300 -100 150 L 50 50 1 1 I
-ENDDRAW
-ENDDEF
-#
-# LED_Dual_ACAC
-#
-DEF LED_Dual_ACAC D 0 0 Y N 1 F N
-F0 "D" 0 225 50 H V C CNN
-F1 "LED_Dual_ACAC" 0 -250 50 H V C CNN
-F2 "" 30 0 50 H I C CNN
-F3 "" 30 0 50 H I C CNN
-$FPLIST
- LED*
- LED_SMD:*
- LED_THT:*
-$ENDFPLIST
-DRAW
-C 0 0 180 0 1 10 f
-P 2 0 1 0 -200 -100 80 -100 N
-P 2 0 1 0 -200 100 80 100 N
-P 2 0 1 10 50 -50 50 -150 N
-P 2 0 1 10 50 150 50 50 N
-P 2 0 1 0 150 -100 75 -100 N
-P 2 0 1 0 150 100 75 100 N
-P 4 0 1 10 -50 -50 -50 -150 50 -100 -50 -50 N
-P 4 0 1 10 -50 150 -50 50 50 100 -50 150 N
-P 5 0 1 0 80 200 140 260 110 260 140 260 140 230 N
-P 5 0 1 0 130 160 190 220 160 220 190 220 190 190 N
-X A1 1 -300 100 120 R 50 50 1 1 I
-X K1 2 300 100 150 L 50 50 1 1 I
-X A2 3 -300 -100 120 R 50 50 1 1 I
-X K2 4 300 -100 150 L 50 50 1 1 I
-ENDDRAW
-ENDDEF
-#
-# LED_Dual_CAC
-#
-DEF LED_Dual_CAC D 0 0 Y Y 1 F N
-F0 "D" 0 225 50 H V C CNN
-F1 "LED_Dual_CAC" 0 -250 50 H V C CNN
-F2 "" 50 0 50 H I C CNN
-F3 "" 50 0 50 H I C CNN
-$FPLIST
- LED*
- LED_SMD:*
- LED_THT:*
-$ENDFPLIST
-DRAW
-C -100 0 11 0 1 0 F
-C 0 0 180 0 1 10 f
-P 2 0 1 0 -180 0 -100 0 N
-P 2 0 1 10 50 -50 50 -150 N
-P 2 0 1 10 50 150 50 50 N
-P 2 0 1 0 150 -100 75 -100 N
-P 2 0 1 0 150 100 75 100 N
-P 4 0 1 10 -50 -50 -50 -150 50 -100 -50 -50 N
-P 4 0 1 10 -50 150 -50 50 50 100 -50 150 N
-P 4 0 1 0 80 100 -100 100 -100 -100 80 -100 N
-P 5 0 1 0 80 200 140 260 110 260 140 260 140 230 N
-P 5 0 1 0 130 160 190 220 160 220 190 220 190 190 N
-X K1 1 300 100 150 L 50 50 1 1 I
-X A 2 -300 0 120 R 50 50 1 1 I
-X K2 3 300 -100 150 L 50 50 1 1 I
-ENDDRAW
-ENDDEF
-#
-# LED_Dual_CACA
-#
-DEF LED_Dual_CACA D 0 0 Y N 1 F N
-F0 "D" 0 225 50 H V C CNN
-F1 "LED_Dual_CACA" 0 -250 50 H V C CNN
-F2 "" 30 0 50 H I C CNN
-F3 "" 30 0 50 H I C CNN
-$FPLIST
- LED*
- LED_SMD:*
- LED_THT:*
-$ENDFPLIST
-DRAW
-C 0 0 180 0 1 10 f
-P 2 0 1 0 -200 -100 80 -100 N
-P 2 0 1 0 -200 100 80 100 N
-P 2 0 1 10 -50 -50 -50 -150 N
-P 2 0 1 10 -50 150 -50 50 N
-P 2 0 1 0 150 -100 75 -100 N
-P 2 0 1 0 150 100 75 100 N
-P 4 0 1 10 50 -50 50 -150 -50 -100 50 -50 N
-P 4 0 1 10 50 150 50 50 -50 100 50 150 N
-P 5 0 1 0 80 200 140 260 110 260 140 260 140 230 N
-P 5 0 1 0 130 160 190 220 160 220 190 220 190 190 N
-X A1 1 -300 100 120 R 50 50 1 1 I
-X K1 2 300 100 150 L 50 50 1 1 I
-X A2 3 -300 -100 120 R 50 50 1 1 I
-X K2 4 300 -100 150 L 50 50 1 1 I
-ENDDRAW
-ENDDEF
-#
-# LED_Dual_CCA
-#
-DEF LED_Dual_CCA D 0 0 Y Y 1 F N
-F0 "D" 0 225 50 H V C CNN
-F1 "LED_Dual_CCA" 0 -250 50 H V C CNN
-F2 "" 50 0 50 H I C CNN
-F3 "" 50 0 50 H I C CNN
-$FPLIST
- LED*
- LED_SMD:*
- LED_THT:*
-$ENDFPLIST
-DRAW
-C -100 0 11 0 1 0 F
-C 0 0 180 0 1 10 f
-P 2 0 1 0 -180 0 -100 0 N
-P 2 0 1 10 50 -50 50 -150 N
-P 2 0 1 10 50 150 50 50 N
-P 2 0 1 0 150 -100 75 -100 N
-P 2 0 1 0 150 100 75 100 N
-P 4 0 1 10 -50 -50 -50 -150 50 -100 -50 -50 N
-P 4 0 1 10 -50 150 -50 50 50 100 -50 150 N
-P 4 0 1 0 80 100 -100 100 -100 -100 80 -100 N
-P 5 0 1 0 80 200 140 260 110 260 140 260 140 230 N
-P 5 0 1 0 130 160 190 220 160 220 190 220 190 190 N
-X K1 1 300 100 150 L 50 50 1 1 I
-X K2 2 300 -100 150 L 50 50 1 1 I
-X A 3 -300 0 120 R 50 50 1 1 I
+P 2 0 1 0 50 0 100 0 N
+P 2 0 1 0 50 200 100 200 N
+P 3 0 1 0 -50 50 -50 -50 -50 -50 N
+P 3 0 1 0 -50 250 -50 150 -50 150 N
+P 4 0 1 0 -50 200 -80 200 -80 -200 -40 -200 N
+P 4 0 1 10 50 -150 50 -250 -50 -200 50 -150 N
+P 4 0 1 10 50 50 50 -50 -50 0 50 50 N
+P 4 0 1 10 50 250 50 150 -50 200 50 250 N
+P 5 0 1 0 -40 -150 20 -90 -10 -90 20 -90 20 -120 N
+P 5 0 1 0 -40 50 20 110 -10 110 20 110 20 80 N
+P 5 0 1 0 -40 250 20 310 -10 310 20 310 20 280 N
+P 5 0 1 0 0 -150 60 -90 30 -90 60 -90 60 -120 N
+P 5 0 1 0 0 50 60 110 30 110 60 110 60 80 N
+P 5 0 1 0 0 250 60 310 30 310 60 310 60 280 N
+X GA 1 200 0 100 L 50 50 1 1 P
+X BA 2 200 -200 100 L 50 50 1 1 P
+X RA 3 200 200 100 L 50 50 1 1 P
+X K 4 -200 0 100 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# LED_GABR
+# LED_GKBR
 #
-DEF LED_GABR D 0 0 Y N 1 F N
+DEF LED_GKBR D 0 0 Y N 1 F N
 F0 "D" 0 370 50 H V C CNN
-F1 "LED_GABR" 0 -350 50 H V C CNN
+F1 "LED_GKBR" 0 -350 50 H V C CNN
 F2 "" 0 -50 50 H I C CNN
 F3 "" 0 -50 50 H I C CNN
 $FPLIST
@@ -5940,28 +6053,28 @@ $FPLIST
  LED_THT:*
 $ENDFPLIST
 DRAW
-C 80 0 10 0 1 0 F
-T 0 -75 -250 50 0 0 0 B Normal 0 C C
-T 0 -75 -50 50 0 0 0 G Normal 0 C C
-T 0 -75 150 50 0 0 0 R Normal 0 C C
+C -80 0 10 0 1 0 F
+T 0 75 -250 50 0 0 0 B Normal 0 C C
+T 0 75 -50 50 0 0 0 G Normal 0 C C
+T 0 75 150 50 0 0 0 R Normal 0 C C
 S 50 -50 50 50 0 1 0 N
 S 50 50 50 50 0 1 0 N
 S 50 150 50 250 0 1 0 N
 S 50 250 50 250 0 1 0 N
 S 110 330 -110 -300 0 1 10 f
-P 2 0 1 0 -50 -200 -100 -200 N
 P 2 0 1 0 -50 -200 50 -200 N
 P 2 0 1 10 -50 -150 -50 -250 N
 P 2 0 1 0 -50 0 -100 0 N
 P 2 0 1 10 -50 50 -50 -50 N
-P 2 0 1 0 -50 200 -100 200 N
 P 2 0 1 0 -50 200 50 200 N
 P 2 0 1 10 -50 250 -50 150 N
+P 2 0 1 0 50 -200 100 -200 N
 P 2 0 1 0 50 0 -50 0 N
 P 2 0 1 0 50 0 100 0 N
+P 2 0 1 0 50 200 100 200 N
 P 3 0 1 0 -50 50 -50 -50 -50 -50 N
 P 3 0 1 0 -50 250 -50 150 -50 150 N
-P 4 0 1 0 50 -200 80 -200 80 200 50 200 N
+P 4 0 1 0 -50 200 -80 200 -80 -200 -40 -200 N
 P 4 0 1 10 50 -150 50 -250 -50 -200 50 -150 N
 P 4 0 1 10 50 50 50 -50 -50 0 50 50 N
 P 4 0 1 10 50 250 50 150 -50 200 50 250 N
@@ -5971,18 +6084,18 @@ P 5 0 1 0 -40 250 20 310 -10 310 20 310 20 280 N
 P 5 0 1 0 0 -150 60 -90 30 -90 60 -90 60 -120 N
 P 5 0 1 0 0 50 60 110 30 110 60 110 60 80 N
 P 5 0 1 0 0 250 60 310 30 310 60 310 60 280 N
-X GK 1 -200 0 100 R 50 50 1 1 P
-X A 2 200 0 100 L 50 50 1 1 P
-X BK 3 -200 -200 100 R 50 50 1 1 P
-X RK 4 -200 200 100 R 50 50 1 1 P
+X GA 1 200 0 100 L 50 50 1 1 P
+X K 2 -200 0 100 R 50 50 1 1 P
+X BA 3 200 -200 100 L 50 50 1 1 P
+X RA 4 200 200 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# LED_GARB
+# LED_GKRB
 #
-DEF LED_GARB D 0 0 Y N 1 F N
+DEF LED_GKRB D 0 0 Y N 1 F N
 F0 "D" 0 370 50 H V C CNN
-F1 "LED_GARB" 0 -350 50 H V C CNN
+F1 "LED_GKRB" 0 -350 50 H V C CNN
 F2 "" 0 -50 50 H I C CNN
 F3 "" 0 -50 50 H I C CNN
 $FPLIST
@@ -5991,28 +6104,28 @@ $FPLIST
  LED_THT:*
 $ENDFPLIST
 DRAW
-C 80 0 10 0 1 0 F
-T 0 -75 -250 50 0 0 0 B Normal 0 C C
-T 0 -75 -50 50 0 0 0 G Normal 0 C C
-T 0 -75 150 50 0 0 0 R Normal 0 C C
+C -80 0 10 0 1 0 F
+T 0 75 -250 50 0 0 0 B Normal 0 C C
+T 0 75 -50 50 0 0 0 G Normal 0 C C
+T 0 75 150 50 0 0 0 R Normal 0 C C
 S 50 -50 50 50 0 1 0 N
 S 50 50 50 50 0 1 0 N
 S 50 150 50 250 0 1 0 N
 S 50 250 50 250 0 1 0 N
 S 110 330 -110 -300 0 1 10 f
-P 2 0 1 0 -50 -200 -100 -200 N
 P 2 0 1 0 -50 -200 50 -200 N
 P 2 0 1 10 -50 -150 -50 -250 N
 P 2 0 1 0 -50 0 -100 0 N
 P 2 0 1 10 -50 50 -50 -50 N
-P 2 0 1 0 -50 200 -100 200 N
 P 2 0 1 0 -50 200 50 200 N
 P 2 0 1 10 -50 250 -50 150 N
+P 2 0 1 0 50 -200 100 -200 N
 P 2 0 1 0 50 0 -50 0 N
 P 2 0 1 0 50 0 100 0 N
+P 2 0 1 0 50 200 100 200 N
 P 3 0 1 0 -50 50 -50 -50 -50 -50 N
 P 3 0 1 0 -50 250 -50 150 -50 150 N
-P 4 0 1 0 50 -200 80 -200 80 200 50 200 N
+P 4 0 1 0 -50 200 -80 200 -80 -200 -40 -200 N
 P 4 0 1 10 50 -150 50 -250 -50 -200 50 -150 N
 P 4 0 1 10 50 50 50 -50 -50 0 50 50 N
 P 4 0 1 10 50 250 50 150 -50 200 50 250 N
@@ -6022,18 +6135,18 @@ P 5 0 1 0 -40 250 20 310 -10 310 20 310 20 280 N
 P 5 0 1 0 0 -150 60 -90 30 -90 60 -90 60 -120 N
 P 5 0 1 0 0 50 60 110 30 110 60 110 60 80 N
 P 5 0 1 0 0 250 60 310 30 310 60 310 60 280 N
-X GK 1 -200 0 100 R 50 50 1 1 P
-X A 2 200 0 100 L 50 50 1 1 P
-X RK 3 -200 200 100 R 50 50 1 1 P
-X BK 4 -200 -200 100 R 50 50 1 1 P
+X GA 1 200 0 100 L 50 50 1 1 P
+X K 2 -200 0 100 R 50 50 1 1 P
+X RA 3 200 200 100 L 50 50 1 1 P
+X BA 4 200 -200 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# LED_GBAR
+# LED_GRAB
 #
-DEF LED_GBAR D 0 0 Y N 1 F N
+DEF LED_GRAB D 0 0 Y N 1 F N
 F0 "D" 0 370 50 H V C CNN
-F1 "LED_GBAR" 0 -350 50 H V C CNN
+F1 "LED_GRAB" 0 -350 50 H V C CNN
 F2 "" 0 -50 50 H I C CNN
 F3 "" 0 -50 50 H I C CNN
 $FPLIST
@@ -6074,17 +6187,17 @@ P 5 0 1 0 0 -150 60 -90 30 -90 60 -90 60 -120 N
 P 5 0 1 0 0 50 60 110 30 110 60 110 60 80 N
 P 5 0 1 0 0 250 60 310 30 310 60 310 60 280 N
 X GK 1 -200 0 100 R 50 50 1 1 P
-X BK 2 -200 -200 100 R 50 50 1 1 P
+X RK 2 -200 200 100 R 50 50 1 1 P
 X A 3 200 0 100 L 50 50 1 1 P
-X RK 4 -200 200 100 R 50 50 1 1 P
+X BK 4 -200 -200 100 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# LED_GBCR
+# LED_GRBA
 #
-DEF LED_GBCR D 0 0 Y N 1 F N
+DEF LED_GRBA D 0 0 Y N 1 F N
 F0 "D" 0 370 50 H V C CNN
-F1 "LED_GBCR" 0 -350 50 H V C CNN
+F1 "LED_GRBA" 0 -350 50 H V C CNN
 F2 "" 0 -50 50 H I C CNN
 F3 "" 0 -50 50 H I C CNN
 $FPLIST
@@ -6093,28 +6206,28 @@ $FPLIST
  LED_THT:*
 $ENDFPLIST
 DRAW
-C -80 0 10 0 1 0 F
-T 0 75 -250 50 0 0 0 B Normal 0 C C
-T 0 75 -50 50 0 0 0 G Normal 0 C C
-T 0 75 150 50 0 0 0 R Normal 0 C C
+C 80 0 10 0 1 0 F
+T 0 -75 -250 50 0 0 0 B Normal 0 C C
+T 0 -75 -50 50 0 0 0 G Normal 0 C C
+T 0 -75 150 50 0 0 0 R Normal 0 C C
 S 50 -50 50 50 0 1 0 N
 S 50 50 50 50 0 1 0 N
 S 50 150 50 250 0 1 0 N
 S 50 250 50 250 0 1 0 N
 S 110 330 -110 -300 0 1 10 f
+P 2 0 1 0 -50 -200 -100 -200 N
 P 2 0 1 0 -50 -200 50 -200 N
 P 2 0 1 10 -50 -150 -50 -250 N
 P 2 0 1 0 -50 0 -100 0 N
 P 2 0 1 10 -50 50 -50 -50 N
+P 2 0 1 0 -50 200 -100 200 N
 P 2 0 1 0 -50 200 50 200 N
 P 2 0 1 10 -50 250 -50 150 N
-P 2 0 1 0 50 -200 100 -200 N
 P 2 0 1 0 50 0 -50 0 N
 P 2 0 1 0 50 0 100 0 N
-P 2 0 1 0 50 200 100 200 N
 P 3 0 1 0 -50 50 -50 -50 -50 -50 N
 P 3 0 1 0 -50 250 -50 150 -50 150 N
-P 4 0 1 0 -50 200 -80 200 -80 -200 -40 -200 N
+P 4 0 1 0 50 -200 80 -200 80 200 50 200 N
 P 4 0 1 10 50 -150 50 -250 -50 -200 50 -150 N
 P 4 0 1 10 50 50 50 -50 -50 0 50 50 N
 P 4 0 1 10 50 250 50 150 -50 200 50 250 N
@@ -6124,18 +6237,18 @@ P 5 0 1 0 -40 250 20 310 -10 310 20 310 20 280 N
 P 5 0 1 0 0 -150 60 -90 30 -90 60 -90 60 -120 N
 P 5 0 1 0 0 50 60 110 30 110 60 110 60 80 N
 P 5 0 1 0 0 250 60 310 30 310 60 310 60 280 N
-X GA 1 200 0 100 L 50 50 1 1 P
-X BA 2 200 -200 100 L 50 50 1 1 P
-X K 3 -200 0 100 R 50 50 1 1 P
-X RA 4 200 200 100 L 50 50 1 1 P
+X GK 1 -200 0 100 R 50 50 1 1 P
+X RK 2 -200 200 100 R 50 50 1 1 P
+X BK 3 -200 -200 100 R 50 50 1 1 P
+X A 4 200 0 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# LED_GBRA
+# LED_GRBK
 #
-DEF LED_GBRA D 0 0 Y N 1 F N
+DEF LED_GRBK D 0 0 Y N 1 F N
 F0 "D" 0 370 50 H V C CNN
-F1 "LED_GBRA" 0 -350 50 H V C CNN
+F1 "LED_GRBK" 0 -350 50 H V C CNN
 F2 "" 0 -50 50 H I C CNN
 F3 "" 0 -50 50 H I C CNN
 $FPLIST
@@ -6144,28 +6257,28 @@ $FPLIST
  LED_THT:*
 $ENDFPLIST
 DRAW
-C 80 0 10 0 1 0 F
-T 0 -75 -250 50 0 0 0 B Normal 0 C C
-T 0 -75 -50 50 0 0 0 G Normal 0 C C
-T 0 -75 150 50 0 0 0 R Normal 0 C C
+C -80 0 10 0 1 0 F
+T 0 75 -250 50 0 0 0 B Normal 0 C C
+T 0 75 -50 50 0 0 0 G Normal 0 C C
+T 0 75 150 50 0 0 0 R Normal 0 C C
 S 50 -50 50 50 0 1 0 N
 S 50 50 50 50 0 1 0 N
 S 50 150 50 250 0 1 0 N
 S 50 250 50 250 0 1 0 N
 S 110 330 -110 -300 0 1 10 f
-P 2 0 1 0 -50 -200 -100 -200 N
 P 2 0 1 0 -50 -200 50 -200 N
 P 2 0 1 10 -50 -150 -50 -250 N
 P 2 0 1 0 -50 0 -100 0 N
 P 2 0 1 10 -50 50 -50 -50 N
-P 2 0 1 0 -50 200 -100 200 N
 P 2 0 1 0 -50 200 50 200 N
 P 2 0 1 10 -50 250 -50 150 N
+P 2 0 1 0 50 -200 100 -200 N
 P 2 0 1 0 50 0 -50 0 N
 P 2 0 1 0 50 0 100 0 N
+P 2 0 1 0 50 200 100 200 N
 P 3 0 1 0 -50 50 -50 -50 -50 -50 N
 P 3 0 1 0 -50 250 -50 150 -50 150 N
-P 4 0 1 0 50 -200 80 -200 80 200 50 200 N
+P 4 0 1 0 -50 200 -80 200 -80 -200 -40 -200 N
 P 4 0 1 10 50 -150 50 -250 -50 -200 50 -150 N
 P 4 0 1 10 50 50 50 -50 -50 0 50 50 N
 P 4 0 1 10 50 250 50 150 -50 200 50 250 N
@@ -6175,18 +6288,18 @@ P 5 0 1 0 -40 250 20 310 -10 310 20 310 20 280 N
 P 5 0 1 0 0 -150 60 -90 30 -90 60 -90 60 -120 N
 P 5 0 1 0 0 50 60 110 30 110 60 110 60 80 N
 P 5 0 1 0 0 250 60 310 30 310 60 310 60 280 N
-X GK 1 -200 0 100 R 50 50 1 1 P
-X BK 2 -200 -200 100 R 50 50 1 1 P
-X RK 3 -200 200 100 R 50 50 1 1 P
-X A 4 200 0 100 L 50 50 1 1 P
+X GA 1 200 0 100 L 50 50 1 1 P
+X RA 2 200 200 100 L 50 50 1 1 P
+X BA 3 200 -200 100 L 50 50 1 1 P
+X K 4 -200 0 100 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# LED_GBRC
+# LED_GRKB
 #
-DEF LED_GBRC D 0 0 Y N 1 F N
+DEF LED_GRKB D 0 0 Y N 1 F N
 F0 "D" 0 370 50 H V C CNN
-F1 "LED_GBRC" 0 -350 50 H V C CNN
+F1 "LED_GRKB" 0 -350 50 H V C CNN
 F2 "" 0 -50 50 H I C CNN
 F3 "" 0 -50 50 H I C CNN
 $FPLIST
@@ -6227,17 +6340,17 @@ P 5 0 1 0 0 -150 60 -90 30 -90 60 -90 60 -120 N
 P 5 0 1 0 0 50 60 110 30 110 60 110 60 80 N
 P 5 0 1 0 0 250 60 310 30 310 60 310 60 280 N
 X GA 1 200 0 100 L 50 50 1 1 P
-X BA 2 200 -200 100 L 50 50 1 1 P
-X RA 3 200 200 100 L 50 50 1 1 P
-X K 4 -200 0 100 R 50 50 1 1 P
+X RA 2 200 200 100 L 50 50 1 1 P
+X K 3 -200 0 100 R 50 50 1 1 P
+X BA 4 200 -200 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# LED_GCBR
+# LED_KBGR
 #
-DEF LED_GCBR D 0 0 Y N 1 F N
+DEF LED_KBGR D 0 0 Y N 1 F N
 F0 "D" 0 370 50 H V C CNN
-F1 "LED_GCBR" 0 -350 50 H V C CNN
+F1 "LED_KBGR" 0 -350 50 H V C CNN
 F2 "" 0 -50 50 H I C CNN
 F3 "" 0 -50 50 H I C CNN
 $FPLIST
@@ -6277,18 +6390,18 @@ P 5 0 1 0 -40 250 20 310 -10 310 20 310 20 280 N
 P 5 0 1 0 0 -150 60 -90 30 -90 60 -90 60 -120 N
 P 5 0 1 0 0 50 60 110 30 110 60 110 60 80 N
 P 5 0 1 0 0 250 60 310 30 310 60 310 60 280 N
-X GA 1 200 0 100 L 50 50 1 1 P
-X K 2 -200 0 100 R 50 50 1 1 P
-X BA 3 200 -200 100 L 50 50 1 1 P
+X K 1 -200 0 100 R 50 50 1 1 P
+X BA 2 200 -200 100 L 50 50 1 1 P
+X GA 3 200 0 100 L 50 50 1 1 P
 X RA 4 200 200 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# LED_GCRB
+# LED_KBRG
 #
-DEF LED_GCRB D 0 0 Y N 1 F N
+DEF LED_KBRG D 0 0 Y N 1 F N
 F0 "D" 0 370 50 H V C CNN
-F1 "LED_GCRB" 0 -350 50 H V C CNN
+F1 "LED_KBRG" 0 -350 50 H V C CNN
 F2 "" 0 -50 50 H I C CNN
 F3 "" 0 -50 50 H I C CNN
 $FPLIST
@@ -6328,18 +6441,18 @@ P 5 0 1 0 -40 250 20 310 -10 310 20 310 20 280 N
 P 5 0 1 0 0 -150 60 -90 30 -90 60 -90 60 -120 N
 P 5 0 1 0 0 50 60 110 30 110 60 110 60 80 N
 P 5 0 1 0 0 250 60 310 30 310 60 310 60 280 N
-X GA 1 200 0 100 L 50 50 1 1 P
-X K 2 -200 0 100 R 50 50 1 1 P
+X K 1 -200 0 100 R 50 50 1 1 P
+X BA 2 200 -200 100 L 50 50 1 1 P
 X RA 3 200 200 100 L 50 50 1 1 P
-X BA 4 200 -200 100 L 50 50 1 1 P
+X GA 4 200 0 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# LED_GRAB
+# LED_KGBR
 #
-DEF LED_GRAB D 0 0 Y N 1 F N
+DEF LED_KGBR D 0 0 Y N 1 F N
 F0 "D" 0 370 50 H V C CNN
-F1 "LED_GRAB" 0 -350 50 H V C CNN
+F1 "LED_KGBR" 0 -350 50 H V C CNN
 F2 "" 0 -50 50 H I C CNN
 F3 "" 0 -50 50 H I C CNN
 $FPLIST
@@ -6348,28 +6461,28 @@ $FPLIST
  LED_THT:*
 $ENDFPLIST
 DRAW
-C 80 0 10 0 1 0 F
-T 0 -75 -250 50 0 0 0 B Normal 0 C C
-T 0 -75 -50 50 0 0 0 G Normal 0 C C
-T 0 -75 150 50 0 0 0 R Normal 0 C C
+C -80 0 10 0 1 0 F
+T 0 75 -250 50 0 0 0 B Normal 0 C C
+T 0 75 -50 50 0 0 0 G Normal 0 C C
+T 0 75 150 50 0 0 0 R Normal 0 C C
 S 50 -50 50 50 0 1 0 N
 S 50 50 50 50 0 1 0 N
 S 50 150 50 250 0 1 0 N
 S 50 250 50 250 0 1 0 N
 S 110 330 -110 -300 0 1 10 f
-P 2 0 1 0 -50 -200 -100 -200 N
 P 2 0 1 0 -50 -200 50 -200 N
 P 2 0 1 10 -50 -150 -50 -250 N
 P 2 0 1 0 -50 0 -100 0 N
 P 2 0 1 10 -50 50 -50 -50 N
-P 2 0 1 0 -50 200 -100 200 N
 P 2 0 1 0 -50 200 50 200 N
 P 2 0 1 10 -50 250 -50 150 N
+P 2 0 1 0 50 -200 100 -200 N
 P 2 0 1 0 50 0 -50 0 N
 P 2 0 1 0 50 0 100 0 N
+P 2 0 1 0 50 200 100 200 N
 P 3 0 1 0 -50 50 -50 -50 -50 -50 N
 P 3 0 1 0 -50 250 -50 150 -50 150 N
-P 4 0 1 0 50 -200 80 -200 80 200 50 200 N
+P 4 0 1 0 -50 200 -80 200 -80 -200 -40 -200 N
 P 4 0 1 10 50 -150 50 -250 -50 -200 50 -150 N
 P 4 0 1 10 50 50 50 -50 -50 0 50 50 N
 P 4 0 1 10 50 250 50 150 -50 200 50 250 N
@@ -6379,18 +6492,18 @@ P 5 0 1 0 -40 250 20 310 -10 310 20 310 20 280 N
 P 5 0 1 0 0 -150 60 -90 30 -90 60 -90 60 -120 N
 P 5 0 1 0 0 50 60 110 30 110 60 110 60 80 N
 P 5 0 1 0 0 250 60 310 30 310 60 310 60 280 N
-X GK 1 -200 0 100 R 50 50 1 1 P
-X RK 2 -200 200 100 R 50 50 1 1 P
-X A 3 200 0 100 L 50 50 1 1 P
-X BK 4 -200 -200 100 R 50 50 1 1 P
+X K 1 -200 0 100 R 50 50 1 1 P
+X GA 2 200 0 100 L 50 50 1 1 P
+X BA 3 200 -200 100 L 50 50 1 1 P
+X RA 4 200 200 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# LED_GRBA
+# LED_KGRB
 #
-DEF LED_GRBA D 0 0 Y N 1 F N
+DEF LED_KGRB D 0 0 Y N 1 F N
 F0 "D" 0 370 50 H V C CNN
-F1 "LED_GRBA" 0 -350 50 H V C CNN
+F1 "LED_KGRB" 0 -350 50 H V C CNN
 F2 "" 0 -50 50 H I C CNN
 F3 "" 0 -50 50 H I C CNN
 $FPLIST
@@ -6399,28 +6512,28 @@ $FPLIST
  LED_THT:*
 $ENDFPLIST
 DRAW
-C 80 0 10 0 1 0 F
-T 0 -75 -250 50 0 0 0 B Normal 0 C C
-T 0 -75 -50 50 0 0 0 G Normal 0 C C
-T 0 -75 150 50 0 0 0 R Normal 0 C C
+C -80 0 10 0 1 0 F
+T 0 75 -250 50 0 0 0 B Normal 0 C C
+T 0 75 -50 50 0 0 0 G Normal 0 C C
+T 0 75 150 50 0 0 0 R Normal 0 C C
 S 50 -50 50 50 0 1 0 N
 S 50 50 50 50 0 1 0 N
 S 50 150 50 250 0 1 0 N
 S 50 250 50 250 0 1 0 N
 S 110 330 -110 -300 0 1 10 f
-P 2 0 1 0 -50 -200 -100 -200 N
 P 2 0 1 0 -50 -200 50 -200 N
 P 2 0 1 10 -50 -150 -50 -250 N
 P 2 0 1 0 -50 0 -100 0 N
 P 2 0 1 10 -50 50 -50 -50 N
-P 2 0 1 0 -50 200 -100 200 N
 P 2 0 1 0 -50 200 50 200 N
 P 2 0 1 10 -50 250 -50 150 N
+P 2 0 1 0 50 -200 100 -200 N
 P 2 0 1 0 50 0 -50 0 N
 P 2 0 1 0 50 0 100 0 N
+P 2 0 1 0 50 200 100 200 N
 P 3 0 1 0 -50 50 -50 -50 -50 -50 N
 P 3 0 1 0 -50 250 -50 150 -50 150 N
-P 4 0 1 0 50 -200 80 -200 80 200 50 200 N
+P 4 0 1 0 -50 200 -80 200 -80 -200 -40 -200 N
 P 4 0 1 10 50 -150 50 -250 -50 -200 50 -150 N
 P 4 0 1 10 50 50 50 -50 -50 0 50 50 N
 P 4 0 1 10 50 250 50 150 -50 200 50 250 N
@@ -6430,18 +6543,18 @@ P 5 0 1 0 -40 250 20 310 -10 310 20 310 20 280 N
 P 5 0 1 0 0 -150 60 -90 30 -90 60 -90 60 -120 N
 P 5 0 1 0 0 50 60 110 30 110 60 110 60 80 N
 P 5 0 1 0 0 250 60 310 30 310 60 310 60 280 N
-X GK 1 -200 0 100 R 50 50 1 1 P
-X RK 2 -200 200 100 R 50 50 1 1 P
-X BK 3 -200 -200 100 R 50 50 1 1 P
-X A 4 200 0 100 L 50 50 1 1 P
+X K 1 -200 0 100 R 50 50 1 1 P
+X GA 2 200 0 100 L 50 50 1 1 P
+X RA 3 200 200 100 L 50 50 1 1 P
+X BA 4 200 -200 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# LED_GRBC
+# LED_KRBG
 #
-DEF LED_GRBC D 0 0 Y N 1 F N
+DEF LED_KRBG D 0 0 Y N 1 F N
 F0 "D" 0 370 50 H V C CNN
-F1 "LED_GRBC" 0 -350 50 H V C CNN
+F1 "LED_KRBG" 0 -350 50 H V C CNN
 F2 "" 0 -50 50 H I C CNN
 F3 "" 0 -50 50 H I C CNN
 $FPLIST
@@ -6481,18 +6594,18 @@ P 5 0 1 0 -40 250 20 310 -10 310 20 310 20 280 N
 P 5 0 1 0 0 -150 60 -90 30 -90 60 -90 60 -120 N
 P 5 0 1 0 0 50 60 110 30 110 60 110 60 80 N
 P 5 0 1 0 0 250 60 310 30 310 60 310 60 280 N
-X GA 1 200 0 100 L 50 50 1 1 P
+X K 1 -200 0 100 R 50 50 1 1 P
 X RA 2 200 200 100 L 50 50 1 1 P
 X BA 3 200 -200 100 L 50 50 1 1 P
-X K 4 -200 0 100 R 50 50 1 1 P
+X GA 4 200 0 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# LED_GRCB
+# LED_KRGB
 #
-DEF LED_GRCB D 0 0 Y N 1 F N
+DEF LED_KRGB D 0 0 Y N 1 F N
 F0 "D" 0 370 50 H V C CNN
-F1 "LED_GRCB" 0 -350 50 H V C CNN
+F1 "LED_KRGB" 0 -350 50 H V C CNN
 F2 "" 0 -50 50 H I C CNN
 F3 "" 0 -50 50 H I C CNN
 $FPLIST
@@ -6532,18 +6645,18 @@ P 5 0 1 0 -40 250 20 310 -10 310 20 310 20 280 N
 P 5 0 1 0 0 -150 60 -90 30 -90 60 -90 60 -120 N
 P 5 0 1 0 0 50 60 110 30 110 60 110 60 80 N
 P 5 0 1 0 0 250 60 310 30 310 60 310 60 280 N
-X GA 1 200 0 100 L 50 50 1 1 P
+X K 1 -200 0 100 R 50 50 1 1 P
 X RA 2 200 200 100 L 50 50 1 1 P
-X K 3 -200 0 100 R 50 50 1 1 P
+X GA 3 200 0 100 L 50 50 1 1 P
 X BA 4 200 -200 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# LED_PAD
+# LED_Pad
 #
-DEF LED_PAD D 0 40 Y N 1 F N
+DEF LED_Pad D 0 40 Y N 1 F N
 F0 "D" 0 225 50 H V C CNN
-F1 "LED_PAD" 0 150 50 H V C CNN
+F1 "LED_Pad" 0 150 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -6680,79 +6793,28 @@ $FPLIST
  LED_THT:*
 $ENDFPLIST
 DRAW
-C 80 0 10 0 1 0 F
-T 0 -75 -250 50 0 0 0 B Normal 0 C C
-T 0 -75 -50 50 0 0 0 G Normal 0 C C
-T 0 -75 150 50 0 0 0 R Normal 0 C C
-S 50 -50 50 50 0 1 0 N
-S 50 50 50 50 0 1 0 N
-S 50 150 50 250 0 1 0 N
-S 50 250 50 250 0 1 0 N
-S 110 330 -110 -300 0 1 10 f
-P 2 0 1 0 -50 -200 -100 -200 N
-P 2 0 1 0 -50 -200 50 -200 N
-P 2 0 1 10 -50 -150 -50 -250 N
-P 2 0 1 0 -50 0 -100 0 N
-P 2 0 1 10 -50 50 -50 -50 N
-P 2 0 1 0 -50 200 -100 200 N
-P 2 0 1 0 -50 200 50 200 N
-P 2 0 1 10 -50 250 -50 150 N
-P 2 0 1 0 50 0 -50 0 N
-P 2 0 1 0 50 0 100 0 N
-P 3 0 1 0 -50 50 -50 -50 -50 -50 N
-P 3 0 1 0 -50 250 -50 150 -50 150 N
-P 4 0 1 0 50 -200 80 -200 80 200 50 200 N
-P 4 0 1 10 50 -150 50 -250 -50 -200 50 -150 N
-P 4 0 1 10 50 50 50 -50 -50 0 50 50 N
-P 4 0 1 10 50 250 50 150 -50 200 50 250 N
-P 5 0 1 0 -40 -150 20 -90 -10 -90 20 -90 20 -120 N
-P 5 0 1 0 -40 50 20 110 -10 110 20 110 20 80 N
-P 5 0 1 0 -40 250 20 310 -10 310 20 310 20 280 N
-P 5 0 1 0 0 -150 60 -90 30 -90 60 -90 60 -120 N
-P 5 0 1 0 0 50 60 110 30 110 60 110 60 80 N
-P 5 0 1 0 0 250 60 310 30 310 60 310 60 280 N
-X RK 1 -200 200 100 R 50 50 1 1 P
-X BK 2 -200 -200 100 R 50 50 1 1 P
-X A 3 200 0 100 L 50 50 1 1 P
-X GK 4 -200 0 100 R 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# LED_RBCG
-#
-DEF LED_RBCG D 0 0 Y N 1 F N
-F0 "D" 0 370 50 H V C CNN
-F1 "LED_RBCG" 0 -350 50 H V C CNN
-F2 "" 0 -50 50 H I C CNN
-F3 "" 0 -50 50 H I C CNN
-$FPLIST
- LED*
- LED_SMD:*
- LED_THT:*
-$ENDFPLIST
-DRAW
-C -80 0 10 0 1 0 F
-T 0 75 -250 50 0 0 0 B Normal 0 C C
-T 0 75 -50 50 0 0 0 G Normal 0 C C
-T 0 75 150 50 0 0 0 R Normal 0 C C
+C 80 0 10 0 1 0 F
+T 0 -75 -250 50 0 0 0 B Normal 0 C C
+T 0 -75 -50 50 0 0 0 G Normal 0 C C
+T 0 -75 150 50 0 0 0 R Normal 0 C C
 S 50 -50 50 50 0 1 0 N
 S 50 50 50 50 0 1 0 N
 S 50 150 50 250 0 1 0 N
 S 50 250 50 250 0 1 0 N
 S 110 330 -110 -300 0 1 10 f
+P 2 0 1 0 -50 -200 -100 -200 N
 P 2 0 1 0 -50 -200 50 -200 N
 P 2 0 1 10 -50 -150 -50 -250 N
 P 2 0 1 0 -50 0 -100 0 N
 P 2 0 1 10 -50 50 -50 -50 N
+P 2 0 1 0 -50 200 -100 200 N
 P 2 0 1 0 -50 200 50 200 N
 P 2 0 1 10 -50 250 -50 150 N
-P 2 0 1 0 50 -200 100 -200 N
 P 2 0 1 0 50 0 -50 0 N
 P 2 0 1 0 50 0 100 0 N
-P 2 0 1 0 50 200 100 200 N
 P 3 0 1 0 -50 50 -50 -50 -50 -50 N
 P 3 0 1 0 -50 250 -50 150 -50 150 N
-P 4 0 1 0 -50 200 -80 200 -80 -200 -40 -200 N
+P 4 0 1 0 50 -200 80 -200 80 200 50 200 N
 P 4 0 1 10 50 -150 50 -250 -50 -200 50 -150 N
 P 4 0 1 10 50 50 50 -50 -50 0 50 50 N
 P 4 0 1 10 50 250 50 150 -50 200 50 250 N
@@ -6762,10 +6824,10 @@ P 5 0 1 0 -40 250 20 310 -10 310 20 310 20 280 N
 P 5 0 1 0 0 -150 60 -90 30 -90 60 -90 60 -120 N
 P 5 0 1 0 0 50 60 110 30 110 60 110 60 80 N
 P 5 0 1 0 0 250 60 310 30 310 60 310 60 280 N
-X RA 1 200 200 100 L 50 50 1 1 P
-X BA 2 200 -200 100 L 50 50 1 1 P
-X K 3 -200 0 100 R 50 50 1 1 P
-X GA 4 200 0 100 L 50 50 1 1 P
+X RK 1 -200 200 100 R 50 50 1 1 P
+X BK 2 -200 -200 100 R 50 50 1 1 P
+X A 3 200 0 100 L 50 50 1 1 P
+X GK 4 -200 0 100 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
@@ -6820,11 +6882,11 @@ X A 4 200 0 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# LED_RBGC
+# LED_RBGK
 #
-DEF LED_RBGC D 0 0 Y N 1 F N
+DEF LED_RBGK D 0 0 Y N 1 F N
 F0 "D" 0 370 50 H V C CNN
-F1 "LED_RBGC" 0 -350 50 H V C CNN
+F1 "LED_RBGK" 0 -350 50 H V C CNN
 F2 "" 0 -50 50 H I C CNN
 F3 "" 0 -50 50 H I C CNN
 $FPLIST
@@ -6871,11 +6933,11 @@ X K 4 -200 0 100 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# LED_RCBG
+# LED_RBKG
 #
-DEF LED_RCBG D 0 0 Y N 1 F N
+DEF LED_RBKG D 0 0 Y N 1 F N
 F0 "D" 0 370 50 H V C CNN
-F1 "LED_RCBG" 0 -350 50 H V C CNN
+F1 "LED_RBKG" 0 -350 50 H V C CNN
 F2 "" 0 -50 50 H I C CNN
 F3 "" 0 -50 50 H I C CNN
 $FPLIST
@@ -6916,17 +6978,17 @@ P 5 0 1 0 0 -150 60 -90 30 -90 60 -90 60 -120 N
 P 5 0 1 0 0 50 60 110 30 110 60 110 60 80 N
 P 5 0 1 0 0 250 60 310 30 310 60 310 60 280 N
 X RA 1 200 200 100 L 50 50 1 1 P
-X K 2 -200 0 100 R 50 50 1 1 P
-X BA 3 200 -200 100 L 50 50 1 1 P
+X BA 2 200 -200 100 L 50 50 1 1 P
+X K 3 -200 0 100 R 50 50 1 1 P
 X GA 4 200 0 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# LED_RCGB
+# LED_RGAB
 #
-DEF LED_RCGB D 0 0 Y N 1 F N
+DEF LED_RGAB D 0 0 Y N 1 F N
 F0 "D" 0 370 50 H V C CNN
-F1 "LED_RCGB" 0 -350 50 H V C CNN
+F1 "LED_RGAB" 0 -350 50 H V C CNN
 F2 "" 0 -50 50 H I C CNN
 F3 "" 0 -50 50 H I C CNN
 $FPLIST
@@ -6935,28 +6997,28 @@ $FPLIST
  LED_THT:*
 $ENDFPLIST
 DRAW
-C -80 0 10 0 1 0 F
-T 0 75 -250 50 0 0 0 B Normal 0 C C
-T 0 75 -50 50 0 0 0 G Normal 0 C C
-T 0 75 150 50 0 0 0 R Normal 0 C C
+C 80 0 10 0 1 0 F
+T 0 -75 -250 50 0 0 0 B Normal 0 C C
+T 0 -75 -50 50 0 0 0 G Normal 0 C C
+T 0 -75 150 50 0 0 0 R Normal 0 C C
 S 50 -50 50 50 0 1 0 N
 S 50 50 50 50 0 1 0 N
 S 50 150 50 250 0 1 0 N
 S 50 250 50 250 0 1 0 N
 S 110 330 -110 -300 0 1 10 f
+P 2 0 1 0 -50 -200 -100 -200 N
 P 2 0 1 0 -50 -200 50 -200 N
 P 2 0 1 10 -50 -150 -50 -250 N
 P 2 0 1 0 -50 0 -100 0 N
 P 2 0 1 10 -50 50 -50 -50 N
+P 2 0 1 0 -50 200 -100 200 N
 P 2 0 1 0 -50 200 50 200 N
 P 2 0 1 10 -50 250 -50 150 N
-P 2 0 1 0 50 -200 100 -200 N
 P 2 0 1 0 50 0 -50 0 N
 P 2 0 1 0 50 0 100 0 N
-P 2 0 1 0 50 200 100 200 N
 P 3 0 1 0 -50 50 -50 -50 -50 -50 N
 P 3 0 1 0 -50 250 -50 150 -50 150 N
-P 4 0 1 0 -50 200 -80 200 -80 -200 -40 -200 N
+P 4 0 1 0 50 -200 80 -200 80 200 50 200 N
 P 4 0 1 10 50 -150 50 -250 -50 -200 50 -150 N
 P 4 0 1 10 50 50 50 -50 -50 0 50 50 N
 P 4 0 1 10 50 250 50 150 -50 200 50 250 N
@@ -6966,18 +7028,18 @@ P 5 0 1 0 -40 250 20 310 -10 310 20 310 20 280 N
 P 5 0 1 0 0 -150 60 -90 30 -90 60 -90 60 -120 N
 P 5 0 1 0 0 50 60 110 30 110 60 110 60 80 N
 P 5 0 1 0 0 250 60 310 30 310 60 310 60 280 N
-X RA 1 200 200 100 L 50 50 1 1 P
-X K 2 -200 0 100 R 50 50 1 1 P
-X GA 3 200 0 100 L 50 50 1 1 P
-X BA 4 200 -200 100 L 50 50 1 1 P
+X RK 1 -200 200 100 R 50 50 1 1 P
+X GK 2 -200 0 100 R 50 50 1 1 P
+X A 3 200 0 100 L 50 50 1 1 P
+X BK 4 -200 -200 100 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# LED_RGAB
+# LED_RGB
 #
-DEF LED_RGAB D 0 0 Y N 1 F N
+DEF LED_RGB D 0 0 Y N 1 F N
 F0 "D" 0 370 50 H V C CNN
-F1 "LED_RGAB" 0 -350 50 H V C CNN
+F1 "LED_RGB" 0 -350 50 H V C CNN
 F2 "" 0 -50 50 H I C CNN
 F3 "" 0 -50 50 H I C CNN
 $FPLIST
@@ -6986,7 +7048,6 @@ $FPLIST
  LED_THT:*
 $ENDFPLIST
 DRAW
-C 80 0 10 0 1 0 F
 T 0 -75 -250 50 0 0 0 B Normal 0 C C
 T 0 -75 -50 50 0 0 0 G Normal 0 C C
 T 0 -75 150 50 0 0 0 R Normal 0 C C
@@ -7003,11 +7064,12 @@ P 2 0 1 10 -50 50 -50 -50 N
 P 2 0 1 0 -50 200 -100 200 N
 P 2 0 1 0 -50 200 50 200 N
 P 2 0 1 10 -50 250 -50 150 N
+P 2 0 1 0 50 -200 100 -200 N
 P 2 0 1 0 50 0 -50 0 N
 P 2 0 1 0 50 0 100 0 N
+P 2 0 1 0 50 200 100 200 N
 P 3 0 1 0 -50 50 -50 -50 -50 -50 N
 P 3 0 1 0 -50 250 -50 150 -50 150 N
-P 4 0 1 0 50 -200 80 -200 80 200 50 200 N
 P 4 0 1 10 50 -150 50 -250 -50 -200 50 -150 N
 P 4 0 1 10 50 50 50 -50 -50 0 50 50 N
 P 4 0 1 10 50 250 50 150 -50 200 50 250 N
@@ -7019,16 +7081,18 @@ P 5 0 1 0 0 50 60 110 30 110 60 110 60 80 N
 P 5 0 1 0 0 250 60 310 30 310 60 310 60 280 N
 X RK 1 -200 200 100 R 50 50 1 1 P
 X GK 2 -200 0 100 R 50 50 1 1 P
-X A 3 200 0 100 L 50 50 1 1 P
-X BK 4 -200 -200 100 R 50 50 1 1 P
+X BK 3 -200 -200 100 R 50 50 1 1 P
+X BA 4 200 -200 100 L 50 50 1 1 P
+X GA 5 200 0 100 L 50 50 1 1 P
+X RA 6 200 200 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# LED_RGB
+# LED_RGBA
 #
-DEF LED_RGB D 0 0 Y N 1 F N
+DEF LED_RGBA D 0 0 Y N 1 F N
 F0 "D" 0 370 50 H V C CNN
-F1 "LED_RGB" 0 -350 50 H V C CNN
+F1 "LED_RGBA" 0 -350 50 H V C CNN
 F2 "" 0 -50 50 H I C CNN
 F3 "" 0 -50 50 H I C CNN
 $FPLIST
@@ -7037,6 +7101,7 @@ $FPLIST
  LED_THT:*
 $ENDFPLIST
 DRAW
+C 80 0 10 0 1 0 F
 T 0 -75 -250 50 0 0 0 B Normal 0 C C
 T 0 -75 -50 50 0 0 0 G Normal 0 C C
 T 0 -75 150 50 0 0 0 R Normal 0 C C
@@ -7053,12 +7118,11 @@ P 2 0 1 10 -50 50 -50 -50 N
 P 2 0 1 0 -50 200 -100 200 N
 P 2 0 1 0 -50 200 50 200 N
 P 2 0 1 10 -50 250 -50 150 N
-P 2 0 1 0 50 -200 100 -200 N
 P 2 0 1 0 50 0 -50 0 N
 P 2 0 1 0 50 0 100 0 N
-P 2 0 1 0 50 200 100 200 N
 P 3 0 1 0 -50 50 -50 -50 -50 -50 N
 P 3 0 1 0 -50 250 -50 150 -50 150 N
+P 4 0 1 0 50 -200 80 -200 80 200 50 200 N
 P 4 0 1 10 50 -150 50 -250 -50 -200 50 -150 N
 P 4 0 1 10 50 50 50 -50 -50 0 50 50 N
 P 4 0 1 10 50 250 50 150 -50 200 50 250 N
@@ -7071,17 +7135,15 @@ P 5 0 1 0 0 250 60 310 30 310 60 310 60 280 N
 X RK 1 -200 200 100 R 50 50 1 1 P
 X GK 2 -200 0 100 R 50 50 1 1 P
 X BK 3 -200 -200 100 R 50 50 1 1 P
-X BA 4 200 -200 100 L 50 50 1 1 P
-X GA 5 200 0 100 L 50 50 1 1 P
-X RA 6 200 200 100 L 50 50 1 1 P
+X A 4 200 0 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# LED_RGBA
+# LED_RGBK
 #
-DEF LED_RGBA D 0 0 Y N 1 F N
+DEF LED_RGBK D 0 0 Y N 1 F N
 F0 "D" 0 370 50 H V C CNN
-F1 "LED_RGBA" 0 -350 50 H V C CNN
+F1 "LED_RGBK" 0 -350 50 H V C CNN
 F2 "" 0 -50 50 H I C CNN
 F3 "" 0 -50 50 H I C CNN
 $FPLIST
@@ -7090,7 +7152,58 @@ $FPLIST
  LED_THT:*
 $ENDFPLIST
 DRAW
-C 80 0 10 0 1 0 F
+C -80 0 10 0 1 0 F
+T 0 75 -250 50 0 0 0 B Normal 0 C C
+T 0 75 -50 50 0 0 0 G Normal 0 C C
+T 0 75 150 50 0 0 0 R Normal 0 C C
+S 50 -50 50 50 0 1 0 N
+S 50 50 50 50 0 1 0 N
+S 50 150 50 250 0 1 0 N
+S 50 250 50 250 0 1 0 N
+S 110 330 -110 -300 0 1 10 f
+P 2 0 1 0 -50 -200 50 -200 N
+P 2 0 1 10 -50 -150 -50 -250 N
+P 2 0 1 0 -50 0 -100 0 N
+P 2 0 1 10 -50 50 -50 -50 N
+P 2 0 1 0 -50 200 50 200 N
+P 2 0 1 10 -50 250 -50 150 N
+P 2 0 1 0 50 -200 100 -200 N
+P 2 0 1 0 50 0 -50 0 N
+P 2 0 1 0 50 0 100 0 N
+P 2 0 1 0 50 200 100 200 N
+P 3 0 1 0 -50 50 -50 -50 -50 -50 N
+P 3 0 1 0 -50 250 -50 150 -50 150 N
+P 4 0 1 0 -50 200 -80 200 -80 -200 -40 -200 N
+P 4 0 1 10 50 -150 50 -250 -50 -200 50 -150 N
+P 4 0 1 10 50 50 50 -50 -50 0 50 50 N
+P 4 0 1 10 50 250 50 150 -50 200 50 250 N
+P 5 0 1 0 -40 -150 20 -90 -10 -90 20 -90 20 -120 N
+P 5 0 1 0 -40 50 20 110 -10 110 20 110 20 80 N
+P 5 0 1 0 -40 250 20 310 -10 310 20 310 20 280 N
+P 5 0 1 0 0 -150 60 -90 30 -90 60 -90 60 -120 N
+P 5 0 1 0 0 50 60 110 30 110 60 110 60 80 N
+P 5 0 1 0 0 250 60 310 30 310 60 310 60 280 N
+X RA 1 200 200 100 L 50 50 1 1 P
+X GA 2 200 0 100 L 50 50 1 1 P
+X BA 3 200 -200 100 L 50 50 1 1 P
+X K 4 -200 0 100 R 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# LED_RGB_EP
+#
+DEF LED_RGB_EP D 0 0 Y N 1 F N
+F0 "D" 0 450 50 H V C CNN
+F1 "LED_RGB_EP" 0 370 50 H V C CNN
+F2 "" 0 -50 50 H I C CNN
+F3 "" 0 -50 50 H I C CNN
+$FPLIST
+ LED*
+ LED_SMD:*
+ LED_THT:*
+$ENDFPLIST
+DRAW
+C 0 -300 14 0 1 10 F
 T 0 -75 -250 50 0 0 0 B Normal 0 C C
 T 0 -75 -50 50 0 0 0 G Normal 0 C C
 T 0 -75 150 50 0 0 0 R Normal 0 C C
@@ -7100,18 +7213,19 @@ S 50 150 50 250 0 1 0 N
 S 50 250 50 250 0 1 0 N
 S 110 330 -110 -300 0 1 10 f
 P 2 0 1 0 -50 -200 -100 -200 N
-P 2 0 1 0 -50 -200 50 -200 N
 P 2 0 1 10 -50 -150 -50 -250 N
 P 2 0 1 0 -50 0 -100 0 N
 P 2 0 1 10 -50 50 -50 -50 N
 P 2 0 1 0 -50 200 -100 200 N
 P 2 0 1 0 -50 200 50 200 N
 P 2 0 1 10 -50 250 -50 150 N
-P 2 0 1 0 50 0 -50 0 N
-P 2 0 1 0 50 0 100 0 N
+P 2 0 1 0 -40 0 50 0 N
+P 2 0 1 0 50 -200 -50 -200 N
+P 2 0 1 0 50 -200 100 -200 N
+P 2 0 1 0 50 200 100 200 N
+P 2 0 1 0 100 0 50 0 N
 P 3 0 1 0 -50 50 -50 -50 -50 -50 N
 P 3 0 1 0 -50 250 -50 150 -50 150 N
-P 4 0 1 0 50 -200 80 -200 80 200 50 200 N
 P 4 0 1 10 50 -150 50 -250 -50 -200 50 -150 N
 P 4 0 1 10 50 50 50 -50 -50 0 50 50 N
 P 4 0 1 10 50 250 50 150 -50 200 50 250 N
@@ -7124,15 +7238,18 @@ P 5 0 1 0 0 250 60 310 30 310 60 310 60 280 N
 X RK 1 -200 200 100 R 50 50 1 1 P
 X GK 2 -200 0 100 R 50 50 1 1 P
 X BK 3 -200 -200 100 R 50 50 1 1 P
-X A 4 200 0 100 L 50 50 1 1 P
+X BA 4 200 -200 100 L 50 50 1 1 P
+X GA 5 200 0 100 L 50 50 1 1 P
+X RA 6 200 200 100 L 50 50 1 1 P
+X PAD 7 0 -500 200 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# LED_RGBC
+# LED_RGKB
 #
-DEF LED_RGBC D 0 0 Y N 1 F N
+DEF LED_RGKB D 0 0 Y N 1 F N
 F0 "D" 0 370 50 H V C CNN
-F1 "LED_RGBC" 0 -350 50 H V C CNN
+F1 "LED_RGKB" 0 -350 50 H V C CNN
 F2 "" 0 -50 50 H I C CNN
 F3 "" 0 -50 50 H I C CNN
 $FPLIST
@@ -7174,16 +7291,16 @@ P 5 0 1 0 0 50 60 110 30 110 60 110 60 80 N
 P 5 0 1 0 0 250 60 310 30 310 60 310 60 280 N
 X RA 1 200 200 100 L 50 50 1 1 P
 X GA 2 200 0 100 L 50 50 1 1 P
-X BA 3 200 -200 100 L 50 50 1 1 P
-X K 4 -200 0 100 R 50 50 1 1 P
+X K 3 -200 0 100 R 50 50 1 1 P
+X BA 4 200 -200 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# LED_RGCB
+# LED_RKBG
 #
-DEF LED_RGCB D 0 0 Y N 1 F N
+DEF LED_RKBG D 0 0 Y N 1 F N
 F0 "D" 0 370 50 H V C CNN
-F1 "LED_RGCB" 0 -350 50 H V C CNN
+F1 "LED_RKBG" 0 -350 50 H V C CNN
 F2 "" 0 -50 50 H I C CNN
 F3 "" 0 -50 50 H I C CNN
 $FPLIST
@@ -7224,17 +7341,17 @@ P 5 0 1 0 0 -150 60 -90 30 -90 60 -90 60 -120 N
 P 5 0 1 0 0 50 60 110 30 110 60 110 60 80 N
 P 5 0 1 0 0 250 60 310 30 310 60 310 60 280 N
 X RA 1 200 200 100 L 50 50 1 1 P
-X GA 2 200 0 100 L 50 50 1 1 P
-X K 3 -200 0 100 R 50 50 1 1 P
-X BA 4 200 -200 100 L 50 50 1 1 P
+X K 2 -200 0 100 R 50 50 1 1 P
+X BA 3 200 -200 100 L 50 50 1 1 P
+X GA 4 200 0 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# LED_RGB_EP
+# LED_RKGB
 #
-DEF LED_RGB_EP D 0 0 Y N 1 F N
-F0 "D" 0 450 50 H V C CNN
-F1 "LED_RGB_EP" 0 370 50 H V C CNN
+DEF LED_RKGB D 0 0 Y N 1 F N
+F0 "D" 0 370 50 H V C CNN
+F1 "LED_RKGB" 0 -350 50 H V C CNN
 F2 "" 0 -50 50 H I C CNN
 F3 "" 0 -50 50 H I C CNN
 $FPLIST
@@ -7243,29 +7360,28 @@ $FPLIST
  LED_THT:*
 $ENDFPLIST
 DRAW
-C 0 -300 14 0 1 10 F
-T 0 -75 -250 50 0 0 0 B Normal 0 C C
-T 0 -75 -50 50 0 0 0 G Normal 0 C C
-T 0 -75 150 50 0 0 0 R Normal 0 C C
+C -80 0 10 0 1 0 F
+T 0 75 -250 50 0 0 0 B Normal 0 C C
+T 0 75 -50 50 0 0 0 G Normal 0 C C
+T 0 75 150 50 0 0 0 R Normal 0 C C
 S 50 -50 50 50 0 1 0 N
 S 50 50 50 50 0 1 0 N
 S 50 150 50 250 0 1 0 N
 S 50 250 50 250 0 1 0 N
 S 110 330 -110 -300 0 1 10 f
-P 2 0 1 0 -50 -200 -100 -200 N
+P 2 0 1 0 -50 -200 50 -200 N
 P 2 0 1 10 -50 -150 -50 -250 N
 P 2 0 1 0 -50 0 -100 0 N
 P 2 0 1 10 -50 50 -50 -50 N
-P 2 0 1 0 -50 200 -100 200 N
 P 2 0 1 0 -50 200 50 200 N
 P 2 0 1 10 -50 250 -50 150 N
-P 2 0 1 0 -40 0 50 0 N
-P 2 0 1 0 50 -200 -50 -200 N
 P 2 0 1 0 50 -200 100 -200 N
+P 2 0 1 0 50 0 -50 0 N
+P 2 0 1 0 50 0 100 0 N
 P 2 0 1 0 50 200 100 200 N
-P 2 0 1 0 100 0 50 0 N
 P 3 0 1 0 -50 50 -50 -50 -50 -50 N
 P 3 0 1 0 -50 250 -50 150 -50 150 N
+P 4 0 1 0 -50 200 -80 200 -80 -200 -40 -200 N
 P 4 0 1 10 50 -150 50 -250 -50 -200 50 -150 N
 P 4 0 1 10 50 50 50 -50 -50 0 50 50 N
 P 4 0 1 10 50 250 50 150 -50 200 50 250 N
@@ -7275,13 +7391,10 @@ P 5 0 1 0 -40 250 20 310 -10 310 20 310 20 280 N
 P 5 0 1 0 0 -150 60 -90 30 -90 60 -90 60 -120 N
 P 5 0 1 0 0 50 60 110 30 110 60 110 60 80 N
 P 5 0 1 0 0 250 60 310 30 310 60 310 60 280 N
-X RK 1 -200 200 100 R 50 50 1 1 P
-X GK 2 -200 0 100 R 50 50 1 1 P
-X BK 3 -200 -200 100 R 50 50 1 1 P
+X RA 1 200 200 100 L 50 50 1 1 P
+X K 2 -200 0 100 R 50 50 1 1 P
+X GA 3 200 0 100 L 50 50 1 1 P
 X BA 4 200 -200 100 L 50 50 1 1 P
-X GA 5 200 0 100 L 50 50 1 1 P
-X RA 6 200 200 100 L 50 50 1 1 P
-X PAD 7 0 -500 200 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
@@ -7316,11 +7429,11 @@ X A 2 250 0 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# LED_Series_PAD
+# LED_Series_Pad
 #
-DEF LED_Series_PAD D 0 40 Y N 1 F N
+DEF LED_Series_Pad D 0 40 Y N 1 F N
 F0 "D" 0 225 50 H V C CNN
-F1 "LED_Series_PAD" 0 150 50 H V C CNN
+F1 "LED_Series_Pad" 0 150 50 H V C CNN
 F2 "" -100 0 50 H I C CNN
 F3 "" -100 0 50 H I C CNN
 $FPLIST
@@ -7373,11 +7486,11 @@ X A 2 100 0 70 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# LED_Small_ALT
+# LED_Small_Filled
 #
-DEF LED_Small_ALT D 0 10 N N 1 F N
+DEF LED_Small_Filled D 0 10 N N 1 F N
 F0 "D" -50 125 50 H V L CNN
-F1 "LED_Small_ALT" -175 -100 50 H V L CNN
+F1 "LED_Small_Filled" -175 -100 50 H V L CNN
 F2 "" 0 0 50 V I C CNN
 F3 "" 0 0 50 V I C CNN
 $FPLIST
@@ -7396,70 +7509,11 @@ X A 2 100 0 70 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# LTRIM
-#
-DEF LTRIM L 0 40 N N 1 F N
-F0 "L" -75 0 50 V V C CNN
-F1 "LTRIM" 125 0 50 V V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- Inductor_*
- L_*
-$ENDFPLIST
-DRAW
-A 0 -75 25 -899 899 0 1 0 N 0 -100 0 -50
-A 0 -25 25 -899 899 0 1 0 N 0 -50 0 0
-A 0 25 25 -899 899 0 1 0 N 0 0 0 50
-A 0 75 25 -899 899 0 1 0 N 0 50 0 100
-P 2 0 1 0 -50 -75 75 100 N
-P 2 0 1 0 75 100 40 85 N
-P 2 0 1 0 75 100 70 65 N
-X 1 1 0 150 50 D 50 50 1 1 P
-X 2 2 0 -150 50 U 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# L_Core_Ferrite
-#
-DEF L_Core_Ferrite L 0 40 N N 1 F N
-F0 "L" -50 0 50 V V C CNN
-F1 "L_Core_Ferrite" 110 0 50 V V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- Choke_*
- *Coil*
- Inductor_*
- L_*
-$ENDFPLIST
-DRAW
-A 0 -75 25 -899 899 0 1 0 N 0 -100 0 -50
-A 0 -25 25 -899 899 0 1 0 N 0 -50 0 0
-A 0 25 25 -899 899 0 1 0 N 0 0 0 50
-A 0 75 25 -899 899 0 1 0 N 0 50 0 100
-P 2 0 1 0 40 -110 40 -90 N
-P 2 0 1 0 40 -70 40 -50 N
-P 2 0 1 0 40 -30 40 -10 N
-P 2 0 1 0 40 10 40 30 N
-P 2 0 1 0 40 50 40 70 N
-P 2 0 1 0 40 90 40 110 N
-P 2 0 1 0 60 -90 60 -110 N
-P 2 0 1 0 60 -50 60 -70 N
-P 2 0 1 0 60 -10 60 -30 N
-P 2 0 1 0 60 30 60 10 N
-P 2 0 1 0 60 70 60 50 N
-P 2 0 1 0 60 110 60 90 N
-X 1 1 0 150 50 D 50 50 1 1 P
-X 2 2 0 -150 50 U 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# L_Core_Ferrite_Coupled
+# L_Coupled
 #
-DEF L_Core_Ferrite_Coupled L 0 10 Y N 1 F N
+DEF L_Coupled L 0 10 Y N 1 F N
 F0 "L" 0 175 50 H V C CNN
-F1 "L_Core_Ferrite_Coupled" 0 -175 50 H V C CNN
+F1 "L_Coupled" 0 -175 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -7481,20 +7535,8 @@ A 80 -80 20 1 1799 0 1 0 N 100 -80 60 -80
 A 80 80 20 -1799 -1 0 1 0 N 60 80 100 80
 C -120 -50 10 0 1 0 F
 C -120 60 10 0 1 0 F
-P 2 0 1 0 -110 -20 -90 -20 N
-P 2 0 1 0 -110 20 -90 20 N
 P 2 0 1 0 -100 -80 -100 -100 N
 P 2 0 1 0 -100 80 -100 100 N
-P 2 0 1 0 -70 -20 -50 -20 N
-P 2 0 1 0 -70 20 -50 20 N
-P 2 0 1 0 -30 -20 -10 -20 N
-P 2 0 1 0 -30 20 -10 20 N
-P 2 0 1 0 10 -20 30 -20 N
-P 2 0 1 0 10 20 30 20 N
-P 2 0 1 0 50 -20 70 -20 N
-P 2 0 1 0 50 20 70 20 N
-P 2 0 1 0 90 -20 110 -20 N
-P 2 0 1 0 90 20 110 20 N
 P 2 0 1 0 100 -80 100 -100 N
 P 2 0 1 0 100 100 100 80 N
 X 1 1 -200 100 100 R 50 50 1 1 P
@@ -7504,11 +7546,11 @@ X 4 4 200 -100 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# L_Core_Ferrite_Coupled_1243
+# L_Coupled_1243
 #
-DEF L_Core_Ferrite_Coupled_1243 L 0 10 Y N 1 F N
+DEF L_Coupled_1243 L 0 10 Y N 1 F N
 F0 "L" 0 175 50 H V C CNN
-F1 "L_Core_Ferrite_Coupled_1243" 0 -175 50 H V C CNN
+F1 "L_Coupled_1243" 0 -175 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -7530,20 +7572,8 @@ A 80 -80 20 1 1799 0 1 0 N 100 -80 60 -80
 A 80 80 20 -1799 -1 0 1 0 N 60 80 100 80
 C -120 -50 10 0 1 0 F
 C -120 60 10 0 1 0 F
-P 2 0 1 0 -110 -20 -90 -20 N
-P 2 0 1 0 -110 20 -90 20 N
 P 2 0 1 0 -100 -80 -100 -100 N
 P 2 0 1 0 -100 80 -100 100 N
-P 2 0 1 0 -70 -20 -50 -20 N
-P 2 0 1 0 -70 20 -50 20 N
-P 2 0 1 0 -30 -20 -10 -20 N
-P 2 0 1 0 -30 20 -10 20 N
-P 2 0 1 0 10 -20 30 -20 N
-P 2 0 1 0 10 20 30 20 N
-P 2 0 1 0 50 -20 70 -20 N
-P 2 0 1 0 50 20 70 20 N
-P 2 0 1 0 90 -20 110 -20 N
-P 2 0 1 0 90 20 110 20 N
 P 2 0 1 0 100 -80 100 -100 N
 P 2 0 1 0 100 100 100 80 N
 X 1 1 -200 100 100 R 50 50 1 1 P
@@ -7553,11 +7583,11 @@ X 4 4 -200 -100 100 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# L_Core_Ferrite_Coupled_1324
+# L_Coupled_1324
 #
-DEF L_Core_Ferrite_Coupled_1324 L 0 10 Y N 1 F N
+DEF L_Coupled_1324 L 0 10 Y N 1 F N
 F0 "L" 0 175 50 H V C CNN
-F1 "L_Core_Ferrite_Coupled_1324" 0 -175 50 H V C CNN
+F1 "L_Coupled_1324" 0 -175 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -7579,20 +7609,8 @@ A 80 -80 20 1 1799 0 1 0 N 100 -80 60 -80
 A 80 80 20 -1799 -1 0 1 0 N 60 80 100 80
 C -120 -50 10 0 1 0 F
 C -120 60 10 0 1 0 F
-P 2 0 1 0 -110 -20 -90 -20 N
-P 2 0 1 0 -110 20 -90 20 N
 P 2 0 1 0 -100 -80 -100 -100 N
 P 2 0 1 0 -100 80 -100 100 N
-P 2 0 1 0 -70 -20 -50 -20 N
-P 2 0 1 0 -70 20 -50 20 N
-P 2 0 1 0 -30 -20 -10 -20 N
-P 2 0 1 0 -30 20 -10 20 N
-P 2 0 1 0 10 -20 30 -20 N
-P 2 0 1 0 10 20 30 20 N
-P 2 0 1 0 50 -20 70 -20 N
-P 2 0 1 0 50 20 70 20 N
-P 2 0 1 0 90 -20 110 -20 N
-P 2 0 1 0 90 20 110 20 N
 P 2 0 1 0 100 -80 100 -100 N
 P 2 0 1 0 100 100 100 80 N
 X 1 1 -200 100 100 R 50 50 1 1 P
@@ -7602,11 +7620,11 @@ X 4 4 200 -100 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# L_Core_Ferrite_Coupled_1342
+# L_Coupled_1342
 #
-DEF L_Core_Ferrite_Coupled_1342 L 0 10 Y N 1 F N
+DEF L_Coupled_1342 L 0 10 Y N 1 F N
 F0 "L" 0 175 50 H V C CNN
-F1 "L_Core_Ferrite_Coupled_1342" 0 -175 50 H V C CNN
+F1 "L_Coupled_1342" 0 -175 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -7628,20 +7646,8 @@ A 80 -80 20 1 1799 0 1 0 N 100 -80 60 -80
 A 80 80 20 -1799 -1 0 1 0 N 60 80 100 80
 C -120 -50 10 0 1 0 F
 C -120 60 10 0 1 0 F
-P 2 0 1 0 -110 -20 -90 -20 N
-P 2 0 1 0 -110 20 -90 20 N
 P 2 0 1 0 -100 -80 -100 -100 N
 P 2 0 1 0 -100 80 -100 100 N
-P 2 0 1 0 -70 -20 -50 -20 N
-P 2 0 1 0 -70 20 -50 20 N
-P 2 0 1 0 -30 -20 -10 -20 N
-P 2 0 1 0 -30 20 -10 20 N
-P 2 0 1 0 10 -20 30 -20 N
-P 2 0 1 0 10 20 30 20 N
-P 2 0 1 0 50 -20 70 -20 N
-P 2 0 1 0 50 20 70 20 N
-P 2 0 1 0 90 -20 110 -20 N
-P 2 0 1 0 90 20 110 20 N
 P 2 0 1 0 100 -80 100 -100 N
 P 2 0 1 0 100 100 100 80 N
 X 1 1 -200 100 100 R 50 50 1 1 P
@@ -7651,11 +7657,11 @@ X 4 4 -200 -100 100 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# L_Core_Ferrite_Coupled_1423
+# L_Coupled_1423
 #
-DEF L_Core_Ferrite_Coupled_1423 L 0 10 Y N 1 F N
+DEF L_Coupled_1423 L 0 10 Y N 1 F N
 F0 "L" 0 175 50 H V C CNN
-F1 "L_Core_Ferrite_Coupled_1423" 0 -175 50 H V C CNN
+F1 "L_Coupled_1423" 0 -175 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -7677,20 +7683,8 @@ A 80 -80 20 1 1799 0 1 0 N 100 -80 60 -80
 A 80 80 20 -1799 -1 0 1 0 N 60 80 100 80
 C -120 -50 10 0 1 0 F
 C -120 60 10 0 1 0 F
-P 2 0 1 0 -110 -20 -90 -20 N
-P 2 0 1 0 -110 20 -90 20 N
 P 2 0 1 0 -100 -80 -100 -100 N
 P 2 0 1 0 -100 80 -100 100 N
-P 2 0 1 0 -70 -20 -50 -20 N
-P 2 0 1 0 -70 20 -50 20 N
-P 2 0 1 0 -30 -20 -10 -20 N
-P 2 0 1 0 -30 20 -10 20 N
-P 2 0 1 0 10 -20 30 -20 N
-P 2 0 1 0 10 20 30 20 N
-P 2 0 1 0 50 -20 70 -20 N
-P 2 0 1 0 50 20 70 20 N
-P 2 0 1 0 90 -20 110 -20 N
-P 2 0 1 0 90 20 110 20 N
 P 2 0 1 0 100 -80 100 -100 N
 P 2 0 1 0 100 100 100 80 N
 X 1 1 -200 100 100 R 50 50 1 1 P
@@ -7700,11 +7694,11 @@ X 4 4 200 100 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# L_Core_Ferrite_Coupled_Small
+# L_Coupled_Small
 #
-DEF L_Core_Ferrite_Coupled_Small L 0 10 Y N 1 F N
+DEF L_Coupled_Small L 0 10 Y N 1 F N
 F0 "L" 0 125 50 H V C CNN
-F1 "L_Core_Ferrite_Coupled_Small" 0 -125 50 H V C CNN
+F1 "L_Coupled_Small" 0 -125 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -7724,20 +7718,6 @@ A 60 -50 20 1 1799 0 1 0 N 80 -50 40 -50
 A 60 50 20 -1799 -1 0 1 0 N 40 50 80 50
 C -60 -50 10 0 1 0 F
 C -60 50 10 0 1 0 F
-P 2 0 1 0 -65 10 -55 10 N
-P 2 0 1 0 -55 -10 -65 -10 N
-P 2 0 1 0 -45 10 -35 10 N
-P 2 0 1 0 -35 -10 -45 -10 N
-P 2 0 1 0 -25 10 -15 10 N
-P 2 0 1 0 -15 -10 -25 -10 N
-P 2 0 1 0 -5 10 5 10 N
-P 2 0 1 0 5 -10 -5 -10 N
-P 2 0 1 0 15 10 25 10 N
-P 2 0 1 0 25 -10 15 -10 N
-P 2 0 1 0 35 10 45 10 N
-P 2 0 1 0 45 -10 35 -10 N
-P 2 0 1 0 55 10 65 10 N
-P 2 0 1 0 65 -10 55 -10 N
 X 1 1 -100 50 20 R 50 50 1 1 P
 X 2 2 100 50 20 L 50 50 1 1 P
 X 3 3 -100 -50 20 R 50 50 1 1 P
@@ -7745,11 +7725,11 @@ X 4 4 100 -50 20 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# L_Core_Ferrite_Coupled_Small_1243
+# L_Coupled_Small_1243
 #
-DEF L_Core_Ferrite_Coupled_Small_1243 L 0 10 Y N 1 F N
+DEF L_Coupled_Small_1243 L 0 10 Y N 1 F N
 F0 "L" 0 125 50 H V C CNN
-F1 "L_Core_Ferrite_Coupled_Small_1243" 0 -125 50 H V C CNN
+F1 "L_Coupled_Small_1243" 0 -125 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -7769,20 +7749,6 @@ A 60 -50 20 1 1799 0 1 0 N 80 -50 40 -50
 A 60 50 20 -1799 -1 0 1 0 N 40 50 80 50
 C -60 -50 10 0 1 0 F
 C -60 50 10 0 1 0 F
-P 2 0 1 0 -65 10 -55 10 N
-P 2 0 1 0 -55 -10 -65 -10 N
-P 2 0 1 0 -45 10 -35 10 N
-P 2 0 1 0 -35 -10 -45 -10 N
-P 2 0 1 0 -25 10 -15 10 N
-P 2 0 1 0 -15 -10 -25 -10 N
-P 2 0 1 0 -5 10 5 10 N
-P 2 0 1 0 5 -10 -5 -10 N
-P 2 0 1 0 15 10 25 10 N
-P 2 0 1 0 25 -10 15 -10 N
-P 2 0 1 0 35 10 45 10 N
-P 2 0 1 0 45 -10 35 -10 N
-P 2 0 1 0 55 10 65 10 N
-P 2 0 1 0 65 -10 55 -10 N
 X 1 1 -100 50 20 R 50 50 1 1 P
 X 2 2 100 50 20 L 50 50 1 1 P
 X 3 3 100 -50 20 L 50 50 1 1 P
@@ -7790,11 +7756,11 @@ X 4 4 -100 -50 20 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# L_Core_Ferrite_Coupled_Small_1324
+# L_Coupled_Small_1324
 #
-DEF L_Core_Ferrite_Coupled_Small_1324 L 0 10 Y N 1 F N
-F0 "L" 0 125 50 H V C CNN
-F1 "L_Core_Ferrite_Coupled_Small_1324" 0 -125 50 H V C CNN
+DEF L_Coupled_Small_1324 L 0 10 Y N 1 F N
+F0 "L" 0 175 50 H V C CNN
+F1 "L_Coupled_Small_1324" 0 -175 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -7804,42 +7770,34 @@ $FPLIST
  L_*
 $ENDFPLIST
 DRAW
-A -60 -50 20 1 1799 0 1 0 N -40 -50 -80 -50
-A -60 50 20 -1799 -1 0 1 0 N -80 50 -40 50
-A -20 -50 20 1 1799 0 1 0 N 0 -50 -40 -50
-A -20 50 20 -1799 -1 0 1 0 N -40 50 0 50
-A 20 -50 20 1 1799 0 1 0 N 40 -50 0 -50
-A 20 50 20 -1799 -1 0 1 0 N 0 50 40 50
-A 60 -50 20 1 1799 0 1 0 N 80 -50 40 -50
-A 60 50 20 -1799 -1 0 1 0 N 40 50 80 50
-C -60 -50 10 0 1 0 F
-C -60 50 10 0 1 0 F
-P 2 0 1 0 -65 10 -55 10 N
-P 2 0 1 0 -55 -10 -65 -10 N
-P 2 0 1 0 -45 10 -35 10 N
-P 2 0 1 0 -35 -10 -45 -10 N
-P 2 0 1 0 -25 10 -15 10 N
-P 2 0 1 0 -15 -10 -25 -10 N
-P 2 0 1 0 -5 10 5 10 N
-P 2 0 1 0 5 -10 -5 -10 N
-P 2 0 1 0 15 10 25 10 N
-P 2 0 1 0 25 -10 15 -10 N
-P 2 0 1 0 35 10 45 10 N
-P 2 0 1 0 45 -10 35 -10 N
-P 2 0 1 0 55 10 65 10 N
-P 2 0 1 0 65 -10 55 -10 N
-X 1 1 -100 50 20 R 50 50 1 1 P
-X 2 2 -100 -50 20 R 50 50 1 1 P
-X 3 3 100 50 20 L 50 50 1 1 P
-X 4 4 100 -50 20 L 50 50 1 1 P
+A -80 -80 20 1 1799 0 1 0 N -60 -80 -100 -80
+A -80 80 20 -1799 -1 0 1 0 N -100 80 -60 80
+A -40 -80 20 1 1799 0 1 0 N -20 -80 -60 -80
+A -40 80 20 -1799 -1 0 1 0 N -60 80 -20 80
+A 0 -80 20 1 1799 0 1 0 N 20 -80 -20 -80
+A 0 80 20 -1799 -1 0 1 0 N -20 80 20 80
+A 40 -80 20 1 1799 0 1 0 N 60 -80 20 -80
+A 40 80 20 -1799 -1 0 1 0 N 20 80 60 80
+A 80 -80 20 1 1799 0 1 0 N 100 -80 60 -80
+A 80 80 20 -1799 -1 0 1 0 N 60 80 100 80
+C -120 -50 10 0 1 0 F
+C -120 60 10 0 1 0 F
+P 2 0 1 0 -100 -80 -100 -100 N
+P 2 0 1 0 -100 80 -100 100 N
+P 2 0 1 0 100 -80 100 -100 N
+P 2 0 1 0 100 100 100 80 N
+X 1 1 -200 100 100 R 50 50 1 1 P
+X 2 2 -200 -100 100 R 50 50 1 1 P
+X 3 3 200 100 100 L 50 50 1 1 P
+X 4 4 200 -100 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# L_Core_Ferrite_Coupled_Small_1342
+# L_Coupled_Small_1342
 #
-DEF L_Core_Ferrite_Coupled_Small_1342 L 0 10 Y N 1 F N
+DEF L_Coupled_Small_1342 L 0 10 Y N 1 F N
 F0 "L" 0 125 50 H V C CNN
-F1 "L_Core_Ferrite_Coupled_Small_1342" 0 -125 50 H V C CNN
+F1 "L_Coupled_Small_1342" 0 -125 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -7859,20 +7817,6 @@ A 60 -50 20 1 1799 0 1 0 N 80 -50 40 -50
 A 60 50 20 -1799 -1 0 1 0 N 40 50 80 50
 C -60 -50 10 0 1 0 F
 C -60 50 10 0 1 0 F
-P 2 0 1 0 -65 10 -55 10 N
-P 2 0 1 0 -55 -10 -65 -10 N
-P 2 0 1 0 -45 10 -35 10 N
-P 2 0 1 0 -35 -10 -45 -10 N
-P 2 0 1 0 -25 10 -15 10 N
-P 2 0 1 0 -15 -10 -25 -10 N
-P 2 0 1 0 -5 10 5 10 N
-P 2 0 1 0 5 -10 -5 -10 N
-P 2 0 1 0 15 10 25 10 N
-P 2 0 1 0 25 -10 15 -10 N
-P 2 0 1 0 35 10 45 10 N
-P 2 0 1 0 45 -10 35 -10 N
-P 2 0 1 0 55 10 65 10 N
-P 2 0 1 0 65 -10 55 -10 N
 X 1 1 -100 50 20 R 50 50 1 1 P
 X 2 2 100 -50 20 L 50 50 1 1 P
 X 3 3 100 50 20 L 50 50 1 1 P
@@ -7880,11 +7824,11 @@ X 4 4 -100 -50 20 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# L_Core_Ferrite_Coupled_Small_1423
+# L_Coupled_Small_1423
 #
-DEF L_Core_Ferrite_Coupled_Small_1423 L 0 10 Y N 1 F N
+DEF L_Coupled_Small_1423 L 0 10 Y N 1 F N
 F0 "L" 0 125 50 H V C CNN
-F1 "L_Core_Ferrite_Coupled_Small_1423" 0 -125 50 H V C CNN
+F1 "L_Coupled_Small_1423" 0 -125 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -7904,20 +7848,6 @@ A 60 -50 20 1 1799 0 1 0 N 80 -50 40 -50
 A 60 50 20 -1799 -1 0 1 0 N 40 50 80 50
 C -60 -50 10 0 1 0 F
 C -60 50 10 0 1 0 F
-P 2 0 1 0 -65 10 -55 10 N
-P 2 0 1 0 -55 -10 -65 -10 N
-P 2 0 1 0 -45 10 -35 10 N
-P 2 0 1 0 -35 -10 -45 -10 N
-P 2 0 1 0 -25 10 -15 10 N
-P 2 0 1 0 -15 -10 -25 -10 N
-P 2 0 1 0 -5 10 5 10 N
-P 2 0 1 0 5 -10 -5 -10 N
-P 2 0 1 0 15 10 25 10 N
-P 2 0 1 0 25 -10 15 -10 N
-P 2 0 1 0 35 10 45 10 N
-P 2 0 1 0 45 -10 35 -10 N
-P 2 0 1 0 55 10 65 10 N
-P 2 0 1 0 65 -10 55 -10 N
 X 1 1 -100 50 20 R 50 50 1 1 P
 X 2 2 -100 -50 20 R 50 50 1 1 P
 X 3 3 100 -50 20 L 50 50 1 1 P
@@ -7925,50 +7855,11 @@ X 4 4 100 50 20 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# L_Core_Ferrite_Small
-#
-DEF L_Core_Ferrite_Small L 0 10 N N 1 F N
-F0 "L" 50 40 50 H V L CNN
-F1 "L_Core_Ferrite_Small" 50 -50 50 H V L CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- Choke_*
- *Coil*
- Inductor_*
- L_*
-$ENDFPLIST
-DRAW
-A 0 -60 20 -899 899 0 1 0 N 0 -80 0 -40
-A 0 -20 20 -899 899 0 1 0 N 0 -40 0 0
-A 0 20 20 -899 899 0 1 0 N 0 0 0 40
-A 0 60 20 -899 899 0 1 0 N 0 40 0 80
-P 2 0 1 0 30 -75 30 -65 N
-P 2 0 1 0 30 -55 30 -45 N
-P 2 0 1 0 30 -35 30 -25 N
-P 2 0 1 0 30 -15 30 -5 N
-P 2 0 1 0 30 5 30 15 N
-P 2 0 1 0 30 25 30 35 N
-P 2 0 1 0 30 45 30 55 N
-P 2 0 1 0 30 65 30 75 N
-P 2 0 1 0 40 -65 40 -75 N
-P 2 0 1 0 40 -45 40 -55 N
-P 2 0 1 0 40 -25 40 -35 N
-P 2 0 1 0 40 -5 40 -15 N
-P 2 0 1 0 40 15 40 5 N
-P 2 0 1 0 40 35 40 25 N
-P 2 0 1 0 40 55 40 45 N
-P 2 0 1 0 40 75 40 65 N
-X ~ 1 0 100 20 D 50 50 1 1 P
-X ~ 2 0 -100 20 U 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# L_Core_Iron
+# L_Ferrite
 #
-DEF L_Core_Iron L 0 40 N N 1 F N
+DEF L_Ferrite L 0 40 N N 1 F N
 F0 "L" -50 0 50 V V C CNN
-F1 "L_Core_Iron" 110 0 50 V V C CNN
+F1 "L_Ferrite" 110 0 50 V V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -7982,18 +7873,28 @@ A 0 -75 25 -899 899 0 1 0 N 0 -100 0 -50
 A 0 -25 25 -899 899 0 1 0 N 0 -50 0 0
 A 0 25 25 -899 899 0 1 0 N 0 0 0 50
 A 0 75 25 -899 899 0 1 0 N 0 50 0 100
-P 2 0 1 0 40 100 40 -100 N
-P 2 0 1 0 60 -100 60 100 N
+P 2 0 1 0 40 -110 40 -90 N
+P 2 0 1 0 40 -70 40 -50 N
+P 2 0 1 0 40 -30 40 -10 N
+P 2 0 1 0 40 10 40 30 N
+P 2 0 1 0 40 50 40 70 N
+P 2 0 1 0 40 90 40 110 N
+P 2 0 1 0 60 -90 60 -110 N
+P 2 0 1 0 60 -50 60 -70 N
+P 2 0 1 0 60 -10 60 -30 N
+P 2 0 1 0 60 30 60 10 N
+P 2 0 1 0 60 70 60 50 N
+P 2 0 1 0 60 110 60 90 N
 X 1 1 0 150 50 D 50 50 1 1 P
 X 2 2 0 -150 50 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# L_Core_Iron_Coupled
+# L_Ferrite_Coupled
 #
-DEF L_Core_Iron_Coupled L 0 10 Y N 1 F N
+DEF L_Ferrite_Coupled L 0 10 Y N 1 F N
 F0 "L" 0 175 50 H V C CNN
-F1 "L_Core_Iron_Coupled" 0 -175 50 H V C CNN
+F1 "L_Ferrite_Coupled" 0 -175 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -8015,11 +7916,21 @@ A 80 -80 20 1 1799 0 1 0 N 100 -80 60 -80
 A 80 80 20 -1799 -1 0 1 0 N 60 80 100 80
 C -120 -50 10 0 1 0 F
 C -120 60 10 0 1 0 F
+P 2 0 1 0 -110 -20 -90 -20 N
+P 2 0 1 0 -110 20 -90 20 N
 P 2 0 1 0 -100 -80 -100 -100 N
-P 2 0 1 0 -100 20 100 20 N
 P 2 0 1 0 -100 80 -100 100 N
+P 2 0 1 0 -70 -20 -50 -20 N
+P 2 0 1 0 -70 20 -50 20 N
+P 2 0 1 0 -30 -20 -10 -20 N
+P 2 0 1 0 -30 20 -10 20 N
+P 2 0 1 0 10 -20 30 -20 N
+P 2 0 1 0 10 20 30 20 N
+P 2 0 1 0 50 -20 70 -20 N
+P 2 0 1 0 50 20 70 20 N
+P 2 0 1 0 90 -20 110 -20 N
+P 2 0 1 0 90 20 110 20 N
 P 2 0 1 0 100 -80 100 -100 N
-P 2 0 1 0 100 -20 -100 -20 N
 P 2 0 1 0 100 100 100 80 N
 X 1 1 -200 100 100 R 50 50 1 1 P
 X 2 2 200 100 100 L 50 50 1 1 P
@@ -8028,11 +7939,11 @@ X 4 4 200 -100 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# L_Core_Iron_Coupled_1243
+# L_Ferrite_Coupled_1243
 #
-DEF L_Core_Iron_Coupled_1243 L 0 10 Y N 1 F N
+DEF L_Ferrite_Coupled_1243 L 0 10 Y N 1 F N
 F0 "L" 0 175 50 H V C CNN
-F1 "L_Core_Iron_Coupled_1243" 0 -175 50 H V C CNN
+F1 "L_Ferrite_Coupled_1243" 0 -175 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -8054,11 +7965,21 @@ A 80 -80 20 1 1799 0 1 0 N 100 -80 60 -80
 A 80 80 20 -1799 -1 0 1 0 N 60 80 100 80
 C -120 -50 10 0 1 0 F
 C -120 60 10 0 1 0 F
+P 2 0 1 0 -110 -20 -90 -20 N
+P 2 0 1 0 -110 20 -90 20 N
 P 2 0 1 0 -100 -80 -100 -100 N
-P 2 0 1 0 -100 20 100 20 N
 P 2 0 1 0 -100 80 -100 100 N
+P 2 0 1 0 -70 -20 -50 -20 N
+P 2 0 1 0 -70 20 -50 20 N
+P 2 0 1 0 -30 -20 -10 -20 N
+P 2 0 1 0 -30 20 -10 20 N
+P 2 0 1 0 10 -20 30 -20 N
+P 2 0 1 0 10 20 30 20 N
+P 2 0 1 0 50 -20 70 -20 N
+P 2 0 1 0 50 20 70 20 N
+P 2 0 1 0 90 -20 110 -20 N
+P 2 0 1 0 90 20 110 20 N
 P 2 0 1 0 100 -80 100 -100 N
-P 2 0 1 0 100 -20 -100 -20 N
 P 2 0 1 0 100 100 100 80 N
 X 1 1 -200 100 100 R 50 50 1 1 P
 X 2 2 200 100 100 L 50 50 1 1 P
@@ -8067,11 +7988,11 @@ X 4 4 -200 -100 100 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# L_Core_Iron_Coupled_1324
+# L_Ferrite_Coupled_1324
 #
-DEF L_Core_Iron_Coupled_1324 L 0 10 Y N 1 F N
+DEF L_Ferrite_Coupled_1324 L 0 10 Y N 1 F N
 F0 "L" 0 175 50 H V C CNN
-F1 "L_Core_Iron_Coupled_1324" 0 -175 50 H V C CNN
+F1 "L_Ferrite_Coupled_1324" 0 -175 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -8093,11 +8014,21 @@ A 80 -80 20 1 1799 0 1 0 N 100 -80 60 -80
 A 80 80 20 -1799 -1 0 1 0 N 60 80 100 80
 C -120 -50 10 0 1 0 F
 C -120 60 10 0 1 0 F
+P 2 0 1 0 -110 -20 -90 -20 N
+P 2 0 1 0 -110 20 -90 20 N
 P 2 0 1 0 -100 -80 -100 -100 N
-P 2 0 1 0 -100 20 100 20 N
 P 2 0 1 0 -100 80 -100 100 N
+P 2 0 1 0 -70 -20 -50 -20 N
+P 2 0 1 0 -70 20 -50 20 N
+P 2 0 1 0 -30 -20 -10 -20 N
+P 2 0 1 0 -30 20 -10 20 N
+P 2 0 1 0 10 -20 30 -20 N
+P 2 0 1 0 10 20 30 20 N
+P 2 0 1 0 50 -20 70 -20 N
+P 2 0 1 0 50 20 70 20 N
+P 2 0 1 0 90 -20 110 -20 N
+P 2 0 1 0 90 20 110 20 N
 P 2 0 1 0 100 -80 100 -100 N
-P 2 0 1 0 100 -20 -100 -20 N
 P 2 0 1 0 100 100 100 80 N
 X 1 1 -200 100 100 R 50 50 1 1 P
 X 2 2 -200 -100 100 R 50 50 1 1 P
@@ -8106,11 +8037,11 @@ X 4 4 200 -100 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# L_Core_Iron_Coupled_1342
+# L_Ferrite_Coupled_1342
 #
-DEF L_Core_Iron_Coupled_1342 L 0 10 Y N 1 F N
+DEF L_Ferrite_Coupled_1342 L 0 10 Y N 1 F N
 F0 "L" 0 175 50 H V C CNN
-F1 "L_Core_Iron_Coupled_1342" 0 -175 50 H V C CNN
+F1 "L_Ferrite_Coupled_1342" 0 -175 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -8132,11 +8063,21 @@ A 80 -80 20 1 1799 0 1 0 N 100 -80 60 -80
 A 80 80 20 -1799 -1 0 1 0 N 60 80 100 80
 C -120 -50 10 0 1 0 F
 C -120 60 10 0 1 0 F
+P 2 0 1 0 -110 -20 -90 -20 N
+P 2 0 1 0 -110 20 -90 20 N
 P 2 0 1 0 -100 -80 -100 -100 N
-P 2 0 1 0 -100 20 100 20 N
 P 2 0 1 0 -100 80 -100 100 N
+P 2 0 1 0 -70 -20 -50 -20 N
+P 2 0 1 0 -70 20 -50 20 N
+P 2 0 1 0 -30 -20 -10 -20 N
+P 2 0 1 0 -30 20 -10 20 N
+P 2 0 1 0 10 -20 30 -20 N
+P 2 0 1 0 10 20 30 20 N
+P 2 0 1 0 50 -20 70 -20 N
+P 2 0 1 0 50 20 70 20 N
+P 2 0 1 0 90 -20 110 -20 N
+P 2 0 1 0 90 20 110 20 N
 P 2 0 1 0 100 -80 100 -100 N
-P 2 0 1 0 100 -20 -100 -20 N
 P 2 0 1 0 100 100 100 80 N
 X 1 1 -200 100 100 R 50 50 1 1 P
 X 2 2 200 -100 100 L 50 50 1 1 P
@@ -8145,11 +8086,11 @@ X 4 4 -200 -100 100 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# L_Core_Iron_Coupled_1423
+# L_Ferrite_Coupled_1423
 #
-DEF L_Core_Iron_Coupled_1423 L 0 10 Y N 1 F N
+DEF L_Ferrite_Coupled_1423 L 0 10 Y N 1 F N
 F0 "L" 0 175 50 H V C CNN
-F1 "L_Core_Iron_Coupled_1423" 0 -175 50 H V C CNN
+F1 "L_Ferrite_Coupled_1423" 0 -175 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -8171,11 +8112,21 @@ A 80 -80 20 1 1799 0 1 0 N 100 -80 60 -80
 A 80 80 20 -1799 -1 0 1 0 N 60 80 100 80
 C -120 -50 10 0 1 0 F
 C -120 60 10 0 1 0 F
+P 2 0 1 0 -110 -20 -90 -20 N
+P 2 0 1 0 -110 20 -90 20 N
 P 2 0 1 0 -100 -80 -100 -100 N
-P 2 0 1 0 -100 20 100 20 N
 P 2 0 1 0 -100 80 -100 100 N
+P 2 0 1 0 -70 -20 -50 -20 N
+P 2 0 1 0 -70 20 -50 20 N
+P 2 0 1 0 -30 -20 -10 -20 N
+P 2 0 1 0 -30 20 -10 20 N
+P 2 0 1 0 10 -20 30 -20 N
+P 2 0 1 0 10 20 30 20 N
+P 2 0 1 0 50 -20 70 -20 N
+P 2 0 1 0 50 20 70 20 N
+P 2 0 1 0 90 -20 110 -20 N
+P 2 0 1 0 90 20 110 20 N
 P 2 0 1 0 100 -80 100 -100 N
-P 2 0 1 0 100 -20 -100 -20 N
 P 2 0 1 0 100 100 100 80 N
 X 1 1 -200 100 100 R 50 50 1 1 P
 X 2 2 -200 -100 100 R 50 50 1 1 P
@@ -8184,11 +8135,11 @@ X 4 4 200 100 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# L_Core_Iron_Coupled_Small
+# L_Ferrite_Coupled_Small
 #
-DEF L_Core_Iron_Coupled_Small L 0 10 Y N 1 F N
+DEF L_Ferrite_Coupled_Small L 0 10 Y N 1 F N
 F0 "L" 0 125 50 H V C CNN
-F1 "L_Core_Iron_Coupled_Small" 0 -125 50 H V C CNN
+F1 "L_Ferrite_Coupled_Small" 0 -125 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -8208,8 +8159,20 @@ A 60 -50 20 1 1799 0 1 0 N 80 -50 40 -50
 A 60 50 20 -1799 -1 0 1 0 N 40 50 80 50
 C -60 -50 10 0 1 0 F
 C -60 50 10 0 1 0 F
-P 2 0 1 0 70 -10 -70 -10 N
-P 2 0 1 0 70 10 -70 10 N
+P 2 0 1 0 -65 10 -55 10 N
+P 2 0 1 0 -55 -10 -65 -10 N
+P 2 0 1 0 -45 10 -35 10 N
+P 2 0 1 0 -35 -10 -45 -10 N
+P 2 0 1 0 -25 10 -15 10 N
+P 2 0 1 0 -15 -10 -25 -10 N
+P 2 0 1 0 -5 10 5 10 N
+P 2 0 1 0 5 -10 -5 -10 N
+P 2 0 1 0 15 10 25 10 N
+P 2 0 1 0 25 -10 15 -10 N
+P 2 0 1 0 35 10 45 10 N
+P 2 0 1 0 45 -10 35 -10 N
+P 2 0 1 0 55 10 65 10 N
+P 2 0 1 0 65 -10 55 -10 N
 X 1 1 -100 50 20 R 50 50 1 1 P
 X 2 2 100 50 20 L 50 50 1 1 P
 X 3 3 -100 -50 20 R 50 50 1 1 P
@@ -8217,11 +8180,11 @@ X 4 4 100 -50 20 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# L_Core_Iron_Coupled_Small_1243
+# L_Ferrite_Coupled_Small_1243
 #
-DEF L_Core_Iron_Coupled_Small_1243 L 0 10 Y N 1 F N
+DEF L_Ferrite_Coupled_Small_1243 L 0 10 Y N 1 F N
 F0 "L" 0 125 50 H V C CNN
-F1 "L_Core_Iron_Coupled_Small_1243" 0 -125 50 H V C CNN
+F1 "L_Ferrite_Coupled_Small_1243" 0 -125 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -8241,8 +8204,20 @@ A 60 -50 20 1 1799 0 1 0 N 80 -50 40 -50
 A 60 50 20 -1799 -1 0 1 0 N 40 50 80 50
 C -60 -50 10 0 1 0 F
 C -60 50 10 0 1 0 F
-P 2 0 1 0 70 -10 -70 -10 N
-P 2 0 1 0 70 10 -70 10 N
+P 2 0 1 0 -65 10 -55 10 N
+P 2 0 1 0 -55 -10 -65 -10 N
+P 2 0 1 0 -45 10 -35 10 N
+P 2 0 1 0 -35 -10 -45 -10 N
+P 2 0 1 0 -25 10 -15 10 N
+P 2 0 1 0 -15 -10 -25 -10 N
+P 2 0 1 0 -5 10 5 10 N
+P 2 0 1 0 5 -10 -5 -10 N
+P 2 0 1 0 15 10 25 10 N
+P 2 0 1 0 25 -10 15 -10 N
+P 2 0 1 0 35 10 45 10 N
+P 2 0 1 0 45 -10 35 -10 N
+P 2 0 1 0 55 10 65 10 N
+P 2 0 1 0 65 -10 55 -10 N
 X 1 1 -100 50 20 R 50 50 1 1 P
 X 2 2 100 50 20 L 50 50 1 1 P
 X 3 3 100 -50 20 L 50 50 1 1 P
@@ -8250,11 +8225,11 @@ X 4 4 -100 -50 20 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# L_Core_Iron_Coupled_Small_1324
+# L_Ferrite_Coupled_Small_1324
 #
-DEF L_Core_Iron_Coupled_Small_1324 L 0 10 Y N 1 F N
+DEF L_Ferrite_Coupled_Small_1324 L 0 10 Y N 1 F N
 F0 "L" 0 125 50 H V C CNN
-F1 "L_Core_Iron_Coupled_Small_1324" 0 -125 50 H V C CNN
+F1 "L_Ferrite_Coupled_Small_1324" 0 -125 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -8274,8 +8249,20 @@ A 60 -50 20 1 1799 0 1 0 N 80 -50 40 -50
 A 60 50 20 -1799 -1 0 1 0 N 40 50 80 50
 C -60 -50 10 0 1 0 F
 C -60 50 10 0 1 0 F
-P 2 0 1 0 70 -10 -70 -10 N
-P 2 0 1 0 70 10 -70 10 N
+P 2 0 1 0 -65 10 -55 10 N
+P 2 0 1 0 -55 -10 -65 -10 N
+P 2 0 1 0 -45 10 -35 10 N
+P 2 0 1 0 -35 -10 -45 -10 N
+P 2 0 1 0 -25 10 -15 10 N
+P 2 0 1 0 -15 -10 -25 -10 N
+P 2 0 1 0 -5 10 5 10 N
+P 2 0 1 0 5 -10 -5 -10 N
+P 2 0 1 0 15 10 25 10 N
+P 2 0 1 0 25 -10 15 -10 N
+P 2 0 1 0 35 10 45 10 N
+P 2 0 1 0 45 -10 35 -10 N
+P 2 0 1 0 55 10 65 10 N
+P 2 0 1 0 65 -10 55 -10 N
 X 1 1 -100 50 20 R 50 50 1 1 P
 X 2 2 -100 -50 20 R 50 50 1 1 P
 X 3 3 100 50 20 L 50 50 1 1 P
@@ -8283,11 +8270,11 @@ X 4 4 100 -50 20 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# L_Core_Iron_Coupled_Small_1342
+# L_Ferrite_Coupled_Small_1342
 #
-DEF L_Core_Iron_Coupled_Small_1342 L 0 10 Y N 1 F N
+DEF L_Ferrite_Coupled_Small_1342 L 0 10 Y N 1 F N
 F0 "L" 0 125 50 H V C CNN
-F1 "L_Core_Iron_Coupled_Small_1342" 0 -125 50 H V C CNN
+F1 "L_Ferrite_Coupled_Small_1342" 0 -125 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -8307,8 +8294,20 @@ A 60 -50 20 1 1799 0 1 0 N 80 -50 40 -50
 A 60 50 20 -1799 -1 0 1 0 N 40 50 80 50
 C -60 -50 10 0 1 0 F
 C -60 50 10 0 1 0 F
-P 2 0 1 0 70 -10 -70 -10 N
-P 2 0 1 0 70 10 -70 10 N
+P 2 0 1 0 -65 10 -55 10 N
+P 2 0 1 0 -55 -10 -65 -10 N
+P 2 0 1 0 -45 10 -35 10 N
+P 2 0 1 0 -35 -10 -45 -10 N
+P 2 0 1 0 -25 10 -15 10 N
+P 2 0 1 0 -15 -10 -25 -10 N
+P 2 0 1 0 -5 10 5 10 N
+P 2 0 1 0 5 -10 -5 -10 N
+P 2 0 1 0 15 10 25 10 N
+P 2 0 1 0 25 -10 15 -10 N
+P 2 0 1 0 35 10 45 10 N
+P 2 0 1 0 45 -10 35 -10 N
+P 2 0 1 0 55 10 65 10 N
+P 2 0 1 0 65 -10 55 -10 N
 X 1 1 -100 50 20 R 50 50 1 1 P
 X 2 2 100 -50 20 L 50 50 1 1 P
 X 3 3 100 50 20 L 50 50 1 1 P
@@ -8316,11 +8315,11 @@ X 4 4 -100 -50 20 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# L_Core_Iron_Coupled_Small_1423
+# L_Ferrite_Coupled_Small_1423
 #
-DEF L_Core_Iron_Coupled_Small_1423 L 0 10 Y N 1 F N
+DEF L_Ferrite_Coupled_Small_1423 L 0 10 Y N 1 F N
 F0 "L" 0 125 50 H V C CNN
-F1 "L_Core_Iron_Coupled_Small_1423" 0 -125 50 H V C CNN
+F1 "L_Ferrite_Coupled_Small_1423" 0 -125 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -8340,8 +8339,20 @@ A 60 -50 20 1 1799 0 1 0 N 80 -50 40 -50
 A 60 50 20 -1799 -1 0 1 0 N 40 50 80 50
 C -60 -50 10 0 1 0 F
 C -60 50 10 0 1 0 F
-P 2 0 1 0 70 -10 -70 -10 N
-P 2 0 1 0 70 10 -70 10 N
+P 2 0 1 0 -65 10 -55 10 N
+P 2 0 1 0 -55 -10 -65 -10 N
+P 2 0 1 0 -45 10 -35 10 N
+P 2 0 1 0 -35 -10 -45 -10 N
+P 2 0 1 0 -25 10 -15 10 N
+P 2 0 1 0 -15 -10 -25 -10 N
+P 2 0 1 0 -5 10 5 10 N
+P 2 0 1 0 5 -10 -5 -10 N
+P 2 0 1 0 15 10 25 10 N
+P 2 0 1 0 25 -10 15 -10 N
+P 2 0 1 0 35 10 45 10 N
+P 2 0 1 0 45 -10 35 -10 N
+P 2 0 1 0 55 10 65 10 N
+P 2 0 1 0 65 -10 55 -10 N
 X 1 1 -100 50 20 R 50 50 1 1 P
 X 2 2 -100 -50 20 R 50 50 1 1 P
 X 3 3 100 -50 20 L 50 50 1 1 P
@@ -8349,11 +8360,11 @@ X 4 4 100 50 20 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# L_Core_Iron_Small
+# L_Ferrite_Small
 #
-DEF L_Core_Iron_Small L 0 10 N N 1 F N
+DEF L_Ferrite_Small L 0 10 N N 1 F N
 F0 "L" 50 40 50 H V L CNN
-F1 "L_Core_Iron_Small" 50 -50 50 H V L CNN
+F1 "L_Ferrite_Small" 50 -50 50 H V L CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -8367,18 +8378,57 @@ A 0 -60 20 -899 899 0 1 0 N 0 -80 0 -40
 A 0 -20 20 -899 899 0 1 0 N 0 -40 0 0
 A 0 20 20 -899 899 0 1 0 N 0 0 0 40
 A 0 60 20 -899 899 0 1 0 N 0 40 0 80
-P 2 0 1 0 30 80 30 -80 N
-P 2 0 1 0 40 -80 40 80 N
+P 2 0 1 0 30 -75 30 -65 N
+P 2 0 1 0 30 -55 30 -45 N
+P 2 0 1 0 30 -35 30 -25 N
+P 2 0 1 0 30 -15 30 -5 N
+P 2 0 1 0 30 5 30 15 N
+P 2 0 1 0 30 25 30 35 N
+P 2 0 1 0 30 45 30 55 N
+P 2 0 1 0 30 65 30 75 N
+P 2 0 1 0 40 -65 40 -75 N
+P 2 0 1 0 40 -45 40 -55 N
+P 2 0 1 0 40 -25 40 -35 N
+P 2 0 1 0 40 -5 40 -15 N
+P 2 0 1 0 40 15 40 5 N
+P 2 0 1 0 40 35 40 25 N
+P 2 0 1 0 40 55 40 45 N
+P 2 0 1 0 40 75 40 65 N
 X ~ 1 0 100 20 D 50 50 1 1 P
 X ~ 2 0 -100 20 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# L_Coupled
+# L_Iron
 #
-DEF L_Coupled L 0 10 Y N 1 F N
+DEF L_Iron L 0 40 N N 1 F N
+F0 "L" -50 0 50 V V C CNN
+F1 "L_Iron" 110 0 50 V V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ Choke_*
+ *Coil*
+ Inductor_*
+ L_*
+$ENDFPLIST
+DRAW
+A 0 -75 25 -899 899 0 1 0 N 0 -100 0 -50
+A 0 -25 25 -899 899 0 1 0 N 0 -50 0 0
+A 0 25 25 -899 899 0 1 0 N 0 0 0 50
+A 0 75 25 -899 899 0 1 0 N 0 50 0 100
+P 2 0 1 0 40 100 40 -100 N
+P 2 0 1 0 60 -100 60 100 N
+X 1 1 0 150 50 D 50 50 1 1 P
+X 2 2 0 -150 50 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# L_Iron_Coupled
+#
+DEF L_Iron_Coupled L 0 10 Y N 1 F N
 F0 "L" 0 175 50 H V C CNN
-F1 "L_Coupled" 0 -175 50 H V C CNN
+F1 "L_Iron_Coupled" 0 -175 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -8401,8 +8451,10 @@ A 80 80 20 -1799 -1 0 1 0 N 60 80 100 80
 C -120 -50 10 0 1 0 F
 C -120 60 10 0 1 0 F
 P 2 0 1 0 -100 -80 -100 -100 N
+P 2 0 1 0 -100 20 100 20 N
 P 2 0 1 0 -100 80 -100 100 N
 P 2 0 1 0 100 -80 100 -100 N
+P 2 0 1 0 100 -20 -100 -20 N
 P 2 0 1 0 100 100 100 80 N
 X 1 1 -200 100 100 R 50 50 1 1 P
 X 2 2 200 100 100 L 50 50 1 1 P
@@ -8411,11 +8463,11 @@ X 4 4 200 -100 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# L_Coupled_1243
+# L_Iron_Coupled_1243
 #
-DEF L_Coupled_1243 L 0 10 Y N 1 F N
+DEF L_Iron_Coupled_1243 L 0 10 Y N 1 F N
 F0 "L" 0 175 50 H V C CNN
-F1 "L_Coupled_1243" 0 -175 50 H V C CNN
+F1 "L_Iron_Coupled_1243" 0 -175 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -8438,8 +8490,10 @@ A 80 80 20 -1799 -1 0 1 0 N 60 80 100 80
 C -120 -50 10 0 1 0 F
 C -120 60 10 0 1 0 F
 P 2 0 1 0 -100 -80 -100 -100 N
+P 2 0 1 0 -100 20 100 20 N
 P 2 0 1 0 -100 80 -100 100 N
 P 2 0 1 0 100 -80 100 -100 N
+P 2 0 1 0 100 -20 -100 -20 N
 P 2 0 1 0 100 100 100 80 N
 X 1 1 -200 100 100 R 50 50 1 1 P
 X 2 2 200 100 100 L 50 50 1 1 P
@@ -8448,11 +8502,11 @@ X 4 4 -200 -100 100 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# L_Coupled_1324
+# L_Iron_Coupled_1324
 #
-DEF L_Coupled_1324 L 0 10 Y N 1 F N
+DEF L_Iron_Coupled_1324 L 0 10 Y N 1 F N
 F0 "L" 0 175 50 H V C CNN
-F1 "L_Coupled_1324" 0 -175 50 H V C CNN
+F1 "L_Iron_Coupled_1324" 0 -175 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -8475,8 +8529,10 @@ A 80 80 20 -1799 -1 0 1 0 N 60 80 100 80
 C -120 -50 10 0 1 0 F
 C -120 60 10 0 1 0 F
 P 2 0 1 0 -100 -80 -100 -100 N
+P 2 0 1 0 -100 20 100 20 N
 P 2 0 1 0 -100 80 -100 100 N
 P 2 0 1 0 100 -80 100 -100 N
+P 2 0 1 0 100 -20 -100 -20 N
 P 2 0 1 0 100 100 100 80 N
 X 1 1 -200 100 100 R 50 50 1 1 P
 X 2 2 -200 -100 100 R 50 50 1 1 P
@@ -8485,11 +8541,11 @@ X 4 4 200 -100 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# L_Coupled_1342
+# L_Iron_Coupled_1342
 #
-DEF L_Coupled_1342 L 0 10 Y N 1 F N
+DEF L_Iron_Coupled_1342 L 0 10 Y N 1 F N
 F0 "L" 0 175 50 H V C CNN
-F1 "L_Coupled_1342" 0 -175 50 H V C CNN
+F1 "L_Iron_Coupled_1342" 0 -175 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -8512,8 +8568,10 @@ A 80 80 20 -1799 -1 0 1 0 N 60 80 100 80
 C -120 -50 10 0 1 0 F
 C -120 60 10 0 1 0 F
 P 2 0 1 0 -100 -80 -100 -100 N
+P 2 0 1 0 -100 20 100 20 N
 P 2 0 1 0 -100 80 -100 100 N
 P 2 0 1 0 100 -80 100 -100 N
+P 2 0 1 0 100 -20 -100 -20 N
 P 2 0 1 0 100 100 100 80 N
 X 1 1 -200 100 100 R 50 50 1 1 P
 X 2 2 200 -100 100 L 50 50 1 1 P
@@ -8522,11 +8580,11 @@ X 4 4 -200 -100 100 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# L_Coupled_1423
+# L_Iron_Coupled_1423
 #
-DEF L_Coupled_1423 L 0 10 Y N 1 F N
+DEF L_Iron_Coupled_1423 L 0 10 Y N 1 F N
 F0 "L" 0 175 50 H V C CNN
-F1 "L_Coupled_1423" 0 -175 50 H V C CNN
+F1 "L_Iron_Coupled_1423" 0 -175 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -8549,8 +8607,10 @@ A 80 80 20 -1799 -1 0 1 0 N 60 80 100 80
 C -120 -50 10 0 1 0 F
 C -120 60 10 0 1 0 F
 P 2 0 1 0 -100 -80 -100 -100 N
+P 2 0 1 0 -100 20 100 20 N
 P 2 0 1 0 -100 80 -100 100 N
 P 2 0 1 0 100 -80 100 -100 N
+P 2 0 1 0 100 -20 -100 -20 N
 P 2 0 1 0 100 100 100 80 N
 X 1 1 -200 100 100 R 50 50 1 1 P
 X 2 2 -200 -100 100 R 50 50 1 1 P
@@ -8559,11 +8619,11 @@ X 4 4 200 100 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# L_Coupled_Small
+# L_Iron_Coupled_Small
 #
-DEF L_Coupled_Small L 0 10 Y N 1 F N
+DEF L_Iron_Coupled_Small L 0 10 Y N 1 F N
 F0 "L" 0 125 50 H V C CNN
-F1 "L_Coupled_Small" 0 -125 50 H V C CNN
+F1 "L_Iron_Coupled_Small" 0 -125 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -8583,6 +8643,8 @@ A 60 -50 20 1 1799 0 1 0 N 80 -50 40 -50
 A 60 50 20 -1799 -1 0 1 0 N 40 50 80 50
 C -60 -50 10 0 1 0 F
 C -60 50 10 0 1 0 F
+P 2 0 1 0 70 -10 -70 -10 N
+P 2 0 1 0 70 10 -70 10 N
 X 1 1 -100 50 20 R 50 50 1 1 P
 X 2 2 100 50 20 L 50 50 1 1 P
 X 3 3 -100 -50 20 R 50 50 1 1 P
@@ -8590,11 +8652,11 @@ X 4 4 100 -50 20 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# L_Coupled_Small_1243
+# L_Iron_Coupled_Small_1243
 #
-DEF L_Coupled_Small_1243 L 0 10 Y N 1 F N
+DEF L_Iron_Coupled_Small_1243 L 0 10 Y N 1 F N
 F0 "L" 0 125 50 H V C CNN
-F1 "L_Coupled_Small_1243" 0 -125 50 H V C CNN
+F1 "L_Iron_Coupled_Small_1243" 0 -125 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -8614,6 +8676,8 @@ A 60 -50 20 1 1799 0 1 0 N 80 -50 40 -50
 A 60 50 20 -1799 -1 0 1 0 N 40 50 80 50
 C -60 -50 10 0 1 0 F
 C -60 50 10 0 1 0 F
+P 2 0 1 0 70 -10 -70 -10 N
+P 2 0 1 0 70 10 -70 10 N
 X 1 1 -100 50 20 R 50 50 1 1 P
 X 2 2 100 50 20 L 50 50 1 1 P
 X 3 3 100 -50 20 L 50 50 1 1 P
@@ -8621,11 +8685,11 @@ X 4 4 -100 -50 20 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# L_Coupled_Small_1324
+# L_Iron_Coupled_Small_1324
 #
-DEF L_Coupled_Small_1324 L 0 10 Y N 1 F N
-F0 "L" 0 175 50 H V C CNN
-F1 "L_Coupled_Small_1324" 0 -175 50 H V C CNN
+DEF L_Iron_Coupled_Small_1324 L 0 10 Y N 1 F N
+F0 "L" 0 125 50 H V C CNN
+F1 "L_Iron_Coupled_Small_1324" 0 -125 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -8635,34 +8699,30 @@ $FPLIST
  L_*
 $ENDFPLIST
 DRAW
-A -80 -80 20 1 1799 0 1 0 N -60 -80 -100 -80
-A -80 80 20 -1799 -1 0 1 0 N -100 80 -60 80
-A -40 -80 20 1 1799 0 1 0 N -20 -80 -60 -80
-A -40 80 20 -1799 -1 0 1 0 N -60 80 -20 80
-A 0 -80 20 1 1799 0 1 0 N 20 -80 -20 -80
-A 0 80 20 -1799 -1 0 1 0 N -20 80 20 80
-A 40 -80 20 1 1799 0 1 0 N 60 -80 20 -80
-A 40 80 20 -1799 -1 0 1 0 N 20 80 60 80
-A 80 -80 20 1 1799 0 1 0 N 100 -80 60 -80
-A 80 80 20 -1799 -1 0 1 0 N 60 80 100 80
-C -120 -50 10 0 1 0 F
-C -120 60 10 0 1 0 F
-P 2 0 1 0 -100 -80 -100 -100 N
-P 2 0 1 0 -100 80 -100 100 N
-P 2 0 1 0 100 -80 100 -100 N
-P 2 0 1 0 100 100 100 80 N
-X 1 1 -200 100 100 R 50 50 1 1 P
-X 2 2 -200 -100 100 R 50 50 1 1 P
-X 3 3 200 100 100 L 50 50 1 1 P
-X 4 4 200 -100 100 L 50 50 1 1 P
+A -60 -50 20 1 1799 0 1 0 N -40 -50 -80 -50
+A -60 50 20 -1799 -1 0 1 0 N -80 50 -40 50
+A -20 -50 20 1 1799 0 1 0 N 0 -50 -40 -50
+A -20 50 20 -1799 -1 0 1 0 N -40 50 0 50
+A 20 -50 20 1 1799 0 1 0 N 40 -50 0 -50
+A 20 50 20 -1799 -1 0 1 0 N 0 50 40 50
+A 60 -50 20 1 1799 0 1 0 N 80 -50 40 -50
+A 60 50 20 -1799 -1 0 1 0 N 40 50 80 50
+C -60 -50 10 0 1 0 F
+C -60 50 10 0 1 0 F
+P 2 0 1 0 70 -10 -70 -10 N
+P 2 0 1 0 70 10 -70 10 N
+X 1 1 -100 50 20 R 50 50 1 1 P
+X 2 2 -100 -50 20 R 50 50 1 1 P
+X 3 3 100 50 20 L 50 50 1 1 P
+X 4 4 100 -50 20 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# L_Coupled_Small_1342
+# L_Iron_Coupled_Small_1342
 #
-DEF L_Coupled_Small_1342 L 0 10 Y N 1 F N
+DEF L_Iron_Coupled_Small_1342 L 0 10 Y N 1 F N
 F0 "L" 0 125 50 H V C CNN
-F1 "L_Coupled_Small_1342" 0 -125 50 H V C CNN
+F1 "L_Iron_Coupled_Small_1342" 0 -125 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -8682,6 +8742,8 @@ A 60 -50 20 1 1799 0 1 0 N 80 -50 40 -50
 A 60 50 20 -1799 -1 0 1 0 N 40 50 80 50
 C -60 -50 10 0 1 0 F
 C -60 50 10 0 1 0 F
+P 2 0 1 0 70 -10 -70 -10 N
+P 2 0 1 0 70 10 -70 10 N
 X 1 1 -100 50 20 R 50 50 1 1 P
 X 2 2 100 -50 20 L 50 50 1 1 P
 X 3 3 100 50 20 L 50 50 1 1 P
@@ -8689,11 +8751,11 @@ X 4 4 -100 -50 20 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# L_Coupled_Small_1423
+# L_Iron_Coupled_Small_1423
 #
-DEF L_Coupled_Small_1423 L 0 10 Y N 1 F N
+DEF L_Iron_Coupled_Small_1423 L 0 10 Y N 1 F N
 F0 "L" 0 125 50 H V C CNN
-F1 "L_Coupled_Small_1423" 0 -125 50 H V C CNN
+F1 "L_Iron_Coupled_Small_1423" 0 -125 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -8713,6 +8775,8 @@ A 60 -50 20 1 1799 0 1 0 N 80 -50 40 -50
 A 60 50 20 -1799 -1 0 1 0 N 40 50 80 50
 C -60 -50 10 0 1 0 F
 C -60 50 10 0 1 0 F
+P 2 0 1 0 70 -10 -70 -10 N
+P 2 0 1 0 70 10 -70 10 N
 X 1 1 -100 50 20 R 50 50 1 1 P
 X 2 2 -100 -50 20 R 50 50 1 1 P
 X 3 3 100 -50 20 L 50 50 1 1 P
@@ -8720,6 +8784,31 @@ X 4 4 100 50 20 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
+# L_Iron_Small
+#
+DEF L_Iron_Small L 0 10 N N 1 F N
+F0 "L" 50 40 50 H V L CNN
+F1 "L_Iron_Small" 50 -50 50 H V L CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ Choke_*
+ *Coil*
+ Inductor_*
+ L_*
+$ENDFPLIST
+DRAW
+A 0 -60 20 -899 899 0 1 0 N 0 -80 0 -40
+A 0 -20 20 -899 899 0 1 0 N 0 -40 0 0
+A 0 20 20 -899 899 0 1 0 N 0 0 0 40
+A 0 60 20 -899 899 0 1 0 N 0 40 0 80
+P 2 0 1 0 30 80 30 -80 N
+P 2 0 1 0 40 -80 40 80 N
+X ~ 1 0 100 20 D 50 50 1 1 P
+X ~ 2 0 -100 20 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
 # L_Small
 #
 DEF L_Small L 0 10 N N 1 F N
@@ -8743,6 +8832,30 @@ X ~ 2 0 -100 20 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
+# L_Trim
+#
+DEF L_Trim L 0 40 N N 1 F N
+F0 "L" -75 0 50 V V C CNN
+F1 "L_Trim" 125 0 50 V V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ Inductor_*
+ L_*
+$ENDFPLIST
+DRAW
+A 0 -75 25 -899 899 0 1 0 N 0 -100 0 -50
+A 0 -25 25 -899 899 0 1 0 N 0 -50 0 0
+A 0 25 25 -899 899 0 1 0 N 0 0 0 50
+A 0 75 25 -899 899 0 1 0 N 0 50 0 100
+P 2 0 1 0 -50 -75 75 100 N
+P 2 0 1 0 75 100 40 85 N
+P 2 0 1 0 75 100 70 65 N
+X 1 1 0 150 50 D 50 50 1 1 P
+X 2 2 0 -150 50 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
 # Lamp
 #
 DEF Lamp LA 0 1 N N 1 F N
@@ -8767,247 +8880,44 @@ F1 "Lamp_Flash" 25 -150 50 H V L CNN
 F2 "" 0 100 50 V I C CNN
 F3 "" 0 100 50 V I C CNN
 DRAW
-A 0 0 117 310 -310 0 0 10 N 100 60 100 -60
-C 0 0 100 0 1 0 N
-C 40 -50 10 0 1 0 F
-S -30 -70 30 -80 0 0 10 F
-S -30 80 30 70 0 0 10 F
-P 2 0 0 10 120 0 150 0 N
-P 2 0 1 0 0 -100 0 -80 N
-P 2 0 1 0 0 100 0 80 N
-X ~ 1 0 -200 100 U 50 50 1 1 P
-X ~ 2 200 0 50 L 50 50 1 1 P
-X ~ 3 0 200 100 D 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# Lamp_Neon
-#
-DEF Lamp_Neon NE 0 1 Y N 1 F N
-F0 "NE" 25 150 50 H V L CNN
-F1 "Lamp_Neon" 25 -150 50 H V L CNN
-F2 "" 0 100 50 V I C CNN
-F3 "" 0 100 50 V I C CNN
-DRAW
-C 0 0 100 0 1 0 N
-C 40 -50 10 0 1 0 F
-S -60 -20 60 -30 0 1 0 F
-S -60 30 60 20 0 1 0 F
-P 2 0 1 0 0 -100 0 -30 N
-P 2 0 1 0 0 30 0 100 N
-X ~ 1 0 -200 100 U 50 50 1 1 P
-X ~ 2 0 200 100 D 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# Laserdiode_1A3C
-#
-DEF Laserdiode_1A3C LD 0 40 Y N 1 F N
-F0 "LD" -50 175 50 H V C CNN
-F1 "Laserdiode_1A3C" -50 -100 50 H V C CNN
-F2 "" -100 -25 50 H I C CNN
-F3 "" 30 -200 50 H I C CNN
-$FPLIST
- *LaserDiode*
-$ENDFPLIST
-DRAW
-P 2 0 1 0 -160 50 -100 110 N
-P 2 0 1 0 -160 70 -100 90 N
-P 2 0 1 0 -160 90 -100 70 N
-P 2 0 1 0 -160 110 -100 50 N
-P 2 0 1 0 -140 110 -120 50 N
-P 2 0 1 0 -130 80 -130 40 N
-P 2 0 1 0 -130 80 -130 120 N
-P 2 0 1 0 -120 110 -140 50 N
-P 2 0 1 0 -70 80 -170 80 N
-P 2 0 1 8 -60 50 -60 -50 N
-P 2 0 1 0 50 120 30 120 N
-P 2 0 1 0 100 0 -200 0 N
-P 3 0 1 0 -10 60 50 120 50 100 N
-P 4 0 1 8 40 50 40 -50 -60 0 40 50 N
-P 5 0 1 0 -60 60 0 120 0 100 0 120 -20 120 N
-X A 1 200 0 100 L 50 50 1 1 P
-X K 3 -300 0 100 R 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# Laserdiode_1C2A
-#
-DEF Laserdiode_1C2A LD 0 40 Y N 1 F N
-F0 "LD" -50 175 50 H V C CNN
-F1 "Laserdiode_1C2A" -50 -100 50 H V C CNN
-F2 "" -100 -25 50 H I C CNN
-F3 "" 30 -200 50 H I C CNN
-$FPLIST
- *LaserDiode*
-$ENDFPLIST
-DRAW
-P 2 0 1 0 -160 50 -100 110 N
-P 2 0 1 0 -160 70 -100 90 N
-P 2 0 1 0 -160 90 -100 70 N
-P 2 0 1 0 -160 110 -100 50 N
-P 2 0 1 0 -140 110 -120 50 N
-P 2 0 1 0 -130 80 -130 40 N
-P 2 0 1 0 -130 80 -130 120 N
-P 2 0 1 0 -120 110 -140 50 N
-P 2 0 1 0 -70 80 -170 80 N
-P 2 0 1 8 -60 50 -60 -50 N
-P 2 0 1 0 50 120 30 120 N
-P 2 0 1 0 100 0 -200 0 N
-P 3 0 1 0 -10 60 50 120 50 100 N
-P 4 0 1 8 40 50 40 -50 -60 0 40 50 N
-P 5 0 1 0 -60 60 0 120 0 100 0 120 -20 120 N
-X K 1 -300 0 100 R 50 50 1 1 P
-X A 2 200 0 100 L 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# Laserdiode_M_TYPE
-#
-DEF Laserdiode_M_TYPE LD 0 20 Y N 1 F N
-F0 "LD" 40 280 50 H V C CNN
-F1 "Laserdiode_M_TYPE" 40 -220 50 H V C CNN
-F2 "" 40 75 50 H I C CNN
-F3 "" 90 -100 50 H I C CNN
-$FPLIST
- *LaserDiode*
-$ENDFPLIST
-DRAW
-A -20 -63 7 -899 899 0 1 0 N -20 -70 -20 -55
-A 0 -70 15 -899 899 0 1 0 N 0 -85 0 -55
-A 0 65 15 -899 899 0 1 0 N 0 50 0 80
-C -60 0 10 0 1 0 F
-S 170 240 -90 -170 0 1 10 f
-P 2 0 1 0 -100 0 -60 0 N
-P 2 0 1 0 -60 150 0 210 N
-P 2 0 1 0 -60 170 0 190 N
-P 2 0 1 0 -60 190 0 170 N
-P 2 0 1 0 -60 210 0 150 N
-P 2 0 1 0 -40 210 -20 150 N
-P 2 0 1 0 -30 180 -30 140 N
-P 2 0 1 0 -30 180 -30 220 N
-P 2 0 1 0 -25 -55 -25 -85 N
-P 2 0 1 0 -20 210 -40 150 N
-P 2 0 1 0 0 -55 0 -85 N
-P 2 0 1 0 0 80 0 50 N
-P 2 0 1 0 30 180 -70 180 N
-P 2 0 1 8 40 -50 40 -150 N
-P 2 0 1 0 40 -30 60 -30 N
-P 2 0 1 8 40 150 40 50 N
-P 2 0 1 0 150 220 130 220 N
-P 3 0 1 0 -25 80 -25 50 -10 50 N
-P 3 0 1 0 90 160 150 220 150 200 N
-P 3 0 1 0 100 30 40 -30 40 -10 N
-P 4 0 1 8 140 -50 140 -150 40 -100 140 -50 N
-P 4 0 1 8 140 150 140 50 40 100 140 150 N
-P 4 0 1 0 200 100 -60 100 -60 -100 200 -100 N
-P 5 0 1 0 40 160 100 220 100 200 100 220 80 220 N
-P 5 0 1 0 150 30 90 -30 90 -10 90 -30 110 -30 N
-X ~ 1 300 100 100 L 50 50 1 1 P
-X ~ 2 -200 0 100 R 50 50 1 1 P
-X ~ 3 300 -100 100 L 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# Laserdiode_N_TYPE
-#
-DEF Laserdiode_N_TYPE LD 0 20 Y N 1 F N
-F0 "LD" 40 280 50 H V C CNN
-F1 "Laserdiode_N_TYPE" 40 -220 50 H V C CNN
-F2 "" 0 75 50 H I C CNN
-F3 "" 50 -100 50 H I C CNN
-$FPLIST
- *LaserDiode*
-$ENDFPLIST
-DRAW
-A -20 -63 7 -899 899 0 1 0 N -20 -70 -20 -55
-A 0 -70 15 -899 899 0 1 0 N 0 -85 0 -55
-A 0 65 15 -899 899 0 1 0 N 0 50 0 80
-C -60 0 10 0 1 0 F
-S 170 240 -90 -170 0 1 10 f
-P 2 0 1 0 -100 0 -60 0 N
-P 2 0 1 0 -60 150 0 210 N
-P 2 0 1 0 -60 170 0 190 N
-P 2 0 1 0 -60 190 0 170 N
-P 2 0 1 0 -60 210 0 150 N
-P 2 0 1 0 -40 210 -20 150 N
-P 2 0 1 0 -30 180 -30 140 N
-P 2 0 1 0 -30 180 -30 220 N
-P 2 0 1 0 -25 -55 -25 -85 N
-P 2 0 1 0 -20 210 -40 150 N
-P 2 0 1 0 0 -55 0 -85 N
-P 2 0 1 0 0 80 0 50 N
-P 2 0 1 0 30 180 -70 180 N
-P 2 0 1 0 30 220 50 220 N
-P 2 0 1 8 40 -50 40 -150 N
-P 2 0 1 0 40 -30 60 -30 N
-P 2 0 1 8 140 150 140 50 N
-P 3 0 1 0 -25 80 -25 50 -10 50 N
-P 3 0 1 0 90 160 30 220 30 200 N
-P 3 0 1 0 100 30 40 -30 40 -10 N
-P 4 0 1 8 140 -50 140 -150 40 -100 140 -50 N
-P 4 0 1 0 200 100 -60 100 -60 -100 200 -100 N
-P 5 0 1 0 140 160 80 220 80 200 80 220 100 220 N
-P 5 0 1 0 150 30 90 -30 90 -10 90 -30 110 -30 N
-P 4 1 1 8 40 150 40 50 140 100 40 150 N
-X ~ 1 300 100 100 L 50 50 1 1 P
-X ~ 2 -200 0 100 R 50 50 1 1 P
-X ~ 3 300 -100 100 L 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# Laserdiode_P_TYPE
-#
-DEF Laserdiode_P_TYPE LD 0 20 Y N 1 F N
-F0 "LD" 40 280 50 H V C CNN
-F1 "Laserdiode_P_TYPE" 40 -220 50 H V C CNN
-F2 "" 0 75 50 H I C CNN
-F3 "" 130 -100 50 H I C CNN
-$FPLIST
- *LaserDiode*
-$ENDFPLIST
-DRAW
-A -20 -63 7 -899 899 0 1 0 N -20 -70 -20 -55
-A 0 -70 15 -899 899 0 1 0 N 0 -85 0 -55
-A 0 65 15 -899 899 0 1 0 N 0 50 0 80
-C -60 0 10 0 1 0 F
-S 170 240 -90 -170 0 1 10 f
-P 2 0 1 0 -100 0 -60 0 N
-P 2 0 1 0 -60 150 0 210 N
-P 2 0 1 0 -60 170 0 190 N
-P 2 0 1 0 -60 190 0 170 N
-P 2 0 1 0 -60 210 0 150 N
-P 2 0 1 0 -40 210 -20 150 N
-P 2 0 1 0 -30 180 -30 140 N
-P 2 0 1 0 -30 180 -30 220 N
-P 2 0 1 0 -25 -55 -25 -85 N
-P 2 0 1 0 -20 210 -40 150 N
-P 2 0 1 0 0 -55 0 -85 N
-P 2 0 1 0 0 80 0 50 N
-P 2 0 1 0 30 180 -70 180 N
-P 2 0 1 8 40 150 40 50 N
-P 2 0 1 8 140 -50 140 -150 N
-P 2 0 1 0 140 -30 120 -30 N
-P 2 0 1 0 150 220 130 220 N
-P 3 0 1 0 -25 80 -25 50 -10 50 N
-P 3 0 1 0 80 30 140 -30 140 -10 N
-P 3 0 1 0 90 160 150 220 150 200 N
-P 4 0 1 8 40 -50 40 -150 140 -100 40 -50 N
-P 4 0 1 8 140 150 140 50 40 100 140 150 N
-P 4 0 1 0 200 100 -60 100 -60 -100 200 -100 N
-P 5 0 1 0 30 30 90 -30 90 -10 90 -30 70 -30 N
-P 5 0 1 0 40 160 100 220 100 200 100 220 80 220 N
-X ~ 1 300 100 100 L 50 50 1 1 P
-X ~ 2 -200 0 100 R 50 50 1 1 P
-X ~ 3 300 -100 100 L 50 50 1 1 P
+A 0 0 117 310 -310 0 0 10 N 100 60 100 -60
+C 0 0 100 0 1 0 N
+C 40 -50 10 0 1 0 F
+S -30 -70 30 -80 0 0 10 F
+S -30 80 30 70 0 0 10 F
+P 2 0 0 10 120 0 150 0 N
+P 2 0 1 0 0 -100 0 -80 N
+P 2 0 1 0 0 100 0 80 N
+X ~ 1 0 -200 100 U 50 50 1 1 P
+X ~ 2 200 0 50 L 50 50 1 1 P
+X ~ 3 0 200 100 D 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Lamp_Neon
+#
+DEF Lamp_Neon NE 0 1 Y N 1 F N
+F0 "NE" 25 150 50 H V L CNN
+F1 "Lamp_Neon" 25 -150 50 H V L CNN
+F2 "" 0 100 50 V I C CNN
+F3 "" 0 100 50 V I C CNN
+DRAW
+C 0 0 100 0 1 0 N
+C 40 -50 10 0 1 0 F
+S -60 -20 60 -30 0 1 0 F
+S -60 30 60 20 0 1 0 F
+P 2 0 1 0 0 -100 0 -30 N
+P 2 0 1 0 0 30 0 100 N
+X ~ 1 0 -200 100 U 50 50 1 1 P
+X ~ 2 0 200 100 D 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# MEMRISTOR
+# Memristor
 #
-DEF MEMRISTOR MR 0 0 N Y 1 F N
+DEF Memristor MR 0 0 N Y 1 F N
 F0 "MR" 100 0 50 V V C CNN
-F1 "MEMRISTOR" -100 0 50 V V C CNN
+F1 "Memristor" -100 0 50 V V C CNN
 F2 "" -70 0 50 V I C CNN
 F3 "" 0 0 50 H I C CNN
 DRAW
@@ -9078,11 +8988,11 @@ X + 2 0 200 100 D 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Net-Tie_2
+# NetTie_2
 #
-DEF Net-Tie_2 NT 0 0 N N 1 F N
+DEF NetTie_2 NT 0 0 N N 1 F N
 F0 "NT" 0 50 50 H V C CNN
-F1 "Net-Tie_2" 0 -50 50 H V C CNN
+F1 "NetTie_2" 0 -50 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -9095,11 +9005,11 @@ X 2 2 100 0 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Net-Tie_3
+# NetTie_3
 #
-DEF Net-Tie_3 NT 0 0 N N 1 F N
+DEF NetTie_3 NT 0 0 N N 1 F N
 F0 "NT" 0 50 50 H V C CNN
-F1 "Net-Tie_3" 0 -150 50 H V C CNN
+F1 "NetTie_3" 0 -150 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -9114,11 +9024,11 @@ X 3 3 -100 -100 100 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Net-Tie_3_Tee
+# NetTie_3_Tee
 #
-DEF Net-Tie_3_Tee NT 0 0 N N 1 F N
+DEF NetTie_3_Tee NT 0 0 N N 1 F N
 F0 "NT" 0 125 50 H V C CNN
-F1 "Net-Tie_3_Tee" 0 50 50 H V C CNN
+F1 "NetTie_3_Tee" 0 50 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -9135,11 +9045,11 @@ X 3 3 0 -100 100 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Net-Tie_4
+# NetTie_4
 #
-DEF Net-Tie_4 NT 0 0 N N 1 F N
+DEF NetTie_4 NT 0 0 N N 1 F N
 F0 "NT" 0 50 50 H V C CNN
-F1 "Net-Tie_4" 0 -150 50 H V C CNN
+F1 "NetTie_4" 0 -150 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -9156,11 +9066,11 @@ X 4 4 100 -100 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Net-Tie_4_Cross
+# NetTie_4_Cross
 #
-DEF Net-Tie_4_Cross NT 0 0 N N 1 F N
+DEF NetTie_4_Cross NT 0 0 N N 1 F N
 F0 "NT" 25 50 50 H V L CNN
-F1 "Net-Tie_4_Cross" 25 -50 50 H V L CNN
+F1 "NetTie_4_Cross" 25 -50 50 H V L CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -9194,11 +9104,11 @@ X + 2 0 200 100 D 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Opamp_Dual_Generic
+# Opamp_Dual
 #
-DEF Opamp_Dual_Generic U 0 20 Y Y 3 L N
+DEF Opamp_Dual U 0 20 Y Y 3 L N
 F0 "U" 0 200 50 H V L CNN
-F1 "Opamp_Dual_Generic" 0 -200 50 H V L CNN
+F1 "Opamp_Dual" 0 -200 50 H V L CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -9224,11 +9134,11 @@ X V+ 8 -100 300 150 D 50 50 3 1 W
 ENDDRAW
 ENDDEF
 #
-# Opamp_Quad_Generic
+# Opamp_Quad
 #
-DEF Opamp_Quad_Generic U 0 20 Y Y 5 L N
+DEF Opamp_Quad U 0 20 Y Y 5 L N
 F0 "U" 0 200 50 H V L CNN
-F1 "Opamp_Quad_Generic" 0 -200 50 H V L CNN
+F1 "Opamp_Quad" 0 -200 50 H V L CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -9284,11 +9194,11 @@ X + 2 0 200 100 D 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Peltier_Element
+# PeltierElement
 #
-DEF Peltier_Element PE 0 0 N Y 1 F N
+DEF PeltierElement PE 0 0 N Y 1 F N
 F0 "PE" 0 125 50 H V C CNN
-F1 "Peltier_Element" 0 -50 50 H V C CNN
+F1 "PeltierElement" 0 -50 50 H V C CNN
 F2 "" 0 -70 50 H I C CNN
 F3 "" 0 25 50 V I C CNN
 DRAW
@@ -9345,11 +9255,11 @@ X ~ 2 0 -100 25 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Q_DUAL_NMOS_G1S2G2D2S1D1
+# Q_Dual_NMOS_G1S2G2D2S1D1
 #
-DEF Q_DUAL_NMOS_G1S2G2D2S1D1 Q 0 0 Y N 2 F N
+DEF Q_Dual_NMOS_G1S2G2D2S1D1 Q 0 0 Y N 2 F N
 F0 "Q" 250 50 50 H V C CNN
-F1 "Q_DUAL_NMOS_G1S2G2D2S1D1" 750 -50 50 H V C CNN
+F1 "Q_Dual_NMOS_G1S2G2D2S1D1" 750 -50 50 H V C CNN
 F2 "" 200 0 50 H I C CNN
 F3 "" 200 0 50 H I C CNN
 $FPLIST
@@ -9382,11 +9292,11 @@ X D 4 100 200 100 D 50 50 2 1 P
 ENDDRAW
 ENDDEF
 #
-# Q_DUAL_NMOS_S1G1D2S2G2D1
+# Q_Dual_NMOS_S1G1D2S2G2D1
 #
-DEF Q_DUAL_NMOS_S1G1D2S2G2D1 Q 0 0 Y N 2 F N
+DEF Q_Dual_NMOS_S1G1D2S2G2D1 Q 0 0 Y N 2 F N
 F0 "Q" 250 50 50 H V C CNN
-F1 "Q_DUAL_NMOS_S1G1D2S2G2D1" 750 -50 50 H V C CNN
+F1 "Q_Dual_NMOS_S1G1D2S2G2D1" 750 -50 50 H V C CNN
 F2 "" 200 0 50 H I C CNN
 F3 "" 200 0 50 H I C CNN
 $FPLIST
@@ -9419,11 +9329,11 @@ X G 5 -200 0 100 R 50 50 2 1 I
 ENDDRAW
 ENDDEF
 #
-# Q_DUAL_NMOS_S1G1S2G2D2D2D1D1
+# Q_Dual_NMOS_S1G1S2G2D2D2D1D1
 #
-DEF Q_DUAL_NMOS_S1G1S2G2D2D2D1D1 Q 0 0 Y N 2 F N
+DEF Q_Dual_NMOS_S1G1S2G2D2D2D1D1 Q 0 0 Y N 2 F N
 F0 "Q" 200 50 50 H V L CNN
-F1 "Q_DUAL_NMOS_S1G1S2G2D2D2D1D1" 200 -50 50 H V L CNN
+F1 "Q_Dual_NMOS_S1G1S2G2D2D2D1D1" 200 -50 50 H V L CNN
 F2 "" 200 0 50 H I C CNN
 F3 "" 200 0 50 H I C CNN
 $FPLIST
@@ -9458,11 +9368,11 @@ X D 6 200 200 100 D 50 50 2 1 P
 ENDDRAW
 ENDDEF
 #
-# Q_DUAL_NPN_C2C1E1E2
+# Q_Dual_NPN_C2C1E1E2
 #
-DEF Q_DUAL_NPN_C2C1E1E2 Q 0 0 Y Y 1 F N
+DEF Q_Dual_NPN_C2C1E1E2 Q 0 0 Y Y 1 F N
 F0 "Q" 300 50 50 H V L CNN
-F1 "Q_DUAL_NPN_C2C1E1E2" 300 -50 50 H V L CNN
+F1 "Q_Dual_NPN_C2C1E1E2" 300 -50 50 H V L CNN
 F2 "" 0 0 50 H I C CIN
 F3 "" -100 0 50 H I L CNN
 $FPLIST
@@ -9489,11 +9399,11 @@ X E2 4 -200 -200 100 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Q_DUAL_NPN_NPN_BRT_E1B1C2E2B2C1
+# Q_Dual_NPN_NPN_BRT_E1B1C2E2B2C1
 #
-DEF Q_DUAL_NPN_NPN_BRT_E1B1C2E2B2C1 Q 0 20 Y N 2 F N
+DEF Q_Dual_NPN_NPN_BRT_E1B1C2E2B2C1 Q 0 20 Y N 2 F N
 F0 "Q" 150 50 50 H V L CNN
-F1 "Q_DUAL_NPN_NPN_BRT_E1B1C2E2B2C1" 150 -50 50 H V L CNN
+F1 "Q_Dual_NPN_NPN_BRT_E1B1C2E2B2C1" 150 -50 50 H V L CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -9527,11 +9437,11 @@ X C1 6 50 200 100 D 50 50 2 1 P
 ENDDRAW
 ENDDEF
 #
-# Q_DUAL_NPN_NPN_C2E2C1E1B1B2
+# Q_Dual_NPN_NPN_C2E2C1E1B1B2
 #
-DEF Q_DUAL_NPN_NPN_C2E2C1E1B1B2 Q 0 0 Y N 2 L N
+DEF Q_Dual_NPN_NPN_C2E2C1E1B1B2 Q 0 0 Y N 2 L N
 F0 "Q" 200 50 50 H V L CNN
-F1 "Q_DUAL_NPN_NPN_C2E2C1E1B1B2" 200 -50 50 H V L CNN
+F1 "Q_Dual_NPN_NPN_C2E2C1E1B1B2" 200 -50 50 H V L CNN
 F2 "" 200 100 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -9556,11 +9466,11 @@ X B2 6 -200 0 100 R 50 50 2 1 I
 ENDDRAW
 ENDDEF
 #
-# Q_DUAL_NPN_NPN_E1B1C2E2B2C1
+# Q_Dual_NPN_NPN_E1B1C2E2B2C1
 #
-DEF Q_DUAL_NPN_NPN_E1B1C2E2B2C1 Q 0 0 Y N 2 L N
+DEF Q_Dual_NPN_NPN_E1B1C2E2B2C1 Q 0 0 Y N 2 L N
 F0 "Q" 200 50 50 H V L CNN
-F1 "Q_DUAL_NPN_NPN_E1B1C2E2B2C1" 200 -50 50 H V L CNN
+F1 "Q_Dual_NPN_NPN_E1B1C2E2B2C1" 200 -50 50 H V L CNN
 F2 "" 200 100 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -9585,11 +9495,11 @@ X B2 5 -200 0 100 R 50 50 2 1 I
 ENDDRAW
 ENDDEF
 #
-# Q_DUAL_NPN_PNP_BRT_E1B1C2E2B2C1
+# Q_Dual_NPN_PNP_BRT_E1B1C2E2B2C1
 #
-DEF Q_DUAL_NPN_PNP_BRT_E1B1C2E2B2C1 Q 0 20 Y N 2 F N
+DEF Q_Dual_NPN_PNP_BRT_E1B1C2E2B2C1 Q 0 20 Y N 2 F N
 F0 "Q" 150 50 50 H V L CNN
-F1 "Q_DUAL_NPN_PNP_BRT_E1B1C2E2B2C1" 150 -50 50 H V L CNN
+F1 "Q_Dual_NPN_PNP_BRT_E1B1C2E2B2C1" 150 -50 50 H V L CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -9623,11 +9533,11 @@ X B1 5 -350 0 100 R 50 50 2 1 I
 ENDDRAW
 ENDDEF
 #
-# Q_DUAL_NPN_PNP_E1B1C2E2B2C1
+# Q_Dual_NPN_PNP_E1B1C2E2B2C1
 #
-DEF Q_DUAL_NPN_PNP_E1B1C2E2B2C1 Q 0 0 Y N 2 L N
+DEF Q_Dual_NPN_PNP_E1B1C2E2B2C1 Q 0 0 Y N 2 L N
 F0 "Q" 200 50 50 H V L CNN
-F1 "Q_DUAL_NPN_PNP_E1B1C2E2B2C1" 200 -50 50 H V L CNN
+F1 "Q_Dual_NPN_PNP_E1B1C2E2B2C1" 200 -50 50 H V L CNN
 F2 "" 200 100 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -9657,11 +9567,11 @@ X B2 5 -200 0 100 R 50 50 2 1 I
 ENDDRAW
 ENDDEF
 #
-# Q_DUAL_PMOS_G1S2G2D2S1D1
+# Q_Dual_PMOS_G1S2G2D2S1D1
 #
-DEF Q_DUAL_PMOS_G1S2G2D2S1D1 Q 0 0 Y N 2 F N
+DEF Q_Dual_PMOS_G1S2G2D2S1D1 Q 0 0 Y N 2 F N
 F0 "Q" 250 50 50 H V C CNN
-F1 "Q_DUAL_PMOS_G1S2G2D2S1D1" 750 -50 50 H V C CNN
+F1 "Q_Dual_PMOS_G1S2G2D2S1D1" 750 -50 50 H V C CNN
 F2 "" 50 0 50 H I C CNN
 F3 "" 50 0 50 H I C CNN
 $FPLIST
@@ -9694,11 +9604,11 @@ X D 4 100 200 100 D 50 50 2 1 P
 ENDDRAW
 ENDDEF
 #
-# Q_DUAL_PMOS_S1G1D2S2G2D1
+# Q_Dual_PMOS_S1G1D2S2G2D1
 #
-DEF Q_DUAL_PMOS_S1G1D2S2G2D1 Q 0 0 Y N 2 F N
+DEF Q_Dual_PMOS_S1G1D2S2G2D1 Q 0 0 Y N 2 F N
 F0 "Q" 250 50 50 H V C CNN
-F1 "Q_DUAL_PMOS_S1G1D2S2G2D1" 750 -50 50 H V C CNN
+F1 "Q_Dual_PMOS_S1G1D2S2G2D1" 750 -50 50 H V C CNN
 F2 "" 50 0 50 H I C CNN
 F3 "" 50 0 50 H I C CNN
 $FPLIST
@@ -9731,11 +9641,11 @@ X G 5 -200 0 100 R 50 50 2 1 I
 ENDDRAW
 ENDDEF
 #
-# Q_DUAL_PMOS_S1G1S2G2D2D2D1D1
+# Q_Dual_PMOS_S1G1S2G2D2D2D1D1
 #
-DEF Q_DUAL_PMOS_S1G1S2G2D2D2D1D1 Q 0 0 Y N 2 F N
+DEF Q_Dual_PMOS_S1G1S2G2D2D2D1D1 Q 0 0 Y N 2 F N
 F0 "Q" 250 50 50 H V C CNN
-F1 "Q_DUAL_PMOS_S1G1S2G2D2D2D1D1" 850 -50 50 H V C CNN
+F1 "Q_Dual_PMOS_S1G1S2G2D2D2D1D1" 850 -50 50 H V C CNN
 F2 "" 50 0 50 H I C CNN
 F3 "" 50 0 50 H I C CNN
 $FPLIST
@@ -9769,11 +9679,11 @@ X G 6 200 200 100 D 50 50 2 1 P
 ENDDRAW
 ENDDEF
 #
-# Q_DUAL_PNP_C2C1E1E2
+# Q_Dual_PNP_C2C1E1E2
 #
-DEF Q_DUAL_PNP_C2C1E1E2 Q 0 0 Y Y 1 F N
+DEF Q_Dual_PNP_C2C1E1E2 Q 0 0 Y Y 1 F N
 F0 "Q" 300 50 50 H V L CNN
-F1 "Q_DUAL_PNP_C2C1E1E2" 300 -50 50 H V L CNN
+F1 "Q_Dual_PNP_C2C1E1E2" 300 -50 50 H V L CNN
 F2 "" 0 0 50 H I C CIN
 F3 "" -100 0 50 H I L CNN
 $FPLIST
@@ -9800,11 +9710,11 @@ X E2 4 -200 200 100 D 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Q_DUAL_PNP_NPN_BRT_E1B1C2E2B2C1
+# Q_Dual_PNP_NPN_BRT_E1B1C2E2B2C1
 #
-DEF Q_DUAL_PNP_NPN_BRT_E1B1C2E2B2C1 Q 0 20 Y N 2 F N
+DEF Q_Dual_PNP_NPN_BRT_E1B1C2E2B2C1 Q 0 20 Y N 2 F N
 F0 "Q" 150 50 50 H V L CNN
-F1 "Q_DUAL_PNP_NPN_BRT_E1B1C2E2B2C1" 150 -50 50 H V L CNN
+F1 "Q_Dual_PNP_NPN_BRT_E1B1C2E2B2C1" 150 -50 50 H V L CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -9838,11 +9748,11 @@ X B1 5 -350 0 100 R 50 50 2 1 I
 ENDDRAW
 ENDDEF
 #
-# Q_DUAL_PNP_PNP_BRT_E1B1C2E2B2C1
+# Q_Dual_PNP_PNP_BRT_E1B1C2E2B2C1
 #
-DEF Q_DUAL_PNP_PNP_BRT_E1B1C2E2B2C1 Q 0 20 Y N 2 F N
+DEF Q_Dual_PNP_PNP_BRT_E1B1C2E2B2C1 Q 0 20 Y N 2 F N
 F0 "Q" 150 50 50 H V L CNN
-F1 "Q_DUAL_PNP_PNP_BRT_E1B1C2E2B2C1" 150 -50 50 H V L CNN
+F1 "Q_Dual_PNP_PNP_BRT_E1B1C2E2B2C1" 150 -50 50 H V L CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -9875,11 +9785,11 @@ X B2 5 -350 0 100 R 50 50 2 1 I
 ENDDRAW
 ENDDEF
 #
-# Q_DUAL_PNP_PNP_C1B1B2C2E2E1
+# Q_Dual_PNP_PNP_C1B1B2C2E2E1
 #
-DEF Q_DUAL_PNP_PNP_C1B1B2C2E2E1 Q 0 0 Y N 2 L N
+DEF Q_Dual_PNP_PNP_C1B1B2C2E2E1 Q 0 0 Y N 2 L N
 F0 "Q" 200 50 50 H V L CNN
-F1 "Q_DUAL_PNP_PNP_C1B1B2C2E2E1" 200 -50 50 H V L CNN
+F1 "Q_Dual_PNP_PNP_C1B1B2C2E2E1" 200 -50 50 H V L CNN
 F2 "" 200 100 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -9904,11 +9814,11 @@ X E2 5 100 -200 100 U 50 50 2 1 P
 ENDDRAW
 ENDDEF
 #
-# Q_DUAL_PNP_PNP_C2E2C1E1B1B2
+# Q_Dual_PNP_PNP_C2E2C1E1B1B2
 #
-DEF Q_DUAL_PNP_PNP_C2E2C1E1B1B2 Q 0 0 Y N 2 L N
+DEF Q_Dual_PNP_PNP_C2E2C1E1B1B2 Q 0 0 Y N 2 L N
 F0 "Q" 200 50 50 H V L CNN
-F1 "Q_DUAL_PNP_PNP_C2E2C1E1B1B2" 200 -50 50 H V L CNN
+F1 "Q_Dual_PNP_PNP_C2E2C1E1B1B2" 200 -50 50 H V L CNN
 F2 "" 200 100 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -9933,11 +9843,11 @@ X B2 6 -200 0 100 R 50 50 2 1 I
 ENDDRAW
 ENDDEF
 #
-# Q_DUAL_PNP_PNP_E1B1C2E2B2C1
+# Q_Dual_PNP_PNP_E1B1C2E2B2C1
 #
-DEF Q_DUAL_PNP_PNP_E1B1C2E2B2C1 Q 0 0 Y N 2 L N
+DEF Q_Dual_PNP_PNP_E1B1C2E2B2C1 Q 0 0 Y N 2 L N
 F0 "Q" 200 50 50 H V L CNN
-F1 "Q_DUAL_PNP_PNP_E1B1C2E2B2C1" 200 -50 50 H V L CNN
+F1 "Q_Dual_PNP_PNP_E1B1C2E2B2C1" 200 -50 50 H V L CNN
 F2 "" 200 100 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -11954,11 +11864,11 @@ X ~ 2 0 -150 50 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# RF_Shield_One_Piece
+# RFShield_OnePiece
 #
-DEF RF_Shield_One_Piece J 0 40 Y Y 1 F N
+DEF RFShield_OnePiece J 0 40 Y Y 1 F N
 F0 "J" 0 200 50 H V C CNN
-F1 "RF_Shield_One_Piece" 0 100 50 H V C CNN
+F1 "RFShield_OnePiece" 0 100 50 H V C CNN
 F2 "" 0 -100 50 H I C CNN
 F3 "" 0 -100 50 H I C CNN
 DRAW
@@ -11990,11 +11900,11 @@ X Shield 1 0 -400 100 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# RF_Shield_Two_Pieces
+# RFShield_TwoPieces
 #
-DEF RF_Shield_Two_Pieces J 0 40 Y Y 1 F N
+DEF RFShield_TwoPieces J 0 40 Y Y 1 F N
 F0 "J" 0 200 50 H V C CNN
-F1 "RF_Shield_Two_Pieces" 0 100 50 H V C CNN
+F1 "RFShield_TwoPieces" 0 100 50 H V C CNN
 F2 "" 0 -100 50 H I C CNN
 F3 "" 0 -100 50 H I C CNN
 DRAW
@@ -12027,24 +11937,6 @@ X Shield 1 0 -400 100 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# RTRIM
-#
-DEF RTRIM R 0 0 N Y 1 F N
-F0 "R" 100 -100 50 V V L CNN
-F1 "RTRIM" -100 -25 50 V V L CNN
-F2 "" -70 0 50 V I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- R_*
-$ENDFPLIST
-DRAW
-S -40 -100 40 100 0 1 10 N
-P 4 0 1 0 -75 -75 75 75 100 50 50 100 N
-X ~ 1 0 150 50 D 50 50 1 1 P
-X ~ 2 0 -150 50 U 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
 # R_Network03
 #
 DEF R_Network03 RN 0 0 Y N 1 F N
@@ -14285,244 +14177,25 @@ P 3 0 1 0 400 166 600 166 600 133 N
 P 3 0 1 0 460 -133 460 -166 1100 -166 N
 P 3 0 1 0 600 0 660 0 660 -33 N
 P 3 0 1 0 600 166 800 166 800 133 N
-P 3 0 1 0 660 -133 660 -166 1100 -166 N
-P 3 0 1 0 800 0 860 0 860 -33 N
-P 3 0 1 0 800 166 1000 166 1000 133 N
-P 3 0 1 0 860 -133 860 -166 1100 -166 N
-P 3 0 1 0 1000 0 1060 0 1060 -33 N
-P 3 0 1 0 1060 -133 1060 -166 1100 -166 N
-X COM1 1 -1000 300 100 D 50 50 1 1 P
-X R9 10 600 -300 100 U 50 50 1 1 P
-X R10 11 800 -300 100 U 50 50 1 1 P
-X R11 12 1000 -300 100 U 50 50 1 1 P
-X COM2 13 1100 300 100 D 50 50 1 1 P
-X R1 2 -1000 -300 100 U 50 50 1 1 P
-X R2 3 -800 -300 100 U 50 50 1 1 P
-X R3 4 -600 -300 100 U 50 50 1 1 P
-X R4 5 -400 -300 100 U 50 50 1 1 P
-X R5 6 -200 -300 100 U 50 50 1 1 P
-X R6 7 0 -300 100 U 50 50 1 1 P
-X R7 8 200 -300 100 U 50 50 1 1 P
-X R8 9 400 -300 100 U 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# R_PHOTO
-#
-DEF R_PHOTO R 0 0 N Y 1 F N
-F0 "R" 50 50 50 H V L CNN
-F1 "R_PHOTO" 50 0 50 H V L TNN
-F2 "" 50 -250 50 V I L CNN
-F3 "" 0 -50 50 H I C CNN
-$FPLIST
- *LDR*
- R?LDR*
-$ENDFPLIST
-DRAW
-S -40 100 40 -100 0 1 10 N
-P 2 0 1 0 -60 -90 -160 10 N
-P 2 0 1 0 -60 -90 -90 -90 N
-P 2 0 1 0 -60 -90 -60 -60 N
-P 2 0 1 0 -60 -30 -160 70 N
-P 2 0 1 0 -60 -30 -90 -30 N
-P 2 0 1 0 -60 -30 -60 0 N
-X ~ 1 0 150 50 D 50 50 1 1 P
-X ~ 2 0 -150 50 U 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# R_POT
-#
-DEF R_POT RV 0 40 Y N 1 F N
-F0 "RV" -175 0 50 V V C CNN
-F1 "R_POT" -100 0 50 V V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- Potentiometer*
-$ENDFPLIST
-DRAW
-S 40 100 -40 -100 0 1 10 N
-P 2 0 1 0 100 0 60 0 N
-P 4 0 1 0 45 0 90 20 90 -20 45 0 F
-X 1 1 0 150 50 D 50 50 1 1 P
-X 2 2 150 0 50 L 50 50 1 1 P
-X 3 3 0 -150 50 U 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# R_POT_Dual
-#
-DEF R_POT_Dual RV 0 40 Y N 1 F N
-F0 "RV" 0 150 50 H V C CNN
-F1 "R_POT_Dual" 0 75 50 H V C CNN
-F2 "" 250 -75 50 H I C CNN
-F3 "" 250 -75 50 H I C CNN
-$FPLIST
- Potentiometer*
-$ENDFPLIST
-DRAW
-S -350 -60 -150 -140 0 1 10 N
-S 150 -60 350 -140 0 1 10 N
-P 2 0 1 0 -250 0 -250 -40 N
-P 2 0 1 0 -250 0 -250 -40 N
-P 2 0 1 0 -250 0 -230 20 N
-P 2 0 1 0 -220 20 -200 20 N
-P 2 0 1 0 -180 20 -160 20 N
-P 2 0 1 0 -140 20 -120 20 N
-P 2 0 1 0 -100 20 -80 20 N
-P 2 0 1 0 -60 20 -40 20 N
-P 2 0 1 0 -20 20 0 20 N
-P 2 0 1 0 20 20 40 20 N
-P 2 0 1 0 60 20 80 20 N
-P 2 0 1 0 100 20 120 20 N
-P 2 0 1 0 140 20 160 20 N
-P 2 0 1 0 180 20 200 20 N
-P 2 0 1 0 220 20 240 20 N
-P 2 0 1 0 250 0 250 -40 N
-P 2 0 1 0 250 0 250 -40 N
-P 3 0 1 0 260 20 270 20 250 0 N
-P 4 0 1 0 -250 -55 -270 -10 -230 -10 -250 -55 F
-P 4 0 1 0 250 -55 230 -10 270 -10 250 -55 F
-X 1 1 -400 -100 50 R 50 50 1 1 P
-X 2 2 -250 100 100 D 50 50 1 1 P
-X 3 3 -100 -100 50 L 50 50 1 1 P
-X 4 4 100 -100 50 R 50 50 1 1 P
-X 5 5 250 100 100 D 50 50 1 1 P
-X 6 6 400 -100 50 L 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# R_POT_Dual_Separate
-#
-DEF R_POT_Dual_Separate RV 0 40 Y N 2 F N
-F0 "RV" -175 0 50 V V C CNN
-F1 "R_POT_Dual_Separate" -100 0 50 V V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- Potentiometer*
-$ENDFPLIST
-DRAW
-S 40 100 -40 -100 0 1 10 N
-P 2 0 1 0 100 0 60 0 N
-P 4 0 1 0 45 0 90 20 90 -20 45 0 F
-X 1 1 0 150 50 D 50 50 1 1 P
-X 2 2 150 0 50 L 50 50 1 1 P
-X 3 3 0 -150 50 U 50 50 1 1 P
-X 4 4 0 150 50 D 50 50 2 1 P
-X 5 5 150 0 50 L 50 50 2 1 P
-X 6 6 0 -150 50 U 50 50 2 1 P
-ENDDRAW
-ENDDEF
-#
-# R_POT_MountingPin
-#
-DEF R_POT_MountingPin RV 0 40 Y N 1 F N
-F0 "RV" -325 0 50 V V C CNN
-F1 "R_POT_MountingPin" -250 0 50 V V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- Potentiometer*
-$ENDFPLIST
-DRAW
-T 900 -65 0 15 0 1 1 Mounting Normal 0 C C
-S 40 100 -40 -100 0 1 10 N
-P 2 0 1 0 100 0 60 0 N
-P 3 0 1 0 45 0 90 20 90 -20 F
-P 2 1 1 6 -80 40 -80 -40 N
-X 1 1 0 150 50 D 50 50 1 1 P
-X 2 2 150 0 50 L 50 50 1 1 P
-X 3 3 0 -150 50 U 50 50 1 1 P
-X MountPin MP -200 0 120 R 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# R_POT_Small
-#
-DEF R_POT_Small RV 0 40 Y N 1 F N
-F0 "RV" -175 0 50 V V C CNN
-F1 "R_POT_Small" -100 0 50 V V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- Potentiometer*
-$ENDFPLIST
-DRAW
-S 30 71 -30 -71 0 1 10 N
-P 6 0 1 0 35 0 25 0 65 15 65 -15 25 0 35 0 F
-X 1 1 0 100 25 D 25 25 1 1 P
-X 2 2 100 0 39 L 25 25 1 1 P
-X 3 3 0 -100 25 U 25 25 1 1 P
-ENDDRAW
-ENDDEF
-#
-# R_POT_TRIM
-#
-DEF R_POT_TRIM RV 0 40 Y N 1 F N
-F0 "RV" -175 0 50 V V C CNN
-F1 "R_POT_TRIM" -100 0 50 V V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- Potentiometer*
-$ENDFPLIST
-DRAW
-S 40 100 -40 -100 0 1 10 N
-P 2 0 1 0 60 30 60 -30 N
-P 2 0 1 0 100 0 60 0 N
-X 1 1 0 150 50 D 50 50 1 1 P
-X 2 2 150 0 50 L 50 50 1 1 P
-X 3 3 0 -150 50 U 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# R_POT_TRIM_US
-#
-DEF R_POT_TRIM_US RV 0 40 Y N 1 F N
-F0 "RV" -175 0 50 V V C CNN
-F1 "R_POT_TRIM_US" -100 0 50 V V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- Potentiometer*
-$ENDFPLIST
-DRAW
-P 2 0 1 0 0 -90 0 -100 N
-P 2 0 1 0 0 90 0 100 N
-P 2 0 1 0 60 30 60 -30 N
-P 2 0 1 0 100 0 60 0 N
-P 5 0 1 0 0 -30 40 -45 0 -60 -40 -75 0 -90 N
-P 5 0 1 0 0 30 40 15 0 0 -40 -15 0 -30 N
-P 5 0 1 0 0 90 40 75 0 60 -40 45 0 30 N
-X 1 1 0 150 50 D 50 50 1 1 P
-X 2 2 150 0 50 L 50 50 1 1 P
-X 3 3 0 -150 50 U 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# R_POT_US
-#
-DEF R_POT_US RV 0 40 Y N 1 F N
-F0 "RV" -175 0 50 V V C CNN
-F1 "R_POT_US" -100 0 50 V V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- Potentiometer*
-$ENDFPLIST
-DRAW
-P 2 0 1 0 0 -90 0 -100 N
-P 2 0 1 0 0 100 0 90 N
-P 2 0 1 0 100 0 60 0 N
-P 4 0 1 0 45 0 90 20 90 -20 45 0 F
-P 5 0 1 0 0 -30 40 -45 0 -60 -40 -75 0 -90 N
-P 5 0 1 0 0 30 40 15 0 0 -40 -15 0 -30 N
-P 5 0 1 0 0 90 40 75 0 60 -40 45 0 30 N
-X 1 1 0 150 50 D 50 50 1 1 P
-X 2 2 150 0 50 L 50 50 1 1 P
-X 3 3 0 -150 50 U 50 50 1 1 P
+P 3 0 1 0 660 -133 660 -166 1100 -166 N
+P 3 0 1 0 800 0 860 0 860 -33 N
+P 3 0 1 0 800 166 1000 166 1000 133 N
+P 3 0 1 0 860 -133 860 -166 1100 -166 N
+P 3 0 1 0 1000 0 1060 0 1060 -33 N
+P 3 0 1 0 1060 -133 1060 -166 1100 -166 N
+X COM1 1 -1000 300 100 D 50 50 1 1 P
+X R9 10 600 -300 100 U 50 50 1 1 P
+X R10 11 800 -300 100 U 50 50 1 1 P
+X R11 12 1000 -300 100 U 50 50 1 1 P
+X COM2 13 1100 300 100 D 50 50 1 1 P
+X R1 2 -1000 -300 100 U 50 50 1 1 P
+X R2 3 -800 -300 100 U 50 50 1 1 P
+X R3 4 -600 -300 100 U 50 50 1 1 P
+X R4 5 -400 -300 100 U 50 50 1 1 P
+X R5 6 -200 -300 100 U 50 50 1 1 P
+X R6 7 0 -300 100 U 50 50 1 1 P
+X R7 8 200 -300 100 U 50 50 1 1 P
+X R8 9 400 -300 100 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
@@ -15683,6 +15356,225 @@ X R11.2 12 0 150 50 D 50 50 11 1 P
 ENDDRAW
 ENDDEF
 #
+# R_Photo
+#
+DEF R_Photo R 0 0 N Y 1 F N
+F0 "R" 50 50 50 H V L CNN
+F1 "R_Photo" 50 0 50 H V L TNN
+F2 "" 50 -250 50 V I L CNN
+F3 "" 0 -50 50 H I C CNN
+$FPLIST
+ *LDR*
+ R?LDR*
+$ENDFPLIST
+DRAW
+S -40 100 40 -100 0 1 10 N
+P 2 0 1 0 -60 -90 -160 10 N
+P 2 0 1 0 -60 -90 -90 -90 N
+P 2 0 1 0 -60 -90 -60 -60 N
+P 2 0 1 0 -60 -30 -160 70 N
+P 2 0 1 0 -60 -30 -90 -30 N
+P 2 0 1 0 -60 -30 -60 0 N
+X ~ 1 0 150 50 D 50 50 1 1 P
+X ~ 2 0 -150 50 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# R_Potentiometer
+#
+DEF R_Potentiometer RV 0 40 Y N 1 F N
+F0 "RV" -175 0 50 V V C CNN
+F1 "R_Potentiometer" -100 0 50 V V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ Potentiometer*
+$ENDFPLIST
+DRAW
+S 40 100 -40 -100 0 1 10 N
+P 2 0 1 0 100 0 60 0 N
+P 4 0 1 0 45 0 90 20 90 -20 45 0 F
+X 1 1 0 150 50 D 50 50 1 1 P
+X 2 2 150 0 50 L 50 50 1 1 P
+X 3 3 0 -150 50 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# R_Potentiometer_Dual
+#
+DEF R_Potentiometer_Dual RV 0 40 Y N 1 F N
+F0 "RV" 0 150 50 H V C CNN
+F1 "R_Potentiometer_Dual" 0 75 50 H V C CNN
+F2 "" 250 -75 50 H I C CNN
+F3 "" 250 -75 50 H I C CNN
+$FPLIST
+ Potentiometer*
+$ENDFPLIST
+DRAW
+S -350 -60 -150 -140 0 1 10 N
+S 150 -60 350 -140 0 1 10 N
+P 2 0 1 0 -250 0 -250 -40 N
+P 2 0 1 0 -250 0 -250 -40 N
+P 2 0 1 0 -250 0 -230 20 N
+P 2 0 1 0 -220 20 -200 20 N
+P 2 0 1 0 -180 20 -160 20 N
+P 2 0 1 0 -140 20 -120 20 N
+P 2 0 1 0 -100 20 -80 20 N
+P 2 0 1 0 -60 20 -40 20 N
+P 2 0 1 0 -20 20 0 20 N
+P 2 0 1 0 20 20 40 20 N
+P 2 0 1 0 60 20 80 20 N
+P 2 0 1 0 100 20 120 20 N
+P 2 0 1 0 140 20 160 20 N
+P 2 0 1 0 180 20 200 20 N
+P 2 0 1 0 220 20 240 20 N
+P 2 0 1 0 250 0 250 -40 N
+P 2 0 1 0 250 0 250 -40 N
+P 3 0 1 0 260 20 270 20 250 0 N
+P 4 0 1 0 -250 -55 -270 -10 -230 -10 -250 -55 F
+P 4 0 1 0 250 -55 230 -10 270 -10 250 -55 F
+X 1 1 -400 -100 50 R 50 50 1 1 P
+X 2 2 -250 100 100 D 50 50 1 1 P
+X 3 3 -100 -100 50 L 50 50 1 1 P
+X 4 4 100 -100 50 R 50 50 1 1 P
+X 5 5 250 100 100 D 50 50 1 1 P
+X 6 6 400 -100 50 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# R_Potentiometer_Dual_Separate
+#
+DEF R_Potentiometer_Dual_Separate RV 0 40 Y N 2 F N
+F0 "RV" -175 0 50 V V C CNN
+F1 "R_Potentiometer_Dual_Separate" -100 0 50 V V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ Potentiometer*
+$ENDFPLIST
+DRAW
+S 40 100 -40 -100 0 1 10 N
+P 2 0 1 0 100 0 60 0 N
+P 4 0 1 0 45 0 90 20 90 -20 45 0 F
+X 1 1 0 150 50 D 50 50 1 1 P
+X 2 2 150 0 50 L 50 50 1 1 P
+X 3 3 0 -150 50 U 50 50 1 1 P
+X 4 4 0 150 50 D 50 50 2 1 P
+X 5 5 150 0 50 L 50 50 2 1 P
+X 6 6 0 -150 50 U 50 50 2 1 P
+ENDDRAW
+ENDDEF
+#
+# R_Potentiometer_MountingPin
+#
+DEF R_Potentiometer_MountingPin RV 0 40 Y N 1 F N
+F0 "RV" -325 0 50 V V C CNN
+F1 "R_Potentiometer_MountingPin" -250 0 50 V V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ Potentiometer*
+$ENDFPLIST
+DRAW
+T 900 -65 0 15 0 1 1 Mounting Normal 0 C C
+S 40 100 -40 -100 0 1 10 N
+P 2 0 1 0 100 0 60 0 N
+P 3 0 1 0 45 0 90 20 90 -20 F
+P 2 1 1 6 -80 40 -80 -40 N
+X 1 1 0 150 50 D 50 50 1 1 P
+X 2 2 150 0 50 L 50 50 1 1 P
+X 3 3 0 -150 50 U 50 50 1 1 P
+X MountPin MP -200 0 120 R 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# R_Potentiometer_Small
+#
+DEF R_Potentiometer_Small RV 0 40 Y N 1 F N
+F0 "RV" -175 0 50 V V C CNN
+F1 "R_Potentiometer_Small" -100 0 50 V V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ Potentiometer*
+$ENDFPLIST
+DRAW
+S 30 71 -30 -71 0 1 10 N
+P 6 0 1 0 35 0 25 0 65 15 65 -15 25 0 35 0 F
+X 1 1 0 100 25 D 25 25 1 1 P
+X 2 2 100 0 39 L 25 25 1 1 P
+X 3 3 0 -100 25 U 25 25 1 1 P
+ENDDRAW
+ENDDEF
+#
+# R_Potentiometer_Trim
+#
+DEF R_Potentiometer_Trim RV 0 40 Y N 1 F N
+F0 "RV" -175 0 50 V V C CNN
+F1 "R_Potentiometer_Trim" -100 0 50 V V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ Potentiometer*
+$ENDFPLIST
+DRAW
+S 40 100 -40 -100 0 1 10 N
+P 2 0 1 0 60 30 60 -30 N
+P 2 0 1 0 100 0 60 0 N
+X 1 1 0 150 50 D 50 50 1 1 P
+X 2 2 150 0 50 L 50 50 1 1 P
+X 3 3 0 -150 50 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# R_Potentiometer_Trim_US
+#
+DEF R_Potentiometer_Trim_US RV 0 40 Y N 1 F N
+F0 "RV" -175 0 50 V V C CNN
+F1 "R_Potentiometer_Trim_US" -100 0 50 V V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ Potentiometer*
+$ENDFPLIST
+DRAW
+P 2 0 1 0 0 -90 0 -100 N
+P 2 0 1 0 0 90 0 100 N
+P 2 0 1 0 60 30 60 -30 N
+P 2 0 1 0 100 0 60 0 N
+P 5 0 1 0 0 -30 40 -45 0 -60 -40 -75 0 -90 N
+P 5 0 1 0 0 30 40 15 0 0 -40 -15 0 -30 N
+P 5 0 1 0 0 90 40 75 0 60 -40 45 0 30 N
+X 1 1 0 150 50 D 50 50 1 1 P
+X 2 2 150 0 50 L 50 50 1 1 P
+X 3 3 0 -150 50 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# R_Potentiometer_US
+#
+DEF R_Potentiometer_US RV 0 40 Y N 1 F N
+F0 "RV" -175 0 50 V V C CNN
+F1 "R_Potentiometer_US" -100 0 50 V V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ Potentiometer*
+$ENDFPLIST
+DRAW
+P 2 0 1 0 0 -90 0 -100 N
+P 2 0 1 0 0 100 0 90 N
+P 2 0 1 0 100 0 60 0 N
+P 4 0 1 0 45 0 90 20 90 -20 45 0 F
+P 5 0 1 0 0 -30 40 -45 0 -60 -40 -75 0 -90 N
+P 5 0 1 0 0 30 40 15 0 0 -40 -15 0 -30 N
+P 5 0 1 0 0 90 40 75 0 60 -40 45 0 30 N
+X 1 1 0 150 50 D 50 50 1 1 P
+X 2 2 150 0 50 L 50 50 1 1 P
+X 3 3 0 -150 50 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
 # R_Shunt
 #
 DEF R_Shunt R 0 0 N Y 1 F N
@@ -15764,6 +15656,24 @@ X ~ 2 0 -100 40 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
+# R_Trim
+#
+DEF R_Trim R 0 0 N Y 1 F N
+F0 "R" 100 -100 50 V V L CNN
+F1 "R_Trim" -100 -25 50 V V L CNN
+F2 "" -70 0 50 V I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ R_*
+$ENDFPLIST
+DRAW
+S -40 -100 40 100 0 1 10 N
+P 4 0 1 0 -75 -75 75 75 100 50 50 100 N
+X ~ 1 0 150 50 D 50 50 1 1 P
+X ~ 2 0 -150 50 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
 # R_US
 #
 DEF R_US R 0 0 N Y 1 F N
@@ -15893,11 +15803,11 @@ X 3 3 100 100 50 D 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Rotary_Encoder
+# RotaryEncoder
 #
-DEF Rotary_Encoder SW 0 10 Y N 1 F N
+DEF RotaryEncoder SW 0 10 Y N 1 F N
 F0 "SW" 0 260 50 H V C CNN
-F1 "Rotary_Encoder" 0 -260 50 H V C CNN
+F1 "RotaryEncoder" 0 -260 50 H V C CNN
 F2 "" -150 160 50 H I C CNN
 F3 "" 0 260 50 H I C CNN
 $FPLIST
@@ -15923,11 +15833,11 @@ X C C -300 0 100 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Rotary_Encoder_Switch
+# RotaryEncoder_Switch
 #
-DEF Rotary_Encoder_Switch SW 0 10 Y N 1 F N
+DEF RotaryEncoder_Switch SW 0 10 Y N 1 F N
 F0 "SW" 0 260 50 H V C CNN
-F1 "Rotary_Encoder_Switch" 0 -260 50 H V C CNN
+F1 "RotaryEncoder_Switch" 0 -260 50 H V C CNN
 F2 "" -150 160 50 H I C CNN
 F3 "" 0 260 50 H I C CNN
 $FPLIST
@@ -15961,24 +15871,6 @@ X S2 S2 300 -100 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# SPARK_GAP
-#
-DEF SPARK_GAP E 0 0 N Y 1 F N
-F0 "E" 0 80 50 H V C CNN
-F1 "SPARK_GAP" 0 -75 50 H V C CNN
-F2 "" 0 -70 50 H I C CNN
-F3 "" 0 0 50 V I C CNN
-$FPLIST
- SG*
-$ENDFPLIST
-DRAW
-P 4 0 1 0 -100 25 -100 -25 -25 0 -100 25 N
-P 4 0 1 0 100 25 100 -25 25 0 100 25 N
-X ~ 1 -200 0 100 R 50 50 1 1 P
-X ~ 2 200 0 100 L 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
 # Solar_Cell
 #
 DEF Solar_Cell SC 0 0 N N 1 F N
@@ -16031,6 +15923,24 @@ X - 2 0 -200 100 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
+# SparkGap
+#
+DEF SparkGap E 0 0 N Y 1 F N
+F0 "E" 0 80 50 H V C CNN
+F1 "SparkGap" 0 -75 50 H V C CNN
+F2 "" 0 -70 50 H I C CNN
+F3 "" 0 0 50 V I C CNN
+$FPLIST
+ SG*
+$ENDFPLIST
+DRAW
+P 4 0 1 0 -100 25 -100 -25 -25 0 -100 25 N
+P 4 0 1 0 100 25 100 -25 25 0 100 25 N
+X ~ 1 -200 0 100 R 50 50 1 1 P
+X ~ 2 200 0 100 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
 # Speaker
 #
 DEF Speaker LS 0 0 Y N 1 F N
@@ -16118,11 +16028,11 @@ X ~ 2 0 -150 50 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Thermistor_NTC_3wire
+# Thermistor_NTC_3Wire
 #
-DEF Thermistor_NTC_3wire TH 0 0 Y Y 1 F N
+DEF Thermistor_NTC_3Wire TH 0 0 Y Y 1 F N
 F0 "TH" 75 150 50 H V L CNN
-F1 "Thermistor_NTC_3wire" 75 50 50 H V L CNN
+F1 "Thermistor_NTC_3Wire" 75 50 50 H V L CNN
 F2 "" 0 50 50 H I C CNN
 F3 "" 0 50 50 H I C CNN
 $FPLIST
@@ -16155,11 +16065,11 @@ X ~ 3 0 -250 100 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Thermistor_NTC_4wire
+# Thermistor_NTC_4Wire
 #
-DEF Thermistor_NTC_4wire TH 0 0 Y Y 1 F N
+DEF Thermistor_NTC_4Wire TH 0 0 Y Y 1 F N
 F0 "TH" 75 150 50 H V L CNN
-F1 "Thermistor_NTC_4wire" 75 50 50 H V L CNN
+F1 "Thermistor_NTC_4Wire" 75 50 50 H V L CNN
 F2 "" 0 50 50 H I C CNN
 F3 "" 0 50 50 H I C CNN
 $FPLIST
@@ -16266,11 +16176,11 @@ X ~ 2 0 -150 50 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Thermistor_PTC_3wire
+# Thermistor_PTC_3Wire
 #
-DEF Thermistor_PTC_3wire TH 0 0 Y Y 1 F N
+DEF Thermistor_PTC_3Wire TH 0 0 Y Y 1 F N
 F0 "TH" 75 50 50 H V L CNN
-F1 "Thermistor_PTC_3wire" 75 -50 50 H V L CNN
+F1 "Thermistor_PTC_3Wire" 75 -50 50 H V L CNN
 F2 "" 0 50 50 H I C CNN
 F3 "" 0 50 50 H I C CNN
 $FPLIST
@@ -16301,11 +16211,11 @@ X ~ 3 0 -250 100 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Thermistor_PTC_4wire
+# Thermistor_PTC_4Wire
 #
-DEF Thermistor_PTC_4wire TH 0 0 Y Y 1 F N
+DEF Thermistor_PTC_4Wire TH 0 0 Y Y 1 F N
 F0 "TH" 75 75 50 H V L CNN
-F1 "Thermistor_PTC_4wire" 75 -25 50 H V L CNN
+F1 "Thermistor_PTC_4Wire" 75 -25 50 H V L CNN
 F2 "" 0 50 50 H I C CNN
 F3 "" 0 50 50 H I C CNN
 $FPLIST
@@ -16431,11 +16341,11 @@ X - 2 100 -100 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Thermocouple_ALT
+# Thermocouple_Alt
 #
-DEF Thermocouple_ALT TC 0 0 N Y 1 F N
+DEF Thermocouple_Alt TC 0 0 N Y 1 F N
 F0 "TC" -120 150 50 H V C CNN
-F1 "Thermocouple_ALT" -180 -200 50 H V L CNN
+F1 "Thermocouple_Alt" -180 -200 50 H V L CNN
 F2 "" -575 50 50 H I C CNN
 F3 "" -575 50 50 H I C CNN
 $FPLIST
@@ -16630,11 +16540,11 @@ X SB 5 400 200 300 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Transformer_AUDIO
+# Transformer_Audio
 #
-DEF Transformer_AUDIO T 0 40 Y N 1 F N
+DEF Transformer_Audio T 0 40 Y N 1 F N
 F0 "T" 0 460 50 H V C CNN
-F1 "Transformer_AUDIO" 10 370 50 H V C CNN
+F1 "Transformer_Audio" 10 370 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 DRAW
@@ -16783,11 +16693,11 @@ X ~ 2 0 -150 50 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Voltage_Divider
+# VoltageDivider
 #
-DEF Voltage_Divider RN 0 0 Y N 1 F N
+DEF VoltageDivider RN 0 0 Y N 1 F N
 F0 "RN" -175 0 50 V V C CNN
-F1 "Voltage_Divider" -100 0 50 V V C CNN
+F1 "VoltageDivider" -100 0 50 V V C CNN
 F2 "" 475 0 50 V I C CNN
 F3 "" 200 0 50 H I C CNN
 $FPLIST
@@ -16809,11 +16719,11 @@ X ~ 3 0 -250 100 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Voltage_Divider_CenterPin1
+# VoltageDivider_CenterPin1
 #
-DEF Voltage_Divider_CenterPin1 RN 0 0 Y N 1 F N
+DEF VoltageDivider_CenterPin1 RN 0 0 Y N 1 F N
 F0 "RN" -175 0 50 V V C CNN
-F1 "Voltage_Divider_CenterPin1" -100 0 50 V V C CNN
+F1 "VoltageDivider_CenterPin1" -100 0 50 V V C CNN
 F2 "" 475 0 50 V I C CNN
 F3 "" 200 0 50 H I C CNN
 $FPLIST
@@ -16835,11 +16745,11 @@ X ~ 3 0 -250 100 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Voltage_Divider_CenterPin3
+# VoltageDivider_CenterPin3
 #
-DEF Voltage_Divider_CenterPin3 RN 0 0 Y N 1 F N
+DEF VoltageDivider_CenterPin3 RN 0 0 Y N 1 F N
 F0 "RN" -175 0 50 V V C CNN
-F1 "Voltage_Divider_CenterPin3" -100 0 50 V V C CNN
+F1 "VoltageDivider_CenterPin3" -100 0 50 V V C CNN
 F2 "" 475 0 50 V I C CNN
 F3 "" 200 0 50 H I C CNN
 $FPLIST
diff --git a/Diode.dcm b/Diode.dcm
index 1dfcde59fd..bd444e92b7 100644
--- a/Diode.dcm
+++ b/Diode.dcm
@@ -1710,6 +1710,126 @@ K diode Schottky
 F https://www.onsemi.com/pub/Collateral/NSR0340H-D.PDF
 $ENDCMP
 #
+$CMP PMEG030V030EPD
+D 30V, 3A low Vf MEGA Schottky barrier rectifier, SOT-1289
+K forward voltage diode
+F https://assets.nexperia.com/documents/data-sheet/PMEG030V030EPD.pdf
+$ENDCMP
+#
+$CMP PMEG030V050EPD
+D 30V, 5A low Vf MEGA Schottky barrier rectifier, SOT-1289
+K forward voltage diode
+F https://assets.nexperia.com/documents/data-sheet/PMEG030V050EPD.pdf
+$ENDCMP
+#
+$CMP PMEG040V030EPD
+D 40V, 3A low Vf MEGA Schottky barrier rectifier, SOT-1289
+K forward voltage diode
+F https://assets.nexperia.com/documents/data-sheet/PMEG040V030EPD.pdf
+$ENDCMP
+#
+$CMP PMEG040V050EPD
+D 40V, 5A low Vf MEGA Schottky barrier rectifier, SOT-1289
+K forward voltage diode
+F https://assets.nexperia.com/documents/data-sheet/PMEG040V050EPD.pdf
+$ENDCMP
+#
+$CMP PMEG045T050EPD
+D 45V, 5A low Vf Trench MEGA Schottky barrier rectifier, SOT-1289
+K forward voltage diode
+F https://assets.nexperia.com/documents/data-sheet/PMEG045T050EPD.pdf
+$ENDCMP
+#
+$CMP PMEG045T100EPD
+D 45V, 10A low Vf Trench MEGA Schottky barrier rectifier, SOT-1289
+K forward voltage diode
+F https://assets.nexperia.com/documents/data-sheet/PMEG045T100EPD.pdf
+$ENDCMP
+#
+$CMP PMEG045T150EIPD
+D 45V, 15A low Vf Trench MEGA Schottky barrier rectifier, SOT-1289
+K forward voltage diode
+F https://assets.nexperia.com/documents/data-sheet/PMEG045T150EIPD.pdf
+$ENDCMP
+#
+$CMP PMEG045T150EPD
+D 45V, 15A low Vf Trench MEGA Schottky barrier rectifier, SOT-1289
+K forward voltage diode
+F https://assets.nexperia.com/documents/data-sheet/PMEG045T150EPD.pdf
+$ENDCMP
+#
+$CMP PMEG045V050EPD
+D 45V, 5A low Vf MEGA Schottky barrier rectifier, SOT-1289
+K forward voltage diode
+F https://assets.nexperia.com/documents/data-sheet/PMEG045V050EPD.pdf
+$ENDCMP
+#
+$CMP PMEG045V100EPD
+D 45V, 10A low Vf MEGA Schottky barrier rectifier, SOT-1289
+K forward voltage diode
+F https://assets.nexperia.com/documents/data-sheet/PMEG045V100EPD.pdf
+$ENDCMP
+#
+$CMP PMEG045V150EPD
+D 45V, 15A low Vf MEGA Schottky barrier rectifier, SOT-1289
+K forward voltage diode
+F https://assets.nexperia.com/documents/data-sheet/PMEG045V150EPD.pdf
+$ENDCMP
+#
+$CMP PMEG050T150EPD
+D 50V, 15A low Vf Trench MEGA Schottky barrier rectifier, SOT-1289
+K forward voltage diode
+F https://assets.nexperia.com/documents/data-sheet/PMEG050T150EPD.pdf
+$ENDCMP
+#
+$CMP PMEG050V030EPD
+D 50V, 3A low Vf MEGA Schottky barrier rectifier, SOT-1289
+K forward voltage diode
+F https://assets.nexperia.com/documents/data-sheet/PMEG050V030EPD.pdf
+$ENDCMP
+#
+$CMP PMEG050V150EPD
+D 50V, 15A low Vf MEGA Schottky barrier rectifier, SOT-1289
+K forward voltage diode
+F https://assets.nexperia.com/documents/data-sheet/PMEG050V150EPD.pdf
+$ENDCMP
+#
+$CMP PMEG060V030EPD
+D 60V, 3A low Vf MEGA Schottky barrier rectifier, SOT-1289
+K forward voltage diode
+F https://assets.nexperia.com/documents/data-sheet/PMEG060V030EPD.pdf
+$ENDCMP
+#
+$CMP PMEG060V050EPD
+D 60V, 5A low Vf MEGA Schottky barrier rectifier, SOT-1289
+K forward voltage diode
+F https://assets.nexperia.com/documents/data-sheet/PMEG060V050EPD.pdf
+$ENDCMP
+#
+$CMP PMEG060V100EPD
+D 60V, 10A low Vf MEGA Schottky barrier rectifier, SOT-1289
+K forward voltage diode
+F https://assets.nexperia.com/documents/data-sheet/PMEG060V100EPD.pdf
+$ENDCMP
+#
+$CMP PMEG100V060ELPD
+D 100V, 6A low leakage current MEGA Schottky barrier rectifier, SOT-1289
+K ir diode
+F https://assets.nexperia.com/documents/data-sheet/PMEG100V060ELPD.pdf
+$ENDCMP
+#
+$CMP PMEG100V080ELPD
+D 100V, 8A low leakage current MEGA Schottky barrier rectifier, SOT-1289
+K ir diode
+F https://assets.nexperia.com/documents/data-sheet/PMEG100V080ELPD.pdf
+$ENDCMP
+#
+$CMP PMEG100V100ELPD
+D 100V, 10A low leakage current MEGA Schottky barrier rectifier, SOT-1289
+K ir diode
+F https://assets.nexperia.com/documents/data-sheet/PMEG100V100ELPD.pdf
+$ENDCMP
+#
 $CMP PMEG1020EH
 D 10V, 2A ultra low Vf MEGA Schottky barrier rectifier, SOD-123F
 K forward voltage diode
@@ -1938,6 +2058,24 @@ K forward voltage diode
 F https://assets.nexperia.com/documents/data-sheet/PMEG4050EP.pdf
 $ENDCMP
 #
+$CMP PMEG45A10EPD
+D 45V, 10A low Vf MEGA Schottky barrier rectifier, SOT-1289
+K forward voltage diode
+F https://assets.nexperia.com/documents/data-sheet/PMEG45A10EPD.pdf
+$ENDCMP
+#
+$CMP PMEG45T15EPD
+D 45V, 15A low Vf Trench MEGA Schottky barrier rectifier, SOT-1289
+K forward voltage diode
+F https://assets.nexperia.com/documents/data-sheet/PMEG45T15EPD.pdf
+$ENDCMP
+#
+$CMP PMEG45U10EPD
+D 45V, 10A extremely low Vf MEGA Schottky barrier rectifier, SOT-1289
+K forward voltage diode
+F https://assets.nexperia.com/documents/data-sheet/PMEG45U10EPD.pdf
+$ENDCMP
+#
 $CMP PMEG6002EJ
 D 60V, 200mA very low Vf MEGA Schottky barrier rectifier, SOD-323F
 K forward voltage diode
diff --git a/Diode.lib b/Diode.lib
index 3660284676..46566d8cc2 100644
--- a/Diode.lib
+++ b/Diode.lib
@@ -1575,6 +1575,27 @@ X A 2 150 0 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
+# PMEG45A10EPD
+#
+DEF PMEG45A10EPD D 0 20 N N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "PMEG45A10EPD" 0 -100 50 H V C CNN
+F2 "Package_TO_SOT_SMD:Nexperia_CFP15_SOT-1289" 0 -175 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+ALIAS PMEG45T15EPD PMEG45U10EPD PMEG030V030EPD PMEG030V050EPD PMEG040V030EPD PMEG040V050EPD PMEG045T050EPD PMEG045T100EPD PMEG045T150EIPD PMEG045T150EPD PMEG045V050EPD PMEG045V100EPD PMEG045V150EPD PMEG050T150EPD PMEG050V030EPD PMEG050V150EPD PMEG060V030EPD PMEG060V050EPD PMEG060V100EPD PMEG100V060ELPD PMEG100V080ELPD PMEG100V100ELPD
+$FPLIST
+ Nexperia*CFP15*SOT?1289*
+$ENDFPLIST
+DRAW
+P 2 0 1 0 50 0 -50 0 N
+P 4 0 1 8 50 50 50 -50 -50 0 50 50 N
+P 6 0 1 8 -75 25 -75 50 -50 50 -50 -50 -25 -50 -25 -25 N
+X A 1 150 0 100 L 50 50 1 1 P
+X A 2 150 0 100 L 50 50 1 1 P N
+X K 3 -150 0 100 R 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
 # Rohm_UMN1N
 #
 DEF Rohm_UMN1N D 0 40 Y N 4 F N
diff --git a/Diode_Bridge.dcm b/Diode_Bridge.dcm
index 6d92b7f03f..ac833374ce 100644
--- a/Diode_Bridge.dcm
+++ b/Diode_Bridge.dcm
@@ -636,6 +636,24 @@ K rectifier acdc
 F http://www.vishay.com/docs/89959/mbl104s.pdf
 $ENDCMP
 #
+$CMP MDB10S
+D Single-Phase Bridge Rectifier, 700V Vrms, 1A If, TSSOP-4
+K bridge diode rectifier ac dc acdc ac-dc
+F https://www.onsemi.com/pub/Collateral/MDB8S-D.PDF
+$ENDCMP
+#
+$CMP MDB6S
+D Single-Phase Bridge Rectifier, 420V Vrms, 1A If, TSSOP-4
+K bridge diode rectifier ac dc acdc ac-dc
+F https://www.onsemi.com/pub/Collateral/MDB8S-D.PDF
+$ENDCMP
+#
+$CMP MDB8S
+D Single-Phase Bridge Rectifier, 560V Vrms, 1A If, TSSOP-4
+K bridge diode rectifier ac dc acdc ac-dc
+F https://www.onsemi.com/pub/Collateral/MDB8S-D.PDF
+$ENDCMP
+#
 $CMP RB151
 D Single-Phase Bridge Rectifier, 35V Vrms, 1.5A If, WOG-like package
 K rectifier acdc
diff --git a/Diode_Bridge.lib b/Diode_Bridge.lib
index 1118233775..842320d7dc 100644
--- a/Diode_Bridge.lib
+++ b/Diode_Bridge.lib
@@ -368,6 +368,34 @@ X - 4 -300 0 100 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
+# MDB6S
+#
+DEF MDB6S D 0 20 Y Y 1 F N
+F0 "D" 150 250 50 H V C CNN
+F1 "MDB6S" 250 150 50 H V C CNN
+F2 "Package_SO:TSSOP-4_4.4x5mm_P4mm" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+ALIAS MDB8S MDB10S
+$FPLIST
+ TSSOP*4.4x5mm*P4mm*
+$ENDFPLIST
+DRAW
+P 2 1 1 0 -100 150 -50 100 N
+P 2 1 1 0 -50 -100 -100 -150 N
+P 2 1 1 0 100 -50 150 -100 N
+P 2 1 1 0 100 50 150 100 N
+P 4 1 1 0 -150 100 -100 50 -75 125 -150 100 N
+P 4 1 1 0 -100 -50 -150 -100 -75 -125 -100 -50 N
+P 4 1 1 0 50 100 100 150 125 75 50 100 N
+P 4 1 1 0 125 -75 50 -100 100 -150 125 -75 N
+P 5 1 1 0 -200 0 0 -200 200 0 0 200 -200 0 N
+X + 1 300 0 100 L 50 50 1 1 P
+X - 2 -300 0 100 R 50 50 1 1 P
+X ~~ 3 0 -300 100 U 50 50 1 1 P
+X ~~ 4 0 300 100 D 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
 # VS-KBPC1005
 #
 DEF VS-KBPC1005 D 0 0 Y Y 1 F N
diff --git a/Driver_FET.dcm b/Driver_FET.dcm
index 428c59f8d6..a425dd4601 100644
--- a/Driver_FET.dcm
+++ b/Driver_FET.dcm
@@ -12,6 +12,18 @@ K Driver, Dual MOSFET
 F https://www.infineon.com/dgdl/Infineon-1EDN7550B-DS-v02_00-EN.pdf?fileId=5546d46262b31d2e01635d9799ef264f
 $ENDCMP
 #
+$CMP 2ED21824S06J
+D 650V Half Bridge Gate Driver with Integrated Bootstrap Diode, 2.5A drive current, SOIC-14
+K Gate Driver MOSFET IGBT
+F https://www.infineon.com/dgdl/Infineon-2ED2182-4-S06F-J-DataSheet-v02_10-EN.pdf?fileId=5546d4626cb27db2016cb8d7368a29e3
+$ENDCMP
+#
+$CMP 2EDL23N06PJXUMA1
+D 600V Half Bridge Gate Driver with OCP and Integrated Bootstrap Diode, +1.8A/-2.5A drive current, SOIC-14
+K Gate Driver MOSFET IGBT
+F https://www.infineon.com/dgdl/Infineon-2EDL23x06xx-DS-v02_01-EN.pdf?fileId=5546d46146d18cb4014738a20c5236f0
+$ENDCMP
+#
 $CMP ACPL-336J
 D 2.5A Gate Drive Optocoupler with Integrated LED Driver, Active Miller Clamp, DESAT Detection, and Fault & UVLO Status Feedback, SOIC-16
 K Gate Driver IGBT
diff --git a/Driver_FET.lib b/Driver_FET.lib
index 2cd499dd66..b56eeaab80 100644
--- a/Driver_FET.lib
+++ b/Driver_FET.lib
@@ -23,6 +23,64 @@ X OUT_SNK 6 400 -100 100 L 50 50 1 1 O
 ENDDRAW
 ENDDEF
 #
+# 2ED21824S06J
+#
+DEF 2ED21824S06J U 0 20 Y Y 1 F N
+F0 "U" 50 525 50 H V L CNN
+F1 "2ED21824S06J" 50 450 50 H V L CNN
+F2 "Package_SO:SOIC-14_3.9x8.7mm_P1.27mm" 0 950 50 H I C CIN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ SOIC*3.9x8.7mm*P1.27mm*
+$ENDFPLIST
+DRAW
+S -300 -400 300 400 0 1 10 f
+X HIN 1 -400 100 100 R 50 50 1 1 I
+X NC 10 300 -100 100 L 50 50 1 1 N N
+X VS 11 400 -200 100 L 50 50 1 1 P
+X HO 12 400 200 100 L 50 50 1 1 O
+X VB 13 400 300 100 L 50 50 1 1 P
+X NC 14 300 100 100 L 50 50 1 1 N N
+X LIN 2 -400 0 100 R 50 50 1 1 I
+X VSS 3 -100 -500 100 U 50 50 1 1 W
+X DT 4 -400 -200 100 R 50 50 1 1 P
+X COM 5 100 -500 100 U 50 50 1 1 W
+X LO 6 400 -300 100 L 50 50 1 1 O
+X VCC 7 0 500 100 D 50 50 1 1 W
+X NC 8 -300 200 100 R 50 50 1 1 N N
+X NC 9 -300 -100 100 R 50 50 1 1 N N
+ENDDRAW
+ENDDEF
+#
+# 2EDL23N06PJXUMA1
+#
+DEF 2EDL23N06PJXUMA1 U 0 20 Y Y 1 F N
+F0 "U" 50 525 50 H V L CNN
+F1 "2EDL23N06PJXUMA1" 50 450 50 H V L CNN
+F2 "Package_SO:SOIC-14_3.9x8.7mm_P1.27mm" 0 950 50 H I C CIN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ SOIC*3.9x8.7mm*P1.27mm*
+$ENDFPLIST
+DRAW
+S -300 -400 300 400 0 1 10 f
+X VDD 1 0 500 100 D 50 50 1 1 W
+X VS 10 400 -200 100 L 50 50 1 1 P
+X HO 11 400 200 100 L 50 50 1 1 O
+X VB 12 400 300 100 L 50 50 1 1 P
+X NC 13 300 0 100 L 50 50 1 1 N N
+X NC 14 300 100 100 L 50 50 1 1 N N
+X HIN 2 -400 100 100 R 50 50 1 1 I
+X LIN 3 -400 0 100 R 50 50 1 1 I
+X EN/FLT 4 -400 -100 100 R 50 50 1 1 C
+X GND 5 -100 -500 100 U 50 50 1 1 W
+X PGND 6 100 -500 100 U 50 50 1 1 W
+X LO 7 400 -300 100 L 50 50 1 1 O
+X NC 8 -300 200 100 R 50 50 1 1 N N
+X NC 9 -300 -200 100 R 50 50 1 1 N N
+ENDDRAW
+ENDDEF
+#
 # ACPL-336J
 #
 DEF ACPL-336J U 0 20 Y Y 1 F N
diff --git a/Driver_LED.dcm b/Driver_LED.dcm
index c7d547cc5c..31ea87c629 100644
--- a/Driver_LED.dcm
+++ b/Driver_LED.dcm
@@ -168,6 +168,30 @@ K Switching LED driver
 F http://www.issi.com/WW/pdf/31LT3360.pdf
 $ENDCMP
 #
+$CMP LED1642GWPTR
+D 16-channel LED driver with error detection, current gain control and 12/16 bit PWM brightness control, QSOP-24
+K PWM LED driver error detection brightness QSOP-24
+F https://www.st.com/resource/en/datasheet/led1642gw.pdf
+$ENDCMP
+#
+$CMP LED1642GWQTR
+D 16-channel LED driver with error detection, current gain control and 12/16 bit PWM brightness control, QFN-24
+K PWM LED driver error detection brightness QFN-24
+F https://www.st.com/resource/en/datasheet/led1642gw.pdf
+$ENDCMP
+#
+$CMP LED1642GWTTR
+D 16-channel LED driver with error detection, current gain control and 12/16 bit PWM brightness control, TSSOP-24
+K PWM LED driver error detection brightness TSSOP-24
+F https://www.st.com/resource/en/datasheet/led1642gw.pdf
+$ENDCMP
+#
+$CMP LED1642GWXTTR
+D 16-channel LED driver with error detection, current gain control and 12/16 bit PWM brightness control, TSSOP-24
+K PWM LED driver error detection brightness TSSOP-24
+F https://www.st.com/resource/en/datasheet/led1642gw.pdf
+$ENDCMP
+#
 $CMP LED5000
 D 3A monolithic step-down current source with dimming, HSOP-8
 K LED buck driver
diff --git a/Driver_LED.lib b/Driver_LED.lib
index a492b37485..7d4c68896d 100644
--- a/Driver_LED.lib
+++ b/Driver_LED.lib
@@ -874,6 +874,164 @@ X VIN 5 -350 200 100 R 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
+# LED1642GWPTR
+#
+DEF LED1642GWPTR U 0 20 Y Y 1 F N
+F0 "U" -500 850 50 H V L CNN
+F1 "LED1642GWPTR" 100 850 50 H V L CNN
+F2 "Package_SO:QSOP-24_3.9x8.7mm_P0.635mm" 25 -975 50 H I L CNN
+F3 "" -400 700 50 H I C CNN
+$FPLIST
+ QSOP*3.9x8.7mm*P0.635mm*
+$ENDFPLIST
+DRAW
+S -500 800 500 -900 0 1 10 f
+X GND 1 0 -1000 100 U 50 50 1 1 W
+X OUT5 10 600 200 100 L 50 50 1 1 O
+X OUT6 11 600 100 100 L 50 50 1 1 O
+X OUT7 12 600 0 100 L 50 50 1 1 O
+X OUT8 13 600 -100 100 L 50 50 1 1 O
+X OUT9 14 600 -200 100 L 50 50 1 1 O
+X OUT10 15 600 -300 100 L 50 50 1 1 O
+X OUT11 16 600 -400 100 L 50 50 1 1 O
+X OUT12 17 600 -500 100 L 50 50 1 1 O
+X OUT13 18 600 -600 100 L 50 50 1 1 O
+X OUT14 19 600 -700 100 L 50 50 1 1 O
+X SDI 2 -600 400 100 R 50 50 1 1 I
+X OUT15 20 600 -800 100 L 50 50 1 1 O
+X PWCLK 21 -600 0 100 R 50 50 1 1 I
+X SDO 22 -600 500 100 R 50 50 1 1 O
+X R-EXT 23 -600 -500 100 R 50 50 1 1 P
+X VDD 24 0 900 100 D 50 50 1 1 W
+X CLK 3 -600 300 100 R 50 50 1 1 I
+X LE 4 -600 200 100 R 50 50 1 1 I
+X OUT0 5 600 700 100 L 50 50 1 1 O
+X OUT1 6 600 600 100 L 50 50 1 1 O
+X OUT2 7 600 500 100 L 50 50 1 1 O
+X OUT3 8 600 400 100 L 50 50 1 1 O
+X OUT4 9 600 300 100 L 50 50 1 1 O
+ENDDRAW
+ENDDEF
+#
+# LED1642GWQTR
+#
+DEF LED1642GWQTR U 0 20 Y Y 1 F N
+F0 "U" -500 850 50 H V L CNN
+F1 "LED1642GWQTR" 100 850 50 H V L CNN
+F2 "Package_DFN_QFN:QFN-24-1EP_4x4mm_P0.5mm_EP2.15x2.15mm" 25 -975 50 H I L CNN
+F3 "" -400 700 50 H I C CNN
+$FPLIST
+ QFN*1EP*4x4mm*P0.5mm*
+$ENDFPLIST
+DRAW
+S -500 800 500 -900 0 1 10 f
+X LE 1 -600 200 100 R 50 50 1 1 I
+X OUT8 10 600 -100 100 L 50 50 1 1 O
+X OUT9 11 600 -200 100 L 50 50 1 1 O
+X OUT10 12 600 -300 100 L 50 50 1 1 O
+X OUT11 13 600 -400 100 L 50 50 1 1 O
+X OUT12 14 600 -500 100 L 50 50 1 1 O
+X OUT13 15 600 -600 100 L 50 50 1 1 O
+X OUT14 16 600 -700 100 L 50 50 1 1 O
+X OUT15 17 600 -800 100 L 50 50 1 1 O
+X PWCLK 18 -600 0 100 R 50 50 1 1 I
+X SDO 19 -600 500 100 R 50 50 1 1 O
+X OUT0 2 600 700 100 L 50 50 1 1 O
+X R-EXT 20 -600 -500 100 R 50 50 1 1 P
+X VDD 21 0 900 100 D 50 50 1 1 W
+X GND 22 0 -1000 100 U 50 50 1 1 W
+X SDI 23 -600 400 100 R 50 50 1 1 I
+X CLK 24 -600 300 100 R 50 50 1 1 I
+X EP 25 -200 -1000 100 U 50 50 1 1 P
+X OUT1 3 600 600 100 L 50 50 1 1 O
+X OUT2 4 600 500 100 L 50 50 1 1 O
+X OUT3 5 600 400 100 L 50 50 1 1 O
+X OUT4 6 600 300 100 L 50 50 1 1 O
+X OUT5 7 600 200 100 L 50 50 1 1 O
+X OUT6 8 600 100 100 L 50 50 1 1 O
+X OUT7 9 600 0 100 L 50 50 1 1 O
+ENDDRAW
+ENDDEF
+#
+# LED1642GWTTR
+#
+DEF LED1642GWTTR U 0 20 Y Y 1 F N
+F0 "U" -500 850 50 H V L CNN
+F1 "LED1642GWTTR" 100 850 50 H V L CNN
+F2 "Package_SO:TSSOP-24_4.4x7.8mm_P0.65mm" 25 -975 50 H I L CNN
+F3 "" -400 700 50 H I C CNN
+$FPLIST
+ TSSOP*4.4x7.8mm*P0.65mm*
+$ENDFPLIST
+DRAW
+S -500 800 500 -900 0 1 10 f
+X GND 1 0 -1000 100 U 50 50 1 1 W
+X OUT5 10 600 200 100 L 50 50 1 1 O
+X OUT6 11 600 100 100 L 50 50 1 1 O
+X OUT7 12 600 0 100 L 50 50 1 1 O
+X OUT8 13 600 -100 100 L 50 50 1 1 O
+X OUT9 14 600 -200 100 L 50 50 1 1 O
+X OUT10 15 600 -300 100 L 50 50 1 1 O
+X OUT11 16 600 -400 100 L 50 50 1 1 O
+X OUT12 17 600 -500 100 L 50 50 1 1 O
+X OUT13 18 600 -600 100 L 50 50 1 1 O
+X OUT14 19 600 -700 100 L 50 50 1 1 O
+X SDI 2 -600 400 100 R 50 50 1 1 I
+X OUT15 20 600 -800 100 L 50 50 1 1 O
+X PWCLK 21 -600 0 100 R 50 50 1 1 I
+X SDO 22 -600 500 100 R 50 50 1 1 O
+X R-EXT 23 -600 -500 100 R 50 50 1 1 P
+X VDD 24 0 900 100 D 50 50 1 1 W
+X CLK 3 -600 300 100 R 50 50 1 1 I
+X LE 4 -600 200 100 R 50 50 1 1 I
+X OUT0 5 600 700 100 L 50 50 1 1 O
+X OUT1 6 600 600 100 L 50 50 1 1 O
+X OUT2 7 600 500 100 L 50 50 1 1 O
+X OUT3 8 600 400 100 L 50 50 1 1 O
+X OUT4 9 600 300 100 L 50 50 1 1 O
+ENDDRAW
+ENDDEF
+#
+# LED1642GWXTTR
+#
+DEF LED1642GWXTTR U 0 20 Y Y 1 F N
+F0 "U" -500 850 50 H V L CNN
+F1 "LED1642GWXTTR" 100 850 50 H V L CNN
+F2 "Package_SO:TSSOP-24-1EP_4.4x7.8mm_P0.65mm_EP3.2x5mm" 25 -975 50 H I L CNN
+F3 "" -400 700 50 H I C CNN
+$FPLIST
+ TSSOP*1EP*4.4x7.8mm*P0.65mm*
+$ENDFPLIST
+DRAW
+S -500 800 500 -900 0 1 10 f
+X GND 1 0 -1000 100 U 50 50 1 1 W
+X OUT5 10 600 200 100 L 50 50 1 1 O
+X OUT6 11 600 100 100 L 50 50 1 1 O
+X OUT7 12 600 0 100 L 50 50 1 1 O
+X OUT8 13 600 -100 100 L 50 50 1 1 O
+X OUT9 14 600 -200 100 L 50 50 1 1 O
+X OUT10 15 600 -300 100 L 50 50 1 1 O
+X OUT11 16 600 -400 100 L 50 50 1 1 O
+X OUT12 17 600 -500 100 L 50 50 1 1 O
+X OUT13 18 600 -600 100 L 50 50 1 1 O
+X OUT14 19 600 -700 100 L 50 50 1 1 O
+X SDI 2 -600 400 100 R 50 50 1 1 I
+X OUT15 20 600 -800 100 L 50 50 1 1 O
+X PWCLK 21 -600 0 100 R 50 50 1 1 I
+X SDO 22 -600 500 100 R 50 50 1 1 O
+X R-EXT 23 -600 -500 100 R 50 50 1 1 P
+X VDD 24 0 900 100 D 50 50 1 1 W
+X EP 25 -200 -1000 100 U 50 50 1 1 P
+X CLK 3 -600 300 100 R 50 50 1 1 I
+X LE 4 -600 200 100 R 50 50 1 1 I
+X OUT0 5 600 700 100 L 50 50 1 1 O
+X OUT1 6 600 600 100 L 50 50 1 1 O
+X OUT2 7 600 500 100 L 50 50 1 1 O
+X OUT3 8 600 400 100 L 50 50 1 1 O
+X OUT4 9 600 300 100 L 50 50 1 1 O
+ENDDRAW
+ENDDEF
+#
 # LED5000
 #
 DEF LED5000 U 0 20 Y Y 1 F N
diff --git a/Driver_Motor.dcm b/Driver_Motor.dcm
index 1e69026f4b..664f058e2f 100644
--- a/Driver_Motor.dcm
+++ b/Driver_Motor.dcm
@@ -24,6 +24,12 @@ K Full-bridge h-bridge
 F www.allegromicro.com/~/media/Files/Datasheets/A4952-3-Datasheet.ashx?la=en
 $ENDCMP
 #
+$CMP A4954
+D Fullbridge PWM Motor Driver, UVLO, OCP, Current Limit, Short Circuit Protection, TSSOP-16
+K Fullbridge, Stepper Driver
+F https://www.allegromicro.com/-/media/Files/Datasheets/A4954-Datasheet.ashx
+$ENDCMP
+#
 $CMP DRV8308
 D Brushless DC motor controller, closed loop, hall sensor inputs, current limiting, SPI interface
 K bldc mosfet-driver hall-sensor
@@ -102,6 +108,30 @@ K half bridge driver
 F http://www.ti.com/lit/ds/symlink/drv8837.pdf
 $ENDCMP
 #
+$CMP DRV8847PWP
+D Dual H-Bridge Motor Driver, 1A, HTSSOP-16
+K Dual H-Bridge motor driver
+F https://www.ti.com/lit/ds/symlink/drv8847.pdf
+$ENDCMP
+#
+$CMP DRV8847PWR
+D Dual H-Bridge Motor Driver, 1A, TSSOP-16
+K Dual H-Bridge motor driver
+F https://www.ti.com/lit/ds/symlink/drv8847.pdf
+$ENDCMP
+#
+$CMP DRV8847RTE
+D Dual H-Bridge Motor Driver, 1A, WQFN-16
+K Dual H-Bridge motor driver
+F https://www.ti.com/lit/ds/symlink/drv8847.pdf
+$ENDCMP
+#
+$CMP DRV8847SPWR
+D Dual H-Bridge Motor Driver, 1A, I2C Interface, TSSOP-16
+K Dual H-Bridge motor driver
+F https://www.ti.com/lit/ds/symlink/drv8847.pdf
+$ENDCMP
+#
 $CMP DRV8848
 D Dual H-Bridge motor driver, PWM controlled, single/dual brushed DC stepper, +2 to +18 VDD, TSSOP-16
 K Dual H-Bridge motor driver
diff --git a/Driver_Motor.lib b/Driver_Motor.lib
index 1bfd12b845..0d6b528a64 100644
--- a/Driver_Motor.lib
+++ b/Driver_Motor.lib
@@ -52,6 +52,38 @@ X OUT2 9 400 200 100 L 50 50 1 1 w
 ENDDRAW
 ENDDEF
 #
+# A4954
+#
+DEF A4954 U 0 20 Y Y 1 F N
+F0 "U" -450 450 50 H V C CNN
+F1 "A4954" 400 450 50 H V C CNN
+F2 "Package_SO:TSSOP-16-1EP_4.4x5mm_P0.65mm_EP3x3mm" 0 -650 50 H I C CNN
+F3 "" -700 -500 50 H I C CNN
+$FPLIST
+ TSSOP*1EP*4.4x5mm*P0.65mm*
+$ENDFPLIST
+DRAW
+S -500 400 500 -400 0 1 10 f
+X GND 1 0 -500 100 U 50 50 1 1 W
+X OUT1 10 600 300 100 L 50 50 1 1 w
+X LSS12 11 600 100 100 L 50 50 1 1 W
+X OUT2 12 600 200 100 L 50 50 1 1 w
+X OUT3 13 600 -100 100 L 50 50 1 1 w
+X LSS34 14 600 -300 100 L 50 50 1 1 W
+X OUT4 15 600 -200 100 L 50 50 1 1 w
+X VBB 16 0 500 100 D 50 50 1 1 P N
+X GND 17 0 -500 100 U 50 50 1 1 P N
+X VREF34 2 -600 -300 100 R 50 50 1 1 I
+X IN3 3 -600 -100 100 R 50 50 1 1 I
+X IN4 4 -600 -200 100 R 50 50 1 1 I
+X IN2 5 -600 200 100 R 50 50 1 1 I
+X IN1 6 -600 300 100 R 50 50 1 1 I
+X VREF12 7 -600 100 100 R 50 50 1 1 I
+X GND 8 0 -500 100 U 50 50 1 1 P N
+X VBB 9 0 500 100 D 50 50 1 1 W
+ENDDRAW
+ENDDEF
+#
 # DRV8308
 #
 DEF DRV8308 U 0 40 Y Y 1 F N
@@ -474,6 +506,132 @@ X GND 9 0 -500 100 U 50 50 1 1 P N
 ENDDRAW
 ENDDEF
 #
+# DRV8847PWP
+#
+DEF DRV8847PWP U 0 20 Y Y 1 F N
+F0 "U" -350 550 50 H V C CNN
+F1 "DRV8847PWP" 350 550 50 H V C CNN
+F2 "Package_SO:HTSSOP-16-1EP_4.4x5mm_P0.65mm_EP3.4x5mm_Mask2.46x2.31mm_ThermalVias" 0 650 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ HTSSOP*1EP*4.4x5mm*P0.65mm*
+$ENDFPLIST
+DRAW
+S -400 -500 400 500 0 1 10 f
+X ~SLEEP 1 -500 400 100 R 50 50 1 1 I
+X IN4 10 -500 -400 100 R 50 50 1 1 I
+X TRQ 11 -500 100 100 R 50 50 1 1 I
+X VM 12 0 600 100 D 50 50 1 1 W
+X GND 13 -100 -600 100 U 50 50 1 1 W
+X MODE 14 -500 300 100 R 50 50 1 1 I
+X IN2 15 -500 -200 100 R 50 50 1 1 I
+X IN1 16 -500 -100 100 R 50 50 1 1 I
+X PPAD 17 0 -600 100 U 50 50 1 1 W
+X OUT1 2 500 400 100 L 50 50 1 1 O
+X ISEN12 3 500 -200 100 L 50 50 1 1 P
+X OUT2 4 500 300 100 L 50 50 1 1 O
+X OUT4 5 500 0 100 L 50 50 1 1 O
+X ISEN34 6 500 -400 100 L 50 50 1 1 P
+X OUT3 7 500 100 100 L 50 50 1 1 O
+X ~FAULT 8 -500 200 100 R 50 50 1 1 C
+X IN3 9 -500 -300 100 R 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# DRV8847PWR
+#
+DEF DRV8847PWR U 0 20 Y Y 1 F N
+F0 "U" -350 550 50 H V C CNN
+F1 "DRV8847PWR" 350 550 50 H V C CNN
+F2 "Package_SO:TSSOP-16_4.4x5mm_P0.65mm" 0 650 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ TSSOP*4.4x5mm*P0.65mm*
+$ENDFPLIST
+DRAW
+S -400 -500 400 500 0 1 10 f
+X ~SLEEP 1 -500 400 100 R 50 50 1 1 I
+X IN4 10 -500 -400 100 R 50 50 1 1 I
+X TRQ 11 -500 100 100 R 50 50 1 1 I
+X VM 12 0 600 100 D 50 50 1 1 W
+X GND 13 0 -600 100 U 50 50 1 1 W
+X MODE 14 -500 300 100 R 50 50 1 1 I
+X IN2 15 -500 -200 100 R 50 50 1 1 I
+X IN1 16 -500 -100 100 R 50 50 1 1 I
+X OUT1 2 500 400 100 L 50 50 1 1 O
+X ISEN12 3 500 -200 100 L 50 50 1 1 P
+X OUT2 4 500 300 100 L 50 50 1 1 O
+X OUT4 5 500 0 100 L 50 50 1 1 O
+X ISEN34 6 500 -400 100 L 50 50 1 1 P
+X OUT3 7 500 100 100 L 50 50 1 1 O
+X ~FAULT 8 -500 200 100 R 50 50 1 1 C
+X IN3 9 -500 -300 100 R 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# DRV8847RTE
+#
+DEF DRV8847RTE U 0 20 Y Y 1 F N
+F0 "U" -350 550 50 H V C CNN
+F1 "DRV8847RTE" 350 550 50 H V C CNN
+F2 "Package_DFN_QFN:QFN-16-1EP_3x3mm_P0.5mm_EP1.7x1.7mm_ThermalVias" 0 650 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ QFN*1EP*3x3mm*P0.5mm*
+$ENDFPLIST
+DRAW
+S -400 -500 400 500 0 1 10 f
+X ISEN12 1 500 -200 100 L 50 50 1 1 P
+X VM 10 0 600 100 D 50 50 1 1 W
+X GND 11 -100 -600 100 U 50 50 1 1 W
+X MODE 12 -500 300 100 R 50 50 1 1 I
+X IN2 13 -500 -200 100 R 50 50 1 1 I
+X IN1 14 -500 -100 100 R 50 50 1 1 I
+X ~SLEEP 15 -500 400 100 R 50 50 1 1 I
+X OUT1 16 500 400 100 L 50 50 1 1 O
+X PPAD 17 0 -600 100 U 50 50 1 1 W
+X OUT2 2 500 300 100 L 50 50 1 1 O
+X OUT4 3 500 0 100 L 50 50 1 1 O
+X ISEN34 4 500 -400 100 L 50 50 1 1 P
+X OUT3 5 500 100 100 L 50 50 1 1 O
+X ~FAULT 6 -500 200 100 R 50 50 1 1 C
+X IN3 7 -500 -300 100 R 50 50 1 1 I
+X IN4 8 -500 -400 100 R 50 50 1 1 I
+X TRQ 9 -500 100 100 R 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# DRV8847SPWR
+#
+DEF DRV8847SPWR U 0 20 Y Y 1 F N
+F0 "U" -350 550 50 H V C CNN
+F1 "DRV8847SPWR" 350 550 50 H V C CNN
+F2 "Package_SO:TSSOP-16_4.4x5mm_P0.65mm" 0 650 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ TSSOP*4.4x5mm*P0.65mm*
+$ENDFPLIST
+DRAW
+S -400 -500 400 500 0 1 10 f
+X ~SLEEP 1 -500 400 100 R 50 50 1 1 I
+X IN4 10 -500 -400 100 R 50 50 1 1 I
+X SCL 11 -500 100 100 R 50 50 1 1 I
+X VM 12 0 600 100 D 50 50 1 1 W
+X GND 13 0 -600 100 U 50 50 1 1 W
+X SDA 14 -500 300 100 R 50 50 1 1 B
+X IN2 15 -500 -200 100 R 50 50 1 1 I
+X IN1 16 -500 -100 100 R 50 50 1 1 I
+X OUT1 2 500 400 100 L 50 50 1 1 O
+X ISEN12 3 500 -200 100 L 50 50 1 1 P
+X OUT2 4 500 300 100 L 50 50 1 1 O
+X OUT4 5 500 0 100 L 50 50 1 1 O
+X ISEN34 6 500 -400 100 L 50 50 1 1 P
+X OUT3 7 500 100 100 L 50 50 1 1 O
+X ~FAULT 8 -500 200 100 R 50 50 1 1 C
+X IN3 9 -500 -300 100 R 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
 # DRV8848
 #
 DEF DRV8848 U 0 40 Y Y 1 F N
diff --git a/FPGA_Lattice.dcm b/FPGA_Lattice.dcm
index 5df230622e..8d68e40231 100644
--- a/FPGA_Lattice.dcm
+++ b/FPGA_Lattice.dcm
@@ -6,6 +6,12 @@ K FPGA programmable logic
 F http://www.latticesemi.com/Products/FPGAandCPLD/iCE40
 $ENDCMP
 #
+$CMP ICE40HX4K-BG121
+D iCE40 HX FPGA, 3520 LUTs, 1.2V, BGA-121
+K FPGA programmable logic
+F http://www.latticesemi.com/Products/FPGAandCPLD/iCE40
+$ENDCMP
+#
 $CMP ICE40HX4K-TQ144
 D iCE40 HX FPGA, 3520 LUTs, 1.2V, TQFP-144
 K FPGA programmable logic
@@ -18,6 +24,12 @@ K FPGA programmable logic
 F http://www.latticesemi.com/Products/FPGAandCPLD/iCE40
 $ENDCMP
 #
+$CMP ICE40UL1K-SWG16
+D iCE40 UltraPlus FPGA, 1.2V, WLCSP-16
+K FPGA programmable logic
+F https://www.latticesemi.com/view_document?document_id=50945
+$ENDCMP
+#
 $CMP ICE40UP5K-SG48ITR
 D iCE40 UltraPlus FPGA, 5280 LUTs, 1.2V, 48-pin QFN
 K FPGA programmable logic
diff --git a/FPGA_Lattice.lib b/FPGA_Lattice.lib
index d26449c185..1e878ce253 100644
--- a/FPGA_Lattice.lib
+++ b/FPGA_Lattice.lib
@@ -334,6 +334,7 @@ F0 "U" 100 1750 50 H V C CNN
 F1 "ICE40HX8K-BG121" 400 1650 50 H V C CNN
 F2 "Package_BGA:BGA-121_9.0x9.0mm_Layout11x11_P0.8mm_Ball0.4mm_Pad0.35mm_NSMD" 0 -1450 50 H I C CNN
 F3 "" -850 1000 50 H I C CNN
+ALIAS ICE40HX4K-BG121
 $FPLIST
  BGA*9.0x9.0mm*Layout11x11*P0.8mm*Ball0.4mm*
 $ENDFPLIST
@@ -467,6 +468,37 @@ X GNDPLL0 L6 600 0 150 L 50 50 5 1 W
 ENDDRAW
 ENDDEF
 #
+# ICE40UL1K-SWG16
+#
+DEF ICE40UL1K-SWG16 U 0 20 Y Y 1 F N
+F0 "U" 350 1100 50 H V C CNN
+F1 "ICE40UL1K-SWG16" 700 1000 50 H V C CNN
+F2 "Package_CSP:WLCSP-16_1.409x1.409mm_P0.35mm" -250 -50 50 H I C CNN
+F3 "" -250 150 50 H I C CNN
+$FPLIST
+ WLCSP*1.409x1.409mm*P0.35mm*
+$ENDFPLIST
+DRAW
+S -700 800 700 -800 0 1 10 f
+X IRLED A1 800 200 100 L 50 50 1 1 B
+X BARCODE A2 800 100 100 L 50 50 1 1 B
+X GND A3 200 -900 100 U 50 50 1 1 W
+X RGB1 A4 800 -100 100 L 50 50 1 1 B
+X GND_LED B1 -200 -900 100 U 50 50 1 1 W
+X CRESET_B B2 -800 -200 100 R 50 50 1 1 I
+X VPP_2V5_VCCIO0 B3 0 900 100 D 50 50 1 1 W
+X RGB0 B4 800 -200 100 L 50 50 1 1 B
+X IOB_16A_SCK C1 -800 0 100 R 50 50 1 1 B
+X IOB_14A_SO C2 -800 200 100 R 50 50 1 1 B
+X IOB_8A_G4_CDONE C3 -800 -300 100 R 50 50 1 1 B
+X RGB2 C4 800 0 100 L 50 50 1 1 B
+X IOB_17B_SS D1 -800 100 100 R 50 50 1 1 B
+X IOB_15B_SI D2 -800 300 100 R 50 50 1 1 B
+X VCCIO D3 -200 900 100 D 50 50 1 1 W
+X VCC D4 200 900 100 D 50 50 1 1 W
+ENDDRAW
+ENDDEF
+#
 # ICE40UP5K-SG48ITR
 #
 DEF ICE40UP5K-SG48ITR U 0 20 Y Y 4 L N
diff --git a/Filter.dcm b/Filter.dcm
index 6aa44ee3ec..88ba56e4db 100644
--- a/Filter.dcm
+++ b/Filter.dcm
@@ -78,6 +78,42 @@ K EMI Filter SMD Murata
 F https://www.murata.com/en-us/products/productdetail.aspx?cate=luNoiseSupprFilteBlockType&partno=BNX025H01%23
 $ENDCMP
 #
+$CMP Choke_Schaffner_RN102-0.3-02-12M
+D Common mode choke, 300mA, 300VAC, 12mH, 1.1 ohm, RN-102
+K common-mode common mode choke powerline power line filter
+F https://www.schaffner.com/products/download/product/datasheet/rn-series-common-mode-chokes-new/
+$ENDCMP
+#
+$CMP Choke_Schaffner_RN102-0.3-02-22M
+D Common mode choke, 300mA, 300VAC, 22mH, 1.3 ohm, RN-102
+K common-mode common mode choke powerline power line filter
+F https://www.schaffner.com/products/download/product/datasheet/rn-series-common-mode-chokes-new/
+$ENDCMP
+#
+$CMP Choke_Schaffner_RN102-0.6-02-4M4
+D Common mode choke, 600mA, 300VAC, 4.4mH, 380mohm, RN-102
+K common-mode common mode choke powerline power line filter
+F https://www.schaffner.com/products/download/product/datasheet/rn-series-common-mode-chokes-new/
+$ENDCMP
+#
+$CMP Choke_Schaffner_RN102-1-02-3M0
+D Common mode choke, 1A, 300VAC, 3mH, 210mohm, RN-102
+K common-mode common mode choke powerline power line filter
+F https://www.schaffner.com/products/download/product/datasheet/rn-series-common-mode-chokes-new/
+$ENDCMP
+#
+$CMP Choke_Schaffner_RN102-1.5-02-1M6
+D Common mode choke, 1.5A, 300VAC, 1.6mH, 94mohm, RN-102
+K common-mode common mode choke powerline power line filter
+F https://www.schaffner.com/products/download/product/datasheet/rn-series-common-mode-chokes-new/
+$ENDCMP
+#
+$CMP Choke_Schaffner_RN102-2-02-1M1
+D Common mode choke, 2A, 300VAC, 1.1mH, 70mohm, RN-102
+K common-mode common mode choke powerline power line filter
+F https://www.schaffner.com/products/download/product/datasheet/rn-series-common-mode-chokes-new/
+$ENDCMP
+#
 $CMP FN405-0.5-02
 D 0.5A, 250VAC, 50/60Hz line filter
 K EMI
diff --git a/Filter.lib b/Filter.lib
index cf90d70524..4e281dbf98 100644
--- a/Filter.lib
+++ b/Filter.lib
@@ -145,6 +145,43 @@ X CG 4 400 -100 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
+# Choke_Schaffner_RN102-0.3-02-22M
+#
+DEF Choke_Schaffner_RN102-0.3-02-22M FL 0 20 Y N 1 F N
+F0 "FL" 0 200 50 H V C CNN
+F1 "Choke_Schaffner_RN102-0.3-02-22M" 0 -200 50 H V C CNN
+F2 "Inductor_THT:Choke_Schaffner_RN102-04-14.0x14.0mm" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+ALIAS Choke_Schaffner_RN102-0.3-02-12M Choke_Schaffner_RN102-0.6-02-4M4 Choke_Schaffner_RN102-1-02-3M0 Choke_Schaffner_RN102-1.5-02-1M6 Choke_Schaffner_RN102-2-02-1M1
+$FPLIST
+ Choke*Schaffner*RN102*
+$ENDFPLIST
+DRAW
+A -80 -80 20 1 1799 1 1 0 N -60 -80 -100 -80
+A -80 80 20 -1799 -1 1 1 0 N -100 80 -60 80
+A -40 -80 20 1 1799 1 1 0 N -20 -80 -60 -80
+A -40 80 20 -1799 -1 1 1 0 N -60 80 -20 80
+A 0 -80 20 1 1799 1 1 0 N 20 -80 -20 -80
+A 0 80 20 -1799 -1 1 1 0 N -20 80 20 80
+A 40 -80 20 1 1799 1 1 0 N 60 -80 20 -80
+A 40 80 20 -1799 -1 1 1 0 N 20 80 60 80
+A 80 -80 20 1 1799 1 1 0 N 100 -80 60 -80
+A 80 80 20 -1799 -1 1 1 0 N 60 80 100 80
+C -120 -50 10 1 1 0 F
+C -120 60 10 1 1 0 F
+P 2 1 1 0 -100 -80 -100 -100 N
+P 2 1 1 0 -100 20 100 20 N
+P 2 1 1 0 -100 80 -100 100 N
+P 2 1 1 0 100 -80 100 -100 N
+P 2 1 1 0 100 -20 -100 -20 N
+P 2 1 1 0 100 100 100 80 N
+X 1 1 -200 100 100 R 50 50 1 1 P
+X 2 2 200 100 100 L 50 50 1 1 P
+X 3 3 -200 -100 100 R 50 50 1 1 P
+X 4 4 200 -100 100 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
 # FN405-0.5-02
 #
 DEF FN405-0.5-02 FL 0 20 Y Y 1 F N
diff --git a/Interface.dcm b/Interface.dcm
index 45e4e9ba8c..94c528bd1a 100644
--- a/Interface.dcm
+++ b/Interface.dcm
@@ -243,12 +243,6 @@ K driver rs485 rs422 differential
 F https://www.analog.com/media/en/technical-documentation/data-sheets/16889fa.pdf
 $ENDCMP
 #
-$CMP LTC4317
-D Dual I2C/SMBus Address-Translator, DFN-16
-K I2C Translator 4kV-ESD Level-Shifter Hot-Swap
-F https://www.analog.com/media/en/technical-documentation/data-sheets/4317fa.pdf
-$ENDCMP
-#
 $CMP LTC6957xDD-1
 D Low Phase Noise, Dual Output Buffer/Driver/Logic Converter, LVPECL, DFN-12
 K LTC clock converter
diff --git a/Interface.lib b/Interface.lib
index 784334f457..575612f071 100644
--- a/Interface.lib
+++ b/Interface.lib
@@ -454,23 +454,22 @@ ENDDEF
 #
 # 8288
 #
-DEF 8288 U 0 40 Y Y 1 F N
+DEF 8288 U 0 20 Y Y 1 F N
 F0 "U" -550 800 50 H V L CNN
 F1 "8288" 350 800 50 H V L CNN
 F2 "Package_DIP:DIP-20_W7.62mm" 0 0 50 H I C CIN
 F3 "" -550 800 50 H I C CNN
 $FPLIST
  DIP*W7.62mm*
- PDIP*W7.62mm*
 $ENDFPLIST
 DRAW
 S -550 -750 550 750 0 0 10 f
 X IOB 1 -700 -400 150 R 50 50 1 1 I
 X GND 10 0 -900 150 U 50 50 1 1 W
-X ~IOWC~ 11 700 400 150 L 50 50 1 1 O
-X ~AIOWC~ 12 700 600 150 L 50 50 1 1 O
-X ~IORC~ 13 700 100 150 L 50 50 1 1 O
-X ~INTA~ 14 700 0 150 L 50 50 1 1 O
+X ~IOWC~ 11 700 400 150 L 50 50 1 1 T
+X ~AIOWC~ 12 700 600 150 L 50 50 1 1 T
+X ~IORC~ 13 700 100 150 L 50 50 1 1 T
+X ~INTA~ 14 700 0 150 L 50 50 1 1 T
 X CEN 15 -700 -500 150 R 50 50 1 1 I
 X DEN 16 700 -600 150 L 50 50 1 1 O
 X MCE/~PDEN~ 17 700 -500 150 L 50 50 1 1 O
@@ -482,9 +481,9 @@ X ~S1~ 3 -700 500 150 R 50 50 1 1 I
 X DT/~R~ 4 700 -300 150 L 50 50 1 1 O
 X ALE 5 700 -400 150 L 50 50 1 1 O
 X ~AEN~ 6 -700 -200 150 R 50 50 1 1 I
-X ~MRDC~ 7 700 200 150 L 50 50 1 1 O
-X ~AMWC~ 8 700 500 150 L 50 50 1 1 O
-X ~MWTC~ 9 700 300 150 L 50 50 1 1 O
+X ~MRDC~ 7 700 200 150 L 50 50 1 1 T
+X ~AMWC~ 8 700 500 150 L 50 50 1 1 T
+X ~MWTC~ 9 700 300 150 L 50 50 1 1 T
 ENDDRAW
 ENDDEF
 #
@@ -1982,38 +1981,6 @@ X GND 8 0 -300 100 U 50 50 3 1 W
 ENDDRAW
 ENDDEF
 #
-# LTC4317
-#
-DEF LTC4317 U 0 20 Y Y 1 F N
-F0 "U" -350 650 50 H V C CNN
-F1 "LTC4317" 250 650 50 H V C CNN
-F2 "Package_DFN_QFN:DFN-16-1EP_3x5mm_P0.5mm_EP1.66x4.4mm" 0 -1100 50 H I C CNN
-F3 "" -600 1650 50 H I C CNN
-$FPLIST
- DFN*1EP*3x5mm*P0.5mm*
-$ENDFPLIST
-DRAW
-S -400 600 400 -600 0 1 10 f
-X GND 1 0 -700 100 U 50 50 1 1 W
-X READY1 10 500 500 100 L 50 50 1 1 C
-X SDAOUT2 11 500 -200 100 L 50 50 1 1 B
-X SDAIN 12 -500 100 100 R 50 50 1 1 B
-X SDAOUT1 13 500 100 100 L 50 50 1 1 B
-X SCLOUT1 14 500 200 100 L 50 50 1 1 O
-X SCLIN 15 -500 200 100 R 50 50 1 1 I
-X SCLOUT2 16 500 -100 100 L 50 50 1 1 O
-X EP 17 100 -700 100 U 50 50 1 1 P
-X ENABLE2 2 -500 400 100 R 50 50 1 1 I
-X XORH2 3 -500 -200 100 R 50 50 1 1 I
-X XORL2 4 -500 -500 100 R 50 50 1 1 I
-X XORH1 5 -500 -100 100 R 50 50 1 1 I
-X XORL1 6 -500 -400 100 R 50 50 1 1 I
-X VCC 7 0 700 100 D 50 50 1 1 W
-X ENABLE1 8 -500 500 100 R 50 50 1 1 I
-X READY2 9 500 400 100 L 50 50 1 1 C
-ENDDRAW
-ENDDEF
-#
 # LTC6957xDD-1
 #
 DEF LTC6957xDD-1 U 0 20 Y Y 1 F N
diff --git a/Interface_Expansion.dcm b/Interface_Expansion.dcm
index dc51554167..30e10ee0f0 100644
--- a/Interface_Expansion.dcm
+++ b/Interface_Expansion.dcm
@@ -24,6 +24,12 @@ K I2C Multiplexer Buffer Level Shifter
 F https://www.analog.com/media/en/technical-documentation/data-sheets/4314f.pdf
 $ENDCMP
 #
+$CMP LTC4317
+D Dual I2C/SMBus Address-Translator, DFN-16
+K I2C Translator 4kV-ESD Level-Shifter Hot-Swap
+F https://www.analog.com/media/en/technical-documentation/data-sheets/4317fa.pdf
+$ENDCMP
+#
 $CMP MAX7325AEG+
 D I2C Port Expander with 8 Push-Pull and 8 Open-Drain I/Os, QSOP-24
 K Expander I2C Parallel Port GPIO Maxim
@@ -186,6 +192,24 @@ K I2C TWI IO expander
 F https://www.nxp.com/docs/en/data-sheet/PCA9555.pdf
 $ENDCMP
 #
+$CMP PCA9557BS
+D 8-bit I2C-bus and SMBus I/O port with reset, HVQFN-16
+K SMBUS I2C Expander
+F https://www.nxp.com/docs/en/data-sheet/PCA9557.pdf
+$ENDCMP
+#
+$CMP PCA9557D
+D 8-bit I2C-bus and SMBus I/O port with reset, SO-16
+K SMBUS I2C Expander
+F https://www.nxp.com/docs/en/data-sheet/PCA9557.pdf
+$ENDCMP
+#
+$CMP PCA9557PW
+D 8-bit I2C-bus and SMBus I/O port with reset, TSSOP-16
+K SMBUS I2C Expander
+F https://www.nxp.com/docs/en/data-sheet/PCA9557.pdf
+$ENDCMP
+#
 $CMP PCAL6416APW
 D IO expander 16 GPIO, I2C 400kHz, Interrupt, 1.65 - 5.5V, TSSOP-24
 K I2C TWI IO expander
diff --git a/Interface_Expansion.lib b/Interface_Expansion.lib
index b8fe82994d..e3b75484e1 100644
--- a/Interface_Expansion.lib
+++ b/Interface_Expansion.lib
@@ -151,6 +151,38 @@ X ENABLE2 9 -500 100 100 R 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
+# LTC4317
+#
+DEF LTC4317 U 0 20 Y Y 1 F N
+F0 "U" -350 650 50 H V C CNN
+F1 "LTC4317" 250 650 50 H V C CNN
+F2 "Package_DFN_QFN:DFN-16-1EP_3x5mm_P0.5mm_EP1.66x4.4mm" 0 -1100 50 H I C CNN
+F3 "" -600 1650 50 H I C CNN
+$FPLIST
+ DFN*1EP*3x5mm*P0.5mm*
+$ENDFPLIST
+DRAW
+S -400 600 400 -600 0 1 10 f
+X GND 1 0 -700 100 U 50 50 1 1 W
+X READY1 10 500 500 100 L 50 50 1 1 C
+X SDAOUT2 11 500 -200 100 L 50 50 1 1 B
+X SDAIN 12 -500 100 100 R 50 50 1 1 B
+X SDAOUT1 13 500 100 100 L 50 50 1 1 B
+X SCLOUT1 14 500 200 100 L 50 50 1 1 O
+X SCLIN 15 -500 200 100 R 50 50 1 1 I
+X SCLOUT2 16 500 -100 100 L 50 50 1 1 O
+X EP 17 100 -700 100 U 50 50 1 1 P
+X ENABLE2 2 -500 400 100 R 50 50 1 1 I
+X XORH2 3 -500 -200 100 R 50 50 1 1 I
+X XORL2 4 -500 -500 100 R 50 50 1 1 I
+X XORH1 5 -500 -100 100 R 50 50 1 1 I
+X XORL1 6 -500 -400 100 R 50 50 1 1 I
+X VCC 7 0 700 100 D 50 50 1 1 W
+X ENABLE1 8 -500 500 100 R 50 50 1 1 I
+X READY2 9 500 400 100 L 50 50 1 1 C
+ENDDRAW
+ENDDEF
+#
 # MAX7325AEG+
 #
 DEF MAX7325AEG+ U 0 40 Y Y 1 F N
@@ -1084,6 +1116,99 @@ X IO0_5 9 500 300 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
+# PCA9557BS
+#
+DEF PCA9557BS U 0 20 Y Y 1 F N
+F0 "U" -300 450 50 H V L CNN
+F1 "PCA9557BS" 100 450 50 H V L CNN
+F2 "Package_DFN_QFN:HVQFN-16-1EP_3x3mm_P0.5mm_EP1.5x1.5mm" 950 -550 50 H I C CNN
+F3 "" 100 -100 50 H I C CNN
+$FPLIST
+ HVQFN*1EP*3x3mm*P0.5mm*
+$ENDFPLIST
+DRAW
+S -300 -500 300 400 0 1 10 f
+X A0 1 -400 -200 100 R 50 50 1 1 I
+X IO5 10 400 -200 100 L 50 50 1 1 B
+X IO6 11 400 -300 100 L 50 50 1 1 B
+X IO7 12 400 -400 100 L 50 50 1 1 B
+X ~RESET~ 13 -400 100 100 R 50 50 1 1 I
+X VDD 14 0 500 100 D 50 50 1 1 W
+X SCL 15 -400 300 100 R 50 50 1 1 I
+X SDA 16 -400 200 100 R 50 50 1 1 B
+X A1 2 -400 -300 100 R 50 50 1 1 I
+X A2 3 -400 -400 100 R 50 50 1 1 I
+X IO0 4 400 300 100 L 50 50 1 1 B
+X IO1 5 400 200 100 L 50 50 1 1 B
+X VSS 6 0 -600 100 U 50 50 1 1 W
+X IO2 7 400 100 100 L 50 50 1 1 B
+X IO3 8 400 0 100 L 50 50 1 1 B
+X IO4 9 400 -100 100 L 50 50 1 1 B
+ENDDRAW
+ENDDEF
+#
+# PCA9557D
+#
+DEF PCA9557D U 0 20 Y Y 1 F N
+F0 "U" -300 450 50 H V L CNN
+F1 "PCA9557D" 100 450 50 H V L CNN
+F2 "Package_SO:SO-16_3.9x9.9mm_P1.27mm" 950 -550 50 H I C CNN
+F3 "" 100 -100 50 H I C CNN
+$FPLIST
+ SO*3.9x9.9mm*P1.27mm*
+$ENDFPLIST
+DRAW
+S -300 -500 300 400 0 1 10 f
+X SCL 1 -400 300 100 R 50 50 1 1 I
+X IO3 10 400 0 100 L 50 50 1 1 B
+X IO4 11 400 -100 100 L 50 50 1 1 B
+X IO5 12 400 -200 100 L 50 50 1 1 B
+X IO6 13 400 -300 100 L 50 50 1 1 B
+X IO7 14 400 -400 100 L 50 50 1 1 B
+X ~RESET~ 15 -400 100 100 R 50 50 1 1 I
+X VDD 16 0 500 100 D 50 50 1 1 W
+X SDA 2 -400 200 100 R 50 50 1 1 B
+X A0 3 -400 -200 100 R 50 50 1 1 I
+X A1 4 -400 -300 100 R 50 50 1 1 I
+X A2 5 -400 -400 100 R 50 50 1 1 I
+X IO0 6 400 300 100 L 50 50 1 1 B
+X IO1 7 400 200 100 L 50 50 1 1 B
+X VSS 8 0 -600 100 U 50 50 1 1 W
+X IO2 9 400 100 100 L 50 50 1 1 B
+ENDDRAW
+ENDDEF
+#
+# PCA9557PW
+#
+DEF PCA9557PW U 0 20 Y Y 1 F N
+F0 "U" -300 450 50 H V L CNN
+F1 "PCA9557PW" 100 450 50 H V L CNN
+F2 "Package_SO:TSSOP-16_4.4x5mm_P0.65mm" 950 -550 50 H I C CNN
+F3 "" 100 -100 50 H I C CNN
+$FPLIST
+ TSSOP*4.4x5mm*P0.65mm*
+$ENDFPLIST
+DRAW
+S -300 -500 300 400 0 1 10 f
+X SCL 1 -400 300 100 R 50 50 1 1 I
+X IO3 10 400 0 100 L 50 50 1 1 B
+X IO4 11 400 -100 100 L 50 50 1 1 B
+X IO5 12 400 -200 100 L 50 50 1 1 B
+X IO6 13 400 -300 100 L 50 50 1 1 B
+X IO7 14 400 -400 100 L 50 50 1 1 B
+X ~RESET~ 15 -400 100 100 R 50 50 1 1 I
+X VDD 16 0 500 100 D 50 50 1 1 W
+X SDA 2 -400 200 100 R 50 50 1 1 B
+X A0 3 -400 -200 100 R 50 50 1 1 I
+X A1 4 -400 -300 100 R 50 50 1 1 I
+X A2 5 -400 -400 100 R 50 50 1 1 I
+X IO0 6 400 300 100 L 50 50 1 1 B
+X IO1 7 400 200 100 L 50 50 1 1 B
+X VSS 8 0 -600 100 U 50 50 1 1 W
+X IO2 9 400 100 100 L 50 50 1 1 B
+ENDDRAW
+ENDDEF
+#
 # PCAL6416APW
 #
 DEF PCAL6416APW U 0 20 Y Y 1 F N
diff --git a/Interface_UART.dcm b/Interface_UART.dcm
index d087dc2d14..05f832f008 100644
--- a/Interface_UART.dcm
+++ b/Interface_UART.dcm
@@ -165,6 +165,36 @@ K rs232 uart transceiver line-driver
 F http://www.intersil.com/content/dam/Intersil/documents/icl3/icl3221-22-23-32-41-43.pdf
 $ENDCMP
 #
+$CMP ISL3280ExHZ
+D RS485, RS422, 20Mbps Transceiver, 3.0V to 5.5V, SOT-23-5
+K Interface Driver Receiver Transciever
+F https://www.renesas.com/us/en/www/doc/datasheet/isl3280e-81e-82e-83e-84e-85e.pdf
+$ENDCMP
+#
+$CMP ISL3281ExHZ
+D RS485, RS422, 20Mbps Transceiver, 3.0V to 5.5V, SOT-23-6
+K Interface - Driver Receiver Transceiver
+F https://www.renesas.com/us/en/www/doc/datasheet/isl3280e-81e-82e-83e-84e-85e.pdf
+$ENDCMP
+#
+$CMP ISL3282ExRHZ
+D RS485, RS422, 20Mbps Transceiver, 3.0V to 5.5V, TDFN-8
+K Interface Driver Receiver Transceiver
+F https://www.renesas.com/us/en/www/doc/datasheet/isl3280e-81e-82e-83e-84e-85e.pdf
+$ENDCMP
+#
+$CMP ISL3283ExHZ
+D RS485, RS422, 20Mbps Transceiver, 3.0V to 5.5V, SOT-23-6
+K Interface Driver Receiver Transceiver
+F https://www.renesas.com/us/en/www/doc/datasheet/isl3280e-81e-82e-83e-84e-85e.pdf
+$ENDCMP
+#
+$CMP ISL3284ExHZ
+D RS485, RS422, 20Mbps Transceiver, 3.0V to 5.5V, SOT-23-6
+K Interface Driver Receiver Transceiver
+F https://www.renesas.com/us/en/www/doc/datasheet/isl3280e-81e-82e-83e-84e-85e.pdf
+$ENDCMP
+#
 $CMP ISL3295xxH
 D RS485, RS422, 20Mbps Transceiver, 3.0V to 7V, Low-Power, SOT-23
 K RS485 RS422 transceiver
diff --git a/Interface_UART.lib b/Interface_UART.lib
index 460f9e9926..93248a211d 100644
--- a/Interface_UART.lib
+++ b/Interface_UART.lib
@@ -997,6 +997,137 @@ X RA5 9 600 400 150 L 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
+# ISL3280ExHZ
+#
+DEF ISL3280ExHZ U 0 20 Y Y 1 F N
+F0 "U" 100 450 50 H V L CNN
+F1 "ISL3280ExHZ" 100 350 50 H V L CNN
+F2 "Package_TO_SOT_SMD:SOT-23-5" 100 550 50 H I L CNN
+F3 "" -900 700 50 H I C CNN
+$FPLIST
+ SOT?23*
+$ENDFPLIST
+DRAW
+C -65 -51 14 0 1 0 N
+S 300 300 -300 -300 0 1 10 f
+P 2 0 1 0 -81 -51 -93 -51 N
+P 2 0 1 0 80 3 105 3 N
+P 6 0 1 0 -45 78 -45 -72 80 3 -45 78 -45 53 -95 53 N
+X VCC 1 0 400 100 D 50 50 1 1 W
+X GND 2 0 -400 100 U 50 50 1 1 W
+X RO 3 400 0 100 L 50 50 1 1 O
+X B 4 -400 -100 100 R 50 50 1 1 I
+X A 5 -400 100 100 R 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# ISL3281ExHZ
+#
+DEF ISL3281ExHZ U 0 20 Y Y 1 F N
+F0 "U" 100 450 50 H V L CNN
+F1 "ISL3281ExHZ" 100 350 50 H V L CNN
+F2 "Package_TO_SOT_SMD:SOT-23-6" 100 550 50 H I L CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ SOT?23*
+$ENDFPLIST
+DRAW
+C -65 -51 14 1 1 0 N
+S 300 300 -300 -300 0 1 10 f
+P 3 0 1 0 30 -30 30 -100 100 -100 N
+P 2 1 1 0 -81 -51 -93 -51 N
+P 2 1 1 0 80 3 105 3 N
+P 6 1 1 0 -45 78 -45 -72 80 3 -45 78 -45 53 -95 53 N
+X VCC 1 0 400 100 D 50 50 1 1 W
+X GND 2 0 -400 100 U 50 50 1 1 W
+X RO 3 400 0 100 L 50 50 1 1 O
+X B 4 -400 -100 100 R 50 50 1 1 I
+X RE 5 400 -100 100 L 50 50 1 1 I
+X A 6 -400 100 100 R 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# ISL3282ExRHZ
+#
+DEF ISL3282ExRHZ U 0 20 Y Y 1 F N
+F0 "U" 100 450 50 H V L CNN
+F1 "ISL3282ExRHZ" 100 350 50 H V L CNN
+F2 "Package_DFN_QFN:TDFN-8-1EP_3x2mm_P0.5mm_EP1.80x1.65mm" 100 550 50 H I L CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ TDFN*1EP*3x2mm*P0.5mm*
+$ENDFPLIST
+DRAW
+C -65 -51 14 1 1 0 N
+S 300 300 -300 -300 0 1 10 f
+P 2 0 1 0 105 -100 105 -100 N
+P 3 0 1 0 25 -30 25 -100 105 -100 N
+P 2 1 1 0 -81 -51 -93 -51 N
+P 2 1 1 0 80 3 105 3 N
+P 6 1 1 0 -45 78 -45 -72 80 3 -45 78 -45 53 -95 53 N
+X RO 1 400 0 100 L 50 50 1 1 O
+X GND 2 0 -400 100 U 50 50 1 1 W
+X NC 3 -300 -200 100 R 50 50 1 1 N N
+X VCC 4 0 400 100 D 50 50 1 1 W
+X A 5 -400 100 100 R 50 50 1 1 I
+X VL 6 -100 400 100 D 50 50 1 1 W
+X ~RE 7 400 -100 100 L 50 50 1 1 I
+X B 8 -400 -100 100 R 50 50 1 1 I
+X GND 9 0 -400 100 U 50 50 1 1 P N
+ENDDRAW
+ENDDEF
+#
+# ISL3283ExHZ
+#
+DEF ISL3283ExHZ U 0 20 Y Y 1 F N
+F0 "U" 100 450 50 H V L CNN
+F1 "ISL3283ExHZ" 100 350 50 H V L CNN
+F2 "Package_TO_SOT_SMD:SOT-23-6" 100 550 50 H I L CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ SOT?23*
+$ENDFPLIST
+DRAW
+C -65 -51 14 1 1 0 N
+S 300 300 -300 -300 0 1 10 f
+P 3 0 1 0 20 -35 20 -100 105 -100 N
+P 2 1 1 0 -81 -51 -93 -51 N
+P 2 1 1 0 80 3 105 3 N
+P 6 1 1 0 -45 78 -45 -72 80 3 -45 78 -45 53 -95 53 N
+X VCC 1 0 400 100 D 50 50 1 1 W
+X GND 2 0 -400 100 U 50 50 1 1 W
+X RO 3 400 0 100 L 50 50 1 1 O
+X B 4 -400 -100 100 R 50 50 1 1 I
+X ~RE 5 400 -100 100 L 50 50 1 1 I
+X A 6 -400 100 100 R 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# ISL3284ExHZ
+#
+DEF ISL3284ExHZ U 0 20 Y Y 1 F N
+F0 "U" 100 450 50 H V L CNN
+F1 "ISL3284ExHZ" 100 350 50 H V L CNN
+F2 "Package_TO_SOT_SMD:SOT-23-6" 100 550 50 H I L CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ SOT?23*
+$ENDFPLIST
+DRAW
+C -65 -51 14 1 1 0 N
+S 300 300 -300 -300 0 1 10 f
+P 2 1 1 0 -81 -51 -93 -51 N
+P 2 1 1 0 80 3 105 3 N
+P 6 1 1 0 -45 78 -45 -72 80 3 -45 78 -45 53 -95 53 N
+X VCC 1 0 400 100 D 50 50 1 1 W
+X GND 2 0 -400 100 U 50 50 1 1 W
+X RO 3 400 0 100 L 50 50 1 1 O
+X B 4 -400 -100 100 R 50 50 1 1 I
+X VL 5 -100 400 100 D 50 50 1 1 W
+X A 6 -400 100 100 R 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
 # ISL3295xxH
 #
 DEF ISL3295xxH U 0 20 Y Y 1 F N
diff --git a/Interface_USB.dcm b/Interface_USB.dcm
index 3747e6af35..87bb776d6b 100644
--- a/Interface_USB.dcm
+++ b/Interface_USB.dcm
@@ -67,7 +67,7 @@ F https://www.silabs.com/documents/public/data-sheets/cp2102n-datasheet.pdf
 $ENDCMP
 #
 $CMP CP2104
-D Single-Chip USB-to-UART Bridge, USB 2.0 Full-Speed, 2Mbps UART, QFN package
+D Single-Chip USB-to-UART Bridge, USB 2.0 Full-Speed, 2Mbps UART, QFN-24
 K uart usb bridge interface transceiver
 F https://www.silabs.com/documents/public/data-sheets/cp2104.pdf
 $ENDCMP
diff --git a/Interface_USB.lib b/Interface_USB.lib
index ff9ec29337..bbfe03ba44 100644
--- a/Interface_USB.lib
+++ b/Interface_USB.lib
@@ -341,41 +341,41 @@ ENDDEF
 #
 # CP2104
 #
-DEF CP2104 U 0 40 Y Y 1 F N
-F0 "U" -300 925 50 H V R CNN
-F1 "CP2104" -300 850 50 H V R CNN
-F2 "Package_DFN_QFN:QFN-24-1EP_4x4mm_P0.5mm_EP2.6x2.6mm" 150 -950 50 H I L CNN
-F3 "" -550 1250 50 H I C CNN
+DEF CP2104 U 0 20 Y Y 1 F N
+F0 "U" -200 1125 50 H V R CNN
+F1 "CP2104" -200 1050 50 H V R CNN
+F2 "Package_DFN_QFN:QFN-24-1EP_4x4mm_P0.5mm_EP2.6x2.6mm" 1150 -2050 50 H I L CNN
+F3 "" 4150 400 50 H I C CNN
 $FPLIST
  QFN*4x4mm*P0.5mm*
 $ENDFPLIST
 DRAW
-S -600 800 600 -900 0 1 10 f
-X RI 1 700 600 100 L 50 50 1 1 I
-X VIO/NC 10 200 900 100 D 50 50 1 1 w
-X GPIO.3 11 -700 -500 100 R 50 50 1 1 B
-X GPIO.2 12 -700 -400 100 R 50 50 1 1 B
-X GPIO.1 13 -700 -300 100 R 50 50 1 1 B
-X GPIO.0 14 -700 -200 100 R 50 50 1 1 B
-X ~SUSPEND 15 700 -700 100 L 50 50 1 1 O
-X VPP 16 -700 -700 100 R 50 50 1 1 P
-X SUSPEND 17 700 -600 100 L 50 50 1 1 O
-X CTS 18 700 -300 100 L 50 50 1 1 I
-X RTS 19 700 -200 100 L 50 50 1 1 O
-X GND 2 0 -1000 100 U 50 50 1 1 W
-X RXD 20 700 0 100 L 50 50 1 1 I
-X TXD 21 700 100 100 L 50 50 1 1 O
-X DSR 22 700 300 100 L 50 50 1 1 I
-X DTR 23 700 400 100 L 50 50 1 1 O
-X DCD 24 700 500 100 L 50 50 1 1 I
-X PAD 25 100 -1000 100 U 50 50 1 1 W
-X D+ 3 -700 0 100 R 50 50 1 1 B
-X D- 4 -700 100 100 R 50 50 1 1 B
-X VIO 5 -200 900 100 D 50 50 1 1 W
-X VDD 6 0 900 100 D 50 50 1 1 W
-X REGIN 7 -700 600 100 R 50 50 1 1 W
-X VBUS 8 -700 400 100 R 50 50 1 1 I
-X ~RST 9 700 -500 100 L 50 50 1 1 B
+S -400 1000 400 -1000 1 1 10 f
+X ~RI 1 500 200 100 L 50 50 1 1 I
+X NC 10 400 -800 100 L 50 50 1 1 N N
+X GPIO.3 11 500 -600 100 L 50 50 1 1 B
+X RS485/GPIO.2 12 500 -500 100 L 50 50 1 1 B
+X RXT/GPIO.1 13 500 -400 100 L 50 50 1 1 B
+X TXT/GPIO.0 14 500 -300 100 L 50 50 1 1 B
+X ~SUSPEND 15 500 -100 100 L 50 50 1 1 O
+X VPP 16 -500 -800 100 R 50 50 1 1 P
+X SUSPEND 17 500 0 100 L 50 50 1 1 O
+X ~CTS 18 500 600 100 L 50 50 1 1 I
+X ~RTS 19 500 700 100 L 50 50 1 1 O
+X GND 2 0 -1100 100 U 50 50 1 1 W
+X RXD 20 500 800 100 L 50 50 1 1 I
+X TXD 21 500 900 100 L 50 50 1 1 O
+X ~DSR 22 500 500 100 L 50 50 1 1 I
+X ~DTR 23 500 400 100 L 50 50 1 1 O
+X ~DCD 24 500 300 100 L 50 50 1 1 I
+X GND 25 0 -1100 100 U 50 50 1 1 P N
+X D+ 3 -500 200 100 R 50 50 1 1 B
+X D- 4 -500 300 100 R 50 50 1 1 B
+X VIO 5 100 1100 100 D 50 50 1 1 W
+X VDD 6 0 1100 100 D 50 50 1 1 W
+X REGIN 7 -100 1100 100 D 50 50 1 1 W
+X VBUS 8 -500 400 100 R 50 50 1 1 I
+X ~RST 9 -500 900 100 R 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
diff --git a/Interface_WDC_6500.dcm b/Interface_WDC_6500.dcm
new file mode 100644
index 0000000000..3dda988842
--- /dev/null
+++ b/Interface_WDC_6500.dcm
@@ -0,0 +1,69 @@
+EESchema-DOCLIB  Version 2.0
+#
+$CMP W65C21NxxPLx-14
+D NMOS Peripheral Interface Adapter 14MHz, PLCC-44
+K 6521, 65C21, PIA
+F http://www.westerndesigncenter.com/wdc/documentation/w65c21.pdf
+$ENDCMP
+#
+$CMP W65C21NxxPx-14
+D NMOS Peripheral Interface Adapter 14MHz, DIP-40
+K 6521, 65C21, PIA
+F http://www.westerndesigncenter.com/wdc/documentation/w65c21.pdf
+$ENDCMP
+#
+$CMP W65C21SxxPLx-14
+D CMOS Peripheral Interface Adapter 14MHz, PLCC-44
+K 6521, 65C21, PIA
+F http://www.westerndesigncenter.com/wdc/documentation/w65c21.pdf
+$ENDCMP
+#
+$CMP W65C21SxxPx-14
+D CMOS Peripheral Interface Adapter 14MHz, DIP-40
+K 6521, 65C21, PIA
+F http://www.westerndesigncenter.com/wdc/documentation/w65c21.pdf
+$ENDCMP
+#
+$CMP W65C22NxxPLx-14
+D 8/16 bit NMOS Versatile Interface Adapter 14MHz, PLCC-44
+K 6522, 65C22, VIA
+F http://www.westerndesigncenter.com/wdc/documentation/w65c22.pdf
+$ENDCMP
+#
+$CMP W65C22NxxPx-14
+D 8/16 bit NMOS Versatile Interface Adapter 14MHz, DIP-40
+K 6522, 65C22, VIA
+F http://www.westerndesigncenter.com/wdc/documentation/w65c22.pdf
+$ENDCMP
+#
+$CMP W65C22SxxPLx-14
+D 8/16 bit CMOS Versatile Interface Adapter 14MHz, PLCC-44
+K 6522, 65C22, VIA
+F http://www.westerndesigncenter.com/wdc/documentation/w65c22.pdf
+$ENDCMP
+#
+$CMP W65C22SxxPx-14
+D 8/16 bit CMOS Versatile Interface Adapter 14MHz, DIP-40
+K 6522, 65C22, VIA
+F http://www.westerndesigncenter.com/wdc/documentation/w65c22.pdf
+$ENDCMP
+#
+$CMP W65C51NxxPLx-14
+D NMOS Asynchronous Communications Interface Adapter 14MHz, PLCC-28
+K 6551, 65C51, ACIA
+F http://www.westerndesigncenter.com/wdc/documentation/w65c51n.pdf
+$ENDCMP
+#
+$CMP W65C51NxxPQx-14
+D NMOS Asynchronous Communications Interface Adapter 14MHz, LQFP-32
+K 6551, 65C51, ACIA
+F http://www.westerndesigncenter.com/wdc/documentation/w65c51n.pdf
+$ENDCMP
+#
+$CMP W65C51NxxPx-14
+D NMOS Asynchronous Communications Interface Adapter 14MHz, DIP-28
+K 6551, 65C51, ACIA
+F http://www.westerndesigncenter.com/wdc/documentation/w65c51n.pdf
+$ENDCMP
+#
+#End Doc Library
diff --git a/Interface_WDC_6500.lib b/Interface_WDC_6500.lib
new file mode 100644
index 0000000000..c23af47d0e
--- /dev/null
+++ b/Interface_WDC_6500.lib
@@ -0,0 +1,369 @@
+EESchema-LIBRARY Version 2.4
+#encoding utf-8
+#
+# W65C21SxxPLx-14
+#
+DEF W65C21SxxPLx-14 U 0 20 Y Y 1 F N
+F0 "U" 500 1300 50 H V C CNN
+F1 "W65C21SxxPLx-14" 500 1200 50 H V C CNN
+F2 "Package_LCC:PLCC-44_THT-Socket" 0 0 50 H I C CIN
+F3 "" 450 200 50 H I C CNN
+ALIAS W65C21NxxPLx-14
+$FPLIST
+ PLCC*
+$ENDFPLIST
+DRAW
+S -300 1100 300 -1100 0 1 10 f
+X VSS 1 0 -1200 100 U 50 50 1 1 W
+X PA7 10 400 100 100 L 50 50 1 1 B
+X PB0 11 400 -300 100 L 50 50 1 1 B
+X PB1 12 400 -400 100 L 50 50 1 1 B
+X PB2 13 400 -500 100 L 50 50 1 1 B
+X PB3 14 400 -600 100 L 50 50 1 1 B
+X PB4 15 400 -700 100 L 50 50 1 1 B
+X PB5 16 400 -800 100 L 50 50 1 1 B
+X PB6 17 400 -900 100 L 50 50 1 1 B
+X PB7 18 400 -1000 100 L 50 50 1 1 B
+X CB1 19 400 -100 100 L 50 50 1 1 I
+X NC 2 400 -1200 100 L 50 50 1 1 N NX
+X CB2 20 400 -200 100 L 50 50 1 1 B
+X VDD 21 0 1200 100 D 50 50 1 1 W
+X NC 22 400 -1300 100 L 50 50 1 1 N NX
+X R/~W 23 -400 500 100 R 50 50 1 1 I
+X CS0 24 -400 300 100 R 50 50 1 1 I
+X ~CS2 25 -400 100 100 R 50 50 1 1 I
+X CS1 26 -400 200 100 R 50 50 1 1 I
+X NC 27 400 -1400 100 L 50 50 1 1 N NX
+X PHI2 28 -400 -100 100 R 50 50 1 1 I C
+X D7 29 -400 -1000 100 R 50 50 1 1 B
+X PA0 3 400 800 100 L 50 50 1 1 B
+X D6 30 -400 -900 100 R 50 50 1 1 B
+X D5 31 -400 -800 100 R 50 50 1 1 B
+X D4 32 -400 -700 100 R 50 50 1 1 B
+X D3 33 -400 -600 100 R 50 50 1 1 B
+X D2 34 -400 -500 100 R 50 50 1 1 B
+X D1 35 -400 -400 100 R 50 50 1 1 B
+X D0 36 -400 -300 100 R 50 50 1 1 B
+X ~RESET 37 -400 800 100 R 50 50 1 1 I
+X RS1 38 -400 900 100 R 50 50 1 1 I
+X RS0 39 -400 1000 100 R 50 50 1 1 I
+X PA1 4 400 700 100 L 50 50 1 1 B
+X NC 40 400 -1500 100 L 50 50 1 1 N NX
+X ~IRQB 41 -400 600 100 R 50 50 1 1 O
+X ~IRQA 42 -400 700 100 R 50 50 1 1 O
+X CA2 43 400 900 100 L 50 50 1 1 B
+X CA1 44 400 1000 100 L 50 50 1 1 I
+X PA2 5 400 600 100 L 50 50 1 1 B
+X PA3 6 400 500 100 L 50 50 1 1 B
+X PA4 7 400 400 100 L 50 50 1 1 B
+X PA5 8 400 300 100 L 50 50 1 1 B
+X PA6 9 400 200 100 L 50 50 1 1 B
+ENDDRAW
+ENDDEF
+#
+# W65C21SxxPx-14
+#
+DEF W65C21SxxPx-14 U 0 20 Y Y 1 F N
+F0 "U" 500 1300 50 H V C CNN
+F1 "W65C21SxxPx-14" 500 1200 50 H V C CNN
+F2 "Package_DIP:DIP-40_W15.24mm" 0 0 50 H I C CIN
+F3 "" 450 200 50 H I C CNN
+ALIAS W65C21NxxPx-14
+$FPLIST
+ DIP*W15.24mm*
+$ENDFPLIST
+DRAW
+S -300 1100 300 -1100 0 1 10 f
+X VSS 1 0 -1200 100 U 50 50 1 1 W
+X PB0 10 400 -300 100 L 50 50 1 1 B
+X PB1 11 400 -400 100 L 50 50 1 1 B
+X PB2 12 400 -500 100 L 50 50 1 1 B
+X PB3 13 400 -600 100 L 50 50 1 1 B
+X PB4 14 400 -700 100 L 50 50 1 1 B
+X PB5 15 400 -800 100 L 50 50 1 1 B
+X PB6 16 400 -900 100 L 50 50 1 1 B
+X PB7 17 400 -1000 100 L 50 50 1 1 B
+X CB1 18 400 -100 100 L 50 50 1 1 I
+X CB2 19 400 -200 100 L 50 50 1 1 B
+X PA0 2 400 800 100 L 50 50 1 1 B
+X VDD 20 0 1200 100 D 50 50 1 1 W
+X R/~W 21 -400 500 100 R 50 50 1 1 I
+X CS0 22 -400 300 100 R 50 50 1 1 I
+X ~CS2 23 -400 100 100 R 50 50 1 1 I
+X CS1 24 -400 200 100 R 50 50 1 1 I
+X PHI2 25 -400 -100 100 R 50 50 1 1 I C
+X D7 26 -400 -1000 100 R 50 50 1 1 B
+X D6 27 -400 -900 100 R 50 50 1 1 B
+X D5 28 -400 -800 100 R 50 50 1 1 B
+X D4 29 -400 -700 100 R 50 50 1 1 B
+X PA1 3 400 700 100 L 50 50 1 1 B
+X D3 30 -400 -600 100 R 50 50 1 1 B
+X D2 31 -400 -500 100 R 50 50 1 1 B
+X D1 32 -400 -400 100 R 50 50 1 1 B
+X D0 33 -400 -300 100 R 50 50 1 1 B
+X ~RESET 34 -400 800 100 R 50 50 1 1 I
+X RS1 35 -400 900 100 R 50 50 1 1 I
+X RS0 36 -400 1000 100 R 50 50 1 1 I
+X ~IRQB 37 -400 600 100 R 50 50 1 1 O
+X ~IRQA 38 -400 700 100 R 50 50 1 1 O
+X CA2 39 400 900 100 L 50 50 1 1 B
+X PA2 4 400 600 100 L 50 50 1 1 B
+X CA1 40 400 1000 100 L 50 50 1 1 I
+X PA3 5 400 500 100 L 50 50 1 1 B
+X PA4 6 400 400 100 L 50 50 1 1 B
+X PA5 7 400 300 100 L 50 50 1 1 B
+X PA6 8 400 200 100 L 50 50 1 1 B
+X PA7 9 400 100 100 L 50 50 1 1 B
+ENDDRAW
+ENDDEF
+#
+# W65C22SxxPLx-14
+#
+DEF W65C22SxxPLx-14 U 0 20 Y Y 1 F N
+F0 "U" 500 1300 50 H V C CNN
+F1 "W65C22SxxPLx-14" 500 1200 50 H V C CNN
+F2 "Package_LCC:PLCC-44_THT-Socket" 0 0 50 H I C CIN
+F3 "" 300 250 50 H I C CNN
+ALIAS W65C22NxxPLx-14
+$FPLIST
+ PLCC*
+$ENDFPLIST
+DRAW
+S 300 1100 -300 -1100 0 1 10 f
+X VSS 1 0 -1200 100 U 50 50 1 1 W
+X PB0 10 400 -300 100 L 50 50 1 1 B
+X NC 11 400 -1200 100 L 50 50 1 1 N NX
+X PB1 12 400 -400 100 L 50 50 1 1 B
+X PB2 13 400 -500 100 L 50 50 1 1 B
+X PB3 14 400 -600 100 L 50 50 1 1 B
+X PB4 15 400 -700 100 L 50 50 1 1 B
+X PB5 16 400 -800 100 L 50 50 1 1 B
+X PB6 17 400 -900 100 L 50 50 1 1 B
+X PB7 18 400 -1000 100 L 50 50 1 1 B
+X CB1 19 400 -100 100 L 50 50 1 1 B
+X PA0 2 400 800 100 L 50 50 1 1 B
+X CB2 20 400 -200 100 L 50 50 1 1 B
+X VDD 21 0 1200 100 D 50 50 1 1 W
+X NC 22 400 -1300 100 L 50 50 1 1 N NX
+X ~IRQ 23 -400 500 100 R 50 50 1 1 O
+X R/~W 24 -400 400 100 R 50 50 1 1 I
+X ~CS2 25 -400 100 100 R 50 50 1 1 I
+X CS1 26 -400 200 100 R 50 50 1 1 I
+X PHI2 27 -400 -100 100 R 50 50 1 1 I C
+X D7 28 -400 -1000 100 R 50 50 1 1 B
+X D6 29 -400 -900 100 R 50 50 1 1 B
+X PA1 3 400 700 100 L 50 50 1 1 B
+X D5 30 -400 -800 100 R 50 50 1 1 B
+X D4 31 -400 -700 100 R 50 50 1 1 B
+X D3 32 -400 -600 100 R 50 50 1 1 B
+X NC 33 400 -1400 100 L 50 50 1 1 N NX
+X D2 34 -400 -500 100 R 50 50 1 1 B
+X D1 35 -400 -400 100 R 50 50 1 1 B
+X D0 36 -400 -300 100 R 50 50 1 1 B
+X ~RESET 37 -400 600 100 R 50 50 1 1 I
+X NC 38 400 -1500 100 L 50 50 1 1 N NX
+X RS3 39 -400 700 100 R 50 50 1 1 I
+X PA2 4 400 600 100 L 50 50 1 1 B
+X RS2 40 -400 800 100 R 50 50 1 1 I
+X RS1 41 -400 900 100 R 50 50 1 1 I
+X RS0 42 -400 1000 100 R 50 50 1 1 I
+X CA2 43 400 900 100 L 50 50 1 1 B
+X CA1 44 400 1000 100 L 50 50 1 1 I
+X PA3 5 400 500 100 L 50 50 1 1 B
+X PA4 6 400 400 100 L 50 50 1 1 B
+X PA5 7 400 300 100 L 50 50 1 1 B
+X PA6 8 400 200 100 L 50 50 1 1 B
+X PA7 9 400 100 100 L 50 50 1 1 B
+ENDDRAW
+ENDDEF
+#
+# W65C22SxxPx-14
+#
+DEF W65C22SxxPx-14 U 0 20 Y Y 1 F N
+F0 "U" 500 1300 50 H V C CNN
+F1 "W65C22SxxPx-14" 500 1200 50 H V C CNN
+F2 "Package_DIP:DIP-40_W15.24mm" 0 0 50 H I C CIN
+F3 "" 300 250 50 H I C CNN
+ALIAS W65C22NxxPx-14
+$FPLIST
+ DIP*W15.24mm*
+$ENDFPLIST
+DRAW
+S 300 1100 -300 -1100 0 1 10 f
+X VSS 1 0 -1200 100 U 50 50 1 1 W
+X PB0 10 400 -300 100 L 50 50 1 1 B
+X PB1 11 400 -400 100 L 50 50 1 1 B
+X PB2 12 400 -500 100 L 50 50 1 1 B
+X PB3 13 400 -600 100 L 50 50 1 1 B
+X PB4 14 400 -700 100 L 50 50 1 1 B
+X PB5 15 400 -800 100 L 50 50 1 1 B
+X PB6 16 400 -900 100 L 50 50 1 1 B
+X PB7 17 400 -1000 100 L 50 50 1 1 B
+X CB1 18 400 -100 100 L 50 50 1 1 B
+X CB2 19 400 -200 100 L 50 50 1 1 B
+X PA0 2 400 800 100 L 50 50 1 1 B
+X VDD 20 0 1200 100 D 50 50 1 1 W
+X ~IRQ 21 -400 500 100 R 50 50 1 1 O
+X R/~W 22 -400 400 100 R 50 50 1 1 I
+X ~CS2 23 -400 100 100 R 50 50 1 1 I
+X CS1 24 -400 200 100 R 50 50 1 1 I
+X PHI2 25 -400 -100 100 R 50 50 1 1 I C
+X D7 26 -400 -1000 100 R 50 50 1 1 B
+X D6 27 -400 -900 100 R 50 50 1 1 B
+X D5 28 -400 -800 100 R 50 50 1 1 B
+X D4 29 -400 -700 100 R 50 50 1 1 B
+X PA1 3 400 700 100 L 50 50 1 1 B
+X D3 30 -400 -600 100 R 50 50 1 1 B
+X D2 31 -400 -500 100 R 50 50 1 1 B
+X D1 32 -400 -400 100 R 50 50 1 1 B
+X D0 33 -400 -300 100 R 50 50 1 1 B
+X ~RESET 34 -400 600 100 R 50 50 1 1 I
+X RS3 35 -400 700 100 R 50 50 1 1 I
+X RS2 36 -400 800 100 R 50 50 1 1 I
+X RS1 37 -400 900 100 R 50 50 1 1 I
+X RS0 38 -400 1000 100 R 50 50 1 1 I
+X CA2 39 400 900 100 L 50 50 1 1 B
+X PA2 4 400 600 100 L 50 50 1 1 B
+X CA1 40 400 1000 100 L 50 50 1 1 I
+X PA3 5 400 500 100 L 50 50 1 1 B
+X PA4 6 400 400 100 L 50 50 1 1 B
+X PA5 7 400 300 100 L 50 50 1 1 B
+X PA6 8 400 200 100 L 50 50 1 1 B
+X PA7 9 400 100 100 L 50 50 1 1 B
+ENDDRAW
+ENDDEF
+#
+# W65C51NxxPLx-14
+#
+DEF W65C51NxxPLx-14 U 0 20 Y Y 1 F N
+F0 "U" 500 1200 50 H V C CNN
+F1 "W65C51NxxPLx-14" 500 1100 50 H V C CNN
+F2 "Package_LCC:PLCC-28_THT-Socket" 0 0 50 H I C CIN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ PLCC*
+$ENDFPLIST
+DRAW
+S -300 1000 300 -1000 0 1 10 f
+X VSS 1 0 -1100 100 U 50 50 1 1 W
+X TxD 10 400 700 100 L 50 50 1 1 O
+X ~DTR 11 400 200 100 L 50 50 1 1 O
+X RxD 12 400 600 100 L 50 50 1 1 I
+X RS0 13 -400 900 100 R 50 50 1 1 I
+X RS1 14 -400 800 100 R 50 50 1 1 I
+X VDD 15 0 1100 100 D 50 50 1 1 W
+X ~DCD 16 400 0 100 L 50 50 1 1 I
+X ~DSR 17 400 100 100 L 50 50 1 1 I
+X D0 18 -400 -200 100 R 50 50 1 1 B
+X D1 19 -400 -300 100 R 50 50 1 1 B
+X CS0 2 -400 300 100 R 50 50 1 1 I
+X D2 20 -400 -400 100 R 50 50 1 1 B
+X D3 21 -400 -500 100 R 50 50 1 1 B
+X D4 22 -400 -600 100 R 50 50 1 1 B
+X D5 23 -400 -700 100 R 50 50 1 1 B
+X D6 24 -400 -800 100 R 50 50 1 1 B
+X D7 25 -400 -900 100 R 50 50 1 1 B
+X ~IRQ 26 -400 600 100 R 50 50 1 1 O
+X PHI2 27 -400 0 100 R 50 50 1 1 I C
+X R/~W 28 -400 500 100 R 50 50 1 1 I
+X ~CS1 3 -400 200 100 R 50 50 1 1 I
+X ~RESET 4 -400 700 100 R 50 50 1 1 I
+X RxC 5 400 -400 100 L 50 50 1 1 B C
+X XTLI 6 400 -200 100 L 50 50 1 1 I C
+X XLT0 7 400 -300 100 L 50 50 1 1 O C
+X ~RTS 8 400 400 100 L 50 50 1 1 O
+X ~CTS 9 400 300 100 L 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# W65C51NxxPQx-14
+#
+DEF W65C51NxxPQx-14 U 0 20 Y Y 1 F N
+F0 "U" 500 1200 50 H V C CNN
+F1 "W65C51NxxPQx-14" 500 1100 50 H V C CNN
+F2 "Package_QFP:LQFP-32_7x7mm_P0.8mm" 0 0 50 H I C CIN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ LQFP*7x7mm*P0.8mm*
+$ENDFPLIST
+DRAW
+S -300 1000 300 -1000 0 1 10 f
+X RxC 1 400 -400 100 L 50 50 1 1 B C
+X RS0 10 -400 900 100 R 50 50 1 1 I
+X RS1 11 -400 800 100 R 50 50 1 1 I
+X VDD 12 0 1100 100 D 50 50 1 1 W
+X VDD 13 0 1100 100 D 50 50 1 1 P N
+X ~DCD 14 400 0 100 L 50 50 1 1 I
+X ~DSR 15 400 100 100 L 50 50 1 1 I
+X D0 16 -400 -200 100 R 50 50 1 1 B
+X D1 17 -400 -300 100 R 50 50 1 1 B
+X D2 18 -400 -400 100 R 50 50 1 1 B
+X D3 19 -400 -500 100 R 50 50 1 1 B
+X XTLI 2 400 -200 100 L 50 50 1 1 I C
+X D4 20 -400 -600 100 R 50 50 1 1 B
+X D5 21 -400 -700 100 R 50 50 1 1 B
+X D6 22 -400 -800 100 R 50 50 1 1 B
+X D7 23 -400 -900 100 R 50 50 1 1 B
+X NC 24 400 -800 100 L 50 50 1 1 N NX
+X ~IRQ 25 -400 600 100 R 50 50 1 1 O
+X PHI2 26 -400 0 100 R 50 50 1 1 I C
+X R/~W 27 -400 500 100 R 50 50 1 1 I
+X VSS 28 0 -1100 100 U 50 50 1 1 P N
+X VSS 29 0 -1100 100 U 50 50 1 1 W
+X XLT0 3 400 -300 100 L 50 50 1 1 O C
+X CS0 30 -400 300 100 R 50 50 1 1 I
+X ~CS1 31 -400 200 100 R 50 50 1 1 I
+X ~RESET 32 -400 700 100 R 50 50 1 1 I
+X ~RTS 4 400 400 100 L 50 50 1 1 O
+X ~CTS 5 400 300 100 L 50 50 1 1 I
+X TxD 6 400 700 100 L 50 50 1 1 O
+X ~DTR 7 400 200 100 L 50 50 1 1 O
+X NC 8 400 -700 100 L 50 50 1 1 N NX
+X RxD 9 400 600 100 L 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# W65C51NxxPx-14
+#
+DEF W65C51NxxPx-14 U 0 20 Y Y 1 F N
+F0 "U" 500 1200 50 H V C CNN
+F1 "W65C51NxxPx-14" 500 1100 50 H V C CNN
+F2 "Package_DIP:DIP-28_W15.24mm" 0 0 50 H I C CIN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ DIP*W15.24mm*
+$ENDFPLIST
+DRAW
+S -300 1000 300 -1000 0 1 10 f
+X VSS 1 0 -1100 100 U 50 50 1 1 W
+X TxD 10 400 700 100 L 50 50 1 1 O
+X ~DTR 11 400 200 100 L 50 50 1 1 O
+X RxD 12 400 600 100 L 50 50 1 1 I
+X RS0 13 -400 900 100 R 50 50 1 1 I
+X RS1 14 -400 800 100 R 50 50 1 1 I
+X VDD 15 0 1100 100 D 50 50 1 1 W
+X ~DCD 16 400 0 100 L 50 50 1 1 I
+X ~DSR 17 400 100 100 L 50 50 1 1 I
+X D0 18 -400 -200 100 R 50 50 1 1 B
+X D1 19 -400 -300 100 R 50 50 1 1 B
+X CS0 2 -400 300 100 R 50 50 1 1 I
+X D2 20 -400 -400 100 R 50 50 1 1 B
+X D3 21 -400 -500 100 R 50 50 1 1 B
+X D4 22 -400 -600 100 R 50 50 1 1 B
+X D5 23 -400 -700 100 R 50 50 1 1 B
+X D6 24 -400 -800 100 R 50 50 1 1 B
+X D7 25 -400 -900 100 R 50 50 1 1 B
+X ~IRQ 26 -400 600 100 R 50 50 1 1 O
+X PHI2 27 -400 0 100 R 50 50 1 1 I C
+X R/~W 28 -400 500 100 R 50 50 1 1 I
+X ~CS1 3 -400 200 100 R 50 50 1 1 I
+X ~RESET 4 -400 700 100 R 50 50 1 1 I
+X RxC 5 400 -400 100 L 50 50 1 1 B C
+X XTLI 6 400 -200 100 L 50 50 1 1 I C
+X XLT0 7 400 -300 100 L 50 50 1 1 O C
+X ~RTS 8 400 400 100 L 50 50 1 1 O
+X ~CTS 9 400 300 100 L 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+#End Library
diff --git a/MCU_Dialog.dcm b/MCU_Dialog.dcm
new file mode 100644
index 0000000000..dcb46431a2
--- /dev/null
+++ b/MCU_Dialog.dcm
@@ -0,0 +1,15 @@
+EESchema-DOCLIB  Version 2.0
+#
+$CMP DA14691
+D Multi-core BLE 5.1 SoC series, 96-MHz/32-bit ARM Cortex-M33, 128 kB ROM, 384 kB SRAM, 4 kB OTP Memory, 16 kB cache SRAM, VFBGA-86
+K BLE MCU
+F https://www.dialog-semiconductor.com/sites/default/files/da1469x_datasheet_3v1.pdf
+$ENDCMP
+#
+$CMP DA14695
+D Multi-core BLE 5.1 Soc series, 96-MHz/32-bit ARM Cortex-M33, 128 kB ROM, 512 kB SRAM, 4 kB OTP Memory, 16 kB cache SRAM, VFBGA-86
+K BLE MCU
+F https://www.dialog-semiconductor.com/sites/default/files/da1469x_datasheet_3v1.pdf
+$ENDCMP
+#
+#End Doc Library
diff --git a/MCU_Dialog.lib b/MCU_Dialog.lib
new file mode 100644
index 0000000000..1dbbece7eb
--- /dev/null
+++ b/MCU_Dialog.lib
@@ -0,0 +1,106 @@
+EESchema-LIBRARY Version 2.4
+#encoding utf-8
+#
+# DA14691
+#
+DEF DA14691 U 0 20 Y Y 1 F N
+F0 "U" 0 100 50 H V C CNN
+F1 "DA14691" 0 0 50 H V C CNN
+F2 "Package_BGA:VFBGA-86_6x6mm_Layout10x10_P0.55mm_Ball0.25mm_Pad0.2mm" 0 2750 50 H I C CNN
+F3 "" -450 3300 50 H I C CNN
+ALIAS DA14695
+$FPLIST
+ VFBGA*6x6mm*Layout10x10*P0.55mm*
+$ENDFPLIST
+DRAW
+S -850 1950 850 -1950 1 1 10 f
+X QSPIF_CLK A1 -1000 1200 150 R 50 50 1 1 O
+X RF_GND A10 300 -2100 150 U 50 50 1 1 P N
+X QSPIF_D0 A2 -1000 1600 150 R 50 50 1 1 B
+X P0_10/M33_SWDIO A3 -1000 -1200 150 R 50 50 1 1 B
+X P0_12/CMAC_SWDIO A4 -1000 -1400 150 R 50 50 1 1 B
+X VSUP_RF A5 100 2100 150 D 50 50 1 1 W
+X RF_GND A6 300 -2100 150 U 50 50 1 1 P N
+X RF_GND A7 300 -2100 150 U 50 50 1 1 W
+X RFIOP A8 -1000 1800 150 R 50 50 1 1 B
+X RF_GND A9 300 -2100 150 U 50 50 1 1 P N
+X QSPIF_CS B1 -1000 1100 150 R 50 50 1 1 O
+X P0_06 B10 1000 1200 150 L 50 50 1 1 B
+X QSPIF_D3 B2 -1000 1300 150 R 50 50 1 1 B
+X P0_11/M33_SWCLK B3 -1000 -1300 150 R 50 50 1 1 B
+X P0_13/CMAC_SWCLK B4 -1000 -1500 150 R 50 50 1 1 B
+X P0_09 B5 1000 900 150 L 50 50 1 1 B
+X RF_GND B7 300 -2100 150 U 50 50 1 1 P N
+X ~RESET B8 -1000 -1100 150 R 50 50 1 1 I
+X P0_07 B9 1000 1100 150 L 50 50 1 1 B
+X QSPIF_D2 C1 -1000 1400 150 R 50 50 1 1 B
+X P0_27 C10 1000 -100 150 L 50 50 1 1 B
+X QSPIF_D1 C2 -1000 1500 150 R 50 50 1 1 B
+X P0_30 C3 1000 -400 150 L 50 50 1 1 B
+X P0_21 C4 1000 300 150 L 50 50 1 1 B
+X P0_19 C6 1000 500 150 L 50 50 1 1 B
+X P0_17 C8 1000 700 150 L 50 50 1 1 B
+X P0_16 C9 1000 800 150 L 50 50 1 1 B
+X P0_05 D1 1000 1300 150 L 50 50 1 1 B
+X RF_GND D10 300 -2100 150 U 50 50 1 1 P N
+X P0_00 D2 1000 1800 150 L 50 50 1 1 B
+X P0_31 D3 1000 -500 150 L 50 50 1 1 B
+X P0_29 D5 1000 -300 150 L 50 50 1 1 B
+X P0_08 D6 1000 1000 150 L 50 50 1 1 B
+X RF_GND D9 300 -2100 150 U 50 50 1 1 P N
+X P0_04 E1 1000 1400 150 L 50 50 1 1 B
+X XTAL32M_GND E10 100 -2100 150 U 50 50 1 1 P
+X P0_03 E2 1000 1500 150 L 50 50 1 1 B
+X P1_05 E4 1000 -1200 150 L 50 50 1 1 B
+X P1_03 E6 1000 -1000 150 L 50 50 1 1 B
+X P1_01 E8 1000 -800 150 L 50 50 1 1 B
+X P1_00 E9 1000 -700 150 L 50 50 1 1 B
+X P0_02 F1 1000 1600 150 L 50 50 1 1 B
+X XTAL32M_M F10 -1000 -700 150 R 50 50 1 1 O
+X P0_01 F2 1000 1700 150 L 50 50 1 1 B
+X VSSIOQ F3 0 -2100 150 U 50 50 1 1 W
+X DGND F4 -200 -2100 150 U 50 50 1 1 P N
+X AGND F5 -100 -2100 150 U 50 50 1 1 W
+X P1_07 F7 1000 -1400 150 L 50 50 1 1 B
+X XTAL32M_P F9 -1000 -800 150 R 50 50 1 1 I
+X V18F G1 -500 2100 150 D 50 50 1 1 w
+X P0_18 G10 1000 600 150 L 50 50 1 1 B
+X V18P G2 -400 2100 150 D 50 50 1 1 w
+X DGND G3 -200 -2100 150 U 50 50 1 1 W
+X DGND G4 -200 -2100 150 U 50 50 1 1 P N
+X AGND G5 -100 -2100 150 U 50 50 1 1 P N
+X P1_11 G6 1000 -1800 150 L 50 50 1 1 B
+X P0_20 G8 1000 400 150 L 50 50 1 1 B
+X P1_09 G9 1000 -1600 150 L 50 50 1 1 B
+X V14 H1 0 2100 150 D 50 50 1 1 w
+X P0_23/XTAL_32K_P H10 -1000 -400 150 R 50 50 1 1 B
+X V18 H2 -100 2100 150 D 50 50 1 1 w
+X P1_04 H3 1000 -1100 150 L 50 50 1 1 B
+X P0_28 H5 1000 -200 150 L 50 50 1 1 B
+X P0_26 H7 1000 0 150 L 50 50 1 1 B
+X P0_25 H8 1000 100 150 L 50 50 1 1 B
+X P0_22/XTAL_32K_M H9 -1000 -300 150 R 50 50 1 1 B
+X LY J1 -1000 100 150 R 50 50 1 1 P
+X P1_02 J10 1000 -900 150 L 50 50 1 1 B
+X V12 J2 200 2100 150 D 50 50 1 1 w
+X GND J3 -300 -2100 150 U 50 50 1 1 P N
+X NC J4 -800 -1800 150 R 50 50 1 1 N N
+X VBUS J5 -300 2100 150 D 50 50 1 1 W
+X V30 J6 -200 2100 150 D 50 50 1 1 w
+X P1_08 J7 1000 -1500 150 L 50 50 1 1 B
+X P1_06 J8 1000 -1300 150 L 50 50 1 1 B
+X P0_24 J9 1000 200 150 L 50 50 1 1 B
+X LX K1 -1000 0 150 R 50 50 1 1 P
+X GND K10 -300 -2100 150 U 50 50 1 1 W
+X VBAT2 K2 400 2100 150 D 50 50 1 1 w
+X BUCK_GND K3 200 -2100 150 U 50 50 1 1 W
+X NC K4 -800 -1900 150 R 50 50 1 1 N N
+X VBAT1 K5 500 2100 150 D 50 50 1 1 w
+X P0_14/USB_P K6 -1000 500 150 R 50 50 1 1 B
+X P0_15/USB_M K7 -1000 400 150 R 50 50 1 1 B
+X P1_10 K8 1000 -1700 150 L 50 50 1 1 B
+X GND K9 -300 -2100 150 U 50 50 1 1 P N
+ENDDRAW
+ENDDEF
+#
+#End Library
diff --git a/MCU_Microchip_8051.dcm b/MCU_Microchip_8051.dcm
index 6b823a6f3f..e452e00e3d 100644
--- a/MCU_Microchip_8051.dcm
+++ b/MCU_Microchip_8051.dcm
@@ -1,72 +1,72 @@
 EESchema-DOCLIB  Version 2.0
 #
-$CMP AT89C2051-12PU
+$CMP AT89C2051-12P
 D 12MHz, 2kB Flash, 128B SRAM, DIP-20
 K MCS-51 8bit Flash Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc0368.pdf
 $ENDCMP
 #
-$CMP AT89C2051-12SU
+$CMP AT89C2051-12S
 D 12MHz, 2kB Flash, 128B SRAM, SOIC-20
 K MCS-51 8bit Flash Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc0368.pdf
 $ENDCMP
 #
-$CMP AT89C2051-24PU
+$CMP AT89C2051-24P
 D 24MHz, 2kB Flash, 128B SRAM, DIP-20
 K MCS-51 8bit Flash Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc0368.pdf
 $ENDCMP
 #
-$CMP AT89C2051-24SU
+$CMP AT89C2051-24S
 D 24MHz, 2kB Flash, 128B SRAM, SOIC-20
 K MCS-51 8bit Flash Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc0368.pdf
 $ENDCMP
 #
-$CMP AT89C4051-12PU
+$CMP AT89C4051-12P
 D 12MHz, 4kB Flash, 128B SRAM, DIP-20
 K MCS-51 8bit Flash Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc1001.pdf
 $ENDCMP
 #
-$CMP AT89C4051-12SU
+$CMP AT89C4051-12S
 D 12MHz, 4kB Flash, 128B SRAM, SOIC-20
 K MCS-51 8bit Flash Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc1001.pdf
 $ENDCMP
 #
-$CMP AT89C4051-24PU
+$CMP AT89C4051-24P
 D 24MHz, 4kB Flash, 128B SRAM, DIP-20
 K MCS-51 8bit Flash Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc1001.pdf
 $ENDCMP
 #
-$CMP AT89C4051-24SU
+$CMP AT89C4051-24S
 D 24MHz, 4kB Flash, 128B SRAM, SOIC-20
 K MCS-51 8bit Flash Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc1001.pdf
 $ENDCMP
 #
-$CMP AT89S2051-24PU
+$CMP AT89S2051-24P
 D 24MHz, 2kB Flash, 256B SRAM, DIP-20
 K MCS-51 8bit Flash Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc3390.pdf
 $ENDCMP
 #
-$CMP AT89S2051-24SU
+$CMP AT89S2051-24S
 D 24MHz, 2kB Flash, 256B SRAM, SOIC-20
 K MCS-51 8bit Flash Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc3390.pdf
 $ENDCMP
 #
-$CMP AT89S4051-24PU
+$CMP AT89S4051-24P
 D 24MHz, 4kB Flash, 256B SRAM, DIP-20
 K MCS-51 8bit Flash Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc3390.pdf
 $ENDCMP
 #
-$CMP AT89S4051-24SU
+$CMP AT89S4051-24S
 D 24MHz, 4kB Flash, 256B SRAM, SOIC-20
 K MCS-51 8bit Flash Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc3390.pdf
diff --git a/MCU_Microchip_8051.lib b/MCU_Microchip_8051.lib
index df3c09939f..6f288506dc 100644
--- a/MCU_Microchip_8051.lib
+++ b/MCU_Microchip_8051.lib
@@ -1,14 +1,14 @@
 EESchema-LIBRARY Version 2.4
 #encoding utf-8
 #
-# AT89C2051-12PU
+# AT89C2051-12P
 #
-DEF AT89C2051-12PU U 0 20 Y Y 1 F N
+DEF AT89C2051-12P U 0 20 Y Y 1 F N
 F0 "U" -500 1050 50 H V L BNN
-F1 "AT89C2051-12PU" 100 -1050 50 H V L TNN
+F1 "AT89C2051-12P" 100 -1050 50 H V L TNN
 F2 "Package_DIP:DIP-20_W7.62mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS AT89C2051-24PU AT89C4051-12PU AT89C4051-24PU AT89S2051-24PU AT89S4051-24PU
+ALIAS AT89C2051-24P AT89C4051-12P AT89C4051-24P AT89S2051-24P AT89S4051-24P
 $FPLIST
  DIP*W7.62mm*
 $ENDFPLIST
@@ -37,14 +37,14 @@ X P3.5 9 600 -600 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# AT89C2051-12SU
+# AT89C2051-12S
 #
-DEF AT89C2051-12SU U 0 20 Y Y 1 F N
+DEF AT89C2051-12S U 0 20 Y Y 1 F N
 F0 "U" -500 1050 50 H V L BNN
-F1 "AT89C2051-12SU" 100 -1050 50 H V L TNN
+F1 "AT89C2051-12S" 100 -1050 50 H V L TNN
 F2 "Package_SO:SOIC-20W_7.5x12.8mm_P1.27mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS AT89C2051-24SU AT89C4051-12SU AT89C4051-24SU AT89S2051-24SU AT89S4051-24SU
+ALIAS AT89C2051-24S AT89C4051-12S AT89C4051-24S AT89S2051-24S AT89S4051-24S
 $FPLIST
  SOIC*7.5x12.8mm*P1.27mm*
 $ENDFPLIST
diff --git a/MCU_Microchip_ATmega.dcm b/MCU_Microchip_ATmega.dcm
index 35cf7d106c..ae16495c8d 100644
--- a/MCU_Microchip_ATmega.dcm
+++ b/MCU_Microchip_ATmega.dcm
@@ -1,684 +1,684 @@
 EESchema-DOCLIB  Version 2.0
 #
-$CMP ATmega128-16AU
+$CMP ATmega128-16A
 D 16MHz, 128kB Flash, 4kB SRAM, 4kB EEPROM, JTAG, TQFP-64
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc2467.pdf
 $ENDCMP
 #
-$CMP ATmega128-16MU
+$CMP ATmega128-16M
 D 16MHz, 128kB Flash, 4kB SRAM, 4kB EEPROM, JTAG, QFN-64
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc2467.pdf
 $ENDCMP
 #
-$CMP ATmega1280-16AU
+$CMP ATmega1280-16A
 D 16MHz, 128kB Flash, 8kB SRAM, 4kB EEPROM, JTAG, TQFP-100
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-2549-8-bit-AVR-Microcontroller-ATmega640-1280-1281-2560-2561_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega1280-16CU
+$CMP ATmega1280-16C
 D 16MHz, 128kB Flash, 8kB SRAM, 4kB EEPROM, JTAG, TFBGA-100
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-2549-8-bit-AVR-Microcontroller-ATmega640-1280-1281-2560-2561_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega1280V-8AU
+$CMP ATmega1280V-8A
 D 8MHz, 128kB Flash, 8kB SRAM, 4kB EEPROM, JTAG, TQFP-100
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-2549-8-bit-AVR-Microcontroller-ATmega640-1280-1281-2560-2561_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega1280V-8CU
+$CMP ATmega1280V-8C
 D 8MHz, 128kB Flash, 8kB SRAM, 4kB EEPROM, JTAG, TFBGA-100
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-2549-8-bit-AVR-Microcontroller-ATmega640-1280-1281-2560-2561_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega1281-16AU
+$CMP ATmega1281-16A
 D 16MHz, 128kB Flash, 8kB SRAM, 4kB EEPROM, JTAG, TQFP-64
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-2549-8-bit-AVR-Microcontroller-ATmega640-1280-1281-2560-2561_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega1281-16MU
+$CMP ATmega1281-16M
 D 16MHz, 128kB Flash, 8kB SRAM, 4kB EEPROM, JTAG, QFN-64
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-2549-8-bit-AVR-Microcontroller-ATmega640-1280-1281-2560-2561_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega1281V-8AU
+$CMP ATmega1281V-8A
 D 8MHz, 128kB Flash, 8kB SRAM, 4kB EEPROM, JTAG, TQFP-64
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-2549-8-bit-AVR-Microcontroller-ATmega640-1280-1281-2560-2561_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega1281V-8MU
+$CMP ATmega1281V-8M
 D 8MHz, 128kB Flash, 8kB SRAM, 4kB EEPROM, JTAG, QFN-64
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-2549-8-bit-AVR-Microcontroller-ATmega640-1280-1281-2560-2561_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega1284-AU
+$CMP ATmega1284-A
 D 20MHz, 128kB Flash, 16kB SRAM, 4kB EEPROM, JTAG, TQFP-44
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8272-8-bit-AVR-microcontroller-ATmega164A_PA-324A_PA-644A_PA-1284_P_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega1284-MU
+$CMP ATmega1284-M
 D 20MHz, 128kB Flash, 16kB SRAM, 4kB EEPROM, JTAG, QFN-44
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8272-8-bit-AVR-microcontroller-ATmega164A_PA-324A_PA-644A_PA-1284_P_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega1284-PU
+$CMP ATmega1284-P
 D 20MHz, 128kB Flash, 16kB SRAM, 4kB EEPROM, JTAG, DIP-40
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8272-8-bit-AVR-microcontroller-ATmega164A_PA-324A_PA-644A_PA-1284_P_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega1284P-AU
+$CMP ATmega1284P-A
 D 20MHz, 128kB Flash, 16kB SRAM, 4kB EEPROM, JTAG, TQFP-44
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8272-8-bit-AVR-microcontroller-ATmega164A_PA-324A_PA-644A_PA-1284_P_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega1284P-MU
+$CMP ATmega1284P-M
 D 20MHz, 128kB Flash, 16kB SRAM, 4kB EEPROM, JTAG, QFN-44
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8272-8-bit-AVR-microcontroller-ATmega164A_PA-324A_PA-644A_PA-1284_P_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega1284P-PU
+$CMP ATmega1284P-P
 D 20MHz, 128kB Flash, 16kB SRAM, 4kB EEPROM, JTAG, DIP-40
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8272-8-bit-AVR-microcontroller-ATmega164A_PA-324A_PA-644A_PA-1284_P_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega128A-AU
+$CMP ATmega128A-A
 D 16MHz, 128kB Flash, 4kB SRAM, 4kB EEPROM, TQFP-64
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8151-8-bit-AVR-ATmega128A_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega128A-MU
+$CMP ATmega128A-M
 D 16MHz, 128kB Flash, 4kB SRAM, 4kB EEPROM, QFN-64
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8151-8-bit-AVR-ATmega128A_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega128L-8AU
+$CMP ATmega128L-8A
 D 8MHz, 128kB Flash, 4kB SRAM, 4kB EEPROM, JTAG, TQFP-64
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc2467.pdf
 $ENDCMP
 #
-$CMP ATmega128L-8MU
+$CMP ATmega128L-8M
 D 8MHz, 128kB Flash, 4kB SRAM, 4kB EEPROM, JTAG, QFN-64
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc2467.pdf
 $ENDCMP
 #
-$CMP ATmega16-16AU
+$CMP ATmega16-16A
 D 16MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, JTAG, TQFP-44
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc2466.pdf
 $ENDCMP
 #
-$CMP ATmega16-16MU
+$CMP ATmega16-16M
 D 16MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, JTAG, QFN-44
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc2466.pdf
 $ENDCMP
 #
-$CMP ATmega16-16PU
+$CMP ATmega16-16P
 D 16MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, JTAG, DIP-40
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc2466.pdf
 $ENDCMP
 #
-$CMP ATmega162-16AU
+$CMP ATmega162-16A
 D 16MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, JTAG, TQFP-44
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-2513-8-bit-AVR-Microntroller-ATmega162_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega162-16MU
+$CMP ATmega162-16M
 D 16MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, JTAG, QFN-44
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-2513-8-bit-AVR-Microntroller-ATmega162_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega162-16PU
+$CMP ATmega162-16P
 D 16MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, JTAG, DIP-40
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-2513-8-bit-AVR-Microntroller-ATmega162_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega162V-8AU
+$CMP ATmega162V-8A
 D 8MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, JTAG, TQFP-44
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-2513-8-bit-AVR-Microntroller-ATmega162_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega162V-8MU
+$CMP ATmega162V-8M
 D 8MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, JTAG, QFN-44
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-2513-8-bit-AVR-Microntroller-ATmega162_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega162V-8PU
+$CMP ATmega162V-8P
 D 8MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, JTAG, DIP-40
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-2513-8-bit-AVR-Microntroller-ATmega162_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega164A-AU
+$CMP ATmega164A-A
 D 20MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, JTAG, TQFP-44
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8272-8-bit-AVR-microcontroller-ATmega164A_PA-324A_PA-644A_PA-1284_P_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega164A-CU
+$CMP ATmega164A-C
 D 20MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, JTAG, VFBGA-49
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8272-8-bit-AVR-microcontroller-ATmega164A_PA-324A_PA-644A_PA-1284_P_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega164A-MCH
-D 20MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, JTAG, DRQFN-44
+$CMP ATmega164A-M
+D 20MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, JTAG, QFN-44
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8272-8-bit-AVR-microcontroller-ATmega164A_PA-324A_PA-644A_PA-1284_P_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega164A-MU
-D 20MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, JTAG, QFN-44
+$CMP ATmega164A-MC
+D 20MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, JTAG, DRQFN-44
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8272-8-bit-AVR-microcontroller-ATmega164A_PA-324A_PA-644A_PA-1284_P_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega164A-PU
+$CMP ATmega164A-P
 D 20MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, JTAG, DIP-40
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8272-8-bit-AVR-microcontroller-ATmega164A_PA-324A_PA-644A_PA-1284_P_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega164P-20AU
+$CMP ATmega164P-20A
 D 20MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, JTAG, TQFP-44
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-42742-ATmega164P_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega164P-20MU
+$CMP ATmega164P-20M
 D 20MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, JTAG, QFN-44
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-42742-ATmega164P_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega164P-20PU
+$CMP ATmega164P-20P
 D 20MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, JTAG, DIP-40
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-42742-ATmega164P_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega164PA-AU
+$CMP ATmega164PA-A
 D 20MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, JTAG, TQFP-44
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8272-8-bit-AVR-microcontroller-ATmega164A_PA-324A_PA-644A_PA-1284_P_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega164PA-CU
+$CMP ATmega164PA-C
 D 20MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, JTAG, VFBGA-49
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8272-8-bit-AVR-microcontroller-ATmega164A_PA-324A_PA-644A_PA-1284_P_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega164PA-MCH
-D 20MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, JTAG, DRQFN-44
-K AVR 8bit Microcontroller MegaAVR
+$CMP ATmega164PA-M
+D 20MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, JTAG, QFN-44
+K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8272-8-bit-AVR-microcontroller-ATmega164A_PA-324A_PA-644A_PA-1284_P_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega164PA-MU
-D 20MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, JTAG, QFN-44
-K AVR 8bit Microcontroller MegaAVR PicoPower
+$CMP ATmega164PA-MC
+D 20MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, JTAG, DRQFN-44
+K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8272-8-bit-AVR-microcontroller-ATmega164A_PA-324A_PA-644A_PA-1284_P_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega164PA-PU
+$CMP ATmega164PA-P
 D 20MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, JTAG, DIP-40
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8272-8-bit-AVR-microcontroller-ATmega164A_PA-324A_PA-644A_PA-1284_P_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega164PV-10AU
+$CMP ATmega164PV-10A
 D 10MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, JTAG, TQFP-44
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-42742-ATmega164P_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega164PV-10MU
+$CMP ATmega164PV-10M
 D 10MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, JTAG, QFN-44
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-42742-ATmega164P_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega164PV-10PU
+$CMP ATmega164PV-10P
 D 10MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, JTAG, DIP-40
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-42742-ATmega164P_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega165A-AU
+$CMP ATmega165A-A
 D 16MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, TQFP-64
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-8285-8-bit-avr-microcontroller-atmega165a_pa_325a_pa_3250a_pa_645a_p_6450a_p_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega165A-MU
+$CMP ATmega165A-M
 D 16MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, QFN-64
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-8285-8-bit-avr-microcontroller-atmega165a_pa_325a_pa_3250a_pa_645a_p_6450a_p_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega165P-16AU
+$CMP ATmega165P-16A
 D 16MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, TQFP-64
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8019.pdf
 $ENDCMP
 #
-$CMP ATmega165P-16MU
+$CMP ATmega165P-16M
 D 16MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, QFN-64
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8019.pdf
 $ENDCMP
 #
-$CMP ATmega165PA-AU
+$CMP ATmega165PA-A
 D 16MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, TQFP-64
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-8285-8-bit-avr-microcontroller-atmega165a_pa_325a_pa_3250a_pa_645a_p_6450a_p_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega165PA-MU
+$CMP ATmega165PA-M
 D 16MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, QFN-64
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-8285-8-bit-avr-microcontroller-atmega165a_pa_325a_pa_3250a_pa_645a_p_6450a_p_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega165PV-8AU
+$CMP ATmega165PV-8A
 D 8MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, TQFP-64
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8019.pdf
 $ENDCMP
 #
-$CMP ATmega165PV-8MU
+$CMP ATmega165PV-8M
 D 8MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, QFN-64
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8019.pdf
 $ENDCMP
 #
-$CMP ATmega168-20AU
+$CMP ATmega168-20A
 D 20MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, TQFP-32
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-2545-8-bit-AVR-Microcontroller-ATmega48-88-168_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega168-20MU
+$CMP ATmega168-20M
 D 20MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, QFN-32
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-2545-8-bit-AVR-Microcontroller-ATmega48-88-168_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega168-20PU
+$CMP ATmega168-20P
 D 20MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, DIP-28
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-2545-8-bit-AVR-Microcontroller-ATmega48-88-168_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega168A-AU
+$CMP ATmega168A-A
 D 20MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, TQFP-32
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/ATmega48A_88A_168A-Data-Sheet-40002007A.pdf
 $ENDCMP
 #
-$CMP ATmega168A-CCU
+$CMP ATmega168A-CC
 D 20MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, UFBGA-32
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/ATmega48A_88A_168A-Data-Sheet-40002007A.pdf
 $ENDCMP
 #
-$CMP ATmega168A-MMH
-D 20MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, QFN-28
+$CMP ATmega168A-M
+D 20MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, QFN-32
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/ATmega48A_88A_168A-Data-Sheet-40002007A.pdf
 $ENDCMP
 #
-$CMP ATmega168A-MU
-D 20MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, QFN-32
+$CMP ATmega168A-MM
+D 20MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, QFN-28
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/ATmega48A_88A_168A-Data-Sheet-40002007A.pdf
 $ENDCMP
 #
-$CMP ATmega168A-PU
+$CMP ATmega168A-P
 D 20MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, DIP-28
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/ATmega48A_88A_168A-Data-Sheet-40002007A.pdf
 $ENDCMP
 #
-$CMP ATmega168P-20AU
+$CMP ATmega168P-20A
 D 20MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, TQFP-32
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8025-8-bit-AVR-Microcontroller-ATmega48P-88P-168P_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega168P-20MU
+$CMP ATmega168P-20M
 D 20MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, QFN-32
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8025-8-bit-AVR-Microcontroller-ATmega48P-88P-168P_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega168P-20PU
+$CMP ATmega168P-20P
 D 20MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, DIP-28
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8025-8-bit-AVR-Microcontroller-ATmega48P-88P-168P_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega168PA-AU
+$CMP ATmega168PA-A
 D 20MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, TQFP-32
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/ATmega48PA_88PA_168PA-Data-Sheet-40002011A.pdf
 $ENDCMP
 #
-$CMP ATmega168PA-CCU
+$CMP ATmega168PA-CC
 D 20MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, UFBGA-32
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/ATmega48PA_88PA_168PA-Data-Sheet-40002011A.pdf
 $ENDCMP
 #
-$CMP ATmega168PA-MMH
-D 20MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, QFN-28
+$CMP ATmega168PA-M
+D 20MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, QFN-32
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/ATmega48PA_88PA_168PA-Data-Sheet-40002011A.pdf
 $ENDCMP
 #
-$CMP ATmega168PA-MU
-D 20MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, QFN-32
+$CMP ATmega168PA-MM
+D 20MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, QFN-28
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/ATmega48PA_88PA_168PA-Data-Sheet-40002011A.pdf
 $ENDCMP
 #
-$CMP ATmega168PA-PU
+$CMP ATmega168PA-P
 D 20MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, DIP-28
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/ATmega48PA_88PA_168PA-Data-Sheet-40002011A.pdf
 $ENDCMP
 #
-$CMP ATmega168PB-AU
+$CMP ATmega168PB-A
 D 20MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, TQFP-32
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/40001909A.pdf
 $ENDCMP
 #
-$CMP ATmega168PB-MU
+$CMP ATmega168PB-M
 D 20MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, QFN-32
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/40001909A.pdf
 $ENDCMP
 #
-$CMP ATmega168PV-10AU
+$CMP ATmega168PV-10A
 D 10MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, TQFP-32
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8025-8-bit-AVR-Microcontroller-ATmega48P-88P-168P_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega168PV-10MU
+$CMP ATmega168PV-10M
 D 10MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, QFN-32
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8025-8-bit-AVR-Microcontroller-ATmega48P-88P-168P_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega168PV-10PU
+$CMP ATmega168PV-10P
 D 10MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, DIP-28
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8025-8-bit-AVR-Microcontroller-ATmega48P-88P-168P_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega168V-10AU
+$CMP ATmega168V-10A
 D 10MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, TQFP-32
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-2545-8-bit-AVR-Microcontroller-ATmega48-88-168_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega168V-10MU
+$CMP ATmega168V-10M
 D 10MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, QFN-32
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-2545-8-bit-AVR-Microcontroller-ATmega48-88-168_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega168V-10PU
+$CMP ATmega168V-10P
 D 10MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, DIP-28
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-2545-8-bit-AVR-Microcontroller-ATmega48-88-168_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega169A-AU
+$CMP ATmega169A-A
 D 16MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, TQFP-64
 K AVR 8bit Microcontroller MegaAVR LCD PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-8284-8-bit-avr-microcontroller-atmega169a_pa_329a_pa_3290a_pa_649a_p_6490a_p_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega169A-MCH
-D 16MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, DRQFN-64
+$CMP ATmega169A-M
+D 16MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, QFN-64
 K AVR 8bit Microcontroller MegaAVR LCD PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-8284-8-bit-avr-microcontroller-atmega169a_pa_329a_pa_3290a_pa_649a_p_6490a_p_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega169A-MU
-D 16MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, QFN-64
+$CMP ATmega169A-MC
+D 16MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, DRQFN-64
 K AVR 8bit Microcontroller MegaAVR LCD PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-8284-8-bit-avr-microcontroller-atmega169a_pa_329a_pa_3290a_pa_649a_p_6490a_p_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega169P-16AU
+$CMP ATmega169P-16A
 D 16MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, TQFP-64
 K AVR 8bit Microcontroller MegaAVR LCD PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8018.pdf
 $ENDCMP
 #
-$CMP ATmega169P-16MCH
-D 16MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, DRQFN-64
+$CMP ATmega169P-16M
+D 16MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, QFN-64
 K AVR 8bit Microcontroller MegaAVR LCD PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8018.pdf
 $ENDCMP
 #
-$CMP ATmega169P-16MU
-D 16MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, QFN-64
+$CMP ATmega169P-16MC
+D 16MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, DRQFN-64
 K AVR 8bit Microcontroller MegaAVR LCD PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8018.pdf
 $ENDCMP
 #
-$CMP ATmega169PA-AU
+$CMP ATmega169PA-A
 D 16MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, TQFP-64
 K AVR 8bit Microcontroller MegaAVR LCD PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-8284-8-bit-avr-microcontroller-atmega169a_pa_329a_pa_3290a_pa_649a_p_6490a_p_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega169PA-MCH
-D 16MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, DRQFN-64
+$CMP ATmega169PA-M
+D 16MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, QFN-64
 K AVR 8bit Microcontroller MegaAVR LCD PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-8284-8-bit-avr-microcontroller-atmega169a_pa_329a_pa_3290a_pa_649a_p_6490a_p_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega169PA-MU
-D 16MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, QFN-64
+$CMP ATmega169PA-MC
+D 16MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, DRQFN-64
 K AVR 8bit Microcontroller MegaAVR LCD PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-8284-8-bit-avr-microcontroller-atmega169a_pa_329a_pa_3290a_pa_649a_p_6490a_p_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega169PV-8AU
+$CMP ATmega169PV-8A
 D 8MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, TQFP-64
 K AVR 8bit Microcontroller MegaAVR LCD PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8018.pdf
 $ENDCMP
 #
-$CMP ATmega169PV-8MCH
-D 8MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, DRQFN-64
+$CMP ATmega169PV-8M
+D 8MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, QFN-64
 K AVR 8bit Microcontroller MegaAVR LCD PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8018.pdf
 $ENDCMP
 #
-$CMP ATmega169PV-8MU
-D 8MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, QFN-64
+$CMP ATmega169PV-8MC
+D 8MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, DRQFN-64
 K AVR 8bit Microcontroller MegaAVR LCD PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8018.pdf
 $ENDCMP
 #
-$CMP ATmega16A-AU
+$CMP ATmega16A-A
 D 16MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, JTAG, TQFP-44
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8154-8-bit-AVR-ATmega16A_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega16A-MU
+$CMP ATmega16A-M
 D 16MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, JTAG, QFN-44
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8154-8-bit-AVR-ATmega16A_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega16A-PU
+$CMP ATmega16A-P
 D 16MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, JTAG, DIP-40
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8154-8-bit-AVR-ATmega16A_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega16L-8AU
+$CMP ATmega16L-8A
 D 8MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, JTAG, TQFP-44
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc2466.pdf
 $ENDCMP
 #
-$CMP ATmega16L-8MU
+$CMP ATmega16L-8M
 D 8MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, JTAG, QFN-44
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc2466.pdf
 $ENDCMP
 #
-$CMP ATmega16L-8PU
+$CMP ATmega16L-8P
 D 8MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, JTAG, DIP-40
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc2466.pdf
 $ENDCMP
 #
-$CMP ATmega16M1-AU
+$CMP ATmega16M1-A
 D 16MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, CAN, TQFP-32
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8209-8-bit%20AVR%20ATmega16M1-32M1-64M1_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega16M1-MU
+$CMP ATmega16M1-M
 D 16MHz, 16kB Flash, 1kB SRAM, 512B EEPROM, CAN, QFN-32
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8209-8-bit%20AVR%20ATmega16M1-32M1-64M1_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega16U2-AU
+$CMP ATmega16U2-A
 D 16MHz, 16kB Flash, 512B SRAM, 512B EEPROM, TQFP-32
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc7799.pdf
 $ENDCMP
 #
-$CMP ATmega16U2-MU
+$CMP ATmega16U2-M
 D 16MHz, 16kB Flash, 512B SRAM, 512B EEPROM, QFN-32
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc7799.pdf
 $ENDCMP
 #
-$CMP ATmega16U4-AU
+$CMP ATmega16U4-A
 D 16MHz, 16kB Flash, 1.25kB SRAM, 512B EEPROM, USB 2.0, TQFP-44
 K AVR 8bit Microcontroller MegaAVR USB
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-7766-8-bit-AVR-ATmega16U4-32U4_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega16U4-MU
+$CMP ATmega16U4-M
 D 16MHz, 16kB Flash, 1.25kB SRAM, 512B EEPROM, USB 2.0, QFN-44
 K AVR 8bit Microcontroller MegaAVR USB
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-7766-8-bit-AVR-ATmega16U4-32U4_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega16U4RC-AU
+$CMP ATmega16U4RC-A
 D 16MHz, 16kB Flash, 1.25kB SRAM, 512B EEPROM, USB 2.0, RC Osc, TQFP-44
 K AVR 8bit Microcontroller MegaAVR USB
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-7766-8-bit-AVR-ATmega16U4-32U4_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega16U4RC-MU
+$CMP ATmega16U4RC-M
 D 16MHz, 16kB Flash, 1.25kB SRAM, 512B EEPROM, USB 2.0, RC Osc, QFN-44
 K AVR 8bit Microcontroller MegaAVR USB
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-7766-8-bit-AVR-ATmega16U4-32U4_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega2560-16AU
+$CMP ATmega2560-16A
 D 16MHz, 256kB Flash, 8kB SRAM, 4kB EEPROM, JTAG, TQFP-100
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-2549-8-bit-AVR-Microcontroller-ATmega640-1280-1281-2560-2561_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega2560-16CU
+$CMP ATmega2560-16C
 D 16MHz, 256kB Flash, 8kB SRAM, 4kB EEPROM, JTAG, TFBGA-100
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-2549-8-bit-AVR-Microcontroller-ATmega640-1280-1281-2560-2561_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega2560V-8AU
+$CMP ATmega2560V-8A
 D 8MHz, 256kB Flash, 8kB SRAM, 4kB EEPROM, JTAG, TQFP-100
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-2549-8-bit-AVR-Microcontroller-ATmega640-1280-1281-2560-2561_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega2560V-8CU
+$CMP ATmega2560V-8C
 D 8MHz, 256kB Flash, 8kB SRAM, 4kB EEPROM, JTAG, TFBGA-100
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-2549-8-bit-AVR-Microcontroller-ATmega640-1280-1281-2560-2561_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega2561-16AU
+$CMP ATmega2561-16A
 D 16MHz, 256kB Flash, 8kB SRAM, 4kB EEPROM, JTAG, TQFP-64
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-2549-8-bit-AVR-Microcontroller-ATmega640-1280-1281-2560-2561_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega2561-16MU
+$CMP ATmega2561-16M
 D 16MHz, 256kB Flash, 8kB SRAM, 4kB EEPROM, JTAG, QFN-64
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-2549-8-bit-AVR-Microcontroller-ATmega640-1280-1281-2560-2561_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega2561V-8AU
+$CMP ATmega2561V-8A
 D 8MHz, 256kB Flash, 8kB SRAM, 4kB EEPROM, JTAG, TQFP-64
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-2549-8-bit-AVR-Microcontroller-ATmega640-1280-1281-2560-2561_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega2561V-8MU
+$CMP ATmega2561V-8M
 D 8MHz, 256kB Flash, 8kB SRAM, 4kB EEPROM, JTAG, QFN-64
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-2549-8-bit-AVR-Microcontroller-ATmega640-1280-1281-2560-2561_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega32-16AU
+$CMP ATmega32-16A
 D 16MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, JTAG, TQFP-44
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc2503.pdf
 $ENDCMP
 #
-$CMP ATmega32-16MU
+$CMP ATmega32-16M
 D 16MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, JTAG, QFN-44
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc2503.pdf
 $ENDCMP
 #
-$CMP ATmega32-16PU
+$CMP ATmega32-16P
 D 16MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, JTAG, DIP-40
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc2503.pdf
@@ -714,469 +714,469 @@ K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/40002016A.pdf
 $ENDCMP
 #
-$CMP ATmega324A-AU
+$CMP ATmega324A-A
 D 20MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, JTAG, TQFP-44
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8272-8-bit-AVR-microcontroller-ATmega164A_PA-324A_PA-644A_PA-1284_P_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega324A-CU
+$CMP ATmega324A-C
 D 20MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, JTAG, VFBGA-49
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8272-8-bit-AVR-microcontroller-ATmega164A_PA-324A_PA-644A_PA-1284_P_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega324A-MCH
-D 20MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, JTAG, DRQFN-44
+$CMP ATmega324A-M
+D 20MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, JTAG, QFN-44
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8272-8-bit-AVR-microcontroller-ATmega164A_PA-324A_PA-644A_PA-1284_P_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega324A-MU
-D 20MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, JTAG, QFN-44
+$CMP ATmega324A-MC
+D 20MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, JTAG, DRQFN-44
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8272-8-bit-AVR-microcontroller-ATmega164A_PA-324A_PA-644A_PA-1284_P_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega324A-PU
+$CMP ATmega324A-P
 D 20MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, JTAG, DIP-40
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8272-8-bit-AVR-microcontroller-ATmega164A_PA-324A_PA-644A_PA-1284_P_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega324P-20AU
+$CMP ATmega324P-20A
 D 20MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, JTAG, TQFP-44
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-42743-ATmega324P_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega324P-20MU
+$CMP ATmega324P-20M
 D 20MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, JTAG, QFN-44
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-42743-ATmega324P_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega324P-20PU
+$CMP ATmega324P-20P
 D 20MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, JTAG, DIP-40
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-42743-ATmega324P_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega324PA-AU
+$CMP ATmega324PA-A
 D 20MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, JTAG, TQFP-44
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8272-8-bit-AVR-microcontroller-ATmega164A_PA-324A_PA-644A_PA-1284_P_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega324PA-CU
+$CMP ATmega324PA-C
 D 20MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, JTAG, VFBGA-49
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8272-8-bit-AVR-microcontroller-ATmega164A_PA-324A_PA-644A_PA-1284_P_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega324PA-MCH
-D 20MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, JTAG, DRQFN-44
-K AVR 8bit Microcontroller MegaAVR
+$CMP ATmega324PA-M
+D 20MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, JTAG, QFN-44
+K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8272-8-bit-AVR-microcontroller-ATmega164A_PA-324A_PA-644A_PA-1284_P_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega324PA-MU
-D 20MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, JTAG, QFN-44
-K AVR 8bit Microcontroller MegaAVR PicoPower
+$CMP ATmega324PA-MC
+D 20MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, JTAG, DRQFN-44
+K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8272-8-bit-AVR-microcontroller-ATmega164A_PA-324A_PA-644A_PA-1284_P_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega324PA-PU
+$CMP ATmega324PA-P
 D 20MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, JTAG, DIP-40
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8272-8-bit-AVR-microcontroller-ATmega164A_PA-324A_PA-644A_PA-1284_P_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega324PB-AU
+$CMP ATmega324PB-A
 D 20MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, JTAG, TQFP-44
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/40001908A.pdf
 $ENDCMP
 #
-$CMP ATmega324PB-MU
+$CMP ATmega324PB-M
 D 20MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, JTAG, QFN-44
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/40001908A.pdf
 $ENDCMP
 #
-$CMP ATmega324PV-10AU
+$CMP ATmega324PV-10A
 D 10MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, JTAG, TQFP-44
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-42743-ATmega324P_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega324PV-10MU
+$CMP ATmega324PV-10M
 D 10MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, JTAG, QFN-44
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-42743-ATmega324P_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega324PV-10PU
+$CMP ATmega324PV-10P
 D 10MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, JTAG, DIP-40
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-42743-ATmega324P_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega325-16AU
+$CMP ATmega325-16A
 D 16MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, JTAG, TQFP-64
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc2570.pdf
 $ENDCMP
 #
-$CMP ATmega325-16MU
+$CMP ATmega325-16M
 D 16MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, JTAG, QFN-64
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc2570.pdf
 $ENDCMP
 #
-$CMP ATmega3250-16AU
+$CMP ATmega3250-16A
 D 16MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, JTAG, TQFP-100
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc2570.pdf
 $ENDCMP
 #
-$CMP ATmega3250A-AU
+$CMP ATmega3250A-A
 D 20MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, JTAG, TQFP-100
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-8285-8-bit-avr-microcontroller-atmega165a_pa_325a_pa_3250a_pa_645a_p_6450a_p_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega3250P-20AU
+$CMP ATmega3250P-20A
 D 20MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, JTAG, TQFP-100
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8023.pdf
 $ENDCMP
 #
-$CMP ATmega3250PA-AU
+$CMP ATmega3250PA-A
 D 20MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, JTAG, TQFP-100
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-8285-8-bit-avr-microcontroller-atmega165a_pa_325a_pa_3250a_pa_645a_p_6450a_p_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega3250PV-10AU
+$CMP ATmega3250PV-10A
 D 10MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, JTAG, TQFP-100
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8023.pdf
 $ENDCMP
 #
-$CMP ATmega3250V-8AU
+$CMP ATmega3250V-8A
 D 8MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, JTAG, TQFP-100
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc2570.pdf
 $ENDCMP
 #
-$CMP ATmega325A-AU
+$CMP ATmega325A-A
 D 20MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, TQFP-64
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-8285-8-bit-avr-microcontroller-atmega165a_pa_325a_pa_3250a_pa_645a_p_6450a_p_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega325A-MU
+$CMP ATmega325A-M
 D 20MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, QFN-64
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-8285-8-bit-avr-microcontroller-atmega165a_pa_325a_pa_3250a_pa_645a_p_6450a_p_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega325P-20AU
+$CMP ATmega325P-20A
 D 20MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, JTAG, TQFP-64
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8023.pdf
 $ENDCMP
 #
-$CMP ATmega325P-20MU
+$CMP ATmega325P-20M
 D 20MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, JTAG, QFN-64
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8023.pdf
 $ENDCMP
 #
-$CMP ATmega325PA-AU
+$CMP ATmega325PA-A
 D 20MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, TQFP-64
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-8285-8-bit-avr-microcontroller-atmega165a_pa_325a_pa_3250a_pa_645a_p_6450a_p_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega325PA-MU
+$CMP ATmega325PA-M
 D 20MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, QFN-64
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-8285-8-bit-avr-microcontroller-atmega165a_pa_325a_pa_3250a_pa_645a_p_6450a_p_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega325PV-10AU
+$CMP ATmega325PV-10A
 D 10MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, JTAG, TQFP-64
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8023.pdf
 $ENDCMP
 #
-$CMP ATmega325PV-10MU
+$CMP ATmega325PV-10M
 D 10MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, JTAG, QFN-64
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8023.pdf
 $ENDCMP
 #
-$CMP ATmega325V-8AU
+$CMP ATmega325V-8A
 D 8MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, JTAG, TQFP-64
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc2570.pdf
 $ENDCMP
 #
-$CMP ATmega325V-8MU
+$CMP ATmega325V-8M
 D 8MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, JTAG, QFN-64
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc2570.pdf
 $ENDCMP
 #
-$CMP ATmega328-AU
+$CMP ATmega328-A
 D 20MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, TQFP-32
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/ATmega328_P%20AVR%20MCU%20with%20picoPower%20Technology%20Data%20Sheet%2040001984A.pdf
 $ENDCMP
 #
-$CMP ATmega328-MMH
-D 20MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, QFN-28
+$CMP ATmega328-M
+D 20MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, QFN-32
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/ATmega328_P%20AVR%20MCU%20with%20picoPower%20Technology%20Data%20Sheet%2040001984A.pdf
 $ENDCMP
 #
-$CMP ATmega328-MU
-D 20MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, QFN-32
+$CMP ATmega328-MM
+D 20MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, QFN-28
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/ATmega328_P%20AVR%20MCU%20with%20picoPower%20Technology%20Data%20Sheet%2040001984A.pdf
 $ENDCMP
 #
-$CMP ATmega328-PU
+$CMP ATmega328-P
 D 20MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, DIP-28
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/ATmega328_P%20AVR%20MCU%20with%20picoPower%20Technology%20Data%20Sheet%2040001984A.pdf
 $ENDCMP
 #
-$CMP ATmega328P-AU
+$CMP ATmega328P-A
 D 20MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, TQFP-32
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/ATmega328_P%20AVR%20MCU%20with%20picoPower%20Technology%20Data%20Sheet%2040001984A.pdf
 $ENDCMP
 #
-$CMP ATmega328P-MMH
-D 20MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, QFN-28
-K AVR 8bit Microcontroller MegaAVR
+$CMP ATmega328P-M
+D 20MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, QFN-32
+K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/ATmega328_P%20AVR%20MCU%20with%20picoPower%20Technology%20Data%20Sheet%2040001984A.pdf
 $ENDCMP
 #
-$CMP ATmega328P-MU
-D 20MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, QFN-32
-K AVR 8bit Microcontroller MegaAVR PicoPower
+$CMP ATmega328P-MM
+D 20MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, QFN-28
+K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/ATmega328_P%20AVR%20MCU%20with%20picoPower%20Technology%20Data%20Sheet%2040001984A.pdf
 $ENDCMP
 #
-$CMP ATmega328P-PU
+$CMP ATmega328P-P
 D 20MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, DIP-28
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/ATmega328_P%20AVR%20MCU%20with%20picoPower%20Technology%20Data%20Sheet%2040001984A.pdf
 $ENDCMP
 #
-$CMP ATmega328PB-AU
+$CMP ATmega328PB-A
 D 20MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, TQFP-32
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/40001906C.pdf
 $ENDCMP
 #
-$CMP ATmega328PB-MU
+$CMP ATmega328PB-M
 D 20MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, QFN-32
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/40001906C.pdf
 $ENDCMP
 #
-$CMP ATmega329-16AU
+$CMP ATmega329-16A
 D 16MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, JTAG, TQFP-64
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc2552.pdf
 $ENDCMP
 #
-$CMP ATmega329-16MU
+$CMP ATmega329-16M
 D 16MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, JTAG, QFN-64
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc2552.pdf
 $ENDCMP
 #
-$CMP ATmega3290-16AU
+$CMP ATmega3290-16A
 D 16MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, JTAG, TQFP-100
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc2552.pdf
 $ENDCMP
 #
-$CMP ATmega3290A-AU
+$CMP ATmega3290A-A
 D 20MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, JTAG, TQFP-100
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-8284-8-bit-avr-microcontroller-atmega169a_pa_329a_pa_3290a_pa_649a_p_6490a_p_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega3290P-20AU
+$CMP ATmega3290P-20A
 D 20MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, JTAG, TQFP-100
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8021-AVR-ATmega329P-3290P_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega3290PA-AU
+$CMP ATmega3290PA-A
 D 20MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, JTAG, TQFP-100
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-8284-8-bit-avr-microcontroller-atmega169a_pa_329a_pa_3290a_pa_649a_p_6490a_p_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega3290PV-10AU
+$CMP ATmega3290PV-10A
 D 10MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, JTAG, TQFP-100
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8021-AVR-ATmega329P-3290P_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega3290V-8AU
+$CMP ATmega3290V-8A
 D 8MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, JTAG, TQFP-100
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc2552.pdf
 $ENDCMP
 #
-$CMP ATmega329A-AU
+$CMP ATmega329A-A
 D 20MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, TQFP-64
 K AVR 8bit Microcontroller MegaAVR LCD PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-8284-8-bit-avr-microcontroller-atmega169a_pa_329a_pa_3290a_pa_649a_p_6490a_p_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega329A-MU
+$CMP ATmega329A-M
 D 20MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, QFN-64
 K AVR 8bit Microcontroller MegaAVR LCD PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-8284-8-bit-avr-microcontroller-atmega169a_pa_329a_pa_3290a_pa_649a_p_6490a_p_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega329P-20AU
+$CMP ATmega329P-20A
 D 20MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, JTAG, TQFP-64
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8021-AVR-ATmega329P-3290P_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega329P-20MU
+$CMP ATmega329P-20M
 D 20MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, JTAG, QFN-64
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8021-AVR-ATmega329P-3290P_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega329PA-AU
+$CMP ATmega329PA-A
 D 20MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, TQFP-64
 K AVR 8bit Microcontroller MegaAVR LCD PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-8284-8-bit-avr-microcontroller-atmega169a_pa_329a_pa_3290a_pa_649a_p_6490a_p_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega329PA-MU
+$CMP ATmega329PA-M
 D 20MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, QFN-64
 K AVR 8bit Microcontroller MegaAVR LCD PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-8284-8-bit-avr-microcontroller-atmega169a_pa_329a_pa_3290a_pa_649a_p_6490a_p_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega329PV-10AU
+$CMP ATmega329PV-10A
 D 10MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, JTAG, TQFP-64
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8021-AVR-ATmega329P-3290P_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega329PV-10MU
+$CMP ATmega329PV-10M
 D 10MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, JTAG, QFN-64
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8021-AVR-ATmega329P-3290P_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega329V-8AU
+$CMP ATmega329V-8A
 D 8MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, JTAG, TQFP-64
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc2552.pdf
 $ENDCMP
 #
-$CMP ATmega329V-8MU
+$CMP ATmega329V-8M
 D 8MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, JTAG, QFN-64
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc2552.pdf
 $ENDCMP
 #
-$CMP ATmega32A-AU
+$CMP ATmega32A-A
 D 16MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, JTAG, TQFP-44
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-8155-8-bit-microcontroller-avr-atmega32a_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega32A-MU
+$CMP ATmega32A-M
 D 16MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, JTAG, QFN-44
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-8155-8-bit-microcontroller-avr-atmega32a_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega32A-PU
+$CMP ATmega32A-P
 D 16MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, JTAG, DIP-40
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-8155-8-bit-microcontroller-avr-atmega32a_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega32L-8AU
+$CMP ATmega32L-8A
 D 8MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, JTAG, TQFP-44
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc2503.pdf
 $ENDCMP
 #
-$CMP ATmega32L-8MU
+$CMP ATmega32L-8M
 D 8MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, JTAG, QFN-44
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc2503.pdf
 $ENDCMP
 #
-$CMP ATmega32L-8PU
+$CMP ATmega32L-8P
 D 8MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, JTAG, DIP-40
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc2503.pdf
 $ENDCMP
 #
-$CMP ATmega32M1-AU
+$CMP ATmega32M1-A
 D 16MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, CAN, TQFP-32
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8209-8-bit%20AVR%20ATmega16M1-32M1-64M1_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega32M1-MU
+$CMP ATmega32M1-M
 D 16MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, CAN, QFN-32
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8209-8-bit%20AVR%20ATmega16M1-32M1-64M1_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega32U2-AU
+$CMP ATmega32U2-A
 D 16MHz, 32kB Flash, 1kB SRAM, 1kB EEPROM, TQFP-32
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc7799.pdf
 $ENDCMP
 #
-$CMP ATmega32U2-MU
+$CMP ATmega32U2-M
 D 16MHz, 32kB Flash, 1kB SRAM, 1kB EEPROM, QFN-32
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc7799.pdf
 $ENDCMP
 #
-$CMP ATmega32U4-AU
+$CMP ATmega32U4-A
 D 16MHz, 32kB Flash, 2.5kB SRAM, 1kB EEPROM, USB 2.0, TQFP-44
 K AVR 8bit Microcontroller MegaAVR USB
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-7766-8-bit-AVR-ATmega16U4-32U4_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega32U4-MU
+$CMP ATmega32U4-M
 D 16MHz, 32kB Flash, 2.5kB SRAM, 1kB EEPROM, USB 2.0, QFN-44
 K AVR 8bit Microcontroller MegaAVR USB
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-7766-8-bit-AVR-ATmega16U4-32U4_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega32U4RC-AU
+$CMP ATmega32U4RC-A
 D 16MHz, 32kB Flash, 2.5kB SRAM, 1kB EEPROM, USB 2.0, RC Osc, TQFP-44
 K AVR 8bit Microcontroller MegaAVR USB
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-7766-8-bit-AVR-ATmega16U4-32U4_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega32U4RC-MU
+$CMP ATmega32U4RC-M
 D 16MHz, 32kB Flash, 2.5kB SRAM, 1kB EEPROM, USB 2.0, RC Osc, QFN-44
 K AVR 8bit Microcontroller MegaAVR USB
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-7766-8-bit-AVR-ATmega16U4-32U4_Datasheet.pdf
@@ -1188,25 +1188,25 @@ K AVR 8bit Microcontroller MegaAVR battery management
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-2548-8-bit-AVR-Microcontroller-Battery-Management-ATmega406_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega48-20AU
+$CMP ATmega48-20A
 D 20MHz, 4kB Flash, 512B SRAM, 256B EEPROM, TQFP-32
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-2545-8-bit-AVR-Microcontroller-ATmega48-88-168_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega48-20MMU
-D 20MHz, 4kB Flash, 512B SRAM, 256B EEPROM, QFN-28
+$CMP ATmega48-20M
+D 20MHz, 4kB Flash, 512B SRAM, 256B EEPROM, QFN-32
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-2545-8-bit-AVR-Microcontroller-ATmega48-88-168_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega48-20MU
-D 20MHz, 4kB Flash, 512B SRAM, 256B EEPROM, QFN-32
+$CMP ATmega48-20MM
+D 20MHz, 4kB Flash, 512B SRAM, 256B EEPROM, QFN-28
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-2545-8-bit-AVR-Microcontroller-ATmega48-88-168_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega48-20PU
+$CMP ATmega48-20P
 D 20MHz, 4kB Flash, 512B SRAM, 256B EEPROM, DIP-28
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-2545-8-bit-AVR-Microcontroller-ATmega48-88-168_Datasheet.pdf
@@ -1242,1399 +1242,1399 @@ K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/40002016A.pdf
 $ENDCMP
 #
-$CMP ATmega48A-AU
+$CMP ATmega48A-A
 D 20MHz, 4kB Flash, 512B SRAM, 256B EEPROM, TQFP-32
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/ATmega48A_88A_168A-Data-Sheet-40002007A.pdf
 $ENDCMP
 #
-$CMP ATmega48A-CCU
+$CMP ATmega48A-CC
 D 20MHz, 4kB Flash, 512B SRAM, 256B EEPROM, UFBGA-32
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/ATmega48A_88A_168A-Data-Sheet-40002007A.pdf
 $ENDCMP
 #
-$CMP ATmega48A-MMH
-D 20MHz, 4kB Flash, 512B SRAM, 256B EEPROM, QFN-28
+$CMP ATmega48A-M
+D 20MHz, 4kB Flash, 512B SRAM, 256B EEPROM, QFN-32
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/ATmega48A_88A_168A-Data-Sheet-40002007A.pdf
 $ENDCMP
 #
-$CMP ATmega48A-MU
-D 20MHz, 4kB Flash, 512B SRAM, 256B EEPROM, QFN-32
+$CMP ATmega48A-MM
+D 20MHz, 4kB Flash, 512B SRAM, 256B EEPROM, QFN-28
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/ATmega48A_88A_168A-Data-Sheet-40002007A.pdf
 $ENDCMP
 #
-$CMP ATmega48A-PU
+$CMP ATmega48A-P
 D 20MHz, 4kB Flash, 512B SRAM, 256B EEPROM, DIP-28
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/ATmega48A_88A_168A-Data-Sheet-40002007A.pdf
 $ENDCMP
 #
-$CMP ATmega48P-20AU
+$CMP ATmega48P-20A
 D 20MHz, 4kB Flash, 512B SRAM, 256B EEPROM, TQFP-32
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8025-8-bit-AVR-Microcontroller-ATmega48P-88P-168P_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega48P-20MMU
-D 20MHz, 4kB Flash, 512B SRAM, 256B EEPROM, QFN-28
+$CMP ATmega48P-20M
+D 20MHz, 4kB Flash, 512B SRAM, 256B EEPROM, QFN-32
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8025-8-bit-AVR-Microcontroller-ATmega48P-88P-168P_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega48P-20MU
-D 20MHz, 4kB Flash, 512B SRAM, 256B EEPROM, QFN-32
+$CMP ATmega48P-20MM
+D 20MHz, 4kB Flash, 512B SRAM, 256B EEPROM, QFN-28
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8025-8-bit-AVR-Microcontroller-ATmega48P-88P-168P_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega48P-20PU
+$CMP ATmega48P-20P
 D 20MHz, 4kB Flash, 512B SRAM, 256B EEPROM, DIP-28
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8025-8-bit-AVR-Microcontroller-ATmega48P-88P-168P_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega48PA-AU
+$CMP ATmega48PA-A
 D 20MHz, 4kB Flash, 512B SRAM, 256B EEPROM, TQFP-32
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/ATmega48PA_88PA_168PA-Data-Sheet-40002011A.pdf
 $ENDCMP
 #
-$CMP ATmega48PA-CCU
+$CMP ATmega48PA-CC
 D 20MHz, 4kB Flash, 512B SRAM, 256B EEPROM, UFBGA-32
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/ATmega48PA_88PA_168PA-Data-Sheet-40002011A.pdf
 $ENDCMP
 #
-$CMP ATmega48PA-MMH
-D 20MHz, 4kB Flash, 512B SRAM, 256B EEPROM, QFN-28
+$CMP ATmega48PA-M
+D 20MHz, 4kB Flash, 512B SRAM, 256B EEPROM, QFN-32
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/ATmega48PA_88PA_168PA-Data-Sheet-40002011A.pdf
 $ENDCMP
 #
-$CMP ATmega48PA-MU
-D 20MHz, 4kB Flash, 512B SRAM, 256B EEPROM, QFN-32
+$CMP ATmega48PA-MM
+D 20MHz, 4kB Flash, 512B SRAM, 256B EEPROM, QFN-28
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/ATmega48PA_88PA_168PA-Data-Sheet-40002011A.pdf
 $ENDCMP
 #
-$CMP ATmega48PA-PU
+$CMP ATmega48PA-P
 D 20MHz, 4kB Flash, 512B SRAM, 256B EEPROM, DIP-28
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/ATmega48PA_88PA_168PA-Data-Sheet-40002011A.pdf
 $ENDCMP
 #
-$CMP ATmega48PB-AU
+$CMP ATmega48PB-A
 D 20MHz, 4kB Flash, 512B SRAM, 256B EEPROM, TQFP-32
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/40001909A.pdf
 $ENDCMP
 #
-$CMP ATmega48PB-MU
+$CMP ATmega48PB-M
 D 20MHz, 4kB Flash, 512B SRAM, 256B EEPROM, QFN-32
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/40001909A.pdf
 $ENDCMP
 #
-$CMP ATmega48PV-10AU
+$CMP ATmega48PV-10A
 D 10MHz, 4kB Flash, 512B SRAM, 256B EEPROM, TQFP-32
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8025-8-bit-AVR-Microcontroller-ATmega48P-88P-168P_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega48PV-10MMU
-D 10MHz, 4kB Flash, 512B SRAM, 256B EEPROM, QFN-28
+$CMP ATmega48PV-10M
+D 10MHz, 4kB Flash, 512B SRAM, 256B EEPROM, QFN-32
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8025-8-bit-AVR-Microcontroller-ATmega48P-88P-168P_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega48PV-10MU
-D 10MHz, 4kB Flash, 512B SRAM, 256B EEPROM, QFN-32
+$CMP ATmega48PV-10MM
+D 10MHz, 4kB Flash, 512B SRAM, 256B EEPROM, QFN-28
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8025-8-bit-AVR-Microcontroller-ATmega48P-88P-168P_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega48PV-10PU
+$CMP ATmega48PV-10P
 D 10MHz, 4kB Flash, 512B SRAM, 256B EEPROM, DIP-28
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8025-8-bit-AVR-Microcontroller-ATmega48P-88P-168P_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega48V-10AU
+$CMP ATmega48V-10A
 D 10MHz, 4kB Flash, 512B SRAM, 256B EEPROM, TQFP-32
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-2545-8-bit-AVR-Microcontroller-ATmega48-88-168_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega48V-10MMU
-D 10MHz, 4kB Flash, 512B SRAM, 256B EEPROM, QFN-28
+$CMP ATmega48V-10M
+D 10MHz, 4kB Flash, 512B SRAM, 256B EEPROM, QFN-32
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-2545-8-bit-AVR-Microcontroller-ATmega48-88-168_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega48V-10MU
-D 10MHz, 4kB Flash, 512B SRAM, 256B EEPROM, QFN-32
+$CMP ATmega48V-10MM
+D 10MHz, 4kB Flash, 512B SRAM, 256B EEPROM, QFN-28
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-2545-8-bit-AVR-Microcontroller-ATmega48-88-168_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega48V-10PU
+$CMP ATmega48V-10P
 D 10MHz, 4kB Flash, 512B SRAM, 256B EEPROM, DIP-28
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-2545-8-bit-AVR-Microcontroller-ATmega48-88-168_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega64-16AU
+$CMP ATmega64-16A
 D 16MHz, 64kB Flash, 4kB SRAM, 2kB EEPROM, TQFP-64
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-2490-8-bit-avr-microcontroller-atmega64-l_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega64-16MU
+$CMP ATmega64-16M
 D 16MHz, 64kB Flash, 4kB SRAM, 2kB EEPROM, QFN-64
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-2490-8-bit-avr-microcontroller-atmega64-l_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega640-16AU
+$CMP ATmega640-16A
 D 16MHz, 64kB Flash, 8kB SRAM, 4kB EEPROM, JTAG, TQFP-100
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-2549-8-bit-AVR-Microcontroller-ATmega640-1280-1281-2560-2561_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega640-16CU
+$CMP ATmega640-16C
 D 16MHz, 64kB Flash, 8kB SRAM, 4kB EEPROM, JTAG, TFBGA-100
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-2549-8-bit-AVR-Microcontroller-ATmega640-1280-1281-2560-2561_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega640V-8AU
+$CMP ATmega640V-8A
 D 8MHz, 64kB Flash, 8kB SRAM, 4kB EEPROM, JTAG, TQFP-100
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-2549-8-bit-AVR-Microcontroller-ATmega640-1280-1281-2560-2561_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega640V-8CU
+$CMP ATmega640V-8C
 D 8MHz, 64kB Flash, 8kB SRAM, 4kB EEPROM, JTAG, TFBGA-100
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-2549-8-bit-AVR-Microcontroller-ATmega640-1280-1281-2560-2561_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega644-20AU
+$CMP ATmega644-20A
 D 20MHz, 64kB Flash, 4kB SRAM, 2kB EEPROM, JTAG, TQFP-44
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc2593.pdf
 $ENDCMP
 #
-$CMP ATmega644-20MU
+$CMP ATmega644-20M
 D 20MHz, 64kB Flash, 4kB SRAM, 2kB EEPROM, JTAG, QFN-44
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc2593.pdf
 $ENDCMP
 #
-$CMP ATmega644-20PU
+$CMP ATmega644-20P
 D 20MHz, 64kB Flash, 4kB SRAM, 2kB EEPROM, JTAG, DIP-40
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc2593.pdf
 $ENDCMP
 #
-$CMP ATmega644A-AU
+$CMP ATmega644A-A
 D 20MHz, 64kB Flash, 4kB SRAM, 2kB EEPROM, JTAG, TQFP-44
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8272-8-bit-AVR-microcontroller-ATmega164A_PA-324A_PA-644A_PA-1284_P_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega644A-MU
+$CMP ATmega644A-M
 D 20MHz, 64kB Flash, 4kB SRAM, 2kB EEPROM, JTAG, QFN-44
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8272-8-bit-AVR-microcontroller-ATmega164A_PA-324A_PA-644A_PA-1284_P_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega644A-PU
+$CMP ATmega644A-P
 D 20MHz, 64kB Flash, 4kB SRAM, 2kB EEPROM, JTAG, DIP-40
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8272-8-bit-AVR-microcontroller-ATmega164A_PA-324A_PA-644A_PA-1284_P_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega644P-20AU
+$CMP ATmega644P-20A
 D 20MHz, 64kB Flash, 4kB SRAM, 2kB EEPROM, JTAG, TQFP-44
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-42744-ATmega644P_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega644P-20MU
+$CMP ATmega644P-20M
 D 20MHz, 64kB Flash, 4kB SRAM, 2kB EEPROM, JTAG, QFN-44
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-42744-ATmega644P_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega644P-20PU
+$CMP ATmega644P-20P
 D 20MHz, 64kB Flash, 4kB SRAM, 2kB EEPROM, JTAG, DIP-40
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-42744-ATmega644P_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega644PA-AU
+$CMP ATmega644PA-A
 D 20MHz, 64kB Flash, 4kB SRAM, 2kB EEPROM, JTAG, TQFP-44
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8272-8-bit-AVR-microcontroller-ATmega164A_PA-324A_PA-644A_PA-1284_P_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega644PA-MU
+$CMP ATmega644PA-M
 D 20MHz, 64kB Flash, 4kB SRAM, 2kB EEPROM, JTAG, QFN-44
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8272-8-bit-AVR-microcontroller-ATmega164A_PA-324A_PA-644A_PA-1284_P_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega644PA-PU
+$CMP ATmega644PA-P
 D 20MHz, 64kB Flash, 4kB SRAM, 2kB EEPROM, JTAG, DIP-40
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8272-8-bit-AVR-microcontroller-ATmega164A_PA-324A_PA-644A_PA-1284_P_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega644PV-10AU
+$CMP ATmega644PV-10A
 D 10MHz, 64kB Flash, 4kB SRAM, 2kB EEPROM, JTAG, TQFP-44
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-42744-ATmega644P_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega644PV-10MU
+$CMP ATmega644PV-10M
 D 10MHz, 64kB Flash, 4kB SRAM, 2kB EEPROM, JTAG, QFN-44
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-42744-ATmega644P_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega644PV-10PU
+$CMP ATmega644PV-10P
 D 10MHz, 64kB Flash, 4kB SRAM, 2kB EEPROM, JTAG, DIP-40
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-42744-ATmega644P_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega644V-10AU
+$CMP ATmega644V-10A
 D 10MHz, 64kB Flash, 4kB SRAM, 2kB EEPROM, JTAG, TQFP-44
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc2593.pdf
 $ENDCMP
 #
-$CMP ATmega644V-10MU
+$CMP ATmega644V-10M
 D 10MHz, 64kB Flash, 4kB SRAM, 2kB EEPROM, JTAG, QFN-44
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc2593.pdf
 $ENDCMP
 #
-$CMP ATmega644V-10PU
+$CMP ATmega644V-10P
 D 10MHz, 64kB Flash, 4kB SRAM, 2kB EEPROM, JTAG, DIP-40
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc2593.pdf
 $ENDCMP
 #
-$CMP ATmega645-16AU
+$CMP ATmega645-16A
 D 16MHz, 64kB Flash, 4kB SRAM, 2kB EEPROM, JTAG, TQFP-64
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc2570.pdf
 $ENDCMP
 #
-$CMP ATmega645-16MU
+$CMP ATmega645-16M
 D 16MHz, 64kB Flash, 4kB SRAM, 2kB EEPROM, JTAG, QFN-64
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc2570.pdf
 $ENDCMP
 #
-$CMP ATmega6450-16AU
+$CMP ATmega6450-16A
 D 16MHz, 64kB Flash, 4kB SRAM, 2kB EEPROM, JTAG, TQFP-100
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc2570.pdf
 $ENDCMP
 #
-$CMP ATmega6450A-AU
+$CMP ATmega6450A-A
 D 20MHz, 64kB Flash, 4kB SRAM, 2kB EEPROM, JTAG, TQFP-100
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-8285-8-bit-avr-microcontroller-atmega165a_pa_325a_pa_3250a_pa_645a_p_6450a_p_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega6450P-AU
+$CMP ATmega6450P-A
 D 20MHz, 64kB Flash, 4kB SRAM, 2kB EEPROM, JTAG, TQFP-100
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-8285-8-bit-avr-microcontroller-atmega165a_pa_325a_pa_3250a_pa_645a_p_6450a_p_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega6450V-8AU
+$CMP ATmega6450V-8A
 D 8MHz, 64kB Flash, 4kB SRAM, 2kB EEPROM, JTAG, TQFP-100
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc2570.pdf
 $ENDCMP
 #
-$CMP ATmega645A-AU
+$CMP ATmega645A-A
 D 20MHz, 64kB Flash, 4kB SRAM, 2kB EEPROM, TQFP-64
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-8285-8-bit-avr-microcontroller-atmega165a_pa_325a_pa_3250a_pa_645a_p_6450a_p_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega645A-MU
+$CMP ATmega645A-M
 D 20MHz, 64kB Flash, 4kB SRAM, 2kB EEPROM, QFN-64
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-8285-8-bit-avr-microcontroller-atmega165a_pa_325a_pa_3250a_pa_645a_p_6450a_p_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega645P-AU
+$CMP ATmega645P-A
 D 20MHz, 64kB Flash, 4kB SRAM, 2kB EEPROM, TQFP-64
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-8285-8-bit-avr-microcontroller-atmega165a_pa_325a_pa_3250a_pa_645a_p_6450a_p_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega645P-MU
+$CMP ATmega645P-M
 D 20MHz, 64kB Flash, 4kB SRAM, 2kB EEPROM, QFN-64
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-8285-8-bit-avr-microcontroller-atmega165a_pa_325a_pa_3250a_pa_645a_p_6450a_p_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega645V-8AU
+$CMP ATmega645V-8A
 D 8MHz, 64kB Flash, 4kB SRAM, 2kB EEPROM, JTAG, TQFP-64
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc2570.pdf
 $ENDCMP
 #
-$CMP ATmega645V-8MU
+$CMP ATmega645V-8M
 D 8MHz, 64kB Flash, 4kB SRAM, 2kB EEPROM, JTAG, QFN-64
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc2570.pdf
 $ENDCMP
 #
-$CMP ATmega649-16AU
+$CMP ATmega649-16A
 D 16MHz, 64kB Flash, 4kB SRAM, 2kB EEPROM, JTAG, TQFP-64
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc2552.pdf
 $ENDCMP
 #
-$CMP ATmega649-16MU
+$CMP ATmega649-16M
 D 16MHz, 64kB Flash, 4kB SRAM, 2kB EEPROM, JTAG, QFN-64
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc2552.pdf
 $ENDCMP
 #
-$CMP ATmega6490-16AU
+$CMP ATmega6490-16A
 D 16MHz, 64kB Flash, 4kB SRAM, 2kB EEPROM, JTAG, TQFP-100
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc2552.pdf
 $ENDCMP
 #
-$CMP ATmega6490A-AU
+$CMP ATmega6490A-A
 D 20MHz, 64kB Flash, 4kB SRAM, 2kB EEPROM, JTAG, TQFP-100
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-8284-8-bit-avr-microcontroller-atmega169a_pa_329a_pa_3290a_pa_649a_p_6490a_p_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega6490P-AU
+$CMP ATmega6490P-A
 D 20MHz, 64kB Flash, 4kB SRAM, 2kB EEPROM, JTAG, TQFP-100
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-8284-8-bit-avr-microcontroller-atmega169a_pa_329a_pa_3290a_pa_649a_p_6490a_p_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega6490V-8AU
+$CMP ATmega6490V-8A
 D 8MHz, 64kB Flash, 4kB SRAM, 2kB EEPROM, JTAG, TQFP-100
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc2552.pdf
 $ENDCMP
 #
-$CMP ATmega649A-AU
+$CMP ATmega649A-A
 D 16MHz, 64kB Flash, 4kB SRAM, 2kB EEPROM, TQFP-64
 K AVR 8bit Microcontroller MegaAVR LCD PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-8284-8-bit-avr-microcontroller-atmega169a_pa_329a_pa_3290a_pa_649a_p_6490a_p_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega649A-MU
+$CMP ATmega649A-M
 D 16MHz, 64kB Flash, 4kB SRAM, 2kB EEPROM, QFN-64
 K AVR 8bit Microcontroller MegaAVR LCD PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-8284-8-bit-avr-microcontroller-atmega169a_pa_329a_pa_3290a_pa_649a_p_6490a_p_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega649P-AU
+$CMP ATmega649P-A
 D 16MHz, 64kB Flash, 4kB SRAM, 2kB EEPROM, TQFP-64
 K AVR 8bit Microcontroller MegaAVR LCD PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-8284-8-bit-avr-microcontroller-atmega169a_pa_329a_pa_3290a_pa_649a_p_6490a_p_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega649P-MU
+$CMP ATmega649P-M
 D 16MHz, 64kB Flash, 4kB SRAM, 2kB EEPROM, QFN-64
 K AVR 8bit Microcontroller MegaAVR LCD PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-8284-8-bit-avr-microcontroller-atmega169a_pa_329a_pa_3290a_pa_649a_p_6490a_p_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega649V-8AU
+$CMP ATmega649V-8A
 D 8MHz, 64kB Flash, 4kB SRAM, 2kB EEPROM, JTAG, TQFP-64
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc2552.pdf
 $ENDCMP
 #
-$CMP ATmega649V-8MU
+$CMP ATmega649V-8M
 D 8MHz, 64kB Flash, 4kB SRAM, 2kB EEPROM, JTAG, QFN-64
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc2552.pdf
 $ENDCMP
 #
-$CMP ATmega64A-AU
+$CMP ATmega64A-A
 D 16MHz, 64kB Flash, 4kB SRAM, 2kB EEPROM, TQFP-64
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-8160-8-bit-avr-microcontroller-atmega64a-datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega64A-MU
+$CMP ATmega64A-M
 D 16MHz, 64kB Flash, 4kB SRAM, 2kB EEPROM, QFN-64
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-8160-8-bit-avr-microcontroller-atmega64a-datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega64L-8AU
+$CMP ATmega64L-8A
 D 8MHz, 64kB Flash, 4kB SRAM, 2kB EEPROM, TQFP-64
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-2490-8-bit-avr-microcontroller-atmega64-l_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega64L-8MU
+$CMP ATmega64L-8M
 D 8MHz, 64kB Flash, 4kB SRAM, 2kB EEPROM, QFN-64
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-2490-8-bit-avr-microcontroller-atmega64-l_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega64M1-AU
+$CMP ATmega64M1-A
 D 16MHz, 64kB Flash, 4kB SRAM, 2kB EEPROM, CAN, TQFP-32
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8209-8-bit%20AVR%20ATmega16M1-32M1-64M1_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega64M1-MU
+$CMP ATmega64M1-M
 D 16MHz, 64kB Flash, 4kB SRAM, 2kB EEPROM, CAN, QFN-32
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8209-8-bit%20AVR%20ATmega16M1-32M1-64M1_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega8-16AU
+$CMP ATmega8-16A
 D 16MHz, 8kB Flash, 1kB SRAM, 512B EEPROM, TQFP-32
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-2486-8-bit-avr-microcontroller-atmega8_l_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega8-16MU
+$CMP ATmega8-16M
 D 16MHz, 8kB Flash, 1kB SRAM, 512B EEPROM, QFN-32
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-2486-8-bit-avr-microcontroller-atmega8_l_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega8-16PU
+$CMP ATmega8-16P
 D 16MHz, 8kB Flash, 1kB SRAM, 512B EEPROM, DIP-28
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-2486-8-bit-avr-microcontroller-atmega8_l_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega8515-16AU
+$CMP ATmega8515-16A
 D 16MHz, 8kB Flash, 512B SRAM, 512B EEPROM, TQFP-44
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc2512.pdf
 $ENDCMP
 #
-$CMP ATmega8515-16JU
+$CMP ATmega8515-16J
 D 16MHz, 8kB Flash, 512B SRAM, 512B EEPROM, PLCC-44
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc2512.pdf
 $ENDCMP
 #
-$CMP ATmega8515-16MU
+$CMP ATmega8515-16M
 D 16MHz, 8kB Flash, 512B SRAM, 512B EEPROM, QFN-44
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc2512.pdf
 $ENDCMP
 #
-$CMP ATmega8515-16PU
+$CMP ATmega8515-16P
 D 16MHz, 8kB Flash, 512B SRAM, 512B EEPROM, DIP-40
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc2512.pdf
 $ENDCMP
 #
-$CMP ATmega8515L-8AU
+$CMP ATmega8515L-8A
 D 8MHz, 8kB Flash, 512B SRAM, 512B EEPROM, TQFP-44
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc2512.pdf
 $ENDCMP
 #
-$CMP ATmega8515L-8JU
+$CMP ATmega8515L-8J
 D 8MHz, 8kB Flash, 512B SRAM, 512B EEPROM, PLCC-44
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc2512.pdf
 $ENDCMP
 #
-$CMP ATmega8515L-8MU
+$CMP ATmega8515L-8M
 D 8MHz, 8kB Flash, 512B SRAM, 512B EEPROM, QFN-44
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc2512.pdf
 $ENDCMP
 #
-$CMP ATmega8515L-8PU
+$CMP ATmega8515L-8P
 D 8MHz, 8kB Flash, 512B SRAM, 512B EEPROM, DIP-40
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc2512.pdf
 $ENDCMP
 #
-$CMP ATmega8535-16AU
+$CMP ATmega8535-16A
 D 16MHz, 8kB Flash, 512B SRAM, 512B EEPROM, TQFP-44
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc2502.pdf
 $ENDCMP
 #
-$CMP ATmega8535-16JU
+$CMP ATmega8535-16J
 D 16MHz, 8kB Flash, 512B SRAM, 512B EEPROM, PLCC-44
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc2502.pdf
 $ENDCMP
 #
-$CMP ATmega8535-16MU
+$CMP ATmega8535-16M
 D 16MHz, 8kB Flash, 512B SRAM, 512B EEPROM, QFN-44
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc2502.pdf
 $ENDCMP
 #
-$CMP ATmega8535-16PU
+$CMP ATmega8535-16P
 D 16MHz, 8kB Flash, 512B SRAM, 512B EEPROM, DIP-40
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc2502.pdf
 $ENDCMP
 #
-$CMP ATmega8535L-8AU
+$CMP ATmega8535L-8A
 D 8MHz, 8kB Flash, 512B SRAM, 512B EEPROM, TQFP-44
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc2502.pdf
 $ENDCMP
 #
-$CMP ATmega8535L-8JU
+$CMP ATmega8535L-8J
 D 8MHz, 8kB Flash, 512B SRAM, 512B EEPROM, PLCC-44
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc2502.pdf
 $ENDCMP
 #
-$CMP ATmega8535L-8MU
+$CMP ATmega8535L-8M
 D 8MHz, 8kB Flash, 512B SRAM, 512B EEPROM, QFN-44
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc2502.pdf
 $ENDCMP
 #
-$CMP ATmega8535L-8PU
+$CMP ATmega8535L-8P
 D 8MHz, 8kB Flash, 512B SRAM, 512B EEPROM, DIP-40
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc2502.pdf
 $ENDCMP
 #
-$CMP ATmega88-20AU
+$CMP ATmega88-20A
 D 20MHz, 8kB Flash, 1kB SRAM, 512B EEPROM, TQFP-32
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-2545-8-bit-AVR-Microcontroller-ATmega48-88-168_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega88-20MU
+$CMP ATmega88-20M
 D 20MHz, 8kB Flash, 1kB SRAM, 512B EEPROM, QFN-32
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-2545-8-bit-AVR-Microcontroller-ATmega48-88-168_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega88-20PU
+$CMP ATmega88-20P
 D 20MHz, 8kB Flash, 1kB SRAM, 512B EEPROM, DIP-28
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-2545-8-bit-AVR-Microcontroller-ATmega48-88-168_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega88A-AU
+$CMP ATmega88A-A
 D 20MHz, 8kB Flash, 1kB SRAM, 512B EEPROM, TQFP-32
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/ATmega48A_88A_168A-Data-Sheet-40002007A.pdf
 $ENDCMP
 #
-$CMP ATmega88A-CCU
+$CMP ATmega88A-CC
 D 20MHz, 8kB Flash, 1kB SRAM, 512B EEPROM, UFBGA-32
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/ATmega48A_88A_168A-Data-Sheet-40002007A.pdf
 $ENDCMP
 #
-$CMP ATmega88A-MMH
-D 20MHz, 8kB Flash, 1kB SRAM, 512B EEPROM, QFN-28
+$CMP ATmega88A-M
+D 20MHz, 8kB Flash, 1kB SRAM, 512B EEPROM, QFN-32
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/ATmega48A_88A_168A-Data-Sheet-40002007A.pdf
 $ENDCMP
 #
-$CMP ATmega88A-MU
-D 20MHz, 8kB Flash, 1kB SRAM, 512B EEPROM, QFN-32
+$CMP ATmega88A-MM
+D 20MHz, 8kB Flash, 1kB SRAM, 512B EEPROM, QFN-28
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/ATmega48A_88A_168A-Data-Sheet-40002007A.pdf
 $ENDCMP
 #
-$CMP ATmega88A-PU
+$CMP ATmega88A-P
 D 20MHz, 8kB Flash, 1kB SRAM, 512B EEPROM, DIP-28
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/ATmega48A_88A_168A-Data-Sheet-40002007A.pdf
 $ENDCMP
 #
-$CMP ATmega88P-20AU
+$CMP ATmega88P-20A
 D 20MHz, 8kB Flash, 1kB SRAM, 512B EEPROM, TQFP-32
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8025-8-bit-AVR-Microcontroller-ATmega48P-88P-168P_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega88P-20MU
+$CMP ATmega88P-20M
 D 20MHz, 8kB Flash, 1kB SRAM, 512B EEPROM, QFN-32
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8025-8-bit-AVR-Microcontroller-ATmega48P-88P-168P_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega88P-20PU
+$CMP ATmega88P-20P
 D 20MHz, 8kB Flash, 1kB SRAM, 512B EEPROM, DIP-28
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8025-8-bit-AVR-Microcontroller-ATmega48P-88P-168P_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega88PA-AU
+$CMP ATmega88PA-A
 D 20MHz, 8kB Flash, 1kB SRAM, 512B EEPROM, TQFP-32
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/ATmega48PA_88PA_168PA-Data-Sheet-40002011A.pdf
 $ENDCMP
 #
-$CMP ATmega88PA-CCU
+$CMP ATmega88PA-CC
 D 20MHz, 8kB Flash, 1kB SRAM, 512B EEPROM, UFBGA-32
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/ATmega48PA_88PA_168PA-Data-Sheet-40002011A.pdf
 $ENDCMP
 #
-$CMP ATmega88PA-MMH
-D 20MHz, 8kB Flash, 1kB SRAM, 512B EEPROM, QFN-28
+$CMP ATmega88PA-M
+D 20MHz, 8kB Flash, 1kB SRAM, 512B EEPROM, QFN-32
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/ATmega48PA_88PA_168PA-Data-Sheet-40002011A.pdf
 $ENDCMP
 #
-$CMP ATmega88PA-MU
-D 20MHz, 8kB Flash, 1kB SRAM, 512B EEPROM, QFN-32
+$CMP ATmega88PA-MM
+D 20MHz, 8kB Flash, 1kB SRAM, 512B EEPROM, QFN-28
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/ATmega48PA_88PA_168PA-Data-Sheet-40002011A.pdf
 $ENDCMP
 #
-$CMP ATmega88PA-PU
+$CMP ATmega88PA-P
 D 20MHz, 8kB Flash, 1kB SRAM, 512B EEPROM, DIP-28
 K AVR 8bit Microcontroller MegaAVR PicoPower
 F http://ww1.microchip.com/downloads/en/DeviceDoc/ATmega48PA_88PA_168PA-Data-Sheet-40002011A.pdf
 $ENDCMP
 #
-$CMP ATmega88PB-AU
+$CMP ATmega88PB-A
 D 20MHz, 8kB Flash, 1kB SRAM, 512B EEPROM, TQFP-32
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/40001909A.pdf
 $ENDCMP
 #
-$CMP ATmega88PB-MU
+$CMP ATmega88PB-M
 D 20MHz, 8kB Flash, 1kB SRAM, 512B EEPROM, QFN-32
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/40001909A.pdf
 $ENDCMP
 #
-$CMP ATmega88PV-10AU
+$CMP ATmega88PV-10A
 D 10MHz, 8kB Flash, 1kB SRAM, 512B EEPROM, TQFP-32
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8025-8-bit-AVR-Microcontroller-ATmega48P-88P-168P_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega88PV-10MU
+$CMP ATmega88PV-10M
 D 10MHz, 8kB Flash, 1kB SRAM, 512B EEPROM, QFN-32
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8025-8-bit-AVR-Microcontroller-ATmega48P-88P-168P_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega88PV-10PU
+$CMP ATmega88PV-10P
 D 10MHz, 8kB Flash, 1kB SRAM, 512B EEPROM, DIP-28
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8025-8-bit-AVR-Microcontroller-ATmega48P-88P-168P_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega88V-10AU
+$CMP ATmega88V-10A
 D 10MHz, 8kB Flash, 1kB SRAM, 512B EEPROM, TQFP-32
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-2545-8-bit-AVR-Microcontroller-ATmega48-88-168_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega88V-10MU
+$CMP ATmega88V-10M
 D 10MHz, 8kB Flash, 1kB SRAM, 512B EEPROM, QFN-32
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-2545-8-bit-AVR-Microcontroller-ATmega48-88-168_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega88V-10PU
+$CMP ATmega88V-10P
 D 10MHz, 8kB Flash, 1kB SRAM, 512B EEPROM, DIP-28
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-2545-8-bit-AVR-Microcontroller-ATmega48-88-168_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega8A-AU
+$CMP ATmega8A-A
 D 16MHz, 8kB Flash, 1kB SRAM, 512B EEPROM, TQFP-32
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Microchip%208bit%20mcu%20AVR%20ATmega8A%20data%20sheet%2040001974A.pdf
 $ENDCMP
 #
-$CMP ATmega8A-MU
+$CMP ATmega8A-M
 D 16MHz, 8kB Flash, 1kB SRAM, 512B EEPROM, QFN-32
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Microchip%208bit%20mcu%20AVR%20ATmega8A%20data%20sheet%2040001974A.pdf
 $ENDCMP
 #
-$CMP ATmega8A-PU
+$CMP ATmega8A-P
 D 16MHz, 8kB Flash, 1kB SRAM, 512B EEPROM, DIP-28
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Microchip%208bit%20mcu%20AVR%20ATmega8A%20data%20sheet%2040001974A.pdf
 $ENDCMP
 #
-$CMP ATmega8L-8AU
+$CMP ATmega8L-8A
 D 8MHz, 8kB Flash, 1kB SRAM, 512B EEPROM, TQFP-32
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-2486-8-bit-avr-microcontroller-atmega8_l_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega8L-8MU
+$CMP ATmega8L-8M
 D 8MHz, 8kB Flash, 1kB SRAM, 512B EEPROM, QFN-32
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-2486-8-bit-avr-microcontroller-atmega8_l_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega8L-8PU
+$CMP ATmega8L-8P
 D 8MHz, 8kB Flash, 1kB SRAM, 512B EEPROM, DIP-28
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-2486-8-bit-avr-microcontroller-atmega8_l_datasheet.pdf
 $ENDCMP
 #
-$CMP ATmega8U2-AU
+$CMP ATmega8U2-A
 D 16MHz, 8kB Flash, 512B SRAM, 512B EEPROM, TQFP-32
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc7799.pdf
 $ENDCMP
 #
-$CMP ATmega8U2-MU
+$CMP ATmega8U2-M
 D 16MHz, 8kB Flash, 512B SRAM, 512B EEPROM, QFN-32
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc7799.pdf
 $ENDCMP
 #
-$CMP ATxmega128A1-AU
+$CMP ATxmega128A1-A
 D 32MHz, 128kB Flash, 8kB Boot, 8kB SRAM, 2kB EEPROM, JTAG, TQFP-100
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8067-8-and-16-bit-AVR-Microcontrollers-ATxmega64A1-ATxmega128A1_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega128A1-C7U
-D 32MHz, 128kB Flash, 8kB Boot, 8kB SRAM, 2kB EEPROM, JTAG, VFBGA-100
+$CMP ATxmega128A1-C
+D 32MHz, 128kB Flash, 8kB Boot, 8kB SRAM, 2kB EEPROM, JTAG, TFBGA-100
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8067-8-and-16-bit-AVR-Microcontrollers-ATxmega64A1-ATxmega128A1_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega128A1-CU
-D 32MHz, 128kB Flash, 8kB Boot, 8kB SRAM, 2kB EEPROM, JTAG, TFBGA-100
+$CMP ATxmega128A1-C7
+D 32MHz, 128kB Flash, 8kB Boot, 8kB SRAM, 2kB EEPROM, JTAG, VFBGA-100
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8067-8-and-16-bit-AVR-Microcontrollers-ATxmega64A1-ATxmega128A1_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega128A1U-AU
+$CMP ATxmega128A1U-A
 D 32MHz, 128kB Flash, 8kB Boot, 8kB SRAM, 2kB EEPROM, JTAG, USB, TQFP-100
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8385-8-and-16-bit-AVR-Microcontroller-ATxmega64A1U-ATxmega128A1U_datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega128A1U-C7U
-D 32MHz, 128kB Flash, 8kB Boot, 8kB SRAM, 2kB EEPROM, JTAG, USB, VFBGA-100
+$CMP ATxmega128A1U-C
+D 32MHz, 128kB Flash, 8kB Boot, 8kB SRAM, 2kB EEPROM, JTAG, USB, TFBGA-100
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8385-8-and-16-bit-AVR-Microcontroller-ATxmega64A1U-ATxmega128A1U_datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega128A1U-CU
-D 32MHz, 128kB Flash, 8kB Boot, 8kB SRAM, 2kB EEPROM, JTAG, USB, TFBGA-100
+$CMP ATxmega128A1U-C7
+D 32MHz, 128kB Flash, 8kB Boot, 8kB SRAM, 2kB EEPROM, JTAG, USB, VFBGA-100
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8385-8-and-16-bit-AVR-Microcontroller-ATxmega64A1U-ATxmega128A1U_datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega128A3-AU
+$CMP ATxmega128A3-A
 D 32MHz, 128kB Flash, 8kB Boot, 8kB SRAM, 2kB EEPROM, JTAG, TQFP-64
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8068-8-and16-bit-AVR-XMEGA-A3-Microcontrollers_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega128A3-MH
+$CMP ATxmega128A3-M
 D 32MHz, 128kB Flash, 8kB Boot, 8kB SRAM, 2kB EEPROM, JTAG, QFN-64
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8068-8-and16-bit-AVR-XMEGA-A3-Microcontrollers_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega128A3U-AU
+$CMP ATxmega128A3U-A
 D 32MHz, 128kB Flash, 8kB Boot, 8kB SRAM, 2kB EEPROM, JTAG, USB, TQFP-64
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8386-8-and-16-bit-AVR-Microcontroller-ATxmega64A3U-128A3U-192A3U-256A3U_datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega128A3U-MH
+$CMP ATxmega128A3U-M
 D 32MHz, 128kB Flash, 8kB Boot, 8kB SRAM, 2kB EEPROM, JTAG, USB, QFN-64
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8386-8-and-16-bit-AVR-Microcontroller-ATxmega64A3U-128A3U-192A3U-256A3U_datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega128A4U-AU
+$CMP ATxmega128A4U-A
 D 32MHz, 128kB Flash, 8kB Boot, 8kB SRAM, 2kB EEPROM, JTAG, USB, TQFP-44
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8387-8-and16-bit-AVR-Microcontroller-XMEGA-A4U_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega128A4U-CU
+$CMP ATxmega128A4U-C
 D 32MHz, 128kB Flash, 8kB Boot, 8kB SRAM, 2kB EEPROM, JTAG, USB, VFBGA-49
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8387-8-and16-bit-AVR-Microcontroller-XMEGA-A4U_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega128A4U-MH
+$CMP ATxmega128A4U-M
 D 32MHz, 128kB Flash, 8kB Boot, 8kB SRAM, 2kB EEPROM, JTAG, USB, QFN-44
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8387-8-and16-bit-AVR-Microcontroller-XMEGA-A4U_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega128B1-AU
+$CMP ATxmega128B1-A
 D 32MHz, 128kB Flash, 8kB Boot, 8kB SRAM, 2kB EEPROM, JTAG, USB, LCD, TQFP-100
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8330-8-and-16-bit-AVR-Microcontroller-XMEGA-B-ATxmega64B1-ATxmega128B1_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega128B1-CU
+$CMP ATxmega128B1-C
 D 32MHz, 128kB Flash, 8kB Boot, 8kB SRAM, 2kB EEPROM, JTAG, USB, LCD, VFBGA-100
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8330-8-and-16-bit-AVR-Microcontroller-XMEGA-B-ATxmega64B1-ATxmega128B1_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega128B3-AU
+$CMP ATxmega128B3-A
 D 32MHz, 128kB Flash, 8kB Boot, 8kB SRAM, 2kB EEPROM, JTAG, USB, LCD, TQFP-64
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8074-8-and-16-bit-AVR-Microcontroller-XMEGA-B-ATxmega64B3-ATxmega128B3_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega128B3-MCU
-D 32MHz, 128kB Flash, 8kB Boot, 8kB SRAM, 2kB EEPROM, JTAG, USB, LCD, DRQFN-64
+$CMP ATxmega128B3-M
+D 32MHz, 128kB Flash, 8kB Boot, 8kB SRAM, 2kB EEPROM, JTAG, USB, LCD, QFN-64
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8074-8-and-16-bit-AVR-Microcontroller-XMEGA-B-ATxmega64B3-ATxmega128B3_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega128B3-MH
-D 32MHz, 128kB Flash, 8kB Boot, 8kB SRAM, 2kB EEPROM, JTAG, USB, LCD, QFN-64
+$CMP ATxmega128B3-MC
+D 32MHz, 128kB Flash, 8kB Boot, 8kB SRAM, 2kB EEPROM, JTAG, USB, LCD, DRQFN-64
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8074-8-and-16-bit-AVR-Microcontroller-XMEGA-B-ATxmega64B3-ATxmega128B3_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega128C3-AU
+$CMP ATxmega128C3-A
 D 32MHz, 128kB Flash, 8kB Boot, 8kB SRAM, 2kB EEPROM, JTAG, USB, TQFP-64
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8492-8-and-16-bit-AVR-microcontroller-ATxmega32C3_64C3_128C3_192C3_256C3_datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega128C3-MH
+$CMP ATxmega128C3-M
 D 32MHz, 128kB Flash, 8kB Boot, 8kB SRAM, 2kB EEPROM, JTAG, USB, QFN-64
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8492-8-and-16-bit-AVR-microcontroller-ATxmega32C3_64C3_128C3_192C3_256C3_datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega128D3-AU
+$CMP ATxmega128D3-A
 D 32MHz, 128kB Flash, 8kB Boot, 8kB SRAM, 2kB EEPROM, JTAG, TQFP-64
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8134-8-16-bit-Atmel-XMEGA-D3-Microcontroller_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega128D3-MH
+$CMP ATxmega128D3-M
 D 32MHz, 128kB Flash, 8kB Boot, 8kB SRAM, 2kB EEPROM, JTAG, QFN-64
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8134-8-16-bit-Atmel-XMEGA-D3-Microcontroller_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega128D4-AU
+$CMP ATxmega128D4-A
 D 32MHz, 128kB Flash, 8kB Boot, 8kB SRAM, 2kB EEPROM, JTAG, TQFP-44
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8135-8-and-16-bit-AVR-microcontroller-ATxmega16D4-32D4-64D4-128D4_datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega128D4-CU
+$CMP ATxmega128D4-C
 D 32MHz, 128kB Flash, 8kB Boot, 8kB SRAM, 2kB EEPROM, JTAG, VFBGA-49
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8135-8-and-16-bit-AVR-microcontroller-ATxmega16D4-32D4-64D4-128D4_datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega128D4-MH
+$CMP ATxmega128D4-M
 D 32MHz, 128kB Flash, 8kB Boot, 8kB SRAM, 2kB EEPROM, JTAG, QFN-44
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8135-8-and-16-bit-AVR-microcontroller-ATxmega16D4-32D4-64D4-128D4_datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega16A4U-AU
+$CMP ATxmega16A4U-A
 D 32MHz, 16kB Flash, 4kB Boot, 2kB SRAM, 1kB EEPROM, JTAG, USB, TQFP-44
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8387-8-and16-bit-AVR-Microcontroller-XMEGA-A4U_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega16A4U-CU
+$CMP ATxmega16A4U-C
 D 32MHz, 16kB Flash, 4kB Boot, 2kB SRAM, 1kB EEPROM, JTAG, USB, VFBGA-49
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8387-8-and16-bit-AVR-Microcontroller-XMEGA-A4U_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega16A4U-MH
+$CMP ATxmega16A4U-M
 D 32MHz, 16kB Flash, 4kB Boot, 2kB SRAM, 1kB EEPROM, JTAG, USB, QFN-44
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8387-8-and16-bit-AVR-Microcontroller-XMEGA-A4U_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega16C4-AU
+$CMP ATxmega16C4-A
 D 32MHz, 16kB Flash, 4kB Boot, 2kB SRAM, 1kB EEPROM, JTAG, TQFP-44
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8493-8-and-32-bit-AVR-XMEGA-Microcontrollers-ATxmega16C4-ATxmega32C4_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega16C4-CU
+$CMP ATxmega16C4-C
 D 32MHz, 16kB Flash, 4kB Boot, 2kB SRAM, 1kB EEPROM, JTAG, VFBGA-49
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8493-8-and-32-bit-AVR-XMEGA-Microcontrollers-ATxmega16C4-ATxmega32C4_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega16C4-MH
+$CMP ATxmega16C4-M
 D 32MHz, 16kB Flash, 4kB Boot, 2kB SRAM, 1kB EEPROM, JTAG, QFN-44
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8493-8-and-32-bit-AVR-XMEGA-Microcontrollers-ATxmega16C4-ATxmega32C4_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega16D4-AU
+$CMP ATxmega16D4-A
 D 32MHz, 16kB Flash, 4kB Boot, 2kB SRAM, 1kB EEPROM, JTAG, TQFP-44
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8135-8-and-16-bit-AVR-microcontroller-ATxmega16D4-32D4-64D4-128D4_datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega16D4-CU
+$CMP ATxmega16D4-C
 D 32MHz, 16kB Flash, 4kB Boot, 2kB SRAM, 1kB EEPROM, JTAG, VFBGA-49
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8135-8-and-16-bit-AVR-microcontroller-ATxmega16D4-32D4-64D4-128D4_datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega16D4-MH
+$CMP ATxmega16D4-M
 D 32MHz, 16kB Flash, 4kB Boot, 2kB SRAM, 1kB EEPROM, JTAG, QFN-44
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8135-8-and-16-bit-AVR-microcontroller-ATxmega16D4-32D4-64D4-128D4_datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega16E5-AU
+$CMP ATxmega16E5-A
 D 32MHz, 16kB Flash, 4kB Boot, 2kB SRAM, 512B EEPROM, TQFP-32
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8153-8-and-16-bit-AVR-Microcontroller-XMEGA-E-ATxmega8E5-ATxmega16E5-ATxmega32E5_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega16E5-M4U
+$CMP ATxmega16E5-M
 D 32MHz, 16kB Flash, 4kB Boot, 2kB SRAM, 512B EEPROM, QFN-32
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8153-8-and-16-bit-AVR-Microcontroller-XMEGA-E-ATxmega8E5-ATxmega16E5-ATxmega32E5_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega16E5-MU
+$CMP ATxmega16E5-M4
 D 32MHz, 16kB Flash, 4kB Boot, 2kB SRAM, 512B EEPROM, QFN-32
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8153-8-and-16-bit-AVR-Microcontroller-XMEGA-E-ATxmega8E5-ATxmega16E5-ATxmega32E5_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega192A3-AU
+$CMP ATxmega192A3-A
 D 32MHz, 192kB Flash, 8kB Boot, 16kB SRAM, 2kB EEPROM, JTAG, TQFP-64
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8068-8-and16-bit-AVR-XMEGA-A3-Microcontrollers_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega192A3-MH
+$CMP ATxmega192A3-M
 D 32MHz, 192kB Flash, 8kB Boot, 16kB SRAM, 2kB EEPROM, JTAG, QFN-64
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8068-8-and16-bit-AVR-XMEGA-A3-Microcontrollers_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega192A3U-AU
+$CMP ATxmega192A3U-A
 D 32MHz, 192kB Flash, 8kB Boot, 16kB SRAM, 2kB EEPROM, JTAG, USB, TQFP-64
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8386-8-and-16-bit-AVR-Microcontroller-ATxmega64A3U-128A3U-192A3U-256A3U_datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega192A3U-MH
+$CMP ATxmega192A3U-M
 D 32MHz, 192kB Flash, 8kB Boot, 16kB SRAM, 2kB EEPROM, JTAG, USB, QFN-64
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8386-8-and-16-bit-AVR-Microcontroller-ATxmega64A3U-128A3U-192A3U-256A3U_datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega192C3-AU
+$CMP ATxmega192C3-A
 D 32MHz, 192kB Flash, 8kB Boot, 16kB SRAM, 2kB EEPROM, JTAG, USB, TQFP-64
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8492-8-and-16-bit-AVR-microcontroller-ATxmega32C3_64C3_128C3_192C3_256C3_datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega192C3-MH
+$CMP ATxmega192C3-M
 D 32MHz, 192kB Flash, 8kB Boot, 16kB SRAM, 2kB EEPROM, JTAG, USB, QFN-64
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8492-8-and-16-bit-AVR-microcontroller-ATxmega32C3_64C3_128C3_192C3_256C3_datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega192D3-AU
+$CMP ATxmega192D3-A
 D 32MHz, 192kB Flash, 8kB Boot, 16kB SRAM, 2kB EEPROM, JTAG, TQFP-64
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8134-8-16-bit-Atmel-XMEGA-D3-Microcontroller_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega192D3-MH
+$CMP ATxmega192D3-M
 D 32MHz, 192kB Flash, 8kB Boot, 16kB SRAM, 2kB EEPROM, JTAG, QFN-64
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8134-8-16-bit-Atmel-XMEGA-D3-Microcontroller_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega256A3-AU
+$CMP ATxmega256A3-A
 D 32MHz, 256kB Flash, 8kB Boot, 16kB SRAM, 4kB EEPROM, JTAG, TQFP-64
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8068-8-and16-bit-AVR-XMEGA-A3-Microcontrollers_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega256A3-MH
+$CMP ATxmega256A3-M
 D 32MHz, 256kB Flash, 8kB Boot, 16kB SRAM, 4kB EEPROM, JTAG, QFN-64
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8068-8-and16-bit-AVR-XMEGA-A3-Microcontrollers_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega256A3B-AU
+$CMP ATxmega256A3B-A
 D 32MHz, 256kB Flash, 8kB Boot, 16kB SRAM, 4kB EEPROM, JTAG, TQFP-64
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8116-8-and-16-bit-AVR-XMEGA-A3B-Microcontroller_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega256A3B-MH
+$CMP ATxmega256A3B-M
 D 32MHz, 256kB Flash, 8kB Boot, 16kB SRAM, 4kB EEPROM, JTAG, QFN-64
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8116-8-and-16-bit-AVR-XMEGA-A3B-Microcontroller_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega256A3BU-AU
+$CMP ATxmega256A3BU-A
 D 32MHz, 256kB Flash, 8kB Boot, 16kB SRAM, 4kB EEPROM, JTAG, USB, TQFP-64
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8362-8-and-16bit-AVR-microcontroller-ATxmega256A3BU_datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega256A3BU-MH
+$CMP ATxmega256A3BU-M
 D 32MHz, 256kB Flash, 8kB Boot, 16kB SRAM, 4kB EEPROM, JTAG, USB, QFN-64
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8362-8-and-16bit-AVR-microcontroller-ATxmega256A3BU_datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega256A3U-AU
+$CMP ATxmega256A3U-A
 D 32MHz, 256kB Flash, 8kB Boot, 16kB SRAM, 4kB EEPROM, JTAG, USB, TQFP-64
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8386-8-and-16-bit-AVR-Microcontroller-ATxmega64A3U-128A3U-192A3U-256A3U_datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega256A3U-MH
+$CMP ATxmega256A3U-M
 D 32MHz, 256kB Flash, 8kB Boot, 16kB SRAM, 4kB EEPROM, JTAG, USB, QFN-64
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8386-8-and-16-bit-AVR-Microcontroller-ATxmega64A3U-128A3U-192A3U-256A3U_datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega256C3-AU
+$CMP ATxmega256C3-A
 D 32MHz, 256kB Flash, 8kB Boot, 16kB SRAM, 4kB EEPROM, JTAG, USB, TQFP-64
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8492-8-and-16-bit-AVR-microcontroller-ATxmega32C3_64C3_128C3_192C3_256C3_datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega256C3-MH
+$CMP ATxmega256C3-M
 D 32MHz, 256kB Flash, 8kB Boot, 16kB SRAM, 4kB EEPROM, JTAG, USB, QFN-64
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8492-8-and-16-bit-AVR-microcontroller-ATxmega32C3_64C3_128C3_192C3_256C3_datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega256D3-AU
+$CMP ATxmega256D3-A
 D 32MHz, 256kB Flash, 8kB Boot, 16kB SRAM, 4kB EEPROM, JTAG, TQFP-64
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8134-8-16-bit-Atmel-XMEGA-D3-Microcontroller_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega256D3-MH
+$CMP ATxmega256D3-M
 D 32MHz, 256kB Flash, 8kB Boot, 16kB SRAM, 4kB EEPROM, JTAG, QFN-64
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8134-8-16-bit-Atmel-XMEGA-D3-Microcontroller_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega32A4U-AU
+$CMP ATxmega32A4U-A
 D 32MHz, 32kB Flash, 4kB Boot, 4kB SRAM, 1kB EEPROM, JTAG, USB, TQFP-44
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8387-8-and16-bit-AVR-Microcontroller-XMEGA-A4U_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega32A4U-CU
+$CMP ATxmega32A4U-C
 D 32MHz, 32kB Flash, 4kB Boot, 4kB SRAM, 1kB EEPROM, JTAG, USB, VFBGA-49
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8387-8-and16-bit-AVR-Microcontroller-XMEGA-A4U_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega32A4U-MH
+$CMP ATxmega32A4U-M
 D 32MHz, 32kB Flash, 4kB Boot, 4kB SRAM, 1kB EEPROM, JTAG, USB, QFN-44
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8387-8-and16-bit-AVR-Microcontroller-XMEGA-A4U_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega32C3-AU
+$CMP ATxmega32C3-A
 D 32MHz, 32kB Flash, 4kB Boot, 4kB SRAM, 1kB EEPROM, JTAG, USB, TQFP-64
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8492-8-and-16-bit-AVR-microcontroller-ATxmega32C3_64C3_128C3_192C3_256C3_datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega32C3-MH
+$CMP ATxmega32C3-M
 D 32MHz, 32kB Flash, 4kB Boot, 4kB SRAM, 1kB EEPROM, JTAG, USB, QFN-64
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8492-8-and-16-bit-AVR-microcontroller-ATxmega32C3_64C3_128C3_192C3_256C3_datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega32C4-AU
+$CMP ATxmega32C4-A
 D 32MHz, 32kB Flash, 4kB Boot, 4kB SRAM, 1kB EEPROM, JTAG, TQFP-44
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8493-8-and-32-bit-AVR-XMEGA-Microcontrollers-ATxmega16C4-ATxmega32C4_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega32C4-CU
+$CMP ATxmega32C4-C
 D 32MHz, 32kB Flash, 4kB Boot, 4kB SRAM, 1kB EEPROM, JTAG, VFBGA-49
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8493-8-and-32-bit-AVR-XMEGA-Microcontrollers-ATxmega16C4-ATxmega32C4_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega32C4-MH
+$CMP ATxmega32C4-M
 D 32MHz, 32kB Flash, 4kB Boot, 4kB SRAM, 1kB EEPROM, JTAG, QFN-44
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8493-8-and-32-bit-AVR-XMEGA-Microcontrollers-ATxmega16C4-ATxmega32C4_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega32D3-AU
+$CMP ATxmega32D3-A
 D 32MHz, 32kB Flash, 4kB Boot, 4kB SRAM, 1kB EEPROM, JTAG, TQFP-64
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8134-8-16-bit-Atmel-XMEGA-D3-Microcontroller_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega32D3-MH
+$CMP ATxmega32D3-M
 D 32MHz, 32kB Flash, 4kB Boot, 4kB SRAM, 1kB EEPROM, JTAG, QFN-64
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8134-8-16-bit-Atmel-XMEGA-D3-Microcontroller_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega32D4-AU
+$CMP ATxmega32D4-A
 D 32MHz, 32kB Flash, 4kB Boot, 4kB SRAM, 1kB EEPROM, JTAG, TQFP-44
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8135-8-and-16-bit-AVR-microcontroller-ATxmega16D4-32D4-64D4-128D4_datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega32D4-CU
+$CMP ATxmega32D4-C
 D 32MHz, 32kB Flash, 4kB Boot, 4kB SRAM, 1kB EEPROM, JTAG, VFBGA-49
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8135-8-and-16-bit-AVR-microcontroller-ATxmega16D4-32D4-64D4-128D4_datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega32D4-MH
+$CMP ATxmega32D4-M
 D 32MHz, 32kB Flash, 4kB Boot, 4kB SRAM, 1kB EEPROM, JTAG, QFN-44
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8135-8-and-16-bit-AVR-microcontroller-ATxmega16D4-32D4-64D4-128D4_datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega32E5-AU
+$CMP ATxmega32E5-A
 D 32MHz, 32kB Flash, 4kB Boot, 4kB SRAM, 1kB EEPROM, TQFP-32
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8153-8-and-16-bit-AVR-Microcontroller-XMEGA-E-ATxmega8E5-ATxmega16E5-ATxmega32E5_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega32E5-M4U
+$CMP ATxmega32E5-M
 D 32MHz, 32kB Flash, 4kB Boot, 4kB SRAM, 1kB EEPROM, QFN-32
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8153-8-and-16-bit-AVR-Microcontroller-XMEGA-E-ATxmega8E5-ATxmega16E5-ATxmega32E5_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega32E5-MU
+$CMP ATxmega32E5-M4
 D 32MHz, 32kB Flash, 4kB Boot, 4kB SRAM, 1kB EEPROM, QFN-32
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8153-8-and-16-bit-AVR-Microcontroller-XMEGA-E-ATxmega8E5-ATxmega16E5-ATxmega32E5_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega384C3-AU
+$CMP ATxmega384C3-A
 D 32MHz, 384kB Flash, 8kB Boot, 32kB SRAM, 4kB EEPROM, JTAG, USB, TQFP-64
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8361-8-and-16-bit-AVR-XMEGA-Microcontrollers-ATxmega384C3_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega384C3-MH
+$CMP ATxmega384C3-M
 D 32MHz, 384kB Flash, 8kB Boot, 32kB SRAM, 4kB EEPROM, JTAG, USB, QFN-64
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8361-8-and-16-bit-AVR-XMEGA-Microcontrollers-ATxmega384C3_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega384D3-AU
+$CMP ATxmega384D3-A
 D 32MHz, 384kB Flash, 8kB Boot, 32kB SRAM, 4kB EEPROM, JTAG, TQFP-64
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8134-8-16-bit-Atmel-XMEGA-D3-Microcontroller_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega384D3-MH
+$CMP ATxmega384D3-M
 D 32MHz, 384kB Flash, 8kB Boot, 32kB SRAM, 4kB EEPROM, JTAG, QFN-64
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8134-8-16-bit-Atmel-XMEGA-D3-Microcontroller_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega64A1-AU
+$CMP ATxmega64A1-A
 D 32MHz, 64kB Flash, 4kB Boot, 4kB SRAM, 2kB EEPROM, JTAG, TQFP-100
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8067-8-and-16-bit-AVR-Microcontrollers-ATxmega64A1-ATxmega128A1_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega64A1-C7U
-D 32MHz, 64kB Flash, 4kB Boot, 4kB SRAM, 2kB EEPROM, JTAG, VFBGA-100
+$CMP ATxmega64A1-C
+D 32MHz, 64kB Flash, 4kB Boot, 4kB SRAM, 2kB EEPROM, JTAG, TFBGA-100
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8067-8-and-16-bit-AVR-Microcontrollers-ATxmega64A1-ATxmega128A1_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega64A1-CU
-D 32MHz, 64kB Flash, 4kB Boot, 4kB SRAM, 2kB EEPROM, JTAG, TFBGA-100
+$CMP ATxmega64A1-C7
+D 32MHz, 64kB Flash, 4kB Boot, 4kB SRAM, 2kB EEPROM, JTAG, VFBGA-100
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8067-8-and-16-bit-AVR-Microcontrollers-ATxmega64A1-ATxmega128A1_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega64A1U-AU
+$CMP ATxmega64A1U-A
 D 32MHz, 64kB Flash, 4kB Boot, 4kB SRAM, 2kB EEPROM, JTAG, USB, TQFP-100
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8385-8-and-16-bit-AVR-Microcontroller-ATxmega64A1U-ATxmega128A1U_datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega64A1U-C7U
-D 32MHz, 64kB Flash, 4kB Boot, 4kB SRAM, 2kB EEPROM, JTAG, USB, VFBGA-100
+$CMP ATxmega64A1U-C
+D 32MHz, 64kB Flash, 4kB Boot, 4kB SRAM, 2kB EEPROM, JTAG, USB, TFBGA-100
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8385-8-and-16-bit-AVR-Microcontroller-ATxmega64A1U-ATxmega128A1U_datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega64A1U-CU
-D 32MHz, 64kB Flash, 4kB Boot, 4kB SRAM, 2kB EEPROM, JTAG, USB, TFBGA-100
+$CMP ATxmega64A1U-C7
+D 32MHz, 64kB Flash, 4kB Boot, 4kB SRAM, 2kB EEPROM, JTAG, USB, VFBGA-100
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8385-8-and-16-bit-AVR-Microcontroller-ATxmega64A1U-ATxmega128A1U_datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega64A3-AU
+$CMP ATxmega64A3-A
 D 32MHz, 64kB Flash, 4kB Boot, 4kB SRAM, 2kB EEPROM, JTAG, TQFP-64
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8068-8-and16-bit-AVR-XMEGA-A3-Microcontrollers_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega64A3-MH
+$CMP ATxmega64A3-M
 D 32MHz, 64kB Flash, 4kB Boot, 4kB SRAM, 2kB EEPROM, JTAG, QFN-64
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8068-8-and16-bit-AVR-XMEGA-A3-Microcontrollers_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega64A3U-AU
+$CMP ATxmega64A3U-A
 D 32MHz, 64kB Flash, 4kB Boot, 4kB SRAM, 2kB EEPROM, JTAG, USB, TQFP-64
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8386-8-and-16-bit-AVR-Microcontroller-ATxmega64A3U-128A3U-192A3U-256A3U_datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega64A3U-MH
+$CMP ATxmega64A3U-M
 D 32MHz, 64kB Flash, 4kB Boot, 4kB SRAM, 2kB EEPROM, JTAG, USB, QFN-64
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8386-8-and-16-bit-AVR-Microcontroller-ATxmega64A3U-128A3U-192A3U-256A3U_datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega64A4U-AU
+$CMP ATxmega64A4U-A
 D 32MHz, 64kB Flash, 4kB Boot, 4kB SRAM, 2kB EEPROM, JTAG, USB, TQFP-44
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8387-8-and16-bit-AVR-Microcontroller-XMEGA-A4U_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega64A4U-CU
+$CMP ATxmega64A4U-C
 D 32MHz, 64kB Flash, 4kB Boot, 4kB SRAM, 2kB EEPROM, JTAG, USB, VFBGA-49
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8387-8-and16-bit-AVR-Microcontroller-XMEGA-A4U_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega64A4U-MH
+$CMP ATxmega64A4U-M
 D 32MHz, 64kB Flash, 4kB Boot, 4kB SRAM, 2kB EEPROM, JTAG, USB, QFN-44
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8387-8-and16-bit-AVR-Microcontroller-XMEGA-A4U_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega64B1-AU
+$CMP ATxmega64B1-A
 D 32MHz, 64kB Flash, 4kB Boot, 4kB SRAM, 2kB EEPROM, JTAG, USB, LCD, TQFP-100
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8330-8-and-16-bit-AVR-Microcontroller-XMEGA-B-ATxmega64B1-ATxmega128B1_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega64B1-CU
+$CMP ATxmega64B1-C
 D 32MHz, 64kB Flash, 4kB Boot, 4kB SRAM, 2kB EEPROM, JTAG, USB, LCD, VFBGA-100
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8330-8-and-16-bit-AVR-Microcontroller-XMEGA-B-ATxmega64B1-ATxmega128B1_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega64B3-AU
+$CMP ATxmega64B3-A
 D 32MHz, 64kB Flash, 4kB Boot, 4kB SRAM, 2kB EEPROM, JTAG, USB, LCD, TQFP-64
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8074-8-and-16-bit-AVR-Microcontroller-XMEGA-B-ATxmega64B3-ATxmega128B3_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega64B3-MH
+$CMP ATxmega64B3-M
 D 32MHz, 64kB Flash, 4kB Boot, 4kB SRAM, 2kB EEPROM, JTAG, USB, LCD, QFN-64
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8074-8-and-16-bit-AVR-Microcontroller-XMEGA-B-ATxmega64B3-ATxmega128B3_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega64C3-AU
+$CMP ATxmega64C3-A
 D 32MHz, 64kB Flash, 4kB Boot, 4kB SRAM, 2kB EEPROM, JTAG, USB, TQFP-64
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8492-8-and-16-bit-AVR-microcontroller-ATxmega32C3_64C3_128C3_192C3_256C3_datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega64C3-MH
+$CMP ATxmega64C3-M
 D 32MHz, 64kB Flash, 4kB Boot, 4kB SRAM, 2kB EEPROM, JTAG, USB, QFN-64
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8492-8-and-16-bit-AVR-microcontroller-ATxmega32C3_64C3_128C3_192C3_256C3_datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega64D3-AU
+$CMP ATxmega64D3-A
 D 32MHz, 64kB Flash, 4kB Boot, 4kB SRAM, 2kB EEPROM, JTAG, TQFP-64
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8134-8-16-bit-Atmel-XMEGA-D3-Microcontroller_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega64D3-MH
+$CMP ATxmega64D3-M
 D 32MHz, 64kB Flash, 4kB Boot, 4kB SRAM, 2kB EEPROM, JTAG, QFN-64
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8134-8-16-bit-Atmel-XMEGA-D3-Microcontroller_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega64D4-AU
+$CMP ATxmega64D4-A
 D 32MHz, 64kB Flash, 4kB Boot, 4kB SRAM, 2kB EEPROM, JTAG, TQFP-44
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8135-8-and-16-bit-AVR-microcontroller-ATxmega16D4-32D4-64D4-128D4_datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega64D4-CU
+$CMP ATxmega64D4-C
 D 32MHz, 64kB Flash, 4kB Boot, 4kB SRAM, 2kB EEPROM, JTAG, VFBGA-49
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8135-8-and-16-bit-AVR-microcontroller-ATxmega16D4-32D4-64D4-128D4_datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega64D4-MH
+$CMP ATxmega64D4-M
 D 32MHz, 64kB Flash, 4kB Boot, 4kB SRAM, 2kB EEPROM, JTAG, QFN-44
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8135-8-and-16-bit-AVR-microcontroller-ATxmega16D4-32D4-64D4-128D4_datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega8E5-AU
+$CMP ATxmega8E5-A
 D 32MHz, 8kB Flash, 2kB Boot, 1kB SRAM, 512B EEPROM, TQFP-32
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8153-8-and-16-bit-AVR-Microcontroller-XMEGA-E-ATxmega8E5-ATxmega16E5-ATxmega32E5_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega8E5-M4U
+$CMP ATxmega8E5-M
 D 32MHz, 8kB Flash, 2kB Boot, 1kB SRAM, 512B EEPROM, QFN-32
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8153-8-and-16-bit-AVR-Microcontroller-XMEGA-E-ATxmega8E5-ATxmega16E5-ATxmega32E5_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATxmega8E5-MU
+$CMP ATxmega8E5-M4
 D 32MHz, 8kB Flash, 2kB Boot, 1kB SRAM, 512B EEPROM, QFN-32
 K AVR 8/16bit Microcontroller XMegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8153-8-and-16-bit-AVR-Microcontroller-XMEGA-E-ATxmega8E5-ATxmega16E5-ATxmega32E5_Datasheet.pdf
diff --git a/MCU_Microchip_ATmega.lib b/MCU_Microchip_ATmega.lib
index e31716ebae..df137c7c4b 100644
--- a/MCU_Microchip_ATmega.lib
+++ b/MCU_Microchip_ATmega.lib
@@ -1,14 +1,14 @@
 EESchema-LIBRARY Version 2.4
 #encoding utf-8
 #
-# ATmega1281V-8AU
+# ATmega1281V-8A
 #
-DEF ATmega1281V-8AU U 0 20 Y Y 1 F N
+DEF ATmega1281V-8A U 0 20 Y Y 1 F N
 F0 "U" -500 1950 50 H V L BNN
-F1 "ATmega1281V-8AU" 100 -1950 50 H V L TNN
+F1 "ATmega1281V-8A" 100 -1950 50 H V L TNN
 F2 "Package_QFP:TQFP-64_14x14mm_P0.8mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATmega1281-16AU ATmega2561V-8AU ATmega2561-16AU
+ALIAS ATmega1281-16A ATmega2561V-8A ATmega2561-16A
 $FPLIST
  TQFP*14x14mm*P0.8mm*
 $ENDFPLIST
@@ -81,14 +81,14 @@ X PE7 9 -600 -1700 100 R 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATmega1281V-8MU
+# ATmega1281V-8M
 #
-DEF ATmega1281V-8MU U 0 20 Y Y 1 F N
+DEF ATmega1281V-8M U 0 20 Y Y 1 F N
 F0 "U" -500 1950 50 H V L BNN
-F1 "ATmega1281V-8MU" 100 -1950 50 H V L TNN
+F1 "ATmega1281V-8M" 100 -1950 50 H V L TNN
 F2 "Package_DFN_QFN:QFN-64-1EP_9x9mm_P0.5mm_EP7.65x7.65mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATmega1281-16MU ATmega2561V-8MU ATmega2561-16MU
+ALIAS ATmega1281-16M ATmega2561V-8M ATmega2561-16M
 $FPLIST
  QFN*1EP*9x9mm*P0.5mm*
 $ENDFPLIST
@@ -162,14 +162,14 @@ X PE7 9 -600 -1700 100 R 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATmega162V-8AU
+# ATmega162V-8A
 #
-DEF ATmega162V-8AU U 0 20 Y Y 1 F N
+DEF ATmega162V-8A U 0 20 Y Y 1 F N
 F0 "U" -500 1950 50 H V L BNN
-F1 "ATmega162V-8AU" 100 -1950 50 H V L TNN
+F1 "ATmega162V-8A" 100 -1950 50 H V L TNN
 F2 "Package_QFP:TQFP-44_10x10mm_P0.8mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATmega162-16AU
+ALIAS ATmega162-16A
 $FPLIST
  TQFP*10x10mm*P0.8mm*
 $ENDFPLIST
@@ -222,14 +222,14 @@ X PD3 9 600 -1300 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATmega162V-8MU
+# ATmega162V-8M
 #
-DEF ATmega162V-8MU U 0 20 Y Y 1 F N
+DEF ATmega162V-8M U 0 20 Y Y 1 F N
 F0 "U" -500 1950 50 H V L BNN
-F1 "ATmega162V-8MU" 100 -1950 50 H V L TNN
+F1 "ATmega162V-8M" 100 -1950 50 H V L TNN
 F2 "Package_DFN_QFN:QFN-44-1EP_7x7mm_P0.5mm_EP5.2x5.2mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATmega162-16MU
+ALIAS ATmega162-16M
 $FPLIST
  QFN*1EP*7x7mm*P0.5mm*
 $ENDFPLIST
@@ -283,14 +283,14 @@ X PD3 9 600 -1300 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATmega162V-8PU
+# ATmega162V-8P
 #
-DEF ATmega162V-8PU U 0 20 Y Y 1 F N
+DEF ATmega162V-8P U 0 20 Y Y 1 F N
 F0 "U" -500 1950 50 H V L BNN
-F1 "ATmega162V-8PU" 100 -1950 50 H V L TNN
+F1 "ATmega162V-8P" 100 -1950 50 H V L TNN
 F2 "Package_DIP:DIP-40_W15.24mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATmega162-16PU
+ALIAS ATmega162-16P
 $FPLIST
  DIP*W15.24mm*
 $ENDFPLIST
@@ -339,14 +339,14 @@ X ~RESET 9 -600 1700 100 R 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
-# ATmega164A-AU
+# ATmega164A-A
 #
-DEF ATmega164A-AU U 0 20 Y Y 1 F N
+DEF ATmega164A-A U 0 20 Y Y 1 F N
 F0 "U" -500 1950 50 H V L BNN
-F1 "ATmega164A-AU" 100 -1950 50 H V L TNN
+F1 "ATmega164A-A" 100 -1950 50 H V L TNN
 F2 "Package_QFP:TQFP-44_10x10mm_P0.8mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATmega164PA-AU ATmega324A-AU ATmega324PA-AU ATmega644A-AU ATmega644PA-AU ATmega1284-AU ATmega1284P-AU
+ALIAS ATmega164PA-A ATmega324A-A ATmega324PA-A ATmega644A-A ATmega644PA-A ATmega1284-A ATmega1284P-A
 $FPLIST
  TQFP*10x10mm*P0.8mm*
 $ENDFPLIST
@@ -399,14 +399,14 @@ X PD0 9 600 -1000 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATmega164A-CU
+# ATmega164A-C
 #
-DEF ATmega164A-CU U 0 20 Y Y 1 F N
+DEF ATmega164A-C U 0 20 Y Y 1 F N
 F0 "U" -500 1950 50 H V L BNN
-F1 "ATmega164A-CU" 100 -1950 50 H V L TNN
+F1 "ATmega164A-C" 100 -1950 50 H V L TNN
 F2 "Package_BGA:VFBGA-49_5.0x5.0mm_Layout7x7_P0.65mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATmega164PA-CU ATmega324A-CU ATmega324PA-CU
+ALIAS ATmega164PA-C ATmega324A-C ATmega324PA-C
 $FPLIST
  VFBGA*5.0x5.0mm*Layout7x7*P0.65mm*
 $ENDFPLIST
@@ -464,75 +464,14 @@ X GND G7 0 -2000 100 U 50 50 1 1 P N
 ENDDRAW
 ENDDEF
 #
-# ATmega164A-MCH
+# ATmega164A-M
 #
-DEF ATmega164A-MCH U 0 20 Y Y 1 F N
-F0 "U" -550 2000 50 H V L BNN
-F1 "ATmega164A-MCH" 100 -2000 50 H V L TNN
-F2 "Package_DFN_QFN:Microchip_DRQFN-44-1EP_5x5mm_P0.7mm_EP2.65x2.65mm" 0 0 50 H I C CIN
-F3 "" 0 0 50 H I C CNN
-ALIAS ATmega164PA-MCH ATmega324A-MCH ATmega324PA-MCH
-$FPLIST
- Microchip*DRQFN*1EP*5x5mm*P0.7mm*
-$ENDFPLIST
-DRAW
-S -550 -1950 550 1950 0 1 10 f
-X PB5 A1 700 300 150 L 50 50 1 1 B
-X GND A10 0 -2100 150 U 50 50 1 1 W
-X PC1 A11 700 -200 150 L 50 50 1 1 B
-X PC3 A12 700 -400 150 L 50 50 1 1 B
-X PC4 A13 700 -500 150 L 50 50 1 1 B
-X PC6 A14 700 -700 150 L 50 50 1 1 B
-X AVCC A15 100 2100 150 D 50 50 1 1 W
-X AREF A16 -700 1100 150 R 50 50 1 1 P
-X PA6 A17 700 1100 150 L 50 50 1 1 B
-X PA4 A18 700 1300 150 L 50 50 1 1 B
-X PA3 A19 700 1400 150 L 50 50 1 1 B
-X PB7 A2 700 100 150 L 50 50 1 1 B
-X PA1 A20 700 1600 150 L 50 50 1 1 B
-X VCC A21 0 2100 150 D 50 50 1 1 P N
-X PB0 A22 700 800 150 L 50 50 1 1 B
-X PB2 A23 700 600 150 L 50 50 1 1 B
-X PB4 A24 700 400 150 L 50 50 1 1 B
-X VCC A3 0 2100 150 D 50 50 1 1 W
-X XTAL2 A4 -700 1300 150 R 50 50 1 1 O
-X PD0 A5 700 -1000 150 L 50 50 1 1 B
-X PD2 A6 700 -1200 150 L 50 50 1 1 B
-X PD3 A7 700 -1300 150 L 50 50 1 1 B
-X PD5 A8 700 -1500 150 L 50 50 1 1 B
-X PD7 A9 700 -1700 150 L 50 50 1 1 B
-X PB6 B1 700 200 150 L 50 50 1 1 B
-X PC2 B10 700 -300 150 L 50 50 1 1 B
-X PC5 B11 700 -600 150 L 50 50 1 1 B
-X PC7 B12 700 -800 150 L 50 50 1 1 B
-X GND B13 0 -2100 150 U 50 50 1 1 P N
-X PA7 B14 700 1000 150 L 50 50 1 1 B
-X PA5 B15 700 1200 150 L 50 50 1 1 B
-X PA2 B16 700 1500 150 L 50 50 1 1 B
-X PA0 B17 700 1700 150 L 50 50 1 1 B
-X GND B18 0 -2100 150 U 50 50 1 1 P N
-X PB1 B19 700 700 150 L 50 50 1 1 B
-X ~RESET B2 -700 1700 150 R 50 50 1 1 I
-X PB3 B20 700 500 150 L 50 50 1 1 B
-X GND B3 0 -2100 150 U 50 50 1 1 P N
-X XTAL1 B4 -700 1500 150 R 50 50 1 1 I
-X PD1 B5 700 -1100 150 L 50 50 1 1 B
-X PD4 B6 700 -1400 150 L 50 50 1 1 B
-X PD6 B7 700 -1600 150 L 50 50 1 1 B
-X VCC B8 0 2100 150 D 50 50 1 1 P N
-X PC0 B9 700 -100 150 L 50 50 1 1 B
-X GND EP 0 -2100 150 U 50 50 1 1 P N
-ENDDRAW
-ENDDEF
-#
-# ATmega164A-MU
-#
-DEF ATmega164A-MU U 0 20 Y Y 1 F N
+DEF ATmega164A-M U 0 20 Y Y 1 F N
 F0 "U" -500 1950 50 H V L BNN
-F1 "ATmega164A-MU" 100 -1950 50 H V L TNN
+F1 "ATmega164A-M" 100 -1950 50 H V L TNN
 F2 "Package_DFN_QFN:QFN-44-1EP_7x7mm_P0.5mm_EP5.2x5.2mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATmega164PA-MU ATmega324A-MU ATmega324PA-MU ATmega644A-MU ATmega644PA-MU ATmega1284-MU ATmega1284P-MU
+ALIAS ATmega164PA-M ATmega324A-M ATmega324PA-M ATmega644A-M ATmega644PA-M ATmega1284-M ATmega1284P-M
 $FPLIST
  QFN*1EP*7x7mm*P0.5mm*
 $ENDFPLIST
@@ -586,14 +525,75 @@ X PD0 9 600 -1000 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATmega164A-PU
+# ATmega164A-MC
+#
+DEF ATmega164A-MC U 0 20 Y Y 1 F N
+F0 "U" -550 2000 50 H V L BNN
+F1 "ATmega164A-MC" 100 -2000 50 H V L TNN
+F2 "Package_DFN_QFN:Microchip_DRQFN-44-1EP_5x5mm_P0.7mm_EP2.65x2.65mm" 0 0 50 H I C CIN
+F3 "" 0 0 50 H I C CNN
+ALIAS ATmega164PA-MC ATmega324A-MC ATmega324PA-MC
+$FPLIST
+ Microchip*DRQFN*1EP*5x5mm*P0.7mm*
+$ENDFPLIST
+DRAW
+S -550 -1950 550 1950 0 1 10 f
+X PB5 A1 700 300 150 L 50 50 1 1 B
+X GND A10 0 -2100 150 U 50 50 1 1 W
+X PC1 A11 700 -200 150 L 50 50 1 1 B
+X PC3 A12 700 -400 150 L 50 50 1 1 B
+X PC4 A13 700 -500 150 L 50 50 1 1 B
+X PC6 A14 700 -700 150 L 50 50 1 1 B
+X AVCC A15 100 2100 150 D 50 50 1 1 W
+X AREF A16 -700 1100 150 R 50 50 1 1 P
+X PA6 A17 700 1100 150 L 50 50 1 1 B
+X PA4 A18 700 1300 150 L 50 50 1 1 B
+X PA3 A19 700 1400 150 L 50 50 1 1 B
+X PB7 A2 700 100 150 L 50 50 1 1 B
+X PA1 A20 700 1600 150 L 50 50 1 1 B
+X VCC A21 0 2100 150 D 50 50 1 1 P N
+X PB0 A22 700 800 150 L 50 50 1 1 B
+X PB2 A23 700 600 150 L 50 50 1 1 B
+X PB4 A24 700 400 150 L 50 50 1 1 B
+X VCC A3 0 2100 150 D 50 50 1 1 W
+X XTAL2 A4 -700 1300 150 R 50 50 1 1 O
+X PD0 A5 700 -1000 150 L 50 50 1 1 B
+X PD2 A6 700 -1200 150 L 50 50 1 1 B
+X PD3 A7 700 -1300 150 L 50 50 1 1 B
+X PD5 A8 700 -1500 150 L 50 50 1 1 B
+X PD7 A9 700 -1700 150 L 50 50 1 1 B
+X PB6 B1 700 200 150 L 50 50 1 1 B
+X PC2 B10 700 -300 150 L 50 50 1 1 B
+X PC5 B11 700 -600 150 L 50 50 1 1 B
+X PC7 B12 700 -800 150 L 50 50 1 1 B
+X GND B13 0 -2100 150 U 50 50 1 1 P N
+X PA7 B14 700 1000 150 L 50 50 1 1 B
+X PA5 B15 700 1200 150 L 50 50 1 1 B
+X PA2 B16 700 1500 150 L 50 50 1 1 B
+X PA0 B17 700 1700 150 L 50 50 1 1 B
+X GND B18 0 -2100 150 U 50 50 1 1 P N
+X PB1 B19 700 700 150 L 50 50 1 1 B
+X ~RESET B2 -700 1700 150 R 50 50 1 1 I
+X PB3 B20 700 500 150 L 50 50 1 1 B
+X GND B3 0 -2100 150 U 50 50 1 1 P N
+X XTAL1 B4 -700 1500 150 R 50 50 1 1 I
+X PD1 B5 700 -1100 150 L 50 50 1 1 B
+X PD4 B6 700 -1400 150 L 50 50 1 1 B
+X PD6 B7 700 -1600 150 L 50 50 1 1 B
+X VCC B8 0 2100 150 D 50 50 1 1 P N
+X PC0 B9 700 -100 150 L 50 50 1 1 B
+X GND EP 0 -2100 150 U 50 50 1 1 P N
+ENDDRAW
+ENDDEF
+#
+# ATmega164A-P
 #
-DEF ATmega164A-PU U 0 20 Y Y 1 F N
+DEF ATmega164A-P U 0 20 Y Y 1 F N
 F0 "U" -500 1950 50 H V L BNN
-F1 "ATmega164A-PU" 100 -1950 50 H V L TNN
+F1 "ATmega164A-P" 100 -1950 50 H V L TNN
 F2 "Package_DIP:DIP-40_W15.24mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATmega164PA-PU ATmega324A-PU ATmega324PA-PU ATmega644A-PU ATmega644PA-PU ATmega1284-PU ATmega1284P-PU
+ALIAS ATmega164PA-P ATmega324A-P ATmega324PA-P ATmega644A-P ATmega644PA-P ATmega1284-P ATmega1284P-P
 $FPLIST
  DIP*W15.24mm*
 $ENDFPLIST
@@ -642,14 +642,14 @@ X ~RESET 9 -600 1700 100 R 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
-# ATmega164PV-10AU
+# ATmega164PV-10A
 #
-DEF ATmega164PV-10AU U 0 20 Y Y 1 F N
+DEF ATmega164PV-10A U 0 20 Y Y 1 F N
 F0 "U" -500 1950 50 H V L BNN
-F1 "ATmega164PV-10AU" 100 -1950 50 H V L TNN
+F1 "ATmega164PV-10A" 100 -1950 50 H V L TNN
 F2 "Package_QFP:TQFP-44_10x10mm_P0.8mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATmega164P-20AU ATmega324PV-10AU ATmega324P-20AU ATmega644PV-10AU ATmega644P-20AU
+ALIAS ATmega164P-20A ATmega324PV-10A ATmega324P-20A ATmega644PV-10A ATmega644P-20A
 $FPLIST
  TQFP*10x10mm*P0.8mm*
 $ENDFPLIST
@@ -702,14 +702,14 @@ X PD0 9 600 -1000 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATmega164PV-10MU
+# ATmega164PV-10M
 #
-DEF ATmega164PV-10MU U 0 20 Y Y 1 F N
+DEF ATmega164PV-10M U 0 20 Y Y 1 F N
 F0 "U" -500 1950 50 H V L BNN
-F1 "ATmega164PV-10MU" 100 -1950 50 H V L TNN
+F1 "ATmega164PV-10M" 100 -1950 50 H V L TNN
 F2 "Package_DFN_QFN:QFN-44-1EP_7x7mm_P0.5mm_EP5.2x5.2mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATmega164P-20MU ATmega324PV-10MU ATmega324P-20MU ATmega644PV-10MU ATmega644P-20MU
+ALIAS ATmega164P-20M ATmega324PV-10M ATmega324P-20M ATmega644PV-10M ATmega644P-20M
 $FPLIST
  QFN*1EP*7x7mm*P0.5mm*
 $ENDFPLIST
@@ -763,14 +763,14 @@ X PD0 9 600 -1000 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATmega164PV-10PU
+# ATmega164PV-10P
 #
-DEF ATmega164PV-10PU U 0 20 Y Y 1 F N
+DEF ATmega164PV-10P U 0 20 Y Y 1 F N
 F0 "U" -500 1950 50 H V L BNN
-F1 "ATmega164PV-10PU" 100 -1950 50 H V L TNN
+F1 "ATmega164PV-10P" 100 -1950 50 H V L TNN
 F2 "Package_DIP:DIP-40_W15.24mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATmega164P-20PU ATmega324PV-10PU ATmega324P-20PU ATmega644PV-10PU ATmega644P-20PU
+ALIAS ATmega164P-20P ATmega324PV-10P ATmega324P-20P ATmega644PV-10P ATmega644P-20P
 $FPLIST
  DIP*W15.24mm*
 $ENDFPLIST
@@ -819,14 +819,14 @@ X ~RESET 9 -600 1700 100 R 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
-# ATmega165A-AU
+# ATmega165A-A
 #
-DEF ATmega165A-AU U 0 20 Y Y 1 F N
+DEF ATmega165A-A U 0 20 Y Y 1 F N
 F0 "U" -500 1950 50 H V L BNN
-F1 "ATmega165A-AU" 100 -1950 50 H V L TNN
+F1 "ATmega165A-A" 100 -1950 50 H V L TNN
 F2 "Package_QFP:TQFP-64_14x14mm_P0.8mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATmega165PA-AU ATmega325A-AU ATmega325PA-AU ATmega645A-AU ATmega645P-AU
+ALIAS ATmega165PA-A ATmega325A-A ATmega325PA-A ATmega645A-A ATmega645P-A
 $FPLIST
  TQFP*14x14mm*P0.8mm*
 $ENDFPLIST
@@ -899,14 +899,14 @@ X PE7 9 -600 -1700 100 R 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATmega165A-MU
+# ATmega165A-M
 #
-DEF ATmega165A-MU U 0 20 Y Y 1 F N
+DEF ATmega165A-M U 0 20 Y Y 1 F N
 F0 "U" -500 1950 50 H V L BNN
-F1 "ATmega165A-MU" 100 -1950 50 H V L TNN
+F1 "ATmega165A-M" 100 -1950 50 H V L TNN
 F2 "Package_DFN_QFN:QFN-64-1EP_9x9mm_P0.5mm_EP5.4x5.4mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATmega165PA-MU ATmega325A-MU ATmega325PA-MU ATmega645A-MU ATmega645P-MU
+ALIAS ATmega165PA-M ATmega325A-M ATmega325PA-M ATmega645A-M ATmega645P-M
 $FPLIST
  QFN*1EP*9x9mm*P0.5mm*
 $ENDFPLIST
@@ -980,14 +980,14 @@ X PE7 9 -600 -1700 100 R 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATmega165PV-8AU
+# ATmega165PV-8A
 #
-DEF ATmega165PV-8AU U 0 20 Y Y 1 F N
+DEF ATmega165PV-8A U 0 20 Y Y 1 F N
 F0 "U" -500 1950 50 H V L BNN
-F1 "ATmega165PV-8AU" 100 -1950 50 H V L TNN
+F1 "ATmega165PV-8A" 100 -1950 50 H V L TNN
 F2 "Package_QFP:TQFP-64_14x14mm_P0.8mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATmega165P-16AU
+ALIAS ATmega165P-16A
 $FPLIST
  TQFP*14x14mm*P0.8mm*
 $ENDFPLIST
@@ -1060,14 +1060,14 @@ X PE7 9 -600 -1700 100 R 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATmega165PV-8MU
+# ATmega165PV-8M
 #
-DEF ATmega165PV-8MU U 0 20 Y Y 1 F N
+DEF ATmega165PV-8M U 0 20 Y Y 1 F N
 F0 "U" -500 1950 50 H V L BNN
-F1 "ATmega165PV-8MU" 100 -1950 50 H V L TNN
+F1 "ATmega165PV-8M" 100 -1950 50 H V L TNN
 F2 "Package_DFN_QFN:QFN-64-1EP_9x9mm_P0.5mm_EP5.4x5.4mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATmega165P-16MU
+ALIAS ATmega165P-16M
 $FPLIST
  QFN*1EP*9x9mm*P0.5mm*
 $ENDFPLIST
@@ -1141,14 +1141,14 @@ X PE7 9 -600 -1700 100 R 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATmega169PV-8AU
+# ATmega169PV-8A
 #
-DEF ATmega169PV-8AU U 0 20 Y Y 1 F N
+DEF ATmega169PV-8A U 0 20 Y Y 1 F N
 F0 "U" -500 1950 50 H V L BNN
-F1 "ATmega169PV-8AU" 100 -1950 50 H V L TNN
+F1 "ATmega169PV-8A" 100 -1950 50 H V L TNN
 F2 "Package_QFP:TQFP-64_14x14mm_P0.8mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATmega169P-16AU ATmega169A-AU ATmega169PA-AU ATmega329A-AU ATmega329PA-AU ATmega649A-AU ATmega649P-AU
+ALIAS ATmega169P-16A ATmega169A-A ATmega169PA-A ATmega329A-A ATmega329PA-A ATmega649A-A ATmega649P-A
 $FPLIST
  TQFP*14x14mm*P0.8mm*
 $ENDFPLIST
@@ -1221,95 +1221,14 @@ X PE7 9 -600 -1700 100 R 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATmega169PV-8MCH
+# ATmega169PV-8M
 #
-DEF ATmega169PV-8MCH U 0 20 Y Y 1 F N
-F0 "U" -550 2000 50 H V L BNN
-F1 "ATmega169PV-8MCH" 100 -2000 50 H V L TNN
-F2 "Package_DFN_QFN:Microchip_DRQFN-64-1EP_7x7mm_P0.65mm_EP4.1x4.1mm" 0 0 50 H I C CIN
-F3 "" 0 0 50 H I C CNN
-ALIAS ATmega169P-16MCH ATmega169A-MCH ATmega169PA-MCH
-$FPLIST
- Microchip*DRQFN*1EP*7x7mm*P0.65mm*
-$ENDFPLIST
-DRAW
-S -550 -1950 550 1950 0 1 10 f
-X PE0 A1 -700 -1000 150 R 50 50 1 1 B
-X PG3 A10 -700 500 150 R 50 50 1 1 B
-X PG5/~RESET A11 -700 300 150 R 50 50 1 1 B
-X GND A12 0 -2100 150 U 50 50 1 1 W
-X XTAL1 A13 -700 1700 150 R 50 50 1 1 I
-X PD1 A14 700 -1100 150 L 50 50 1 1 B
-X PD3 A15 700 -1300 150 L 50 50 1 1 B
-X PD5 A16 700 -1500 150 L 50 50 1 1 B
-X PD6 A17 700 -1600 150 L 50 50 1 1 B
-X PG1 A18 -700 700 150 R 50 50 1 1 B
-X PC0 A19 700 -100 150 L 50 50 1 1 B
-X PE1 A2 -700 -1100 150 R 50 50 1 1 B
-X PC2 A20 700 -300 150 L 50 50 1 1 B
-X PC4 A21 700 -500 150 L 50 50 1 1 B
-X PC6 A22 700 -700 150 L 50 50 1 1 B
-X PG2 A23 -700 600 150 R 50 50 1 1 B
-X PA6 A24 700 1100 150 L 50 50 1 1 B
-X PA5 A25 700 1200 150 L 50 50 1 1 B
-X PA2 A26 700 1500 150 L 50 50 1 1 B
-X PA1 A27 700 1600 150 L 50 50 1 1 B
-X VCC A28 0 2100 150 D 50 50 1 1 W
-X PF7 A29 -700 -800 150 R 50 50 1 1 B
-X PE3 A3 -700 -1300 150 R 50 50 1 1 B
-X PF5 A30 -700 -600 150 R 50 50 1 1 B
-X PF3 A31 -700 -400 150 R 50 50 1 1 B
-X PF1 A32 -700 -200 150 R 50 50 1 1 B
-X AREF A33 -700 1300 150 R 50 50 1 1 P
-X GND A34 0 -2100 150 U 50 50 1 1 P N
-X PE5 A4 -700 -1500 150 R 50 50 1 1 B
-X PE7 A5 -700 -1700 150 R 50 50 1 1 B
-X PB1 A6 700 700 150 L 50 50 1 1 B
-X PB3 A7 700 500 150 L 50 50 1 1 B
-X PB4 A8 700 400 150 L 50 50 1 1 B
-X PB7 A9 700 100 150 L 50 50 1 1 B
-X LCDCAP B1 -700 1100 150 R 50 50 1 1 P
-X VCC B10 0 2100 150 D 50 50 1 1 P N
-X XTAL2 B11 -700 1500 150 R 50 50 1 1 O
-X PD0 B12 700 -1000 150 L 50 50 1 1 B
-X PD2 B13 700 -1200 150 L 50 50 1 1 B
-X PD4 B14 700 -1400 150 L 50 50 1 1 B
-X PD7 B15 700 -1700 150 L 50 50 1 1 B
-X PG0 B16 -700 800 150 R 50 50 1 1 B
-X PC1 B17 700 -200 150 L 50 50 1 1 B
-X PC3 B18 700 -400 150 L 50 50 1 1 B
-X PC5 B19 700 -600 150 L 50 50 1 1 B
-X PE2 B2 -700 -1200 150 R 50 50 1 1 B
-X PC7 B20 700 -800 150 L 50 50 1 1 B
-X PA7 B21 700 1000 150 L 50 50 1 1 B
-X PA4 B22 700 1300 150 L 50 50 1 1 B
-X PA3 B23 700 1400 150 L 50 50 1 1 B
-X PA0 B24 700 1700 150 L 50 50 1 1 B
-X GND B25 0 -2100 150 U 50 50 1 1 P N
-X PF6 B26 -700 -700 150 R 50 50 1 1 B
-X PF4 B27 -700 -500 150 R 50 50 1 1 B
-X PF2 B28 -700 -300 150 R 50 50 1 1 B
-X PF0 B29 -700 -100 150 R 50 50 1 1 B
-X PE4 B3 -700 -1400 150 R 50 50 1 1 B
-X AVCC B30 100 2100 150 D 50 50 1 1 W
-X PE6 B4 -700 -1600 150 R 50 50 1 1 B
-X PB0 B5 700 800 150 L 50 50 1 1 B
-X PB2 B6 700 600 150 L 50 50 1 1 B
-X PB5 B7 700 300 150 L 50 50 1 1 B
-X PB6 B8 700 200 150 L 50 50 1 1 B
-X PG4 B9 -700 400 150 R 50 50 1 1 B
-X GND EP 0 -2100 150 U 50 50 1 1 P N
-ENDDRAW
-ENDDEF
-#
-# ATmega169PV-8MU
-#
-DEF ATmega169PV-8MU U 0 20 Y Y 1 F N
+DEF ATmega169PV-8M U 0 20 Y Y 1 F N
 F0 "U" -500 1950 50 H V L BNN
-F1 "ATmega169PV-8MU" 100 -1950 50 H V L TNN
+F1 "ATmega169PV-8M" 100 -1950 50 H V L TNN
 F2 "Package_DFN_QFN:QFN-64-1EP_9x9mm_P0.5mm_EP5.4x5.4mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATmega169P-16MU ATmega169A-MU ATmega169PA-MU ATmega329A-MU ATmega329PA-MU ATmega649A-MU ATmega649P-MU
+ALIAS ATmega169P-16M ATmega169A-M ATmega169PA-M ATmega329A-M ATmega329PA-M ATmega649A-M ATmega649P-M
 $FPLIST
  QFN*1EP*9x9mm*P0.5mm*
 $ENDFPLIST
@@ -1383,14 +1302,95 @@ X PE7 9 -600 -1700 100 R 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATmega16L-8AU
+# ATmega169PV-8MC
+#
+DEF ATmega169PV-8MC U 0 20 Y Y 1 F N
+F0 "U" -550 2000 50 H V L BNN
+F1 "ATmega169PV-8MC" 100 -2000 50 H V L TNN
+F2 "Package_DFN_QFN:Microchip_DRQFN-64-1EP_7x7mm_P0.65mm_EP4.1x4.1mm" 0 0 50 H I C CIN
+F3 "" 0 0 50 H I C CNN
+ALIAS ATmega169P-16MC ATmega169A-MC ATmega169PA-MC
+$FPLIST
+ Microchip*DRQFN*1EP*7x7mm*P0.65mm*
+$ENDFPLIST
+DRAW
+S -550 -1950 550 1950 0 1 10 f
+X PE0 A1 -700 -1000 150 R 50 50 1 1 B
+X PG3 A10 -700 500 150 R 50 50 1 1 B
+X PG5/~RESET A11 -700 300 150 R 50 50 1 1 B
+X GND A12 0 -2100 150 U 50 50 1 1 W
+X XTAL1 A13 -700 1700 150 R 50 50 1 1 I
+X PD1 A14 700 -1100 150 L 50 50 1 1 B
+X PD3 A15 700 -1300 150 L 50 50 1 1 B
+X PD5 A16 700 -1500 150 L 50 50 1 1 B
+X PD6 A17 700 -1600 150 L 50 50 1 1 B
+X PG1 A18 -700 700 150 R 50 50 1 1 B
+X PC0 A19 700 -100 150 L 50 50 1 1 B
+X PE1 A2 -700 -1100 150 R 50 50 1 1 B
+X PC2 A20 700 -300 150 L 50 50 1 1 B
+X PC4 A21 700 -500 150 L 50 50 1 1 B
+X PC6 A22 700 -700 150 L 50 50 1 1 B
+X PG2 A23 -700 600 150 R 50 50 1 1 B
+X PA6 A24 700 1100 150 L 50 50 1 1 B
+X PA5 A25 700 1200 150 L 50 50 1 1 B
+X PA2 A26 700 1500 150 L 50 50 1 1 B
+X PA1 A27 700 1600 150 L 50 50 1 1 B
+X VCC A28 0 2100 150 D 50 50 1 1 W
+X PF7 A29 -700 -800 150 R 50 50 1 1 B
+X PE3 A3 -700 -1300 150 R 50 50 1 1 B
+X PF5 A30 -700 -600 150 R 50 50 1 1 B
+X PF3 A31 -700 -400 150 R 50 50 1 1 B
+X PF1 A32 -700 -200 150 R 50 50 1 1 B
+X AREF A33 -700 1300 150 R 50 50 1 1 P
+X GND A34 0 -2100 150 U 50 50 1 1 P N
+X PE5 A4 -700 -1500 150 R 50 50 1 1 B
+X PE7 A5 -700 -1700 150 R 50 50 1 1 B
+X PB1 A6 700 700 150 L 50 50 1 1 B
+X PB3 A7 700 500 150 L 50 50 1 1 B
+X PB4 A8 700 400 150 L 50 50 1 1 B
+X PB7 A9 700 100 150 L 50 50 1 1 B
+X LCDCAP B1 -700 1100 150 R 50 50 1 1 P
+X VCC B10 0 2100 150 D 50 50 1 1 P N
+X XTAL2 B11 -700 1500 150 R 50 50 1 1 O
+X PD0 B12 700 -1000 150 L 50 50 1 1 B
+X PD2 B13 700 -1200 150 L 50 50 1 1 B
+X PD4 B14 700 -1400 150 L 50 50 1 1 B
+X PD7 B15 700 -1700 150 L 50 50 1 1 B
+X PG0 B16 -700 800 150 R 50 50 1 1 B
+X PC1 B17 700 -200 150 L 50 50 1 1 B
+X PC3 B18 700 -400 150 L 50 50 1 1 B
+X PC5 B19 700 -600 150 L 50 50 1 1 B
+X PE2 B2 -700 -1200 150 R 50 50 1 1 B
+X PC7 B20 700 -800 150 L 50 50 1 1 B
+X PA7 B21 700 1000 150 L 50 50 1 1 B
+X PA4 B22 700 1300 150 L 50 50 1 1 B
+X PA3 B23 700 1400 150 L 50 50 1 1 B
+X PA0 B24 700 1700 150 L 50 50 1 1 B
+X GND B25 0 -2100 150 U 50 50 1 1 P N
+X PF6 B26 -700 -700 150 R 50 50 1 1 B
+X PF4 B27 -700 -500 150 R 50 50 1 1 B
+X PF2 B28 -700 -300 150 R 50 50 1 1 B
+X PF0 B29 -700 -100 150 R 50 50 1 1 B
+X PE4 B3 -700 -1400 150 R 50 50 1 1 B
+X AVCC B30 100 2100 150 D 50 50 1 1 W
+X PE6 B4 -700 -1600 150 R 50 50 1 1 B
+X PB0 B5 700 800 150 L 50 50 1 1 B
+X PB2 B6 700 600 150 L 50 50 1 1 B
+X PB5 B7 700 300 150 L 50 50 1 1 B
+X PB6 B8 700 200 150 L 50 50 1 1 B
+X PG4 B9 -700 400 150 R 50 50 1 1 B
+X GND EP 0 -2100 150 U 50 50 1 1 P N
+ENDDRAW
+ENDDEF
+#
+# ATmega16L-8A
 #
-DEF ATmega16L-8AU U 0 20 Y Y 1 F N
+DEF ATmega16L-8A U 0 20 Y Y 1 F N
 F0 "U" -500 1950 50 H V L BNN
-F1 "ATmega16L-8AU" 100 -1950 50 H V L TNN
+F1 "ATmega16L-8A" 100 -1950 50 H V L TNN
 F2 "Package_QFP:TQFP-44_10x10mm_P0.8mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATmega16-16AU ATmega16A-AU ATmega32L-8AU ATmega32-16AU ATmega32A-AU
+ALIAS ATmega16-16A ATmega16A-A ATmega32L-8A ATmega32-16A ATmega32A-A
 $FPLIST
  TQFP*10x10mm*P0.8mm*
 $ENDFPLIST
@@ -1443,14 +1443,14 @@ X PD0 9 600 -1000 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATmega16L-8MU
+# ATmega16L-8M
 #
-DEF ATmega16L-8MU U 0 20 Y Y 1 F N
+DEF ATmega16L-8M U 0 20 Y Y 1 F N
 F0 "U" -500 1950 50 H V L BNN
-F1 "ATmega16L-8MU" 100 -1950 50 H V L TNN
+F1 "ATmega16L-8M" 100 -1950 50 H V L TNN
 F2 "Package_DFN_QFN:QFN-44-1EP_7x7mm_P0.5mm_EP5.2x5.2mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATmega16-16MU ATmega16A-MU ATmega32L-8MU ATmega32-16MU ATmega32A-MU
+ALIAS ATmega16-16M ATmega16A-M ATmega32L-8M ATmega32-16M ATmega32A-M
 $FPLIST
  QFN*1EP*7x7mm*P0.5mm*
 $ENDFPLIST
@@ -1504,14 +1504,14 @@ X PD0 9 600 -1000 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATmega16L-8PU
+# ATmega16L-8P
 #
-DEF ATmega16L-8PU U 0 20 Y Y 1 F N
+DEF ATmega16L-8P U 0 20 Y Y 1 F N
 F0 "U" -500 1950 50 H V L BNN
-F1 "ATmega16L-8PU" 100 -1950 50 H V L TNN
+F1 "ATmega16L-8P" 100 -1950 50 H V L TNN
 F2 "Package_DIP:DIP-40_W15.24mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATmega16-16PU ATmega16A-PU ATmega32L-8PU ATmega32-16PU ATmega32A-PU
+ALIAS ATmega16-16P ATmega16A-P ATmega32L-8P ATmega32-16P ATmega32A-P
 $FPLIST
  DIP*W15.24mm*
 $ENDFPLIST
@@ -1560,14 +1560,14 @@ X ~RESET 9 -600 1700 100 R 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
-# ATmega16M1-AU
+# ATmega16M1-A
 #
-DEF ATmega16M1-AU U 0 20 Y Y 1 F N
+DEF ATmega16M1-A U 0 20 Y Y 1 F N
 F0 "U" -500 1750 50 H V L BNN
-F1 "ATmega16M1-AU" 200 -1750 50 H V L TNN
+F1 "ATmega16M1-A" 200 -1750 50 H V L TNN
 F2 "Package_QFP:TQFP-32_7x7mm_P0.8mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATmega32M1-AU ATmega64M1-AU
+ALIAS ATmega32M1-A ATmega64M1-A
 $FPLIST
  TQFP*7x7mm*P0.8mm*
 $ENDFPLIST
@@ -1608,14 +1608,14 @@ X PB1 9 600 1400 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATmega16M1-MU
+# ATmega16M1-M
 #
-DEF ATmega16M1-MU U 0 20 Y Y 1 F N
+DEF ATmega16M1-M U 0 20 Y Y 1 F N
 F0 "U" -500 1750 50 H V L BNN
-F1 "ATmega16M1-MU" 200 -1750 50 H V L TNN
+F1 "ATmega16M1-M" 200 -1750 50 H V L TNN
 F2 "Package_DFN_QFN:QFN-32-1EP_7x7mm_P0.65mm_EP4.65x4.65mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATmega32M1-MU ATmega64M1-MU
+ALIAS ATmega32M1-M ATmega64M1-M
 $FPLIST
  QFN*1EP*7x7mm*P0.65mm*
 $ENDFPLIST
@@ -1657,14 +1657,14 @@ X PB1 9 600 1400 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATmega16U4-AU
+# ATmega16U4-A
 #
-DEF ATmega16U4-AU U 0 20 Y Y 1 F N
+DEF ATmega16U4-A U 0 20 Y Y 1 F N
 F0 "U" -500 1750 50 H V L BNN
-F1 "ATmega16U4-AU" 100 -1750 50 H V L TNN
+F1 "ATmega16U4-A" 100 -1750 50 H V L TNN
 F2 "Package_QFP:TQFP-44_10x10mm_P0.8mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATmega16U4RC-AU ATmega32U4-AU ATmega32U4RC-AU
+ALIAS ATmega16U4RC-A ATmega32U4-A ATmega32U4RC-A
 $FPLIST
  TQFP*10x10mm*P0.8mm*
 $ENDFPLIST
@@ -1717,14 +1717,14 @@ X PB1 9 600 1400 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATmega16U4-MU
+# ATmega16U4-M
 #
-DEF ATmega16U4-MU U 0 20 Y Y 1 F N
+DEF ATmega16U4-M U 0 20 Y Y 1 F N
 F0 "U" -500 1750 50 H V L BNN
-F1 "ATmega16U4-MU" 100 -1750 50 H V L TNN
+F1 "ATmega16U4-M" 100 -1750 50 H V L TNN
 F2 "Package_DFN_QFN:QFN-44-1EP_7x7mm_P0.5mm_EP5.2x5.2mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATmega16U4RC-MU ATmega32U4-MU ATmega32U4RC-MU
+ALIAS ATmega16U4RC-M ATmega32U4-M ATmega32U4RC-M
 $FPLIST
  QFN*1EP*7x7mm*P0.5mm*
 $ENDFPLIST
@@ -2048,11 +2048,11 @@ X PB5 9 600 -200 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATmega324PB-AU
+# ATmega324PB-A
 #
-DEF ATmega324PB-AU U 0 20 Y Y 1 F N
+DEF ATmega324PB-A U 0 20 Y Y 1 F N
 F0 "U" -500 1450 50 H V L BNN
-F1 "ATmega324PB-AU" 100 -1450 50 H V L TNN
+F1 "ATmega324PB-A" 100 -1450 50 H V L TNN
 F2 "Package_QFP:TQFP-44_10x10mm_P0.8mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -2107,11 +2107,11 @@ X PD0 9 -600 -500 100 R 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATmega324PB-MU
+# ATmega324PB-M
 #
-DEF ATmega324PB-MU U 0 20 Y Y 1 F N
+DEF ATmega324PB-M U 0 20 Y Y 1 F N
 F0 "U" -500 1450 50 H V L BNN
-F1 "ATmega324PB-MU" 100 -1450 50 H V L TNN
+F1 "ATmega324PB-M" 100 -1450 50 H V L TNN
 F2 "Package_DFN_QFN:QFN-44-1EP_7x7mm_P0.5mm_EP5.2x5.2mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -2167,14 +2167,14 @@ X PD0 9 -600 -500 100 R 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATmega3250V-8AU
+# ATmega3250V-8A
 #
-DEF ATmega3250V-8AU U 0 20 Y Y 1 F N
+DEF ATmega3250V-8A U 0 20 Y Y 1 F N
 F0 "U" 0 50 50 H V C BNN
-F1 "ATmega3250V-8AU" 0 -50 50 H V C TNN
+F1 "ATmega3250V-8A" 0 -50 50 H V C TNN
 F2 "Package_QFP:TQFP-100_14x14mm_P0.5mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATmega3250-16AU ATmega3250PV-10AU ATmega3250P-20AU ATmega3250A-AU ATmega3250PA-AU ATmega6450V-8AU ATmega6450-16AU ATmega6450A-AU ATmega6450P-AU
+ALIAS ATmega3250-16A ATmega3250PV-10A ATmega3250P-20A ATmega3250A-A ATmega3250PA-A ATmega6450V-8A ATmega6450-16A ATmega6450A-A ATmega6450P-A
 $FPLIST
  TQFP*14x14mm*P0.5mm*
 $ENDFPLIST
@@ -2283,14 +2283,14 @@ X AGND 99 100 -2500 150 U 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
-# ATmega325V-8AU
+# ATmega325V-8A
 #
-DEF ATmega325V-8AU U 0 20 Y Y 1 F N
+DEF ATmega325V-8A U 0 20 Y Y 1 F N
 F0 "U" -500 1950 50 H V L BNN
-F1 "ATmega325V-8AU" 100 -1950 50 H V L TNN
+F1 "ATmega325V-8A" 100 -1950 50 H V L TNN
 F2 "Package_QFP:TQFP-64_14x14mm_P0.8mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATmega325-16AU ATmega325PV-10AU ATmega325P-20AU ATmega645V-8AU ATmega645-16AU
+ALIAS ATmega325-16A ATmega325PV-10A ATmega325P-20A ATmega645V-8A ATmega645-16A
 $FPLIST
  TQFP*14x14mm*P0.8mm*
 $ENDFPLIST
@@ -2363,14 +2363,14 @@ X PE7 9 -600 -1700 100 R 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATmega325V-8MU
+# ATmega325V-8M
 #
-DEF ATmega325V-8MU U 0 20 Y Y 1 F N
+DEF ATmega325V-8M U 0 20 Y Y 1 F N
 F0 "U" -500 1950 50 H V L BNN
-F1 "ATmega325V-8MU" 100 -1950 50 H V L TNN
+F1 "ATmega325V-8M" 100 -1950 50 H V L TNN
 F2 "Package_DFN_QFN:QFN-64-1EP_9x9mm_P0.5mm_EP5.4x5.4mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATmega325-16MU ATmega325PV-10MU ATmega325P-20MU ATmega645V-8MU ATmega645-16MU
+ALIAS ATmega325-16M ATmega325PV-10M ATmega325P-20M ATmega645V-8M ATmega645-16M
 $FPLIST
  QFN*1EP*9x9mm*P0.5mm*
 $ENDFPLIST
@@ -2444,14 +2444,14 @@ X PE7 9 -600 -1700 100 R 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATmega3290V-8AU
+# ATmega3290V-8A
 #
-DEF ATmega3290V-8AU U 0 20 Y Y 1 F N
+DEF ATmega3290V-8A U 0 20 Y Y 1 F N
 F0 "U" 0 50 50 H V C BNN
-F1 "ATmega3290V-8AU" 0 -50 50 H V C TNN
+F1 "ATmega3290V-8A" 0 -50 50 H V C TNN
 F2 "Package_QFP:TQFP-100_14x14mm_P0.5mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATmega3290-16AU ATmega3290PV-10AU ATmega3290P-20AU ATmega3290A-AU ATmega3290PA-AU ATmega6490V-8AU ATmega6490-16AU ATmega6490A-AU ATmega6490P-AU
+ALIAS ATmega3290-16A ATmega3290PV-10A ATmega3290P-20A ATmega3290A-A ATmega3290PA-A ATmega6490V-8A ATmega6490-16A ATmega6490A-A ATmega6490P-A
 $FPLIST
  TQFP*14x14mm*P0.5mm*
 $ENDFPLIST
@@ -2560,14 +2560,14 @@ X AGND 99 100 -2500 150 U 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
-# ATmega329V-8AU
+# ATmega329V-8A
 #
-DEF ATmega329V-8AU U 0 20 Y Y 1 F N
+DEF ATmega329V-8A U 0 20 Y Y 1 F N
 F0 "U" -500 1950 50 H V L BNN
-F1 "ATmega329V-8AU" 100 -1950 50 H V L TNN
+F1 "ATmega329V-8A" 100 -1950 50 H V L TNN
 F2 "Package_QFP:TQFP-64_14x14mm_P0.8mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATmega329-16AU ATmega329PV-10AU ATmega329P-20AU ATmega649V-8AU ATmega649-16AU
+ALIAS ATmega329-16A ATmega329PV-10A ATmega329P-20A ATmega649V-8A ATmega649-16A
 $FPLIST
  TQFP*14x14mm*P0.8mm*
 $ENDFPLIST
@@ -2640,14 +2640,14 @@ X PE7 9 -600 -1700 100 R 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATmega329V-8MU
+# ATmega329V-8M
 #
-DEF ATmega329V-8MU U 0 20 Y Y 1 F N
+DEF ATmega329V-8M U 0 20 Y Y 1 F N
 F0 "U" -500 1950 50 H V L BNN
-F1 "ATmega329V-8MU" 100 -1950 50 H V L TNN
+F1 "ATmega329V-8M" 100 -1950 50 H V L TNN
 F2 "Package_DFN_QFN:QFN-64-1EP_9x9mm_P0.5mm_EP5.4x5.4mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATmega329-16MU ATmega329PV-10MU ATmega329P-20MU ATmega649V-8MU ATmega649-16MU
+ALIAS ATmega329-16M ATmega329PV-10M ATmega329P-20M ATmega649V-8M ATmega649-16M
 $FPLIST
  QFN*1EP*9x9mm*P0.5mm*
 $ENDFPLIST
@@ -2784,14 +2784,14 @@ X PA4 9 -600 -1300 100 R 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATmega48A-CCU
+# ATmega48A-CC
 #
-DEF ATmega48A-CCU U 0 20 Y Y 1 F N
+DEF ATmega48A-CC U 0 20 Y Y 1 F N
 F0 "U" -500 1450 50 H V L BNN
-F1 "ATmega48A-CCU" 100 -1450 50 H V L TNN
+F1 "ATmega48A-CC" 100 -1450 50 H V L TNN
 F2 "Package_BGA:UFBGA-32_4.0x4.0mm_Layout6x6_P0.5mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATmega48PA-CCU ATmega88A-CCU ATmega88PA-CCU ATmega168A-CCU ATmega168PA-CCU
+ALIAS ATmega48PA-CC ATmega88A-CC ATmega88PA-CC ATmega168A-CC ATmega168PA-CC
 $FPLIST
  UFBGA*4.0x4.0mm*Layout6x6*P0.5mm*
 $ENDFPLIST
@@ -2832,14 +2832,14 @@ X PB4 F6 600 800 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATmega48PB-AU
+# ATmega48PB-A
 #
-DEF ATmega48PB-AU U 0 20 Y Y 1 F N
+DEF ATmega48PB-A U 0 20 Y Y 1 F N
 F0 "U" -500 1450 50 H V L BNN
-F1 "ATmega48PB-AU" 100 -1450 50 H V L TNN
+F1 "ATmega48PB-A" 100 -1450 50 H V L TNN
 F2 "Package_QFP:TQFP-32_7x7mm_P0.8mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATmega88PB-AU ATmega168PB-AU ATmega328PB-AU
+ALIAS ATmega88PB-A ATmega168PB-A ATmega328PB-A
 $FPLIST
  TQFP*7x7mm*P0.8mm*
 $ENDFPLIST
@@ -2880,14 +2880,14 @@ X PD5 9 600 -1000 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATmega48PB-MU
+# ATmega48PB-M
 #
-DEF ATmega48PB-MU U 0 20 Y Y 1 F N
+DEF ATmega48PB-M U 0 20 Y Y 1 F N
 F0 "U" -500 1450 50 H V L BNN
-F1 "ATmega48PB-MU" 100 -1450 50 H V L TNN
+F1 "ATmega48PB-M" 100 -1450 50 H V L TNN
 F2 "Package_DFN_QFN:QFN-32-1EP_5x5mm_P0.5mm_EP3.1x3.1mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATmega88PB-MU ATmega168PB-MU ATmega328PB-MU
+ALIAS ATmega88PB-M ATmega168PB-M ATmega328PB-M
 $FPLIST
  QFN*1EP*5x5mm*P0.5mm*
 $ENDFPLIST
@@ -2929,14 +2929,14 @@ X PD5 9 600 -1000 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATmega48PV-10AU
+# ATmega48PV-10A
 #
-DEF ATmega48PV-10AU U 0 20 Y Y 1 F N
+DEF ATmega48PV-10A U 0 20 Y Y 1 F N
 F0 "U" -500 1450 50 H V L BNN
-F1 "ATmega48PV-10AU" 100 -1450 50 H V L TNN
+F1 "ATmega48PV-10A" 100 -1450 50 H V L TNN
 F2 "Package_QFP:TQFP-32_7x7mm_P0.8mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATmega48P-20AU ATmega48A-AU ATmega48PA-AU ATmega88PV-10AU ATmega88P-20AU ATmega88A-AU ATmega88PA-AU ATmega168PV-10AU ATmega168P-20AU ATmega168A-AU ATmega168PA-AU ATmega328-AU ATmega328P-AU
+ALIAS ATmega48P-20A ATmega48A-A ATmega48PA-A ATmega88PV-10A ATmega88P-20A ATmega88A-A ATmega88PA-A ATmega168PV-10A ATmega168P-20A ATmega168A-A ATmega168PA-A ATmega328-A ATmega328P-A
 $FPLIST
  TQFP*7x7mm*P0.8mm*
 $ENDFPLIST
@@ -2977,59 +2977,14 @@ X PD5 9 600 -1000 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATmega48PV-10MMU
-#
-DEF ATmega48PV-10MMU U 0 20 Y Y 1 F N
-F0 "U" -500 1450 50 H V L BNN
-F1 "ATmega48PV-10MMU" 100 -1450 50 H V L TNN
-F2 "Package_DFN_QFN:QFN-28-1EP_4x4mm_P0.45mm_EP2.4x2.4mm" 0 0 50 H I C CIN
-F3 "" 0 0 50 H I C CNN
-ALIAS ATmega48P-20MMU ATmega48A-MMH ATmega48PA-MMH ATmega88A-MMH ATmega88PA-MMH ATmega168A-MMH ATmega168PA-MMH ATmega328-MMH ATmega328P-MMH
-$FPLIST
- QFN*1EP*4x4mm*P0.45mm*
-$ENDFPLIST
-DRAW
-S -500 -1400 500 1400 0 1 10 f
-X PD3 1 600 -800 100 L 50 50 1 1 B
-X PB0 10 600 1200 100 L 50 50 1 1 B
-X PB1 11 600 1100 100 L 50 50 1 1 B
-X PB2 12 600 1000 100 L 50 50 1 1 B
-X PB3 13 600 900 100 L 50 50 1 1 B
-X PB4 14 600 800 100 L 50 50 1 1 B
-X PB5 15 600 700 100 L 50 50 1 1 B
-X AVCC 16 100 1500 100 D 50 50 1 1 W
-X AREF 17 -600 1200 100 R 50 50 1 1 P
-X GND 18 0 -1500 100 U 50 50 1 1 P N
-X PC0 19 600 300 100 L 50 50 1 1 B
-X PD4 2 600 -900 100 L 50 50 1 1 B
-X PC1 20 600 200 100 L 50 50 1 1 B
-X PC2 21 600 100 100 L 50 50 1 1 B
-X PC3 22 600 0 100 L 50 50 1 1 B
-X PC4 23 600 -100 100 L 50 50 1 1 B
-X PC5 24 600 -200 100 L 50 50 1 1 B
-X ~RESET~/PC6 25 600 -300 100 L 50 50 1 1 B
-X PD0 26 600 -500 100 L 50 50 1 1 B
-X PD1 27 600 -600 100 L 50 50 1 1 B
-X PD2 28 600 -700 100 L 50 50 1 1 B
-X GND 29 0 -1500 100 U 50 50 1 1 P N
-X VCC 3 0 1500 100 D 50 50 1 1 W
-X GND 4 0 -1500 100 U 50 50 1 1 W
-X XTAL1/PB6 5 600 600 100 L 50 50 1 1 B
-X XTAL2/PB7 6 600 500 100 L 50 50 1 1 B
-X PD5 7 600 -1000 100 L 50 50 1 1 B
-X PD6 8 600 -1100 100 L 50 50 1 1 B
-X PD7 9 600 -1200 100 L 50 50 1 1 B
-ENDDRAW
-ENDDEF
-#
-# ATmega48PV-10MU
+# ATmega48PV-10M
 #
-DEF ATmega48PV-10MU U 0 20 Y Y 1 F N
+DEF ATmega48PV-10M U 0 20 Y Y 1 F N
 F0 "U" -500 1450 50 H V L BNN
-F1 "ATmega48PV-10MU" 100 -1450 50 H V L TNN
+F1 "ATmega48PV-10M" 100 -1450 50 H V L TNN
 F2 "Package_DFN_QFN:QFN-32-1EP_5x5mm_P0.5mm_EP3.1x3.1mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATmega48P-20MU ATmega48A-MU ATmega48PA-MU ATmega88PV-10MU ATmega88P-20MU ATmega88A-MU ATmega88PA-MU ATmega168PV-10MU ATmega168P-20MU ATmega168A-MU ATmega168PA-MU ATmega328-MU ATmega328P-MU
+ALIAS ATmega48P-20M ATmega48A-M ATmega48PA-M ATmega88PV-10M ATmega88P-20M ATmega88A-M ATmega88PA-M ATmega168PV-10M ATmega168P-20M ATmega168A-M ATmega168PA-M ATmega328-M ATmega328P-M
 $FPLIST
  QFN*1EP*5x5mm*P0.5mm*
 $ENDFPLIST
@@ -3071,14 +3026,59 @@ X PD5 9 600 -1000 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATmega48PV-10PU
+# ATmega48PV-10MM
+#
+DEF ATmega48PV-10MM U 0 20 Y Y 1 F N
+F0 "U" -500 1450 50 H V L BNN
+F1 "ATmega48PV-10MM" 100 -1450 50 H V L TNN
+F2 "Package_DFN_QFN:QFN-28-1EP_4x4mm_P0.45mm_EP2.4x2.4mm" 0 0 50 H I C CIN
+F3 "" 0 0 50 H I C CNN
+ALIAS ATmega48P-20MM ATmega48A-MM ATmega48PA-MM ATmega88A-MM ATmega88PA-MM ATmega168A-MM ATmega168PA-MM ATmega328-MM ATmega328P-MM
+$FPLIST
+ QFN*1EP*4x4mm*P0.45mm*
+$ENDFPLIST
+DRAW
+S -500 -1400 500 1400 0 1 10 f
+X PD3 1 600 -800 100 L 50 50 1 1 B
+X PB0 10 600 1200 100 L 50 50 1 1 B
+X PB1 11 600 1100 100 L 50 50 1 1 B
+X PB2 12 600 1000 100 L 50 50 1 1 B
+X PB3 13 600 900 100 L 50 50 1 1 B
+X PB4 14 600 800 100 L 50 50 1 1 B
+X PB5 15 600 700 100 L 50 50 1 1 B
+X AVCC 16 100 1500 100 D 50 50 1 1 W
+X AREF 17 -600 1200 100 R 50 50 1 1 P
+X GND 18 0 -1500 100 U 50 50 1 1 P N
+X PC0 19 600 300 100 L 50 50 1 1 B
+X PD4 2 600 -900 100 L 50 50 1 1 B
+X PC1 20 600 200 100 L 50 50 1 1 B
+X PC2 21 600 100 100 L 50 50 1 1 B
+X PC3 22 600 0 100 L 50 50 1 1 B
+X PC4 23 600 -100 100 L 50 50 1 1 B
+X PC5 24 600 -200 100 L 50 50 1 1 B
+X ~RESET~/PC6 25 600 -300 100 L 50 50 1 1 B
+X PD0 26 600 -500 100 L 50 50 1 1 B
+X PD1 27 600 -600 100 L 50 50 1 1 B
+X PD2 28 600 -700 100 L 50 50 1 1 B
+X GND 29 0 -1500 100 U 50 50 1 1 P N
+X VCC 3 0 1500 100 D 50 50 1 1 W
+X GND 4 0 -1500 100 U 50 50 1 1 W
+X XTAL1/PB6 5 600 600 100 L 50 50 1 1 B
+X XTAL2/PB7 6 600 500 100 L 50 50 1 1 B
+X PD5 7 600 -1000 100 L 50 50 1 1 B
+X PD6 8 600 -1100 100 L 50 50 1 1 B
+X PD7 9 600 -1200 100 L 50 50 1 1 B
+ENDDRAW
+ENDDEF
+#
+# ATmega48PV-10P
 #
-DEF ATmega48PV-10PU U 0 20 Y Y 1 F N
+DEF ATmega48PV-10P U 0 20 Y Y 1 F N
 F0 "U" -500 1450 50 H V L BNN
-F1 "ATmega48PV-10PU" 100 -1450 50 H V L TNN
+F1 "ATmega48PV-10P" 100 -1450 50 H V L TNN
 F2 "Package_DIP:DIP-28_W7.62mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATmega48P-20PU ATmega48A-PU ATmega48PA-PU ATmega88PV-10PU ATmega88P-20PU ATmega88A-PU ATmega88PA-PU ATmega168PV-10PU ATmega168P-20PU ATmega168A-PU ATmega168PA-PU ATmega328-PU ATmega328P-PU
+ALIAS ATmega48P-20P ATmega48A-P ATmega48PA-P ATmega88PV-10P ATmega88P-20P ATmega88A-P ATmega88PA-P ATmega168PV-10P ATmega168P-20P ATmega168A-P ATmega168PA-P ATmega328-P ATmega328P-P
 $FPLIST
  DIP*W7.62mm*
 $ENDFPLIST
@@ -3115,14 +3115,14 @@ X XTAL1/PB6 9 600 600 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATmega48V-10AU
+# ATmega48V-10A
 #
-DEF ATmega48V-10AU U 0 20 Y Y 1 F N
+DEF ATmega48V-10A U 0 20 Y Y 1 F N
 F0 "U" -500 1450 50 H V L BNN
-F1 "ATmega48V-10AU" 100 -1450 50 H V L TNN
+F1 "ATmega48V-10A" 100 -1450 50 H V L TNN
 F2 "Package_QFP:TQFP-32_7x7mm_P0.8mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATmega48-20AU ATmega88V-10AU ATmega88-20AU ATmega168V-10AU ATmega168-20AU
+ALIAS ATmega48-20A ATmega88V-10A ATmega88-20A ATmega168V-10A ATmega168-20A
 $FPLIST
  TQFP*7x7mm*P0.8mm*
 $ENDFPLIST
@@ -3163,59 +3163,14 @@ X PD5 9 600 -1000 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATmega48V-10MMU
+# ATmega48V-10M
 #
-DEF ATmega48V-10MMU U 0 20 Y Y 1 F N
+DEF ATmega48V-10M U 0 20 Y Y 1 F N
 F0 "U" -500 1450 50 H V L BNN
-F1 "ATmega48V-10MMU" 100 -1450 50 H V L TNN
-F2 "Package_DFN_QFN:QFN-28-1EP_4x4mm_P0.45mm_EP2.4x2.4mm" 0 0 50 H I C CIN
-F3 "" 0 0 50 H I C CNN
-ALIAS ATmega48-20MMU
-$FPLIST
- QFN*1EP*4x4mm*P0.45mm*
-$ENDFPLIST
-DRAW
-S -500 -1400 500 1400 0 1 10 f
-X PD3 1 600 -800 100 L 50 50 1 1 B
-X PB0 10 600 1200 100 L 50 50 1 1 B
-X PB1 11 600 1100 100 L 50 50 1 1 B
-X PB2 12 600 1000 100 L 50 50 1 1 B
-X PB3 13 600 900 100 L 50 50 1 1 B
-X PB4 14 600 800 100 L 50 50 1 1 B
-X PB5 15 600 700 100 L 50 50 1 1 B
-X AVCC 16 100 1500 100 D 50 50 1 1 W
-X AREF 17 -600 1200 100 R 50 50 1 1 P
-X GND 18 0 -1500 100 U 50 50 1 1 P N
-X PC0 19 600 300 100 L 50 50 1 1 B
-X PD4 2 600 -900 100 L 50 50 1 1 B
-X PC1 20 600 200 100 L 50 50 1 1 B
-X PC2 21 600 100 100 L 50 50 1 1 B
-X PC3 22 600 0 100 L 50 50 1 1 B
-X PC4 23 600 -100 100 L 50 50 1 1 B
-X PC5 24 600 -200 100 L 50 50 1 1 B
-X ~RESET~/PC6 25 600 -300 100 L 50 50 1 1 B
-X PD0 26 600 -500 100 L 50 50 1 1 B
-X PD1 27 600 -600 100 L 50 50 1 1 B
-X PD2 28 600 -700 100 L 50 50 1 1 B
-X GND 29 0 -1500 100 U 50 50 1 1 P N
-X VCC 3 0 1500 100 D 50 50 1 1 W
-X GND 4 0 -1500 100 U 50 50 1 1 W
-X XTAL1/PB6 5 600 600 100 L 50 50 1 1 B
-X XTAL2/PB7 6 600 500 100 L 50 50 1 1 B
-X PD5 7 600 -1000 100 L 50 50 1 1 B
-X PD6 8 600 -1100 100 L 50 50 1 1 B
-X PD7 9 600 -1200 100 L 50 50 1 1 B
-ENDDRAW
-ENDDEF
-#
-# ATmega48V-10MU
-#
-DEF ATmega48V-10MU U 0 20 Y Y 1 F N
-F0 "U" -500 1450 50 H V L BNN
-F1 "ATmega48V-10MU" 100 -1450 50 H V L TNN
+F1 "ATmega48V-10M" 100 -1450 50 H V L TNN
 F2 "Package_DFN_QFN:QFN-32-1EP_5x5mm_P0.5mm_EP3.1x3.1mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATmega48-20MU ATmega88V-10MU ATmega88-20MU ATmega168V-10MU ATmega168-20MU
+ALIAS ATmega48-20M ATmega88V-10M ATmega88-20M ATmega168V-10M ATmega168-20M
 $FPLIST
  QFN*1EP*5x5mm*P0.5mm*
 $ENDFPLIST
@@ -3257,14 +3212,59 @@ X PD5 9 600 -1000 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATmega48V-10PU
+# ATmega48V-10MM
+#
+DEF ATmega48V-10MM U 0 20 Y Y 1 F N
+F0 "U" -500 1450 50 H V L BNN
+F1 "ATmega48V-10MM" 100 -1450 50 H V L TNN
+F2 "Package_DFN_QFN:QFN-28-1EP_4x4mm_P0.45mm_EP2.4x2.4mm" 0 0 50 H I C CIN
+F3 "" 0 0 50 H I C CNN
+ALIAS ATmega48-20MM
+$FPLIST
+ QFN*1EP*4x4mm*P0.45mm*
+$ENDFPLIST
+DRAW
+S -500 -1400 500 1400 0 1 10 f
+X PD3 1 600 -800 100 L 50 50 1 1 B
+X PB0 10 600 1200 100 L 50 50 1 1 B
+X PB1 11 600 1100 100 L 50 50 1 1 B
+X PB2 12 600 1000 100 L 50 50 1 1 B
+X PB3 13 600 900 100 L 50 50 1 1 B
+X PB4 14 600 800 100 L 50 50 1 1 B
+X PB5 15 600 700 100 L 50 50 1 1 B
+X AVCC 16 100 1500 100 D 50 50 1 1 W
+X AREF 17 -600 1200 100 R 50 50 1 1 P
+X GND 18 0 -1500 100 U 50 50 1 1 P N
+X PC0 19 600 300 100 L 50 50 1 1 B
+X PD4 2 600 -900 100 L 50 50 1 1 B
+X PC1 20 600 200 100 L 50 50 1 1 B
+X PC2 21 600 100 100 L 50 50 1 1 B
+X PC3 22 600 0 100 L 50 50 1 1 B
+X PC4 23 600 -100 100 L 50 50 1 1 B
+X PC5 24 600 -200 100 L 50 50 1 1 B
+X ~RESET~/PC6 25 600 -300 100 L 50 50 1 1 B
+X PD0 26 600 -500 100 L 50 50 1 1 B
+X PD1 27 600 -600 100 L 50 50 1 1 B
+X PD2 28 600 -700 100 L 50 50 1 1 B
+X GND 29 0 -1500 100 U 50 50 1 1 P N
+X VCC 3 0 1500 100 D 50 50 1 1 W
+X GND 4 0 -1500 100 U 50 50 1 1 W
+X XTAL1/PB6 5 600 600 100 L 50 50 1 1 B
+X XTAL2/PB7 6 600 500 100 L 50 50 1 1 B
+X PD5 7 600 -1000 100 L 50 50 1 1 B
+X PD6 8 600 -1100 100 L 50 50 1 1 B
+X PD7 9 600 -1200 100 L 50 50 1 1 B
+ENDDRAW
+ENDDEF
+#
+# ATmega48V-10P
 #
-DEF ATmega48V-10PU U 0 20 Y Y 1 F N
+DEF ATmega48V-10P U 0 20 Y Y 1 F N
 F0 "U" -500 1450 50 H V L BNN
-F1 "ATmega48V-10PU" 100 -1450 50 H V L TNN
+F1 "ATmega48V-10P" 100 -1450 50 H V L TNN
 F2 "Package_DIP:DIP-28_W7.62mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATmega48-20PU ATmega88V-10PU ATmega88-20PU ATmega168V-10PU ATmega168-20PU
+ALIAS ATmega48-20P ATmega88V-10P ATmega88-20P ATmega168V-10P ATmega168-20P
 $FPLIST
  DIP*W7.62mm*
 $ENDFPLIST
@@ -3301,14 +3301,14 @@ X XTAL1/PB6 9 600 600 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATmega640V-8AU
+# ATmega640V-8A
 #
-DEF ATmega640V-8AU U 0 20 Y Y 1 F N
+DEF ATmega640V-8A U 0 20 Y Y 1 F N
 F0 "U" 0 50 50 H V C BNN
-F1 "ATmega640V-8AU" 0 -50 50 H V C TNN
+F1 "ATmega640V-8A" 0 -50 50 H V C TNN
 F2 "Package_QFP:TQFP-100_14x14mm_P0.5mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATmega640-16AU ATmega1280V-8AU ATmega1280-16AU ATmega2560V-8AU ATmega2560-16AU
+ALIAS ATmega640-16A ATmega1280V-8A ATmega1280-16A ATmega2560V-8A ATmega2560-16A
 $FPLIST
  TQFP*14x14mm*P0.5mm*
 $ENDFPLIST
@@ -3417,14 +3417,14 @@ X GND 99 0 -2900 150 U 50 50 1 1 P N
 ENDDRAW
 ENDDEF
 #
-# ATmega640V-8CU
+# ATmega640V-8C
 #
-DEF ATmega640V-8CU U 0 20 Y Y 1 F N
+DEF ATmega640V-8C U 0 20 Y Y 1 F N
 F0 "U" 0 50 50 H V C BNN
-F1 "ATmega640V-8CU" 0 -50 50 H V C TNN
+F1 "ATmega640V-8C" 0 -50 50 H V C TNN
 F2 "Package_BGA:TFBGA-100_9.0x9.0mm_Layout10x10_P0.8mm" 0 0 50 H I C CIN
 F3 "" -1150 2800 50 H I C CNN
-ALIAS ATmega640-16CU ATmega1280V-8CU ATmega1280-16CU ATmega2560V-8CU ATmega2560-16CU
+ALIAS ATmega640-16C ATmega1280V-8C ATmega1280-16C ATmega2560V-8C ATmega2560-16C
 $FPLIST
  TFBGA*9.0x9.0mm*Layout10x10*P0.8mm*
 $ENDFPLIST
@@ -3533,14 +3533,14 @@ X PD7 K9 800 -800 150 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATmega644V-10AU
+# ATmega644V-10A
 #
-DEF ATmega644V-10AU U 0 20 Y Y 1 F N
+DEF ATmega644V-10A U 0 20 Y Y 1 F N
 F0 "U" -500 1950 50 H V L BNN
-F1 "ATmega644V-10AU" 100 -1950 50 H V L TNN
+F1 "ATmega644V-10A" 100 -1950 50 H V L TNN
 F2 "Package_QFP:TQFP-44_10x10mm_P0.8mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATmega644-20AU
+ALIAS ATmega644-20A
 $FPLIST
  TQFP*10x10mm*P0.8mm*
 $ENDFPLIST
@@ -3593,14 +3593,14 @@ X PD0 9 600 -1000 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATmega644V-10MU
+# ATmega644V-10M
 #
-DEF ATmega644V-10MU U 0 20 Y Y 1 F N
+DEF ATmega644V-10M U 0 20 Y Y 1 F N
 F0 "U" -500 1950 50 H V L BNN
-F1 "ATmega644V-10MU" 100 -1950 50 H V L TNN
+F1 "ATmega644V-10M" 100 -1950 50 H V L TNN
 F2 "Package_DFN_QFN:QFN-44-1EP_7x7mm_P0.5mm_EP5.2x5.2mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATmega644-20MU
+ALIAS ATmega644-20M
 $FPLIST
  QFN*1EP*7x7mm*P0.5mm*
 $ENDFPLIST
@@ -3654,14 +3654,14 @@ X PD0 9 600 -1000 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATmega644V-10PU
+# ATmega644V-10P
 #
-DEF ATmega644V-10PU U 0 20 Y Y 1 F N
+DEF ATmega644V-10P U 0 20 Y Y 1 F N
 F0 "U" -500 1950 50 H V L BNN
-F1 "ATmega644V-10PU" 100 -1950 50 H V L TNN
+F1 "ATmega644V-10P" 100 -1950 50 H V L TNN
 F2 "Package_DIP:DIP-40_W15.24mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATmega644-20PU
+ALIAS ATmega644-20P
 $FPLIST
  DIP*W15.24mm*
 $ENDFPLIST
@@ -3710,14 +3710,14 @@ X ~RESET 9 -600 1700 100 R 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
-# ATmega64L-8AU
+# ATmega64L-8A
 #
-DEF ATmega64L-8AU U 0 20 Y Y 1 F N
+DEF ATmega64L-8A U 0 20 Y Y 1 F N
 F0 "U" -500 1950 50 H V L BNN
-F1 "ATmega64L-8AU" 100 -1950 50 H V L TNN
+F1 "ATmega64L-8A" 100 -1950 50 H V L TNN
 F2 "Package_QFP:TQFP-64_14x14mm_P0.8mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATmega64-16AU ATmega64A-AU ATmega128L-8AU ATmega128-16AU ATmega128A-AU
+ALIAS ATmega64-16A ATmega64A-A ATmega128L-8A ATmega128-16A ATmega128A-A
 $FPLIST
  TQFP*14x14mm*P0.8mm*
 $ENDFPLIST
@@ -3790,14 +3790,14 @@ X PE7 9 -600 -1700 100 R 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATmega64L-8MU
+# ATmega64L-8M
 #
-DEF ATmega64L-8MU U 0 20 Y Y 1 F N
+DEF ATmega64L-8M U 0 20 Y Y 1 F N
 F0 "U" -500 1950 50 H V L BNN
-F1 "ATmega64L-8MU" 100 -1950 50 H V L TNN
+F1 "ATmega64L-8M" 100 -1950 50 H V L TNN
 F2 "Package_DFN_QFN:QFN-64-1EP_9x9mm_P0.5mm_EP5.4x5.4mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATmega64-16MU ATmega64A-MU ATmega128L-8MU ATmega128-16MU ATmega128A-MU
+ALIAS ATmega64-16M ATmega64A-M ATmega128L-8M ATmega128-16M ATmega128A-M
 $FPLIST
  QFN*1EP*9x9mm*P0.5mm*
 $ENDFPLIST
@@ -3871,14 +3871,14 @@ X PE7 9 -600 -1700 100 R 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATmega8515L-8AU
+# ATmega8515L-8A
 #
-DEF ATmega8515L-8AU U 0 20 Y Y 1 F N
+DEF ATmega8515L-8A U 0 20 Y Y 1 F N
 F0 "U" -500 1950 50 H V L BNN
-F1 "ATmega8515L-8AU" 100 -1950 50 H V L TNN
+F1 "ATmega8515L-8A" 100 -1950 50 H V L TNN
 F2 "Package_QFP:TQFP-44_10x10mm_P0.8mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATmega8515-16AU
+ALIAS ATmega8515-16A
 $FPLIST
  TQFP*10x10mm*P0.8mm*
 $ENDFPLIST
@@ -3931,14 +3931,14 @@ X PD3 9 600 -1300 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATmega8515L-8JU
+# ATmega8515L-8J
 #
-DEF ATmega8515L-8JU U 0 20 Y Y 1 F N
+DEF ATmega8515L-8J U 0 20 Y Y 1 F N
 F0 "U" -500 1950 50 H V L BNN
-F1 "ATmega8515L-8JU" 100 -1950 50 H V L TNN
+F1 "ATmega8515L-8J" 100 -1950 50 H V L TNN
 F2 "Package_LCC:PLCC-44" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATmega8515-16JU
+ALIAS ATmega8515-16J
 $FPLIST
  PLCC*
 $ENDFPLIST
@@ -3991,14 +3991,14 @@ X PB7 9 600 100 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATmega8515L-8MU
+# ATmega8515L-8M
 #
-DEF ATmega8515L-8MU U 0 20 Y Y 1 F N
+DEF ATmega8515L-8M U 0 20 Y Y 1 F N
 F0 "U" -500 1950 50 H V L BNN
-F1 "ATmega8515L-8MU" 100 -1950 50 H V L TNN
+F1 "ATmega8515L-8M" 100 -1950 50 H V L TNN
 F2 "Package_DFN_QFN:QFN-44-1EP_7x7mm_P0.5mm_EP5.2x5.2mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATmega8515-16MU
+ALIAS ATmega8515-16M
 $FPLIST
  QFN*1EP*7x7mm*P0.5mm*
 $ENDFPLIST
@@ -4052,14 +4052,14 @@ X PD3 9 600 -1300 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATmega8515L-8PU
+# ATmega8515L-8P
 #
-DEF ATmega8515L-8PU U 0 20 Y Y 1 F N
+DEF ATmega8515L-8P U 0 20 Y Y 1 F N
 F0 "U" -500 1950 50 H V L BNN
-F1 "ATmega8515L-8PU" 100 -1950 50 H V L TNN
+F1 "ATmega8515L-8P" 100 -1950 50 H V L TNN
 F2 "Package_DIP:DIP-40_W15.24mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATmega8515-16PU
+ALIAS ATmega8515-16P
 $FPLIST
  DIP*W15.24mm*
 $ENDFPLIST
@@ -4108,14 +4108,14 @@ X ~RESET 9 -600 1700 100 R 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
-# ATmega8535L-8AU
+# ATmega8535L-8A
 #
-DEF ATmega8535L-8AU U 0 20 Y Y 1 F N
+DEF ATmega8535L-8A U 0 20 Y Y 1 F N
 F0 "U" -500 1950 50 H V L BNN
-F1 "ATmega8535L-8AU" 200 -1950 50 H V L TNN
+F1 "ATmega8535L-8A" 200 -1950 50 H V L TNN
 F2 "Package_QFP:TQFP-44_10x10mm_P0.8mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATmega8535-16AU
+ALIAS ATmega8535-16A
 $FPLIST
  TQFP*10x10mm*P0.8mm*
 $ENDFPLIST
@@ -4168,14 +4168,14 @@ X PD0 9 600 -1000 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATmega8535L-8JU
+# ATmega8535L-8J
 #
-DEF ATmega8535L-8JU U 0 20 Y Y 1 F N
+DEF ATmega8535L-8J U 0 20 Y Y 1 F N
 F0 "U" -500 1950 50 H V L BNN
-F1 "ATmega8535L-8JU" 200 -1950 50 H V L TNN
+F1 "ATmega8535L-8J" 200 -1950 50 H V L TNN
 F2 "Package_LCC:PLCC-44" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATmega8535-16JU
+ALIAS ATmega8535-16J
 $FPLIST
  PLCC*
 $ENDFPLIST
@@ -4228,14 +4228,14 @@ X PB7 9 600 100 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATmega8535L-8MU
+# ATmega8535L-8M
 #
-DEF ATmega8535L-8MU U 0 20 Y Y 1 F N
+DEF ATmega8535L-8M U 0 20 Y Y 1 F N
 F0 "U" -500 1950 50 H V L BNN
-F1 "ATmega8535L-8MU" 200 -1950 50 H V L TNN
+F1 "ATmega8535L-8M" 200 -1950 50 H V L TNN
 F2 "Package_DFN_QFN:QFN-44-1EP_7x7mm_P0.5mm_EP5.2x5.2mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATmega8535-16MU
+ALIAS ATmega8535-16M
 $FPLIST
  QFN*1EP*7x7mm*P0.5mm*
 $ENDFPLIST
@@ -4289,14 +4289,14 @@ X PD0 9 600 -1000 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATmega8535L-8PU
+# ATmega8535L-8P
 #
-DEF ATmega8535L-8PU U 0 20 Y Y 1 F N
+DEF ATmega8535L-8P U 0 20 Y Y 1 F N
 F0 "U" -500 1950 50 H V L BNN
-F1 "ATmega8535L-8PU" 200 -1950 50 H V L TNN
+F1 "ATmega8535L-8P" 200 -1950 50 H V L TNN
 F2 "Package_DIP:DIP-40_W15.24mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATmega8535-16PU
+ALIAS ATmega8535-16P
 $FPLIST
  DIP*W15.24mm*
 $ENDFPLIST
@@ -4345,14 +4345,14 @@ X ~RESET 9 -600 1700 100 R 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
-# ATmega8L-8AU
+# ATmega8L-8A
 #
-DEF ATmega8L-8AU U 0 20 Y Y 1 F N
+DEF ATmega8L-8A U 0 20 Y Y 1 F N
 F0 "U" -500 1350 50 H V L BNN
-F1 "ATmega8L-8AU" 200 -1350 50 H V L TNN
+F1 "ATmega8L-8A" 200 -1350 50 H V L TNN
 F2 "Package_QFP:TQFP-32_7x7mm_P0.8mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATmega8-16AU ATmega8A-AU
+ALIAS ATmega8-16A ATmega8A-A
 $FPLIST
  TQFP*7x7mm*P0.8mm*
 $ENDFPLIST
@@ -4393,14 +4393,14 @@ X PD5 9 600 -800 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATmega8L-8MU
+# ATmega8L-8M
 #
-DEF ATmega8L-8MU U 0 20 Y Y 1 F N
+DEF ATmega8L-8M U 0 20 Y Y 1 F N
 F0 "U" -500 1350 50 H V L BNN
-F1 "ATmega8L-8MU" 200 -1350 50 H V L TNN
+F1 "ATmega8L-8M" 200 -1350 50 H V L TNN
 F2 "Package_DFN_QFN:QFN-32-1EP_5x5mm_P0.5mm_EP3.1x3.1mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATmega8-16MU ATmega8A-MU
+ALIAS ATmega8-16M ATmega8A-M
 $FPLIST
  QFN*1EP*5x5mm*P0.5mm*
 $ENDFPLIST
@@ -4442,14 +4442,14 @@ X PD5 9 600 -800 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATmega8L-8PU
+# ATmega8L-8P
 #
-DEF ATmega8L-8PU U 0 20 Y Y 1 F N
+DEF ATmega8L-8P U 0 20 Y Y 1 F N
 F0 "U" -500 1350 50 H V L BNN
-F1 "ATmega8L-8PU" 200 -1350 50 H V L TNN
+F1 "ATmega8L-8P" 200 -1350 50 H V L TNN
 F2 "Package_DIP:DIP-28_W7.62mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATmega8-16PU ATmega8A-PU
+ALIAS ATmega8-16P ATmega8A-P
 $FPLIST
  DIP*W7.62mm*
 $ENDFPLIST
@@ -4486,14 +4486,14 @@ X PB6/XTAL1 9 -600 900 100 R 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATmega8U2-AU
+# ATmega8U2-A
 #
-DEF ATmega8U2-AU U 0 20 Y Y 1 F N
+DEF ATmega8U2-A U 0 20 Y Y 1 F N
 F0 "U" -600 1350 50 H V L BNN
-F1 "ATmega8U2-AU" 100 -1350 50 H V L TNN
+F1 "ATmega8U2-A" 100 -1350 50 H V L TNN
 F2 "Package_QFP:TQFP-32_7x7mm_P0.8mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATmega16U2-AU ATmega32U2-AU
+ALIAS ATmega16U2-A ATmega32U2-A
 $FPLIST
  TQFP*7x7mm*P0.8mm*
 $ENDFPLIST
@@ -4534,14 +4534,14 @@ X PD3 9 700 -700 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATmega8U2-MU
+# ATmega8U2-M
 #
-DEF ATmega8U2-MU U 0 20 Y Y 1 F N
+DEF ATmega8U2-M U 0 20 Y Y 1 F N
 F0 "U" -600 1350 50 H V L BNN
-F1 "ATmega8U2-MU" 100 -1350 50 H V L TNN
+F1 "ATmega8U2-M" 100 -1350 50 H V L TNN
 F2 "Package_DFN_QFN:QFN-32-1EP_5x5mm_P0.5mm_EP3.1x3.1mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATmega16U2-MU ATmega32U2-MU
+ALIAS ATmega16U2-M ATmega32U2-M
 $FPLIST
  QFN*1EP*5x5mm*P0.5mm*
 $ENDFPLIST
@@ -4583,11 +4583,11 @@ X PD3 9 700 -700 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATxmega128B3-MCU
+# ATxmega128B3-MC
 #
-DEF ATxmega128B3-MCU U 0 20 Y Y 1 F N
+DEF ATxmega128B3-MC U 0 20 Y Y 1 F N
 F0 "U" -650 1900 50 H V L BNN
-F1 "ATxmega128B3-MCU" 200 -1900 50 H V L TNN
+F1 "ATxmega128B3-MC" 200 -1900 50 H V L TNN
 F2 "Package_DFN_QFN:Microchip_DRQFN-64-1EP_7x7mm_P0.65mm_EP4.1x4.1mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -4663,14 +4663,14 @@ X GND EP 0 -2000 150 U 50 50 1 1 P N
 ENDDRAW
 ENDDEF
 #
-# ATxmega16A4U-AU
+# ATxmega16A4U-A
 #
-DEF ATxmega16A4U-AU U 0 20 Y Y 1 F N
+DEF ATxmega16A4U-A U 0 20 Y Y 1 F N
 F0 "U" -600 1350 50 H V L BNN
-F1 "ATxmega16A4U-AU" 100 -1350 50 H V L TNN
+F1 "ATxmega16A4U-A" 100 -1350 50 H V L TNN
 F2 "Package_QFP:TQFP-44_10x10mm_P0.8mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATxmega32A4U-AU ATxmega64A4U-AU ATxmega128A4U-AU
+ALIAS ATxmega32A4U-A ATxmega64A4U-A ATxmega128A4U-A
 $FPLIST
  TQFP*10x10mm*P0.8mm*
 $ENDFPLIST
@@ -4723,14 +4723,14 @@ X VCC 9 0 1400 100 D 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
-# ATxmega16A4U-CU
+# ATxmega16A4U-C
 #
-DEF ATxmega16A4U-CU U 0 20 Y Y 1 F N
+DEF ATxmega16A4U-C U 0 20 Y Y 1 F N
 F0 "U" -600 1350 50 H V L BNN
-F1 "ATxmega16A4U-CU" 100 -1350 50 H V L TNN
+F1 "ATxmega16A4U-C" 100 -1350 50 H V L TNN
 F2 "Package_BGA:VFBGA-49_5.0x5.0mm_Layout7x7_P0.65mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATxmega32A4U-CU ATxmega64A4U-CU ATxmega128A4U-CU
+ALIAS ATxmega32A4U-C ATxmega64A4U-C ATxmega128A4U-C
 $FPLIST
  VFBGA*5.0x5.0mm*Layout7x7*P0.65mm*
 $ENDFPLIST
@@ -4788,14 +4788,14 @@ X PD2 G7 -700 -500 100 R 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATxmega16A4U-MH
+# ATxmega16A4U-M
 #
-DEF ATxmega16A4U-MH U 0 20 Y Y 1 F N
+DEF ATxmega16A4U-M U 0 20 Y Y 1 F N
 F0 "U" -600 1350 50 H V L BNN
-F1 "ATxmega16A4U-MH" 100 -1350 50 H V L TNN
+F1 "ATxmega16A4U-M" 100 -1350 50 H V L TNN
 F2 "Package_DFN_QFN:QFN-44-1EP_7x7mm_P0.5mm_EP5.2x5.2mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATxmega32A4U-MH ATxmega64A4U-MH ATxmega128A4U-MH
+ALIAS ATxmega32A4U-M ATxmega64A4U-M ATxmega128A4U-M
 $FPLIST
  QFN*1EP*7x7mm*P0.5mm*
 $ENDFPLIST
@@ -4849,14 +4849,14 @@ X VCC 9 0 1400 100 D 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
-# ATxmega16C4-AU
+# ATxmega16C4-A
 #
-DEF ATxmega16C4-AU U 0 20 Y Y 1 F N
+DEF ATxmega16C4-A U 0 20 Y Y 1 F N
 F0 "U" -600 1350 50 H V L BNN
-F1 "ATxmega16C4-AU" 100 -1350 50 H V L TNN
+F1 "ATxmega16C4-A" 100 -1350 50 H V L TNN
 F2 "Package_QFP:TQFP-44_10x10mm_P0.8mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATxmega32C4-AU
+ALIAS ATxmega32C4-A
 $FPLIST
  TQFP*10x10mm*P0.8mm*
 $ENDFPLIST
@@ -4909,14 +4909,14 @@ X VCC 9 0 1400 100 D 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
-# ATxmega16C4-CU
+# ATxmega16C4-C
 #
-DEF ATxmega16C4-CU U 0 20 Y Y 1 F N
+DEF ATxmega16C4-C U 0 20 Y Y 1 F N
 F0 "U" -600 1350 50 H V L BNN
-F1 "ATxmega16C4-CU" 100 -1350 50 H V L TNN
+F1 "ATxmega16C4-C" 100 -1350 50 H V L TNN
 F2 "Package_BGA:VFBGA-49_5.0x5.0mm_Layout7x7_P0.65mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATxmega32C4-CU
+ALIAS ATxmega32C4-C
 $FPLIST
  VFBGA*5.0x5.0mm*Layout7x7*P0.65mm*
 $ENDFPLIST
@@ -4974,14 +4974,14 @@ X PD2 G7 -700 -500 100 R 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATxmega16C4-MH
+# ATxmega16C4-M
 #
-DEF ATxmega16C4-MH U 0 20 Y Y 1 F N
+DEF ATxmega16C4-M U 0 20 Y Y 1 F N
 F0 "U" -600 1350 50 H V L BNN
-F1 "ATxmega16C4-MH" 100 -1350 50 H V L TNN
+F1 "ATxmega16C4-M" 100 -1350 50 H V L TNN
 F2 "Package_DFN_QFN:QFN-44-1EP_7x7mm_P0.5mm_EP5.2x5.2mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATxmega32C4-MH
+ALIAS ATxmega32C4-M
 $FPLIST
  QFN*1EP*7x7mm*P0.5mm*
 $ENDFPLIST
@@ -5035,14 +5035,14 @@ X VCC 9 0 1400 100 D 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
-# ATxmega16D4-AU
+# ATxmega16D4-A
 #
-DEF ATxmega16D4-AU U 0 20 Y Y 1 F N
+DEF ATxmega16D4-A U 0 20 Y Y 1 F N
 F0 "U" -600 1350 50 H V L BNN
-F1 "ATxmega16D4-AU" 100 -1350 50 H V L TNN
+F1 "ATxmega16D4-A" 100 -1350 50 H V L TNN
 F2 "Package_QFP:TQFP-44_10x10mm_P0.8mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATxmega32D4-AU ATxmega64D4-AU ATxmega128D4-AU
+ALIAS ATxmega32D4-A ATxmega64D4-A ATxmega128D4-A
 $FPLIST
  TQFP*10x10mm*P0.8mm*
 $ENDFPLIST
@@ -5095,14 +5095,14 @@ X VCC 9 0 1400 100 D 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
-# ATxmega16D4-CU
+# ATxmega16D4-C
 #
-DEF ATxmega16D4-CU U 0 20 Y Y 1 F N
+DEF ATxmega16D4-C U 0 20 Y Y 1 F N
 F0 "U" -600 1350 50 H V L BNN
-F1 "ATxmega16D4-CU" 100 -1350 50 H V L TNN
+F1 "ATxmega16D4-C" 100 -1350 50 H V L TNN
 F2 "Package_BGA:VFBGA-49_5.0x5.0mm_Layout7x7_P0.65mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATxmega32D4-CU ATxmega64D4-CU ATxmega128D4-CU
+ALIAS ATxmega32D4-C ATxmega64D4-C ATxmega128D4-C
 $FPLIST
  VFBGA*5.0x5.0mm*Layout7x7*P0.65mm*
 $ENDFPLIST
@@ -5160,14 +5160,14 @@ X PD2 G7 -700 -500 100 R 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATxmega16D4-MH
+# ATxmega16D4-M
 #
-DEF ATxmega16D4-MH U 0 20 Y Y 1 F N
+DEF ATxmega16D4-M U 0 20 Y Y 1 F N
 F0 "U" -600 1350 50 H V L BNN
-F1 "ATxmega16D4-MH" 100 -1350 50 H V L TNN
+F1 "ATxmega16D4-M" 100 -1350 50 H V L TNN
 F2 "Package_DFN_QFN:QFN-44-1EP_7x7mm_P0.5mm_EP5.2x5.2mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATxmega32D4-MH ATxmega64D4-MH ATxmega128D4-MH
+ALIAS ATxmega32D4-M ATxmega64D4-M ATxmega128D4-M
 $FPLIST
  QFN*1EP*7x7mm*P0.5mm*
 $ENDFPLIST
@@ -5221,11 +5221,11 @@ X VCC 9 0 1400 100 D 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
-# ATxmega256A3B-AU
+# ATxmega256A3B-A
 #
-DEF ATxmega256A3B-AU U 0 20 Y Y 1 F N
+DEF ATxmega256A3B-A U 0 20 Y Y 1 F N
 F0 "U" -600 1950 50 H V L BNN
-F1 "ATxmega256A3B-AU" 100 -1950 50 H V L TNN
+F1 "ATxmega256A3B-A" 100 -1950 50 H V L TNN
 F2 "Package_QFP:TQFP-64_14x14mm_P0.8mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -5300,11 +5300,11 @@ X PB3 9 700 500 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATxmega256A3B-MH
+# ATxmega256A3B-M
 #
-DEF ATxmega256A3B-MH U 0 20 Y Y 1 F N
+DEF ATxmega256A3B-M U 0 20 Y Y 1 F N
 F0 "U" -600 1950 50 H V L BNN
-F1 "ATxmega256A3B-MH" 100 -1950 50 H V L TNN
+F1 "ATxmega256A3B-M" 100 -1950 50 H V L TNN
 F2 "Package_DFN_QFN:QFN-64-1EP_9x9mm_P0.5mm_EP7.65x7.65mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -5380,11 +5380,11 @@ X PB3 9 700 500 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATxmega256A3BU-AU
+# ATxmega256A3BU-A
 #
-DEF ATxmega256A3BU-AU U 0 20 Y Y 1 F N
+DEF ATxmega256A3BU-A U 0 20 Y Y 1 F N
 F0 "U" -600 1950 50 H V L BNN
-F1 "ATxmega256A3BU-AU" 100 -1950 50 H V L TNN
+F1 "ATxmega256A3BU-A" 100 -1950 50 H V L TNN
 F2 "Package_QFP:TQFP-64_14x14mm_P0.8mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -5459,11 +5459,11 @@ X PB3 9 700 500 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATxmega256A3BU-MH
+# ATxmega256A3BU-M
 #
-DEF ATxmega256A3BU-MH U 0 20 Y Y 1 F N
+DEF ATxmega256A3BU-M U 0 20 Y Y 1 F N
 F0 "U" -600 1950 50 H V L BNN
-F1 "ATxmega256A3BU-MH" 100 -1950 50 H V L TNN
+F1 "ATxmega256A3BU-M" 100 -1950 50 H V L TNN
 F2 "Package_DFN_QFN:QFN-64-1EP_9x9mm_P0.5mm_EP7.65x7.65mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -5539,14 +5539,14 @@ X PB3 9 700 500 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATxmega32C3-AU
+# ATxmega32C3-A
 #
-DEF ATxmega32C3-AU U 0 20 Y Y 1 F N
+DEF ATxmega32C3-A U 0 20 Y Y 1 F N
 F0 "U" -600 1750 50 H V L BNN
-F1 "ATxmega32C3-AU" 100 -1750 50 H V L TNN
+F1 "ATxmega32C3-A" 100 -1750 50 H V L TNN
 F2 "Package_QFP:TQFP-64_14x14mm_P0.8mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATxmega64C3-AU ATxmega128C3-AU ATxmega192C3-AU ATxmega256C3-AU ATxmega384C3-AU
+ALIAS ATxmega64C3-A ATxmega128C3-A ATxmega192C3-A ATxmega256C3-A ATxmega384C3-A
 $FPLIST
  TQFP*14x14mm*P0.8mm*
 $ENDFPLIST
@@ -5619,14 +5619,14 @@ X PB3 9 700 300 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATxmega32C3-MH
+# ATxmega32C3-M
 #
-DEF ATxmega32C3-MH U 0 20 Y Y 1 F N
+DEF ATxmega32C3-M U 0 20 Y Y 1 F N
 F0 "U" -600 1750 50 H V L BNN
-F1 "ATxmega32C3-MH" 100 -1750 50 H V L TNN
+F1 "ATxmega32C3-M" 100 -1750 50 H V L TNN
 F2 "Package_DFN_QFN:QFN-64-1EP_9x9mm_P0.5mm_EP7.65x7.65mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATxmega64C3-MH ATxmega128C3-MH ATxmega192C3-MH ATxmega256C3-MH ATxmega384C3-MH
+ALIAS ATxmega64C3-M ATxmega128C3-M ATxmega192C3-M ATxmega256C3-M ATxmega384C3-M
 $FPLIST
  QFN*1EP*9x9mm*P0.5mm*
 $ENDFPLIST
@@ -5700,14 +5700,14 @@ X PB3 9 700 300 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATxmega32D3-AU
+# ATxmega32D3-A
 #
-DEF ATxmega32D3-AU U 0 20 Y Y 1 F N
+DEF ATxmega32D3-A U 0 20 Y Y 1 F N
 F0 "U" -600 1750 50 H V L BNN
-F1 "ATxmega32D3-AU" 100 -1750 50 H V L TNN
+F1 "ATxmega32D3-A" 100 -1750 50 H V L TNN
 F2 "Package_QFP:TQFP-64_14x14mm_P0.8mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATxmega64D3-AU ATxmega128D3-AU ATxmega192D3-AU ATxmega256D3-AU ATxmega384D3-AU
+ALIAS ATxmega64D3-A ATxmega128D3-A ATxmega192D3-A ATxmega256D3-A ATxmega384D3-A
 $FPLIST
  TQFP*14x14mm*P0.8mm*
 $ENDFPLIST
@@ -5780,14 +5780,14 @@ X PB3 9 700 300 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATxmega32D3-MH
+# ATxmega32D3-M
 #
-DEF ATxmega32D3-MH U 0 20 Y Y 1 F N
+DEF ATxmega32D3-M U 0 20 Y Y 1 F N
 F0 "U" -600 1750 50 H V L BNN
-F1 "ATxmega32D3-MH" 100 -1750 50 H V L TNN
+F1 "ATxmega32D3-M" 100 -1750 50 H V L TNN
 F2 "Package_DFN_QFN:QFN-64-1EP_9x9mm_P0.5mm_EP7.65x7.65mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATxmega64D3-MH ATxmega128D3-MH ATxmega192D3-MH ATxmega256D3-MH ATxmega384D3-MH
+ALIAS ATxmega64D3-M ATxmega128D3-M ATxmega192D3-M ATxmega256D3-M ATxmega384D3-M
 $FPLIST
  QFN*1EP*9x9mm*P0.5mm*
 $ENDFPLIST
@@ -5861,14 +5861,14 @@ X PB3 9 700 300 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATxmega64A1-AU
+# ATxmega64A1-A
 #
-DEF ATxmega64A1-AU U 0 20 Y Y 1 F N
+DEF ATxmega64A1-A U 0 20 Y Y 1 F N
 F0 "U" 0 50 50 H V C BNN
-F1 "ATxmega64A1-AU" 0 -50 50 H V C TNN
+F1 "ATxmega64A1-A" 0 -50 50 H V C TNN
 F2 "Package_QFP:TQFP-100_14x14mm_P0.5mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATxmega128A1-AU
+ALIAS ATxmega128A1-A
 $FPLIST
  TQFP*14x14mm*P0.5mm*
 $ENDFPLIST
@@ -5977,16 +5977,16 @@ X PA4 99 800 1900 150 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATxmega64A1-C7U
+# ATxmega64A1-C
 #
-DEF ATxmega64A1-C7U U 0 20 Y Y 1 F N
+DEF ATxmega64A1-C U 0 20 Y Y 1 F N
 F0 "U" 0 50 50 H V C BNN
-F1 "ATxmega64A1-C7U" 0 -50 50 H V C TNN
-F2 "Package_BGA:VFBGA-100_7.0x7.0mm_Layout10x10_P0.65mm" 0 0 50 H I C CIN
+F1 "ATxmega64A1-C" 0 -50 50 H V C TNN
+F2 "Package_BGA:TFBGA-100_9.0x9.0mm_Layout10x10_P0.8mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATxmega128A1-C7U
+ALIAS ATxmega128A1-C
 $FPLIST
- VFBGA*7.0x7.0mm*Layout10x10*P0.65mm*
+ TFBGA*9.0x9.0mm*Layout10x10*P0.8mm*
 $ENDFPLIST
 DRAW
 S -650 -2450 650 2450 0 1 10 f
@@ -6093,16 +6093,16 @@ X GND K9 0 -2600 150 U 50 50 1 1 P N
 ENDDRAW
 ENDDEF
 #
-# ATxmega64A1-CU
+# ATxmega64A1-C7
 #
-DEF ATxmega64A1-CU U 0 20 Y Y 1 F N
+DEF ATxmega64A1-C7 U 0 20 Y Y 1 F N
 F0 "U" 0 50 50 H V C BNN
-F1 "ATxmega64A1-CU" 0 -50 50 H V C TNN
-F2 "Package_BGA:TFBGA-100_9.0x9.0mm_Layout10x10_P0.8mm" 0 0 50 H I C CIN
+F1 "ATxmega64A1-C7" 0 -50 50 H V C TNN
+F2 "Package_BGA:VFBGA-100_7.0x7.0mm_Layout10x10_P0.65mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATxmega128A1-CU
+ALIAS ATxmega128A1-C7
 $FPLIST
- TFBGA*9.0x9.0mm*Layout10x10*P0.8mm*
+ VFBGA*7.0x7.0mm*Layout10x10*P0.65mm*
 $ENDFPLIST
 DRAW
 S -650 -2450 650 2450 0 1 10 f
@@ -6209,14 +6209,14 @@ X GND K9 0 -2600 150 U 50 50 1 1 P N
 ENDDRAW
 ENDDEF
 #
-# ATxmega64A1U-AU
+# ATxmega64A1U-A
 #
-DEF ATxmega64A1U-AU U 0 20 Y Y 1 F N
+DEF ATxmega64A1U-A U 0 20 Y Y 1 F N
 F0 "U" 0 50 50 H V C BNN
-F1 "ATxmega64A1U-AU" 0 -50 50 H V C TNN
+F1 "ATxmega64A1U-A" 0 -50 50 H V C TNN
 F2 "Package_QFP:TQFP-100_14x14mm_P0.5mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATxmega128A1U-AU
+ALIAS ATxmega128A1U-A
 $FPLIST
  TQFP*14x14mm*P0.5mm*
 $ENDFPLIST
@@ -6325,16 +6325,16 @@ X PA4 99 800 1900 150 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATxmega64A1U-C7U
+# ATxmega64A1U-C
 #
-DEF ATxmega64A1U-C7U U 0 20 Y Y 1 F N
+DEF ATxmega64A1U-C U 0 20 Y Y 1 F N
 F0 "U" 0 50 50 H V C BNN
-F1 "ATxmega64A1U-C7U" 0 -50 50 H V C TNN
-F2 "Package_BGA:VFBGA-100_7.0x7.0mm_Layout10x10_P0.65mm" 0 0 50 H I C CIN
+F1 "ATxmega64A1U-C" 0 -50 50 H V C TNN
+F2 "Package_BGA:TFBGA-100_9.0x9.0mm_Layout10x10_P0.8mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATxmega128A1U-C7U
+ALIAS ATxmega128A1U-C
 $FPLIST
- VFBGA*7.0x7.0mm*Layout10x10*P0.65mm*
+ TFBGA*9.0x9.0mm*Layout10x10*P0.8mm*
 $ENDFPLIST
 DRAW
 S -650 -2450 650 2450 0 1 10 f
@@ -6441,16 +6441,16 @@ X GND K9 0 -2600 150 U 50 50 1 1 P N
 ENDDRAW
 ENDDEF
 #
-# ATxmega64A1U-CU
+# ATxmega64A1U-C7
 #
-DEF ATxmega64A1U-CU U 0 20 Y Y 1 F N
+DEF ATxmega64A1U-C7 U 0 20 Y Y 1 F N
 F0 "U" 0 50 50 H V C BNN
-F1 "ATxmega64A1U-CU" 0 -50 50 H V C TNN
-F2 "Package_BGA:TFBGA-100_9.0x9.0mm_Layout10x10_P0.8mm" 0 0 50 H I C CIN
+F1 "ATxmega64A1U-C7" 0 -50 50 H V C TNN
+F2 "Package_BGA:VFBGA-100_7.0x7.0mm_Layout10x10_P0.65mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATxmega128A1U-CU
+ALIAS ATxmega128A1U-C7
 $FPLIST
- TFBGA*9.0x9.0mm*Layout10x10*P0.8mm*
+ VFBGA*7.0x7.0mm*Layout10x10*P0.65mm*
 $ENDFPLIST
 DRAW
 S -650 -2450 650 2450 0 1 10 f
@@ -6557,14 +6557,14 @@ X GND K9 0 -2600 150 U 50 50 1 1 P N
 ENDDRAW
 ENDDEF
 #
-# ATxmega64A3-AU
+# ATxmega64A3-A
 #
-DEF ATxmega64A3-AU U 0 20 Y Y 1 F N
+DEF ATxmega64A3-A U 0 20 Y Y 1 F N
 F0 "U" -600 1750 50 H V L BNN
-F1 "ATxmega64A3-AU" 100 -1750 50 H V L TNN
+F1 "ATxmega64A3-A" 100 -1750 50 H V L TNN
 F2 "Package_QFP:TQFP-64_14x14mm_P0.8mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATxmega128A3-AU ATxmega192A3-AU ATxmega256A3-AU
+ALIAS ATxmega128A3-A ATxmega192A3-A ATxmega256A3-A
 $FPLIST
  TQFP*14x14mm*P0.8mm*
 $ENDFPLIST
@@ -6637,14 +6637,14 @@ X PB3 9 700 300 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATxmega64A3-MH
+# ATxmega64A3-M
 #
-DEF ATxmega64A3-MH U 0 20 Y Y 1 F N
+DEF ATxmega64A3-M U 0 20 Y Y 1 F N
 F0 "U" -600 1750 50 H V L BNN
-F1 "ATxmega64A3-MH" 100 -1750 50 H V L TNN
+F1 "ATxmega64A3-M" 100 -1750 50 H V L TNN
 F2 "Package_DFN_QFN:QFN-64-1EP_9x9mm_P0.5mm_EP7.65x7.65mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATxmega128A3-MH ATxmega192A3-MH ATxmega256A3-MH
+ALIAS ATxmega128A3-M ATxmega192A3-M ATxmega256A3-M
 $FPLIST
  QFN*1EP*9x9mm*P0.5mm*
 $ENDFPLIST
@@ -6718,14 +6718,14 @@ X PB3 9 700 300 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATxmega64A3U-AU
+# ATxmega64A3U-A
 #
-DEF ATxmega64A3U-AU U 0 20 Y Y 1 F N
+DEF ATxmega64A3U-A U 0 20 Y Y 1 F N
 F0 "U" -600 1750 50 H V L BNN
-F1 "ATxmega64A3U-AU" 100 -1750 50 H V L TNN
+F1 "ATxmega64A3U-A" 100 -1750 50 H V L TNN
 F2 "Package_QFP:TQFP-64_14x14mm_P0.8mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATxmega128A3U-AU ATxmega192A3U-AU ATxmega256A3U-AU
+ALIAS ATxmega128A3U-A ATxmega192A3U-A ATxmega256A3U-A
 $FPLIST
  TQFP*14x14mm*P0.8mm*
 $ENDFPLIST
@@ -6798,14 +6798,14 @@ X PB3 9 700 300 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATxmega64A3U-MH
+# ATxmega64A3U-M
 #
-DEF ATxmega64A3U-MH U 0 20 Y Y 1 F N
+DEF ATxmega64A3U-M U 0 20 Y Y 1 F N
 F0 "U" -600 1750 50 H V L BNN
-F1 "ATxmega64A3U-MH" 100 -1750 50 H V L TNN
+F1 "ATxmega64A3U-M" 100 -1750 50 H V L TNN
 F2 "Package_DFN_QFN:QFN-64-1EP_9x9mm_P0.5mm_EP7.65x7.65mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATxmega128A3U-MH ATxmega192A3U-MH ATxmega256A3U-MH
+ALIAS ATxmega128A3U-M ATxmega192A3U-M ATxmega256A3U-M
 $FPLIST
  QFN*1EP*9x9mm*P0.5mm*
 $ENDFPLIST
@@ -6879,14 +6879,14 @@ X PB3 9 700 300 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATxmega64B1-AU
+# ATxmega64B1-A
 #
-DEF ATxmega64B1-AU U 0 20 Y Y 1 F N
+DEF ATxmega64B1-A U 0 20 Y Y 1 F N
 F0 "U" 0 50 50 H V C BNN
-F1 "ATxmega64B1-AU" 0 -50 50 H V C TNN
+F1 "ATxmega64B1-A" 0 -50 50 H V C TNN
 F2 "Package_QFP:TQFP-100_14x14mm_P0.5mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATxmega128B1-AU
+ALIAS ATxmega128B1-A
 $FPLIST
  TQFP*14x14mm*P0.5mm*
 $ENDFPLIST
@@ -6995,14 +6995,14 @@ X PB7 99 -800 -300 150 R 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATxmega64B1-CU
+# ATxmega64B1-C
 #
-DEF ATxmega64B1-CU U 0 20 Y Y 1 F N
+DEF ATxmega64B1-C U 0 20 Y Y 1 F N
 F0 "U" 0 50 50 H V C BNN
-F1 "ATxmega64B1-CU" 0 -50 50 H V C TNN
+F1 "ATxmega64B1-C" 0 -50 50 H V C TNN
 F2 "Package_BGA:VFBGA-100_7.0x7.0mm_Layout10x10_P0.65mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATxmega128B1-CU
+ALIAS ATxmega128B1-C
 $FPLIST
  VFBGA*7.0x7.0mm*Layout10x10*P0.65mm*
 $ENDFPLIST
@@ -7111,14 +7111,14 @@ X SEG19 K9 800 200 150 L 50 50 1 1 O
 ENDDRAW
 ENDDEF
 #
-# ATxmega64B3-AU
+# ATxmega64B3-A
 #
-DEF ATxmega64B3-AU U 0 20 Y Y 1 F N
+DEF ATxmega64B3-A U 0 20 Y Y 1 F N
 F0 "U" -600 1850 50 H V L BNN
-F1 "ATxmega64B3-AU" 200 -1850 50 H V L TNN
+F1 "ATxmega64B3-A" 200 -1850 50 H V L TNN
 F2 "Package_QFP:TQFP-64_14x14mm_P0.8mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATxmega128B3-AU
+ALIAS ATxmega128B3-A
 $FPLIST
  TQFP*14x14mm*P0.8mm*
 $ENDFPLIST
@@ -7191,14 +7191,14 @@ X GND 9 0 -1900 100 U 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
-# ATxmega64B3-MH
+# ATxmega64B3-M
 #
-DEF ATxmega64B3-MH U 0 20 Y Y 1 F N
+DEF ATxmega64B3-M U 0 20 Y Y 1 F N
 F0 "U" -600 1850 50 H V L BNN
-F1 "ATxmega64B3-MH" 200 -1850 50 H V L TNN
+F1 "ATxmega64B3-M" 200 -1850 50 H V L TNN
 F2 "Package_DFN_QFN:QFN-64-1EP_9x9mm_P0.5mm_EP7.65x7.65mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATxmega128B3-MH
+ALIAS ATxmega128B3-M
 $FPLIST
  QFN*1EP*9x9mm*P0.5mm*
 $ENDFPLIST
@@ -7272,14 +7272,14 @@ X GND 9 0 -1900 100 U 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
-# ATxmega8E5-AU
+# ATxmega8E5-A
 #
-DEF ATxmega8E5-AU U 0 20 Y Y 1 F N
+DEF ATxmega8E5-A U 0 20 Y Y 1 F N
 F0 "U" -600 1050 50 H V L BNN
-F1 "ATxmega8E5-AU" 100 -1050 50 H V L TNN
+F1 "ATxmega8E5-A" 100 -1050 50 H V L TNN
 F2 "Package_QFP:TQFP-32_7x7mm_P0.8mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATxmega16E5-AU ATxmega32E5-AU
+ALIAS ATxmega16E5-A ATxmega32E5-A
 $FPLIST
  TQFP*7x7mm*P0.8mm*
 $ENDFPLIST
@@ -7320,16 +7320,16 @@ X PC7 9 700 -800 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATxmega8E5-M4U
+# ATxmega8E5-M
 #
-DEF ATxmega8E5-M4U U 0 20 Y Y 1 F N
+DEF ATxmega8E5-M U 0 20 Y Y 1 F N
 F0 "U" -600 1050 50 H V L BNN
-F1 "ATxmega8E5-M4U" 100 -1050 50 H V L TNN
-F2 "Package_DFN_QFN:QFN-32-1EP_4x4mm_P0.4mm_EP2.9x2.9mm" 0 0 50 H I C CIN
+F1 "ATxmega8E5-M" 100 -1050 50 H V L TNN
+F2 "Package_DFN_QFN:QFN-32-1EP_5x5mm_P0.5mm_EP3.1x3.1mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATxmega16E5-M4U ATxmega32E5-M4U
+ALIAS ATxmega16E5-M ATxmega32E5-M
 $FPLIST
- QFN*1EP*4x4mm*P0.4mm*
+ QFN*1EP*5x5mm*P0.5mm*
 $ENDFPLIST
 DRAW
 S -600 -1000 600 1000 0 1 10 f
@@ -7369,16 +7369,16 @@ X PC7 9 700 -800 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATxmega8E5-MU
+# ATxmega8E5-M4
 #
-DEF ATxmega8E5-MU U 0 20 Y Y 1 F N
+DEF ATxmega8E5-M4 U 0 20 Y Y 1 F N
 F0 "U" -600 1050 50 H V L BNN
-F1 "ATxmega8E5-MU" 100 -1050 50 H V L TNN
-F2 "Package_DFN_QFN:QFN-32-1EP_5x5mm_P0.5mm_EP3.1x3.1mm" 0 0 50 H I C CIN
+F1 "ATxmega8E5-M4" 100 -1050 50 H V L TNN
+F2 "Package_DFN_QFN:QFN-32-1EP_4x4mm_P0.4mm_EP2.9x2.9mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATxmega16E5-MU ATxmega32E5-MU
+ALIAS ATxmega16E5-M4 ATxmega32E5-M4
 $FPLIST
- QFN*1EP*5x5mm*P0.5mm*
+ QFN*1EP*4x4mm*P0.4mm*
 $ENDFPLIST
 DRAW
 S -600 -1000 600 1000 0 1 10 f
diff --git a/MCU_Microchip_ATtiny.dcm b/MCU_Microchip_ATtiny.dcm
index c5a24f0bf2..b419b4ce7c 100644
--- a/MCU_Microchip_ATtiny.dcm
+++ b/MCU_Microchip_ATtiny.dcm
@@ -30,92 +30,92 @@ K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-42505-8-bit-AVR-Microcontrollers-ATtiny102-ATtiny104_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATtiny13-20MMU
-D 20MHz, 1kB Flash, 64B SRAM, 64B EEPROM, debugWIRE, DFN-10
+$CMP ATtiny13-20M
+D 20MHz, 1kB Flash, 64B SRAM, 64B EEPROM, debugWIRE, QFN-20
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc2535.pdf
 $ENDCMP
 #
-$CMP ATtiny13-20MU
-D 20MHz, 1kB Flash, 64B SRAM, 64B EEPROM, debugWIRE, QFN-20
+$CMP ATtiny13-20MM
+D 20MHz, 1kB Flash, 64B SRAM, 64B EEPROM, debugWIRE, DFN-10
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc2535.pdf
 $ENDCMP
 #
-$CMP ATtiny13-20PU
+$CMP ATtiny13-20P
 D 20MHz, 1kB Flash, 64B SRAM, 64B EEPROM, debugWIRE, DIP-8
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc2535.pdf
 $ENDCMP
 #
-$CMP ATtiny13-20SSU
-D 20MHz, 1kB Flash, 64B SRAM, 64B EEPROM, debugWIRE, SOIC-8
+$CMP ATtiny13-20S
+D 20MHz, 1kB Flash, 64B SRAM, 64B EEPROM, debugWIRE, SOIJ-8
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc2535.pdf
 $ENDCMP
 #
-$CMP ATtiny13-20SU
-D 20MHz, 1kB Flash, 64B SRAM, 64B EEPROM, debugWIRE, SOIJ-8
+$CMP ATtiny13-20SS
+D 20MHz, 1kB Flash, 64B SRAM, 64B EEPROM, debugWIRE, SOIC-8
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc2535.pdf
 $ENDCMP
 #
-$CMP ATtiny13A-MMF
-D 20MHz, 1kB Flash, 64B SRAM, 64B EEPROM, debugWIRE, DFN-10
+$CMP ATtiny13A-M
+D 20MHz, 1kB Flash, 64B SRAM, 64B EEPROM, debugWIRE, QFN-20
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8126.pdf
 $ENDCMP
 #
-$CMP ATtiny13A-MU
-D 20MHz, 1kB Flash, 64B SRAM, 64B EEPROM, debugWIRE, QFN-20
+$CMP ATtiny13A-MM
+D 20MHz, 1kB Flash, 64B SRAM, 64B EEPROM, debugWIRE, DFN-10
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8126.pdf
 $ENDCMP
 #
-$CMP ATtiny13A-PU
+$CMP ATtiny13A-P
 D 20MHz, 1kB Flash, 64B SRAM, 64B EEPROM, debugWIRE, DIP-8
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8126.pdf
 $ENDCMP
 #
-$CMP ATtiny13A-SSU
-D 20MHz, 1kB Flash, 64B SRAM, 64B EEPROM, debugWIRE, SOIC-8
+$CMP ATtiny13A-S
+D 20MHz, 1kB Flash, 64B SRAM, 64B EEPROM, debugWIRE, SOIJ-8
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8126.pdf
 $ENDCMP
 #
-$CMP ATtiny13A-SU
-D 20MHz, 1kB Flash, 64B SRAM, 64B EEPROM, debugWIRE, SOIJ-8
+$CMP ATtiny13A-SS
+D 20MHz, 1kB Flash, 64B SRAM, 64B EEPROM, debugWIRE, SOIC-8
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8126.pdf
 $ENDCMP
 #
-$CMP ATtiny13V-10MMU
-D 10MHz, 1kB Flash, 64B SRAM, 64B EEPROM, debugWIRE, DFN-10
+$CMP ATtiny13V-10M
+D 10MHz, 1kB Flash, 64B SRAM, 64B EEPROM, debugWIRE, QFN-20
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc2535.pdf
 $ENDCMP
 #
-$CMP ATtiny13V-10MU
-D 10MHz, 1kB Flash, 64B SRAM, 64B EEPROM, debugWIRE, QFN-20
+$CMP ATtiny13V-10MM
+D 10MHz, 1kB Flash, 64B SRAM, 64B EEPROM, debugWIRE, DFN-10
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc2535.pdf
 $ENDCMP
 #
-$CMP ATtiny13V-10PU
+$CMP ATtiny13V-10P
 D 10MHz, 1kB Flash, 64B SRAM, 64B EEPROM, debugWIRE, DIP-8
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc2535.pdf
 $ENDCMP
 #
-$CMP ATtiny13V-10SSU
-D 10MHz, 1kB Flash, 64B SRAM, 64B EEPROM, debugWIRE, SOIC-8
+$CMP ATtiny13V-10S
+D 10MHz, 1kB Flash, 64B SRAM, 64B EEPROM, debugWIRE, SOIJ-8
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc2535.pdf
 $ENDCMP
 #
-$CMP ATtiny13V-10SU
-D 10MHz, 1kB Flash, 64B SRAM, 64B EEPROM, debugWIRE, SOIJ-8
+$CMP ATtiny13V-10SS
+D 10MHz, 1kB Flash, 64B SRAM, 64B EEPROM, debugWIRE, SOIC-8
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc2535.pdf
 $ENDCMP
@@ -168,61 +168,61 @@ K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/ATtiny3217_1617-Data-Sheet-40001999B.pdf
 $ENDCMP
 #
-$CMP ATtiny1634-MU
+$CMP ATtiny1634-M
 D 12MHz, 16kB Flash, 1kB SRAM, 256B EEPROM, ADC, ACI, debugWIRE, QFN-20
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8303-8-bit-AVR-Microcontroller-tinyAVR-ATtiny1634_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATtiny1634-SU
+$CMP ATtiny1634-S
 D 12MHz, 16kB Flash, 1kB SRAM, 256B EEPROM, ADC, ACI, debugWIRE, SOIC-20
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8303-8-bit-AVR-Microcontroller-tinyAVR-ATtiny1634_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATtiny167-MU
+$CMP ATtiny167-M
 D 16MHz, 16kB Flash, 512B SRAM, 512B EEPROM, debugWIRE, QFN-32
 K AVR 8bit Microcontroller tinyAVR Automotive
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8265-8-bit-AVR-Microcontroller-tinyAVR-ATtiny87-ATtiny167_datasheet.pdf
 $ENDCMP
 #
-$CMP ATtiny167-SU
+$CMP ATtiny167-S
 D 16MHz, 16kB Flash, 512B SRAM, 512B EEPROM, debugWIRE, SOIC-20
 K AVR 8bit Microcontroller tinyAVR Automotive
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8265-8-bit-AVR-Microcontroller-tinyAVR-ATtiny87-ATtiny167_datasheet.pdf
 $ENDCMP
 #
-$CMP ATtiny167-XU
+$CMP ATtiny167-X
 D 16MHz, 16kB Flash, 512B SRAM, 512B EEPROM, debugWIRE, TSSOP-20
 K AVR 8bit Microcontroller tinyAVR Automotive
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8265-8-bit-AVR-Microcontroller-tinyAVR-ATtiny87-ATtiny167_datasheet.pdf
 $ENDCMP
 #
-$CMP ATtiny20-CCU
+$CMP ATtiny20-CC
 D 12MHz, 2kB Flash, 128B SRAM, No EEPROM, UFBGA-15
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-8235-8-bit-avr-microcontroller-attiny20_datasheet.pdf
 $ENDCMP
 #
-$CMP ATtiny20-MMH
+$CMP ATtiny20-MM
 D 12MHz, 2kB Flash, 128B SRAM, No EEPROM, QFN-20
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-8235-8-bit-avr-microcontroller-attiny20_datasheet.pdf
 $ENDCMP
 #
-$CMP ATtiny20-SSU
+$CMP ATtiny20-SS
 D 12MHz, 2kB Flash, 128B SRAM, No EEPROM, SOIC-14
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-8235-8-bit-avr-microcontroller-attiny20_datasheet.pdf
 $ENDCMP
 #
-$CMP ATtiny20-UU
+$CMP ATtiny20-U
 D 12MHz, 2kB Flash, 128B SRAM, No EEPROM, WLCSP-12
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-8235-8-bit-avr-microcontroller-attiny20_datasheet.pdf
 $ENDCMP
 #
-$CMP ATtiny20-XU
+$CMP ATtiny20-X
 D 12MHz, 2kB Flash, 128B SRAM, No EEPROM, TSSOP-14
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-8235-8-bit-avr-microcontroller-attiny20_datasheet.pdf
@@ -252,271 +252,271 @@ K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/40001912A.pdf
 $ENDCMP
 #
-$CMP ATtiny2313-20MU
+$CMP ATtiny2313-20M
 D 20MHz, 2kB Flash, 128B SRAM, 128B EEPROM, debugWIRE, QFN-20
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-2543-AVR-ATtiny2313_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATtiny2313-20PU
+$CMP ATtiny2313-20P
 D 20MHz, 2kB Flash, 128B SRAM, 128B EEPROM, debugWIRE, DIP-20
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-2543-AVR-ATtiny2313_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATtiny2313-20SU
+$CMP ATtiny2313-20S
 D 20MHz, 2kB Flash, 128B SRAM, 128B EEPROM, debugWIRE, SOIC-20
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-2543-AVR-ATtiny2313_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATtiny2313A-MMH
+$CMP ATtiny2313A-M
 D 20MHz, 2kB Flash, 128B SRAM, 128B EEPROM, QFN-20
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8246.pdf
 $ENDCMP
 #
-$CMP ATtiny2313A-MU
+$CMP ATtiny2313A-MM
 D 20MHz, 2kB Flash, 128B SRAM, 128B EEPROM, QFN-20
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8246.pdf
 $ENDCMP
 #
-$CMP ATtiny2313A-PU
+$CMP ATtiny2313A-P
 D 20MHz, 2kB Flash, 128B SRAM, 128B EEPROM, DIP-20
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8246.pdf
 $ENDCMP
 #
-$CMP ATtiny2313A-SU
+$CMP ATtiny2313A-S
 D 20MHz, 2kB Flash, 128B SRAM, 128B EEPROM, SOIC-20
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8246.pdf
 $ENDCMP
 #
-$CMP ATtiny2313V-10MU
+$CMP ATtiny2313V-10M
 D 10MHz, 2kB Flash, 128B SRAM, 128B EEPROM, debugWIRE, QFN-20
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-2543-AVR-ATtiny2313_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATtiny2313V-10PU
+$CMP ATtiny2313V-10P
 D 10MHz, 2kB Flash, 128B SRAM, 128B EEPROM, debugWIRE, DIP-20
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-2543-AVR-ATtiny2313_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATtiny2313V-10SU
+$CMP ATtiny2313V-10S
 D 10MHz, 2kB Flash, 128B SRAM, 128B EEPROM, debugWIRE, SOIC-20
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-2543-AVR-ATtiny2313_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATtiny24-20MU
+$CMP ATtiny24-20M
 D 20MHz, 2kB Flash, 128B SRAM, 128B EEPROM, debugWIRE, QFN-20
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8006.pdf
 $ENDCMP
 #
-$CMP ATtiny24-20PU
+$CMP ATtiny24-20P
 D 20MHz, 2kB Flash, 128B SRAM, 128B EEPROM, debugWIRE, DIP-14
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8006.pdf
 $ENDCMP
 #
-$CMP ATtiny24-20SSU
+$CMP ATtiny24-20SS
 D 20MHz, 2kB Flash, 128B SRAM, 128B EEPROM, debugWIRE, SOIC-14
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8006.pdf
 $ENDCMP
 #
-$CMP ATtiny24A-CCU
+$CMP ATtiny24A-CC
 D 20MHz, 2kB Flash, 128B SRAM, 128B EEPROM, debugWIRE, UFBGA-15
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8183.pdf
 $ENDCMP
 #
-$CMP ATtiny24A-MMH
+$CMP ATtiny24A-M
 D 20MHz, 2kB Flash, 128B SRAM, 128B EEPROM, debugWIRE, QFN-20
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8183.pdf
 $ENDCMP
 #
-$CMP ATtiny24A-MU
+$CMP ATtiny24A-MM
 D 20MHz, 2kB Flash, 128B SRAM, 128B EEPROM, debugWIRE, QFN-20
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8183.pdf
 $ENDCMP
 #
-$CMP ATtiny24A-PU
+$CMP ATtiny24A-P
 D 20MHz, 2kB Flash, 128B SRAM, 128B EEPROM, debugWIRE, DIP-14
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8183.pdf
 $ENDCMP
 #
-$CMP ATtiny24A-SSU
+$CMP ATtiny24A-SS
 D 20MHz, 2kB Flash, 128B SRAM, 128B EEPROM, debugWIRE, SOIC-14
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8183.pdf
 $ENDCMP
 #
-$CMP ATtiny24V-10MU
+$CMP ATtiny24V-10M
 D 10MHz, 2kB Flash, 128B SRAM, 128B EEPROM, debugWIRE, QFN-20
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8006.pdf
 $ENDCMP
 #
-$CMP ATtiny24V-10PU
+$CMP ATtiny24V-10P
 D 10MHz, 2kB Flash, 128B SRAM, 128B EEPROM, debugWIRE, DIP-14
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8006.pdf
 $ENDCMP
 #
-$CMP ATtiny24V-10SSU
+$CMP ATtiny24V-10SS
 D 10MHz, 2kB Flash, 128B SRAM, 128B EEPROM, debugWIRE, SOIC-14
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8006.pdf
 $ENDCMP
 #
-$CMP ATtiny25-20MU
+$CMP ATtiny25-20M
 D 20MHz, 2kB Flash, 128B SRAM, 128B EEPROM, debugWIRE, QFN-20
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-2586-avr-8-bit-microcontroller-attiny25-attiny45-attiny85_datasheet.pdf
 $ENDCMP
 #
-$CMP ATtiny25-20PU
+$CMP ATtiny25-20P
 D 20MHz, 2kB Flash, 128B SRAM, 128B EEPROM, debugWIRE, DIP-8
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-2586-avr-8-bit-microcontroller-attiny25-attiny45-attiny85_datasheet.pdf
 $ENDCMP
 #
-$CMP ATtiny25-20SSU
-D 20MHz, 2kB Flash, 128B SRAM, 128B EEPROM, debugWIRE, SOIC-8
+$CMP ATtiny25-20S
+D 20MHz, 2kB Flash, 128B SRAM, 128B EEPROM, debugWIRE, SOIJ-8
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-2586-avr-8-bit-microcontroller-attiny25-attiny45-attiny85_datasheet.pdf
 $ENDCMP
 #
-$CMP ATtiny25-20SU
-D 20MHz, 2kB Flash, 128B SRAM, 128B EEPROM, debugWIRE, SOIJ-8
+$CMP ATtiny25-20SS
+D 20MHz, 2kB Flash, 128B SRAM, 128B EEPROM, debugWIRE, SOIC-8
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-2586-avr-8-bit-microcontroller-attiny25-attiny45-attiny85_datasheet.pdf
 $ENDCMP
 #
-$CMP ATtiny25V-10MU
+$CMP ATtiny25V-10M
 D 10MHz, 2kB Flash, 128B SRAM, 128B EEPROM, debugWIRE, QFN-20
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-2586-avr-8-bit-microcontroller-attiny25-attiny45-attiny85_datasheet.pdf
 $ENDCMP
 #
-$CMP ATtiny25V-10PU
+$CMP ATtiny25V-10P
 D 10MHz, 2kB Flash, 128B SRAM, 128B EEPROM, debugWIRE, DIP-8
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-2586-avr-8-bit-microcontroller-attiny25-attiny45-attiny85_datasheet.pdf
 $ENDCMP
 #
-$CMP ATtiny25V-10SSU
-D 10MHz, 2kB Flash, 128B SRAM, 128B EEPROM, debugWIRE, SOIC-8
+$CMP ATtiny25V-10S
+D 10MHz, 2kB Flash, 128B SRAM, 128B EEPROM, debugWIRE, SOIJ-8
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-2586-avr-8-bit-microcontroller-attiny25-attiny45-attiny85_datasheet.pdf
 $ENDCMP
 #
-$CMP ATtiny25V-10SU
-D 10MHz, 2kB Flash, 128B SRAM, 128B EEPROM, debugWIRE, SOIJ-8
+$CMP ATtiny25V-10SS
+D 10MHz, 2kB Flash, 128B SRAM, 128B EEPROM, debugWIRE, SOIC-8
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-2586-avr-8-bit-microcontroller-attiny25-attiny45-attiny85_datasheet.pdf
 $ENDCMP
 #
-$CMP ATtiny26-16MU
+$CMP ATtiny26-16M
 D 16MHz, 2kB Flash, 128B SRAM, 128B EEPROM, QFN-32
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc1477.pdf
 $ENDCMP
 #
-$CMP ATtiny26-16PU
+$CMP ATtiny26-16P
 D 16MHz, 2kB Flash, 128B SRAM, 128B EEPROM, DIP-20
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc1477.pdf
 $ENDCMP
 #
-$CMP ATtiny26-16SU
+$CMP ATtiny26-16S
 D 16MHz, 2kB Flash, 128B SRAM, 128B EEPROM, SOIC-20
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc1477.pdf
 $ENDCMP
 #
-$CMP ATtiny261A-MU
+$CMP ATtiny261A-M
 D 20MHz, 2kB Flash, 128B SRAM, 128B EEPROM, QFN-32
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8197.pdf
 $ENDCMP
 #
-$CMP ATtiny261A-PU
+$CMP ATtiny261A-P
 D 20MHz, 2kB Flash, 128B SRAM, 128B EEPROM, DIP-20
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8197.pdf
 $ENDCMP
 #
-$CMP ATtiny261A-SU
+$CMP ATtiny261A-S
 D 20MHz, 2kB Flash, 128B SRAM, 128B EEPROM, SOIC-20
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8197.pdf
 $ENDCMP
 #
-$CMP ATtiny261A-XU
+$CMP ATtiny261A-X
 D 20MHz, 2kB Flash, 128B SRAM, 128B EEPROM, TSSOP-20
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8197.pdf
 $ENDCMP
 #
-$CMP ATtiny26L-8MU
+$CMP ATtiny26L-8M
 D 8MHz, 2kB Flash, 128B SRAM, 128B EEPROM, QFN-32
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc1477.pdf
 $ENDCMP
 #
-$CMP ATtiny26L-8PU
+$CMP ATtiny26L-8P
 D 8MHz, 2kB Flash, 128B SRAM, 128B EEPROM, DIP-20
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc1477.pdf
 $ENDCMP
 #
-$CMP ATtiny26L-8SU
+$CMP ATtiny26L-8S
 D 8MHz, 2kB Flash, 128B SRAM, 128B EEPROM, SOIC-20
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc1477.pdf
 $ENDCMP
 #
-$CMP ATtiny28L-4AU
+$CMP ATtiny28L-4A
 D 4MHz, 2kB Flash, No SRAM, No EEPROM, TQFP-32
 K AVR 8bit Microcontroller tinyAVR IR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc1062.pdf
 $ENDCMP
 #
-$CMP ATtiny28L-4MU
+$CMP ATtiny28L-4M
 D 4MHz, 2kB Flash, No SRAM, No EEPROM, QFN-32
 K AVR 8bit Microcontroller tinyAVR IR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc1062.pdf
 $ENDCMP
 #
-$CMP ATtiny28L-4PU
+$CMP ATtiny28L-4P
 D 4MHz, 2kB Flash, No SRAM, No EEPROM, DIP-28
 K AVR 8bit Microcontroller tinyAVR IR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc1062.pdf
 $ENDCMP
 #
-$CMP ATtiny28V-1AU
+$CMP ATtiny28V-1A
 D 1.2MHz, 2kB Flash, No SRAM, No EEPROM, TQFP-32
 K AVR 8bit Microcontroller tinyAVR IR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc1062.pdf
 $ENDCMP
 #
-$CMP ATtiny28V-1MU
+$CMP ATtiny28V-1M
 D 1.2MHz, 2kB Flash, No SRAM, No EEPROM, QFN-32
 K AVR 8bit Microcontroller tinyAVR IR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc1062.pdf
 $ENDCMP
 #
-$CMP ATtiny28V-1PU
+$CMP ATtiny28V-1P
 D 1.2MHz, 2kB Flash, No SRAM, No EEPROM, DIP-28
 K AVR 8bit Microcontroller tinyAVR IR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc1062.pdf
@@ -552,19 +552,19 @@ K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8127-AVR-8-bit-Microcontroller-ATtiny4-ATtiny5-ATtiny9-ATtiny10_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATtiny40-MMH
+$CMP ATtiny40-MM
 D 12MHz, 4kB Flash, 256B SRAM, No EEPROM, QFN-20
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-8263-8-bit-avr-microcontroller-tinyavr-attiny40_datasheet.pdf
 $ENDCMP
 #
-$CMP ATtiny40-SU
+$CMP ATtiny40-S
 D 12MHz, 4kB Flash, 256B SRAM, No EEPROM, SOIC-20
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-8263-8-bit-avr-microcontroller-tinyavr-attiny40_datasheet.pdf
 $ENDCMP
 #
-$CMP ATtiny40-XU
+$CMP ATtiny40-X
 D 12MHz, 4kB Flash, 256B SRAM, No EEPROM, TSSOP-20
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-8263-8-bit-avr-microcontroller-tinyavr-attiny40_datasheet.pdf
@@ -624,259 +624,259 @@ K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/40001901B.pdf
 $ENDCMP
 #
-$CMP ATtiny4313-MMH
+$CMP ATtiny4313-M
 D 20MHz, 4kB Flash, 256B SRAM, 256B EEPROM, QFN-20
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8246.pdf
 $ENDCMP
 #
-$CMP ATtiny4313-MU
+$CMP ATtiny4313-MM
 D 20MHz, 4kB Flash, 256B SRAM, 256B EEPROM, QFN-20
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8246.pdf
 $ENDCMP
 #
-$CMP ATtiny4313-PU
+$CMP ATtiny4313-P
 D 20MHz, 4kB Flash, 256B SRAM, 256B EEPROM, DIP-20
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8246.pdf
 $ENDCMP
 #
-$CMP ATtiny4313-SU
+$CMP ATtiny4313-S
 D 20MHz, 4kB Flash, 256B SRAM, 256B EEPROM, SOIC-20
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8246.pdf
 $ENDCMP
 #
-$CMP ATtiny43U-MU
+$CMP ATtiny43U-M
 D 8MHz, 4kB Flash, 256B SRAM, 64B EEPROM, QFN-20
 K AVR 8bit Microcontroller tinyAVR Battery Boost
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8048.pdf
 $ENDCMP
 #
-$CMP ATtiny43U-SU
+$CMP ATtiny43U-S
 D 8MHz, 4kB Flash, 256B SRAM, 64B EEPROM, SOIC-20
 K AVR 8bit Microcontroller tinyAVR Battery Boost
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8048.pdf
 $ENDCMP
 #
-$CMP ATtiny44-20MU
+$CMP ATtiny44-20M
 D 20MHz, 4kB Flash, 256B SRAM, 256B EEPROM, debugWIRE, QFN-20
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8006.pdf
 $ENDCMP
 #
-$CMP ATtiny44-20PU
+$CMP ATtiny44-20P
 D 20MHz, 4kB Flash, 256B SRAM, 256B EEPROM, debugWIRE, DIP-14
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8006.pdf
 $ENDCMP
 #
-$CMP ATtiny44-20SSU
+$CMP ATtiny44-20SS
 D 20MHz, 4kB Flash, 256B SRAM, 256B EEPROM, debugWIRE, SOIC-14
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8006.pdf
 $ENDCMP
 #
-$CMP ATtiny441-MMH
+$CMP ATtiny441-M
 D 16MHz, 4kB Flash, 256B SRAM, 256B EEPROM, ADC, ACI, debugWIRE, QFN-20
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8495-8-bit-AVR-Microcontrollers-ATtiny441-ATtiny841_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATtiny441-MU
+$CMP ATtiny441-MM
 D 16MHz, 4kB Flash, 256B SRAM, 256B EEPROM, ADC, ACI, debugWIRE, QFN-20
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8495-8-bit-AVR-Microcontrollers-ATtiny441-ATtiny841_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATtiny441-SSU
+$CMP ATtiny441-SS
 D 16MHz, 4kB Flash, 256B SRAM, 256B EEPROM, ADC, ACI, debugWIRE, SOIC-14
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8495-8-bit-AVR-Microcontrollers-ATtiny441-ATtiny841_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATtiny44A-CCU
+$CMP ATtiny44A-CC
 D 20MHz, 4kB Flash, 256B SRAM, 256B EEPROM, debugWIRE, UFBGA-15
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8183.pdf
 $ENDCMP
 #
-$CMP ATtiny44A-MMH
+$CMP ATtiny44A-M
 D 20MHz, 4kB Flash, 256B SRAM, 256B EEPROM, debugWIRE, QFN-20
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8183.pdf
 $ENDCMP
 #
-$CMP ATtiny44A-MU
+$CMP ATtiny44A-MM
 D 20MHz, 4kB Flash, 256B SRAM, 256B EEPROM, debugWIRE, QFN-20
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8183.pdf
 $ENDCMP
 #
-$CMP ATtiny44A-PU
+$CMP ATtiny44A-P
 D 20MHz, 4kB Flash, 256B SRAM, 256B EEPROM, debugWIRE, DIP-14
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8183.pdf
 $ENDCMP
 #
-$CMP ATtiny44A-SSU
+$CMP ATtiny44A-SS
 D 20MHz, 4kB Flash, 256B SRAM, 256B EEPROM, debugWIRE, SOIC-14
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8183.pdf
 $ENDCMP
 #
-$CMP ATtiny44V-10MU
+$CMP ATtiny44V-10M
 D 10MHz, 4kB Flash, 256B SRAM, 256B EEPROM, debugWIRE, QFN-20
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8006.pdf
 $ENDCMP
 #
-$CMP ATtiny44V-10PU
+$CMP ATtiny44V-10P
 D 10MHz, 4kB Flash, 256B SRAM, 256B EEPROM, debugWIRE, DIP-14
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8006.pdf
 $ENDCMP
 #
-$CMP ATtiny44V-10SSU
+$CMP ATtiny44V-10SS
 D 10MHz, 4kB Flash, 256B SRAM, 256B EEPROM, debugWIRE, SOIC-14
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8006.pdf
 $ENDCMP
 #
-$CMP ATtiny45-20MU
+$CMP ATtiny45-20M
 D 20MHz, 4kB Flash, 256B SRAM, 256B EEPROM, debugWIRE, QFN-20
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-2586-avr-8-bit-microcontroller-attiny25-attiny45-attiny85_datasheet.pdf
 $ENDCMP
 #
-$CMP ATtiny45-20PU
+$CMP ATtiny45-20P
 D 20MHz, 4kB Flash, 256B SRAM, 256B EEPROM, debugWIRE, DIP-8
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-2586-avr-8-bit-microcontroller-attiny25-attiny45-attiny85_datasheet.pdf
 $ENDCMP
 #
-$CMP ATtiny45-20SU
+$CMP ATtiny45-20S
 D 20MHz, 4kB Flash, 256B SRAM, 256B EEPROM, debugWIRE, SOIJ-8
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-2586-avr-8-bit-microcontroller-attiny25-attiny45-attiny85_datasheet.pdf
 $ENDCMP
 #
-$CMP ATtiny45-20XU
+$CMP ATtiny45-20X
 D 20MHz, 4kB Flash, 256B SRAM, 256B EEPROM, debugWIRE, TSSOP-8
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-2586-avr-8-bit-microcontroller-attiny25-attiny45-attiny85_datasheet.pdf
 $ENDCMP
 #
-$CMP ATtiny45V-10MU
+$CMP ATtiny45V-10M
 D 10MHz, 4kB Flash, 256B SRAM, 256B EEPROM, debugWIRE, QFN-20
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-2586-avr-8-bit-microcontroller-attiny25-attiny45-attiny85_datasheet.pdf
 $ENDCMP
 #
-$CMP ATtiny45V-10PU
+$CMP ATtiny45V-10P
 D 10MHz, 4kB Flash, 256B SRAM, 256B EEPROM, debugWIRE, DIP-8
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-2586-avr-8-bit-microcontroller-attiny25-attiny45-attiny85_datasheet.pdf
 $ENDCMP
 #
-$CMP ATtiny45V-10SU
+$CMP ATtiny45V-10S
 D 10MHz, 4kB Flash, 256B SRAM, 256B EEPROM, debugWIRE, SOIJ-8
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-2586-avr-8-bit-microcontroller-attiny25-attiny45-attiny85_datasheet.pdf
 $ENDCMP
 #
-$CMP ATtiny45V-10XU
+$CMP ATtiny45V-10X
 D 10MHz, 4kB Flash, 256B SRAM, 256B EEPROM, debugWIRE, TSSOP-8
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-2586-avr-8-bit-microcontroller-attiny25-attiny45-attiny85_datasheet.pdf
 $ENDCMP
 #
-$CMP ATtiny461-20MU
+$CMP ATtiny461-20M
 D 20MHz, 4kB Flash, 256B SRAM, 256B EEPROM, QFN-32
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-2588-8-bit-avr-microcontrollers-tinyavr-attiny261-attiny461-attiny861_datasheet.pdf
 $ENDCMP
 #
-$CMP ATtiny461-20PU
+$CMP ATtiny461-20P
 D 20MHz, 4kB Flash, 256B SRAM, 256B EEPROM, DIP-20
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-2588-8-bit-avr-microcontrollers-tinyavr-attiny261-attiny461-attiny861_datasheet.pdf
 $ENDCMP
 #
-$CMP ATtiny461-20SU
+$CMP ATtiny461-20S
 D 20MHz, 4kB Flash, 256B SRAM, 256B EEPROM, SOIC-20
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-2588-8-bit-avr-microcontrollers-tinyavr-attiny261-attiny461-attiny861_datasheet.pdf
 $ENDCMP
 #
-$CMP ATtiny461A-MU
+$CMP ATtiny461A-M
 D 20MHz, 4kB Flash, 256B SRAM, 256B EEPROM, QFN-32
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8197.pdf
 $ENDCMP
 #
-$CMP ATtiny461A-PU
+$CMP ATtiny461A-P
 D 20MHz, 4kB Flash, 256B SRAM, 256B EEPROM, DIP-20
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8197.pdf
 $ENDCMP
 #
-$CMP ATtiny461A-SU
+$CMP ATtiny461A-S
 D 20MHz, 4kB Flash, 256B SRAM, 256B EEPROM, SOIC-20
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8197.pdf
 $ENDCMP
 #
-$CMP ATtiny461A-XU
+$CMP ATtiny461A-X
 D 20MHz, 4kB Flash, 256B SRAM, 256B EEPROM, TSSOP-20
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8197.pdf
 $ENDCMP
 #
-$CMP ATtiny461V-10MU
+$CMP ATtiny461V-10M
 D 10MHz, 4kB Flash, 256B SRAM, 256B EEPROM, QFN-32
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-2588-8-bit-avr-microcontrollers-tinyavr-attiny261-attiny461-attiny861_datasheet.pdf
 $ENDCMP
 #
-$CMP ATtiny461V-10PU
+$CMP ATtiny461V-10P
 D 10MHz, 4kB Flash, 256B SRAM, 256B EEPROM, DIP-20
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-2588-8-bit-avr-microcontrollers-tinyavr-attiny261-attiny461-attiny861_datasheet.pdf
 $ENDCMP
 #
-$CMP ATtiny461V-10SU
+$CMP ATtiny461V-10S
 D 10MHz, 4kB Flash, 256B SRAM, 256B EEPROM, SOIC-20
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-2588-8-bit-avr-microcontrollers-tinyavr-attiny261-attiny461-attiny861_datasheet.pdf
 $ENDCMP
 #
-$CMP ATtiny48-AU
+$CMP ATtiny48-A
 D 12MHz, 4kB Flash, 256B SRAM, 64B EEPROM, TQFP-32
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8008.pdf
 $ENDCMP
 #
-$CMP ATtiny48-CCU
+$CMP ATtiny48-CC
 D 12MHz, 4kB Flash, 256B SRAM, 64B EEPROM, UFBGA-32
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8008.pdf
 $ENDCMP
 #
-$CMP ATtiny48-MMU
-D 12MHz, 4kB Flash, 256B SRAM, 64B EEPROM, QFN-28
+$CMP ATtiny48-M
+D 12MHz, 4kB Flash, 256B SRAM, 64B EEPROM, QFN-32
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8008.pdf
 $ENDCMP
 #
-$CMP ATtiny48-MU
-D 12MHz, 4kB Flash, 256B SRAM, 64B EEPROM, QFN-32
+$CMP ATtiny48-MM
+D 12MHz, 4kB Flash, 256B SRAM, 64B EEPROM, QFN-28
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8008.pdf
 $ENDCMP
 #
-$CMP ATtiny48-PU
+$CMP ATtiny48-P
 D 12MHz, 4kB Flash, 256B SRAM, 64B EEPROM, DIP-28
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8008.pdf
@@ -954,229 +954,229 @@ K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8371.pdf
 $ENDCMP
 #
-$CMP ATtiny84-20MU
+$CMP ATtiny84-20M
 D 20MHz, 8kB Flash, 512B SRAM, 512B EEPROM, debugWIRE, QFN-20
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8006.pdf
 $ENDCMP
 #
-$CMP ATtiny84-20PU
+$CMP ATtiny84-20P
 D 20MHz, 8kB Flash, 512B SRAM, 512B EEPROM, debugWIRE, DIP-14
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8006.pdf
 $ENDCMP
 #
-$CMP ATtiny84-20SSU
+$CMP ATtiny84-20SS
 D 20MHz, 8kB Flash, 512B SRAM, 512B EEPROM, debugWIRE, SOIC-14
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8006.pdf
 $ENDCMP
 #
-$CMP ATtiny841-MMH
+$CMP ATtiny841-M
 D 16MHz, 8kB Flash, 512B SRAM, 512B EEPROM, ADC, ACI, debugWIRE, QFN-20
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8495-8-bit-AVR-Microcontrollers-ATtiny441-ATtiny841_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATtiny841-MU
+$CMP ATtiny841-MM
 D 16MHz, 8kB Flash, 512B SRAM, 512B EEPROM, ADC, ACI, debugWIRE, QFN-20
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8495-8-bit-AVR-Microcontrollers-ATtiny441-ATtiny841_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATtiny841-SSU
+$CMP ATtiny841-SS
 D 16MHz, 8kB Flash, 512B SRAM, 512B EEPROM, ADC, ACI, debugWIRE, SOIC-14
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8495-8-bit-AVR-Microcontrollers-ATtiny441-ATtiny841_Datasheet.pdf
 $ENDCMP
 #
-$CMP ATtiny84A-CCU
+$CMP ATtiny84A-CC
 D 20MHz, 8kB Flash, 512B SRAM, 512B EEPROM, debugWIRE, UFBGA-15
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8183.pdf
 $ENDCMP
 #
-$CMP ATtiny84A-MMH
+$CMP ATtiny84A-M
 D 20MHz, 8kB Flash, 512B SRAM, 512B EEPROM, debugWIRE, QFN-20
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8183.pdf
 $ENDCMP
 #
-$CMP ATtiny84A-MU
+$CMP ATtiny84A-MM
 D 20MHz, 8kB Flash, 512B SRAM, 512B EEPROM, debugWIRE, QFN-20
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8183.pdf
 $ENDCMP
 #
-$CMP ATtiny84A-PU
+$CMP ATtiny84A-P
 D 20MHz, 8kB Flash, 512B SRAM, 512B EEPROM, debugWIRE, DIP-14
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8183.pdf
 $ENDCMP
 #
-$CMP ATtiny84A-SSU
+$CMP ATtiny84A-SS
 D 20MHz, 8kB Flash, 512B SRAM, 512B EEPROM, debugWIRE, SOIC-14
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8183.pdf
 $ENDCMP
 #
-$CMP ATtiny84V-10MU
+$CMP ATtiny84V-10M
 D 10MHz, 8kB Flash, 512B SRAM, 512B EEPROM, debugWIRE, QFN-20
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8006.pdf
 $ENDCMP
 #
-$CMP ATtiny84V-10PU
+$CMP ATtiny84V-10P
 D 10MHz, 8kB Flash, 512B SRAM, 512B EEPROM, debugWIRE, DIP-14
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8006.pdf
 $ENDCMP
 #
-$CMP ATtiny84V-10SSU
+$CMP ATtiny84V-10SS
 D 10MHz, 8kB Flash, 512B SRAM, 512B EEPROM, debugWIRE, SOIC-14
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8006.pdf
 $ENDCMP
 #
-$CMP ATtiny85-20MU
+$CMP ATtiny85-20M
 D 20MHz, 8kB Flash, 512B SRAM, 512B EEPROM, debugWIRE, QFN-20
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-2586-avr-8-bit-microcontroller-attiny25-attiny45-attiny85_datasheet.pdf
 $ENDCMP
 #
-$CMP ATtiny85-20PU
+$CMP ATtiny85-20P
 D 20MHz, 8kB Flash, 512B SRAM, 512B EEPROM, debugWIRE, DIP-8
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-2586-avr-8-bit-microcontroller-attiny25-attiny45-attiny85_datasheet.pdf
 $ENDCMP
 #
-$CMP ATtiny85-20SU
+$CMP ATtiny85-20S
 D 20MHz, 8kB Flash, 512B SRAM, 512B EEPROM, debugWIRE, SOIJ-8
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-2586-avr-8-bit-microcontroller-attiny25-attiny45-attiny85_datasheet.pdf
 $ENDCMP
 #
-$CMP ATtiny85V-10MU
+$CMP ATtiny85V-10M
 D 10MHz, 8kB Flash, 512B SRAM, 512B EEPROM, debugWIRE, QFN-20
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-2586-avr-8-bit-microcontroller-attiny25-attiny45-attiny85_datasheet.pdf
 $ENDCMP
 #
-$CMP ATtiny85V-10PU
+$CMP ATtiny85V-10P
 D 10MHz, 8kB Flash, 512B SRAM, 512B EEPROM, debugWIRE, DIP-8
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-2586-avr-8-bit-microcontroller-attiny25-attiny45-attiny85_datasheet.pdf
 $ENDCMP
 #
-$CMP ATtiny85V-10SU
+$CMP ATtiny85V-10S
 D 10MHz, 8kB Flash, 512B SRAM, 512B EEPROM, debugWIRE, SOIJ-8
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-2586-avr-8-bit-microcontroller-attiny25-attiny45-attiny85_datasheet.pdf
 $ENDCMP
 #
-$CMP ATtiny861-20MU
+$CMP ATtiny861-20M
 D 20MHz, 8kB Flash, 512B SRAM, 512B EEPROM, QFN-32
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-2588-8-bit-avr-microcontrollers-tinyavr-attiny261-attiny461-attiny861_datasheet.pdf
 $ENDCMP
 #
-$CMP ATtiny861-20PU
+$CMP ATtiny861-20P
 D 20MHz, 8kB Flash, 512B SRAM, 512B EEPROM, DIP-20
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-2588-8-bit-avr-microcontrollers-tinyavr-attiny261-attiny461-attiny861_datasheet.pdf
 $ENDCMP
 #
-$CMP ATtiny861-20SU
+$CMP ATtiny861-20S
 D 20MHz, 8kB Flash, 512B SRAM, 512B EEPROM, SOIC-20
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-2588-8-bit-avr-microcontrollers-tinyavr-attiny261-attiny461-attiny861_datasheet.pdf
 $ENDCMP
 #
-$CMP ATtiny861A-MU
+$CMP ATtiny861A-M
 D 20MHz, 8kB Flash, 512B SRAM, 512B EEPROM, QFN-32
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8197.pdf
 $ENDCMP
 #
-$CMP ATtiny861A-PU
+$CMP ATtiny861A-P
 D 20MHz, 8kB Flash, 512B SRAM, 512B EEPROM, DIP-20
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8197.pdf
 $ENDCMP
 #
-$CMP ATtiny861A-SU
+$CMP ATtiny861A-S
 D 20MHz, 8kB Flash, 512B SRAM, 512B EEPROM, SOIC-20
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8197.pdf
 $ENDCMP
 #
-$CMP ATtiny861A-XU
+$CMP ATtiny861A-X
 D 20MHz, 8kB Flash, 512B SRAM, 512B EEPROM, TSSOP-20
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8197.pdf
 $ENDCMP
 #
-$CMP ATtiny861V-10MU
+$CMP ATtiny861V-10M
 D 10MHz, 8kB Flash, 512B SRAM, 512B EEPROM, QFN-32
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-2588-8-bit-avr-microcontrollers-tinyavr-attiny261-attiny461-attiny861_datasheet.pdf
 $ENDCMP
 #
-$CMP ATtiny861V-10PU
+$CMP ATtiny861V-10P
 D 10MHz, 8kB Flash, 512B SRAM, 512B EEPROM, DIP-20
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-2588-8-bit-avr-microcontrollers-tinyavr-attiny261-attiny461-attiny861_datasheet.pdf
 $ENDCMP
 #
-$CMP ATtiny861V-10SU
+$CMP ATtiny861V-10S
 D 10MHz, 8kB Flash, 512B SRAM, 512B EEPROM, SOIC-20
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/atmel-2588-8-bit-avr-microcontrollers-tinyavr-attiny261-attiny461-attiny861_datasheet.pdf
 $ENDCMP
 #
-$CMP ATtiny87-MU
+$CMP ATtiny87-M
 D 16MHz, 8kB Flash, 512B SRAM, 512B EEPROM, debugWIRE, QFN-32
 K AVR 8bit Microcontroller tinyAVR Automotive
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8265-8-bit-AVR-Microcontroller-tinyAVR-ATtiny87-ATtiny167_datasheet.pdf
 $ENDCMP
 #
-$CMP ATtiny87-SU
+$CMP ATtiny87-S
 D 16MHz, 8kB Flash, 512B SRAM, 512B EEPROM, debugWIRE, SOIC-20
 K AVR 8bit Microcontroller tinyAVR Automotive
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8265-8-bit-AVR-Microcontroller-tinyAVR-ATtiny87-ATtiny167_datasheet.pdf
 $ENDCMP
 #
-$CMP ATtiny87-XU
+$CMP ATtiny87-X
 D 16MHz, 8kB Flash, 512B SRAM, 512B EEPROM, debugWIRE, TSSOP-20
 K AVR 8bit Microcontroller tinyAVR Automotive
 F http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8265-8-bit-AVR-Microcontroller-tinyAVR-ATtiny87-ATtiny167_datasheet.pdf
 $ENDCMP
 #
-$CMP ATtiny88-AU
+$CMP ATtiny88-A
 D 12MHz, 8kB Flash, 512B SRAM, 64B EEPROM, TQFP-32
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8008.pdf
 $ENDCMP
 #
-$CMP ATtiny88-CCU
+$CMP ATtiny88-CC
 D 12MHz, 8kB Flash, 512B SRAM, 64B EEPROM, UFBGA-32
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8008.pdf
 $ENDCMP
 #
-$CMP ATtiny88-MMU
-D 12MHz, 8kB Flash, 512B SRAM, 64B EEPROM, QFN-28
+$CMP ATtiny88-M
+D 12MHz, 8kB Flash, 512B SRAM, 64B EEPROM, QFN-32
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8008.pdf
 $ENDCMP
 #
-$CMP ATtiny88-MU
-D 12MHz, 8kB Flash, 512B SRAM, 64B EEPROM, QFN-32
+$CMP ATtiny88-MM
+D 12MHz, 8kB Flash, 512B SRAM, 64B EEPROM, QFN-28
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8008.pdf
 $ENDCMP
 #
-$CMP ATtiny88-PU
+$CMP ATtiny88-P
 D 12MHz, 8kB Flash, 512B SRAM, 64B EEPROM, DIP-28
 K AVR 8bit Microcontroller tinyAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc8008.pdf
diff --git a/MCU_Microchip_ATtiny.lib b/MCU_Microchip_ATtiny.lib
index 3d6ae32ab8..f7b38f2ed6 100644
--- a/MCU_Microchip_ATtiny.lib
+++ b/MCU_Microchip_ATtiny.lib
@@ -77,41 +77,14 @@ X PA7 9 600 -300 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATtiny13V-10MMU
+# ATtiny13V-10M
 #
-DEF ATtiny13V-10MMU U 0 20 Y Y 1 F N
+DEF ATtiny13V-10M U 0 20 Y Y 1 F N
 F0 "U" -500 550 50 H V L BNN
-F1 "ATtiny13V-10MMU" 100 -550 50 H V L TNN
-F2 "Package_DFN_QFN:DFN-10-1EP_3x3mm_P0.5mm_EP1.75x2.7mm" 0 0 50 H I C CIN
-F3 "" 0 0 50 H I C CNN
-ALIAS ATtiny13-20MMU ATtiny13A-MMF
-$FPLIST
- DFN*1EP*3x3mm*P0.5mm*
-$ENDFPLIST
-DRAW
-S -500 -500 500 500 0 1 10 f
-X ~RESET~/PB5 1 600 -200 100 L 50 50 1 1 B
-X VCC 10 0 600 100 D 50 50 1 1 W
-X GND 11 0 -600 100 U 50 50 1 1 P N
-X PB3 2 600 0 100 L 50 50 1 1 B
-X NC 3 -500 -300 100 R 50 50 1 1 N N
-X PB4 4 600 -100 100 L 50 50 1 1 B
-X GND 5 0 -600 100 U 50 50 1 1 W
-X PB0 6 600 300 100 L 50 50 1 1 B
-X PB1 7 600 200 100 L 50 50 1 1 B
-X NC 8 -500 -400 100 R 50 50 1 1 N N
-X PB2 9 600 100 100 L 50 50 1 1 B
-ENDDRAW
-ENDDEF
-#
-# ATtiny13V-10MU
-#
-DEF ATtiny13V-10MU U 0 20 Y Y 1 F N
-F0 "U" -500 550 50 H V L BNN
-F1 "ATtiny13V-10MU" 100 -550 50 H V L TNN
+F1 "ATtiny13V-10M" 100 -550 50 H V L TNN
 F2 "Package_DFN_QFN:QFN-20-1EP_4x4mm_P0.5mm_EP2.6x2.6mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATtiny13-20MU ATtiny13A-MU
+ALIAS ATtiny13-20M ATtiny13A-M
 $FPLIST
  QFN*1EP*4x4mm*P0.5mm*
 $ENDFPLIST
@@ -141,14 +114,41 @@ X NC 9 -500 0 100 R 50 50 1 1 N N
 ENDDRAW
 ENDDEF
 #
-# ATtiny13V-10PU
+# ATtiny13V-10MM
+#
+DEF ATtiny13V-10MM U 0 20 Y Y 1 F N
+F0 "U" -500 550 50 H V L BNN
+F1 "ATtiny13V-10MM" 100 -550 50 H V L TNN
+F2 "Package_DFN_QFN:DFN-10-1EP_3x3mm_P0.5mm_EP1.75x2.7mm" 0 0 50 H I C CIN
+F3 "" 0 0 50 H I C CNN
+ALIAS ATtiny13-20MM ATtiny13A-MM
+$FPLIST
+ DFN*1EP*3x3mm*P0.5mm*
+$ENDFPLIST
+DRAW
+S -500 -500 500 500 0 1 10 f
+X ~RESET~/PB5 1 600 -200 100 L 50 50 1 1 B
+X VCC 10 0 600 100 D 50 50 1 1 W
+X GND 11 0 -600 100 U 50 50 1 1 P N
+X PB3 2 600 0 100 L 50 50 1 1 B
+X NC 3 -500 -300 100 R 50 50 1 1 N N
+X PB4 4 600 -100 100 L 50 50 1 1 B
+X GND 5 0 -600 100 U 50 50 1 1 W
+X PB0 6 600 300 100 L 50 50 1 1 B
+X PB1 7 600 200 100 L 50 50 1 1 B
+X NC 8 -500 -400 100 R 50 50 1 1 N N
+X PB2 9 600 100 100 L 50 50 1 1 B
+ENDDRAW
+ENDDEF
+#
+# ATtiny13V-10P
 #
-DEF ATtiny13V-10PU U 0 20 Y Y 1 F N
+DEF ATtiny13V-10P U 0 20 Y Y 1 F N
 F0 "U" -500 550 50 H V L BNN
-F1 "ATtiny13V-10PU" 100 -550 50 H V L TNN
+F1 "ATtiny13V-10P" 100 -550 50 H V L TNN
 F2 "Package_DIP:DIP-8_W7.62mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATtiny13-20PU ATtiny13A-PU
+ALIAS ATtiny13-20P ATtiny13A-P
 $FPLIST
  DIP*W7.62mm*
 $ENDFPLIST
@@ -165,16 +165,16 @@ X VCC 8 0 600 100 D 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
-# ATtiny13V-10SSU
+# ATtiny13V-10S
 #
-DEF ATtiny13V-10SSU U 0 20 Y Y 1 F N
+DEF ATtiny13V-10S U 0 20 Y Y 1 F N
 F0 "U" -500 550 50 H V L BNN
-F1 "ATtiny13V-10SSU" 100 -550 50 H V L TNN
-F2 "Package_SO:SOIC-8_3.9x4.9mm_P1.27mm" 0 0 50 H I C CIN
+F1 "ATtiny13V-10S" 100 -550 50 H V L TNN
+F2 "Package_SO:SOIJ-8_5.3x5.3mm_P1.27mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATtiny13-20SSU ATtiny13A-SSU
+ALIAS ATtiny13-20S ATtiny13A-S
 $FPLIST
- SOIC*3.9x4.9mm*P1.27mm*
+ SOIJ*5.3x5.3mm*P1.27mm*
 $ENDFPLIST
 DRAW
 S -500 -500 500 500 0 1 10 f
@@ -189,16 +189,16 @@ X VCC 8 0 600 100 D 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
-# ATtiny13V-10SU
+# ATtiny13V-10SS
 #
-DEF ATtiny13V-10SU U 0 20 Y Y 1 F N
+DEF ATtiny13V-10SS U 0 20 Y Y 1 F N
 F0 "U" -500 550 50 H V L BNN
-F1 "ATtiny13V-10SU" 100 -550 50 H V L TNN
-F2 "Package_SO:SOIJ-8_5.3x5.3mm_P1.27mm" 0 0 50 H I C CIN
+F1 "ATtiny13V-10SS" 100 -550 50 H V L TNN
+F2 "Package_SO:SOIC-8_3.9x4.9mm_P1.27mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATtiny13-20SU ATtiny13A-SU
+ALIAS ATtiny13-20SS ATtiny13A-SS
 $FPLIST
- SOIJ*5.3x5.3mm*P1.27mm*
+ SOIC*3.9x4.9mm*P1.27mm*
 $ENDFPLIST
 DRAW
 S -500 -500 500 500 0 1 10 f
@@ -213,11 +213,11 @@ X VCC 8 0 600 100 D 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
-# ATtiny1634-MU
+# ATtiny1634-M
 #
-DEF ATtiny1634-MU U 0 20 Y Y 1 F N
+DEF ATtiny1634-M U 0 20 Y Y 1 F N
 F0 "U" -500 1250 50 H V L BNN
-F1 "ATtiny1634-MU" 100 -1250 50 H V L TNN
+F1 "ATtiny1634-M" 100 -1250 50 H V L TNN
 F2 "Package_DFN_QFN:QFN-20-1EP_4x4mm_P0.5mm_EP2.6x2.6mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -249,11 +249,11 @@ X VCC 9 0 1300 100 D 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
-# ATtiny1634-SU
+# ATtiny1634-S
 #
-DEF ATtiny1634-SU U 0 20 Y Y 1 F N
+DEF ATtiny1634-S U 0 20 Y Y 1 F N
 F0 "U" -500 1250 50 H V L BNN
-F1 "ATtiny1634-SU" 100 -1250 50 H V L TNN
+F1 "ATtiny1634-S" 100 -1250 50 H V L TNN
 F2 "Package_SO:SOIC-20W_7.5x12.8mm_P1.27mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -284,11 +284,11 @@ X AREF/PA0 9 600 1000 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATtiny20-CCU
+# ATtiny20-CC
 #
-DEF ATtiny20-CCU U 0 20 Y Y 1 F N
+DEF ATtiny20-CC U 0 20 Y Y 1 F N
 F0 "U" -500 850 50 H V L BNN
-F1 "ATtiny20-CCU" 100 -850 50 H V L TNN
+F1 "ATtiny20-CC" 100 -850 50 H V L TNN
 F2 "Package_BGA:UFBGA-15_3.0x3.0mm_Layout4x4_P0.65mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -314,11 +314,11 @@ X VCC D4 0 900 100 D 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
-# ATtiny20-MMH
+# ATtiny20-MM
 #
-DEF ATtiny20-MMH U 0 20 Y Y 1 F N
+DEF ATtiny20-MM U 0 20 Y Y 1 F N
 F0 "U" -500 850 50 H V L BNN
-F1 "ATtiny20-MMH" 100 -850 50 H V L TNN
+F1 "ATtiny20-MM" 100 -850 50 H V L TNN
 F2 "Package_DFN_QFN:QFN-20-1EP_3x3mm_P0.45mm_EP1.6x1.6mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -350,11 +350,11 @@ X VCC 9 0 900 100 D 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
-# ATtiny20-SSU
+# ATtiny20-SS
 #
-DEF ATtiny20-SSU U 0 20 Y Y 1 F N
+DEF ATtiny20-SS U 0 20 Y Y 1 F N
 F0 "U" -500 850 50 H V L BNN
-F1 "ATtiny20-SSU" 100 -850 50 H V L TNN
+F1 "ATtiny20-SS" 100 -850 50 H V L TNN
 F2 "Package_SO:SOIC-14_3.9x8.7mm_P1.27mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -379,11 +379,11 @@ X PA4 9 600 200 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATtiny20-UU
+# ATtiny20-U
 #
-DEF ATtiny20-UU U 0 20 Y Y 1 F N
+DEF ATtiny20-U U 0 20 Y Y 1 F N
 F0 "U" -500 850 50 H V L BNN
-F1 "ATtiny20-UU" 100 -850 50 H V L TNN
+F1 "ATtiny20-U" 100 -850 50 H V L TNN
 F2 "Package_CSP:WLCSP-12_1.403x1.555mm_P0.4mm_Stagger" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -406,11 +406,11 @@ X PB0 D6 600 -300 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATtiny20-XU
+# ATtiny20-X
 #
-DEF ATtiny20-XU U 0 20 Y Y 1 F N
+DEF ATtiny20-X U 0 20 Y Y 1 F N
 F0 "U" -500 850 50 H V L BNN
-F1 "ATtiny20-XU" 100 -850 50 H V L TNN
+F1 "ATtiny20-X" 100 -850 50 H V L TNN
 F2 "Package_SO:TSSOP-14_4.4x5mm_P0.65mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -489,14 +489,14 @@ X PB0 9 -600 400 100 R 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATtiny2313A-MMH
+# ATtiny2313A-MM
 #
-DEF ATtiny2313A-MMH U 0 20 Y Y 1 F N
+DEF ATtiny2313A-MM U 0 20 Y Y 1 F N
 F0 "U" -500 1050 50 H V L BNN
-F1 "ATtiny2313A-MMH" 100 -1050 50 H V L TNN
+F1 "ATtiny2313A-MM" 100 -1050 50 H V L TNN
 F2 "Package_DFN_QFN:VQFN-20-1EP_3x3mm_P0.45mm_EP1.55x1.55mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATtiny4313-MMH
+ALIAS ATtiny4313-MM
 $FPLIST
  VQFN*1EP*3x3mm*P0.45mm*
 $ENDFPLIST
@@ -526,14 +526,14 @@ X PD6 9 600 -700 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATtiny2313V-10MU
+# ATtiny2313V-10M
 #
-DEF ATtiny2313V-10MU U 0 20 Y Y 1 F N
+DEF ATtiny2313V-10M U 0 20 Y Y 1 F N
 F0 "U" -500 1050 50 H V L BNN
-F1 "ATtiny2313V-10MU" 100 -1050 50 H V L TNN
+F1 "ATtiny2313V-10M" 100 -1050 50 H V L TNN
 F2 "Package_DFN_QFN:MLF-20-1EP_4x4mm_P0.5mm_EP2.6x2.6mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATtiny2313-20MU ATtiny2313A-MU ATtiny4313-MU
+ALIAS ATtiny2313-20M ATtiny2313A-M ATtiny4313-M
 $FPLIST
  MLF*1EP*4x4mm*P0.5mm*
 $ENDFPLIST
@@ -563,14 +563,14 @@ X PD6 9 600 -700 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATtiny2313V-10PU
+# ATtiny2313V-10P
 #
-DEF ATtiny2313V-10PU U 0 20 Y Y 1 F N
+DEF ATtiny2313V-10P U 0 20 Y Y 1 F N
 F0 "U" -500 1050 50 H V L BNN
-F1 "ATtiny2313V-10PU" 100 -1050 50 H V L TNN
+F1 "ATtiny2313V-10P" 100 -1050 50 H V L TNN
 F2 "Package_DIP:DIP-20_W7.62mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATtiny2313-20PU ATtiny2313A-PU ATtiny4313-PU
+ALIAS ATtiny2313-20P ATtiny2313A-P ATtiny4313-P
 $FPLIST
  DIP*W7.62mm*
 $ENDFPLIST
@@ -599,14 +599,14 @@ X PD5 9 600 -600 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATtiny2313V-10SU
+# ATtiny2313V-10S
 #
-DEF ATtiny2313V-10SU U 0 20 Y Y 1 F N
+DEF ATtiny2313V-10S U 0 20 Y Y 1 F N
 F0 "U" -500 1050 50 H V L BNN
-F1 "ATtiny2313V-10SU" 100 -1050 50 H V L TNN
+F1 "ATtiny2313V-10S" 100 -1050 50 H V L TNN
 F2 "Package_SO:SOIC-20W_7.5x12.8mm_P1.27mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATtiny2313-20SU ATtiny2313A-SU ATtiny4313-SU
+ALIAS ATtiny2313-20S ATtiny2313A-S ATtiny4313-S
 $FPLIST
  SOIC*7.5x12.8mm*P1.27mm*
 $ENDFPLIST
@@ -635,14 +635,14 @@ X PD5 9 600 -600 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATtiny24A-CCU
+# ATtiny24A-CC
 #
-DEF ATtiny24A-CCU U 0 20 Y Y 1 F N
+DEF ATtiny24A-CC U 0 20 Y Y 1 F N
 F0 "U" -500 850 50 H V L BNN
-F1 "ATtiny24A-CCU" 100 -850 50 H V L TNN
+F1 "ATtiny24A-CC" 100 -850 50 H V L TNN
 F2 "Package_BGA:UFBGA-15_3.0x3.0mm_Layout4x4_P0.65mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATtiny44A-CCU ATtiny84A-CCU
+ALIAS ATtiny44A-CC ATtiny84A-CC
 $FPLIST
  UFBGA*3.0x3.0mm*Layout4x4*P0.65mm*
 $ENDFPLIST
@@ -666,14 +666,14 @@ X VCC D4 0 900 100 D 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
-# ATtiny24A-MMH
+# ATtiny24A-MM
 #
-DEF ATtiny24A-MMH U 0 20 Y Y 1 F N
+DEF ATtiny24A-MM U 0 20 Y Y 1 F N
 F0 "U" -500 850 50 H V L BNN
-F1 "ATtiny24A-MMH" 100 -850 50 H V L TNN
+F1 "ATtiny24A-MM" 100 -850 50 H V L TNN
 F2 "Package_DFN_QFN:QFN-20-1EP_3x3mm_P0.45mm_EP1.6x1.6mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATtiny44A-MMH ATtiny84A-MMH
+ALIAS ATtiny44A-MM ATtiny84A-MM
 $FPLIST
  QFN*1EP*3x3mm*P0.45mm*
 $ENDFPLIST
@@ -703,14 +703,14 @@ X VCC 9 0 900 100 D 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
-# ATtiny24V-10MU
+# ATtiny24V-10M
 #
-DEF ATtiny24V-10MU U 0 20 Y Y 1 F N
+DEF ATtiny24V-10M U 0 20 Y Y 1 F N
 F0 "U" -500 850 50 H V L BNN
-F1 "ATtiny24V-10MU" 100 -850 50 H V L TNN
+F1 "ATtiny24V-10M" 100 -850 50 H V L TNN
 F2 "Package_DFN_QFN:QFN-20-1EP_4x4mm_P0.5mm_EP2.6x2.6mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATtiny24-20MU ATtiny24A-MU ATtiny44V-10MU ATtiny44-20MU ATtiny44A-MU ATtiny84V-10MU ATtiny84-20MU ATtiny84A-MU
+ALIAS ATtiny24-20M ATtiny24A-M ATtiny44V-10M ATtiny44-20M ATtiny44A-M ATtiny84V-10M ATtiny84-20M ATtiny84A-M
 $FPLIST
  QFN*1EP*4x4mm*P0.5mm*
 $ENDFPLIST
@@ -740,14 +740,14 @@ X VCC 9 0 900 100 D 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
-# ATtiny24V-10PU
+# ATtiny24V-10P
 #
-DEF ATtiny24V-10PU U 0 20 Y Y 1 F N
+DEF ATtiny24V-10P U 0 20 Y Y 1 F N
 F0 "U" -500 850 50 H V L BNN
-F1 "ATtiny24V-10PU" 100 -850 50 H V L TNN
+F1 "ATtiny24V-10P" 100 -850 50 H V L TNN
 F2 "Package_DIP:DIP-14_W7.62mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATtiny24-20PU ATtiny24A-PU ATtiny44V-10PU ATtiny44-20PU ATtiny44A-PU ATtiny84V-10PU ATtiny84-20PU ATtiny84A-PU
+ALIAS ATtiny24-20P ATtiny24A-P ATtiny44V-10P ATtiny44-20P ATtiny44A-P ATtiny84V-10P ATtiny84-20P ATtiny84A-P
 $FPLIST
  DIP*W7.62mm*
 $ENDFPLIST
@@ -770,14 +770,14 @@ X PA4 9 600 200 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATtiny24V-10SSU
+# ATtiny24V-10SS
 #
-DEF ATtiny24V-10SSU U 0 20 Y Y 1 F N
+DEF ATtiny24V-10SS U 0 20 Y Y 1 F N
 F0 "U" -500 850 50 H V L BNN
-F1 "ATtiny24V-10SSU" 100 -850 50 H V L TNN
+F1 "ATtiny24V-10SS" 100 -850 50 H V L TNN
 F2 "Package_SO:SOIC-14_3.9x8.7mm_P1.27mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATtiny24-20SSU ATtiny24A-SSU ATtiny44V-10SSU ATtiny44-20SSU ATtiny44A-SSU ATtiny84V-10SSU ATtiny84-20SSU ATtiny84A-SSU
+ALIAS ATtiny24-20SS ATtiny24A-SS ATtiny44V-10SS ATtiny44-20SS ATtiny44A-SS ATtiny84V-10SS ATtiny84-20SS ATtiny84A-SS
 $FPLIST
  SOIC*3.9x8.7mm*P1.27mm*
 $ENDFPLIST
@@ -800,14 +800,14 @@ X PA4 9 600 200 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATtiny25V-10MU
+# ATtiny25V-10M
 #
-DEF ATtiny25V-10MU U 0 20 Y Y 1 F N
+DEF ATtiny25V-10M U 0 20 Y Y 1 F N
 F0 "U" -500 550 50 H V L BNN
-F1 "ATtiny25V-10MU" 100 -550 50 H V L TNN
+F1 "ATtiny25V-10M" 100 -550 50 H V L TNN
 F2 "Package_DFN_QFN:QFN-20-1EP_4x4mm_P0.5mm_EP2.6x2.6mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATtiny25-20MU ATtiny45V-10MU ATtiny45-20MU ATtiny85V-10MU ATtiny85-20MU
+ALIAS ATtiny25-20M ATtiny45V-10M ATtiny45-20M ATtiny85V-10M ATtiny85-20M
 $FPLIST
  QFN*1EP*4x4mm*P0.5mm*
 $ENDFPLIST
@@ -837,14 +837,14 @@ X NC 9 -500 0 100 R 50 50 1 1 N N
 ENDDRAW
 ENDDEF
 #
-# ATtiny25V-10PU
+# ATtiny25V-10P
 #
-DEF ATtiny25V-10PU U 0 20 Y Y 1 F N
+DEF ATtiny25V-10P U 0 20 Y Y 1 F N
 F0 "U" -500 550 50 H V L BNN
-F1 "ATtiny25V-10PU" 100 -550 50 H V L TNN
+F1 "ATtiny25V-10P" 100 -550 50 H V L TNN
 F2 "Package_DIP:DIP-8_W7.62mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATtiny25-20PU ATtiny45V-10PU ATtiny45-20PU ATtiny85V-10PU ATtiny85-20PU
+ALIAS ATtiny25-20P ATtiny45V-10P ATtiny45-20P ATtiny85V-10P ATtiny85-20P
 $FPLIST
  DIP*W7.62mm*
 $ENDFPLIST
@@ -861,16 +861,16 @@ X VCC 8 0 600 100 D 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
-# ATtiny25V-10SSU
+# ATtiny25V-10S
 #
-DEF ATtiny25V-10SSU U 0 20 Y Y 1 F N
+DEF ATtiny25V-10S U 0 20 Y Y 1 F N
 F0 "U" -500 550 50 H V L BNN
-F1 "ATtiny25V-10SSU" 100 -550 50 H V L TNN
-F2 "Package_SO:SOIC-8_3.9x4.9mm_P1.27mm" 0 0 50 H I C CIN
+F1 "ATtiny25V-10S" 100 -550 50 H V L TNN
+F2 "Package_SO:SOIJ-8_5.3x5.3mm_P1.27mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATtiny25-20SSU
+ALIAS ATtiny25-20S ATtiny45V-10S ATtiny45-20S ATtiny85V-10S ATtiny85-20S
 $FPLIST
- SOIC*3.9x4.9mm*P1.27mm*
+ SOIJ*5.3x5.3mm*P1.27mm*
 $ENDFPLIST
 DRAW
 S -500 -500 500 500 0 1 10 f
@@ -885,16 +885,16 @@ X VCC 8 0 600 100 D 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
-# ATtiny25V-10SU
+# ATtiny25V-10SS
 #
-DEF ATtiny25V-10SU U 0 20 Y Y 1 F N
+DEF ATtiny25V-10SS U 0 20 Y Y 1 F N
 F0 "U" -500 550 50 H V L BNN
-F1 "ATtiny25V-10SU" 100 -550 50 H V L TNN
-F2 "Package_SO:SOIJ-8_5.3x5.3mm_P1.27mm" 0 0 50 H I C CIN
+F1 "ATtiny25V-10SS" 100 -550 50 H V L TNN
+F2 "Package_SO:SOIC-8_3.9x4.9mm_P1.27mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATtiny25-20SU ATtiny45V-10SU ATtiny45-20SU ATtiny85V-10SU ATtiny85-20SU
+ALIAS ATtiny25-20SS
 $FPLIST
- SOIJ*5.3x5.3mm*P1.27mm*
+ SOIC*3.9x4.9mm*P1.27mm*
 $ENDFPLIST
 DRAW
 S -500 -500 500 500 0 1 10 f
@@ -909,14 +909,14 @@ X VCC 8 0 600 100 D 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
-# ATtiny261A-XU
+# ATtiny261A-X
 #
-DEF ATtiny261A-XU U 0 20 Y Y 1 F N
+DEF ATtiny261A-X U 0 20 Y Y 1 F N
 F0 "U" -600 1050 50 H V L BNN
-F1 "ATtiny261A-XU" 200 -1050 50 H V L TNN
+F1 "ATtiny261A-X" 200 -1050 50 H V L TNN
 F2 "Package_SO:TSSOP-20_4.4x6.5mm_P0.65mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATtiny461A-XU ATtiny861A-XU
+ALIAS ATtiny461A-X ATtiny861A-X
 $FPLIST
  TSSOP*4.4x6.5mm*P0.65mm*
 $ENDFPLIST
@@ -945,14 +945,14 @@ X PB6 9 700 -700 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATtiny26L-8MU
+# ATtiny26L-8M
 #
-DEF ATtiny26L-8MU U 0 20 Y Y 1 F N
+DEF ATtiny26L-8M U 0 20 Y Y 1 F N
 F0 "U" -500 1050 50 H V L BNN
-F1 "ATtiny26L-8MU" 100 -1050 50 H V L TNN
+F1 "ATtiny26L-8M" 100 -1050 50 H V L TNN
 F2 "Package_DFN_QFN:QFN-32-1EP_5x5mm_P0.5mm_EP3.1x3.1mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATtiny26-16MU
+ALIAS ATtiny26-16M
 $FPLIST
  QFN*1EP*5x5mm*P0.5mm*
 $ENDFPLIST
@@ -994,14 +994,14 @@ X NC 9 -500 -100 100 R 50 50 1 1 N N
 ENDDRAW
 ENDDEF
 #
-# ATtiny26L-8PU
+# ATtiny26L-8P
 #
-DEF ATtiny26L-8PU U 0 20 Y Y 1 F N
+DEF ATtiny26L-8P U 0 20 Y Y 1 F N
 F0 "U" -500 1050 50 H V L BNN
-F1 "ATtiny26L-8PU" 100 -1050 50 H V L TNN
+F1 "ATtiny26L-8P" 100 -1050 50 H V L TNN
 F2 "Package_DIP:DIP-20_W7.62mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATtiny26-16PU
+ALIAS ATtiny26-16P
 $FPLIST
  DIP*W7.62mm*
 $ENDFPLIST
@@ -1030,14 +1030,14 @@ X PB6 9 600 -700 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATtiny26L-8SU
+# ATtiny26L-8S
 #
-DEF ATtiny26L-8SU U 0 20 Y Y 1 F N
+DEF ATtiny26L-8S U 0 20 Y Y 1 F N
 F0 "U" -500 1050 50 H V L BNN
-F1 "ATtiny26L-8SU" 100 -1050 50 H V L TNN
+F1 "ATtiny26L-8S" 100 -1050 50 H V L TNN
 F2 "Package_SO:SOIC-20W_7.5x12.8mm_P1.27mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATtiny26-16SU
+ALIAS ATtiny26-16S
 $FPLIST
  SOIC*7.5x12.8mm*P1.27mm*
 $ENDFPLIST
@@ -1066,14 +1066,14 @@ X PB6 9 600 -700 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATtiny28V-1AU
+# ATtiny28V-1A
 #
-DEF ATtiny28V-1AU U 0 20 Y Y 1 F N
+DEF ATtiny28V-1A U 0 20 Y Y 1 F N
 F0 "U" -500 1350 50 H V L BNN
-F1 "ATtiny28V-1AU" 100 -1350 50 H V L TNN
+F1 "ATtiny28V-1A" 100 -1350 50 H V L TNN
 F2 "Package_QFP:TQFP-32_7x7mm_P0.8mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATtiny28L-4AU
+ALIAS ATtiny28L-4A
 $FPLIST
  TQFP*7x7mm*P0.8mm*
 $ENDFPLIST
@@ -1114,14 +1114,14 @@ X PD5 9 600 -800 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATtiny28V-1MU
+# ATtiny28V-1M
 #
-DEF ATtiny28V-1MU U 0 20 Y Y 1 F N
+DEF ATtiny28V-1M U 0 20 Y Y 1 F N
 F0 "U" -500 1350 50 H V L BNN
-F1 "ATtiny28V-1MU" 100 -1350 50 H V L TNN
+F1 "ATtiny28V-1M" 100 -1350 50 H V L TNN
 F2 "Package_DFN_QFN:QFN-32-1EP_5x5mm_P0.5mm_EP3.1x3.1mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATtiny28L-4MU
+ALIAS ATtiny28L-4M
 $FPLIST
  QFN*1EP*5x5mm*P0.5mm*
 $ENDFPLIST
@@ -1163,14 +1163,14 @@ X PD5 9 600 -800 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATtiny28V-1PU
+# ATtiny28V-1P
 #
-DEF ATtiny28V-1PU U 0 20 Y Y 1 F N
+DEF ATtiny28V-1P U 0 20 Y Y 1 F N
 F0 "U" -500 1350 50 H V L BNN
-F1 "ATtiny28V-1PU" 100 -1350 50 H V L TNN
+F1 "ATtiny28V-1P" 100 -1350 50 H V L TNN
 F2 "Package_DIP:DIP-28_W7.62mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATtiny28L-4PU
+ALIAS ATtiny28L-4P
 $FPLIST
  DIP*W7.62mm*
 $ENDFPLIST
@@ -1253,11 +1253,11 @@ X ~RESET~/PB3 6 600 0 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATtiny40-MMH
+# ATtiny40-MM
 #
-DEF ATtiny40-MMH U 0 20 Y Y 1 F N
+DEF ATtiny40-MM U 0 20 Y Y 1 F N
 F0 "U" -500 1250 50 H V L BNN
-F1 "ATtiny40-MMH" 100 -1250 50 H V L TNN
+F1 "ATtiny40-MM" 100 -1250 50 H V L TNN
 F2 "Package_DFN_QFN:QFN-20-1EP_3x3mm_P0.45mm_EP1.6x1.6mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -1289,11 +1289,11 @@ X VCC 9 0 1300 100 D 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
-# ATtiny40-SU
+# ATtiny40-S
 #
-DEF ATtiny40-SU U 0 20 Y Y 1 F N
+DEF ATtiny40-S U 0 20 Y Y 1 F N
 F0 "U" -500 1250 50 H V L BNN
-F1 "ATtiny40-SU" 100 -1250 50 H V L TNN
+F1 "ATtiny40-S" 100 -1250 50 H V L TNN
 F2 "Package_SO:SOIC-20W_7.5x12.8mm_P1.27mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -1324,11 +1324,11 @@ X PA0 9 600 1000 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATtiny40-XU
+# ATtiny40-X
 #
-DEF ATtiny40-XU U 0 20 Y Y 1 F N
+DEF ATtiny40-X U 0 20 Y Y 1 F N
 F0 "U" -500 1250 50 H V L BNN
-F1 "ATtiny40-XU" 100 -1250 50 H V L TNN
+F1 "ATtiny40-X" 100 -1250 50 H V L TNN
 F2 "Package_SO:TSSOP-20_4.4x6.5mm_P0.65mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -1432,11 +1432,11 @@ X PB2 9 600 -400 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATtiny43U-MU
+# ATtiny43U-M
 #
-DEF ATtiny43U-MU U 0 20 Y Y 1 F N
+DEF ATtiny43U-M U 0 20 Y Y 1 F N
 F0 "U" -500 1050 50 H V L BNN
-F1 "ATtiny43U-MU" 100 -1050 50 H V L TNN
+F1 "ATtiny43U-M" 100 -1050 50 H V L TNN
 F2 "Package_DFN_QFN:QFN-20-1EP_4x4mm_P0.5mm_EP2.6x2.6mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -1468,11 +1468,11 @@ X LSW 9 -600 800 100 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# ATtiny43U-SU
+# ATtiny43U-S
 #
-DEF ATtiny43U-SU U 0 20 Y Y 1 F N
+DEF ATtiny43U-S U 0 20 Y Y 1 F N
 F0 "U" -500 1050 50 H V L BNN
-F1 "ATtiny43U-SU" 100 -1050 50 H V L TNN
+F1 "ATtiny43U-S" 100 -1050 50 H V L TNN
 F2 "Package_SO:SOIC-20W_7.5x12.8mm_P1.27mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -1503,16 +1503,16 @@ X VCC 9 0 1100 100 D 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
-# ATtiny441-MMH
+# ATtiny441-M
 #
-DEF ATtiny441-MMH U 0 20 Y Y 1 F N
+DEF ATtiny441-M U 0 20 Y Y 1 F N
 F0 "U" -500 850 50 H V L BNN
-F1 "ATtiny441-MMH" 100 -850 50 H V L TNN
-F2 "Package_DFN_QFN:QFN-20-1EP_3x3mm_P0.45mm_EP1.6x1.6mm" 0 0 50 H I C CIN
+F1 "ATtiny441-M" 100 -850 50 H V L TNN
+F2 "Package_DFN_QFN:QFN-20-1EP_4x4mm_P0.5mm_EP2.6x2.6mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATtiny841-MMH
+ALIAS ATtiny841-M
 $FPLIST
- QFN*1EP*3x3mm*P0.45mm*
+ QFN*1EP*4x4mm*P0.5mm*
 $ENDFPLIST
 DRAW
 S -500 -800 500 800 0 1 10 f
@@ -1540,16 +1540,16 @@ X VCC 9 0 900 100 D 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
-# ATtiny441-MU
+# ATtiny441-MM
 #
-DEF ATtiny441-MU U 0 20 Y Y 1 F N
+DEF ATtiny441-MM U 0 20 Y Y 1 F N
 F0 "U" -500 850 50 H V L BNN
-F1 "ATtiny441-MU" 100 -850 50 H V L TNN
-F2 "Package_DFN_QFN:QFN-20-1EP_4x4mm_P0.5mm_EP2.6x2.6mm" 0 0 50 H I C CIN
+F1 "ATtiny441-MM" 100 -850 50 H V L TNN
+F2 "Package_DFN_QFN:QFN-20-1EP_3x3mm_P0.45mm_EP1.6x1.6mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATtiny841-MU
+ALIAS ATtiny841-MM
 $FPLIST
- QFN*1EP*4x4mm*P0.5mm*
+ QFN*1EP*3x3mm*P0.45mm*
 $ENDFPLIST
 DRAW
 S -500 -800 500 800 0 1 10 f
@@ -1577,14 +1577,14 @@ X VCC 9 0 900 100 D 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
-# ATtiny441-SSU
+# ATtiny441-SS
 #
-DEF ATtiny441-SSU U 0 20 Y Y 1 F N
+DEF ATtiny441-SS U 0 20 Y Y 1 F N
 F0 "U" -500 850 50 H V L BNN
-F1 "ATtiny441-SSU" 100 -850 50 H V L TNN
+F1 "ATtiny441-SS" 100 -850 50 H V L TNN
 F2 "Package_SO:SOIC-14_3.9x8.7mm_P1.27mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATtiny841-SSU
+ALIAS ATtiny841-SS
 $FPLIST
  SOIC*3.9x8.7mm*P1.27mm*
 $ENDFPLIST
@@ -1607,14 +1607,14 @@ X PA4 9 600 200 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATtiny45V-10XU
+# ATtiny45V-10X
 #
-DEF ATtiny45V-10XU U 0 20 Y Y 1 F N
+DEF ATtiny45V-10X U 0 20 Y Y 1 F N
 F0 "U" -500 550 50 H V L BNN
-F1 "ATtiny45V-10XU" 100 -550 50 H V L TNN
+F1 "ATtiny45V-10X" 100 -550 50 H V L TNN
 F2 "Package_SO:TSSOP-8_4.4x3mm_P0.65mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATtiny45-20XU
+ALIAS ATtiny45-20X
 $FPLIST
  TSSOP*4.4x3mm*P0.65mm*
 $ENDFPLIST
@@ -1631,14 +1631,14 @@ X VCC 8 0 600 100 D 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
-# ATtiny461V-10MU
+# ATtiny461V-10M
 #
-DEF ATtiny461V-10MU U 0 20 Y Y 1 F N
+DEF ATtiny461V-10M U 0 20 Y Y 1 F N
 F0 "U" -600 1050 50 H V L BNN
-F1 "ATtiny461V-10MU" 200 -1050 50 H V L TNN
+F1 "ATtiny461V-10M" 200 -1050 50 H V L TNN
 F2 "Package_DFN_QFN:QFN-32-1EP_5x5mm_P0.5mm_EP3.1x3.1mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATtiny461-20MU ATtiny861V-10MU ATtiny861-20MU ATtiny261A-MU ATtiny461A-MU ATtiny861A-MU
+ALIAS ATtiny461-20M ATtiny861V-10M ATtiny861-20M ATtiny261A-M ATtiny461A-M ATtiny861A-M
 $FPLIST
  QFN*1EP*5x5mm*P0.5mm*
 $ENDFPLIST
@@ -1680,14 +1680,14 @@ X NC 9 -600 -100 100 R 50 50 1 1 N N
 ENDDRAW
 ENDDEF
 #
-# ATtiny461V-10PU
+# ATtiny461V-10P
 #
-DEF ATtiny461V-10PU U 0 20 Y Y 1 F N
+DEF ATtiny461V-10P U 0 20 Y Y 1 F N
 F0 "U" -600 1050 50 H V L BNN
-F1 "ATtiny461V-10PU" 200 -1050 50 H V L TNN
+F1 "ATtiny461V-10P" 200 -1050 50 H V L TNN
 F2 "Package_DIP:DIP-20_W7.62mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATtiny461-20PU ATtiny861V-10PU ATtiny861-20PU ATtiny261A-PU ATtiny461A-PU ATtiny861A-PU
+ALIAS ATtiny461-20P ATtiny861V-10P ATtiny861-20P ATtiny261A-P ATtiny461A-P ATtiny861A-P
 $FPLIST
  DIP*W7.62mm*
 $ENDFPLIST
@@ -1716,14 +1716,14 @@ X PB6 9 700 -700 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATtiny461V-10SU
+# ATtiny461V-10S
 #
-DEF ATtiny461V-10SU U 0 20 Y Y 1 F N
+DEF ATtiny461V-10S U 0 20 Y Y 1 F N
 F0 "U" -600 1050 50 H V L BNN
-F1 "ATtiny461V-10SU" 200 -1050 50 H V L TNN
+F1 "ATtiny461V-10S" 200 -1050 50 H V L TNN
 F2 "Package_SO:SOIC-20W_7.5x12.8mm_P1.27mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATtiny461-20SU ATtiny861V-10SU ATtiny861-20SU ATtiny261A-SU ATtiny461A-SU ATtiny861A-SU
+ALIAS ATtiny461-20S ATtiny861V-10S ATtiny861-20S ATtiny261A-S ATtiny461A-S ATtiny861A-S
 $FPLIST
  SOIC*7.5x12.8mm*P1.27mm*
 $ENDFPLIST
@@ -1752,14 +1752,14 @@ X PB6 9 700 -700 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATtiny48-AU
+# ATtiny48-A
 #
-DEF ATtiny48-AU U 0 20 Y Y 1 F N
+DEF ATtiny48-A U 0 20 Y Y 1 F N
 F0 "U" -500 1750 50 H V L BNN
-F1 "ATtiny48-AU" 100 -1750 50 H V L TNN
+F1 "ATtiny48-A" 100 -1750 50 H V L TNN
 F2 "Package_QFP:TQFP-32_7x7mm_P0.8mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATtiny88-AU
+ALIAS ATtiny88-A
 $FPLIST
  TQFP*7x7mm*P0.8mm*
 $ENDFPLIST
@@ -1800,14 +1800,14 @@ X PD5 9 600 -1300 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATtiny48-CCU
+# ATtiny48-CC
 #
-DEF ATtiny48-CCU U 0 20 Y Y 1 F N
+DEF ATtiny48-CC U 0 20 Y Y 1 F N
 F0 "U" -500 1750 50 H V L BNN
-F1 "ATtiny48-CCU" 100 -1750 50 H V L TNN
+F1 "ATtiny48-CC" 100 -1750 50 H V L TNN
 F2 "Package_BGA:UFBGA-32_4.0x4.0mm_Layout6x6_P0.5mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATtiny88-CCU
+ALIAS ATtiny88-CC
 $FPLIST
  UFBGA*4.0x4.0mm*Layout6x6*P0.5mm*
 $ENDFPLIST
@@ -1848,59 +1848,14 @@ X PB4 F6 600 600 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATtiny48-MMU
-#
-DEF ATtiny48-MMU U 0 20 Y Y 1 F N
-F0 "U" -500 1550 50 H V L BNN
-F1 "ATtiny48-MMU" 100 -1550 50 H V L TNN
-F2 "Package_DFN_QFN:QFN-28-1EP_4x4mm_P0.45mm_EP2.4x2.4mm" 0 0 50 H I C CIN
-F3 "" 0 0 50 H I C CNN
-ALIAS ATtiny88-MMU
-$FPLIST
- QFN*1EP*4x4mm*P0.45mm*
-$ENDFPLIST
-DRAW
-S -500 -1500 500 1500 0 1 10 f
-X PD3 1 600 -800 100 L 50 50 1 1 B
-X PB0 10 600 1300 100 L 50 50 1 1 B
-X PB1 11 600 1200 100 L 50 50 1 1 B
-X PB2 12 600 1100 100 L 50 50 1 1 B
-X PB3 13 600 1000 100 L 50 50 1 1 B
-X PB4 14 600 900 100 L 50 50 1 1 B
-X PB5 15 600 800 100 L 50 50 1 1 B
-X AVCC 16 100 1600 100 D 50 50 1 1 W
-X PC7 17 600 -300 100 L 50 50 1 1 B
-X GND 18 0 -1600 100 U 50 50 1 1 P N
-X PC0 19 600 400 100 L 50 50 1 1 B
-X PD4 2 600 -900 100 L 50 50 1 1 B
-X PC1 20 600 300 100 L 50 50 1 1 B
-X PC2 21 600 200 100 L 50 50 1 1 B
-X PC3 22 600 100 100 L 50 50 1 1 B
-X PC4 23 600 0 100 L 50 50 1 1 B
-X PC5 24 600 -100 100 L 50 50 1 1 B
-X ~RESET~/PC6 25 600 -200 100 L 50 50 1 1 B
-X PD0 26 600 -500 100 L 50 50 1 1 B
-X PD1 27 600 -600 100 L 50 50 1 1 B
-X PD2 28 600 -700 100 L 50 50 1 1 B
-X GND 29 0 -1600 100 U 50 50 1 1 P N
-X VCC 3 0 1600 100 D 50 50 1 1 W
-X GND 4 0 -1600 100 U 50 50 1 1 W
-X PB6 5 600 700 100 L 50 50 1 1 B
-X PB7 6 600 600 100 L 50 50 1 1 B
-X PD5 7 600 -1000 100 L 50 50 1 1 B
-X PD6 8 600 -1100 100 L 50 50 1 1 B
-X PD7 9 600 -1200 100 L 50 50 1 1 B
-ENDDRAW
-ENDDEF
-#
-# ATtiny48-MU
+# ATtiny48-M
 #
-DEF ATtiny48-MU U 0 20 Y Y 1 F N
+DEF ATtiny48-M U 0 20 Y Y 1 F N
 F0 "U" -500 1750 50 H V L BNN
-F1 "ATtiny48-MU" 100 -1750 50 H V L TNN
+F1 "ATtiny48-M" 100 -1750 50 H V L TNN
 F2 "Package_DFN_QFN:QFN-32-1EP_5x5mm_P0.5mm_EP3.1x3.1mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATtiny88-MU
+ALIAS ATtiny88-M
 $FPLIST
  QFN*1EP*5x5mm*P0.5mm*
 $ENDFPLIST
@@ -1942,14 +1897,59 @@ X PD5 9 600 -1300 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATtiny48-PU
+# ATtiny48-MM
+#
+DEF ATtiny48-MM U 0 20 Y Y 1 F N
+F0 "U" -500 1550 50 H V L BNN
+F1 "ATtiny48-MM" 100 -1550 50 H V L TNN
+F2 "Package_DFN_QFN:QFN-28-1EP_4x4mm_P0.45mm_EP2.4x2.4mm" 0 0 50 H I C CIN
+F3 "" 0 0 50 H I C CNN
+ALIAS ATtiny88-MM
+$FPLIST
+ QFN*1EP*4x4mm*P0.45mm*
+$ENDFPLIST
+DRAW
+S -500 -1500 500 1500 0 1 10 f
+X PD3 1 600 -800 100 L 50 50 1 1 B
+X PB0 10 600 1300 100 L 50 50 1 1 B
+X PB1 11 600 1200 100 L 50 50 1 1 B
+X PB2 12 600 1100 100 L 50 50 1 1 B
+X PB3 13 600 1000 100 L 50 50 1 1 B
+X PB4 14 600 900 100 L 50 50 1 1 B
+X PB5 15 600 800 100 L 50 50 1 1 B
+X AVCC 16 100 1600 100 D 50 50 1 1 W
+X PC7 17 600 -300 100 L 50 50 1 1 B
+X GND 18 0 -1600 100 U 50 50 1 1 P N
+X PC0 19 600 400 100 L 50 50 1 1 B
+X PD4 2 600 -900 100 L 50 50 1 1 B
+X PC1 20 600 300 100 L 50 50 1 1 B
+X PC2 21 600 200 100 L 50 50 1 1 B
+X PC3 22 600 100 100 L 50 50 1 1 B
+X PC4 23 600 0 100 L 50 50 1 1 B
+X PC5 24 600 -100 100 L 50 50 1 1 B
+X ~RESET~/PC6 25 600 -200 100 L 50 50 1 1 B
+X PD0 26 600 -500 100 L 50 50 1 1 B
+X PD1 27 600 -600 100 L 50 50 1 1 B
+X PD2 28 600 -700 100 L 50 50 1 1 B
+X GND 29 0 -1600 100 U 50 50 1 1 P N
+X VCC 3 0 1600 100 D 50 50 1 1 W
+X GND 4 0 -1600 100 U 50 50 1 1 W
+X PB6 5 600 700 100 L 50 50 1 1 B
+X PB7 6 600 600 100 L 50 50 1 1 B
+X PD5 7 600 -1000 100 L 50 50 1 1 B
+X PD6 8 600 -1100 100 L 50 50 1 1 B
+X PD7 9 600 -1200 100 L 50 50 1 1 B
+ENDDRAW
+ENDDEF
+#
+# ATtiny48-P
 #
-DEF ATtiny48-PU U 0 20 Y Y 1 F N
+DEF ATtiny48-P U 0 20 Y Y 1 F N
 F0 "U" -500 1550 50 H V L BNN
-F1 "ATtiny48-PU" 100 -1550 50 H V L TNN
+F1 "ATtiny48-P" 100 -1550 50 H V L TNN
 F2 "Package_DIP:DIP-28_W7.62mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATtiny88-PU
+ALIAS ATtiny88-P
 $FPLIST
  DIP*W7.62mm*
 $ENDFPLIST
@@ -2122,14 +2122,14 @@ X PA0 9 600 800 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATtiny87-MU
+# ATtiny87-M
 #
-DEF ATtiny87-MU U 0 20 Y Y 1 F N
+DEF ATtiny87-M U 0 20 Y Y 1 F N
 F0 "U" -600 1050 50 H V L BNN
-F1 "ATtiny87-MU" 200 -1050 50 H V L TNN
+F1 "ATtiny87-M" 200 -1050 50 H V L TNN
 F2 "Package_DFN_QFN:QFN-32-1EP_5x5mm_P0.5mm_EP3.1x3.1mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATtiny167-MU
+ALIAS ATtiny167-M
 $FPLIST
  QFN*1EP*5x5mm*P0.5mm*
 $ENDFPLIST
@@ -2171,14 +2171,14 @@ X PA4 9 700 400 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATtiny87-SU
+# ATtiny87-S
 #
-DEF ATtiny87-SU U 0 20 Y Y 1 F N
+DEF ATtiny87-S U 0 20 Y Y 1 F N
 F0 "U" -600 1050 50 H V L BNN
-F1 "ATtiny87-SU" 200 -1050 50 H V L TNN
+F1 "ATtiny87-S" 200 -1050 50 H V L TNN
 F2 "Package_SO:SOIC-20W_7.5x12.8mm_P1.27mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATtiny167-SU
+ALIAS ATtiny167-S
 $FPLIST
  SOIC*7.5x12.8mm*P1.27mm*
 $ENDFPLIST
@@ -2207,14 +2207,14 @@ X PA6 9 700 200 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# ATtiny87-XU
+# ATtiny87-X
 #
-DEF ATtiny87-XU U 0 20 Y Y 1 F N
+DEF ATtiny87-X U 0 20 Y Y 1 F N
 F0 "U" -600 1050 50 H V L BNN
-F1 "ATtiny87-XU" 200 -1050 50 H V L TNN
+F1 "ATtiny87-X" 200 -1050 50 H V L TNN
 F2 "Package_SO:TSSOP-20_4.4x6.5mm_P0.65mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS ATtiny167-XU
+ALIAS ATtiny167-X
 $FPLIST
  TSSOP*4.4x6.5mm*P0.65mm*
 $ENDFPLIST
diff --git a/MCU_Microchip_AVR.dcm b/MCU_Microchip_AVR.dcm
index 3ed7f2170b..4d448232d7 100644
--- a/MCU_Microchip_AVR.dcm
+++ b/MCU_Microchip_AVR.dcm
@@ -1,114 +1,114 @@
 EESchema-DOCLIB  Version 2.0
 #
-$CMP AT90CAN128-16AU
+$CMP AT90CAN128-16A
 D 16MHz, 128kB Flash, 4kB SRAM, 4kB EEPROM, JTAG, CAN, TQFP-64
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc7679.pdf
 $ENDCMP
 #
-$CMP AT90CAN128-16MU
+$CMP AT90CAN128-16M
 D 16MHz, 128kB Flash, 4kB SRAM, 4kB EEPROM, JTAG, CAN, QFN-64
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc7679.pdf
 $ENDCMP
 #
-$CMP AT90CAN32-16AU
+$CMP AT90CAN32-16A
 D 16MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, JTAG, CAN, TQFP-64
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc7679.pdf
 $ENDCMP
 #
-$CMP AT90CAN32-16MU
+$CMP AT90CAN32-16M
 D 16MHz, 32kB Flash, 2kB SRAM, 1kB EEPROM, JTAG, CAN, QFN-64
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc7679.pdf
 $ENDCMP
 #
-$CMP AT90CAN64-16AU
+$CMP AT90CAN64-16A
 D 16MHz, 64kB Flash, 4kB SRAM, 2kB EEPROM, JTAG, CAN, TQFP-64
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc7679.pdf
 $ENDCMP
 #
-$CMP AT90CAN64-16MU
+$CMP AT90CAN64-16M
 D 16MHz, 64kB Flash, 4kB SRAM, 2kB EEPROM, JTAG, CAN, QFN-64
 K AVR 8bit Microcontroller MegaAVR
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc7679.pdf
 $ENDCMP
 #
-$CMP AT90PWM1-16MU
+$CMP AT90PWM1-16M
 D 16MHz, 8kB Flash, 512B SRAM, 512B EEPROM, QFN-32
 K AVR 8bit Microcontroller LightingAVR PWM
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc4378.pdf
 $ENDCMP
 #
-$CMP AT90PWM1-16SU
+$CMP AT90PWM1-16S
 D 16MHz, 8kB Flash, 512B SRAM, 512B EEPROM, SOIC-24
 K AVR 8bit Microcontroller LightingAVR PWM
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc4378.pdf
 $ENDCMP
 #
-$CMP AT90USB1286-AU
+$CMP AT90USB1286-A
 D 16MHz, 128kB Flash, 8kB SRAM, 4kB EEPROM, USB 2.0, TQFP-64
 K AVR 8bit Microcontroller USB
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc7593.pdf
 $ENDCMP
 #
-$CMP AT90USB1286-MU
+$CMP AT90USB1286-M
 D 16MHz, 128kB Flash, 8kB SRAM, 4kB EEPROM, USB 2.0, QFN-64
 K AVR 8bit Microcontroller USB
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc7593.pdf
 $ENDCMP
 #
-$CMP AT90USB1287-AU
+$CMP AT90USB1287-A
 D 16MHz, 128kB Flash, 8kB SRAM, 4kB EEPROM, USB 2.0 OTG, TQFP-64
 K AVR 8bit Microcontroller USB
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc7593.pdf
 $ENDCMP
 #
-$CMP AT90USB1287-MU
+$CMP AT90USB1287-M
 D 16MHz, 128kB Flash, 8kB SRAM, 4kB EEPROM, USB 2.0 OTG, QFN-64
 K AVR 8bit Microcontroller USB
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc7593.pdf
 $ENDCMP
 #
-$CMP AT90USB162-16AU
+$CMP AT90USB162-16A
 D 16MHz, 16kB Flash, 512B SRAM, 512B EEPROM, USB 2.0, TQFP-32
 K AVR 8bit Microcontroller USB
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc7707.pdf
 $ENDCMP
 #
-$CMP AT90USB162-16MU
+$CMP AT90USB162-16M
 D 16MHz, 16kB Flash, 512B SRAM, 512B EEPROM, USB 2.0, QFN-32
 K AVR 8bit Microcontroller USB
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc7707.pdf
 $ENDCMP
 #
-$CMP AT90USB646-AU
+$CMP AT90USB646-A
 D 16MHz, 64kB Flash, 4kB SRAM, 2kB EEPROM, USB 2.0, TQFP-64
 K AVR 8bit Microcontroller USB
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc7593.pdf
 $ENDCMP
 #
-$CMP AT90USB646-MU
+$CMP AT90USB646-M
 D 16MHz, 64kB Flash, 4kB SRAM, 2kB EEPROM, USB 2.0, QFN-64
 K AVR 8bit Microcontroller USB
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc7593.pdf
 $ENDCMP
 #
-$CMP AT90USB647-AU
+$CMP AT90USB647-A
 D 16MHz, 64kB Flash, 4kB SRAM, 2kB EEPROM, USB 2.0 OTG, TQFP-64
 K AVR 8bit Microcontroller USB
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc7593.pdf
 $ENDCMP
 #
-$CMP AT90USB647-MU
+$CMP AT90USB647-M
 D 16MHz, 64kB Flash, 4kB SRAM, 2kB EEPROM, USB 2.0 OTG, QFN-64
 K AVR 8bit Microcontroller USB
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc7593.pdf
 $ENDCMP
 #
-$CMP AT90USB82-16MU
+$CMP AT90USB82-16M
 D 16MHz, 8kB Flash, 512B SRAM, 512B EEPROM, USB 2.0, QFN-32
 K AVR 8bit Microcontroller USB
 F http://ww1.microchip.com/downloads/en/DeviceDoc/doc7707.pdf
diff --git a/MCU_Microchip_AVR.lib b/MCU_Microchip_AVR.lib
index 8ad6d8663d..1d1df46974 100644
--- a/MCU_Microchip_AVR.lib
+++ b/MCU_Microchip_AVR.lib
@@ -1,14 +1,14 @@
 EESchema-LIBRARY Version 2.4
 #encoding utf-8
 #
-# AT90CAN32-16AU
+# AT90CAN32-16A
 #
-DEF AT90CAN32-16AU U 0 20 Y Y 1 F N
+DEF AT90CAN32-16A U 0 20 Y Y 1 F N
 F0 "U" -500 1950 50 H V L BNN
-F1 "AT90CAN32-16AU" 200 -1950 50 H V L TNN
+F1 "AT90CAN32-16A" 200 -1950 50 H V L TNN
 F2 "Package_QFP:TQFP-64_14x14mm_P0.8mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS AT90CAN64-16AU AT90CAN128-16AU
+ALIAS AT90CAN64-16A AT90CAN128-16A
 $FPLIST
  TQFP*14x14mm*P0.8mm*
 $ENDFPLIST
@@ -81,14 +81,14 @@ X PE7 9 -600 -1700 100 R 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# AT90CAN32-16MU
+# AT90CAN32-16M
 #
-DEF AT90CAN32-16MU U 0 20 Y Y 1 F N
+DEF AT90CAN32-16M U 0 20 Y Y 1 F N
 F0 "U" -500 1950 50 H V L BNN
-F1 "AT90CAN32-16MU" 200 -1950 50 H V L TNN
+F1 "AT90CAN32-16M" 200 -1950 50 H V L TNN
 F2 "Package_DFN_QFN:QFN-64-1EP_9x9mm_P0.5mm_EP7.5x7.5mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS AT90CAN64-16MU AT90CAN128-16MU
+ALIAS AT90CAN64-16M AT90CAN128-16M
 $FPLIST
  QFN*1EP*9x9mm*P0.5mm*
 $ENDFPLIST
@@ -162,11 +162,11 @@ X PE7 9 -600 -1700 100 R 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# AT90PWM1-16MU
+# AT90PWM1-16M
 #
-DEF AT90PWM1-16MU U 0 20 Y Y 1 F N
+DEF AT90PWM1-16M U 0 20 Y Y 1 F N
 F0 "U" -600 1250 50 H V L BNN
-F1 "AT90PWM1-16MU" 200 -1250 50 H V L TNN
+F1 "AT90PWM1-16M" 200 -1250 50 H V L TNN
 F2 "Package_DFN_QFN:QFN-32-1EP_7x7mm_P0.65mm_EP4.65x4.65mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -210,11 +210,11 @@ X PB1 9 700 900 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# AT90PWM1-16SU
+# AT90PWM1-16S
 #
-DEF AT90PWM1-16SU U 0 20 Y Y 1 F N
+DEF AT90PWM1-16S U 0 20 Y Y 1 F N
 F0 "U" -600 1250 50 H V L BNN
-F1 "AT90PWM1-16SU" 200 -1250 50 H V L TNN
+F1 "AT90PWM1-16S" 200 -1250 50 H V L TNN
 F2 "Package_SO:SOIC-24W_7.5x15.4mm_P1.27mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -249,11 +249,11 @@ X PB1 9 700 900 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# AT90USB162-16AU
+# AT90USB162-16A
 #
-DEF AT90USB162-16AU U 0 20 Y Y 1 F N
+DEF AT90USB162-16A U 0 20 Y Y 1 F N
 F0 "U" -600 1350 50 H V L BNN
-F1 "AT90USB162-16AU" 100 -1350 50 H V L TNN
+F1 "AT90USB162-16A" 100 -1350 50 H V L TNN
 F2 "Package_QFP:TQFP-32_7x7mm_P0.8mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -296,14 +296,14 @@ X PD3 9 700 -700 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# AT90USB646-AU
+# AT90USB646-A
 #
-DEF AT90USB646-AU U 0 20 Y Y 1 F N
+DEF AT90USB646-A U 0 20 Y Y 1 F N
 F0 "U" -500 1950 50 H V L BNN
-F1 "AT90USB646-AU" 100 -1950 50 H V L TNN
+F1 "AT90USB646-A" 100 -1950 50 H V L TNN
 F2 "Package_QFP:TQFP-64_14x14mm_P0.8mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS AT90USB647-AU AT90USB1286-AU AT90USB1287-AU
+ALIAS AT90USB647-A AT90USB1286-A AT90USB1287-A
 $FPLIST
  TQFP*14x14mm*P0.8mm*
 $ENDFPLIST
@@ -376,14 +376,14 @@ X PE3 9 -600 -400 100 R 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# AT90USB646-MU
+# AT90USB646-M
 #
-DEF AT90USB646-MU U 0 20 Y Y 1 F N
+DEF AT90USB646-M U 0 20 Y Y 1 F N
 F0 "U" -500 1950 50 H V L BNN
-F1 "AT90USB646-MU" 100 -1950 50 H V L TNN
+F1 "AT90USB646-M" 100 -1950 50 H V L TNN
 F2 "Package_DFN_QFN:QFN-64-1EP_9x9mm_P0.5mm_EP7.5x7.5mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS AT90USB647-MU AT90USB1286-MU AT90USB1287-MU
+ALIAS AT90USB647-M AT90USB1286-M AT90USB1287-M
 $FPLIST
  QFN*1EP*9x9mm*P0.5mm*
 $ENDFPLIST
@@ -457,14 +457,14 @@ X PE3 9 -600 -400 100 R 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# AT90USB82-16MU
+# AT90USB82-16M
 #
-DEF AT90USB82-16MU U 0 20 Y Y 1 F N
+DEF AT90USB82-16M U 0 20 Y Y 1 F N
 F0 "U" -600 1350 50 H V L BNN
-F1 "AT90USB82-16MU" 100 -1350 50 H V L TNN
+F1 "AT90USB82-16M" 100 -1350 50 H V L TNN
 F2 "Package_DFN_QFN:QFN-32-1EP_5x5mm_P0.5mm_EP3.6x3.6mm" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS AT90USB162-16MU
+ALIAS AT90USB162-16M
 $FPLIST
  QFN*1EP*5x5mm*P0.5mm*
 $ENDFPLIST
diff --git a/MCU_Microchip_PIC32.dcm b/MCU_Microchip_PIC32.dcm
index 304cf5c182..2bd4437fc4 100644
--- a/MCU_Microchip_PIC32.dcm
+++ b/MCU_Microchip_PIC32.dcm
@@ -1,5 +1,17 @@
 EESchema-DOCLIB  Version 2.0
 #
+$CMP PIC32MK1024GPD100-xPT
+D MIPS MCU, 120MHz, 1MB Flash, 256KB RAM, 2.3-3.6V, USB, TQFP-100
+K 32-bit MIPS MCU Microcontroller
+F http://ww1.microchip.com/downloads/en/DeviceDoc/PIC32MK_GP_MC_Familly_Datasheet_60001402G.pdf
+$ENDCMP
+#
+$CMP PIC32MK1024GPE100-xPT
+D MIPS MCU, 120MHz, 1MB Flash, 256KB RAM, 2.3-3.6V, USB, TQFP-100
+K 32-bit MIPS MCU Microcontroller
+F http://ww1.microchip.com/downloads/en/DeviceDoc/PIC32MK_GP_MC_Familly_Datasheet_60001402G.pdf
+$ENDCMP
+#
 $CMP PIC32MX110F016D-IPT
 D 32-bit Microcontrollers (16KB Flash and 4KB SRAM TQFP-44) with Audio and Graphics Interfaces, USB, and Advanced Analog
 K Microchip PIC32 Microcontroller MIPS
diff --git a/MCU_Microchip_PIC32.lib b/MCU_Microchip_PIC32.lib
index 0514615896..58ecc938e6 100644
--- a/MCU_Microchip_PIC32.lib
+++ b/MCU_Microchip_PIC32.lib
@@ -1,6 +1,122 @@
 EESchema-LIBRARY Version 2.4
 #encoding utf-8
 #
+# PIC32MK1024GPD100-xPT
+#
+DEF PIC32MK1024GPD100-xPT U 0 20 Y Y 1 F N
+F0 "U" -750 2550 50 H V R CNN
+F1 "PIC32MK1024GPD100-xPT" 250 -2650 50 H V L CNN
+F2 "Package_QFP:TQFP-100_12x12mm_P0.4mm" 0 -3150 50 H I C CNN
+F3 "" 0 -3000 50 H I C CNN
+ALIAS PIC32MK1024GPE100-xPT
+$FPLIST
+ TQFP*12x12mm*P0.4mm*
+$ENDFPLIST
+DRAW
+S -1050 2450 1050 -2550 0 1 10 f
+X RG15 1 -1200 -2100 150 R 50 50 1 1 B
+X RG6/VBUSON2 10 -1200 -1200 150 R 50 50 1 1 B
+X RA10/TDO 100 -1200 1800 150 R 50 50 1 1 B
+X RG7 11 -1200 -1300 150 R 50 50 1 1 B
+X RG8 12 -1200 -1400 150 R 50 50 1 1 B
+X ~MCLR~ 13 1200 2200 150 L 50 50 1 1 I
+X RG9 14 -1200 -1500 150 R 50 50 1 1 B
+X VSS 15 -100 -2700 150 U 50 50 1 1 W
+X VDD 16 -400 2600 150 D 50 50 1 1 W
+X RG10 17 -1200 -1600 150 R 50 50 1 1 B
+X RE8 18 -1200 -300 150 R 50 50 1 1 B
+X RE9 19 -1200 -400 150 R 50 50 1 1 B
+X VDD 2 -500 2600 150 D 50 50 1 1 W
+X RA12 20 -1200 1600 150 R 50 50 1 1 B
+X RA11 21 -1200 1700 150 R 50 50 1 1 B
+X RA0 22 -1200 2300 150 R 50 50 1 1 B
+X RA1 23 -1200 2200 150 R 50 50 1 1 B
+X PGD3/RB0 24 1200 2000 150 L 50 50 1 1 B
+X PGC3/RB1 25 1200 1900 150 L 50 50 1 1 B
+X PGC1/RB2 26 1200 1800 150 L 50 50 1 1 B
+X PGD1/RB3 27 1200 1700 150 L 50 50 1 1 B
+X RF9 28 1200 -1300 150 L 50 50 1 1 B
+X RF10 29 1200 -1400 150 L 50 50 1 1 B
+X RA7/TCK 3 -1200 2000 150 R 50 50 1 1 B
+X AVDD 30 200 2600 150 D 50 50 1 1 W
+X AVSS 31 100 -2700 150 U 50 50 1 1 W
+X RC0 32 -1200 1200 150 R 50 50 1 1 B
+X RC1 33 -1200 1100 150 R 50 50 1 1 B
+X RC2 34 -1200 1000 150 R 50 50 1 1 B
+X RC11 35 -1200 400 150 R 50 50 1 1 B
+X VSS 36 -100 -2700 150 U 50 50 1 1 P N
+X VDD 37 -300 2600 150 D 50 50 1 1 W
+X RG11 38 -1200 -1700 150 R 50 50 1 1 B
+X RF13 39 1200 -1600 150 L 50 50 1 1 B
+X RB14/VBUSON1 4 1200 600 150 L 50 50 1 1 B
+X RF12 40 1200 -1500 150 L 50 50 1 1 B
+X RE12 41 -1200 -500 150 R 50 50 1 1 B
+X RE13 42 -1200 -600 150 R 50 50 1 1 B
+X RE14 43 -1200 -700 150 R 50 50 1 1 B
+X RE15 44 -1200 -800 150 R 50 50 1 1 B
+X VSS 45 -100 -2700 150 U 50 50 1 1 P N
+X VDD 46 -200 2600 150 D 50 50 1 1 W
+X RD14 47 1200 -500 150 L 50 50 1 1 B
+X RD15 48 1200 -600 150 L 50 50 1 1 B
+X RA8/TDI 49 -1200 1900 150 R 50 50 1 1 B
+X RB15 5 1200 500 150 L 50 50 1 1 B
+X RB4 50 1200 1600 150 L 50 50 1 1 B
+X RA4 51 -1200 2100 150 R 50 50 1 1 B
+X RE0 52 -1200 -100 150 R 50 50 1 1 B
+X RE1 53 -1200 -200 150 R 50 50 1 1 B
+X VBUS1 54 -1200 -2300 150 R 50 50 1 1 I
+X VUSB3V3 55 100 2600 150 D 50 50 1 1 W
+X D1- 56 1200 -1800 150 L 50 50 1 1 B
+X D1+ 57 1200 -1900 150 L 50 50 1 1 B
+X VBUS2 58 -1200 -2400 150 R 50 50 1 1 I
+X D2- 59 1200 -2100 150 L 50 50 1 1 B
+X RD1 6 1200 300 150 L 50 50 1 1 B
+X D2+ 60 1200 -2200 150 L 50 50 1 1 B
+X RF5 61 1200 -1000 150 L 50 50 1 1 B
+X VDD 62 -100 2600 150 D 50 50 1 1 W
+X RC12/OSCI/CLKI 63 -1200 300 150 R 50 50 1 1 B
+X RC15/OSCO/CLKO 64 -1200 100 150 R 50 50 1 1 B
+X VSS 65 -100 -2700 150 U 50 50 1 1 P N
+X RA14 66 -1200 1500 150 R 50 50 1 1 B
+X RA15 67 -1200 1400 150 R 50 50 1 1 B
+X VBAT 68 400 2600 150 D 50 50 1 1 W
+X PGD2/RB5 69 1200 1500 150 L 50 50 1 1 B
+X RD2 7 1200 200 150 L 50 50 1 1 B
+X PGC2/RB6 70 1200 1400 150 L 50 50 1 1 B
+X RC10 71 -1200 500 150 R 50 50 1 1 B
+X RB7 72 1200 1300 150 L 50 50 1 1 B
+X RC13/SOSCI 73 -1200 200 150 R 50 50 1 1 B
+X SOSCO/RB8 74 1200 1200 150 L 50 50 1 1 B
+X VSS 75 -100 -2700 150 U 50 50 1 1 P N
+X TMS/RB9 76 1200 1100 150 L 50 50 1 1 B
+X RC6 77 -1200 900 150 R 50 50 1 1 B
+X RC7 78 -1200 800 150 R 50 50 1 1 B
+X RD12 79 1200 -300 150 L 50 50 1 1 B
+X RD3 8 1200 100 150 L 50 50 1 1 B
+X RD13 80 1200 -400 150 L 50 50 1 1 B
+X RC8 81 -1200 700 150 R 50 50 1 1 B
+X RD5 82 1200 -100 150 L 50 50 1 1 B
+X RD6 83 1200 -200 150 L 50 50 1 1 B
+X RC9 84 -1200 600 150 R 50 50 1 1 B
+X VSS 85 -100 -2700 150 U 50 50 1 1 P N
+X VDD 86 0 2600 150 D 50 50 1 1 W
+X RF0 87 1200 -800 150 L 50 50 1 1 B
+X RF1 88 1200 -900 150 L 50 50 1 1 B
+X RG1 89 -1200 -1100 150 R 50 50 1 1 B
+X RD4 9 1200 0 150 L 50 50 1 1 B
+X RG0 90 -1200 -1000 150 R 50 50 1 1 B
+X TRCLK/RF6 91 1200 -1100 150 L 50 50 1 1 B
+X TRD3/RF7 92 1200 -1200 150 L 50 50 1 1 B
+X RB10 93 1200 1000 150 L 50 50 1 1 B
+X RB11 94 1200 900 150 L 50 50 1 1 B
+X RG14/TRD2 95 -1200 -2000 150 R 50 50 1 1 B
+X RG12 96 -1200 -1800 150 R 50 50 1 1 B
+X RG13/TRD0 97 -1200 -1900 150 R 50 50 1 1 B
+X RB12 98 1200 800 150 L 50 50 1 1 B
+X RB13 99 1200 700 150 L 50 50 1 1 B
+ENDDRAW
+ENDDEF
+#
 # PIC32MX110F016D-IPT
 #
 DEF PIC32MX110F016D-IPT U 0 40 Y Y 1 F N
diff --git a/MCU_Microchip_SAME.lib b/MCU_Microchip_SAME.lib
index af9901d09d..5a5a234bc6 100644
--- a/MCU_Microchip_SAME.lib
+++ b/MCU_Microchip_SAME.lib
@@ -29,7 +29,7 @@ X PA10 19 -900 400 100 R 50 50 1 1 B
 X PA01 2 -900 1300 100 R 50 50 1 1 B
 X PA11 20 -900 300 100 R 50 50 1 1 B
 X VDDIOB 21 -100 1900 100 D 50 50 1 1 W
-X GND 22 0 -1900 100 U 50 50 1 1 P N
+X GND 22 0 -1900 100 U 50 50 1 1 W
 X PB10 23 900 400 100 L 50 50 1 1 B
 X PB11 24 900 300 100 L 50 50 1 1 B
 X PB12 25 900 200 100 L 50 50 1 1 B
@@ -75,7 +75,7 @@ X PB31 60 900 -700 100 L 50 50 1 1 B
 X PB00 61 900 1400 100 L 50 50 1 1 B
 X PB01 62 900 1300 100 L 50 50 1 1 B
 X PB02 63 900 1200 100 L 50 50 1 1 B
-X GND 7 0 -1900 100 U 50 50 1 1 W
+X GNDANA 7 100 -1900 100 U 50 50 1 1 W
 X VDDANA 8 400 1900 100 D 50 50 1 1 W
 X PB06 9 900 800 100 L 50 50 1 1 B
 ENDDRAW
@@ -108,7 +108,7 @@ X PA10 19 -600 400 100 R 50 50 1 1 B
 X PA01 2 -600 1300 100 R 50 50 1 1 B
 X PA11 20 -600 300 100 R 50 50 1 1 B
 X VDDIOB 21 0 1800 100 D 50 50 1 1 W
-X GND 22 0 -1800 100 U 50 50 1 1 P N
+X GND 22 0 -1800 100 U 50 50 1 1 W
 X PB10 23 600 400 100 L 50 50 1 1 B
 X PB11 24 600 300 100 L 50 50 1 1 B
 X PB12 25 600 200 100 L 50 50 1 1 B
@@ -143,7 +143,7 @@ X PB23 50 600 -500 100 L 50 50 1 1 B
 X PA27 51 -600 -1200 100 R 50 50 1 1 B
 X ~RESET 52 -600 -1600 100 R 50 50 1 1 I
 X VDDCORE 53 -200 1800 100 D 50 50 1 1 w
-X GND 54 0 -1800 100 U 50 50 1 1 W
+X GND 54 0 -1800 100 U 50 50 1 1 P N
 X VSW 55 -300 1800 100 D 50 50 1 1 W
 X VDDIO 56 100 1800 100 D 50 50 1 1 W
 X PA30 57 -600 -1300 100 R 50 50 1 1 B
@@ -156,7 +156,7 @@ X PB01 62 600 1300 100 L 50 50 1 1 B
 X PB02 63 600 1200 100 L 50 50 1 1 B
 X PB03 64 600 1100 100 L 50 50 1 1 B
 X GND 65 0 -1800 100 U 50 50 1 1 P N
-X GND 7 0 -1800 100 U 50 50 1 1 P N
+X GNDANA 7 100 -1800 100 U 50 50 1 1 W
 X VDDANA 8 -100 1800 100 D 50 50 1 1 W
 X PB06 9 600 800 100 L 50 50 1 1 B
 ENDDRAW
diff --git a/MCU_NXP_Kinetis.dcm b/MCU_NXP_Kinetis.dcm
index b536cffd90..070643c92f 100644
--- a/MCU_NXP_Kinetis.dcm
+++ b/MCU_NXP_Kinetis.dcm
@@ -894,4 +894,40 @@ K Kinetis KV11 ARM Cortex M0+
 F https://www.nxp.com/docs/en/data-sheet/KV11P64M75.pdf
 $ENDCMP
 #
+$CMP MKW21Z256VHT
+D Kinetis KW41Z-2.4 GHz, Arm Cortex-M0+, 256kB Flash, 64kB SRAM, generic FSK, LQFN-48
+K Kinetis KW21Z ARM Cortex M0+
+F https://www.nxp.com/docs/en/data-sheet/MKW41Z512.pdf
+$ENDCMP
+#
+$CMP MKW21Z512VHT
+D Kinetis KW41Z-2.4 GHz, Arm Cortex-M0+, 512kB Flash, 128kB SRAM, generic FSK, LQFN-48
+K Kinetis KW21Z ARM Cortex M0+
+F https://www.nxp.com/docs/en/data-sheet/MKW41Z512.pdf
+$ENDCMP
+#
+$CMP MKW31Z256VHT
+D Kinetis KW31Z-2.4 GHz, Arm Cortex-M0+, 256kB Flash, 64kB SRAM, Dual Mode: Bluetooth LE and generic FSK, LQFN-48
+K Kinetis KW31Z ARM Cortex M0+
+F https://www.nxp.com/docs/en/data-sheet/MKW41Z512.pdf
+$ENDCMP
+#
+$CMP MKW31Z512VHT
+D Kinetis KW41Z-2.4 GHz, Arm Cortex-M0+, 512kB Flash, 128kB SRAM, Dual Mode: Bluetooth LE and generic FSK, LQFN-48
+K Kinetis KW31Z ARM Cortex M0+
+F https://www.nxp.com/docs/en/data-sheet/MKW41Z512.pdf
+$ENDCMP
+#
+$CMP MKW41Z256VHT
+D Kinetis KW41Z-2.4 GHz, Arm Cortex-M0+, 256kB Flash, 64kB SRAM, Multi Mode: Bluetooth LE and 802.15.4 Wireless Radio and generic FSK, LQFN-48
+K Kinetis KW41Z ARM Cortex M0+
+F https://www.nxp.com/docs/en/data-sheet/MKW41Z512.pdf
+$ENDCMP
+#
+$CMP MKW41Z512VHT
+D Kinetis KW41Z-2.4 GHz, Arm Cortex-M0+, 512kB Flash, 128kB SRAM, Multi Mode: Bluetooth LE and 802.15.4 Wireless Radio and generic FSK, LQFN-48
+K Kinetis KW41Z ARM Cortex M0+
+F https://www.nxp.com/docs/en/data-sheet/MKW41Z512.pdf
+$ENDCMP
+#
 #End Doc Library
diff --git a/MCU_NXP_Kinetis.lib b/MCU_NXP_Kinetis.lib
index 24ab75c5ec..25e41c8682 100644
--- a/MCU_NXP_Kinetis.lib
+++ b/MCU_NXP_Kinetis.lib
@@ -4913,4 +4913,69 @@ X PTE20 9 700 100 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
+# MKW41Z512VHT
+#
+DEF MKW41Z512VHT U 0 20 Y Y 1 F N
+F0 "U" -800 1750 50 H V C CNN
+F1 "MKW41Z512VHT" 850 1750 50 H V C CNN
+F2 "Package_DFN_QFN:NXP_LQFN-48-1EP_7x7mm_P0.5mm_EP3.5x3.5mm_16xMask0.45x0.45_ThermalVias" -50 0 50 H I C CNN
+F3 "" 0 -100 50 H I C CNN
+ALIAS MKW41Z256VHT MKW31Z256VHT MKW31Z512VHT MKW21Z256VHT MKW21Z512VHT
+$FPLIST
+ NXP*LQFN*1EP*7x7mm*P0.5mm*
+$ENDFPLIST
+DRAW
+S -800 -1700 800 1700 0 1 10 f
+X PTA0 1 900 -500 100 L 50 50 0 0 B
+X VDCDC_IN 10 -900 -600 100 R 50 50 0 0 W
+X DCDC_LP 11 -900 -900 100 R 50 50 0 0 P
+X DCDC_LN 12 -900 -1000 100 R 50 50 0 0 P
+X DCDC_GND 13 0 -1800 100 U 50 50 0 0 W
+X VDD_1P8OUT 14 -300 1800 100 D 50 50 0 0 w
+X VDD_1P5OUT_PMCIN 15 -200 1800 100 D 50 50 0 0 w
+X PTB0 16 900 300 100 L 50 50 0 0 B
+X PTB1 17 900 200 100 L 50 50 0 0 B
+X PTB2 18 900 100 100 L 50 50 0 0 B
+X PTB3 19 900 0 100 L 50 50 0 0 B
+X PTA1 2 900 -600 100 L 50 50 0 0 B
+X VDD_0 20 400 1800 100 D 50 50 0 0 W
+X PTB16 21 900 -100 100 L 50 50 0 0 B
+X PTB17 22 900 -200 100 L 50 50 0 0 B
+X PTB18 23 900 -300 100 L 50 50 0 0 B
+X ADC0_DP0/CMP0_IN0 24 -900 100 100 R 50 50 0 0 I
+X ADC0_DM0/CMP0_IN1 25 -900 200 100 R 50 50 0 0 I
+X VSSA 26 100 -1800 100 U 50 50 0 0 W
+X VREFH/VREF_OUT 27 -500 1800 100 D 50 50 0 0 B
+X VDDA 28 500 1800 100 D 50 50 0 0 W
+X XTAL_OUT 29 -900 800 100 R 50 50 0 0 O
+X PTA2 3 900 -700 100 L 50 50 0 0 B
+X EXTAL 30 -900 900 100 R 50 50 0 0 I
+X XTAL 31 -900 1000 100 R 50 50 0 0 I
+X VDD_RF3 32 -100 1800 100 D 50 50 0 0 W
+X ANT 33 900 -1400 100 L 50 50 0 0 P
+X GANT 34 200 -1800 100 U 50 50 0 0 W
+X VDD_RF2 35 0 1800 100 D 50 50 0 0 W
+X VDD_RF1 36 100 1800 100 D 50 50 0 0 W
+X PTC1 37 900 1500 100 L 50 50 0 0 B
+X PTC2 38 900 1400 100 L 50 50 0 0 B
+X PTC3 39 900 1300 100 L 50 50 0 0 B
+X PTA16 4 900 -800 100 L 50 50 0 0 B
+X PTC4 40 900 1200 100 L 50 50 0 0 B
+X PTC5 41 900 1100 100 L 50 50 0 0 B
+X PTC6 42 900 1000 100 L 50 50 0 0 B
+X PTC7 43 900 900 100 L 50 50 0 0 B
+X VDD_1 44 300 1800 100 D 50 50 0 0 W
+X PTC16 45 900 800 100 L 50 50 0 0 B
+X PTC17 46 900 700 100 L 50 50 0 0 B
+X PTC18 47 900 600 100 L 50 50 0 0 B
+X PTC19 48 900 500 100 L 50 50 0 0 B
+X VSS 49 -100 -1800 100 U 50 50 0 0 W
+X PTA17 5 900 -900 100 L 50 50 0 0 B
+X PTA18 6 900 -1000 100 L 50 50 0 0 B
+X PTA19 7 900 -1100 100 L 50 50 0 0 B
+X PSWITCH 8 -900 -200 100 R 50 50 0 0 I
+X DCDC_CFG 9 -900 -400 100 R 50 50 0 0 I
+ENDDRAW
+ENDDEF
+#
 #End Library
diff --git a/MCU_ST_STM32G0.dcm b/MCU_ST_STM32G0.dcm
new file mode 100644
index 0000000000..f3d1a63788
--- /dev/null
+++ b/MCU_ST_STM32G0.dcm
@@ -0,0 +1,15 @@
+EESchema-DOCLIB  Version 2.0
+#
+$CMP STM32G071KxT
+D ARM Cortex-M0+ MCU, 64/128 kB flash, 36 kB SRAM, 64 MHz, 1.7-3.6 V, 30 GPIO, LQFP-32
+K ARM Cortex-M0+ STM32G0 STM32G071
+F https://www.st.com/resource/en/datasheet/stm32g071kb.pdf
+$ENDCMP
+#
+$CMP STM32G071KxU
+D ARM Cortex-M0+ MCU, 64/128 kB flash, 36 kB SRAM, 64 MHz, 1.7-3.6 V, 30 GPIO, UFQFPN-32
+K ARM Cortex-M0+ STM32G0 STM32G071
+F https://www.st.com/resource/en/datasheet/stm32g071kb.pdf
+$ENDCMP
+#
+#End Doc Library
diff --git a/MCU_ST_STM32G0.lib b/MCU_ST_STM32G0.lib
new file mode 100644
index 0000000000..f957bfc232
--- /dev/null
+++ b/MCU_ST_STM32G0.lib
@@ -0,0 +1,99 @@
+EESchema-LIBRARY Version 2.4
+#encoding utf-8
+#
+# STM32G071KxT
+#
+DEF STM32G071KxT U 0 20 Y Y 1 F N
+F0 "U" -600 1050 50 H V L CNN
+F1 "STM32G071KxT" 50 1050 50 H V L CNN
+F2 "Package_QFP:LQFP-32_7x7mm_P0.8mm" -100 -1050 50 H I R CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ LQFP*7x7mm*P0.8mm*
+$ENDFPLIST
+DRAW
+S -600 -1000 600 1000 0 1 10 f
+X PB9 1 700 -100 100 L 50 50 1 1 B
+X PA3 10 -700 500 100 R 50 50 1 1 B
+X PA4 11 -700 400 100 R 50 50 1 1 B
+X PA5 12 -700 300 100 R 50 50 1 1 B
+X PA6 13 -700 200 100 R 50 50 1 1 B
+X PA7 14 -700 100 100 R 50 50 1 1 B
+X PB0 15 700 800 100 L 50 50 1 1 B
+X PB1 16 700 700 100 L 50 50 1 1 B
+X PB2 17 700 600 100 L 50 50 1 1 B
+X PA8 18 -700 0 100 R 50 50 1 1 B
+X PA9 19 -700 -100 100 R 50 50 1 1 B
+X OSC32_IN/PC14 2 700 -400 100 L 50 50 1 1 B
+X PC6 20 700 -300 100 L 50 50 1 1 B
+X PA10 21 -700 -200 100 R 50 50 1 1 B
+X PA11_[PA9] 22 -700 -300 100 R 50 50 1 1 B
+X PA12_[PA10] 23 -700 -400 100 R 50 50 1 1 B
+X PA13 24 -700 -500 100 R 50 50 1 1 B
+X PA14/BOOT0 25 -700 -600 100 R 50 50 1 1 B
+X PA15 26 -700 -700 100 R 50 50 1 1 B
+X PB3 27 700 500 100 L 50 50 1 1 B
+X PB4 28 700 400 100 L 50 50 1 1 B
+X PB5 29 700 300 100 L 50 50 1 1 B
+X OSC32_OUT/PC15 3 700 -500 100 L 50 50 1 1 B
+X PB6 30 700 200 100 L 50 50 1 1 B
+X PB7 31 700 100 100 L 50 50 1 1 B
+X PB8 32 700 0 100 L 50 50 1 1 B
+X VDD/VDDA 4 0 1100 100 D 50 50 1 1 W
+X VSS/VSSA 5 0 -1100 100 U 50 50 1 1 W
+X ~RST~/PF2 6 700 -700 100 L 50 50 1 1 B
+X PA0 7 -700 800 100 R 50 50 1 1 B
+X PA1 8 -700 700 100 R 50 50 1 1 B
+X PA2 9 -700 600 100 R 50 50 1 1 B
+ENDDRAW
+ENDDEF
+#
+# STM32G071KxU
+#
+DEF STM32G071KxU U 0 20 Y Y 1 F N
+F0 "U" -600 1050 50 H V L CNN
+F1 "STM32G071KxU" 50 1050 50 H V L CNN
+F2 "Package_DFN_QFN:UFQFPN-32-1EP_5x5mm_P0.5mm_EP3.5x3.5mm_ThermalVias" -100 -1050 50 H I R CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ UFQFPN*1EP*5x5mm*P0.5mm*
+$ENDFPLIST
+DRAW
+S -600 -1000 600 1000 0 1 10 f
+X PB9 1 700 -100 100 L 50 50 1 1 B
+X PA3 10 -700 500 100 R 50 50 1 1 B
+X PA4 11 -700 400 100 R 50 50 1 1 B
+X PA5 12 -700 300 100 R 50 50 1 1 B
+X PA6 13 -700 200 100 R 50 50 1 1 B
+X PA7 14 -700 100 100 R 50 50 1 1 B
+X PB0 15 700 800 100 L 50 50 1 1 B
+X PB1 16 700 700 100 L 50 50 1 1 B
+X PB2 17 700 600 100 L 50 50 1 1 B
+X PA8 18 -700 0 100 R 50 50 1 1 B
+X PA9 19 -700 -100 100 R 50 50 1 1 B
+X OSC32_IN/PC14 2 700 -400 100 L 50 50 1 1 B
+X PC6 20 700 -300 100 L 50 50 1 1 B
+X PA10 21 -700 -200 100 R 50 50 1 1 B
+X PA11_[PA9] 22 -700 -300 100 R 50 50 1 1 B
+X PA12_[PA10] 23 -700 -400 100 R 50 50 1 1 B
+X PA13 24 -700 -500 100 R 50 50 1 1 B
+X PA14/BOOT0 25 -700 -600 100 R 50 50 1 1 B
+X PA15 26 -700 -700 100 R 50 50 1 1 B
+X PB3 27 700 500 100 L 50 50 1 1 B
+X PB4 28 700 400 100 L 50 50 1 1 B
+X PB5 29 700 300 100 L 50 50 1 1 B
+X OSC32_OUT/PC15 3 700 -500 100 L 50 50 1 1 B
+X PB6 30 700 200 100 L 50 50 1 1 B
+X PB7 31 700 100 100 L 50 50 1 1 B
+X PB8 32 700 0 100 L 50 50 1 1 B
+X VSS/VSSA 33 0 -1100 100 U 50 50 1 1 P N
+X VDD/VDDA 4 0 1100 100 D 50 50 1 1 W
+X VSS/VSSA 5 0 -1100 100 U 50 50 1 1 W
+X ~RST~/PF2 6 700 -700 100 L 50 50 1 1 B
+X PA0 7 -700 800 100 R 50 50 1 1 B
+X PA1 8 -700 700 100 R 50 50 1 1 B
+X PA2 9 -700 600 100 R 50 50 1 1 B
+ENDDRAW
+ENDDEF
+#
+#End Library
diff --git a/MCU_ST_STM32L4.lib b/MCU_ST_STM32L4.lib
index 6185f60e47..7affcb278e 100644
--- a/MCU_ST_STM32L4.lib
+++ b/MCU_ST_STM32L4.lib
@@ -1,4 +1,4 @@
-EESchema-LIBRARY Version 2.3
+EESchema-LIBRARY Version 2.4
 #encoding utf-8
 #
 # STM32L431CBTx
@@ -14,54 +14,54 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -500 -1400 500 1300 0 1 10 f
-X NRST 7 -600 1200 100 R 50 50 1 1 I
+X VBAT 1 -200 1400 100 D 50 50 1 1 W
 X PA0 10 600 200 100 L 50 50 1 1 B
 X PA1 11 600 100 100 L 50 50 1 1 B
-X PA10 31 600 -800 100 L 50 50 1 1 B
-X PA11 32 600 -900 100 L 50 50 1 1 B
-X PA12 33 600 -1000 100 L 50 50 1 1 B
-X PA13 34 600 -1100 100 L 50 50 1 1 B
-X PA14 37 600 -1200 100 L 50 50 1 1 B
-X PA15 38 600 -1300 100 L 50 50 1 1 B
 X PA2 12 600 0 100 L 50 50 1 1 B
 X PA3 13 600 -100 100 L 50 50 1 1 B
 X PA4 14 600 -200 100 L 50 50 1 1 B
 X PA5 15 600 -300 100 L 50 50 1 1 B
 X PA6 16 600 -400 100 L 50 50 1 1 B
 X PA7 17 600 -500 100 L 50 50 1 1 B
-X PA8 29 600 -600 100 L 50 50 1 1 B
-X PA9 30 600 -700 100 L 50 50 1 1 B
 X PB0 18 -600 200 100 R 50 50 1 1 B
 X PB1 19 -600 100 100 R 50 50 1 1 B
+X PC13 2 -600 600 100 R 50 50 1 1 B
+X PB2 20 -600 0 100 R 50 50 1 1 B
 X PB10 21 -600 -800 100 R 50 50 1 1 B
 X PB11 22 -600 -900 100 R 50 50 1 1 B
+X VSS 23 -200 -1500 100 U 50 50 1 1 W
+X VDD 24 -100 1400 100 D 50 50 1 1 W
 X PB12 25 -600 -1000 100 R 50 50 1 1 B
 X PB13 26 -600 -1100 100 R 50 50 1 1 B
 X PB14 27 -600 -1200 100 R 50 50 1 1 B
 X PB15 28 -600 -1300 100 R 50 50 1 1 B
-X PB2 20 -600 0 100 R 50 50 1 1 B
+X PA8 29 600 -600 100 L 50 50 1 1 B
+X PC14 3 -600 500 100 R 50 50 1 1 B
+X PA9 30 600 -700 100 L 50 50 1 1 B
+X PA10 31 600 -800 100 L 50 50 1 1 B
+X PA11 32 600 -900 100 L 50 50 1 1 B
+X PA12 33 600 -1000 100 L 50 50 1 1 B
+X PA13 34 600 -1100 100 L 50 50 1 1 B
+X VSS 35 -100 -1500 100 U 50 50 1 1 W
+X VDD 36 0 1400 100 D 50 50 1 1 W
+X PA14 37 600 -1200 100 L 50 50 1 1 B
+X PA15 38 600 -1300 100 L 50 50 1 1 B
 X PB3 39 -600 -100 100 R 50 50 1 1 B
+X PC15 4 -600 400 100 R 50 50 1 1 B
 X PB4 40 -600 -200 100 R 50 50 1 1 B
 X PB5 41 -600 -300 100 R 50 50 1 1 B
 X PB6 42 -600 -400 100 R 50 50 1 1 B
 X PB7 43 -600 -500 100 R 50 50 1 1 B
+X PH3 44 -600 800 100 R 50 50 1 1 B
 X PB8 45 -600 -600 100 R 50 50 1 1 B
 X PB9 46 -600 -700 100 R 50 50 1 1 B
-X PC13 2 -600 600 100 R 50 50 1 1 B
-X PC14 3 -600 500 100 R 50 50 1 1 B
-X PC15 4 -600 400 100 R 50 50 1 1 B
+X VSS 47 0 -1500 100 U 50 50 1 1 W
+X VDD 48 100 1400 100 D 50 50 1 1 W
 X PH0 5 -600 1000 100 R 50 50 1 1 I
 X PH1 6 -600 900 100 R 50 50 1 1 I
-X PH3 44 -600 800 100 R 50 50 1 1 B
-X VBAT 1 -200 1400 100 D 50 50 1 1 W
-X VDD 24 -100 1400 100 D 50 50 1 1 W
-X VDD 48 0 1400 100 D 50 50 1 1 W
-X VDDA 9 100 1400 100 D 50 50 1 1 W
-X VDDUSB 36 200 1400 100 D 50 50 1 1 W
-X VSS 23 -200 -1500 100 U 50 50 1 1 W
-X VSS 35 -100 -1500 100 U 50 50 1 1 W
-X VSS 47 0 -1500 100 U 50 50 1 1 W
+X NRST 7 -600 1200 100 R 50 50 1 1 I
 X VSSA 8 100 -1500 100 U 50 50 1 1 W
+X VDDA 9 200 1400 100 D 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
@@ -78,55 +78,55 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -500 -1400 500 1300 0 1 10 f
-X NRST 7 -600 1200 100 R 50 50 1 1 I
+X VBAT 1 -200 1400 100 D 50 50 1 1 W
 X PA0 10 600 200 100 L 50 50 1 1 B
 X PA1 11 600 100 100 L 50 50 1 1 B
-X PA10 31 600 -800 100 L 50 50 1 1 B
-X PA11 32 600 -900 100 L 50 50 1 1 B
-X PA12 33 600 -1000 100 L 50 50 1 1 B
-X PA13 34 600 -1100 100 L 50 50 1 1 B
-X PA14 37 600 -1200 100 L 50 50 1 1 B
-X PA15 38 600 -1300 100 L 50 50 1 1 B
 X PA2 12 600 0 100 L 50 50 1 1 B
 X PA3 13 600 -100 100 L 50 50 1 1 B
 X PA4 14 600 -200 100 L 50 50 1 1 B
 X PA5 15 600 -300 100 L 50 50 1 1 B
 X PA6 16 600 -400 100 L 50 50 1 1 B
 X PA7 17 600 -500 100 L 50 50 1 1 B
-X PA8 29 600 -600 100 L 50 50 1 1 B
-X PA9 30 600 -700 100 L 50 50 1 1 B
 X PB0 18 -600 200 100 R 50 50 1 1 B
 X PB1 19 -600 100 100 R 50 50 1 1 B
+X PC13 2 -600 600 100 R 50 50 1 1 B
+X PB2 20 -600 0 100 R 50 50 1 1 B
 X PB10 21 -600 -800 100 R 50 50 1 1 B
 X PB11 22 -600 -900 100 R 50 50 1 1 B
+X VSS 23 -200 -1500 100 U 50 50 1 1 W
+X VDD 24 -100 1400 100 D 50 50 1 1 W
 X PB12 25 -600 -1000 100 R 50 50 1 1 B
 X PB13 26 -600 -1100 100 R 50 50 1 1 B
 X PB14 27 -600 -1200 100 R 50 50 1 1 B
 X PB15 28 -600 -1300 100 R 50 50 1 1 B
-X PB2 20 -600 0 100 R 50 50 1 1 B
+X PA8 29 600 -600 100 L 50 50 1 1 B
+X PC14 3 -600 500 100 R 50 50 1 1 B
+X PA9 30 600 -700 100 L 50 50 1 1 B
+X PA10 31 600 -800 100 L 50 50 1 1 B
+X PA11 32 600 -900 100 L 50 50 1 1 B
+X PA12 33 600 -1000 100 L 50 50 1 1 B
+X PA13 34 600 -1100 100 L 50 50 1 1 B
+X VSS 35 -100 -1500 100 U 50 50 1 1 W
+X VDD 36 0 1400 100 D 50 50 1 1 W
+X PA14 37 600 -1200 100 L 50 50 1 1 B
+X PA15 38 600 -1300 100 L 50 50 1 1 B
 X PB3 39 -600 -100 100 R 50 50 1 1 B
+X PC15 4 -600 400 100 R 50 50 1 1 B
 X PB4 40 -600 -200 100 R 50 50 1 1 B
 X PB5 41 -600 -300 100 R 50 50 1 1 B
 X PB6 42 -600 -400 100 R 50 50 1 1 B
 X PB7 43 -600 -500 100 R 50 50 1 1 B
+X PH3 44 -600 800 100 R 50 50 1 1 B
 X PB8 45 -600 -600 100 R 50 50 1 1 B
 X PB9 46 -600 -700 100 R 50 50 1 1 B
-X PC13 2 -600 600 100 R 50 50 1 1 B
-X PC14 3 -600 500 100 R 50 50 1 1 B
-X PC15 4 -600 400 100 R 50 50 1 1 B
-X PH0 5 -600 1000 100 R 50 50 1 1 I
-X PH1 6 -600 900 100 R 50 50 1 1 I
-X PH3 44 -600 800 100 R 50 50 1 1 B
-X VBAT 1 -200 1400 100 D 50 50 1 1 W
-X VDD 24 -100 1400 100 D 50 50 1 1 W
-X VDD 48 0 1400 100 D 50 50 1 1 W
-X VDDA 9 100 1400 100 D 50 50 1 1 W
-X VDDUSB 36 200 1400 100 D 50 50 1 1 W
-X VSS 23 -200 -1500 100 U 50 50 1 1 W
-X VSS 35 -100 -1500 100 U 50 50 1 1 W
 X VSS 47 0 -1500 100 U 50 50 1 1 W
+X VDD 48 100 1400 100 D 50 50 1 1 W
 X VSS 49 100 -1500 100 U 50 50 1 1 W
+X PH0 5 -600 1000 100 R 50 50 1 1 I
+X PH1 6 -600 900 100 R 50 50 1 1 I
+X NRST 7 -600 1200 100 R 50 50 1 1 I
 X VSSA 8 200 -1500 100 U 50 50 1 1 W
+X VDDA 9 200 1400 100 D 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
@@ -143,55 +143,55 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -500 -1400 500 1400 0 1 10 f
-X NRST D5 -600 1300 100 R 50 50 1 1 I
-X PA0 F6 600 200 100 L 50 50 1 1 B
-X PA1 G7 600 100 100 L 50 50 1 1 B
-X PA10 C2 600 -800 100 L 50 50 1 1 B
-X PA11 C1 600 -900 100 L 50 50 1 1 B
-X PA12 C3 600 -1000 100 L 50 50 1 1 B
-X PA13 B2 600 -1100 100 L 50 50 1 1 B
+X VDD A1 -100 1500 100 D 50 50 1 1 W
 X PA14 A2 600 -1200 100 L 50 50 1 1 B
-X PA15 B3 600 -1300 100 L 50 50 1 1 B
-X PA2 E5 600 0 100 L 50 50 1 1 B
-X PA3 E4 600 -100 100 L 50 50 1 1 B
-X PA4 G6 600 -200 100 L 50 50 1 1 B
-X PA5 F5 600 -300 100 L 50 50 1 1 B
-X PA6 F4 600 -400 100 L 50 50 1 1 B
-X PA7 F3 600 -500 100 L 50 50 1 1 B
-X PA8 D1 600 -600 100 L 50 50 1 1 B
-X PA9 D2 600 -700 100 L 50 50 1 1 B
-X PB0 G5 -600 200 100 R 50 50 1 1 B
-X PB1 G4 -600 100 100 R 50 50 1 1 B
-X PB10 E3 -600 -800 100 R 50 50 1 1 B
-X PB11 F2 -600 -900 100 R 50 50 1 1 B
-X PB12 F1 -600 -1000 100 R 50 50 1 1 B
-X PB13 E2 -600 -1100 100 R 50 50 1 1 B
-X PB14 E1 -600 -1200 100 R 50 50 1 1 B
-X PB15 D3 -600 -1300 100 R 50 50 1 1 B
-X PB2 G3 -600 0 100 R 50 50 1 1 B
 X PB3 A3 -600 -100 100 R 50 50 1 1 B
 X PB4 A4 -600 -200 100 R 50 50 1 1 B
+X PH3 A5 -600 900 100 R 50 50 1 1 B
+X VSS A6 -200 -1500 100 U 50 50 1 1 W
+X VDD A7 0 1500 100 D 50 50 1 1 W
+X VSS B1 -100 -1500 100 U 50 50 1 1 W
+X PA13 B2 600 -1100 100 L 50 50 1 1 B
+X PA15 B3 600 -1300 100 L 50 50 1 1 B
 X PB5 B4 -600 -300 100 R 50 50 1 1 B
-X PB6 C4 -600 -400 100 R 50 50 1 1 B
-X PB7 D4 -600 -500 100 R 50 50 1 1 B
 X PB8 B5 -600 -600 100 R 50 50 1 1 B
-X PB9 C5 -600 -700 100 R 50 50 1 1 B
+X VBAT B6 -200 1500 100 D 50 50 1 1 W
 X PC13 B7 -600 600 100 R 50 50 1 1 B
-X PC14 C7 -600 500 100 R 50 50 1 1 B
+X PA11 C1 600 -900 100 L 50 50 1 1 B
+X PA10 C2 600 -800 100 L 50 50 1 1 B
+X PA12 C3 600 -1000 100 L 50 50 1 1 B
+X PB6 C4 -600 -400 100 R 50 50 1 1 B
+X PB9 C5 -600 -700 100 R 50 50 1 1 B
 X PC15 C6 -600 400 100 R 50 50 1 1 B
-X PC3 E6 -600 700 100 R 50 50 1 1 B
-X PH0 D7 -600 1100 100 R 50 50 1 1 I
+X PC14 C7 -600 500 100 R 50 50 1 1 B
+X PA8 D1 600 -600 100 L 50 50 1 1 B
+X PA9 D2 600 -700 100 L 50 50 1 1 B
+X PB15 D3 -600 -1300 100 R 50 50 1 1 B
+X PB7 D4 -600 -500 100 R 50 50 1 1 B
+X NRST D5 -600 1300 100 R 50 50 1 1 I
 X PH1 D6 -600 1000 100 R 50 50 1 1 I
-X PH3 A5 -600 900 100 R 50 50 1 1 B
-X VBAT B6 -200 1500 100 D 50 50 1 1 W
-X VDD A7 -100 1500 100 D 50 50 1 1 W
-X VDD G1 0 1500 100 D 50 50 1 1 W
-X VDDA F7 100 1500 100 D 50 50 1 1 W
-X VDDUSB A1 200 1500 100 D 50 50 1 1 W
-X VSS A6 -200 -1500 100 U 50 50 1 1 W
-X VSS B1 -100 -1500 100 U 50 50 1 1 W
-X VSS G2 0 -1500 100 U 50 50 1 1 W
+X PH0 D7 -600 1100 100 R 50 50 1 1 I
+X PB14 E1 -600 -1200 100 R 50 50 1 1 B
+X PB13 E2 -600 -1100 100 R 50 50 1 1 B
+X PB10 E3 -600 -800 100 R 50 50 1 1 B
+X PA3 E4 600 -100 100 L 50 50 1 1 B
+X PA2 E5 600 0 100 L 50 50 1 1 B
+X PC3 E6 -600 700 100 R 50 50 1 1 B
 X VSSA E7 100 -1500 100 U 50 50 1 1 W
+X PB12 F1 -600 -1000 100 R 50 50 1 1 B
+X PB11 F2 -600 -900 100 R 50 50 1 1 B
+X PA7 F3 600 -500 100 L 50 50 1 1 B
+X PA6 F4 600 -400 100 L 50 50 1 1 B
+X PA5 F5 600 -300 100 L 50 50 1 1 B
+X PA0 F6 600 200 100 L 50 50 1 1 B
+X VDDA F7 200 1500 100 D 50 50 1 1 W
+X VDD G1 100 1500 100 D 50 50 1 1 W
+X VSS G2 0 -1500 100 U 50 50 1 1 W
+X PB2 G3 -600 0 100 R 50 50 1 1 B
+X PB1 G4 -600 100 100 R 50 50 1 1 B
+X PB0 G5 -600 200 100 R 50 50 1 1 B
+X PA4 G6 600 -200 100 L 50 50 1 1 B
+X PA1 G7 600 100 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
@@ -208,39 +208,39 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -400 -900 400 800 0 1 10 f
-X NRST 4 -500 700 100 R 50 50 1 1 I
-X PA0 6 500 700 100 L 50 50 1 1 B
-X PA1 7 500 600 100 L 50 50 1 1 B
-X PA10 20 500 -300 100 L 50 50 1 1 B
-X PA11 21 500 -400 100 L 50 50 1 1 B
-X PA12 22 500 -500 100 L 50 50 1 1 B
-X PA13 23 500 -600 100 L 50 50 1 1 B
-X PA14 24 500 -700 100 L 50 50 1 1 B
-X PA15 25 500 -800 100 L 50 50 1 1 B
-X PA2 8 500 500 100 L 50 50 1 1 B
-X PA3 9 500 400 100 L 50 50 1 1 B
+X VDD 1 -100 900 100 D 50 50 1 1 W
 X PA4 10 500 300 100 L 50 50 1 1 B
 X PA5 11 500 200 100 L 50 50 1 1 B
 X PA6 12 500 100 100 L 50 50 1 1 B
 X PA7 13 500 0 100 L 50 50 1 1 B
-X PA8 18 500 -100 100 L 50 50 1 1 B
-X PA9 19 500 -200 100 L 50 50 1 1 B
 X PB0 14 -500 -200 100 R 50 50 1 1 B
 X PB1 15 -500 -300 100 R 50 50 1 1 B
+X VSS 16 -100 -1000 100 U 50 50 1 1 W
+X VDD 17 0 900 100 D 50 50 1 1 W
+X PA8 18 500 -100 100 L 50 50 1 1 B
+X PA9 19 500 -200 100 L 50 50 1 1 B
+X PC14 2 -500 100 100 R 50 50 1 1 B
+X PA10 20 500 -300 100 L 50 50 1 1 B
+X PA11 21 500 -400 100 L 50 50 1 1 B
+X PA12 22 500 -500 100 L 50 50 1 1 B
+X PA13 23 500 -600 100 L 50 50 1 1 B
+X PA14 24 500 -700 100 L 50 50 1 1 B
+X PA15 25 500 -800 100 L 50 50 1 1 B
 X PB3 26 -500 -400 100 R 50 50 1 1 B
 X PB4 27 -500 -500 100 R 50 50 1 1 B
 X PB5 28 -500 -600 100 R 50 50 1 1 B
 X PB6 29 -500 -700 100 R 50 50 1 1 B
-X PB7 30 -500 -800 100 R 50 50 1 1 B
-X PC14 2 -500 100 100 R 50 50 1 1 B
 X PC15 3 -500 0 100 R 50 50 1 1 B
+X PB7 30 -500 -800 100 R 50 50 1 1 B
 X PH3 31 -500 300 100 R 50 50 1 1 B
-X VDD 1 -100 900 100 D 50 50 1 1 W
-X VDD 17 0 900 100 D 50 50 1 1 W
-X VDDA 5 100 900 100 D 50 50 1 1 W
-X VSS 16 -100 -1000 100 U 50 50 1 1 W
 X VSS 32 0 -1000 100 U 50 50 1 1 W
 X VSS 33 100 -1000 100 U 50 50 1 1 W
+X NRST 4 -500 700 100 R 50 50 1 1 I
+X VDDA 5 100 900 100 D 50 50 1 1 W
+X PA0 6 500 700 100 L 50 50 1 1 B
+X PA1 7 500 600 100 L 50 50 1 1 B
+X PA2 8 500 500 100 L 50 50 1 1 B
+X PA3 9 500 400 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
@@ -257,70 +257,70 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -600 -1700 500 1700 0 1 10 f
-X NRST E1 -700 1600 100 R 50 50 1 1 I
-X PA0 G2 600 1600 100 L 50 50 1 1 B
-X PA1 H2 600 1500 100 L 50 50 1 1 B
+X PC14 A1 -700 -1500 100 R 50 50 1 1 B
+X PC13 A2 -700 -1400 100 R 50 50 1 1 B
+X PB9 A3 600 -1000 100 L 50 50 1 1 B
+X PB4 A4 600 -500 100 L 50 50 1 1 B
+X PB3 A5 600 -400 100 L 50 50 1 1 B
+X PA15 A6 600 100 100 L 50 50 1 1 B
+X PA14 A7 600 200 100 L 50 50 1 1 B
+X PA13 A8 600 300 100 L 50 50 1 1 B
+X PC15 B1 -700 -1600 100 R 50 50 1 1 B
+X VBAT B2 -300 1800 100 D 50 50 1 1 W
+X PB8 B3 600 -900 100 L 50 50 1 1 B
+X PH3 B4 -700 300 100 R 50 50 1 1 B
+X PD2 B5 -700 100 100 R 50 50 1 1 B
+X PC11 B6 -700 -1200 100 R 50 50 1 1 B
+X PC10 B7 -700 -1100 100 R 50 50 1 1 B
+X PA12 B8 600 400 100 L 50 50 1 1 B
+X PH0 C1 -700 500 100 R 50 50 1 1 I
+X VSS C2 -300 -1800 100 U 50 50 1 1 W
+X PB7 C3 600 -800 100 L 50 50 1 1 B
+X PB5 C4 600 -600 100 L 50 50 1 1 B
+X PC12 C5 -700 -1300 100 R 50 50 1 1 B
 X PA10 C6 600 600 100 L 50 50 1 1 B
+X PA9 C7 600 700 100 L 50 50 1 1 B
 X PA11 C8 600 500 100 L 50 50 1 1 B
-X PA12 B8 600 400 100 L 50 50 1 1 B
-X PA13 A8 600 300 100 L 50 50 1 1 B
-X PA14 A7 600 200 100 L 50 50 1 1 B
-X PA15 A6 600 100 100 L 50 50 1 1 B
+X PH1 D1 -700 400 100 R 50 50 1 1 I
+X VDD D2 -200 1800 100 D 50 50 1 1 W
+X PB6 D3 600 -700 100 L 50 50 1 1 B
+X VSS D4 -200 -1800 100 U 50 50 1 1 W
+X VSS D5 -100 -1800 100 U 50 50 1 1 W
+X VSS D6 0 -1800 100 U 50 50 1 1 W
+X PA8 D7 600 800 100 L 50 50 1 1 B
+X PC9 D8 -700 -1000 100 R 50 50 1 1 B
+X NRST E1 -700 1600 100 R 50 50 1 1 I
+X PC1 E2 -700 -200 100 R 50 50 1 1 B
+X PC0 E3 -700 -100 100 R 50 50 1 1 B
+X VDD E4 -100 1800 100 D 50 50 1 1 W
+X VDD E5 0 1800 100 D 50 50 1 1 W
+X VDD E6 100 1800 100 D 50 50 1 1 W
+X PC7 E7 -700 -800 100 R 50 50 1 1 B
+X PC8 E8 -700 -900 100 R 50 50 1 1 B
+X VSSA F1 100 -1800 100 U 50 50 1 1 W
+X PC2 F2 -700 -300 100 R 50 50 1 1 B
 X PA2 F3 600 1400 100 L 50 50 1 1 B
-X PA3 G3 600 1300 100 L 50 50 1 1 B
-X PA4 H3 600 1200 100 L 50 50 1 1 B
 X PA5 F4 600 1100 100 L 50 50 1 1 B
-X PA6 G4 600 1000 100 L 50 50 1 1 B
-X PA7 H4 600 900 100 L 50 50 1 1 B
-X PA8 D7 600 800 100 L 50 50 1 1 B
-X PA9 C7 600 700 100 L 50 50 1 1 B
 X PB0 F5 600 -100 100 L 50 50 1 1 B
-X PB1 G5 600 -200 100 L 50 50 1 1 B
-X PB10 G7 600 -1100 100 L 50 50 1 1 B
-X PB11 H7 600 -1200 100 L 50 50 1 1 B
-X PB12 H8 600 -1300 100 L 50 50 1 1 B
-X PB13 G8 600 -1400 100 L 50 50 1 1 B
-X PB14 F8 600 -1500 100 L 50 50 1 1 B
+X PC6 F6 -700 -700 100 R 50 50 1 1 B
 X PB15 F7 600 -1600 100 L 50 50 1 1 B
-X PB2 G6 600 -300 100 L 50 50 1 1 B
-X PB3 A5 600 -400 100 L 50 50 1 1 B
-X PB4 A4 600 -500 100 L 50 50 1 1 B
-X PB5 C4 600 -600 100 L 50 50 1 1 B
-X PB6 D3 600 -700 100 L 50 50 1 1 B
-X PB7 C3 600 -800 100 L 50 50 1 1 B
-X PB8 B3 600 -900 100 L 50 50 1 1 B
-X PB9 A3 600 -1000 100 L 50 50 1 1 B
-X PC0 E3 -700 -100 100 R 50 50 1 1 B
-X PC1 E2 -700 -200 100 R 50 50 1 1 B
-X PC10 B7 -700 -1100 100 R 50 50 1 1 B
-X PC11 B6 -700 -1200 100 R 50 50 1 1 B
-X PC12 C5 -700 -1300 100 R 50 50 1 1 B
-X PC13 A2 -700 -1400 100 R 50 50 1 1 B
-X PC14 A1 -700 -1500 100 R 50 50 1 1 B
-X PC15 B1 -700 -1600 100 R 50 50 1 1 B
-X PC2 F2 -700 -300 100 R 50 50 1 1 B
+X PB14 F8 600 -1500 100 L 50 50 1 1 B
 X PC3 G1 -700 -400 100 R 50 50 1 1 B
+X PA0 G2 600 1600 100 L 50 50 1 1 B
+X PA3 G3 600 1300 100 L 50 50 1 1 B
+X PA6 G4 600 1000 100 L 50 50 1 1 B
+X PB1 G5 600 -200 100 L 50 50 1 1 B
+X PB2 G6 600 -300 100 L 50 50 1 1 B
+X PB10 G7 600 -1100 100 L 50 50 1 1 B
+X PB13 G8 600 -1400 100 L 50 50 1 1 B
+X VDDA H1 200 1800 100 D 50 50 1 1 W
+X PA1 H2 600 1500 100 L 50 50 1 1 B
+X PA4 H3 600 1200 100 L 50 50 1 1 B
+X PA7 H4 600 900 100 L 50 50 1 1 B
 X PC4 H5 -700 -500 100 R 50 50 1 1 B
 X PC5 H6 -700 -600 100 R 50 50 1 1 B
-X PC6 F6 -700 -700 100 R 50 50 1 1 B
-X PC7 E7 -700 -800 100 R 50 50 1 1 B
-X PC8 E8 -700 -900 100 R 50 50 1 1 B
-X PC9 D8 -700 -1000 100 R 50 50 1 1 B
-X PD2 B5 -700 100 100 R 50 50 1 1 B
-X PH0 C1 -700 500 100 R 50 50 1 1 I
-X PH1 D1 -700 400 100 R 50 50 1 1 I
-X PH3 B4 -700 300 100 R 50 50 1 1 B
-X VBAT B2 -300 1800 100 D 50 50 1 1 W
-X VDD D2 -200 1800 100 D 50 50 1 1 W
-X VDD E4 -100 1800 100 D 50 50 1 1 W
-X VDD E6 0 1800 100 D 50 50 1 1 W
-X VDDA H1 100 1800 100 D 50 50 1 1 W
-X VDDUSB E5 200 1800 100 D 50 50 1 1 W
-X VSS C2 -300 -1800 100 U 50 50 1 1 W
-X VSS D4 -200 -1800 100 U 50 50 1 1 W
-X VSS D5 -100 -1800 100 U 50 50 1 1 W
-X VSS D6 0 -1800 100 U 50 50 1 1 W
-X VSSA F1 100 -1800 100 U 50 50 1 1 W
+X PB11 H7 600 -1200 100 L 50 50 1 1 B
+X PB12 H8 600 -1300 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
@@ -337,70 +337,70 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -600 -1700 500 1700 0 1 10 f
-X NRST 7 -700 1600 100 R 50 50 1 1 I
+X VBAT 1 -300 1800 100 D 50 50 1 1 W
+X PC2 10 -700 -300 100 R 50 50 1 1 B
+X PC3 11 -700 -400 100 R 50 50 1 1 B
+X VSSA 12 100 -1800 100 U 50 50 1 1 W
+X VDDA 13 200 1800 100 D 50 50 1 1 W
 X PA0 14 600 1600 100 L 50 50 1 1 B
 X PA1 15 600 1500 100 L 50 50 1 1 B
-X PA10 43 600 600 100 L 50 50 1 1 B
-X PA11 44 600 500 100 L 50 50 1 1 B
-X PA12 45 600 400 100 L 50 50 1 1 B
-X PA13 46 600 300 100 L 50 50 1 1 B
-X PA14 49 600 200 100 L 50 50 1 1 B
-X PA15 50 600 100 100 L 50 50 1 1 B
 X PA2 16 600 1400 100 L 50 50 1 1 B
 X PA3 17 600 1300 100 L 50 50 1 1 B
+X VSS 18 -300 -1800 100 U 50 50 1 1 W
+X VDD 19 -200 1800 100 D 50 50 1 1 W
+X PC13 2 -700 -1400 100 R 50 50 1 1 B
 X PA4 20 600 1200 100 L 50 50 1 1 B
 X PA5 21 600 1100 100 L 50 50 1 1 B
 X PA6 22 600 1000 100 L 50 50 1 1 B
 X PA7 23 600 900 100 L 50 50 1 1 B
-X PA8 41 600 800 100 L 50 50 1 1 B
-X PA9 42 600 700 100 L 50 50 1 1 B
+X PC4 24 -700 -500 100 R 50 50 1 1 B
+X PC5 25 -700 -600 100 R 50 50 1 1 B
 X PB0 26 600 -100 100 L 50 50 1 1 B
 X PB1 27 600 -200 100 L 50 50 1 1 B
+X PB2 28 600 -300 100 L 50 50 1 1 B
 X PB10 29 600 -1100 100 L 50 50 1 1 B
+X PC14 3 -700 -1500 100 R 50 50 1 1 B
 X PB11 30 600 -1200 100 L 50 50 1 1 B
+X VSS 31 -200 -1800 100 U 50 50 1 1 W
+X VDD 32 -100 1800 100 D 50 50 1 1 W
 X PB12 33 600 -1300 100 L 50 50 1 1 B
 X PB13 34 600 -1400 100 L 50 50 1 1 B
 X PB14 35 600 -1500 100 L 50 50 1 1 B
 X PB15 36 600 -1600 100 L 50 50 1 1 B
-X PB2 28 600 -300 100 L 50 50 1 1 B
+X PC6 37 -700 -700 100 R 50 50 1 1 B
+X PC7 38 -700 -800 100 R 50 50 1 1 B
+X PC8 39 -700 -900 100 R 50 50 1 1 B
+X PC15 4 -700 -1600 100 R 50 50 1 1 B
+X PC9 40 -700 -1000 100 R 50 50 1 1 B
+X PA8 41 600 800 100 L 50 50 1 1 B
+X PA9 42 600 700 100 L 50 50 1 1 B
+X PA10 43 600 600 100 L 50 50 1 1 B
+X PA11 44 600 500 100 L 50 50 1 1 B
+X PA12 45 600 400 100 L 50 50 1 1 B
+X PA13 46 600 300 100 L 50 50 1 1 B
+X VSS 47 -100 -1800 100 U 50 50 1 1 W
+X VDD 48 0 1800 100 D 50 50 1 1 W
+X PA14 49 600 200 100 L 50 50 1 1 B
+X PH0 5 -700 500 100 R 50 50 1 1 I
+X PA15 50 600 100 100 L 50 50 1 1 B
+X PC10 51 -700 -1100 100 R 50 50 1 1 B
+X PC11 52 -700 -1200 100 R 50 50 1 1 B
+X PC12 53 -700 -1300 100 R 50 50 1 1 B
+X PD2 54 -700 100 100 R 50 50 1 1 B
 X PB3 55 600 -400 100 L 50 50 1 1 B
 X PB4 56 600 -500 100 L 50 50 1 1 B
 X PB5 57 600 -600 100 L 50 50 1 1 B
 X PB6 58 600 -700 100 L 50 50 1 1 B
 X PB7 59 600 -800 100 L 50 50 1 1 B
+X PH1 6 -700 400 100 R 50 50 1 1 I
+X PH3 60 -700 300 100 R 50 50 1 1 B
 X PB8 61 600 -900 100 L 50 50 1 1 B
 X PB9 62 600 -1000 100 L 50 50 1 1 B
+X VSS 63 0 -1800 100 U 50 50 1 1 W
+X VDD 64 100 1800 100 D 50 50 1 1 W
+X NRST 7 -700 1600 100 R 50 50 1 1 I
 X PC0 8 -700 -100 100 R 50 50 1 1 B
 X PC1 9 -700 -200 100 R 50 50 1 1 B
-X PC10 51 -700 -1100 100 R 50 50 1 1 B
-X PC11 52 -700 -1200 100 R 50 50 1 1 B
-X PC12 53 -700 -1300 100 R 50 50 1 1 B
-X PC13 2 -700 -1400 100 R 50 50 1 1 B
-X PC14 3 -700 -1500 100 R 50 50 1 1 B
-X PC15 4 -700 -1600 100 R 50 50 1 1 B
-X PC2 10 -700 -300 100 R 50 50 1 1 B
-X PC3 11 -700 -400 100 R 50 50 1 1 B
-X PC4 24 -700 -500 100 R 50 50 1 1 B
-X PC5 25 -700 -600 100 R 50 50 1 1 B
-X PC6 37 -700 -700 100 R 50 50 1 1 B
-X PC7 38 -700 -800 100 R 50 50 1 1 B
-X PC8 39 -700 -900 100 R 50 50 1 1 B
-X PC9 40 -700 -1000 100 R 50 50 1 1 B
-X PD2 54 -700 100 100 R 50 50 1 1 B
-X PH0 5 -700 500 100 R 50 50 1 1 I
-X PH1 6 -700 400 100 R 50 50 1 1 I
-X PH3 60 -700 300 100 R 50 50 1 1 B
-X VBAT 1 -300 1800 100 D 50 50 1 1 W
-X VDD 19 -200 1800 100 D 50 50 1 1 W
-X VDD 32 -100 1800 100 D 50 50 1 1 W
-X VDD 64 0 1800 100 D 50 50 1 1 W
-X VDDA 13 100 1800 100 D 50 50 1 1 W
-X VDDUSB 48 200 1800 100 D 50 50 1 1 W
-X VSS 18 -300 -1800 100 U 50 50 1 1 W
-X VSS 31 -200 -1800 100 U 50 50 1 1 W
-X VSS 47 -100 -1800 100 U 50 50 1 1 W
-X VSS 63 0 -1800 100 U 50 50 1 1 W
-X VSSA 12 100 -1800 100 U 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
@@ -417,70 +417,70 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -600 -1700 500 1700 0 1 10 f
-X NRST D6 -700 1600 100 R 50 50 1 1 I
-X PA0 F7 600 1600 100 L 50 50 1 1 B
-X PA1 G7 600 1500 100 L 50 50 1 1 B
-X PA10 D2 600 600 100 L 50 50 1 1 B
-X PA11 D3 600 500 100 L 50 50 1 1 B
-X PA12 C1 600 400 100 L 50 50 1 1 B
-X PA13 C2 600 300 100 L 50 50 1 1 B
-X PA14 B2 600 200 100 L 50 50 1 1 B
+X VDD A1 -200 1800 100 D 50 50 1 1 W
 X PA15 A2 600 100 100 L 50 50 1 1 B
-X PA2 F6 600 1400 100 L 50 50 1 1 B
-X PA3 G6 600 1300 100 L 50 50 1 1 B
-X PA4 E5 600 1200 100 L 50 50 1 1 B
-X PA5 F5 600 1100 100 L 50 50 1 1 B
-X PA6 G5 600 1000 100 L 50 50 1 1 B
-X PA7 H6 600 900 100 L 50 50 1 1 B
-X PA8 E3 600 800 100 L 50 50 1 1 B
-X PA9 D1 600 700 100 L 50 50 1 1 B
-X PB0 F4 600 -100 100 L 50 50 1 1 B
-X PB1 H5 600 -200 100 L 50 50 1 1 B
-X PB10 H4 600 -1100 100 L 50 50 1 1 B
-X PB11 H3 600 -1200 100 L 50 50 1 1 B
-X PB12 G3 600 -1300 100 L 50 50 1 1 B
-X PB13 G2 600 -1400 100 L 50 50 1 1 B
-X PB14 G1 600 -1500 100 L 50 50 1 1 B
-X PB15 F2 600 -1600 100 L 50 50 1 1 B
-X PB2 G4 600 -300 100 L 50 50 1 1 B
+X PC12 A3 -700 -1300 100 R 50 50 1 1 B
+X PD2 A4 -700 100 100 R 50 50 1 1 B
 X PB3 A5 600 -400 100 L 50 50 1 1 B
+X PB7 A6 600 -800 100 L 50 50 1 1 B
+X VSS A7 -300 -1800 100 U 50 50 1 1 W
+X VDD A8 -100 1800 100 D 50 50 1 1 W
+X VSS B1 -200 -1800 100 U 50 50 1 1 W
+X PA14 B2 600 200 100 L 50 50 1 1 B
+X PC11 B3 -700 -1200 100 R 50 50 1 1 B
 X PB4 B4 600 -500 100 L 50 50 1 1 B
-X PB5 C4 600 -600 100 L 50 50 1 1 B
 X PB6 B5 600 -700 100 L 50 50 1 1 B
-X PB7 A6 600 -800 100 L 50 50 1 1 B
-X PB8 C6 600 -900 100 L 50 50 1 1 B
 X PB9 B6 600 -1000 100 L 50 50 1 1 B
-X PC0 D5 -700 -100 100 R 50 50 1 1 B
-X PC1 E8 -700 -200 100 R 50 50 1 1 B
-X PC10 C3 -700 -1100 100 R 50 50 1 1 B
-X PC11 B3 -700 -1200 100 R 50 50 1 1 B
-X PC12 A3 -700 -1300 100 R 50 50 1 1 B
+X VBAT B7 -300 1800 100 D 50 50 1 1 W
 X PC13 B8 -700 -1400 100 R 50 50 1 1 B
-X PC14 C8 -700 -1500 100 R 50 50 1 1 B
+X PA12 C1 600 400 100 L 50 50 1 1 B
+X PA13 C2 600 300 100 L 50 50 1 1 B
+X PC10 C3 -700 -1100 100 R 50 50 1 1 B
+X PB5 C4 600 -600 100 L 50 50 1 1 B
+X PH3 C5 -700 300 100 R 50 50 1 1 B
+X PB8 C6 600 -900 100 L 50 50 1 1 B
 X PC15 C7 -700 -1600 100 R 50 50 1 1 B
-X PC2 E7 -700 -300 100 R 50 50 1 1 B
-X PC3 E6 -700 -400 100 R 50 50 1 1 B
+X PC14 C8 -700 -1500 100 R 50 50 1 1 B
+X PA9 D1 600 700 100 L 50 50 1 1 B
+X PA10 D2 600 600 100 L 50 50 1 1 B
+X PA11 D3 600 500 100 L 50 50 1 1 B
 X PC4 D4 -700 -500 100 R 50 50 1 1 B
+X PC0 D5 -700 -100 100 R 50 50 1 1 B
+X NRST D6 -700 1600 100 R 50 50 1 1 I
+X PH1 D7 -700 400 100 R 50 50 1 1 I
+X PH0 D8 -700 500 100 R 50 50 1 1 I
+X PC7 E1 -700 -800 100 R 50 50 1 1 B
+X PC9 E2 -700 -1000 100 R 50 50 1 1 B
+X PA8 E3 600 800 100 L 50 50 1 1 B
 X PC5 E4 -700 -600 100 R 50 50 1 1 B
+X PA4 E5 600 1200 100 L 50 50 1 1 B
+X PC3 E6 -700 -400 100 R 50 50 1 1 B
+X PC2 E7 -700 -300 100 R 50 50 1 1 B
+X PC1 E8 -700 -200 100 R 50 50 1 1 B
 X PC6 F1 -700 -700 100 R 50 50 1 1 B
-X PC7 E1 -700 -800 100 R 50 50 1 1 B
+X PB15 F2 600 -1600 100 L 50 50 1 1 B
 X PC8 F3 -700 -900 100 R 50 50 1 1 B
-X PC9 E2 -700 -1000 100 R 50 50 1 1 B
-X PD2 A4 -700 100 100 R 50 50 1 1 B
-X PH0 D8 -700 500 100 R 50 50 1 1 I
-X PH1 D7 -700 400 100 R 50 50 1 1 I
-X PH3 C5 -700 300 100 R 50 50 1 1 B
-X VBAT B7 -300 1800 100 D 50 50 1 1 W
-X VDD A8 -200 1800 100 D 50 50 1 1 W
-X VDD H1 -100 1800 100 D 50 50 1 1 W
-X VDD H7 0 1800 100 D 50 50 1 1 W
-X VDDA G8 100 1800 100 D 50 50 1 1 W
-X VDDUSB A1 200 1800 100 D 50 50 1 1 W
-X VSS A7 -300 -1800 100 U 50 50 1 1 W
-X VSS B1 -200 -1800 100 U 50 50 1 1 W
+X PB0 F4 600 -100 100 L 50 50 1 1 B
+X PA5 F5 600 1100 100 L 50 50 1 1 B
+X PA2 F6 600 1400 100 L 50 50 1 1 B
+X PA0 F7 600 1600 100 L 50 50 1 1 B
+X VSSA F8 100 -1800 100 U 50 50 1 1 W
+X PB14 G1 600 -1500 100 L 50 50 1 1 B
+X PB13 G2 600 -1400 100 L 50 50 1 1 B
+X PB12 G3 600 -1300 100 L 50 50 1 1 B
+X PB2 G4 600 -300 100 L 50 50 1 1 B
+X PA6 G5 600 1000 100 L 50 50 1 1 B
+X PA3 G6 600 1300 100 L 50 50 1 1 B
+X PA1 G7 600 1500 100 L 50 50 1 1 B
+X VDDA G8 200 1800 100 D 50 50 1 1 W
+X VDD H1 0 1800 100 D 50 50 1 1 W
 X VSS H2 -100 -1800 100 U 50 50 1 1 W
+X PB11 H3 600 -1200 100 L 50 50 1 1 B
+X PB10 H4 600 -1100 100 L 50 50 1 1 B
+X PB1 H5 600 -200 100 L 50 50 1 1 B
+X PA7 H6 600 900 100 L 50 50 1 1 B
+X VDD H7 100 1800 100 D 50 50 1 1 W
 X VSS H8 0 -1800 100 U 50 50 1 1 W
-X VSSA F8 100 -1800 100 U 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
@@ -496,106 +496,106 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -700 -2600 700 2500 0 1 10 f
-X NRST H2 -900 2400 200 R 50 50 1 1 I
-X PA0 L2 900 2400 200 L 50 50 1 1 B
-X PA1 M2 900 2300 200 L 50 50 1 1 B
-X PA10 C12 900 1400 200 L 50 50 1 1 B
-X PA11 B12 900 1300 200 L 50 50 1 1 B
-X PA12 A12 900 1200 200 L 50 50 1 1 B
-X PA13 A11 900 1100 200 L 50 50 1 1 B
+X PE3 A1 -900 400 200 R 50 50 1 1 B
 X PA14 A10 900 1000 200 L 50 50 1 1 B
+X PA13 A11 900 1100 200 L 50 50 1 1 B
+X PA12 A12 900 1200 200 L 50 50 1 1 B
+X PE1 A2 -900 600 200 R 50 50 1 1 B
+X PB8 A3 900 -100 200 L 50 50 1 1 B
+X PH3 A4 -900 900 200 R 50 50 1 1 B
+X PD7 A5 -900 -1700 200 R 50 50 1 1 B
+X PD5 A6 -900 -1500 200 R 50 50 1 1 B
+X PB4 A7 900 300 200 L 50 50 1 1 B
+X PB3 A8 900 400 200 L 50 50 1 1 B
 X PA15 A9 900 900 200 L 50 50 1 1 B
-X PA2 K3 900 2200 200 L 50 50 1 1 B
-X PA3 L3 900 2100 200 L 50 50 1 1 B
-X PA4 M3 900 2000 200 L 50 50 1 1 B
-X PA5 K4 900 1900 200 L 50 50 1 1 B
-X PA6 L4 900 1800 200 L 50 50 1 1 B
-X PA7 M4 900 1700 200 L 50 50 1 1 B
-X PA8 D11 900 1600 200 L 50 50 1 1 B
-X PA9 D10 900 1500 200 L 50 50 1 1 B
-X PB0 M5 900 700 200 L 50 50 1 1 B
-X PB1 M6 900 600 200 L 50 50 1 1 B
-X PB10 L10 900 -300 200 L 50 50 1 1 B
-X PB11 L11 900 -400 200 L 50 50 1 1 B
-X PB12 L12 900 -500 200 L 50 50 1 1 B
-X PB13 K12 900 -600 200 L 50 50 1 1 B
-X PB14 K11 900 -700 200 L 50 50 1 1 B
-X PB15 K10 900 -800 200 L 50 50 1 1 B
-X PB2 L6 900 500 200 L 50 50 1 1 B
-X PB3 A8 900 400 200 L 50 50 1 1 B
-X PB4 A7 900 300 200 L 50 50 1 1 B
-X PB5 C5 900 200 200 L 50 50 1 1 B
-X PB6 B5 900 100 200 L 50 50 1 1 B
-X PB7 B4 900 0 200 L 50 50 1 1 B
-X PB8 A3 900 -100 200 L 50 50 1 1 B
-X PB9 B3 900 -200 200 L 50 50 1 1 B
-X PC0 H1 900 -1000 200 L 50 50 1 1 B
-X PC1 J2 900 -1100 200 L 50 50 1 1 B
-X PC10 B11 900 -2000 200 L 50 50 1 1 B
-X PC11 C10 900 -2100 200 L 50 50 1 1 B
+X PE4 B1 -900 300 200 R 50 50 1 1 B
 X PC12 B10 900 -2200 200 L 50 50 1 1 B
+X PC10 B11 900 -2000 200 L 50 50 1 1 B
+X PA11 B12 900 1300 200 L 50 50 1 1 B
+X PE2 B2 -900 500 200 R 50 50 1 1 B
+X PB9 B3 900 -200 200 L 50 50 1 1 B
+X PB7 B4 900 0 200 L 50 50 1 1 B
+X PB6 B5 900 100 200 L 50 50 1 1 B
+X PD6 B6 -900 -1600 200 R 50 50 1 1 B
+X PD4 B7 -900 -1400 200 R 50 50 1 1 B
+X PD3 B8 -900 -1300 200 R 50 50 1 1 B
+X PD1 B9 -900 -1100 200 R 50 50 1 1 B
 X PC13 C1 900 -2300 200 L 50 50 1 1 B
+X PC11 C10 900 -2100 200 L 50 50 1 1 B
+X VDD C11 -100 2700 200 D 50 50 1 1 W
+X PA10 C12 900 1400 200 L 50 50 1 1 B
+X PE5 C2 -900 200 200 R 50 50 1 1 B
+X PE0 C3 -900 700 200 R 50 50 1 1 B
+X VDD C4 -200 2700 200 D 50 50 1 1 W
+X PB5 C5 900 200 200 L 50 50 1 1 B
+X PD2 C8 -900 -1200 200 R 50 50 1 1 B
+X PD0 C9 -900 -1000 200 R 50 50 1 1 B
 X PC14 D1 900 -2400 200 L 50 50 1 1 B
+X PA9 D10 900 1500 200 L 50 50 1 1 B
+X PA8 D11 900 1600 200 L 50 50 1 1 B
+X PC9 D12 900 -1900 200 L 50 50 1 1 B
+X PE6 D2 -900 100 200 R 50 50 1 1 B
+X VSS D3 -200 -2800 200 U 50 50 1 1 W
 X PC15 E1 900 -2500 200 L 50 50 1 1 B
+X PC8 E10 900 -1800 200 L 50 50 1 1 B
+X PC7 E11 900 -1700 200 L 50 50 1 1 B
+X PC6 E12 900 -1600 200 L 50 50 1 1 B
+X VBAT E2 -300 2700 200 D 50 50 1 1 W
+X VSS E3 -100 -2800 200 U 50 50 1 1 W
+X PH0 F1 -900 1100 200 R 50 50 1 1 I
+X VSS F11 100 -2800 200 U 50 50 1 1 W
+X VSS F12 200 -2800 200 U 50 50 1 1 W
+X VSS F2 0 -2800 200 U 50 50 1 1 W
+X PH1 G1 -900 1000 200 R 50 50 1 1 I
+X VDD G11 100 2700 200 D 50 50 1 1 W
+X VDD G12 200 2700 200 D 50 50 1 1 W
+X VDD G2 0 2700 200 D 50 50 1 1 W
+X PC0 H1 900 -1000 200 L 50 50 1 1 B
+X PD15 H10 -900 -2500 200 R 50 50 1 1 B
+X PD14 H11 -900 -2400 200 R 50 50 1 1 B
+X PD13 H12 -900 -2300 200 R 50 50 1 1 B
+X NRST H2 -900 2400 200 R 50 50 1 1 I
+X VDD H3 300 2700 200 D 50 50 1 1 W
+X VSSA J1 300 -2800 200 U 50 50 1 1 W
+X PD12 J10 -900 -2200 200 R 50 50 1 1 B
+X PD11 J11 -900 -2100 200 R 50 50 1 1 B
+X PD10 J12 -900 -2000 200 R 50 50 1 1 B
+X PC1 J2 900 -1100 200 L 50 50 1 1 B
 X PC2 J3 900 -1200 200 L 50 50 1 1 B
+X VREF- K1 -900 2100 200 R 50 50 1 1 W
+X PB15 K10 900 -800 200 L 50 50 1 1 B
+X PB14 K11 900 -700 200 L 50 50 1 1 B
+X PB13 K12 900 -600 200 L 50 50 1 1 B
 X PC3 K2 900 -1300 200 L 50 50 1 1 B
+X PA2 K3 900 2200 200 L 50 50 1 1 B
+X PA5 K4 900 1900 200 L 50 50 1 1 B
 X PC4 K5 900 -1400 200 L 50 50 1 1 B
-X PC5 L5 900 -1500 200 L 50 50 1 1 B
-X PC6 E12 900 -1600 200 L 50 50 1 1 B
-X PC7 E11 900 -1700 200 L 50 50 1 1 B
-X PC8 E10 900 -1800 200 L 50 50 1 1 B
-X PC9 D12 900 -1900 200 L 50 50 1 1 B
-X PD0 C9 -900 -1000 200 R 50 50 1 1 B
-X PD1 B9 -900 -1100 200 R 50 50 1 1 B
-X PD10 J12 -900 -2000 200 R 50 50 1 1 B
-X PD11 J11 -900 -2100 200 R 50 50 1 1 B
-X PD12 J10 -900 -2200 200 R 50 50 1 1 B
-X PD13 H12 -900 -2300 200 R 50 50 1 1 B
-X PD14 H11 -900 -2400 200 R 50 50 1 1 B
-X PD15 H10 -900 -2500 200 R 50 50 1 1 B
-X PD2 C8 -900 -1200 200 R 50 50 1 1 B
-X PD3 B8 -900 -1300 200 R 50 50 1 1 B
-X PD4 B7 -900 -1400 200 R 50 50 1 1 B
-X PD5 A6 -900 -1500 200 R 50 50 1 1 B
-X PD6 B6 -900 -1600 200 R 50 50 1 1 B
-X PD7 A5 -900 -1700 200 R 50 50 1 1 B
-X PD8 K9 -900 -1800 200 R 50 50 1 1 B
 X PD9 K8 -900 -1900 200 R 50 50 1 1 B
-X PE0 C3 -900 700 200 R 50 50 1 1 B
-X PE1 A2 -900 600 200 R 50 50 1 1 B
+X PD8 K9 -900 -1800 200 R 50 50 1 1 B
+X VREF+ L1 -900 2200 200 R 50 50 1 1 B
+X PB10 L10 900 -300 200 L 50 50 1 1 B
+X PB11 L11 900 -400 200 L 50 50 1 1 B
+X PB12 L12 900 -500 200 L 50 50 1 1 B
+X PA0 L2 900 2400 200 L 50 50 1 1 B
+X PA3 L3 900 2100 200 L 50 50 1 1 B
+X PA6 L4 900 1800 200 L 50 50 1 1 B
+X PC5 L5 900 -1500 200 L 50 50 1 1 B
+X PB2 L6 900 500 200 L 50 50 1 1 B
+X PE8 L7 -900 -100 200 R 50 50 1 1 B
 X PE10 L8 -900 -300 200 R 50 50 1 1 B
-X PE11 M9 -900 -400 200 R 50 50 1 1 B
 X PE12 L9 -900 -500 200 R 50 50 1 1 B
+X VDDA M1 400 2700 200 D 50 50 1 1 W
 X PE13 M10 -900 -600 200 R 50 50 1 1 B
 X PE14 M11 -900 -700 200 R 50 50 1 1 B
 X PE15 M12 -900 -800 200 R 50 50 1 1 B
-X PE2 B2 -900 500 200 R 50 50 1 1 B
-X PE3 A1 -900 400 200 R 50 50 1 1 B
-X PE4 B1 -900 300 200 R 50 50 1 1 B
-X PE5 C2 -900 200 200 R 50 50 1 1 B
-X PE6 D2 -900 100 200 R 50 50 1 1 B
+X PA1 M2 900 2300 200 L 50 50 1 1 B
+X PA4 M3 900 2000 200 L 50 50 1 1 B
+X PA7 M4 900 1700 200 L 50 50 1 1 B
+X PB0 M5 900 700 200 L 50 50 1 1 B
+X PB1 M6 900 600 200 L 50 50 1 1 B
 X PE7 M7 -900 0 200 R 50 50 1 1 B
-X PE8 L7 -900 -100 200 R 50 50 1 1 B
 X PE9 M8 -900 -200 200 R 50 50 1 1 B
-X PH0 F1 -900 1100 200 R 50 50 1 1 I
-X PH1 G1 -900 1000 200 R 50 50 1 1 I
-X PH3 A4 -900 900 200 R 50 50 1 1 B
-X VBAT E2 -300 2700 200 D 50 50 1 1 W
-X VDD C4 -200 2700 200 D 50 50 1 1 W
-X VDD G11 0 2700 200 D 50 50 1 1 W
-X VDD G12 100 2700 200 D 50 50 1 1 W
-X VDD G2 -100 2700 200 D 50 50 1 1 W
-X VDD H3 200 2700 200 D 50 50 1 1 W
-X VDDA M1 300 2700 200 D 50 50 1 1 W
-X VDDUSB C11 400 2700 200 D 50 50 1 1 W
-X VREF+ L1 -900 2200 200 R 50 50 1 1 B
-X VREF- K1 -900 2100 200 R 50 50 1 1 W
-X VSS D3 -200 -2800 200 U 50 50 1 1 W
-X VSS E3 -100 -2800 200 U 50 50 1 1 W
-X VSS F11 100 -2800 200 U 50 50 1 1 W
-X VSS F12 200 -2800 200 U 50 50 1 1 W
-X VSS F2 0 -2800 200 U 50 50 1 1 W
-X VSSA J1 300 -2800 200 U 50 50 1 1 W
+X PE11 M9 -900 -400 200 R 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
@@ -611,106 +611,106 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -700 -2600 700 2500 0 1 10 f
+X PE2 1 -900 500 200 R 50 50 1 1 B
+X VSS 10 -200 -2800 200 U 50 50 1 1 W
+X VDD 100 300 2700 200 D 50 50 1 1 W
+X VDD 11 -200 2700 200 D 50 50 1 1 W
+X PH0 12 -900 1100 200 R 50 50 1 1 I
+X PH1 13 -900 1000 200 R 50 50 1 1 I
 X NRST 14 -900 2400 200 R 50 50 1 1 I
+X PC0 15 900 -1000 200 L 50 50 1 1 B
+X PC1 16 900 -1100 200 L 50 50 1 1 B
+X PC2 17 900 -1200 200 L 50 50 1 1 B
+X PC3 18 900 -1300 200 L 50 50 1 1 B
+X VSSA 19 300 -2800 200 U 50 50 1 1 W
+X PE3 2 -900 400 200 R 50 50 1 1 B
+X VREF- 20 -900 2100 200 R 50 50 1 1 W
+X VREF+ 21 -900 2200 200 R 50 50 1 1 B
+X VDDA 22 400 2700 200 D 50 50 1 1 W
 X PA0 23 900 2400 200 L 50 50 1 1 B
 X PA1 24 900 2300 200 L 50 50 1 1 B
-X PA10 69 900 1400 200 L 50 50 1 1 B
-X PA11 70 900 1300 200 L 50 50 1 1 B
-X PA12 71 900 1200 200 L 50 50 1 1 B
-X PA13 72 900 1100 200 L 50 50 1 1 B
-X PA14 76 900 1000 200 L 50 50 1 1 B
-X PA15 77 900 900 200 L 50 50 1 1 B
 X PA2 25 900 2200 200 L 50 50 1 1 B
 X PA3 26 900 2100 200 L 50 50 1 1 B
+X VSS 27 -100 -2800 200 U 50 50 1 1 W
+X VDD 28 -100 2700 200 D 50 50 1 1 W
 X PA4 29 900 2000 200 L 50 50 1 1 B
+X PE4 3 -900 300 200 R 50 50 1 1 B
 X PA5 30 900 1900 200 L 50 50 1 1 B
 X PA6 31 900 1800 200 L 50 50 1 1 B
 X PA7 32 900 1700 200 L 50 50 1 1 B
-X PA8 67 900 1600 200 L 50 50 1 1 B
-X PA9 68 900 1500 200 L 50 50 1 1 B
+X PC4 33 900 -1400 200 L 50 50 1 1 B
+X PC5 34 900 -1500 200 L 50 50 1 1 B
 X PB0 35 900 700 200 L 50 50 1 1 B
 X PB1 36 900 600 200 L 50 50 1 1 B
+X PB2 37 900 500 200 L 50 50 1 1 B
+X PE7 38 -900 0 200 R 50 50 1 1 B
+X PE8 39 -900 -100 200 R 50 50 1 1 B
+X PE5 4 -900 200 200 R 50 50 1 1 B
+X PE9 40 -900 -200 200 R 50 50 1 1 B
+X PE10 41 -900 -300 200 R 50 50 1 1 B
+X PE11 42 -900 -400 200 R 50 50 1 1 B
+X PE12 43 -900 -500 200 R 50 50 1 1 B
+X PE13 44 -900 -600 200 R 50 50 1 1 B
+X PE14 45 -900 -700 200 R 50 50 1 1 B
+X PE15 46 -900 -800 200 R 50 50 1 1 B
 X PB10 47 900 -300 200 L 50 50 1 1 B
 X PB11 48 900 -400 200 L 50 50 1 1 B
+X VSS 49 0 -2800 200 U 50 50 1 1 W
+X PE6 5 -900 100 200 R 50 50 1 1 B
+X VDD 50 0 2700 200 D 50 50 1 1 W
 X PB12 51 900 -500 200 L 50 50 1 1 B
 X PB13 52 900 -600 200 L 50 50 1 1 B
 X PB14 53 900 -700 200 L 50 50 1 1 B
 X PB15 54 900 -800 200 L 50 50 1 1 B
-X PB2 37 900 500 200 L 50 50 1 1 B
-X PB3 89 900 400 200 L 50 50 1 1 B
-X PB4 90 900 300 200 L 50 50 1 1 B
-X PB5 91 900 200 200 L 50 50 1 1 B
-X PB6 92 900 100 200 L 50 50 1 1 B
-X PB7 93 900 0 200 L 50 50 1 1 B
-X PB8 95 900 -100 200 L 50 50 1 1 B
-X PB9 96 900 -200 200 L 50 50 1 1 B
-X PC0 15 900 -1000 200 L 50 50 1 1 B
-X PC1 16 900 -1100 200 L 50 50 1 1 B
-X PC10 78 900 -2000 200 L 50 50 1 1 B
-X PC11 79 900 -2100 200 L 50 50 1 1 B
-X PC12 80 900 -2200 200 L 50 50 1 1 B
-X PC13 7 900 -2300 200 L 50 50 1 1 B
-X PC14 8 900 -2400 200 L 50 50 1 1 B
-X PC15 9 900 -2500 200 L 50 50 1 1 B
-X PC2 17 900 -1200 200 L 50 50 1 1 B
-X PC3 18 900 -1300 200 L 50 50 1 1 B
-X PC4 33 900 -1400 200 L 50 50 1 1 B
-X PC5 34 900 -1500 200 L 50 50 1 1 B
-X PC6 63 900 -1600 200 L 50 50 1 1 B
-X PC7 64 900 -1700 200 L 50 50 1 1 B
-X PC8 65 900 -1800 200 L 50 50 1 1 B
-X PC9 66 900 -1900 200 L 50 50 1 1 B
-X PD0 81 -900 -1000 200 R 50 50 1 1 B
-X PD1 82 -900 -1100 200 R 50 50 1 1 B
+X PD8 55 -900 -1800 200 R 50 50 1 1 B
+X PD9 56 -900 -1900 200 R 50 50 1 1 B
 X PD10 57 -900 -2000 200 R 50 50 1 1 B
 X PD11 58 -900 -2100 200 R 50 50 1 1 B
 X PD12 59 -900 -2200 200 R 50 50 1 1 B
+X VBAT 6 -300 2700 200 D 50 50 1 1 W
 X PD13 60 -900 -2300 200 R 50 50 1 1 B
 X PD14 61 -900 -2400 200 R 50 50 1 1 B
 X PD15 62 -900 -2500 200 R 50 50 1 1 B
+X PC6 63 900 -1600 200 L 50 50 1 1 B
+X PC7 64 900 -1700 200 L 50 50 1 1 B
+X PC8 65 900 -1800 200 L 50 50 1 1 B
+X PC9 66 900 -1900 200 L 50 50 1 1 B
+X PA8 67 900 1600 200 L 50 50 1 1 B
+X PA9 68 900 1500 200 L 50 50 1 1 B
+X PA10 69 900 1400 200 L 50 50 1 1 B
+X PC13 7 900 -2300 200 L 50 50 1 1 B
+X PA11 70 900 1300 200 L 50 50 1 1 B
+X PA12 71 900 1200 200 L 50 50 1 1 B
+X PA13 72 900 1100 200 L 50 50 1 1 B
+X VDD 73 100 2700 200 D 50 50 1 1 W
+X VSS 74 100 -2800 200 U 50 50 1 1 W
+X VDD 75 200 2700 200 D 50 50 1 1 W
+X PA14 76 900 1000 200 L 50 50 1 1 B
+X PA15 77 900 900 200 L 50 50 1 1 B
+X PC10 78 900 -2000 200 L 50 50 1 1 B
+X PC11 79 900 -2100 200 L 50 50 1 1 B
+X PC14 8 900 -2400 200 L 50 50 1 1 B
+X PC12 80 900 -2200 200 L 50 50 1 1 B
+X PD0 81 -900 -1000 200 R 50 50 1 1 B
+X PD1 82 -900 -1100 200 R 50 50 1 1 B
 X PD2 83 -900 -1200 200 R 50 50 1 1 B
 X PD3 84 -900 -1300 200 R 50 50 1 1 B
 X PD4 85 -900 -1400 200 R 50 50 1 1 B
 X PD5 86 -900 -1500 200 R 50 50 1 1 B
 X PD6 87 -900 -1600 200 R 50 50 1 1 B
 X PD7 88 -900 -1700 200 R 50 50 1 1 B
-X PD8 55 -900 -1800 200 R 50 50 1 1 B
-X PD9 56 -900 -1900 200 R 50 50 1 1 B
+X PB3 89 900 400 200 L 50 50 1 1 B
+X PC15 9 900 -2500 200 L 50 50 1 1 B
+X PB4 90 900 300 200 L 50 50 1 1 B
+X PB5 91 900 200 200 L 50 50 1 1 B
+X PB6 92 900 100 200 L 50 50 1 1 B
+X PB7 93 900 0 200 L 50 50 1 1 B
+X PH3 94 -900 900 200 R 50 50 1 1 B
+X PB8 95 900 -100 200 L 50 50 1 1 B
+X PB9 96 900 -200 200 L 50 50 1 1 B
 X PE0 97 -900 700 200 R 50 50 1 1 B
 X PE1 98 -900 600 200 R 50 50 1 1 B
-X PE10 41 -900 -300 200 R 50 50 1 1 B
-X PE11 42 -900 -400 200 R 50 50 1 1 B
-X PE12 43 -900 -500 200 R 50 50 1 1 B
-X PE13 44 -900 -600 200 R 50 50 1 1 B
-X PE14 45 -900 -700 200 R 50 50 1 1 B
-X PE15 46 -900 -800 200 R 50 50 1 1 B
-X PE2 1 -900 500 200 R 50 50 1 1 B
-X PE3 2 -900 400 200 R 50 50 1 1 B
-X PE4 3 -900 300 200 R 50 50 1 1 B
-X PE5 4 -900 200 200 R 50 50 1 1 B
-X PE6 5 -900 100 200 R 50 50 1 1 B
-X PE7 38 -900 0 200 R 50 50 1 1 B
-X PE8 39 -900 -100 200 R 50 50 1 1 B
-X PE9 40 -900 -200 200 R 50 50 1 1 B
-X PH0 12 -900 1100 200 R 50 50 1 1 I
-X PH1 13 -900 1000 200 R 50 50 1 1 I
-X PH3 94 -900 900 200 R 50 50 1 1 B
-X VBAT 6 -300 2700 200 D 50 50 1 1 W
-X VDD 100 200 2700 200 D 50 50 1 1 W
-X VDD 11 -200 2700 200 D 50 50 1 1 W
-X VDD 28 -100 2700 200 D 50 50 1 1 W
-X VDD 50 0 2700 200 D 50 50 1 1 W
-X VDD 75 100 2700 200 D 50 50 1 1 W
-X VDDA 22 300 2700 200 D 50 50 1 1 W
-X VDDUSB 73 400 2700 200 D 50 50 1 1 W
-X VREF+ 21 -900 2200 200 R 50 50 1 1 B
-X VREF- 20 -900 2100 200 R 50 50 1 1 W
-X VSS 10 -200 -2800 200 U 50 50 1 1 W
-X VSS 27 -100 -2800 200 U 50 50 1 1 W
-X VSS 49 0 -2800 200 U 50 50 1 1 W
-X VSS 74 100 -2800 200 U 50 50 1 1 W
 X VSS 99 200 -2800 200 U 50 50 1 1 W
-X VSSA 19 300 -2800 200 U 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
@@ -727,39 +727,39 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -400 -900 400 800 0 1 10 f
-X NRST 4 -500 700 100 R 50 50 1 1 I
-X PA0 6 500 700 100 L 50 50 1 1 B
-X PA1 7 500 600 100 L 50 50 1 1 B
-X PA10 20 500 -300 100 L 50 50 1 1 B
-X PA11 21 500 -400 100 L 50 50 1 1 B
-X PA12 22 500 -500 100 L 50 50 1 1 B
-X PA13 23 500 -600 100 L 50 50 1 1 B
-X PA14 24 500 -700 100 L 50 50 1 1 B
-X PA15 25 500 -800 100 L 50 50 1 1 B
-X PA2 8 500 500 100 L 50 50 1 1 B
-X PA3 9 500 400 100 L 50 50 1 1 B
+X VDD 1 -100 900 100 D 50 50 1 1 W
 X PA4 10 500 300 100 L 50 50 1 1 B
 X PA5 11 500 200 100 L 50 50 1 1 B
 X PA6 12 500 100 100 L 50 50 1 1 B
 X PA7 13 500 0 100 L 50 50 1 1 B
-X PA8 18 500 -100 100 L 50 50 1 1 B
-X PA9 19 500 -200 100 L 50 50 1 1 B
 X PB0 14 -500 -200 100 R 50 50 1 1 B
 X PB1 15 -500 -300 100 R 50 50 1 1 B
+X VSS 16 -100 -1000 100 U 50 50 1 1 W
+X VDD 17 0 900 100 D 50 50 1 1 W
+X PA8 18 500 -100 100 L 50 50 1 1 B
+X PA9 19 500 -200 100 L 50 50 1 1 B
+X PC14 2 -500 100 100 R 50 50 1 1 B
+X PA10 20 500 -300 100 L 50 50 1 1 B
+X PA11 21 500 -400 100 L 50 50 1 1 B
+X PA12 22 500 -500 100 L 50 50 1 1 B
+X PA13 23 500 -600 100 L 50 50 1 1 B
+X PA14 24 500 -700 100 L 50 50 1 1 B
+X PA15 25 500 -800 100 L 50 50 1 1 B
 X PB3 26 -500 -400 100 R 50 50 1 1 B
 X PB4 27 -500 -500 100 R 50 50 1 1 B
 X PB5 28 -500 -600 100 R 50 50 1 1 B
 X PB6 29 -500 -700 100 R 50 50 1 1 B
-X PB7 30 -500 -800 100 R 50 50 1 1 B
-X PC14 2 -500 100 100 R 50 50 1 1 B
 X PC15 3 -500 0 100 R 50 50 1 1 B
+X PB7 30 -500 -800 100 R 50 50 1 1 B
 X PH3 31 -500 300 100 R 50 50 1 1 B
-X VDD 1 -100 900 100 D 50 50 1 1 W
-X VDD 17 0 900 100 D 50 50 1 1 W
-X VDDA 5 100 900 100 D 50 50 1 1 W
-X VSS 16 -100 -1000 100 U 50 50 1 1 W
 X VSS 32 0 -1000 100 U 50 50 1 1 W
 X VSS 33 100 -1000 100 U 50 50 1 1 W
+X NRST 4 -500 700 100 R 50 50 1 1 I
+X VDDA 5 100 900 100 D 50 50 1 1 W
+X PA0 6 500 700 100 L 50 50 1 1 B
+X PA1 7 500 600 100 L 50 50 1 1 B
+X PA2 8 500 500 100 L 50 50 1 1 B
+X PA3 9 500 400 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
@@ -776,54 +776,54 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -500 -1400 500 1300 0 1 10 f
-X NRST 7 -600 1200 100 R 50 50 1 1 I
+X VBAT 1 -200 1400 100 D 50 50 1 1 W
 X PA0 10 600 200 100 L 50 50 1 1 B
 X PA1 11 600 100 100 L 50 50 1 1 B
-X PA10 31 600 -800 100 L 50 50 1 1 B
-X PA11 32 600 -900 100 L 50 50 1 1 B
-X PA12 33 600 -1000 100 L 50 50 1 1 B
-X PA13 34 600 -1100 100 L 50 50 1 1 B
-X PA14 37 600 -1200 100 L 50 50 1 1 B
-X PA15 38 600 -1300 100 L 50 50 1 1 B
 X PA2 12 600 0 100 L 50 50 1 1 B
 X PA3 13 600 -100 100 L 50 50 1 1 B
 X PA4 14 600 -200 100 L 50 50 1 1 B
 X PA5 15 600 -300 100 L 50 50 1 1 B
 X PA6 16 600 -400 100 L 50 50 1 1 B
 X PA7 17 600 -500 100 L 50 50 1 1 B
-X PA8 29 600 -600 100 L 50 50 1 1 B
-X PA9 30 600 -700 100 L 50 50 1 1 B
 X PB0 18 -600 200 100 R 50 50 1 1 B
 X PB1 19 -600 100 100 R 50 50 1 1 B
+X PC13 2 -600 600 100 R 50 50 1 1 B
+X PB2 20 -600 0 100 R 50 50 1 1 B
 X PB10 21 -600 -800 100 R 50 50 1 1 B
 X PB11 22 -600 -900 100 R 50 50 1 1 B
+X VSS 23 -200 -1500 100 U 50 50 1 1 W
+X VDD 24 -100 1400 100 D 50 50 1 1 W
 X PB12 25 -600 -1000 100 R 50 50 1 1 B
 X PB13 26 -600 -1100 100 R 50 50 1 1 B
 X PB14 27 -600 -1200 100 R 50 50 1 1 B
 X PB15 28 -600 -1300 100 R 50 50 1 1 B
-X PB2 20 -600 0 100 R 50 50 1 1 B
+X PA8 29 600 -600 100 L 50 50 1 1 B
+X PC14 3 -600 500 100 R 50 50 1 1 B
+X PA9 30 600 -700 100 L 50 50 1 1 B
+X PA10 31 600 -800 100 L 50 50 1 1 B
+X PA11 32 600 -900 100 L 50 50 1 1 B
+X PA12 33 600 -1000 100 L 50 50 1 1 B
+X PA13 34 600 -1100 100 L 50 50 1 1 B
+X VSS 35 -100 -1500 100 U 50 50 1 1 W
+X VDDUSB 36 200 1400 100 D 50 50 1 1 W
+X PA14 37 600 -1200 100 L 50 50 1 1 B
+X PA15 38 600 -1300 100 L 50 50 1 1 B
 X PB3 39 -600 -100 100 R 50 50 1 1 B
+X PC15 4 -600 400 100 R 50 50 1 1 B
 X PB4 40 -600 -200 100 R 50 50 1 1 B
 X PB5 41 -600 -300 100 R 50 50 1 1 B
 X PB6 42 -600 -400 100 R 50 50 1 1 B
 X PB7 43 -600 -500 100 R 50 50 1 1 B
+X PH3 44 -600 800 100 R 50 50 1 1 B
 X PB8 45 -600 -600 100 R 50 50 1 1 B
 X PB9 46 -600 -700 100 R 50 50 1 1 B
-X PC13 2 -600 600 100 R 50 50 1 1 B
-X PC14 3 -600 500 100 R 50 50 1 1 B
-X PC15 4 -600 400 100 R 50 50 1 1 B
+X VSS 47 0 -1500 100 U 50 50 1 1 W
+X VDD 48 0 1400 100 D 50 50 1 1 W
 X PH0 5 -600 1000 100 R 50 50 1 1 I
 X PH1 6 -600 900 100 R 50 50 1 1 I
-X PH3 44 -600 800 100 R 50 50 1 1 B
-X VBAT 1 -200 1400 100 D 50 50 1 1 W
-X VDD 24 -100 1400 100 D 50 50 1 1 W
-X VDD 48 0 1400 100 D 50 50 1 1 W
-X VDDA 9 100 1400 100 D 50 50 1 1 W
-X VDDUSB 36 200 1400 100 D 50 50 1 1 W
-X VSS 23 -200 -1500 100 U 50 50 1 1 W
-X VSS 35 -100 -1500 100 U 50 50 1 1 W
-X VSS 47 0 -1500 100 U 50 50 1 1 W
+X NRST 7 -600 1200 100 R 50 50 1 1 I
 X VSSA 8 100 -1500 100 U 50 50 1 1 W
+X VDDA 9 100 1400 100 D 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
@@ -840,55 +840,55 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -500 -1400 500 1300 0 1 10 f
-X NRST 7 -600 1200 100 R 50 50 1 1 I
+X VBAT 1 -200 1400 100 D 50 50 1 1 W
 X PA0 10 600 200 100 L 50 50 1 1 B
 X PA1 11 600 100 100 L 50 50 1 1 B
-X PA10 31 600 -800 100 L 50 50 1 1 B
-X PA11 32 600 -900 100 L 50 50 1 1 B
-X PA12 33 600 -1000 100 L 50 50 1 1 B
-X PA13 34 600 -1100 100 L 50 50 1 1 B
-X PA14 37 600 -1200 100 L 50 50 1 1 B
-X PA15 38 600 -1300 100 L 50 50 1 1 B
 X PA2 12 600 0 100 L 50 50 1 1 B
 X PA3 13 600 -100 100 L 50 50 1 1 B
 X PA4 14 600 -200 100 L 50 50 1 1 B
 X PA5 15 600 -300 100 L 50 50 1 1 B
 X PA6 16 600 -400 100 L 50 50 1 1 B
 X PA7 17 600 -500 100 L 50 50 1 1 B
-X PA8 29 600 -600 100 L 50 50 1 1 B
-X PA9 30 600 -700 100 L 50 50 1 1 B
 X PB0 18 -600 200 100 R 50 50 1 1 B
 X PB1 19 -600 100 100 R 50 50 1 1 B
+X PC13 2 -600 600 100 R 50 50 1 1 B
+X PB2 20 -600 0 100 R 50 50 1 1 B
 X PB10 21 -600 -800 100 R 50 50 1 1 B
 X PB11 22 -600 -900 100 R 50 50 1 1 B
+X VSS 23 -200 -1500 100 U 50 50 1 1 W
+X VDD 24 -100 1400 100 D 50 50 1 1 W
 X PB12 25 -600 -1000 100 R 50 50 1 1 B
 X PB13 26 -600 -1100 100 R 50 50 1 1 B
 X PB14 27 -600 -1200 100 R 50 50 1 1 B
 X PB15 28 -600 -1300 100 R 50 50 1 1 B
-X PB2 20 -600 0 100 R 50 50 1 1 B
+X PA8 29 600 -600 100 L 50 50 1 1 B
+X PC14 3 -600 500 100 R 50 50 1 1 B
+X PA9 30 600 -700 100 L 50 50 1 1 B
+X PA10 31 600 -800 100 L 50 50 1 1 B
+X PA11 32 600 -900 100 L 50 50 1 1 B
+X PA12 33 600 -1000 100 L 50 50 1 1 B
+X PA13 34 600 -1100 100 L 50 50 1 1 B
+X VSS 35 -100 -1500 100 U 50 50 1 1 W
+X VDDUSB 36 200 1400 100 D 50 50 1 1 W
+X PA14 37 600 -1200 100 L 50 50 1 1 B
+X PA15 38 600 -1300 100 L 50 50 1 1 B
 X PB3 39 -600 -100 100 R 50 50 1 1 B
+X PC15 4 -600 400 100 R 50 50 1 1 B
 X PB4 40 -600 -200 100 R 50 50 1 1 B
 X PB5 41 -600 -300 100 R 50 50 1 1 B
 X PB6 42 -600 -400 100 R 50 50 1 1 B
 X PB7 43 -600 -500 100 R 50 50 1 1 B
+X PH3 44 -600 800 100 R 50 50 1 1 B
 X PB8 45 -600 -600 100 R 50 50 1 1 B
 X PB9 46 -600 -700 100 R 50 50 1 1 B
-X PC13 2 -600 600 100 R 50 50 1 1 B
-X PC14 3 -600 500 100 R 50 50 1 1 B
-X PC15 4 -600 400 100 R 50 50 1 1 B
-X PH0 5 -600 1000 100 R 50 50 1 1 I
-X PH1 6 -600 900 100 R 50 50 1 1 I
-X PH3 44 -600 800 100 R 50 50 1 1 B
-X VBAT 1 -200 1400 100 D 50 50 1 1 W
-X VDD 24 -100 1400 100 D 50 50 1 1 W
-X VDD 48 0 1400 100 D 50 50 1 1 W
-X VDDA 9 100 1400 100 D 50 50 1 1 W
-X VDDUSB 36 200 1400 100 D 50 50 1 1 W
-X VSS 23 -200 -1500 100 U 50 50 1 1 W
-X VSS 35 -100 -1500 100 U 50 50 1 1 W
 X VSS 47 0 -1500 100 U 50 50 1 1 W
+X VDD 48 0 1400 100 D 50 50 1 1 W
 X VSS 49 100 -1500 100 U 50 50 1 1 W
+X PH0 5 -600 1000 100 R 50 50 1 1 I
+X PH1 6 -600 900 100 R 50 50 1 1 I
+X NRST 7 -600 1200 100 R 50 50 1 1 I
 X VSSA 8 200 -1500 100 U 50 50 1 1 W
+X VDDA 9 100 1400 100 D 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
@@ -905,55 +905,55 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -500 -1400 500 1400 0 1 10 f
-X NRST D5 -600 1300 100 R 50 50 1 1 I
-X PA0 F6 600 200 100 L 50 50 1 1 B
-X PA1 G7 600 100 100 L 50 50 1 1 B
-X PA10 C2 600 -800 100 L 50 50 1 1 B
-X PA11 C1 600 -900 100 L 50 50 1 1 B
-X PA12 C3 600 -1000 100 L 50 50 1 1 B
-X PA13 B2 600 -1100 100 L 50 50 1 1 B
+X VDDUSB A1 200 1500 100 D 50 50 1 1 W
 X PA14 A2 600 -1200 100 L 50 50 1 1 B
-X PA15 B3 600 -1300 100 L 50 50 1 1 B
-X PA2 E5 600 0 100 L 50 50 1 1 B
-X PA3 E4 600 -100 100 L 50 50 1 1 B
-X PA4 G6 600 -200 100 L 50 50 1 1 B
-X PA5 F5 600 -300 100 L 50 50 1 1 B
-X PA6 F4 600 -400 100 L 50 50 1 1 B
-X PA7 F3 600 -500 100 L 50 50 1 1 B
-X PA8 D1 600 -600 100 L 50 50 1 1 B
-X PA9 D2 600 -700 100 L 50 50 1 1 B
-X PB0 G5 -600 200 100 R 50 50 1 1 B
-X PB1 G4 -600 100 100 R 50 50 1 1 B
-X PB10 E3 -600 -800 100 R 50 50 1 1 B
-X PB11 F2 -600 -900 100 R 50 50 1 1 B
-X PB12 F1 -600 -1000 100 R 50 50 1 1 B
-X PB13 E2 -600 -1100 100 R 50 50 1 1 B
-X PB14 E1 -600 -1200 100 R 50 50 1 1 B
-X PB15 D3 -600 -1300 100 R 50 50 1 1 B
-X PB2 G3 -600 0 100 R 50 50 1 1 B
 X PB3 A3 -600 -100 100 R 50 50 1 1 B
 X PB4 A4 -600 -200 100 R 50 50 1 1 B
+X PH3 A5 -600 900 100 R 50 50 1 1 B
+X VSS A6 -200 -1500 100 U 50 50 1 1 W
+X VDD A7 -100 1500 100 D 50 50 1 1 W
+X VSS B1 -100 -1500 100 U 50 50 1 1 W
+X PA13 B2 600 -1100 100 L 50 50 1 1 B
+X PA15 B3 600 -1300 100 L 50 50 1 1 B
 X PB5 B4 -600 -300 100 R 50 50 1 1 B
-X PB6 C4 -600 -400 100 R 50 50 1 1 B
-X PB7 D4 -600 -500 100 R 50 50 1 1 B
 X PB8 B5 -600 -600 100 R 50 50 1 1 B
-X PB9 C5 -600 -700 100 R 50 50 1 1 B
+X VBAT B6 -200 1500 100 D 50 50 1 1 W
 X PC13 B7 -600 600 100 R 50 50 1 1 B
-X PC14 C7 -600 500 100 R 50 50 1 1 B
+X PA11 C1 600 -900 100 L 50 50 1 1 B
+X PA10 C2 600 -800 100 L 50 50 1 1 B
+X PA12 C3 600 -1000 100 L 50 50 1 1 B
+X PB6 C4 -600 -400 100 R 50 50 1 1 B
+X PB9 C5 -600 -700 100 R 50 50 1 1 B
 X PC15 C6 -600 400 100 R 50 50 1 1 B
-X PC3 E6 -600 700 100 R 50 50 1 1 B
-X PH0 D7 -600 1100 100 R 50 50 1 1 I
+X PC14 C7 -600 500 100 R 50 50 1 1 B
+X PA8 D1 600 -600 100 L 50 50 1 1 B
+X PA9 D2 600 -700 100 L 50 50 1 1 B
+X PB15 D3 -600 -1300 100 R 50 50 1 1 B
+X PB7 D4 -600 -500 100 R 50 50 1 1 B
+X NRST D5 -600 1300 100 R 50 50 1 1 I
 X PH1 D6 -600 1000 100 R 50 50 1 1 I
-X PH3 A5 -600 900 100 R 50 50 1 1 B
-X VBAT B6 -200 1500 100 D 50 50 1 1 W
-X VDD A7 -100 1500 100 D 50 50 1 1 W
-X VDD G1 0 1500 100 D 50 50 1 1 W
+X PH0 D7 -600 1100 100 R 50 50 1 1 I
+X PB14 E1 -600 -1200 100 R 50 50 1 1 B
+X PB13 E2 -600 -1100 100 R 50 50 1 1 B
+X PB10 E3 -600 -800 100 R 50 50 1 1 B
+X PA3 E4 600 -100 100 L 50 50 1 1 B
+X PA2 E5 600 0 100 L 50 50 1 1 B
+X PC3 E6 -600 700 100 R 50 50 1 1 B
+X VSSA E7 100 -1500 100 U 50 50 1 1 W
+X PB12 F1 -600 -1000 100 R 50 50 1 1 B
+X PB11 F2 -600 -900 100 R 50 50 1 1 B
+X PA7 F3 600 -500 100 L 50 50 1 1 B
+X PA6 F4 600 -400 100 L 50 50 1 1 B
+X PA5 F5 600 -300 100 L 50 50 1 1 B
+X PA0 F6 600 200 100 L 50 50 1 1 B
 X VDDA F7 100 1500 100 D 50 50 1 1 W
-X VDDUSB A1 200 1500 100 D 50 50 1 1 W
-X VSS A6 -200 -1500 100 U 50 50 1 1 W
-X VSS B1 -100 -1500 100 U 50 50 1 1 W
+X VDD G1 0 1500 100 D 50 50 1 1 W
 X VSS G2 0 -1500 100 U 50 50 1 1 W
-X VSSA E7 100 -1500 100 U 50 50 1 1 W
+X PB2 G3 -600 0 100 R 50 50 1 1 B
+X PB1 G4 -600 100 100 R 50 50 1 1 B
+X PB0 G5 -600 200 100 R 50 50 1 1 B
+X PA4 G6 600 -200 100 L 50 50 1 1 B
+X PA1 G7 600 100 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
@@ -970,70 +970,70 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -600 -1700 500 1700 0 1 10 f
-X NRST E1 -700 1600 100 R 50 50 1 1 I
-X PA0 G2 600 1600 100 L 50 50 1 1 B
-X PA1 H2 600 1500 100 L 50 50 1 1 B
-X PA10 C6 600 600 100 L 50 50 1 1 B
-X PA11 C8 600 500 100 L 50 50 1 1 B
-X PA12 B8 600 400 100 L 50 50 1 1 B
-X PA13 A8 600 300 100 L 50 50 1 1 B
-X PA14 A7 600 200 100 L 50 50 1 1 B
-X PA15 A6 600 100 100 L 50 50 1 1 B
-X PA2 F3 600 1400 100 L 50 50 1 1 B
-X PA3 G3 600 1300 100 L 50 50 1 1 B
-X PA4 H3 600 1200 100 L 50 50 1 1 B
-X PA5 F4 600 1100 100 L 50 50 1 1 B
-X PA6 G4 600 1000 100 L 50 50 1 1 B
-X PA7 H4 600 900 100 L 50 50 1 1 B
-X PA8 D7 600 800 100 L 50 50 1 1 B
-X PA9 C7 600 700 100 L 50 50 1 1 B
-X PB0 F5 600 -100 100 L 50 50 1 1 B
-X PB1 G5 600 -200 100 L 50 50 1 1 B
-X PB10 G7 600 -1100 100 L 50 50 1 1 B
-X PB11 H7 600 -1200 100 L 50 50 1 1 B
-X PB12 H8 600 -1300 100 L 50 50 1 1 B
-X PB13 G8 600 -1400 100 L 50 50 1 1 B
-X PB14 F8 600 -1500 100 L 50 50 1 1 B
-X PB15 F7 600 -1600 100 L 50 50 1 1 B
-X PB2 G6 600 -300 100 L 50 50 1 1 B
-X PB3 A5 600 -400 100 L 50 50 1 1 B
+X PC14 A1 -700 -1500 100 R 50 50 1 1 B
+X PC13 A2 -700 -1400 100 R 50 50 1 1 B
+X PB9 A3 600 -1000 100 L 50 50 1 1 B
 X PB4 A4 600 -500 100 L 50 50 1 1 B
-X PB5 C4 600 -600 100 L 50 50 1 1 B
-X PB6 D3 600 -700 100 L 50 50 1 1 B
-X PB7 C3 600 -800 100 L 50 50 1 1 B
+X PB3 A5 600 -400 100 L 50 50 1 1 B
+X PA15 A6 600 100 100 L 50 50 1 1 B
+X PA14 A7 600 200 100 L 50 50 1 1 B
+X PA13 A8 600 300 100 L 50 50 1 1 B
+X PC15 B1 -700 -1600 100 R 50 50 1 1 B
+X VBAT B2 -300 1800 100 D 50 50 1 1 W
 X PB8 B3 600 -900 100 L 50 50 1 1 B
-X PB9 A3 600 -1000 100 L 50 50 1 1 B
-X PC0 E3 -700 -100 100 R 50 50 1 1 B
-X PC1 E2 -700 -200 100 R 50 50 1 1 B
-X PC10 B7 -700 -1100 100 R 50 50 1 1 B
+X PH3 B4 -700 300 100 R 50 50 1 1 B
+X PD2 B5 -700 100 100 R 50 50 1 1 B
 X PC11 B6 -700 -1200 100 R 50 50 1 1 B
-X PC12 C5 -700 -1300 100 R 50 50 1 1 B
-X PC13 A2 -700 -1400 100 R 50 50 1 1 B
-X PC14 A1 -700 -1500 100 R 50 50 1 1 B
-X PC15 B1 -700 -1600 100 R 50 50 1 1 B
-X PC2 F2 -700 -300 100 R 50 50 1 1 B
-X PC3 G1 -700 -400 100 R 50 50 1 1 B
-X PC4 H5 -700 -500 100 R 50 50 1 1 B
-X PC5 H6 -700 -600 100 R 50 50 1 1 B
-X PC6 F6 -700 -700 100 R 50 50 1 1 B
-X PC7 E7 -700 -800 100 R 50 50 1 1 B
-X PC8 E8 -700 -900 100 R 50 50 1 1 B
-X PC9 D8 -700 -1000 100 R 50 50 1 1 B
-X PD2 B5 -700 100 100 R 50 50 1 1 B
+X PC10 B7 -700 -1100 100 R 50 50 1 1 B
+X PA12 B8 600 400 100 L 50 50 1 1 B
 X PH0 C1 -700 500 100 R 50 50 1 1 I
+X VSS C2 -300 -1800 100 U 50 50 1 1 W
+X PB7 C3 600 -800 100 L 50 50 1 1 B
+X PB5 C4 600 -600 100 L 50 50 1 1 B
+X PC12 C5 -700 -1300 100 R 50 50 1 1 B
+X PA10 C6 600 600 100 L 50 50 1 1 B
+X PA9 C7 600 700 100 L 50 50 1 1 B
+X PA11 C8 600 500 100 L 50 50 1 1 B
 X PH1 D1 -700 400 100 R 50 50 1 1 I
-X PH3 B4 -700 300 100 R 50 50 1 1 B
-X VBAT B2 -300 1800 100 D 50 50 1 1 W
 X VDD D2 -200 1800 100 D 50 50 1 1 W
-X VDD E4 -100 1800 100 D 50 50 1 1 W
-X VDD E6 0 1800 100 D 50 50 1 1 W
-X VDDA H1 100 1800 100 D 50 50 1 1 W
-X VDDUSB E5 200 1800 100 D 50 50 1 1 W
-X VSS C2 -300 -1800 100 U 50 50 1 1 W
+X PB6 D3 600 -700 100 L 50 50 1 1 B
 X VSS D4 -200 -1800 100 U 50 50 1 1 W
 X VSS D5 -100 -1800 100 U 50 50 1 1 W
 X VSS D6 0 -1800 100 U 50 50 1 1 W
+X PA8 D7 600 800 100 L 50 50 1 1 B
+X PC9 D8 -700 -1000 100 R 50 50 1 1 B
+X NRST E1 -700 1600 100 R 50 50 1 1 I
+X PC1 E2 -700 -200 100 R 50 50 1 1 B
+X PC0 E3 -700 -100 100 R 50 50 1 1 B
+X VDD E4 -100 1800 100 D 50 50 1 1 W
+X VDDUSB E5 200 1800 100 D 50 50 1 1 W
+X VDD E6 0 1800 100 D 50 50 1 1 W
+X PC7 E7 -700 -800 100 R 50 50 1 1 B
+X PC8 E8 -700 -900 100 R 50 50 1 1 B
 X VSSA F1 100 -1800 100 U 50 50 1 1 W
+X PC2 F2 -700 -300 100 R 50 50 1 1 B
+X PA2 F3 600 1400 100 L 50 50 1 1 B
+X PA5 F4 600 1100 100 L 50 50 1 1 B
+X PB0 F5 600 -100 100 L 50 50 1 1 B
+X PC6 F6 -700 -700 100 R 50 50 1 1 B
+X PB15 F7 600 -1600 100 L 50 50 1 1 B
+X PB14 F8 600 -1500 100 L 50 50 1 1 B
+X PC3 G1 -700 -400 100 R 50 50 1 1 B
+X PA0 G2 600 1600 100 L 50 50 1 1 B
+X PA3 G3 600 1300 100 L 50 50 1 1 B
+X PA6 G4 600 1000 100 L 50 50 1 1 B
+X PB1 G5 600 -200 100 L 50 50 1 1 B
+X PB2 G6 600 -300 100 L 50 50 1 1 B
+X PB10 G7 600 -1100 100 L 50 50 1 1 B
+X PB13 G8 600 -1400 100 L 50 50 1 1 B
+X VDDA H1 100 1800 100 D 50 50 1 1 W
+X PA1 H2 600 1500 100 L 50 50 1 1 B
+X PA4 H3 600 1200 100 L 50 50 1 1 B
+X PA7 H4 600 900 100 L 50 50 1 1 B
+X PC4 H5 -700 -500 100 R 50 50 1 1 B
+X PC5 H6 -700 -600 100 R 50 50 1 1 B
+X PB11 H7 600 -1200 100 L 50 50 1 1 B
+X PB12 H8 600 -1300 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
@@ -1050,70 +1050,70 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -600 -1700 500 1700 0 1 10 f
-X NRST 7 -700 1600 100 R 50 50 1 1 I
+X VBAT 1 -300 1800 100 D 50 50 1 1 W
+X PC2 10 -700 -300 100 R 50 50 1 1 B
+X PC3 11 -700 -400 100 R 50 50 1 1 B
+X VSSA 12 100 -1800 100 U 50 50 1 1 W
+X VDDA 13 100 1800 100 D 50 50 1 1 W
 X PA0 14 600 1600 100 L 50 50 1 1 B
 X PA1 15 600 1500 100 L 50 50 1 1 B
-X PA10 43 600 600 100 L 50 50 1 1 B
-X PA11 44 600 500 100 L 50 50 1 1 B
-X PA12 45 600 400 100 L 50 50 1 1 B
-X PA13 46 600 300 100 L 50 50 1 1 B
-X PA14 49 600 200 100 L 50 50 1 1 B
-X PA15 50 600 100 100 L 50 50 1 1 B
 X PA2 16 600 1400 100 L 50 50 1 1 B
 X PA3 17 600 1300 100 L 50 50 1 1 B
+X VSS 18 -300 -1800 100 U 50 50 1 1 W
+X VDD 19 -200 1800 100 D 50 50 1 1 W
+X PC13 2 -700 -1400 100 R 50 50 1 1 B
 X PA4 20 600 1200 100 L 50 50 1 1 B
 X PA5 21 600 1100 100 L 50 50 1 1 B
 X PA6 22 600 1000 100 L 50 50 1 1 B
 X PA7 23 600 900 100 L 50 50 1 1 B
-X PA8 41 600 800 100 L 50 50 1 1 B
-X PA9 42 600 700 100 L 50 50 1 1 B
+X PC4 24 -700 -500 100 R 50 50 1 1 B
+X PC5 25 -700 -600 100 R 50 50 1 1 B
 X PB0 26 600 -100 100 L 50 50 1 1 B
 X PB1 27 600 -200 100 L 50 50 1 1 B
+X PB2 28 600 -300 100 L 50 50 1 1 B
 X PB10 29 600 -1100 100 L 50 50 1 1 B
+X PC14 3 -700 -1500 100 R 50 50 1 1 B
 X PB11 30 600 -1200 100 L 50 50 1 1 B
+X VSS 31 -200 -1800 100 U 50 50 1 1 W
+X VDD 32 -100 1800 100 D 50 50 1 1 W
 X PB12 33 600 -1300 100 L 50 50 1 1 B
 X PB13 34 600 -1400 100 L 50 50 1 1 B
 X PB14 35 600 -1500 100 L 50 50 1 1 B
 X PB15 36 600 -1600 100 L 50 50 1 1 B
-X PB2 28 600 -300 100 L 50 50 1 1 B
+X PC6 37 -700 -700 100 R 50 50 1 1 B
+X PC7 38 -700 -800 100 R 50 50 1 1 B
+X PC8 39 -700 -900 100 R 50 50 1 1 B
+X PC15 4 -700 -1600 100 R 50 50 1 1 B
+X PC9 40 -700 -1000 100 R 50 50 1 1 B
+X PA8 41 600 800 100 L 50 50 1 1 B
+X PA9 42 600 700 100 L 50 50 1 1 B
+X PA10 43 600 600 100 L 50 50 1 1 B
+X PA11 44 600 500 100 L 50 50 1 1 B
+X PA12 45 600 400 100 L 50 50 1 1 B
+X PA13 46 600 300 100 L 50 50 1 1 B
+X VSS 47 -100 -1800 100 U 50 50 1 1 W
+X VDDUSB 48 200 1800 100 D 50 50 1 1 W
+X PA14 49 600 200 100 L 50 50 1 1 B
+X PH0 5 -700 500 100 R 50 50 1 1 I
+X PA15 50 600 100 100 L 50 50 1 1 B
+X PC10 51 -700 -1100 100 R 50 50 1 1 B
+X PC11 52 -700 -1200 100 R 50 50 1 1 B
+X PC12 53 -700 -1300 100 R 50 50 1 1 B
+X PD2 54 -700 100 100 R 50 50 1 1 B
 X PB3 55 600 -400 100 L 50 50 1 1 B
 X PB4 56 600 -500 100 L 50 50 1 1 B
 X PB5 57 600 -600 100 L 50 50 1 1 B
 X PB6 58 600 -700 100 L 50 50 1 1 B
 X PB7 59 600 -800 100 L 50 50 1 1 B
+X PH1 6 -700 400 100 R 50 50 1 1 I
+X PH3 60 -700 300 100 R 50 50 1 1 B
 X PB8 61 600 -900 100 L 50 50 1 1 B
 X PB9 62 600 -1000 100 L 50 50 1 1 B
+X VSS 63 0 -1800 100 U 50 50 1 1 W
+X VDD 64 0 1800 100 D 50 50 1 1 W
+X NRST 7 -700 1600 100 R 50 50 1 1 I
 X PC0 8 -700 -100 100 R 50 50 1 1 B
 X PC1 9 -700 -200 100 R 50 50 1 1 B
-X PC10 51 -700 -1100 100 R 50 50 1 1 B
-X PC11 52 -700 -1200 100 R 50 50 1 1 B
-X PC12 53 -700 -1300 100 R 50 50 1 1 B
-X PC13 2 -700 -1400 100 R 50 50 1 1 B
-X PC14 3 -700 -1500 100 R 50 50 1 1 B
-X PC15 4 -700 -1600 100 R 50 50 1 1 B
-X PC2 10 -700 -300 100 R 50 50 1 1 B
-X PC3 11 -700 -400 100 R 50 50 1 1 B
-X PC4 24 -700 -500 100 R 50 50 1 1 B
-X PC5 25 -700 -600 100 R 50 50 1 1 B
-X PC6 37 -700 -700 100 R 50 50 1 1 B
-X PC7 38 -700 -800 100 R 50 50 1 1 B
-X PC8 39 -700 -900 100 R 50 50 1 1 B
-X PC9 40 -700 -1000 100 R 50 50 1 1 B
-X PD2 54 -700 100 100 R 50 50 1 1 B
-X PH0 5 -700 500 100 R 50 50 1 1 I
-X PH1 6 -700 400 100 R 50 50 1 1 I
-X PH3 60 -700 300 100 R 50 50 1 1 B
-X VBAT 1 -300 1800 100 D 50 50 1 1 W
-X VDD 19 -200 1800 100 D 50 50 1 1 W
-X VDD 32 -100 1800 100 D 50 50 1 1 W
-X VDD 64 0 1800 100 D 50 50 1 1 W
-X VDDA 13 100 1800 100 D 50 50 1 1 W
-X VDDUSB 48 200 1800 100 D 50 50 1 1 W
-X VSS 18 -300 -1800 100 U 50 50 1 1 W
-X VSS 31 -200 -1800 100 U 50 50 1 1 W
-X VSS 47 -100 -1800 100 U 50 50 1 1 W
-X VSS 63 0 -1800 100 U 50 50 1 1 W
-X VSSA 12 100 -1800 100 U 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
@@ -1130,70 +1130,70 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -600 -1700 500 1700 0 1 10 f
-X NRST D6 -700 1600 100 R 50 50 1 1 I
-X PA0 F7 600 1600 100 L 50 50 1 1 B
-X PA1 G7 600 1500 100 L 50 50 1 1 B
-X PA10 D2 600 600 100 L 50 50 1 1 B
-X PA11 D3 600 500 100 L 50 50 1 1 B
-X PA12 C1 600 400 100 L 50 50 1 1 B
-X PA13 C2 600 300 100 L 50 50 1 1 B
-X PA14 B2 600 200 100 L 50 50 1 1 B
+X VDDUSB A1 200 1800 100 D 50 50 1 1 W
 X PA15 A2 600 100 100 L 50 50 1 1 B
-X PA2 F6 600 1400 100 L 50 50 1 1 B
-X PA3 G6 600 1300 100 L 50 50 1 1 B
-X PA4 E5 600 1200 100 L 50 50 1 1 B
-X PA5 F5 600 1100 100 L 50 50 1 1 B
-X PA6 G5 600 1000 100 L 50 50 1 1 B
-X PA7 H6 600 900 100 L 50 50 1 1 B
-X PA8 E3 600 800 100 L 50 50 1 1 B
-X PA9 D1 600 700 100 L 50 50 1 1 B
-X PB0 F4 600 -100 100 L 50 50 1 1 B
-X PB1 H5 600 -200 100 L 50 50 1 1 B
-X PB10 H4 600 -1100 100 L 50 50 1 1 B
-X PB11 H3 600 -1200 100 L 50 50 1 1 B
-X PB12 G3 600 -1300 100 L 50 50 1 1 B
-X PB13 G2 600 -1400 100 L 50 50 1 1 B
-X PB14 G1 600 -1500 100 L 50 50 1 1 B
-X PB15 F2 600 -1600 100 L 50 50 1 1 B
-X PB2 G4 600 -300 100 L 50 50 1 1 B
+X PC12 A3 -700 -1300 100 R 50 50 1 1 B
+X PD2 A4 -700 100 100 R 50 50 1 1 B
 X PB3 A5 600 -400 100 L 50 50 1 1 B
+X PB7 A6 600 -800 100 L 50 50 1 1 B
+X VSS A7 -300 -1800 100 U 50 50 1 1 W
+X VDD A8 -200 1800 100 D 50 50 1 1 W
+X VSS B1 -200 -1800 100 U 50 50 1 1 W
+X PA14 B2 600 200 100 L 50 50 1 1 B
+X PC11 B3 -700 -1200 100 R 50 50 1 1 B
 X PB4 B4 600 -500 100 L 50 50 1 1 B
-X PB5 C4 600 -600 100 L 50 50 1 1 B
 X PB6 B5 600 -700 100 L 50 50 1 1 B
-X PB7 A6 600 -800 100 L 50 50 1 1 B
-X PB8 C6 600 -900 100 L 50 50 1 1 B
 X PB9 B6 600 -1000 100 L 50 50 1 1 B
-X PC0 D5 -700 -100 100 R 50 50 1 1 B
-X PC1 E8 -700 -200 100 R 50 50 1 1 B
-X PC10 C3 -700 -1100 100 R 50 50 1 1 B
-X PC11 B3 -700 -1200 100 R 50 50 1 1 B
-X PC12 A3 -700 -1300 100 R 50 50 1 1 B
+X VBAT B7 -300 1800 100 D 50 50 1 1 W
 X PC13 B8 -700 -1400 100 R 50 50 1 1 B
-X PC14 C8 -700 -1500 100 R 50 50 1 1 B
+X PA12 C1 600 400 100 L 50 50 1 1 B
+X PA13 C2 600 300 100 L 50 50 1 1 B
+X PC10 C3 -700 -1100 100 R 50 50 1 1 B
+X PB5 C4 600 -600 100 L 50 50 1 1 B
+X PH3 C5 -700 300 100 R 50 50 1 1 B
+X PB8 C6 600 -900 100 L 50 50 1 1 B
 X PC15 C7 -700 -1600 100 R 50 50 1 1 B
-X PC2 E7 -700 -300 100 R 50 50 1 1 B
-X PC3 E6 -700 -400 100 R 50 50 1 1 B
+X PC14 C8 -700 -1500 100 R 50 50 1 1 B
+X PA9 D1 600 700 100 L 50 50 1 1 B
+X PA10 D2 600 600 100 L 50 50 1 1 B
+X PA11 D3 600 500 100 L 50 50 1 1 B
 X PC4 D4 -700 -500 100 R 50 50 1 1 B
+X PC0 D5 -700 -100 100 R 50 50 1 1 B
+X NRST D6 -700 1600 100 R 50 50 1 1 I
+X PH1 D7 -700 400 100 R 50 50 1 1 I
+X PH0 D8 -700 500 100 R 50 50 1 1 I
+X PC7 E1 -700 -800 100 R 50 50 1 1 B
+X PC9 E2 -700 -1000 100 R 50 50 1 1 B
+X PA8 E3 600 800 100 L 50 50 1 1 B
 X PC5 E4 -700 -600 100 R 50 50 1 1 B
+X PA4 E5 600 1200 100 L 50 50 1 1 B
+X PC3 E6 -700 -400 100 R 50 50 1 1 B
+X PC2 E7 -700 -300 100 R 50 50 1 1 B
+X PC1 E8 -700 -200 100 R 50 50 1 1 B
 X PC6 F1 -700 -700 100 R 50 50 1 1 B
-X PC7 E1 -700 -800 100 R 50 50 1 1 B
+X PB15 F2 600 -1600 100 L 50 50 1 1 B
 X PC8 F3 -700 -900 100 R 50 50 1 1 B
-X PC9 E2 -700 -1000 100 R 50 50 1 1 B
-X PD2 A4 -700 100 100 R 50 50 1 1 B
-X PH0 D8 -700 500 100 R 50 50 1 1 I
-X PH1 D7 -700 400 100 R 50 50 1 1 I
-X PH3 C5 -700 300 100 R 50 50 1 1 B
-X VBAT B7 -300 1800 100 D 50 50 1 1 W
-X VDD A8 -200 1800 100 D 50 50 1 1 W
-X VDD H1 -100 1800 100 D 50 50 1 1 W
-X VDD H7 0 1800 100 D 50 50 1 1 W
+X PB0 F4 600 -100 100 L 50 50 1 1 B
+X PA5 F5 600 1100 100 L 50 50 1 1 B
+X PA2 F6 600 1400 100 L 50 50 1 1 B
+X PA0 F7 600 1600 100 L 50 50 1 1 B
+X VSSA F8 100 -1800 100 U 50 50 1 1 W
+X PB14 G1 600 -1500 100 L 50 50 1 1 B
+X PB13 G2 600 -1400 100 L 50 50 1 1 B
+X PB12 G3 600 -1300 100 L 50 50 1 1 B
+X PB2 G4 600 -300 100 L 50 50 1 1 B
+X PA6 G5 600 1000 100 L 50 50 1 1 B
+X PA3 G6 600 1300 100 L 50 50 1 1 B
+X PA1 G7 600 1500 100 L 50 50 1 1 B
 X VDDA G8 100 1800 100 D 50 50 1 1 W
-X VDDUSB A1 200 1800 100 D 50 50 1 1 W
-X VSS A7 -300 -1800 100 U 50 50 1 1 W
-X VSS B1 -200 -1800 100 U 50 50 1 1 W
+X VDD H1 -100 1800 100 D 50 50 1 1 W
 X VSS H2 -100 -1800 100 U 50 50 1 1 W
+X PB11 H3 600 -1200 100 L 50 50 1 1 B
+X PB10 H4 600 -1100 100 L 50 50 1 1 B
+X PB1 H5 600 -200 100 L 50 50 1 1 B
+X PA7 H6 600 900 100 L 50 50 1 1 B
+X VDD H7 0 1800 100 D 50 50 1 1 W
 X VSS H8 0 -1800 100 U 50 50 1 1 W
-X VSSA F8 100 -1800 100 U 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
@@ -1209,70 +1209,70 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -700 -1700 600 1700 0 1 10 f
-X NRST 7 -800 1600 100 R 50 50 1 1 I
+X VBAT 1 -400 1800 100 D 50 50 1 1 W
+X PC2 10 -800 -400 100 R 50 50 1 1 B
+X PC3 11 -800 -500 100 R 50 50 1 1 B
+X VSSA 12 100 -1800 100 U 50 50 1 1 W
+X VDDA 13 200 1800 100 D 50 50 1 1 W
 X PA0 14 700 1600 100 L 50 50 1 1 B
 X PA1 15 700 1500 100 L 50 50 1 1 B
-X PA10 43 700 600 100 L 50 50 1 1 B
-X PA11 44 700 500 100 L 50 50 1 1 B
-X PA12 45 700 400 100 L 50 50 1 1 B
-X PA13 46 700 300 100 L 50 50 1 1 B
-X PA14 49 700 200 100 L 50 50 1 1 B
-X PA15 50 700 100 100 L 50 50 1 1 B
 X PA2 16 700 1400 100 L 50 50 1 1 B
 X PA3 17 700 1300 100 L 50 50 1 1 B
+X VSS 18 -300 -1800 100 U 50 50 1 1 W
+X VDD 19 -300 1800 100 D 50 50 1 1 W
+X PC13 2 -800 -1400 100 R 50 50 1 1 B
 X PA4 20 700 1200 100 L 50 50 1 1 B
 X PA5 21 700 1100 100 L 50 50 1 1 B
 X PA6 22 700 1000 100 L 50 50 1 1 B
 X PA7 23 700 900 100 L 50 50 1 1 B
-X PA8 41 700 800 100 L 50 50 1 1 B
-X PA9 42 700 700 100 L 50 50 1 1 B
+X PC4 24 -800 -600 100 R 50 50 1 1 B
 X PB0 25 700 -100 100 L 50 50 1 1 B
 X PB1 26 700 -200 100 L 50 50 1 1 B
+X PB2 27 700 -300 100 L 50 50 1 1 B
 X PB10 28 700 -1100 100 L 50 50 1 1 B
 X PB11 29 700 -1200 100 L 50 50 1 1 B
+X PC14 3 -800 -1500 100 R 50 50 1 1 B
+X VDD12 30 0 1800 100 D 50 50 1 1 W
+X VSS 31 -200 -1800 100 U 50 50 1 1 W
+X VDD 32 -200 1800 100 D 50 50 1 1 W
 X PB12 33 700 -1300 100 L 50 50 1 1 B
 X PB13 34 700 -1400 100 L 50 50 1 1 B
 X PB14 35 700 -1500 100 L 50 50 1 1 B
 X PB15 36 700 -1600 100 L 50 50 1 1 B
-X PB2 27 700 -300 100 L 50 50 1 1 B
+X PC6 37 -800 -700 100 R 50 50 1 1 B
+X PC7 38 -800 -800 100 R 50 50 1 1 B
+X PC8 39 -800 -900 100 R 50 50 1 1 B
+X PC15 4 -800 -1600 100 R 50 50 1 1 B
+X PC9 40 -800 -1000 100 R 50 50 1 1 B
+X PA8 41 700 800 100 L 50 50 1 1 B
+X PA9 42 700 700 100 L 50 50 1 1 B
+X PA10 43 700 600 100 L 50 50 1 1 B
+X PA11 44 700 500 100 L 50 50 1 1 B
+X PA12 45 700 400 100 L 50 50 1 1 B
+X PA13 46 700 300 100 L 50 50 1 1 B
+X VSS 47 -100 -1800 100 U 50 50 1 1 W
+X VDDUSB 48 300 1800 100 D 50 50 1 1 W
+X PA14 49 700 200 100 L 50 50 1 1 B
+X PH0 5 -800 200 100 R 50 50 1 1 I
+X PA15 50 700 100 100 L 50 50 1 1 B
+X PC10 51 -800 -1100 100 R 50 50 1 1 B
+X PC11 52 -800 -1200 100 R 50 50 1 1 B
+X PC12 53 -800 -1300 100 R 50 50 1 1 B
 X PB3 54 700 -400 100 L 50 50 1 1 B
 X PB4 55 700 -500 100 L 50 50 1 1 B
 X PB5 56 700 -600 100 L 50 50 1 1 B
 X PB6 57 700 -700 100 L 50 50 1 1 B
 X PB7 58 700 -800 100 L 50 50 1 1 B
+X PH3 59 -800 0 100 R 50 50 1 1 B
+X PH1 6 -800 100 100 R 50 50 1 1 I
 X PB8 60 700 -900 100 L 50 50 1 1 B
 X PB9 61 700 -1000 100 L 50 50 1 1 B
-X PC0 8 -800 -200 100 R 50 50 1 1 B
-X PC1 9 -800 -300 100 R 50 50 1 1 B
-X PC10 51 -800 -1100 100 R 50 50 1 1 B
-X PC11 52 -800 -1200 100 R 50 50 1 1 B
-X PC12 53 -800 -1300 100 R 50 50 1 1 B
-X PC13 2 -800 -1400 100 R 50 50 1 1 B
-X PC14 3 -800 -1500 100 R 50 50 1 1 B
-X PC15 4 -800 -1600 100 R 50 50 1 1 B
-X PC2 10 -800 -400 100 R 50 50 1 1 B
-X PC3 11 -800 -500 100 R 50 50 1 1 B
-X PC4 24 -800 -600 100 R 50 50 1 1 B
-X PC6 37 -800 -700 100 R 50 50 1 1 B
-X PC7 38 -800 -800 100 R 50 50 1 1 B
-X PC8 39 -800 -900 100 R 50 50 1 1 B
-X PC9 40 -800 -1000 100 R 50 50 1 1 B
-X PH0 5 -800 200 100 R 50 50 1 1 I
-X PH1 6 -800 100 100 R 50 50 1 1 I
-X PH3 59 -800 0 100 R 50 50 1 1 B
-X VBAT 1 -400 1800 100 D 50 50 1 1 W
-X VDD 19 -300 1800 100 D 50 50 1 1 W
-X VDD 32 -200 1800 100 D 50 50 1 1 W
-X VDD 64 -100 1800 100 D 50 50 1 1 W
-X VDD12 30 0 1800 100 D 50 50 1 1 W
 X VDD12 62 100 1800 100 D 50 50 1 1 W
-X VDDA 13 200 1800 100 D 50 50 1 1 W
-X VDDUSB 48 300 1800 100 D 50 50 1 1 W
-X VSS 18 -300 -1800 100 U 50 50 1 1 W
-X VSS 31 -200 -1800 100 U 50 50 1 1 W
-X VSS 47 -100 -1800 100 U 50 50 1 1 W
 X VSS 63 0 -1800 100 U 50 50 1 1 W
-X VSSA 12 100 -1800 100 U 50 50 1 1 W
+X VDD 64 -100 1800 100 D 50 50 1 1 W
+X NRST 7 -800 1600 100 R 50 50 1 1 I
+X PC0 8 -800 -200 100 R 50 50 1 1 B
+X PC1 9 -800 -300 100 R 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
@@ -1288,106 +1288,106 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -700 -2600 700 2500 0 1 10 f
-X NRST H2 -900 2400 200 R 50 50 1 1 I
-X PA0 L2 900 2400 200 L 50 50 1 1 B
-X PA1 M2 900 2300 200 L 50 50 1 1 B
-X PA10 C12 900 1400 200 L 50 50 1 1 B
-X PA11 B12 900 1300 200 L 50 50 1 1 B
-X PA12 A12 900 1200 200 L 50 50 1 1 B
-X PA13 A11 900 1100 200 L 50 50 1 1 B
+X PE3 A1 -900 400 200 R 50 50 1 1 B
 X PA14 A10 900 1000 200 L 50 50 1 1 B
-X PA15 A9 900 900 200 L 50 50 1 1 B
-X PA2 K3 900 2200 200 L 50 50 1 1 B
-X PA3 L3 900 2100 200 L 50 50 1 1 B
-X PA4 M3 900 2000 200 L 50 50 1 1 B
-X PA5 K4 900 1900 200 L 50 50 1 1 B
-X PA6 L4 900 1800 200 L 50 50 1 1 B
-X PA7 M4 900 1700 200 L 50 50 1 1 B
-X PA8 D11 900 1600 200 L 50 50 1 1 B
-X PA9 D10 900 1500 200 L 50 50 1 1 B
-X PB0 M5 900 700 200 L 50 50 1 1 B
-X PB1 M6 900 600 200 L 50 50 1 1 B
-X PB10 L10 900 -300 200 L 50 50 1 1 B
-X PB11 L11 900 -400 200 L 50 50 1 1 B
-X PB12 L12 900 -500 200 L 50 50 1 1 B
-X PB13 K12 900 -600 200 L 50 50 1 1 B
-X PB14 K11 900 -700 200 L 50 50 1 1 B
-X PB15 K10 900 -800 200 L 50 50 1 1 B
-X PB2 L6 900 500 200 L 50 50 1 1 B
-X PB3 A8 900 400 200 L 50 50 1 1 B
-X PB4 A7 900 300 200 L 50 50 1 1 B
-X PB5 C5 900 200 200 L 50 50 1 1 B
-X PB6 B5 900 100 200 L 50 50 1 1 B
-X PB7 B4 900 0 200 L 50 50 1 1 B
+X PA13 A11 900 1100 200 L 50 50 1 1 B
+X PA12 A12 900 1200 200 L 50 50 1 1 B
+X PE1 A2 -900 600 200 R 50 50 1 1 B
 X PB8 A3 900 -100 200 L 50 50 1 1 B
-X PB9 B3 900 -200 200 L 50 50 1 1 B
-X PC0 H1 900 -1000 200 L 50 50 1 1 B
-X PC1 J2 900 -1100 200 L 50 50 1 1 B
-X PC10 B11 900 -2000 200 L 50 50 1 1 B
-X PC11 C10 900 -2100 200 L 50 50 1 1 B
+X PH3 A4 -900 900 200 R 50 50 1 1 B
+X PD7 A5 -900 -1700 200 R 50 50 1 1 B
+X PD5 A6 -900 -1500 200 R 50 50 1 1 B
+X PB4 A7 900 300 200 L 50 50 1 1 B
+X PB3 A8 900 400 200 L 50 50 1 1 B
+X PA15 A9 900 900 200 L 50 50 1 1 B
+X PE4 B1 -900 300 200 R 50 50 1 1 B
 X PC12 B10 900 -2200 200 L 50 50 1 1 B
+X PC10 B11 900 -2000 200 L 50 50 1 1 B
+X PA11 B12 900 1300 200 L 50 50 1 1 B
+X PE2 B2 -900 500 200 R 50 50 1 1 B
+X PB9 B3 900 -200 200 L 50 50 1 1 B
+X PB7 B4 900 0 200 L 50 50 1 1 B
+X PB6 B5 900 100 200 L 50 50 1 1 B
+X PD6 B6 -900 -1600 200 R 50 50 1 1 B
+X PD4 B7 -900 -1400 200 R 50 50 1 1 B
+X PD3 B8 -900 -1300 200 R 50 50 1 1 B
+X PD1 B9 -900 -1100 200 R 50 50 1 1 B
 X PC13 C1 900 -2300 200 L 50 50 1 1 B
+X PC11 C10 900 -2100 200 L 50 50 1 1 B
+X VDDUSB C11 400 2700 200 D 50 50 1 1 W
+X PA10 C12 900 1400 200 L 50 50 1 1 B
+X PE5 C2 -900 200 200 R 50 50 1 1 B
+X PE0 C3 -900 700 200 R 50 50 1 1 B
+X VDD C4 -200 2700 200 D 50 50 1 1 W
+X PB5 C5 900 200 200 L 50 50 1 1 B
+X PD2 C8 -900 -1200 200 R 50 50 1 1 B
+X PD0 C9 -900 -1000 200 R 50 50 1 1 B
 X PC14 D1 900 -2400 200 L 50 50 1 1 B
+X PA9 D10 900 1500 200 L 50 50 1 1 B
+X PA8 D11 900 1600 200 L 50 50 1 1 B
+X PC9 D12 900 -1900 200 L 50 50 1 1 B
+X PE6 D2 -900 100 200 R 50 50 1 1 B
+X VSS D3 -200 -2800 200 U 50 50 1 1 W
 X PC15 E1 900 -2500 200 L 50 50 1 1 B
+X PC8 E10 900 -1800 200 L 50 50 1 1 B
+X PC7 E11 900 -1700 200 L 50 50 1 1 B
+X PC6 E12 900 -1600 200 L 50 50 1 1 B
+X VBAT E2 -300 2700 200 D 50 50 1 1 W
+X VSS E3 -100 -2800 200 U 50 50 1 1 W
+X PH0 F1 -900 1100 200 R 50 50 1 1 I
+X VSS F11 100 -2800 200 U 50 50 1 1 W
+X VSS F12 200 -2800 200 U 50 50 1 1 W
+X VSS F2 0 -2800 200 U 50 50 1 1 W
+X PH1 G1 -900 1000 200 R 50 50 1 1 I
+X VDD G11 0 2700 200 D 50 50 1 1 W
+X VDD G12 100 2700 200 D 50 50 1 1 W
+X VDD G2 -100 2700 200 D 50 50 1 1 W
+X PC0 H1 900 -1000 200 L 50 50 1 1 B
+X PD15 H10 -900 -2500 200 R 50 50 1 1 B
+X PD14 H11 -900 -2400 200 R 50 50 1 1 B
+X PD13 H12 -900 -2300 200 R 50 50 1 1 B
+X NRST H2 -900 2400 200 R 50 50 1 1 I
+X VDD H3 200 2700 200 D 50 50 1 1 W
+X VSSA J1 300 -2800 200 U 50 50 1 1 W
+X PD12 J10 -900 -2200 200 R 50 50 1 1 B
+X PD11 J11 -900 -2100 200 R 50 50 1 1 B
+X PD10 J12 -900 -2000 200 R 50 50 1 1 B
+X PC1 J2 900 -1100 200 L 50 50 1 1 B
 X PC2 J3 900 -1200 200 L 50 50 1 1 B
+X VREF- K1 -900 2100 200 R 50 50 1 1 W
+X PB15 K10 900 -800 200 L 50 50 1 1 B
+X PB14 K11 900 -700 200 L 50 50 1 1 B
+X PB13 K12 900 -600 200 L 50 50 1 1 B
 X PC3 K2 900 -1300 200 L 50 50 1 1 B
+X PA2 K3 900 2200 200 L 50 50 1 1 B
+X PA5 K4 900 1900 200 L 50 50 1 1 B
 X PC4 K5 900 -1400 200 L 50 50 1 1 B
-X PC5 L5 900 -1500 200 L 50 50 1 1 B
-X PC6 E12 900 -1600 200 L 50 50 1 1 B
-X PC7 E11 900 -1700 200 L 50 50 1 1 B
-X PC8 E10 900 -1800 200 L 50 50 1 1 B
-X PC9 D12 900 -1900 200 L 50 50 1 1 B
-X PD0 C9 -900 -1000 200 R 50 50 1 1 B
-X PD1 B9 -900 -1100 200 R 50 50 1 1 B
-X PD10 J12 -900 -2000 200 R 50 50 1 1 B
-X PD11 J11 -900 -2100 200 R 50 50 1 1 B
-X PD12 J10 -900 -2200 200 R 50 50 1 1 B
-X PD13 H12 -900 -2300 200 R 50 50 1 1 B
-X PD14 H11 -900 -2400 200 R 50 50 1 1 B
-X PD15 H10 -900 -2500 200 R 50 50 1 1 B
-X PD2 C8 -900 -1200 200 R 50 50 1 1 B
-X PD3 B8 -900 -1300 200 R 50 50 1 1 B
-X PD4 B7 -900 -1400 200 R 50 50 1 1 B
-X PD5 A6 -900 -1500 200 R 50 50 1 1 B
-X PD6 B6 -900 -1600 200 R 50 50 1 1 B
-X PD7 A5 -900 -1700 200 R 50 50 1 1 B
-X PD8 K9 -900 -1800 200 R 50 50 1 1 B
 X PD9 K8 -900 -1900 200 R 50 50 1 1 B
-X PE0 C3 -900 700 200 R 50 50 1 1 B
-X PE1 A2 -900 600 200 R 50 50 1 1 B
+X PD8 K9 -900 -1800 200 R 50 50 1 1 B
+X VREF+ L1 -900 2200 200 R 50 50 1 1 B
+X PB10 L10 900 -300 200 L 50 50 1 1 B
+X PB11 L11 900 -400 200 L 50 50 1 1 B
+X PB12 L12 900 -500 200 L 50 50 1 1 B
+X PA0 L2 900 2400 200 L 50 50 1 1 B
+X PA3 L3 900 2100 200 L 50 50 1 1 B
+X PA6 L4 900 1800 200 L 50 50 1 1 B
+X PC5 L5 900 -1500 200 L 50 50 1 1 B
+X PB2 L6 900 500 200 L 50 50 1 1 B
+X PE8 L7 -900 -100 200 R 50 50 1 1 B
 X PE10 L8 -900 -300 200 R 50 50 1 1 B
-X PE11 M9 -900 -400 200 R 50 50 1 1 B
 X PE12 L9 -900 -500 200 R 50 50 1 1 B
+X VDDA M1 300 2700 200 D 50 50 1 1 W
 X PE13 M10 -900 -600 200 R 50 50 1 1 B
 X PE14 M11 -900 -700 200 R 50 50 1 1 B
 X PE15 M12 -900 -800 200 R 50 50 1 1 B
-X PE2 B2 -900 500 200 R 50 50 1 1 B
-X PE3 A1 -900 400 200 R 50 50 1 1 B
-X PE4 B1 -900 300 200 R 50 50 1 1 B
-X PE5 C2 -900 200 200 R 50 50 1 1 B
-X PE6 D2 -900 100 200 R 50 50 1 1 B
+X PA1 M2 900 2300 200 L 50 50 1 1 B
+X PA4 M3 900 2000 200 L 50 50 1 1 B
+X PA7 M4 900 1700 200 L 50 50 1 1 B
+X PB0 M5 900 700 200 L 50 50 1 1 B
+X PB1 M6 900 600 200 L 50 50 1 1 B
 X PE7 M7 -900 0 200 R 50 50 1 1 B
-X PE8 L7 -900 -100 200 R 50 50 1 1 B
 X PE9 M8 -900 -200 200 R 50 50 1 1 B
-X PH0 F1 -900 1100 200 R 50 50 1 1 I
-X PH1 G1 -900 1000 200 R 50 50 1 1 I
-X PH3 A4 -900 900 200 R 50 50 1 1 B
-X VBAT E2 -300 2700 200 D 50 50 1 1 W
-X VDD C4 -200 2700 200 D 50 50 1 1 W
-X VDD G11 0 2700 200 D 50 50 1 1 W
-X VDD G12 100 2700 200 D 50 50 1 1 W
-X VDD G2 -100 2700 200 D 50 50 1 1 W
-X VDD H3 200 2700 200 D 50 50 1 1 W
-X VDDA M1 300 2700 200 D 50 50 1 1 W
-X VDDUSB C11 400 2700 200 D 50 50 1 1 W
-X VREF+ L1 -900 2200 200 R 50 50 1 1 B
-X VREF- K1 -900 2100 200 R 50 50 1 1 W
-X VSS D3 -200 -2800 200 U 50 50 1 1 W
-X VSS E3 -100 -2800 200 U 50 50 1 1 W
-X VSS F11 100 -2800 200 U 50 50 1 1 W
-X VSS F12 200 -2800 200 U 50 50 1 1 W
-X VSS F2 0 -2800 200 U 50 50 1 1 W
-X VSSA J1 300 -2800 200 U 50 50 1 1 W
+X PE11 M9 -900 -400 200 R 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
@@ -1403,106 +1403,106 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -700 -2600 700 2500 0 1 10 f
+X PE2 1 -900 500 200 R 50 50 1 1 B
+X VSS 10 -200 -2800 200 U 50 50 1 1 W
+X VDD 100 200 2700 200 D 50 50 1 1 W
+X VDD 11 -200 2700 200 D 50 50 1 1 W
+X PH0 12 -900 1100 200 R 50 50 1 1 I
+X PH1 13 -900 1000 200 R 50 50 1 1 I
 X NRST 14 -900 2400 200 R 50 50 1 1 I
+X PC0 15 900 -1000 200 L 50 50 1 1 B
+X PC1 16 900 -1100 200 L 50 50 1 1 B
+X PC2 17 900 -1200 200 L 50 50 1 1 B
+X PC3 18 900 -1300 200 L 50 50 1 1 B
+X VSSA 19 300 -2800 200 U 50 50 1 1 W
+X PE3 2 -900 400 200 R 50 50 1 1 B
+X VREF- 20 -900 2100 200 R 50 50 1 1 W
+X VREF+ 21 -900 2200 200 R 50 50 1 1 B
+X VDDA 22 300 2700 200 D 50 50 1 1 W
 X PA0 23 900 2400 200 L 50 50 1 1 B
 X PA1 24 900 2300 200 L 50 50 1 1 B
-X PA10 69 900 1400 200 L 50 50 1 1 B
-X PA11 70 900 1300 200 L 50 50 1 1 B
-X PA12 71 900 1200 200 L 50 50 1 1 B
-X PA13 72 900 1100 200 L 50 50 1 1 B
-X PA14 76 900 1000 200 L 50 50 1 1 B
-X PA15 77 900 900 200 L 50 50 1 1 B
 X PA2 25 900 2200 200 L 50 50 1 1 B
 X PA3 26 900 2100 200 L 50 50 1 1 B
+X VSS 27 -100 -2800 200 U 50 50 1 1 W
+X VDD 28 -100 2700 200 D 50 50 1 1 W
 X PA4 29 900 2000 200 L 50 50 1 1 B
+X PE4 3 -900 300 200 R 50 50 1 1 B
 X PA5 30 900 1900 200 L 50 50 1 1 B
 X PA6 31 900 1800 200 L 50 50 1 1 B
 X PA7 32 900 1700 200 L 50 50 1 1 B
-X PA8 67 900 1600 200 L 50 50 1 1 B
-X PA9 68 900 1500 200 L 50 50 1 1 B
-X PB0 35 900 700 200 L 50 50 1 1 B
+X PC4 33 900 -1400 200 L 50 50 1 1 B
+X PC5 34 900 -1500 200 L 50 50 1 1 B
+X PB0 35 900 700 200 L 50 50 1 1 B
 X PB1 36 900 600 200 L 50 50 1 1 B
+X PB2 37 900 500 200 L 50 50 1 1 B
+X PE7 38 -900 0 200 R 50 50 1 1 B
+X PE8 39 -900 -100 200 R 50 50 1 1 B
+X PE5 4 -900 200 200 R 50 50 1 1 B
+X PE9 40 -900 -200 200 R 50 50 1 1 B
+X PE10 41 -900 -300 200 R 50 50 1 1 B
+X PE11 42 -900 -400 200 R 50 50 1 1 B
+X PE12 43 -900 -500 200 R 50 50 1 1 B
+X PE13 44 -900 -600 200 R 50 50 1 1 B
+X PE14 45 -900 -700 200 R 50 50 1 1 B
+X PE15 46 -900 -800 200 R 50 50 1 1 B
 X PB10 47 900 -300 200 L 50 50 1 1 B
 X PB11 48 900 -400 200 L 50 50 1 1 B
+X VSS 49 0 -2800 200 U 50 50 1 1 W
+X PE6 5 -900 100 200 R 50 50 1 1 B
+X VDD 50 0 2700 200 D 50 50 1 1 W
 X PB12 51 900 -500 200 L 50 50 1 1 B
 X PB13 52 900 -600 200 L 50 50 1 1 B
 X PB14 53 900 -700 200 L 50 50 1 1 B
 X PB15 54 900 -800 200 L 50 50 1 1 B
-X PB2 37 900 500 200 L 50 50 1 1 B
-X PB3 89 900 400 200 L 50 50 1 1 B
-X PB4 90 900 300 200 L 50 50 1 1 B
-X PB5 91 900 200 200 L 50 50 1 1 B
-X PB6 92 900 100 200 L 50 50 1 1 B
-X PB7 93 900 0 200 L 50 50 1 1 B
-X PB8 95 900 -100 200 L 50 50 1 1 B
-X PB9 96 900 -200 200 L 50 50 1 1 B
-X PC0 15 900 -1000 200 L 50 50 1 1 B
-X PC1 16 900 -1100 200 L 50 50 1 1 B
-X PC10 78 900 -2000 200 L 50 50 1 1 B
-X PC11 79 900 -2100 200 L 50 50 1 1 B
-X PC12 80 900 -2200 200 L 50 50 1 1 B
-X PC13 7 900 -2300 200 L 50 50 1 1 B
-X PC14 8 900 -2400 200 L 50 50 1 1 B
-X PC15 9 900 -2500 200 L 50 50 1 1 B
-X PC2 17 900 -1200 200 L 50 50 1 1 B
-X PC3 18 900 -1300 200 L 50 50 1 1 B
-X PC4 33 900 -1400 200 L 50 50 1 1 B
-X PC5 34 900 -1500 200 L 50 50 1 1 B
-X PC6 63 900 -1600 200 L 50 50 1 1 B
-X PC7 64 900 -1700 200 L 50 50 1 1 B
-X PC8 65 900 -1800 200 L 50 50 1 1 B
-X PC9 66 900 -1900 200 L 50 50 1 1 B
-X PD0 81 -900 -1000 200 R 50 50 1 1 B
-X PD1 82 -900 -1100 200 R 50 50 1 1 B
+X PD8 55 -900 -1800 200 R 50 50 1 1 B
+X PD9 56 -900 -1900 200 R 50 50 1 1 B
 X PD10 57 -900 -2000 200 R 50 50 1 1 B
 X PD11 58 -900 -2100 200 R 50 50 1 1 B
 X PD12 59 -900 -2200 200 R 50 50 1 1 B
+X VBAT 6 -300 2700 200 D 50 50 1 1 W
 X PD13 60 -900 -2300 200 R 50 50 1 1 B
 X PD14 61 -900 -2400 200 R 50 50 1 1 B
 X PD15 62 -900 -2500 200 R 50 50 1 1 B
+X PC6 63 900 -1600 200 L 50 50 1 1 B
+X PC7 64 900 -1700 200 L 50 50 1 1 B
+X PC8 65 900 -1800 200 L 50 50 1 1 B
+X PC9 66 900 -1900 200 L 50 50 1 1 B
+X PA8 67 900 1600 200 L 50 50 1 1 B
+X PA9 68 900 1500 200 L 50 50 1 1 B
+X PA10 69 900 1400 200 L 50 50 1 1 B
+X PC13 7 900 -2300 200 L 50 50 1 1 B
+X PA11 70 900 1300 200 L 50 50 1 1 B
+X PA12 71 900 1200 200 L 50 50 1 1 B
+X PA13 72 900 1100 200 L 50 50 1 1 B
+X VDDUSB 73 400 2700 200 D 50 50 1 1 W
+X VSS 74 100 -2800 200 U 50 50 1 1 W
+X VDD 75 100 2700 200 D 50 50 1 1 W
+X PA14 76 900 1000 200 L 50 50 1 1 B
+X PA15 77 900 900 200 L 50 50 1 1 B
+X PC10 78 900 -2000 200 L 50 50 1 1 B
+X PC11 79 900 -2100 200 L 50 50 1 1 B
+X PC14 8 900 -2400 200 L 50 50 1 1 B
+X PC12 80 900 -2200 200 L 50 50 1 1 B
+X PD0 81 -900 -1000 200 R 50 50 1 1 B
+X PD1 82 -900 -1100 200 R 50 50 1 1 B
 X PD2 83 -900 -1200 200 R 50 50 1 1 B
 X PD3 84 -900 -1300 200 R 50 50 1 1 B
 X PD4 85 -900 -1400 200 R 50 50 1 1 B
 X PD5 86 -900 -1500 200 R 50 50 1 1 B
 X PD6 87 -900 -1600 200 R 50 50 1 1 B
 X PD7 88 -900 -1700 200 R 50 50 1 1 B
-X PD8 55 -900 -1800 200 R 50 50 1 1 B
-X PD9 56 -900 -1900 200 R 50 50 1 1 B
+X PB3 89 900 400 200 L 50 50 1 1 B
+X PC15 9 900 -2500 200 L 50 50 1 1 B
+X PB4 90 900 300 200 L 50 50 1 1 B
+X PB5 91 900 200 200 L 50 50 1 1 B
+X PB6 92 900 100 200 L 50 50 1 1 B
+X PB7 93 900 0 200 L 50 50 1 1 B
+X PH3 94 -900 900 200 R 50 50 1 1 B
+X PB8 95 900 -100 200 L 50 50 1 1 B
+X PB9 96 900 -200 200 L 50 50 1 1 B
 X PE0 97 -900 700 200 R 50 50 1 1 B
 X PE1 98 -900 600 200 R 50 50 1 1 B
-X PE10 41 -900 -300 200 R 50 50 1 1 B
-X PE11 42 -900 -400 200 R 50 50 1 1 B
-X PE12 43 -900 -500 200 R 50 50 1 1 B
-X PE13 44 -900 -600 200 R 50 50 1 1 B
-X PE14 45 -900 -700 200 R 50 50 1 1 B
-X PE15 46 -900 -800 200 R 50 50 1 1 B
-X PE2 1 -900 500 200 R 50 50 1 1 B
-X PE3 2 -900 400 200 R 50 50 1 1 B
-X PE4 3 -900 300 200 R 50 50 1 1 B
-X PE5 4 -900 200 200 R 50 50 1 1 B
-X PE6 5 -900 100 200 R 50 50 1 1 B
-X PE7 38 -900 0 200 R 50 50 1 1 B
-X PE8 39 -900 -100 200 R 50 50 1 1 B
-X PE9 40 -900 -200 200 R 50 50 1 1 B
-X PH0 12 -900 1100 200 R 50 50 1 1 I
-X PH1 13 -900 1000 200 R 50 50 1 1 I
-X PH3 94 -900 900 200 R 50 50 1 1 B
-X VBAT 6 -300 2700 200 D 50 50 1 1 W
-X VDD 100 200 2700 200 D 50 50 1 1 W
-X VDD 11 -200 2700 200 D 50 50 1 1 W
-X VDD 28 -100 2700 200 D 50 50 1 1 W
-X VDD 50 0 2700 200 D 50 50 1 1 W
-X VDD 75 100 2700 200 D 50 50 1 1 W
-X VDDA 22 300 2700 200 D 50 50 1 1 W
-X VDDUSB 73 400 2700 200 D 50 50 1 1 W
-X VREF+ 21 -900 2200 200 R 50 50 1 1 B
-X VREF- 20 -900 2100 200 R 50 50 1 1 W
-X VSS 10 -200 -2800 200 U 50 50 1 1 W
-X VSS 27 -100 -2800 200 U 50 50 1 1 W
-X VSS 49 0 -2800 200 U 50 50 1 1 W
-X VSS 74 100 -2800 200 U 50 50 1 1 W
 X VSS 99 200 -2800 200 U 50 50 1 1 W
-X VSSA 19 300 -2800 200 U 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
@@ -1518,39 +1518,39 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -400 -900 400 800 0 1 10 f
-X NRST 4 -500 700 100 R 50 50 1 1 I
-X PA0 6 500 700 100 L 50 50 1 1 B
-X PA1 7 500 600 100 L 50 50 1 1 B
-X PA10 20 500 -300 100 L 50 50 1 1 B
-X PA11 21 500 -400 100 L 50 50 1 1 B
-X PA12 22 500 -500 100 L 50 50 1 1 B
-X PA13 23 500 -600 100 L 50 50 1 1 B
-X PA14 24 500 -700 100 L 50 50 1 1 B
-X PA15 25 500 -800 100 L 50 50 1 1 B
-X PA2 8 500 500 100 L 50 50 1 1 B
-X PA3 9 500 400 100 L 50 50 1 1 B
+X VDD 1 -100 900 100 D 50 50 1 1 W
 X PA4 10 500 300 100 L 50 50 1 1 B
 X PA5 11 500 200 100 L 50 50 1 1 B
 X PA6 12 500 100 100 L 50 50 1 1 B
 X PA7 13 500 0 100 L 50 50 1 1 B
-X PA8 18 500 -100 100 L 50 50 1 1 B
-X PA9 19 500 -200 100 L 50 50 1 1 B
 X PB0 14 -500 -200 100 R 50 50 1 1 B
 X PB1 15 -500 -300 100 R 50 50 1 1 B
+X VSS 16 -100 -1000 100 U 50 50 1 1 W
+X VDD 17 0 900 100 D 50 50 1 1 W
+X PA8 18 500 -100 100 L 50 50 1 1 B
+X PA9 19 500 -200 100 L 50 50 1 1 B
+X PC14 2 -500 100 100 R 50 50 1 1 B
+X PA10 20 500 -300 100 L 50 50 1 1 B
+X PA11 21 500 -400 100 L 50 50 1 1 B
+X PA12 22 500 -500 100 L 50 50 1 1 B
+X PA13 23 500 -600 100 L 50 50 1 1 B
+X PA14 24 500 -700 100 L 50 50 1 1 B
+X PA15 25 500 -800 100 L 50 50 1 1 B
 X PB3 26 -500 -400 100 R 50 50 1 1 B
 X PB4 27 -500 -500 100 R 50 50 1 1 B
 X PB5 28 -500 -600 100 R 50 50 1 1 B
 X PB6 29 -500 -700 100 R 50 50 1 1 B
-X PB7 30 -500 -800 100 R 50 50 1 1 B
-X PC14 2 -500 100 100 R 50 50 1 1 B
 X PC15 3 -500 0 100 R 50 50 1 1 B
+X PB7 30 -500 -800 100 R 50 50 1 1 B
 X PH3 31 -500 300 100 R 50 50 1 1 B
-X VDD 1 -100 900 100 D 50 50 1 1 W
-X VDD 17 0 900 100 D 50 50 1 1 W
-X VDDA 5 100 900 100 D 50 50 1 1 W
-X VSS 16 -100 -1000 100 U 50 50 1 1 W
 X VSS 32 0 -1000 100 U 50 50 1 1 W
 X VSS 33 100 -1000 100 U 50 50 1 1 W
+X NRST 4 -500 700 100 R 50 50 1 1 I
+X VDDA 5 100 900 100 D 50 50 1 1 W
+X PA0 6 500 700 100 L 50 50 1 1 B
+X PA1 7 500 600 100 L 50 50 1 1 B
+X PA2 8 500 500 100 L 50 50 1 1 B
+X PA3 9 500 400 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
@@ -1566,54 +1566,54 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -500 -1400 500 1300 0 1 10 f
-X NRST 7 -600 1200 100 R 50 50 1 1 I
+X VBAT 1 -200 1400 100 D 50 50 1 1 W
 X PA0 10 600 200 100 L 50 50 1 1 B
 X PA1 11 600 100 100 L 50 50 1 1 B
-X PA10 31 600 -800 100 L 50 50 1 1 B
-X PA11 32 600 -900 100 L 50 50 1 1 B
-X PA12 33 600 -1000 100 L 50 50 1 1 B
-X PA13 34 600 -1100 100 L 50 50 1 1 B
-X PA14 37 600 -1200 100 L 50 50 1 1 B
-X PA15 38 600 -1300 100 L 50 50 1 1 B
 X PA2 12 600 0 100 L 50 50 1 1 B
 X PA3 13 600 -100 100 L 50 50 1 1 B
 X PA4 14 600 -200 100 L 50 50 1 1 B
 X PA5 15 600 -300 100 L 50 50 1 1 B
 X PA6 16 600 -400 100 L 50 50 1 1 B
 X PA7 17 600 -500 100 L 50 50 1 1 B
-X PA8 29 600 -600 100 L 50 50 1 1 B
-X PA9 30 600 -700 100 L 50 50 1 1 B
 X PB0 18 -600 200 100 R 50 50 1 1 B
 X PB1 19 -600 100 100 R 50 50 1 1 B
+X PC13 2 -600 600 100 R 50 50 1 1 B
+X PB2 20 -600 0 100 R 50 50 1 1 B
 X PB10 21 -600 -800 100 R 50 50 1 1 B
 X PB11 22 -600 -900 100 R 50 50 1 1 B
+X VSS 23 -200 -1500 100 U 50 50 1 1 W
+X VDD 24 -100 1400 100 D 50 50 1 1 W
 X PB12 25 -600 -1000 100 R 50 50 1 1 B
 X PB13 26 -600 -1100 100 R 50 50 1 1 B
 X PB14 27 -600 -1200 100 R 50 50 1 1 B
 X PB15 28 -600 -1300 100 R 50 50 1 1 B
-X PB2 20 -600 0 100 R 50 50 1 1 B
+X PA8 29 600 -600 100 L 50 50 1 1 B
+X PC14 3 -600 500 100 R 50 50 1 1 B
+X PA9 30 600 -700 100 L 50 50 1 1 B
+X PA10 31 600 -800 100 L 50 50 1 1 B
+X PA11 32 600 -900 100 L 50 50 1 1 B
+X PA12 33 600 -1000 100 L 50 50 1 1 B
+X PA13 34 600 -1100 100 L 50 50 1 1 B
+X VSS 35 -100 -1500 100 U 50 50 1 1 W
+X VDDUSB 36 200 1400 100 D 50 50 1 1 W
+X PA14 37 600 -1200 100 L 50 50 1 1 B
+X PA15 38 600 -1300 100 L 50 50 1 1 B
 X PB3 39 -600 -100 100 R 50 50 1 1 B
+X PC15 4 -600 400 100 R 50 50 1 1 B
 X PB4 40 -600 -200 100 R 50 50 1 1 B
 X PB5 41 -600 -300 100 R 50 50 1 1 B
 X PB6 42 -600 -400 100 R 50 50 1 1 B
 X PB7 43 -600 -500 100 R 50 50 1 1 B
+X PH3 44 -600 800 100 R 50 50 1 1 B
 X PB8 45 -600 -600 100 R 50 50 1 1 B
 X PB9 46 -600 -700 100 R 50 50 1 1 B
-X PC13 2 -600 600 100 R 50 50 1 1 B
-X PC14 3 -600 500 100 R 50 50 1 1 B
-X PC15 4 -600 400 100 R 50 50 1 1 B
+X VSS 47 0 -1500 100 U 50 50 1 1 W
+X VDD 48 0 1400 100 D 50 50 1 1 W
 X PH0 5 -600 1000 100 R 50 50 1 1 I
 X PH1 6 -600 900 100 R 50 50 1 1 I
-X PH3 44 -600 800 100 R 50 50 1 1 B
-X VBAT 1 -200 1400 100 D 50 50 1 1 W
-X VDD 24 -100 1400 100 D 50 50 1 1 W
-X VDD 48 0 1400 100 D 50 50 1 1 W
-X VDDA 9 100 1400 100 D 50 50 1 1 W
-X VDDUSB 36 200 1400 100 D 50 50 1 1 W
-X VSS 23 -200 -1500 100 U 50 50 1 1 W
-X VSS 35 -100 -1500 100 U 50 50 1 1 W
-X VSS 47 0 -1500 100 U 50 50 1 1 W
+X NRST 7 -600 1200 100 R 50 50 1 1 I
 X VSSA 8 100 -1500 100 U 50 50 1 1 W
+X VDDA 9 100 1400 100 D 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
@@ -1629,55 +1629,55 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -500 -1400 500 1300 0 1 10 f
-X NRST 7 -600 1200 100 R 50 50 1 1 I
+X VBAT 1 -200 1400 100 D 50 50 1 1 W
 X PA0 10 600 200 100 L 50 50 1 1 B
 X PA1 11 600 100 100 L 50 50 1 1 B
-X PA10 31 600 -800 100 L 50 50 1 1 B
-X PA11 32 600 -900 100 L 50 50 1 1 B
-X PA12 33 600 -1000 100 L 50 50 1 1 B
-X PA13 34 600 -1100 100 L 50 50 1 1 B
-X PA14 37 600 -1200 100 L 50 50 1 1 B
-X PA15 38 600 -1300 100 L 50 50 1 1 B
 X PA2 12 600 0 100 L 50 50 1 1 B
 X PA3 13 600 -100 100 L 50 50 1 1 B
 X PA4 14 600 -200 100 L 50 50 1 1 B
 X PA5 15 600 -300 100 L 50 50 1 1 B
 X PA6 16 600 -400 100 L 50 50 1 1 B
 X PA7 17 600 -500 100 L 50 50 1 1 B
-X PA8 29 600 -600 100 L 50 50 1 1 B
-X PA9 30 600 -700 100 L 50 50 1 1 B
 X PB0 18 -600 200 100 R 50 50 1 1 B
 X PB1 19 -600 100 100 R 50 50 1 1 B
+X PC13 2 -600 600 100 R 50 50 1 1 B
+X PB2 20 -600 0 100 R 50 50 1 1 B
 X PB10 21 -600 -800 100 R 50 50 1 1 B
 X PB11 22 -600 -900 100 R 50 50 1 1 B
+X VSS 23 -200 -1500 100 U 50 50 1 1 W
+X VDD 24 -100 1400 100 D 50 50 1 1 W
 X PB12 25 -600 -1000 100 R 50 50 1 1 B
 X PB13 26 -600 -1100 100 R 50 50 1 1 B
 X PB14 27 -600 -1200 100 R 50 50 1 1 B
 X PB15 28 -600 -1300 100 R 50 50 1 1 B
-X PB2 20 -600 0 100 R 50 50 1 1 B
+X PA8 29 600 -600 100 L 50 50 1 1 B
+X PC14 3 -600 500 100 R 50 50 1 1 B
+X PA9 30 600 -700 100 L 50 50 1 1 B
+X PA10 31 600 -800 100 L 50 50 1 1 B
+X PA11 32 600 -900 100 L 50 50 1 1 B
+X PA12 33 600 -1000 100 L 50 50 1 1 B
+X PA13 34 600 -1100 100 L 50 50 1 1 B
+X VSS 35 -100 -1500 100 U 50 50 1 1 W
+X VDDUSB 36 200 1400 100 D 50 50 1 1 W
+X PA14 37 600 -1200 100 L 50 50 1 1 B
+X PA15 38 600 -1300 100 L 50 50 1 1 B
 X PB3 39 -600 -100 100 R 50 50 1 1 B
+X PC15 4 -600 400 100 R 50 50 1 1 B
 X PB4 40 -600 -200 100 R 50 50 1 1 B
 X PB5 41 -600 -300 100 R 50 50 1 1 B
 X PB6 42 -600 -400 100 R 50 50 1 1 B
 X PB7 43 -600 -500 100 R 50 50 1 1 B
+X PH3 44 -600 800 100 R 50 50 1 1 B
 X PB8 45 -600 -600 100 R 50 50 1 1 B
 X PB9 46 -600 -700 100 R 50 50 1 1 B
-X PC13 2 -600 600 100 R 50 50 1 1 B
-X PC14 3 -600 500 100 R 50 50 1 1 B
-X PC15 4 -600 400 100 R 50 50 1 1 B
-X PH0 5 -600 1000 100 R 50 50 1 1 I
-X PH1 6 -600 900 100 R 50 50 1 1 I
-X PH3 44 -600 800 100 R 50 50 1 1 B
-X VBAT 1 -200 1400 100 D 50 50 1 1 W
-X VDD 24 -100 1400 100 D 50 50 1 1 W
-X VDD 48 0 1400 100 D 50 50 1 1 W
-X VDDA 9 100 1400 100 D 50 50 1 1 W
-X VDDUSB 36 200 1400 100 D 50 50 1 1 W
-X VSS 23 -200 -1500 100 U 50 50 1 1 W
-X VSS 35 -100 -1500 100 U 50 50 1 1 W
 X VSS 47 0 -1500 100 U 50 50 1 1 W
+X VDD 48 0 1400 100 D 50 50 1 1 W
 X VSS 49 100 -1500 100 U 50 50 1 1 W
+X PH0 5 -600 1000 100 R 50 50 1 1 I
+X PH1 6 -600 900 100 R 50 50 1 1 I
+X NRST 7 -600 1200 100 R 50 50 1 1 I
 X VSSA 8 200 -1500 100 U 50 50 1 1 W
+X VDDA 9 100 1400 100 D 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
@@ -1693,55 +1693,55 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -500 -1400 500 1400 0 1 10 f
-X NRST D5 -600 1300 100 R 50 50 1 1 I
-X PA0 F6 600 200 100 L 50 50 1 1 B
-X PA1 G7 600 100 100 L 50 50 1 1 B
-X PA10 C2 600 -800 100 L 50 50 1 1 B
-X PA11 C1 600 -900 100 L 50 50 1 1 B
-X PA12 C3 600 -1000 100 L 50 50 1 1 B
-X PA13 B2 600 -1100 100 L 50 50 1 1 B
+X VDDUSB A1 200 1500 100 D 50 50 1 1 W
 X PA14 A2 600 -1200 100 L 50 50 1 1 B
+X PB3 A3 -600 -100 100 R 50 50 1 1 B
+X PB4 A4 -600 -200 100 R 50 50 1 1 B
+X PH3 A5 -600 900 100 R 50 50 1 1 B
+X VSS A6 -200 -1500 100 U 50 50 1 1 W
+X VDD A7 -100 1500 100 D 50 50 1 1 W
+X VSS B1 -100 -1500 100 U 50 50 1 1 W
+X PA13 B2 600 -1100 100 L 50 50 1 1 B
 X PA15 B3 600 -1300 100 L 50 50 1 1 B
-X PA2 E5 600 0 100 L 50 50 1 1 B
-X PA3 E4 600 -100 100 L 50 50 1 1 B
-X PA4 G6 600 -200 100 L 50 50 1 1 B
-X PA5 F5 600 -300 100 L 50 50 1 1 B
-X PA6 F4 600 -400 100 L 50 50 1 1 B
-X PA7 F3 600 -500 100 L 50 50 1 1 B
-X PA8 D1 600 -600 100 L 50 50 1 1 B
-X PA9 D2 600 -700 100 L 50 50 1 1 B
-X PB0 G5 -600 200 100 R 50 50 1 1 B
-X PB1 G4 -600 100 100 R 50 50 1 1 B
-X PB10 E3 -600 -800 100 R 50 50 1 1 B
-X PB11 F2 -600 -900 100 R 50 50 1 1 B
-X PB12 F1 -600 -1000 100 R 50 50 1 1 B
-X PB13 E2 -600 -1100 100 R 50 50 1 1 B
-X PB14 E1 -600 -1200 100 R 50 50 1 1 B
-X PB15 D3 -600 -1300 100 R 50 50 1 1 B
-X PB2 G3 -600 0 100 R 50 50 1 1 B
-X PB3 A3 -600 -100 100 R 50 50 1 1 B
-X PB4 A4 -600 -200 100 R 50 50 1 1 B
 X PB5 B4 -600 -300 100 R 50 50 1 1 B
-X PB6 C4 -600 -400 100 R 50 50 1 1 B
-X PB7 D4 -600 -500 100 R 50 50 1 1 B
 X PB8 B5 -600 -600 100 R 50 50 1 1 B
-X PB9 C5 -600 -700 100 R 50 50 1 1 B
+X VBAT B6 -200 1500 100 D 50 50 1 1 W
 X PC13 B7 -600 600 100 R 50 50 1 1 B
-X PC14 C7 -600 500 100 R 50 50 1 1 B
+X PA11 C1 600 -900 100 L 50 50 1 1 B
+X PA10 C2 600 -800 100 L 50 50 1 1 B
+X PA12 C3 600 -1000 100 L 50 50 1 1 B
+X PB6 C4 -600 -400 100 R 50 50 1 1 B
+X PB9 C5 -600 -700 100 R 50 50 1 1 B
 X PC15 C6 -600 400 100 R 50 50 1 1 B
-X PC3 E6 -600 700 100 R 50 50 1 1 B
-X PH0 D7 -600 1100 100 R 50 50 1 1 I
+X PC14 C7 -600 500 100 R 50 50 1 1 B
+X PA8 D1 600 -600 100 L 50 50 1 1 B
+X PA9 D2 600 -700 100 L 50 50 1 1 B
+X PB15 D3 -600 -1300 100 R 50 50 1 1 B
+X PB7 D4 -600 -500 100 R 50 50 1 1 B
+X NRST D5 -600 1300 100 R 50 50 1 1 I
 X PH1 D6 -600 1000 100 R 50 50 1 1 I
-X PH3 A5 -600 900 100 R 50 50 1 1 B
-X VBAT B6 -200 1500 100 D 50 50 1 1 W
-X VDD A7 -100 1500 100 D 50 50 1 1 W
-X VDD G1 0 1500 100 D 50 50 1 1 W
+X PH0 D7 -600 1100 100 R 50 50 1 1 I
+X PB14 E1 -600 -1200 100 R 50 50 1 1 B
+X PB13 E2 -600 -1100 100 R 50 50 1 1 B
+X PB10 E3 -600 -800 100 R 50 50 1 1 B
+X PA3 E4 600 -100 100 L 50 50 1 1 B
+X PA2 E5 600 0 100 L 50 50 1 1 B
+X PC3 E6 -600 700 100 R 50 50 1 1 B
+X VSSA E7 100 -1500 100 U 50 50 1 1 W
+X PB12 F1 -600 -1000 100 R 50 50 1 1 B
+X PB11 F2 -600 -900 100 R 50 50 1 1 B
+X PA7 F3 600 -500 100 L 50 50 1 1 B
+X PA6 F4 600 -400 100 L 50 50 1 1 B
+X PA5 F5 600 -300 100 L 50 50 1 1 B
+X PA0 F6 600 200 100 L 50 50 1 1 B
 X VDDA F7 100 1500 100 D 50 50 1 1 W
-X VDDUSB A1 200 1500 100 D 50 50 1 1 W
-X VSS A6 -200 -1500 100 U 50 50 1 1 W
-X VSS B1 -100 -1500 100 U 50 50 1 1 W
+X VDD G1 0 1500 100 D 50 50 1 1 W
 X VSS G2 0 -1500 100 U 50 50 1 1 W
-X VSSA E7 100 -1500 100 U 50 50 1 1 W
+X PB2 G3 -600 0 100 R 50 50 1 1 B
+X PB1 G4 -600 100 100 R 50 50 1 1 B
+X PB0 G5 -600 200 100 R 50 50 1 1 B
+X PA4 G6 600 -200 100 L 50 50 1 1 B
+X PA1 G7 600 100 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
@@ -1757,70 +1757,70 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -600 -1700 500 1700 0 1 10 f
-X NRST E1 -700 1600 100 R 50 50 1 1 I
-X PA0 G2 600 1600 100 L 50 50 1 1 B
-X PA1 H2 600 1500 100 L 50 50 1 1 B
-X PA10 C6 600 600 100 L 50 50 1 1 B
-X PA11 C8 600 500 100 L 50 50 1 1 B
-X PA12 B8 600 400 100 L 50 50 1 1 B
-X PA13 A8 600 300 100 L 50 50 1 1 B
-X PA14 A7 600 200 100 L 50 50 1 1 B
-X PA15 A6 600 100 100 L 50 50 1 1 B
-X PA2 F3 600 1400 100 L 50 50 1 1 B
-X PA3 G3 600 1300 100 L 50 50 1 1 B
-X PA4 H3 600 1200 100 L 50 50 1 1 B
-X PA5 F4 600 1100 100 L 50 50 1 1 B
-X PA6 G4 600 1000 100 L 50 50 1 1 B
-X PA7 H4 600 900 100 L 50 50 1 1 B
-X PA8 D7 600 800 100 L 50 50 1 1 B
-X PA9 C7 600 700 100 L 50 50 1 1 B
-X PB0 F5 600 -100 100 L 50 50 1 1 B
-X PB1 G5 600 -200 100 L 50 50 1 1 B
-X PB10 G7 600 -1100 100 L 50 50 1 1 B
-X PB11 H7 600 -1200 100 L 50 50 1 1 B
-X PB12 H8 600 -1300 100 L 50 50 1 1 B
-X PB13 G8 600 -1400 100 L 50 50 1 1 B
-X PB14 F8 600 -1500 100 L 50 50 1 1 B
-X PB15 F7 600 -1600 100 L 50 50 1 1 B
-X PB2 G6 600 -300 100 L 50 50 1 1 B
-X PB3 A5 600 -400 100 L 50 50 1 1 B
-X PB4 A4 600 -500 100 L 50 50 1 1 B
-X PB5 C4 600 -600 100 L 50 50 1 1 B
-X PB6 D3 600 -700 100 L 50 50 1 1 B
-X PB7 C3 600 -800 100 L 50 50 1 1 B
-X PB8 B3 600 -900 100 L 50 50 1 1 B
-X PB9 A3 600 -1000 100 L 50 50 1 1 B
-X PC0 E3 -700 -100 100 R 50 50 1 1 B
-X PC1 E2 -700 -200 100 R 50 50 1 1 B
-X PC10 B7 -700 -1100 100 R 50 50 1 1 B
-X PC11 B6 -700 -1200 100 R 50 50 1 1 B
-X PC12 C5 -700 -1300 100 R 50 50 1 1 B
-X PC13 A2 -700 -1400 100 R 50 50 1 1 B
 X PC14 A1 -700 -1500 100 R 50 50 1 1 B
+X PC13 A2 -700 -1400 100 R 50 50 1 1 B
+X PB9 A3 600 -1000 100 L 50 50 1 1 B
+X PB4 A4 600 -500 100 L 50 50 1 1 B
+X PB3 A5 600 -400 100 L 50 50 1 1 B
+X PA15 A6 600 100 100 L 50 50 1 1 B
+X PA14 A7 600 200 100 L 50 50 1 1 B
+X PA13 A8 600 300 100 L 50 50 1 1 B
 X PC15 B1 -700 -1600 100 R 50 50 1 1 B
-X PC2 F2 -700 -300 100 R 50 50 1 1 B
-X PC3 G1 -700 -400 100 R 50 50 1 1 B
-X PC4 H5 -700 -500 100 R 50 50 1 1 B
-X PC5 H6 -700 -600 100 R 50 50 1 1 B
-X PC6 F6 -700 -700 100 R 50 50 1 1 B
-X PC7 E7 -700 -800 100 R 50 50 1 1 B
-X PC8 E8 -700 -900 100 R 50 50 1 1 B
-X PC9 D8 -700 -1000 100 R 50 50 1 1 B
+X VBAT B2 -300 1800 100 D 50 50 1 1 W
+X PB8 B3 600 -900 100 L 50 50 1 1 B
+X PH3 B4 -700 300 100 R 50 50 1 1 B
 X PD2 B5 -700 100 100 R 50 50 1 1 B
+X PC11 B6 -700 -1200 100 R 50 50 1 1 B
+X PC10 B7 -700 -1100 100 R 50 50 1 1 B
+X PA12 B8 600 400 100 L 50 50 1 1 B
 X PH0 C1 -700 500 100 R 50 50 1 1 I
+X VSS C2 -300 -1800 100 U 50 50 1 1 W
+X PB7 C3 600 -800 100 L 50 50 1 1 B
+X PB5 C4 600 -600 100 L 50 50 1 1 B
+X PC12 C5 -700 -1300 100 R 50 50 1 1 B
+X PA10 C6 600 600 100 L 50 50 1 1 B
+X PA9 C7 600 700 100 L 50 50 1 1 B
+X PA11 C8 600 500 100 L 50 50 1 1 B
 X PH1 D1 -700 400 100 R 50 50 1 1 I
-X PH3 B4 -700 300 100 R 50 50 1 1 B
-X VBAT B2 -300 1800 100 D 50 50 1 1 W
 X VDD D2 -200 1800 100 D 50 50 1 1 W
-X VDD E4 -100 1800 100 D 50 50 1 1 W
-X VDD E6 0 1800 100 D 50 50 1 1 W
-X VDDA H1 100 1800 100 D 50 50 1 1 W
-X VDDUSB E5 200 1800 100 D 50 50 1 1 W
-X VSS C2 -300 -1800 100 U 50 50 1 1 W
+X PB6 D3 600 -700 100 L 50 50 1 1 B
 X VSS D4 -200 -1800 100 U 50 50 1 1 W
 X VSS D5 -100 -1800 100 U 50 50 1 1 W
 X VSS D6 0 -1800 100 U 50 50 1 1 W
+X PA8 D7 600 800 100 L 50 50 1 1 B
+X PC9 D8 -700 -1000 100 R 50 50 1 1 B
+X NRST E1 -700 1600 100 R 50 50 1 1 I
+X PC1 E2 -700 -200 100 R 50 50 1 1 B
+X PC0 E3 -700 -100 100 R 50 50 1 1 B
+X VDD E4 -100 1800 100 D 50 50 1 1 W
+X VDDUSB E5 200 1800 100 D 50 50 1 1 W
+X VDD E6 0 1800 100 D 50 50 1 1 W
+X PC7 E7 -700 -800 100 R 50 50 1 1 B
+X PC8 E8 -700 -900 100 R 50 50 1 1 B
 X VSSA F1 100 -1800 100 U 50 50 1 1 W
+X PC2 F2 -700 -300 100 R 50 50 1 1 B
+X PA2 F3 600 1400 100 L 50 50 1 1 B
+X PA5 F4 600 1100 100 L 50 50 1 1 B
+X PB0 F5 600 -100 100 L 50 50 1 1 B
+X PC6 F6 -700 -700 100 R 50 50 1 1 B
+X PB15 F7 600 -1600 100 L 50 50 1 1 B
+X PB14 F8 600 -1500 100 L 50 50 1 1 B
+X PC3 G1 -700 -400 100 R 50 50 1 1 B
+X PA0 G2 600 1600 100 L 50 50 1 1 B
+X PA3 G3 600 1300 100 L 50 50 1 1 B
+X PA6 G4 600 1000 100 L 50 50 1 1 B
+X PB1 G5 600 -200 100 L 50 50 1 1 B
+X PB2 G6 600 -300 100 L 50 50 1 1 B
+X PB10 G7 600 -1100 100 L 50 50 1 1 B
+X PB13 G8 600 -1400 100 L 50 50 1 1 B
+X VDDA H1 100 1800 100 D 50 50 1 1 W
+X PA1 H2 600 1500 100 L 50 50 1 1 B
+X PA4 H3 600 1200 100 L 50 50 1 1 B
+X PA7 H4 600 900 100 L 50 50 1 1 B
+X PC4 H5 -700 -500 100 R 50 50 1 1 B
+X PC5 H6 -700 -600 100 R 50 50 1 1 B
+X PB11 H7 600 -1200 100 L 50 50 1 1 B
+X PB12 H8 600 -1300 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
@@ -1836,70 +1836,70 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -600 -1700 500 1700 0 1 10 f
-X NRST 7 -700 1600 100 R 50 50 1 1 I
+X VBAT 1 -300 1800 100 D 50 50 1 1 W
+X PC2 10 -700 -300 100 R 50 50 1 1 B
+X PC3 11 -700 -400 100 R 50 50 1 1 B
+X VSSA 12 100 -1800 100 U 50 50 1 1 W
+X VDDA 13 100 1800 100 D 50 50 1 1 W
 X PA0 14 600 1600 100 L 50 50 1 1 B
 X PA1 15 600 1500 100 L 50 50 1 1 B
-X PA10 43 600 600 100 L 50 50 1 1 B
-X PA11 44 600 500 100 L 50 50 1 1 B
-X PA12 45 600 400 100 L 50 50 1 1 B
-X PA13 46 600 300 100 L 50 50 1 1 B
-X PA14 49 600 200 100 L 50 50 1 1 B
-X PA15 50 600 100 100 L 50 50 1 1 B
 X PA2 16 600 1400 100 L 50 50 1 1 B
 X PA3 17 600 1300 100 L 50 50 1 1 B
+X VSS 18 -300 -1800 100 U 50 50 1 1 W
+X VDD 19 -200 1800 100 D 50 50 1 1 W
+X PC13 2 -700 -1400 100 R 50 50 1 1 B
 X PA4 20 600 1200 100 L 50 50 1 1 B
 X PA5 21 600 1100 100 L 50 50 1 1 B
 X PA6 22 600 1000 100 L 50 50 1 1 B
 X PA7 23 600 900 100 L 50 50 1 1 B
-X PA8 41 600 800 100 L 50 50 1 1 B
-X PA9 42 600 700 100 L 50 50 1 1 B
+X PC4 24 -700 -500 100 R 50 50 1 1 B
+X PC5 25 -700 -600 100 R 50 50 1 1 B
 X PB0 26 600 -100 100 L 50 50 1 1 B
 X PB1 27 600 -200 100 L 50 50 1 1 B
+X PB2 28 600 -300 100 L 50 50 1 1 B
 X PB10 29 600 -1100 100 L 50 50 1 1 B
+X PC14 3 -700 -1500 100 R 50 50 1 1 B
 X PB11 30 600 -1200 100 L 50 50 1 1 B
+X VSS 31 -200 -1800 100 U 50 50 1 1 W
+X VDD 32 -100 1800 100 D 50 50 1 1 W
 X PB12 33 600 -1300 100 L 50 50 1 1 B
 X PB13 34 600 -1400 100 L 50 50 1 1 B
 X PB14 35 600 -1500 100 L 50 50 1 1 B
 X PB15 36 600 -1600 100 L 50 50 1 1 B
-X PB2 28 600 -300 100 L 50 50 1 1 B
+X PC6 37 -700 -700 100 R 50 50 1 1 B
+X PC7 38 -700 -800 100 R 50 50 1 1 B
+X PC8 39 -700 -900 100 R 50 50 1 1 B
+X PC15 4 -700 -1600 100 R 50 50 1 1 B
+X PC9 40 -700 -1000 100 R 50 50 1 1 B
+X PA8 41 600 800 100 L 50 50 1 1 B
+X PA9 42 600 700 100 L 50 50 1 1 B
+X PA10 43 600 600 100 L 50 50 1 1 B
+X PA11 44 600 500 100 L 50 50 1 1 B
+X PA12 45 600 400 100 L 50 50 1 1 B
+X PA13 46 600 300 100 L 50 50 1 1 B
+X VSS 47 -100 -1800 100 U 50 50 1 1 W
+X VDDUSB 48 200 1800 100 D 50 50 1 1 W
+X PA14 49 600 200 100 L 50 50 1 1 B
+X PH0 5 -700 500 100 R 50 50 1 1 I
+X PA15 50 600 100 100 L 50 50 1 1 B
+X PC10 51 -700 -1100 100 R 50 50 1 1 B
+X PC11 52 -700 -1200 100 R 50 50 1 1 B
+X PC12 53 -700 -1300 100 R 50 50 1 1 B
+X PD2 54 -700 100 100 R 50 50 1 1 B
 X PB3 55 600 -400 100 L 50 50 1 1 B
 X PB4 56 600 -500 100 L 50 50 1 1 B
 X PB5 57 600 -600 100 L 50 50 1 1 B
 X PB6 58 600 -700 100 L 50 50 1 1 B
 X PB7 59 600 -800 100 L 50 50 1 1 B
+X PH1 6 -700 400 100 R 50 50 1 1 I
+X PH3 60 -700 300 100 R 50 50 1 1 B
 X PB8 61 600 -900 100 L 50 50 1 1 B
 X PB9 62 600 -1000 100 L 50 50 1 1 B
+X VSS 63 0 -1800 100 U 50 50 1 1 W
+X VDD 64 0 1800 100 D 50 50 1 1 W
+X NRST 7 -700 1600 100 R 50 50 1 1 I
 X PC0 8 -700 -100 100 R 50 50 1 1 B
 X PC1 9 -700 -200 100 R 50 50 1 1 B
-X PC10 51 -700 -1100 100 R 50 50 1 1 B
-X PC11 52 -700 -1200 100 R 50 50 1 1 B
-X PC12 53 -700 -1300 100 R 50 50 1 1 B
-X PC13 2 -700 -1400 100 R 50 50 1 1 B
-X PC14 3 -700 -1500 100 R 50 50 1 1 B
-X PC15 4 -700 -1600 100 R 50 50 1 1 B
-X PC2 10 -700 -300 100 R 50 50 1 1 B
-X PC3 11 -700 -400 100 R 50 50 1 1 B
-X PC4 24 -700 -500 100 R 50 50 1 1 B
-X PC5 25 -700 -600 100 R 50 50 1 1 B
-X PC6 37 -700 -700 100 R 50 50 1 1 B
-X PC7 38 -700 -800 100 R 50 50 1 1 B
-X PC8 39 -700 -900 100 R 50 50 1 1 B
-X PC9 40 -700 -1000 100 R 50 50 1 1 B
-X PD2 54 -700 100 100 R 50 50 1 1 B
-X PH0 5 -700 500 100 R 50 50 1 1 I
-X PH1 6 -700 400 100 R 50 50 1 1 I
-X PH3 60 -700 300 100 R 50 50 1 1 B
-X VBAT 1 -300 1800 100 D 50 50 1 1 W
-X VDD 19 -200 1800 100 D 50 50 1 1 W
-X VDD 32 -100 1800 100 D 50 50 1 1 W
-X VDD 64 0 1800 100 D 50 50 1 1 W
-X VDDA 13 100 1800 100 D 50 50 1 1 W
-X VDDUSB 48 200 1800 100 D 50 50 1 1 W
-X VSS 18 -300 -1800 100 U 50 50 1 1 W
-X VSS 31 -200 -1800 100 U 50 50 1 1 W
-X VSS 47 -100 -1800 100 U 50 50 1 1 W
-X VSS 63 0 -1800 100 U 50 50 1 1 W
-X VSSA 12 100 -1800 100 U 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
@@ -1915,70 +1915,70 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -600 -1700 500 1700 0 1 10 f
-X NRST D6 -700 1600 100 R 50 50 1 1 I
-X PA0 F7 600 1600 100 L 50 50 1 1 B
-X PA1 G7 600 1500 100 L 50 50 1 1 B
-X PA10 D2 600 600 100 L 50 50 1 1 B
-X PA11 D3 600 500 100 L 50 50 1 1 B
-X PA12 C1 600 400 100 L 50 50 1 1 B
-X PA13 C2 600 300 100 L 50 50 1 1 B
-X PA14 B2 600 200 100 L 50 50 1 1 B
+X VDDUSB A1 200 1800 100 D 50 50 1 1 W
 X PA15 A2 600 100 100 L 50 50 1 1 B
-X PA2 F6 600 1400 100 L 50 50 1 1 B
-X PA3 G6 600 1300 100 L 50 50 1 1 B
-X PA4 E5 600 1200 100 L 50 50 1 1 B
-X PA5 F5 600 1100 100 L 50 50 1 1 B
-X PA6 G5 600 1000 100 L 50 50 1 1 B
-X PA7 H6 600 900 100 L 50 50 1 1 B
-X PA8 E3 600 800 100 L 50 50 1 1 B
-X PA9 D1 600 700 100 L 50 50 1 1 B
-X PB0 F4 600 -100 100 L 50 50 1 1 B
-X PB1 H5 600 -200 100 L 50 50 1 1 B
-X PB10 H4 600 -1100 100 L 50 50 1 1 B
-X PB11 H3 600 -1200 100 L 50 50 1 1 B
-X PB12 G3 600 -1300 100 L 50 50 1 1 B
-X PB13 G2 600 -1400 100 L 50 50 1 1 B
-X PB14 G1 600 -1500 100 L 50 50 1 1 B
-X PB15 F2 600 -1600 100 L 50 50 1 1 B
-X PB2 G4 600 -300 100 L 50 50 1 1 B
+X PC12 A3 -700 -1300 100 R 50 50 1 1 B
+X PD2 A4 -700 100 100 R 50 50 1 1 B
 X PB3 A5 600 -400 100 L 50 50 1 1 B
+X PB7 A6 600 -800 100 L 50 50 1 1 B
+X VSS A7 -300 -1800 100 U 50 50 1 1 W
+X VDD A8 -200 1800 100 D 50 50 1 1 W
+X VSS B1 -200 -1800 100 U 50 50 1 1 W
+X PA14 B2 600 200 100 L 50 50 1 1 B
+X PC11 B3 -700 -1200 100 R 50 50 1 1 B
 X PB4 B4 600 -500 100 L 50 50 1 1 B
-X PB5 C4 600 -600 100 L 50 50 1 1 B
 X PB6 B5 600 -700 100 L 50 50 1 1 B
-X PB7 A6 600 -800 100 L 50 50 1 1 B
-X PB8 C6 600 -900 100 L 50 50 1 1 B
 X PB9 B6 600 -1000 100 L 50 50 1 1 B
-X PC0 D5 -700 -100 100 R 50 50 1 1 B
-X PC1 E8 -700 -200 100 R 50 50 1 1 B
-X PC10 C3 -700 -1100 100 R 50 50 1 1 B
-X PC11 B3 -700 -1200 100 R 50 50 1 1 B
-X PC12 A3 -700 -1300 100 R 50 50 1 1 B
+X VBAT B7 -300 1800 100 D 50 50 1 1 W
 X PC13 B8 -700 -1400 100 R 50 50 1 1 B
-X PC14 C8 -700 -1500 100 R 50 50 1 1 B
+X PA12 C1 600 400 100 L 50 50 1 1 B
+X PA13 C2 600 300 100 L 50 50 1 1 B
+X PC10 C3 -700 -1100 100 R 50 50 1 1 B
+X PB5 C4 600 -600 100 L 50 50 1 1 B
+X PH3 C5 -700 300 100 R 50 50 1 1 B
+X PB8 C6 600 -900 100 L 50 50 1 1 B
 X PC15 C7 -700 -1600 100 R 50 50 1 1 B
-X PC2 E7 -700 -300 100 R 50 50 1 1 B
-X PC3 E6 -700 -400 100 R 50 50 1 1 B
+X PC14 C8 -700 -1500 100 R 50 50 1 1 B
+X PA9 D1 600 700 100 L 50 50 1 1 B
+X PA10 D2 600 600 100 L 50 50 1 1 B
+X PA11 D3 600 500 100 L 50 50 1 1 B
 X PC4 D4 -700 -500 100 R 50 50 1 1 B
+X PC0 D5 -700 -100 100 R 50 50 1 1 B
+X NRST D6 -700 1600 100 R 50 50 1 1 I
+X PH1 D7 -700 400 100 R 50 50 1 1 I
+X PH0 D8 -700 500 100 R 50 50 1 1 I
+X PC7 E1 -700 -800 100 R 50 50 1 1 B
+X PC9 E2 -700 -1000 100 R 50 50 1 1 B
+X PA8 E3 600 800 100 L 50 50 1 1 B
 X PC5 E4 -700 -600 100 R 50 50 1 1 B
+X PA4 E5 600 1200 100 L 50 50 1 1 B
+X PC3 E6 -700 -400 100 R 50 50 1 1 B
+X PC2 E7 -700 -300 100 R 50 50 1 1 B
+X PC1 E8 -700 -200 100 R 50 50 1 1 B
 X PC6 F1 -700 -700 100 R 50 50 1 1 B
-X PC7 E1 -700 -800 100 R 50 50 1 1 B
+X PB15 F2 600 -1600 100 L 50 50 1 1 B
 X PC8 F3 -700 -900 100 R 50 50 1 1 B
-X PC9 E2 -700 -1000 100 R 50 50 1 1 B
-X PD2 A4 -700 100 100 R 50 50 1 1 B
-X PH0 D8 -700 500 100 R 50 50 1 1 I
-X PH1 D7 -700 400 100 R 50 50 1 1 I
-X PH3 C5 -700 300 100 R 50 50 1 1 B
-X VBAT B7 -300 1800 100 D 50 50 1 1 W
-X VDD A8 -200 1800 100 D 50 50 1 1 W
-X VDD H1 -100 1800 100 D 50 50 1 1 W
-X VDD H7 0 1800 100 D 50 50 1 1 W
+X PB0 F4 600 -100 100 L 50 50 1 1 B
+X PA5 F5 600 1100 100 L 50 50 1 1 B
+X PA2 F6 600 1400 100 L 50 50 1 1 B
+X PA0 F7 600 1600 100 L 50 50 1 1 B
+X VSSA F8 100 -1800 100 U 50 50 1 1 W
+X PB14 G1 600 -1500 100 L 50 50 1 1 B
+X PB13 G2 600 -1400 100 L 50 50 1 1 B
+X PB12 G3 600 -1300 100 L 50 50 1 1 B
+X PB2 G4 600 -300 100 L 50 50 1 1 B
+X PA6 G5 600 1000 100 L 50 50 1 1 B
+X PA3 G6 600 1300 100 L 50 50 1 1 B
+X PA1 G7 600 1500 100 L 50 50 1 1 B
 X VDDA G8 100 1800 100 D 50 50 1 1 W
-X VDDUSB A1 200 1800 100 D 50 50 1 1 W
-X VSS A7 -300 -1800 100 U 50 50 1 1 W
-X VSS B1 -200 -1800 100 U 50 50 1 1 W
+X VDD H1 -100 1800 100 D 50 50 1 1 W
 X VSS H2 -100 -1800 100 U 50 50 1 1 W
+X PB11 H3 600 -1200 100 L 50 50 1 1 B
+X PB10 H4 600 -1100 100 L 50 50 1 1 B
+X PB1 H5 600 -200 100 L 50 50 1 1 B
+X PA7 H6 600 900 100 L 50 50 1 1 B
+X VDD H7 0 1800 100 D 50 50 1 1 W
 X VSS H8 0 -1800 100 U 50 50 1 1 W
-X VSSA F8 100 -1800 100 U 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
@@ -1994,106 +1994,106 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -700 -2600 700 2500 0 1 10 f
-X NRST H2 -900 2400 200 R 50 50 1 1 I
-X PA0 L2 900 2400 200 L 50 50 1 1 B
-X PA1 M2 900 2300 200 L 50 50 1 1 B
-X PA10 C12 900 1400 200 L 50 50 1 1 B
-X PA11 B12 900 1300 200 L 50 50 1 1 B
-X PA12 A12 900 1200 200 L 50 50 1 1 B
-X PA13 A11 900 1100 200 L 50 50 1 1 B
+X PE3 A1 -900 400 200 R 50 50 1 1 B
 X PA14 A10 900 1000 200 L 50 50 1 1 B
-X PA15 A9 900 900 200 L 50 50 1 1 B
-X PA2 K3 900 2200 200 L 50 50 1 1 B
-X PA3 L3 900 2100 200 L 50 50 1 1 B
-X PA4 M3 900 2000 200 L 50 50 1 1 B
-X PA5 K4 900 1900 200 L 50 50 1 1 B
-X PA6 L4 900 1800 200 L 50 50 1 1 B
-X PA7 M4 900 1700 200 L 50 50 1 1 B
-X PA8 D11 900 1600 200 L 50 50 1 1 B
-X PA9 D10 900 1500 200 L 50 50 1 1 B
-X PB0 M5 900 700 200 L 50 50 1 1 B
-X PB1 M6 900 600 200 L 50 50 1 1 B
-X PB10 L10 900 -300 200 L 50 50 1 1 B
-X PB11 L11 900 -400 200 L 50 50 1 1 B
-X PB12 L12 900 -500 200 L 50 50 1 1 B
-X PB13 K12 900 -600 200 L 50 50 1 1 B
-X PB14 K11 900 -700 200 L 50 50 1 1 B
-X PB15 K10 900 -800 200 L 50 50 1 1 B
-X PB2 L6 900 500 200 L 50 50 1 1 B
-X PB3 A8 900 400 200 L 50 50 1 1 B
-X PB4 A7 900 300 200 L 50 50 1 1 B
-X PB5 C5 900 200 200 L 50 50 1 1 B
-X PB6 B5 900 100 200 L 50 50 1 1 B
-X PB7 B4 900 0 200 L 50 50 1 1 B
+X PA13 A11 900 1100 200 L 50 50 1 1 B
+X PA12 A12 900 1200 200 L 50 50 1 1 B
+X PE1 A2 -900 600 200 R 50 50 1 1 B
 X PB8 A3 900 -100 200 L 50 50 1 1 B
-X PB9 B3 900 -200 200 L 50 50 1 1 B
-X PC0 H1 900 -1000 200 L 50 50 1 1 B
-X PC1 J2 900 -1100 200 L 50 50 1 1 B
-X PC10 B11 900 -2000 200 L 50 50 1 1 B
-X PC11 C10 900 -2100 200 L 50 50 1 1 B
+X PH3 A4 -900 900 200 R 50 50 1 1 B
+X PD7 A5 -900 -1700 200 R 50 50 1 1 B
+X PD5 A6 -900 -1500 200 R 50 50 1 1 B
+X PB4 A7 900 300 200 L 50 50 1 1 B
+X PB3 A8 900 400 200 L 50 50 1 1 B
+X PA15 A9 900 900 200 L 50 50 1 1 B
+X PE4 B1 -900 300 200 R 50 50 1 1 B
 X PC12 B10 900 -2200 200 L 50 50 1 1 B
+X PC10 B11 900 -2000 200 L 50 50 1 1 B
+X PA11 B12 900 1300 200 L 50 50 1 1 B
+X PE2 B2 -900 500 200 R 50 50 1 1 B
+X PB9 B3 900 -200 200 L 50 50 1 1 B
+X PB7 B4 900 0 200 L 50 50 1 1 B
+X PB6 B5 900 100 200 L 50 50 1 1 B
+X PD6 B6 -900 -1600 200 R 50 50 1 1 B
+X PD4 B7 -900 -1400 200 R 50 50 1 1 B
+X PD3 B8 -900 -1300 200 R 50 50 1 1 B
+X PD1 B9 -900 -1100 200 R 50 50 1 1 B
 X PC13 C1 900 -2300 200 L 50 50 1 1 B
+X PC11 C10 900 -2100 200 L 50 50 1 1 B
+X VDDUSB C11 400 2700 200 D 50 50 1 1 W
+X PA10 C12 900 1400 200 L 50 50 1 1 B
+X PE5 C2 -900 200 200 R 50 50 1 1 B
+X PE0 C3 -900 700 200 R 50 50 1 1 B
+X VDD C4 -200 2700 200 D 50 50 1 1 W
+X PB5 C5 900 200 200 L 50 50 1 1 B
+X PD2 C8 -900 -1200 200 R 50 50 1 1 B
+X PD0 C9 -900 -1000 200 R 50 50 1 1 B
 X PC14 D1 900 -2400 200 L 50 50 1 1 B
+X PA9 D10 900 1500 200 L 50 50 1 1 B
+X PA8 D11 900 1600 200 L 50 50 1 1 B
+X PC9 D12 900 -1900 200 L 50 50 1 1 B
+X PE6 D2 -900 100 200 R 50 50 1 1 B
+X VSS D3 -200 -2800 200 U 50 50 1 1 W
 X PC15 E1 900 -2500 200 L 50 50 1 1 B
+X PC8 E10 900 -1800 200 L 50 50 1 1 B
+X PC7 E11 900 -1700 200 L 50 50 1 1 B
+X PC6 E12 900 -1600 200 L 50 50 1 1 B
+X VBAT E2 -300 2700 200 D 50 50 1 1 W
+X VSS E3 -100 -2800 200 U 50 50 1 1 W
+X PH0 F1 -900 1100 200 R 50 50 1 1 I
+X VSS F11 100 -2800 200 U 50 50 1 1 W
+X VSS F12 200 -2800 200 U 50 50 1 1 W
+X VSS F2 0 -2800 200 U 50 50 1 1 W
+X PH1 G1 -900 1000 200 R 50 50 1 1 I
+X VDD G11 0 2700 200 D 50 50 1 1 W
+X VDD G12 100 2700 200 D 50 50 1 1 W
+X VDD G2 -100 2700 200 D 50 50 1 1 W
+X PC0 H1 900 -1000 200 L 50 50 1 1 B
+X PD15 H10 -900 -2500 200 R 50 50 1 1 B
+X PD14 H11 -900 -2400 200 R 50 50 1 1 B
+X PD13 H12 -900 -2300 200 R 50 50 1 1 B
+X NRST H2 -900 2400 200 R 50 50 1 1 I
+X VDD H3 200 2700 200 D 50 50 1 1 W
+X VSSA J1 300 -2800 200 U 50 50 1 1 W
+X PD12 J10 -900 -2200 200 R 50 50 1 1 B
+X PD11 J11 -900 -2100 200 R 50 50 1 1 B
+X PD10 J12 -900 -2000 200 R 50 50 1 1 B
+X PC1 J2 900 -1100 200 L 50 50 1 1 B
 X PC2 J3 900 -1200 200 L 50 50 1 1 B
+X VREF- K1 -900 2100 200 R 50 50 1 1 W
+X PB15 K10 900 -800 200 L 50 50 1 1 B
+X PB14 K11 900 -700 200 L 50 50 1 1 B
+X PB13 K12 900 -600 200 L 50 50 1 1 B
 X PC3 K2 900 -1300 200 L 50 50 1 1 B
+X PA2 K3 900 2200 200 L 50 50 1 1 B
+X PA5 K4 900 1900 200 L 50 50 1 1 B
 X PC4 K5 900 -1400 200 L 50 50 1 1 B
-X PC5 L5 900 -1500 200 L 50 50 1 1 B
-X PC6 E12 900 -1600 200 L 50 50 1 1 B
-X PC7 E11 900 -1700 200 L 50 50 1 1 B
-X PC8 E10 900 -1800 200 L 50 50 1 1 B
-X PC9 D12 900 -1900 200 L 50 50 1 1 B
-X PD0 C9 -900 -1000 200 R 50 50 1 1 B
-X PD1 B9 -900 -1100 200 R 50 50 1 1 B
-X PD10 J12 -900 -2000 200 R 50 50 1 1 B
-X PD11 J11 -900 -2100 200 R 50 50 1 1 B
-X PD12 J10 -900 -2200 200 R 50 50 1 1 B
-X PD13 H12 -900 -2300 200 R 50 50 1 1 B
-X PD14 H11 -900 -2400 200 R 50 50 1 1 B
-X PD15 H10 -900 -2500 200 R 50 50 1 1 B
-X PD2 C8 -900 -1200 200 R 50 50 1 1 B
-X PD3 B8 -900 -1300 200 R 50 50 1 1 B
-X PD4 B7 -900 -1400 200 R 50 50 1 1 B
-X PD5 A6 -900 -1500 200 R 50 50 1 1 B
-X PD6 B6 -900 -1600 200 R 50 50 1 1 B
-X PD7 A5 -900 -1700 200 R 50 50 1 1 B
-X PD8 K9 -900 -1800 200 R 50 50 1 1 B
 X PD9 K8 -900 -1900 200 R 50 50 1 1 B
-X PE0 C3 -900 700 200 R 50 50 1 1 B
-X PE1 A2 -900 600 200 R 50 50 1 1 B
+X PD8 K9 -900 -1800 200 R 50 50 1 1 B
+X VREF+ L1 -900 2200 200 R 50 50 1 1 B
+X PB10 L10 900 -300 200 L 50 50 1 1 B
+X PB11 L11 900 -400 200 L 50 50 1 1 B
+X PB12 L12 900 -500 200 L 50 50 1 1 B
+X PA0 L2 900 2400 200 L 50 50 1 1 B
+X PA3 L3 900 2100 200 L 50 50 1 1 B
+X PA6 L4 900 1800 200 L 50 50 1 1 B
+X PC5 L5 900 -1500 200 L 50 50 1 1 B
+X PB2 L6 900 500 200 L 50 50 1 1 B
+X PE8 L7 -900 -100 200 R 50 50 1 1 B
 X PE10 L8 -900 -300 200 R 50 50 1 1 B
-X PE11 M9 -900 -400 200 R 50 50 1 1 B
 X PE12 L9 -900 -500 200 R 50 50 1 1 B
+X VDDA M1 300 2700 200 D 50 50 1 1 W
 X PE13 M10 -900 -600 200 R 50 50 1 1 B
 X PE14 M11 -900 -700 200 R 50 50 1 1 B
 X PE15 M12 -900 -800 200 R 50 50 1 1 B
-X PE2 B2 -900 500 200 R 50 50 1 1 B
-X PE3 A1 -900 400 200 R 50 50 1 1 B
-X PE4 B1 -900 300 200 R 50 50 1 1 B
-X PE5 C2 -900 200 200 R 50 50 1 1 B
-X PE6 D2 -900 100 200 R 50 50 1 1 B
+X PA1 M2 900 2300 200 L 50 50 1 1 B
+X PA4 M3 900 2000 200 L 50 50 1 1 B
+X PA7 M4 900 1700 200 L 50 50 1 1 B
+X PB0 M5 900 700 200 L 50 50 1 1 B
+X PB1 M6 900 600 200 L 50 50 1 1 B
 X PE7 M7 -900 0 200 R 50 50 1 1 B
-X PE8 L7 -900 -100 200 R 50 50 1 1 B
 X PE9 M8 -900 -200 200 R 50 50 1 1 B
-X PH0 F1 -900 1100 200 R 50 50 1 1 I
-X PH1 G1 -900 1000 200 R 50 50 1 1 I
-X PH3 A4 -900 900 200 R 50 50 1 1 B
-X VBAT E2 -300 2700 200 D 50 50 1 1 W
-X VDD C4 -200 2700 200 D 50 50 1 1 W
-X VDD G11 0 2700 200 D 50 50 1 1 W
-X VDD G12 100 2700 200 D 50 50 1 1 W
-X VDD G2 -100 2700 200 D 50 50 1 1 W
-X VDD H3 200 2700 200 D 50 50 1 1 W
-X VDDA M1 300 2700 200 D 50 50 1 1 W
-X VDDUSB C11 400 2700 200 D 50 50 1 1 W
-X VREF+ L1 -900 2200 200 R 50 50 1 1 B
-X VREF- K1 -900 2100 200 R 50 50 1 1 W
-X VSS D3 -200 -2800 200 U 50 50 1 1 W
-X VSS E3 -100 -2800 200 U 50 50 1 1 W
-X VSS F11 100 -2800 200 U 50 50 1 1 W
-X VSS F12 200 -2800 200 U 50 50 1 1 W
-X VSS F2 0 -2800 200 U 50 50 1 1 W
-X VSSA J1 300 -2800 200 U 50 50 1 1 W
+X PE11 M9 -900 -400 200 R 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
@@ -2109,106 +2109,106 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -700 -2600 700 2500 0 1 10 f
+X PE2 1 -900 500 200 R 50 50 1 1 B
+X VSS 10 -200 -2800 200 U 50 50 1 1 W
+X VDD 100 200 2700 200 D 50 50 1 1 W
+X VDD 11 -200 2700 200 D 50 50 1 1 W
+X PH0 12 -900 1100 200 R 50 50 1 1 I
+X PH1 13 -900 1000 200 R 50 50 1 1 I
 X NRST 14 -900 2400 200 R 50 50 1 1 I
+X PC0 15 900 -1000 200 L 50 50 1 1 B
+X PC1 16 900 -1100 200 L 50 50 1 1 B
+X PC2 17 900 -1200 200 L 50 50 1 1 B
+X PC3 18 900 -1300 200 L 50 50 1 1 B
+X VSSA 19 300 -2800 200 U 50 50 1 1 W
+X PE3 2 -900 400 200 R 50 50 1 1 B
+X VREF- 20 -900 2100 200 R 50 50 1 1 W
+X VREF+ 21 -900 2200 200 R 50 50 1 1 B
+X VDDA 22 300 2700 200 D 50 50 1 1 W
 X PA0 23 900 2400 200 L 50 50 1 1 B
 X PA1 24 900 2300 200 L 50 50 1 1 B
-X PA10 69 900 1400 200 L 50 50 1 1 B
-X PA11 70 900 1300 200 L 50 50 1 1 B
-X PA12 71 900 1200 200 L 50 50 1 1 B
-X PA13 72 900 1100 200 L 50 50 1 1 B
-X PA14 76 900 1000 200 L 50 50 1 1 B
-X PA15 77 900 900 200 L 50 50 1 1 B
 X PA2 25 900 2200 200 L 50 50 1 1 B
 X PA3 26 900 2100 200 L 50 50 1 1 B
+X VSS 27 -100 -2800 200 U 50 50 1 1 W
+X VDD 28 -100 2700 200 D 50 50 1 1 W
 X PA4 29 900 2000 200 L 50 50 1 1 B
+X PE4 3 -900 300 200 R 50 50 1 1 B
 X PA5 30 900 1900 200 L 50 50 1 1 B
 X PA6 31 900 1800 200 L 50 50 1 1 B
 X PA7 32 900 1700 200 L 50 50 1 1 B
-X PA8 67 900 1600 200 L 50 50 1 1 B
-X PA9 68 900 1500 200 L 50 50 1 1 B
+X PC4 33 900 -1400 200 L 50 50 1 1 B
+X PC5 34 900 -1500 200 L 50 50 1 1 B
 X PB0 35 900 700 200 L 50 50 1 1 B
 X PB1 36 900 600 200 L 50 50 1 1 B
+X PB2 37 900 500 200 L 50 50 1 1 B
+X PE7 38 -900 0 200 R 50 50 1 1 B
+X PE8 39 -900 -100 200 R 50 50 1 1 B
+X PE5 4 -900 200 200 R 50 50 1 1 B
+X PE9 40 -900 -200 200 R 50 50 1 1 B
+X PE10 41 -900 -300 200 R 50 50 1 1 B
+X PE11 42 -900 -400 200 R 50 50 1 1 B
+X PE12 43 -900 -500 200 R 50 50 1 1 B
+X PE13 44 -900 -600 200 R 50 50 1 1 B
+X PE14 45 -900 -700 200 R 50 50 1 1 B
+X PE15 46 -900 -800 200 R 50 50 1 1 B
 X PB10 47 900 -300 200 L 50 50 1 1 B
 X PB11 48 900 -400 200 L 50 50 1 1 B
+X VSS 49 0 -2800 200 U 50 50 1 1 W
+X PE6 5 -900 100 200 R 50 50 1 1 B
+X VDD 50 0 2700 200 D 50 50 1 1 W
 X PB12 51 900 -500 200 L 50 50 1 1 B
 X PB13 52 900 -600 200 L 50 50 1 1 B
 X PB14 53 900 -700 200 L 50 50 1 1 B
 X PB15 54 900 -800 200 L 50 50 1 1 B
-X PB2 37 900 500 200 L 50 50 1 1 B
-X PB3 89 900 400 200 L 50 50 1 1 B
-X PB4 90 900 300 200 L 50 50 1 1 B
-X PB5 91 900 200 200 L 50 50 1 1 B
-X PB6 92 900 100 200 L 50 50 1 1 B
-X PB7 93 900 0 200 L 50 50 1 1 B
-X PB8 95 900 -100 200 L 50 50 1 1 B
-X PB9 96 900 -200 200 L 50 50 1 1 B
-X PC0 15 900 -1000 200 L 50 50 1 1 B
-X PC1 16 900 -1100 200 L 50 50 1 1 B
-X PC10 78 900 -2000 200 L 50 50 1 1 B
-X PC11 79 900 -2100 200 L 50 50 1 1 B
-X PC12 80 900 -2200 200 L 50 50 1 1 B
-X PC13 7 900 -2300 200 L 50 50 1 1 B
-X PC14 8 900 -2400 200 L 50 50 1 1 B
-X PC15 9 900 -2500 200 L 50 50 1 1 B
-X PC2 17 900 -1200 200 L 50 50 1 1 B
-X PC3 18 900 -1300 200 L 50 50 1 1 B
-X PC4 33 900 -1400 200 L 50 50 1 1 B
-X PC5 34 900 -1500 200 L 50 50 1 1 B
-X PC6 63 900 -1600 200 L 50 50 1 1 B
-X PC7 64 900 -1700 200 L 50 50 1 1 B
-X PC8 65 900 -1800 200 L 50 50 1 1 B
-X PC9 66 900 -1900 200 L 50 50 1 1 B
-X PD0 81 -900 -1000 200 R 50 50 1 1 B
-X PD1 82 -900 -1100 200 R 50 50 1 1 B
+X PD8 55 -900 -1800 200 R 50 50 1 1 B
+X PD9 56 -900 -1900 200 R 50 50 1 1 B
 X PD10 57 -900 -2000 200 R 50 50 1 1 B
 X PD11 58 -900 -2100 200 R 50 50 1 1 B
 X PD12 59 -900 -2200 200 R 50 50 1 1 B
+X VBAT 6 -300 2700 200 D 50 50 1 1 W
 X PD13 60 -900 -2300 200 R 50 50 1 1 B
 X PD14 61 -900 -2400 200 R 50 50 1 1 B
 X PD15 62 -900 -2500 200 R 50 50 1 1 B
+X PC6 63 900 -1600 200 L 50 50 1 1 B
+X PC7 64 900 -1700 200 L 50 50 1 1 B
+X PC8 65 900 -1800 200 L 50 50 1 1 B
+X PC9 66 900 -1900 200 L 50 50 1 1 B
+X PA8 67 900 1600 200 L 50 50 1 1 B
+X PA9 68 900 1500 200 L 50 50 1 1 B
+X PA10 69 900 1400 200 L 50 50 1 1 B
+X PC13 7 900 -2300 200 L 50 50 1 1 B
+X PA11 70 900 1300 200 L 50 50 1 1 B
+X PA12 71 900 1200 200 L 50 50 1 1 B
+X PA13 72 900 1100 200 L 50 50 1 1 B
+X VDDUSB 73 400 2700 200 D 50 50 1 1 W
+X VSS 74 100 -2800 200 U 50 50 1 1 W
+X VDD 75 100 2700 200 D 50 50 1 1 W
+X PA14 76 900 1000 200 L 50 50 1 1 B
+X PA15 77 900 900 200 L 50 50 1 1 B
+X PC10 78 900 -2000 200 L 50 50 1 1 B
+X PC11 79 900 -2100 200 L 50 50 1 1 B
+X PC14 8 900 -2400 200 L 50 50 1 1 B
+X PC12 80 900 -2200 200 L 50 50 1 1 B
+X PD0 81 -900 -1000 200 R 50 50 1 1 B
+X PD1 82 -900 -1100 200 R 50 50 1 1 B
 X PD2 83 -900 -1200 200 R 50 50 1 1 B
 X PD3 84 -900 -1300 200 R 50 50 1 1 B
 X PD4 85 -900 -1400 200 R 50 50 1 1 B
 X PD5 86 -900 -1500 200 R 50 50 1 1 B
 X PD6 87 -900 -1600 200 R 50 50 1 1 B
 X PD7 88 -900 -1700 200 R 50 50 1 1 B
-X PD8 55 -900 -1800 200 R 50 50 1 1 B
-X PD9 56 -900 -1900 200 R 50 50 1 1 B
+X PB3 89 900 400 200 L 50 50 1 1 B
+X PC15 9 900 -2500 200 L 50 50 1 1 B
+X PB4 90 900 300 200 L 50 50 1 1 B
+X PB5 91 900 200 200 L 50 50 1 1 B
+X PB6 92 900 100 200 L 50 50 1 1 B
+X PB7 93 900 0 200 L 50 50 1 1 B
+X PH3 94 -900 900 200 R 50 50 1 1 B
+X PB8 95 900 -100 200 L 50 50 1 1 B
+X PB9 96 900 -200 200 L 50 50 1 1 B
 X PE0 97 -900 700 200 R 50 50 1 1 B
 X PE1 98 -900 600 200 R 50 50 1 1 B
-X PE10 41 -900 -300 200 R 50 50 1 1 B
-X PE11 42 -900 -400 200 R 50 50 1 1 B
-X PE12 43 -900 -500 200 R 50 50 1 1 B
-X PE13 44 -900 -600 200 R 50 50 1 1 B
-X PE14 45 -900 -700 200 R 50 50 1 1 B
-X PE15 46 -900 -800 200 R 50 50 1 1 B
-X PE2 1 -900 500 200 R 50 50 1 1 B
-X PE3 2 -900 400 200 R 50 50 1 1 B
-X PE4 3 -900 300 200 R 50 50 1 1 B
-X PE5 4 -900 200 200 R 50 50 1 1 B
-X PE6 5 -900 100 200 R 50 50 1 1 B
-X PE7 38 -900 0 200 R 50 50 1 1 B
-X PE8 39 -900 -100 200 R 50 50 1 1 B
-X PE9 40 -900 -200 200 R 50 50 1 1 B
-X PH0 12 -900 1100 200 R 50 50 1 1 I
-X PH1 13 -900 1000 200 R 50 50 1 1 I
-X PH3 94 -900 900 200 R 50 50 1 1 B
-X VBAT 6 -300 2700 200 D 50 50 1 1 W
-X VDD 100 200 2700 200 D 50 50 1 1 W
-X VDD 11 -200 2700 200 D 50 50 1 1 W
-X VDD 28 -100 2700 200 D 50 50 1 1 W
-X VDD 50 0 2700 200 D 50 50 1 1 W
-X VDD 75 100 2700 200 D 50 50 1 1 W
-X VDDA 22 300 2700 200 D 50 50 1 1 W
-X VDDUSB 73 400 2700 200 D 50 50 1 1 W
-X VREF+ 21 -900 2200 200 R 50 50 1 1 B
-X VREF- 20 -900 2100 200 R 50 50 1 1 W
-X VSS 10 -200 -2800 200 U 50 50 1 1 W
-X VSS 27 -100 -2800 200 U 50 50 1 1 W
-X VSS 49 0 -2800 200 U 50 50 1 1 W
-X VSS 74 100 -2800 200 U 50 50 1 1 W
 X VSS 99 200 -2800 200 U 50 50 1 1 W
-X VSSA 19 300 -2800 200 U 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
@@ -2225,55 +2225,55 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -500 -1400 500 1300 0 1 10 f
-X NRST 7 -600 1200 100 R 50 50 1 1 I
+X VBAT 1 -200 1400 100 D 50 50 1 1 W
 X PA0 10 600 200 100 L 50 50 1 1 B
 X PA1 11 600 100 100 L 50 50 1 1 B
-X PA10 31 600 -800 100 L 50 50 1 1 B
-X PA11 32 600 -900 100 L 50 50 1 1 B
-X PA12 33 600 -1000 100 L 50 50 1 1 B
-X PA13 34 600 -1100 100 L 50 50 1 1 B
-X PA14 37 600 -1200 100 L 50 50 1 1 B
-X PA15 38 600 -1300 100 L 50 50 1 1 B
 X PA2 12 600 0 100 L 50 50 1 1 B
 X PA3 13 600 -100 100 L 50 50 1 1 B
 X PA4 14 600 -200 100 L 50 50 1 1 B
 X PA5 15 600 -300 100 L 50 50 1 1 B
 X PA6 16 600 -400 100 L 50 50 1 1 B
 X PA7 17 600 -500 100 L 50 50 1 1 B
-X PA8 29 600 -600 100 L 50 50 1 1 B
-X PA9 30 600 -700 100 L 50 50 1 1 B
 X PB0 18 -600 200 100 R 50 50 1 1 B
 X PB1 19 -600 100 100 R 50 50 1 1 B
+X PC13 2 -600 600 100 R 50 50 1 1 B
+X PB2 20 -600 0 100 R 50 50 1 1 B
 X PB10 21 -600 -800 100 R 50 50 1 1 B
 X PB11 22 -600 -900 100 R 50 50 1 1 B
+X VSS 23 -200 -1500 100 U 50 50 1 1 W
+X VDD 24 -100 1400 100 D 50 50 1 1 W
 X PB12 25 -600 -1000 100 R 50 50 1 1 B
 X PB13 26 -600 -1100 100 R 50 50 1 1 B
 X PB14 27 -600 -1200 100 R 50 50 1 1 B
 X PB15 28 -600 -1300 100 R 50 50 1 1 B
-X PB2 20 -600 0 100 R 50 50 1 1 B
+X PA8 29 600 -600 100 L 50 50 1 1 B
+X PC14 3 -600 500 100 R 50 50 1 1 B
+X PA9 30 600 -700 100 L 50 50 1 1 B
+X PA10 31 600 -800 100 L 50 50 1 1 B
+X PA11 32 600 -900 100 L 50 50 1 1 B
+X PA12 33 600 -1000 100 L 50 50 1 1 B
+X PA13 34 600 -1100 100 L 50 50 1 1 B
+X VSS 35 -100 -1500 100 U 50 50 1 1 W
+X VDD 36 0 1400 100 D 50 50 1 1 W
+X PA14 37 600 -1200 100 L 50 50 1 1 B
+X PA15 38 600 -1300 100 L 50 50 1 1 B
 X PB3 39 -600 -100 100 R 50 50 1 1 B
+X PC15 4 -600 400 100 R 50 50 1 1 B
 X PB4 40 -600 -200 100 R 50 50 1 1 B
 X PB5 41 -600 -300 100 R 50 50 1 1 B
 X PB6 42 -600 -400 100 R 50 50 1 1 B
 X PB7 43 -600 -500 100 R 50 50 1 1 B
+X PH3 44 -600 800 100 R 50 50 1 1 B
 X PB8 45 -600 -600 100 R 50 50 1 1 B
 X PB9 46 -600 -700 100 R 50 50 1 1 B
-X PC13 2 -600 600 100 R 50 50 1 1 B
-X PC14 3 -600 500 100 R 50 50 1 1 B
-X PC15 4 -600 400 100 R 50 50 1 1 B
-X PH0 5 -600 1000 100 R 50 50 1 1 I
-X PH1 6 -600 900 100 R 50 50 1 1 I
-X PH3 44 -600 800 100 R 50 50 1 1 B
-X VBAT 1 -200 1400 100 D 50 50 1 1 W
-X VDD 24 -100 1400 100 D 50 50 1 1 W
-X VDD 48 0 1400 100 D 50 50 1 1 W
-X VDDA 9 100 1400 100 D 50 50 1 1 W
-X VDDUSB 36 200 1400 100 D 50 50 1 1 W
-X VSS 23 -200 -1500 100 U 50 50 1 1 W
-X VSS 35 -100 -1500 100 U 50 50 1 1 W
 X VSS 47 0 -1500 100 U 50 50 1 1 W
+X VDD 48 100 1400 100 D 50 50 1 1 W
 X VSS 49 100 -1500 100 U 50 50 1 1 W
+X PH0 5 -600 1000 100 R 50 50 1 1 I
+X PH1 6 -600 900 100 R 50 50 1 1 I
+X NRST 7 -600 1200 100 R 50 50 1 1 I
 X VSSA 8 200 -1500 100 U 50 50 1 1 W
+X VDDA 9 200 1400 100 D 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
@@ -2290,70 +2290,70 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -600 -1700 500 1700 0 1 10 f
-X NRST E1 -700 1600 100 R 50 50 1 1 I
-X PA0 G2 600 1600 100 L 50 50 1 1 B
-X PA1 H2 600 1500 100 L 50 50 1 1 B
+X PC14 A1 -700 -1500 100 R 50 50 1 1 B
+X PC13 A2 -700 -1400 100 R 50 50 1 1 B
+X PB9 A3 600 -1000 100 L 50 50 1 1 B
+X PB4 A4 600 -500 100 L 50 50 1 1 B
+X PB3 A5 600 -400 100 L 50 50 1 1 B
+X PA15 A6 600 100 100 L 50 50 1 1 B
+X PA14 A7 600 200 100 L 50 50 1 1 B
+X PA13 A8 600 300 100 L 50 50 1 1 B
+X PC15 B1 -700 -1600 100 R 50 50 1 1 B
+X VBAT B2 -300 1800 100 D 50 50 1 1 W
+X PB8 B3 600 -900 100 L 50 50 1 1 B
+X PH3 B4 -700 300 100 R 50 50 1 1 B
+X PD2 B5 -700 100 100 R 50 50 1 1 B
+X PC11 B6 -700 -1200 100 R 50 50 1 1 B
+X PC10 B7 -700 -1100 100 R 50 50 1 1 B
+X PA12 B8 600 400 100 L 50 50 1 1 B
+X PH0 C1 -700 500 100 R 50 50 1 1 I
+X VSS C2 -300 -1800 100 U 50 50 1 1 W
+X PB7 C3 600 -800 100 L 50 50 1 1 B
+X PB5 C4 600 -600 100 L 50 50 1 1 B
+X PC12 C5 -700 -1300 100 R 50 50 1 1 B
 X PA10 C6 600 600 100 L 50 50 1 1 B
+X PA9 C7 600 700 100 L 50 50 1 1 B
 X PA11 C8 600 500 100 L 50 50 1 1 B
-X PA12 B8 600 400 100 L 50 50 1 1 B
-X PA13 A8 600 300 100 L 50 50 1 1 B
-X PA14 A7 600 200 100 L 50 50 1 1 B
-X PA15 A6 600 100 100 L 50 50 1 1 B
+X PH1 D1 -700 400 100 R 50 50 1 1 I
+X VDD D2 -200 1800 100 D 50 50 1 1 W
+X PB6 D3 600 -700 100 L 50 50 1 1 B
+X VSS D4 -200 -1800 100 U 50 50 1 1 W
+X VSS D5 -100 -1800 100 U 50 50 1 1 W
+X VSS D6 0 -1800 100 U 50 50 1 1 W
+X PA8 D7 600 800 100 L 50 50 1 1 B
+X PC9 D8 -700 -1000 100 R 50 50 1 1 B
+X NRST E1 -700 1600 100 R 50 50 1 1 I
+X PC1 E2 -700 -200 100 R 50 50 1 1 B
+X PC0 E3 -700 -100 100 R 50 50 1 1 B
+X VDD E4 -100 1800 100 D 50 50 1 1 W
+X VDD E5 0 1800 100 D 50 50 1 1 W
+X VDD E6 100 1800 100 D 50 50 1 1 W
+X PC7 E7 -700 -800 100 R 50 50 1 1 B
+X PC8 E8 -700 -900 100 R 50 50 1 1 B
+X VSSA F1 100 -1800 100 U 50 50 1 1 W
+X PC2 F2 -700 -300 100 R 50 50 1 1 B
 X PA2 F3 600 1400 100 L 50 50 1 1 B
-X PA3 G3 600 1300 100 L 50 50 1 1 B
-X PA4 H3 600 1200 100 L 50 50 1 1 B
 X PA5 F4 600 1100 100 L 50 50 1 1 B
-X PA6 G4 600 1000 100 L 50 50 1 1 B
-X PA7 H4 600 900 100 L 50 50 1 1 B
-X PA8 D7 600 800 100 L 50 50 1 1 B
-X PA9 C7 600 700 100 L 50 50 1 1 B
 X PB0 F5 600 -100 100 L 50 50 1 1 B
+X PC6 F6 -700 -700 100 R 50 50 1 1 B
+X PB15 F7 600 -1600 100 L 50 50 1 1 B
+X PB14 F8 600 -1500 100 L 50 50 1 1 B
+X PC3 G1 -700 -400 100 R 50 50 1 1 B
+X PA0 G2 600 1600 100 L 50 50 1 1 B
+X PA3 G3 600 1300 100 L 50 50 1 1 B
+X PA6 G4 600 1000 100 L 50 50 1 1 B
 X PB1 G5 600 -200 100 L 50 50 1 1 B
+X PB2 G6 600 -300 100 L 50 50 1 1 B
 X PB10 G7 600 -1100 100 L 50 50 1 1 B
+X PB13 G8 600 -1400 100 L 50 50 1 1 B
+X VDDA H1 200 1800 100 D 50 50 1 1 W
+X PA1 H2 600 1500 100 L 50 50 1 1 B
+X PA4 H3 600 1200 100 L 50 50 1 1 B
+X PA7 H4 600 900 100 L 50 50 1 1 B
+X PC4 H5 -700 -500 100 R 50 50 1 1 B
+X PC5 H6 -700 -600 100 R 50 50 1 1 B
 X PB11 H7 600 -1200 100 L 50 50 1 1 B
 X PB12 H8 600 -1300 100 L 50 50 1 1 B
-X PB13 G8 600 -1400 100 L 50 50 1 1 B
-X PB14 F8 600 -1500 100 L 50 50 1 1 B
-X PB15 F7 600 -1600 100 L 50 50 1 1 B
-X PB2 G6 600 -300 100 L 50 50 1 1 B
-X PB3 A5 600 -400 100 L 50 50 1 1 B
-X PB4 A4 600 -500 100 L 50 50 1 1 B
-X PB5 C4 600 -600 100 L 50 50 1 1 B
-X PB6 D3 600 -700 100 L 50 50 1 1 B
-X PB7 C3 600 -800 100 L 50 50 1 1 B
-X PB8 B3 600 -900 100 L 50 50 1 1 B
-X PB9 A3 600 -1000 100 L 50 50 1 1 B
-X PC0 E3 -700 -100 100 R 50 50 1 1 B
-X PC1 E2 -700 -200 100 R 50 50 1 1 B
-X PC10 B7 -700 -1100 100 R 50 50 1 1 B
-X PC11 B6 -700 -1200 100 R 50 50 1 1 B
-X PC12 C5 -700 -1300 100 R 50 50 1 1 B
-X PC13 A2 -700 -1400 100 R 50 50 1 1 B
-X PC14 A1 -700 -1500 100 R 50 50 1 1 B
-X PC15 B1 -700 -1600 100 R 50 50 1 1 B
-X PC2 F2 -700 -300 100 R 50 50 1 1 B
-X PC3 G1 -700 -400 100 R 50 50 1 1 B
-X PC4 H5 -700 -500 100 R 50 50 1 1 B
-X PC5 H6 -700 -600 100 R 50 50 1 1 B
-X PC6 F6 -700 -700 100 R 50 50 1 1 B
-X PC7 E7 -700 -800 100 R 50 50 1 1 B
-X PC8 E8 -700 -900 100 R 50 50 1 1 B
-X PC9 D8 -700 -1000 100 R 50 50 1 1 B
-X PD2 B5 -700 100 100 R 50 50 1 1 B
-X PH0 C1 -700 500 100 R 50 50 1 1 I
-X PH1 D1 -700 400 100 R 50 50 1 1 I
-X PH3 B4 -700 300 100 R 50 50 1 1 B
-X VBAT B2 -300 1800 100 D 50 50 1 1 W
-X VDD D2 -200 1800 100 D 50 50 1 1 W
-X VDD E4 -100 1800 100 D 50 50 1 1 W
-X VDD E6 0 1800 100 D 50 50 1 1 W
-X VDDA H1 100 1800 100 D 50 50 1 1 W
-X VDDUSB E5 200 1800 100 D 50 50 1 1 W
-X VSS C2 -300 -1800 100 U 50 50 1 1 W
-X VSS D4 -200 -1800 100 U 50 50 1 1 W
-X VSS D5 -100 -1800 100 U 50 50 1 1 W
-X VSS D6 0 -1800 100 U 50 50 1 1 W
-X VSSA F1 100 -1800 100 U 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
@@ -2370,70 +2370,70 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -600 -1700 500 1700 0 1 10 f
-X NRST 7 -700 1600 100 R 50 50 1 1 I
+X VBAT 1 -300 1800 100 D 50 50 1 1 W
+X PC2 10 -700 -300 100 R 50 50 1 1 B
+X PC3 11 -700 -400 100 R 50 50 1 1 B
+X VSSA 12 100 -1800 100 U 50 50 1 1 W
+X VDDA 13 200 1800 100 D 50 50 1 1 W
 X PA0 14 600 1600 100 L 50 50 1 1 B
 X PA1 15 600 1500 100 L 50 50 1 1 B
-X PA10 43 600 600 100 L 50 50 1 1 B
-X PA11 44 600 500 100 L 50 50 1 1 B
-X PA12 45 600 400 100 L 50 50 1 1 B
-X PA13 46 600 300 100 L 50 50 1 1 B
-X PA14 49 600 200 100 L 50 50 1 1 B
-X PA15 50 600 100 100 L 50 50 1 1 B
 X PA2 16 600 1400 100 L 50 50 1 1 B
 X PA3 17 600 1300 100 L 50 50 1 1 B
+X VSS 18 -300 -1800 100 U 50 50 1 1 W
+X VDD 19 -200 1800 100 D 50 50 1 1 W
+X PC13 2 -700 -1400 100 R 50 50 1 1 B
 X PA4 20 600 1200 100 L 50 50 1 1 B
 X PA5 21 600 1100 100 L 50 50 1 1 B
 X PA6 22 600 1000 100 L 50 50 1 1 B
 X PA7 23 600 900 100 L 50 50 1 1 B
-X PA8 41 600 800 100 L 50 50 1 1 B
-X PA9 42 600 700 100 L 50 50 1 1 B
+X PC4 24 -700 -500 100 R 50 50 1 1 B
+X PC5 25 -700 -600 100 R 50 50 1 1 B
 X PB0 26 600 -100 100 L 50 50 1 1 B
 X PB1 27 600 -200 100 L 50 50 1 1 B
+X PB2 28 600 -300 100 L 50 50 1 1 B
 X PB10 29 600 -1100 100 L 50 50 1 1 B
+X PC14 3 -700 -1500 100 R 50 50 1 1 B
 X PB11 30 600 -1200 100 L 50 50 1 1 B
+X VSS 31 -200 -1800 100 U 50 50 1 1 W
+X VDD 32 -100 1800 100 D 50 50 1 1 W
 X PB12 33 600 -1300 100 L 50 50 1 1 B
 X PB13 34 600 -1400 100 L 50 50 1 1 B
 X PB14 35 600 -1500 100 L 50 50 1 1 B
 X PB15 36 600 -1600 100 L 50 50 1 1 B
-X PB2 28 600 -300 100 L 50 50 1 1 B
+X PC6 37 -700 -700 100 R 50 50 1 1 B
+X PC7 38 -700 -800 100 R 50 50 1 1 B
+X PC8 39 -700 -900 100 R 50 50 1 1 B
+X PC15 4 -700 -1600 100 R 50 50 1 1 B
+X PC9 40 -700 -1000 100 R 50 50 1 1 B
+X PA8 41 600 800 100 L 50 50 1 1 B
+X PA9 42 600 700 100 L 50 50 1 1 B
+X PA10 43 600 600 100 L 50 50 1 1 B
+X PA11 44 600 500 100 L 50 50 1 1 B
+X PA12 45 600 400 100 L 50 50 1 1 B
+X PA13 46 600 300 100 L 50 50 1 1 B
+X VSS 47 -100 -1800 100 U 50 50 1 1 W
+X VDD 48 0 1800 100 D 50 50 1 1 W
+X PA14 49 600 200 100 L 50 50 1 1 B
+X PH0 5 -700 500 100 R 50 50 1 1 I
+X PA15 50 600 100 100 L 50 50 1 1 B
+X PC10 51 -700 -1100 100 R 50 50 1 1 B
+X PC11 52 -700 -1200 100 R 50 50 1 1 B
+X PC12 53 -700 -1300 100 R 50 50 1 1 B
+X PD2 54 -700 100 100 R 50 50 1 1 B
 X PB3 55 600 -400 100 L 50 50 1 1 B
 X PB4 56 600 -500 100 L 50 50 1 1 B
 X PB5 57 600 -600 100 L 50 50 1 1 B
 X PB6 58 600 -700 100 L 50 50 1 1 B
 X PB7 59 600 -800 100 L 50 50 1 1 B
+X PH1 6 -700 400 100 R 50 50 1 1 I
+X PH3 60 -700 300 100 R 50 50 1 1 B
 X PB8 61 600 -900 100 L 50 50 1 1 B
 X PB9 62 600 -1000 100 L 50 50 1 1 B
+X VSS 63 0 -1800 100 U 50 50 1 1 W
+X VDD 64 100 1800 100 D 50 50 1 1 W
+X NRST 7 -700 1600 100 R 50 50 1 1 I
 X PC0 8 -700 -100 100 R 50 50 1 1 B
 X PC1 9 -700 -200 100 R 50 50 1 1 B
-X PC10 51 -700 -1100 100 R 50 50 1 1 B
-X PC11 52 -700 -1200 100 R 50 50 1 1 B
-X PC12 53 -700 -1300 100 R 50 50 1 1 B
-X PC13 2 -700 -1400 100 R 50 50 1 1 B
-X PC14 3 -700 -1500 100 R 50 50 1 1 B
-X PC15 4 -700 -1600 100 R 50 50 1 1 B
-X PC2 10 -700 -300 100 R 50 50 1 1 B
-X PC3 11 -700 -400 100 R 50 50 1 1 B
-X PC4 24 -700 -500 100 R 50 50 1 1 B
-X PC5 25 -700 -600 100 R 50 50 1 1 B
-X PC6 37 -700 -700 100 R 50 50 1 1 B
-X PC7 38 -700 -800 100 R 50 50 1 1 B
-X PC8 39 -700 -900 100 R 50 50 1 1 B
-X PC9 40 -700 -1000 100 R 50 50 1 1 B
-X PD2 54 -700 100 100 R 50 50 1 1 B
-X PH0 5 -700 500 100 R 50 50 1 1 I
-X PH1 6 -700 400 100 R 50 50 1 1 I
-X PH3 60 -700 300 100 R 50 50 1 1 B
-X VBAT 1 -300 1800 100 D 50 50 1 1 W
-X VDD 19 -200 1800 100 D 50 50 1 1 W
-X VDD 32 -100 1800 100 D 50 50 1 1 W
-X VDD 64 0 1800 100 D 50 50 1 1 W
-X VDDA 13 100 1800 100 D 50 50 1 1 W
-X VDDUSB 48 200 1800 100 D 50 50 1 1 W
-X VSS 18 -300 -1800 100 U 50 50 1 1 W
-X VSS 31 -200 -1800 100 U 50 50 1 1 W
-X VSS 47 -100 -1800 100 U 50 50 1 1 W
-X VSS 63 0 -1800 100 U 50 50 1 1 W
-X VSSA 12 100 -1800 100 U 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
@@ -2450,70 +2450,70 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -600 -1700 600 1700 0 1 10 f
-X NRST F8 -700 1600 100 R 50 50 1 1 I
-X PA0 H8 700 1600 100 L 50 50 1 1 B
-X PA1 E6 700 1500 100 L 50 50 1 1 B
-X PA10 C1 700 600 100 L 50 50 1 1 B
-X PA11 D2 700 500 100 L 50 50 1 1 B
-X PA12 D3 700 400 100 L 50 50 1 1 B
-X PA13 C2 700 300 100 L 50 50 1 1 B
-X PA14 C3 700 200 100 L 50 50 1 1 B
+X VDD A1 -200 1800 100 D 50 50 1 1 W
 X PA15 A2 700 100 100 L 50 50 1 1 B
-X PA2 G7 700 1400 100 L 50 50 1 1 B
-X PA3 F6 700 1300 100 L 50 50 1 1 B
-X PA4 G6 700 1200 100 L 50 50 1 1 B
-X PA5 F5 700 1100 100 L 50 50 1 1 B
-X PA6 H6 700 1000 100 L 50 50 1 1 B
-X PA7 E5 700 900 100 L 50 50 1 1 B
-X PA8 E3 700 800 100 L 50 50 1 1 B
-X PA9 D1 700 700 100 L 50 50 1 1 B
-X PB0 H5 700 -100 100 L 50 50 1 1 B
-X PB1 F4 700 -200 100 L 50 50 1 1 B
-X PB10 H4 700 -1100 100 L 50 50 1 1 B
-X PB11 H3 700 -1200 100 L 50 50 1 1 B
-X PB12 G3 700 -1300 100 L 50 50 1 1 B
-X PB13 G2 700 -1400 100 L 50 50 1 1 B
-X PB14 G1 700 -1500 100 L 50 50 1 1 B
-X PB15 F1 700 -1600 100 L 50 50 1 1 B
-X PB2 G4 700 -300 100 L 50 50 1 1 B
-X PB3 B4 700 -400 100 L 50 50 1 1 B
+X PC12 A3 -700 -1300 100 R 50 50 1 1 B
 X PB4 A4 700 -500 100 L 50 50 1 1 B
-X PB5 C5 700 -600 100 L 50 50 1 1 B
-X PB6 B5 700 -700 100 L 50 50 1 1 B
 X PB7 A5 700 -800 100 L 50 50 1 1 B
 X PB8 A6 700 -900 100 L 50 50 1 1 B
-X PB9 C6 700 -1000 100 L 50 50 1 1 B
-X PC0 D7 -700 -100 100 R 50 50 1 1 B
-X PC1 D5 -700 -200 100 R 50 50 1 1 B
-X PC10 D4 -700 -1100 100 R 50 50 1 1 B
+X VSS A7 -200 -1800 100 U 50 50 1 1 W
+X VDD A8 -100 1800 100 D 50 50 1 1 W
+X VSS B1 -100 -1800 100 U 50 50 1 1 W
+X VDD B2 0 1800 100 D 50 50 1 1 W
 X PC11 B3 -700 -1200 100 R 50 50 1 1 B
-X PC12 A3 -700 -1300 100 R 50 50 1 1 B
+X PB3 B4 700 -400 100 L 50 50 1 1 B
+X PB6 B5 700 -700 100 L 50 50 1 1 B
+X PH3 B6 -700 300 100 R 50 50 1 1 B
+X VBAT B7 -300 1800 100 D 50 50 1 1 W
 X PC13 B8 -700 -1400 100 R 50 50 1 1 B
-X PC14 C8 -700 -1500 100 R 50 50 1 1 B
+X PA10 C1 700 600 100 L 50 50 1 1 B
+X PA13 C2 700 300 100 L 50 50 1 1 B
+X PA14 C3 700 200 100 L 50 50 1 1 B
+X PD2 C4 -700 100 100 R 50 50 1 1 B
+X PB5 C5 700 -600 100 L 50 50 1 1 B
+X PB9 C6 700 -1000 100 L 50 50 1 1 B
 X PC15 C7 -700 -1600 100 R 50 50 1 1 B
+X PC14 C8 -700 -1500 100 R 50 50 1 1 B
+X PA9 D1 700 700 100 L 50 50 1 1 B
+X PA11 D2 700 500 100 L 50 50 1 1 B
+X PA12 D3 700 400 100 L 50 50 1 1 B
+X PC10 D4 -700 -1100 100 R 50 50 1 1 B
+X PC1 D5 -700 -200 100 R 50 50 1 1 B
 X PC2 D6 -700 -300 100 R 50 50 1 1 B
-X PC3 E7 -700 -400 100 R 50 50 1 1 B
-X PC4 E4 -700 -500 100 R 50 50 1 1 B
-X PC5 G5 -700 -600 100 R 50 50 1 1 B
-X PC6 F2 -700 -700 100 R 50 50 1 1 B
+X PC0 D7 -700 -100 100 R 50 50 1 1 B
+X PH0 D8 -700 500 100 R 50 50 1 1 I
 X PC7 E1 -700 -800 100 R 50 50 1 1 B
-X PC8 F3 -700 -900 100 R 50 50 1 1 B
 X PC9 E2 -700 -1000 100 R 50 50 1 1 B
-X PD2 C4 -700 100 100 R 50 50 1 1 B
-X PH0 D8 -700 500 100 R 50 50 1 1 I
+X PA8 E3 700 800 100 L 50 50 1 1 B
+X PC4 E4 -700 -500 100 R 50 50 1 1 B
+X PA7 E5 700 900 100 L 50 50 1 1 B
+X PA1 E6 700 1500 100 L 50 50 1 1 B
+X PC3 E7 -700 -400 100 R 50 50 1 1 B
 X PH1 E8 -700 400 100 R 50 50 1 1 I
-X PH3 B6 -700 300 100 R 50 50 1 1 B
-X VBAT B7 -300 1800 100 D 50 50 1 1 W
-X VDD A8 -200 1800 100 D 50 50 1 1 W
-X VDD B2 -100 1800 100 D 50 50 1 1 W
-X VDD H1 0 1800 100 D 50 50 1 1 W
-X VDD H7 100 1800 100 D 50 50 1 1 W
-X VDDA F7 200 1800 100 D 50 50 1 1 W
-X VDDUSB A1 300 1800 100 D 50 50 1 1 W
-X VSS A7 -200 -1800 100 U 50 50 1 1 W
-X VSS B1 -100 -1800 100 U 50 50 1 1 W
-X VSS H2 0 -1800 100 U 50 50 1 1 W
+X PB15 F1 700 -1600 100 L 50 50 1 1 B
+X PC6 F2 -700 -700 100 R 50 50 1 1 B
+X PC8 F3 -700 -900 100 R 50 50 1 1 B
+X PB1 F4 700 -200 100 L 50 50 1 1 B
+X PA5 F5 700 1100 100 L 50 50 1 1 B
+X PA3 F6 700 1300 100 L 50 50 1 1 B
+X VDDA F7 300 1800 100 D 50 50 1 1 W
+X NRST F8 -700 1600 100 R 50 50 1 1 I
+X PB14 G1 700 -1500 100 L 50 50 1 1 B
+X PB13 G2 700 -1400 100 L 50 50 1 1 B
+X PB12 G3 700 -1300 100 L 50 50 1 1 B
+X PB2 G4 700 -300 100 L 50 50 1 1 B
+X PC5 G5 -700 -600 100 R 50 50 1 1 B
+X PA4 G6 700 1200 100 L 50 50 1 1 B
+X PA2 G7 700 1400 100 L 50 50 1 1 B
 X VSSA G8 100 -1800 100 U 50 50 1 1 W
+X VDD H1 100 1800 100 D 50 50 1 1 W
+X VSS H2 0 -1800 100 U 50 50 1 1 W
+X PB11 H3 700 -1200 100 L 50 50 1 1 B
+X PB10 H4 700 -1100 100 L 50 50 1 1 B
+X PB0 H5 700 -100 100 L 50 50 1 1 B
+X PA6 H6 700 1000 100 L 50 50 1 1 B
+X VDD H7 200 1800 100 D 50 50 1 1 W
+X PA0 H8 700 1600 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
@@ -2530,106 +2530,106 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -700 -2600 700 2500 0 1 10 f
-X NRST H2 -900 2400 200 R 50 50 1 1 I
-X PA0 L2 900 2400 200 L 50 50 1 1 B
-X PA1 M2 900 2300 200 L 50 50 1 1 B
-X PA10 C12 900 1400 200 L 50 50 1 1 B
-X PA11 B12 900 1300 200 L 50 50 1 1 B
-X PA12 A12 900 1200 200 L 50 50 1 1 B
-X PA13 A11 900 1100 200 L 50 50 1 1 B
+X PE3 A1 -900 400 200 R 50 50 1 1 B
 X PA14 A10 900 1000 200 L 50 50 1 1 B
-X PA15 A9 900 900 200 L 50 50 1 1 B
-X PA2 K3 900 2200 200 L 50 50 1 1 B
-X PA3 L3 900 2100 200 L 50 50 1 1 B
-X PA4 M3 900 2000 200 L 50 50 1 1 B
-X PA5 K4 900 1900 200 L 50 50 1 1 B
-X PA6 L4 900 1800 200 L 50 50 1 1 B
-X PA7 M4 900 1700 200 L 50 50 1 1 B
-X PA8 D11 900 1600 200 L 50 50 1 1 B
-X PA9 D10 900 1500 200 L 50 50 1 1 B
-X PB0 M5 900 700 200 L 50 50 1 1 B
-X PB1 M6 900 600 200 L 50 50 1 1 B
-X PB10 L10 900 -300 200 L 50 50 1 1 B
-X PB11 L11 900 -400 200 L 50 50 1 1 B
-X PB12 L12 900 -500 200 L 50 50 1 1 B
-X PB13 K12 900 -600 200 L 50 50 1 1 B
-X PB14 K11 900 -700 200 L 50 50 1 1 B
-X PB15 K10 900 -800 200 L 50 50 1 1 B
-X PB2 L6 900 500 200 L 50 50 1 1 B
-X PB3 A8 900 400 200 L 50 50 1 1 B
-X PB4 A7 900 300 200 L 50 50 1 1 B
-X PB5 C5 900 200 200 L 50 50 1 1 B
-X PB6 B5 900 100 200 L 50 50 1 1 B
-X PB7 B4 900 0 200 L 50 50 1 1 B
+X PA13 A11 900 1100 200 L 50 50 1 1 B
+X PA12 A12 900 1200 200 L 50 50 1 1 B
+X PE1 A2 -900 600 200 R 50 50 1 1 B
 X PB8 A3 900 -100 200 L 50 50 1 1 B
-X PB9 B3 900 -200 200 L 50 50 1 1 B
-X PC0 H1 900 -1000 200 L 50 50 1 1 B
-X PC1 J2 900 -1100 200 L 50 50 1 1 B
-X PC10 B11 900 -2000 200 L 50 50 1 1 B
-X PC11 C10 900 -2100 200 L 50 50 1 1 B
+X PH3 A4 -900 900 200 R 50 50 1 1 B
+X PD7 A5 -900 -1700 200 R 50 50 1 1 B
+X PD5 A6 -900 -1500 200 R 50 50 1 1 B
+X PB4 A7 900 300 200 L 50 50 1 1 B
+X PB3 A8 900 400 200 L 50 50 1 1 B
+X PA15 A9 900 900 200 L 50 50 1 1 B
+X PE4 B1 -900 300 200 R 50 50 1 1 B
 X PC12 B10 900 -2200 200 L 50 50 1 1 B
-X PC13 C1 900 -2300 200 L 50 50 1 1 B
-X PC14 D1 900 -2400 200 L 50 50 1 1 B
+X PC10 B11 900 -2000 200 L 50 50 1 1 B
+X PA11 B12 900 1300 200 L 50 50 1 1 B
+X PE2 B2 -900 500 200 R 50 50 1 1 B
+X PB9 B3 900 -200 200 L 50 50 1 1 B
+X PB7 B4 900 0 200 L 50 50 1 1 B
+X PB6 B5 900 100 200 L 50 50 1 1 B
+X PD6 B6 -900 -1600 200 R 50 50 1 1 B
+X PD4 B7 -900 -1400 200 R 50 50 1 1 B
+X PD3 B8 -900 -1300 200 R 50 50 1 1 B
+X PD1 B9 -900 -1100 200 R 50 50 1 1 B
+X PC13 C1 900 -2300 200 L 50 50 1 1 B
+X PC11 C10 900 -2100 200 L 50 50 1 1 B
+X VDD C11 -100 2700 200 D 50 50 1 1 W
+X PA10 C12 900 1400 200 L 50 50 1 1 B
+X PE5 C2 -900 200 200 R 50 50 1 1 B
+X PE0 C3 -900 700 200 R 50 50 1 1 B
+X VDD C4 -200 2700 200 D 50 50 1 1 W
+X PB5 C5 900 200 200 L 50 50 1 1 B
+X PD2 C8 -900 -1200 200 R 50 50 1 1 B
+X PD0 C9 -900 -1000 200 R 50 50 1 1 B
+X PC14 D1 900 -2400 200 L 50 50 1 1 B
+X PA9 D10 900 1500 200 L 50 50 1 1 B
+X PA8 D11 900 1600 200 L 50 50 1 1 B
+X PC9 D12 900 -1900 200 L 50 50 1 1 B
+X PE6 D2 -900 100 200 R 50 50 1 1 B
+X VSS D3 -200 -2800 200 U 50 50 1 1 W
 X PC15 E1 900 -2500 200 L 50 50 1 1 B
+X PC8 E10 900 -1800 200 L 50 50 1 1 B
+X PC7 E11 900 -1700 200 L 50 50 1 1 B
+X PC6 E12 900 -1600 200 L 50 50 1 1 B
+X VBAT E2 -300 2700 200 D 50 50 1 1 W
+X VSS E3 -100 -2800 200 U 50 50 1 1 W
+X PH0 F1 -900 1100 200 R 50 50 1 1 I
+X VSS F11 100 -2800 200 U 50 50 1 1 W
+X VSS F12 200 -2800 200 U 50 50 1 1 W
+X VSS F2 0 -2800 200 U 50 50 1 1 W
+X PH1 G1 -900 1000 200 R 50 50 1 1 I
+X VDD G11 100 2700 200 D 50 50 1 1 W
+X VDD G12 200 2700 200 D 50 50 1 1 W
+X VDD G2 0 2700 200 D 50 50 1 1 W
+X PC0 H1 900 -1000 200 L 50 50 1 1 B
+X PD15 H10 -900 -2500 200 R 50 50 1 1 B
+X PD14 H11 -900 -2400 200 R 50 50 1 1 B
+X PD13 H12 -900 -2300 200 R 50 50 1 1 B
+X NRST H2 -900 2400 200 R 50 50 1 1 I
+X VDD H3 300 2700 200 D 50 50 1 1 W
+X VSSA J1 300 -2800 200 U 50 50 1 1 W
+X PD12 J10 -900 -2200 200 R 50 50 1 1 B
+X PD11 J11 -900 -2100 200 R 50 50 1 1 B
+X PD10 J12 -900 -2000 200 R 50 50 1 1 B
+X PC1 J2 900 -1100 200 L 50 50 1 1 B
 X PC2 J3 900 -1200 200 L 50 50 1 1 B
+X VREF- K1 -900 2100 200 R 50 50 1 1 W
+X PB15 K10 900 -800 200 L 50 50 1 1 B
+X PB14 K11 900 -700 200 L 50 50 1 1 B
+X PB13 K12 900 -600 200 L 50 50 1 1 B
 X PC3 K2 900 -1300 200 L 50 50 1 1 B
+X PA2 K3 900 2200 200 L 50 50 1 1 B
+X PA5 K4 900 1900 200 L 50 50 1 1 B
 X PC4 K5 900 -1400 200 L 50 50 1 1 B
-X PC5 L5 900 -1500 200 L 50 50 1 1 B
-X PC6 E12 900 -1600 200 L 50 50 1 1 B
-X PC7 E11 900 -1700 200 L 50 50 1 1 B
-X PC8 E10 900 -1800 200 L 50 50 1 1 B
-X PC9 D12 900 -1900 200 L 50 50 1 1 B
-X PD0 C9 -900 -1000 200 R 50 50 1 1 B
-X PD1 B9 -900 -1100 200 R 50 50 1 1 B
-X PD10 J12 -900 -2000 200 R 50 50 1 1 B
-X PD11 J11 -900 -2100 200 R 50 50 1 1 B
-X PD12 J10 -900 -2200 200 R 50 50 1 1 B
-X PD13 H12 -900 -2300 200 R 50 50 1 1 B
-X PD14 H11 -900 -2400 200 R 50 50 1 1 B
-X PD15 H10 -900 -2500 200 R 50 50 1 1 B
-X PD2 C8 -900 -1200 200 R 50 50 1 1 B
-X PD3 B8 -900 -1300 200 R 50 50 1 1 B
-X PD4 B7 -900 -1400 200 R 50 50 1 1 B
-X PD5 A6 -900 -1500 200 R 50 50 1 1 B
-X PD6 B6 -900 -1600 200 R 50 50 1 1 B
-X PD7 A5 -900 -1700 200 R 50 50 1 1 B
-X PD8 K9 -900 -1800 200 R 50 50 1 1 B
 X PD9 K8 -900 -1900 200 R 50 50 1 1 B
-X PE0 C3 -900 700 200 R 50 50 1 1 B
-X PE1 A2 -900 600 200 R 50 50 1 1 B
+X PD8 K9 -900 -1800 200 R 50 50 1 1 B
+X VREF+ L1 -900 2200 200 R 50 50 1 1 B
+X PB10 L10 900 -300 200 L 50 50 1 1 B
+X PB11 L11 900 -400 200 L 50 50 1 1 B
+X PB12 L12 900 -500 200 L 50 50 1 1 B
+X PA0 L2 900 2400 200 L 50 50 1 1 B
+X PA3 L3 900 2100 200 L 50 50 1 1 B
+X PA6 L4 900 1800 200 L 50 50 1 1 B
+X PC5 L5 900 -1500 200 L 50 50 1 1 B
+X PB2 L6 900 500 200 L 50 50 1 1 B
+X PE8 L7 -900 -100 200 R 50 50 1 1 B
 X PE10 L8 -900 -300 200 R 50 50 1 1 B
-X PE11 M9 -900 -400 200 R 50 50 1 1 B
 X PE12 L9 -900 -500 200 R 50 50 1 1 B
+X VDDA M1 400 2700 200 D 50 50 1 1 W
 X PE13 M10 -900 -600 200 R 50 50 1 1 B
 X PE14 M11 -900 -700 200 R 50 50 1 1 B
 X PE15 M12 -900 -800 200 R 50 50 1 1 B
-X PE2 B2 -900 500 200 R 50 50 1 1 B
-X PE3 A1 -900 400 200 R 50 50 1 1 B
-X PE4 B1 -900 300 200 R 50 50 1 1 B
-X PE5 C2 -900 200 200 R 50 50 1 1 B
-X PE6 D2 -900 100 200 R 50 50 1 1 B
+X PA1 M2 900 2300 200 L 50 50 1 1 B
+X PA4 M3 900 2000 200 L 50 50 1 1 B
+X PA7 M4 900 1700 200 L 50 50 1 1 B
+X PB0 M5 900 700 200 L 50 50 1 1 B
+X PB1 M6 900 600 200 L 50 50 1 1 B
 X PE7 M7 -900 0 200 R 50 50 1 1 B
-X PE8 L7 -900 -100 200 R 50 50 1 1 B
 X PE9 M8 -900 -200 200 R 50 50 1 1 B
-X PH0 F1 -900 1100 200 R 50 50 1 1 I
-X PH1 G1 -900 1000 200 R 50 50 1 1 I
-X PH3 A4 -900 900 200 R 50 50 1 1 B
-X VBAT E2 -300 2700 200 D 50 50 1 1 W
-X VDD C4 -200 2700 200 D 50 50 1 1 W
-X VDD G11 0 2700 200 D 50 50 1 1 W
-X VDD G12 100 2700 200 D 50 50 1 1 W
-X VDD G2 -100 2700 200 D 50 50 1 1 W
-X VDD H3 200 2700 200 D 50 50 1 1 W
-X VDDA M1 300 2700 200 D 50 50 1 1 W
-X VDDUSB C11 400 2700 200 D 50 50 1 1 W
-X VREF+ L1 -900 2200 200 R 50 50 1 1 B
-X VREF- K1 -900 2100 200 R 50 50 1 1 W
-X VSS D3 -200 -2800 200 U 50 50 1 1 W
-X VSS E3 -100 -2800 200 U 50 50 1 1 W
-X VSS F11 100 -2800 200 U 50 50 1 1 W
-X VSS F12 200 -2800 200 U 50 50 1 1 W
-X VSS F2 0 -2800 200 U 50 50 1 1 W
-X VSSA J1 300 -2800 200 U 50 50 1 1 W
+X PE11 M9 -900 -400 200 R 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
@@ -2646,106 +2646,106 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -700 -2600 700 2500 0 1 10 f
+X PE2 1 -900 500 200 R 50 50 1 1 B
+X VSS 10 -200 -2800 200 U 50 50 1 1 W
+X VDD 100 300 2700 200 D 50 50 1 1 W
+X VDD 11 -200 2700 200 D 50 50 1 1 W
+X PH0 12 -900 1100 200 R 50 50 1 1 I
+X PH1 13 -900 1000 200 R 50 50 1 1 I
 X NRST 14 -900 2400 200 R 50 50 1 1 I
+X PC0 15 900 -1000 200 L 50 50 1 1 B
+X PC1 16 900 -1100 200 L 50 50 1 1 B
+X PC2 17 900 -1200 200 L 50 50 1 1 B
+X PC3 18 900 -1300 200 L 50 50 1 1 B
+X VSSA 19 300 -2800 200 U 50 50 1 1 W
+X PE3 2 -900 400 200 R 50 50 1 1 B
+X VREF- 20 -900 2100 200 R 50 50 1 1 W
+X VREF+ 21 -900 2200 200 R 50 50 1 1 B
+X VDDA 22 400 2700 200 D 50 50 1 1 W
 X PA0 23 900 2400 200 L 50 50 1 1 B
 X PA1 24 900 2300 200 L 50 50 1 1 B
-X PA10 69 900 1400 200 L 50 50 1 1 B
-X PA11 70 900 1300 200 L 50 50 1 1 B
-X PA12 71 900 1200 200 L 50 50 1 1 B
-X PA13 72 900 1100 200 L 50 50 1 1 B
-X PA14 76 900 1000 200 L 50 50 1 1 B
-X PA15 77 900 900 200 L 50 50 1 1 B
 X PA2 25 900 2200 200 L 50 50 1 1 B
 X PA3 26 900 2100 200 L 50 50 1 1 B
+X VSS 27 -100 -2800 200 U 50 50 1 1 W
+X VDD 28 -100 2700 200 D 50 50 1 1 W
 X PA4 29 900 2000 200 L 50 50 1 1 B
+X PE4 3 -900 300 200 R 50 50 1 1 B
 X PA5 30 900 1900 200 L 50 50 1 1 B
 X PA6 31 900 1800 200 L 50 50 1 1 B
 X PA7 32 900 1700 200 L 50 50 1 1 B
-X PA8 67 900 1600 200 L 50 50 1 1 B
-X PA9 68 900 1500 200 L 50 50 1 1 B
+X PC4 33 900 -1400 200 L 50 50 1 1 B
+X PC5 34 900 -1500 200 L 50 50 1 1 B
 X PB0 35 900 700 200 L 50 50 1 1 B
 X PB1 36 900 600 200 L 50 50 1 1 B
+X PB2 37 900 500 200 L 50 50 1 1 B
+X PE7 38 -900 0 200 R 50 50 1 1 B
+X PE8 39 -900 -100 200 R 50 50 1 1 B
+X PE5 4 -900 200 200 R 50 50 1 1 B
+X PE9 40 -900 -200 200 R 50 50 1 1 B
+X PE10 41 -900 -300 200 R 50 50 1 1 B
+X PE11 42 -900 -400 200 R 50 50 1 1 B
+X PE12 43 -900 -500 200 R 50 50 1 1 B
+X PE13 44 -900 -600 200 R 50 50 1 1 B
+X PE14 45 -900 -700 200 R 50 50 1 1 B
+X PE15 46 -900 -800 200 R 50 50 1 1 B
 X PB10 47 900 -300 200 L 50 50 1 1 B
 X PB11 48 900 -400 200 L 50 50 1 1 B
+X VSS 49 0 -2800 200 U 50 50 1 1 W
+X PE6 5 -900 100 200 R 50 50 1 1 B
+X VDD 50 0 2700 200 D 50 50 1 1 W
 X PB12 51 900 -500 200 L 50 50 1 1 B
 X PB13 52 900 -600 200 L 50 50 1 1 B
 X PB14 53 900 -700 200 L 50 50 1 1 B
 X PB15 54 900 -800 200 L 50 50 1 1 B
-X PB2 37 900 500 200 L 50 50 1 1 B
-X PB3 89 900 400 200 L 50 50 1 1 B
-X PB4 90 900 300 200 L 50 50 1 1 B
-X PB5 91 900 200 200 L 50 50 1 1 B
-X PB6 92 900 100 200 L 50 50 1 1 B
-X PB7 93 900 0 200 L 50 50 1 1 B
-X PB8 95 900 -100 200 L 50 50 1 1 B
-X PB9 96 900 -200 200 L 50 50 1 1 B
-X PC0 15 900 -1000 200 L 50 50 1 1 B
-X PC1 16 900 -1100 200 L 50 50 1 1 B
-X PC10 78 900 -2000 200 L 50 50 1 1 B
-X PC11 79 900 -2100 200 L 50 50 1 1 B
-X PC12 80 900 -2200 200 L 50 50 1 1 B
-X PC13 7 900 -2300 200 L 50 50 1 1 B
-X PC14 8 900 -2400 200 L 50 50 1 1 B
-X PC15 9 900 -2500 200 L 50 50 1 1 B
-X PC2 17 900 -1200 200 L 50 50 1 1 B
-X PC3 18 900 -1300 200 L 50 50 1 1 B
-X PC4 33 900 -1400 200 L 50 50 1 1 B
-X PC5 34 900 -1500 200 L 50 50 1 1 B
-X PC6 63 900 -1600 200 L 50 50 1 1 B
-X PC7 64 900 -1700 200 L 50 50 1 1 B
-X PC8 65 900 -1800 200 L 50 50 1 1 B
-X PC9 66 900 -1900 200 L 50 50 1 1 B
-X PD0 81 -900 -1000 200 R 50 50 1 1 B
-X PD1 82 -900 -1100 200 R 50 50 1 1 B
+X PD8 55 -900 -1800 200 R 50 50 1 1 B
+X PD9 56 -900 -1900 200 R 50 50 1 1 B
 X PD10 57 -900 -2000 200 R 50 50 1 1 B
 X PD11 58 -900 -2100 200 R 50 50 1 1 B
 X PD12 59 -900 -2200 200 R 50 50 1 1 B
+X VBAT 6 -300 2700 200 D 50 50 1 1 W
 X PD13 60 -900 -2300 200 R 50 50 1 1 B
 X PD14 61 -900 -2400 200 R 50 50 1 1 B
 X PD15 62 -900 -2500 200 R 50 50 1 1 B
+X PC6 63 900 -1600 200 L 50 50 1 1 B
+X PC7 64 900 -1700 200 L 50 50 1 1 B
+X PC8 65 900 -1800 200 L 50 50 1 1 B
+X PC9 66 900 -1900 200 L 50 50 1 1 B
+X PA8 67 900 1600 200 L 50 50 1 1 B
+X PA9 68 900 1500 200 L 50 50 1 1 B
+X PA10 69 900 1400 200 L 50 50 1 1 B
+X PC13 7 900 -2300 200 L 50 50 1 1 B
+X PA11 70 900 1300 200 L 50 50 1 1 B
+X PA12 71 900 1200 200 L 50 50 1 1 B
+X PA13 72 900 1100 200 L 50 50 1 1 B
+X VDD 73 100 2700 200 D 50 50 1 1 W
+X VSS 74 100 -2800 200 U 50 50 1 1 W
+X VDD 75 200 2700 200 D 50 50 1 1 W
+X PA14 76 900 1000 200 L 50 50 1 1 B
+X PA15 77 900 900 200 L 50 50 1 1 B
+X PC10 78 900 -2000 200 L 50 50 1 1 B
+X PC11 79 900 -2100 200 L 50 50 1 1 B
+X PC14 8 900 -2400 200 L 50 50 1 1 B
+X PC12 80 900 -2200 200 L 50 50 1 1 B
+X PD0 81 -900 -1000 200 R 50 50 1 1 B
+X PD1 82 -900 -1100 200 R 50 50 1 1 B
 X PD2 83 -900 -1200 200 R 50 50 1 1 B
 X PD3 84 -900 -1300 200 R 50 50 1 1 B
 X PD4 85 -900 -1400 200 R 50 50 1 1 B
 X PD5 86 -900 -1500 200 R 50 50 1 1 B
 X PD6 87 -900 -1600 200 R 50 50 1 1 B
 X PD7 88 -900 -1700 200 R 50 50 1 1 B
-X PD8 55 -900 -1800 200 R 50 50 1 1 B
-X PD9 56 -900 -1900 200 R 50 50 1 1 B
+X PB3 89 900 400 200 L 50 50 1 1 B
+X PC15 9 900 -2500 200 L 50 50 1 1 B
+X PB4 90 900 300 200 L 50 50 1 1 B
+X PB5 91 900 200 200 L 50 50 1 1 B
+X PB6 92 900 100 200 L 50 50 1 1 B
+X PB7 93 900 0 200 L 50 50 1 1 B
+X PH3 94 -900 900 200 R 50 50 1 1 B
+X PB8 95 900 -100 200 L 50 50 1 1 B
+X PB9 96 900 -200 200 L 50 50 1 1 B
 X PE0 97 -900 700 200 R 50 50 1 1 B
 X PE1 98 -900 600 200 R 50 50 1 1 B
-X PE10 41 -900 -300 200 R 50 50 1 1 B
-X PE11 42 -900 -400 200 R 50 50 1 1 B
-X PE12 43 -900 -500 200 R 50 50 1 1 B
-X PE13 44 -900 -600 200 R 50 50 1 1 B
-X PE14 45 -900 -700 200 R 50 50 1 1 B
-X PE15 46 -900 -800 200 R 50 50 1 1 B
-X PE2 1 -900 500 200 R 50 50 1 1 B
-X PE3 2 -900 400 200 R 50 50 1 1 B
-X PE4 3 -900 300 200 R 50 50 1 1 B
-X PE5 4 -900 200 200 R 50 50 1 1 B
-X PE6 5 -900 100 200 R 50 50 1 1 B
-X PE7 38 -900 0 200 R 50 50 1 1 B
-X PE8 39 -900 -100 200 R 50 50 1 1 B
-X PE9 40 -900 -200 200 R 50 50 1 1 B
-X PH0 12 -900 1100 200 R 50 50 1 1 I
-X PH1 13 -900 1000 200 R 50 50 1 1 I
-X PH3 94 -900 900 200 R 50 50 1 1 B
-X VBAT 6 -300 2700 200 D 50 50 1 1 W
-X VDD 100 200 2700 200 D 50 50 1 1 W
-X VDD 11 -200 2700 200 D 50 50 1 1 W
-X VDD 28 -100 2700 200 D 50 50 1 1 W
-X VDD 50 0 2700 200 D 50 50 1 1 W
-X VDD 75 100 2700 200 D 50 50 1 1 W
-X VDDA 22 300 2700 200 D 50 50 1 1 W
-X VDDUSB 73 400 2700 200 D 50 50 1 1 W
-X VREF+ 21 -900 2200 200 R 50 50 1 1 B
-X VREF- 20 -900 2100 200 R 50 50 1 1 W
-X VSS 10 -200 -2800 200 U 50 50 1 1 W
-X VSS 27 -100 -2800 200 U 50 50 1 1 W
-X VSS 49 0 -2800 200 U 50 50 1 1 W
-X VSS 74 100 -2800 200 U 50 50 1 1 W
 X VSS 99 200 -2800 200 U 50 50 1 1 W
-X VSSA 19 300 -2800 200 U 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
@@ -2762,55 +2762,55 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -500 -1400 500 1300 0 1 10 f
-X NRST 7 -600 1200 100 R 50 50 1 1 I
+X VBAT 1 -200 1400 100 D 50 50 1 1 W
 X PA0 10 600 200 100 L 50 50 1 1 B
 X PA1 11 600 100 100 L 50 50 1 1 B
-X PA10 31 600 -800 100 L 50 50 1 1 B
-X PA11 32 600 -900 100 L 50 50 1 1 B
-X PA12 33 600 -1000 100 L 50 50 1 1 B
-X PA13 34 600 -1100 100 L 50 50 1 1 B
-X PA14 37 600 -1200 100 L 50 50 1 1 B
-X PA15 38 600 -1300 100 L 50 50 1 1 B
 X PA2 12 600 0 100 L 50 50 1 1 B
 X PA3 13 600 -100 100 L 50 50 1 1 B
 X PA4 14 600 -200 100 L 50 50 1 1 B
 X PA5 15 600 -300 100 L 50 50 1 1 B
 X PA6 16 600 -400 100 L 50 50 1 1 B
 X PA7 17 600 -500 100 L 50 50 1 1 B
-X PA8 29 600 -600 100 L 50 50 1 1 B
-X PA9 30 600 -700 100 L 50 50 1 1 B
 X PB0 18 -600 200 100 R 50 50 1 1 B
 X PB1 19 -600 100 100 R 50 50 1 1 B
+X PC13 2 -600 600 100 R 50 50 1 1 B
+X PB2 20 -600 0 100 R 50 50 1 1 B
 X PB10 21 -600 -800 100 R 50 50 1 1 B
 X PB11 22 -600 -900 100 R 50 50 1 1 B
+X VSS 23 -200 -1500 100 U 50 50 1 1 W
+X VDD 24 -100 1400 100 D 50 50 1 1 W
 X PB12 25 -600 -1000 100 R 50 50 1 1 B
 X PB13 26 -600 -1100 100 R 50 50 1 1 B
 X PB14 27 -600 -1200 100 R 50 50 1 1 B
 X PB15 28 -600 -1300 100 R 50 50 1 1 B
-X PB2 20 -600 0 100 R 50 50 1 1 B
+X PA8 29 600 -600 100 L 50 50 1 1 B
+X PC14 3 -600 500 100 R 50 50 1 1 B
+X PA9 30 600 -700 100 L 50 50 1 1 B
+X PA10 31 600 -800 100 L 50 50 1 1 B
+X PA11 32 600 -900 100 L 50 50 1 1 B
+X PA12 33 600 -1000 100 L 50 50 1 1 B
+X PA13 34 600 -1100 100 L 50 50 1 1 B
+X VSS 35 -100 -1500 100 U 50 50 1 1 W
+X VDDUSB 36 200 1400 100 D 50 50 1 1 W
+X PA14 37 600 -1200 100 L 50 50 1 1 B
+X PA15 38 600 -1300 100 L 50 50 1 1 B
 X PB3 39 -600 -100 100 R 50 50 1 1 B
+X PC15 4 -600 400 100 R 50 50 1 1 B
 X PB4 40 -600 -200 100 R 50 50 1 1 B
 X PB5 41 -600 -300 100 R 50 50 1 1 B
 X PB6 42 -600 -400 100 R 50 50 1 1 B
 X PB7 43 -600 -500 100 R 50 50 1 1 B
+X PH3 44 -600 800 100 R 50 50 1 1 B
 X PB8 45 -600 -600 100 R 50 50 1 1 B
 X PB9 46 -600 -700 100 R 50 50 1 1 B
-X PC13 2 -600 600 100 R 50 50 1 1 B
-X PC14 3 -600 500 100 R 50 50 1 1 B
-X PC15 4 -600 400 100 R 50 50 1 1 B
-X PH0 5 -600 1000 100 R 50 50 1 1 I
-X PH1 6 -600 900 100 R 50 50 1 1 I
-X PH3 44 -600 800 100 R 50 50 1 1 B
-X VBAT 1 -200 1400 100 D 50 50 1 1 W
-X VDD 24 -100 1400 100 D 50 50 1 1 W
-X VDD 48 0 1400 100 D 50 50 1 1 W
-X VDDA 9 100 1400 100 D 50 50 1 1 W
-X VDDUSB 36 200 1400 100 D 50 50 1 1 W
-X VSS 23 -200 -1500 100 U 50 50 1 1 W
-X VSS 35 -100 -1500 100 U 50 50 1 1 W
 X VSS 47 0 -1500 100 U 50 50 1 1 W
+X VDD 48 0 1400 100 D 50 50 1 1 W
 X VSS 49 100 -1500 100 U 50 50 1 1 W
+X PH0 5 -600 1000 100 R 50 50 1 1 I
+X PH1 6 -600 900 100 R 50 50 1 1 I
+X NRST 7 -600 1200 100 R 50 50 1 1 I
 X VSSA 8 200 -1500 100 U 50 50 1 1 W
+X VDDA 9 100 1400 100 D 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
@@ -2827,70 +2827,70 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -600 -1700 500 1700 0 1 10 f
-X NRST E1 -700 1600 100 R 50 50 1 1 I
-X PA0 G2 600 1600 100 L 50 50 1 1 B
-X PA1 H2 600 1500 100 L 50 50 1 1 B
-X PA10 C6 600 600 100 L 50 50 1 1 B
-X PA11 C8 600 500 100 L 50 50 1 1 B
-X PA12 B8 600 400 100 L 50 50 1 1 B
-X PA13 A8 600 300 100 L 50 50 1 1 B
-X PA14 A7 600 200 100 L 50 50 1 1 B
-X PA15 A6 600 100 100 L 50 50 1 1 B
-X PA2 F3 600 1400 100 L 50 50 1 1 B
-X PA3 G3 600 1300 100 L 50 50 1 1 B
-X PA4 H3 600 1200 100 L 50 50 1 1 B
-X PA5 F4 600 1100 100 L 50 50 1 1 B
-X PA6 G4 600 1000 100 L 50 50 1 1 B
-X PA7 H4 600 900 100 L 50 50 1 1 B
-X PA8 D7 600 800 100 L 50 50 1 1 B
-X PA9 C7 600 700 100 L 50 50 1 1 B
-X PB0 F5 600 -100 100 L 50 50 1 1 B
-X PB1 G5 600 -200 100 L 50 50 1 1 B
-X PB10 G7 600 -1100 100 L 50 50 1 1 B
-X PB11 H7 600 -1200 100 L 50 50 1 1 B
-X PB12 H8 600 -1300 100 L 50 50 1 1 B
-X PB13 G8 600 -1400 100 L 50 50 1 1 B
-X PB14 F8 600 -1500 100 L 50 50 1 1 B
-X PB15 F7 600 -1600 100 L 50 50 1 1 B
-X PB2 G6 600 -300 100 L 50 50 1 1 B
-X PB3 A5 600 -400 100 L 50 50 1 1 B
-X PB4 A4 600 -500 100 L 50 50 1 1 B
-X PB5 C4 600 -600 100 L 50 50 1 1 B
-X PB6 D3 600 -700 100 L 50 50 1 1 B
-X PB7 C3 600 -800 100 L 50 50 1 1 B
-X PB8 B3 600 -900 100 L 50 50 1 1 B
-X PB9 A3 600 -1000 100 L 50 50 1 1 B
-X PC0 E3 -700 -100 100 R 50 50 1 1 B
-X PC1 E2 -700 -200 100 R 50 50 1 1 B
-X PC10 B7 -700 -1100 100 R 50 50 1 1 B
-X PC11 B6 -700 -1200 100 R 50 50 1 1 B
-X PC12 C5 -700 -1300 100 R 50 50 1 1 B
-X PC13 A2 -700 -1400 100 R 50 50 1 1 B
 X PC14 A1 -700 -1500 100 R 50 50 1 1 B
+X PC13 A2 -700 -1400 100 R 50 50 1 1 B
+X PB9 A3 600 -1000 100 L 50 50 1 1 B
+X PB4 A4 600 -500 100 L 50 50 1 1 B
+X PB3 A5 600 -400 100 L 50 50 1 1 B
+X PA15 A6 600 100 100 L 50 50 1 1 B
+X PA14 A7 600 200 100 L 50 50 1 1 B
+X PA13 A8 600 300 100 L 50 50 1 1 B
 X PC15 B1 -700 -1600 100 R 50 50 1 1 B
-X PC2 F2 -700 -300 100 R 50 50 1 1 B
-X PC3 G1 -700 -400 100 R 50 50 1 1 B
-X PC4 H5 -700 -500 100 R 50 50 1 1 B
-X PC5 H6 -700 -600 100 R 50 50 1 1 B
-X PC6 F6 -700 -700 100 R 50 50 1 1 B
-X PC7 E7 -700 -800 100 R 50 50 1 1 B
-X PC8 E8 -700 -900 100 R 50 50 1 1 B
-X PC9 D8 -700 -1000 100 R 50 50 1 1 B
+X VBAT B2 -300 1800 100 D 50 50 1 1 W
+X PB8 B3 600 -900 100 L 50 50 1 1 B
+X PH3 B4 -700 300 100 R 50 50 1 1 B
 X PD2 B5 -700 100 100 R 50 50 1 1 B
+X PC11 B6 -700 -1200 100 R 50 50 1 1 B
+X PC10 B7 -700 -1100 100 R 50 50 1 1 B
+X PA12 B8 600 400 100 L 50 50 1 1 B
 X PH0 C1 -700 500 100 R 50 50 1 1 I
+X VSS C2 -300 -1800 100 U 50 50 1 1 W
+X PB7 C3 600 -800 100 L 50 50 1 1 B
+X PB5 C4 600 -600 100 L 50 50 1 1 B
+X PC12 C5 -700 -1300 100 R 50 50 1 1 B
+X PA10 C6 600 600 100 L 50 50 1 1 B
+X PA9 C7 600 700 100 L 50 50 1 1 B
+X PA11 C8 600 500 100 L 50 50 1 1 B
 X PH1 D1 -700 400 100 R 50 50 1 1 I
-X PH3 B4 -700 300 100 R 50 50 1 1 B
-X VBAT B2 -300 1800 100 D 50 50 1 1 W
 X VDD D2 -200 1800 100 D 50 50 1 1 W
-X VDD E4 -100 1800 100 D 50 50 1 1 W
-X VDD E6 0 1800 100 D 50 50 1 1 W
-X VDDA H1 100 1800 100 D 50 50 1 1 W
-X VDDUSB E5 200 1800 100 D 50 50 1 1 W
-X VSS C2 -300 -1800 100 U 50 50 1 1 W
+X PB6 D3 600 -700 100 L 50 50 1 1 B
 X VSS D4 -200 -1800 100 U 50 50 1 1 W
 X VSS D5 -100 -1800 100 U 50 50 1 1 W
 X VSS D6 0 -1800 100 U 50 50 1 1 W
+X PA8 D7 600 800 100 L 50 50 1 1 B
+X PC9 D8 -700 -1000 100 R 50 50 1 1 B
+X NRST E1 -700 1600 100 R 50 50 1 1 I
+X PC1 E2 -700 -200 100 R 50 50 1 1 B
+X PC0 E3 -700 -100 100 R 50 50 1 1 B
+X VDD E4 -100 1800 100 D 50 50 1 1 W
+X VDDUSB E5 200 1800 100 D 50 50 1 1 W
+X VDD E6 0 1800 100 D 50 50 1 1 W
+X PC7 E7 -700 -800 100 R 50 50 1 1 B
+X PC8 E8 -700 -900 100 R 50 50 1 1 B
 X VSSA F1 100 -1800 100 U 50 50 1 1 W
+X PC2 F2 -700 -300 100 R 50 50 1 1 B
+X PA2 F3 600 1400 100 L 50 50 1 1 B
+X PA5 F4 600 1100 100 L 50 50 1 1 B
+X PB0 F5 600 -100 100 L 50 50 1 1 B
+X PC6 F6 -700 -700 100 R 50 50 1 1 B
+X PB15 F7 600 -1600 100 L 50 50 1 1 B
+X PB14 F8 600 -1500 100 L 50 50 1 1 B
+X PC3 G1 -700 -400 100 R 50 50 1 1 B
+X PA0 G2 600 1600 100 L 50 50 1 1 B
+X PA3 G3 600 1300 100 L 50 50 1 1 B
+X PA6 G4 600 1000 100 L 50 50 1 1 B
+X PB1 G5 600 -200 100 L 50 50 1 1 B
+X PB2 G6 600 -300 100 L 50 50 1 1 B
+X PB10 G7 600 -1100 100 L 50 50 1 1 B
+X PB13 G8 600 -1400 100 L 50 50 1 1 B
+X VDDA H1 100 1800 100 D 50 50 1 1 W
+X PA1 H2 600 1500 100 L 50 50 1 1 B
+X PA4 H3 600 1200 100 L 50 50 1 1 B
+X PA7 H4 600 900 100 L 50 50 1 1 B
+X PC4 H5 -700 -500 100 R 50 50 1 1 B
+X PC5 H6 -700 -600 100 R 50 50 1 1 B
+X PB11 H7 600 -1200 100 L 50 50 1 1 B
+X PB12 H8 600 -1300 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
@@ -2907,70 +2907,70 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -600 -1700 500 1700 0 1 10 f
-X NRST 7 -700 1600 100 R 50 50 1 1 I
+X VBAT 1 -300 1800 100 D 50 50 1 1 W
+X PC2 10 -700 -300 100 R 50 50 1 1 B
+X PC3 11 -700 -400 100 R 50 50 1 1 B
+X VSSA 12 100 -1800 100 U 50 50 1 1 W
+X VDDA 13 100 1800 100 D 50 50 1 1 W
 X PA0 14 600 1600 100 L 50 50 1 1 B
 X PA1 15 600 1500 100 L 50 50 1 1 B
-X PA10 43 600 600 100 L 50 50 1 1 B
-X PA11 44 600 500 100 L 50 50 1 1 B
-X PA12 45 600 400 100 L 50 50 1 1 B
-X PA13 46 600 300 100 L 50 50 1 1 B
-X PA14 49 600 200 100 L 50 50 1 1 B
-X PA15 50 600 100 100 L 50 50 1 1 B
 X PA2 16 600 1400 100 L 50 50 1 1 B
 X PA3 17 600 1300 100 L 50 50 1 1 B
+X VSS 18 -300 -1800 100 U 50 50 1 1 W
+X VDD 19 -200 1800 100 D 50 50 1 1 W
+X PC13 2 -700 -1400 100 R 50 50 1 1 B
 X PA4 20 600 1200 100 L 50 50 1 1 B
 X PA5 21 600 1100 100 L 50 50 1 1 B
 X PA6 22 600 1000 100 L 50 50 1 1 B
 X PA7 23 600 900 100 L 50 50 1 1 B
-X PA8 41 600 800 100 L 50 50 1 1 B
-X PA9 42 600 700 100 L 50 50 1 1 B
+X PC4 24 -700 -500 100 R 50 50 1 1 B
+X PC5 25 -700 -600 100 R 50 50 1 1 B
 X PB0 26 600 -100 100 L 50 50 1 1 B
 X PB1 27 600 -200 100 L 50 50 1 1 B
+X PB2 28 600 -300 100 L 50 50 1 1 B
 X PB10 29 600 -1100 100 L 50 50 1 1 B
+X PC14 3 -700 -1500 100 R 50 50 1 1 B
 X PB11 30 600 -1200 100 L 50 50 1 1 B
+X VSS 31 -200 -1800 100 U 50 50 1 1 W
+X VDD 32 -100 1800 100 D 50 50 1 1 W
 X PB12 33 600 -1300 100 L 50 50 1 1 B
 X PB13 34 600 -1400 100 L 50 50 1 1 B
 X PB14 35 600 -1500 100 L 50 50 1 1 B
 X PB15 36 600 -1600 100 L 50 50 1 1 B
-X PB2 28 600 -300 100 L 50 50 1 1 B
+X PC6 37 -700 -700 100 R 50 50 1 1 B
+X PC7 38 -700 -800 100 R 50 50 1 1 B
+X PC8 39 -700 -900 100 R 50 50 1 1 B
+X PC15 4 -700 -1600 100 R 50 50 1 1 B
+X PC9 40 -700 -1000 100 R 50 50 1 1 B
+X PA8 41 600 800 100 L 50 50 1 1 B
+X PA9 42 600 700 100 L 50 50 1 1 B
+X PA10 43 600 600 100 L 50 50 1 1 B
+X PA11 44 600 500 100 L 50 50 1 1 B
+X PA12 45 600 400 100 L 50 50 1 1 B
+X PA13 46 600 300 100 L 50 50 1 1 B
+X VSS 47 -100 -1800 100 U 50 50 1 1 W
+X VDDUSB 48 200 1800 100 D 50 50 1 1 W
+X PA14 49 600 200 100 L 50 50 1 1 B
+X PH0 5 -700 500 100 R 50 50 1 1 I
+X PA15 50 600 100 100 L 50 50 1 1 B
+X PC10 51 -700 -1100 100 R 50 50 1 1 B
+X PC11 52 -700 -1200 100 R 50 50 1 1 B
+X PC12 53 -700 -1300 100 R 50 50 1 1 B
+X PD2 54 -700 100 100 R 50 50 1 1 B
 X PB3 55 600 -400 100 L 50 50 1 1 B
 X PB4 56 600 -500 100 L 50 50 1 1 B
 X PB5 57 600 -600 100 L 50 50 1 1 B
 X PB6 58 600 -700 100 L 50 50 1 1 B
 X PB7 59 600 -800 100 L 50 50 1 1 B
+X PH1 6 -700 400 100 R 50 50 1 1 I
+X PH3 60 -700 300 100 R 50 50 1 1 B
 X PB8 61 600 -900 100 L 50 50 1 1 B
 X PB9 62 600 -1000 100 L 50 50 1 1 B
+X VSS 63 0 -1800 100 U 50 50 1 1 W
+X VDD 64 0 1800 100 D 50 50 1 1 W
+X NRST 7 -700 1600 100 R 50 50 1 1 I
 X PC0 8 -700 -100 100 R 50 50 1 1 B
 X PC1 9 -700 -200 100 R 50 50 1 1 B
-X PC10 51 -700 -1100 100 R 50 50 1 1 B
-X PC11 52 -700 -1200 100 R 50 50 1 1 B
-X PC12 53 -700 -1300 100 R 50 50 1 1 B
-X PC13 2 -700 -1400 100 R 50 50 1 1 B
-X PC14 3 -700 -1500 100 R 50 50 1 1 B
-X PC15 4 -700 -1600 100 R 50 50 1 1 B
-X PC2 10 -700 -300 100 R 50 50 1 1 B
-X PC3 11 -700 -400 100 R 50 50 1 1 B
-X PC4 24 -700 -500 100 R 50 50 1 1 B
-X PC5 25 -700 -600 100 R 50 50 1 1 B
-X PC6 37 -700 -700 100 R 50 50 1 1 B
-X PC7 38 -700 -800 100 R 50 50 1 1 B
-X PC8 39 -700 -900 100 R 50 50 1 1 B
-X PC9 40 -700 -1000 100 R 50 50 1 1 B
-X PD2 54 -700 100 100 R 50 50 1 1 B
-X PH0 5 -700 500 100 R 50 50 1 1 I
-X PH1 6 -700 400 100 R 50 50 1 1 I
-X PH3 60 -700 300 100 R 50 50 1 1 B
-X VBAT 1 -300 1800 100 D 50 50 1 1 W
-X VDD 19 -200 1800 100 D 50 50 1 1 W
-X VDD 32 -100 1800 100 D 50 50 1 1 W
-X VDD 64 0 1800 100 D 50 50 1 1 W
-X VDDA 13 100 1800 100 D 50 50 1 1 W
-X VDDUSB 48 200 1800 100 D 50 50 1 1 W
-X VSS 18 -300 -1800 100 U 50 50 1 1 W
-X VSS 31 -200 -1800 100 U 50 50 1 1 W
-X VSS 47 -100 -1800 100 U 50 50 1 1 W
-X VSS 63 0 -1800 100 U 50 50 1 1 W
-X VSSA 12 100 -1800 100 U 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
@@ -2987,70 +2987,70 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -600 -1700 600 1700 0 1 10 f
-X NRST F8 -700 1600 100 R 50 50 1 1 I
-X PA0 H8 700 1600 100 L 50 50 1 1 B
-X PA1 E6 700 1500 100 L 50 50 1 1 B
-X PA10 C1 700 600 100 L 50 50 1 1 B
-X PA11 D2 700 500 100 L 50 50 1 1 B
-X PA12 D3 700 400 100 L 50 50 1 1 B
-X PA13 C2 700 300 100 L 50 50 1 1 B
-X PA14 C3 700 200 100 L 50 50 1 1 B
+X VDDUSB A1 300 1800 100 D 50 50 1 1 W
 X PA15 A2 700 100 100 L 50 50 1 1 B
-X PA2 G7 700 1400 100 L 50 50 1 1 B
-X PA3 F6 700 1300 100 L 50 50 1 1 B
-X PA4 G6 700 1200 100 L 50 50 1 1 B
-X PA5 F5 700 1100 100 L 50 50 1 1 B
-X PA6 H6 700 1000 100 L 50 50 1 1 B
-X PA7 E5 700 900 100 L 50 50 1 1 B
-X PA8 E3 700 800 100 L 50 50 1 1 B
-X PA9 D1 700 700 100 L 50 50 1 1 B
-X PB0 H5 700 -100 100 L 50 50 1 1 B
-X PB1 F4 700 -200 100 L 50 50 1 1 B
-X PB10 H4 700 -1100 100 L 50 50 1 1 B
-X PB11 H3 700 -1200 100 L 50 50 1 1 B
-X PB12 G3 700 -1300 100 L 50 50 1 1 B
-X PB13 G2 700 -1400 100 L 50 50 1 1 B
-X PB14 G1 700 -1500 100 L 50 50 1 1 B
-X PB15 F1 700 -1600 100 L 50 50 1 1 B
-X PB2 G4 700 -300 100 L 50 50 1 1 B
-X PB3 B4 700 -400 100 L 50 50 1 1 B
+X PC12 A3 -700 -1300 100 R 50 50 1 1 B
 X PB4 A4 700 -500 100 L 50 50 1 1 B
-X PB5 C5 700 -600 100 L 50 50 1 1 B
-X PB6 B5 700 -700 100 L 50 50 1 1 B
 X PB7 A5 700 -800 100 L 50 50 1 1 B
 X PB8 A6 700 -900 100 L 50 50 1 1 B
-X PB9 C6 700 -1000 100 L 50 50 1 1 B
-X PC0 D7 -700 -100 100 R 50 50 1 1 B
-X PC1 D5 -700 -200 100 R 50 50 1 1 B
-X PC10 D4 -700 -1100 100 R 50 50 1 1 B
+X VSS A7 -200 -1800 100 U 50 50 1 1 W
+X VDD A8 -200 1800 100 D 50 50 1 1 W
+X VSS B1 -100 -1800 100 U 50 50 1 1 W
+X VDD B2 -100 1800 100 D 50 50 1 1 W
 X PC11 B3 -700 -1200 100 R 50 50 1 1 B
-X PC12 A3 -700 -1300 100 R 50 50 1 1 B
+X PB3 B4 700 -400 100 L 50 50 1 1 B
+X PB6 B5 700 -700 100 L 50 50 1 1 B
+X PH3 B6 -700 300 100 R 50 50 1 1 B
+X VBAT B7 -300 1800 100 D 50 50 1 1 W
 X PC13 B8 -700 -1400 100 R 50 50 1 1 B
-X PC14 C8 -700 -1500 100 R 50 50 1 1 B
+X PA10 C1 700 600 100 L 50 50 1 1 B
+X PA13 C2 700 300 100 L 50 50 1 1 B
+X PA14 C3 700 200 100 L 50 50 1 1 B
+X PD2 C4 -700 100 100 R 50 50 1 1 B
+X PB5 C5 700 -600 100 L 50 50 1 1 B
+X PB9 C6 700 -1000 100 L 50 50 1 1 B
 X PC15 C7 -700 -1600 100 R 50 50 1 1 B
+X PC14 C8 -700 -1500 100 R 50 50 1 1 B
+X PA9 D1 700 700 100 L 50 50 1 1 B
+X PA11 D2 700 500 100 L 50 50 1 1 B
+X PA12 D3 700 400 100 L 50 50 1 1 B
+X PC10 D4 -700 -1100 100 R 50 50 1 1 B
+X PC1 D5 -700 -200 100 R 50 50 1 1 B
 X PC2 D6 -700 -300 100 R 50 50 1 1 B
-X PC3 E7 -700 -400 100 R 50 50 1 1 B
-X PC4 E4 -700 -500 100 R 50 50 1 1 B
-X PC5 G5 -700 -600 100 R 50 50 1 1 B
-X PC6 F2 -700 -700 100 R 50 50 1 1 B
+X PC0 D7 -700 -100 100 R 50 50 1 1 B
+X PH0 D8 -700 500 100 R 50 50 1 1 I
 X PC7 E1 -700 -800 100 R 50 50 1 1 B
-X PC8 F3 -700 -900 100 R 50 50 1 1 B
 X PC9 E2 -700 -1000 100 R 50 50 1 1 B
-X PD2 C4 -700 100 100 R 50 50 1 1 B
-X PH0 D8 -700 500 100 R 50 50 1 1 I
+X PA8 E3 700 800 100 L 50 50 1 1 B
+X PC4 E4 -700 -500 100 R 50 50 1 1 B
+X PA7 E5 700 900 100 L 50 50 1 1 B
+X PA1 E6 700 1500 100 L 50 50 1 1 B
+X PC3 E7 -700 -400 100 R 50 50 1 1 B
 X PH1 E8 -700 400 100 R 50 50 1 1 I
-X PH3 B6 -700 300 100 R 50 50 1 1 B
-X VBAT B7 -300 1800 100 D 50 50 1 1 W
-X VDD A8 -200 1800 100 D 50 50 1 1 W
-X VDD B2 -100 1800 100 D 50 50 1 1 W
-X VDD H1 0 1800 100 D 50 50 1 1 W
-X VDD H7 100 1800 100 D 50 50 1 1 W
+X PB15 F1 700 -1600 100 L 50 50 1 1 B
+X PC6 F2 -700 -700 100 R 50 50 1 1 B
+X PC8 F3 -700 -900 100 R 50 50 1 1 B
+X PB1 F4 700 -200 100 L 50 50 1 1 B
+X PA5 F5 700 1100 100 L 50 50 1 1 B
+X PA3 F6 700 1300 100 L 50 50 1 1 B
 X VDDA F7 200 1800 100 D 50 50 1 1 W
-X VDDUSB A1 300 1800 100 D 50 50 1 1 W
-X VSS A7 -200 -1800 100 U 50 50 1 1 W
-X VSS B1 -100 -1800 100 U 50 50 1 1 W
-X VSS H2 0 -1800 100 U 50 50 1 1 W
+X NRST F8 -700 1600 100 R 50 50 1 1 I
+X PB14 G1 700 -1500 100 L 50 50 1 1 B
+X PB13 G2 700 -1400 100 L 50 50 1 1 B
+X PB12 G3 700 -1300 100 L 50 50 1 1 B
+X PB2 G4 700 -300 100 L 50 50 1 1 B
+X PC5 G5 -700 -600 100 R 50 50 1 1 B
+X PA4 G6 700 1200 100 L 50 50 1 1 B
+X PA2 G7 700 1400 100 L 50 50 1 1 B
 X VSSA G8 100 -1800 100 U 50 50 1 1 W
+X VDD H1 0 1800 100 D 50 50 1 1 W
+X VSS H2 0 -1800 100 U 50 50 1 1 W
+X PB11 H3 700 -1200 100 L 50 50 1 1 B
+X PB10 H4 700 -1100 100 L 50 50 1 1 B
+X PB0 H5 700 -100 100 L 50 50 1 1 B
+X PA6 H6 700 1000 100 L 50 50 1 1 B
+X VDD H7 100 1800 100 D 50 50 1 1 W
+X PA0 H8 700 1600 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
@@ -3066,70 +3066,70 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -700 -1700 600 1700 0 1 10 f
-X NRST 7 -800 1600 100 R 50 50 1 1 I
+X VBAT 1 -400 1800 100 D 50 50 1 1 W
+X PC2 10 -800 -400 100 R 50 50 1 1 B
+X PC3 11 -800 -500 100 R 50 50 1 1 B
+X VSSA 12 100 -1800 100 U 50 50 1 1 W
+X VDDA 13 200 1800 100 D 50 50 1 1 W
 X PA0 14 700 1600 100 L 50 50 1 1 B
 X PA1 15 700 1500 100 L 50 50 1 1 B
-X PA10 43 700 600 100 L 50 50 1 1 B
-X PA11 44 700 500 100 L 50 50 1 1 B
-X PA12 45 700 400 100 L 50 50 1 1 B
-X PA13 46 700 300 100 L 50 50 1 1 B
-X PA14 49 700 200 100 L 50 50 1 1 B
-X PA15 50 700 100 100 L 50 50 1 1 B
 X PA2 16 700 1400 100 L 50 50 1 1 B
 X PA3 17 700 1300 100 L 50 50 1 1 B
+X VSS 18 -300 -1800 100 U 50 50 1 1 W
+X VDD 19 -300 1800 100 D 50 50 1 1 W
+X PC13 2 -800 -1400 100 R 50 50 1 1 B
 X PA4 20 700 1200 100 L 50 50 1 1 B
 X PA5 21 700 1100 100 L 50 50 1 1 B
 X PA6 22 700 1000 100 L 50 50 1 1 B
 X PA7 23 700 900 100 L 50 50 1 1 B
-X PA8 41 700 800 100 L 50 50 1 1 B
-X PA9 42 700 700 100 L 50 50 1 1 B
+X PC4 24 -800 -600 100 R 50 50 1 1 B
 X PB0 25 700 -100 100 L 50 50 1 1 B
 X PB1 26 700 -200 100 L 50 50 1 1 B
+X PB2 27 700 -300 100 L 50 50 1 1 B
 X PB10 28 700 -1100 100 L 50 50 1 1 B
 X PB11 29 700 -1200 100 L 50 50 1 1 B
+X PC14 3 -800 -1500 100 R 50 50 1 1 B
+X VDD12 30 0 1800 100 D 50 50 1 1 W
+X VSS 31 -200 -1800 100 U 50 50 1 1 W
+X VDD 32 -200 1800 100 D 50 50 1 1 W
 X PB12 33 700 -1300 100 L 50 50 1 1 B
 X PB13 34 700 -1400 100 L 50 50 1 1 B
 X PB14 35 700 -1500 100 L 50 50 1 1 B
 X PB15 36 700 -1600 100 L 50 50 1 1 B
-X PB2 27 700 -300 100 L 50 50 1 1 B
+X PC6 37 -800 -700 100 R 50 50 1 1 B
+X PC7 38 -800 -800 100 R 50 50 1 1 B
+X PC8 39 -800 -900 100 R 50 50 1 1 B
+X PC15 4 -800 -1600 100 R 50 50 1 1 B
+X PC9 40 -800 -1000 100 R 50 50 1 1 B
+X PA8 41 700 800 100 L 50 50 1 1 B
+X PA9 42 700 700 100 L 50 50 1 1 B
+X PA10 43 700 600 100 L 50 50 1 1 B
+X PA11 44 700 500 100 L 50 50 1 1 B
+X PA12 45 700 400 100 L 50 50 1 1 B
+X PA13 46 700 300 100 L 50 50 1 1 B
+X VSS 47 -100 -1800 100 U 50 50 1 1 W
+X VDDUSB 48 300 1800 100 D 50 50 1 1 W
+X PA14 49 700 200 100 L 50 50 1 1 B
+X PH0 5 -800 200 100 R 50 50 1 1 I
+X PA15 50 700 100 100 L 50 50 1 1 B
+X PC10 51 -800 -1100 100 R 50 50 1 1 B
+X PC11 52 -800 -1200 100 R 50 50 1 1 B
+X PC12 53 -800 -1300 100 R 50 50 1 1 B
 X PB3 54 700 -400 100 L 50 50 1 1 B
 X PB4 55 700 -500 100 L 50 50 1 1 B
 X PB5 56 700 -600 100 L 50 50 1 1 B
 X PB6 57 700 -700 100 L 50 50 1 1 B
 X PB7 58 700 -800 100 L 50 50 1 1 B
+X PH3 59 -800 0 100 R 50 50 1 1 B
+X PH1 6 -800 100 100 R 50 50 1 1 I
 X PB8 60 700 -900 100 L 50 50 1 1 B
 X PB9 61 700 -1000 100 L 50 50 1 1 B
-X PC0 8 -800 -200 100 R 50 50 1 1 B
-X PC1 9 -800 -300 100 R 50 50 1 1 B
-X PC10 51 -800 -1100 100 R 50 50 1 1 B
-X PC11 52 -800 -1200 100 R 50 50 1 1 B
-X PC12 53 -800 -1300 100 R 50 50 1 1 B
-X PC13 2 -800 -1400 100 R 50 50 1 1 B
-X PC14 3 -800 -1500 100 R 50 50 1 1 B
-X PC15 4 -800 -1600 100 R 50 50 1 1 B
-X PC2 10 -800 -400 100 R 50 50 1 1 B
-X PC3 11 -800 -500 100 R 50 50 1 1 B
-X PC4 24 -800 -600 100 R 50 50 1 1 B
-X PC6 37 -800 -700 100 R 50 50 1 1 B
-X PC7 38 -800 -800 100 R 50 50 1 1 B
-X PC8 39 -800 -900 100 R 50 50 1 1 B
-X PC9 40 -800 -1000 100 R 50 50 1 1 B
-X PH0 5 -800 200 100 R 50 50 1 1 I
-X PH1 6 -800 100 100 R 50 50 1 1 I
-X PH3 59 -800 0 100 R 50 50 1 1 B
-X VBAT 1 -400 1800 100 D 50 50 1 1 W
-X VDD 19 -300 1800 100 D 50 50 1 1 W
-X VDD 32 -200 1800 100 D 50 50 1 1 W
-X VDD 64 -100 1800 100 D 50 50 1 1 W
-X VDD12 30 0 1800 100 D 50 50 1 1 W
 X VDD12 62 100 1800 100 D 50 50 1 1 W
-X VDDA 13 200 1800 100 D 50 50 1 1 W
-X VDDUSB 48 300 1800 100 D 50 50 1 1 W
-X VSS 18 -300 -1800 100 U 50 50 1 1 W
-X VSS 31 -200 -1800 100 U 50 50 1 1 W
-X VSS 47 -100 -1800 100 U 50 50 1 1 W
 X VSS 63 0 -1800 100 U 50 50 1 1 W
-X VSSA 12 100 -1800 100 U 50 50 1 1 W
+X VDD 64 -100 1800 100 D 50 50 1 1 W
+X NRST 7 -800 1600 100 R 50 50 1 1 I
+X PC0 8 -800 -200 100 R 50 50 1 1 B
+X PC1 9 -800 -300 100 R 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
@@ -3146,106 +3146,106 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -700 -2600 700 2500 0 1 10 f
-X NRST H2 -900 2400 200 R 50 50 1 1 I
-X PA0 L2 900 2400 200 L 50 50 1 1 B
-X PA1 M2 900 2300 200 L 50 50 1 1 B
-X PA10 C12 900 1400 200 L 50 50 1 1 B
-X PA11 B12 900 1300 200 L 50 50 1 1 B
-X PA12 A12 900 1200 200 L 50 50 1 1 B
-X PA13 A11 900 1100 200 L 50 50 1 1 B
+X PE3 A1 -900 400 200 R 50 50 1 1 B
 X PA14 A10 900 1000 200 L 50 50 1 1 B
-X PA15 A9 900 900 200 L 50 50 1 1 B
-X PA2 K3 900 2200 200 L 50 50 1 1 B
-X PA3 L3 900 2100 200 L 50 50 1 1 B
-X PA4 M3 900 2000 200 L 50 50 1 1 B
-X PA5 K4 900 1900 200 L 50 50 1 1 B
-X PA6 L4 900 1800 200 L 50 50 1 1 B
-X PA7 M4 900 1700 200 L 50 50 1 1 B
-X PA8 D11 900 1600 200 L 50 50 1 1 B
-X PA9 D10 900 1500 200 L 50 50 1 1 B
-X PB0 M5 900 700 200 L 50 50 1 1 B
-X PB1 M6 900 600 200 L 50 50 1 1 B
-X PB10 L10 900 -300 200 L 50 50 1 1 B
-X PB11 L11 900 -400 200 L 50 50 1 1 B
-X PB12 L12 900 -500 200 L 50 50 1 1 B
-X PB13 K12 900 -600 200 L 50 50 1 1 B
-X PB14 K11 900 -700 200 L 50 50 1 1 B
-X PB15 K10 900 -800 200 L 50 50 1 1 B
-X PB2 L6 900 500 200 L 50 50 1 1 B
-X PB3 A8 900 400 200 L 50 50 1 1 B
-X PB4 A7 900 300 200 L 50 50 1 1 B
-X PB5 C5 900 200 200 L 50 50 1 1 B
-X PB6 B5 900 100 200 L 50 50 1 1 B
-X PB7 B4 900 0 200 L 50 50 1 1 B
+X PA13 A11 900 1100 200 L 50 50 1 1 B
+X PA12 A12 900 1200 200 L 50 50 1 1 B
+X PE1 A2 -900 600 200 R 50 50 1 1 B
 X PB8 A3 900 -100 200 L 50 50 1 1 B
-X PB9 B3 900 -200 200 L 50 50 1 1 B
-X PC0 H1 900 -1000 200 L 50 50 1 1 B
-X PC1 J2 900 -1100 200 L 50 50 1 1 B
-X PC10 B11 900 -2000 200 L 50 50 1 1 B
-X PC11 C10 900 -2100 200 L 50 50 1 1 B
+X PH3 A4 -900 900 200 R 50 50 1 1 B
+X PD7 A5 -900 -1700 200 R 50 50 1 1 B
+X PD5 A6 -900 -1500 200 R 50 50 1 1 B
+X PB4 A7 900 300 200 L 50 50 1 1 B
+X PB3 A8 900 400 200 L 50 50 1 1 B
+X PA15 A9 900 900 200 L 50 50 1 1 B
+X PE4 B1 -900 300 200 R 50 50 1 1 B
 X PC12 B10 900 -2200 200 L 50 50 1 1 B
+X PC10 B11 900 -2000 200 L 50 50 1 1 B
+X PA11 B12 900 1300 200 L 50 50 1 1 B
+X PE2 B2 -900 500 200 R 50 50 1 1 B
+X PB9 B3 900 -200 200 L 50 50 1 1 B
+X PB7 B4 900 0 200 L 50 50 1 1 B
+X PB6 B5 900 100 200 L 50 50 1 1 B
+X PD6 B6 -900 -1600 200 R 50 50 1 1 B
+X PD4 B7 -900 -1400 200 R 50 50 1 1 B
+X PD3 B8 -900 -1300 200 R 50 50 1 1 B
+X PD1 B9 -900 -1100 200 R 50 50 1 1 B
 X PC13 C1 900 -2300 200 L 50 50 1 1 B
+X PC11 C10 900 -2100 200 L 50 50 1 1 B
+X VDDUSB C11 400 2700 200 D 50 50 1 1 W
+X PA10 C12 900 1400 200 L 50 50 1 1 B
+X PE5 C2 -900 200 200 R 50 50 1 1 B
+X PE0 C3 -900 700 200 R 50 50 1 1 B
+X VDD C4 -200 2700 200 D 50 50 1 1 W
+X PB5 C5 900 200 200 L 50 50 1 1 B
+X PD2 C8 -900 -1200 200 R 50 50 1 1 B
+X PD0 C9 -900 -1000 200 R 50 50 1 1 B
 X PC14 D1 900 -2400 200 L 50 50 1 1 B
+X PA9 D10 900 1500 200 L 50 50 1 1 B
+X PA8 D11 900 1600 200 L 50 50 1 1 B
+X PC9 D12 900 -1900 200 L 50 50 1 1 B
+X PE6 D2 -900 100 200 R 50 50 1 1 B
+X VSS D3 -200 -2800 200 U 50 50 1 1 W
 X PC15 E1 900 -2500 200 L 50 50 1 1 B
+X PC8 E10 900 -1800 200 L 50 50 1 1 B
+X PC7 E11 900 -1700 200 L 50 50 1 1 B
+X PC6 E12 900 -1600 200 L 50 50 1 1 B
+X VBAT E2 -300 2700 200 D 50 50 1 1 W
+X VSS E3 -100 -2800 200 U 50 50 1 1 W
+X PH0 F1 -900 1100 200 R 50 50 1 1 I
+X VSS F11 100 -2800 200 U 50 50 1 1 W
+X VSS F12 200 -2800 200 U 50 50 1 1 W
+X VSS F2 0 -2800 200 U 50 50 1 1 W
+X PH1 G1 -900 1000 200 R 50 50 1 1 I
+X VDD G11 0 2700 200 D 50 50 1 1 W
+X VDD G12 100 2700 200 D 50 50 1 1 W
+X VDD G2 -100 2700 200 D 50 50 1 1 W
+X PC0 H1 900 -1000 200 L 50 50 1 1 B
+X PD15 H10 -900 -2500 200 R 50 50 1 1 B
+X PD14 H11 -900 -2400 200 R 50 50 1 1 B
+X PD13 H12 -900 -2300 200 R 50 50 1 1 B
+X NRST H2 -900 2400 200 R 50 50 1 1 I
+X VDD H3 200 2700 200 D 50 50 1 1 W
+X VSSA J1 300 -2800 200 U 50 50 1 1 W
+X PD12 J10 -900 -2200 200 R 50 50 1 1 B
+X PD11 J11 -900 -2100 200 R 50 50 1 1 B
+X PD10 J12 -900 -2000 200 R 50 50 1 1 B
+X PC1 J2 900 -1100 200 L 50 50 1 1 B
 X PC2 J3 900 -1200 200 L 50 50 1 1 B
+X VREF- K1 -900 2100 200 R 50 50 1 1 W
+X PB15 K10 900 -800 200 L 50 50 1 1 B
+X PB14 K11 900 -700 200 L 50 50 1 1 B
+X PB13 K12 900 -600 200 L 50 50 1 1 B
 X PC3 K2 900 -1300 200 L 50 50 1 1 B
+X PA2 K3 900 2200 200 L 50 50 1 1 B
+X PA5 K4 900 1900 200 L 50 50 1 1 B
 X PC4 K5 900 -1400 200 L 50 50 1 1 B
-X PC5 L5 900 -1500 200 L 50 50 1 1 B
-X PC6 E12 900 -1600 200 L 50 50 1 1 B
-X PC7 E11 900 -1700 200 L 50 50 1 1 B
-X PC8 E10 900 -1800 200 L 50 50 1 1 B
-X PC9 D12 900 -1900 200 L 50 50 1 1 B
-X PD0 C9 -900 -1000 200 R 50 50 1 1 B
-X PD1 B9 -900 -1100 200 R 50 50 1 1 B
-X PD10 J12 -900 -2000 200 R 50 50 1 1 B
-X PD11 J11 -900 -2100 200 R 50 50 1 1 B
-X PD12 J10 -900 -2200 200 R 50 50 1 1 B
-X PD13 H12 -900 -2300 200 R 50 50 1 1 B
-X PD14 H11 -900 -2400 200 R 50 50 1 1 B
-X PD15 H10 -900 -2500 200 R 50 50 1 1 B
-X PD2 C8 -900 -1200 200 R 50 50 1 1 B
-X PD3 B8 -900 -1300 200 R 50 50 1 1 B
-X PD4 B7 -900 -1400 200 R 50 50 1 1 B
-X PD5 A6 -900 -1500 200 R 50 50 1 1 B
-X PD6 B6 -900 -1600 200 R 50 50 1 1 B
-X PD7 A5 -900 -1700 200 R 50 50 1 1 B
-X PD8 K9 -900 -1800 200 R 50 50 1 1 B
 X PD9 K8 -900 -1900 200 R 50 50 1 1 B
-X PE0 C3 -900 700 200 R 50 50 1 1 B
-X PE1 A2 -900 600 200 R 50 50 1 1 B
+X PD8 K9 -900 -1800 200 R 50 50 1 1 B
+X VREF+ L1 -900 2200 200 R 50 50 1 1 B
+X PB10 L10 900 -300 200 L 50 50 1 1 B
+X PB11 L11 900 -400 200 L 50 50 1 1 B
+X PB12 L12 900 -500 200 L 50 50 1 1 B
+X PA0 L2 900 2400 200 L 50 50 1 1 B
+X PA3 L3 900 2100 200 L 50 50 1 1 B
+X PA6 L4 900 1800 200 L 50 50 1 1 B
+X PC5 L5 900 -1500 200 L 50 50 1 1 B
+X PB2 L6 900 500 200 L 50 50 1 1 B
+X PE8 L7 -900 -100 200 R 50 50 1 1 B
 X PE10 L8 -900 -300 200 R 50 50 1 1 B
-X PE11 M9 -900 -400 200 R 50 50 1 1 B
 X PE12 L9 -900 -500 200 R 50 50 1 1 B
+X VDDA M1 300 2700 200 D 50 50 1 1 W
 X PE13 M10 -900 -600 200 R 50 50 1 1 B
 X PE14 M11 -900 -700 200 R 50 50 1 1 B
 X PE15 M12 -900 -800 200 R 50 50 1 1 B
-X PE2 B2 -900 500 200 R 50 50 1 1 B
-X PE3 A1 -900 400 200 R 50 50 1 1 B
-X PE4 B1 -900 300 200 R 50 50 1 1 B
-X PE5 C2 -900 200 200 R 50 50 1 1 B
-X PE6 D2 -900 100 200 R 50 50 1 1 B
+X PA1 M2 900 2300 200 L 50 50 1 1 B
+X PA4 M3 900 2000 200 L 50 50 1 1 B
+X PA7 M4 900 1700 200 L 50 50 1 1 B
+X PB0 M5 900 700 200 L 50 50 1 1 B
+X PB1 M6 900 600 200 L 50 50 1 1 B
 X PE7 M7 -900 0 200 R 50 50 1 1 B
-X PE8 L7 -900 -100 200 R 50 50 1 1 B
 X PE9 M8 -900 -200 200 R 50 50 1 1 B
-X PH0 F1 -900 1100 200 R 50 50 1 1 I
-X PH1 G1 -900 1000 200 R 50 50 1 1 I
-X PH3 A4 -900 900 200 R 50 50 1 1 B
-X VBAT E2 -300 2700 200 D 50 50 1 1 W
-X VDD C4 -200 2700 200 D 50 50 1 1 W
-X VDD G11 0 2700 200 D 50 50 1 1 W
-X VDD G12 100 2700 200 D 50 50 1 1 W
-X VDD G2 -100 2700 200 D 50 50 1 1 W
-X VDD H3 200 2700 200 D 50 50 1 1 W
-X VDDA M1 300 2700 200 D 50 50 1 1 W
-X VDDUSB C11 400 2700 200 D 50 50 1 1 W
-X VREF+ L1 -900 2200 200 R 50 50 1 1 B
-X VREF- K1 -900 2100 200 R 50 50 1 1 W
-X VSS D3 -200 -2800 200 U 50 50 1 1 W
-X VSS E3 -100 -2800 200 U 50 50 1 1 W
-X VSS F11 100 -2800 200 U 50 50 1 1 W
-X VSS F12 200 -2800 200 U 50 50 1 1 W
-X VSS F2 0 -2800 200 U 50 50 1 1 W
-X VSSA J1 300 -2800 200 U 50 50 1 1 W
+X PE11 M9 -900 -400 200 R 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
@@ -3262,106 +3262,106 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -700 -2600 700 2500 0 1 10 f
+X PE2 1 -900 500 200 R 50 50 1 1 B
+X VSS 10 -200 -2800 200 U 50 50 1 1 W
+X VDD 100 200 2700 200 D 50 50 1 1 W
+X VDD 11 -200 2700 200 D 50 50 1 1 W
+X PH0 12 -900 1100 200 R 50 50 1 1 I
+X PH1 13 -900 1000 200 R 50 50 1 1 I
 X NRST 14 -900 2400 200 R 50 50 1 1 I
+X PC0 15 900 -1000 200 L 50 50 1 1 B
+X PC1 16 900 -1100 200 L 50 50 1 1 B
+X PC2 17 900 -1200 200 L 50 50 1 1 B
+X PC3 18 900 -1300 200 L 50 50 1 1 B
+X VSSA 19 300 -2800 200 U 50 50 1 1 W
+X PE3 2 -900 400 200 R 50 50 1 1 B
+X VREF- 20 -900 2100 200 R 50 50 1 1 W
+X VREF+ 21 -900 2200 200 R 50 50 1 1 B
+X VDDA 22 300 2700 200 D 50 50 1 1 W
 X PA0 23 900 2400 200 L 50 50 1 1 B
 X PA1 24 900 2300 200 L 50 50 1 1 B
-X PA10 69 900 1400 200 L 50 50 1 1 B
-X PA11 70 900 1300 200 L 50 50 1 1 B
-X PA12 71 900 1200 200 L 50 50 1 1 B
-X PA13 72 900 1100 200 L 50 50 1 1 B
-X PA14 76 900 1000 200 L 50 50 1 1 B
-X PA15 77 900 900 200 L 50 50 1 1 B
 X PA2 25 900 2200 200 L 50 50 1 1 B
 X PA3 26 900 2100 200 L 50 50 1 1 B
+X VSS 27 -100 -2800 200 U 50 50 1 1 W
+X VDD 28 -100 2700 200 D 50 50 1 1 W
 X PA4 29 900 2000 200 L 50 50 1 1 B
+X PE4 3 -900 300 200 R 50 50 1 1 B
 X PA5 30 900 1900 200 L 50 50 1 1 B
 X PA6 31 900 1800 200 L 50 50 1 1 B
 X PA7 32 900 1700 200 L 50 50 1 1 B
-X PA8 67 900 1600 200 L 50 50 1 1 B
-X PA9 68 900 1500 200 L 50 50 1 1 B
+X PC4 33 900 -1400 200 L 50 50 1 1 B
+X PC5 34 900 -1500 200 L 50 50 1 1 B
 X PB0 35 900 700 200 L 50 50 1 1 B
 X PB1 36 900 600 200 L 50 50 1 1 B
+X PB2 37 900 500 200 L 50 50 1 1 B
+X PE7 38 -900 0 200 R 50 50 1 1 B
+X PE8 39 -900 -100 200 R 50 50 1 1 B
+X PE5 4 -900 200 200 R 50 50 1 1 B
+X PE9 40 -900 -200 200 R 50 50 1 1 B
+X PE10 41 -900 -300 200 R 50 50 1 1 B
+X PE11 42 -900 -400 200 R 50 50 1 1 B
+X PE12 43 -900 -500 200 R 50 50 1 1 B
+X PE13 44 -900 -600 200 R 50 50 1 1 B
+X PE14 45 -900 -700 200 R 50 50 1 1 B
+X PE15 46 -900 -800 200 R 50 50 1 1 B
 X PB10 47 900 -300 200 L 50 50 1 1 B
 X PB11 48 900 -400 200 L 50 50 1 1 B
+X VSS 49 0 -2800 200 U 50 50 1 1 W
+X PE6 5 -900 100 200 R 50 50 1 1 B
+X VDD 50 0 2700 200 D 50 50 1 1 W
 X PB12 51 900 -500 200 L 50 50 1 1 B
 X PB13 52 900 -600 200 L 50 50 1 1 B
 X PB14 53 900 -700 200 L 50 50 1 1 B
 X PB15 54 900 -800 200 L 50 50 1 1 B
-X PB2 37 900 500 200 L 50 50 1 1 B
-X PB3 89 900 400 200 L 50 50 1 1 B
-X PB4 90 900 300 200 L 50 50 1 1 B
-X PB5 91 900 200 200 L 50 50 1 1 B
-X PB6 92 900 100 200 L 50 50 1 1 B
-X PB7 93 900 0 200 L 50 50 1 1 B
-X PB8 95 900 -100 200 L 50 50 1 1 B
-X PB9 96 900 -200 200 L 50 50 1 1 B
-X PC0 15 900 -1000 200 L 50 50 1 1 B
-X PC1 16 900 -1100 200 L 50 50 1 1 B
-X PC10 78 900 -2000 200 L 50 50 1 1 B
-X PC11 79 900 -2100 200 L 50 50 1 1 B
-X PC12 80 900 -2200 200 L 50 50 1 1 B
-X PC13 7 900 -2300 200 L 50 50 1 1 B
-X PC14 8 900 -2400 200 L 50 50 1 1 B
-X PC15 9 900 -2500 200 L 50 50 1 1 B
-X PC2 17 900 -1200 200 L 50 50 1 1 B
-X PC3 18 900 -1300 200 L 50 50 1 1 B
-X PC4 33 900 -1400 200 L 50 50 1 1 B
-X PC5 34 900 -1500 200 L 50 50 1 1 B
-X PC6 63 900 -1600 200 L 50 50 1 1 B
-X PC7 64 900 -1700 200 L 50 50 1 1 B
-X PC8 65 900 -1800 200 L 50 50 1 1 B
-X PC9 66 900 -1900 200 L 50 50 1 1 B
-X PD0 81 -900 -1000 200 R 50 50 1 1 B
-X PD1 82 -900 -1100 200 R 50 50 1 1 B
+X PD8 55 -900 -1800 200 R 50 50 1 1 B
+X PD9 56 -900 -1900 200 R 50 50 1 1 B
 X PD10 57 -900 -2000 200 R 50 50 1 1 B
 X PD11 58 -900 -2100 200 R 50 50 1 1 B
 X PD12 59 -900 -2200 200 R 50 50 1 1 B
+X VBAT 6 -300 2700 200 D 50 50 1 1 W
 X PD13 60 -900 -2300 200 R 50 50 1 1 B
 X PD14 61 -900 -2400 200 R 50 50 1 1 B
 X PD15 62 -900 -2500 200 R 50 50 1 1 B
+X PC6 63 900 -1600 200 L 50 50 1 1 B
+X PC7 64 900 -1700 200 L 50 50 1 1 B
+X PC8 65 900 -1800 200 L 50 50 1 1 B
+X PC9 66 900 -1900 200 L 50 50 1 1 B
+X PA8 67 900 1600 200 L 50 50 1 1 B
+X PA9 68 900 1500 200 L 50 50 1 1 B
+X PA10 69 900 1400 200 L 50 50 1 1 B
+X PC13 7 900 -2300 200 L 50 50 1 1 B
+X PA11 70 900 1300 200 L 50 50 1 1 B
+X PA12 71 900 1200 200 L 50 50 1 1 B
+X PA13 72 900 1100 200 L 50 50 1 1 B
+X VDDUSB 73 400 2700 200 D 50 50 1 1 W
+X VSS 74 100 -2800 200 U 50 50 1 1 W
+X VDD 75 100 2700 200 D 50 50 1 1 W
+X PA14 76 900 1000 200 L 50 50 1 1 B
+X PA15 77 900 900 200 L 50 50 1 1 B
+X PC10 78 900 -2000 200 L 50 50 1 1 B
+X PC11 79 900 -2100 200 L 50 50 1 1 B
+X PC14 8 900 -2400 200 L 50 50 1 1 B
+X PC12 80 900 -2200 200 L 50 50 1 1 B
+X PD0 81 -900 -1000 200 R 50 50 1 1 B
+X PD1 82 -900 -1100 200 R 50 50 1 1 B
 X PD2 83 -900 -1200 200 R 50 50 1 1 B
 X PD3 84 -900 -1300 200 R 50 50 1 1 B
 X PD4 85 -900 -1400 200 R 50 50 1 1 B
 X PD5 86 -900 -1500 200 R 50 50 1 1 B
 X PD6 87 -900 -1600 200 R 50 50 1 1 B
 X PD7 88 -900 -1700 200 R 50 50 1 1 B
-X PD8 55 -900 -1800 200 R 50 50 1 1 B
-X PD9 56 -900 -1900 200 R 50 50 1 1 B
+X PB3 89 900 400 200 L 50 50 1 1 B
+X PC15 9 900 -2500 200 L 50 50 1 1 B
+X PB4 90 900 300 200 L 50 50 1 1 B
+X PB5 91 900 200 200 L 50 50 1 1 B
+X PB6 92 900 100 200 L 50 50 1 1 B
+X PB7 93 900 0 200 L 50 50 1 1 B
+X PH3 94 -900 900 200 R 50 50 1 1 B
+X PB8 95 900 -100 200 L 50 50 1 1 B
+X PB9 96 900 -200 200 L 50 50 1 1 B
 X PE0 97 -900 700 200 R 50 50 1 1 B
 X PE1 98 -900 600 200 R 50 50 1 1 B
-X PE10 41 -900 -300 200 R 50 50 1 1 B
-X PE11 42 -900 -400 200 R 50 50 1 1 B
-X PE12 43 -900 -500 200 R 50 50 1 1 B
-X PE13 44 -900 -600 200 R 50 50 1 1 B
-X PE14 45 -900 -700 200 R 50 50 1 1 B
-X PE15 46 -900 -800 200 R 50 50 1 1 B
-X PE2 1 -900 500 200 R 50 50 1 1 B
-X PE3 2 -900 400 200 R 50 50 1 1 B
-X PE4 3 -900 300 200 R 50 50 1 1 B
-X PE5 4 -900 200 200 R 50 50 1 1 B
-X PE6 5 -900 100 200 R 50 50 1 1 B
-X PE7 38 -900 0 200 R 50 50 1 1 B
-X PE8 39 -900 -100 200 R 50 50 1 1 B
-X PE9 40 -900 -200 200 R 50 50 1 1 B
-X PH0 12 -900 1100 200 R 50 50 1 1 I
-X PH1 13 -900 1000 200 R 50 50 1 1 I
-X PH3 94 -900 900 200 R 50 50 1 1 B
-X VBAT 6 -300 2700 200 D 50 50 1 1 W
-X VDD 100 200 2700 200 D 50 50 1 1 W
-X VDD 11 -200 2700 200 D 50 50 1 1 W
-X VDD 28 -100 2700 200 D 50 50 1 1 W
-X VDD 50 0 2700 200 D 50 50 1 1 W
-X VDD 75 100 2700 200 D 50 50 1 1 W
-X VDDA 22 300 2700 200 D 50 50 1 1 W
-X VDDUSB 73 400 2700 200 D 50 50 1 1 W
-X VREF+ 21 -900 2200 200 R 50 50 1 1 B
-X VREF- 20 -900 2100 200 R 50 50 1 1 W
-X VSS 10 -200 -2800 200 U 50 50 1 1 W
-X VSS 27 -100 -2800 200 U 50 50 1 1 W
-X VSS 49 0 -2800 200 U 50 50 1 1 W
-X VSS 74 100 -2800 200 U 50 50 1 1 W
 X VSS 99 200 -2800 200 U 50 50 1 1 W
-X VSSA 19 300 -2800 200 U 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
@@ -3377,55 +3377,55 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -500 -1400 500 1300 0 1 10 f
-X NRST 7 -600 1200 100 R 50 50 1 1 I
+X VBAT 1 -200 1400 100 D 50 50 1 1 W
 X PA0 10 600 200 100 L 50 50 1 1 B
 X PA1 11 600 100 100 L 50 50 1 1 B
-X PA10 31 600 -800 100 L 50 50 1 1 B
-X PA11 32 600 -900 100 L 50 50 1 1 B
-X PA12 33 600 -1000 100 L 50 50 1 1 B
-X PA13 34 600 -1100 100 L 50 50 1 1 B
-X PA14 37 600 -1200 100 L 50 50 1 1 B
-X PA15 38 600 -1300 100 L 50 50 1 1 B
 X PA2 12 600 0 100 L 50 50 1 1 B
 X PA3 13 600 -100 100 L 50 50 1 1 B
 X PA4 14 600 -200 100 L 50 50 1 1 B
 X PA5 15 600 -300 100 L 50 50 1 1 B
 X PA6 16 600 -400 100 L 50 50 1 1 B
 X PA7 17 600 -500 100 L 50 50 1 1 B
-X PA8 29 600 -600 100 L 50 50 1 1 B
-X PA9 30 600 -700 100 L 50 50 1 1 B
 X PB0 18 -600 200 100 R 50 50 1 1 B
 X PB1 19 -600 100 100 R 50 50 1 1 B
+X PC13 2 -600 600 100 R 50 50 1 1 B
+X PB2 20 -600 0 100 R 50 50 1 1 B
 X PB10 21 -600 -800 100 R 50 50 1 1 B
 X PB11 22 -600 -900 100 R 50 50 1 1 B
+X VSS 23 -200 -1500 100 U 50 50 1 1 W
+X VDD 24 -100 1400 100 D 50 50 1 1 W
 X PB12 25 -600 -1000 100 R 50 50 1 1 B
 X PB13 26 -600 -1100 100 R 50 50 1 1 B
 X PB14 27 -600 -1200 100 R 50 50 1 1 B
 X PB15 28 -600 -1300 100 R 50 50 1 1 B
-X PB2 20 -600 0 100 R 50 50 1 1 B
+X PA8 29 600 -600 100 L 50 50 1 1 B
+X PC14 3 -600 500 100 R 50 50 1 1 B
+X PA9 30 600 -700 100 L 50 50 1 1 B
+X PA10 31 600 -800 100 L 50 50 1 1 B
+X PA11 32 600 -900 100 L 50 50 1 1 B
+X PA12 33 600 -1000 100 L 50 50 1 1 B
+X PA13 34 600 -1100 100 L 50 50 1 1 B
+X VSS 35 -100 -1500 100 U 50 50 1 1 W
+X VDDUSB 36 200 1400 100 D 50 50 1 1 W
+X PA14 37 600 -1200 100 L 50 50 1 1 B
+X PA15 38 600 -1300 100 L 50 50 1 1 B
 X PB3 39 -600 -100 100 R 50 50 1 1 B
+X PC15 4 -600 400 100 R 50 50 1 1 B
 X PB4 40 -600 -200 100 R 50 50 1 1 B
 X PB5 41 -600 -300 100 R 50 50 1 1 B
 X PB6 42 -600 -400 100 R 50 50 1 1 B
 X PB7 43 -600 -500 100 R 50 50 1 1 B
+X PH3 44 -600 800 100 R 50 50 1 1 B
 X PB8 45 -600 -600 100 R 50 50 1 1 B
 X PB9 46 -600 -700 100 R 50 50 1 1 B
-X PC13 2 -600 600 100 R 50 50 1 1 B
-X PC14 3 -600 500 100 R 50 50 1 1 B
-X PC15 4 -600 400 100 R 50 50 1 1 B
-X PH0 5 -600 1000 100 R 50 50 1 1 I
-X PH1 6 -600 900 100 R 50 50 1 1 I
-X PH3 44 -600 800 100 R 50 50 1 1 B
-X VBAT 1 -200 1400 100 D 50 50 1 1 W
-X VDD 24 -100 1400 100 D 50 50 1 1 W
-X VDD 48 0 1400 100 D 50 50 1 1 W
-X VDDA 9 100 1400 100 D 50 50 1 1 W
-X VDDUSB 36 200 1400 100 D 50 50 1 1 W
-X VSS 23 -200 -1500 100 U 50 50 1 1 W
-X VSS 35 -100 -1500 100 U 50 50 1 1 W
 X VSS 47 0 -1500 100 U 50 50 1 1 W
+X VDD 48 0 1400 100 D 50 50 1 1 W
 X VSS 49 100 -1500 100 U 50 50 1 1 W
+X PH0 5 -600 1000 100 R 50 50 1 1 I
+X PH1 6 -600 900 100 R 50 50 1 1 I
+X NRST 7 -600 1200 100 R 50 50 1 1 I
 X VSSA 8 200 -1500 100 U 50 50 1 1 W
+X VDDA 9 100 1400 100 D 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
@@ -3441,70 +3441,70 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -600 -1700 500 1700 0 1 10 f
-X NRST E1 -700 1600 100 R 50 50 1 1 I
-X PA0 G2 600 1600 100 L 50 50 1 1 B
-X PA1 H2 600 1500 100 L 50 50 1 1 B
-X PA10 C6 600 600 100 L 50 50 1 1 B
-X PA11 C8 600 500 100 L 50 50 1 1 B
-X PA12 B8 600 400 100 L 50 50 1 1 B
-X PA13 A8 600 300 100 L 50 50 1 1 B
-X PA14 A7 600 200 100 L 50 50 1 1 B
+X PC14 A1 -700 -1500 100 R 50 50 1 1 B
+X PC13 A2 -700 -1400 100 R 50 50 1 1 B
+X PB9 A3 600 -1000 100 L 50 50 1 1 B
+X PB4 A4 600 -500 100 L 50 50 1 1 B
+X PB3 A5 600 -400 100 L 50 50 1 1 B
 X PA15 A6 600 100 100 L 50 50 1 1 B
-X PA2 F3 600 1400 100 L 50 50 1 1 B
-X PA3 G3 600 1300 100 L 50 50 1 1 B
-X PA4 H3 600 1200 100 L 50 50 1 1 B
-X PA5 F4 600 1100 100 L 50 50 1 1 B
-X PA6 G4 600 1000 100 L 50 50 1 1 B
-X PA7 H4 600 900 100 L 50 50 1 1 B
-X PA8 D7 600 800 100 L 50 50 1 1 B
-X PA9 C7 600 700 100 L 50 50 1 1 B
-X PB0 F5 600 -100 100 L 50 50 1 1 B
-X PB1 G5 600 -200 100 L 50 50 1 1 B
-X PB10 G7 600 -1100 100 L 50 50 1 1 B
-X PB11 H7 600 -1200 100 L 50 50 1 1 B
-X PB12 H8 600 -1300 100 L 50 50 1 1 B
-X PB13 G8 600 -1400 100 L 50 50 1 1 B
-X PB14 F8 600 -1500 100 L 50 50 1 1 B
-X PB15 F7 600 -1600 100 L 50 50 1 1 B
-X PB2 G6 600 -300 100 L 50 50 1 1 B
-X PB3 A5 600 -400 100 L 50 50 1 1 B
-X PB4 A4 600 -500 100 L 50 50 1 1 B
-X PB5 C4 600 -600 100 L 50 50 1 1 B
-X PB6 D3 600 -700 100 L 50 50 1 1 B
-X PB7 C3 600 -800 100 L 50 50 1 1 B
-X PB8 B3 600 -900 100 L 50 50 1 1 B
-X PB9 A3 600 -1000 100 L 50 50 1 1 B
-X PC0 E3 -700 -100 100 R 50 50 1 1 B
-X PC1 E2 -700 -200 100 R 50 50 1 1 B
-X PC10 B7 -700 -1100 100 R 50 50 1 1 B
-X PC11 B6 -700 -1200 100 R 50 50 1 1 B
-X PC12 C5 -700 -1300 100 R 50 50 1 1 B
-X PC13 A2 -700 -1400 100 R 50 50 1 1 B
-X PC14 A1 -700 -1500 100 R 50 50 1 1 B
+X PA14 A7 600 200 100 L 50 50 1 1 B
+X PA13 A8 600 300 100 L 50 50 1 1 B
 X PC15 B1 -700 -1600 100 R 50 50 1 1 B
-X PC2 F2 -700 -300 100 R 50 50 1 1 B
-X PC3 G1 -700 -400 100 R 50 50 1 1 B
-X PC4 H5 -700 -500 100 R 50 50 1 1 B
-X PC5 H6 -700 -600 100 R 50 50 1 1 B
-X PC6 F6 -700 -700 100 R 50 50 1 1 B
-X PC7 E7 -700 -800 100 R 50 50 1 1 B
-X PC8 E8 -700 -900 100 R 50 50 1 1 B
-X PC9 D8 -700 -1000 100 R 50 50 1 1 B
+X VBAT B2 -300 1800 100 D 50 50 1 1 W
+X PB8 B3 600 -900 100 L 50 50 1 1 B
+X PH3 B4 -700 300 100 R 50 50 1 1 B
 X PD2 B5 -700 100 100 R 50 50 1 1 B
+X PC11 B6 -700 -1200 100 R 50 50 1 1 B
+X PC10 B7 -700 -1100 100 R 50 50 1 1 B
+X PA12 B8 600 400 100 L 50 50 1 1 B
 X PH0 C1 -700 500 100 R 50 50 1 1 I
+X VSS C2 -300 -1800 100 U 50 50 1 1 W
+X PB7 C3 600 -800 100 L 50 50 1 1 B
+X PB5 C4 600 -600 100 L 50 50 1 1 B
+X PC12 C5 -700 -1300 100 R 50 50 1 1 B
+X PA10 C6 600 600 100 L 50 50 1 1 B
+X PA9 C7 600 700 100 L 50 50 1 1 B
+X PA11 C8 600 500 100 L 50 50 1 1 B
 X PH1 D1 -700 400 100 R 50 50 1 1 I
-X PH3 B4 -700 300 100 R 50 50 1 1 B
-X VBAT B2 -300 1800 100 D 50 50 1 1 W
 X VDD D2 -200 1800 100 D 50 50 1 1 W
-X VDD E4 -100 1800 100 D 50 50 1 1 W
-X VDD E6 0 1800 100 D 50 50 1 1 W
-X VDDA H1 100 1800 100 D 50 50 1 1 W
-X VDDUSB E5 200 1800 100 D 50 50 1 1 W
-X VSS C2 -300 -1800 100 U 50 50 1 1 W
+X PB6 D3 600 -700 100 L 50 50 1 1 B
 X VSS D4 -200 -1800 100 U 50 50 1 1 W
 X VSS D5 -100 -1800 100 U 50 50 1 1 W
 X VSS D6 0 -1800 100 U 50 50 1 1 W
+X PA8 D7 600 800 100 L 50 50 1 1 B
+X PC9 D8 -700 -1000 100 R 50 50 1 1 B
+X NRST E1 -700 1600 100 R 50 50 1 1 I
+X PC1 E2 -700 -200 100 R 50 50 1 1 B
+X PC0 E3 -700 -100 100 R 50 50 1 1 B
+X VDD E4 -100 1800 100 D 50 50 1 1 W
+X VDDUSB E5 200 1800 100 D 50 50 1 1 W
+X VDD E6 0 1800 100 D 50 50 1 1 W
+X PC7 E7 -700 -800 100 R 50 50 1 1 B
+X PC8 E8 -700 -900 100 R 50 50 1 1 B
 X VSSA F1 100 -1800 100 U 50 50 1 1 W
+X PC2 F2 -700 -300 100 R 50 50 1 1 B
+X PA2 F3 600 1400 100 L 50 50 1 1 B
+X PA5 F4 600 1100 100 L 50 50 1 1 B
+X PB0 F5 600 -100 100 L 50 50 1 1 B
+X PC6 F6 -700 -700 100 R 50 50 1 1 B
+X PB15 F7 600 -1600 100 L 50 50 1 1 B
+X PB14 F8 600 -1500 100 L 50 50 1 1 B
+X PC3 G1 -700 -400 100 R 50 50 1 1 B
+X PA0 G2 600 1600 100 L 50 50 1 1 B
+X PA3 G3 600 1300 100 L 50 50 1 1 B
+X PA6 G4 600 1000 100 L 50 50 1 1 B
+X PB1 G5 600 -200 100 L 50 50 1 1 B
+X PB2 G6 600 -300 100 L 50 50 1 1 B
+X PB10 G7 600 -1100 100 L 50 50 1 1 B
+X PB13 G8 600 -1400 100 L 50 50 1 1 B
+X VDDA H1 100 1800 100 D 50 50 1 1 W
+X PA1 H2 600 1500 100 L 50 50 1 1 B
+X PA4 H3 600 1200 100 L 50 50 1 1 B
+X PA7 H4 600 900 100 L 50 50 1 1 B
+X PC4 H5 -700 -500 100 R 50 50 1 1 B
+X PC5 H6 -700 -600 100 R 50 50 1 1 B
+X PB11 H7 600 -1200 100 L 50 50 1 1 B
+X PB12 H8 600 -1300 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
@@ -3520,70 +3520,70 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -600 -1700 500 1700 0 1 10 f
-X NRST 7 -700 1600 100 R 50 50 1 1 I
+X VBAT 1 -300 1800 100 D 50 50 1 1 W
+X PC2 10 -700 -300 100 R 50 50 1 1 B
+X PC3 11 -700 -400 100 R 50 50 1 1 B
+X VSSA 12 100 -1800 100 U 50 50 1 1 W
+X VDDA 13 100 1800 100 D 50 50 1 1 W
 X PA0 14 600 1600 100 L 50 50 1 1 B
 X PA1 15 600 1500 100 L 50 50 1 1 B
-X PA10 43 600 600 100 L 50 50 1 1 B
-X PA11 44 600 500 100 L 50 50 1 1 B
-X PA12 45 600 400 100 L 50 50 1 1 B
-X PA13 46 600 300 100 L 50 50 1 1 B
-X PA14 49 600 200 100 L 50 50 1 1 B
-X PA15 50 600 100 100 L 50 50 1 1 B
 X PA2 16 600 1400 100 L 50 50 1 1 B
 X PA3 17 600 1300 100 L 50 50 1 1 B
+X VSS 18 -300 -1800 100 U 50 50 1 1 W
+X VDD 19 -200 1800 100 D 50 50 1 1 W
+X PC13 2 -700 -1400 100 R 50 50 1 1 B
 X PA4 20 600 1200 100 L 50 50 1 1 B
 X PA5 21 600 1100 100 L 50 50 1 1 B
 X PA6 22 600 1000 100 L 50 50 1 1 B
 X PA7 23 600 900 100 L 50 50 1 1 B
-X PA8 41 600 800 100 L 50 50 1 1 B
-X PA9 42 600 700 100 L 50 50 1 1 B
+X PC4 24 -700 -500 100 R 50 50 1 1 B
+X PC5 25 -700 -600 100 R 50 50 1 1 B
 X PB0 26 600 -100 100 L 50 50 1 1 B
 X PB1 27 600 -200 100 L 50 50 1 1 B
+X PB2 28 600 -300 100 L 50 50 1 1 B
 X PB10 29 600 -1100 100 L 50 50 1 1 B
+X PC14 3 -700 -1500 100 R 50 50 1 1 B
 X PB11 30 600 -1200 100 L 50 50 1 1 B
+X VSS 31 -200 -1800 100 U 50 50 1 1 W
+X VDD 32 -100 1800 100 D 50 50 1 1 W
 X PB12 33 600 -1300 100 L 50 50 1 1 B
 X PB13 34 600 -1400 100 L 50 50 1 1 B
 X PB14 35 600 -1500 100 L 50 50 1 1 B
 X PB15 36 600 -1600 100 L 50 50 1 1 B
-X PB2 28 600 -300 100 L 50 50 1 1 B
+X PC6 37 -700 -700 100 R 50 50 1 1 B
+X PC7 38 -700 -800 100 R 50 50 1 1 B
+X PC8 39 -700 -900 100 R 50 50 1 1 B
+X PC15 4 -700 -1600 100 R 50 50 1 1 B
+X PC9 40 -700 -1000 100 R 50 50 1 1 B
+X PA8 41 600 800 100 L 50 50 1 1 B
+X PA9 42 600 700 100 L 50 50 1 1 B
+X PA10 43 600 600 100 L 50 50 1 1 B
+X PA11 44 600 500 100 L 50 50 1 1 B
+X PA12 45 600 400 100 L 50 50 1 1 B
+X PA13 46 600 300 100 L 50 50 1 1 B
+X VSS 47 -100 -1800 100 U 50 50 1 1 W
+X VDDUSB 48 200 1800 100 D 50 50 1 1 W
+X PA14 49 600 200 100 L 50 50 1 1 B
+X PH0 5 -700 500 100 R 50 50 1 1 I
+X PA15 50 600 100 100 L 50 50 1 1 B
+X PC10 51 -700 -1100 100 R 50 50 1 1 B
+X PC11 52 -700 -1200 100 R 50 50 1 1 B
+X PC12 53 -700 -1300 100 R 50 50 1 1 B
+X PD2 54 -700 100 100 R 50 50 1 1 B
 X PB3 55 600 -400 100 L 50 50 1 1 B
 X PB4 56 600 -500 100 L 50 50 1 1 B
 X PB5 57 600 -600 100 L 50 50 1 1 B
 X PB6 58 600 -700 100 L 50 50 1 1 B
 X PB7 59 600 -800 100 L 50 50 1 1 B
+X PH1 6 -700 400 100 R 50 50 1 1 I
+X PH3 60 -700 300 100 R 50 50 1 1 B
 X PB8 61 600 -900 100 L 50 50 1 1 B
 X PB9 62 600 -1000 100 L 50 50 1 1 B
+X VSS 63 0 -1800 100 U 50 50 1 1 W
+X VDD 64 0 1800 100 D 50 50 1 1 W
+X NRST 7 -700 1600 100 R 50 50 1 1 I
 X PC0 8 -700 -100 100 R 50 50 1 1 B
 X PC1 9 -700 -200 100 R 50 50 1 1 B
-X PC10 51 -700 -1100 100 R 50 50 1 1 B
-X PC11 52 -700 -1200 100 R 50 50 1 1 B
-X PC12 53 -700 -1300 100 R 50 50 1 1 B
-X PC13 2 -700 -1400 100 R 50 50 1 1 B
-X PC14 3 -700 -1500 100 R 50 50 1 1 B
-X PC15 4 -700 -1600 100 R 50 50 1 1 B
-X PC2 10 -700 -300 100 R 50 50 1 1 B
-X PC3 11 -700 -400 100 R 50 50 1 1 B
-X PC4 24 -700 -500 100 R 50 50 1 1 B
-X PC5 25 -700 -600 100 R 50 50 1 1 B
-X PC6 37 -700 -700 100 R 50 50 1 1 B
-X PC7 38 -700 -800 100 R 50 50 1 1 B
-X PC8 39 -700 -900 100 R 50 50 1 1 B
-X PC9 40 -700 -1000 100 R 50 50 1 1 B
-X PD2 54 -700 100 100 R 50 50 1 1 B
-X PH0 5 -700 500 100 R 50 50 1 1 I
-X PH1 6 -700 400 100 R 50 50 1 1 I
-X PH3 60 -700 300 100 R 50 50 1 1 B
-X VBAT 1 -300 1800 100 D 50 50 1 1 W
-X VDD 19 -200 1800 100 D 50 50 1 1 W
-X VDD 32 -100 1800 100 D 50 50 1 1 W
-X VDD 64 0 1800 100 D 50 50 1 1 W
-X VDDA 13 100 1800 100 D 50 50 1 1 W
-X VDDUSB 48 200 1800 100 D 50 50 1 1 W
-X VSS 18 -300 -1800 100 U 50 50 1 1 W
-X VSS 31 -200 -1800 100 U 50 50 1 1 W
-X VSS 47 -100 -1800 100 U 50 50 1 1 W
-X VSS 63 0 -1800 100 U 50 50 1 1 W
-X VSSA 12 100 -1800 100 U 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
@@ -3599,70 +3599,70 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -600 -1700 600 1700 0 1 10 f
-X NRST F8 -700 1600 100 R 50 50 1 1 I
-X PA0 H8 700 1600 100 L 50 50 1 1 B
-X PA1 E6 700 1500 100 L 50 50 1 1 B
-X PA10 C1 700 600 100 L 50 50 1 1 B
-X PA11 D2 700 500 100 L 50 50 1 1 B
-X PA12 D3 700 400 100 L 50 50 1 1 B
-X PA13 C2 700 300 100 L 50 50 1 1 B
-X PA14 C3 700 200 100 L 50 50 1 1 B
+X VDDUSB A1 300 1800 100 D 50 50 1 1 W
 X PA15 A2 700 100 100 L 50 50 1 1 B
-X PA2 G7 700 1400 100 L 50 50 1 1 B
-X PA3 F6 700 1300 100 L 50 50 1 1 B
-X PA4 G6 700 1200 100 L 50 50 1 1 B
-X PA5 F5 700 1100 100 L 50 50 1 1 B
-X PA6 H6 700 1000 100 L 50 50 1 1 B
-X PA7 E5 700 900 100 L 50 50 1 1 B
-X PA8 E3 700 800 100 L 50 50 1 1 B
-X PA9 D1 700 700 100 L 50 50 1 1 B
-X PB0 H5 700 -100 100 L 50 50 1 1 B
-X PB1 F4 700 -200 100 L 50 50 1 1 B
-X PB10 H4 700 -1100 100 L 50 50 1 1 B
-X PB11 H3 700 -1200 100 L 50 50 1 1 B
-X PB12 G3 700 -1300 100 L 50 50 1 1 B
-X PB13 G2 700 -1400 100 L 50 50 1 1 B
-X PB14 G1 700 -1500 100 L 50 50 1 1 B
-X PB15 F1 700 -1600 100 L 50 50 1 1 B
-X PB2 G4 700 -300 100 L 50 50 1 1 B
-X PB3 B4 700 -400 100 L 50 50 1 1 B
+X PC12 A3 -700 -1300 100 R 50 50 1 1 B
 X PB4 A4 700 -500 100 L 50 50 1 1 B
-X PB5 C5 700 -600 100 L 50 50 1 1 B
-X PB6 B5 700 -700 100 L 50 50 1 1 B
 X PB7 A5 700 -800 100 L 50 50 1 1 B
 X PB8 A6 700 -900 100 L 50 50 1 1 B
-X PB9 C6 700 -1000 100 L 50 50 1 1 B
-X PC0 D7 -700 -100 100 R 50 50 1 1 B
-X PC1 D5 -700 -200 100 R 50 50 1 1 B
-X PC10 D4 -700 -1100 100 R 50 50 1 1 B
+X VSS A7 -200 -1800 100 U 50 50 1 1 W
+X VDD A8 -200 1800 100 D 50 50 1 1 W
+X VSS B1 -100 -1800 100 U 50 50 1 1 W
+X VDD B2 -100 1800 100 D 50 50 1 1 W
 X PC11 B3 -700 -1200 100 R 50 50 1 1 B
-X PC12 A3 -700 -1300 100 R 50 50 1 1 B
+X PB3 B4 700 -400 100 L 50 50 1 1 B
+X PB6 B5 700 -700 100 L 50 50 1 1 B
+X PH3 B6 -700 300 100 R 50 50 1 1 B
+X VBAT B7 -300 1800 100 D 50 50 1 1 W
 X PC13 B8 -700 -1400 100 R 50 50 1 1 B
-X PC14 C8 -700 -1500 100 R 50 50 1 1 B
+X PA10 C1 700 600 100 L 50 50 1 1 B
+X PA13 C2 700 300 100 L 50 50 1 1 B
+X PA14 C3 700 200 100 L 50 50 1 1 B
+X PD2 C4 -700 100 100 R 50 50 1 1 B
+X PB5 C5 700 -600 100 L 50 50 1 1 B
+X PB9 C6 700 -1000 100 L 50 50 1 1 B
 X PC15 C7 -700 -1600 100 R 50 50 1 1 B
+X PC14 C8 -700 -1500 100 R 50 50 1 1 B
+X PA9 D1 700 700 100 L 50 50 1 1 B
+X PA11 D2 700 500 100 L 50 50 1 1 B
+X PA12 D3 700 400 100 L 50 50 1 1 B
+X PC10 D4 -700 -1100 100 R 50 50 1 1 B
+X PC1 D5 -700 -200 100 R 50 50 1 1 B
 X PC2 D6 -700 -300 100 R 50 50 1 1 B
-X PC3 E7 -700 -400 100 R 50 50 1 1 B
-X PC4 E4 -700 -500 100 R 50 50 1 1 B
-X PC5 G5 -700 -600 100 R 50 50 1 1 B
-X PC6 F2 -700 -700 100 R 50 50 1 1 B
+X PC0 D7 -700 -100 100 R 50 50 1 1 B
+X PH0 D8 -700 500 100 R 50 50 1 1 I
 X PC7 E1 -700 -800 100 R 50 50 1 1 B
-X PC8 F3 -700 -900 100 R 50 50 1 1 B
 X PC9 E2 -700 -1000 100 R 50 50 1 1 B
-X PD2 C4 -700 100 100 R 50 50 1 1 B
-X PH0 D8 -700 500 100 R 50 50 1 1 I
+X PA8 E3 700 800 100 L 50 50 1 1 B
+X PC4 E4 -700 -500 100 R 50 50 1 1 B
+X PA7 E5 700 900 100 L 50 50 1 1 B
+X PA1 E6 700 1500 100 L 50 50 1 1 B
+X PC3 E7 -700 -400 100 R 50 50 1 1 B
 X PH1 E8 -700 400 100 R 50 50 1 1 I
-X PH3 B6 -700 300 100 R 50 50 1 1 B
-X VBAT B7 -300 1800 100 D 50 50 1 1 W
-X VDD A8 -200 1800 100 D 50 50 1 1 W
-X VDD B2 -100 1800 100 D 50 50 1 1 W
-X VDD H1 0 1800 100 D 50 50 1 1 W
-X VDD H7 100 1800 100 D 50 50 1 1 W
+X PB15 F1 700 -1600 100 L 50 50 1 1 B
+X PC6 F2 -700 -700 100 R 50 50 1 1 B
+X PC8 F3 -700 -900 100 R 50 50 1 1 B
+X PB1 F4 700 -200 100 L 50 50 1 1 B
+X PA5 F5 700 1100 100 L 50 50 1 1 B
+X PA3 F6 700 1300 100 L 50 50 1 1 B
 X VDDA F7 200 1800 100 D 50 50 1 1 W
-X VDDUSB A1 300 1800 100 D 50 50 1 1 W
-X VSS A7 -200 -1800 100 U 50 50 1 1 W
-X VSS B1 -100 -1800 100 U 50 50 1 1 W
-X VSS H2 0 -1800 100 U 50 50 1 1 W
+X NRST F8 -700 1600 100 R 50 50 1 1 I
+X PB14 G1 700 -1500 100 L 50 50 1 1 B
+X PB13 G2 700 -1400 100 L 50 50 1 1 B
+X PB12 G3 700 -1300 100 L 50 50 1 1 B
+X PB2 G4 700 -300 100 L 50 50 1 1 B
+X PC5 G5 -700 -600 100 R 50 50 1 1 B
+X PA4 G6 700 1200 100 L 50 50 1 1 B
+X PA2 G7 700 1400 100 L 50 50 1 1 B
 X VSSA G8 100 -1800 100 U 50 50 1 1 W
+X VDD H1 0 1800 100 D 50 50 1 1 W
+X VSS H2 0 -1800 100 U 50 50 1 1 W
+X PB11 H3 700 -1200 100 L 50 50 1 1 B
+X PB10 H4 700 -1100 100 L 50 50 1 1 B
+X PB0 H5 700 -100 100 L 50 50 1 1 B
+X PA6 H6 700 1000 100 L 50 50 1 1 B
+X VDD H7 100 1800 100 D 50 50 1 1 W
+X PA0 H8 700 1600 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
@@ -3678,106 +3678,106 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -700 -2600 700 2500 0 1 10 f
-X NRST H2 -900 2400 200 R 50 50 1 1 I
-X PA0 L2 900 2400 200 L 50 50 1 1 B
-X PA1 M2 900 2300 200 L 50 50 1 1 B
-X PA10 C12 900 1400 200 L 50 50 1 1 B
-X PA11 B12 900 1300 200 L 50 50 1 1 B
-X PA12 A12 900 1200 200 L 50 50 1 1 B
-X PA13 A11 900 1100 200 L 50 50 1 1 B
+X PE3 A1 -900 400 200 R 50 50 1 1 B
 X PA14 A10 900 1000 200 L 50 50 1 1 B
-X PA15 A9 900 900 200 L 50 50 1 1 B
-X PA2 K3 900 2200 200 L 50 50 1 1 B
-X PA3 L3 900 2100 200 L 50 50 1 1 B
-X PA4 M3 900 2000 200 L 50 50 1 1 B
-X PA5 K4 900 1900 200 L 50 50 1 1 B
-X PA6 L4 900 1800 200 L 50 50 1 1 B
-X PA7 M4 900 1700 200 L 50 50 1 1 B
-X PA8 D11 900 1600 200 L 50 50 1 1 B
-X PA9 D10 900 1500 200 L 50 50 1 1 B
-X PB0 M5 900 700 200 L 50 50 1 1 B
-X PB1 M6 900 600 200 L 50 50 1 1 B
-X PB10 L10 900 -300 200 L 50 50 1 1 B
-X PB11 L11 900 -400 200 L 50 50 1 1 B
-X PB12 L12 900 -500 200 L 50 50 1 1 B
-X PB13 K12 900 -600 200 L 50 50 1 1 B
-X PB14 K11 900 -700 200 L 50 50 1 1 B
-X PB15 K10 900 -800 200 L 50 50 1 1 B
-X PB2 L6 900 500 200 L 50 50 1 1 B
-X PB3 A8 900 400 200 L 50 50 1 1 B
-X PB4 A7 900 300 200 L 50 50 1 1 B
-X PB5 C5 900 200 200 L 50 50 1 1 B
-X PB6 B5 900 100 200 L 50 50 1 1 B
-X PB7 B4 900 0 200 L 50 50 1 1 B
+X PA13 A11 900 1100 200 L 50 50 1 1 B
+X PA12 A12 900 1200 200 L 50 50 1 1 B
+X PE1 A2 -900 600 200 R 50 50 1 1 B
 X PB8 A3 900 -100 200 L 50 50 1 1 B
-X PB9 B3 900 -200 200 L 50 50 1 1 B
-X PC0 H1 900 -1000 200 L 50 50 1 1 B
-X PC1 J2 900 -1100 200 L 50 50 1 1 B
-X PC10 B11 900 -2000 200 L 50 50 1 1 B
-X PC11 C10 900 -2100 200 L 50 50 1 1 B
+X PH3 A4 -900 900 200 R 50 50 1 1 B
+X PD7 A5 -900 -1700 200 R 50 50 1 1 B
+X PD5 A6 -900 -1500 200 R 50 50 1 1 B
+X PB4 A7 900 300 200 L 50 50 1 1 B
+X PB3 A8 900 400 200 L 50 50 1 1 B
+X PA15 A9 900 900 200 L 50 50 1 1 B
+X PE4 B1 -900 300 200 R 50 50 1 1 B
 X PC12 B10 900 -2200 200 L 50 50 1 1 B
+X PC10 B11 900 -2000 200 L 50 50 1 1 B
+X PA11 B12 900 1300 200 L 50 50 1 1 B
+X PE2 B2 -900 500 200 R 50 50 1 1 B
+X PB9 B3 900 -200 200 L 50 50 1 1 B
+X PB7 B4 900 0 200 L 50 50 1 1 B
+X PB6 B5 900 100 200 L 50 50 1 1 B
+X PD6 B6 -900 -1600 200 R 50 50 1 1 B
+X PD4 B7 -900 -1400 200 R 50 50 1 1 B
+X PD3 B8 -900 -1300 200 R 50 50 1 1 B
+X PD1 B9 -900 -1100 200 R 50 50 1 1 B
 X PC13 C1 900 -2300 200 L 50 50 1 1 B
+X PC11 C10 900 -2100 200 L 50 50 1 1 B
+X VDDUSB C11 400 2700 200 D 50 50 1 1 W
+X PA10 C12 900 1400 200 L 50 50 1 1 B
+X PE5 C2 -900 200 200 R 50 50 1 1 B
+X PE0 C3 -900 700 200 R 50 50 1 1 B
+X VDD C4 -200 2700 200 D 50 50 1 1 W
+X PB5 C5 900 200 200 L 50 50 1 1 B
+X PD2 C8 -900 -1200 200 R 50 50 1 1 B
+X PD0 C9 -900 -1000 200 R 50 50 1 1 B
 X PC14 D1 900 -2400 200 L 50 50 1 1 B
+X PA9 D10 900 1500 200 L 50 50 1 1 B
+X PA8 D11 900 1600 200 L 50 50 1 1 B
+X PC9 D12 900 -1900 200 L 50 50 1 1 B
+X PE6 D2 -900 100 200 R 50 50 1 1 B
+X VSS D3 -200 -2800 200 U 50 50 1 1 W
 X PC15 E1 900 -2500 200 L 50 50 1 1 B
+X PC8 E10 900 -1800 200 L 50 50 1 1 B
+X PC7 E11 900 -1700 200 L 50 50 1 1 B
+X PC6 E12 900 -1600 200 L 50 50 1 1 B
+X VBAT E2 -300 2700 200 D 50 50 1 1 W
+X VSS E3 -100 -2800 200 U 50 50 1 1 W
+X PH0 F1 -900 1100 200 R 50 50 1 1 I
+X VSS F11 100 -2800 200 U 50 50 1 1 W
+X VSS F12 200 -2800 200 U 50 50 1 1 W
+X VSS F2 0 -2800 200 U 50 50 1 1 W
+X PH1 G1 -900 1000 200 R 50 50 1 1 I
+X VDD G11 0 2700 200 D 50 50 1 1 W
+X VDD G12 100 2700 200 D 50 50 1 1 W
+X VDD G2 -100 2700 200 D 50 50 1 1 W
+X PC0 H1 900 -1000 200 L 50 50 1 1 B
+X PD15 H10 -900 -2500 200 R 50 50 1 1 B
+X PD14 H11 -900 -2400 200 R 50 50 1 1 B
+X PD13 H12 -900 -2300 200 R 50 50 1 1 B
+X NRST H2 -900 2400 200 R 50 50 1 1 I
+X VDD H3 200 2700 200 D 50 50 1 1 W
+X VSSA J1 300 -2800 200 U 50 50 1 1 W
+X PD12 J10 -900 -2200 200 R 50 50 1 1 B
+X PD11 J11 -900 -2100 200 R 50 50 1 1 B
+X PD10 J12 -900 -2000 200 R 50 50 1 1 B
+X PC1 J2 900 -1100 200 L 50 50 1 1 B
 X PC2 J3 900 -1200 200 L 50 50 1 1 B
+X VREF- K1 -900 2100 200 R 50 50 1 1 W
+X PB15 K10 900 -800 200 L 50 50 1 1 B
+X PB14 K11 900 -700 200 L 50 50 1 1 B
+X PB13 K12 900 -600 200 L 50 50 1 1 B
 X PC3 K2 900 -1300 200 L 50 50 1 1 B
+X PA2 K3 900 2200 200 L 50 50 1 1 B
+X PA5 K4 900 1900 200 L 50 50 1 1 B
 X PC4 K5 900 -1400 200 L 50 50 1 1 B
-X PC5 L5 900 -1500 200 L 50 50 1 1 B
-X PC6 E12 900 -1600 200 L 50 50 1 1 B
-X PC7 E11 900 -1700 200 L 50 50 1 1 B
-X PC8 E10 900 -1800 200 L 50 50 1 1 B
-X PC9 D12 900 -1900 200 L 50 50 1 1 B
-X PD0 C9 -900 -1000 200 R 50 50 1 1 B
-X PD1 B9 -900 -1100 200 R 50 50 1 1 B
-X PD10 J12 -900 -2000 200 R 50 50 1 1 B
-X PD11 J11 -900 -2100 200 R 50 50 1 1 B
-X PD12 J10 -900 -2200 200 R 50 50 1 1 B
-X PD13 H12 -900 -2300 200 R 50 50 1 1 B
-X PD14 H11 -900 -2400 200 R 50 50 1 1 B
-X PD15 H10 -900 -2500 200 R 50 50 1 1 B
-X PD2 C8 -900 -1200 200 R 50 50 1 1 B
-X PD3 B8 -900 -1300 200 R 50 50 1 1 B
-X PD4 B7 -900 -1400 200 R 50 50 1 1 B
-X PD5 A6 -900 -1500 200 R 50 50 1 1 B
-X PD6 B6 -900 -1600 200 R 50 50 1 1 B
-X PD7 A5 -900 -1700 200 R 50 50 1 1 B
-X PD8 K9 -900 -1800 200 R 50 50 1 1 B
 X PD9 K8 -900 -1900 200 R 50 50 1 1 B
-X PE0 C3 -900 700 200 R 50 50 1 1 B
-X PE1 A2 -900 600 200 R 50 50 1 1 B
+X PD8 K9 -900 -1800 200 R 50 50 1 1 B
+X VREF+ L1 -900 2200 200 R 50 50 1 1 B
+X PB10 L10 900 -300 200 L 50 50 1 1 B
+X PB11 L11 900 -400 200 L 50 50 1 1 B
+X PB12 L12 900 -500 200 L 50 50 1 1 B
+X PA0 L2 900 2400 200 L 50 50 1 1 B
+X PA3 L3 900 2100 200 L 50 50 1 1 B
+X PA6 L4 900 1800 200 L 50 50 1 1 B
+X PC5 L5 900 -1500 200 L 50 50 1 1 B
+X PB2 L6 900 500 200 L 50 50 1 1 B
+X PE8 L7 -900 -100 200 R 50 50 1 1 B
 X PE10 L8 -900 -300 200 R 50 50 1 1 B
-X PE11 M9 -900 -400 200 R 50 50 1 1 B
 X PE12 L9 -900 -500 200 R 50 50 1 1 B
+X VDDA M1 300 2700 200 D 50 50 1 1 W
 X PE13 M10 -900 -600 200 R 50 50 1 1 B
 X PE14 M11 -900 -700 200 R 50 50 1 1 B
 X PE15 M12 -900 -800 200 R 50 50 1 1 B
-X PE2 B2 -900 500 200 R 50 50 1 1 B
-X PE3 A1 -900 400 200 R 50 50 1 1 B
-X PE4 B1 -900 300 200 R 50 50 1 1 B
-X PE5 C2 -900 200 200 R 50 50 1 1 B
-X PE6 D2 -900 100 200 R 50 50 1 1 B
+X PA1 M2 900 2300 200 L 50 50 1 1 B
+X PA4 M3 900 2000 200 L 50 50 1 1 B
+X PA7 M4 900 1700 200 L 50 50 1 1 B
+X PB0 M5 900 700 200 L 50 50 1 1 B
+X PB1 M6 900 600 200 L 50 50 1 1 B
 X PE7 M7 -900 0 200 R 50 50 1 1 B
-X PE8 L7 -900 -100 200 R 50 50 1 1 B
 X PE9 M8 -900 -200 200 R 50 50 1 1 B
-X PH0 F1 -900 1100 200 R 50 50 1 1 I
-X PH1 G1 -900 1000 200 R 50 50 1 1 I
-X PH3 A4 -900 900 200 R 50 50 1 1 B
-X VBAT E2 -300 2700 200 D 50 50 1 1 W
-X VDD C4 -200 2700 200 D 50 50 1 1 W
-X VDD G11 0 2700 200 D 50 50 1 1 W
-X VDD G12 100 2700 200 D 50 50 1 1 W
-X VDD G2 -100 2700 200 D 50 50 1 1 W
-X VDD H3 200 2700 200 D 50 50 1 1 W
-X VDDA M1 300 2700 200 D 50 50 1 1 W
-X VDDUSB C11 400 2700 200 D 50 50 1 1 W
-X VREF+ L1 -900 2200 200 R 50 50 1 1 B
-X VREF- K1 -900 2100 200 R 50 50 1 1 W
-X VSS D3 -200 -2800 200 U 50 50 1 1 W
-X VSS E3 -100 -2800 200 U 50 50 1 1 W
-X VSS F11 100 -2800 200 U 50 50 1 1 W
-X VSS F12 200 -2800 200 U 50 50 1 1 W
-X VSS F2 0 -2800 200 U 50 50 1 1 W
-X VSSA J1 300 -2800 200 U 50 50 1 1 W
+X PE11 M9 -900 -400 200 R 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
@@ -3793,106 +3793,106 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -700 -2600 700 2500 0 1 10 f
+X PE2 1 -900 500 200 R 50 50 1 1 B
+X VSS 10 -200 -2800 200 U 50 50 1 1 W
+X VDD 100 200 2700 200 D 50 50 1 1 W
+X VDD 11 -200 2700 200 D 50 50 1 1 W
+X PH0 12 -900 1100 200 R 50 50 1 1 I
+X PH1 13 -900 1000 200 R 50 50 1 1 I
 X NRST 14 -900 2400 200 R 50 50 1 1 I
+X PC0 15 900 -1000 200 L 50 50 1 1 B
+X PC1 16 900 -1100 200 L 50 50 1 1 B
+X PC2 17 900 -1200 200 L 50 50 1 1 B
+X PC3 18 900 -1300 200 L 50 50 1 1 B
+X VSSA 19 300 -2800 200 U 50 50 1 1 W
+X PE3 2 -900 400 200 R 50 50 1 1 B
+X VREF- 20 -900 2100 200 R 50 50 1 1 W
+X VREF+ 21 -900 2200 200 R 50 50 1 1 B
+X VDDA 22 300 2700 200 D 50 50 1 1 W
 X PA0 23 900 2400 200 L 50 50 1 1 B
 X PA1 24 900 2300 200 L 50 50 1 1 B
-X PA10 69 900 1400 200 L 50 50 1 1 B
-X PA11 70 900 1300 200 L 50 50 1 1 B
-X PA12 71 900 1200 200 L 50 50 1 1 B
-X PA13 72 900 1100 200 L 50 50 1 1 B
-X PA14 76 900 1000 200 L 50 50 1 1 B
-X PA15 77 900 900 200 L 50 50 1 1 B
 X PA2 25 900 2200 200 L 50 50 1 1 B
 X PA3 26 900 2100 200 L 50 50 1 1 B
+X VSS 27 -100 -2800 200 U 50 50 1 1 W
+X VDD 28 -100 2700 200 D 50 50 1 1 W
 X PA4 29 900 2000 200 L 50 50 1 1 B
+X PE4 3 -900 300 200 R 50 50 1 1 B
 X PA5 30 900 1900 200 L 50 50 1 1 B
 X PA6 31 900 1800 200 L 50 50 1 1 B
 X PA7 32 900 1700 200 L 50 50 1 1 B
-X PA8 67 900 1600 200 L 50 50 1 1 B
-X PA9 68 900 1500 200 L 50 50 1 1 B
+X PC4 33 900 -1400 200 L 50 50 1 1 B
+X PC5 34 900 -1500 200 L 50 50 1 1 B
 X PB0 35 900 700 200 L 50 50 1 1 B
 X PB1 36 900 600 200 L 50 50 1 1 B
+X PB2 37 900 500 200 L 50 50 1 1 B
+X PE7 38 -900 0 200 R 50 50 1 1 B
+X PE8 39 -900 -100 200 R 50 50 1 1 B
+X PE5 4 -900 200 200 R 50 50 1 1 B
+X PE9 40 -900 -200 200 R 50 50 1 1 B
+X PE10 41 -900 -300 200 R 50 50 1 1 B
+X PE11 42 -900 -400 200 R 50 50 1 1 B
+X PE12 43 -900 -500 200 R 50 50 1 1 B
+X PE13 44 -900 -600 200 R 50 50 1 1 B
+X PE14 45 -900 -700 200 R 50 50 1 1 B
+X PE15 46 -900 -800 200 R 50 50 1 1 B
 X PB10 47 900 -300 200 L 50 50 1 1 B
 X PB11 48 900 -400 200 L 50 50 1 1 B
+X VSS 49 0 -2800 200 U 50 50 1 1 W
+X PE6 5 -900 100 200 R 50 50 1 1 B
+X VDD 50 0 2700 200 D 50 50 1 1 W
 X PB12 51 900 -500 200 L 50 50 1 1 B
 X PB13 52 900 -600 200 L 50 50 1 1 B
 X PB14 53 900 -700 200 L 50 50 1 1 B
 X PB15 54 900 -800 200 L 50 50 1 1 B
-X PB2 37 900 500 200 L 50 50 1 1 B
-X PB3 89 900 400 200 L 50 50 1 1 B
-X PB4 90 900 300 200 L 50 50 1 1 B
-X PB5 91 900 200 200 L 50 50 1 1 B
-X PB6 92 900 100 200 L 50 50 1 1 B
-X PB7 93 900 0 200 L 50 50 1 1 B
-X PB8 95 900 -100 200 L 50 50 1 1 B
-X PB9 96 900 -200 200 L 50 50 1 1 B
-X PC0 15 900 -1000 200 L 50 50 1 1 B
-X PC1 16 900 -1100 200 L 50 50 1 1 B
-X PC10 78 900 -2000 200 L 50 50 1 1 B
-X PC11 79 900 -2100 200 L 50 50 1 1 B
-X PC12 80 900 -2200 200 L 50 50 1 1 B
-X PC13 7 900 -2300 200 L 50 50 1 1 B
-X PC14 8 900 -2400 200 L 50 50 1 1 B
-X PC15 9 900 -2500 200 L 50 50 1 1 B
-X PC2 17 900 -1200 200 L 50 50 1 1 B
-X PC3 18 900 -1300 200 L 50 50 1 1 B
-X PC4 33 900 -1400 200 L 50 50 1 1 B
-X PC5 34 900 -1500 200 L 50 50 1 1 B
-X PC6 63 900 -1600 200 L 50 50 1 1 B
-X PC7 64 900 -1700 200 L 50 50 1 1 B
-X PC8 65 900 -1800 200 L 50 50 1 1 B
-X PC9 66 900 -1900 200 L 50 50 1 1 B
-X PD0 81 -900 -1000 200 R 50 50 1 1 B
-X PD1 82 -900 -1100 200 R 50 50 1 1 B
+X PD8 55 -900 -1800 200 R 50 50 1 1 B
+X PD9 56 -900 -1900 200 R 50 50 1 1 B
 X PD10 57 -900 -2000 200 R 50 50 1 1 B
 X PD11 58 -900 -2100 200 R 50 50 1 1 B
 X PD12 59 -900 -2200 200 R 50 50 1 1 B
+X VBAT 6 -300 2700 200 D 50 50 1 1 W
 X PD13 60 -900 -2300 200 R 50 50 1 1 B
 X PD14 61 -900 -2400 200 R 50 50 1 1 B
 X PD15 62 -900 -2500 200 R 50 50 1 1 B
-X PD2 83 -900 -1200 200 R 50 50 1 1 B
-X PD3 84 -900 -1300 200 R 50 50 1 1 B
-X PD4 85 -900 -1400 200 R 50 50 1 1 B
+X PC6 63 900 -1600 200 L 50 50 1 1 B
+X PC7 64 900 -1700 200 L 50 50 1 1 B
+X PC8 65 900 -1800 200 L 50 50 1 1 B
+X PC9 66 900 -1900 200 L 50 50 1 1 B
+X PA8 67 900 1600 200 L 50 50 1 1 B
+X PA9 68 900 1500 200 L 50 50 1 1 B
+X PA10 69 900 1400 200 L 50 50 1 1 B
+X PC13 7 900 -2300 200 L 50 50 1 1 B
+X PA11 70 900 1300 200 L 50 50 1 1 B
+X PA12 71 900 1200 200 L 50 50 1 1 B
+X PA13 72 900 1100 200 L 50 50 1 1 B
+X VDDUSB 73 400 2700 200 D 50 50 1 1 W
+X VSS 74 100 -2800 200 U 50 50 1 1 W
+X VDD 75 100 2700 200 D 50 50 1 1 W
+X PA14 76 900 1000 200 L 50 50 1 1 B
+X PA15 77 900 900 200 L 50 50 1 1 B
+X PC10 78 900 -2000 200 L 50 50 1 1 B
+X PC11 79 900 -2100 200 L 50 50 1 1 B
+X PC14 8 900 -2400 200 L 50 50 1 1 B
+X PC12 80 900 -2200 200 L 50 50 1 1 B
+X PD0 81 -900 -1000 200 R 50 50 1 1 B
+X PD1 82 -900 -1100 200 R 50 50 1 1 B
+X PD2 83 -900 -1200 200 R 50 50 1 1 B
+X PD3 84 -900 -1300 200 R 50 50 1 1 B
+X PD4 85 -900 -1400 200 R 50 50 1 1 B
 X PD5 86 -900 -1500 200 R 50 50 1 1 B
 X PD6 87 -900 -1600 200 R 50 50 1 1 B
 X PD7 88 -900 -1700 200 R 50 50 1 1 B
-X PD8 55 -900 -1800 200 R 50 50 1 1 B
-X PD9 56 -900 -1900 200 R 50 50 1 1 B
+X PB3 89 900 400 200 L 50 50 1 1 B
+X PC15 9 900 -2500 200 L 50 50 1 1 B
+X PB4 90 900 300 200 L 50 50 1 1 B
+X PB5 91 900 200 200 L 50 50 1 1 B
+X PB6 92 900 100 200 L 50 50 1 1 B
+X PB7 93 900 0 200 L 50 50 1 1 B
+X PH3 94 -900 900 200 R 50 50 1 1 B
+X PB8 95 900 -100 200 L 50 50 1 1 B
+X PB9 96 900 -200 200 L 50 50 1 1 B
 X PE0 97 -900 700 200 R 50 50 1 1 B
 X PE1 98 -900 600 200 R 50 50 1 1 B
-X PE10 41 -900 -300 200 R 50 50 1 1 B
-X PE11 42 -900 -400 200 R 50 50 1 1 B
-X PE12 43 -900 -500 200 R 50 50 1 1 B
-X PE13 44 -900 -600 200 R 50 50 1 1 B
-X PE14 45 -900 -700 200 R 50 50 1 1 B
-X PE15 46 -900 -800 200 R 50 50 1 1 B
-X PE2 1 -900 500 200 R 50 50 1 1 B
-X PE3 2 -900 400 200 R 50 50 1 1 B
-X PE4 3 -900 300 200 R 50 50 1 1 B
-X PE5 4 -900 200 200 R 50 50 1 1 B
-X PE6 5 -900 100 200 R 50 50 1 1 B
-X PE7 38 -900 0 200 R 50 50 1 1 B
-X PE8 39 -900 -100 200 R 50 50 1 1 B
-X PE9 40 -900 -200 200 R 50 50 1 1 B
-X PH0 12 -900 1100 200 R 50 50 1 1 I
-X PH1 13 -900 1000 200 R 50 50 1 1 I
-X PH3 94 -900 900 200 R 50 50 1 1 B
-X VBAT 6 -300 2700 200 D 50 50 1 1 W
-X VDD 100 200 2700 200 D 50 50 1 1 W
-X VDD 11 -200 2700 200 D 50 50 1 1 W
-X VDD 28 -100 2700 200 D 50 50 1 1 W
-X VDD 50 0 2700 200 D 50 50 1 1 W
-X VDD 75 100 2700 200 D 50 50 1 1 W
-X VDDA 22 300 2700 200 D 50 50 1 1 W
-X VDDUSB 73 400 2700 200 D 50 50 1 1 W
-X VREF+ 21 -900 2200 200 R 50 50 1 1 B
-X VREF- 20 -900 2100 200 R 50 50 1 1 W
-X VSS 10 -200 -2800 200 U 50 50 1 1 W
-X VSS 27 -100 -2800 200 U 50 50 1 1 W
-X VSS 49 0 -2800 200 U 50 50 1 1 W
-X VSS 74 100 -2800 200 U 50 50 1 1 W
 X VSS 99 200 -2800 200 U 50 50 1 1 W
-X VSSA 19 300 -2800 200 U 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
@@ -3909,218 +3909,218 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -1000 -3400 900 3400 0 1 10 f
-X BOOT0 A4 -1200 3100 200 R 50 50 1 1 I
-X NRST H2 -1200 3300 200 R 50 50 1 1 I
-X OPAMP1_VINM M3 -1200 2700 200 R 50 50 1 1 B
-X OPAMP2_VINM M4 -1200 2600 200 R 50 50 1 1 B
-X PA0 L2 1100 3300 200 L 50 50 1 1 B
-X PA1 M2 1100 3200 200 L 50 50 1 1 B
-X PA10 C12 1100 2300 200 L 50 50 1 1 B
-X PA11 B12 1100 2200 200 L 50 50 1 1 B
-X PA12 A12 1100 2100 200 L 50 50 1 1 B
-X PA13 A11 1100 2000 200 L 50 50 1 1 B
+X PE3 A1 -1200 -2100 200 R 50 50 1 1 B
 X PA14 A10 1100 1900 200 L 50 50 1 1 B
-X PA15 A9 1100 1800 200 L 50 50 1 1 B
-X PA2 K3 1100 3100 200 L 50 50 1 1 B
-X PA3 L3 1100 3000 200 L 50 50 1 1 B
-X PA4 J4 1100 2900 200 L 50 50 1 1 B
-X PA5 K4 1100 2800 200 L 50 50 1 1 B
-X PA6 L4 1100 2700 200 L 50 50 1 1 B
-X PA7 J5 1100 2600 200 L 50 50 1 1 B
-X PA8 D11 1100 2500 200 L 50 50 1 1 B
-X PA9 D10 1100 2400 200 L 50 50 1 1 B
-X PB0 M5 1100 1600 200 L 50 50 1 1 B
-X PB1 M6 1100 1500 200 L 50 50 1 1 B
-X PB10 L10 1100 600 200 L 50 50 1 1 B
-X PB11 L11 1100 500 200 L 50 50 1 1 B
-X PB12 L12 1100 400 200 L 50 50 1 1 B
-X PB13 K12 1100 300 200 L 50 50 1 1 B
-X PB14 K11 1100 200 200 L 50 50 1 1 B
-X PB15 K10 1100 100 200 L 50 50 1 1 B
-X PB2 L6 1100 1400 200 L 50 50 1 1 B
-X PB3 A8 1100 1300 200 L 50 50 1 1 B
-X PB4 A7 1100 1200 200 L 50 50 1 1 B
-X PB5 C5 1100 1100 200 L 50 50 1 1 B
-X PB6 B5 1100 1000 200 L 50 50 1 1 B
-X PB7 B4 1100 900 200 L 50 50 1 1 B
+X PA13 A11 1100 2000 200 L 50 50 1 1 B
+X PA12 A12 1100 2100 200 L 50 50 1 1 B
+X PE1 A2 -1200 -1900 200 R 50 50 1 1 B
 X PB8 A3 1100 800 200 L 50 50 1 1 B
-X PB9 B3 1100 700 200 L 50 50 1 1 B
-X PC0 H1 1100 -100 200 L 50 50 1 1 B
-X PC1 J2 1100 -200 200 L 50 50 1 1 B
-X PC10 B11 1100 -1100 200 L 50 50 1 1 B
-X PC11 C10 1100 -1200 200 L 50 50 1 1 B
+X BOOT0 A4 -1200 3100 200 R 50 50 1 1 I
+X PD7 A5 1100 -2500 200 L 50 50 1 1 B
+X PD5 A6 1100 -2300 200 L 50 50 1 1 B
+X PB4 A7 1100 1200 200 L 50 50 1 1 B
+X PB3 A8 1100 1300 200 L 50 50 1 1 B
+X PA15 A9 1100 1800 200 L 50 50 1 1 B
+X PE4 B1 -1200 -2200 200 R 50 50 1 1 B
 X PC12 B10 1100 -1300 200 L 50 50 1 1 B
+X PC10 B11 1100 -1100 200 L 50 50 1 1 B
+X PA11 B12 1100 2200 200 L 50 50 1 1 B
+X PE2 B2 -1200 -2000 200 R 50 50 1 1 B
+X PB9 B3 1100 700 200 L 50 50 1 1 B
+X PB7 B4 1100 900 200 L 50 50 1 1 B
+X PB6 B5 1100 1000 200 L 50 50 1 1 B
+X PD6 B6 1100 -2400 200 L 50 50 1 1 B
+X PD4 B7 1100 -2200 200 L 50 50 1 1 B
+X PD3 B8 1100 -2100 200 L 50 50 1 1 B
+X PD1 B9 1100 -1900 200 L 50 50 1 1 B
 X PC13 C1 1100 -1400 200 L 50 50 1 1 B
+X PC11 C10 1100 -1200 200 L 50 50 1 1 B
+X VDD C11 -100 3600 200 D 50 50 1 1 W
+X PA10 C12 1100 2300 200 L 50 50 1 1 B
+X PE5 C2 -1200 -2300 200 R 50 50 1 1 B
+X PE0 C3 -1200 -1800 200 R 50 50 1 1 B
+X VDD C4 -200 3600 200 D 50 50 1 1 W
+X PB5 C5 1100 1100 200 L 50 50 1 1 B
+X PG14 C6 -1200 -300 200 R 50 50 1 1 B
+X PG13 C7 -1200 -200 200 R 50 50 1 1 B
+X PD2 C8 1100 -2000 200 L 50 50 1 1 B
+X PD0 C9 1100 -1800 200 L 50 50 1 1 B
 X PC14 D1 1100 -1500 200 L 50 50 1 1 B
-X PC15 E1 1100 -1600 200 L 50 50 1 1 B
-X PC2 J3 1100 -300 200 L 50 50 1 1 B
-X PC3 K2 1100 -400 200 L 50 50 1 1 B
-X PC4 K5 1100 -500 200 L 50 50 1 1 B
-X PC5 L5 1100 -600 200 L 50 50 1 1 B
-X PC6 E12 1100 -700 200 L 50 50 1 1 B
-X PC7 E11 1100 -800 200 L 50 50 1 1 B
-X PC8 E10 1100 -900 200 L 50 50 1 1 B
+X PA9 D10 1100 2400 200 L 50 50 1 1 B
+X PA8 D11 1100 2500 200 L 50 50 1 1 B
 X PC9 D12 1100 -1000 200 L 50 50 1 1 B
-X PD0 C9 1100 -1800 200 L 50 50 1 1 B
-X PD1 B9 1100 -1900 200 L 50 50 1 1 B
-X PD10 J12 1100 -2800 200 L 50 50 1 1 B
-X PD11 J11 1100 -2900 200 L 50 50 1 1 B
-X PD12 J10 1100 -3000 200 L 50 50 1 1 B
-X PD13 H12 1100 -3100 200 L 50 50 1 1 B
-X PD14 H11 1100 -3200 200 L 50 50 1 1 B
-X PD15 H10 1100 -3300 200 L 50 50 1 1 B
-X PD2 C8 1100 -2000 200 L 50 50 1 1 B
-X PD3 B8 1100 -2100 200 L 50 50 1 1 B
-X PD4 B7 1100 -2200 200 L 50 50 1 1 B
-X PD5 A6 1100 -2300 200 L 50 50 1 1 B
-X PD6 B6 1100 -2400 200 L 50 50 1 1 B
-X PD7 A5 1100 -2500 200 L 50 50 1 1 B
-X PD8 K9 1100 -2600 200 L 50 50 1 1 B
-X PD9 K8 1100 -2700 200 L 50 50 1 1 B
-X PE0 C3 -1200 -1800 200 R 50 50 1 1 B
-X PE1 A2 -1200 -1900 200 R 50 50 1 1 B
-X PE10 L8 -1200 -2800 200 R 50 50 1 1 B
-X PE11 M9 -1200 -2900 200 R 50 50 1 1 B
-X PE12 L9 -1200 -3000 200 R 50 50 1 1 B
-X PE13 M10 -1200 -3100 200 R 50 50 1 1 B
-X PE14 M11 -1200 -3200 200 R 50 50 1 1 B
-X PE15 M12 -1200 -3300 200 R 50 50 1 1 B
-X PE2 B2 -1200 -2000 200 R 50 50 1 1 B
-X PE3 A1 -1200 -2100 200 R 50 50 1 1 B
-X PE4 B1 -1200 -2200 200 R 50 50 1 1 B
-X PE5 C2 -1200 -2300 200 R 50 50 1 1 B
 X PE6 D2 -1200 -2400 200 R 50 50 1 1 B
-X PE7 M7 -1200 -2500 200 R 50 50 1 1 B
-X PE8 L7 -1200 -2600 200 R 50 50 1 1 B
-X PE9 M8 -1200 -2700 200 R 50 50 1 1 B
-X PF0 D6 -1200 -600 200 R 50 50 1 1 B
-X PF1 D5 -1200 -700 200 R 50 50 1 1 B
-X PF11 K6 -1200 -1200 200 R 50 50 1 1 B
-X PF12 J7 -1200 -1300 200 R 50 50 1 1 B
-X PF13 K7 -1200 -1400 200 R 50 50 1 1 B
-X PF14 J8 -1200 -1500 200 R 50 50 1 1 B
-X PF15 J9 -1200 -1600 200 R 50 50 1 1 B
+X VSS D3 -200 -3600 200 U 50 50 1 1 W
 X PF2 D4 -1200 -800 200 R 50 50 1 1 B
-X PF3 E4 -1200 -900 200 R 50 50 1 1 B
-X PF4 F3 -1200 -1000 200 R 50 50 1 1 B
-X PF5 F4 -1200 -1100 200 R 50 50 1 1 B
-X PG0 H9 -1200 1100 200 R 50 50 1 1 B
-X PG1 G9 -1200 1000 200 R 50 50 1 1 B
-X PG10 D8 -1200 100 200 R 50 50 1 1 B
-X PG11 G3 -1200 0 200 R 50 50 1 1 B
+X PF1 D5 -1200 -700 200 R 50 50 1 1 B
+X PF0 D6 -1200 -600 200 R 50 50 1 1 B
 X PG12 D7 -1200 -100 200 R 50 50 1 1 B
-X PG13 C7 -1200 -200 200 R 50 50 1 1 B
-X PG14 C6 -1200 -300 200 R 50 50 1 1 B
-X PG15 K1 -1200 -400 200 R 50 50 1 1 B
-X PG2 G10 -1200 900 200 R 50 50 1 1 B
-X PG3 F9 -1200 800 200 R 50 50 1 1 B
-X PG4 F10 -1200 700 200 R 50 50 1 1 B
-X PG5 E9 -1200 600 200 R 50 50 1 1 B
-X PG6 G4 -1200 500 200 R 50 50 1 1 B
-X PG7 H4 -1200 400 200 R 50 50 1 1 B
-X PG8 J6 -1200 300 200 R 50 50 1 1 B
+X PG10 D8 -1200 100 200 R 50 50 1 1 B
 X PG9 D9 -1200 200 200 R 50 50 1 1 B
-X PH0 F1 -1200 1400 200 R 50 50 1 1 I
-X PH1 G1 -1200 1300 200 R 50 50 1 1 I
+X PC15 E1 1100 -1600 200 L 50 50 1 1 B
+X PC8 E10 1100 -900 200 L 50 50 1 1 B
+X PC7 E11 1100 -800 200 L 50 50 1 1 B
+X PC6 E12 1100 -700 200 L 50 50 1 1 B
 X VBAT E2 -300 3600 200 D 50 50 1 1 W
-X VDD C4 -200 3600 200 D 50 50 1 1 W
-X VDD G11 100 3600 200 D 50 50 1 1 W
-X VDD G12 200 3600 200 D 50 50 1 1 W
-X VDD G2 -100 3600 200 D 50 50 1 1 W
-X VDD G6 0 3600 200 D 50 50 1 1 W
-X VDD H3 300 3600 200 D 50 50 1 1 W
-X VDDA M1 400 3600 200 D 50 50 1 1 W
-X VDDIO2 G7 500 3600 200 D 50 50 1 1 W
-X VDDUSB C11 600 3600 200 D 50 50 1 1 W
-X VREF+ L1 -1200 2900 200 R 50 50 1 1 B
-X VSS D3 -200 -3600 200 U 50 50 1 1 W
 X VSS E3 -100 -3600 200 U 50 50 1 1 W
+X PF3 E4 -1200 -900 200 R 50 50 1 1 B
+X PG5 E9 -1200 600 200 R 50 50 1 1 B
+X PH0 F1 -1200 1400 200 R 50 50 1 1 I
+X PG4 F10 -1200 700 200 R 50 50 1 1 B
 X VSS F11 300 -3600 200 U 50 50 1 1 W
 X VSS F12 400 -3600 200 U 50 50 1 1 W
 X VSS F2 0 -3600 200 U 50 50 1 1 W
+X PF4 F3 -1200 -1000 200 R 50 50 1 1 B
+X PF5 F4 -1200 -1100 200 R 50 50 1 1 B
 X VSS F6 100 -3600 200 U 50 50 1 1 W
 X VSS F7 200 -3600 200 U 50 50 1 1 W
+X PG3 F9 -1200 800 200 R 50 50 1 1 B
+X PH1 G1 -1200 1300 200 R 50 50 1 1 I
+X PG2 G10 -1200 900 200 R 50 50 1 1 B
+X VDD G11 200 3600 200 D 50 50 1 1 W
+X VDD G12 300 3600 200 D 50 50 1 1 W
+X VDD G2 0 3600 200 D 50 50 1 1 W
+X PG11 G3 -1200 0 200 R 50 50 1 1 B
+X PG6 G4 -1200 500 200 R 50 50 1 1 B
+X VDD G6 100 3600 200 D 50 50 1 1 W
+X VDDIO2 G7 600 3600 200 D 50 50 1 1 W
+X PG1 G9 -1200 1000 200 R 50 50 1 1 B
+X PC0 H1 1100 -100 200 L 50 50 1 1 B
+X PD15 H10 1100 -3300 200 L 50 50 1 1 B
+X PD14 H11 1100 -3200 200 L 50 50 1 1 B
+X PD13 H12 1100 -3100 200 L 50 50 1 1 B
+X NRST H2 -1200 3300 200 R 50 50 1 1 I
+X VDD H3 400 3600 200 D 50 50 1 1 W
+X PG7 H4 -1200 400 200 R 50 50 1 1 B
+X PG0 H9 -1200 1100 200 R 50 50 1 1 B
 X VSSA J1 500 -3600 200 U 50 50 1 1 W
-ENDDRAW
-ENDDEF
-#
-# STM32L471RETx
-#
-DEF STM32L471RETx U 0 20 Y Y 1 F N
-F0 "U" -600 1750 50 H V L CNN
-F1 "STM32L471RETx" 400 1750 50 H V L CNN
-F2 "Package_QFP:LQFP-64_10x10mm_P0.5mm" -600 -1700 50 H I R CNN
-F3 "" 0 0 50 H I C CNN
-ALIAS STM32L471RGTx
-$FPLIST
- LQFP*10x10mm*P0.5mm*
-$ENDFPLIST
+X PD12 J10 1100 -3000 200 L 50 50 1 1 B
+X PD11 J11 1100 -2900 200 L 50 50 1 1 B
+X PD10 J12 1100 -2800 200 L 50 50 1 1 B
+X PC1 J2 1100 -200 200 L 50 50 1 1 B
+X PC2 J3 1100 -300 200 L 50 50 1 1 B
+X PA4 J4 1100 2900 200 L 50 50 1 1 B
+X PA7 J5 1100 2600 200 L 50 50 1 1 B
+X PG8 J6 -1200 300 200 R 50 50 1 1 B
+X PF12 J7 -1200 -1300 200 R 50 50 1 1 B
+X PF14 J8 -1200 -1500 200 R 50 50 1 1 B
+X PF15 J9 -1200 -1600 200 R 50 50 1 1 B
+X PG15 K1 -1200 -400 200 R 50 50 1 1 B
+X PB15 K10 1100 100 200 L 50 50 1 1 B
+X PB14 K11 1100 200 200 L 50 50 1 1 B
+X PB13 K12 1100 300 200 L 50 50 1 1 B
+X PC3 K2 1100 -400 200 L 50 50 1 1 B
+X PA2 K3 1100 3100 200 L 50 50 1 1 B
+X PA5 K4 1100 2800 200 L 50 50 1 1 B
+X PC4 K5 1100 -500 200 L 50 50 1 1 B
+X PF11 K6 -1200 -1200 200 R 50 50 1 1 B
+X PF13 K7 -1200 -1400 200 R 50 50 1 1 B
+X PD9 K8 1100 -2700 200 L 50 50 1 1 B
+X PD8 K9 1100 -2600 200 L 50 50 1 1 B
+X VREF+ L1 -1200 2900 200 R 50 50 1 1 B
+X PB10 L10 1100 600 200 L 50 50 1 1 B
+X PB11 L11 1100 500 200 L 50 50 1 1 B
+X PB12 L12 1100 400 200 L 50 50 1 1 B
+X PA0 L2 1100 3300 200 L 50 50 1 1 B
+X PA3 L3 1100 3000 200 L 50 50 1 1 B
+X PA6 L4 1100 2700 200 L 50 50 1 1 B
+X PC5 L5 1100 -600 200 L 50 50 1 1 B
+X PB2 L6 1100 1400 200 L 50 50 1 1 B
+X PE8 L7 -1200 -2600 200 R 50 50 1 1 B
+X PE10 L8 -1200 -2800 200 R 50 50 1 1 B
+X PE12 L9 -1200 -3000 200 R 50 50 1 1 B
+X VDDA M1 500 3600 200 D 50 50 1 1 W
+X PE13 M10 -1200 -3100 200 R 50 50 1 1 B
+X PE14 M11 -1200 -3200 200 R 50 50 1 1 B
+X PE15 M12 -1200 -3300 200 R 50 50 1 1 B
+X PA1 M2 1100 3200 200 L 50 50 1 1 B
+X OPAMP1_VINM M3 -1200 2700 200 R 50 50 1 1 B
+X OPAMP2_VINM M4 -1200 2600 200 R 50 50 1 1 B
+X PB0 M5 1100 1600 200 L 50 50 1 1 B
+X PB1 M6 1100 1500 200 L 50 50 1 1 B
+X PE7 M7 -1200 -2500 200 R 50 50 1 1 B
+X PE9 M8 -1200 -2700 200 R 50 50 1 1 B
+X PE11 M9 -1200 -2900 200 R 50 50 1 1 B
+ENDDRAW
+ENDDEF
+#
+# STM32L471RETx
+#
+DEF STM32L471RETx U 0 20 Y Y 1 F N
+F0 "U" -600 1750 50 H V L CNN
+F1 "STM32L471RETx" 400 1750 50 H V L CNN
+F2 "Package_QFP:LQFP-64_10x10mm_P0.5mm" -600 -1700 50 H I R CNN
+F3 "" 0 0 50 H I C CNN
+ALIAS STM32L471RGTx
+$FPLIST
+ LQFP*10x10mm*P0.5mm*
+$ENDFPLIST
 DRAW
 S -600 -1700 600 1700 0 1 10 f
-X BOOT0 60 -700 1400 100 R 50 50 1 1 I
-X NRST 7 -700 1600 100 R 50 50 1 1 I
+X VBAT 1 -200 1800 100 D 50 50 1 1 W
+X PC2 10 -700 -300 100 R 50 50 1 1 B
+X PC3 11 -700 -400 100 R 50 50 1 1 B
+X VSSA 12 200 -1800 100 U 50 50 1 1 W
+X VDDA 13 300 1800 100 D 50 50 1 1 W
 X PA0 14 700 1600 100 L 50 50 1 1 B
 X PA1 15 700 1500 100 L 50 50 1 1 B
-X PA10 43 700 600 100 L 50 50 1 1 B
-X PA11 44 700 500 100 L 50 50 1 1 B
-X PA12 45 700 400 100 L 50 50 1 1 B
-X PA13 46 700 300 100 L 50 50 1 1 B
-X PA14 49 700 200 100 L 50 50 1 1 B
-X PA15 50 700 100 100 L 50 50 1 1 B
 X PA2 16 700 1400 100 L 50 50 1 1 B
 X PA3 17 700 1300 100 L 50 50 1 1 B
+X VSS 18 -200 -1800 100 U 50 50 1 1 W
+X VDD 19 -100 1800 100 D 50 50 1 1 W
+X PC13 2 -700 -1400 100 R 50 50 1 1 B
 X PA4 20 700 1200 100 L 50 50 1 1 B
 X PA5 21 700 1100 100 L 50 50 1 1 B
 X PA6 22 700 1000 100 L 50 50 1 1 B
 X PA7 23 700 900 100 L 50 50 1 1 B
-X PA8 41 700 800 100 L 50 50 1 1 B
-X PA9 42 700 700 100 L 50 50 1 1 B
+X PC4 24 -700 -500 100 R 50 50 1 1 B
+X PC5 25 -700 -600 100 R 50 50 1 1 B
 X PB0 26 700 -100 100 L 50 50 1 1 B
 X PB1 27 700 -200 100 L 50 50 1 1 B
+X PB2 28 700 -300 100 L 50 50 1 1 B
 X PB10 29 700 -1100 100 L 50 50 1 1 B
+X PC14 3 -700 -1500 100 R 50 50 1 1 B
 X PB11 30 700 -1200 100 L 50 50 1 1 B
+X VSS 31 -100 -1800 100 U 50 50 1 1 W
+X VDD 32 0 1800 100 D 50 50 1 1 W
 X PB12 33 700 -1300 100 L 50 50 1 1 B
 X PB13 34 700 -1400 100 L 50 50 1 1 B
 X PB14 35 700 -1500 100 L 50 50 1 1 B
 X PB15 36 700 -1600 100 L 50 50 1 1 B
-X PB2 28 700 -300 100 L 50 50 1 1 B
+X PC6 37 -700 -700 100 R 50 50 1 1 B
+X PC7 38 -700 -800 100 R 50 50 1 1 B
+X PC8 39 -700 -900 100 R 50 50 1 1 B
+X PC15 4 -700 -1600 100 R 50 50 1 1 B
+X PC9 40 -700 -1000 100 R 50 50 1 1 B
+X PA8 41 700 800 100 L 50 50 1 1 B
+X PA9 42 700 700 100 L 50 50 1 1 B
+X PA10 43 700 600 100 L 50 50 1 1 B
+X PA11 44 700 500 100 L 50 50 1 1 B
+X PA12 45 700 400 100 L 50 50 1 1 B
+X PA13 46 700 300 100 L 50 50 1 1 B
+X VSS 47 0 -1800 100 U 50 50 1 1 W
+X VDD 48 100 1800 100 D 50 50 1 1 W
+X PA14 49 700 200 100 L 50 50 1 1 B
+X PH0 5 -700 400 100 R 50 50 1 1 I
+X PA15 50 700 100 100 L 50 50 1 1 B
+X PC10 51 -700 -1100 100 R 50 50 1 1 B
+X PC11 52 -700 -1200 100 R 50 50 1 1 B
+X PC12 53 -700 -1300 100 R 50 50 1 1 B
+X PD2 54 -700 100 100 R 50 50 1 1 B
 X PB3 55 700 -400 100 L 50 50 1 1 B
 X PB4 56 700 -500 100 L 50 50 1 1 B
 X PB5 57 700 -600 100 L 50 50 1 1 B
 X PB6 58 700 -700 100 L 50 50 1 1 B
 X PB7 59 700 -800 100 L 50 50 1 1 B
+X PH1 6 -700 300 100 R 50 50 1 1 I
+X BOOT0 60 -700 1400 100 R 50 50 1 1 I
 X PB8 61 700 -900 100 L 50 50 1 1 B
 X PB9 62 700 -1000 100 L 50 50 1 1 B
+X VSS 63 100 -1800 100 U 50 50 1 1 W
+X VDD 64 200 1800 100 D 50 50 1 1 W
+X NRST 7 -700 1600 100 R 50 50 1 1 I
 X PC0 8 -700 -100 100 R 50 50 1 1 B
 X PC1 9 -700 -200 100 R 50 50 1 1 B
-X PC10 51 -700 -1100 100 R 50 50 1 1 B
-X PC11 52 -700 -1200 100 R 50 50 1 1 B
-X PC12 53 -700 -1300 100 R 50 50 1 1 B
-X PC13 2 -700 -1400 100 R 50 50 1 1 B
-X PC14 3 -700 -1500 100 R 50 50 1 1 B
-X PC15 4 -700 -1600 100 R 50 50 1 1 B
-X PC2 10 -700 -300 100 R 50 50 1 1 B
-X PC3 11 -700 -400 100 R 50 50 1 1 B
-X PC4 24 -700 -500 100 R 50 50 1 1 B
-X PC5 25 -700 -600 100 R 50 50 1 1 B
-X PC6 37 -700 -700 100 R 50 50 1 1 B
-X PC7 38 -700 -800 100 R 50 50 1 1 B
-X PC8 39 -700 -900 100 R 50 50 1 1 B
-X PC9 40 -700 -1000 100 R 50 50 1 1 B
-X PD2 54 -700 100 100 R 50 50 1 1 B
-X PH0 5 -700 400 100 R 50 50 1 1 I
-X PH1 6 -700 300 100 R 50 50 1 1 I
-X VBAT 1 -200 1800 100 D 50 50 1 1 W
-X VDD 19 -100 1800 100 D 50 50 1 1 W
-X VDD 32 0 1800 100 D 50 50 1 1 W
-X VDD 64 100 1800 100 D 50 50 1 1 W
-X VDDA 13 200 1800 100 D 50 50 1 1 W
-X VDDUSB 48 300 1800 100 D 50 50 1 1 W
-X VSS 18 -200 -1800 100 U 50 50 1 1 W
-X VSS 31 -100 -1800 100 U 50 50 1 1 W
-X VSS 47 0 -1800 100 U 50 50 1 1 W
-X VSS 63 100 -1800 100 U 50 50 1 1 W
-X VSSA 12 200 -1800 100 U 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
@@ -4137,106 +4137,106 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -700 -2600 700 2500 0 1 10 f
-X BOOT0 94 -900 2200 200 R 50 50 1 1 I
+X PE2 1 -900 500 200 R 50 50 1 1 B
+X VSS 10 -200 -2800 200 U 50 50 1 1 W
+X VDD 100 300 2700 200 D 50 50 1 1 W
+X VDD 11 -200 2700 200 D 50 50 1 1 W
+X PH0 12 -900 1000 200 R 50 50 1 1 I
+X PH1 13 -900 900 200 R 50 50 1 1 I
 X NRST 14 -900 2400 200 R 50 50 1 1 I
+X PC0 15 900 -1000 200 L 50 50 1 1 B
+X PC1 16 900 -1100 200 L 50 50 1 1 B
+X PC2 17 900 -1200 200 L 50 50 1 1 B
+X PC3 18 900 -1300 200 L 50 50 1 1 B
+X VSSA 19 300 -2800 200 U 50 50 1 1 W
+X PE3 2 -900 400 200 R 50 50 1 1 B
+X VREF- 20 -900 1900 200 R 50 50 1 1 W
+X VREF+ 21 -900 2000 200 R 50 50 1 1 B
+X VDDA 22 400 2700 200 D 50 50 1 1 W
 X PA0 23 900 2400 200 L 50 50 1 1 B
 X PA1 24 900 2300 200 L 50 50 1 1 B
-X PA10 69 900 1400 200 L 50 50 1 1 B
-X PA11 70 900 1300 200 L 50 50 1 1 B
-X PA12 71 900 1200 200 L 50 50 1 1 B
-X PA13 72 900 1100 200 L 50 50 1 1 B
-X PA14 76 900 1000 200 L 50 50 1 1 B
-X PA15 77 900 900 200 L 50 50 1 1 B
 X PA2 25 900 2200 200 L 50 50 1 1 B
 X PA3 26 900 2100 200 L 50 50 1 1 B
+X VSS 27 -100 -2800 200 U 50 50 1 1 W
+X VDD 28 -100 2700 200 D 50 50 1 1 W
 X PA4 29 900 2000 200 L 50 50 1 1 B
+X PE4 3 -900 300 200 R 50 50 1 1 B
 X PA5 30 900 1900 200 L 50 50 1 1 B
 X PA6 31 900 1800 200 L 50 50 1 1 B
 X PA7 32 900 1700 200 L 50 50 1 1 B
-X PA8 67 900 1600 200 L 50 50 1 1 B
-X PA9 68 900 1500 200 L 50 50 1 1 B
+X PC4 33 900 -1400 200 L 50 50 1 1 B
+X PC5 34 900 -1500 200 L 50 50 1 1 B
 X PB0 35 900 700 200 L 50 50 1 1 B
 X PB1 36 900 600 200 L 50 50 1 1 B
+X PB2 37 900 500 200 L 50 50 1 1 B
+X PE7 38 -900 0 200 R 50 50 1 1 B
+X PE8 39 -900 -100 200 R 50 50 1 1 B
+X PE5 4 -900 200 200 R 50 50 1 1 B
+X PE9 40 -900 -200 200 R 50 50 1 1 B
+X PE10 41 -900 -300 200 R 50 50 1 1 B
+X PE11 42 -900 -400 200 R 50 50 1 1 B
+X PE12 43 -900 -500 200 R 50 50 1 1 B
+X PE13 44 -900 -600 200 R 50 50 1 1 B
+X PE14 45 -900 -700 200 R 50 50 1 1 B
+X PE15 46 -900 -800 200 R 50 50 1 1 B
 X PB10 47 900 -300 200 L 50 50 1 1 B
 X PB11 48 900 -400 200 L 50 50 1 1 B
+X VSS 49 0 -2800 200 U 50 50 1 1 W
+X PE6 5 -900 100 200 R 50 50 1 1 B
+X VDD 50 0 2700 200 D 50 50 1 1 W
 X PB12 51 900 -500 200 L 50 50 1 1 B
 X PB13 52 900 -600 200 L 50 50 1 1 B
 X PB14 53 900 -700 200 L 50 50 1 1 B
 X PB15 54 900 -800 200 L 50 50 1 1 B
-X PB2 37 900 500 200 L 50 50 1 1 B
-X PB3 89 900 400 200 L 50 50 1 1 B
-X PB4 90 900 300 200 L 50 50 1 1 B
-X PB5 91 900 200 200 L 50 50 1 1 B
-X PB6 92 900 100 200 L 50 50 1 1 B
-X PB7 93 900 0 200 L 50 50 1 1 B
-X PB8 95 900 -100 200 L 50 50 1 1 B
-X PB9 96 900 -200 200 L 50 50 1 1 B
-X PC0 15 900 -1000 200 L 50 50 1 1 B
-X PC1 16 900 -1100 200 L 50 50 1 1 B
-X PC10 78 900 -2000 200 L 50 50 1 1 B
-X PC11 79 900 -2100 200 L 50 50 1 1 B
-X PC12 80 900 -2200 200 L 50 50 1 1 B
-X PC13 7 900 -2300 200 L 50 50 1 1 B
-X PC14 8 900 -2400 200 L 50 50 1 1 B
-X PC15 9 900 -2500 200 L 50 50 1 1 B
-X PC2 17 900 -1200 200 L 50 50 1 1 B
-X PC3 18 900 -1300 200 L 50 50 1 1 B
-X PC4 33 900 -1400 200 L 50 50 1 1 B
-X PC5 34 900 -1500 200 L 50 50 1 1 B
-X PC6 63 900 -1600 200 L 50 50 1 1 B
-X PC7 64 900 -1700 200 L 50 50 1 1 B
-X PC8 65 900 -1800 200 L 50 50 1 1 B
-X PC9 66 900 -1900 200 L 50 50 1 1 B
-X PD0 81 -900 -1000 200 R 50 50 1 1 B
-X PD1 82 -900 -1100 200 R 50 50 1 1 B
+X PD8 55 -900 -1800 200 R 50 50 1 1 B
+X PD9 56 -900 -1900 200 R 50 50 1 1 B
 X PD10 57 -900 -2000 200 R 50 50 1 1 B
 X PD11 58 -900 -2100 200 R 50 50 1 1 B
 X PD12 59 -900 -2200 200 R 50 50 1 1 B
+X VBAT 6 -300 2700 200 D 50 50 1 1 W
 X PD13 60 -900 -2300 200 R 50 50 1 1 B
 X PD14 61 -900 -2400 200 R 50 50 1 1 B
 X PD15 62 -900 -2500 200 R 50 50 1 1 B
+X PC6 63 900 -1600 200 L 50 50 1 1 B
+X PC7 64 900 -1700 200 L 50 50 1 1 B
+X PC8 65 900 -1800 200 L 50 50 1 1 B
+X PC9 66 900 -1900 200 L 50 50 1 1 B
+X PA8 67 900 1600 200 L 50 50 1 1 B
+X PA9 68 900 1500 200 L 50 50 1 1 B
+X PA10 69 900 1400 200 L 50 50 1 1 B
+X PC13 7 900 -2300 200 L 50 50 1 1 B
+X PA11 70 900 1300 200 L 50 50 1 1 B
+X PA12 71 900 1200 200 L 50 50 1 1 B
+X PA13 72 900 1100 200 L 50 50 1 1 B
+X VDD 73 100 2700 200 D 50 50 1 1 W
+X VSS 74 100 -2800 200 U 50 50 1 1 W
+X VDD 75 200 2700 200 D 50 50 1 1 W
+X PA14 76 900 1000 200 L 50 50 1 1 B
+X PA15 77 900 900 200 L 50 50 1 1 B
+X PC10 78 900 -2000 200 L 50 50 1 1 B
+X PC11 79 900 -2100 200 L 50 50 1 1 B
+X PC14 8 900 -2400 200 L 50 50 1 1 B
+X PC12 80 900 -2200 200 L 50 50 1 1 B
+X PD0 81 -900 -1000 200 R 50 50 1 1 B
+X PD1 82 -900 -1100 200 R 50 50 1 1 B
 X PD2 83 -900 -1200 200 R 50 50 1 1 B
 X PD3 84 -900 -1300 200 R 50 50 1 1 B
 X PD4 85 -900 -1400 200 R 50 50 1 1 B
 X PD5 86 -900 -1500 200 R 50 50 1 1 B
 X PD6 87 -900 -1600 200 R 50 50 1 1 B
 X PD7 88 -900 -1700 200 R 50 50 1 1 B
-X PD8 55 -900 -1800 200 R 50 50 1 1 B
-X PD9 56 -900 -1900 200 R 50 50 1 1 B
+X PB3 89 900 400 200 L 50 50 1 1 B
+X PC15 9 900 -2500 200 L 50 50 1 1 B
+X PB4 90 900 300 200 L 50 50 1 1 B
+X PB5 91 900 200 200 L 50 50 1 1 B
+X PB6 92 900 100 200 L 50 50 1 1 B
+X PB7 93 900 0 200 L 50 50 1 1 B
+X BOOT0 94 -900 2200 200 R 50 50 1 1 I
+X PB8 95 900 -100 200 L 50 50 1 1 B
+X PB9 96 900 -200 200 L 50 50 1 1 B
 X PE0 97 -900 700 200 R 50 50 1 1 B
 X PE1 98 -900 600 200 R 50 50 1 1 B
-X PE10 41 -900 -300 200 R 50 50 1 1 B
-X PE11 42 -900 -400 200 R 50 50 1 1 B
-X PE12 43 -900 -500 200 R 50 50 1 1 B
-X PE13 44 -900 -600 200 R 50 50 1 1 B
-X PE14 45 -900 -700 200 R 50 50 1 1 B
-X PE15 46 -900 -800 200 R 50 50 1 1 B
-X PE2 1 -900 500 200 R 50 50 1 1 B
-X PE3 2 -900 400 200 R 50 50 1 1 B
-X PE4 3 -900 300 200 R 50 50 1 1 B
-X PE5 4 -900 200 200 R 50 50 1 1 B
-X PE6 5 -900 100 200 R 50 50 1 1 B
-X PE7 38 -900 0 200 R 50 50 1 1 B
-X PE8 39 -900 -100 200 R 50 50 1 1 B
-X PE9 40 -900 -200 200 R 50 50 1 1 B
-X PH0 12 -900 1000 200 R 50 50 1 1 I
-X PH1 13 -900 900 200 R 50 50 1 1 I
-X VBAT 6 -300 2700 200 D 50 50 1 1 W
-X VDD 100 200 2700 200 D 50 50 1 1 W
-X VDD 11 -200 2700 200 D 50 50 1 1 W
-X VDD 28 -100 2700 200 D 50 50 1 1 W
-X VDD 50 0 2700 200 D 50 50 1 1 W
-X VDD 75 100 2700 200 D 50 50 1 1 W
-X VDDA 22 300 2700 200 D 50 50 1 1 W
-X VDDUSB 73 400 2700 200 D 50 50 1 1 W
-X VREF+ 21 -900 2000 200 R 50 50 1 1 B
-X VREF- 20 -900 1900 200 R 50 50 1 1 W
-X VSS 10 -200 -2800 200 U 50 50 1 1 W
-X VSS 27 -100 -2800 200 U 50 50 1 1 W
-X VSS 49 0 -2800 200 U 50 50 1 1 W
-X VSS 74 100 -2800 200 U 50 50 1 1 W
 X VSS 99 200 -2800 200 U 50 50 1 1 W
-X VSSA 19 300 -2800 200 U 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
@@ -4253,150 +4253,150 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -1000 -3400 1000 3400 0 1 10 f
-X BOOT0 138 -1200 3100 200 R 50 50 1 1 I
-X NRST 25 -1200 3300 200 R 50 50 1 1 I
-X PA0 34 1200 3300 200 L 50 50 1 1 B
-X PA1 35 1200 3200 200 L 50 50 1 1 B
+X PE2 1 -1200 -2000 200 R 50 50 1 1 B
+X PF0 10 -1200 -100 200 R 50 50 1 1 B
+X PA8 100 1200 2500 200 L 50 50 1 1 B
+X PA9 101 1200 2400 200 L 50 50 1 1 B
 X PA10 102 1200 2300 200 L 50 50 1 1 B
 X PA11 103 1200 2200 200 L 50 50 1 1 B
 X PA12 104 1200 2100 200 L 50 50 1 1 B
 X PA13 105 1200 2000 200 L 50 50 1 1 B
+X VDD 106 100 3600 200 D 50 50 1 1 W
+X VSS 107 200 -3600 200 U 50 50 1 1 W
+X VDD 108 200 3600 200 D 50 50 1 1 W
 X PA14 109 1200 1900 200 L 50 50 1 1 B
+X PF1 11 -1200 -200 200 R 50 50 1 1 B
 X PA15 110 1200 1800 200 L 50 50 1 1 B
-X PA2 36 1200 3100 200 L 50 50 1 1 B
-X PA3 37 1200 3000 200 L 50 50 1 1 B
-X PA4 40 1200 2900 200 L 50 50 1 1 B
-X PA5 41 1200 2800 200 L 50 50 1 1 B
-X PA6 42 1200 2700 200 L 50 50 1 1 B
-X PA7 43 1200 2600 200 L 50 50 1 1 B
-X PA8 100 1200 2500 200 L 50 50 1 1 B
-X PA9 101 1200 2400 200 L 50 50 1 1 B
-X PB0 46 1200 1600 200 L 50 50 1 1 B
-X PB1 47 1200 1500 200 L 50 50 1 1 B
-X PB10 69 1200 600 200 L 50 50 1 1 B
-X PB11 70 1200 500 200 L 50 50 1 1 B
-X PB12 73 1200 400 200 L 50 50 1 1 B
-X PB13 74 1200 300 200 L 50 50 1 1 B
-X PB14 75 1200 200 200 L 50 50 1 1 B
-X PB15 76 1200 100 200 L 50 50 1 1 B
-X PB2 48 1200 1400 200 L 50 50 1 1 B
-X PB3 133 1200 1300 200 L 50 50 1 1 B
-X PB4 134 1200 1200 200 L 50 50 1 1 B
-X PB5 135 1200 1100 200 L 50 50 1 1 B
-X PB6 136 1200 1000 200 L 50 50 1 1 B
-X PB7 137 1200 900 200 L 50 50 1 1 B
-X PB8 139 1200 800 200 L 50 50 1 1 B
-X PB9 140 1200 700 200 L 50 50 1 1 B
-X PC0 26 1200 -100 200 L 50 50 1 1 B
-X PC1 27 1200 -200 200 L 50 50 1 1 B
 X PC10 111 1200 -1100 200 L 50 50 1 1 B
 X PC11 112 1200 -1200 200 L 50 50 1 1 B
 X PC12 113 1200 -1300 200 L 50 50 1 1 B
-X PC13 7 1200 -1400 200 L 50 50 1 1 B
-X PC14 8 1200 -1500 200 L 50 50 1 1 B
-X PC15 9 1200 -1600 200 L 50 50 1 1 B
-X PC2 28 1200 -300 200 L 50 50 1 1 B
-X PC3 29 1200 -400 200 L 50 50 1 1 B
-X PC4 44 1200 -500 200 L 50 50 1 1 B
-X PC5 45 1200 -600 200 L 50 50 1 1 B
-X PC6 96 1200 -700 200 L 50 50 1 1 B
-X PC7 97 1200 -800 200 L 50 50 1 1 B
-X PC8 98 1200 -900 200 L 50 50 1 1 B
-X PC9 99 1200 -1000 200 L 50 50 1 1 B
 X PD0 114 1200 -1800 200 L 50 50 1 1 B
 X PD1 115 1200 -1900 200 L 50 50 1 1 B
-X PD10 79 1200 -2800 200 L 50 50 1 1 B
-X PD11 80 1200 -2900 200 L 50 50 1 1 B
-X PD12 81 1200 -3000 200 L 50 50 1 1 B
-X PD13 82 1200 -3100 200 L 50 50 1 1 B
-X PD14 85 1200 -3200 200 L 50 50 1 1 B
-X PD15 86 1200 -3300 200 L 50 50 1 1 B
 X PD2 116 1200 -2000 200 L 50 50 1 1 B
 X PD3 117 1200 -2100 200 L 50 50 1 1 B
 X PD4 118 1200 -2200 200 L 50 50 1 1 B
 X PD5 119 1200 -2300 200 L 50 50 1 1 B
+X PF2 12 -1200 -300 200 R 50 50 1 1 B
+X VSS 120 300 -3600 200 U 50 50 1 1 W
+X VDD 121 300 3600 200 D 50 50 1 1 W
 X PD6 122 1200 -2400 200 L 50 50 1 1 B
 X PD7 123 1200 -2500 200 L 50 50 1 1 B
-X PD8 77 1200 -2600 200 L 50 50 1 1 B
-X PD9 78 1200 -2700 200 L 50 50 1 1 B
+X PG9 124 -1200 700 200 R 50 50 1 1 B
+X PG10 125 -1200 600 200 R 50 50 1 1 B
+X PG11 126 -1200 500 200 R 50 50 1 1 B
+X PG12 127 -1200 400 200 R 50 50 1 1 B
+X PG13 128 -1200 300 200 R 50 50 1 1 B
+X PG14 129 -1200 200 200 R 50 50 1 1 B
+X PF3 13 -1200 -400 200 R 50 50 1 1 B
+X VSS 130 400 -3600 200 U 50 50 1 1 W
+X VDDIO2 131 700 3600 200 D 50 50 1 1 W
+X PG15 132 -1200 100 200 R 50 50 1 1 B
+X PB3 133 1200 1300 200 L 50 50 1 1 B
+X PB4 134 1200 1200 200 L 50 50 1 1 B
+X PB5 135 1200 1100 200 L 50 50 1 1 B
+X PB6 136 1200 1000 200 L 50 50 1 1 B
+X PB7 137 1200 900 200 L 50 50 1 1 B
+X BOOT0 138 -1200 3100 200 R 50 50 1 1 I
+X PB8 139 1200 800 200 L 50 50 1 1 B
+X PF4 14 -1200 -500 200 R 50 50 1 1 B
+X PB9 140 1200 700 200 L 50 50 1 1 B
 X PE0 141 -1200 -1800 200 R 50 50 1 1 B
 X PE1 142 -1200 -1900 200 R 50 50 1 1 B
-X PE10 63 -1200 -2800 200 R 50 50 1 1 B
-X PE11 64 -1200 -2900 200 R 50 50 1 1 B
-X PE12 65 -1200 -3000 200 R 50 50 1 1 B
-X PE13 66 -1200 -3100 200 R 50 50 1 1 B
-X PE14 67 -1200 -3200 200 R 50 50 1 1 B
-X PE15 68 -1200 -3300 200 R 50 50 1 1 B
-X PE2 1 -1200 -2000 200 R 50 50 1 1 B
+X VSS 143 500 -3600 200 U 50 50 1 1 W
+X VDD 144 400 3600 200 D 50 50 1 1 W
+X PF5 15 -1200 -600 200 R 50 50 1 1 B
+X VSS 16 -500 -3600 200 U 50 50 1 1 W
+X VDD 17 -500 3600 200 D 50 50 1 1 W
+X PF6 18 -1200 -700 200 R 50 50 1 1 B
+X PF7 19 -1200 -800 200 R 50 50 1 1 B
 X PE3 2 -1200 -2100 200 R 50 50 1 1 B
+X PF8 20 -1200 -900 200 R 50 50 1 1 B
+X PF9 21 -1200 -1000 200 R 50 50 1 1 B
+X PF10 22 -1200 -1100 200 R 50 50 1 1 B
+X PH0 23 -1200 1900 200 R 50 50 1 1 I
+X PH1 24 -1200 1800 200 R 50 50 1 1 I
+X NRST 25 -1200 3300 200 R 50 50 1 1 I
+X PC0 26 1200 -100 200 L 50 50 1 1 B
+X PC1 27 1200 -200 200 L 50 50 1 1 B
+X PC2 28 1200 -300 200 L 50 50 1 1 B
+X PC3 29 1200 -400 200 L 50 50 1 1 B
 X PE4 3 -1200 -2200 200 R 50 50 1 1 B
+X VSSA 30 600 -3600 200 U 50 50 1 1 W
+X VREF- 31 -1200 2800 200 R 50 50 1 1 W
+X VREF+ 32 -1200 2900 200 R 50 50 1 1 B
+X VDDA 33 500 3600 200 D 50 50 1 1 W
+X PA0 34 1200 3300 200 L 50 50 1 1 B
+X PA1 35 1200 3200 200 L 50 50 1 1 B
+X PA2 36 1200 3100 200 L 50 50 1 1 B
+X PA3 37 1200 3000 200 L 50 50 1 1 B
+X VSS 38 -400 -3600 200 U 50 50 1 1 W
+X VDD 39 -400 3600 200 D 50 50 1 1 W
 X PE5 4 -1200 -2300 200 R 50 50 1 1 B
-X PE6 5 -1200 -2400 200 R 50 50 1 1 B
-X PE7 58 -1200 -2500 200 R 50 50 1 1 B
-X PE8 59 -1200 -2600 200 R 50 50 1 1 B
-X PE9 60 -1200 -2700 200 R 50 50 1 1 B
-X PF0 10 -1200 -100 200 R 50 50 1 1 B
-X PF1 11 -1200 -200 200 R 50 50 1 1 B
-X PF10 22 -1200 -1100 200 R 50 50 1 1 B
+X PA4 40 1200 2900 200 L 50 50 1 1 B
+X PA5 41 1200 2800 200 L 50 50 1 1 B
+X PA6 42 1200 2700 200 L 50 50 1 1 B
+X PA7 43 1200 2600 200 L 50 50 1 1 B
+X PC4 44 1200 -500 200 L 50 50 1 1 B
+X PC5 45 1200 -600 200 L 50 50 1 1 B
+X PB0 46 1200 1600 200 L 50 50 1 1 B
+X PB1 47 1200 1500 200 L 50 50 1 1 B
+X PB2 48 1200 1400 200 L 50 50 1 1 B
 X PF11 49 -1200 -1200 200 R 50 50 1 1 B
+X PE6 5 -1200 -2400 200 R 50 50 1 1 B
 X PF12 50 -1200 -1300 200 R 50 50 1 1 B
+X VSS 51 -300 -3600 200 U 50 50 1 1 W
+X VDD 52 -300 3600 200 D 50 50 1 1 W
 X PF13 53 -1200 -1400 200 R 50 50 1 1 B
 X PF14 54 -1200 -1500 200 R 50 50 1 1 B
 X PF15 55 -1200 -1600 200 R 50 50 1 1 B
-X PF2 12 -1200 -300 200 R 50 50 1 1 B
-X PF3 13 -1200 -400 200 R 50 50 1 1 B
-X PF4 14 -1200 -500 200 R 50 50 1 1 B
-X PF5 15 -1200 -600 200 R 50 50 1 1 B
-X PF6 18 -1200 -700 200 R 50 50 1 1 B
-X PF7 19 -1200 -800 200 R 50 50 1 1 B
-X PF8 20 -1200 -900 200 R 50 50 1 1 B
-X PF9 21 -1200 -1000 200 R 50 50 1 1 B
 X PG0 56 -1200 1600 200 R 50 50 1 1 B
 X PG1 57 -1200 1500 200 R 50 50 1 1 B
-X PG10 125 -1200 600 200 R 50 50 1 1 B
-X PG11 126 -1200 500 200 R 50 50 1 1 B
-X PG12 127 -1200 400 200 R 50 50 1 1 B
-X PG13 128 -1200 300 200 R 50 50 1 1 B
-X PG14 129 -1200 200 200 R 50 50 1 1 B
-X PG15 132 -1200 100 200 R 50 50 1 1 B
+X PE7 58 -1200 -2500 200 R 50 50 1 1 B
+X PE8 59 -1200 -2600 200 R 50 50 1 1 B
+X VBAT 6 -600 3600 200 D 50 50 1 1 W
+X PE9 60 -1200 -2700 200 R 50 50 1 1 B
+X VSS 61 -200 -3600 200 U 50 50 1 1 W
+X VDD 62 -200 3600 200 D 50 50 1 1 W
+X PE10 63 -1200 -2800 200 R 50 50 1 1 B
+X PE11 64 -1200 -2900 200 R 50 50 1 1 B
+X PE12 65 -1200 -3000 200 R 50 50 1 1 B
+X PE13 66 -1200 -3100 200 R 50 50 1 1 B
+X PE14 67 -1200 -3200 200 R 50 50 1 1 B
+X PE15 68 -1200 -3300 200 R 50 50 1 1 B
+X PB10 69 1200 600 200 L 50 50 1 1 B
+X PC13 7 1200 -1400 200 L 50 50 1 1 B
+X PB11 70 1200 500 200 L 50 50 1 1 B
+X VSS 71 -100 -3600 200 U 50 50 1 1 W
+X VDD 72 -100 3600 200 D 50 50 1 1 W
+X PB12 73 1200 400 200 L 50 50 1 1 B
+X PB13 74 1200 300 200 L 50 50 1 1 B
+X PB14 75 1200 200 200 L 50 50 1 1 B
+X PB15 76 1200 100 200 L 50 50 1 1 B
+X PD8 77 1200 -2600 200 L 50 50 1 1 B
+X PD9 78 1200 -2700 200 L 50 50 1 1 B
+X PD10 79 1200 -2800 200 L 50 50 1 1 B
+X PC14 8 1200 -1500 200 L 50 50 1 1 B
+X PD11 80 1200 -2900 200 L 50 50 1 1 B
+X PD12 81 1200 -3000 200 L 50 50 1 1 B
+X PD13 82 1200 -3100 200 L 50 50 1 1 B
+X VSS 83 0 -3600 200 U 50 50 1 1 W
+X VDD 84 0 3600 200 D 50 50 1 1 W
+X PD14 85 1200 -3200 200 L 50 50 1 1 B
+X PD15 86 1200 -3300 200 L 50 50 1 1 B
 X PG2 87 -1200 1400 200 R 50 50 1 1 B
 X PG3 88 -1200 1300 200 R 50 50 1 1 B
 X PG4 89 -1200 1200 200 R 50 50 1 1 B
+X PC15 9 1200 -1600 200 L 50 50 1 1 B
 X PG5 90 -1200 1100 200 R 50 50 1 1 B
 X PG6 91 -1200 1000 200 R 50 50 1 1 B
 X PG7 92 -1200 900 200 R 50 50 1 1 B
 X PG8 93 -1200 800 200 R 50 50 1 1 B
-X PG9 124 -1200 700 200 R 50 50 1 1 B
-X PH0 23 -1200 1900 200 R 50 50 1 1 I
-X PH1 24 -1200 1800 200 R 50 50 1 1 I
-X VBAT 6 -600 3600 200 D 50 50 1 1 W
-X VDD 108 100 3600 200 D 50 50 1 1 W
-X VDD 121 200 3600 200 D 50 50 1 1 W
-X VDD 144 300 3600 200 D 50 50 1 1 W
-X VDD 17 -500 3600 200 D 50 50 1 1 W
-X VDD 39 -400 3600 200 D 50 50 1 1 W
-X VDD 52 -300 3600 200 D 50 50 1 1 W
-X VDD 62 -200 3600 200 D 50 50 1 1 W
-X VDD 72 -100 3600 200 D 50 50 1 1 W
-X VDD 84 0 3600 200 D 50 50 1 1 W
-X VDDA 33 400 3600 200 D 50 50 1 1 W
-X VDDIO2 131 600 3600 200 D 50 50 1 1 W
-X VDDIO2 95 500 3600 200 D 50 50 1 1 W
-X VDDUSB 106 700 3600 200 D 50 50 1 1 W
-X VREF+ 32 -1200 2900 200 R 50 50 1 1 B
-X VREF- 31 -1200 2800 200 R 50 50 1 1 W
-X VSS 107 200 -3600 200 U 50 50 1 1 W
-X VSS 120 300 -3600 200 U 50 50 1 1 W
-X VSS 130 400 -3600 200 U 50 50 1 1 W
-X VSS 143 500 -3600 200 U 50 50 1 1 W
-X VSS 16 -500 -3600 200 U 50 50 1 1 W
-X VSS 38 -400 -3600 200 U 50 50 1 1 W
-X VSS 51 -300 -3600 200 U 50 50 1 1 W
-X VSS 61 -200 -3600 200 U 50 50 1 1 W
-X VSS 71 -100 -3600 200 U 50 50 1 1 W
-X VSS 83 0 -3600 200 U 50 50 1 1 W
 X VSS 94 100 -3600 200 U 50 50 1 1 W
-X VSSA 30 600 -3600 200 U 50 50 1 1 W
+X VDDIO2 95 600 3600 200 D 50 50 1 1 W
+X PC6 96 1200 -700 200 L 50 50 1 1 B
+X PC7 97 1200 -800 200 L 50 50 1 1 B
+X PC8 98 1200 -900 200 L 50 50 1 1 B
+X PC9 99 1200 -1000 200 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
@@ -4413,70 +4413,70 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -600 -1700 600 1700 0 1 10 f
-X BOOT0 60 -700 1400 100 R 50 50 1 1 I
-X NRST 7 -700 1600 100 R 50 50 1 1 I
+X VBAT 1 -200 1800 100 D 50 50 1 1 W
+X PC2 10 -700 -300 100 R 50 50 1 1 B
+X PC3 11 -700 -400 100 R 50 50 1 1 B
+X VSSA 12 200 -1800 100 U 50 50 1 1 W
+X VDDA 13 200 1800 100 D 50 50 1 1 W
 X PA0 14 700 1600 100 L 50 50 1 1 B
 X PA1 15 700 1500 100 L 50 50 1 1 B
-X PA10 43 700 600 100 L 50 50 1 1 B
-X PA11 44 700 500 100 L 50 50 1 1 B
-X PA12 45 700 400 100 L 50 50 1 1 B
-X PA13 46 700 300 100 L 50 50 1 1 B
-X PA14 49 700 200 100 L 50 50 1 1 B
-X PA15 50 700 100 100 L 50 50 1 1 B
 X PA2 16 700 1400 100 L 50 50 1 1 B
 X PA3 17 700 1300 100 L 50 50 1 1 B
+X VSS 18 -200 -1800 100 U 50 50 1 1 W
+X VDD 19 -100 1800 100 D 50 50 1 1 W
+X PC13 2 -700 -1400 100 R 50 50 1 1 B
 X PA4 20 700 1200 100 L 50 50 1 1 B
 X PA5 21 700 1100 100 L 50 50 1 1 B
 X PA6 22 700 1000 100 L 50 50 1 1 B
 X PA7 23 700 900 100 L 50 50 1 1 B
-X PA8 41 700 800 100 L 50 50 1 1 B
-X PA9 42 700 700 100 L 50 50 1 1 B
+X PC4 24 -700 -500 100 R 50 50 1 1 B
+X PC5 25 -700 -600 100 R 50 50 1 1 B
 X PB0 26 700 -100 100 L 50 50 1 1 B
 X PB1 27 700 -200 100 L 50 50 1 1 B
+X PB2 28 700 -300 100 L 50 50 1 1 B
 X PB10 29 700 -1100 100 L 50 50 1 1 B
+X PC14 3 -700 -1500 100 R 50 50 1 1 B
 X PB11 30 700 -1200 100 L 50 50 1 1 B
+X VSS 31 -100 -1800 100 U 50 50 1 1 W
+X VDD 32 0 1800 100 D 50 50 1 1 W
 X PB12 33 700 -1300 100 L 50 50 1 1 B
 X PB13 34 700 -1400 100 L 50 50 1 1 B
 X PB14 35 700 -1500 100 L 50 50 1 1 B
 X PB15 36 700 -1600 100 L 50 50 1 1 B
-X PB2 28 700 -300 100 L 50 50 1 1 B
-X PB3 55 700 -400 100 L 50 50 1 1 B
-X PB4 56 700 -500 100 L 50 50 1 1 B
-X PB5 57 700 -600 100 L 50 50 1 1 B
-X PB6 58 700 -700 100 L 50 50 1 1 B
-X PB7 59 700 -800 100 L 50 50 1 1 B
-X PB8 61 700 -900 100 L 50 50 1 1 B
-X PB9 62 700 -1000 100 L 50 50 1 1 B
-X PC0 8 -700 -100 100 R 50 50 1 1 B
-X PC1 9 -700 -200 100 R 50 50 1 1 B
-X PC10 51 -700 -1100 100 R 50 50 1 1 B
-X PC11 52 -700 -1200 100 R 50 50 1 1 B
-X PC12 53 -700 -1300 100 R 50 50 1 1 B
-X PC13 2 -700 -1400 100 R 50 50 1 1 B
-X PC14 3 -700 -1500 100 R 50 50 1 1 B
-X PC15 4 -700 -1600 100 R 50 50 1 1 B
-X PC2 10 -700 -300 100 R 50 50 1 1 B
-X PC3 11 -700 -400 100 R 50 50 1 1 B
-X PC4 24 -700 -500 100 R 50 50 1 1 B
-X PC5 25 -700 -600 100 R 50 50 1 1 B
 X PC6 37 -700 -700 100 R 50 50 1 1 B
 X PC7 38 -700 -800 100 R 50 50 1 1 B
 X PC8 39 -700 -900 100 R 50 50 1 1 B
+X PC15 4 -700 -1600 100 R 50 50 1 1 B
 X PC9 40 -700 -1000 100 R 50 50 1 1 B
-X PD2 54 -700 100 100 R 50 50 1 1 B
+X PA8 41 700 800 100 L 50 50 1 1 B
+X PA9 42 700 700 100 L 50 50 1 1 B
+X PA10 43 700 600 100 L 50 50 1 1 B
+X PA11 44 700 500 100 L 50 50 1 1 B
+X PA12 45 700 400 100 L 50 50 1 1 B
+X PA13 46 700 300 100 L 50 50 1 1 B
+X VSS 47 0 -1800 100 U 50 50 1 1 W
+X VDDUSB 48 300 1800 100 D 50 50 1 1 W
+X PA14 49 700 200 100 L 50 50 1 1 B
 X PH0 5 -700 400 100 R 50 50 1 1 I
+X PA15 50 700 100 100 L 50 50 1 1 B
+X PC10 51 -700 -1100 100 R 50 50 1 1 B
+X PC11 52 -700 -1200 100 R 50 50 1 1 B
+X PC12 53 -700 -1300 100 R 50 50 1 1 B
+X PD2 54 -700 100 100 R 50 50 1 1 B
+X PB3 55 700 -400 100 L 50 50 1 1 B
+X PB4 56 700 -500 100 L 50 50 1 1 B
+X PB5 57 700 -600 100 L 50 50 1 1 B
+X PB6 58 700 -700 100 L 50 50 1 1 B
+X PB7 59 700 -800 100 L 50 50 1 1 B
 X PH1 6 -700 300 100 R 50 50 1 1 I
-X VBAT 1 -200 1800 100 D 50 50 1 1 W
-X VDD 19 -100 1800 100 D 50 50 1 1 W
-X VDD 32 0 1800 100 D 50 50 1 1 W
-X VDD 64 100 1800 100 D 50 50 1 1 W
-X VDDA 13 200 1800 100 D 50 50 1 1 W
-X VDDUSB 48 300 1800 100 D 50 50 1 1 W
-X VSS 18 -200 -1800 100 U 50 50 1 1 W
-X VSS 31 -100 -1800 100 U 50 50 1 1 W
-X VSS 47 0 -1800 100 U 50 50 1 1 W
+X BOOT0 60 -700 1400 100 R 50 50 1 1 I
+X PB8 61 700 -900 100 L 50 50 1 1 B
+X PB9 62 700 -1000 100 L 50 50 1 1 B
 X VSS 63 100 -1800 100 U 50 50 1 1 W
-X VSSA 12 200 -1800 100 U 50 50 1 1 W
+X VDD 64 100 1800 100 D 50 50 1 1 W
+X NRST 7 -700 1600 100 R 50 50 1 1 I
+X PC0 8 -700 -100 100 R 50 50 1 1 B
+X PC1 9 -700 -200 100 R 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
@@ -4493,106 +4493,106 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -700 -2600 700 2500 0 1 10 f
-X BOOT0 94 -900 2200 200 R 50 50 1 1 I
+X PE2 1 -900 500 200 R 50 50 1 1 B
+X VSS 10 -200 -2800 200 U 50 50 1 1 W
+X VDD 100 200 2700 200 D 50 50 1 1 W
+X VDD 11 -200 2700 200 D 50 50 1 1 W
+X PH0 12 -900 1000 200 R 50 50 1 1 I
+X PH1 13 -900 900 200 R 50 50 1 1 I
 X NRST 14 -900 2400 200 R 50 50 1 1 I
+X PC0 15 900 -1000 200 L 50 50 1 1 B
+X PC1 16 900 -1100 200 L 50 50 1 1 B
+X PC2 17 900 -1200 200 L 50 50 1 1 B
+X PC3 18 900 -1300 200 L 50 50 1 1 B
+X VSSA 19 300 -2800 200 U 50 50 1 1 W
+X PE3 2 -900 400 200 R 50 50 1 1 B
+X VREF- 20 -900 1900 200 R 50 50 1 1 W
+X VREF+ 21 -900 2000 200 R 50 50 1 1 B
+X VDDA 22 300 2700 200 D 50 50 1 1 W
 X PA0 23 900 2400 200 L 50 50 1 1 B
 X PA1 24 900 2300 200 L 50 50 1 1 B
-X PA10 69 900 1400 200 L 50 50 1 1 B
-X PA11 70 900 1300 200 L 50 50 1 1 B
-X PA12 71 900 1200 200 L 50 50 1 1 B
-X PA13 72 900 1100 200 L 50 50 1 1 B
-X PA14 76 900 1000 200 L 50 50 1 1 B
-X PA15 77 900 900 200 L 50 50 1 1 B
 X PA2 25 900 2200 200 L 50 50 1 1 B
 X PA3 26 900 2100 200 L 50 50 1 1 B
+X VSS 27 -100 -2800 200 U 50 50 1 1 W
+X VDD 28 -100 2700 200 D 50 50 1 1 W
 X PA4 29 900 2000 200 L 50 50 1 1 B
+X PE4 3 -900 300 200 R 50 50 1 1 B
 X PA5 30 900 1900 200 L 50 50 1 1 B
 X PA6 31 900 1800 200 L 50 50 1 1 B
 X PA7 32 900 1700 200 L 50 50 1 1 B
-X PA8 67 900 1600 200 L 50 50 1 1 B
-X PA9 68 900 1500 200 L 50 50 1 1 B
+X PC4 33 900 -1400 200 L 50 50 1 1 B
+X PC5 34 900 -1500 200 L 50 50 1 1 B
 X PB0 35 900 700 200 L 50 50 1 1 B
 X PB1 36 900 600 200 L 50 50 1 1 B
+X PB2 37 900 500 200 L 50 50 1 1 B
+X PE7 38 -900 0 200 R 50 50 1 1 B
+X PE8 39 -900 -100 200 R 50 50 1 1 B
+X PE5 4 -900 200 200 R 50 50 1 1 B
+X PE9 40 -900 -200 200 R 50 50 1 1 B
+X PE10 41 -900 -300 200 R 50 50 1 1 B
+X PE11 42 -900 -400 200 R 50 50 1 1 B
+X PE12 43 -900 -500 200 R 50 50 1 1 B
+X PE13 44 -900 -600 200 R 50 50 1 1 B
+X PE14 45 -900 -700 200 R 50 50 1 1 B
+X PE15 46 -900 -800 200 R 50 50 1 1 B
 X PB10 47 900 -300 200 L 50 50 1 1 B
 X PB11 48 900 -400 200 L 50 50 1 1 B
+X VSS 49 0 -2800 200 U 50 50 1 1 W
+X PE6 5 -900 100 200 R 50 50 1 1 B
+X VDD 50 0 2700 200 D 50 50 1 1 W
 X PB12 51 900 -500 200 L 50 50 1 1 B
 X PB13 52 900 -600 200 L 50 50 1 1 B
 X PB14 53 900 -700 200 L 50 50 1 1 B
 X PB15 54 900 -800 200 L 50 50 1 1 B
-X PB2 37 900 500 200 L 50 50 1 1 B
-X PB3 89 900 400 200 L 50 50 1 1 B
-X PB4 90 900 300 200 L 50 50 1 1 B
-X PB5 91 900 200 200 L 50 50 1 1 B
-X PB6 92 900 100 200 L 50 50 1 1 B
-X PB7 93 900 0 200 L 50 50 1 1 B
-X PB8 95 900 -100 200 L 50 50 1 1 B
-X PB9 96 900 -200 200 L 50 50 1 1 B
-X PC0 15 900 -1000 200 L 50 50 1 1 B
-X PC1 16 900 -1100 200 L 50 50 1 1 B
-X PC10 78 900 -2000 200 L 50 50 1 1 B
-X PC11 79 900 -2100 200 L 50 50 1 1 B
-X PC12 80 900 -2200 200 L 50 50 1 1 B
-X PC13 7 900 -2300 200 L 50 50 1 1 B
-X PC14 8 900 -2400 200 L 50 50 1 1 B
-X PC15 9 900 -2500 200 L 50 50 1 1 B
-X PC2 17 900 -1200 200 L 50 50 1 1 B
-X PC3 18 900 -1300 200 L 50 50 1 1 B
-X PC4 33 900 -1400 200 L 50 50 1 1 B
-X PC5 34 900 -1500 200 L 50 50 1 1 B
-X PC6 63 900 -1600 200 L 50 50 1 1 B
-X PC7 64 900 -1700 200 L 50 50 1 1 B
-X PC8 65 900 -1800 200 L 50 50 1 1 B
-X PC9 66 900 -1900 200 L 50 50 1 1 B
-X PD0 81 -900 -1000 200 R 50 50 1 1 B
-X PD1 82 -900 -1100 200 R 50 50 1 1 B
+X PD8 55 -900 -1800 200 R 50 50 1 1 B
+X PD9 56 -900 -1900 200 R 50 50 1 1 B
 X PD10 57 -900 -2000 200 R 50 50 1 1 B
 X PD11 58 -900 -2100 200 R 50 50 1 1 B
 X PD12 59 -900 -2200 200 R 50 50 1 1 B
+X VBAT 6 -300 2700 200 D 50 50 1 1 W
 X PD13 60 -900 -2300 200 R 50 50 1 1 B
 X PD14 61 -900 -2400 200 R 50 50 1 1 B
 X PD15 62 -900 -2500 200 R 50 50 1 1 B
+X PC6 63 900 -1600 200 L 50 50 1 1 B
+X PC7 64 900 -1700 200 L 50 50 1 1 B
+X PC8 65 900 -1800 200 L 50 50 1 1 B
+X PC9 66 900 -1900 200 L 50 50 1 1 B
+X PA8 67 900 1600 200 L 50 50 1 1 B
+X PA9 68 900 1500 200 L 50 50 1 1 B
+X PA10 69 900 1400 200 L 50 50 1 1 B
+X PC13 7 900 -2300 200 L 50 50 1 1 B
+X PA11 70 900 1300 200 L 50 50 1 1 B
+X PA12 71 900 1200 200 L 50 50 1 1 B
+X PA13 72 900 1100 200 L 50 50 1 1 B
+X VDDUSB 73 400 2700 200 D 50 50 1 1 W
+X VSS 74 100 -2800 200 U 50 50 1 1 W
+X VDD 75 100 2700 200 D 50 50 1 1 W
+X PA14 76 900 1000 200 L 50 50 1 1 B
+X PA15 77 900 900 200 L 50 50 1 1 B
+X PC10 78 900 -2000 200 L 50 50 1 1 B
+X PC11 79 900 -2100 200 L 50 50 1 1 B
+X PC14 8 900 -2400 200 L 50 50 1 1 B
+X PC12 80 900 -2200 200 L 50 50 1 1 B
+X PD0 81 -900 -1000 200 R 50 50 1 1 B
+X PD1 82 -900 -1100 200 R 50 50 1 1 B
 X PD2 83 -900 -1200 200 R 50 50 1 1 B
 X PD3 84 -900 -1300 200 R 50 50 1 1 B
 X PD4 85 -900 -1400 200 R 50 50 1 1 B
 X PD5 86 -900 -1500 200 R 50 50 1 1 B
 X PD6 87 -900 -1600 200 R 50 50 1 1 B
 X PD7 88 -900 -1700 200 R 50 50 1 1 B
-X PD8 55 -900 -1800 200 R 50 50 1 1 B
-X PD9 56 -900 -1900 200 R 50 50 1 1 B
+X PB3 89 900 400 200 L 50 50 1 1 B
+X PC15 9 900 -2500 200 L 50 50 1 1 B
+X PB4 90 900 300 200 L 50 50 1 1 B
+X PB5 91 900 200 200 L 50 50 1 1 B
+X PB6 92 900 100 200 L 50 50 1 1 B
+X PB7 93 900 0 200 L 50 50 1 1 B
+X BOOT0 94 -900 2200 200 R 50 50 1 1 I
+X PB8 95 900 -100 200 L 50 50 1 1 B
+X PB9 96 900 -200 200 L 50 50 1 1 B
 X PE0 97 -900 700 200 R 50 50 1 1 B
 X PE1 98 -900 600 200 R 50 50 1 1 B
-X PE10 41 -900 -300 200 R 50 50 1 1 B
-X PE11 42 -900 -400 200 R 50 50 1 1 B
-X PE12 43 -900 -500 200 R 50 50 1 1 B
-X PE13 44 -900 -600 200 R 50 50 1 1 B
-X PE14 45 -900 -700 200 R 50 50 1 1 B
-X PE15 46 -900 -800 200 R 50 50 1 1 B
-X PE2 1 -900 500 200 R 50 50 1 1 B
-X PE3 2 -900 400 200 R 50 50 1 1 B
-X PE4 3 -900 300 200 R 50 50 1 1 B
-X PE5 4 -900 200 200 R 50 50 1 1 B
-X PE6 5 -900 100 200 R 50 50 1 1 B
-X PE7 38 -900 0 200 R 50 50 1 1 B
-X PE8 39 -900 -100 200 R 50 50 1 1 B
-X PE9 40 -900 -200 200 R 50 50 1 1 B
-X PH0 12 -900 1000 200 R 50 50 1 1 I
-X PH1 13 -900 900 200 R 50 50 1 1 I
-X VBAT 6 -300 2700 200 D 50 50 1 1 W
-X VDD 100 200 2700 200 D 50 50 1 1 W
-X VDD 11 -200 2700 200 D 50 50 1 1 W
-X VDD 28 -100 2700 200 D 50 50 1 1 W
-X VDD 50 0 2700 200 D 50 50 1 1 W
-X VDD 75 100 2700 200 D 50 50 1 1 W
-X VDDA 22 300 2700 200 D 50 50 1 1 W
-X VDDUSB 73 400 2700 200 D 50 50 1 1 W
-X VREF+ 21 -900 2000 200 R 50 50 1 1 B
-X VREF- 20 -900 1900 200 R 50 50 1 1 W
-X VSS 10 -200 -2800 200 U 50 50 1 1 W
-X VSS 27 -100 -2800 200 U 50 50 1 1 W
-X VSS 49 0 -2800 200 U 50 50 1 1 W
-X VSS 74 100 -2800 200 U 50 50 1 1 W
 X VSS 99 200 -2800 200 U 50 50 1 1 W
-X VSSA 19 300 -2800 200 U 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
@@ -4609,78 +4609,78 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -700 -1800 600 1700 0 1 10 f
-X BOOT0 D7 -800 1400 100 R 50 50 1 1 I
-X NRST E9 -800 1600 100 R 50 50 1 1 I
-X PA0 H8 700 1500 100 L 50 50 1 1 B
-X PA1 G4 700 1400 100 L 50 50 1 1 B
-X PA10 D2 700 500 100 L 50 50 1 1 B
-X PA11 D1 700 400 100 L 50 50 1 1 B
-X PA12 C1 700 300 100 L 50 50 1 1 B
-X PA13 C2 700 200 100 L 50 50 1 1 B
-X PA14 B2 700 100 100 L 50 50 1 1 B
+X VDDUSB A1 300 1800 100 D 50 50 1 1 W
 X PA15 A2 700 0 100 L 50 50 1 1 B
-X PA2 G6 700 1300 100 L 50 50 1 1 B
-X PA3 H7 700 1200 100 L 50 50 1 1 B
-X PA4 G5 700 1100 100 L 50 50 1 1 B
-X PA5 H6 700 1000 100 L 50 50 1 1 B
-X PA6 H5 700 900 100 L 50 50 1 1 B
-X PA7 H4 700 800 100 L 50 50 1 1 B
-X PA8 E2 700 700 100 L 50 50 1 1 B
-X PA9 E3 700 600 100 L 50 50 1 1 B
-X PB0 J5 700 -200 100 L 50 50 1 1 B
-X PB1 J4 700 -300 100 L 50 50 1 1 B
-X PB10 H3 700 -1200 100 L 50 50 1 1 B
-X PB11 G3 700 -1300 100 L 50 50 1 1 B
-X PB12 H1 700 -1400 100 L 50 50 1 1 B
-X PB13 H2 700 -1500 100 L 50 50 1 1 B
-X PB14 G2 700 -1600 100 L 50 50 1 1 B
-X PB15 G1 700 -1700 100 L 50 50 1 1 B
-X PB2 J3 700 -400 100 L 50 50 1 1 B
+X PD2 A3 -800 0 100 R 50 50 1 1 B
+X PG9 A4 -800 700 100 R 50 50 1 1 B
+X PG14 A5 -800 200 100 R 50 50 1 1 B
 X PB3 A6 700 -500 100 L 50 50 1 1 B
-X PB4 C6 700 -600 100 L 50 50 1 1 B
-X PB5 C7 700 -700 100 L 50 50 1 1 B
-X PB6 B7 700 -800 100 L 50 50 1 1 B
 X PB7 A7 700 -900 100 L 50 50 1 1 B
-X PB8 E7 700 -1000 100 L 50 50 1 1 B
-X PB9 E8 700 -1100 100 L 50 50 1 1 B
-X PC0 F9 -800 -200 100 R 50 50 1 1 B
-X PC1 F8 -800 -300 100 R 50 50 1 1 B
-X PC10 D3 -800 -1200 100 R 50 50 1 1 B
-X PC11 C3 -800 -1300 100 R 50 50 1 1 B
+X VSS A8 -200 -1900 100 U 50 50 1 1 W
+X VDD A9 -200 1800 100 D 50 50 1 1 W
+X VSS B1 -100 -1900 100 U 50 50 1 1 W
+X PA14 B2 700 100 100 L 50 50 1 1 B
 X PC12 B3 -800 -1400 100 R 50 50 1 1 B
-X PC13 B8 -800 -1500 100 R 50 50 1 1 B
-X PC14 C9 -800 -1600 100 R 50 50 1 1 B
-X PC15 C8 -800 -1700 100 R 50 50 1 1 B
-X PC2 F7 -800 -400 100 R 50 50 1 1 B
-X PC3 G7 -800 -500 100 R 50 50 1 1 B
-X PC4 J7 -800 -600 100 R 50 50 1 1 B
-X PC5 J6 -800 -700 100 R 50 50 1 1 B
-X PC6 F3 -800 -800 100 R 50 50 1 1 B
-X PC7 F1 -800 -900 100 R 50 50 1 1 B
-X PC8 F2 -800 -1000 100 R 50 50 1 1 B
-X PC9 E1 -800 -1100 100 R 50 50 1 1 B
-X PD2 A3 -800 0 100 R 50 50 1 1 B
 X PG10 B4 -800 600 100 R 50 50 1 1 B
+X PG13 B5 -800 300 100 R 50 50 1 1 B
+X VDDIO2 B6 200 1800 100 D 50 50 1 1 W
+X PB6 B7 700 -800 100 L 50 50 1 1 B
+X PC13 B8 -800 -1500 100 R 50 50 1 1 B
+X VBAT B9 -300 1800 100 D 50 50 1 1 W
+X PA12 C1 700 300 100 L 50 50 1 1 B
+X PA13 C2 700 200 100 L 50 50 1 1 B
+X PC11 C3 -800 -1300 100 R 50 50 1 1 B
 X PG11 C4 -800 500 100 R 50 50 1 1 B
 X PG12 C5 -800 400 100 R 50 50 1 1 B
-X PG13 B5 -800 300 100 R 50 50 1 1 B
-X PG14 A5 -800 200 100 R 50 50 1 1 B
-X PG9 A4 -800 700 100 R 50 50 1 1 B
-X PH0 D9 -800 1000 100 R 50 50 1 1 I
+X PB4 C6 700 -600 100 L 50 50 1 1 B
+X PB5 C7 700 -700 100 L 50 50 1 1 B
+X PC15 C8 -800 -1700 100 R 50 50 1 1 B
+X PC14 C9 -800 -1600 100 R 50 50 1 1 B
+X PA11 D1 700 400 100 L 50 50 1 1 B
+X PA10 D2 700 500 100 L 50 50 1 1 B
+X PC10 D3 -800 -1200 100 R 50 50 1 1 B
+X BOOT0 D7 -800 1400 100 R 50 50 1 1 I
 X PH1 D8 -800 900 100 R 50 50 1 1 I
-X VBAT B9 -300 1800 100 D 50 50 1 1 W
-X VDD A9 -200 1800 100 D 50 50 1 1 W
-X VDD J1 -100 1800 100 D 50 50 1 1 W
-X VDD J8 0 1800 100 D 50 50 1 1 W
-X VDDA H9 100 1800 100 D 50 50 1 1 W
-X VDDIO2 B6 200 1800 100 D 50 50 1 1 W
-X VDDUSB A1 300 1800 100 D 50 50 1 1 W
+X PH0 D9 -800 1000 100 R 50 50 1 1 I
+X PC9 E1 -800 -1100 100 R 50 50 1 1 B
+X PA8 E2 700 700 100 L 50 50 1 1 B
+X PA9 E3 700 600 100 L 50 50 1 1 B
+X PB8 E7 700 -1000 100 L 50 50 1 1 B
+X PB9 E8 700 -1100 100 L 50 50 1 1 B
+X NRST E9 -800 1600 100 R 50 50 1 1 I
+X PC7 F1 -800 -900 100 R 50 50 1 1 B
+X PC8 F2 -800 -1000 100 R 50 50 1 1 B
+X PC6 F3 -800 -800 100 R 50 50 1 1 B
+X PC2 F7 -800 -400 100 R 50 50 1 1 B
+X PC1 F8 -800 -300 100 R 50 50 1 1 B
+X PC0 F9 -800 -200 100 R 50 50 1 1 B
+X PB15 G1 700 -1700 100 L 50 50 1 1 B
+X PB14 G2 700 -1600 100 L 50 50 1 1 B
+X PB11 G3 700 -1300 100 L 50 50 1 1 B
+X PA1 G4 700 1400 100 L 50 50 1 1 B
+X PA4 G5 700 1100 100 L 50 50 1 1 B
+X PA2 G6 700 1300 100 L 50 50 1 1 B
+X PC3 G7 -800 -500 100 R 50 50 1 1 B
 X VREF+ G8 -800 1200 100 R 50 50 1 1 B
-X VSS A8 -200 -1900 100 U 50 50 1 1 W
-X VSS B1 -100 -1900 100 U 50 50 1 1 W
+X VSSA G9 200 -1900 100 U 50 50 1 1 W
+X PB12 H1 700 -1400 100 L 50 50 1 1 B
+X PB13 H2 700 -1500 100 L 50 50 1 1 B
+X PB10 H3 700 -1200 100 L 50 50 1 1 B
+X PA7 H4 700 800 100 L 50 50 1 1 B
+X PA6 H5 700 900 100 L 50 50 1 1 B
+X PA5 H6 700 1000 100 L 50 50 1 1 B
+X PA3 H7 700 1200 100 L 50 50 1 1 B
+X PA0 H8 700 1500 100 L 50 50 1 1 B
+X VDDA H9 100 1800 100 D 50 50 1 1 W
+X VDD J1 -100 1800 100 D 50 50 1 1 W
 X VSS J2 0 -1900 100 U 50 50 1 1 W
+X PB2 J3 700 -400 100 L 50 50 1 1 B
+X PB1 J4 700 -300 100 L 50 50 1 1 B
+X PB0 J5 700 -200 100 L 50 50 1 1 B
+X PC5 J6 -800 -700 100 R 50 50 1 1 B
+X PC4 J7 -800 -600 100 R 50 50 1 1 B
+X VDD J8 0 1800 100 D 50 50 1 1 W
 X VSS J9 100 -1900 100 U 50 50 1 1 W
-X VSSA G9 200 -1900 100 U 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
@@ -4696,78 +4696,78 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -800 -1700 700 1700 0 1 10 f
+X VDDUSB A1 400 1800 100 D 50 50 1 1 W
+X PC10 A2 -900 -1100 100 R 50 50 1 1 B
+X PD2 A3 -900 0 100 R 50 50 1 1 B
+X PG9 A4 -900 600 100 R 50 50 1 1 B
+X PG14 A5 -900 200 100 R 50 50 1 1 B
+X PB3 A6 800 -400 100 L 50 50 1 1 B
 X BOOT0 A7 -900 1400 100 R 50 50 1 1 I
-X NRST E9 -900 1600 100 R 50 50 1 1 I
-X PA0 G5 800 1600 100 L 50 50 1 1 B
-X PA1 G6 800 1500 100 L 50 50 1 1 B
-X PA10 D2 800 600 100 L 50 50 1 1 B
-X PA11 D1 800 500 100 L 50 50 1 1 B
+X VSS A8 -200 -1800 100 U 50 50 1 1 W
+X VDD A9 -300 1800 100 D 50 50 1 1 W
+X VSS B1 -100 -1800 100 U 50 50 1 1 W
+X PA14 B2 800 200 100 L 50 50 1 1 B
+X PC12 B3 -900 -1300 100 R 50 50 1 1 B
+X PG10 B4 -900 500 100 R 50 50 1 1 B
+X PG13 B5 -900 300 100 R 50 50 1 1 B
+X VDDIO2 B6 300 1800 100 D 50 50 1 1 W
+X PB7 B7 800 -800 100 L 50 50 1 1 B
+X VDD12 B8 0 1800 100 D 50 50 1 1 W
+X VBAT B9 -400 1800 100 D 50 50 1 1 W
 X PA12 C1 800 400 100 L 50 50 1 1 B
 X PA13 C2 800 300 100 L 50 50 1 1 B
-X PA14 B2 800 200 100 L 50 50 1 1 B
 X PA15 C3 800 100 100 L 50 50 1 1 B
-X PA2 G4 800 1400 100 L 50 50 1 1 B
-X PA3 H7 800 1300 100 L 50 50 1 1 B
-X PA4 H6 800 1200 100 L 50 50 1 1 B
-X PA5 H5 800 1100 100 L 50 50 1 1 B
-X PA6 J8 800 1000 100 L 50 50 1 1 B
-X PA7 H4 800 900 100 L 50 50 1 1 B
-X PA8 E2 800 800 100 L 50 50 1 1 B
-X PA9 E3 800 700 100 L 50 50 1 1 B
-X PB0 J4 800 -100 100 L 50 50 1 1 B
-X PB1 J5 800 -200 100 L 50 50 1 1 B
-X PB10 J3 800 -1100 100 L 50 50 1 1 B
-X PB11 H3 800 -1200 100 L 50 50 1 1 B
-X PB12 H1 800 -1300 100 L 50 50 1 1 B
-X PB13 H2 800 -1400 100 L 50 50 1 1 B
-X PB14 G3 800 -1500 100 L 50 50 1 1 B
-X PB15 G1 800 -1600 100 L 50 50 1 1 B
-X PB2 J6 800 -300 100 L 50 50 1 1 B
-X PB3 A6 800 -400 100 L 50 50 1 1 B
+X PG12 C4 -900 400 100 R 50 50 1 1 B
 X PB4 C5 800 -500 100 L 50 50 1 1 B
-X PB5 E7 800 -600 100 L 50 50 1 1 B
-X PB6 E8 800 -700 100 L 50 50 1 1 B
-X PB7 B7 800 -800 100 L 50 50 1 1 B
 X PB8 C6 800 -900 100 L 50 50 1 1 B
-X PB9 D7 800 -1000 100 L 50 50 1 1 B
-X PC0 F9 -900 -200 100 R 50 50 1 1 B
-X PC1 F8 -900 -300 100 R 50 50 1 1 B
-X PC10 A2 -900 -1100 100 R 50 50 1 1 B
-X PC11 D3 -900 -1200 100 R 50 50 1 1 B
-X PC12 B3 -900 -1300 100 R 50 50 1 1 B
 X PC13 C7 -900 -1400 100 R 50 50 1 1 B
-X PC14 C9 -900 -1500 100 R 50 50 1 1 B
 X PC15 C8 -900 -1600 100 R 50 50 1 1 B
-X PC2 F7 -900 -400 100 R 50 50 1 1 B
-X PC3 G7 -900 -500 100 R 50 50 1 1 B
-X PC4 J7 -900 -600 100 R 50 50 1 1 B
-X PC6 G2 -900 -700 100 R 50 50 1 1 B
-X PC7 F2 -900 -800 100 R 50 50 1 1 B
-X PC8 F3 -900 -900 100 R 50 50 1 1 B
-X PC9 E1 -900 -1000 100 R 50 50 1 1 B
-X PD2 A3 -900 0 100 R 50 50 1 1 B
-X PG10 B4 -900 500 100 R 50 50 1 1 B
-X PG12 C4 -900 400 100 R 50 50 1 1 B
-X PG13 B5 -900 300 100 R 50 50 1 1 B
-X PG14 A5 -900 200 100 R 50 50 1 1 B
-X PG9 A4 -900 600 100 R 50 50 1 1 B
-X PH0 D9 -900 900 100 R 50 50 1 1 I
+X PC14 C9 -900 -1500 100 R 50 50 1 1 B
+X PA11 D1 800 500 100 L 50 50 1 1 B
+X PA10 D2 800 600 100 L 50 50 1 1 B
+X PC11 D3 -900 -1200 100 R 50 50 1 1 B
+X PB9 D7 800 -1000 100 L 50 50 1 1 B
 X PH1 D8 -900 800 100 R 50 50 1 1 I
-X VBAT B9 -400 1800 100 D 50 50 1 1 W
-X VDD A9 -300 1800 100 D 50 50 1 1 W
+X PH0 D9 -900 900 100 R 50 50 1 1 I
+X PC9 E1 -900 -1000 100 R 50 50 1 1 B
+X PA8 E2 800 800 100 L 50 50 1 1 B
+X PA9 E3 800 700 100 L 50 50 1 1 B
+X PB5 E7 800 -600 100 L 50 50 1 1 B
+X PB6 E8 800 -700 100 L 50 50 1 1 B
+X NRST E9 -900 1600 100 R 50 50 1 1 I
 X VDD F1 -200 1800 100 D 50 50 1 1 W
+X PC7 F2 -900 -800 100 R 50 50 1 1 B
+X PC8 F3 -900 -900 100 R 50 50 1 1 B
+X PC2 F7 -900 -400 100 R 50 50 1 1 B
+X PC1 F8 -900 -300 100 R 50 50 1 1 B
+X PC0 F9 -900 -200 100 R 50 50 1 1 B
+X PB15 G1 800 -1600 100 L 50 50 1 1 B
+X PC6 G2 -900 -700 100 R 50 50 1 1 B
+X PB14 G3 800 -1500 100 L 50 50 1 1 B
+X PA2 G4 800 1400 100 L 50 50 1 1 B
+X PA0 G5 800 1600 100 L 50 50 1 1 B
+X PA1 G6 800 1500 100 L 50 50 1 1 B
+X PC3 G7 -900 -500 100 R 50 50 1 1 B
+X VREF+ G8 -900 1200 100 R 50 50 1 1 B
+X VSSA G9 200 -1800 100 U 50 50 1 1 W
+X PB12 H1 800 -1300 100 L 50 50 1 1 B
+X PB13 H2 800 -1400 100 L 50 50 1 1 B
+X PB11 H3 800 -1200 100 L 50 50 1 1 B
+X PA7 H4 800 900 100 L 50 50 1 1 B
+X PA5 H5 800 1100 100 L 50 50 1 1 B
+X PA4 H6 800 1200 100 L 50 50 1 1 B
+X PA3 H7 800 1300 100 L 50 50 1 1 B
 X VDD H8 -100 1800 100 D 50 50 1 1 W
-X VDD12 B8 0 1800 100 D 50 50 1 1 W
-X VDD12 J1 100 1800 100 D 50 50 1 1 W
 X VDDA H9 200 1800 100 D 50 50 1 1 W
-X VDDIO2 B6 300 1800 100 D 50 50 1 1 W
-X VDDUSB A1 400 1800 100 D 50 50 1 1 W
-X VREF+ G8 -900 1200 100 R 50 50 1 1 B
-X VSS A8 -200 -1800 100 U 50 50 1 1 W
-X VSS B1 -100 -1800 100 U 50 50 1 1 W
+X VDD12 J1 100 1800 100 D 50 50 1 1 W
 X VSS J2 0 -1800 100 U 50 50 1 1 W
+X PB10 J3 800 -1100 100 L 50 50 1 1 B
+X PB0 J4 800 -100 100 L 50 50 1 1 B
+X PB1 J5 800 -200 100 L 50 50 1 1 B
+X PB2 J6 800 -300 100 L 50 50 1 1 B
+X PC4 J7 -900 -600 100 R 50 50 1 1 B
+X PA6 J8 800 1000 100 L 50 50 1 1 B
 X VSS J9 100 -1800 100 U 50 50 1 1 W
-X VSSA G9 200 -1800 100 U 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
@@ -4784,87 +4784,87 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -700 -2200 700 2200 0 1 10 f
-X BOOT0 D7 -800 1900 100 R 50 50 1 1 I
-X NRST E9 -800 2100 100 R 50 50 1 1 I
-X PA0 H8 800 1100 100 L 50 50 1 1 B
-X PA1 G4 800 1000 100 L 50 50 1 1 B
-X PA10 D2 800 100 100 L 50 50 1 1 B
-X PA11 D1 800 0 100 L 50 50 1 1 B
-X PA12 C1 800 -100 100 L 50 50 1 1 B
-X PA13 C2 800 -200 100 L 50 50 1 1 B
-X PA14 B2 800 -300 100 L 50 50 1 1 B
+X VDDUSB A1 400 2300 100 D 50 50 1 1 W
 X PA15 A2 800 -400 100 L 50 50 1 1 B
-X PA2 G6 800 900 100 L 50 50 1 1 B
-X PA3 H7 800 800 100 L 50 50 1 1 B
-X PA4 G5 800 700 100 L 50 50 1 1 B
-X PA5 H6 800 600 100 L 50 50 1 1 B
-X PA6 H5 800 500 100 L 50 50 1 1 B
-X PA7 H4 800 400 100 L 50 50 1 1 B
-X PA8 E2 800 300 100 L 50 50 1 1 B
-X PA9 E3 800 200 100 L 50 50 1 1 B
-X PB0 J5 800 -600 100 L 50 50 1 1 B
-X PB1 J4 800 -700 100 L 50 50 1 1 B
-X PB10 H3 800 -1600 100 L 50 50 1 1 B
-X PB11 G3 800 -1700 100 L 50 50 1 1 B
-X PB12 H1 800 -1800 100 L 50 50 1 1 B
-X PB13 H2 800 -1900 100 L 50 50 1 1 B
-X PB14 G2 800 -2000 100 L 50 50 1 1 B
-X PB15 G1 800 -2100 100 L 50 50 1 1 B
-X PB2 J3 800 -800 100 L 50 50 1 1 B
+X PD2 A3 -800 200 100 R 50 50 1 1 B
+X PG9 A4 -800 1200 100 R 50 50 1 1 B
+X PG14 A5 -800 700 100 R 50 50 1 1 B
 X PB3 A6 800 -900 100 L 50 50 1 1 B
-X PB4 C6 800 -1000 100 L 50 50 1 1 B
-X PB5 C7 800 -1100 100 L 50 50 1 1 B
-X PB6 B7 800 -1200 100 L 50 50 1 1 B
 X PB7 A7 800 -1300 100 L 50 50 1 1 B
-X PB8 E7 800 -1400 100 L 50 50 1 1 B
-X PB9 E8 800 -1500 100 L 50 50 1 1 B
-X PC0 F9 -800 -600 100 R 50 50 1 1 B
-X PC1 F8 -800 -700 100 R 50 50 1 1 B
-X PC10 D3 -800 -1600 100 R 50 50 1 1 B
-X PC11 C3 -800 -1700 100 R 50 50 1 1 B
+X VSS A8 -200 -2300 100 U 50 50 1 1 W
+X VDD A9 -200 2300 100 D 50 50 1 1 W
+X VSS B1 -100 -2300 100 U 50 50 1 1 W
+X PA14 B2 800 -300 100 L 50 50 1 1 B
 X PC12 B3 -800 -1800 100 R 50 50 1 1 B
+X PG10 B4 -800 1100 100 R 50 50 1 1 B
+X PG13 B5 -800 800 100 R 50 50 1 1 B
+X VDDIO2 B6 300 2300 100 D 50 50 1 1 W
+X PB6 B7 800 -1200 100 L 50 50 1 1 B
 X PC13 B8 -800 -1900 100 R 50 50 1 1 B
-X PC14 C9 -800 -2000 100 R 50 50 1 1 B
+X VBAT B9 -300 2300 100 D 50 50 1 1 W
+X PA12 C1 800 -100 100 L 50 50 1 1 B
+X PA13 C2 800 -200 100 L 50 50 1 1 B
+X PC11 C3 -800 -1700 100 R 50 50 1 1 B
+X PG11 C4 -800 1000 100 R 50 50 1 1 B
+X PG12 C5 -800 900 100 R 50 50 1 1 B
+X PB4 C6 800 -1000 100 L 50 50 1 1 B
+X PB5 C7 800 -1100 100 L 50 50 1 1 B
 X PC15 C8 -800 -2100 100 R 50 50 1 1 B
-X PC2 F7 -800 -800 100 R 50 50 1 1 B
-X PC3 G7 -800 -900 100 R 50 50 1 1 B
-X PC4 J7 -800 -1000 100 R 50 50 1 1 B
-X PC5 J6 -800 -1100 100 R 50 50 1 1 B
-X PC6 F3 -800 -1200 100 R 50 50 1 1 B
-X PC7 F1 -800 -1300 100 R 50 50 1 1 B
-X PC8 F2 -800 -1400 100 R 50 50 1 1 B
-X PC9 E1 -800 -1500 100 R 50 50 1 1 B
-X PD2 A3 -800 200 100 R 50 50 1 1 B
-X PD4 E5 -800 100 100 R 50 50 1 1 B
+X PC14 C9 -800 -2000 100 R 50 50 1 1 B
+X PA11 D1 800 0 100 L 50 50 1 1 B
+X PA10 D2 800 100 100 L 50 50 1 1 B
+X PC10 D3 -800 -1600 100 R 50 50 1 1 B
 X PD5 D4 -800 0 100 R 50 50 1 1 B
 X PD6 D5 -800 -100 100 R 50 50 1 1 B
 X PD7 D6 -800 -200 100 R 50 50 1 1 B
-X PD8 F5 -800 -300 100 R 50 50 1 1 B
-X PD9 F4 -800 -400 100 R 50 50 1 1 B
-X PE7 E6 -800 500 100 R 50 50 1 1 B
-X PE8 F6 -800 400 100 R 50 50 1 1 B
-X PG10 B4 -800 1100 100 R 50 50 1 1 B
-X PG11 C4 -800 1000 100 R 50 50 1 1 B
-X PG12 C5 -800 900 100 R 50 50 1 1 B
-X PG13 B5 -800 800 100 R 50 50 1 1 B
-X PG14 A5 -800 700 100 R 50 50 1 1 B
-X PG9 A4 -800 1200 100 R 50 50 1 1 B
-X PH0 D9 -800 1500 100 R 50 50 1 1 I
+X BOOT0 D7 -800 1900 100 R 50 50 1 1 I
 X PH1 D8 -800 1400 100 R 50 50 1 1 I
-X VBAT B9 -300 2300 100 D 50 50 1 1 W
-X VDD A9 -200 2300 100 D 50 50 1 1 W
+X PH0 D9 -800 1500 100 R 50 50 1 1 I
+X PC9 E1 -800 -1500 100 R 50 50 1 1 B
+X PA8 E2 800 300 100 L 50 50 1 1 B
+X PA9 E3 800 200 100 L 50 50 1 1 B
 X VDD E4 -100 2300 100 D 50 50 1 1 W
-X VDD J1 0 2300 100 D 50 50 1 1 W
-X VDD J8 100 2300 100 D 50 50 1 1 W
-X VDDA H9 200 2300 100 D 50 50 1 1 W
-X VDDIO2 B6 300 2300 100 D 50 50 1 1 W
-X VDDUSB A1 400 2300 100 D 50 50 1 1 W
-X VREF+ G8 -800 1700 100 R 50 50 1 1 B
-X VSS A8 -200 -2300 100 U 50 50 1 1 W
-X VSS B1 -100 -2300 100 U 50 50 1 1 W
+X PD4 E5 -800 100 100 R 50 50 1 1 B
+X PE7 E6 -800 500 100 R 50 50 1 1 B
+X PB8 E7 800 -1400 100 L 50 50 1 1 B
+X PB9 E8 800 -1500 100 L 50 50 1 1 B
+X NRST E9 -800 2100 100 R 50 50 1 1 I
+X PC7 F1 -800 -1300 100 R 50 50 1 1 B
+X PC8 F2 -800 -1400 100 R 50 50 1 1 B
+X PC6 F3 -800 -1200 100 R 50 50 1 1 B
+X PD9 F4 -800 -400 100 R 50 50 1 1 B
+X PD8 F5 -800 -300 100 R 50 50 1 1 B
+X PE8 F6 -800 400 100 R 50 50 1 1 B
+X PC2 F7 -800 -800 100 R 50 50 1 1 B
+X PC1 F8 -800 -700 100 R 50 50 1 1 B
+X PC0 F9 -800 -600 100 R 50 50 1 1 B
+X PB15 G1 800 -2100 100 L 50 50 1 1 B
+X PB14 G2 800 -2000 100 L 50 50 1 1 B
+X PB11 G3 800 -1700 100 L 50 50 1 1 B
+X PA1 G4 800 1000 100 L 50 50 1 1 B
+X PA4 G5 800 700 100 L 50 50 1 1 B
+X PA2 G6 800 900 100 L 50 50 1 1 B
+X PC3 G7 -800 -900 100 R 50 50 1 1 B
+X VREF+ G8 -800 1700 100 R 50 50 1 1 B
+X VSSA G9 200 -2300 100 U 50 50 1 1 W
+X PB12 H1 800 -1800 100 L 50 50 1 1 B
+X PB13 H2 800 -1900 100 L 50 50 1 1 B
+X PB10 H3 800 -1600 100 L 50 50 1 1 B
+X PA7 H4 800 400 100 L 50 50 1 1 B
+X PA6 H5 800 500 100 L 50 50 1 1 B
+X PA5 H6 800 600 100 L 50 50 1 1 B
+X PA3 H7 800 800 100 L 50 50 1 1 B
+X PA0 H8 800 1100 100 L 50 50 1 1 B
+X VDDA H9 200 2300 100 D 50 50 1 1 W
+X VDD J1 0 2300 100 D 50 50 1 1 W
 X VSS J2 0 -2300 100 U 50 50 1 1 W
+X PB2 J3 800 -800 100 L 50 50 1 1 B
+X PB1 J4 800 -700 100 L 50 50 1 1 B
+X PB0 J5 800 -600 100 L 50 50 1 1 B
+X PC5 J6 -800 -1100 100 R 50 50 1 1 B
+X PC4 J7 -800 -1000 100 R 50 50 1 1 B
+X VDD J8 100 2300 100 D 50 50 1 1 W
 X VSS J9 100 -2300 100 U 50 50 1 1 W
-X VSSA G9 200 -2300 100 U 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
@@ -4881,218 +4881,218 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -1000 -3400 900 3400 0 1 10 f
-X BOOT0 A4 -1200 3100 200 R 50 50 1 1 I
-X NRST H2 -1200 3300 200 R 50 50 1 1 I
-X OPAMP1_VINM M3 -1200 2700 200 R 50 50 1 1 B
-X OPAMP2_VINM M4 -1200 2600 200 R 50 50 1 1 B
-X PA0 L2 1100 3300 200 L 50 50 1 1 B
-X PA1 M2 1100 3200 200 L 50 50 1 1 B
-X PA10 C12 1100 2300 200 L 50 50 1 1 B
-X PA11 B12 1100 2200 200 L 50 50 1 1 B
-X PA12 A12 1100 2100 200 L 50 50 1 1 B
-X PA13 A11 1100 2000 200 L 50 50 1 1 B
+X PE3 A1 -1200 -2100 200 R 50 50 1 1 B
 X PA14 A10 1100 1900 200 L 50 50 1 1 B
-X PA15 A9 1100 1800 200 L 50 50 1 1 B
-X PA2 K3 1100 3100 200 L 50 50 1 1 B
-X PA3 L3 1100 3000 200 L 50 50 1 1 B
-X PA4 J4 1100 2900 200 L 50 50 1 1 B
-X PA5 K4 1100 2800 200 L 50 50 1 1 B
-X PA6 L4 1100 2700 200 L 50 50 1 1 B
-X PA7 J5 1100 2600 200 L 50 50 1 1 B
-X PA8 D11 1100 2500 200 L 50 50 1 1 B
-X PA9 D10 1100 2400 200 L 50 50 1 1 B
-X PB0 M5 1100 1600 200 L 50 50 1 1 B
-X PB1 M6 1100 1500 200 L 50 50 1 1 B
-X PB10 L10 1100 600 200 L 50 50 1 1 B
-X PB11 L11 1100 500 200 L 50 50 1 1 B
-X PB12 L12 1100 400 200 L 50 50 1 1 B
-X PB13 K12 1100 300 200 L 50 50 1 1 B
-X PB14 K11 1100 200 200 L 50 50 1 1 B
-X PB15 K10 1100 100 200 L 50 50 1 1 B
-X PB2 L6 1100 1400 200 L 50 50 1 1 B
-X PB3 A8 1100 1300 200 L 50 50 1 1 B
-X PB4 A7 1100 1200 200 L 50 50 1 1 B
-X PB5 C5 1100 1100 200 L 50 50 1 1 B
-X PB6 B5 1100 1000 200 L 50 50 1 1 B
-X PB7 B4 1100 900 200 L 50 50 1 1 B
+X PA13 A11 1100 2000 200 L 50 50 1 1 B
+X PA12 A12 1100 2100 200 L 50 50 1 1 B
+X PE1 A2 -1200 -1900 200 R 50 50 1 1 B
 X PB8 A3 1100 800 200 L 50 50 1 1 B
-X PB9 B3 1100 700 200 L 50 50 1 1 B
-X PC0 H1 1100 -100 200 L 50 50 1 1 B
-X PC1 J2 1100 -200 200 L 50 50 1 1 B
-X PC10 B11 1100 -1100 200 L 50 50 1 1 B
-X PC11 C10 1100 -1200 200 L 50 50 1 1 B
+X BOOT0 A4 -1200 3100 200 R 50 50 1 1 I
+X PD7 A5 1100 -2500 200 L 50 50 1 1 B
+X PD5 A6 1100 -2300 200 L 50 50 1 1 B
+X PB4 A7 1100 1200 200 L 50 50 1 1 B
+X PB3 A8 1100 1300 200 L 50 50 1 1 B
+X PA15 A9 1100 1800 200 L 50 50 1 1 B
+X PE4 B1 -1200 -2200 200 R 50 50 1 1 B
 X PC12 B10 1100 -1300 200 L 50 50 1 1 B
+X PC10 B11 1100 -1100 200 L 50 50 1 1 B
+X PA11 B12 1100 2200 200 L 50 50 1 1 B
+X PE2 B2 -1200 -2000 200 R 50 50 1 1 B
+X PB9 B3 1100 700 200 L 50 50 1 1 B
+X PB7 B4 1100 900 200 L 50 50 1 1 B
+X PB6 B5 1100 1000 200 L 50 50 1 1 B
+X PD6 B6 1100 -2400 200 L 50 50 1 1 B
+X PD4 B7 1100 -2200 200 L 50 50 1 1 B
+X PD3 B8 1100 -2100 200 L 50 50 1 1 B
+X PD1 B9 1100 -1900 200 L 50 50 1 1 B
 X PC13 C1 1100 -1400 200 L 50 50 1 1 B
+X PC11 C10 1100 -1200 200 L 50 50 1 1 B
+X VDDUSB C11 600 3600 200 D 50 50 1 1 W
+X PA10 C12 1100 2300 200 L 50 50 1 1 B
+X PE5 C2 -1200 -2300 200 R 50 50 1 1 B
+X PE0 C3 -1200 -1800 200 R 50 50 1 1 B
+X VDD C4 -200 3600 200 D 50 50 1 1 W
+X PB5 C5 1100 1100 200 L 50 50 1 1 B
+X PG14 C6 -1200 -300 200 R 50 50 1 1 B
+X PG13 C7 -1200 -200 200 R 50 50 1 1 B
+X PD2 C8 1100 -2000 200 L 50 50 1 1 B
+X PD0 C9 1100 -1800 200 L 50 50 1 1 B
 X PC14 D1 1100 -1500 200 L 50 50 1 1 B
-X PC15 E1 1100 -1600 200 L 50 50 1 1 B
-X PC2 J3 1100 -300 200 L 50 50 1 1 B
-X PC3 K2 1100 -400 200 L 50 50 1 1 B
-X PC4 K5 1100 -500 200 L 50 50 1 1 B
-X PC5 L5 1100 -600 200 L 50 50 1 1 B
-X PC6 E12 1100 -700 200 L 50 50 1 1 B
-X PC7 E11 1100 -800 200 L 50 50 1 1 B
-X PC8 E10 1100 -900 200 L 50 50 1 1 B
+X PA9 D10 1100 2400 200 L 50 50 1 1 B
+X PA8 D11 1100 2500 200 L 50 50 1 1 B
 X PC9 D12 1100 -1000 200 L 50 50 1 1 B
-X PD0 C9 1100 -1800 200 L 50 50 1 1 B
-X PD1 B9 1100 -1900 200 L 50 50 1 1 B
-X PD10 J12 1100 -2800 200 L 50 50 1 1 B
-X PD11 J11 1100 -2900 200 L 50 50 1 1 B
-X PD12 J10 1100 -3000 200 L 50 50 1 1 B
-X PD13 H12 1100 -3100 200 L 50 50 1 1 B
-X PD14 H11 1100 -3200 200 L 50 50 1 1 B
-X PD15 H10 1100 -3300 200 L 50 50 1 1 B
-X PD2 C8 1100 -2000 200 L 50 50 1 1 B
-X PD3 B8 1100 -2100 200 L 50 50 1 1 B
-X PD4 B7 1100 -2200 200 L 50 50 1 1 B
-X PD5 A6 1100 -2300 200 L 50 50 1 1 B
-X PD6 B6 1100 -2400 200 L 50 50 1 1 B
-X PD7 A5 1100 -2500 200 L 50 50 1 1 B
-X PD8 K9 1100 -2600 200 L 50 50 1 1 B
-X PD9 K8 1100 -2700 200 L 50 50 1 1 B
-X PE0 C3 -1200 -1800 200 R 50 50 1 1 B
-X PE1 A2 -1200 -1900 200 R 50 50 1 1 B
-X PE10 L8 -1200 -2800 200 R 50 50 1 1 B
-X PE11 M9 -1200 -2900 200 R 50 50 1 1 B
-X PE12 L9 -1200 -3000 200 R 50 50 1 1 B
-X PE13 M10 -1200 -3100 200 R 50 50 1 1 B
-X PE14 M11 -1200 -3200 200 R 50 50 1 1 B
-X PE15 M12 -1200 -3300 200 R 50 50 1 1 B
-X PE2 B2 -1200 -2000 200 R 50 50 1 1 B
-X PE3 A1 -1200 -2100 200 R 50 50 1 1 B
-X PE4 B1 -1200 -2200 200 R 50 50 1 1 B
-X PE5 C2 -1200 -2300 200 R 50 50 1 1 B
 X PE6 D2 -1200 -2400 200 R 50 50 1 1 B
-X PE7 M7 -1200 -2500 200 R 50 50 1 1 B
-X PE8 L7 -1200 -2600 200 R 50 50 1 1 B
-X PE9 M8 -1200 -2700 200 R 50 50 1 1 B
-X PF0 D6 -1200 -600 200 R 50 50 1 1 B
-X PF1 D5 -1200 -700 200 R 50 50 1 1 B
-X PF11 K6 -1200 -1200 200 R 50 50 1 1 B
-X PF12 J7 -1200 -1300 200 R 50 50 1 1 B
-X PF13 K7 -1200 -1400 200 R 50 50 1 1 B
-X PF14 J8 -1200 -1500 200 R 50 50 1 1 B
-X PF15 J9 -1200 -1600 200 R 50 50 1 1 B
+X VSS D3 -200 -3600 200 U 50 50 1 1 W
 X PF2 D4 -1200 -800 200 R 50 50 1 1 B
+X PF1 D5 -1200 -700 200 R 50 50 1 1 B
+X PF0 D6 -1200 -600 200 R 50 50 1 1 B
+X PG12 D7 -1200 -100 200 R 50 50 1 1 B
+X PG10 D8 -1200 100 200 R 50 50 1 1 B
+X PG9 D9 -1200 200 200 R 50 50 1 1 B
+X PC15 E1 1100 -1600 200 L 50 50 1 1 B
+X PC8 E10 1100 -900 200 L 50 50 1 1 B
+X PC7 E11 1100 -800 200 L 50 50 1 1 B
+X PC6 E12 1100 -700 200 L 50 50 1 1 B
+X VBAT E2 -300 3600 200 D 50 50 1 1 W
+X VSS E3 -100 -3600 200 U 50 50 1 1 W
 X PF3 E4 -1200 -900 200 R 50 50 1 1 B
+X PG5 E9 -1200 600 200 R 50 50 1 1 B
+X PH0 F1 -1200 1400 200 R 50 50 1 1 I
+X PG4 F10 -1200 700 200 R 50 50 1 1 B
+X VSS F11 300 -3600 200 U 50 50 1 1 W
+X VSS F12 400 -3600 200 U 50 50 1 1 W
+X VSS F2 0 -3600 200 U 50 50 1 1 W
 X PF4 F3 -1200 -1000 200 R 50 50 1 1 B
 X PF5 F4 -1200 -1100 200 R 50 50 1 1 B
-X PG0 H9 -1200 1100 200 R 50 50 1 1 B
-X PG1 G9 -1200 1000 200 R 50 50 1 1 B
-X PG10 D8 -1200 100 200 R 50 50 1 1 B
-X PG11 G3 -1200 0 200 R 50 50 1 1 B
-X PG12 D7 -1200 -100 200 R 50 50 1 1 B
-X PG13 C7 -1200 -200 200 R 50 50 1 1 B
-X PG14 C6 -1200 -300 200 R 50 50 1 1 B
-X PG15 K1 -1200 -400 200 R 50 50 1 1 B
-X PG2 G10 -1200 900 200 R 50 50 1 1 B
+X VSS F6 100 -3600 200 U 50 50 1 1 W
+X VSS F7 200 -3600 200 U 50 50 1 1 W
 X PG3 F9 -1200 800 200 R 50 50 1 1 B
-X PG4 F10 -1200 700 200 R 50 50 1 1 B
-X PG5 E9 -1200 600 200 R 50 50 1 1 B
-X PG6 G4 -1200 500 200 R 50 50 1 1 B
-X PG7 H4 -1200 400 200 R 50 50 1 1 B
-X PG8 J6 -1200 300 200 R 50 50 1 1 B
-X PG9 D9 -1200 200 200 R 50 50 1 1 B
-X PH0 F1 -1200 1400 200 R 50 50 1 1 I
 X PH1 G1 -1200 1300 200 R 50 50 1 1 I
-X VBAT E2 -300 3600 200 D 50 50 1 1 W
-X VDD C4 -200 3600 200 D 50 50 1 1 W
+X PG2 G10 -1200 900 200 R 50 50 1 1 B
 X VDD G11 100 3600 200 D 50 50 1 1 W
 X VDD G12 200 3600 200 D 50 50 1 1 W
 X VDD G2 -100 3600 200 D 50 50 1 1 W
+X PG11 G3 -1200 0 200 R 50 50 1 1 B
+X PG6 G4 -1200 500 200 R 50 50 1 1 B
 X VDD G6 0 3600 200 D 50 50 1 1 W
-X VDD H3 300 3600 200 D 50 50 1 1 W
-X VDDA M1 400 3600 200 D 50 50 1 1 W
 X VDDIO2 G7 500 3600 200 D 50 50 1 1 W
-X VDDUSB C11 600 3600 200 D 50 50 1 1 W
-X VREF+ L1 -1200 2900 200 R 50 50 1 1 B
-X VSS D3 -200 -3600 200 U 50 50 1 1 W
-X VSS E3 -100 -3600 200 U 50 50 1 1 W
-X VSS F11 300 -3600 200 U 50 50 1 1 W
-X VSS F12 400 -3600 200 U 50 50 1 1 W
-X VSS F2 0 -3600 200 U 50 50 1 1 W
-X VSS F6 100 -3600 200 U 50 50 1 1 W
-X VSS F7 200 -3600 200 U 50 50 1 1 W
+X PG1 G9 -1200 1000 200 R 50 50 1 1 B
+X PC0 H1 1100 -100 200 L 50 50 1 1 B
+X PD15 H10 1100 -3300 200 L 50 50 1 1 B
+X PD14 H11 1100 -3200 200 L 50 50 1 1 B
+X PD13 H12 1100 -3100 200 L 50 50 1 1 B
+X NRST H2 -1200 3300 200 R 50 50 1 1 I
+X VDD H3 300 3600 200 D 50 50 1 1 W
+X PG7 H4 -1200 400 200 R 50 50 1 1 B
+X PG0 H9 -1200 1100 200 R 50 50 1 1 B
 X VSSA J1 500 -3600 200 U 50 50 1 1 W
-ENDDRAW
-ENDDEF
-#
-# STM32L476RCTx
-#
-DEF STM32L476RCTx U 0 20 Y Y 1 F N
-F0 "U" -600 1750 50 H V L CNN
-F1 "STM32L476RCTx" 400 1750 50 H V L CNN
-F2 "Package_QFP:LQFP-64_10x10mm_P0.5mm" -600 -1700 50 H I R CNN
-F3 "" 0 0 50 H I C CNN
-ALIAS STM32L476RETx STM32L476RGTx
-$FPLIST
- LQFP*10x10mm*P0.5mm*
-$ENDFPLIST
-DRAW
-S -600 -1700 600 1700 0 1 10 f
-X BOOT0 60 -700 1400 100 R 50 50 1 1 I
-X NRST 7 -700 1600 100 R 50 50 1 1 I
-X PA0 14 700 1600 100 L 50 50 1 1 B
-X PA1 15 700 1500 100 L 50 50 1 1 B
-X PA10 43 700 600 100 L 50 50 1 1 B
-X PA11 44 700 500 100 L 50 50 1 1 B
-X PA12 45 700 400 100 L 50 50 1 1 B
-X PA13 46 700 300 100 L 50 50 1 1 B
-X PA14 49 700 200 100 L 50 50 1 1 B
-X PA15 50 700 100 100 L 50 50 1 1 B
-X PA2 16 700 1400 100 L 50 50 1 1 B
-X PA3 17 700 1300 100 L 50 50 1 1 B
-X PA4 20 700 1200 100 L 50 50 1 1 B
-X PA5 21 700 1100 100 L 50 50 1 1 B
-X PA6 22 700 1000 100 L 50 50 1 1 B
-X PA7 23 700 900 100 L 50 50 1 1 B
-X PA8 41 700 800 100 L 50 50 1 1 B
-X PA9 42 700 700 100 L 50 50 1 1 B
-X PB0 26 700 -100 100 L 50 50 1 1 B
+X PD12 J10 1100 -3000 200 L 50 50 1 1 B
+X PD11 J11 1100 -2900 200 L 50 50 1 1 B
+X PD10 J12 1100 -2800 200 L 50 50 1 1 B
+X PC1 J2 1100 -200 200 L 50 50 1 1 B
+X PC2 J3 1100 -300 200 L 50 50 1 1 B
+X PA4 J4 1100 2900 200 L 50 50 1 1 B
+X PA7 J5 1100 2600 200 L 50 50 1 1 B
+X PG8 J6 -1200 300 200 R 50 50 1 1 B
+X PF12 J7 -1200 -1300 200 R 50 50 1 1 B
+X PF14 J8 -1200 -1500 200 R 50 50 1 1 B
+X PF15 J9 -1200 -1600 200 R 50 50 1 1 B
+X PG15 K1 -1200 -400 200 R 50 50 1 1 B
+X PB15 K10 1100 100 200 L 50 50 1 1 B
+X PB14 K11 1100 200 200 L 50 50 1 1 B
+X PB13 K12 1100 300 200 L 50 50 1 1 B
+X PC3 K2 1100 -400 200 L 50 50 1 1 B
+X PA2 K3 1100 3100 200 L 50 50 1 1 B
+X PA5 K4 1100 2800 200 L 50 50 1 1 B
+X PC4 K5 1100 -500 200 L 50 50 1 1 B
+X PF11 K6 -1200 -1200 200 R 50 50 1 1 B
+X PF13 K7 -1200 -1400 200 R 50 50 1 1 B
+X PD9 K8 1100 -2700 200 L 50 50 1 1 B
+X PD8 K9 1100 -2600 200 L 50 50 1 1 B
+X VREF+ L1 -1200 2900 200 R 50 50 1 1 B
+X PB10 L10 1100 600 200 L 50 50 1 1 B
+X PB11 L11 1100 500 200 L 50 50 1 1 B
+X PB12 L12 1100 400 200 L 50 50 1 1 B
+X PA0 L2 1100 3300 200 L 50 50 1 1 B
+X PA3 L3 1100 3000 200 L 50 50 1 1 B
+X PA6 L4 1100 2700 200 L 50 50 1 1 B
+X PC5 L5 1100 -600 200 L 50 50 1 1 B
+X PB2 L6 1100 1400 200 L 50 50 1 1 B
+X PE8 L7 -1200 -2600 200 R 50 50 1 1 B
+X PE10 L8 -1200 -2800 200 R 50 50 1 1 B
+X PE12 L9 -1200 -3000 200 R 50 50 1 1 B
+X VDDA M1 400 3600 200 D 50 50 1 1 W
+X PE13 M10 -1200 -3100 200 R 50 50 1 1 B
+X PE14 M11 -1200 -3200 200 R 50 50 1 1 B
+X PE15 M12 -1200 -3300 200 R 50 50 1 1 B
+X PA1 M2 1100 3200 200 L 50 50 1 1 B
+X OPAMP1_VINM M3 -1200 2700 200 R 50 50 1 1 B
+X OPAMP2_VINM M4 -1200 2600 200 R 50 50 1 1 B
+X PB0 M5 1100 1600 200 L 50 50 1 1 B
+X PB1 M6 1100 1500 200 L 50 50 1 1 B
+X PE7 M7 -1200 -2500 200 R 50 50 1 1 B
+X PE9 M8 -1200 -2700 200 R 50 50 1 1 B
+X PE11 M9 -1200 -2900 200 R 50 50 1 1 B
+ENDDRAW
+ENDDEF
+#
+# STM32L476RCTx
+#
+DEF STM32L476RCTx U 0 20 Y Y 1 F N
+F0 "U" -600 1750 50 H V L CNN
+F1 "STM32L476RCTx" 400 1750 50 H V L CNN
+F2 "Package_QFP:LQFP-64_10x10mm_P0.5mm" -600 -1700 50 H I R CNN
+F3 "" 0 0 50 H I C CNN
+ALIAS STM32L476RETx STM32L476RGTx
+$FPLIST
+ LQFP*10x10mm*P0.5mm*
+$ENDFPLIST
+DRAW
+S -600 -1700 600 1700 0 1 10 f
+X VBAT 1 -200 1800 100 D 50 50 1 1 W
+X PC2 10 -700 -300 100 R 50 50 1 1 B
+X PC3 11 -700 -400 100 R 50 50 1 1 B
+X VSSA 12 200 -1800 100 U 50 50 1 1 W
+X VDDA 13 200 1800 100 D 50 50 1 1 W
+X PA0 14 700 1600 100 L 50 50 1 1 B
+X PA1 15 700 1500 100 L 50 50 1 1 B
+X PA2 16 700 1400 100 L 50 50 1 1 B
+X PA3 17 700 1300 100 L 50 50 1 1 B
+X VSS 18 -200 -1800 100 U 50 50 1 1 W
+X VDD 19 -100 1800 100 D 50 50 1 1 W
+X PC13 2 -700 -1400 100 R 50 50 1 1 B
+X PA4 20 700 1200 100 L 50 50 1 1 B
+X PA5 21 700 1100 100 L 50 50 1 1 B
+X PA6 22 700 1000 100 L 50 50 1 1 B
+X PA7 23 700 900 100 L 50 50 1 1 B
+X PC4 24 -700 -500 100 R 50 50 1 1 B
+X PC5 25 -700 -600 100 R 50 50 1 1 B
+X PB0 26 700 -100 100 L 50 50 1 1 B
 X PB1 27 700 -200 100 L 50 50 1 1 B
+X PB2 28 700 -300 100 L 50 50 1 1 B
 X PB10 29 700 -1100 100 L 50 50 1 1 B
+X PC14 3 -700 -1500 100 R 50 50 1 1 B
 X PB11 30 700 -1200 100 L 50 50 1 1 B
+X VSS 31 -100 -1800 100 U 50 50 1 1 W
+X VDD 32 0 1800 100 D 50 50 1 1 W
 X PB12 33 700 -1300 100 L 50 50 1 1 B
 X PB13 34 700 -1400 100 L 50 50 1 1 B
 X PB14 35 700 -1500 100 L 50 50 1 1 B
 X PB15 36 700 -1600 100 L 50 50 1 1 B
-X PB2 28 700 -300 100 L 50 50 1 1 B
+X PC6 37 -700 -700 100 R 50 50 1 1 B
+X PC7 38 -700 -800 100 R 50 50 1 1 B
+X PC8 39 -700 -900 100 R 50 50 1 1 B
+X PC15 4 -700 -1600 100 R 50 50 1 1 B
+X PC9 40 -700 -1000 100 R 50 50 1 1 B
+X PA8 41 700 800 100 L 50 50 1 1 B
+X PA9 42 700 700 100 L 50 50 1 1 B
+X PA10 43 700 600 100 L 50 50 1 1 B
+X PA11 44 700 500 100 L 50 50 1 1 B
+X PA12 45 700 400 100 L 50 50 1 1 B
+X PA13 46 700 300 100 L 50 50 1 1 B
+X VSS 47 0 -1800 100 U 50 50 1 1 W
+X VDDUSB 48 300 1800 100 D 50 50 1 1 W
+X PA14 49 700 200 100 L 50 50 1 1 B
+X PH0 5 -700 400 100 R 50 50 1 1 I
+X PA15 50 700 100 100 L 50 50 1 1 B
+X PC10 51 -700 -1100 100 R 50 50 1 1 B
+X PC11 52 -700 -1200 100 R 50 50 1 1 B
+X PC12 53 -700 -1300 100 R 50 50 1 1 B
+X PD2 54 -700 100 100 R 50 50 1 1 B
 X PB3 55 700 -400 100 L 50 50 1 1 B
 X PB4 56 700 -500 100 L 50 50 1 1 B
 X PB5 57 700 -600 100 L 50 50 1 1 B
 X PB6 58 700 -700 100 L 50 50 1 1 B
 X PB7 59 700 -800 100 L 50 50 1 1 B
+X PH1 6 -700 300 100 R 50 50 1 1 I
+X BOOT0 60 -700 1400 100 R 50 50 1 1 I
 X PB8 61 700 -900 100 L 50 50 1 1 B
 X PB9 62 700 -1000 100 L 50 50 1 1 B
+X VSS 63 100 -1800 100 U 50 50 1 1 W
+X VDD 64 100 1800 100 D 50 50 1 1 W
+X NRST 7 -700 1600 100 R 50 50 1 1 I
 X PC0 8 -700 -100 100 R 50 50 1 1 B
 X PC1 9 -700 -200 100 R 50 50 1 1 B
-X PC10 51 -700 -1100 100 R 50 50 1 1 B
-X PC11 52 -700 -1200 100 R 50 50 1 1 B
-X PC12 53 -700 -1300 100 R 50 50 1 1 B
-X PC13 2 -700 -1400 100 R 50 50 1 1 B
-X PC14 3 -700 -1500 100 R 50 50 1 1 B
-X PC15 4 -700 -1600 100 R 50 50 1 1 B
-X PC2 10 -700 -300 100 R 50 50 1 1 B
-X PC3 11 -700 -400 100 R 50 50 1 1 B
-X PC4 24 -700 -500 100 R 50 50 1 1 B
-X PC5 25 -700 -600 100 R 50 50 1 1 B
-X PC6 37 -700 -700 100 R 50 50 1 1 B
-X PC7 38 -700 -800 100 R 50 50 1 1 B
-X PC8 39 -700 -900 100 R 50 50 1 1 B
-X PC9 40 -700 -1000 100 R 50 50 1 1 B
-X PD2 54 -700 100 100 R 50 50 1 1 B
-X PH0 5 -700 400 100 R 50 50 1 1 I
-X PH1 6 -700 300 100 R 50 50 1 1 I
-X VBAT 1 -200 1800 100 D 50 50 1 1 W
-X VDD 19 -100 1800 100 D 50 50 1 1 W
-X VDD 32 0 1800 100 D 50 50 1 1 W
-X VDD 64 100 1800 100 D 50 50 1 1 W
-X VDDA 13 200 1800 100 D 50 50 1 1 W
-X VDDUSB 48 300 1800 100 D 50 50 1 1 W
-X VSS 18 -200 -1800 100 U 50 50 1 1 W
-X VSS 31 -100 -1800 100 U 50 50 1 1 W
-X VSS 47 0 -1800 100 U 50 50 1 1 W
-X VSS 63 100 -1800 100 U 50 50 1 1 W
-X VSSA 12 200 -1800 100 U 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
@@ -5109,106 +5109,106 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -700 -2600 700 2500 0 1 10 f
-X BOOT0 94 -900 2200 200 R 50 50 1 1 I
+X PE2 1 -900 500 200 R 50 50 1 1 B
+X VSS 10 -200 -2800 200 U 50 50 1 1 W
+X VDD 100 200 2700 200 D 50 50 1 1 W
+X VDD 11 -200 2700 200 D 50 50 1 1 W
+X PH0 12 -900 1000 200 R 50 50 1 1 I
+X PH1 13 -900 900 200 R 50 50 1 1 I
 X NRST 14 -900 2400 200 R 50 50 1 1 I
+X PC0 15 900 -1000 200 L 50 50 1 1 B
+X PC1 16 900 -1100 200 L 50 50 1 1 B
+X PC2 17 900 -1200 200 L 50 50 1 1 B
+X PC3 18 900 -1300 200 L 50 50 1 1 B
+X VSSA 19 300 -2800 200 U 50 50 1 1 W
+X PE3 2 -900 400 200 R 50 50 1 1 B
+X VREF- 20 -900 1900 200 R 50 50 1 1 W
+X VREF+ 21 -900 2000 200 R 50 50 1 1 B
+X VDDA 22 300 2700 200 D 50 50 1 1 W
 X PA0 23 900 2400 200 L 50 50 1 1 B
 X PA1 24 900 2300 200 L 50 50 1 1 B
-X PA10 69 900 1400 200 L 50 50 1 1 B
-X PA11 70 900 1300 200 L 50 50 1 1 B
-X PA12 71 900 1200 200 L 50 50 1 1 B
-X PA13 72 900 1100 200 L 50 50 1 1 B
-X PA14 76 900 1000 200 L 50 50 1 1 B
-X PA15 77 900 900 200 L 50 50 1 1 B
 X PA2 25 900 2200 200 L 50 50 1 1 B
 X PA3 26 900 2100 200 L 50 50 1 1 B
+X VSS 27 -100 -2800 200 U 50 50 1 1 W
+X VDD 28 -100 2700 200 D 50 50 1 1 W
 X PA4 29 900 2000 200 L 50 50 1 1 B
+X PE4 3 -900 300 200 R 50 50 1 1 B
 X PA5 30 900 1900 200 L 50 50 1 1 B
 X PA6 31 900 1800 200 L 50 50 1 1 B
 X PA7 32 900 1700 200 L 50 50 1 1 B
-X PA8 67 900 1600 200 L 50 50 1 1 B
-X PA9 68 900 1500 200 L 50 50 1 1 B
+X PC4 33 900 -1400 200 L 50 50 1 1 B
+X PC5 34 900 -1500 200 L 50 50 1 1 B
 X PB0 35 900 700 200 L 50 50 1 1 B
 X PB1 36 900 600 200 L 50 50 1 1 B
+X PB2 37 900 500 200 L 50 50 1 1 B
+X PE7 38 -900 0 200 R 50 50 1 1 B
+X PE8 39 -900 -100 200 R 50 50 1 1 B
+X PE5 4 -900 200 200 R 50 50 1 1 B
+X PE9 40 -900 -200 200 R 50 50 1 1 B
+X PE10 41 -900 -300 200 R 50 50 1 1 B
+X PE11 42 -900 -400 200 R 50 50 1 1 B
+X PE12 43 -900 -500 200 R 50 50 1 1 B
+X PE13 44 -900 -600 200 R 50 50 1 1 B
+X PE14 45 -900 -700 200 R 50 50 1 1 B
+X PE15 46 -900 -800 200 R 50 50 1 1 B
 X PB10 47 900 -300 200 L 50 50 1 1 B
 X PB11 48 900 -400 200 L 50 50 1 1 B
+X VSS 49 0 -2800 200 U 50 50 1 1 W
+X PE6 5 -900 100 200 R 50 50 1 1 B
+X VDD 50 0 2700 200 D 50 50 1 1 W
 X PB12 51 900 -500 200 L 50 50 1 1 B
 X PB13 52 900 -600 200 L 50 50 1 1 B
 X PB14 53 900 -700 200 L 50 50 1 1 B
 X PB15 54 900 -800 200 L 50 50 1 1 B
-X PB2 37 900 500 200 L 50 50 1 1 B
-X PB3 89 900 400 200 L 50 50 1 1 B
-X PB4 90 900 300 200 L 50 50 1 1 B
-X PB5 91 900 200 200 L 50 50 1 1 B
-X PB6 92 900 100 200 L 50 50 1 1 B
-X PB7 93 900 0 200 L 50 50 1 1 B
-X PB8 95 900 -100 200 L 50 50 1 1 B
-X PB9 96 900 -200 200 L 50 50 1 1 B
-X PC0 15 900 -1000 200 L 50 50 1 1 B
-X PC1 16 900 -1100 200 L 50 50 1 1 B
-X PC10 78 900 -2000 200 L 50 50 1 1 B
-X PC11 79 900 -2100 200 L 50 50 1 1 B
-X PC12 80 900 -2200 200 L 50 50 1 1 B
-X PC13 7 900 -2300 200 L 50 50 1 1 B
-X PC14 8 900 -2400 200 L 50 50 1 1 B
-X PC15 9 900 -2500 200 L 50 50 1 1 B
-X PC2 17 900 -1200 200 L 50 50 1 1 B
-X PC3 18 900 -1300 200 L 50 50 1 1 B
-X PC4 33 900 -1400 200 L 50 50 1 1 B
-X PC5 34 900 -1500 200 L 50 50 1 1 B
-X PC6 63 900 -1600 200 L 50 50 1 1 B
-X PC7 64 900 -1700 200 L 50 50 1 1 B
-X PC8 65 900 -1800 200 L 50 50 1 1 B
-X PC9 66 900 -1900 200 L 50 50 1 1 B
-X PD0 81 -900 -1000 200 R 50 50 1 1 B
-X PD1 82 -900 -1100 200 R 50 50 1 1 B
+X PD8 55 -900 -1800 200 R 50 50 1 1 B
+X PD9 56 -900 -1900 200 R 50 50 1 1 B
 X PD10 57 -900 -2000 200 R 50 50 1 1 B
 X PD11 58 -900 -2100 200 R 50 50 1 1 B
 X PD12 59 -900 -2200 200 R 50 50 1 1 B
+X VBAT 6 -300 2700 200 D 50 50 1 1 W
 X PD13 60 -900 -2300 200 R 50 50 1 1 B
 X PD14 61 -900 -2400 200 R 50 50 1 1 B
 X PD15 62 -900 -2500 200 R 50 50 1 1 B
+X PC6 63 900 -1600 200 L 50 50 1 1 B
+X PC7 64 900 -1700 200 L 50 50 1 1 B
+X PC8 65 900 -1800 200 L 50 50 1 1 B
+X PC9 66 900 -1900 200 L 50 50 1 1 B
+X PA8 67 900 1600 200 L 50 50 1 1 B
+X PA9 68 900 1500 200 L 50 50 1 1 B
+X PA10 69 900 1400 200 L 50 50 1 1 B
+X PC13 7 900 -2300 200 L 50 50 1 1 B
+X PA11 70 900 1300 200 L 50 50 1 1 B
+X PA12 71 900 1200 200 L 50 50 1 1 B
+X PA13 72 900 1100 200 L 50 50 1 1 B
+X VDDUSB 73 400 2700 200 D 50 50 1 1 W
+X VSS 74 100 -2800 200 U 50 50 1 1 W
+X VDD 75 100 2700 200 D 50 50 1 1 W
+X PA14 76 900 1000 200 L 50 50 1 1 B
+X PA15 77 900 900 200 L 50 50 1 1 B
+X PC10 78 900 -2000 200 L 50 50 1 1 B
+X PC11 79 900 -2100 200 L 50 50 1 1 B
+X PC14 8 900 -2400 200 L 50 50 1 1 B
+X PC12 80 900 -2200 200 L 50 50 1 1 B
+X PD0 81 -900 -1000 200 R 50 50 1 1 B
+X PD1 82 -900 -1100 200 R 50 50 1 1 B
 X PD2 83 -900 -1200 200 R 50 50 1 1 B
 X PD3 84 -900 -1300 200 R 50 50 1 1 B
 X PD4 85 -900 -1400 200 R 50 50 1 1 B
 X PD5 86 -900 -1500 200 R 50 50 1 1 B
 X PD6 87 -900 -1600 200 R 50 50 1 1 B
 X PD7 88 -900 -1700 200 R 50 50 1 1 B
-X PD8 55 -900 -1800 200 R 50 50 1 1 B
-X PD9 56 -900 -1900 200 R 50 50 1 1 B
+X PB3 89 900 400 200 L 50 50 1 1 B
+X PC15 9 900 -2500 200 L 50 50 1 1 B
+X PB4 90 900 300 200 L 50 50 1 1 B
+X PB5 91 900 200 200 L 50 50 1 1 B
+X PB6 92 900 100 200 L 50 50 1 1 B
+X PB7 93 900 0 200 L 50 50 1 1 B
+X BOOT0 94 -900 2200 200 R 50 50 1 1 I
+X PB8 95 900 -100 200 L 50 50 1 1 B
+X PB9 96 900 -200 200 L 50 50 1 1 B
 X PE0 97 -900 700 200 R 50 50 1 1 B
 X PE1 98 -900 600 200 R 50 50 1 1 B
-X PE10 41 -900 -300 200 R 50 50 1 1 B
-X PE11 42 -900 -400 200 R 50 50 1 1 B
-X PE12 43 -900 -500 200 R 50 50 1 1 B
-X PE13 44 -900 -600 200 R 50 50 1 1 B
-X PE14 45 -900 -700 200 R 50 50 1 1 B
-X PE15 46 -900 -800 200 R 50 50 1 1 B
-X PE2 1 -900 500 200 R 50 50 1 1 B
-X PE3 2 -900 400 200 R 50 50 1 1 B
-X PE4 3 -900 300 200 R 50 50 1 1 B
-X PE5 4 -900 200 200 R 50 50 1 1 B
-X PE6 5 -900 100 200 R 50 50 1 1 B
-X PE7 38 -900 0 200 R 50 50 1 1 B
-X PE8 39 -900 -100 200 R 50 50 1 1 B
-X PE9 40 -900 -200 200 R 50 50 1 1 B
-X PH0 12 -900 1000 200 R 50 50 1 1 I
-X PH1 13 -900 900 200 R 50 50 1 1 I
-X VBAT 6 -300 2700 200 D 50 50 1 1 W
-X VDD 100 200 2700 200 D 50 50 1 1 W
-X VDD 11 -200 2700 200 D 50 50 1 1 W
-X VDD 28 -100 2700 200 D 50 50 1 1 W
-X VDD 50 0 2700 200 D 50 50 1 1 W
-X VDD 75 100 2700 200 D 50 50 1 1 W
-X VDDA 22 300 2700 200 D 50 50 1 1 W
-X VDDUSB 73 400 2700 200 D 50 50 1 1 W
-X VREF+ 21 -900 2000 200 R 50 50 1 1 B
-X VREF- 20 -900 1900 200 R 50 50 1 1 W
-X VSS 10 -200 -2800 200 U 50 50 1 1 W
-X VSS 27 -100 -2800 200 U 50 50 1 1 W
-X VSS 49 0 -2800 200 U 50 50 1 1 W
-X VSS 74 100 -2800 200 U 50 50 1 1 W
 X VSS 99 200 -2800 200 U 50 50 1 1 W
-X VSSA 19 300 -2800 200 U 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
@@ -5225,150 +5225,150 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -1000 -3400 1000 3400 0 1 10 f
-X BOOT0 138 -1200 3100 200 R 50 50 1 1 I
-X NRST 25 -1200 3300 200 R 50 50 1 1 I
-X PA0 34 1200 3300 200 L 50 50 1 1 B
-X PA1 35 1200 3200 200 L 50 50 1 1 B
+X PE2 1 -1200 -2000 200 R 50 50 1 1 B
+X PF0 10 -1200 -100 200 R 50 50 1 1 B
+X PA8 100 1200 2500 200 L 50 50 1 1 B
+X PA9 101 1200 2400 200 L 50 50 1 1 B
 X PA10 102 1200 2300 200 L 50 50 1 1 B
 X PA11 103 1200 2200 200 L 50 50 1 1 B
 X PA12 104 1200 2100 200 L 50 50 1 1 B
 X PA13 105 1200 2000 200 L 50 50 1 1 B
+X VDDUSB 106 700 3600 200 D 50 50 1 1 W
+X VSS 107 200 -3600 200 U 50 50 1 1 W
+X VDD 108 100 3600 200 D 50 50 1 1 W
 X PA14 109 1200 1900 200 L 50 50 1 1 B
+X PF1 11 -1200 -200 200 R 50 50 1 1 B
 X PA15 110 1200 1800 200 L 50 50 1 1 B
-X PA2 36 1200 3100 200 L 50 50 1 1 B
-X PA3 37 1200 3000 200 L 50 50 1 1 B
-X PA4 40 1200 2900 200 L 50 50 1 1 B
-X PA5 41 1200 2800 200 L 50 50 1 1 B
-X PA6 42 1200 2700 200 L 50 50 1 1 B
-X PA7 43 1200 2600 200 L 50 50 1 1 B
-X PA8 100 1200 2500 200 L 50 50 1 1 B
-X PA9 101 1200 2400 200 L 50 50 1 1 B
-X PB0 46 1200 1600 200 L 50 50 1 1 B
-X PB1 47 1200 1500 200 L 50 50 1 1 B
-X PB10 69 1200 600 200 L 50 50 1 1 B
-X PB11 70 1200 500 200 L 50 50 1 1 B
-X PB12 73 1200 400 200 L 50 50 1 1 B
-X PB13 74 1200 300 200 L 50 50 1 1 B
-X PB14 75 1200 200 200 L 50 50 1 1 B
-X PB15 76 1200 100 200 L 50 50 1 1 B
-X PB2 48 1200 1400 200 L 50 50 1 1 B
-X PB3 133 1200 1300 200 L 50 50 1 1 B
-X PB4 134 1200 1200 200 L 50 50 1 1 B
-X PB5 135 1200 1100 200 L 50 50 1 1 B
-X PB6 136 1200 1000 200 L 50 50 1 1 B
-X PB7 137 1200 900 200 L 50 50 1 1 B
-X PB8 139 1200 800 200 L 50 50 1 1 B
-X PB9 140 1200 700 200 L 50 50 1 1 B
-X PC0 26 1200 -100 200 L 50 50 1 1 B
-X PC1 27 1200 -200 200 L 50 50 1 1 B
 X PC10 111 1200 -1100 200 L 50 50 1 1 B
 X PC11 112 1200 -1200 200 L 50 50 1 1 B
 X PC12 113 1200 -1300 200 L 50 50 1 1 B
-X PC13 7 1200 -1400 200 L 50 50 1 1 B
-X PC14 8 1200 -1500 200 L 50 50 1 1 B
-X PC15 9 1200 -1600 200 L 50 50 1 1 B
-X PC2 28 1200 -300 200 L 50 50 1 1 B
-X PC3 29 1200 -400 200 L 50 50 1 1 B
-X PC4 44 1200 -500 200 L 50 50 1 1 B
-X PC5 45 1200 -600 200 L 50 50 1 1 B
-X PC6 96 1200 -700 200 L 50 50 1 1 B
-X PC7 97 1200 -800 200 L 50 50 1 1 B
-X PC8 98 1200 -900 200 L 50 50 1 1 B
-X PC9 99 1200 -1000 200 L 50 50 1 1 B
 X PD0 114 1200 -1800 200 L 50 50 1 1 B
 X PD1 115 1200 -1900 200 L 50 50 1 1 B
-X PD10 79 1200 -2800 200 L 50 50 1 1 B
-X PD11 80 1200 -2900 200 L 50 50 1 1 B
-X PD12 81 1200 -3000 200 L 50 50 1 1 B
-X PD13 82 1200 -3100 200 L 50 50 1 1 B
-X PD14 85 1200 -3200 200 L 50 50 1 1 B
-X PD15 86 1200 -3300 200 L 50 50 1 1 B
 X PD2 116 1200 -2000 200 L 50 50 1 1 B
 X PD3 117 1200 -2100 200 L 50 50 1 1 B
 X PD4 118 1200 -2200 200 L 50 50 1 1 B
 X PD5 119 1200 -2300 200 L 50 50 1 1 B
+X PF2 12 -1200 -300 200 R 50 50 1 1 B
+X VSS 120 300 -3600 200 U 50 50 1 1 W
+X VDD 121 200 3600 200 D 50 50 1 1 W
 X PD6 122 1200 -2400 200 L 50 50 1 1 B
 X PD7 123 1200 -2500 200 L 50 50 1 1 B
-X PD8 77 1200 -2600 200 L 50 50 1 1 B
-X PD9 78 1200 -2700 200 L 50 50 1 1 B
+X PG9 124 -1200 700 200 R 50 50 1 1 B
+X PG10 125 -1200 600 200 R 50 50 1 1 B
+X PG11 126 -1200 500 200 R 50 50 1 1 B
+X PG12 127 -1200 400 200 R 50 50 1 1 B
+X PG13 128 -1200 300 200 R 50 50 1 1 B
+X PG14 129 -1200 200 200 R 50 50 1 1 B
+X PF3 13 -1200 -400 200 R 50 50 1 1 B
+X VSS 130 400 -3600 200 U 50 50 1 1 W
+X VDDIO2 131 600 3600 200 D 50 50 1 1 W
+X PG15 132 -1200 100 200 R 50 50 1 1 B
+X PB3 133 1200 1300 200 L 50 50 1 1 B
+X PB4 134 1200 1200 200 L 50 50 1 1 B
+X PB5 135 1200 1100 200 L 50 50 1 1 B
+X PB6 136 1200 1000 200 L 50 50 1 1 B
+X PB7 137 1200 900 200 L 50 50 1 1 B
+X BOOT0 138 -1200 3100 200 R 50 50 1 1 I
+X PB8 139 1200 800 200 L 50 50 1 1 B
+X PF4 14 -1200 -500 200 R 50 50 1 1 B
+X PB9 140 1200 700 200 L 50 50 1 1 B
 X PE0 141 -1200 -1800 200 R 50 50 1 1 B
 X PE1 142 -1200 -1900 200 R 50 50 1 1 B
-X PE10 63 -1200 -2800 200 R 50 50 1 1 B
-X PE11 64 -1200 -2900 200 R 50 50 1 1 B
-X PE12 65 -1200 -3000 200 R 50 50 1 1 B
-X PE13 66 -1200 -3100 200 R 50 50 1 1 B
-X PE14 67 -1200 -3200 200 R 50 50 1 1 B
-X PE15 68 -1200 -3300 200 R 50 50 1 1 B
-X PE2 1 -1200 -2000 200 R 50 50 1 1 B
+X VSS 143 500 -3600 200 U 50 50 1 1 W
+X VDD 144 300 3600 200 D 50 50 1 1 W
+X PF5 15 -1200 -600 200 R 50 50 1 1 B
+X VSS 16 -500 -3600 200 U 50 50 1 1 W
+X VDD 17 -500 3600 200 D 50 50 1 1 W
+X PF6 18 -1200 -700 200 R 50 50 1 1 B
+X PF7 19 -1200 -800 200 R 50 50 1 1 B
 X PE3 2 -1200 -2100 200 R 50 50 1 1 B
+X PF8 20 -1200 -900 200 R 50 50 1 1 B
+X PF9 21 -1200 -1000 200 R 50 50 1 1 B
+X PF10 22 -1200 -1100 200 R 50 50 1 1 B
+X PH0 23 -1200 1900 200 R 50 50 1 1 I
+X PH1 24 -1200 1800 200 R 50 50 1 1 I
+X NRST 25 -1200 3300 200 R 50 50 1 1 I
+X PC0 26 1200 -100 200 L 50 50 1 1 B
+X PC1 27 1200 -200 200 L 50 50 1 1 B
+X PC2 28 1200 -300 200 L 50 50 1 1 B
+X PC3 29 1200 -400 200 L 50 50 1 1 B
 X PE4 3 -1200 -2200 200 R 50 50 1 1 B
+X VSSA 30 600 -3600 200 U 50 50 1 1 W
+X VREF- 31 -1200 2800 200 R 50 50 1 1 W
+X VREF+ 32 -1200 2900 200 R 50 50 1 1 B
+X VDDA 33 400 3600 200 D 50 50 1 1 W
+X PA0 34 1200 3300 200 L 50 50 1 1 B
+X PA1 35 1200 3200 200 L 50 50 1 1 B
+X PA2 36 1200 3100 200 L 50 50 1 1 B
+X PA3 37 1200 3000 200 L 50 50 1 1 B
+X VSS 38 -400 -3600 200 U 50 50 1 1 W
+X VDD 39 -400 3600 200 D 50 50 1 1 W
 X PE5 4 -1200 -2300 200 R 50 50 1 1 B
-X PE6 5 -1200 -2400 200 R 50 50 1 1 B
-X PE7 58 -1200 -2500 200 R 50 50 1 1 B
-X PE8 59 -1200 -2600 200 R 50 50 1 1 B
-X PE9 60 -1200 -2700 200 R 50 50 1 1 B
-X PF0 10 -1200 -100 200 R 50 50 1 1 B
-X PF1 11 -1200 -200 200 R 50 50 1 1 B
-X PF10 22 -1200 -1100 200 R 50 50 1 1 B
+X PA4 40 1200 2900 200 L 50 50 1 1 B
+X PA5 41 1200 2800 200 L 50 50 1 1 B
+X PA6 42 1200 2700 200 L 50 50 1 1 B
+X PA7 43 1200 2600 200 L 50 50 1 1 B
+X PC4 44 1200 -500 200 L 50 50 1 1 B
+X PC5 45 1200 -600 200 L 50 50 1 1 B
+X PB0 46 1200 1600 200 L 50 50 1 1 B
+X PB1 47 1200 1500 200 L 50 50 1 1 B
+X PB2 48 1200 1400 200 L 50 50 1 1 B
 X PF11 49 -1200 -1200 200 R 50 50 1 1 B
+X PE6 5 -1200 -2400 200 R 50 50 1 1 B
 X PF12 50 -1200 -1300 200 R 50 50 1 1 B
+X VSS 51 -300 -3600 200 U 50 50 1 1 W
+X VDD 52 -300 3600 200 D 50 50 1 1 W
 X PF13 53 -1200 -1400 200 R 50 50 1 1 B
 X PF14 54 -1200 -1500 200 R 50 50 1 1 B
 X PF15 55 -1200 -1600 200 R 50 50 1 1 B
-X PF2 12 -1200 -300 200 R 50 50 1 1 B
-X PF3 13 -1200 -400 200 R 50 50 1 1 B
-X PF4 14 -1200 -500 200 R 50 50 1 1 B
-X PF5 15 -1200 -600 200 R 50 50 1 1 B
-X PF6 18 -1200 -700 200 R 50 50 1 1 B
-X PF7 19 -1200 -800 200 R 50 50 1 1 B
-X PF8 20 -1200 -900 200 R 50 50 1 1 B
-X PF9 21 -1200 -1000 200 R 50 50 1 1 B
 X PG0 56 -1200 1600 200 R 50 50 1 1 B
 X PG1 57 -1200 1500 200 R 50 50 1 1 B
-X PG10 125 -1200 600 200 R 50 50 1 1 B
-X PG11 126 -1200 500 200 R 50 50 1 1 B
-X PG12 127 -1200 400 200 R 50 50 1 1 B
-X PG13 128 -1200 300 200 R 50 50 1 1 B
-X PG14 129 -1200 200 200 R 50 50 1 1 B
-X PG15 132 -1200 100 200 R 50 50 1 1 B
+X PE7 58 -1200 -2500 200 R 50 50 1 1 B
+X PE8 59 -1200 -2600 200 R 50 50 1 1 B
+X VBAT 6 -600 3600 200 D 50 50 1 1 W
+X PE9 60 -1200 -2700 200 R 50 50 1 1 B
+X VSS 61 -200 -3600 200 U 50 50 1 1 W
+X VDD 62 -200 3600 200 D 50 50 1 1 W
+X PE10 63 -1200 -2800 200 R 50 50 1 1 B
+X PE11 64 -1200 -2900 200 R 50 50 1 1 B
+X PE12 65 -1200 -3000 200 R 50 50 1 1 B
+X PE13 66 -1200 -3100 200 R 50 50 1 1 B
+X PE14 67 -1200 -3200 200 R 50 50 1 1 B
+X PE15 68 -1200 -3300 200 R 50 50 1 1 B
+X PB10 69 1200 600 200 L 50 50 1 1 B
+X PC13 7 1200 -1400 200 L 50 50 1 1 B
+X PB11 70 1200 500 200 L 50 50 1 1 B
+X VSS 71 -100 -3600 200 U 50 50 1 1 W
+X VDD 72 -100 3600 200 D 50 50 1 1 W
+X PB12 73 1200 400 200 L 50 50 1 1 B
+X PB13 74 1200 300 200 L 50 50 1 1 B
+X PB14 75 1200 200 200 L 50 50 1 1 B
+X PB15 76 1200 100 200 L 50 50 1 1 B
+X PD8 77 1200 -2600 200 L 50 50 1 1 B
+X PD9 78 1200 -2700 200 L 50 50 1 1 B
+X PD10 79 1200 -2800 200 L 50 50 1 1 B
+X PC14 8 1200 -1500 200 L 50 50 1 1 B
+X PD11 80 1200 -2900 200 L 50 50 1 1 B
+X PD12 81 1200 -3000 200 L 50 50 1 1 B
+X PD13 82 1200 -3100 200 L 50 50 1 1 B
+X VSS 83 0 -3600 200 U 50 50 1 1 W
+X VDD 84 0 3600 200 D 50 50 1 1 W
+X PD14 85 1200 -3200 200 L 50 50 1 1 B
+X PD15 86 1200 -3300 200 L 50 50 1 1 B
 X PG2 87 -1200 1400 200 R 50 50 1 1 B
 X PG3 88 -1200 1300 200 R 50 50 1 1 B
 X PG4 89 -1200 1200 200 R 50 50 1 1 B
+X PC15 9 1200 -1600 200 L 50 50 1 1 B
 X PG5 90 -1200 1100 200 R 50 50 1 1 B
 X PG6 91 -1200 1000 200 R 50 50 1 1 B
 X PG7 92 -1200 900 200 R 50 50 1 1 B
 X PG8 93 -1200 800 200 R 50 50 1 1 B
-X PG9 124 -1200 700 200 R 50 50 1 1 B
-X PH0 23 -1200 1900 200 R 50 50 1 1 I
-X PH1 24 -1200 1800 200 R 50 50 1 1 I
-X VBAT 6 -600 3600 200 D 50 50 1 1 W
-X VDD 108 100 3600 200 D 50 50 1 1 W
-X VDD 121 200 3600 200 D 50 50 1 1 W
-X VDD 144 300 3600 200 D 50 50 1 1 W
-X VDD 17 -500 3600 200 D 50 50 1 1 W
-X VDD 39 -400 3600 200 D 50 50 1 1 W
-X VDD 52 -300 3600 200 D 50 50 1 1 W
-X VDD 62 -200 3600 200 D 50 50 1 1 W
-X VDD 72 -100 3600 200 D 50 50 1 1 W
-X VDD 84 0 3600 200 D 50 50 1 1 W
-X VDDA 33 400 3600 200 D 50 50 1 1 W
-X VDDIO2 131 600 3600 200 D 50 50 1 1 W
-X VDDIO2 95 500 3600 200 D 50 50 1 1 W
-X VDDUSB 106 700 3600 200 D 50 50 1 1 W
-X VREF+ 32 -1200 2900 200 R 50 50 1 1 B
-X VREF- 31 -1200 2800 200 R 50 50 1 1 W
-X VSS 107 200 -3600 200 U 50 50 1 1 W
-X VSS 120 300 -3600 200 U 50 50 1 1 W
-X VSS 130 400 -3600 200 U 50 50 1 1 W
-X VSS 143 500 -3600 200 U 50 50 1 1 W
-X VSS 16 -500 -3600 200 U 50 50 1 1 W
-X VSS 38 -400 -3600 200 U 50 50 1 1 W
-X VSS 51 -300 -3600 200 U 50 50 1 1 W
-X VSS 61 -200 -3600 200 U 50 50 1 1 W
-X VSS 71 -100 -3600 200 U 50 50 1 1 W
-X VSS 83 0 -3600 200 U 50 50 1 1 W
 X VSS 94 100 -3600 200 U 50 50 1 1 W
-X VSSA 30 600 -3600 200 U 50 50 1 1 W
+X VDDIO2 95 500 3600 200 D 50 50 1 1 W
+X PC6 96 1200 -700 200 L 50 50 1 1 B
+X PC7 97 1200 -800 200 L 50 50 1 1 B
+X PC8 98 1200 -900 200 L 50 50 1 1 B
+X PC9 99 1200 -1000 200 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
@@ -5384,150 +5384,150 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -1100 -3400 1100 3300 0 1 10 f
-X BOOT0 137 -1300 3000 200 R 50 50 1 1 I
-X NRST 25 -1300 3200 200 R 50 50 1 1 I
-X PA0 34 1300 3200 200 L 50 50 1 1 B
-X PA1 35 1300 3100 200 L 50 50 1 1 B
+X PE2 1 -1300 -2000 200 R 50 50 1 1 B
+X PF0 10 -1300 -100 200 R 50 50 1 1 B
+X PA8 100 1300 2400 200 L 50 50 1 1 B
+X PA9 101 1300 2300 200 L 50 50 1 1 B
 X PA10 102 1300 2200 200 L 50 50 1 1 B
 X PA11 103 1300 2100 200 L 50 50 1 1 B
 X PA12 104 1300 2000 200 L 50 50 1 1 B
 X PA13 105 1300 1900 200 L 50 50 1 1 B
+X VDDUSB 106 800 3500 200 D 50 50 1 1 W
+X VSS 107 200 -3600 200 U 50 50 1 1 W
+X VDD 108 0 3500 200 D 50 50 1 1 W
 X PA14 109 1300 1800 200 L 50 50 1 1 B
+X PF1 11 -1300 -200 200 R 50 50 1 1 B
 X PA15 110 1300 1700 200 L 50 50 1 1 B
-X PA2 36 1300 3000 200 L 50 50 1 1 B
-X PA3 37 1300 2900 200 L 50 50 1 1 B
-X PA4 40 1300 2800 200 L 50 50 1 1 B
-X PA5 41 1300 2700 200 L 50 50 1 1 B
-X PA6 42 1300 2600 200 L 50 50 1 1 B
-X PA7 43 1300 2500 200 L 50 50 1 1 B
-X PA8 100 1300 2400 200 L 50 50 1 1 B
-X PA9 101 1300 2300 200 L 50 50 1 1 B
-X PB0 46 1300 1500 200 L 50 50 1 1 B
-X PB1 47 1300 1400 200 L 50 50 1 1 B
-X PB10 69 1300 500 200 L 50 50 1 1 B
-X PB12 73 1300 400 200 L 50 50 1 1 B
-X PB13 74 1300 300 200 L 50 50 1 1 B
-X PB14 75 1300 200 200 L 50 50 1 1 B
-X PB15 76 1300 100 200 L 50 50 1 1 B
-X PB2 48 1300 1300 200 L 50 50 1 1 B
-X PB3 132 1300 1200 200 L 50 50 1 1 B
-X PB4 133 1300 1100 200 L 50 50 1 1 B
-X PB5 134 1300 1000 200 L 50 50 1 1 B
-X PB6 135 1300 900 200 L 50 50 1 1 B
-X PB7 136 1300 800 200 L 50 50 1 1 B
-X PB8 138 1300 700 200 L 50 50 1 1 B
-X PB9 139 1300 600 200 L 50 50 1 1 B
-X PC0 26 1300 -100 200 L 50 50 1 1 B
-X PC1 27 1300 -200 200 L 50 50 1 1 B
 X PC10 111 1300 -1100 200 L 50 50 1 1 B
 X PC11 112 1300 -1200 200 L 50 50 1 1 B
 X PC12 113 1300 -1300 200 L 50 50 1 1 B
-X PC13 7 1300 -1400 200 L 50 50 1 1 B
-X PC14 8 1300 -1500 200 L 50 50 1 1 B
-X PC15 9 1300 -1600 200 L 50 50 1 1 B
-X PC2 28 1300 -300 200 L 50 50 1 1 B
-X PC3 29 1300 -400 200 L 50 50 1 1 B
-X PC4 44 1300 -500 200 L 50 50 1 1 B
-X PC5 45 1300 -600 200 L 50 50 1 1 B
-X PC6 96 1300 -700 200 L 50 50 1 1 B
-X PC7 97 1300 -800 200 L 50 50 1 1 B
-X PC8 98 1300 -900 200 L 50 50 1 1 B
-X PC9 99 1300 -1000 200 L 50 50 1 1 B
 X PD0 114 1300 -1800 200 L 50 50 1 1 B
 X PD1 115 1300 -1900 200 L 50 50 1 1 B
-X PD10 79 1300 -2800 200 L 50 50 1 1 B
-X PD11 80 1300 -2900 200 L 50 50 1 1 B
-X PD12 81 1300 -3000 200 L 50 50 1 1 B
-X PD13 82 1300 -3100 200 L 50 50 1 1 B
-X PD14 85 1300 -3200 200 L 50 50 1 1 B
-X PD15 86 1300 -3300 200 L 50 50 1 1 B
 X PD2 116 1300 -2000 200 L 50 50 1 1 B
 X PD3 117 1300 -2100 200 L 50 50 1 1 B
 X PD4 118 1300 -2200 200 L 50 50 1 1 B
 X PD5 119 1300 -2300 200 L 50 50 1 1 B
+X PF2 12 -1300 -300 200 R 50 50 1 1 B
+X VSS 120 300 -3600 200 U 50 50 1 1 W
+X VDD 121 100 3500 200 D 50 50 1 1 W
 X PD6 122 1300 -2400 200 L 50 50 1 1 B
 X PD7 123 1300 -2500 200 L 50 50 1 1 B
-X PD8 77 1300 -2600 200 L 50 50 1 1 B
-X PD9 78 1300 -2700 200 L 50 50 1 1 B
+X PG9 124 -1300 600 200 R 50 50 1 1 B
+X PG10 125 -1300 500 200 R 50 50 1 1 B
+X PG11 126 -1300 400 200 R 50 50 1 1 B
+X PG12 127 -1300 300 200 R 50 50 1 1 B
+X PG13 128 -1300 200 200 R 50 50 1 1 B
+X PG14 129 -1300 100 200 R 50 50 1 1 B
+X PF3 13 -1300 -400 200 R 50 50 1 1 B
+X VSS 130 400 -3600 200 U 50 50 1 1 W
+X VDDIO2 131 700 3500 200 D 50 50 1 1 W
+X PB3 132 1300 1200 200 L 50 50 1 1 B
+X PB4 133 1300 1100 200 L 50 50 1 1 B
+X PB5 134 1300 1000 200 L 50 50 1 1 B
+X PB6 135 1300 900 200 L 50 50 1 1 B
+X PB7 136 1300 800 200 L 50 50 1 1 B
+X BOOT0 137 -1300 3000 200 R 50 50 1 1 I
+X PB8 138 1300 700 200 L 50 50 1 1 B
+X PB9 139 1300 600 200 L 50 50 1 1 B
+X PF4 14 -1300 -500 200 R 50 50 1 1 B
 X PE0 140 -1300 -1800 200 R 50 50 1 1 B
 X PE1 141 -1300 -1900 200 R 50 50 1 1 B
-X PE10 63 -1300 -2800 200 R 50 50 1 1 B
-X PE11 64 -1300 -2900 200 R 50 50 1 1 B
-X PE12 65 -1300 -3000 200 R 50 50 1 1 B
-X PE13 66 -1300 -3100 200 R 50 50 1 1 B
-X PE14 67 -1300 -3200 200 R 50 50 1 1 B
-X PE15 68 -1300 -3300 200 R 50 50 1 1 B
-X PE2 1 -1300 -2000 200 R 50 50 1 1 B
+X VDD12 142 400 3500 200 D 50 50 1 1 W
+X VSS 143 500 -3600 200 U 50 50 1 1 W
+X VDD 144 200 3500 200 D 50 50 1 1 W
+X PF5 15 -1300 -600 200 R 50 50 1 1 B
+X VSS 16 -500 -3600 200 U 50 50 1 1 W
+X VDD 17 -600 3500 200 D 50 50 1 1 W
+X PF6 18 -1300 -700 200 R 50 50 1 1 B
+X PF7 19 -1300 -800 200 R 50 50 1 1 B
 X PE3 2 -1300 -2100 200 R 50 50 1 1 B
+X PF8 20 -1300 -900 200 R 50 50 1 1 B
+X PF9 21 -1300 -1000 200 R 50 50 1 1 B
+X PF10 22 -1300 -1100 200 R 50 50 1 1 B
+X PH0 23 -1300 1800 200 R 50 50 1 1 I
+X PH1 24 -1300 1700 200 R 50 50 1 1 I
+X NRST 25 -1300 3200 200 R 50 50 1 1 I
+X PC0 26 1300 -100 200 L 50 50 1 1 B
+X PC1 27 1300 -200 200 L 50 50 1 1 B
+X PC2 28 1300 -300 200 L 50 50 1 1 B
+X PC3 29 1300 -400 200 L 50 50 1 1 B
 X PE4 3 -1300 -2200 200 R 50 50 1 1 B
+X VSSA 30 600 -3600 200 U 50 50 1 1 W
+X VREF- 31 -1300 2700 200 R 50 50 1 1 W
+X VREF+ 32 -1300 2800 200 R 50 50 1 1 B
+X VDDA 33 500 3500 200 D 50 50 1 1 W
+X PA0 34 1300 3200 200 L 50 50 1 1 B
+X PA1 35 1300 3100 200 L 50 50 1 1 B
+X PA2 36 1300 3000 200 L 50 50 1 1 B
+X PA3 37 1300 2900 200 L 50 50 1 1 B
+X VSS 38 -400 -3600 200 U 50 50 1 1 W
+X VDD 39 -500 3500 200 D 50 50 1 1 W
 X PE5 4 -1300 -2300 200 R 50 50 1 1 B
-X PE6 5 -1300 -2400 200 R 50 50 1 1 B
-X PE7 58 -1300 -2500 200 R 50 50 1 1 B
-X PE8 59 -1300 -2600 200 R 50 50 1 1 B
-X PE9 60 -1300 -2700 200 R 50 50 1 1 B
-X PF0 10 -1300 -100 200 R 50 50 1 1 B
-X PF1 11 -1300 -200 200 R 50 50 1 1 B
-X PF10 22 -1300 -1100 200 R 50 50 1 1 B
+X PA4 40 1300 2800 200 L 50 50 1 1 B
+X PA5 41 1300 2700 200 L 50 50 1 1 B
+X PA6 42 1300 2600 200 L 50 50 1 1 B
+X PA7 43 1300 2500 200 L 50 50 1 1 B
+X PC4 44 1300 -500 200 L 50 50 1 1 B
+X PC5 45 1300 -600 200 L 50 50 1 1 B
+X PB0 46 1300 1500 200 L 50 50 1 1 B
+X PB1 47 1300 1400 200 L 50 50 1 1 B
+X PB2 48 1300 1300 200 L 50 50 1 1 B
 X PF11 49 -1300 -1200 200 R 50 50 1 1 B
+X PE6 5 -1300 -2400 200 R 50 50 1 1 B
 X PF12 50 -1300 -1300 200 R 50 50 1 1 B
+X VSS 51 -300 -3600 200 U 50 50 1 1 W
+X VDD 52 -400 3500 200 D 50 50 1 1 W
 X PF13 53 -1300 -1400 200 R 50 50 1 1 B
 X PF14 54 -1300 -1500 200 R 50 50 1 1 B
 X PF15 55 -1300 -1600 200 R 50 50 1 1 B
-X PF2 12 -1300 -300 200 R 50 50 1 1 B
-X PF3 13 -1300 -400 200 R 50 50 1 1 B
-X PF4 14 -1300 -500 200 R 50 50 1 1 B
-X PF5 15 -1300 -600 200 R 50 50 1 1 B
-X PF6 18 -1300 -700 200 R 50 50 1 1 B
-X PF7 19 -1300 -800 200 R 50 50 1 1 B
-X PF8 20 -1300 -900 200 R 50 50 1 1 B
-X PF9 21 -1300 -1000 200 R 50 50 1 1 B
 X PG0 56 -1300 1500 200 R 50 50 1 1 B
 X PG1 57 -1300 1400 200 R 50 50 1 1 B
-X PG10 125 -1300 500 200 R 50 50 1 1 B
-X PG11 126 -1300 400 200 R 50 50 1 1 B
-X PG12 127 -1300 300 200 R 50 50 1 1 B
-X PG13 128 -1300 200 200 R 50 50 1 1 B
-X PG14 129 -1300 100 200 R 50 50 1 1 B
+X PE7 58 -1300 -2500 200 R 50 50 1 1 B
+X PE8 59 -1300 -2600 200 R 50 50 1 1 B
+X VBAT 6 -700 3500 200 D 50 50 1 1 W
+X PE9 60 -1300 -2700 200 R 50 50 1 1 B
+X VSS 61 -200 -3600 200 U 50 50 1 1 W
+X VDD 62 -300 3500 200 D 50 50 1 1 W
+X PE10 63 -1300 -2800 200 R 50 50 1 1 B
+X PE11 64 -1300 -2900 200 R 50 50 1 1 B
+X PE12 65 -1300 -3000 200 R 50 50 1 1 B
+X PE13 66 -1300 -3100 200 R 50 50 1 1 B
+X PE14 67 -1300 -3200 200 R 50 50 1 1 B
+X PE15 68 -1300 -3300 200 R 50 50 1 1 B
+X PB10 69 1300 500 200 L 50 50 1 1 B
+X PC13 7 1300 -1400 200 L 50 50 1 1 B
+X VDD12 70 300 3500 200 D 50 50 1 1 W
+X VSS 71 -100 -3600 200 U 50 50 1 1 W
+X VDD 72 -200 3500 200 D 50 50 1 1 W
+X PB12 73 1300 400 200 L 50 50 1 1 B
+X PB13 74 1300 300 200 L 50 50 1 1 B
+X PB14 75 1300 200 200 L 50 50 1 1 B
+X PB15 76 1300 100 200 L 50 50 1 1 B
+X PD8 77 1300 -2600 200 L 50 50 1 1 B
+X PD9 78 1300 -2700 200 L 50 50 1 1 B
+X PD10 79 1300 -2800 200 L 50 50 1 1 B
+X PC14 8 1300 -1500 200 L 50 50 1 1 B
+X PD11 80 1300 -2900 200 L 50 50 1 1 B
+X PD12 81 1300 -3000 200 L 50 50 1 1 B
+X PD13 82 1300 -3100 200 L 50 50 1 1 B
+X VSS 83 0 -3600 200 U 50 50 1 1 W
+X VDD 84 -100 3500 200 D 50 50 1 1 W
+X PD14 85 1300 -3200 200 L 50 50 1 1 B
+X PD15 86 1300 -3300 200 L 50 50 1 1 B
 X PG2 87 -1300 1300 200 R 50 50 1 1 B
 X PG3 88 -1300 1200 200 R 50 50 1 1 B
 X PG4 89 -1300 1100 200 R 50 50 1 1 B
+X PC15 9 1300 -1600 200 L 50 50 1 1 B
 X PG5 90 -1300 1000 200 R 50 50 1 1 B
 X PG6 91 -1300 900 200 R 50 50 1 1 B
 X PG7 92 -1300 800 200 R 50 50 1 1 B
 X PG8 93 -1300 700 200 R 50 50 1 1 B
-X PG9 124 -1300 600 200 R 50 50 1 1 B
-X PH0 23 -1300 1800 200 R 50 50 1 1 I
-X PH1 24 -1300 1700 200 R 50 50 1 1 I
-X VBAT 6 -700 3500 200 D 50 50 1 1 W
-X VDD 108 0 3500 200 D 50 50 1 1 W
-X VDD 121 100 3500 200 D 50 50 1 1 W
-X VDD 144 200 3500 200 D 50 50 1 1 W
-X VDD 17 -600 3500 200 D 50 50 1 1 W
-X VDD 39 -500 3500 200 D 50 50 1 1 W
-X VDD 52 -400 3500 200 D 50 50 1 1 W
-X VDD 62 -300 3500 200 D 50 50 1 1 W
-X VDD 72 -200 3500 200 D 50 50 1 1 W
-X VDD 84 -100 3500 200 D 50 50 1 1 W
-X VDD12 142 400 3500 200 D 50 50 1 1 W
-X VDD12 70 300 3500 200 D 50 50 1 1 W
-X VDDA 33 500 3500 200 D 50 50 1 1 W
-X VDDIO2 131 700 3500 200 D 50 50 1 1 W
-X VDDIO2 95 600 3500 200 D 50 50 1 1 W
-X VDDUSB 106 800 3500 200 D 50 50 1 1 W
-X VREF+ 32 -1300 2800 200 R 50 50 1 1 B
-X VREF- 31 -1300 2700 200 R 50 50 1 1 W
-X VSS 107 200 -3600 200 U 50 50 1 1 W
-X VSS 120 300 -3600 200 U 50 50 1 1 W
-X VSS 130 400 -3600 200 U 50 50 1 1 W
-X VSS 143 500 -3600 200 U 50 50 1 1 W
-X VSS 16 -500 -3600 200 U 50 50 1 1 W
-X VSS 38 -400 -3600 200 U 50 50 1 1 W
-X VSS 51 -300 -3600 200 U 50 50 1 1 W
-X VSS 61 -200 -3600 200 U 50 50 1 1 W
-X VSS 71 -100 -3600 200 U 50 50 1 1 W
-X VSS 83 0 -3600 200 U 50 50 1 1 W
 X VSS 94 100 -3600 200 U 50 50 1 1 W
-X VSSA 30 600 -3600 200 U 50 50 1 1 W
+X VDDIO2 95 600 3500 200 D 50 50 1 1 W
+X PC6 96 1300 -700 200 L 50 50 1 1 B
+X PC7 97 1300 -800 200 L 50 50 1 1 B
+X PC8 98 1300 -900 200 L 50 50 1 1 B
+X PC9 99 1300 -1000 200 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
@@ -5543,78 +5543,78 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -700 -1800 600 1700 0 1 10 f
-X BOOT0 D7 -800 1400 100 R 50 50 1 1 I
-X NRST E9 -800 1600 100 R 50 50 1 1 I
-X PA0 H8 700 1500 100 L 50 50 1 1 B
-X PA1 G4 700 1400 100 L 50 50 1 1 B
-X PA10 D2 700 500 100 L 50 50 1 1 B
-X PA11 D1 700 400 100 L 50 50 1 1 B
-X PA12 C1 700 300 100 L 50 50 1 1 B
-X PA13 C2 700 200 100 L 50 50 1 1 B
-X PA14 B2 700 100 100 L 50 50 1 1 B
+X VDDUSB A1 300 1800 100 D 50 50 1 1 W
 X PA15 A2 700 0 100 L 50 50 1 1 B
-X PA2 G6 700 1300 100 L 50 50 1 1 B
-X PA3 H7 700 1200 100 L 50 50 1 1 B
-X PA4 G5 700 1100 100 L 50 50 1 1 B
-X PA5 H6 700 1000 100 L 50 50 1 1 B
-X PA6 H5 700 900 100 L 50 50 1 1 B
-X PA7 H4 700 800 100 L 50 50 1 1 B
-X PA8 E2 700 700 100 L 50 50 1 1 B
-X PA9 E3 700 600 100 L 50 50 1 1 B
-X PB0 J5 700 -200 100 L 50 50 1 1 B
-X PB1 J4 700 -300 100 L 50 50 1 1 B
-X PB10 H3 700 -1200 100 L 50 50 1 1 B
-X PB11 G3 700 -1300 100 L 50 50 1 1 B
-X PB12 H1 700 -1400 100 L 50 50 1 1 B
-X PB13 H2 700 -1500 100 L 50 50 1 1 B
-X PB14 G2 700 -1600 100 L 50 50 1 1 B
-X PB15 G1 700 -1700 100 L 50 50 1 1 B
-X PB2 J3 700 -400 100 L 50 50 1 1 B
+X PD2 A3 -800 0 100 R 50 50 1 1 B
+X PG9 A4 -800 700 100 R 50 50 1 1 B
+X PG14 A5 -800 200 100 R 50 50 1 1 B
 X PB3 A6 700 -500 100 L 50 50 1 1 B
-X PB4 C6 700 -600 100 L 50 50 1 1 B
-X PB5 C7 700 -700 100 L 50 50 1 1 B
-X PB6 B7 700 -800 100 L 50 50 1 1 B
 X PB7 A7 700 -900 100 L 50 50 1 1 B
-X PB8 E7 700 -1000 100 L 50 50 1 1 B
-X PB9 E8 700 -1100 100 L 50 50 1 1 B
-X PC0 F9 -800 -200 100 R 50 50 1 1 B
-X PC1 F8 -800 -300 100 R 50 50 1 1 B
-X PC10 D3 -800 -1200 100 R 50 50 1 1 B
-X PC11 C3 -800 -1300 100 R 50 50 1 1 B
+X VSS A8 -200 -1900 100 U 50 50 1 1 W
+X VDD A9 -200 1800 100 D 50 50 1 1 W
+X VSS B1 -100 -1900 100 U 50 50 1 1 W
+X PA14 B2 700 100 100 L 50 50 1 1 B
 X PC12 B3 -800 -1400 100 R 50 50 1 1 B
-X PC13 B8 -800 -1500 100 R 50 50 1 1 B
-X PC14 C9 -800 -1600 100 R 50 50 1 1 B
-X PC15 C8 -800 -1700 100 R 50 50 1 1 B
-X PC2 F7 -800 -400 100 R 50 50 1 1 B
-X PC3 G7 -800 -500 100 R 50 50 1 1 B
-X PC4 J7 -800 -600 100 R 50 50 1 1 B
-X PC5 J6 -800 -700 100 R 50 50 1 1 B
-X PC6 F3 -800 -800 100 R 50 50 1 1 B
-X PC7 F1 -800 -900 100 R 50 50 1 1 B
-X PC8 F2 -800 -1000 100 R 50 50 1 1 B
-X PC9 E1 -800 -1100 100 R 50 50 1 1 B
-X PD2 A3 -800 0 100 R 50 50 1 1 B
 X PG10 B4 -800 600 100 R 50 50 1 1 B
-X PG11 C4 -800 500 100 R 50 50 1 1 B
-X PG12 C5 -800 400 100 R 50 50 1 1 B
 X PG13 B5 -800 300 100 R 50 50 1 1 B
-X PG14 A5 -800 200 100 R 50 50 1 1 B
-X PG9 A4 -800 700 100 R 50 50 1 1 B
-X PH0 D9 -800 1000 100 R 50 50 1 1 I
-X PH1 D8 -800 900 100 R 50 50 1 1 I
+X VDDIO2 B6 200 1800 100 D 50 50 1 1 W
+X PB6 B7 700 -800 100 L 50 50 1 1 B
+X PC13 B8 -800 -1500 100 R 50 50 1 1 B
 X VBAT B9 -300 1800 100 D 50 50 1 1 W
-X VDD A9 -200 1800 100 D 50 50 1 1 W
-X VDD J1 -100 1800 100 D 50 50 1 1 W
-X VDD J8 0 1800 100 D 50 50 1 1 W
-X VDDA H9 100 1800 100 D 50 50 1 1 W
-X VDDIO2 B6 200 1800 100 D 50 50 1 1 W
-X VDDUSB A1 300 1800 100 D 50 50 1 1 W
+X PA12 C1 700 300 100 L 50 50 1 1 B
+X PA13 C2 700 200 100 L 50 50 1 1 B
+X PC11 C3 -800 -1300 100 R 50 50 1 1 B
+X PG11 C4 -800 500 100 R 50 50 1 1 B
+X PG12 C5 -800 400 100 R 50 50 1 1 B
+X PB4 C6 700 -600 100 L 50 50 1 1 B
+X PB5 C7 700 -700 100 L 50 50 1 1 B
+X PC15 C8 -800 -1700 100 R 50 50 1 1 B
+X PC14 C9 -800 -1600 100 R 50 50 1 1 B
+X PA11 D1 700 400 100 L 50 50 1 1 B
+X PA10 D2 700 500 100 L 50 50 1 1 B
+X PC10 D3 -800 -1200 100 R 50 50 1 1 B
+X BOOT0 D7 -800 1400 100 R 50 50 1 1 I
+X PH1 D8 -800 900 100 R 50 50 1 1 I
+X PH0 D9 -800 1000 100 R 50 50 1 1 I
+X PC9 E1 -800 -1100 100 R 50 50 1 1 B
+X PA8 E2 700 700 100 L 50 50 1 1 B
+X PA9 E3 700 600 100 L 50 50 1 1 B
+X PB8 E7 700 -1000 100 L 50 50 1 1 B
+X PB9 E8 700 -1100 100 L 50 50 1 1 B
+X NRST E9 -800 1600 100 R 50 50 1 1 I
+X PC7 F1 -800 -900 100 R 50 50 1 1 B
+X PC8 F2 -800 -1000 100 R 50 50 1 1 B
+X PC6 F3 -800 -800 100 R 50 50 1 1 B
+X PC2 F7 -800 -400 100 R 50 50 1 1 B
+X PC1 F8 -800 -300 100 R 50 50 1 1 B
+X PC0 F9 -800 -200 100 R 50 50 1 1 B
+X PB15 G1 700 -1700 100 L 50 50 1 1 B
+X PB14 G2 700 -1600 100 L 50 50 1 1 B
+X PB11 G3 700 -1300 100 L 50 50 1 1 B
+X PA1 G4 700 1400 100 L 50 50 1 1 B
+X PA4 G5 700 1100 100 L 50 50 1 1 B
+X PA2 G6 700 1300 100 L 50 50 1 1 B
+X PC3 G7 -800 -500 100 R 50 50 1 1 B
 X VREF+ G8 -800 1200 100 R 50 50 1 1 B
-X VSS A8 -200 -1900 100 U 50 50 1 1 W
-X VSS B1 -100 -1900 100 U 50 50 1 1 W
+X VSSA G9 200 -1900 100 U 50 50 1 1 W
+X PB12 H1 700 -1400 100 L 50 50 1 1 B
+X PB13 H2 700 -1500 100 L 50 50 1 1 B
+X PB10 H3 700 -1200 100 L 50 50 1 1 B
+X PA7 H4 700 800 100 L 50 50 1 1 B
+X PA6 H5 700 900 100 L 50 50 1 1 B
+X PA5 H6 700 1000 100 L 50 50 1 1 B
+X PA3 H7 700 1200 100 L 50 50 1 1 B
+X PA0 H8 700 1500 100 L 50 50 1 1 B
+X VDDA H9 100 1800 100 D 50 50 1 1 W
+X VDD J1 -100 1800 100 D 50 50 1 1 W
 X VSS J2 0 -1900 100 U 50 50 1 1 W
+X PB2 J3 700 -400 100 L 50 50 1 1 B
+X PB1 J4 700 -300 100 L 50 50 1 1 B
+X PB0 J5 700 -200 100 L 50 50 1 1 B
+X PC5 J6 -800 -700 100 R 50 50 1 1 B
+X PC4 J7 -800 -600 100 R 50 50 1 1 B
+X VDD J8 0 1800 100 D 50 50 1 1 W
 X VSS J9 100 -1900 100 U 50 50 1 1 W
-X VSSA G9 200 -1900 100 U 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
@@ -5630,217 +5630,217 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -1000 -3400 900 3400 0 1 10 f
-X BOOT0 A4 -1200 3100 200 R 50 50 1 1 I
-X NRST H2 -1200 3300 200 R 50 50 1 1 I
-X OPAMP1_VINM M3 -1200 2700 200 R 50 50 1 1 B
-X OPAMP2_VINM M4 -1200 2600 200 R 50 50 1 1 B
-X PA0 L2 1100 3300 200 L 50 50 1 1 B
-X PA1 M2 1100 3200 200 L 50 50 1 1 B
-X PA10 C12 1100 2300 200 L 50 50 1 1 B
-X PA11 B12 1100 2200 200 L 50 50 1 1 B
-X PA12 A12 1100 2100 200 L 50 50 1 1 B
-X PA13 A11 1100 2000 200 L 50 50 1 1 B
+X PE3 A1 -1200 -2100 200 R 50 50 1 1 B
 X PA14 A10 1100 1900 200 L 50 50 1 1 B
-X PA15 A9 1100 1800 200 L 50 50 1 1 B
-X PA2 K3 1100 3100 200 L 50 50 1 1 B
-X PA3 L3 1100 3000 200 L 50 50 1 1 B
-X PA4 J4 1100 2900 200 L 50 50 1 1 B
-X PA5 K4 1100 2800 200 L 50 50 1 1 B
-X PA6 L4 1100 2700 200 L 50 50 1 1 B
-X PA7 J5 1100 2600 200 L 50 50 1 1 B
-X PA8 D11 1100 2500 200 L 50 50 1 1 B
-X PA9 D10 1100 2400 200 L 50 50 1 1 B
-X PB0 M5 1100 1600 200 L 50 50 1 1 B
-X PB1 M6 1100 1500 200 L 50 50 1 1 B
-X PB10 L10 1100 600 200 L 50 50 1 1 B
-X PB11 L11 1100 500 200 L 50 50 1 1 B
-X PB12 L12 1100 400 200 L 50 50 1 1 B
-X PB13 K12 1100 300 200 L 50 50 1 1 B
-X PB14 K11 1100 200 200 L 50 50 1 1 B
-X PB15 K10 1100 100 200 L 50 50 1 1 B
-X PB2 L6 1100 1400 200 L 50 50 1 1 B
-X PB3 A8 1100 1300 200 L 50 50 1 1 B
-X PB4 A7 1100 1200 200 L 50 50 1 1 B
-X PB5 C5 1100 1100 200 L 50 50 1 1 B
-X PB6 B5 1100 1000 200 L 50 50 1 1 B
-X PB7 B4 1100 900 200 L 50 50 1 1 B
+X PA13 A11 1100 2000 200 L 50 50 1 1 B
+X PA12 A12 1100 2100 200 L 50 50 1 1 B
+X PE1 A2 -1200 -1900 200 R 50 50 1 1 B
 X PB8 A3 1100 800 200 L 50 50 1 1 B
-X PB9 B3 1100 700 200 L 50 50 1 1 B
-X PC0 H1 1100 -100 200 L 50 50 1 1 B
-X PC1 J2 1100 -200 200 L 50 50 1 1 B
-X PC10 B11 1100 -1100 200 L 50 50 1 1 B
-X PC11 C10 1100 -1200 200 L 50 50 1 1 B
+X BOOT0 A4 -1200 3100 200 R 50 50 1 1 I
+X PD7 A5 1100 -2500 200 L 50 50 1 1 B
+X PD5 A6 1100 -2300 200 L 50 50 1 1 B
+X PB4 A7 1100 1200 200 L 50 50 1 1 B
+X PB3 A8 1100 1300 200 L 50 50 1 1 B
+X PA15 A9 1100 1800 200 L 50 50 1 1 B
+X PE4 B1 -1200 -2200 200 R 50 50 1 1 B
 X PC12 B10 1100 -1300 200 L 50 50 1 1 B
+X PC10 B11 1100 -1100 200 L 50 50 1 1 B
+X PA11 B12 1100 2200 200 L 50 50 1 1 B
+X PE2 B2 -1200 -2000 200 R 50 50 1 1 B
+X PB9 B3 1100 700 200 L 50 50 1 1 B
+X PB7 B4 1100 900 200 L 50 50 1 1 B
+X PB6 B5 1100 1000 200 L 50 50 1 1 B
+X PD6 B6 1100 -2400 200 L 50 50 1 1 B
+X PD4 B7 1100 -2200 200 L 50 50 1 1 B
+X PD3 B8 1100 -2100 200 L 50 50 1 1 B
+X PD1 B9 1100 -1900 200 L 50 50 1 1 B
 X PC13 C1 1100 -1400 200 L 50 50 1 1 B
+X PC11 C10 1100 -1200 200 L 50 50 1 1 B
+X VDDUSB C11 600 3600 200 D 50 50 1 1 W
+X PA10 C12 1100 2300 200 L 50 50 1 1 B
+X PE5 C2 -1200 -2300 200 R 50 50 1 1 B
+X PE0 C3 -1200 -1800 200 R 50 50 1 1 B
+X VDD C4 -200 3600 200 D 50 50 1 1 W
+X PB5 C5 1100 1100 200 L 50 50 1 1 B
+X PG14 C6 -1200 -300 200 R 50 50 1 1 B
+X PG13 C7 -1200 -200 200 R 50 50 1 1 B
+X PD2 C8 1100 -2000 200 L 50 50 1 1 B
+X PD0 C9 1100 -1800 200 L 50 50 1 1 B
 X PC14 D1 1100 -1500 200 L 50 50 1 1 B
-X PC15 E1 1100 -1600 200 L 50 50 1 1 B
-X PC2 J3 1100 -300 200 L 50 50 1 1 B
-X PC3 K2 1100 -400 200 L 50 50 1 1 B
-X PC4 K5 1100 -500 200 L 50 50 1 1 B
-X PC5 L5 1100 -600 200 L 50 50 1 1 B
-X PC6 E12 1100 -700 200 L 50 50 1 1 B
-X PC7 E11 1100 -800 200 L 50 50 1 1 B
-X PC8 E10 1100 -900 200 L 50 50 1 1 B
+X PA9 D10 1100 2400 200 L 50 50 1 1 B
+X PA8 D11 1100 2500 200 L 50 50 1 1 B
 X PC9 D12 1100 -1000 200 L 50 50 1 1 B
-X PD0 C9 1100 -1800 200 L 50 50 1 1 B
-X PD1 B9 1100 -1900 200 L 50 50 1 1 B
-X PD10 J12 1100 -2800 200 L 50 50 1 1 B
-X PD11 J11 1100 -2900 200 L 50 50 1 1 B
-X PD12 J10 1100 -3000 200 L 50 50 1 1 B
-X PD13 H12 1100 -3100 200 L 50 50 1 1 B
-X PD14 H11 1100 -3200 200 L 50 50 1 1 B
-X PD15 H10 1100 -3300 200 L 50 50 1 1 B
-X PD2 C8 1100 -2000 200 L 50 50 1 1 B
-X PD3 B8 1100 -2100 200 L 50 50 1 1 B
-X PD4 B7 1100 -2200 200 L 50 50 1 1 B
-X PD5 A6 1100 -2300 200 L 50 50 1 1 B
-X PD6 B6 1100 -2400 200 L 50 50 1 1 B
-X PD7 A5 1100 -2500 200 L 50 50 1 1 B
-X PD8 K9 1100 -2600 200 L 50 50 1 1 B
-X PD9 K8 1100 -2700 200 L 50 50 1 1 B
-X PE0 C3 -1200 -1800 200 R 50 50 1 1 B
-X PE1 A2 -1200 -1900 200 R 50 50 1 1 B
-X PE10 L8 -1200 -2800 200 R 50 50 1 1 B
-X PE11 M9 -1200 -2900 200 R 50 50 1 1 B
-X PE12 L9 -1200 -3000 200 R 50 50 1 1 B
-X PE13 M10 -1200 -3100 200 R 50 50 1 1 B
-X PE14 M11 -1200 -3200 200 R 50 50 1 1 B
-X PE15 M12 -1200 -3300 200 R 50 50 1 1 B
-X PE2 B2 -1200 -2000 200 R 50 50 1 1 B
-X PE3 A1 -1200 -2100 200 R 50 50 1 1 B
-X PE4 B1 -1200 -2200 200 R 50 50 1 1 B
-X PE5 C2 -1200 -2300 200 R 50 50 1 1 B
 X PE6 D2 -1200 -2400 200 R 50 50 1 1 B
-X PE7 M7 -1200 -2500 200 R 50 50 1 1 B
-X PE8 L7 -1200 -2600 200 R 50 50 1 1 B
-X PE9 M8 -1200 -2700 200 R 50 50 1 1 B
-X PF0 D6 -1200 -600 200 R 50 50 1 1 B
-X PF1 D5 -1200 -700 200 R 50 50 1 1 B
-X PF11 K6 -1200 -1200 200 R 50 50 1 1 B
-X PF12 J7 -1200 -1300 200 R 50 50 1 1 B
-X PF13 K7 -1200 -1400 200 R 50 50 1 1 B
-X PF14 J8 -1200 -1500 200 R 50 50 1 1 B
-X PF15 J9 -1200 -1600 200 R 50 50 1 1 B
+X VSS D3 -200 -3600 200 U 50 50 1 1 W
 X PF2 D4 -1200 -800 200 R 50 50 1 1 B
+X PF1 D5 -1200 -700 200 R 50 50 1 1 B
+X PF0 D6 -1200 -600 200 R 50 50 1 1 B
+X PG12 D7 -1200 -100 200 R 50 50 1 1 B
+X PG10 D8 -1200 100 200 R 50 50 1 1 B
+X PG9 D9 -1200 200 200 R 50 50 1 1 B
+X PC15 E1 1100 -1600 200 L 50 50 1 1 B
+X PC8 E10 1100 -900 200 L 50 50 1 1 B
+X PC7 E11 1100 -800 200 L 50 50 1 1 B
+X PC6 E12 1100 -700 200 L 50 50 1 1 B
+X VBAT E2 -300 3600 200 D 50 50 1 1 W
+X VSS E3 -100 -3600 200 U 50 50 1 1 W
 X PF3 E4 -1200 -900 200 R 50 50 1 1 B
+X PG5 E9 -1200 600 200 R 50 50 1 1 B
+X PH0 F1 -1200 1400 200 R 50 50 1 1 I
+X PG4 F10 -1200 700 200 R 50 50 1 1 B
+X VSS F11 300 -3600 200 U 50 50 1 1 W
+X VSS F12 400 -3600 200 U 50 50 1 1 W
+X VSS F2 0 -3600 200 U 50 50 1 1 W
 X PF4 F3 -1200 -1000 200 R 50 50 1 1 B
 X PF5 F4 -1200 -1100 200 R 50 50 1 1 B
-X PG0 H9 -1200 1100 200 R 50 50 1 1 B
-X PG1 G9 -1200 1000 200 R 50 50 1 1 B
-X PG10 D8 -1200 100 200 R 50 50 1 1 B
-X PG11 G3 -1200 0 200 R 50 50 1 1 B
-X PG12 D7 -1200 -100 200 R 50 50 1 1 B
-X PG13 C7 -1200 -200 200 R 50 50 1 1 B
-X PG14 C6 -1200 -300 200 R 50 50 1 1 B
-X PG15 K1 -1200 -400 200 R 50 50 1 1 B
-X PG2 G10 -1200 900 200 R 50 50 1 1 B
+X VSS F6 100 -3600 200 U 50 50 1 1 W
+X VSS F7 200 -3600 200 U 50 50 1 1 W
 X PG3 F9 -1200 800 200 R 50 50 1 1 B
-X PG4 F10 -1200 700 200 R 50 50 1 1 B
-X PG5 E9 -1200 600 200 R 50 50 1 1 B
-X PG6 G4 -1200 500 200 R 50 50 1 1 B
-X PG7 H4 -1200 400 200 R 50 50 1 1 B
-X PG8 J6 -1200 300 200 R 50 50 1 1 B
-X PG9 D9 -1200 200 200 R 50 50 1 1 B
-X PH0 F1 -1200 1400 200 R 50 50 1 1 I
 X PH1 G1 -1200 1300 200 R 50 50 1 1 I
-X VBAT E2 -300 3600 200 D 50 50 1 1 W
-X VDD C4 -200 3600 200 D 50 50 1 1 W
+X PG2 G10 -1200 900 200 R 50 50 1 1 B
 X VDD G11 100 3600 200 D 50 50 1 1 W
 X VDD G12 200 3600 200 D 50 50 1 1 W
 X VDD G2 -100 3600 200 D 50 50 1 1 W
+X PG11 G3 -1200 0 200 R 50 50 1 1 B
+X PG6 G4 -1200 500 200 R 50 50 1 1 B
 X VDD G6 0 3600 200 D 50 50 1 1 W
-X VDD H3 300 3600 200 D 50 50 1 1 W
-X VDDA M1 400 3600 200 D 50 50 1 1 W
 X VDDIO2 G7 500 3600 200 D 50 50 1 1 W
-X VDDUSB C11 600 3600 200 D 50 50 1 1 W
-X VREF+ L1 -1200 2900 200 R 50 50 1 1 B
-X VSS D3 -200 -3600 200 U 50 50 1 1 W
-X VSS E3 -100 -3600 200 U 50 50 1 1 W
-X VSS F11 300 -3600 200 U 50 50 1 1 W
-X VSS F12 400 -3600 200 U 50 50 1 1 W
-X VSS F2 0 -3600 200 U 50 50 1 1 W
-X VSS F6 100 -3600 200 U 50 50 1 1 W
-X VSS F7 200 -3600 200 U 50 50 1 1 W
+X PG1 G9 -1200 1000 200 R 50 50 1 1 B
+X PC0 H1 1100 -100 200 L 50 50 1 1 B
+X PD15 H10 1100 -3300 200 L 50 50 1 1 B
+X PD14 H11 1100 -3200 200 L 50 50 1 1 B
+X PD13 H12 1100 -3100 200 L 50 50 1 1 B
+X NRST H2 -1200 3300 200 R 50 50 1 1 I
+X VDD H3 300 3600 200 D 50 50 1 1 W
+X PG7 H4 -1200 400 200 R 50 50 1 1 B
+X PG0 H9 -1200 1100 200 R 50 50 1 1 B
 X VSSA J1 500 -3600 200 U 50 50 1 1 W
-ENDDRAW
-ENDDEF
-#
-# STM32L486RGTx
-#
-DEF STM32L486RGTx U 0 20 Y Y 1 F N
-F0 "U" -600 1750 50 H V L CNN
-F1 "STM32L486RGTx" 400 1750 50 H V L CNN
-F2 "Package_QFP:LQFP-64_10x10mm_P0.5mm" -600 -1700 50 H I R CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- LQFP*10x10mm*P0.5mm*
-$ENDFPLIST
-DRAW
-S -600 -1700 600 1700 0 1 10 f
-X BOOT0 60 -700 1400 100 R 50 50 1 1 I
-X NRST 7 -700 1600 100 R 50 50 1 1 I
+X PD12 J10 1100 -3000 200 L 50 50 1 1 B
+X PD11 J11 1100 -2900 200 L 50 50 1 1 B
+X PD10 J12 1100 -2800 200 L 50 50 1 1 B
+X PC1 J2 1100 -200 200 L 50 50 1 1 B
+X PC2 J3 1100 -300 200 L 50 50 1 1 B
+X PA4 J4 1100 2900 200 L 50 50 1 1 B
+X PA7 J5 1100 2600 200 L 50 50 1 1 B
+X PG8 J6 -1200 300 200 R 50 50 1 1 B
+X PF12 J7 -1200 -1300 200 R 50 50 1 1 B
+X PF14 J8 -1200 -1500 200 R 50 50 1 1 B
+X PF15 J9 -1200 -1600 200 R 50 50 1 1 B
+X PG15 K1 -1200 -400 200 R 50 50 1 1 B
+X PB15 K10 1100 100 200 L 50 50 1 1 B
+X PB14 K11 1100 200 200 L 50 50 1 1 B
+X PB13 K12 1100 300 200 L 50 50 1 1 B
+X PC3 K2 1100 -400 200 L 50 50 1 1 B
+X PA2 K3 1100 3100 200 L 50 50 1 1 B
+X PA5 K4 1100 2800 200 L 50 50 1 1 B
+X PC4 K5 1100 -500 200 L 50 50 1 1 B
+X PF11 K6 -1200 -1200 200 R 50 50 1 1 B
+X PF13 K7 -1200 -1400 200 R 50 50 1 1 B
+X PD9 K8 1100 -2700 200 L 50 50 1 1 B
+X PD8 K9 1100 -2600 200 L 50 50 1 1 B
+X VREF+ L1 -1200 2900 200 R 50 50 1 1 B
+X PB10 L10 1100 600 200 L 50 50 1 1 B
+X PB11 L11 1100 500 200 L 50 50 1 1 B
+X PB12 L12 1100 400 200 L 50 50 1 1 B
+X PA0 L2 1100 3300 200 L 50 50 1 1 B
+X PA3 L3 1100 3000 200 L 50 50 1 1 B
+X PA6 L4 1100 2700 200 L 50 50 1 1 B
+X PC5 L5 1100 -600 200 L 50 50 1 1 B
+X PB2 L6 1100 1400 200 L 50 50 1 1 B
+X PE8 L7 -1200 -2600 200 R 50 50 1 1 B
+X PE10 L8 -1200 -2800 200 R 50 50 1 1 B
+X PE12 L9 -1200 -3000 200 R 50 50 1 1 B
+X VDDA M1 400 3600 200 D 50 50 1 1 W
+X PE13 M10 -1200 -3100 200 R 50 50 1 1 B
+X PE14 M11 -1200 -3200 200 R 50 50 1 1 B
+X PE15 M12 -1200 -3300 200 R 50 50 1 1 B
+X PA1 M2 1100 3200 200 L 50 50 1 1 B
+X OPAMP1_VINM M3 -1200 2700 200 R 50 50 1 1 B
+X OPAMP2_VINM M4 -1200 2600 200 R 50 50 1 1 B
+X PB0 M5 1100 1600 200 L 50 50 1 1 B
+X PB1 M6 1100 1500 200 L 50 50 1 1 B
+X PE7 M7 -1200 -2500 200 R 50 50 1 1 B
+X PE9 M8 -1200 -2700 200 R 50 50 1 1 B
+X PE11 M9 -1200 -2900 200 R 50 50 1 1 B
+ENDDRAW
+ENDDEF
+#
+# STM32L486RGTx
+#
+DEF STM32L486RGTx U 0 20 Y Y 1 F N
+F0 "U" -600 1750 50 H V L CNN
+F1 "STM32L486RGTx" 400 1750 50 H V L CNN
+F2 "Package_QFP:LQFP-64_10x10mm_P0.5mm" -600 -1700 50 H I R CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ LQFP*10x10mm*P0.5mm*
+$ENDFPLIST
+DRAW
+S -600 -1700 600 1700 0 1 10 f
+X VBAT 1 -200 1800 100 D 50 50 1 1 W
+X PC2 10 -700 -300 100 R 50 50 1 1 B
+X PC3 11 -700 -400 100 R 50 50 1 1 B
+X VSSA 12 200 -1800 100 U 50 50 1 1 W
+X VDDA 13 200 1800 100 D 50 50 1 1 W
 X PA0 14 700 1600 100 L 50 50 1 1 B
 X PA1 15 700 1500 100 L 50 50 1 1 B
-X PA10 43 700 600 100 L 50 50 1 1 B
-X PA11 44 700 500 100 L 50 50 1 1 B
-X PA12 45 700 400 100 L 50 50 1 1 B
-X PA13 46 700 300 100 L 50 50 1 1 B
-X PA14 49 700 200 100 L 50 50 1 1 B
-X PA15 50 700 100 100 L 50 50 1 1 B
 X PA2 16 700 1400 100 L 50 50 1 1 B
 X PA3 17 700 1300 100 L 50 50 1 1 B
+X VSS 18 -200 -1800 100 U 50 50 1 1 W
+X VDD 19 -100 1800 100 D 50 50 1 1 W
+X PC13 2 -700 -1400 100 R 50 50 1 1 B
 X PA4 20 700 1200 100 L 50 50 1 1 B
 X PA5 21 700 1100 100 L 50 50 1 1 B
 X PA6 22 700 1000 100 L 50 50 1 1 B
 X PA7 23 700 900 100 L 50 50 1 1 B
-X PA8 41 700 800 100 L 50 50 1 1 B
-X PA9 42 700 700 100 L 50 50 1 1 B
+X PC4 24 -700 -500 100 R 50 50 1 1 B
+X PC5 25 -700 -600 100 R 50 50 1 1 B
 X PB0 26 700 -100 100 L 50 50 1 1 B
 X PB1 27 700 -200 100 L 50 50 1 1 B
+X PB2 28 700 -300 100 L 50 50 1 1 B
 X PB10 29 700 -1100 100 L 50 50 1 1 B
+X PC14 3 -700 -1500 100 R 50 50 1 1 B
 X PB11 30 700 -1200 100 L 50 50 1 1 B
+X VSS 31 -100 -1800 100 U 50 50 1 1 W
+X VDD 32 0 1800 100 D 50 50 1 1 W
 X PB12 33 700 -1300 100 L 50 50 1 1 B
 X PB13 34 700 -1400 100 L 50 50 1 1 B
 X PB14 35 700 -1500 100 L 50 50 1 1 B
 X PB15 36 700 -1600 100 L 50 50 1 1 B
-X PB2 28 700 -300 100 L 50 50 1 1 B
+X PC6 37 -700 -700 100 R 50 50 1 1 B
+X PC7 38 -700 -800 100 R 50 50 1 1 B
+X PC8 39 -700 -900 100 R 50 50 1 1 B
+X PC15 4 -700 -1600 100 R 50 50 1 1 B
+X PC9 40 -700 -1000 100 R 50 50 1 1 B
+X PA8 41 700 800 100 L 50 50 1 1 B
+X PA9 42 700 700 100 L 50 50 1 1 B
+X PA10 43 700 600 100 L 50 50 1 1 B
+X PA11 44 700 500 100 L 50 50 1 1 B
+X PA12 45 700 400 100 L 50 50 1 1 B
+X PA13 46 700 300 100 L 50 50 1 1 B
+X VSS 47 0 -1800 100 U 50 50 1 1 W
+X VDDUSB 48 300 1800 100 D 50 50 1 1 W
+X PA14 49 700 200 100 L 50 50 1 1 B
+X PH0 5 -700 400 100 R 50 50 1 1 I
+X PA15 50 700 100 100 L 50 50 1 1 B
+X PC10 51 -700 -1100 100 R 50 50 1 1 B
+X PC11 52 -700 -1200 100 R 50 50 1 1 B
+X PC12 53 -700 -1300 100 R 50 50 1 1 B
+X PD2 54 -700 100 100 R 50 50 1 1 B
 X PB3 55 700 -400 100 L 50 50 1 1 B
 X PB4 56 700 -500 100 L 50 50 1 1 B
 X PB5 57 700 -600 100 L 50 50 1 1 B
 X PB6 58 700 -700 100 L 50 50 1 1 B
 X PB7 59 700 -800 100 L 50 50 1 1 B
+X PH1 6 -700 300 100 R 50 50 1 1 I
+X BOOT0 60 -700 1400 100 R 50 50 1 1 I
 X PB8 61 700 -900 100 L 50 50 1 1 B
 X PB9 62 700 -1000 100 L 50 50 1 1 B
+X VSS 63 100 -1800 100 U 50 50 1 1 W
+X VDD 64 100 1800 100 D 50 50 1 1 W
+X NRST 7 -700 1600 100 R 50 50 1 1 I
 X PC0 8 -700 -100 100 R 50 50 1 1 B
 X PC1 9 -700 -200 100 R 50 50 1 1 B
-X PC10 51 -700 -1100 100 R 50 50 1 1 B
-X PC11 52 -700 -1200 100 R 50 50 1 1 B
-X PC12 53 -700 -1300 100 R 50 50 1 1 B
-X PC13 2 -700 -1400 100 R 50 50 1 1 B
-X PC14 3 -700 -1500 100 R 50 50 1 1 B
-X PC15 4 -700 -1600 100 R 50 50 1 1 B
-X PC2 10 -700 -300 100 R 50 50 1 1 B
-X PC3 11 -700 -400 100 R 50 50 1 1 B
-X PC4 24 -700 -500 100 R 50 50 1 1 B
-X PC5 25 -700 -600 100 R 50 50 1 1 B
-X PC6 37 -700 -700 100 R 50 50 1 1 B
-X PC7 38 -700 -800 100 R 50 50 1 1 B
-X PC8 39 -700 -900 100 R 50 50 1 1 B
-X PC9 40 -700 -1000 100 R 50 50 1 1 B
-X PD2 54 -700 100 100 R 50 50 1 1 B
-X PH0 5 -700 400 100 R 50 50 1 1 I
-X PH1 6 -700 300 100 R 50 50 1 1 I
-X VBAT 1 -200 1800 100 D 50 50 1 1 W
-X VDD 19 -100 1800 100 D 50 50 1 1 W
-X VDD 32 0 1800 100 D 50 50 1 1 W
-X VDD 64 100 1800 100 D 50 50 1 1 W
-X VDDA 13 200 1800 100 D 50 50 1 1 W
-X VDDUSB 48 300 1800 100 D 50 50 1 1 W
-X VSS 18 -200 -1800 100 U 50 50 1 1 W
-X VSS 31 -100 -1800 100 U 50 50 1 1 W
-X VSS 47 0 -1800 100 U 50 50 1 1 W
-X VSS 63 100 -1800 100 U 50 50 1 1 W
-X VSSA 12 200 -1800 100 U 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
@@ -5856,106 +5856,106 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -700 -2600 700 2500 0 1 10 f
-X BOOT0 94 -900 2200 200 R 50 50 1 1 I
+X PE2 1 -900 500 200 R 50 50 1 1 B
+X VSS 10 -200 -2800 200 U 50 50 1 1 W
+X VDD 100 200 2700 200 D 50 50 1 1 W
+X VDD 11 -200 2700 200 D 50 50 1 1 W
+X PH0 12 -900 1000 200 R 50 50 1 1 I
+X PH1 13 -900 900 200 R 50 50 1 1 I
 X NRST 14 -900 2400 200 R 50 50 1 1 I
+X PC0 15 900 -1000 200 L 50 50 1 1 B
+X PC1 16 900 -1100 200 L 50 50 1 1 B
+X PC2 17 900 -1200 200 L 50 50 1 1 B
+X PC3 18 900 -1300 200 L 50 50 1 1 B
+X VSSA 19 300 -2800 200 U 50 50 1 1 W
+X PE3 2 -900 400 200 R 50 50 1 1 B
+X VREF- 20 -900 1900 200 R 50 50 1 1 W
+X VREF+ 21 -900 2000 200 R 50 50 1 1 B
+X VDDA 22 300 2700 200 D 50 50 1 1 W
 X PA0 23 900 2400 200 L 50 50 1 1 B
 X PA1 24 900 2300 200 L 50 50 1 1 B
-X PA10 69 900 1400 200 L 50 50 1 1 B
-X PA11 70 900 1300 200 L 50 50 1 1 B
-X PA12 71 900 1200 200 L 50 50 1 1 B
-X PA13 72 900 1100 200 L 50 50 1 1 B
-X PA14 76 900 1000 200 L 50 50 1 1 B
-X PA15 77 900 900 200 L 50 50 1 1 B
 X PA2 25 900 2200 200 L 50 50 1 1 B
 X PA3 26 900 2100 200 L 50 50 1 1 B
+X VSS 27 -100 -2800 200 U 50 50 1 1 W
+X VDD 28 -100 2700 200 D 50 50 1 1 W
 X PA4 29 900 2000 200 L 50 50 1 1 B
+X PE4 3 -900 300 200 R 50 50 1 1 B
 X PA5 30 900 1900 200 L 50 50 1 1 B
 X PA6 31 900 1800 200 L 50 50 1 1 B
 X PA7 32 900 1700 200 L 50 50 1 1 B
-X PA8 67 900 1600 200 L 50 50 1 1 B
-X PA9 68 900 1500 200 L 50 50 1 1 B
+X PC4 33 900 -1400 200 L 50 50 1 1 B
+X PC5 34 900 -1500 200 L 50 50 1 1 B
 X PB0 35 900 700 200 L 50 50 1 1 B
 X PB1 36 900 600 200 L 50 50 1 1 B
+X PB2 37 900 500 200 L 50 50 1 1 B
+X PE7 38 -900 0 200 R 50 50 1 1 B
+X PE8 39 -900 -100 200 R 50 50 1 1 B
+X PE5 4 -900 200 200 R 50 50 1 1 B
+X PE9 40 -900 -200 200 R 50 50 1 1 B
+X PE10 41 -900 -300 200 R 50 50 1 1 B
+X PE11 42 -900 -400 200 R 50 50 1 1 B
+X PE12 43 -900 -500 200 R 50 50 1 1 B
+X PE13 44 -900 -600 200 R 50 50 1 1 B
+X PE14 45 -900 -700 200 R 50 50 1 1 B
+X PE15 46 -900 -800 200 R 50 50 1 1 B
 X PB10 47 900 -300 200 L 50 50 1 1 B
 X PB11 48 900 -400 200 L 50 50 1 1 B
+X VSS 49 0 -2800 200 U 50 50 1 1 W
+X PE6 5 -900 100 200 R 50 50 1 1 B
+X VDD 50 0 2700 200 D 50 50 1 1 W
 X PB12 51 900 -500 200 L 50 50 1 1 B
 X PB13 52 900 -600 200 L 50 50 1 1 B
 X PB14 53 900 -700 200 L 50 50 1 1 B
 X PB15 54 900 -800 200 L 50 50 1 1 B
-X PB2 37 900 500 200 L 50 50 1 1 B
-X PB3 89 900 400 200 L 50 50 1 1 B
-X PB4 90 900 300 200 L 50 50 1 1 B
-X PB5 91 900 200 200 L 50 50 1 1 B
-X PB6 92 900 100 200 L 50 50 1 1 B
-X PB7 93 900 0 200 L 50 50 1 1 B
-X PB8 95 900 -100 200 L 50 50 1 1 B
-X PB9 96 900 -200 200 L 50 50 1 1 B
-X PC0 15 900 -1000 200 L 50 50 1 1 B
-X PC1 16 900 -1100 200 L 50 50 1 1 B
-X PC10 78 900 -2000 200 L 50 50 1 1 B
-X PC11 79 900 -2100 200 L 50 50 1 1 B
-X PC12 80 900 -2200 200 L 50 50 1 1 B
-X PC13 7 900 -2300 200 L 50 50 1 1 B
-X PC14 8 900 -2400 200 L 50 50 1 1 B
-X PC15 9 900 -2500 200 L 50 50 1 1 B
-X PC2 17 900 -1200 200 L 50 50 1 1 B
-X PC3 18 900 -1300 200 L 50 50 1 1 B
-X PC4 33 900 -1400 200 L 50 50 1 1 B
-X PC5 34 900 -1500 200 L 50 50 1 1 B
-X PC6 63 900 -1600 200 L 50 50 1 1 B
-X PC7 64 900 -1700 200 L 50 50 1 1 B
-X PC8 65 900 -1800 200 L 50 50 1 1 B
-X PC9 66 900 -1900 200 L 50 50 1 1 B
-X PD0 81 -900 -1000 200 R 50 50 1 1 B
-X PD1 82 -900 -1100 200 R 50 50 1 1 B
+X PD8 55 -900 -1800 200 R 50 50 1 1 B
+X PD9 56 -900 -1900 200 R 50 50 1 1 B
 X PD10 57 -900 -2000 200 R 50 50 1 1 B
 X PD11 58 -900 -2100 200 R 50 50 1 1 B
 X PD12 59 -900 -2200 200 R 50 50 1 1 B
+X VBAT 6 -300 2700 200 D 50 50 1 1 W
 X PD13 60 -900 -2300 200 R 50 50 1 1 B
 X PD14 61 -900 -2400 200 R 50 50 1 1 B
 X PD15 62 -900 -2500 200 R 50 50 1 1 B
+X PC6 63 900 -1600 200 L 50 50 1 1 B
+X PC7 64 900 -1700 200 L 50 50 1 1 B
+X PC8 65 900 -1800 200 L 50 50 1 1 B
+X PC9 66 900 -1900 200 L 50 50 1 1 B
+X PA8 67 900 1600 200 L 50 50 1 1 B
+X PA9 68 900 1500 200 L 50 50 1 1 B
+X PA10 69 900 1400 200 L 50 50 1 1 B
+X PC13 7 900 -2300 200 L 50 50 1 1 B
+X PA11 70 900 1300 200 L 50 50 1 1 B
+X PA12 71 900 1200 200 L 50 50 1 1 B
+X PA13 72 900 1100 200 L 50 50 1 1 B
+X VDDUSB 73 400 2700 200 D 50 50 1 1 W
+X VSS 74 100 -2800 200 U 50 50 1 1 W
+X VDD 75 100 2700 200 D 50 50 1 1 W
+X PA14 76 900 1000 200 L 50 50 1 1 B
+X PA15 77 900 900 200 L 50 50 1 1 B
+X PC10 78 900 -2000 200 L 50 50 1 1 B
+X PC11 79 900 -2100 200 L 50 50 1 1 B
+X PC14 8 900 -2400 200 L 50 50 1 1 B
+X PC12 80 900 -2200 200 L 50 50 1 1 B
+X PD0 81 -900 -1000 200 R 50 50 1 1 B
+X PD1 82 -900 -1100 200 R 50 50 1 1 B
 X PD2 83 -900 -1200 200 R 50 50 1 1 B
 X PD3 84 -900 -1300 200 R 50 50 1 1 B
 X PD4 85 -900 -1400 200 R 50 50 1 1 B
 X PD5 86 -900 -1500 200 R 50 50 1 1 B
 X PD6 87 -900 -1600 200 R 50 50 1 1 B
 X PD7 88 -900 -1700 200 R 50 50 1 1 B
-X PD8 55 -900 -1800 200 R 50 50 1 1 B
-X PD9 56 -900 -1900 200 R 50 50 1 1 B
+X PB3 89 900 400 200 L 50 50 1 1 B
+X PC15 9 900 -2500 200 L 50 50 1 1 B
+X PB4 90 900 300 200 L 50 50 1 1 B
+X PB5 91 900 200 200 L 50 50 1 1 B
+X PB6 92 900 100 200 L 50 50 1 1 B
+X PB7 93 900 0 200 L 50 50 1 1 B
+X BOOT0 94 -900 2200 200 R 50 50 1 1 I
+X PB8 95 900 -100 200 L 50 50 1 1 B
+X PB9 96 900 -200 200 L 50 50 1 1 B
 X PE0 97 -900 700 200 R 50 50 1 1 B
 X PE1 98 -900 600 200 R 50 50 1 1 B
-X PE10 41 -900 -300 200 R 50 50 1 1 B
-X PE11 42 -900 -400 200 R 50 50 1 1 B
-X PE12 43 -900 -500 200 R 50 50 1 1 B
-X PE13 44 -900 -600 200 R 50 50 1 1 B
-X PE14 45 -900 -700 200 R 50 50 1 1 B
-X PE15 46 -900 -800 200 R 50 50 1 1 B
-X PE2 1 -900 500 200 R 50 50 1 1 B
-X PE3 2 -900 400 200 R 50 50 1 1 B
-X PE4 3 -900 300 200 R 50 50 1 1 B
-X PE5 4 -900 200 200 R 50 50 1 1 B
-X PE6 5 -900 100 200 R 50 50 1 1 B
-X PE7 38 -900 0 200 R 50 50 1 1 B
-X PE8 39 -900 -100 200 R 50 50 1 1 B
-X PE9 40 -900 -200 200 R 50 50 1 1 B
-X PH0 12 -900 1000 200 R 50 50 1 1 I
-X PH1 13 -900 900 200 R 50 50 1 1 I
-X VBAT 6 -300 2700 200 D 50 50 1 1 W
-X VDD 100 200 2700 200 D 50 50 1 1 W
-X VDD 11 -200 2700 200 D 50 50 1 1 W
-X VDD 28 -100 2700 200 D 50 50 1 1 W
-X VDD 50 0 2700 200 D 50 50 1 1 W
-X VDD 75 100 2700 200 D 50 50 1 1 W
-X VDDA 22 300 2700 200 D 50 50 1 1 W
-X VDDUSB 73 400 2700 200 D 50 50 1 1 W
-X VREF+ 21 -900 2000 200 R 50 50 1 1 B
-X VREF- 20 -900 1900 200 R 50 50 1 1 W
-X VSS 10 -200 -2800 200 U 50 50 1 1 W
-X VSS 27 -100 -2800 200 U 50 50 1 1 W
-X VSS 49 0 -2800 200 U 50 50 1 1 W
-X VSS 74 100 -2800 200 U 50 50 1 1 W
 X VSS 99 200 -2800 200 U 50 50 1 1 W
-X VSSA 19 300 -2800 200 U 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
@@ -5971,150 +5971,150 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -1000 -3400 1000 3400 0 1 10 f
-X BOOT0 138 -1200 3100 200 R 50 50 1 1 I
-X NRST 25 -1200 3300 200 R 50 50 1 1 I
-X PA0 34 1200 3300 200 L 50 50 1 1 B
-X PA1 35 1200 3200 200 L 50 50 1 1 B
+X PE2 1 -1200 -2000 200 R 50 50 1 1 B
+X PF0 10 -1200 -100 200 R 50 50 1 1 B
+X PA8 100 1200 2500 200 L 50 50 1 1 B
+X PA9 101 1200 2400 200 L 50 50 1 1 B
 X PA10 102 1200 2300 200 L 50 50 1 1 B
 X PA11 103 1200 2200 200 L 50 50 1 1 B
 X PA12 104 1200 2100 200 L 50 50 1 1 B
 X PA13 105 1200 2000 200 L 50 50 1 1 B
+X VDDUSB 106 700 3600 200 D 50 50 1 1 W
+X VSS 107 200 -3600 200 U 50 50 1 1 W
+X VDD 108 100 3600 200 D 50 50 1 1 W
 X PA14 109 1200 1900 200 L 50 50 1 1 B
+X PF1 11 -1200 -200 200 R 50 50 1 1 B
 X PA15 110 1200 1800 200 L 50 50 1 1 B
-X PA2 36 1200 3100 200 L 50 50 1 1 B
-X PA3 37 1200 3000 200 L 50 50 1 1 B
-X PA4 40 1200 2900 200 L 50 50 1 1 B
-X PA5 41 1200 2800 200 L 50 50 1 1 B
-X PA6 42 1200 2700 200 L 50 50 1 1 B
-X PA7 43 1200 2600 200 L 50 50 1 1 B
-X PA8 100 1200 2500 200 L 50 50 1 1 B
-X PA9 101 1200 2400 200 L 50 50 1 1 B
-X PB0 46 1200 1600 200 L 50 50 1 1 B
-X PB1 47 1200 1500 200 L 50 50 1 1 B
-X PB10 69 1200 600 200 L 50 50 1 1 B
-X PB11 70 1200 500 200 L 50 50 1 1 B
-X PB12 73 1200 400 200 L 50 50 1 1 B
-X PB13 74 1200 300 200 L 50 50 1 1 B
-X PB14 75 1200 200 200 L 50 50 1 1 B
-X PB15 76 1200 100 200 L 50 50 1 1 B
-X PB2 48 1200 1400 200 L 50 50 1 1 B
-X PB3 133 1200 1300 200 L 50 50 1 1 B
-X PB4 134 1200 1200 200 L 50 50 1 1 B
-X PB5 135 1200 1100 200 L 50 50 1 1 B
-X PB6 136 1200 1000 200 L 50 50 1 1 B
-X PB7 137 1200 900 200 L 50 50 1 1 B
-X PB8 139 1200 800 200 L 50 50 1 1 B
-X PB9 140 1200 700 200 L 50 50 1 1 B
-X PC0 26 1200 -100 200 L 50 50 1 1 B
-X PC1 27 1200 -200 200 L 50 50 1 1 B
 X PC10 111 1200 -1100 200 L 50 50 1 1 B
 X PC11 112 1200 -1200 200 L 50 50 1 1 B
 X PC12 113 1200 -1300 200 L 50 50 1 1 B
-X PC13 7 1200 -1400 200 L 50 50 1 1 B
-X PC14 8 1200 -1500 200 L 50 50 1 1 B
-X PC15 9 1200 -1600 200 L 50 50 1 1 B
-X PC2 28 1200 -300 200 L 50 50 1 1 B
-X PC3 29 1200 -400 200 L 50 50 1 1 B
-X PC4 44 1200 -500 200 L 50 50 1 1 B
-X PC5 45 1200 -600 200 L 50 50 1 1 B
-X PC6 96 1200 -700 200 L 50 50 1 1 B
-X PC7 97 1200 -800 200 L 50 50 1 1 B
-X PC8 98 1200 -900 200 L 50 50 1 1 B
-X PC9 99 1200 -1000 200 L 50 50 1 1 B
 X PD0 114 1200 -1800 200 L 50 50 1 1 B
 X PD1 115 1200 -1900 200 L 50 50 1 1 B
-X PD10 79 1200 -2800 200 L 50 50 1 1 B
-X PD11 80 1200 -2900 200 L 50 50 1 1 B
-X PD12 81 1200 -3000 200 L 50 50 1 1 B
-X PD13 82 1200 -3100 200 L 50 50 1 1 B
-X PD14 85 1200 -3200 200 L 50 50 1 1 B
-X PD15 86 1200 -3300 200 L 50 50 1 1 B
 X PD2 116 1200 -2000 200 L 50 50 1 1 B
 X PD3 117 1200 -2100 200 L 50 50 1 1 B
 X PD4 118 1200 -2200 200 L 50 50 1 1 B
 X PD5 119 1200 -2300 200 L 50 50 1 1 B
+X PF2 12 -1200 -300 200 R 50 50 1 1 B
+X VSS 120 300 -3600 200 U 50 50 1 1 W
+X VDD 121 200 3600 200 D 50 50 1 1 W
 X PD6 122 1200 -2400 200 L 50 50 1 1 B
 X PD7 123 1200 -2500 200 L 50 50 1 1 B
-X PD8 77 1200 -2600 200 L 50 50 1 1 B
-X PD9 78 1200 -2700 200 L 50 50 1 1 B
+X PG9 124 -1200 700 200 R 50 50 1 1 B
+X PG10 125 -1200 600 200 R 50 50 1 1 B
+X PG11 126 -1200 500 200 R 50 50 1 1 B
+X PG12 127 -1200 400 200 R 50 50 1 1 B
+X PG13 128 -1200 300 200 R 50 50 1 1 B
+X PG14 129 -1200 200 200 R 50 50 1 1 B
+X PF3 13 -1200 -400 200 R 50 50 1 1 B
+X VSS 130 400 -3600 200 U 50 50 1 1 W
+X VDDIO2 131 600 3600 200 D 50 50 1 1 W
+X PG15 132 -1200 100 200 R 50 50 1 1 B
+X PB3 133 1200 1300 200 L 50 50 1 1 B
+X PB4 134 1200 1200 200 L 50 50 1 1 B
+X PB5 135 1200 1100 200 L 50 50 1 1 B
+X PB6 136 1200 1000 200 L 50 50 1 1 B
+X PB7 137 1200 900 200 L 50 50 1 1 B
+X BOOT0 138 -1200 3100 200 R 50 50 1 1 I
+X PB8 139 1200 800 200 L 50 50 1 1 B
+X PF4 14 -1200 -500 200 R 50 50 1 1 B
+X PB9 140 1200 700 200 L 50 50 1 1 B
 X PE0 141 -1200 -1800 200 R 50 50 1 1 B
 X PE1 142 -1200 -1900 200 R 50 50 1 1 B
-X PE10 63 -1200 -2800 200 R 50 50 1 1 B
-X PE11 64 -1200 -2900 200 R 50 50 1 1 B
-X PE12 65 -1200 -3000 200 R 50 50 1 1 B
-X PE13 66 -1200 -3100 200 R 50 50 1 1 B
-X PE14 67 -1200 -3200 200 R 50 50 1 1 B
-X PE15 68 -1200 -3300 200 R 50 50 1 1 B
-X PE2 1 -1200 -2000 200 R 50 50 1 1 B
+X VSS 143 500 -3600 200 U 50 50 1 1 W
+X VDD 144 300 3600 200 D 50 50 1 1 W
+X PF5 15 -1200 -600 200 R 50 50 1 1 B
+X VSS 16 -500 -3600 200 U 50 50 1 1 W
+X VDD 17 -500 3600 200 D 50 50 1 1 W
+X PF6 18 -1200 -700 200 R 50 50 1 1 B
+X PF7 19 -1200 -800 200 R 50 50 1 1 B
 X PE3 2 -1200 -2100 200 R 50 50 1 1 B
+X PF8 20 -1200 -900 200 R 50 50 1 1 B
+X PF9 21 -1200 -1000 200 R 50 50 1 1 B
+X PF10 22 -1200 -1100 200 R 50 50 1 1 B
+X PH0 23 -1200 1900 200 R 50 50 1 1 I
+X PH1 24 -1200 1800 200 R 50 50 1 1 I
+X NRST 25 -1200 3300 200 R 50 50 1 1 I
+X PC0 26 1200 -100 200 L 50 50 1 1 B
+X PC1 27 1200 -200 200 L 50 50 1 1 B
+X PC2 28 1200 -300 200 L 50 50 1 1 B
+X PC3 29 1200 -400 200 L 50 50 1 1 B
 X PE4 3 -1200 -2200 200 R 50 50 1 1 B
+X VSSA 30 600 -3600 200 U 50 50 1 1 W
+X VREF- 31 -1200 2800 200 R 50 50 1 1 W
+X VREF+ 32 -1200 2900 200 R 50 50 1 1 B
+X VDDA 33 400 3600 200 D 50 50 1 1 W
+X PA0 34 1200 3300 200 L 50 50 1 1 B
+X PA1 35 1200 3200 200 L 50 50 1 1 B
+X PA2 36 1200 3100 200 L 50 50 1 1 B
+X PA3 37 1200 3000 200 L 50 50 1 1 B
+X VSS 38 -400 -3600 200 U 50 50 1 1 W
+X VDD 39 -400 3600 200 D 50 50 1 1 W
 X PE5 4 -1200 -2300 200 R 50 50 1 1 B
-X PE6 5 -1200 -2400 200 R 50 50 1 1 B
-X PE7 58 -1200 -2500 200 R 50 50 1 1 B
-X PE8 59 -1200 -2600 200 R 50 50 1 1 B
-X PE9 60 -1200 -2700 200 R 50 50 1 1 B
-X PF0 10 -1200 -100 200 R 50 50 1 1 B
-X PF1 11 -1200 -200 200 R 50 50 1 1 B
-X PF10 22 -1200 -1100 200 R 50 50 1 1 B
+X PA4 40 1200 2900 200 L 50 50 1 1 B
+X PA5 41 1200 2800 200 L 50 50 1 1 B
+X PA6 42 1200 2700 200 L 50 50 1 1 B
+X PA7 43 1200 2600 200 L 50 50 1 1 B
+X PC4 44 1200 -500 200 L 50 50 1 1 B
+X PC5 45 1200 -600 200 L 50 50 1 1 B
+X PB0 46 1200 1600 200 L 50 50 1 1 B
+X PB1 47 1200 1500 200 L 50 50 1 1 B
+X PB2 48 1200 1400 200 L 50 50 1 1 B
 X PF11 49 -1200 -1200 200 R 50 50 1 1 B
+X PE6 5 -1200 -2400 200 R 50 50 1 1 B
 X PF12 50 -1200 -1300 200 R 50 50 1 1 B
+X VSS 51 -300 -3600 200 U 50 50 1 1 W
+X VDD 52 -300 3600 200 D 50 50 1 1 W
 X PF13 53 -1200 -1400 200 R 50 50 1 1 B
 X PF14 54 -1200 -1500 200 R 50 50 1 1 B
 X PF15 55 -1200 -1600 200 R 50 50 1 1 B
-X PF2 12 -1200 -300 200 R 50 50 1 1 B
-X PF3 13 -1200 -400 200 R 50 50 1 1 B
-X PF4 14 -1200 -500 200 R 50 50 1 1 B
-X PF5 15 -1200 -600 200 R 50 50 1 1 B
-X PF6 18 -1200 -700 200 R 50 50 1 1 B
-X PF7 19 -1200 -800 200 R 50 50 1 1 B
-X PF8 20 -1200 -900 200 R 50 50 1 1 B
-X PF9 21 -1200 -1000 200 R 50 50 1 1 B
 X PG0 56 -1200 1600 200 R 50 50 1 1 B
 X PG1 57 -1200 1500 200 R 50 50 1 1 B
-X PG10 125 -1200 600 200 R 50 50 1 1 B
-X PG11 126 -1200 500 200 R 50 50 1 1 B
-X PG12 127 -1200 400 200 R 50 50 1 1 B
-X PG13 128 -1200 300 200 R 50 50 1 1 B
-X PG14 129 -1200 200 200 R 50 50 1 1 B
-X PG15 132 -1200 100 200 R 50 50 1 1 B
+X PE7 58 -1200 -2500 200 R 50 50 1 1 B
+X PE8 59 -1200 -2600 200 R 50 50 1 1 B
+X VBAT 6 -600 3600 200 D 50 50 1 1 W
+X PE9 60 -1200 -2700 200 R 50 50 1 1 B
+X VSS 61 -200 -3600 200 U 50 50 1 1 W
+X VDD 62 -200 3600 200 D 50 50 1 1 W
+X PE10 63 -1200 -2800 200 R 50 50 1 1 B
+X PE11 64 -1200 -2900 200 R 50 50 1 1 B
+X PE12 65 -1200 -3000 200 R 50 50 1 1 B
+X PE13 66 -1200 -3100 200 R 50 50 1 1 B
+X PE14 67 -1200 -3200 200 R 50 50 1 1 B
+X PE15 68 -1200 -3300 200 R 50 50 1 1 B
+X PB10 69 1200 600 200 L 50 50 1 1 B
+X PC13 7 1200 -1400 200 L 50 50 1 1 B
+X PB11 70 1200 500 200 L 50 50 1 1 B
+X VSS 71 -100 -3600 200 U 50 50 1 1 W
+X VDD 72 -100 3600 200 D 50 50 1 1 W
+X PB12 73 1200 400 200 L 50 50 1 1 B
+X PB13 74 1200 300 200 L 50 50 1 1 B
+X PB14 75 1200 200 200 L 50 50 1 1 B
+X PB15 76 1200 100 200 L 50 50 1 1 B
+X PD8 77 1200 -2600 200 L 50 50 1 1 B
+X PD9 78 1200 -2700 200 L 50 50 1 1 B
+X PD10 79 1200 -2800 200 L 50 50 1 1 B
+X PC14 8 1200 -1500 200 L 50 50 1 1 B
+X PD11 80 1200 -2900 200 L 50 50 1 1 B
+X PD12 81 1200 -3000 200 L 50 50 1 1 B
+X PD13 82 1200 -3100 200 L 50 50 1 1 B
+X VSS 83 0 -3600 200 U 50 50 1 1 W
+X VDD 84 0 3600 200 D 50 50 1 1 W
+X PD14 85 1200 -3200 200 L 50 50 1 1 B
+X PD15 86 1200 -3300 200 L 50 50 1 1 B
 X PG2 87 -1200 1400 200 R 50 50 1 1 B
 X PG3 88 -1200 1300 200 R 50 50 1 1 B
 X PG4 89 -1200 1200 200 R 50 50 1 1 B
+X PC15 9 1200 -1600 200 L 50 50 1 1 B
 X PG5 90 -1200 1100 200 R 50 50 1 1 B
 X PG6 91 -1200 1000 200 R 50 50 1 1 B
 X PG7 92 -1200 900 200 R 50 50 1 1 B
 X PG8 93 -1200 800 200 R 50 50 1 1 B
-X PG9 124 -1200 700 200 R 50 50 1 1 B
-X PH0 23 -1200 1900 200 R 50 50 1 1 I
-X PH1 24 -1200 1800 200 R 50 50 1 1 I
-X VBAT 6 -600 3600 200 D 50 50 1 1 W
-X VDD 108 100 3600 200 D 50 50 1 1 W
-X VDD 121 200 3600 200 D 50 50 1 1 W
-X VDD 144 300 3600 200 D 50 50 1 1 W
-X VDD 17 -500 3600 200 D 50 50 1 1 W
-X VDD 39 -400 3600 200 D 50 50 1 1 W
-X VDD 52 -300 3600 200 D 50 50 1 1 W
-X VDD 62 -200 3600 200 D 50 50 1 1 W
-X VDD 72 -100 3600 200 D 50 50 1 1 W
-X VDD 84 0 3600 200 D 50 50 1 1 W
-X VDDA 33 400 3600 200 D 50 50 1 1 W
-X VDDIO2 131 600 3600 200 D 50 50 1 1 W
-X VDDIO2 95 500 3600 200 D 50 50 1 1 W
-X VDDUSB 106 700 3600 200 D 50 50 1 1 W
-X VREF+ 32 -1200 2900 200 R 50 50 1 1 B
-X VREF- 31 -1200 2800 200 R 50 50 1 1 W
-X VSS 107 200 -3600 200 U 50 50 1 1 W
-X VSS 120 300 -3600 200 U 50 50 1 1 W
-X VSS 130 400 -3600 200 U 50 50 1 1 W
-X VSS 143 500 -3600 200 U 50 50 1 1 W
-X VSS 16 -500 -3600 200 U 50 50 1 1 W
-X VSS 38 -400 -3600 200 U 50 50 1 1 W
-X VSS 51 -300 -3600 200 U 50 50 1 1 W
-X VSS 61 -200 -3600 200 U 50 50 1 1 W
-X VSS 71 -100 -3600 200 U 50 50 1 1 W
-X VSS 83 0 -3600 200 U 50 50 1 1 W
 X VSS 94 100 -3600 200 U 50 50 1 1 W
-X VSSA 30 600 -3600 200 U 50 50 1 1 W
+X VDDIO2 95 500 3600 200 D 50 50 1 1 W
+X PC6 96 1200 -700 200 L 50 50 1 1 B
+X PC7 97 1200 -800 200 L 50 50 1 1 B
+X PC8 98 1200 -900 200 L 50 50 1 1 B
+X PC9 99 1200 -1000 200 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
@@ -6131,175 +6131,175 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -1300 -4200 1200 4200 0 1 10 f
-X NRST H3 -1500 4100 200 R 50 50 1 1 I
-X OPAMP1_VINM M1 -1500 3700 200 R 50 50 1 1 B
-X OPAMP2_VINM N4 -1500 3600 200 R 50 50 1 1 B
-X PA0 K3 1400 2500 200 L 50 50 1 1 B
-X PA1 N2 1400 2400 200 L 50 50 1 1 B
-X PA10 F9 1400 1500 200 L 50 50 1 1 B
-X PA11 E13 1400 1400 200 L 50 50 1 1 B
-X PA12 D13 1400 1300 200 L 50 50 1 1 B
-X PA13 A11 1400 1200 200 L 50 50 1 1 B
+X PI10 A1 -1500 2400 200 R 50 50 1 1 B
 X PA14 A10 1400 1100 200 L 50 50 1 1 B
+X PA13 A11 1400 1200 200 L 50 50 1 1 B
+X PI0 A12 -1500 3400 200 R 50 50 1 1 B
+X PH14 A13 -1500 700 200 R 50 50 1 1 B
+X PH2 A2 -1500 1900 200 R 50 50 1 1 B
+X VDD A3 -500 4400 200 D 50 50 1 1 W
+X PE0 A4 -1500 -2600 200 R 50 50 1 1 B
+X PB4 A5 1400 400 200 L 50 50 1 1 B
+X PB3 A6 1400 500 200 L 50 50 1 1 B
+X VSS A7 -500 -4400 200 U 50 50 1 1 W
+X VDD A8 -400 4400 200 D 50 50 1 1 W
 X PA15 A9 1400 1000 200 L 50 50 1 1 B
-X PA2 N1 1400 2300 200 L 50 50 1 1 B
-X PA3 M2 1400 2200 200 L 50 50 1 1 B
-X PA4 L3 1400 2100 200 L 50 50 1 1 B
-X PA5 K4 1400 2000 200 L 50 50 1 1 B
-X PA6 M4 1400 1900 200 L 50 50 1 1 B
-X PA7 L4 1400 1800 200 L 50 50 1 1 B
-X PA8 G8 1400 1700 200 L 50 50 1 1 B
-X PA9 F10 1400 1600 200 L 50 50 1 1 B
-X PB0 K5 1400 800 200 L 50 50 1 1 B
-X PB1 L5 1400 700 200 L 50 50 1 1 B
-X PB10 N9 1400 -200 200 L 50 50 1 1 B
-X PB11 H8 1400 -300 200 L 50 50 1 1 B
-X PB12 N12 1400 -400 200 L 50 50 1 1 B
-X PB13 N13 1400 -500 200 L 50 50 1 1 B
-X PB14 M13 1400 -600 200 L 50 50 1 1 B
-X PB15 M12 1400 -700 200 L 50 50 1 1 B
-X PB2 N5 1400 600 200 L 50 50 1 1 B
-X PB3 A6 1400 500 200 L 50 50 1 1 B
-X PB4 A5 1400 400 200 L 50 50 1 1 B
+X PI9 B1 -1500 2500 200 R 50 50 1 1 B
+X PI2 B10 -1500 3200 200 R 50 50 1 1 B
+X PI1 B11 -1500 3300 200 R 50 50 1 1 B
+X PH15 B12 -1500 600 200 R 50 50 1 1 B
+X PH12 B13 -1500 900 200 R 50 50 1 1 B
+X PI7 B2 -1500 2700 200 R 50 50 1 1 B
+X VSS B3 -400 -4400 200 U 50 50 1 1 W
+X PE1 B4 -1500 -2700 200 R 50 50 1 1 B
 X PB5 B5 1400 300 200 L 50 50 1 1 B
-X PB6 C5 1400 200 200 L 50 50 1 1 B
-X PB7 D5 1400 100 200 L 50 50 1 1 B
+X VDDIO2 B6 700 4400 200 D 50 50 1 1 W
+X PG9 B7 -1500 -500 200 R 50 50 1 1 B
+X PD0 B8 1400 -2600 200 L 50 50 1 1 B
+X PI6 B9 -1500 2800 200 R 50 50 1 1 B
+X VDD C1 -300 4400 200 D 50 50 1 1 W
+X PI3 C10 -1500 3100 200 R 50 50 1 1 B
+X PI8 C11 -1500 2600 200 R 50 50 1 1 B
+X VSS C12 -200 -4400 200 U 50 50 1 1 W
+X VDD C13 -200 4400 200 D 50 50 1 1 W
+X VSS C2 -300 -4400 200 U 50 50 1 1 W
+X PI11 C3 -1500 2300 200 R 50 50 1 1 B
 X PB8 C4 1400 0 200 L 50 50 1 1 B
+X PB6 C5 1400 200 200 L 50 50 1 1 B
+X PG15 C6 -1500 -1100 200 R 50 50 1 1 B
+X PD4 C7 1400 -3000 200 L 50 50 1 1 B
+X PD1 C8 1400 -2700 200 L 50 50 1 1 B
+X PH13 C9 -1500 800 200 R 50 50 1 1 B
+X PE4 D1 -1500 -3000 200 R 50 50 1 1 B
+X PI4 D10 -1500 3000 200 R 50 50 1 1 B
+X PH9 D11 -1500 1200 200 R 50 50 1 1 B
+X PH7 D12 -1500 1400 200 R 50 50 1 1 B
+X PA12 D13 1400 1300 200 L 50 50 1 1 B
+X PE3 D2 -1500 -2900 200 R 50 50 1 1 B
+X PE2 D3 -1500 -2800 200 R 50 50 1 1 B
 X PB9 D4 1400 -100 200 L 50 50 1 1 B
-X PC0 J2 1400 -900 200 L 50 50 1 1 B
-X PC1 J3 1400 -1000 200 L 50 50 1 1 B
+X PB7 D5 1400 100 200 L 50 50 1 1 B
+X PG10 D6 -1500 -600 200 R 50 50 1 1 B
+X PD5 D7 1400 -3100 200 L 50 50 1 1 B
+X PD2 D8 1400 -2800 200 L 50 50 1 1 B
 X PC10 D9 1400 -1900 200 L 50 50 1 1 B
-X PC11 E9 1400 -2000 200 L 50 50 1 1 B
-X PC12 F8 1400 -2100 200 L 50 50 1 1 B
 X PC13 E1 1400 -2200 200 L 50 50 1 1 B
+X PI5 E10 -1500 2900 200 R 50 50 1 1 B
+X PH6 E11 -1500 1500 200 R 50 50 1 1 B
+X VDDUSB E12 900 4400 200 D 50 50 1 1 W
+X PA11 E13 1400 1400 200 L 50 50 1 1 B
+X VBAT E2 -600 4400 200 D 50 50 1 1 W
+X PE6 E3 -1500 -3200 200 R 50 50 1 1 B
+X PE5 E4 -1500 -3100 200 R 50 50 1 1 B
+X PH3 E5 -1500 1800 200 R 50 50 1 1 B
+X PG11 E6 -1500 -700 200 R 50 50 1 1 B
+X PD6 E7 1400 -3200 200 L 50 50 1 1 B
+X PD3 E8 1400 -2900 200 L 50 50 1 1 B
+X PC11 E9 1400 -2000 200 L 50 50 1 1 B
 X PC14 F1 1400 -2300 200 L 50 50 1 1 B
-X PC15 G1 1400 -2400 200 L 50 50 1 1 B
-X PC2 J4 1400 -1100 200 L 50 50 1 1 B
-X PC3 K1 1400 -1200 200 L 50 50 1 1 B
-X PC4 H5 1400 -1300 200 L 50 50 1 1 B
-X PC5 J5 1400 -1400 200 L 50 50 1 1 B
+X PA9 F10 1400 1600 200 L 50 50 1 1 B
 X PC6 F11 1400 -1500 200 L 50 50 1 1 B
-X PC7 G12 1400 -1600 200 L 50 50 1 1 B
-X PC8 G10 1400 -1700 200 L 50 50 1 1 B
-X PC9 G9 1400 -1800 200 L 50 50 1 1 B
-X PD0 B8 1400 -2600 200 L 50 50 1 1 B
-X PD1 C8 1400 -2700 200 L 50 50 1 1 B
-X PD10 J13 1400 -3600 200 L 50 50 1 1 B
-X PD11 K12 1400 -3700 200 L 50 50 1 1 B
-X PD12 K11 1400 -3800 200 L 50 50 1 1 B
-X PD13 K13 1400 -3900 200 L 50 50 1 1 B
-X PD14 K10 1400 -4000 200 L 50 50 1 1 B
-X PD15 H11 1400 -4100 200 L 50 50 1 1 B
-X PD2 D8 1400 -2800 200 L 50 50 1 1 B
-X PD3 E8 1400 -2900 200 L 50 50 1 1 B
-X PD4 C7 1400 -3000 200 L 50 50 1 1 B
-X PD5 D7 1400 -3100 200 L 50 50 1 1 B
-X PD6 E7 1400 -3200 200 L 50 50 1 1 B
-X PD7 F7 1400 -3300 200 L 50 50 1 1 B
-X PD8 L11 1400 -3400 200 L 50 50 1 1 B
-X PD9 L10 1400 -3500 200 L 50 50 1 1 B
-X PE0 A4 -1500 -2600 200 R 50 50 1 1 B
-X PE1 B4 -1500 -2700 200 R 50 50 1 1 B
-X PE10 H7 -1500 -3600 200 R 50 50 1 1 B
-X PE11 N8 -1500 -3700 200 R 50 50 1 1 B
-X PE12 M8 -1500 -3800 200 R 50 50 1 1 B
-X PE13 L8 -1500 -3900 200 R 50 50 1 1 B
-X PE14 K8 -1500 -4000 200 R 50 50 1 1 B
-X PE15 J8 -1500 -4100 200 R 50 50 1 1 B
-X PE2 D3 -1500 -2800 200 R 50 50 1 1 B
-X PE3 D2 -1500 -2900 200 R 50 50 1 1 B
-X PE4 D1 -1500 -3000 200 R 50 50 1 1 B
-X PE5 E4 -1500 -3100 200 R 50 50 1 1 B
-X PE6 E3 -1500 -3200 200 R 50 50 1 1 B
-X PE7 L7 -1500 -3300 200 R 50 50 1 1 B
-X PE8 K7 -1500 -3400 200 R 50 50 1 1 B
-X PE9 J7 -1500 -3500 200 R 50 50 1 1 B
-X PF0 F5 -1500 -1300 200 R 50 50 1 1 B
-X PF1 F4 -1500 -1400 200 R 50 50 1 1 B
-X PF10 H4 -1500 -1900 200 R 50 50 1 1 B
-X PF11 M5 -1500 -2000 200 R 50 50 1 1 B
-X PF12 N6 -1500 -2100 200 R 50 50 1 1 B
-X PF13 M6 -1500 -2200 200 R 50 50 1 1 B
-X PF14 L6 -1500 -2300 200 R 50 50 1 1 B
-X PF15 K6 -1500 -2400 200 R 50 50 1 1 B
+X VDDIO2 F12 800 4400 200 D 50 50 1 1 W
+X VSS F13 0 -4400 200 U 50 50 1 1 W
+X VSS F2 -100 -4400 200 U 50 50 1 1 W
 X PF2 F3 -1500 -1500 200 R 50 50 1 1 B
+X PF1 F4 -1500 -1400 200 R 50 50 1 1 B
+X PF0 F5 -1500 -1300 200 R 50 50 1 1 B
+X PG12 F6 -1500 -800 200 R 50 50 1 1 B
+X PD7 F7 1400 -3300 200 L 50 50 1 1 B
+X PC12 F8 1400 -2100 200 L 50 50 1 1 B
+X PA10 F9 1400 1500 200 L 50 50 1 1 B
+X PC15 G1 1400 -2400 200 L 50 50 1 1 B
+X PC8 G10 1400 -1700 200 L 50 50 1 1 B
+X PG6 G11 -1500 -200 200 R 50 50 1 1 B
+X PC7 G12 1400 -1600 200 L 50 50 1 1 B
+X VDD G13 0 4400 200 D 50 50 1 1 W
+X VDD G2 -100 4400 200 D 50 50 1 1 W
 X PF3 G3 -1500 -1600 200 R 50 50 1 1 B
 X PF4 G4 -1500 -1700 200 R 50 50 1 1 B
 X PF5 G5 -1500 -1800 200 R 50 50 1 1 B
-X PG0 J6 -1500 400 200 R 50 50 1 1 B
-X PG1 H6 -1500 300 200 R 50 50 1 1 B
-X PG10 D6 -1500 -600 200 R 50 50 1 1 B
-X PG11 E6 -1500 -700 200 R 50 50 1 1 B
-X PG12 F6 -1500 -800 200 R 50 50 1 1 B
-X PG13 G7 -1500 -900 200 R 50 50 1 1 B
 X PG14 G6 -1500 -1000 200 R 50 50 1 1 B
-X PG15 C6 -1500 -1100 200 R 50 50 1 1 B
-X PG2 J12 -1500 200 200 R 50 50 1 1 B
-X PG3 J11 -1500 100 200 R 50 50 1 1 B
-X PG4 J10 -1500 0 200 R 50 50 1 1 B
-X PG5 J9 -1500 -100 200 R 50 50 1 1 B
-X PG6 G11 -1500 -200 200 R 50 50 1 1 B
+X PG13 G7 -1500 -900 200 R 50 50 1 1 B
+X PA8 G8 1400 1700 200 L 50 50 1 1 B
+X PC9 G9 1400 -1800 200 L 50 50 1 1 B
+X PH0 H1 -1500 2100 200 R 50 50 1 1 I
 X PG7 H10 -1500 -300 200 R 50 50 1 1 B
+X PD15 H11 1400 -4100 200 L 50 50 1 1 B
+X VSS H12 200 -4400 200 U 50 50 1 1 W
+X VDD H13 100 4400 200 D 50 50 1 1 W
+X VSS H2 100 -4400 200 U 50 50 1 1 W
+X NRST H3 -1500 4100 200 R 50 50 1 1 I
+X PF10 H4 -1500 -1900 200 R 50 50 1 1 B
+X PC4 H5 1400 -1300 200 L 50 50 1 1 B
+X PG1 H6 -1500 300 200 R 50 50 1 1 B
+X PE10 H7 -1500 -3600 200 R 50 50 1 1 B
+X PB11 H8 1400 -300 200 L 50 50 1 1 B
 X PG8 H9 -1500 -400 200 R 50 50 1 1 B
-X PG9 B7 -1500 -500 200 R 50 50 1 1 B
-X PH0 H1 -1500 2100 200 R 50 50 1 1 I
 X PH1 J1 -1500 2000 200 R 50 50 1 1 I
-X PH10 M9 -1500 1100 200 R 50 50 1 1 B
-X PH11 M10 -1500 1000 200 R 50 50 1 1 B
-X PH12 B13 -1500 900 200 R 50 50 1 1 B
-X PH13 C9 -1500 800 200 R 50 50 1 1 B
-X PH14 A13 -1500 700 200 R 50 50 1 1 B
-X PH15 B12 -1500 600 200 R 50 50 1 1 B
-X PH2 A2 -1500 1900 200 R 50 50 1 1 B
-X PH3 E5 -1500 1800 200 R 50 50 1 1 B
+X PG4 J10 -1500 0 200 R 50 50 1 1 B
+X PG3 J11 -1500 100 200 R 50 50 1 1 B
+X PG2 J12 -1500 200 200 R 50 50 1 1 B
+X PD10 J13 1400 -3600 200 L 50 50 1 1 B
+X PC0 J2 1400 -900 200 L 50 50 1 1 B
+X PC1 J3 1400 -1000 200 L 50 50 1 1 B
+X PC2 J4 1400 -1100 200 L 50 50 1 1 B
+X PC5 J5 1400 -1400 200 L 50 50 1 1 B
+X PG0 J6 -1500 400 200 R 50 50 1 1 B
+X PE9 J7 -1500 -3500 200 R 50 50 1 1 B
+X PE15 J8 -1500 -4100 200 R 50 50 1 1 B
+X PG5 J9 -1500 -100 200 R 50 50 1 1 B
+X PC3 K1 1400 -1200 200 L 50 50 1 1 B
+X PD14 K10 1400 -4000 200 L 50 50 1 1 B
+X PD12 K11 1400 -3800 200 L 50 50 1 1 B
+X PD11 K12 1400 -3700 200 L 50 50 1 1 B
+X PD13 K13 1400 -3900 200 L 50 50 1 1 B
+X VSSA K2 700 -4400 200 U 50 50 1 1 W
+X PA0 K3 1400 2500 200 L 50 50 1 1 B
+X PA5 K4 1400 2000 200 L 50 50 1 1 B
+X PB0 K5 1400 800 200 L 50 50 1 1 B
+X PF15 K6 -1500 -2400 200 R 50 50 1 1 B
+X PE8 K7 -1500 -3400 200 R 50 50 1 1 B
+X PE14 K8 -1500 -4000 200 R 50 50 1 1 B
 X PH4 K9 -1500 1700 200 R 50 50 1 1 B
-X PH5 L9 -1500 1600 200 R 50 50 1 1 B
-X PH6 E11 -1500 1500 200 R 50 50 1 1 B
-X PH7 D12 -1500 1400 200 R 50 50 1 1 B
-X PH8 N10 -1500 1300 200 R 50 50 1 1 B
-X PH9 D11 -1500 1200 200 R 50 50 1 1 B
-X PI0 A12 -1500 3400 200 R 50 50 1 1 B
-X PI1 B11 -1500 3300 200 R 50 50 1 1 B
-X PI10 A1 -1500 2400 200 R 50 50 1 1 B
-X PI11 C3 -1500 2300 200 R 50 50 1 1 B
-X PI2 B10 -1500 3200 200 R 50 50 1 1 B
-X PI3 C10 -1500 3100 200 R 50 50 1 1 B
-X PI4 D10 -1500 3000 200 R 50 50 1 1 B
-X PI5 E10 -1500 2900 200 R 50 50 1 1 B
-X PI6 B9 -1500 2800 200 R 50 50 1 1 B
-X PI7 B2 -1500 2700 200 R 50 50 1 1 B
-X PI8 C11 -1500 2600 200 R 50 50 1 1 B
-X PI9 B1 -1500 2500 200 R 50 50 1 1 B
-X VBAT E2 -600 4400 200 D 50 50 1 1 W
-X VDD A3 -500 4400 200 D 50 50 1 1 W
-X VDD A8 -400 4400 200 D 50 50 1 1 W
-X VDD C1 -300 4400 200 D 50 50 1 1 W
-X VDD C13 -200 4400 200 D 50 50 1 1 W
-X VDD G13 0 4400 200 D 50 50 1 1 W
-X VDD G2 -100 4400 200 D 50 50 1 1 W
-X VDD H13 100 4400 200 D 50 50 1 1 W
-X VDD L12 200 4400 200 D 50 50 1 1 W
-X VDD N11 500 4400 200 D 50 50 1 1 W
-X VDD N3 300 4400 200 D 50 50 1 1 W
-X VDD N7 400 4400 200 D 50 50 1 1 W
-X VDDA L2 600 4400 200 D 50 50 1 1 W
-X VDDIO2 B6 700 4400 200 D 50 50 1 1 W
-X VDDIO2 F12 800 4400 200 D 50 50 1 1 W
-X VDDUSB E12 900 4400 200 D 50 50 1 1 W
 X VREF+ L1 -1500 3900 200 R 50 50 1 1 B
-X VSS A7 -500 -4400 200 U 50 50 1 1 W
-X VSS B3 -400 -4400 200 U 50 50 1 1 W
-X VSS C12 -200 -4400 200 U 50 50 1 1 W
-X VSS C2 -300 -4400 200 U 50 50 1 1 W
-X VSS F13 0 -4400 200 U 50 50 1 1 W
-X VSS F2 -100 -4400 200 U 50 50 1 1 W
-X VSS H12 200 -4400 200 U 50 50 1 1 W
-X VSS H2 100 -4400 200 U 50 50 1 1 W
+X PD9 L10 1400 -3500 200 L 50 50 1 1 B
+X PD8 L11 1400 -3400 200 L 50 50 1 1 B
+X VDD L12 200 4400 200 D 50 50 1 1 W
 X VSS L13 300 -4400 200 U 50 50 1 1 W
+X VDDA L2 600 4400 200 D 50 50 1 1 W
+X PA4 L3 1400 2100 200 L 50 50 1 1 B
+X PA7 L4 1400 1800 200 L 50 50 1 1 B
+X PB1 L5 1400 700 200 L 50 50 1 1 B
+X PF14 L6 -1500 -2300 200 R 50 50 1 1 B
+X PE7 L7 -1500 -3300 200 R 50 50 1 1 B
+X PE13 L8 -1500 -3900 200 R 50 50 1 1 B
+X PH5 L9 -1500 1600 200 R 50 50 1 1 B
+X OPAMP1_VINM M1 -1500 3700 200 R 50 50 1 1 B
+X PH11 M10 -1500 1000 200 R 50 50 1 1 B
 X VSS M11 600 -4400 200 U 50 50 1 1 W
+X PB15 M12 1400 -700 200 L 50 50 1 1 B
+X PB14 M13 1400 -600 200 L 50 50 1 1 B
+X PA3 M2 1400 2200 200 L 50 50 1 1 B
 X VSS M3 400 -4400 200 U 50 50 1 1 W
+X PA6 M4 1400 1900 200 L 50 50 1 1 B
+X PF11 M5 -1500 -2000 200 R 50 50 1 1 B
+X PF13 M6 -1500 -2200 200 R 50 50 1 1 B
 X VSS M7 500 -4400 200 U 50 50 1 1 W
-X VSSA K2 700 -4400 200 U 50 50 1 1 W
+X PE12 M8 -1500 -3800 200 R 50 50 1 1 B
+X PH10 M9 -1500 1100 200 R 50 50 1 1 B
+X PA2 N1 1400 2300 200 L 50 50 1 1 B
+X PH8 N10 -1500 1300 200 R 50 50 1 1 B
+X VDD N11 500 4400 200 D 50 50 1 1 W
+X PB12 N12 1400 -400 200 L 50 50 1 1 B
+X PB13 N13 1400 -500 200 L 50 50 1 1 B
+X PA1 N2 1400 2400 200 L 50 50 1 1 B
+X VDD N3 300 4400 200 D 50 50 1 1 W
+X OPAMP2_VINM N4 -1500 3600 200 R 50 50 1 1 B
+X PB2 N5 1400 600 200 L 50 50 1 1 B
+X PF12 N6 -1500 -2100 200 R 50 50 1 1 B
+X VDD N7 400 4400 200 D 50 50 1 1 W
+X PE11 N8 -1500 -3700 200 R 50 50 1 1 B
+X PB10 N9 1400 -200 200 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
@@ -6315,175 +6315,175 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -1400 -4100 1300 4100 0 1 10 f
-X NRST H3 -1600 4000 200 R 50 50 1 1 I
-X OPAMP1_VINM M1 -1600 3600 200 R 50 50 1 1 B
-X OPAMP2_VINM N4 -1600 3500 200 R 50 50 1 1 B
-X PA0 K3 1500 2600 200 L 50 50 1 1 B
-X PA1 N2 1500 2500 200 L 50 50 1 1 B
-X PA10 F9 1500 1600 200 L 50 50 1 1 B
-X PA11 E13 1500 1500 200 L 50 50 1 1 B
-X PA12 D13 1500 1400 200 L 50 50 1 1 B
-X PA13 A11 1500 1300 200 L 50 50 1 1 B
+X PI10 A1 -1600 2300 200 R 50 50 1 1 B
 X PA14 A10 1500 1200 200 L 50 50 1 1 B
-X PA15 A9 1500 1100 200 L 50 50 1 1 B
-X PA2 N1 1500 2400 200 L 50 50 1 1 B
-X PA3 M2 1500 2300 200 L 50 50 1 1 B
-X PA4 L3 1500 2200 200 L 50 50 1 1 B
-X PA5 K4 1500 2100 200 L 50 50 1 1 B
-X PA6 M4 1500 2000 200 L 50 50 1 1 B
-X PA7 L4 1500 1900 200 L 50 50 1 1 B
-X PA8 G8 1500 1800 200 L 50 50 1 1 B
-X PA9 F10 1500 1700 200 L 50 50 1 1 B
-X PB0 K5 1500 900 200 L 50 50 1 1 B
-X PB1 L5 1500 800 200 L 50 50 1 1 B
-X PB10 N9 1500 -100 200 L 50 50 1 1 B
-X PB11 H8 1500 -200 200 L 50 50 1 1 B
-X PB12 N12 1500 -300 200 L 50 50 1 1 B
-X PB13 N13 1500 -400 200 L 50 50 1 1 B
-X PB14 M13 1500 -500 200 L 50 50 1 1 B
-X PB15 M12 1500 -600 200 L 50 50 1 1 B
-X PB2 N5 1500 700 200 L 50 50 1 1 B
-X PB3 A6 1500 600 200 L 50 50 1 1 B
+X PA13 A11 1500 1300 200 L 50 50 1 1 B
+X PI0 A12 -1600 3300 200 R 50 50 1 1 B
+X PH14 A13 -1600 700 200 R 50 50 1 1 B
+X PH2 A2 -1600 1800 200 R 50 50 1 1 B
+X VDD A3 -600 4300 200 D 50 50 1 1 W
+X PE0 A4 -1600 -2500 200 R 50 50 1 1 B
 X PB4 A5 1500 500 200 L 50 50 1 1 B
+X PB3 A6 1500 600 200 L 50 50 1 1 B
+X VSS A7 -500 -4300 200 U 50 50 1 1 W
+X VDD A8 -500 4300 200 D 50 50 1 1 W
+X PA15 A9 1500 1100 200 L 50 50 1 1 B
+X PI9 B1 -1600 2400 200 R 50 50 1 1 B
+X PI2 B10 -1600 3100 200 R 50 50 1 1 B
+X PI1 B11 -1600 3200 200 R 50 50 1 1 B
+X PH15 B12 -1600 600 200 R 50 50 1 1 B
+X PH12 B13 -1600 900 200 R 50 50 1 1 B
+X PI7 B2 -1600 2600 200 R 50 50 1 1 B
+X VSS B3 -400 -4300 200 U 50 50 1 1 W
+X PE1 B4 -1600 -2600 200 R 50 50 1 1 B
 X PB5 B5 1500 400 200 L 50 50 1 1 B
-X PB6 C5 1500 300 200 L 50 50 1 1 B
-X PB7 D5 1500 200 200 L 50 50 1 1 B
+X VDDIO2 B6 800 4300 200 D 50 50 1 1 W
+X PG9 B7 -1600 -500 200 R 50 50 1 1 B
+X PD0 B8 1500 -2500 200 L 50 50 1 1 B
+X PI6 B9 -1600 2700 200 R 50 50 1 1 B
+X VDD C1 -400 4300 200 D 50 50 1 1 W
+X PI3 C10 -1600 3000 200 R 50 50 1 1 B
+X PI8 C11 -1600 2500 200 R 50 50 1 1 B
+X VSS C12 -200 -4300 200 U 50 50 1 1 W
+X VDD C13 -300 4300 200 D 50 50 1 1 W
+X VSS C2 -300 -4300 200 U 50 50 1 1 W
+X PI11 C3 -1600 2200 200 R 50 50 1 1 B
 X PB8 C4 1500 100 200 L 50 50 1 1 B
+X PB6 C5 1500 300 200 L 50 50 1 1 B
+X VDD12 C6 500 4300 200 D 50 50 1 1 W
+X PD4 C7 1500 -2900 200 L 50 50 1 1 B
+X PD1 C8 1500 -2600 200 L 50 50 1 1 B
+X PH13 C9 -1600 800 200 R 50 50 1 1 B
+X PE4 D1 -1600 -2900 200 R 50 50 1 1 B
+X PI4 D10 -1600 2900 200 R 50 50 1 1 B
+X PH9 D11 -1600 1100 200 R 50 50 1 1 B
+X PH7 D12 -1600 1300 200 R 50 50 1 1 B
+X PA12 D13 1500 1400 200 L 50 50 1 1 B
+X PE3 D2 -1600 -2800 200 R 50 50 1 1 B
+X PE2 D3 -1600 -2700 200 R 50 50 1 1 B
 X PB9 D4 1500 0 200 L 50 50 1 1 B
-X PC0 J2 1500 -800 200 L 50 50 1 1 B
-X PC1 J3 1500 -900 200 L 50 50 1 1 B
+X PB7 D5 1500 200 200 L 50 50 1 1 B
+X PG10 D6 -1600 -600 200 R 50 50 1 1 B
+X PD5 D7 1500 -3000 200 L 50 50 1 1 B
+X PD2 D8 1500 -2700 200 L 50 50 1 1 B
 X PC10 D9 1500 -1800 200 L 50 50 1 1 B
-X PC11 E9 1500 -1900 200 L 50 50 1 1 B
-X PC12 F8 1500 -2000 200 L 50 50 1 1 B
 X PC13 E1 1500 -2100 200 L 50 50 1 1 B
+X PI5 E10 -1600 2800 200 R 50 50 1 1 B
+X PH6 E11 -1600 1400 200 R 50 50 1 1 B
+X VDDUSB E12 1000 4300 200 D 50 50 1 1 W
+X PA11 E13 1500 1500 200 L 50 50 1 1 B
+X VBAT E2 -700 4300 200 D 50 50 1 1 W
+X PE6 E3 -1600 -3100 200 R 50 50 1 1 B
+X PE5 E4 -1600 -3000 200 R 50 50 1 1 B
+X PH3 E5 -1600 1700 200 R 50 50 1 1 B
+X PG11 E6 -1600 -700 200 R 50 50 1 1 B
+X PD6 E7 1500 -3100 200 L 50 50 1 1 B
+X PD3 E8 1500 -2800 200 L 50 50 1 1 B
+X PC11 E9 1500 -1900 200 L 50 50 1 1 B
 X PC14 F1 1500 -2200 200 L 50 50 1 1 B
-X PC15 G1 1500 -2300 200 L 50 50 1 1 B
-X PC2 J4 1500 -1000 200 L 50 50 1 1 B
-X PC3 K1 1500 -1100 200 L 50 50 1 1 B
-X PC4 H5 1500 -1200 200 L 50 50 1 1 B
-X PC5 J5 1500 -1300 200 L 50 50 1 1 B
+X PA9 F10 1500 1700 200 L 50 50 1 1 B
 X PC6 F11 1500 -1400 200 L 50 50 1 1 B
-X PC7 G12 1500 -1500 200 L 50 50 1 1 B
-X PC8 G10 1500 -1600 200 L 50 50 1 1 B
-X PC9 G9 1500 -1700 200 L 50 50 1 1 B
-X PD0 B8 1500 -2500 200 L 50 50 1 1 B
-X PD1 C8 1500 -2600 200 L 50 50 1 1 B
-X PD10 J13 1500 -3500 200 L 50 50 1 1 B
-X PD11 K12 1500 -3600 200 L 50 50 1 1 B
-X PD12 K11 1500 -3700 200 L 50 50 1 1 B
-X PD13 K13 1500 -3800 200 L 50 50 1 1 B
-X PD14 K10 1500 -3900 200 L 50 50 1 1 B
-X PD15 H11 1500 -4000 200 L 50 50 1 1 B
-X PD2 D8 1500 -2700 200 L 50 50 1 1 B
-X PD3 E8 1500 -2800 200 L 50 50 1 1 B
-X PD4 C7 1500 -2900 200 L 50 50 1 1 B
-X PD5 D7 1500 -3000 200 L 50 50 1 1 B
-X PD6 E7 1500 -3100 200 L 50 50 1 1 B
-X PD7 F7 1500 -3200 200 L 50 50 1 1 B
-X PD8 L11 1500 -3300 200 L 50 50 1 1 B
-X PD9 L10 1500 -3400 200 L 50 50 1 1 B
-X PE0 A4 -1600 -2500 200 R 50 50 1 1 B
-X PE1 B4 -1600 -2600 200 R 50 50 1 1 B
-X PE10 H7 -1600 -3500 200 R 50 50 1 1 B
-X PE11 N8 -1600 -3600 200 R 50 50 1 1 B
-X PE12 M8 -1600 -3700 200 R 50 50 1 1 B
-X PE13 L8 -1600 -3800 200 R 50 50 1 1 B
-X PE14 K8 -1600 -3900 200 R 50 50 1 1 B
-X PE15 J8 -1600 -4000 200 R 50 50 1 1 B
-X PE2 D3 -1600 -2700 200 R 50 50 1 1 B
-X PE3 D2 -1600 -2800 200 R 50 50 1 1 B
-X PE4 D1 -1600 -2900 200 R 50 50 1 1 B
-X PE5 E4 -1600 -3000 200 R 50 50 1 1 B
-X PE6 E3 -1600 -3100 200 R 50 50 1 1 B
-X PE7 L7 -1600 -3200 200 R 50 50 1 1 B
-X PE8 K7 -1600 -3300 200 R 50 50 1 1 B
-X PE9 J7 -1600 -3400 200 R 50 50 1 1 B
-X PF0 F5 -1600 -1200 200 R 50 50 1 1 B
-X PF1 F4 -1600 -1300 200 R 50 50 1 1 B
-X PF10 H4 -1600 -1800 200 R 50 50 1 1 B
-X PF11 M5 -1600 -1900 200 R 50 50 1 1 B
-X PF12 N6 -1600 -2000 200 R 50 50 1 1 B
-X PF13 M6 -1600 -2100 200 R 50 50 1 1 B
-X PF14 L6 -1600 -2200 200 R 50 50 1 1 B
-X PF15 K6 -1600 -2300 200 R 50 50 1 1 B
+X VDDIO2 F12 900 4300 200 D 50 50 1 1 W
+X VSS F13 0 -4300 200 U 50 50 1 1 W
+X VSS F2 -100 -4300 200 U 50 50 1 1 W
 X PF2 F3 -1600 -1400 200 R 50 50 1 1 B
+X PF1 F4 -1600 -1300 200 R 50 50 1 1 B
+X PF0 F5 -1600 -1200 200 R 50 50 1 1 B
+X PG12 F6 -1600 -800 200 R 50 50 1 1 B
+X PD7 F7 1500 -3200 200 L 50 50 1 1 B
+X PC12 F8 1500 -2000 200 L 50 50 1 1 B
+X PA10 F9 1500 1600 200 L 50 50 1 1 B
+X PC15 G1 1500 -2300 200 L 50 50 1 1 B
+X PC8 G10 1500 -1600 200 L 50 50 1 1 B
+X PG6 G11 -1600 -200 200 R 50 50 1 1 B
+X PC7 G12 1500 -1500 200 L 50 50 1 1 B
+X VDD G13 -100 4300 200 D 50 50 1 1 W
+X VDD G2 -200 4300 200 D 50 50 1 1 W
 X PF3 G3 -1600 -1500 200 R 50 50 1 1 B
 X PF4 G4 -1600 -1600 200 R 50 50 1 1 B
 X PF5 G5 -1600 -1700 200 R 50 50 1 1 B
-X PG0 J6 -1600 400 200 R 50 50 1 1 B
-X PG1 H6 -1600 300 200 R 50 50 1 1 B
-X PG10 D6 -1600 -600 200 R 50 50 1 1 B
-X PG11 E6 -1600 -700 200 R 50 50 1 1 B
-X PG12 F6 -1600 -800 200 R 50 50 1 1 B
-X PG13 G7 -1600 -900 200 R 50 50 1 1 B
 X PG14 G6 -1600 -1000 200 R 50 50 1 1 B
-X PG2 J12 -1600 200 200 R 50 50 1 1 B
-X PG3 J11 -1600 100 200 R 50 50 1 1 B
-X PG4 J10 -1600 0 200 R 50 50 1 1 B
-X PG5 J9 -1600 -100 200 R 50 50 1 1 B
-X PG6 G11 -1600 -200 200 R 50 50 1 1 B
+X PG13 G7 -1600 -900 200 R 50 50 1 1 B
+X PA8 G8 1500 1800 200 L 50 50 1 1 B
+X PC9 G9 1500 -1700 200 L 50 50 1 1 B
+X PH0 H1 -1600 2000 200 R 50 50 1 1 I
 X PG7 H10 -1600 -300 200 R 50 50 1 1 B
+X PD15 H11 1500 -4000 200 L 50 50 1 1 B
+X VSS H12 200 -4300 200 U 50 50 1 1 W
+X VDD H13 0 4300 200 D 50 50 1 1 W
+X VSS H2 100 -4300 200 U 50 50 1 1 W
+X NRST H3 -1600 4000 200 R 50 50 1 1 I
+X PF10 H4 -1600 -1800 200 R 50 50 1 1 B
+X PC4 H5 1500 -1200 200 L 50 50 1 1 B
+X PG1 H6 -1600 300 200 R 50 50 1 1 B
+X PE10 H7 -1600 -3500 200 R 50 50 1 1 B
+X PB11 H8 1500 -200 200 L 50 50 1 1 B
 X PG8 H9 -1600 -400 200 R 50 50 1 1 B
-X PG9 B7 -1600 -500 200 R 50 50 1 1 B
-X PH0 H1 -1600 2000 200 R 50 50 1 1 I
 X PH1 J1 -1600 1900 200 R 50 50 1 1 I
-X PH10 M9 -1600 1000 200 R 50 50 1 1 B
-X PH12 B13 -1600 900 200 R 50 50 1 1 B
-X PH13 C9 -1600 800 200 R 50 50 1 1 B
-X PH14 A13 -1600 700 200 R 50 50 1 1 B
-X PH15 B12 -1600 600 200 R 50 50 1 1 B
-X PH2 A2 -1600 1800 200 R 50 50 1 1 B
-X PH3 E5 -1600 1700 200 R 50 50 1 1 B
+X PG4 J10 -1600 0 200 R 50 50 1 1 B
+X PG3 J11 -1600 100 200 R 50 50 1 1 B
+X PG2 J12 -1600 200 200 R 50 50 1 1 B
+X PD10 J13 1500 -3500 200 L 50 50 1 1 B
+X PC0 J2 1500 -800 200 L 50 50 1 1 B
+X PC1 J3 1500 -900 200 L 50 50 1 1 B
+X PC2 J4 1500 -1000 200 L 50 50 1 1 B
+X PC5 J5 1500 -1300 200 L 50 50 1 1 B
+X PG0 J6 -1600 400 200 R 50 50 1 1 B
+X PE9 J7 -1600 -3400 200 R 50 50 1 1 B
+X PE15 J8 -1600 -4000 200 R 50 50 1 1 B
+X PG5 J9 -1600 -100 200 R 50 50 1 1 B
+X PC3 K1 1500 -1100 200 L 50 50 1 1 B
+X PD14 K10 1500 -3900 200 L 50 50 1 1 B
+X PD12 K11 1500 -3700 200 L 50 50 1 1 B
+X PD11 K12 1500 -3600 200 L 50 50 1 1 B
+X PD13 K13 1500 -3800 200 L 50 50 1 1 B
+X VSSA K2 700 -4300 200 U 50 50 1 1 W
+X PA0 K3 1500 2600 200 L 50 50 1 1 B
+X PA5 K4 1500 2100 200 L 50 50 1 1 B
+X PB0 K5 1500 900 200 L 50 50 1 1 B
+X PF15 K6 -1600 -2300 200 R 50 50 1 1 B
+X PE8 K7 -1600 -3300 200 R 50 50 1 1 B
+X PE14 K8 -1600 -3900 200 R 50 50 1 1 B
 X PH4 K9 -1600 1600 200 R 50 50 1 1 B
-X PH5 L9 -1600 1500 200 R 50 50 1 1 B
-X PH6 E11 -1600 1400 200 R 50 50 1 1 B
-X PH7 D12 -1600 1300 200 R 50 50 1 1 B
-X PH8 N10 -1600 1200 200 R 50 50 1 1 B
-X PH9 D11 -1600 1100 200 R 50 50 1 1 B
-X PI0 A12 -1600 3300 200 R 50 50 1 1 B
-X PI1 B11 -1600 3200 200 R 50 50 1 1 B
-X PI10 A1 -1600 2300 200 R 50 50 1 1 B
-X PI11 C3 -1600 2200 200 R 50 50 1 1 B
-X PI2 B10 -1600 3100 200 R 50 50 1 1 B
-X PI3 C10 -1600 3000 200 R 50 50 1 1 B
-X PI4 D10 -1600 2900 200 R 50 50 1 1 B
-X PI5 E10 -1600 2800 200 R 50 50 1 1 B
-X PI6 B9 -1600 2700 200 R 50 50 1 1 B
-X PI7 B2 -1600 2600 200 R 50 50 1 1 B
-X PI8 C11 -1600 2500 200 R 50 50 1 1 B
-X PI9 B1 -1600 2400 200 R 50 50 1 1 B
-X VBAT E2 -700 4300 200 D 50 50 1 1 W
-X VDD A3 -600 4300 200 D 50 50 1 1 W
-X VDD A8 -500 4300 200 D 50 50 1 1 W
-X VDD C1 -400 4300 200 D 50 50 1 1 W
-X VDD C13 -300 4300 200 D 50 50 1 1 W
-X VDD G13 -100 4300 200 D 50 50 1 1 W
-X VDD G2 -200 4300 200 D 50 50 1 1 W
-X VDD H13 0 4300 200 D 50 50 1 1 W
-X VDD L12 100 4300 200 D 50 50 1 1 W
-X VDD N11 400 4300 200 D 50 50 1 1 W
-X VDD N3 200 4300 200 D 50 50 1 1 W
-X VDD N7 300 4300 200 D 50 50 1 1 W
-X VDD12 C6 500 4300 200 D 50 50 1 1 W
-X VDD12 M10 600 4300 200 D 50 50 1 1 W
-X VDDA L2 700 4300 200 D 50 50 1 1 W
-X VDDIO2 B6 800 4300 200 D 50 50 1 1 W
-X VDDIO2 F12 900 4300 200 D 50 50 1 1 W
-X VDDUSB E12 1000 4300 200 D 50 50 1 1 W
 X VREF+ L1 -1600 3800 200 R 50 50 1 1 B
-X VSS A7 -500 -4300 200 U 50 50 1 1 W
-X VSS B3 -400 -4300 200 U 50 50 1 1 W
-X VSS C12 -200 -4300 200 U 50 50 1 1 W
-X VSS C2 -300 -4300 200 U 50 50 1 1 W
-X VSS F13 0 -4300 200 U 50 50 1 1 W
-X VSS F2 -100 -4300 200 U 50 50 1 1 W
-X VSS H12 200 -4300 200 U 50 50 1 1 W
-X VSS H2 100 -4300 200 U 50 50 1 1 W
+X PD9 L10 1500 -3400 200 L 50 50 1 1 B
+X PD8 L11 1500 -3300 200 L 50 50 1 1 B
+X VDD L12 100 4300 200 D 50 50 1 1 W
 X VSS L13 300 -4300 200 U 50 50 1 1 W
+X VDDA L2 700 4300 200 D 50 50 1 1 W
+X PA4 L3 1500 2200 200 L 50 50 1 1 B
+X PA7 L4 1500 1900 200 L 50 50 1 1 B
+X PB1 L5 1500 800 200 L 50 50 1 1 B
+X PF14 L6 -1600 -2200 200 R 50 50 1 1 B
+X PE7 L7 -1600 -3200 200 R 50 50 1 1 B
+X PE13 L8 -1600 -3800 200 R 50 50 1 1 B
+X PH5 L9 -1600 1500 200 R 50 50 1 1 B
+X OPAMP1_VINM M1 -1600 3600 200 R 50 50 1 1 B
+X VDD12 M10 600 4300 200 D 50 50 1 1 W
 X VSS M11 600 -4300 200 U 50 50 1 1 W
+X PB15 M12 1500 -600 200 L 50 50 1 1 B
+X PB14 M13 1500 -500 200 L 50 50 1 1 B
+X PA3 M2 1500 2300 200 L 50 50 1 1 B
 X VSS M3 400 -4300 200 U 50 50 1 1 W
+X PA6 M4 1500 2000 200 L 50 50 1 1 B
+X PF11 M5 -1600 -1900 200 R 50 50 1 1 B
+X PF13 M6 -1600 -2100 200 R 50 50 1 1 B
 X VSS M7 500 -4300 200 U 50 50 1 1 W
-X VSSA K2 700 -4300 200 U 50 50 1 1 W
+X PE12 M8 -1600 -3700 200 R 50 50 1 1 B
+X PH10 M9 -1600 1000 200 R 50 50 1 1 B
+X PA2 N1 1500 2400 200 L 50 50 1 1 B
+X PH8 N10 -1600 1200 200 R 50 50 1 1 B
+X VDD N11 400 4300 200 D 50 50 1 1 W
+X PB12 N12 1500 -300 200 L 50 50 1 1 B
+X PB13 N13 1500 -400 200 L 50 50 1 1 B
+X PA1 N2 1500 2500 200 L 50 50 1 1 B
+X VDD N3 200 4300 200 D 50 50 1 1 W
+X OPAMP2_VINM N4 -1600 3500 200 R 50 50 1 1 B
+X PB2 N5 1500 700 200 L 50 50 1 1 B
+X PF12 N6 -1600 -2000 200 R 50 50 1 1 B
+X VDD N7 300 4300 200 D 50 50 1 1 W
+X PE11 N8 -1600 -3600 200 R 50 50 1 1 B
+X PB10 N9 1500 -100 200 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
@@ -6500,138 +6500,138 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -1000 -3400 900 3400 0 1 10 f
-X NRST H2 -1200 3300 200 R 50 50 1 1 I
-X OPAMP1_VINM M3 -1200 2900 200 R 50 50 1 1 B
-X OPAMP2_VINM M4 -1200 2800 200 R 50 50 1 1 B
-X PA0 L2 1100 3300 200 L 50 50 1 1 B
-X PA1 M2 1100 3200 200 L 50 50 1 1 B
-X PA10 C12 1100 2300 200 L 50 50 1 1 B
-X PA11 B12 1100 2200 200 L 50 50 1 1 B
-X PA12 A12 1100 2100 200 L 50 50 1 1 B
-X PA13 A11 1100 2000 200 L 50 50 1 1 B
+X PE3 A1 -1200 -2100 200 R 50 50 1 1 B
 X PA14 A10 1100 1900 200 L 50 50 1 1 B
-X PA15 A9 1100 1800 200 L 50 50 1 1 B
-X PA2 K3 1100 3100 200 L 50 50 1 1 B
-X PA3 L3 1100 3000 200 L 50 50 1 1 B
-X PA4 J4 1100 2900 200 L 50 50 1 1 B
-X PA5 K4 1100 2800 200 L 50 50 1 1 B
-X PA6 L4 1100 2700 200 L 50 50 1 1 B
-X PA7 J5 1100 2600 200 L 50 50 1 1 B
-X PA8 D11 1100 2500 200 L 50 50 1 1 B
-X PA9 D10 1100 2400 200 L 50 50 1 1 B
-X PB0 M5 1100 1600 200 L 50 50 1 1 B
-X PB1 M6 1100 1500 200 L 50 50 1 1 B
-X PB10 L10 1100 600 200 L 50 50 1 1 B
-X PB11 L11 1100 500 200 L 50 50 1 1 B
-X PB12 L12 1100 400 200 L 50 50 1 1 B
-X PB13 K12 1100 300 200 L 50 50 1 1 B
-X PB14 K11 1100 200 200 L 50 50 1 1 B
-X PB15 K10 1100 100 200 L 50 50 1 1 B
-X PB2 L6 1100 1400 200 L 50 50 1 1 B
-X PB3 A8 1100 1300 200 L 50 50 1 1 B
-X PB4 A7 1100 1200 200 L 50 50 1 1 B
-X PB5 C5 1100 1100 200 L 50 50 1 1 B
-X PB6 B5 1100 1000 200 L 50 50 1 1 B
-X PB7 B4 1100 900 200 L 50 50 1 1 B
+X PA13 A11 1100 2000 200 L 50 50 1 1 B
+X PA12 A12 1100 2100 200 L 50 50 1 1 B
+X PE1 A2 -1200 -1900 200 R 50 50 1 1 B
 X PB8 A3 1100 800 200 L 50 50 1 1 B
-X PB9 B3 1100 700 200 L 50 50 1 1 B
-X PC0 H1 1100 -100 200 L 50 50 1 1 B
-X PC1 J2 1100 -200 200 L 50 50 1 1 B
-X PC10 B11 1100 -1100 200 L 50 50 1 1 B
-X PC11 C10 1100 -1200 200 L 50 50 1 1 B
-X PC12 B10 1100 -1300 200 L 50 50 1 1 B
-X PC13 C1 1100 -1400 200 L 50 50 1 1 B
-X PC14 D1 1100 -1500 200 L 50 50 1 1 B
-X PC15 E1 1100 -1600 200 L 50 50 1 1 B
-X PC2 J3 1100 -300 200 L 50 50 1 1 B
-X PC3 K2 1100 -400 200 L 50 50 1 1 B
-X PC4 K5 1100 -500 200 L 50 50 1 1 B
-X PC5 L5 1100 -600 200 L 50 50 1 1 B
-X PC6 E12 1100 -700 200 L 50 50 1 1 B
-X PC7 E11 1100 -800 200 L 50 50 1 1 B
-X PC8 E10 1100 -900 200 L 50 50 1 1 B
-X PC9 D12 1100 -1000 200 L 50 50 1 1 B
-X PD0 C9 1100 -1800 200 L 50 50 1 1 B
-X PD1 B9 1100 -1900 200 L 50 50 1 1 B
-X PD10 J12 1100 -2800 200 L 50 50 1 1 B
-X PD11 J11 1100 -2900 200 L 50 50 1 1 B
-X PD12 J10 1100 -3000 200 L 50 50 1 1 B
-X PD13 H12 1100 -3100 200 L 50 50 1 1 B
-X PD14 H11 1100 -3200 200 L 50 50 1 1 B
-X PD15 H10 1100 -3300 200 L 50 50 1 1 B
-X PD2 C8 1100 -2000 200 L 50 50 1 1 B
-X PD3 B8 1100 -2100 200 L 50 50 1 1 B
-X PD4 B7 1100 -2200 200 L 50 50 1 1 B
-X PD5 A6 1100 -2300 200 L 50 50 1 1 B
-X PD6 B6 1100 -2400 200 L 50 50 1 1 B
+X PH3 A4 -1200 1300 200 R 50 50 1 1 B
 X PD7 A5 1100 -2500 200 L 50 50 1 1 B
-X PD8 K9 1100 -2600 200 L 50 50 1 1 B
-X PD9 K8 1100 -2700 200 L 50 50 1 1 B
-X PE0 C3 -1200 -1800 200 R 50 50 1 1 B
-X PE1 A2 -1200 -1900 200 R 50 50 1 1 B
-X PE10 L8 -1200 -2800 200 R 50 50 1 1 B
-X PE11 M9 -1200 -2900 200 R 50 50 1 1 B
-X PE12 L9 -1200 -3000 200 R 50 50 1 1 B
-X PE13 M10 -1200 -3100 200 R 50 50 1 1 B
-X PE14 M11 -1200 -3200 200 R 50 50 1 1 B
-X PE15 M12 -1200 -3300 200 R 50 50 1 1 B
-X PE2 B2 -1200 -2000 200 R 50 50 1 1 B
-X PE3 A1 -1200 -2100 200 R 50 50 1 1 B
+X PD5 A6 1100 -2300 200 L 50 50 1 1 B
+X PB4 A7 1100 1200 200 L 50 50 1 1 B
+X PB3 A8 1100 1300 200 L 50 50 1 1 B
+X PA15 A9 1100 1800 200 L 50 50 1 1 B
 X PE4 B1 -1200 -2200 200 R 50 50 1 1 B
+X PC12 B10 1100 -1300 200 L 50 50 1 1 B
+X PC10 B11 1100 -1100 200 L 50 50 1 1 B
+X PA11 B12 1100 2200 200 L 50 50 1 1 B
+X PE2 B2 -1200 -2000 200 R 50 50 1 1 B
+X PB9 B3 1100 700 200 L 50 50 1 1 B
+X PB7 B4 1100 900 200 L 50 50 1 1 B
+X PB6 B5 1100 1000 200 L 50 50 1 1 B
+X PD6 B6 1100 -2400 200 L 50 50 1 1 B
+X PD4 B7 1100 -2200 200 L 50 50 1 1 B
+X PD3 B8 1100 -2100 200 L 50 50 1 1 B
+X PD1 B9 1100 -1900 200 L 50 50 1 1 B
+X PC13 C1 1100 -1400 200 L 50 50 1 1 B
+X PC11 C10 1100 -1200 200 L 50 50 1 1 B
+X VDDUSB C11 600 3600 200 D 50 50 1 1 W
+X PA10 C12 1100 2300 200 L 50 50 1 1 B
 X PE5 C2 -1200 -2300 200 R 50 50 1 1 B
-X PE6 D2 -1200 -2400 200 R 50 50 1 1 B
-X PE7 M7 -1200 -2500 200 R 50 50 1 1 B
-X PE8 L7 -1200 -2600 200 R 50 50 1 1 B
-X PE9 M8 -1200 -2700 200 R 50 50 1 1 B
-X PF0 D6 -1200 -600 200 R 50 50 1 1 B
-X PF1 D5 -1200 -700 200 R 50 50 1 1 B
-X PF11 K6 -1200 -1200 200 R 50 50 1 1 B
-X PF12 J7 -1200 -1300 200 R 50 50 1 1 B
-X PF13 K7 -1200 -1400 200 R 50 50 1 1 B
-X PF14 J8 -1200 -1500 200 R 50 50 1 1 B
-X PF15 J9 -1200 -1600 200 R 50 50 1 1 B
+X PE0 C3 -1200 -1800 200 R 50 50 1 1 B
+X VDD C4 -200 3600 200 D 50 50 1 1 W
+X PB5 C5 1100 1100 200 L 50 50 1 1 B
+X PG14 C6 -1200 -300 200 R 50 50 1 1 B
+X PG13 C7 -1200 -200 200 R 50 50 1 1 B
+X PD2 C8 1100 -2000 200 L 50 50 1 1 B
+X PD0 C9 1100 -1800 200 L 50 50 1 1 B
+X PC14 D1 1100 -1500 200 L 50 50 1 1 B
+X PA9 D10 1100 2400 200 L 50 50 1 1 B
+X PA8 D11 1100 2500 200 L 50 50 1 1 B
+X PC9 D12 1100 -1000 200 L 50 50 1 1 B
+X PE6 D2 -1200 -2400 200 R 50 50 1 1 B
+X VSS D3 -200 -3600 200 U 50 50 1 1 W
 X PF2 D4 -1200 -800 200 R 50 50 1 1 B
+X PF1 D5 -1200 -700 200 R 50 50 1 1 B
+X PF0 D6 -1200 -600 200 R 50 50 1 1 B
+X PG12 D7 -1200 -100 200 R 50 50 1 1 B
+X PG10 D8 -1200 100 200 R 50 50 1 1 B
+X PG9 D9 -1200 200 200 R 50 50 1 1 B
+X PC15 E1 1100 -1600 200 L 50 50 1 1 B
+X PC8 E10 1100 -900 200 L 50 50 1 1 B
+X PC7 E11 1100 -800 200 L 50 50 1 1 B
+X PC6 E12 1100 -700 200 L 50 50 1 1 B
+X VBAT E2 -300 3600 200 D 50 50 1 1 W
+X VSS E3 -100 -3600 200 U 50 50 1 1 W
 X PF3 E4 -1200 -900 200 R 50 50 1 1 B
+X PG5 E9 -1200 600 200 R 50 50 1 1 B
+X PH0 F1 -1200 1500 200 R 50 50 1 1 I
+X PG4 F10 -1200 700 200 R 50 50 1 1 B
+X VSS F11 300 -3600 200 U 50 50 1 1 W
+X VSS F12 400 -3600 200 U 50 50 1 1 W
+X VSS F2 0 -3600 200 U 50 50 1 1 W
 X PF4 F3 -1200 -1000 200 R 50 50 1 1 B
 X PF5 F4 -1200 -1100 200 R 50 50 1 1 B
-X PG0 H9 -1200 1100 200 R 50 50 1 1 B
-X PG1 G9 -1200 1000 200 R 50 50 1 1 B
-X PG10 D8 -1200 100 200 R 50 50 1 1 B
-X PG11 G3 -1200 0 200 R 50 50 1 1 B
-X PG12 D7 -1200 -100 200 R 50 50 1 1 B
-X PG13 C7 -1200 -200 200 R 50 50 1 1 B
-X PG14 C6 -1200 -300 200 R 50 50 1 1 B
-X PG15 K1 -1200 -400 200 R 50 50 1 1 B
-X PG2 G10 -1200 900 200 R 50 50 1 1 B
+X VSS F6 100 -3600 200 U 50 50 1 1 W
+X VSS F7 200 -3600 200 U 50 50 1 1 W
 X PG3 F9 -1200 800 200 R 50 50 1 1 B
-X PG4 F10 -1200 700 200 R 50 50 1 1 B
-X PG5 E9 -1200 600 200 R 50 50 1 1 B
-X PG6 G4 -1200 500 200 R 50 50 1 1 B
-X PG7 H4 -1200 400 200 R 50 50 1 1 B
-X PG8 J6 -1200 300 200 R 50 50 1 1 B
-X PG9 D9 -1200 200 200 R 50 50 1 1 B
-X PH0 F1 -1200 1500 200 R 50 50 1 1 I
 X PH1 G1 -1200 1400 200 R 50 50 1 1 I
-X PH3 A4 -1200 1300 200 R 50 50 1 1 B
-X VBAT E2 -300 3600 200 D 50 50 1 1 W
-X VDD C4 -200 3600 200 D 50 50 1 1 W
+X PG2 G10 -1200 900 200 R 50 50 1 1 B
 X VDD G11 100 3600 200 D 50 50 1 1 W
 X VDD G12 200 3600 200 D 50 50 1 1 W
 X VDD G2 -100 3600 200 D 50 50 1 1 W
+X PG11 G3 -1200 0 200 R 50 50 1 1 B
+X PG6 G4 -1200 500 200 R 50 50 1 1 B
 X VDD G6 0 3600 200 D 50 50 1 1 W
-X VDD H3 300 3600 200 D 50 50 1 1 W
-X VDDA M1 400 3600 200 D 50 50 1 1 W
 X VDDIO2 G7 500 3600 200 D 50 50 1 1 W
-X VDDUSB C11 600 3600 200 D 50 50 1 1 W
-X VREF+ L1 -1200 3100 200 R 50 50 1 1 B
-X VSS D3 -200 -3600 200 U 50 50 1 1 W
-X VSS E3 -100 -3600 200 U 50 50 1 1 W
-X VSS F11 300 -3600 200 U 50 50 1 1 W
-X VSS F12 400 -3600 200 U 50 50 1 1 W
-X VSS F2 0 -3600 200 U 50 50 1 1 W
-X VSS F6 100 -3600 200 U 50 50 1 1 W
-X VSS F7 200 -3600 200 U 50 50 1 1 W
+X PG1 G9 -1200 1000 200 R 50 50 1 1 B
+X PC0 H1 1100 -100 200 L 50 50 1 1 B
+X PD15 H10 1100 -3300 200 L 50 50 1 1 B
+X PD14 H11 1100 -3200 200 L 50 50 1 1 B
+X PD13 H12 1100 -3100 200 L 50 50 1 1 B
+X NRST H2 -1200 3300 200 R 50 50 1 1 I
+X VDD H3 300 3600 200 D 50 50 1 1 W
+X PG7 H4 -1200 400 200 R 50 50 1 1 B
+X PG0 H9 -1200 1100 200 R 50 50 1 1 B
 X VSSA J1 500 -3600 200 U 50 50 1 1 W
+X PD12 J10 1100 -3000 200 L 50 50 1 1 B
+X PD11 J11 1100 -2900 200 L 50 50 1 1 B
+X PD10 J12 1100 -2800 200 L 50 50 1 1 B
+X PC1 J2 1100 -200 200 L 50 50 1 1 B
+X PC2 J3 1100 -300 200 L 50 50 1 1 B
+X PA4 J4 1100 2900 200 L 50 50 1 1 B
+X PA7 J5 1100 2600 200 L 50 50 1 1 B
+X PG8 J6 -1200 300 200 R 50 50 1 1 B
+X PF12 J7 -1200 -1300 200 R 50 50 1 1 B
+X PF14 J8 -1200 -1500 200 R 50 50 1 1 B
+X PF15 J9 -1200 -1600 200 R 50 50 1 1 B
+X PG15 K1 -1200 -400 200 R 50 50 1 1 B
+X PB15 K10 1100 100 200 L 50 50 1 1 B
+X PB14 K11 1100 200 200 L 50 50 1 1 B
+X PB13 K12 1100 300 200 L 50 50 1 1 B
+X PC3 K2 1100 -400 200 L 50 50 1 1 B
+X PA2 K3 1100 3100 200 L 50 50 1 1 B
+X PA5 K4 1100 2800 200 L 50 50 1 1 B
+X PC4 K5 1100 -500 200 L 50 50 1 1 B
+X PF11 K6 -1200 -1200 200 R 50 50 1 1 B
+X PF13 K7 -1200 -1400 200 R 50 50 1 1 B
+X PD9 K8 1100 -2700 200 L 50 50 1 1 B
+X PD8 K9 1100 -2600 200 L 50 50 1 1 B
+X VREF+ L1 -1200 3100 200 R 50 50 1 1 B
+X PB10 L10 1100 600 200 L 50 50 1 1 B
+X PB11 L11 1100 500 200 L 50 50 1 1 B
+X PB12 L12 1100 400 200 L 50 50 1 1 B
+X PA0 L2 1100 3300 200 L 50 50 1 1 B
+X PA3 L3 1100 3000 200 L 50 50 1 1 B
+X PA6 L4 1100 2700 200 L 50 50 1 1 B
+X PC5 L5 1100 -600 200 L 50 50 1 1 B
+X PB2 L6 1100 1400 200 L 50 50 1 1 B
+X PE8 L7 -1200 -2600 200 R 50 50 1 1 B
+X PE10 L8 -1200 -2800 200 R 50 50 1 1 B
+X PE12 L9 -1200 -3000 200 R 50 50 1 1 B
+X VDDA M1 400 3600 200 D 50 50 1 1 W
+X PE13 M10 -1200 -3100 200 R 50 50 1 1 B
+X PE14 M11 -1200 -3200 200 R 50 50 1 1 B
+X PE15 M12 -1200 -3300 200 R 50 50 1 1 B
+X PA1 M2 1100 3200 200 L 50 50 1 1 B
+X OPAMP1_VINM M3 -1200 2900 200 R 50 50 1 1 B
+X OPAMP2_VINM M4 -1200 2800 200 R 50 50 1 1 B
+X PB0 M5 1100 1600 200 L 50 50 1 1 B
+X PB1 M6 1100 1500 200 L 50 50 1 1 B
+X PE7 M7 -1200 -2500 200 R 50 50 1 1 B
+X PE9 M8 -1200 -2700 200 R 50 50 1 1 B
+X PE11 M9 -1200 -2900 200 R 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
@@ -6648,70 +6648,70 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -600 -1700 500 1700 0 1 10 f
-X NRST 7 -700 1600 100 R 50 50 1 1 I
+X VBAT 1 -300 1800 100 D 50 50 1 1 W
+X PC2 10 -700 -300 100 R 50 50 1 1 B
+X PC3 11 -700 -400 100 R 50 50 1 1 B
+X VSSA 12 100 -1800 100 U 50 50 1 1 W
+X VDDA 13 100 1800 100 D 50 50 1 1 W
 X PA0 14 600 1600 100 L 50 50 1 1 B
 X PA1 15 600 1500 100 L 50 50 1 1 B
-X PA10 43 600 600 100 L 50 50 1 1 B
-X PA11 44 600 500 100 L 50 50 1 1 B
-X PA12 45 600 400 100 L 50 50 1 1 B
-X PA13 46 600 300 100 L 50 50 1 1 B
-X PA14 49 600 200 100 L 50 50 1 1 B
-X PA15 50 600 100 100 L 50 50 1 1 B
 X PA2 16 600 1400 100 L 50 50 1 1 B
 X PA3 17 600 1300 100 L 50 50 1 1 B
+X VSS 18 -300 -1800 100 U 50 50 1 1 W
+X VDD 19 -200 1800 100 D 50 50 1 1 W
+X PC13 2 -700 -1400 100 R 50 50 1 1 B
 X PA4 20 600 1200 100 L 50 50 1 1 B
 X PA5 21 600 1100 100 L 50 50 1 1 B
 X PA6 22 600 1000 100 L 50 50 1 1 B
 X PA7 23 600 900 100 L 50 50 1 1 B
-X PA8 41 600 800 100 L 50 50 1 1 B
-X PA9 42 600 700 100 L 50 50 1 1 B
+X PC4 24 -700 -500 100 R 50 50 1 1 B
+X PC5 25 -700 -600 100 R 50 50 1 1 B
 X PB0 26 600 -100 100 L 50 50 1 1 B
 X PB1 27 600 -200 100 L 50 50 1 1 B
+X PB2 28 600 -300 100 L 50 50 1 1 B
 X PB10 29 600 -1100 100 L 50 50 1 1 B
+X PC14 3 -700 -1500 100 R 50 50 1 1 B
 X PB11 30 600 -1200 100 L 50 50 1 1 B
+X VSS 31 -200 -1800 100 U 50 50 1 1 W
+X VDD 32 -100 1800 100 D 50 50 1 1 W
 X PB12 33 600 -1300 100 L 50 50 1 1 B
 X PB13 34 600 -1400 100 L 50 50 1 1 B
 X PB14 35 600 -1500 100 L 50 50 1 1 B
 X PB15 36 600 -1600 100 L 50 50 1 1 B
-X PB2 28 600 -300 100 L 50 50 1 1 B
+X PC6 37 -700 -700 100 R 50 50 1 1 B
+X PC7 38 -700 -800 100 R 50 50 1 1 B
+X PC8 39 -700 -900 100 R 50 50 1 1 B
+X PC15 4 -700 -1600 100 R 50 50 1 1 B
+X PC9 40 -700 -1000 100 R 50 50 1 1 B
+X PA8 41 600 800 100 L 50 50 1 1 B
+X PA9 42 600 700 100 L 50 50 1 1 B
+X PA10 43 600 600 100 L 50 50 1 1 B
+X PA11 44 600 500 100 L 50 50 1 1 B
+X PA12 45 600 400 100 L 50 50 1 1 B
+X PA13 46 600 300 100 L 50 50 1 1 B
+X VSS 47 -100 -1800 100 U 50 50 1 1 W
+X VDDUSB 48 200 1800 100 D 50 50 1 1 W
+X PA14 49 600 200 100 L 50 50 1 1 B
+X PH0 5 -700 500 100 R 50 50 1 1 I
+X PA15 50 600 100 100 L 50 50 1 1 B
+X PC10 51 -700 -1100 100 R 50 50 1 1 B
+X PC11 52 -700 -1200 100 R 50 50 1 1 B
+X PC12 53 -700 -1300 100 R 50 50 1 1 B
+X PD2 54 -700 100 100 R 50 50 1 1 B
 X PB3 55 600 -400 100 L 50 50 1 1 B
 X PB4 56 600 -500 100 L 50 50 1 1 B
 X PB5 57 600 -600 100 L 50 50 1 1 B
 X PB6 58 600 -700 100 L 50 50 1 1 B
 X PB7 59 600 -800 100 L 50 50 1 1 B
+X PH1 6 -700 400 100 R 50 50 1 1 I
+X PH3 60 -700 300 100 R 50 50 1 1 B
 X PB8 61 600 -900 100 L 50 50 1 1 B
 X PB9 62 600 -1000 100 L 50 50 1 1 B
+X VSS 63 0 -1800 100 U 50 50 1 1 W
+X VDD 64 0 1800 100 D 50 50 1 1 W
+X NRST 7 -700 1600 100 R 50 50 1 1 I
 X PC0 8 -700 -100 100 R 50 50 1 1 B
 X PC1 9 -700 -200 100 R 50 50 1 1 B
-X PC10 51 -700 -1100 100 R 50 50 1 1 B
-X PC11 52 -700 -1200 100 R 50 50 1 1 B
-X PC12 53 -700 -1300 100 R 50 50 1 1 B
-X PC13 2 -700 -1400 100 R 50 50 1 1 B
-X PC14 3 -700 -1500 100 R 50 50 1 1 B
-X PC15 4 -700 -1600 100 R 50 50 1 1 B
-X PC2 10 -700 -300 100 R 50 50 1 1 B
-X PC3 11 -700 -400 100 R 50 50 1 1 B
-X PC4 24 -700 -500 100 R 50 50 1 1 B
-X PC5 25 -700 -600 100 R 50 50 1 1 B
-X PC6 37 -700 -700 100 R 50 50 1 1 B
-X PC7 38 -700 -800 100 R 50 50 1 1 B
-X PC8 39 -700 -900 100 R 50 50 1 1 B
-X PC9 40 -700 -1000 100 R 50 50 1 1 B
-X PD2 54 -700 100 100 R 50 50 1 1 B
-X PH0 5 -700 500 100 R 50 50 1 1 I
-X PH1 6 -700 400 100 R 50 50 1 1 I
-X PH3 60 -700 300 100 R 50 50 1 1 B
-X VBAT 1 -300 1800 100 D 50 50 1 1 W
-X VDD 19 -200 1800 100 D 50 50 1 1 W
-X VDD 32 -100 1800 100 D 50 50 1 1 W
-X VDD 64 0 1800 100 D 50 50 1 1 W
-X VDDA 13 100 1800 100 D 50 50 1 1 W
-X VDDUSB 48 200 1800 100 D 50 50 1 1 W
-X VSS 18 -300 -1800 100 U 50 50 1 1 W
-X VSS 31 -200 -1800 100 U 50 50 1 1 W
-X VSS 47 -100 -1800 100 U 50 50 1 1 W
-X VSS 63 0 -1800 100 U 50 50 1 1 W
-X VSSA 12 100 -1800 100 U 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
@@ -6727,70 +6727,70 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -700 -1700 600 1700 0 1 10 f
-X NRST 7 -800 1600 100 R 50 50 1 1 I
+X VBAT 1 -400 1800 100 D 50 50 1 1 W
+X PC2 10 -800 -400 100 R 50 50 1 1 B
+X PC3 11 -800 -500 100 R 50 50 1 1 B
+X VSSA 12 100 -1800 100 U 50 50 1 1 W
+X VDDA 13 200 1800 100 D 50 50 1 1 W
 X PA0 14 700 1600 100 L 50 50 1 1 B
 X PA1 15 700 1500 100 L 50 50 1 1 B
-X PA10 43 700 600 100 L 50 50 1 1 B
-X PA11 44 700 500 100 L 50 50 1 1 B
-X PA12 45 700 400 100 L 50 50 1 1 B
-X PA13 46 700 300 100 L 50 50 1 1 B
-X PA14 49 700 200 100 L 50 50 1 1 B
-X PA15 50 700 100 100 L 50 50 1 1 B
 X PA2 16 700 1400 100 L 50 50 1 1 B
 X PA3 17 700 1300 100 L 50 50 1 1 B
+X VSS 18 -300 -1800 100 U 50 50 1 1 W
+X VDD 19 -300 1800 100 D 50 50 1 1 W
+X PC13 2 -800 -1400 100 R 50 50 1 1 B
 X PA4 20 700 1200 100 L 50 50 1 1 B
 X PA5 21 700 1100 100 L 50 50 1 1 B
 X PA6 22 700 1000 100 L 50 50 1 1 B
 X PA7 23 700 900 100 L 50 50 1 1 B
-X PA8 41 700 800 100 L 50 50 1 1 B
-X PA9 42 700 700 100 L 50 50 1 1 B
+X PC4 24 -800 -600 100 R 50 50 1 1 B
 X PB0 25 700 -100 100 L 50 50 1 1 B
 X PB1 26 700 -200 100 L 50 50 1 1 B
+X PB2 27 700 -300 100 L 50 50 1 1 B
 X PB10 28 700 -1100 100 L 50 50 1 1 B
 X PB11 29 700 -1200 100 L 50 50 1 1 B
+X PC14 3 -800 -1500 100 R 50 50 1 1 B
+X VDD12 30 0 1800 100 D 50 50 1 1 W
+X VSS 31 -200 -1800 100 U 50 50 1 1 W
+X VDD 32 -200 1800 100 D 50 50 1 1 W
 X PB12 33 700 -1300 100 L 50 50 1 1 B
 X PB13 34 700 -1400 100 L 50 50 1 1 B
 X PB14 35 700 -1500 100 L 50 50 1 1 B
 X PB15 36 700 -1600 100 L 50 50 1 1 B
-X PB2 27 700 -300 100 L 50 50 1 1 B
-X PB3 54 700 -400 100 L 50 50 1 1 B
-X PB4 55 700 -500 100 L 50 50 1 1 B
-X PB5 56 700 -600 100 L 50 50 1 1 B
-X PB6 57 700 -700 100 L 50 50 1 1 B
-X PB7 58 700 -800 100 L 50 50 1 1 B
-X PB8 60 700 -900 100 L 50 50 1 1 B
-X PB9 61 700 -1000 100 L 50 50 1 1 B
-X PC0 8 -800 -200 100 R 50 50 1 1 B
-X PC1 9 -800 -300 100 R 50 50 1 1 B
-X PC10 51 -800 -1100 100 R 50 50 1 1 B
-X PC11 52 -800 -1200 100 R 50 50 1 1 B
-X PC12 53 -800 -1300 100 R 50 50 1 1 B
-X PC13 2 -800 -1400 100 R 50 50 1 1 B
-X PC14 3 -800 -1500 100 R 50 50 1 1 B
-X PC15 4 -800 -1600 100 R 50 50 1 1 B
-X PC2 10 -800 -400 100 R 50 50 1 1 B
-X PC3 11 -800 -500 100 R 50 50 1 1 B
-X PC4 24 -800 -600 100 R 50 50 1 1 B
 X PC6 37 -800 -700 100 R 50 50 1 1 B
 X PC7 38 -800 -800 100 R 50 50 1 1 B
 X PC8 39 -800 -900 100 R 50 50 1 1 B
+X PC15 4 -800 -1600 100 R 50 50 1 1 B
 X PC9 40 -800 -1000 100 R 50 50 1 1 B
+X PA8 41 700 800 100 L 50 50 1 1 B
+X PA9 42 700 700 100 L 50 50 1 1 B
+X PA10 43 700 600 100 L 50 50 1 1 B
+X PA11 44 700 500 100 L 50 50 1 1 B
+X PA12 45 700 400 100 L 50 50 1 1 B
+X PA13 46 700 300 100 L 50 50 1 1 B
+X VSS 47 -100 -1800 100 U 50 50 1 1 W
+X VDDUSB 48 300 1800 100 D 50 50 1 1 W
+X PA14 49 700 200 100 L 50 50 1 1 B
 X PH0 5 -800 200 100 R 50 50 1 1 I
-X PH1 6 -800 100 100 R 50 50 1 1 I
-X PH3 59 -800 0 100 R 50 50 1 1 B
-X VBAT 1 -400 1800 100 D 50 50 1 1 W
-X VDD 19 -300 1800 100 D 50 50 1 1 W
-X VDD 32 -200 1800 100 D 50 50 1 1 W
-X VDD 64 -100 1800 100 D 50 50 1 1 W
-X VDD12 30 0 1800 100 D 50 50 1 1 W
+X PA15 50 700 100 100 L 50 50 1 1 B
+X PC10 51 -800 -1100 100 R 50 50 1 1 B
+X PC11 52 -800 -1200 100 R 50 50 1 1 B
+X PC12 53 -800 -1300 100 R 50 50 1 1 B
+X PB3 54 700 -400 100 L 50 50 1 1 B
+X PB4 55 700 -500 100 L 50 50 1 1 B
+X PB5 56 700 -600 100 L 50 50 1 1 B
+X PB6 57 700 -700 100 L 50 50 1 1 B
+X PB7 58 700 -800 100 L 50 50 1 1 B
+X PH3 59 -800 0 100 R 50 50 1 1 B
+X PH1 6 -800 100 100 R 50 50 1 1 I
+X PB8 60 700 -900 100 L 50 50 1 1 B
+X PB9 61 700 -1000 100 L 50 50 1 1 B
 X VDD12 62 100 1800 100 D 50 50 1 1 W
-X VDDA 13 200 1800 100 D 50 50 1 1 W
-X VDDUSB 48 300 1800 100 D 50 50 1 1 W
-X VSS 18 -300 -1800 100 U 50 50 1 1 W
-X VSS 31 -200 -1800 100 U 50 50 1 1 W
-X VSS 47 -100 -1800 100 U 50 50 1 1 W
 X VSS 63 0 -1800 100 U 50 50 1 1 W
-X VSSA 12 100 -1800 100 U 50 50 1 1 W
+X VDD 64 -100 1800 100 D 50 50 1 1 W
+X NRST 7 -800 1600 100 R 50 50 1 1 I
+X PC0 8 -800 -200 100 R 50 50 1 1 B
+X PC1 9 -800 -300 100 R 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
@@ -6807,106 +6807,106 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -700 -2600 700 2500 0 1 10 f
+X PE2 1 -900 500 200 R 50 50 1 1 B
+X VSS 10 -200 -2800 200 U 50 50 1 1 W
+X VDD 100 200 2700 200 D 50 50 1 1 W
+X VDD 11 -200 2700 200 D 50 50 1 1 W
+X PH0 12 -900 1100 200 R 50 50 1 1 I
+X PH1 13 -900 1000 200 R 50 50 1 1 I
 X NRST 14 -900 2400 200 R 50 50 1 1 I
+X PC0 15 900 -1000 200 L 50 50 1 1 B
+X PC1 16 900 -1100 200 L 50 50 1 1 B
+X PC2 17 900 -1200 200 L 50 50 1 1 B
+X PC3 18 900 -1300 200 L 50 50 1 1 B
+X VSSA 19 300 -2800 200 U 50 50 1 1 W
+X PE3 2 -900 400 200 R 50 50 1 1 B
+X VREF- 20 -900 2100 200 R 50 50 1 1 W
+X VREF+ 21 -900 2200 200 R 50 50 1 1 B
+X VDDA 22 300 2700 200 D 50 50 1 1 W
 X PA0 23 900 2400 200 L 50 50 1 1 B
 X PA1 24 900 2300 200 L 50 50 1 1 B
-X PA10 69 900 1400 200 L 50 50 1 1 B
-X PA11 70 900 1300 200 L 50 50 1 1 B
-X PA12 71 900 1200 200 L 50 50 1 1 B
-X PA13 72 900 1100 200 L 50 50 1 1 B
-X PA14 76 900 1000 200 L 50 50 1 1 B
-X PA15 77 900 900 200 L 50 50 1 1 B
 X PA2 25 900 2200 200 L 50 50 1 1 B
 X PA3 26 900 2100 200 L 50 50 1 1 B
+X VSS 27 -100 -2800 200 U 50 50 1 1 W
+X VDD 28 -100 2700 200 D 50 50 1 1 W
 X PA4 29 900 2000 200 L 50 50 1 1 B
+X PE4 3 -900 300 200 R 50 50 1 1 B
 X PA5 30 900 1900 200 L 50 50 1 1 B
 X PA6 31 900 1800 200 L 50 50 1 1 B
 X PA7 32 900 1700 200 L 50 50 1 1 B
-X PA8 67 900 1600 200 L 50 50 1 1 B
-X PA9 68 900 1500 200 L 50 50 1 1 B
+X PC4 33 900 -1400 200 L 50 50 1 1 B
+X PC5 34 900 -1500 200 L 50 50 1 1 B
 X PB0 35 900 700 200 L 50 50 1 1 B
 X PB1 36 900 600 200 L 50 50 1 1 B
+X PB2 37 900 500 200 L 50 50 1 1 B
+X PE7 38 -900 0 200 R 50 50 1 1 B
+X PE8 39 -900 -100 200 R 50 50 1 1 B
+X PE5 4 -900 200 200 R 50 50 1 1 B
+X PE9 40 -900 -200 200 R 50 50 1 1 B
+X PE10 41 -900 -300 200 R 50 50 1 1 B
+X PE11 42 -900 -400 200 R 50 50 1 1 B
+X PE12 43 -900 -500 200 R 50 50 1 1 B
+X PE13 44 -900 -600 200 R 50 50 1 1 B
+X PE14 45 -900 -700 200 R 50 50 1 1 B
+X PE15 46 -900 -800 200 R 50 50 1 1 B
 X PB10 47 900 -300 200 L 50 50 1 1 B
 X PB11 48 900 -400 200 L 50 50 1 1 B
+X VSS 49 0 -2800 200 U 50 50 1 1 W
+X PE6 5 -900 100 200 R 50 50 1 1 B
+X VDD 50 0 2700 200 D 50 50 1 1 W
 X PB12 51 900 -500 200 L 50 50 1 1 B
 X PB13 52 900 -600 200 L 50 50 1 1 B
 X PB14 53 900 -700 200 L 50 50 1 1 B
 X PB15 54 900 -800 200 L 50 50 1 1 B
-X PB2 37 900 500 200 L 50 50 1 1 B
-X PB3 89 900 400 200 L 50 50 1 1 B
-X PB4 90 900 300 200 L 50 50 1 1 B
-X PB5 91 900 200 200 L 50 50 1 1 B
-X PB6 92 900 100 200 L 50 50 1 1 B
-X PB7 93 900 0 200 L 50 50 1 1 B
-X PB8 95 900 -100 200 L 50 50 1 1 B
-X PB9 96 900 -200 200 L 50 50 1 1 B
-X PC0 15 900 -1000 200 L 50 50 1 1 B
-X PC1 16 900 -1100 200 L 50 50 1 1 B
-X PC10 78 900 -2000 200 L 50 50 1 1 B
-X PC11 79 900 -2100 200 L 50 50 1 1 B
-X PC12 80 900 -2200 200 L 50 50 1 1 B
-X PC13 7 900 -2300 200 L 50 50 1 1 B
-X PC14 8 900 -2400 200 L 50 50 1 1 B
-X PC15 9 900 -2500 200 L 50 50 1 1 B
-X PC2 17 900 -1200 200 L 50 50 1 1 B
-X PC3 18 900 -1300 200 L 50 50 1 1 B
-X PC4 33 900 -1400 200 L 50 50 1 1 B
-X PC5 34 900 -1500 200 L 50 50 1 1 B
-X PC6 63 900 -1600 200 L 50 50 1 1 B
-X PC7 64 900 -1700 200 L 50 50 1 1 B
-X PC8 65 900 -1800 200 L 50 50 1 1 B
-X PC9 66 900 -1900 200 L 50 50 1 1 B
-X PD0 81 -900 -1000 200 R 50 50 1 1 B
-X PD1 82 -900 -1100 200 R 50 50 1 1 B
+X PD8 55 -900 -1800 200 R 50 50 1 1 B
+X PD9 56 -900 -1900 200 R 50 50 1 1 B
 X PD10 57 -900 -2000 200 R 50 50 1 1 B
 X PD11 58 -900 -2100 200 R 50 50 1 1 B
 X PD12 59 -900 -2200 200 R 50 50 1 1 B
+X VBAT 6 -300 2700 200 D 50 50 1 1 W
 X PD13 60 -900 -2300 200 R 50 50 1 1 B
 X PD14 61 -900 -2400 200 R 50 50 1 1 B
 X PD15 62 -900 -2500 200 R 50 50 1 1 B
+X PC6 63 900 -1600 200 L 50 50 1 1 B
+X PC7 64 900 -1700 200 L 50 50 1 1 B
+X PC8 65 900 -1800 200 L 50 50 1 1 B
+X PC9 66 900 -1900 200 L 50 50 1 1 B
+X PA8 67 900 1600 200 L 50 50 1 1 B
+X PA9 68 900 1500 200 L 50 50 1 1 B
+X PA10 69 900 1400 200 L 50 50 1 1 B
+X PC13 7 900 -2300 200 L 50 50 1 1 B
+X PA11 70 900 1300 200 L 50 50 1 1 B
+X PA12 71 900 1200 200 L 50 50 1 1 B
+X PA13 72 900 1100 200 L 50 50 1 1 B
+X VDDUSB 73 400 2700 200 D 50 50 1 1 W
+X VSS 74 100 -2800 200 U 50 50 1 1 W
+X VDD 75 100 2700 200 D 50 50 1 1 W
+X PA14 76 900 1000 200 L 50 50 1 1 B
+X PA15 77 900 900 200 L 50 50 1 1 B
+X PC10 78 900 -2000 200 L 50 50 1 1 B
+X PC11 79 900 -2100 200 L 50 50 1 1 B
+X PC14 8 900 -2400 200 L 50 50 1 1 B
+X PC12 80 900 -2200 200 L 50 50 1 1 B
+X PD0 81 -900 -1000 200 R 50 50 1 1 B
+X PD1 82 -900 -1100 200 R 50 50 1 1 B
 X PD2 83 -900 -1200 200 R 50 50 1 1 B
 X PD3 84 -900 -1300 200 R 50 50 1 1 B
 X PD4 85 -900 -1400 200 R 50 50 1 1 B
 X PD5 86 -900 -1500 200 R 50 50 1 1 B
 X PD6 87 -900 -1600 200 R 50 50 1 1 B
 X PD7 88 -900 -1700 200 R 50 50 1 1 B
-X PD8 55 -900 -1800 200 R 50 50 1 1 B
-X PD9 56 -900 -1900 200 R 50 50 1 1 B
+X PB3 89 900 400 200 L 50 50 1 1 B
+X PC15 9 900 -2500 200 L 50 50 1 1 B
+X PB4 90 900 300 200 L 50 50 1 1 B
+X PB5 91 900 200 200 L 50 50 1 1 B
+X PB6 92 900 100 200 L 50 50 1 1 B
+X PB7 93 900 0 200 L 50 50 1 1 B
+X PH3 94 -900 900 200 R 50 50 1 1 B
+X PB8 95 900 -100 200 L 50 50 1 1 B
+X PB9 96 900 -200 200 L 50 50 1 1 B
 X PE0 97 -900 700 200 R 50 50 1 1 B
 X PE1 98 -900 600 200 R 50 50 1 1 B
-X PE10 41 -900 -300 200 R 50 50 1 1 B
-X PE11 42 -900 -400 200 R 50 50 1 1 B
-X PE12 43 -900 -500 200 R 50 50 1 1 B
-X PE13 44 -900 -600 200 R 50 50 1 1 B
-X PE14 45 -900 -700 200 R 50 50 1 1 B
-X PE15 46 -900 -800 200 R 50 50 1 1 B
-X PE2 1 -900 500 200 R 50 50 1 1 B
-X PE3 2 -900 400 200 R 50 50 1 1 B
-X PE4 3 -900 300 200 R 50 50 1 1 B
-X PE5 4 -900 200 200 R 50 50 1 1 B
-X PE6 5 -900 100 200 R 50 50 1 1 B
-X PE7 38 -900 0 200 R 50 50 1 1 B
-X PE8 39 -900 -100 200 R 50 50 1 1 B
-X PE9 40 -900 -200 200 R 50 50 1 1 B
-X PH0 12 -900 1100 200 R 50 50 1 1 I
-X PH1 13 -900 1000 200 R 50 50 1 1 I
-X PH3 94 -900 900 200 R 50 50 1 1 B
-X VBAT 6 -300 2700 200 D 50 50 1 1 W
-X VDD 100 200 2700 200 D 50 50 1 1 W
-X VDD 11 -200 2700 200 D 50 50 1 1 W
-X VDD 28 -100 2700 200 D 50 50 1 1 W
-X VDD 50 0 2700 200 D 50 50 1 1 W
-X VDD 75 100 2700 200 D 50 50 1 1 W
-X VDDA 22 300 2700 200 D 50 50 1 1 W
-X VDDUSB 73 400 2700 200 D 50 50 1 1 W
-X VREF+ 21 -900 2200 200 R 50 50 1 1 B
-X VREF- 20 -900 2100 200 R 50 50 1 1 W
-X VSS 10 -200 -2800 200 U 50 50 1 1 W
-X VSS 27 -100 -2800 200 U 50 50 1 1 W
-X VSS 49 0 -2800 200 U 50 50 1 1 W
-X VSS 74 100 -2800 200 U 50 50 1 1 W
 X VSS 99 200 -2800 200 U 50 50 1 1 W
-X VSSA 19 300 -2800 200 U 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
@@ -6923,106 +6923,106 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -800 -2600 800 2500 0 1 10 f
-X NRST E8 -1000 2400 200 R 50 50 1 1 I
-X PA0 G9 1000 2400 200 L 50 50 1 1 B
-X PA1 H8 1000 2300 200 L 50 50 1 1 B
-X PA10 D2 1000 1400 200 L 50 50 1 1 B
-X PA11 D1 1000 1300 200 L 50 50 1 1 B
-X PA12 C1 1000 1200 200 L 50 50 1 1 B
-X PA13 C2 1000 1100 200 L 50 50 1 1 B
-X PA14 B2 1000 1000 200 L 50 50 1 1 B
+X VDDUSB A1 500 2700 200 D 50 50 1 1 W
+X VDD A10 -200 2700 200 D 50 50 1 1 W
 X PA15 A2 1000 900 200 L 50 50 1 1 B
-X PA2 H7 1000 2200 200 L 50 50 1 1 B
-X PA3 J9 1000 2100 200 L 50 50 1 1 B
-X PA4 F6 1000 2000 200 L 50 50 1 1 B
-X PA5 G6 1000 1900 200 L 50 50 1 1 B
-X PA6 K9 1000 1800 200 L 50 50 1 1 B
-X PA7 J7 1000 1700 200 L 50 50 1 1 B
-X PA8 E3 1000 1600 200 L 50 50 1 1 B
-X PA9 D3 1000 1500 200 L 50 50 1 1 B
-X PB0 J6 1000 700 200 L 50 50 1 1 B
-X PB1 K7 1000 600 200 L 50 50 1 1 B
-X PB10 K3 1000 -300 200 L 50 50 1 1 B
-X PB11 J3 1000 -400 200 L 50 50 1 1 B
-X PB12 J1 1000 -500 200 L 50 50 1 1 B
-X PB13 J2 1000 -600 200 L 50 50 1 1 B
-X PB14 H2 1000 -700 200 L 50 50 1 1 B
-X PB15 H1 1000 -800 200 L 50 50 1 1 B
-X PB2 F5 1000 500 200 L 50 50 1 1 B
-X PB3 C6 1000 400 200 L 50 50 1 1 B
-X PB4 C7 1000 300 200 L 50 50 1 1 B
-X PB5 B7 1000 200 200 L 50 50 1 1 B
+X PD1 A3 -1000 -1500 200 R 50 50 1 1 B
+X VDD A4 -300 2700 200 D 50 50 1 1 W
+X PG10 A5 -1000 500 200 R 50 50 1 1 B
+X VDDIO2 A6 400 2700 200 D 50 50 1 1 W
 X PB6 A7 1000 100 200 L 50 50 1 1 B
-X PB7 D7 1000 0 200 L 50 50 1 1 B
-X PB8 B8 1000 -100 200 L 50 50 1 1 B
 X PB9 A8 1000 -200 200 L 50 50 1 1 B
-X PC0 F9 1000 -1000 200 L 50 50 1 1 B
-X PC1 F8 1000 -1100 200 L 50 50 1 1 B
-X PC10 D4 1000 -2000 200 L 50 50 1 1 B
+X VSS A9 -200 -2800 200 U 50 50 1 1 W
+X VSS B1 -100 -2800 200 U 50 50 1 1 W
+X PE3 B10 -1000 0 200 R 50 50 1 1 B
+X PA14 B2 1000 1000 200 L 50 50 1 1 B
+X PD0 B3 -1000 -1400 200 R 50 50 1 1 B
+X PD4 B4 -1000 -1700 200 R 50 50 1 1 B
+X PG9 B5 -1000 600 200 R 50 50 1 1 B
+X PG12 B6 -1000 300 200 R 50 50 1 1 B
+X PB5 B7 1000 200 200 L 50 50 1 1 B
+X PB8 B8 1000 -100 200 L 50 50 1 1 B
+X PE2 B9 -1000 100 200 R 50 50 1 1 B
+X PA12 C1 1000 1200 200 L 50 50 1 1 B
+X VBAT C10 -400 2700 200 D 50 50 1 1 W
+X PA13 C2 1000 1100 200 L 50 50 1 1 B
 X PC11 C3 1000 -2100 200 L 50 50 1 1 B
 X PC12 C4 1000 -2200 200 L 50 50 1 1 B
+X PD7 C5 -1000 -2000 200 R 50 50 1 1 B
+X PB3 C6 1000 400 200 L 50 50 1 1 B
+X PB4 C7 1000 300 200 L 50 50 1 1 B
+X PE4 C8 -1000 -100 200 R 50 50 1 1 B
 X PC13 C9 1000 -2300 200 L 50 50 1 1 B
+X PA11 D1 1000 1300 200 L 50 50 1 1 B
 X PC14 D10 1000 -2400 200 L 50 50 1 1 B
+X PA10 D2 1000 1400 200 L 50 50 1 1 B
+X PA9 D3 1000 1500 200 L 50 50 1 1 B
+X PC10 D4 1000 -2000 200 L 50 50 1 1 B
+X PD6 D5 -1000 -1900 200 R 50 50 1 1 B
+X PG11 D6 -1000 400 200 R 50 50 1 1 B
+X PB7 D7 1000 0 200 L 50 50 1 1 B
+X PE5 D8 -1000 -200 200 R 50 50 1 1 B
+X VSS D9 0 -2800 200 U 50 50 1 1 W
+X PC8 E1 1000 -1800 200 L 50 50 1 1 B
 X PC15 E10 1000 -2500 200 L 50 50 1 1 B
-X PC2 H10 1000 -1200 200 L 50 50 1 1 B
-X PC3 F7 1000 -1300 200 L 50 50 1 1 B
-X PC4 H6 1000 -1400 200 L 50 50 1 1 B
-X PC5 K8 1000 -1500 200 L 50 50 1 1 B
+X PC9 E2 1000 -1900 200 L 50 50 1 1 B
+X PA8 E3 1000 1600 200 L 50 50 1 1 B
+X PD2 E4 -1000 -1600 200 R 50 50 1 1 B
+X PD5 E5 -1000 -1800 200 R 50 50 1 1 B
+X PH3 E6 -1000 800 200 R 50 50 1 1 B
+X PE6 E7 -1000 -300 200 R 50 50 1 1 B
+X NRST E8 -1000 2400 200 R 50 50 1 1 I
+X VDD E9 -100 2700 200 D 50 50 1 1 W
+X VDD F1 0 2700 200 D 50 50 1 1 W
+X PH0 F10 -1000 1000 200 R 50 50 1 1 I
 X PC6 F2 1000 -1600 200 L 50 50 1 1 B
 X PC7 F3 1000 -1700 200 L 50 50 1 1 B
-X PC8 E1 1000 -1800 200 L 50 50 1 1 B
-X PC9 E2 1000 -1900 200 L 50 50 1 1 B
-X PD0 B3 -1000 -1400 200 R 50 50 1 1 B
-X PD1 A3 -1000 -1500 200 R 50 50 1 1 B
+X PD15 F4 -1000 -2500 200 R 50 50 1 1 B
+X PB2 F5 1000 500 200 L 50 50 1 1 B
+X PA4 F6 1000 2000 200 L 50 50 1 1 B
+X PC3 F7 1000 -1300 200 L 50 50 1 1 B
+X PC1 F8 1000 -1100 200 L 50 50 1 1 B
+X PC0 F9 1000 -1000 200 L 50 50 1 1 B
 X PD10 G1 -1000 -2300 200 R 50 50 1 1 B
+X PH1 G10 -1000 900 200 R 50 50 1 1 I
+X PD9 G2 -1000 -2200 200 R 50 50 1 1 B
 X PD14 G3 -1000 -2400 200 R 50 50 1 1 B
-X PD15 F4 -1000 -2500 200 R 50 50 1 1 B
-X PD2 E4 -1000 -1600 200 R 50 50 1 1 B
-X PD4 B4 -1000 -1700 200 R 50 50 1 1 B
-X PD5 E5 -1000 -1800 200 R 50 50 1 1 B
-X PD6 D5 -1000 -1900 200 R 50 50 1 1 B
-X PD7 C5 -1000 -2000 200 R 50 50 1 1 B
+X PE13 G4 -1000 -1000 200 R 50 50 1 1 B
+X PE12 G5 -1000 -900 200 R 50 50 1 1 B
+X PA5 G6 1000 1900 200 L 50 50 1 1 B
+X VREF+ G7 -1000 2200 200 R 50 50 1 1 B
+X VREF- G8 -1000 2100 200 R 50 50 1 1 W
+X PA0 G9 1000 2400 200 L 50 50 1 1 B
+X PB15 H1 1000 -800 200 L 50 50 1 1 B
+X PC2 H10 1000 -1200 200 L 50 50 1 1 B
+X PB14 H2 1000 -700 200 L 50 50 1 1 B
 X PD8 H3 -1000 -2100 200 R 50 50 1 1 B
-X PD9 G2 -1000 -2200 200 R 50 50 1 1 B
+X PE15 H4 -1000 -1200 200 R 50 50 1 1 B
 X PE10 H5 -1000 -700 200 R 50 50 1 1 B
-X PE11 K4 -1000 -800 200 R 50 50 1 1 B
-X PE12 G5 -1000 -900 200 R 50 50 1 1 B
-X PE13 G4 -1000 -1000 200 R 50 50 1 1 B
+X PC4 H6 1000 -1400 200 L 50 50 1 1 B
+X PA2 H7 1000 2200 200 L 50 50 1 1 B
+X PA1 H8 1000 2300 200 L 50 50 1 1 B
+X VSSA H9 300 -2800 200 U 50 50 1 1 W
+X PB12 J1 1000 -500 200 L 50 50 1 1 B
+X VDDA J10 300 2700 200 D 50 50 1 1 W
+X PB13 J2 1000 -600 200 L 50 50 1 1 B
+X PB11 J3 1000 -400 200 L 50 50 1 1 B
 X PE14 J4 -1000 -1100 200 R 50 50 1 1 B
-X PE15 H4 -1000 -1200 200 R 50 50 1 1 B
-X PE2 B9 -1000 100 200 R 50 50 1 1 B
-X PE3 B10 -1000 0 200 R 50 50 1 1 B
-X PE4 C8 -1000 -100 200 R 50 50 1 1 B
-X PE5 D8 -1000 -200 200 R 50 50 1 1 B
-X PE6 E7 -1000 -300 200 R 50 50 1 1 B
-X PE7 K6 -1000 -400 200 R 50 50 1 1 B
-X PE8 K5 -1000 -500 200 R 50 50 1 1 B
 X PE9 J5 -1000 -600 200 R 50 50 1 1 B
-X PG10 A5 -1000 500 200 R 50 50 1 1 B
-X PG11 D6 -1000 400 200 R 50 50 1 1 B
-X PG12 B6 -1000 300 200 R 50 50 1 1 B
-X PG9 B5 -1000 600 200 R 50 50 1 1 B
-X PH0 F10 -1000 1000 200 R 50 50 1 1 I
-X PH1 G10 -1000 900 200 R 50 50 1 1 I
-X PH3 E6 -1000 800 200 R 50 50 1 1 B
-X VBAT C10 -400 2700 200 D 50 50 1 1 W
-X VDD A10 -200 2700 200 D 50 50 1 1 W
-X VDD A4 -300 2700 200 D 50 50 1 1 W
-X VDD E9 -100 2700 200 D 50 50 1 1 W
-X VDD F1 0 2700 200 D 50 50 1 1 W
+X PB0 J6 1000 700 200 L 50 50 1 1 B
+X PA7 J7 1000 1700 200 L 50 50 1 1 B
 X VDD J8 100 2700 200 D 50 50 1 1 W
+X PA3 J9 1000 2100 200 L 50 50 1 1 B
 X VDD K1 200 2700 200 D 50 50 1 1 W
-X VDDA J10 300 2700 200 D 50 50 1 1 W
-X VDDIO2 A6 400 2700 200 D 50 50 1 1 W
-X VDDUSB A1 500 2700 200 D 50 50 1 1 W
-X VREF+ G7 -1000 2200 200 R 50 50 1 1 B
-X VREF- G8 -1000 2100 200 R 50 50 1 1 W
-X VSS A9 -200 -2800 200 U 50 50 1 1 W
-X VSS B1 -100 -2800 200 U 50 50 1 1 W
-X VSS D9 0 -2800 200 U 50 50 1 1 W
 X VSS K10 200 -2800 200 U 50 50 1 1 W
 X VSS K2 100 -2800 200 U 50 50 1 1 W
-X VSSA H9 300 -2800 200 U 50 50 1 1 W
+X PB10 K3 1000 -300 200 L 50 50 1 1 B
+X PE11 K4 -1000 -800 200 R 50 50 1 1 B
+X PE8 K5 -1000 -500 200 R 50 50 1 1 B
+X PE7 K6 -1000 -400 200 R 50 50 1 1 B
+X PB1 K7 1000 600 200 L 50 50 1 1 B
+X PC5 K8 1000 -1500 200 L 50 50 1 1 B
+X PA6 K9 1000 1800 200 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
@@ -7038,106 +7038,106 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -900 -2500 900 2500 0 1 10 f
-X NRST F8 -1100 2400 200 R 50 50 1 1 I
-X PA0 G8 1100 2400 200 L 50 50 1 1 B
-X PA1 G7 1100 2300 200 L 50 50 1 1 B
-X PA10 D2 1100 1400 200 L 50 50 1 1 B
-X PA11 D1 1100 1300 200 L 50 50 1 1 B
-X PA12 C1 1100 1200 200 L 50 50 1 1 B
-X PA13 C2 1100 1100 200 L 50 50 1 1 B
-X PA14 B2 1100 1000 200 L 50 50 1 1 B
+X VDDUSB A1 600 2700 200 D 50 50 1 1 W
+X VDD A10 -300 2700 200 D 50 50 1 1 W
 X PA15 A2 1100 900 200 L 50 50 1 1 B
-X PA2 H8 1100 2200 200 L 50 50 1 1 B
-X PA3 J9 1100 2100 200 L 50 50 1 1 B
-X PA4 H7 1100 2000 200 L 50 50 1 1 B
-X PA5 J7 1100 1900 200 L 50 50 1 1 B
-X PA6 K9 1100 1800 200 L 50 50 1 1 B
-X PA7 G6 1100 1700 200 L 50 50 1 1 B
-X PA8 E3 1100 1600 200 L 50 50 1 1 B
-X PA9 D3 1100 1500 200 L 50 50 1 1 B
-X PB0 H6 1100 700 200 L 50 50 1 1 B
-X PB1 K7 1100 600 200 L 50 50 1 1 B
-X PB10 K3 1100 -300 200 L 50 50 1 1 B
-X PB11 J3 1100 -400 200 L 50 50 1 1 B
-X PB12 J1 1100 -500 200 L 50 50 1 1 B
-X PB13 H2 1100 -600 200 L 50 50 1 1 B
-X PB14 H1 1100 -700 200 L 50 50 1 1 B
-X PB15 H3 1100 -800 200 L 50 50 1 1 B
-X PB2 J6 1100 500 200 L 50 50 1 1 B
-X PB3 F5 1100 400 200 L 50 50 1 1 B
-X PB4 E6 1100 300 200 L 50 50 1 1 B
-X PB5 C7 1100 200 200 L 50 50 1 1 B
+X PD1 A3 -1100 -1400 200 R 50 50 1 1 B
+X VDD A4 -400 2700 200 D 50 50 1 1 W
+X PG10 A5 -1100 600 200 R 50 50 1 1 B
+X VDDIO2 A6 500 2700 200 D 50 50 1 1 W
 X PB6 A7 1100 100 200 L 50 50 1 1 B
+X PB9 A8 1100 -200 200 L 50 50 1 1 B
+X VDD12 A9 200 2700 200 D 50 50 1 1 W
+X VSS B1 -200 -2700 200 U 50 50 1 1 W
+X PE3 B10 -1100 100 200 R 50 50 1 1 B
+X PA14 B2 1100 1000 200 L 50 50 1 1 B
+X PD0 B3 -1100 -1300 200 R 50 50 1 1 B
+X PD5 B4 -1100 -1700 200 R 50 50 1 1 B
+X PD6 B5 -1100 -1800 200 R 50 50 1 1 B
+X PG12 B6 -1100 400 200 R 50 50 1 1 B
 X PB7 B7 1100 0 200 L 50 50 1 1 B
 X PB8 B8 1100 -100 200 L 50 50 1 1 B
-X PB9 A8 1100 -200 200 L 50 50 1 1 B
-X PC0 G10 1100 -1000 200 L 50 50 1 1 B
-X PC1 F7 1100 -1100 200 L 50 50 1 1 B
+X VSS B9 -100 -2700 200 U 50 50 1 1 W
+X PA12 C1 1100 1200 200 L 50 50 1 1 B
+X VBAT C10 -500 2700 200 D 50 50 1 1 W
+X PA13 C2 1100 1100 200 L 50 50 1 1 B
 X PC10 C3 1100 -1900 200 L 50 50 1 1 B
-X PC11 D4 1100 -2000 200 L 50 50 1 1 B
 X PC12 C4 1100 -2100 200 L 50 50 1 1 B
+X PD4 C5 -1100 -1600 200 R 50 50 1 1 B
+X PD7 C6 -1100 -1900 200 R 50 50 1 1 B
+X PB5 C7 1100 200 200 L 50 50 1 1 B
+X PE2 C8 -1100 200 200 R 50 50 1 1 B
 X PC13 C9 1100 -2200 200 L 50 50 1 1 B
+X PA11 D1 1100 1300 200 L 50 50 1 1 B
 X PC14 D10 1100 -2300 200 L 50 50 1 1 B
+X PA10 D2 1100 1400 200 L 50 50 1 1 B
+X PA9 D3 1100 1500 200 L 50 50 1 1 B
+X PC11 D4 1100 -2000 200 L 50 50 1 1 B
+X PD2 D5 -1100 -1500 200 R 50 50 1 1 B
+X PG9 D6 -1100 700 200 R 50 50 1 1 B
+X PH3 D7 -1100 900 200 R 50 50 1 1 B
+X PE6 D8 -1100 -200 200 R 50 50 1 1 B
 X PC15 D9 1100 -2400 200 L 50 50 1 1 B
-X PC2 G9 1100 -1200 200 L 50 50 1 1 B
-X PC3 F6 1100 -1300 200 L 50 50 1 1 B
-X PC4 K8 1100 -1400 200 L 50 50 1 1 B
-X PC6 F4 1100 -1500 200 L 50 50 1 1 B
-X PC7 E4 1100 -1600 200 L 50 50 1 1 B
 X PC8 E1 1100 -1700 200 L 50 50 1 1 B
+X VSS E10 0 -2700 200 U 50 50 1 1 W
 X PC9 E2 1100 -1800 200 L 50 50 1 1 B
-X PD0 B3 -1100 -1300 200 R 50 50 1 1 B
-X PD1 A3 -1100 -1400 200 R 50 50 1 1 B
-X PD10 G1 -1100 -2200 200 R 50 50 1 1 B
-X PD14 F3 -1100 -2300 200 R 50 50 1 1 B
-X PD15 F2 -1100 -2400 200 R 50 50 1 1 B
-X PD2 D5 -1100 -1500 200 R 50 50 1 1 B
-X PD4 C5 -1100 -1600 200 R 50 50 1 1 B
-X PD5 B4 -1100 -1700 200 R 50 50 1 1 B
-X PD6 B5 -1100 -1800 200 R 50 50 1 1 B
-X PD7 C6 -1100 -1900 200 R 50 50 1 1 B
-X PD8 G3 -1100 -2000 200 R 50 50 1 1 B
-X PD9 G2 -1100 -2100 200 R 50 50 1 1 B
-X PE10 H5 -1100 -600 200 R 50 50 1 1 B
-X PE11 K4 -1100 -700 200 R 50 50 1 1 B
-X PE12 J4 -1100 -800 200 R 50 50 1 1 B
-X PE13 G5 -1100 -900 200 R 50 50 1 1 B
-X PE14 G4 -1100 -1000 200 R 50 50 1 1 B
-X PE15 H4 -1100 -1100 200 R 50 50 1 1 B
-X PE2 C8 -1100 200 200 R 50 50 1 1 B
-X PE3 B10 -1100 100 200 R 50 50 1 1 B
+X PA8 E3 1100 1600 200 L 50 50 1 1 B
+X PC7 E4 1100 -1600 200 L 50 50 1 1 B
+X PG11 E5 -1100 500 200 R 50 50 1 1 B
+X PB4 E6 1100 300 200 L 50 50 1 1 B
 X PE4 E7 -1100 0 200 R 50 50 1 1 B
 X PE5 E8 -1100 -100 200 R 50 50 1 1 B
-X PE6 D8 -1100 -200 200 R 50 50 1 1 B
-X PE7 K6 -1100 -300 200 R 50 50 1 1 B
-X PE8 K5 -1100 -400 200 R 50 50 1 1 B
-X PE9 J5 -1100 -500 200 R 50 50 1 1 B
-X PG10 A5 -1100 600 200 R 50 50 1 1 B
-X PG11 E5 -1100 500 200 R 50 50 1 1 B
-X PG12 B6 -1100 400 200 R 50 50 1 1 B
-X PG9 D6 -1100 700 200 R 50 50 1 1 B
-X PH0 F10 -1100 1100 200 R 50 50 1 1 I
-X PH1 F9 -1100 1000 200 R 50 50 1 1 I
-X PH3 D7 -1100 900 200 R 50 50 1 1 B
-X VBAT C10 -500 2700 200 D 50 50 1 1 W
-X VDD A10 -300 2700 200 D 50 50 1 1 W
-X VDD A4 -400 2700 200 D 50 50 1 1 W
 X VDD E9 -200 2700 200 D 50 50 1 1 W
 X VDD F1 -100 2700 200 D 50 50 1 1 W
+X PH0 F10 -1100 1100 200 R 50 50 1 1 I
+X PD15 F2 -1100 -2400 200 R 50 50 1 1 B
+X PD14 F3 -1100 -2300 200 R 50 50 1 1 B
+X PC6 F4 1100 -1500 200 L 50 50 1 1 B
+X PB3 F5 1100 400 200 L 50 50 1 1 B
+X PC3 F6 1100 -1300 200 L 50 50 1 1 B
+X PC1 F7 1100 -1100 200 L 50 50 1 1 B
+X NRST F8 -1100 2400 200 R 50 50 1 1 I
+X PH1 F9 -1100 1000 200 R 50 50 1 1 I
+X PD10 G1 -1100 -2200 200 R 50 50 1 1 B
+X PC0 G10 1100 -1000 200 L 50 50 1 1 B
+X PD9 G2 -1100 -2100 200 R 50 50 1 1 B
+X PD8 G3 -1100 -2000 200 R 50 50 1 1 B
+X PE14 G4 -1100 -1000 200 R 50 50 1 1 B
+X PE13 G5 -1100 -900 200 R 50 50 1 1 B
+X PA7 G6 1100 1700 200 L 50 50 1 1 B
+X PA1 G7 1100 2300 200 L 50 50 1 1 B
+X PA0 G8 1100 2400 200 L 50 50 1 1 B
+X PC2 G9 1100 -1200 200 L 50 50 1 1 B
+X PB14 H1 1100 -700 200 L 50 50 1 1 B
+X VREF+ H10 -1100 2200 200 R 50 50 1 1 B
+X PB13 H2 1100 -600 200 L 50 50 1 1 B
+X PB15 H3 1100 -800 200 L 50 50 1 1 B
+X PE15 H4 -1100 -1100 200 R 50 50 1 1 B
+X PE10 H5 -1100 -600 200 R 50 50 1 1 B
+X PB0 H6 1100 700 200 L 50 50 1 1 B
+X PA4 H7 1100 2000 200 L 50 50 1 1 B
+X PA2 H8 1100 2200 200 L 50 50 1 1 B
+X VSSA H9 300 -2700 200 U 50 50 1 1 W
+X PB12 J1 1100 -500 200 L 50 50 1 1 B
+X VDDA J10 400 2700 200 D 50 50 1 1 W
 X VDD J2 0 2700 200 D 50 50 1 1 W
+X PB11 J3 1100 -400 200 L 50 50 1 1 B
+X PE12 J4 -1100 -800 200 R 50 50 1 1 B
+X PE9 J5 -1100 -500 200 R 50 50 1 1 B
+X PB2 J6 1100 500 200 L 50 50 1 1 B
+X PA5 J7 1100 1900 200 L 50 50 1 1 B
 X VDD J8 100 2700 200 D 50 50 1 1 W
-X VDD12 A9 200 2700 200 D 50 50 1 1 W
+X PA3 J9 1100 2100 200 L 50 50 1 1 B
 X VDD12 K1 300 2700 200 D 50 50 1 1 W
-X VDDA J10 400 2700 200 D 50 50 1 1 W
-X VDDIO2 A6 500 2700 200 D 50 50 1 1 W
-X VDDUSB A1 600 2700 200 D 50 50 1 1 W
-X VREF+ H10 -1100 2200 200 R 50 50 1 1 B
-X VSS B1 -200 -2700 200 U 50 50 1 1 W
-X VSS B9 -100 -2700 200 U 50 50 1 1 W
-X VSS E10 0 -2700 200 U 50 50 1 1 W
 X VSS K10 200 -2700 200 U 50 50 1 1 W
 X VSS K2 100 -2700 200 U 50 50 1 1 W
-X VSSA H9 300 -2700 200 U 50 50 1 1 W
+X PB10 K3 1100 -300 200 L 50 50 1 1 B
+X PE11 K4 -1100 -700 200 R 50 50 1 1 B
+X PE8 K5 -1100 -400 200 R 50 50 1 1 B
+X PE7 K6 -1100 -300 200 R 50 50 1 1 B
+X PB1 K7 1100 600 200 L 50 50 1 1 B
+X PC4 K8 1100 -1400 200 L 50 50 1 1 B
+X PA6 K9 1100 1800 200 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
@@ -7149,155 +7149,155 @@ F1 "STM32L496ZETx" 800 3450 50 H V L CNN
 F2 "Package_QFP:LQFP-144_20x20mm_P0.5mm" -1000 -3400 50 H I R CNN
 F3 "" 0 0 50 H I C CNN
 ALIAS STM32L496ZGTx
-$FPLIST
- LQFP*20x20mm*P0.5mm*
-$ENDFPLIST
-DRAW
-S -1000 -3400 1000 3400 0 1 10 f
-X NRST 25 -1200 3300 200 R 50 50 1 1 I
-X PA0 34 1200 3300 200 L 50 50 1 1 B
-X PA1 35 1200 3200 200 L 50 50 1 1 B
-X PA10 102 1200 2300 200 L 50 50 1 1 B
-X PA11 103 1200 2200 200 L 50 50 1 1 B
-X PA12 104 1200 2100 200 L 50 50 1 1 B
-X PA13 105 1200 2000 200 L 50 50 1 1 B
-X PA14 109 1200 1900 200 L 50 50 1 1 B
-X PA15 110 1200 1800 200 L 50 50 1 1 B
-X PA2 36 1200 3100 200 L 50 50 1 1 B
-X PA3 37 1200 3000 200 L 50 50 1 1 B
-X PA4 40 1200 2900 200 L 50 50 1 1 B
-X PA5 41 1200 2800 200 L 50 50 1 1 B
-X PA6 42 1200 2700 200 L 50 50 1 1 B
-X PA7 43 1200 2600 200 L 50 50 1 1 B
-X PA8 100 1200 2500 200 L 50 50 1 1 B
-X PA9 101 1200 2400 200 L 50 50 1 1 B
-X PB0 46 1200 1600 200 L 50 50 1 1 B
-X PB1 47 1200 1500 200 L 50 50 1 1 B
-X PB10 69 1200 600 200 L 50 50 1 1 B
-X PB11 70 1200 500 200 L 50 50 1 1 B
-X PB12 73 1200 400 200 L 50 50 1 1 B
-X PB13 74 1200 300 200 L 50 50 1 1 B
-X PB14 75 1200 200 200 L 50 50 1 1 B
-X PB15 76 1200 100 200 L 50 50 1 1 B
-X PB2 48 1200 1400 200 L 50 50 1 1 B
-X PB3 133 1200 1300 200 L 50 50 1 1 B
-X PB4 134 1200 1200 200 L 50 50 1 1 B
-X PB5 135 1200 1100 200 L 50 50 1 1 B
-X PB6 136 1200 1000 200 L 50 50 1 1 B
-X PB7 137 1200 900 200 L 50 50 1 1 B
-X PB8 139 1200 800 200 L 50 50 1 1 B
-X PB9 140 1200 700 200 L 50 50 1 1 B
-X PC0 26 1200 -100 200 L 50 50 1 1 B
-X PC1 27 1200 -200 200 L 50 50 1 1 B
+$FPLIST
+ LQFP*20x20mm*P0.5mm*
+$ENDFPLIST
+DRAW
+S -1000 -3400 1000 3400 0 1 10 f
+X PE2 1 -1200 -2000 200 R 50 50 1 1 B
+X PF0 10 -1200 -100 200 R 50 50 1 1 B
+X PA8 100 1200 2500 200 L 50 50 1 1 B
+X PA9 101 1200 2400 200 L 50 50 1 1 B
+X PA10 102 1200 2300 200 L 50 50 1 1 B
+X PA11 103 1200 2200 200 L 50 50 1 1 B
+X PA12 104 1200 2100 200 L 50 50 1 1 B
+X PA13 105 1200 2000 200 L 50 50 1 1 B
+X VDDUSB 106 700 3600 200 D 50 50 1 1 W
+X VSS 107 200 -3600 200 U 50 50 1 1 W
+X VDD 108 100 3600 200 D 50 50 1 1 W
+X PA14 109 1200 1900 200 L 50 50 1 1 B
+X PF1 11 -1200 -200 200 R 50 50 1 1 B
+X PA15 110 1200 1800 200 L 50 50 1 1 B
 X PC10 111 1200 -1100 200 L 50 50 1 1 B
 X PC11 112 1200 -1200 200 L 50 50 1 1 B
 X PC12 113 1200 -1300 200 L 50 50 1 1 B
-X PC13 7 1200 -1400 200 L 50 50 1 1 B
-X PC14 8 1200 -1500 200 L 50 50 1 1 B
-X PC15 9 1200 -1600 200 L 50 50 1 1 B
-X PC2 28 1200 -300 200 L 50 50 1 1 B
-X PC3 29 1200 -400 200 L 50 50 1 1 B
-X PC4 44 1200 -500 200 L 50 50 1 1 B
-X PC5 45 1200 -600 200 L 50 50 1 1 B
-X PC6 96 1200 -700 200 L 50 50 1 1 B
-X PC7 97 1200 -800 200 L 50 50 1 1 B
-X PC8 98 1200 -900 200 L 50 50 1 1 B
-X PC9 99 1200 -1000 200 L 50 50 1 1 B
 X PD0 114 1200 -1800 200 L 50 50 1 1 B
 X PD1 115 1200 -1900 200 L 50 50 1 1 B
-X PD10 79 1200 -2800 200 L 50 50 1 1 B
-X PD11 80 1200 -2900 200 L 50 50 1 1 B
-X PD12 81 1200 -3000 200 L 50 50 1 1 B
-X PD13 82 1200 -3100 200 L 50 50 1 1 B
-X PD14 85 1200 -3200 200 L 50 50 1 1 B
-X PD15 86 1200 -3300 200 L 50 50 1 1 B
 X PD2 116 1200 -2000 200 L 50 50 1 1 B
 X PD3 117 1200 -2100 200 L 50 50 1 1 B
 X PD4 118 1200 -2200 200 L 50 50 1 1 B
 X PD5 119 1200 -2300 200 L 50 50 1 1 B
+X PF2 12 -1200 -300 200 R 50 50 1 1 B
+X VSS 120 300 -3600 200 U 50 50 1 1 W
+X VDD 121 200 3600 200 D 50 50 1 1 W
 X PD6 122 1200 -2400 200 L 50 50 1 1 B
 X PD7 123 1200 -2500 200 L 50 50 1 1 B
-X PD8 77 1200 -2600 200 L 50 50 1 1 B
-X PD9 78 1200 -2700 200 L 50 50 1 1 B
+X PG9 124 -1200 700 200 R 50 50 1 1 B
+X PG10 125 -1200 600 200 R 50 50 1 1 B
+X PG11 126 -1200 500 200 R 50 50 1 1 B
+X PG12 127 -1200 400 200 R 50 50 1 1 B
+X PG13 128 -1200 300 200 R 50 50 1 1 B
+X PG14 129 -1200 200 200 R 50 50 1 1 B
+X PF3 13 -1200 -400 200 R 50 50 1 1 B
+X VSS 130 400 -3600 200 U 50 50 1 1 W
+X VDDIO2 131 600 3600 200 D 50 50 1 1 W
+X PG15 132 -1200 100 200 R 50 50 1 1 B
+X PB3 133 1200 1300 200 L 50 50 1 1 B
+X PB4 134 1200 1200 200 L 50 50 1 1 B
+X PB5 135 1200 1100 200 L 50 50 1 1 B
+X PB6 136 1200 1000 200 L 50 50 1 1 B
+X PB7 137 1200 900 200 L 50 50 1 1 B
+X PH3 138 -1200 1800 200 R 50 50 1 1 B
+X PB8 139 1200 800 200 L 50 50 1 1 B
+X PF4 14 -1200 -500 200 R 50 50 1 1 B
+X PB9 140 1200 700 200 L 50 50 1 1 B
 X PE0 141 -1200 -1800 200 R 50 50 1 1 B
 X PE1 142 -1200 -1900 200 R 50 50 1 1 B
-X PE10 63 -1200 -2800 200 R 50 50 1 1 B
-X PE11 64 -1200 -2900 200 R 50 50 1 1 B
-X PE12 65 -1200 -3000 200 R 50 50 1 1 B
-X PE13 66 -1200 -3100 200 R 50 50 1 1 B
-X PE14 67 -1200 -3200 200 R 50 50 1 1 B
-X PE15 68 -1200 -3300 200 R 50 50 1 1 B
-X PE2 1 -1200 -2000 200 R 50 50 1 1 B
+X VSS 143 500 -3600 200 U 50 50 1 1 W
+X VDD 144 300 3600 200 D 50 50 1 1 W
+X PF5 15 -1200 -600 200 R 50 50 1 1 B
+X VSS 16 -500 -3600 200 U 50 50 1 1 W
+X VDD 17 -500 3600 200 D 50 50 1 1 W
+X PF6 18 -1200 -700 200 R 50 50 1 1 B
+X PF7 19 -1200 -800 200 R 50 50 1 1 B
 X PE3 2 -1200 -2100 200 R 50 50 1 1 B
+X PF8 20 -1200 -900 200 R 50 50 1 1 B
+X PF9 21 -1200 -1000 200 R 50 50 1 1 B
+X PF10 22 -1200 -1100 200 R 50 50 1 1 B
+X PH0 23 -1200 2000 200 R 50 50 1 1 I
+X PH1 24 -1200 1900 200 R 50 50 1 1 I
+X NRST 25 -1200 3300 200 R 50 50 1 1 I
+X PC0 26 1200 -100 200 L 50 50 1 1 B
+X PC1 27 1200 -200 200 L 50 50 1 1 B
+X PC2 28 1200 -300 200 L 50 50 1 1 B
+X PC3 29 1200 -400 200 L 50 50 1 1 B
 X PE4 3 -1200 -2200 200 R 50 50 1 1 B
+X VSSA 30 600 -3600 200 U 50 50 1 1 W
+X VREF- 31 -1200 3000 200 R 50 50 1 1 W
+X VREF+ 32 -1200 3100 200 R 50 50 1 1 B
+X VDDA 33 400 3600 200 D 50 50 1 1 W
+X PA0 34 1200 3300 200 L 50 50 1 1 B
+X PA1 35 1200 3200 200 L 50 50 1 1 B
+X PA2 36 1200 3100 200 L 50 50 1 1 B
+X PA3 37 1200 3000 200 L 50 50 1 1 B
+X VSS 38 -400 -3600 200 U 50 50 1 1 W
+X VDD 39 -400 3600 200 D 50 50 1 1 W
 X PE5 4 -1200 -2300 200 R 50 50 1 1 B
-X PE6 5 -1200 -2400 200 R 50 50 1 1 B
-X PE7 58 -1200 -2500 200 R 50 50 1 1 B
-X PE8 59 -1200 -2600 200 R 50 50 1 1 B
-X PE9 60 -1200 -2700 200 R 50 50 1 1 B
-X PF0 10 -1200 -100 200 R 50 50 1 1 B
-X PF1 11 -1200 -200 200 R 50 50 1 1 B
-X PF10 22 -1200 -1100 200 R 50 50 1 1 B
+X PA4 40 1200 2900 200 L 50 50 1 1 B
+X PA5 41 1200 2800 200 L 50 50 1 1 B
+X PA6 42 1200 2700 200 L 50 50 1 1 B
+X PA7 43 1200 2600 200 L 50 50 1 1 B
+X PC4 44 1200 -500 200 L 50 50 1 1 B
+X PC5 45 1200 -600 200 L 50 50 1 1 B
+X PB0 46 1200 1600 200 L 50 50 1 1 B
+X PB1 47 1200 1500 200 L 50 50 1 1 B
+X PB2 48 1200 1400 200 L 50 50 1 1 B
 X PF11 49 -1200 -1200 200 R 50 50 1 1 B
+X PE6 5 -1200 -2400 200 R 50 50 1 1 B
 X PF12 50 -1200 -1300 200 R 50 50 1 1 B
+X VSS 51 -300 -3600 200 U 50 50 1 1 W
+X VDD 52 -300 3600 200 D 50 50 1 1 W
 X PF13 53 -1200 -1400 200 R 50 50 1 1 B
 X PF14 54 -1200 -1500 200 R 50 50 1 1 B
 X PF15 55 -1200 -1600 200 R 50 50 1 1 B
-X PF2 12 -1200 -300 200 R 50 50 1 1 B
-X PF3 13 -1200 -400 200 R 50 50 1 1 B
-X PF4 14 -1200 -500 200 R 50 50 1 1 B
-X PF5 15 -1200 -600 200 R 50 50 1 1 B
-X PF6 18 -1200 -700 200 R 50 50 1 1 B
-X PF7 19 -1200 -800 200 R 50 50 1 1 B
-X PF8 20 -1200 -900 200 R 50 50 1 1 B
-X PF9 21 -1200 -1000 200 R 50 50 1 1 B
 X PG0 56 -1200 1600 200 R 50 50 1 1 B
 X PG1 57 -1200 1500 200 R 50 50 1 1 B
-X PG10 125 -1200 600 200 R 50 50 1 1 B
-X PG11 126 -1200 500 200 R 50 50 1 1 B
-X PG12 127 -1200 400 200 R 50 50 1 1 B
-X PG13 128 -1200 300 200 R 50 50 1 1 B
-X PG14 129 -1200 200 200 R 50 50 1 1 B
-X PG15 132 -1200 100 200 R 50 50 1 1 B
+X PE7 58 -1200 -2500 200 R 50 50 1 1 B
+X PE8 59 -1200 -2600 200 R 50 50 1 1 B
+X VBAT 6 -600 3600 200 D 50 50 1 1 W
+X PE9 60 -1200 -2700 200 R 50 50 1 1 B
+X VSS 61 -200 -3600 200 U 50 50 1 1 W
+X VDD 62 -200 3600 200 D 50 50 1 1 W
+X PE10 63 -1200 -2800 200 R 50 50 1 1 B
+X PE11 64 -1200 -2900 200 R 50 50 1 1 B
+X PE12 65 -1200 -3000 200 R 50 50 1 1 B
+X PE13 66 -1200 -3100 200 R 50 50 1 1 B
+X PE14 67 -1200 -3200 200 R 50 50 1 1 B
+X PE15 68 -1200 -3300 200 R 50 50 1 1 B
+X PB10 69 1200 600 200 L 50 50 1 1 B
+X PC13 7 1200 -1400 200 L 50 50 1 1 B
+X PB11 70 1200 500 200 L 50 50 1 1 B
+X VSS 71 -100 -3600 200 U 50 50 1 1 W
+X VDD 72 -100 3600 200 D 50 50 1 1 W
+X PB12 73 1200 400 200 L 50 50 1 1 B
+X PB13 74 1200 300 200 L 50 50 1 1 B
+X PB14 75 1200 200 200 L 50 50 1 1 B
+X PB15 76 1200 100 200 L 50 50 1 1 B
+X PD8 77 1200 -2600 200 L 50 50 1 1 B
+X PD9 78 1200 -2700 200 L 50 50 1 1 B
+X PD10 79 1200 -2800 200 L 50 50 1 1 B
+X PC14 8 1200 -1500 200 L 50 50 1 1 B
+X PD11 80 1200 -2900 200 L 50 50 1 1 B
+X PD12 81 1200 -3000 200 L 50 50 1 1 B
+X PD13 82 1200 -3100 200 L 50 50 1 1 B
+X VSS 83 0 -3600 200 U 50 50 1 1 W
+X VDD 84 0 3600 200 D 50 50 1 1 W
+X PD14 85 1200 -3200 200 L 50 50 1 1 B
+X PD15 86 1200 -3300 200 L 50 50 1 1 B
 X PG2 87 -1200 1400 200 R 50 50 1 1 B
 X PG3 88 -1200 1300 200 R 50 50 1 1 B
 X PG4 89 -1200 1200 200 R 50 50 1 1 B
+X PC15 9 1200 -1600 200 L 50 50 1 1 B
 X PG5 90 -1200 1100 200 R 50 50 1 1 B
 X PG6 91 -1200 1000 200 R 50 50 1 1 B
 X PG7 92 -1200 900 200 R 50 50 1 1 B
 X PG8 93 -1200 800 200 R 50 50 1 1 B
-X PG9 124 -1200 700 200 R 50 50 1 1 B
-X PH0 23 -1200 2000 200 R 50 50 1 1 I
-X PH1 24 -1200 1900 200 R 50 50 1 1 I
-X PH3 138 -1200 1800 200 R 50 50 1 1 B
-X VBAT 6 -600 3600 200 D 50 50 1 1 W
-X VDD 108 100 3600 200 D 50 50 1 1 W
-X VDD 121 200 3600 200 D 50 50 1 1 W
-X VDD 144 300 3600 200 D 50 50 1 1 W
-X VDD 17 -500 3600 200 D 50 50 1 1 W
-X VDD 39 -400 3600 200 D 50 50 1 1 W
-X VDD 52 -300 3600 200 D 50 50 1 1 W
-X VDD 62 -200 3600 200 D 50 50 1 1 W
-X VDD 72 -100 3600 200 D 50 50 1 1 W
-X VDD 84 0 3600 200 D 50 50 1 1 W
-X VDDA 33 400 3600 200 D 50 50 1 1 W
-X VDDIO2 131 600 3600 200 D 50 50 1 1 W
-X VDDIO2 95 500 3600 200 D 50 50 1 1 W
-X VDDUSB 106 700 3600 200 D 50 50 1 1 W
-X VREF+ 32 -1200 3100 200 R 50 50 1 1 B
-X VREF- 31 -1200 3000 200 R 50 50 1 1 W
-X VSS 107 200 -3600 200 U 50 50 1 1 W
-X VSS 120 300 -3600 200 U 50 50 1 1 W
-X VSS 130 400 -3600 200 U 50 50 1 1 W
-X VSS 143 500 -3600 200 U 50 50 1 1 W
-X VSS 16 -500 -3600 200 U 50 50 1 1 W
-X VSS 38 -400 -3600 200 U 50 50 1 1 W
-X VSS 51 -300 -3600 200 U 50 50 1 1 W
-X VSS 61 -200 -3600 200 U 50 50 1 1 W
-X VSS 71 -100 -3600 200 U 50 50 1 1 W
-X VSS 83 0 -3600 200 U 50 50 1 1 W
 X VSS 94 100 -3600 200 U 50 50 1 1 W
-X VSSA 30 600 -3600 200 U 50 50 1 1 W
+X VDDIO2 95 500 3600 200 D 50 50 1 1 W
+X PC6 96 1200 -700 200 L 50 50 1 1 B
+X PC7 97 1200 -800 200 L 50 50 1 1 B
+X PC8 98 1200 -900 200 L 50 50 1 1 B
+X PC9 99 1200 -1000 200 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
@@ -7313,150 +7313,150 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -1100 -3400 1100 3300 0 1 10 f
+X PE2 1 -1300 -2000 200 R 50 50 1 1 B
+X PF0 10 -1300 -100 200 R 50 50 1 1 B
+X PA8 100 1300 2400 200 L 50 50 1 1 B
+X PA9 101 1300 2300 200 L 50 50 1 1 B
+X PA10 102 1300 2200 200 L 50 50 1 1 B
+X PA11 103 1300 2100 200 L 50 50 1 1 B
+X PA12 104 1300 2000 200 L 50 50 1 1 B
+X PA13 105 1300 1900 200 L 50 50 1 1 B
+X VDDUSB 106 800 3500 200 D 50 50 1 1 W
+X VSS 107 200 -3600 200 U 50 50 1 1 W
+X VDD 108 0 3500 200 D 50 50 1 1 W
+X PA14 109 1300 1800 200 L 50 50 1 1 B
+X PF1 11 -1300 -200 200 R 50 50 1 1 B
+X PA15 110 1300 1700 200 L 50 50 1 1 B
+X PC10 111 1300 -1100 200 L 50 50 1 1 B
+X PC11 112 1300 -1200 200 L 50 50 1 1 B
+X PC12 113 1300 -1300 200 L 50 50 1 1 B
+X PD0 114 1300 -1800 200 L 50 50 1 1 B
+X PD1 115 1300 -1900 200 L 50 50 1 1 B
+X PD2 116 1300 -2000 200 L 50 50 1 1 B
+X PD3 117 1300 -2100 200 L 50 50 1 1 B
+X PD4 118 1300 -2200 200 L 50 50 1 1 B
+X PD5 119 1300 -2300 200 L 50 50 1 1 B
+X PF2 12 -1300 -300 200 R 50 50 1 1 B
+X VSS 120 300 -3600 200 U 50 50 1 1 W
+X VDD 121 100 3500 200 D 50 50 1 1 W
+X PD6 122 1300 -2400 200 L 50 50 1 1 B
+X PD7 123 1300 -2500 200 L 50 50 1 1 B
+X PG9 124 -1300 600 200 R 50 50 1 1 B
+X PG10 125 -1300 500 200 R 50 50 1 1 B
+X PG11 126 -1300 400 200 R 50 50 1 1 B
+X PG12 127 -1300 300 200 R 50 50 1 1 B
+X PG13 128 -1300 200 200 R 50 50 1 1 B
+X PG14 129 -1300 100 200 R 50 50 1 1 B
+X PF3 13 -1300 -400 200 R 50 50 1 1 B
+X VSS 130 400 -3600 200 U 50 50 1 1 W
+X VDDIO2 131 700 3500 200 D 50 50 1 1 W
+X PB3 132 1300 1200 200 L 50 50 1 1 B
+X PB4 133 1300 1100 200 L 50 50 1 1 B
+X PB5 134 1300 1000 200 L 50 50 1 1 B
+X PB6 135 1300 900 200 L 50 50 1 1 B
+X PB7 136 1300 800 200 L 50 50 1 1 B
+X PH3 137 -1300 1700 200 R 50 50 1 1 B
+X PB8 138 1300 700 200 L 50 50 1 1 B
+X PB9 139 1300 600 200 L 50 50 1 1 B
+X PF4 14 -1300 -500 200 R 50 50 1 1 B
+X PE0 140 -1300 -1800 200 R 50 50 1 1 B
+X PE1 141 -1300 -1900 200 R 50 50 1 1 B
+X VDD12 142 400 3500 200 D 50 50 1 1 W
+X VSS 143 500 -3600 200 U 50 50 1 1 W
+X VDD 144 200 3500 200 D 50 50 1 1 W
+X PF5 15 -1300 -600 200 R 50 50 1 1 B
+X VSS 16 -500 -3600 200 U 50 50 1 1 W
+X VDD 17 -600 3500 200 D 50 50 1 1 W
+X PF6 18 -1300 -700 200 R 50 50 1 1 B
+X PF7 19 -1300 -800 200 R 50 50 1 1 B
+X PE3 2 -1300 -2100 200 R 50 50 1 1 B
+X PF8 20 -1300 -900 200 R 50 50 1 1 B
+X PF9 21 -1300 -1000 200 R 50 50 1 1 B
+X PF10 22 -1300 -1100 200 R 50 50 1 1 B
+X PH0 23 -1300 1900 200 R 50 50 1 1 I
+X PH1 24 -1300 1800 200 R 50 50 1 1 I
 X NRST 25 -1300 3200 200 R 50 50 1 1 I
+X PC0 26 1300 -100 200 L 50 50 1 1 B
+X PC1 27 1300 -200 200 L 50 50 1 1 B
+X PC2 28 1300 -300 200 L 50 50 1 1 B
+X PC3 29 1300 -400 200 L 50 50 1 1 B
+X PE4 3 -1300 -2200 200 R 50 50 1 1 B
+X VSSA 30 600 -3600 200 U 50 50 1 1 W
+X VREF- 31 -1300 2900 200 R 50 50 1 1 W
+X VREF+ 32 -1300 3000 200 R 50 50 1 1 B
+X VDDA 33 500 3500 200 D 50 50 1 1 W
 X PA0 34 1300 3200 200 L 50 50 1 1 B
 X PA1 35 1300 3100 200 L 50 50 1 1 B
-X PA10 102 1300 2200 200 L 50 50 1 1 B
-X PA11 103 1300 2100 200 L 50 50 1 1 B
-X PA12 104 1300 2000 200 L 50 50 1 1 B
-X PA13 105 1300 1900 200 L 50 50 1 1 B
-X PA14 109 1300 1800 200 L 50 50 1 1 B
-X PA15 110 1300 1700 200 L 50 50 1 1 B
 X PA2 36 1300 3000 200 L 50 50 1 1 B
 X PA3 37 1300 2900 200 L 50 50 1 1 B
+X VSS 38 -400 -3600 200 U 50 50 1 1 W
+X VDD 39 -500 3500 200 D 50 50 1 1 W
+X PE5 4 -1300 -2300 200 R 50 50 1 1 B
 X PA4 40 1300 2800 200 L 50 50 1 1 B
 X PA5 41 1300 2700 200 L 50 50 1 1 B
 X PA6 42 1300 2600 200 L 50 50 1 1 B
 X PA7 43 1300 2500 200 L 50 50 1 1 B
-X PA8 100 1300 2400 200 L 50 50 1 1 B
-X PA9 101 1300 2300 200 L 50 50 1 1 B
+X PC4 44 1300 -500 200 L 50 50 1 1 B
+X PC5 45 1300 -600 200 L 50 50 1 1 B
 X PB0 46 1300 1500 200 L 50 50 1 1 B
 X PB1 47 1300 1400 200 L 50 50 1 1 B
+X PB2 48 1300 1300 200 L 50 50 1 1 B
+X PF11 49 -1300 -1200 200 R 50 50 1 1 B
+X PE6 5 -1300 -2400 200 R 50 50 1 1 B
+X PF12 50 -1300 -1300 200 R 50 50 1 1 B
+X VSS 51 -300 -3600 200 U 50 50 1 1 W
+X VDD 52 -400 3500 200 D 50 50 1 1 W
+X PF13 53 -1300 -1400 200 R 50 50 1 1 B
+X PF14 54 -1300 -1500 200 R 50 50 1 1 B
+X PF15 55 -1300 -1600 200 R 50 50 1 1 B
+X PG0 56 -1300 1500 200 R 50 50 1 1 B
+X PG1 57 -1300 1400 200 R 50 50 1 1 B
+X PE7 58 -1300 -2500 200 R 50 50 1 1 B
+X PE8 59 -1300 -2600 200 R 50 50 1 1 B
+X VBAT 6 -700 3500 200 D 50 50 1 1 W
+X PE9 60 -1300 -2700 200 R 50 50 1 1 B
+X VSS 61 -200 -3600 200 U 50 50 1 1 W
+X VDD 62 -300 3500 200 D 50 50 1 1 W
+X PE10 63 -1300 -2800 200 R 50 50 1 1 B
+X PE11 64 -1300 -2900 200 R 50 50 1 1 B
+X PE12 65 -1300 -3000 200 R 50 50 1 1 B
+X PE13 66 -1300 -3100 200 R 50 50 1 1 B
+X PE14 67 -1300 -3200 200 R 50 50 1 1 B
+X PE15 68 -1300 -3300 200 R 50 50 1 1 B
 X PB10 69 1300 500 200 L 50 50 1 1 B
+X PC13 7 1300 -1400 200 L 50 50 1 1 B
+X VDD12 70 300 3500 200 D 50 50 1 1 W
+X VSS 71 -100 -3600 200 U 50 50 1 1 W
+X VDD 72 -200 3500 200 D 50 50 1 1 W
 X PB12 73 1300 400 200 L 50 50 1 1 B
 X PB13 74 1300 300 200 L 50 50 1 1 B
 X PB14 75 1300 200 200 L 50 50 1 1 B
 X PB15 76 1300 100 200 L 50 50 1 1 B
-X PB2 48 1300 1300 200 L 50 50 1 1 B
-X PB3 132 1300 1200 200 L 50 50 1 1 B
-X PB4 133 1300 1100 200 L 50 50 1 1 B
-X PB5 134 1300 1000 200 L 50 50 1 1 B
-X PB6 135 1300 900 200 L 50 50 1 1 B
-X PB7 136 1300 800 200 L 50 50 1 1 B
-X PB8 138 1300 700 200 L 50 50 1 1 B
-X PB9 139 1300 600 200 L 50 50 1 1 B
-X PC0 26 1300 -100 200 L 50 50 1 1 B
-X PC1 27 1300 -200 200 L 50 50 1 1 B
-X PC10 111 1300 -1100 200 L 50 50 1 1 B
-X PC11 112 1300 -1200 200 L 50 50 1 1 B
-X PC12 113 1300 -1300 200 L 50 50 1 1 B
-X PC13 7 1300 -1400 200 L 50 50 1 1 B
-X PC14 8 1300 -1500 200 L 50 50 1 1 B
-X PC15 9 1300 -1600 200 L 50 50 1 1 B
-X PC2 28 1300 -300 200 L 50 50 1 1 B
-X PC3 29 1300 -400 200 L 50 50 1 1 B
-X PC4 44 1300 -500 200 L 50 50 1 1 B
-X PC5 45 1300 -600 200 L 50 50 1 1 B
-X PC6 96 1300 -700 200 L 50 50 1 1 B
-X PC7 97 1300 -800 200 L 50 50 1 1 B
-X PC8 98 1300 -900 200 L 50 50 1 1 B
-X PC9 99 1300 -1000 200 L 50 50 1 1 B
-X PD0 114 1300 -1800 200 L 50 50 1 1 B
-X PD1 115 1300 -1900 200 L 50 50 1 1 B
+X PD8 77 1300 -2600 200 L 50 50 1 1 B
+X PD9 78 1300 -2700 200 L 50 50 1 1 B
 X PD10 79 1300 -2800 200 L 50 50 1 1 B
+X PC14 8 1300 -1500 200 L 50 50 1 1 B
 X PD11 80 1300 -2900 200 L 50 50 1 1 B
 X PD12 81 1300 -3000 200 L 50 50 1 1 B
 X PD13 82 1300 -3100 200 L 50 50 1 1 B
+X VSS 83 0 -3600 200 U 50 50 1 1 W
+X VDD 84 -100 3500 200 D 50 50 1 1 W
 X PD14 85 1300 -3200 200 L 50 50 1 1 B
 X PD15 86 1300 -3300 200 L 50 50 1 1 B
-X PD2 116 1300 -2000 200 L 50 50 1 1 B
-X PD3 117 1300 -2100 200 L 50 50 1 1 B
-X PD4 118 1300 -2200 200 L 50 50 1 1 B
-X PD5 119 1300 -2300 200 L 50 50 1 1 B
-X PD6 122 1300 -2400 200 L 50 50 1 1 B
-X PD7 123 1300 -2500 200 L 50 50 1 1 B
-X PD8 77 1300 -2600 200 L 50 50 1 1 B
-X PD9 78 1300 -2700 200 L 50 50 1 1 B
-X PE0 140 -1300 -1800 200 R 50 50 1 1 B
-X PE1 141 -1300 -1900 200 R 50 50 1 1 B
-X PE10 63 -1300 -2800 200 R 50 50 1 1 B
-X PE11 64 -1300 -2900 200 R 50 50 1 1 B
-X PE12 65 -1300 -3000 200 R 50 50 1 1 B
-X PE13 66 -1300 -3100 200 R 50 50 1 1 B
-X PE14 67 -1300 -3200 200 R 50 50 1 1 B
-X PE15 68 -1300 -3300 200 R 50 50 1 1 B
-X PE2 1 -1300 -2000 200 R 50 50 1 1 B
-X PE3 2 -1300 -2100 200 R 50 50 1 1 B
-X PE4 3 -1300 -2200 200 R 50 50 1 1 B
-X PE5 4 -1300 -2300 200 R 50 50 1 1 B
-X PE6 5 -1300 -2400 200 R 50 50 1 1 B
-X PE7 58 -1300 -2500 200 R 50 50 1 1 B
-X PE8 59 -1300 -2600 200 R 50 50 1 1 B
-X PE9 60 -1300 -2700 200 R 50 50 1 1 B
-X PF0 10 -1300 -100 200 R 50 50 1 1 B
-X PF1 11 -1300 -200 200 R 50 50 1 1 B
-X PF10 22 -1300 -1100 200 R 50 50 1 1 B
-X PF11 49 -1300 -1200 200 R 50 50 1 1 B
-X PF12 50 -1300 -1300 200 R 50 50 1 1 B
-X PF13 53 -1300 -1400 200 R 50 50 1 1 B
-X PF14 54 -1300 -1500 200 R 50 50 1 1 B
-X PF15 55 -1300 -1600 200 R 50 50 1 1 B
-X PF2 12 -1300 -300 200 R 50 50 1 1 B
-X PF3 13 -1300 -400 200 R 50 50 1 1 B
-X PF4 14 -1300 -500 200 R 50 50 1 1 B
-X PF5 15 -1300 -600 200 R 50 50 1 1 B
-X PF6 18 -1300 -700 200 R 50 50 1 1 B
-X PF7 19 -1300 -800 200 R 50 50 1 1 B
-X PF8 20 -1300 -900 200 R 50 50 1 1 B
-X PF9 21 -1300 -1000 200 R 50 50 1 1 B
-X PG0 56 -1300 1500 200 R 50 50 1 1 B
-X PG1 57 -1300 1400 200 R 50 50 1 1 B
-X PG10 125 -1300 500 200 R 50 50 1 1 B
-X PG11 126 -1300 400 200 R 50 50 1 1 B
-X PG12 127 -1300 300 200 R 50 50 1 1 B
-X PG13 128 -1300 200 200 R 50 50 1 1 B
-X PG14 129 -1300 100 200 R 50 50 1 1 B
 X PG2 87 -1300 1300 200 R 50 50 1 1 B
 X PG3 88 -1300 1200 200 R 50 50 1 1 B
 X PG4 89 -1300 1100 200 R 50 50 1 1 B
+X PC15 9 1300 -1600 200 L 50 50 1 1 B
 X PG5 90 -1300 1000 200 R 50 50 1 1 B
 X PG6 91 -1300 900 200 R 50 50 1 1 B
 X PG7 92 -1300 800 200 R 50 50 1 1 B
 X PG8 93 -1300 700 200 R 50 50 1 1 B
-X PG9 124 -1300 600 200 R 50 50 1 1 B
-X PH0 23 -1300 1900 200 R 50 50 1 1 I
-X PH1 24 -1300 1800 200 R 50 50 1 1 I
-X PH3 137 -1300 1700 200 R 50 50 1 1 B
-X VBAT 6 -700 3500 200 D 50 50 1 1 W
-X VDD 108 0 3500 200 D 50 50 1 1 W
-X VDD 121 100 3500 200 D 50 50 1 1 W
-X VDD 144 200 3500 200 D 50 50 1 1 W
-X VDD 17 -600 3500 200 D 50 50 1 1 W
-X VDD 39 -500 3500 200 D 50 50 1 1 W
-X VDD 52 -400 3500 200 D 50 50 1 1 W
-X VDD 62 -300 3500 200 D 50 50 1 1 W
-X VDD 72 -200 3500 200 D 50 50 1 1 W
-X VDD 84 -100 3500 200 D 50 50 1 1 W
-X VDD12 142 400 3500 200 D 50 50 1 1 W
-X VDD12 70 300 3500 200 D 50 50 1 1 W
-X VDDA 33 500 3500 200 D 50 50 1 1 W
-X VDDIO2 131 700 3500 200 D 50 50 1 1 W
-X VDDIO2 95 600 3500 200 D 50 50 1 1 W
-X VDDUSB 106 800 3500 200 D 50 50 1 1 W
-X VREF+ 32 -1300 3000 200 R 50 50 1 1 B
-X VREF- 31 -1300 2900 200 R 50 50 1 1 W
-X VSS 107 200 -3600 200 U 50 50 1 1 W
-X VSS 120 300 -3600 200 U 50 50 1 1 W
-X VSS 130 400 -3600 200 U 50 50 1 1 W
-X VSS 143 500 -3600 200 U 50 50 1 1 W
-X VSS 16 -500 -3600 200 U 50 50 1 1 W
-X VSS 38 -400 -3600 200 U 50 50 1 1 W
-X VSS 51 -300 -3600 200 U 50 50 1 1 W
-X VSS 61 -200 -3600 200 U 50 50 1 1 W
-X VSS 71 -100 -3600 200 U 50 50 1 1 W
-X VSS 83 0 -3600 200 U 50 50 1 1 W
 X VSS 94 100 -3600 200 U 50 50 1 1 W
-X VSSA 30 600 -3600 200 U 50 50 1 1 W
+X VDDIO2 95 600 3500 200 D 50 50 1 1 W
+X PC6 96 1300 -700 200 L 50 50 1 1 B
+X PC7 97 1300 -800 200 L 50 50 1 1 B
+X PC8 98 1300 -900 200 L 50 50 1 1 B
+X PC9 99 1300 -1000 200 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
@@ -7472,175 +7472,175 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -1300 -4200 1200 4200 0 1 10 f
-X NRST H3 -1500 4100 200 R 50 50 1 1 I
-X OPAMP1_VINM M1 -1500 3700 200 R 50 50 1 1 B
-X OPAMP2_VINM N4 -1500 3600 200 R 50 50 1 1 B
-X PA0 K3 1400 2500 200 L 50 50 1 1 B
-X PA1 N2 1400 2400 200 L 50 50 1 1 B
-X PA10 F9 1400 1500 200 L 50 50 1 1 B
-X PA11 E13 1400 1400 200 L 50 50 1 1 B
-X PA12 D13 1400 1300 200 L 50 50 1 1 B
-X PA13 A11 1400 1200 200 L 50 50 1 1 B
+X PI10 A1 -1500 2400 200 R 50 50 1 1 B
 X PA14 A10 1400 1100 200 L 50 50 1 1 B
-X PA15 A9 1400 1000 200 L 50 50 1 1 B
-X PA2 N1 1400 2300 200 L 50 50 1 1 B
-X PA3 M2 1400 2200 200 L 50 50 1 1 B
-X PA4 L3 1400 2100 200 L 50 50 1 1 B
-X PA5 K4 1400 2000 200 L 50 50 1 1 B
-X PA6 M4 1400 1900 200 L 50 50 1 1 B
-X PA7 L4 1400 1800 200 L 50 50 1 1 B
-X PA8 G8 1400 1700 200 L 50 50 1 1 B
-X PA9 F10 1400 1600 200 L 50 50 1 1 B
-X PB0 K5 1400 800 200 L 50 50 1 1 B
-X PB1 L5 1400 700 200 L 50 50 1 1 B
-X PB10 N9 1400 -200 200 L 50 50 1 1 B
-X PB11 H8 1400 -300 200 L 50 50 1 1 B
-X PB12 N12 1400 -400 200 L 50 50 1 1 B
-X PB13 N13 1400 -500 200 L 50 50 1 1 B
-X PB14 M13 1400 -600 200 L 50 50 1 1 B
-X PB15 M12 1400 -700 200 L 50 50 1 1 B
-X PB2 N5 1400 600 200 L 50 50 1 1 B
-X PB3 A6 1400 500 200 L 50 50 1 1 B
+X PA13 A11 1400 1200 200 L 50 50 1 1 B
+X PI0 A12 -1500 3400 200 R 50 50 1 1 B
+X PH14 A13 -1500 700 200 R 50 50 1 1 B
+X PH2 A2 -1500 1900 200 R 50 50 1 1 B
+X VDD A3 -500 4400 200 D 50 50 1 1 W
+X PE0 A4 -1500 -2600 200 R 50 50 1 1 B
 X PB4 A5 1400 400 200 L 50 50 1 1 B
+X PB3 A6 1400 500 200 L 50 50 1 1 B
+X VSS A7 -500 -4400 200 U 50 50 1 1 W
+X VDD A8 -400 4400 200 D 50 50 1 1 W
+X PA15 A9 1400 1000 200 L 50 50 1 1 B
+X PI9 B1 -1500 2500 200 R 50 50 1 1 B
+X PI2 B10 -1500 3200 200 R 50 50 1 1 B
+X PI1 B11 -1500 3300 200 R 50 50 1 1 B
+X PH15 B12 -1500 600 200 R 50 50 1 1 B
+X PH12 B13 -1500 900 200 R 50 50 1 1 B
+X PI7 B2 -1500 2700 200 R 50 50 1 1 B
+X VSS B3 -400 -4400 200 U 50 50 1 1 W
+X PE1 B4 -1500 -2700 200 R 50 50 1 1 B
 X PB5 B5 1400 300 200 L 50 50 1 1 B
-X PB6 C5 1400 200 200 L 50 50 1 1 B
-X PB7 D5 1400 100 200 L 50 50 1 1 B
-X PB8 C4 1400 0 200 L 50 50 1 1 B
-X PB9 D4 1400 -100 200 L 50 50 1 1 B
-X PC0 J2 1400 -900 200 L 50 50 1 1 B
-X PC1 J3 1400 -1000 200 L 50 50 1 1 B
-X PC10 D9 1400 -1900 200 L 50 50 1 1 B
-X PC11 E9 1400 -2000 200 L 50 50 1 1 B
-X PC12 F8 1400 -2100 200 L 50 50 1 1 B
-X PC13 E1 1400 -2200 200 L 50 50 1 1 B
-X PC14 F1 1400 -2300 200 L 50 50 1 1 B
-X PC15 G1 1400 -2400 200 L 50 50 1 1 B
-X PC2 J4 1400 -1100 200 L 50 50 1 1 B
-X PC3 K1 1400 -1200 200 L 50 50 1 1 B
-X PC4 H5 1400 -1300 200 L 50 50 1 1 B
-X PC5 J5 1400 -1400 200 L 50 50 1 1 B
-X PC6 F11 1400 -1500 200 L 50 50 1 1 B
-X PC7 G12 1400 -1600 200 L 50 50 1 1 B
-X PC8 G10 1400 -1700 200 L 50 50 1 1 B
-X PC9 G9 1400 -1800 200 L 50 50 1 1 B
+X VDDIO2 B6 700 4400 200 D 50 50 1 1 W
+X PG9 B7 -1500 -500 200 R 50 50 1 1 B
 X PD0 B8 1400 -2600 200 L 50 50 1 1 B
-X PD1 C8 1400 -2700 200 L 50 50 1 1 B
-X PD10 J13 1400 -3600 200 L 50 50 1 1 B
-X PD11 K12 1400 -3700 200 L 50 50 1 1 B
-X PD12 K11 1400 -3800 200 L 50 50 1 1 B
-X PD13 K13 1400 -3900 200 L 50 50 1 1 B
-X PD14 K10 1400 -4000 200 L 50 50 1 1 B
-X PD15 H11 1400 -4100 200 L 50 50 1 1 B
-X PD2 D8 1400 -2800 200 L 50 50 1 1 B
-X PD3 E8 1400 -2900 200 L 50 50 1 1 B
+X PI6 B9 -1500 2800 200 R 50 50 1 1 B
+X VDD C1 -300 4400 200 D 50 50 1 1 W
+X PI3 C10 -1500 3100 200 R 50 50 1 1 B
+X PI8 C11 -1500 2600 200 R 50 50 1 1 B
+X VSS C12 -200 -4400 200 U 50 50 1 1 W
+X VDD C13 -200 4400 200 D 50 50 1 1 W
+X VSS C2 -300 -4400 200 U 50 50 1 1 W
+X PI11 C3 -1500 2300 200 R 50 50 1 1 B
+X PB8 C4 1400 0 200 L 50 50 1 1 B
+X PB6 C5 1400 200 200 L 50 50 1 1 B
+X PG15 C6 -1500 -1100 200 R 50 50 1 1 B
 X PD4 C7 1400 -3000 200 L 50 50 1 1 B
-X PD5 D7 1400 -3100 200 L 50 50 1 1 B
-X PD6 E7 1400 -3200 200 L 50 50 1 1 B
-X PD7 F7 1400 -3300 200 L 50 50 1 1 B
-X PD8 L11 1400 -3400 200 L 50 50 1 1 B
-X PD9 L10 1400 -3500 200 L 50 50 1 1 B
-X PE0 A4 -1500 -2600 200 R 50 50 1 1 B
-X PE1 B4 -1500 -2700 200 R 50 50 1 1 B
-X PE10 H7 -1500 -3600 200 R 50 50 1 1 B
-X PE11 N8 -1500 -3700 200 R 50 50 1 1 B
-X PE12 M8 -1500 -3800 200 R 50 50 1 1 B
-X PE13 L8 -1500 -3900 200 R 50 50 1 1 B
-X PE14 K8 -1500 -4000 200 R 50 50 1 1 B
-X PE15 J8 -1500 -4100 200 R 50 50 1 1 B
-X PE2 D3 -1500 -2800 200 R 50 50 1 1 B
-X PE3 D2 -1500 -2900 200 R 50 50 1 1 B
+X PD1 C8 1400 -2700 200 L 50 50 1 1 B
+X PH13 C9 -1500 800 200 R 50 50 1 1 B
 X PE4 D1 -1500 -3000 200 R 50 50 1 1 B
-X PE5 E4 -1500 -3100 200 R 50 50 1 1 B
+X PI4 D10 -1500 3000 200 R 50 50 1 1 B
+X PH9 D11 -1500 1200 200 R 50 50 1 1 B
+X PH7 D12 -1500 1400 200 R 50 50 1 1 B
+X PA12 D13 1400 1300 200 L 50 50 1 1 B
+X PE3 D2 -1500 -2900 200 R 50 50 1 1 B
+X PE2 D3 -1500 -2800 200 R 50 50 1 1 B
+X PB9 D4 1400 -100 200 L 50 50 1 1 B
+X PB7 D5 1400 100 200 L 50 50 1 1 B
+X PG10 D6 -1500 -600 200 R 50 50 1 1 B
+X PD5 D7 1400 -3100 200 L 50 50 1 1 B
+X PD2 D8 1400 -2800 200 L 50 50 1 1 B
+X PC10 D9 1400 -1900 200 L 50 50 1 1 B
+X PC13 E1 1400 -2200 200 L 50 50 1 1 B
+X PI5 E10 -1500 2900 200 R 50 50 1 1 B
+X PH6 E11 -1500 1500 200 R 50 50 1 1 B
+X VDDUSB E12 900 4400 200 D 50 50 1 1 W
+X PA11 E13 1400 1400 200 L 50 50 1 1 B
+X VBAT E2 -600 4400 200 D 50 50 1 1 W
 X PE6 E3 -1500 -3200 200 R 50 50 1 1 B
-X PE7 L7 -1500 -3300 200 R 50 50 1 1 B
-X PE8 K7 -1500 -3400 200 R 50 50 1 1 B
-X PE9 J7 -1500 -3500 200 R 50 50 1 1 B
-X PF0 F5 -1500 -1300 200 R 50 50 1 1 B
-X PF1 F4 -1500 -1400 200 R 50 50 1 1 B
-X PF10 H4 -1500 -1900 200 R 50 50 1 1 B
-X PF11 M5 -1500 -2000 200 R 50 50 1 1 B
-X PF12 N6 -1500 -2100 200 R 50 50 1 1 B
-X PF13 M6 -1500 -2200 200 R 50 50 1 1 B
-X PF14 L6 -1500 -2300 200 R 50 50 1 1 B
-X PF15 K6 -1500 -2400 200 R 50 50 1 1 B
+X PE5 E4 -1500 -3100 200 R 50 50 1 1 B
+X PH3 E5 -1500 1800 200 R 50 50 1 1 B
+X PG11 E6 -1500 -700 200 R 50 50 1 1 B
+X PD6 E7 1400 -3200 200 L 50 50 1 1 B
+X PD3 E8 1400 -2900 200 L 50 50 1 1 B
+X PC11 E9 1400 -2000 200 L 50 50 1 1 B
+X PC14 F1 1400 -2300 200 L 50 50 1 1 B
+X PA9 F10 1400 1600 200 L 50 50 1 1 B
+X PC6 F11 1400 -1500 200 L 50 50 1 1 B
+X VDDIO2 F12 800 4400 200 D 50 50 1 1 W
+X VSS F13 0 -4400 200 U 50 50 1 1 W
+X VSS F2 -100 -4400 200 U 50 50 1 1 W
 X PF2 F3 -1500 -1500 200 R 50 50 1 1 B
+X PF1 F4 -1500 -1400 200 R 50 50 1 1 B
+X PF0 F5 -1500 -1300 200 R 50 50 1 1 B
+X PG12 F6 -1500 -800 200 R 50 50 1 1 B
+X PD7 F7 1400 -3300 200 L 50 50 1 1 B
+X PC12 F8 1400 -2100 200 L 50 50 1 1 B
+X PA10 F9 1400 1500 200 L 50 50 1 1 B
+X PC15 G1 1400 -2400 200 L 50 50 1 1 B
+X PC8 G10 1400 -1700 200 L 50 50 1 1 B
+X PG6 G11 -1500 -200 200 R 50 50 1 1 B
+X PC7 G12 1400 -1600 200 L 50 50 1 1 B
+X VDD G13 0 4400 200 D 50 50 1 1 W
+X VDD G2 -100 4400 200 D 50 50 1 1 W
 X PF3 G3 -1500 -1600 200 R 50 50 1 1 B
 X PF4 G4 -1500 -1700 200 R 50 50 1 1 B
 X PF5 G5 -1500 -1800 200 R 50 50 1 1 B
-X PG0 J6 -1500 400 200 R 50 50 1 1 B
-X PG1 H6 -1500 300 200 R 50 50 1 1 B
-X PG10 D6 -1500 -600 200 R 50 50 1 1 B
-X PG11 E6 -1500 -700 200 R 50 50 1 1 B
-X PG12 F6 -1500 -800 200 R 50 50 1 1 B
-X PG13 G7 -1500 -900 200 R 50 50 1 1 B
 X PG14 G6 -1500 -1000 200 R 50 50 1 1 B
-X PG15 C6 -1500 -1100 200 R 50 50 1 1 B
-X PG2 J12 -1500 200 200 R 50 50 1 1 B
-X PG3 J11 -1500 100 200 R 50 50 1 1 B
-X PG4 J10 -1500 0 200 R 50 50 1 1 B
-X PG5 J9 -1500 -100 200 R 50 50 1 1 B
-X PG6 G11 -1500 -200 200 R 50 50 1 1 B
+X PG13 G7 -1500 -900 200 R 50 50 1 1 B
+X PA8 G8 1400 1700 200 L 50 50 1 1 B
+X PC9 G9 1400 -1800 200 L 50 50 1 1 B
+X PH0 H1 -1500 2100 200 R 50 50 1 1 I
 X PG7 H10 -1500 -300 200 R 50 50 1 1 B
+X PD15 H11 1400 -4100 200 L 50 50 1 1 B
+X VSS H12 200 -4400 200 U 50 50 1 1 W
+X VDD H13 100 4400 200 D 50 50 1 1 W
+X VSS H2 100 -4400 200 U 50 50 1 1 W
+X NRST H3 -1500 4100 200 R 50 50 1 1 I
+X PF10 H4 -1500 -1900 200 R 50 50 1 1 B
+X PC4 H5 1400 -1300 200 L 50 50 1 1 B
+X PG1 H6 -1500 300 200 R 50 50 1 1 B
+X PE10 H7 -1500 -3600 200 R 50 50 1 1 B
+X PB11 H8 1400 -300 200 L 50 50 1 1 B
 X PG8 H9 -1500 -400 200 R 50 50 1 1 B
-X PG9 B7 -1500 -500 200 R 50 50 1 1 B
-X PH0 H1 -1500 2100 200 R 50 50 1 1 I
 X PH1 J1 -1500 2000 200 R 50 50 1 1 I
-X PH10 M9 -1500 1100 200 R 50 50 1 1 B
-X PH11 M10 -1500 1000 200 R 50 50 1 1 B
-X PH12 B13 -1500 900 200 R 50 50 1 1 B
-X PH13 C9 -1500 800 200 R 50 50 1 1 B
-X PH14 A13 -1500 700 200 R 50 50 1 1 B
-X PH15 B12 -1500 600 200 R 50 50 1 1 B
-X PH2 A2 -1500 1900 200 R 50 50 1 1 B
-X PH3 E5 -1500 1800 200 R 50 50 1 1 B
+X PG4 J10 -1500 0 200 R 50 50 1 1 B
+X PG3 J11 -1500 100 200 R 50 50 1 1 B
+X PG2 J12 -1500 200 200 R 50 50 1 1 B
+X PD10 J13 1400 -3600 200 L 50 50 1 1 B
+X PC0 J2 1400 -900 200 L 50 50 1 1 B
+X PC1 J3 1400 -1000 200 L 50 50 1 1 B
+X PC2 J4 1400 -1100 200 L 50 50 1 1 B
+X PC5 J5 1400 -1400 200 L 50 50 1 1 B
+X PG0 J6 -1500 400 200 R 50 50 1 1 B
+X PE9 J7 -1500 -3500 200 R 50 50 1 1 B
+X PE15 J8 -1500 -4100 200 R 50 50 1 1 B
+X PG5 J9 -1500 -100 200 R 50 50 1 1 B
+X PC3 K1 1400 -1200 200 L 50 50 1 1 B
+X PD14 K10 1400 -4000 200 L 50 50 1 1 B
+X PD12 K11 1400 -3800 200 L 50 50 1 1 B
+X PD11 K12 1400 -3700 200 L 50 50 1 1 B
+X PD13 K13 1400 -3900 200 L 50 50 1 1 B
+X VSSA K2 700 -4400 200 U 50 50 1 1 W
+X PA0 K3 1400 2500 200 L 50 50 1 1 B
+X PA5 K4 1400 2000 200 L 50 50 1 1 B
+X PB0 K5 1400 800 200 L 50 50 1 1 B
+X PF15 K6 -1500 -2400 200 R 50 50 1 1 B
+X PE8 K7 -1500 -3400 200 R 50 50 1 1 B
+X PE14 K8 -1500 -4000 200 R 50 50 1 1 B
 X PH4 K9 -1500 1700 200 R 50 50 1 1 B
-X PH5 L9 -1500 1600 200 R 50 50 1 1 B
-X PH6 E11 -1500 1500 200 R 50 50 1 1 B
-X PH7 D12 -1500 1400 200 R 50 50 1 1 B
-X PH8 N10 -1500 1300 200 R 50 50 1 1 B
-X PH9 D11 -1500 1200 200 R 50 50 1 1 B
-X PI0 A12 -1500 3400 200 R 50 50 1 1 B
-X PI1 B11 -1500 3300 200 R 50 50 1 1 B
-X PI10 A1 -1500 2400 200 R 50 50 1 1 B
-X PI11 C3 -1500 2300 200 R 50 50 1 1 B
-X PI2 B10 -1500 3200 200 R 50 50 1 1 B
-X PI3 C10 -1500 3100 200 R 50 50 1 1 B
-X PI4 D10 -1500 3000 200 R 50 50 1 1 B
-X PI5 E10 -1500 2900 200 R 50 50 1 1 B
-X PI6 B9 -1500 2800 200 R 50 50 1 1 B
-X PI7 B2 -1500 2700 200 R 50 50 1 1 B
-X PI8 C11 -1500 2600 200 R 50 50 1 1 B
-X PI9 B1 -1500 2500 200 R 50 50 1 1 B
-X VBAT E2 -600 4400 200 D 50 50 1 1 W
-X VDD A3 -500 4400 200 D 50 50 1 1 W
-X VDD A8 -400 4400 200 D 50 50 1 1 W
-X VDD C1 -300 4400 200 D 50 50 1 1 W
-X VDD C13 -200 4400 200 D 50 50 1 1 W
-X VDD G13 0 4400 200 D 50 50 1 1 W
-X VDD G2 -100 4400 200 D 50 50 1 1 W
-X VDD H13 100 4400 200 D 50 50 1 1 W
-X VDD L12 200 4400 200 D 50 50 1 1 W
-X VDD N11 500 4400 200 D 50 50 1 1 W
-X VDD N3 300 4400 200 D 50 50 1 1 W
-X VDD N7 400 4400 200 D 50 50 1 1 W
-X VDDA L2 600 4400 200 D 50 50 1 1 W
-X VDDIO2 B6 700 4400 200 D 50 50 1 1 W
-X VDDIO2 F12 800 4400 200 D 50 50 1 1 W
-X VDDUSB E12 900 4400 200 D 50 50 1 1 W
 X VREF+ L1 -1500 3900 200 R 50 50 1 1 B
-X VSS A7 -500 -4400 200 U 50 50 1 1 W
-X VSS B3 -400 -4400 200 U 50 50 1 1 W
-X VSS C12 -200 -4400 200 U 50 50 1 1 W
-X VSS C2 -300 -4400 200 U 50 50 1 1 W
-X VSS F13 0 -4400 200 U 50 50 1 1 W
-X VSS F2 -100 -4400 200 U 50 50 1 1 W
-X VSS H12 200 -4400 200 U 50 50 1 1 W
-X VSS H2 100 -4400 200 U 50 50 1 1 W
+X PD9 L10 1400 -3500 200 L 50 50 1 1 B
+X PD8 L11 1400 -3400 200 L 50 50 1 1 B
+X VDD L12 200 4400 200 D 50 50 1 1 W
 X VSS L13 300 -4400 200 U 50 50 1 1 W
+X VDDA L2 600 4400 200 D 50 50 1 1 W
+X PA4 L3 1400 2100 200 L 50 50 1 1 B
+X PA7 L4 1400 1800 200 L 50 50 1 1 B
+X PB1 L5 1400 700 200 L 50 50 1 1 B
+X PF14 L6 -1500 -2300 200 R 50 50 1 1 B
+X PE7 L7 -1500 -3300 200 R 50 50 1 1 B
+X PE13 L8 -1500 -3900 200 R 50 50 1 1 B
+X PH5 L9 -1500 1600 200 R 50 50 1 1 B
+X OPAMP1_VINM M1 -1500 3700 200 R 50 50 1 1 B
+X PH11 M10 -1500 1000 200 R 50 50 1 1 B
 X VSS M11 600 -4400 200 U 50 50 1 1 W
+X PB15 M12 1400 -700 200 L 50 50 1 1 B
+X PB14 M13 1400 -600 200 L 50 50 1 1 B
+X PA3 M2 1400 2200 200 L 50 50 1 1 B
 X VSS M3 400 -4400 200 U 50 50 1 1 W
+X PA6 M4 1400 1900 200 L 50 50 1 1 B
+X PF11 M5 -1500 -2000 200 R 50 50 1 1 B
+X PF13 M6 -1500 -2200 200 R 50 50 1 1 B
 X VSS M7 500 -4400 200 U 50 50 1 1 W
-X VSSA K2 700 -4400 200 U 50 50 1 1 W
+X PE12 M8 -1500 -3800 200 R 50 50 1 1 B
+X PH10 M9 -1500 1100 200 R 50 50 1 1 B
+X PA2 N1 1400 2300 200 L 50 50 1 1 B
+X PH8 N10 -1500 1300 200 R 50 50 1 1 B
+X VDD N11 500 4400 200 D 50 50 1 1 W
+X PB12 N12 1400 -400 200 L 50 50 1 1 B
+X PB13 N13 1400 -500 200 L 50 50 1 1 B
+X PA1 N2 1400 2400 200 L 50 50 1 1 B
+X VDD N3 300 4400 200 D 50 50 1 1 W
+X OPAMP2_VINM N4 -1500 3600 200 R 50 50 1 1 B
+X PB2 N5 1400 600 200 L 50 50 1 1 B
+X PF12 N6 -1500 -2100 200 R 50 50 1 1 B
+X VDD N7 400 4400 200 D 50 50 1 1 W
+X PE11 N8 -1500 -3700 200 R 50 50 1 1 B
+X PB10 N9 1400 -200 200 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
@@ -7656,138 +7656,138 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -1000 -3400 900 3400 0 1 10 f
-X NRST H2 -1200 3300 200 R 50 50 1 1 I
-X OPAMP1_VINM M3 -1200 2900 200 R 50 50 1 1 B
-X OPAMP2_VINM M4 -1200 2800 200 R 50 50 1 1 B
-X PA0 L2 1100 3300 200 L 50 50 1 1 B
-X PA1 M2 1100 3200 200 L 50 50 1 1 B
-X PA10 C12 1100 2300 200 L 50 50 1 1 B
-X PA11 B12 1100 2200 200 L 50 50 1 1 B
-X PA12 A12 1100 2100 200 L 50 50 1 1 B
-X PA13 A11 1100 2000 200 L 50 50 1 1 B
+X PE3 A1 -1200 -2100 200 R 50 50 1 1 B
 X PA14 A10 1100 1900 200 L 50 50 1 1 B
-X PA15 A9 1100 1800 200 L 50 50 1 1 B
-X PA2 K3 1100 3100 200 L 50 50 1 1 B
-X PA3 L3 1100 3000 200 L 50 50 1 1 B
-X PA4 J4 1100 2900 200 L 50 50 1 1 B
-X PA5 K4 1100 2800 200 L 50 50 1 1 B
-X PA6 L4 1100 2700 200 L 50 50 1 1 B
-X PA7 J5 1100 2600 200 L 50 50 1 1 B
-X PA8 D11 1100 2500 200 L 50 50 1 1 B
-X PA9 D10 1100 2400 200 L 50 50 1 1 B
-X PB0 M5 1100 1600 200 L 50 50 1 1 B
-X PB1 M6 1100 1500 200 L 50 50 1 1 B
-X PB10 L10 1100 600 200 L 50 50 1 1 B
-X PB11 L11 1100 500 200 L 50 50 1 1 B
-X PB12 L12 1100 400 200 L 50 50 1 1 B
-X PB13 K12 1100 300 200 L 50 50 1 1 B
-X PB14 K11 1100 200 200 L 50 50 1 1 B
-X PB15 K10 1100 100 200 L 50 50 1 1 B
-X PB2 L6 1100 1400 200 L 50 50 1 1 B
-X PB3 A8 1100 1300 200 L 50 50 1 1 B
-X PB4 A7 1100 1200 200 L 50 50 1 1 B
-X PB5 C5 1100 1100 200 L 50 50 1 1 B
-X PB6 B5 1100 1000 200 L 50 50 1 1 B
-X PB7 B4 1100 900 200 L 50 50 1 1 B
+X PA13 A11 1100 2000 200 L 50 50 1 1 B
+X PA12 A12 1100 2100 200 L 50 50 1 1 B
+X PE1 A2 -1200 -1900 200 R 50 50 1 1 B
 X PB8 A3 1100 800 200 L 50 50 1 1 B
-X PB9 B3 1100 700 200 L 50 50 1 1 B
-X PC0 H1 1100 -100 200 L 50 50 1 1 B
-X PC1 J2 1100 -200 200 L 50 50 1 1 B
-X PC10 B11 1100 -1100 200 L 50 50 1 1 B
-X PC11 C10 1100 -1200 200 L 50 50 1 1 B
+X PH3 A4 -1200 1300 200 R 50 50 1 1 B
+X PD7 A5 1100 -2500 200 L 50 50 1 1 B
+X PD5 A6 1100 -2300 200 L 50 50 1 1 B
+X PB4 A7 1100 1200 200 L 50 50 1 1 B
+X PB3 A8 1100 1300 200 L 50 50 1 1 B
+X PA15 A9 1100 1800 200 L 50 50 1 1 B
+X PE4 B1 -1200 -2200 200 R 50 50 1 1 B
 X PC12 B10 1100 -1300 200 L 50 50 1 1 B
+X PC10 B11 1100 -1100 200 L 50 50 1 1 B
+X PA11 B12 1100 2200 200 L 50 50 1 1 B
+X PE2 B2 -1200 -2000 200 R 50 50 1 1 B
+X PB9 B3 1100 700 200 L 50 50 1 1 B
+X PB7 B4 1100 900 200 L 50 50 1 1 B
+X PB6 B5 1100 1000 200 L 50 50 1 1 B
+X PD6 B6 1100 -2400 200 L 50 50 1 1 B
+X PD4 B7 1100 -2200 200 L 50 50 1 1 B
+X PD3 B8 1100 -2100 200 L 50 50 1 1 B
+X PD1 B9 1100 -1900 200 L 50 50 1 1 B
 X PC13 C1 1100 -1400 200 L 50 50 1 1 B
+X PC11 C10 1100 -1200 200 L 50 50 1 1 B
+X VDDUSB C11 600 3600 200 D 50 50 1 1 W
+X PA10 C12 1100 2300 200 L 50 50 1 1 B
+X PE5 C2 -1200 -2300 200 R 50 50 1 1 B
+X PE0 C3 -1200 -1800 200 R 50 50 1 1 B
+X VDD C4 -200 3600 200 D 50 50 1 1 W
+X PB5 C5 1100 1100 200 L 50 50 1 1 B
+X PG14 C6 -1200 -300 200 R 50 50 1 1 B
+X PG13 C7 -1200 -200 200 R 50 50 1 1 B
+X PD2 C8 1100 -2000 200 L 50 50 1 1 B
+X PD0 C9 1100 -1800 200 L 50 50 1 1 B
 X PC14 D1 1100 -1500 200 L 50 50 1 1 B
-X PC15 E1 1100 -1600 200 L 50 50 1 1 B
-X PC2 J3 1100 -300 200 L 50 50 1 1 B
-X PC3 K2 1100 -400 200 L 50 50 1 1 B
-X PC4 K5 1100 -500 200 L 50 50 1 1 B
-X PC5 L5 1100 -600 200 L 50 50 1 1 B
-X PC6 E12 1100 -700 200 L 50 50 1 1 B
-X PC7 E11 1100 -800 200 L 50 50 1 1 B
-X PC8 E10 1100 -900 200 L 50 50 1 1 B
+X PA9 D10 1100 2400 200 L 50 50 1 1 B
+X PA8 D11 1100 2500 200 L 50 50 1 1 B
 X PC9 D12 1100 -1000 200 L 50 50 1 1 B
-X PD0 C9 1100 -1800 200 L 50 50 1 1 B
-X PD1 B9 1100 -1900 200 L 50 50 1 1 B
-X PD10 J12 1100 -2800 200 L 50 50 1 1 B
-X PD11 J11 1100 -2900 200 L 50 50 1 1 B
-X PD12 J10 1100 -3000 200 L 50 50 1 1 B
-X PD13 H12 1100 -3100 200 L 50 50 1 1 B
-X PD14 H11 1100 -3200 200 L 50 50 1 1 B
-X PD15 H10 1100 -3300 200 L 50 50 1 1 B
-X PD2 C8 1100 -2000 200 L 50 50 1 1 B
-X PD3 B8 1100 -2100 200 L 50 50 1 1 B
-X PD4 B7 1100 -2200 200 L 50 50 1 1 B
-X PD5 A6 1100 -2300 200 L 50 50 1 1 B
-X PD6 B6 1100 -2400 200 L 50 50 1 1 B
-X PD7 A5 1100 -2500 200 L 50 50 1 1 B
-X PD8 K9 1100 -2600 200 L 50 50 1 1 B
-X PD9 K8 1100 -2700 200 L 50 50 1 1 B
-X PE0 C3 -1200 -1800 200 R 50 50 1 1 B
-X PE1 A2 -1200 -1900 200 R 50 50 1 1 B
-X PE10 L8 -1200 -2800 200 R 50 50 1 1 B
-X PE11 M9 -1200 -2900 200 R 50 50 1 1 B
-X PE12 L9 -1200 -3000 200 R 50 50 1 1 B
-X PE13 M10 -1200 -3100 200 R 50 50 1 1 B
-X PE14 M11 -1200 -3200 200 R 50 50 1 1 B
-X PE15 M12 -1200 -3300 200 R 50 50 1 1 B
-X PE2 B2 -1200 -2000 200 R 50 50 1 1 B
-X PE3 A1 -1200 -2100 200 R 50 50 1 1 B
-X PE4 B1 -1200 -2200 200 R 50 50 1 1 B
-X PE5 C2 -1200 -2300 200 R 50 50 1 1 B
 X PE6 D2 -1200 -2400 200 R 50 50 1 1 B
-X PE7 M7 -1200 -2500 200 R 50 50 1 1 B
-X PE8 L7 -1200 -2600 200 R 50 50 1 1 B
-X PE9 M8 -1200 -2700 200 R 50 50 1 1 B
-X PF0 D6 -1200 -600 200 R 50 50 1 1 B
-X PF1 D5 -1200 -700 200 R 50 50 1 1 B
-X PF11 K6 -1200 -1200 200 R 50 50 1 1 B
-X PF12 J7 -1200 -1300 200 R 50 50 1 1 B
-X PF13 K7 -1200 -1400 200 R 50 50 1 1 B
-X PF14 J8 -1200 -1500 200 R 50 50 1 1 B
-X PF15 J9 -1200 -1600 200 R 50 50 1 1 B
+X VSS D3 -200 -3600 200 U 50 50 1 1 W
 X PF2 D4 -1200 -800 200 R 50 50 1 1 B
+X PF1 D5 -1200 -700 200 R 50 50 1 1 B
+X PF0 D6 -1200 -600 200 R 50 50 1 1 B
+X PG12 D7 -1200 -100 200 R 50 50 1 1 B
+X PG10 D8 -1200 100 200 R 50 50 1 1 B
+X PG9 D9 -1200 200 200 R 50 50 1 1 B
+X PC15 E1 1100 -1600 200 L 50 50 1 1 B
+X PC8 E10 1100 -900 200 L 50 50 1 1 B
+X PC7 E11 1100 -800 200 L 50 50 1 1 B
+X PC6 E12 1100 -700 200 L 50 50 1 1 B
+X VBAT E2 -300 3600 200 D 50 50 1 1 W
+X VSS E3 -100 -3600 200 U 50 50 1 1 W
 X PF3 E4 -1200 -900 200 R 50 50 1 1 B
+X PG5 E9 -1200 600 200 R 50 50 1 1 B
+X PH0 F1 -1200 1500 200 R 50 50 1 1 I
+X PG4 F10 -1200 700 200 R 50 50 1 1 B
+X VSS F11 300 -3600 200 U 50 50 1 1 W
+X VSS F12 400 -3600 200 U 50 50 1 1 W
+X VSS F2 0 -3600 200 U 50 50 1 1 W
 X PF4 F3 -1200 -1000 200 R 50 50 1 1 B
 X PF5 F4 -1200 -1100 200 R 50 50 1 1 B
-X PG0 H9 -1200 1100 200 R 50 50 1 1 B
-X PG1 G9 -1200 1000 200 R 50 50 1 1 B
-X PG10 D8 -1200 100 200 R 50 50 1 1 B
-X PG11 G3 -1200 0 200 R 50 50 1 1 B
-X PG12 D7 -1200 -100 200 R 50 50 1 1 B
-X PG13 C7 -1200 -200 200 R 50 50 1 1 B
-X PG14 C6 -1200 -300 200 R 50 50 1 1 B
-X PG15 K1 -1200 -400 200 R 50 50 1 1 B
-X PG2 G10 -1200 900 200 R 50 50 1 1 B
+X VSS F6 100 -3600 200 U 50 50 1 1 W
+X VSS F7 200 -3600 200 U 50 50 1 1 W
 X PG3 F9 -1200 800 200 R 50 50 1 1 B
-X PG4 F10 -1200 700 200 R 50 50 1 1 B
-X PG5 E9 -1200 600 200 R 50 50 1 1 B
-X PG6 G4 -1200 500 200 R 50 50 1 1 B
-X PG7 H4 -1200 400 200 R 50 50 1 1 B
-X PG8 J6 -1200 300 200 R 50 50 1 1 B
-X PG9 D9 -1200 200 200 R 50 50 1 1 B
-X PH0 F1 -1200 1500 200 R 50 50 1 1 I
 X PH1 G1 -1200 1400 200 R 50 50 1 1 I
-X PH3 A4 -1200 1300 200 R 50 50 1 1 B
-X VBAT E2 -300 3600 200 D 50 50 1 1 W
-X VDD C4 -200 3600 200 D 50 50 1 1 W
+X PG2 G10 -1200 900 200 R 50 50 1 1 B
 X VDD G11 100 3600 200 D 50 50 1 1 W
 X VDD G12 200 3600 200 D 50 50 1 1 W
 X VDD G2 -100 3600 200 D 50 50 1 1 W
+X PG11 G3 -1200 0 200 R 50 50 1 1 B
+X PG6 G4 -1200 500 200 R 50 50 1 1 B
 X VDD G6 0 3600 200 D 50 50 1 1 W
-X VDD H3 300 3600 200 D 50 50 1 1 W
-X VDDA M1 400 3600 200 D 50 50 1 1 W
 X VDDIO2 G7 500 3600 200 D 50 50 1 1 W
-X VDDUSB C11 600 3600 200 D 50 50 1 1 W
-X VREF+ L1 -1200 3100 200 R 50 50 1 1 B
-X VSS D3 -200 -3600 200 U 50 50 1 1 W
-X VSS E3 -100 -3600 200 U 50 50 1 1 W
-X VSS F11 300 -3600 200 U 50 50 1 1 W
-X VSS F12 400 -3600 200 U 50 50 1 1 W
-X VSS F2 0 -3600 200 U 50 50 1 1 W
-X VSS F6 100 -3600 200 U 50 50 1 1 W
-X VSS F7 200 -3600 200 U 50 50 1 1 W
+X PG1 G9 -1200 1000 200 R 50 50 1 1 B
+X PC0 H1 1100 -100 200 L 50 50 1 1 B
+X PD15 H10 1100 -3300 200 L 50 50 1 1 B
+X PD14 H11 1100 -3200 200 L 50 50 1 1 B
+X PD13 H12 1100 -3100 200 L 50 50 1 1 B
+X NRST H2 -1200 3300 200 R 50 50 1 1 I
+X VDD H3 300 3600 200 D 50 50 1 1 W
+X PG7 H4 -1200 400 200 R 50 50 1 1 B
+X PG0 H9 -1200 1100 200 R 50 50 1 1 B
 X VSSA J1 500 -3600 200 U 50 50 1 1 W
+X PD12 J10 1100 -3000 200 L 50 50 1 1 B
+X PD11 J11 1100 -2900 200 L 50 50 1 1 B
+X PD10 J12 1100 -2800 200 L 50 50 1 1 B
+X PC1 J2 1100 -200 200 L 50 50 1 1 B
+X PC2 J3 1100 -300 200 L 50 50 1 1 B
+X PA4 J4 1100 2900 200 L 50 50 1 1 B
+X PA7 J5 1100 2600 200 L 50 50 1 1 B
+X PG8 J6 -1200 300 200 R 50 50 1 1 B
+X PF12 J7 -1200 -1300 200 R 50 50 1 1 B
+X PF14 J8 -1200 -1500 200 R 50 50 1 1 B
+X PF15 J9 -1200 -1600 200 R 50 50 1 1 B
+X PG15 K1 -1200 -400 200 R 50 50 1 1 B
+X PB15 K10 1100 100 200 L 50 50 1 1 B
+X PB14 K11 1100 200 200 L 50 50 1 1 B
+X PB13 K12 1100 300 200 L 50 50 1 1 B
+X PC3 K2 1100 -400 200 L 50 50 1 1 B
+X PA2 K3 1100 3100 200 L 50 50 1 1 B
+X PA5 K4 1100 2800 200 L 50 50 1 1 B
+X PC4 K5 1100 -500 200 L 50 50 1 1 B
+X PF11 K6 -1200 -1200 200 R 50 50 1 1 B
+X PF13 K7 -1200 -1400 200 R 50 50 1 1 B
+X PD9 K8 1100 -2700 200 L 50 50 1 1 B
+X PD8 K9 1100 -2600 200 L 50 50 1 1 B
+X VREF+ L1 -1200 3100 200 R 50 50 1 1 B
+X PB10 L10 1100 600 200 L 50 50 1 1 B
+X PB11 L11 1100 500 200 L 50 50 1 1 B
+X PB12 L12 1100 400 200 L 50 50 1 1 B
+X PA0 L2 1100 3300 200 L 50 50 1 1 B
+X PA3 L3 1100 3000 200 L 50 50 1 1 B
+X PA6 L4 1100 2700 200 L 50 50 1 1 B
+X PC5 L5 1100 -600 200 L 50 50 1 1 B
+X PB2 L6 1100 1400 200 L 50 50 1 1 B
+X PE8 L7 -1200 -2600 200 R 50 50 1 1 B
+X PE10 L8 -1200 -2800 200 R 50 50 1 1 B
+X PE12 L9 -1200 -3000 200 R 50 50 1 1 B
+X VDDA M1 400 3600 200 D 50 50 1 1 W
+X PE13 M10 -1200 -3100 200 R 50 50 1 1 B
+X PE14 M11 -1200 -3200 200 R 50 50 1 1 B
+X PE15 M12 -1200 -3300 200 R 50 50 1 1 B
+X PA1 M2 1100 3200 200 L 50 50 1 1 B
+X OPAMP1_VINM M3 -1200 2900 200 R 50 50 1 1 B
+X OPAMP2_VINM M4 -1200 2800 200 R 50 50 1 1 B
+X PB0 M5 1100 1600 200 L 50 50 1 1 B
+X PB1 M6 1100 1500 200 L 50 50 1 1 B
+X PE7 M7 -1200 -2500 200 R 50 50 1 1 B
+X PE9 M8 -1200 -2700 200 R 50 50 1 1 B
+X PE11 M9 -1200 -2900 200 R 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
@@ -7803,70 +7803,70 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -600 -1700 500 1700 0 1 10 f
-X NRST 7 -700 1600 100 R 50 50 1 1 I
+X VBAT 1 -300 1800 100 D 50 50 1 1 W
+X PC2 10 -700 -300 100 R 50 50 1 1 B
+X PC3 11 -700 -400 100 R 50 50 1 1 B
+X VSSA 12 100 -1800 100 U 50 50 1 1 W
+X VDDA 13 100 1800 100 D 50 50 1 1 W
 X PA0 14 600 1600 100 L 50 50 1 1 B
 X PA1 15 600 1500 100 L 50 50 1 1 B
-X PA10 43 600 600 100 L 50 50 1 1 B
-X PA11 44 600 500 100 L 50 50 1 1 B
-X PA12 45 600 400 100 L 50 50 1 1 B
-X PA13 46 600 300 100 L 50 50 1 1 B
-X PA14 49 600 200 100 L 50 50 1 1 B
-X PA15 50 600 100 100 L 50 50 1 1 B
 X PA2 16 600 1400 100 L 50 50 1 1 B
 X PA3 17 600 1300 100 L 50 50 1 1 B
+X VSS 18 -300 -1800 100 U 50 50 1 1 W
+X VDD 19 -200 1800 100 D 50 50 1 1 W
+X PC13 2 -700 -1400 100 R 50 50 1 1 B
 X PA4 20 600 1200 100 L 50 50 1 1 B
 X PA5 21 600 1100 100 L 50 50 1 1 B
 X PA6 22 600 1000 100 L 50 50 1 1 B
 X PA7 23 600 900 100 L 50 50 1 1 B
-X PA8 41 600 800 100 L 50 50 1 1 B
-X PA9 42 600 700 100 L 50 50 1 1 B
+X PC4 24 -700 -500 100 R 50 50 1 1 B
+X PC5 25 -700 -600 100 R 50 50 1 1 B
 X PB0 26 600 -100 100 L 50 50 1 1 B
 X PB1 27 600 -200 100 L 50 50 1 1 B
+X PB2 28 600 -300 100 L 50 50 1 1 B
 X PB10 29 600 -1100 100 L 50 50 1 1 B
+X PC14 3 -700 -1500 100 R 50 50 1 1 B
 X PB11 30 600 -1200 100 L 50 50 1 1 B
+X VSS 31 -200 -1800 100 U 50 50 1 1 W
+X VDD 32 -100 1800 100 D 50 50 1 1 W
 X PB12 33 600 -1300 100 L 50 50 1 1 B
 X PB13 34 600 -1400 100 L 50 50 1 1 B
 X PB14 35 600 -1500 100 L 50 50 1 1 B
 X PB15 36 600 -1600 100 L 50 50 1 1 B
-X PB2 28 600 -300 100 L 50 50 1 1 B
-X PB3 55 600 -400 100 L 50 50 1 1 B
-X PB4 56 600 -500 100 L 50 50 1 1 B
-X PB5 57 600 -600 100 L 50 50 1 1 B
-X PB6 58 600 -700 100 L 50 50 1 1 B
-X PB7 59 600 -800 100 L 50 50 1 1 B
-X PB8 61 600 -900 100 L 50 50 1 1 B
-X PB9 62 600 -1000 100 L 50 50 1 1 B
-X PC0 8 -700 -100 100 R 50 50 1 1 B
-X PC1 9 -700 -200 100 R 50 50 1 1 B
-X PC10 51 -700 -1100 100 R 50 50 1 1 B
-X PC11 52 -700 -1200 100 R 50 50 1 1 B
-X PC12 53 -700 -1300 100 R 50 50 1 1 B
-X PC13 2 -700 -1400 100 R 50 50 1 1 B
-X PC14 3 -700 -1500 100 R 50 50 1 1 B
-X PC15 4 -700 -1600 100 R 50 50 1 1 B
-X PC2 10 -700 -300 100 R 50 50 1 1 B
-X PC3 11 -700 -400 100 R 50 50 1 1 B
-X PC4 24 -700 -500 100 R 50 50 1 1 B
-X PC5 25 -700 -600 100 R 50 50 1 1 B
 X PC6 37 -700 -700 100 R 50 50 1 1 B
 X PC7 38 -700 -800 100 R 50 50 1 1 B
 X PC8 39 -700 -900 100 R 50 50 1 1 B
+X PC15 4 -700 -1600 100 R 50 50 1 1 B
 X PC9 40 -700 -1000 100 R 50 50 1 1 B
-X PD2 54 -700 100 100 R 50 50 1 1 B
+X PA8 41 600 800 100 L 50 50 1 1 B
+X PA9 42 600 700 100 L 50 50 1 1 B
+X PA10 43 600 600 100 L 50 50 1 1 B
+X PA11 44 600 500 100 L 50 50 1 1 B
+X PA12 45 600 400 100 L 50 50 1 1 B
+X PA13 46 600 300 100 L 50 50 1 1 B
+X VSS 47 -100 -1800 100 U 50 50 1 1 W
+X VDDUSB 48 200 1800 100 D 50 50 1 1 W
+X PA14 49 600 200 100 L 50 50 1 1 B
 X PH0 5 -700 500 100 R 50 50 1 1 I
+X PA15 50 600 100 100 L 50 50 1 1 B
+X PC10 51 -700 -1100 100 R 50 50 1 1 B
+X PC11 52 -700 -1200 100 R 50 50 1 1 B
+X PC12 53 -700 -1300 100 R 50 50 1 1 B
+X PD2 54 -700 100 100 R 50 50 1 1 B
+X PB3 55 600 -400 100 L 50 50 1 1 B
+X PB4 56 600 -500 100 L 50 50 1 1 B
+X PB5 57 600 -600 100 L 50 50 1 1 B
+X PB6 58 600 -700 100 L 50 50 1 1 B
+X PB7 59 600 -800 100 L 50 50 1 1 B
 X PH1 6 -700 400 100 R 50 50 1 1 I
 X PH3 60 -700 300 100 R 50 50 1 1 B
-X VBAT 1 -300 1800 100 D 50 50 1 1 W
-X VDD 19 -200 1800 100 D 50 50 1 1 W
-X VDD 32 -100 1800 100 D 50 50 1 1 W
-X VDD 64 0 1800 100 D 50 50 1 1 W
-X VDDA 13 100 1800 100 D 50 50 1 1 W
-X VDDUSB 48 200 1800 100 D 50 50 1 1 W
-X VSS 18 -300 -1800 100 U 50 50 1 1 W
-X VSS 31 -200 -1800 100 U 50 50 1 1 W
-X VSS 47 -100 -1800 100 U 50 50 1 1 W
+X PB8 61 600 -900 100 L 50 50 1 1 B
+X PB9 62 600 -1000 100 L 50 50 1 1 B
 X VSS 63 0 -1800 100 U 50 50 1 1 W
-X VSSA 12 100 -1800 100 U 50 50 1 1 W
+X VDD 64 0 1800 100 D 50 50 1 1 W
+X NRST 7 -700 1600 100 R 50 50 1 1 I
+X PC0 8 -700 -100 100 R 50 50 1 1 B
+X PC1 9 -700 -200 100 R 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
@@ -7882,106 +7882,106 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -700 -2600 700 2500 0 1 10 f
+X PE2 1 -900 500 200 R 50 50 1 1 B
+X VSS 10 -200 -2800 200 U 50 50 1 1 W
+X VDD 100 200 2700 200 D 50 50 1 1 W
+X VDD 11 -200 2700 200 D 50 50 1 1 W
+X PH0 12 -900 1100 200 R 50 50 1 1 I
+X PH1 13 -900 1000 200 R 50 50 1 1 I
 X NRST 14 -900 2400 200 R 50 50 1 1 I
+X PC0 15 900 -1000 200 L 50 50 1 1 B
+X PC1 16 900 -1100 200 L 50 50 1 1 B
+X PC2 17 900 -1200 200 L 50 50 1 1 B
+X PC3 18 900 -1300 200 L 50 50 1 1 B
+X VSSA 19 300 -2800 200 U 50 50 1 1 W
+X PE3 2 -900 400 200 R 50 50 1 1 B
+X VREF- 20 -900 2100 200 R 50 50 1 1 W
+X VREF+ 21 -900 2200 200 R 50 50 1 1 B
+X VDDA 22 300 2700 200 D 50 50 1 1 W
 X PA0 23 900 2400 200 L 50 50 1 1 B
 X PA1 24 900 2300 200 L 50 50 1 1 B
-X PA10 69 900 1400 200 L 50 50 1 1 B
-X PA11 70 900 1300 200 L 50 50 1 1 B
-X PA12 71 900 1200 200 L 50 50 1 1 B
-X PA13 72 900 1100 200 L 50 50 1 1 B
-X PA14 76 900 1000 200 L 50 50 1 1 B
-X PA15 77 900 900 200 L 50 50 1 1 B
 X PA2 25 900 2200 200 L 50 50 1 1 B
 X PA3 26 900 2100 200 L 50 50 1 1 B
+X VSS 27 -100 -2800 200 U 50 50 1 1 W
+X VDD 28 -100 2700 200 D 50 50 1 1 W
 X PA4 29 900 2000 200 L 50 50 1 1 B
+X PE4 3 -900 300 200 R 50 50 1 1 B
 X PA5 30 900 1900 200 L 50 50 1 1 B
 X PA6 31 900 1800 200 L 50 50 1 1 B
 X PA7 32 900 1700 200 L 50 50 1 1 B
-X PA8 67 900 1600 200 L 50 50 1 1 B
-X PA9 68 900 1500 200 L 50 50 1 1 B
+X PC4 33 900 -1400 200 L 50 50 1 1 B
+X PC5 34 900 -1500 200 L 50 50 1 1 B
 X PB0 35 900 700 200 L 50 50 1 1 B
 X PB1 36 900 600 200 L 50 50 1 1 B
+X PB2 37 900 500 200 L 50 50 1 1 B
+X PE7 38 -900 0 200 R 50 50 1 1 B
+X PE8 39 -900 -100 200 R 50 50 1 1 B
+X PE5 4 -900 200 200 R 50 50 1 1 B
+X PE9 40 -900 -200 200 R 50 50 1 1 B
+X PE10 41 -900 -300 200 R 50 50 1 1 B
+X PE11 42 -900 -400 200 R 50 50 1 1 B
+X PE12 43 -900 -500 200 R 50 50 1 1 B
+X PE13 44 -900 -600 200 R 50 50 1 1 B
+X PE14 45 -900 -700 200 R 50 50 1 1 B
+X PE15 46 -900 -800 200 R 50 50 1 1 B
 X PB10 47 900 -300 200 L 50 50 1 1 B
 X PB11 48 900 -400 200 L 50 50 1 1 B
+X VSS 49 0 -2800 200 U 50 50 1 1 W
+X PE6 5 -900 100 200 R 50 50 1 1 B
+X VDD 50 0 2700 200 D 50 50 1 1 W
 X PB12 51 900 -500 200 L 50 50 1 1 B
 X PB13 52 900 -600 200 L 50 50 1 1 B
 X PB14 53 900 -700 200 L 50 50 1 1 B
 X PB15 54 900 -800 200 L 50 50 1 1 B
-X PB2 37 900 500 200 L 50 50 1 1 B
-X PB3 89 900 400 200 L 50 50 1 1 B
-X PB4 90 900 300 200 L 50 50 1 1 B
-X PB5 91 900 200 200 L 50 50 1 1 B
-X PB6 92 900 100 200 L 50 50 1 1 B
-X PB7 93 900 0 200 L 50 50 1 1 B
-X PB8 95 900 -100 200 L 50 50 1 1 B
-X PB9 96 900 -200 200 L 50 50 1 1 B
-X PC0 15 900 -1000 200 L 50 50 1 1 B
-X PC1 16 900 -1100 200 L 50 50 1 1 B
-X PC10 78 900 -2000 200 L 50 50 1 1 B
-X PC11 79 900 -2100 200 L 50 50 1 1 B
-X PC12 80 900 -2200 200 L 50 50 1 1 B
-X PC13 7 900 -2300 200 L 50 50 1 1 B
-X PC14 8 900 -2400 200 L 50 50 1 1 B
-X PC15 9 900 -2500 200 L 50 50 1 1 B
-X PC2 17 900 -1200 200 L 50 50 1 1 B
-X PC3 18 900 -1300 200 L 50 50 1 1 B
-X PC4 33 900 -1400 200 L 50 50 1 1 B
-X PC5 34 900 -1500 200 L 50 50 1 1 B
-X PC6 63 900 -1600 200 L 50 50 1 1 B
-X PC7 64 900 -1700 200 L 50 50 1 1 B
-X PC8 65 900 -1800 200 L 50 50 1 1 B
-X PC9 66 900 -1900 200 L 50 50 1 1 B
-X PD0 81 -900 -1000 200 R 50 50 1 1 B
-X PD1 82 -900 -1100 200 R 50 50 1 1 B
+X PD8 55 -900 -1800 200 R 50 50 1 1 B
+X PD9 56 -900 -1900 200 R 50 50 1 1 B
 X PD10 57 -900 -2000 200 R 50 50 1 1 B
 X PD11 58 -900 -2100 200 R 50 50 1 1 B
 X PD12 59 -900 -2200 200 R 50 50 1 1 B
+X VBAT 6 -300 2700 200 D 50 50 1 1 W
 X PD13 60 -900 -2300 200 R 50 50 1 1 B
 X PD14 61 -900 -2400 200 R 50 50 1 1 B
 X PD15 62 -900 -2500 200 R 50 50 1 1 B
+X PC6 63 900 -1600 200 L 50 50 1 1 B
+X PC7 64 900 -1700 200 L 50 50 1 1 B
+X PC8 65 900 -1800 200 L 50 50 1 1 B
+X PC9 66 900 -1900 200 L 50 50 1 1 B
+X PA8 67 900 1600 200 L 50 50 1 1 B
+X PA9 68 900 1500 200 L 50 50 1 1 B
+X PA10 69 900 1400 200 L 50 50 1 1 B
+X PC13 7 900 -2300 200 L 50 50 1 1 B
+X PA11 70 900 1300 200 L 50 50 1 1 B
+X PA12 71 900 1200 200 L 50 50 1 1 B
+X PA13 72 900 1100 200 L 50 50 1 1 B
+X VDDUSB 73 400 2700 200 D 50 50 1 1 W
+X VSS 74 100 -2800 200 U 50 50 1 1 W
+X VDD 75 100 2700 200 D 50 50 1 1 W
+X PA14 76 900 1000 200 L 50 50 1 1 B
+X PA15 77 900 900 200 L 50 50 1 1 B
+X PC10 78 900 -2000 200 L 50 50 1 1 B
+X PC11 79 900 -2100 200 L 50 50 1 1 B
+X PC14 8 900 -2400 200 L 50 50 1 1 B
+X PC12 80 900 -2200 200 L 50 50 1 1 B
+X PD0 81 -900 -1000 200 R 50 50 1 1 B
+X PD1 82 -900 -1100 200 R 50 50 1 1 B
 X PD2 83 -900 -1200 200 R 50 50 1 1 B
 X PD3 84 -900 -1300 200 R 50 50 1 1 B
 X PD4 85 -900 -1400 200 R 50 50 1 1 B
 X PD5 86 -900 -1500 200 R 50 50 1 1 B
 X PD6 87 -900 -1600 200 R 50 50 1 1 B
 X PD7 88 -900 -1700 200 R 50 50 1 1 B
-X PD8 55 -900 -1800 200 R 50 50 1 1 B
-X PD9 56 -900 -1900 200 R 50 50 1 1 B
+X PB3 89 900 400 200 L 50 50 1 1 B
+X PC15 9 900 -2500 200 L 50 50 1 1 B
+X PB4 90 900 300 200 L 50 50 1 1 B
+X PB5 91 900 200 200 L 50 50 1 1 B
+X PB6 92 900 100 200 L 50 50 1 1 B
+X PB7 93 900 0 200 L 50 50 1 1 B
+X PH3 94 -900 900 200 R 50 50 1 1 B
+X PB8 95 900 -100 200 L 50 50 1 1 B
+X PB9 96 900 -200 200 L 50 50 1 1 B
 X PE0 97 -900 700 200 R 50 50 1 1 B
 X PE1 98 -900 600 200 R 50 50 1 1 B
-X PE10 41 -900 -300 200 R 50 50 1 1 B
-X PE11 42 -900 -400 200 R 50 50 1 1 B
-X PE12 43 -900 -500 200 R 50 50 1 1 B
-X PE13 44 -900 -600 200 R 50 50 1 1 B
-X PE14 45 -900 -700 200 R 50 50 1 1 B
-X PE15 46 -900 -800 200 R 50 50 1 1 B
-X PE2 1 -900 500 200 R 50 50 1 1 B
-X PE3 2 -900 400 200 R 50 50 1 1 B
-X PE4 3 -900 300 200 R 50 50 1 1 B
-X PE5 4 -900 200 200 R 50 50 1 1 B
-X PE6 5 -900 100 200 R 50 50 1 1 B
-X PE7 38 -900 0 200 R 50 50 1 1 B
-X PE8 39 -900 -100 200 R 50 50 1 1 B
-X PE9 40 -900 -200 200 R 50 50 1 1 B
-X PH0 12 -900 1100 200 R 50 50 1 1 I
-X PH1 13 -900 1000 200 R 50 50 1 1 I
-X PH3 94 -900 900 200 R 50 50 1 1 B
-X VBAT 6 -300 2700 200 D 50 50 1 1 W
-X VDD 100 200 2700 200 D 50 50 1 1 W
-X VDD 11 -200 2700 200 D 50 50 1 1 W
-X VDD 28 -100 2700 200 D 50 50 1 1 W
-X VDD 50 0 2700 200 D 50 50 1 1 W
-X VDD 75 100 2700 200 D 50 50 1 1 W
-X VDDA 22 300 2700 200 D 50 50 1 1 W
-X VDDUSB 73 400 2700 200 D 50 50 1 1 W
-X VREF+ 21 -900 2200 200 R 50 50 1 1 B
-X VREF- 20 -900 2100 200 R 50 50 1 1 W
-X VSS 10 -200 -2800 200 U 50 50 1 1 W
-X VSS 27 -100 -2800 200 U 50 50 1 1 W
-X VSS 49 0 -2800 200 U 50 50 1 1 W
-X VSS 74 100 -2800 200 U 50 50 1 1 W
 X VSS 99 200 -2800 200 U 50 50 1 1 W
-X VSSA 19 300 -2800 200 U 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
@@ -7997,106 +7997,106 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -800 -2600 800 2500 0 1 10 f
-X NRST E8 -1000 2400 200 R 50 50 1 1 I
-X PA0 G9 1000 2400 200 L 50 50 1 1 B
-X PA1 H8 1000 2300 200 L 50 50 1 1 B
-X PA10 D2 1000 1400 200 L 50 50 1 1 B
-X PA11 D1 1000 1300 200 L 50 50 1 1 B
-X PA12 C1 1000 1200 200 L 50 50 1 1 B
-X PA13 C2 1000 1100 200 L 50 50 1 1 B
-X PA14 B2 1000 1000 200 L 50 50 1 1 B
+X VDDUSB A1 500 2700 200 D 50 50 1 1 W
+X VDD A10 -200 2700 200 D 50 50 1 1 W
 X PA15 A2 1000 900 200 L 50 50 1 1 B
-X PA2 H7 1000 2200 200 L 50 50 1 1 B
-X PA3 J9 1000 2100 200 L 50 50 1 1 B
-X PA4 F6 1000 2000 200 L 50 50 1 1 B
-X PA5 G6 1000 1900 200 L 50 50 1 1 B
-X PA6 K9 1000 1800 200 L 50 50 1 1 B
-X PA7 J7 1000 1700 200 L 50 50 1 1 B
-X PA8 E3 1000 1600 200 L 50 50 1 1 B
-X PA9 D3 1000 1500 200 L 50 50 1 1 B
-X PB0 J6 1000 700 200 L 50 50 1 1 B
-X PB1 K7 1000 600 200 L 50 50 1 1 B
-X PB10 K3 1000 -300 200 L 50 50 1 1 B
-X PB11 J3 1000 -400 200 L 50 50 1 1 B
-X PB12 J1 1000 -500 200 L 50 50 1 1 B
-X PB13 J2 1000 -600 200 L 50 50 1 1 B
-X PB14 H2 1000 -700 200 L 50 50 1 1 B
-X PB15 H1 1000 -800 200 L 50 50 1 1 B
-X PB2 F5 1000 500 200 L 50 50 1 1 B
-X PB3 C6 1000 400 200 L 50 50 1 1 B
-X PB4 C7 1000 300 200 L 50 50 1 1 B
-X PB5 B7 1000 200 200 L 50 50 1 1 B
+X PD1 A3 -1000 -1500 200 R 50 50 1 1 B
+X VDD A4 -300 2700 200 D 50 50 1 1 W
+X PG10 A5 -1000 500 200 R 50 50 1 1 B
+X VDDIO2 A6 400 2700 200 D 50 50 1 1 W
 X PB6 A7 1000 100 200 L 50 50 1 1 B
-X PB7 D7 1000 0 200 L 50 50 1 1 B
-X PB8 B8 1000 -100 200 L 50 50 1 1 B
 X PB9 A8 1000 -200 200 L 50 50 1 1 B
-X PC0 F9 1000 -1000 200 L 50 50 1 1 B
-X PC1 F8 1000 -1100 200 L 50 50 1 1 B
-X PC10 D4 1000 -2000 200 L 50 50 1 1 B
+X VSS A9 -200 -2800 200 U 50 50 1 1 W
+X VSS B1 -100 -2800 200 U 50 50 1 1 W
+X PE3 B10 -1000 0 200 R 50 50 1 1 B
+X PA14 B2 1000 1000 200 L 50 50 1 1 B
+X PD0 B3 -1000 -1400 200 R 50 50 1 1 B
+X PD4 B4 -1000 -1700 200 R 50 50 1 1 B
+X PG9 B5 -1000 600 200 R 50 50 1 1 B
+X PG12 B6 -1000 300 200 R 50 50 1 1 B
+X PB5 B7 1000 200 200 L 50 50 1 1 B
+X PB8 B8 1000 -100 200 L 50 50 1 1 B
+X PE2 B9 -1000 100 200 R 50 50 1 1 B
+X PA12 C1 1000 1200 200 L 50 50 1 1 B
+X VBAT C10 -400 2700 200 D 50 50 1 1 W
+X PA13 C2 1000 1100 200 L 50 50 1 1 B
 X PC11 C3 1000 -2100 200 L 50 50 1 1 B
 X PC12 C4 1000 -2200 200 L 50 50 1 1 B
+X PD7 C5 -1000 -2000 200 R 50 50 1 1 B
+X PB3 C6 1000 400 200 L 50 50 1 1 B
+X PB4 C7 1000 300 200 L 50 50 1 1 B
+X PE4 C8 -1000 -100 200 R 50 50 1 1 B
 X PC13 C9 1000 -2300 200 L 50 50 1 1 B
+X PA11 D1 1000 1300 200 L 50 50 1 1 B
 X PC14 D10 1000 -2400 200 L 50 50 1 1 B
+X PA10 D2 1000 1400 200 L 50 50 1 1 B
+X PA9 D3 1000 1500 200 L 50 50 1 1 B
+X PC10 D4 1000 -2000 200 L 50 50 1 1 B
+X PD6 D5 -1000 -1900 200 R 50 50 1 1 B
+X PG11 D6 -1000 400 200 R 50 50 1 1 B
+X PB7 D7 1000 0 200 L 50 50 1 1 B
+X PE5 D8 -1000 -200 200 R 50 50 1 1 B
+X VSS D9 0 -2800 200 U 50 50 1 1 W
+X PC8 E1 1000 -1800 200 L 50 50 1 1 B
 X PC15 E10 1000 -2500 200 L 50 50 1 1 B
-X PC2 H10 1000 -1200 200 L 50 50 1 1 B
-X PC3 F7 1000 -1300 200 L 50 50 1 1 B
-X PC4 H6 1000 -1400 200 L 50 50 1 1 B
-X PC5 K8 1000 -1500 200 L 50 50 1 1 B
+X PC9 E2 1000 -1900 200 L 50 50 1 1 B
+X PA8 E3 1000 1600 200 L 50 50 1 1 B
+X PD2 E4 -1000 -1600 200 R 50 50 1 1 B
+X PD5 E5 -1000 -1800 200 R 50 50 1 1 B
+X PH3 E6 -1000 800 200 R 50 50 1 1 B
+X PE6 E7 -1000 -300 200 R 50 50 1 1 B
+X NRST E8 -1000 2400 200 R 50 50 1 1 I
+X VDD E9 -100 2700 200 D 50 50 1 1 W
+X VDD F1 0 2700 200 D 50 50 1 1 W
+X PH0 F10 -1000 1000 200 R 50 50 1 1 I
 X PC6 F2 1000 -1600 200 L 50 50 1 1 B
 X PC7 F3 1000 -1700 200 L 50 50 1 1 B
-X PC8 E1 1000 -1800 200 L 50 50 1 1 B
-X PC9 E2 1000 -1900 200 L 50 50 1 1 B
-X PD0 B3 -1000 -1400 200 R 50 50 1 1 B
-X PD1 A3 -1000 -1500 200 R 50 50 1 1 B
+X PD15 F4 -1000 -2500 200 R 50 50 1 1 B
+X PB2 F5 1000 500 200 L 50 50 1 1 B
+X PA4 F6 1000 2000 200 L 50 50 1 1 B
+X PC3 F7 1000 -1300 200 L 50 50 1 1 B
+X PC1 F8 1000 -1100 200 L 50 50 1 1 B
+X PC0 F9 1000 -1000 200 L 50 50 1 1 B
 X PD10 G1 -1000 -2300 200 R 50 50 1 1 B
+X PH1 G10 -1000 900 200 R 50 50 1 1 I
+X PD9 G2 -1000 -2200 200 R 50 50 1 1 B
 X PD14 G3 -1000 -2400 200 R 50 50 1 1 B
-X PD15 F4 -1000 -2500 200 R 50 50 1 1 B
-X PD2 E4 -1000 -1600 200 R 50 50 1 1 B
-X PD4 B4 -1000 -1700 200 R 50 50 1 1 B
-X PD5 E5 -1000 -1800 200 R 50 50 1 1 B
-X PD6 D5 -1000 -1900 200 R 50 50 1 1 B
-X PD7 C5 -1000 -2000 200 R 50 50 1 1 B
+X PE13 G4 -1000 -1000 200 R 50 50 1 1 B
+X PE12 G5 -1000 -900 200 R 50 50 1 1 B
+X PA5 G6 1000 1900 200 L 50 50 1 1 B
+X VREF+ G7 -1000 2200 200 R 50 50 1 1 B
+X VREF- G8 -1000 2100 200 R 50 50 1 1 W
+X PA0 G9 1000 2400 200 L 50 50 1 1 B
+X PB15 H1 1000 -800 200 L 50 50 1 1 B
+X PC2 H10 1000 -1200 200 L 50 50 1 1 B
+X PB14 H2 1000 -700 200 L 50 50 1 1 B
 X PD8 H3 -1000 -2100 200 R 50 50 1 1 B
-X PD9 G2 -1000 -2200 200 R 50 50 1 1 B
+X PE15 H4 -1000 -1200 200 R 50 50 1 1 B
 X PE10 H5 -1000 -700 200 R 50 50 1 1 B
-X PE11 K4 -1000 -800 200 R 50 50 1 1 B
-X PE12 G5 -1000 -900 200 R 50 50 1 1 B
-X PE13 G4 -1000 -1000 200 R 50 50 1 1 B
+X PC4 H6 1000 -1400 200 L 50 50 1 1 B
+X PA2 H7 1000 2200 200 L 50 50 1 1 B
+X PA1 H8 1000 2300 200 L 50 50 1 1 B
+X VSSA H9 300 -2800 200 U 50 50 1 1 W
+X PB12 J1 1000 -500 200 L 50 50 1 1 B
+X VDDA J10 300 2700 200 D 50 50 1 1 W
+X PB13 J2 1000 -600 200 L 50 50 1 1 B
+X PB11 J3 1000 -400 200 L 50 50 1 1 B
 X PE14 J4 -1000 -1100 200 R 50 50 1 1 B
-X PE15 H4 -1000 -1200 200 R 50 50 1 1 B
-X PE2 B9 -1000 100 200 R 50 50 1 1 B
-X PE3 B10 -1000 0 200 R 50 50 1 1 B
-X PE4 C8 -1000 -100 200 R 50 50 1 1 B
-X PE5 D8 -1000 -200 200 R 50 50 1 1 B
-X PE6 E7 -1000 -300 200 R 50 50 1 1 B
-X PE7 K6 -1000 -400 200 R 50 50 1 1 B
-X PE8 K5 -1000 -500 200 R 50 50 1 1 B
 X PE9 J5 -1000 -600 200 R 50 50 1 1 B
-X PG10 A5 -1000 500 200 R 50 50 1 1 B
-X PG11 D6 -1000 400 200 R 50 50 1 1 B
-X PG12 B6 -1000 300 200 R 50 50 1 1 B
-X PG9 B5 -1000 600 200 R 50 50 1 1 B
-X PH0 F10 -1000 1000 200 R 50 50 1 1 I
-X PH1 G10 -1000 900 200 R 50 50 1 1 I
-X PH3 E6 -1000 800 200 R 50 50 1 1 B
-X VBAT C10 -400 2700 200 D 50 50 1 1 W
-X VDD A10 -200 2700 200 D 50 50 1 1 W
-X VDD A4 -300 2700 200 D 50 50 1 1 W
-X VDD E9 -100 2700 200 D 50 50 1 1 W
-X VDD F1 0 2700 200 D 50 50 1 1 W
+X PB0 J6 1000 700 200 L 50 50 1 1 B
+X PA7 J7 1000 1700 200 L 50 50 1 1 B
 X VDD J8 100 2700 200 D 50 50 1 1 W
+X PA3 J9 1000 2100 200 L 50 50 1 1 B
 X VDD K1 200 2700 200 D 50 50 1 1 W
-X VDDA J10 300 2700 200 D 50 50 1 1 W
-X VDDIO2 A6 400 2700 200 D 50 50 1 1 W
-X VDDUSB A1 500 2700 200 D 50 50 1 1 W
-X VREF+ G7 -1000 2200 200 R 50 50 1 1 B
-X VREF- G8 -1000 2100 200 R 50 50 1 1 W
-X VSS A9 -200 -2800 200 U 50 50 1 1 W
-X VSS B1 -100 -2800 200 U 50 50 1 1 W
-X VSS D9 0 -2800 200 U 50 50 1 1 W
 X VSS K10 200 -2800 200 U 50 50 1 1 W
 X VSS K2 100 -2800 200 U 50 50 1 1 W
-X VSSA H9 300 -2800 200 U 50 50 1 1 W
+X PB10 K3 1000 -300 200 L 50 50 1 1 B
+X PE11 K4 -1000 -800 200 R 50 50 1 1 B
+X PE8 K5 -1000 -500 200 R 50 50 1 1 B
+X PE7 K6 -1000 -400 200 R 50 50 1 1 B
+X PB1 K7 1000 600 200 L 50 50 1 1 B
+X PC5 K8 1000 -1500 200 L 50 50 1 1 B
+X PA6 K9 1000 1800 200 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
@@ -8112,150 +8112,150 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -1000 -3400 1000 3400 0 1 10 f
-X NRST 25 -1200 3300 200 R 50 50 1 1 I
-X PA0 34 1200 3300 200 L 50 50 1 1 B
-X PA1 35 1200 3200 200 L 50 50 1 1 B
+X PE2 1 -1200 -2000 200 R 50 50 1 1 B
+X PF0 10 -1200 -100 200 R 50 50 1 1 B
+X PA8 100 1200 2500 200 L 50 50 1 1 B
+X PA9 101 1200 2400 200 L 50 50 1 1 B
 X PA10 102 1200 2300 200 L 50 50 1 1 B
 X PA11 103 1200 2200 200 L 50 50 1 1 B
 X PA12 104 1200 2100 200 L 50 50 1 1 B
 X PA13 105 1200 2000 200 L 50 50 1 1 B
+X VDDUSB 106 700 3600 200 D 50 50 1 1 W
+X VSS 107 200 -3600 200 U 50 50 1 1 W
+X VDD 108 100 3600 200 D 50 50 1 1 W
 X PA14 109 1200 1900 200 L 50 50 1 1 B
+X PF1 11 -1200 -200 200 R 50 50 1 1 B
 X PA15 110 1200 1800 200 L 50 50 1 1 B
-X PA2 36 1200 3100 200 L 50 50 1 1 B
-X PA3 37 1200 3000 200 L 50 50 1 1 B
-X PA4 40 1200 2900 200 L 50 50 1 1 B
-X PA5 41 1200 2800 200 L 50 50 1 1 B
-X PA6 42 1200 2700 200 L 50 50 1 1 B
-X PA7 43 1200 2600 200 L 50 50 1 1 B
-X PA8 100 1200 2500 200 L 50 50 1 1 B
-X PA9 101 1200 2400 200 L 50 50 1 1 B
-X PB0 46 1200 1600 200 L 50 50 1 1 B
-X PB1 47 1200 1500 200 L 50 50 1 1 B
-X PB10 69 1200 600 200 L 50 50 1 1 B
-X PB11 70 1200 500 200 L 50 50 1 1 B
-X PB12 73 1200 400 200 L 50 50 1 1 B
-X PB13 74 1200 300 200 L 50 50 1 1 B
-X PB14 75 1200 200 200 L 50 50 1 1 B
-X PB15 76 1200 100 200 L 50 50 1 1 B
-X PB2 48 1200 1400 200 L 50 50 1 1 B
-X PB3 133 1200 1300 200 L 50 50 1 1 B
-X PB4 134 1200 1200 200 L 50 50 1 1 B
-X PB5 135 1200 1100 200 L 50 50 1 1 B
-X PB6 136 1200 1000 200 L 50 50 1 1 B
-X PB7 137 1200 900 200 L 50 50 1 1 B
-X PB8 139 1200 800 200 L 50 50 1 1 B
-X PB9 140 1200 700 200 L 50 50 1 1 B
-X PC0 26 1200 -100 200 L 50 50 1 1 B
-X PC1 27 1200 -200 200 L 50 50 1 1 B
 X PC10 111 1200 -1100 200 L 50 50 1 1 B
 X PC11 112 1200 -1200 200 L 50 50 1 1 B
 X PC12 113 1200 -1300 200 L 50 50 1 1 B
-X PC13 7 1200 -1400 200 L 50 50 1 1 B
-X PC14 8 1200 -1500 200 L 50 50 1 1 B
-X PC15 9 1200 -1600 200 L 50 50 1 1 B
-X PC2 28 1200 -300 200 L 50 50 1 1 B
-X PC3 29 1200 -400 200 L 50 50 1 1 B
-X PC4 44 1200 -500 200 L 50 50 1 1 B
-X PC5 45 1200 -600 200 L 50 50 1 1 B
-X PC6 96 1200 -700 200 L 50 50 1 1 B
-X PC7 97 1200 -800 200 L 50 50 1 1 B
-X PC8 98 1200 -900 200 L 50 50 1 1 B
-X PC9 99 1200 -1000 200 L 50 50 1 1 B
 X PD0 114 1200 -1800 200 L 50 50 1 1 B
 X PD1 115 1200 -1900 200 L 50 50 1 1 B
-X PD10 79 1200 -2800 200 L 50 50 1 1 B
-X PD11 80 1200 -2900 200 L 50 50 1 1 B
-X PD12 81 1200 -3000 200 L 50 50 1 1 B
-X PD13 82 1200 -3100 200 L 50 50 1 1 B
-X PD14 85 1200 -3200 200 L 50 50 1 1 B
-X PD15 86 1200 -3300 200 L 50 50 1 1 B
 X PD2 116 1200 -2000 200 L 50 50 1 1 B
 X PD3 117 1200 -2100 200 L 50 50 1 1 B
 X PD4 118 1200 -2200 200 L 50 50 1 1 B
 X PD5 119 1200 -2300 200 L 50 50 1 1 B
+X PF2 12 -1200 -300 200 R 50 50 1 1 B
+X VSS 120 300 -3600 200 U 50 50 1 1 W
+X VDD 121 200 3600 200 D 50 50 1 1 W
 X PD6 122 1200 -2400 200 L 50 50 1 1 B
 X PD7 123 1200 -2500 200 L 50 50 1 1 B
-X PD8 77 1200 -2600 200 L 50 50 1 1 B
-X PD9 78 1200 -2700 200 L 50 50 1 1 B
+X PG9 124 -1200 700 200 R 50 50 1 1 B
+X PG10 125 -1200 600 200 R 50 50 1 1 B
+X PG11 126 -1200 500 200 R 50 50 1 1 B
+X PG12 127 -1200 400 200 R 50 50 1 1 B
+X PG13 128 -1200 300 200 R 50 50 1 1 B
+X PG14 129 -1200 200 200 R 50 50 1 1 B
+X PF3 13 -1200 -400 200 R 50 50 1 1 B
+X VSS 130 400 -3600 200 U 50 50 1 1 W
+X VDDIO2 131 600 3600 200 D 50 50 1 1 W
+X PG15 132 -1200 100 200 R 50 50 1 1 B
+X PB3 133 1200 1300 200 L 50 50 1 1 B
+X PB4 134 1200 1200 200 L 50 50 1 1 B
+X PB5 135 1200 1100 200 L 50 50 1 1 B
+X PB6 136 1200 1000 200 L 50 50 1 1 B
+X PB7 137 1200 900 200 L 50 50 1 1 B
+X PH3 138 -1200 1800 200 R 50 50 1 1 B
+X PB8 139 1200 800 200 L 50 50 1 1 B
+X PF4 14 -1200 -500 200 R 50 50 1 1 B
+X PB9 140 1200 700 200 L 50 50 1 1 B
 X PE0 141 -1200 -1800 200 R 50 50 1 1 B
 X PE1 142 -1200 -1900 200 R 50 50 1 1 B
-X PE10 63 -1200 -2800 200 R 50 50 1 1 B
-X PE11 64 -1200 -2900 200 R 50 50 1 1 B
-X PE12 65 -1200 -3000 200 R 50 50 1 1 B
-X PE13 66 -1200 -3100 200 R 50 50 1 1 B
-X PE14 67 -1200 -3200 200 R 50 50 1 1 B
-X PE15 68 -1200 -3300 200 R 50 50 1 1 B
-X PE2 1 -1200 -2000 200 R 50 50 1 1 B
+X VSS 143 500 -3600 200 U 50 50 1 1 W
+X VDD 144 300 3600 200 D 50 50 1 1 W
+X PF5 15 -1200 -600 200 R 50 50 1 1 B
+X VSS 16 -500 -3600 200 U 50 50 1 1 W
+X VDD 17 -500 3600 200 D 50 50 1 1 W
+X PF6 18 -1200 -700 200 R 50 50 1 1 B
+X PF7 19 -1200 -800 200 R 50 50 1 1 B
 X PE3 2 -1200 -2100 200 R 50 50 1 1 B
+X PF8 20 -1200 -900 200 R 50 50 1 1 B
+X PF9 21 -1200 -1000 200 R 50 50 1 1 B
+X PF10 22 -1200 -1100 200 R 50 50 1 1 B
+X PH0 23 -1200 2000 200 R 50 50 1 1 I
+X PH1 24 -1200 1900 200 R 50 50 1 1 I
+X NRST 25 -1200 3300 200 R 50 50 1 1 I
+X PC0 26 1200 -100 200 L 50 50 1 1 B
+X PC1 27 1200 -200 200 L 50 50 1 1 B
+X PC2 28 1200 -300 200 L 50 50 1 1 B
+X PC3 29 1200 -400 200 L 50 50 1 1 B
 X PE4 3 -1200 -2200 200 R 50 50 1 1 B
+X VSSA 30 600 -3600 200 U 50 50 1 1 W
+X VREF- 31 -1200 3000 200 R 50 50 1 1 W
+X VREF+ 32 -1200 3100 200 R 50 50 1 1 B
+X VDDA 33 400 3600 200 D 50 50 1 1 W
+X PA0 34 1200 3300 200 L 50 50 1 1 B
+X PA1 35 1200 3200 200 L 50 50 1 1 B
+X PA2 36 1200 3100 200 L 50 50 1 1 B
+X PA3 37 1200 3000 200 L 50 50 1 1 B
+X VSS 38 -400 -3600 200 U 50 50 1 1 W
+X VDD 39 -400 3600 200 D 50 50 1 1 W
 X PE5 4 -1200 -2300 200 R 50 50 1 1 B
-X PE6 5 -1200 -2400 200 R 50 50 1 1 B
-X PE7 58 -1200 -2500 200 R 50 50 1 1 B
-X PE8 59 -1200 -2600 200 R 50 50 1 1 B
-X PE9 60 -1200 -2700 200 R 50 50 1 1 B
-X PF0 10 -1200 -100 200 R 50 50 1 1 B
-X PF1 11 -1200 -200 200 R 50 50 1 1 B
-X PF10 22 -1200 -1100 200 R 50 50 1 1 B
+X PA4 40 1200 2900 200 L 50 50 1 1 B
+X PA5 41 1200 2800 200 L 50 50 1 1 B
+X PA6 42 1200 2700 200 L 50 50 1 1 B
+X PA7 43 1200 2600 200 L 50 50 1 1 B
+X PC4 44 1200 -500 200 L 50 50 1 1 B
+X PC5 45 1200 -600 200 L 50 50 1 1 B
+X PB0 46 1200 1600 200 L 50 50 1 1 B
+X PB1 47 1200 1500 200 L 50 50 1 1 B
+X PB2 48 1200 1400 200 L 50 50 1 1 B
 X PF11 49 -1200 -1200 200 R 50 50 1 1 B
+X PE6 5 -1200 -2400 200 R 50 50 1 1 B
 X PF12 50 -1200 -1300 200 R 50 50 1 1 B
+X VSS 51 -300 -3600 200 U 50 50 1 1 W
+X VDD 52 -300 3600 200 D 50 50 1 1 W
 X PF13 53 -1200 -1400 200 R 50 50 1 1 B
 X PF14 54 -1200 -1500 200 R 50 50 1 1 B
 X PF15 55 -1200 -1600 200 R 50 50 1 1 B
-X PF2 12 -1200 -300 200 R 50 50 1 1 B
-X PF3 13 -1200 -400 200 R 50 50 1 1 B
-X PF4 14 -1200 -500 200 R 50 50 1 1 B
-X PF5 15 -1200 -600 200 R 50 50 1 1 B
-X PF6 18 -1200 -700 200 R 50 50 1 1 B
-X PF7 19 -1200 -800 200 R 50 50 1 1 B
-X PF8 20 -1200 -900 200 R 50 50 1 1 B
-X PF9 21 -1200 -1000 200 R 50 50 1 1 B
 X PG0 56 -1200 1600 200 R 50 50 1 1 B
 X PG1 57 -1200 1500 200 R 50 50 1 1 B
-X PG10 125 -1200 600 200 R 50 50 1 1 B
-X PG11 126 -1200 500 200 R 50 50 1 1 B
-X PG12 127 -1200 400 200 R 50 50 1 1 B
-X PG13 128 -1200 300 200 R 50 50 1 1 B
-X PG14 129 -1200 200 200 R 50 50 1 1 B
-X PG15 132 -1200 100 200 R 50 50 1 1 B
+X PE7 58 -1200 -2500 200 R 50 50 1 1 B
+X PE8 59 -1200 -2600 200 R 50 50 1 1 B
+X VBAT 6 -600 3600 200 D 50 50 1 1 W
+X PE9 60 -1200 -2700 200 R 50 50 1 1 B
+X VSS 61 -200 -3600 200 U 50 50 1 1 W
+X VDD 62 -200 3600 200 D 50 50 1 1 W
+X PE10 63 -1200 -2800 200 R 50 50 1 1 B
+X PE11 64 -1200 -2900 200 R 50 50 1 1 B
+X PE12 65 -1200 -3000 200 R 50 50 1 1 B
+X PE13 66 -1200 -3100 200 R 50 50 1 1 B
+X PE14 67 -1200 -3200 200 R 50 50 1 1 B
+X PE15 68 -1200 -3300 200 R 50 50 1 1 B
+X PB10 69 1200 600 200 L 50 50 1 1 B
+X PC13 7 1200 -1400 200 L 50 50 1 1 B
+X PB11 70 1200 500 200 L 50 50 1 1 B
+X VSS 71 -100 -3600 200 U 50 50 1 1 W
+X VDD 72 -100 3600 200 D 50 50 1 1 W
+X PB12 73 1200 400 200 L 50 50 1 1 B
+X PB13 74 1200 300 200 L 50 50 1 1 B
+X PB14 75 1200 200 200 L 50 50 1 1 B
+X PB15 76 1200 100 200 L 50 50 1 1 B
+X PD8 77 1200 -2600 200 L 50 50 1 1 B
+X PD9 78 1200 -2700 200 L 50 50 1 1 B
+X PD10 79 1200 -2800 200 L 50 50 1 1 B
+X PC14 8 1200 -1500 200 L 50 50 1 1 B
+X PD11 80 1200 -2900 200 L 50 50 1 1 B
+X PD12 81 1200 -3000 200 L 50 50 1 1 B
+X PD13 82 1200 -3100 200 L 50 50 1 1 B
+X VSS 83 0 -3600 200 U 50 50 1 1 W
+X VDD 84 0 3600 200 D 50 50 1 1 W
+X PD14 85 1200 -3200 200 L 50 50 1 1 B
+X PD15 86 1200 -3300 200 L 50 50 1 1 B
 X PG2 87 -1200 1400 200 R 50 50 1 1 B
 X PG3 88 -1200 1300 200 R 50 50 1 1 B
 X PG4 89 -1200 1200 200 R 50 50 1 1 B
+X PC15 9 1200 -1600 200 L 50 50 1 1 B
 X PG5 90 -1200 1100 200 R 50 50 1 1 B
 X PG6 91 -1200 1000 200 R 50 50 1 1 B
 X PG7 92 -1200 900 200 R 50 50 1 1 B
 X PG8 93 -1200 800 200 R 50 50 1 1 B
-X PG9 124 -1200 700 200 R 50 50 1 1 B
-X PH0 23 -1200 2000 200 R 50 50 1 1 I
-X PH1 24 -1200 1900 200 R 50 50 1 1 I
-X PH3 138 -1200 1800 200 R 50 50 1 1 B
-X VBAT 6 -600 3600 200 D 50 50 1 1 W
-X VDD 108 100 3600 200 D 50 50 1 1 W
-X VDD 121 200 3600 200 D 50 50 1 1 W
-X VDD 144 300 3600 200 D 50 50 1 1 W
-X VDD 17 -500 3600 200 D 50 50 1 1 W
-X VDD 39 -400 3600 200 D 50 50 1 1 W
-X VDD 52 -300 3600 200 D 50 50 1 1 W
-X VDD 62 -200 3600 200 D 50 50 1 1 W
-X VDD 72 -100 3600 200 D 50 50 1 1 W
-X VDD 84 0 3600 200 D 50 50 1 1 W
-X VDDA 33 400 3600 200 D 50 50 1 1 W
-X VDDIO2 131 600 3600 200 D 50 50 1 1 W
-X VDDIO2 95 500 3600 200 D 50 50 1 1 W
-X VDDUSB 106 700 3600 200 D 50 50 1 1 W
-X VREF+ 32 -1200 3100 200 R 50 50 1 1 B
-X VREF- 31 -1200 3000 200 R 50 50 1 1 W
-X VSS 107 200 -3600 200 U 50 50 1 1 W
-X VSS 120 300 -3600 200 U 50 50 1 1 W
-X VSS 130 400 -3600 200 U 50 50 1 1 W
-X VSS 143 500 -3600 200 U 50 50 1 1 W
-X VSS 16 -500 -3600 200 U 50 50 1 1 W
-X VSS 38 -400 -3600 200 U 50 50 1 1 W
-X VSS 51 -300 -3600 200 U 50 50 1 1 W
-X VSS 61 -200 -3600 200 U 50 50 1 1 W
-X VSS 71 -100 -3600 200 U 50 50 1 1 W
-X VSS 83 0 -3600 200 U 50 50 1 1 W
 X VSS 94 100 -3600 200 U 50 50 1 1 W
-X VSSA 30 600 -3600 200 U 50 50 1 1 W
+X VDDIO2 95 500 3600 200 D 50 50 1 1 W
+X PC6 96 1200 -700 200 L 50 50 1 1 B
+X PC7 97 1200 -800 200 L 50 50 1 1 B
+X PC8 98 1200 -900 200 L 50 50 1 1 B
+X PC9 99 1200 -1000 200 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
diff --git a/MCU_SiliconLabs.dcm b/MCU_SiliconLabs.dcm
index 21ed7311b5..4eaf418a83 100644
--- a/MCU_SiliconLabs.dcm
+++ b/MCU_SiliconLabs.dcm
@@ -6,27 +6,27 @@ K 8051 microcontroller PCA UART USB SPI I2C ADC EMIF TQFP48
 F https://www.silabs.com/documents/public/data-sheets/C8051F38x.pdf
 $ENDCMP
 #
-$CMP C8051F382-GQ
-D Full Speed USB Flash MCU Family, 32k flash, 2304 ram, 40 IO, EMIF, ADC, Temperature, VREF, TQFP-48
-K 8051 microcontroller PCA UART USB SPI I2C ADC EMIF TQFP48
+$CMP C8051F381-GM
+D Full Speed USB Flash MCU Family, 64k flash, 4352 ram, 25 IO, ADC, Temperature, VREF, QFN-32
+K 8051 microcontroller PCA UART USB SPI I2C ADC QFN32
 F https://www.silabs.com/documents/public/data-sheets/C8051F38x.pdf
 $ENDCMP
 #
-$CMP C8051F384-GQ
-D Full Speed USB Flash MCU Family, 64k flash, 4352 ram, 40 IO, EMIF, TQFP-48
-K 8051 microcontroller PCA UART USB SPI I2C EMIF TQFP48
+$CMP C8051F381-GQ
+D Full Speed USB Flash MCU Family, 64k flash, 4352 ram, 25 IO, ADC, Temperature, VREF, LQFP-32
+K 8051 microcontroller PCA UART USB SPI I2C ADC LQFP32
 F https://www.silabs.com/documents/public/data-sheets/C8051F38x.pdf
 $ENDCMP
 #
-$CMP C8051F386-GQ
-D Full Speed USB Flash MCU Family, 32k flash, 2304 ram, 40 IO, EMIF, TQFP-48
-K 8051 microcontroller PCA UART USB SPI I2C EMIF TQFP48
+$CMP C8051F382-GQ
+D Full Speed USB Flash MCU Family, 32k flash, 2304 ram, 40 IO, EMIF, ADC, Temperature, VREF, TQFP-48
+K 8051 microcontroller PCA UART USB SPI I2C ADC EMIF TQFP48
 F https://www.silabs.com/documents/public/data-sheets/C8051F38x.pdf
 $ENDCMP
 #
-$CMP C8051F381-GQ
-D Full Speed USB Flash MCU Family, 64k flash, 4352 ram, 25 IO, ADC, Temperature, VREF, LQFP-32
-K 8051 microcontroller PCA UART USB SPI I2C ADC LQFP32
+$CMP C8051F383-GM
+D Full Speed USB Flash MCU Family, 32k flash, 2304 ram, 25 IO, ADC, Temperature, VREF, QFN-32
+K 8051 microcontroller PCA UART USB SPI I2C ADC QFN32
 F https://www.silabs.com/documents/public/data-sheets/C8051F38x.pdf
 $ENDCMP
 #
@@ -36,45 +36,39 @@ K 8051 microcontroller PCA UART USB SPI I2C ADC LQFP32
 F https://www.silabs.com/documents/public/data-sheets/C8051F38x.pdf
 $ENDCMP
 #
-$CMP C8051F385-GQ
-D Full Speed USB Flash MCU Family, 64k flash, 4352 ram, 25 IO, LQFP-32
-K 8051 microcontroller PCA UART USB SPI I2C LQFP32
-F https://www.silabs.com/documents/public/data-sheets/C8051F38x.pdf
-$ENDCMP
-#
-$CMP C8051F387-GQ
-D Full Speed USB Flash MCU Family, 32k flash, 2304 ram, 25 IO, LQFP-32
-K 8051 microcontroller PCA UART USB SPI I2C LQFP32
+$CMP C8051F384-GQ
+D Full Speed USB Flash MCU Family, 64k flash, 4352 ram, 40 IO, EMIF, TQFP-48
+K 8051 microcontroller PCA UART USB SPI I2C EMIF TQFP48
 F https://www.silabs.com/documents/public/data-sheets/C8051F38x.pdf
 $ENDCMP
 #
-$CMP C8051F38C-GQ
-D Full Speed USB Flash MCU Family, 16k flash, 2304 ram, 25 IO, ADC, Temperature, VREF, LQFP-32
-K 8051 microcontroller PCA UART USB SPI I2C ADC LQFP32
+$CMP C8051F385-GM
+D Full Speed USB Flash MCU Family, 64k flash, 4352 ram, 25 IO, QFN-32
+K 8051 microcontroller PCA UART USB SPI I2C QFN32
 F https://www.silabs.com/documents/public/data-sheets/C8051F38x.pdf
 $ENDCMP
 #
-$CMP C8051F381-GM
-D Full Speed USB Flash MCU Family, 64k flash, 4352 ram, 25 IO, ADC, Temperature, VREF, QFN-32
-K 8051 microcontroller PCA UART USB SPI I2C ADC QFN32
+$CMP C8051F385-GQ
+D Full Speed USB Flash MCU Family, 64k flash, 4352 ram, 25 IO, LQFP-32
+K 8051 microcontroller PCA UART USB SPI I2C LQFP32
 F https://www.silabs.com/documents/public/data-sheets/C8051F38x.pdf
 $ENDCMP
 #
-$CMP C8051F383-GM
-D Full Speed USB Flash MCU Family, 32k flash, 2304 ram, 25 IO, ADC, Temperature, VREF, QFN-32
-K 8051 microcontroller PCA UART USB SPI I2C ADC QFN32
+$CMP C8051F386-GQ
+D Full Speed USB Flash MCU Family, 32k flash, 2304 ram, 40 IO, EMIF, TQFP-48
+K 8051 microcontroller PCA UART USB SPI I2C EMIF TQFP48
 F https://www.silabs.com/documents/public/data-sheets/C8051F38x.pdf
 $ENDCMP
 #
-$CMP C8051F385-GM
-D Full Speed USB Flash MCU Family, 64k flash, 4352 ram, 25 IO, QFN-32
+$CMP C8051F387-GM
+D Full Speed USB Flash MCU Family, 32k flash, 2304 ram, 25 IO, QFN-32
 K 8051 microcontroller PCA UART USB SPI I2C QFN32
 F https://www.silabs.com/documents/public/data-sheets/C8051F38x.pdf
 $ENDCMP
 #
-$CMP C8051F387-GM
-D Full Speed USB Flash MCU Family, 32k flash, 2304 ram, 25 IO, QFN-32
-K 8051 microcontroller PCA UART USB SPI I2C QFN32
+$CMP C8051F387-GQ
+D Full Speed USB Flash MCU Family, 32k flash, 2304 ram, 25 IO, LQFP-32
+K 8051 microcontroller PCA UART USB SPI I2C LQFP32
 F https://www.silabs.com/documents/public/data-sheets/C8051F38x.pdf
 $ENDCMP
 #
@@ -84,6 +78,12 @@ K 8051 microcontroller PCA UART USB SPI I2C ADC QFN32
 F https://www.silabs.com/documents/public/data-sheets/C8051F38x.pdf
 $ENDCMP
 #
+$CMP C8051F38C-GQ
+D Full Speed USB Flash MCU Family, 16k flash, 2304 ram, 25 IO, ADC, Temperature, VREF, LQFP-32
+K 8051 microcontroller PCA UART USB SPI I2C ADC LQFP32
+F https://www.silabs.com/documents/public/data-sheets/C8051F38x.pdf
+$ENDCMP
+#
 $CMP EFM32G230F128G-E-QFN64
 D 32-bit ARM Cortex-M3 microcontroller, 128 kB flash, 16 kB x 8 RAM, Silicon Labs - Gecko, QFN-64
 K MCU microcontroller silicon labs siliconlabs silabs EFM32 gecko
@@ -192,4 +192,22 @@ K 8051 microcontroller PWM UART SPI I2C ADC SOIC16
 F https://www.silabs.com/documents/public/data-sheets/efm8bb1-datasheet.pdf
 $ENDCMP
 #
+$CMP EFM8UB30F40G-A-QFN20
+D 8051-compatible microcontroller, 48 MHz, 2.3 to 5.5V, 40K flash, 3.25K RAM, -40 to +85 C, QFN-20
+K 8051 microcontroller PWM UART SPI I2C USB LDOREG ADC QFN20
+F https://www.silabs.com/documents/public/data-sheets/efm8ub3-datasheet.pdf
+$ENDCMP
+#
+$CMP EFM8UB31F40G-A-QFN24
+D 8051-compatible microcontroller, 48 MHz, 2.3 to 5.5V, 40K flash, 3.25K RAM, -40 to +85 C, QFN-24
+K 8051 microcontroller PWM UART SPI I2C USB LDOREG ADC QFN24
+F https://www.silabs.com/documents/public/data-sheets/efm8ub3-datasheet.pdf
+$ENDCMP
+#
+$CMP EFM8UB31F40G-A-QSOP24
+D 8051-compatible microcontroller, 48 MHz, 2.3 to 5.5V, 40K flash, 3.25K RAM, -40 to +85 C, QSOP-24
+K 8051 microcontroller PWM UART SPI I2C USB LDOREG ADC QSOP24
+F https://www.silabs.com/documents/public/data-sheets/efm8ub3-datasheet.pdf
+$ENDCMP
+#
 #End Doc Library
diff --git a/MCU_SiliconLabs.lib b/MCU_SiliconLabs.lib
index e1ec888062..54f1e96eec 100644
--- a/MCU_SiliconLabs.lib
+++ b/MCU_SiliconLabs.lib
@@ -65,16 +65,16 @@ X D- 9 -500 1200 100 R 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# C8051F381-GQ
+# C8051F381-GM
 #
-DEF C8051F381-GQ U 0 20 Y Y 1 F N
+DEF C8051F381-GM U 0 20 Y Y 1 F N
 F0 "U" -400 1100 50 H V C CNN
-F1 "C8051F381-GQ" 500 1100 50 H V C CNN
-F2 "Package_QFP:LQFP-32_7x7mm_P0.8mm" -900 -1100 50 H I C CNN
+F1 "C8051F381-GM" 500 1100 50 H V C CNN
+F2 "Package_DFN_QFN:QFN-32-1EP_5x5mm_P0.5mm_EP3.3x3.3mm" -900 -1100 50 H I C CNN
 F3 "" -900 -1000 50 H I C CNN
-ALIAS C8051F383-GQ C8051F385-GQ C8051F387-GQ C8051F38C-GQ
+ALIAS C8051F383-GM C8051F385-GM C8051F387-GM C8051F38C-GM
 $FPLIST
- LQFP*7x7mm*P0.8mm*
+ QFN*1EP*5x5mm*P0.5mm*
 $ENDFPLIST
 DRAW
 S -400 1000 400 -1000 0 1 10 f
@@ -104,6 +104,7 @@ X GND 3 0 -1100 100 U 50 50 1 1 W
 X P0.4 30 -500 -500 100 R 50 50 1 1 B
 X P0.3 31 -500 -400 100 R 50 50 1 1 B
 X P0.2 32 -500 -300 100 R 50 50 1 1 B
+X GND 33 0 -1100 100 U 50 50 1 1 P N
 X D+ 4 -500 800 100 R 50 50 1 1 B
 X D- 5 -500 700 100 R 50 50 1 1 B
 X VDD 6 -100 1100 100 D 50 50 1 1 W
@@ -113,16 +114,16 @@ X ~RST~/C2CK 9 -500 400 100 R 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
-# C8051F381-GM
+# C8051F381-GQ
 #
-DEF C8051F381-GM U 0 20 Y Y 1 F N
+DEF C8051F381-GQ U 0 20 Y Y 1 F N
 F0 "U" -400 1100 50 H V C CNN
-F1 "C8051F381-GM" 500 1100 50 H V C CNN
-F2 "Package_DFN_QFN:QFN-32-1EP_5x5mm_P0.5mm_EP3.3x3.3mm" -900 -1100 50 H I C CNN
+F1 "C8051F381-GQ" 500 1100 50 H V C CNN
+F2 "Package_QFP:LQFP-32_7x7mm_P0.8mm" -900 -1100 50 H I C CNN
 F3 "" -900 -1000 50 H I C CNN
-ALIAS C8051F383-GM C8051F385-GM C8051F387-GM C8051F38C-GM
+ALIAS C8051F383-GQ C8051F385-GQ C8051F387-GQ C8051F38C-GQ
 $FPLIST
- QFN*1EP*5x5mm*P0.5mm*
+ LQFP*7x7mm*P0.8mm*
 $ENDFPLIST
 DRAW
 S -400 1000 400 -1000 0 1 10 f
@@ -152,7 +153,6 @@ X GND 3 0 -1100 100 U 50 50 1 1 W
 X P0.4 30 -500 -500 100 R 50 50 1 1 B
 X P0.3 31 -500 -400 100 R 50 50 1 1 B
 X P0.2 32 -500 -300 100 R 50 50 1 1 B
-X GND 33 0 -1100 100 U 50 50 1 1 P N
 X D+ 4 -500 800 100 R 50 50 1 1 B
 X D- 5 -500 700 100 R 50 50 1 1 B
 X VDD 6 -100 1100 100 D 50 50 1 1 W
@@ -433,4 +433,119 @@ X P1.2 9 700 200 150 L 50 50 0 1 B
 ENDDRAW
 ENDDEF
 #
+# EFM8UB30F40G-A-QFN20
+#
+DEF EFM8UB30F40G-A-QFN20 U 0 20 Y Y 1 F N
+F0 "U" -500 750 50 H V C CNN
+F1 "EFM8UB30F40G-A-QFN20" 150 750 50 H V L CNN
+F2 "Package_DFN_QFN:SiliconLabs_QFN-20-1EP_3x3mm_P0.5mm_EP1.8x1.8mm" 0 -1250 50 H I C CNN
+F3 "" -600 -100 50 H I C CNN
+$FPLIST
+ SiliconLabs*QFN*1EP*3x3mm*P0.5mm*
+$ENDFPLIST
+DRAW
+S -500 700 500 -600 0 1 10 f
+X P0.1 1 600 500 100 L 50 50 1 1 B
+X P2.0/C2D 10 -600 400 100 R 50 50 1 1 B
+X P1.2 11 600 -500 100 L 50 50 1 1 B
+X GND 12 0 -700 100 U 50 50 1 1 P N
+X P1.1 13 600 -400 100 L 50 50 1 1 B
+X P1.0 14 600 -300 100 L 50 50 1 1 B
+X P0.7 15 600 -100 100 L 50 50 1 1 B
+X P0.6 16 600 0 100 L 50 50 1 1 B
+X P0.5 17 600 100 100 L 50 50 1 1 B
+X P0.4 18 600 200 100 L 50 50 1 1 B
+X P0.3 19 600 300 100 L 50 50 1 1 B
+X P0.0 2 600 600 100 L 50 50 1 1 B
+X P0.2 20 600 400 100 L 50 50 1 1 B
+X GND 21 0 -700 100 U 50 50 1 1 P N
+X GND 3 0 -700 100 U 50 50 1 1 W
+X D+ 4 -600 0 100 R 50 50 1 1 B
+X D- 5 -600 -100 100 R 50 50 1 1 B
+X VDD 6 0 800 100 D 50 50 1 1 W
+X VREGIN 7 100 800 100 D 50 50 1 1 W
+X P2.1/VBUS 8 -600 200 100 R 50 50 1 1 B
+X ~RST~/C2CK 9 -600 500 100 R 50 50 1 1 B
+ENDDRAW
+ENDDEF
+#
+# EFM8UB31F40G-A-QFN24
+#
+DEF EFM8UB31F40G-A-QFN24 U 0 20 Y Y 1 F N
+F0 "U" -500 950 50 H V C CNN
+F1 "EFM8UB31F40G-A-QFN24" 150 950 50 H V L CNN
+F2 "Package_DFN_QFN:QFN-24-1EP_4x4mm_P0.5mm_EP2.6x2.6mm" 0 -1400 50 H I C CNN
+F3 "" -600 100 50 H I C CNN
+$FPLIST
+ QFN*1EP*4x4mm*P0.5mm*
+$ENDFPLIST
+DRAW
+S -500 900 500 -800 0 1 10 f
+X P0.0 1 600 800 100 L 50 50 1 1 B
+X P2.0/C2D 10 -600 600 100 R 50 50 1 1 B
+X P1.6 11 600 -700 100 L 50 50 1 1 B
+X P1.5 12 600 -600 100 L 50 50 1 1 B
+X P1.4 13 600 -500 100 L 50 50 1 1 B
+X P1.3 14 600 -400 100 L 50 50 1 1 B
+X P1.2 15 600 -300 100 L 50 50 1 1 B
+X P1.1 16 600 -200 100 L 50 50 1 1 B
+X P1.0 17 600 -100 100 L 50 50 1 1 B
+X P0.7 18 600 100 100 L 50 50 1 1 B
+X P0.6 19 600 200 100 L 50 50 1 1 B
+X GND 2 0 -900 100 U 50 50 1 1 W
+X P0.5 20 600 300 100 L 50 50 1 1 B
+X P0.4 21 600 400 100 L 50 50 1 1 B
+X P0.3 22 600 500 100 L 50 50 1 1 B
+X P0.2 23 600 600 100 L 50 50 1 1 B
+X P0.1 24 600 700 100 L 50 50 1 1 B
+X GND 25 0 -900 100 U 50 50 1 1 P N
+X D+ 3 -600 200 100 R 50 50 1 1 B
+X D- 4 -600 100 100 R 50 50 1 1 B
+X VIO 5 -100 1000 100 D 50 50 1 1 W
+X VDD 6 0 1000 100 D 50 50 1 1 W
+X VREGIN 7 100 1000 100 D 50 50 1 1 W
+X P2.1/VBUS 8 -600 400 100 R 50 50 1 1 B
+X ~RST~/C2CK 9 -600 700 100 R 50 50 1 1 B
+ENDDRAW
+ENDDEF
+#
+# EFM8UB31F40G-A-QSOP24
+#
+DEF EFM8UB31F40G-A-QSOP24 U 0 20 Y Y 1 F N
+F0 "U" -500 950 50 H V C CNN
+F1 "EFM8UB31F40G-A-QSOP24" 150 950 50 H V L CNN
+F2 "Package_SO:QSOP-24_3.9x8.7mm_P0.635mm" 0 -1400 50 H I C CNN
+F3 "" -600 100 50 H I C CNN
+$FPLIST
+ QSOP*3.9x8.7mm*P0.635mm*
+$ENDFPLIST
+DRAW
+S -500 900 500 -800 1 1 10 f
+X P0.2 1 600 600 100 L 50 50 1 1 B
+X P2.1/VBUS 10 -600 400 100 R 50 50 1 1 B
+X ~RST~/C2CK 11 -600 700 100 R 50 50 1 1 B
+X P2.0/C2D 12 -600 600 100 R 50 50 1 1 B
+X P1.6 13 600 -700 100 L 50 50 1 1 B
+X P1.5 14 600 -600 100 L 50 50 1 1 B
+X P1.4 15 600 -500 100 L 50 50 1 1 B
+X P1.3 16 600 -400 100 L 50 50 1 1 B
+X P1.2 17 600 -300 100 L 50 50 1 1 B
+X P1.1 18 600 -200 100 L 50 50 1 1 B
+X P1.0 19 600 -100 100 L 50 50 1 1 B
+X P0.1 2 600 700 100 L 50 50 1 1 B
+X P0.7 20 600 100 100 L 50 50 1 1 B
+X P0.6 21 600 200 100 L 50 50 1 1 B
+X P0.5 22 600 300 100 L 50 50 1 1 B
+X P0.4 23 600 400 100 L 50 50 1 1 B
+X P0.3 24 600 500 100 L 50 50 1 1 B
+X P0.0 3 600 800 100 L 50 50 1 1 B
+X GND 4 0 -900 100 U 50 50 1 1 W
+X D+ 5 -600 200 100 R 50 50 1 1 B
+X D- 6 -600 100 100 R 50 50 1 1 B
+X VIO 7 -100 1000 100 D 50 50 1 1 W
+X VDD 8 0 1000 100 D 50 50 1 1 W
+X VREGIN 9 100 1000 100 D 50 50 1 1 W
+ENDDRAW
+ENDDEF
+#
 #End Library
diff --git a/MCU_Texas_MSP430.dcm b/MCU_Texas_MSP430.dcm
index 55dc28a6f2..f62d12e9f1 100644
--- a/MCU_Texas_MSP430.dcm
+++ b/MCU_Texas_MSP430.dcm
@@ -1,5 +1,23 @@
 EESchema-DOCLIB  Version 2.0
 #
+$CMP CC430F5133xRGZ
+D 8KB Flash, 2KB RAM, MSP430 core with integrated CC1101 radio transceiver, VQFN-48
+K TI MSP430 CC430 16-bit mixed signal microcontroller CC1101
+F http://www.ti.com/lit/ds/symlink/cc430f5137.pdf
+$ENDCMP
+#
+$CMP CC430F5135xRGZ
+D 16KB Flash, 2KB RAM, MSP430 core with integrated CC1101 radio transceiver, VQFN-48
+K TI MSP430 CC430 16-bit mixed signal microcontroller CC1101
+F http://www.ti.com/lit/ds/symlink/cc430f5137.pdf
+$ENDCMP
+#
+$CMP CC430F5137xRGZ
+D 32KB Flash, 4KB RAM, MSP430 core with integrated CC1101 radio transceiver, VQFN-48
+K TI MSP430 CC430 16-bit mixed signal microcontroller CC1101
+F http://www.ti.com/lit/ds/symlink/cc430f5137.pdf
+$ENDCMP
+#
 $CMP MSP430AFE221IPW
 D 4kB Flash, 256B RAM, TSSOP-24
 K TI MSP430 16-bit mixed signal microcontroller
diff --git a/MCU_Texas_MSP430.lib b/MCU_Texas_MSP430.lib
index 7e23102a75..f5da5e2d2a 100644
--- a/MCU_Texas_MSP430.lib
+++ b/MCU_Texas_MSP430.lib
@@ -1,6 +1,71 @@
 EESchema-LIBRARY Version 2.4
 #encoding utf-8
 #
+# CC430F5137xRGZ
+#
+DEF CC430F5137xRGZ U 0 20 Y Y 1 F N
+F0 "U" -450 1350 50 H V C CNN
+F1 "CC430F5137xRGZ" 550 1350 50 H V C CNN
+F2 "Package_DFN_QFN:VQFN-48-1EP_7x7mm_P0.5mm_EP4.1x4.1mm_ThermalVias" 50 -1350 50 H I C CNN
+F3 "" -400 1250 50 H I C CNN
+ALIAS CC430F5135xRGZ CC430F5133xRGZ
+$FPLIST
+ VQFN*1EP*7x7mm*P0.5mm*
+$ENDFPLIST
+DRAW
+S -500 1300 500 -1300 0 1 10 f
+X P2.2 1 600 -400 100 L 50 50 1 1 B
+X P1.3 10 600 400 100 L 50 50 1 1 B
+X P1.2 11 600 500 100 L 50 50 1 1 B
+X P1.1 12 600 600 100 L 50 50 1 1 B
+X P1.0 13 600 700 100 L 50 50 1 1 B
+X P3.7 14 -600 -600 100 R 50 50 1 1 B
+X P3.6 15 -600 -500 100 R 50 50 1 1 B
+X P3.5 16 -600 -400 100 R 50 50 1 1 B
+X P3.4 17 -600 -300 100 R 50 50 1 1 B
+X P3.3 18 -600 -200 100 R 50 50 1 1 B
+X P3.2 19 -600 -100 100 R 50 50 1 1 B
+X P2.1 2 600 -300 100 L 50 50 1 1 B
+X P3.1 20 -600 0 100 R 50 50 1 1 B
+X P3.0 21 -600 100 100 R 50 50 1 1 B
+X DVCC 22 -200 1400 100 D 50 50 1 1 P N
+X P2.7 23 600 -900 100 L 50 50 1 1 B
+X P2.6 24 600 -800 100 L 50 50 1 1 B
+X RF_XIN 25 -600 -1200 100 R 50 50 1 1 I
+X RF_XOUT 26 -600 -1100 100 R 50 50 1 1 O
+X AVCC_RF 27 100 1400 100 D 50 50 1 1 W
+X AVCC_RF 28 100 1400 100 D 50 50 1 1 P N
+X RF_P 29 600 1000 100 L 50 50 1 1 P
+X P2.0 3 600 -200 100 L 50 50 1 1 B
+X RF_N 30 600 900 100 L 50 50 1 1 P
+X AVCC_RF 31 200 1400 100 D 50 50 1 1 W
+X AVCC_RF 32 200 1400 100 D 50 50 1 1 P N
+X RBIAS 33 600 -1100 100 L 50 50 1 1 P
+X GUARD 34 -100 1400 100 D 50 50 1 1 W
+X PJ.0/TDO 35 -600 800 100 R 50 50 1 1 B
+X PJ.1/TDI/TCLK 36 -600 700 100 R 50 50 1 1 B
+X PJ.2/TMS 37 -600 600 100 R 50 50 1 1 B
+X PJ.3/TCK 38 -600 500 100 R 50 50 1 1 B
+X TEST 39 -600 300 100 R 50 50 1 1 B
+X P1.7 4 600 0 100 L 50 50 1 1 B
+X ~RST 40 -600 1000 100 R 50 50 1 1 I
+X DVCC 41 -200 1400 100 D 50 50 1 1 P N
+X AVSS 42 0 -1400 100 U 50 50 1 1 W
+X P5.1 43 -600 -900 100 R 50 50 1 1 B
+X P5.0 44 -600 -800 100 R 50 50 1 1 B
+X AVCC 45 0 1400 100 D 50 50 1 1 W
+X P2.5 46 600 -700 100 L 50 50 1 1 B
+X P2.4 47 600 -600 100 L 50 50 1 1 B
+X P2.3 48 600 -500 100 L 50 50 1 1 B
+X VSS 49 -100 -1400 100 U 50 50 1 1 W
+X P1.6 5 600 100 100 L 50 50 1 1 B
+X P1.5 6 600 200 100 L 50 50 1 1 B
+X VCORE 7 -300 1400 100 D 50 50 1 1 W
+X DVCC 8 -200 1400 100 D 50 50 1 1 W
+X P1.4 9 600 300 100 L 50 50 1 1 B
+ENDDRAW
+ENDDEF
+#
 # MSP430AFE221IPW
 #
 DEF MSP430AFE221IPW U 0 20 Y Y 1 F N
diff --git a/MCU_WDC_6500.dcm b/MCU_WDC_6500.dcm
new file mode 100644
index 0000000000..f58f8953b9
--- /dev/null
+++ b/MCU_WDC_6500.dcm
@@ -0,0 +1,27 @@
+EESchema-DOCLIB  Version 2.0
+#
+$CMP W65C134SxxPLx-8
+D 8-Bit Microcontroller unit 8.0MHz, PLCC-68
+K PLCC-68, 6502, 65C02, 65134, 65C134, MCU
+F https://www.westerndesigncenter.com/wdc/documentation/w65c134s.pdf
+$ENDCMP
+#
+$CMP W65C134SxxQx-8
+D 8-Bit Microcontroller unit 8.0MHz, QFP-80
+K QFP-80, 6502, 65C02, 65134, 65C134, MCU
+F https://www.westerndesigncenter.com/wdc/documentation/w65c134s.pdf
+$ENDCMP
+#
+$CMP W65C265SxxPLx-8
+D 8/16-Bit Microcontroller unit 8.0MHz, PLCC-84
+K PLCC-84, 65816, 65C816, 65265, 65C265, MCU
+F https://www.westerndesigncenter.com/wdc/documentation/w65c265s.pdf
+$ENDCMP
+#
+$CMP W65C265SxxQx-8
+D 8/16-Bit Microcontroller unit 8.0MHz, QFP-100
+K QFP-100, 65816, 65C816, 65265, 65C265, MCU
+F https://www.westerndesigncenter.com/wdc/documentation/w65c265s.pdf
+$ENDCMP
+#
+#End Doc Library
diff --git a/MCU_WDC_6500.lib b/MCU_WDC_6500.lib
new file mode 100644
index 0000000000..16f39556cb
--- /dev/null
+++ b/MCU_WDC_6500.lib
@@ -0,0 +1,396 @@
+EESchema-LIBRARY Version 2.4
+#encoding utf-8
+#
+# W65C134SxxPLx-8
+#
+DEF W65C134SxxPLx-8 U 0 20 Y Y 1 F N
+F0 "U" 400 3100 50 H V C CNN
+F1 "W65C134SxxPLx-8" 400 3000 50 H V C CNN
+F2 "Package_LCC:PLCC-68_THT-Socket" 0 0 50 H I C CNN
+F3 "" -450 2000 50 H I C CNN
+$FPLIST
+ PLCC*
+$ENDFPLIST
+DRAW
+S -300 2900 300 -2900 1 1 10 f
+X P57 1 400 -1800 100 L 50 50 1 1 B
+X ~RES 10 -400 1800 100 R 50 50 1 1 B
+X ~WE 11 -400 1700 100 R 50 50 1 1 B
+X RUN 12 400 1000 100 L 50 50 1 1 O
+X ~FCLKO 13 -400 1500 100 R 50 50 1 1 O C
+X FCLK 14 -400 1400 100 R 50 50 1 1 I C
+X BE 15 -400 1300 100 R 50 50 1 1 I
+X CLK 16 -400 1200 100 R 50 50 1 1 I C
+X ~CLKO 17 -400 1100 100 R 50 50 1 1 O C
+X PHI2 18 400 900 100 L 50 50 1 1 O C
+X A0 19 400 2700 100 L 50 50 1 1 O
+X P60 2 400 -2000 100 L 50 50 1 1 B
+X A1 20 400 2600 100 L 50 50 1 1 O
+X A2 21 400 2500 100 L 50 50 1 1 O
+X A3 22 400 2400 100 L 50 50 1 1 O
+X A4 23 400 2300 100 L 50 50 1 1 O
+X A5 24 400 2200 100 L 50 50 1 1 O
+X A6 25 400 2100 100 L 50 50 1 1 O
+X A7 26 400 2000 100 L 50 50 1 1 O
+X VSS 27 0 -3000 100 U 50 50 1 1 W
+X A8 28 400 1900 100 L 50 50 1 1 O
+X A9 29 400 1800 100 L 50 50 1 1 O
+X P61 3 400 -2100 100 L 50 50 1 1 B
+X A10 30 400 1700 100 L 50 50 1 1 O
+X A11 31 400 1600 100 L 50 50 1 1 O
+X A12 32 400 1500 100 L 50 50 1 1 O
+X A13 33 400 1400 100 L 50 50 1 1 O
+X A14 34 400 1300 100 L 50 50 1 1 O
+X A15 35 400 1200 100 L 50 50 1 1 O
+X VDD 36 0 3000 100 D 50 50 1 1 W
+X P30 37 400 700 100 L 50 50 1 1 O
+X P31 38 400 600 100 L 50 50 1 1 O
+X P32 39 400 500 100 L 50 50 1 1 O
+X P62 4 400 -2200 100 L 50 50 1 1 B
+X P33 40 400 400 100 L 50 50 1 1 O
+X P34 41 400 300 100 L 50 50 1 1 O
+X P35 42 400 200 100 L 50 50 1 1 O
+X P36 43 400 100 100 L 50 50 1 1 O
+X P37 44 400 0 100 L 50 50 1 1 O
+X D0 45 -400 2700 100 R 50 50 1 1 B
+X D1 46 -400 2600 100 R 50 50 1 1 B
+X D2 47 -400 2500 100 R 50 50 1 1 B
+X D3 48 -400 2400 100 R 50 50 1 1 B
+X D4 49 -400 2300 100 R 50 50 1 1 B
+X P63 5 400 -2300 100 L 50 50 1 1 B
+X D5 50 -400 2200 100 R 50 50 1 1 B
+X D6 51 -400 2100 100 R 50 50 1 1 B
+X D7 52 -400 2000 100 R 50 50 1 1 B
+X VSS 53 0 -3000 100 U 50 50 1 1 P N
+X P40 54 400 -200 100 L 50 50 1 1 B
+X P41 55 400 -300 100 L 50 50 1 1 B
+X P42 56 400 -400 100 L 50 50 1 1 B
+X P43 57 400 -500 100 L 50 50 1 1 B
+X P44 58 400 -600 100 L 50 50 1 1 B
+X P45 59 400 -700 100 L 50 50 1 1 B
+X P64 6 400 -2400 100 L 50 50 1 1 B
+X P46 60 400 -800 100 L 50 50 1 1 B
+X P47 61 400 -900 100 L 50 50 1 1 B
+X P50 62 400 -1100 100 L 50 50 1 1 B
+X P51 63 400 -1200 100 L 50 50 1 1 B
+X P52 64 400 -1300 100 L 50 50 1 1 B
+X P53 65 400 -1400 100 L 50 50 1 1 B
+X P54 66 400 -1500 100 L 50 50 1 1 B
+X P55 67 400 -1600 100 L 50 50 1 1 B
+X P56 68 400 -1700 100 L 50 50 1 1 B
+X P65 7 400 -2500 100 L 50 50 1 1 B
+X P66 8 400 -2600 100 L 50 50 1 1 B
+X P67 9 400 -2700 100 L 50 50 1 1 B
+ENDDRAW
+ENDDEF
+#
+# W65C134SxxQx-8
+#
+DEF W65C134SxxQx-8 U 0 20 Y Y 1 F N
+F0 "U" 400 3100 50 H V C CNN
+F1 "W65C134SxxQx-8" 400 3000 50 H V C CNN
+F2 "Package_QFP:PQFP-80_14x20mm_P0.8mm" 0 0 50 H I C CNN
+F3 "" -450 2000 50 H I C CNN
+$FPLIST
+ PQFP*14x20mm*P0.8mm*
+$ENDFPLIST
+DRAW
+S -300 2900 300 -2900 1 1 10 f
+X VDD 1 0 3000 100 D 50 50 1 1 W
+X D6 10 -400 2100 100 R 50 50 1 1 B
+X D7 11 -400 2000 100 R 50 50 1 1 B
+X VSS 12 0 -3000 100 U 50 50 1 1 P N
+X VSS 13 0 -3000 100 U 50 50 1 1 P N
+X P40 14 400 -200 100 L 50 50 1 1 B
+X P41 15 400 -300 100 L 50 50 1 1 B
+X P42 16 400 -400 100 L 50 50 1 1 B
+X P43 17 400 -500 100 L 50 50 1 1 B
+X P44 18 400 -600 100 L 50 50 1 1 B
+X P45 19 400 -700 100 L 50 50 1 1 B
+X VSS 2 0 -3000 100 U 50 50 1 1 W
+X P46 20 400 -800 100 L 50 50 1 1 B
+X P47 21 400 -900 100 L 50 50 1 1 B
+X VSS 22 0 -3000 100 U 50 50 1 1 P N
+X VDD 23 0 3000 100 D 50 50 1 1 P N
+X P50 24 400 -1100 100 L 50 50 1 1 B
+X P51 25 400 -1200 100 L 50 50 1 1 B
+X P52 26 400 -1300 100 L 50 50 1 1 B
+X P53 27 400 -1400 100 L 50 50 1 1 B
+X P54 28 400 -1500 100 L 50 50 1 1 B
+X P55 29 400 -1600 100 L 50 50 1 1 B
+X P37 3 400 0 100 L 50 50 1 1 O
+X P56 30 400 -1700 100 L 50 50 1 1 B
+X NC 31 500 -3000 100 L 50 50 1 1 N N
+X P57 32 400 -1800 100 L 50 50 1 1 B
+X P60 33 400 -2000 100 L 50 50 1 1 B
+X P61 34 400 -2100 100 L 50 50 1 1 B
+X P62 35 400 -2200 100 L 50 50 1 1 B
+X P63 36 400 -2300 100 L 50 50 1 1 B
+X P64 37 400 -2400 100 L 50 50 1 1 B
+X P65 38 400 -2500 100 L 50 50 1 1 B
+X P66 39 400 -2600 100 L 50 50 1 1 B
+X D0 4 -400 2700 100 R 50 50 1 1 B
+X P67 40 400 -2700 100 L 50 50 1 1 B
+X VDD 41 0 3000 100 D 50 50 1 1 P N
+X VSS 42 0 -3000 100 U 50 50 1 1 P N
+X ~RES 43 -400 1800 100 R 50 50 1 1 B
+X ~WE 44 -400 1700 100 R 50 50 1 1 B
+X RUN 45 400 1000 100 L 50 50 1 1 O
+X ~FCLKO 46 -400 1500 100 R 50 50 1 1 O C
+X FCLK 47 -400 1400 100 R 50 50 1 1 I C
+X BE 48 -400 1300 100 R 50 50 1 1 I
+X CLK 49 -400 1200 100 R 50 50 1 1 I C
+X D1 5 -400 2600 100 R 50 50 1 1 B
+X ~CLKO 50 -400 1100 100 R 50 50 1 1 O C
+X PHI2 51 400 900 100 L 50 50 1 1 O C
+X NC 52 500 -3100 100 L 50 50 1 1 N N
+X NC 53 500 -3200 100 L 50 50 1 1 N N
+X A0 54 400 2700 100 L 50 50 1 1 O
+X A1 55 400 2600 100 L 50 50 1 1 O
+X A2 56 400 2500 100 L 50 50 1 1 O
+X A3 57 400 2400 100 L 50 50 1 1 O
+X A4 58 400 2300 100 L 50 50 1 1 O
+X A5 59 400 2200 100 L 50 50 1 1 O
+X D2 6 -400 2500 100 R 50 50 1 1 B
+X A6 60 400 2100 100 L 50 50 1 1 O
+X A7 61 400 2000 100 L 50 50 1 1 O
+X VDD 62 0 3000 100 D 50 50 1 1 P N
+X VSS 63 0 -3000 100 U 50 50 1 1 P N
+X A8 64 400 1900 100 L 50 50 1 1 O
+X A9 65 400 1800 100 L 50 50 1 1 O
+X A10 66 400 1700 100 L 50 50 1 1 O
+X A11 67 400 1600 100 L 50 50 1 1 O
+X A12 68 400 1500 100 L 50 50 1 1 O
+X A13 69 400 1400 100 L 50 50 1 1 O
+X D3 7 -400 2400 100 R 50 50 1 1 B
+X A14 70 400 1300 100 L 50 50 1 1 O
+X A15 71 400 1200 100 L 50 50 1 1 O
+X VDD 72 0 3000 100 D 50 50 1 1 P N
+X VDD 73 0 3000 100 D 50 50 1 1 P N
+X P30 74 400 700 100 L 50 50 1 1 O
+X P31 75 400 600 100 L 50 50 1 1 O
+X P32 76 400 500 100 L 50 50 1 1 O
+X P33 77 400 400 100 L 50 50 1 1 O
+X P34 78 400 300 100 L 50 50 1 1 O
+X P35 79 400 200 100 L 50 50 1 1 O
+X D4 8 -400 2300 100 R 50 50 1 1 B
+X P36 80 400 100 100 L 50 50 1 1 O
+X D5 9 -400 2200 100 R 50 50 1 1 B
+ENDDRAW
+ENDDEF
+#
+# W65C265SxxPLx-8
+#
+DEF W65C265SxxPLx-8 U 0 20 Y Y 1 F N
+F0 "U" 400 3600 50 H V C CNN
+F1 "W65C265SxxPLx-8" 400 3500 50 H V C CNN
+F2 "Package_LCC:PLCC-84_THT-Socket" 0 0 50 H I C CNN
+F3 "" -450 2500 50 H I C CNN
+$FPLIST
+ PLCC*
+$ENDFPLIST
+DRAW
+S -300 3400 300 -3400 1 1 10 f
+X BA 21 400 300 100 L 50 50 0 0 O
+X P70 50 400 -2600 100 L 50 50 0 0 O
+X P71 51 400 -2700 100 L 50 50 0 0 O
+X TG0 68 400 500 100 L 50 50 0 0 O
+X TG1 69 400 400 100 L 50 50 0 0 O
+X VSS 1 0 -3500 100 U 50 50 1 1 W
+X P66 10 400 -2300 100 L 50 50 1 1 B
+X P67 11 400 -2400 100 L 50 50 1 1 B
+X ~RES 12 -400 2300 100 R 50 50 1 1 B
+X ~WE 13 -400 2200 100 R 50 50 1 1 B
+X RUN 14 400 700 100 L 50 50 1 1 O
+X ~FCLKO 15 -400 2000 100 R 50 50 1 1 O C
+X FCLK 16 -400 1900 100 R 50 50 1 1 I C
+X BE 17 -400 1800 100 R 50 50 1 1 I
+X CLK 18 -400 1700 100 R 50 50 1 1 I C
+X ~CLKO 19 -400 1600 100 R 50 50 1 1 O C
+X P56 2 400 -1400 100 L 50 50 1 1 B
+X PHI2 20 400 600 100 L 50 50 1 1 O C
+X VSS 22 0 -3500 100 U 50 50 1 1 P N
+X VDD 23 0 3500 100 D 50 50 1 1 P N
+X A0 24 400 3200 100 L 50 50 1 1 O
+X A1 25 400 3100 100 L 50 50 1 1 O
+X A2 26 400 3000 100 L 50 50 1 1 O
+X A3 27 400 2900 100 L 50 50 1 1 O
+X A4 28 400 2800 100 L 50 50 1 1 O
+X A5 29 400 2700 100 L 50 50 1 1 O
+X P57 3 400 -1500 100 L 50 50 1 1 B
+X A6 30 400 2600 100 L 50 50 1 1 O
+X A7 31 400 2500 100 L 50 50 1 1 O
+X A8 32 400 2400 100 L 50 50 1 1 O
+X A9 33 400 2300 100 L 50 50 1 1 O
+X A10 34 400 2200 100 L 50 50 1 1 O
+X A11 35 400 2100 100 L 50 50 1 1 O
+X A12 36 400 2000 100 L 50 50 1 1 O
+X A13 37 400 1900 100 L 50 50 1 1 O
+X A14 38 400 1800 100 L 50 50 1 1 O
+X A15 39 400 1700 100 L 50 50 1 1 O
+X P60 4 400 -1700 100 L 50 50 1 1 B
+X A16 40 400 1600 100 L 50 50 1 1 O
+X A17 41 400 1500 100 L 50 50 1 1 O
+X A18 42 400 1400 100 L 50 50 1 1 O
+X VSS 43 0 -3500 100 U 50 50 1 1 P N
+X VDD 44 0 3500 100 D 50 50 1 1 P N
+X A19 45 400 1300 100 L 50 50 1 1 O
+X A20 46 400 1200 100 L 50 50 1 1 O
+X A21 47 400 1100 100 L 50 50 1 1 O
+X A22 48 400 1000 100 L 50 50 1 1 O
+X A23 49 400 900 100 L 50 50 1 1 O
+X P61 5 400 -1800 100 L 50 50 1 1 B
+X P72 52 400 -2800 100 L 50 50 1 1 O
+X P73 53 400 -2900 100 L 50 50 1 1 O
+X P74 54 400 -3000 100 L 50 50 1 1 O
+X P75 55 400 -3100 100 L 50 50 1 1 O
+X P76 56 400 -3200 100 L 50 50 1 1 O
+X P77 57 400 -3300 100 L 50 50 1 1 O
+X D0 58 -400 3200 100 R 50 50 1 1 B
+X D1 59 -400 3100 100 R 50 50 1 1 B
+X P62 6 400 -1900 100 L 50 50 1 1 B
+X D2 60 -400 3000 100 R 50 50 1 1 B
+X D3 61 -400 2900 100 R 50 50 1 1 B
+X D4 62 -400 2800 100 R 50 50 1 1 B
+X VDD 63 0 3500 100 D 50 50 1 1 P N
+X VSS 64 0 -3500 100 U 50 50 1 1 P N
+X D5 65 -400 2700 100 R 50 50 1 1 B
+X D6 66 -400 2600 100 R 50 50 1 1 B
+X D7 67 -400 2500 100 R 50 50 1 1 B
+X P63 7 400 -2000 100 L 50 50 1 1 B
+X P40 70 400 100 100 L 50 50 1 1 B
+X P41 71 400 0 100 L 50 50 1 1 B
+X P42 72 400 -100 100 L 50 50 1 1 B
+X P43 73 400 -200 100 L 50 50 1 1 B
+X P44 74 400 -300 100 L 50 50 1 1 B
+X P45 75 400 -400 100 L 50 50 1 1 B
+X P46 76 400 -500 100 L 50 50 1 1 B
+X P47 77 400 -600 100 L 50 50 1 1 B
+X P50 78 400 -800 100 L 50 50 1 1 B
+X P51 79 400 -900 100 L 50 50 1 1 B
+X P64 8 400 -2100 100 L 50 50 1 1 B
+X P52 80 400 -1000 100 L 50 50 1 1 B
+X P53 81 400 -1100 100 L 50 50 1 1 B
+X P54 82 400 -1200 100 L 50 50 1 1 B
+X P55 83 400 -1300 100 L 50 50 1 1 B
+X VDD 84 0 3500 100 D 50 50 1 1 W
+X P65 9 400 -2200 100 L 50 50 1 1 B
+ENDDRAW
+ENDDEF
+#
+# W65C265SxxQx-8
+#
+DEF W65C265SxxQx-8 U 0 20 Y Y 1 F N
+F0 "U" 400 3600 50 H V C CNN
+F1 "W65C265SxxQx-8" 400 3500 50 H V C CNN
+F2 "Package_QFP:PQFP-100_14x20mm_P0.65mm" 0 0 50 H I C CNN
+F3 "" -450 2500 50 H I C CNN
+$FPLIST
+ PQFP*14x20mm*P0.65mm*
+$ENDFPLIST
+DRAW
+S -300 3400 300 -3400 1 1 10 f
+X BA 39 400 300 100 L 50 50 0 0 O
+X P70 72 400 -2600 100 L 50 50 0 0 O
+X P71 73 400 -2700 100 L 50 50 0 0 O
+X TG0 94 400 500 100 L 50 50 0 0 O
+X TG1 95 400 400 100 L 50 50 0 0 O
+X NC 1 400 -3500 100 L 50 50 1 1 N N
+X P52 10 400 -1000 100 L 50 50 1 1 B
+X P44 100 400 -300 100 L 50 50 1 1 B
+X P53 11 400 -1100 100 L 50 50 1 1 B
+X P54 12 400 -1200 100 L 50 50 1 1 B
+X P55 13 400 -1300 100 L 50 50 1 1 B
+X VDD 14 0 3500 100 D 50 50 1 1 W
+X VSS 15 0 -3500 100 U 50 50 1 1 W
+X P56 16 400 -1400 100 L 50 50 1 1 B
+X P57 17 400 -1500 100 L 50 50 1 1 B
+X P60 18 400 -1700 100 L 50 50 1 1 B
+X P61 19 400 -1800 100 L 50 50 1 1 B
+X NC 2 400 -3600 100 L 50 50 1 1 N N
+X P62 20 400 -1900 100 L 50 50 1 1 B
+X P63 21 400 -2000 100 L 50 50 1 1 B
+X P64 22 400 -2100 100 L 50 50 1 1 B
+X P65 23 400 -2200 100 L 50 50 1 1 B
+X P66 24 400 -2300 100 L 50 50 1 1 B
+X P67 25 400 -2400 100 L 50 50 1 1 B
+X ~RES 26 -400 2300 100 R 50 50 1 1 B
+X NC 27 1100 -3500 100 L 50 50 1 1 N N
+X NC 28 1100 -3600 100 L 50 50 1 1 N N
+X NC 29 1100 -3700 100 L 50 50 1 1 N N
+X NC 3 400 -3700 100 L 50 50 1 1 N N
+X NC 30 1100 -3800 100 L 50 50 1 1 N N
+X ~WE 31 -400 2200 100 R 50 50 1 1 B
+X RUN 32 400 700 100 L 50 50 1 1 O
+X ~FCLKO 33 -400 2000 100 R 50 50 1 1 O C
+X FCLK 34 -400 1900 100 R 50 50 1 1 I C
+X BE 35 -400 1800 100 R 50 50 1 1 I
+X CLK 36 -400 1700 100 R 50 50 1 1 I C
+X ~CLKO 37 -400 1600 100 R 50 50 1 1 O C
+X PHI2 38 400 600 100 L 50 50 1 1 O C
+X NC 4 400 -3800 100 L 50 50 1 1 N N
+X VSS 40 0 -3500 100 U 50 50 1 1 P N
+X VDD 41 0 3500 100 D 50 50 1 1 P N
+X A0 42 400 3200 100 L 50 50 1 1 O
+X A1 43 400 3100 100 L 50 50 1 1 O
+X A2 44 400 3000 100 L 50 50 1 1 O
+X A3 45 400 2900 100 L 50 50 1 1 O
+X A4 46 400 2800 100 L 50 50 1 1 O
+X A5 47 400 2700 100 L 50 50 1 1 O
+X A6 48 400 2600 100 L 50 50 1 1 O
+X A7 49 400 2500 100 L 50 50 1 1 O
+X P45 5 400 -400 100 L 50 50 1 1 B
+X A8 50 400 2400 100 L 50 50 1 1 O
+X NC 51 1800 -3500 100 L 50 50 1 1 N N
+X NC 52 1800 -3600 100 L 50 50 1 1 N N
+X NC 53 1800 -3700 100 L 50 50 1 1 N N
+X NC 54 1800 -3800 100 L 50 50 1 1 N N
+X A9 55 400 2300 100 L 50 50 1 1 O
+X A10 56 400 2200 100 L 50 50 1 1 O
+X A11 57 400 2100 100 L 50 50 1 1 O
+X A12 58 400 2000 100 L 50 50 1 1 O
+X A13 59 400 1900 100 L 50 50 1 1 O
+X P46 6 400 -500 100 L 50 50 1 1 B
+X A14 60 400 1800 100 L 50 50 1 1 O
+X A15 61 400 1700 100 L 50 50 1 1 O
+X A16 62 400 1600 100 L 50 50 1 1 O
+X A17 63 400 1500 100 L 50 50 1 1 O
+X A18 64 400 1400 100 L 50 50 1 1 O
+X VSS 65 0 -3500 100 U 50 50 1 1 P N
+X VDD 66 0 3500 100 D 50 50 1 1 P N
+X A19 67 400 1300 100 L 50 50 1 1 O
+X A20 68 400 1200 100 L 50 50 1 1 O
+X A21 69 400 1100 100 L 50 50 1 1 O
+X P47 7 400 -600 100 L 50 50 1 1 B
+X A22 70 400 1000 100 L 50 50 1 1 O
+X A23 71 400 900 100 L 50 50 1 1 O
+X P72 74 400 -2800 100 L 50 50 1 1 O
+X P73 75 400 -2900 100 L 50 50 1 1 O
+X NC 76 2500 -3500 100 L 50 50 1 1 N N
+X NC 77 2500 -3600 100 L 50 50 1 1 N N
+X NC 78 2500 -3700 100 L 50 50 1 1 N N
+X NC 79 2500 -3800 100 L 50 50 1 1 N N
+X P50 8 400 -800 100 L 50 50 1 1 B
+X P74 80 400 -3000 100 L 50 50 1 1 O
+X P75 81 400 -3100 100 L 50 50 1 1 O
+X P76 82 400 -3200 100 L 50 50 1 1 O
+X P77 83 400 -3300 100 L 50 50 1 1 O
+X D0 84 -400 3200 100 R 50 50 1 1 B
+X D1 85 -400 3100 100 R 50 50 1 1 B
+X D2 86 -400 3000 100 R 50 50 1 1 B
+X D3 87 -400 2900 100 R 50 50 1 1 B
+X D4 88 -400 2800 100 R 50 50 1 1 B
+X VDD 89 0 3500 100 D 50 50 1 1 P N
+X P51 9 400 -900 100 L 50 50 1 1 B
+X VSS 90 0 -3500 100 U 50 50 1 1 P N
+X D5 91 -400 2700 100 R 50 50 1 1 B
+X D6 92 -400 2600 100 R 50 50 1 1 B
+X D7 93 -400 2500 100 R 50 50 1 1 B
+X P40 96 400 100 100 L 50 50 1 1 B
+X P41 97 400 0 100 L 50 50 1 1 B
+X P42 98 400 -100 100 L 50 50 1 1 B
+X P43 99 400 -200 100 L 50 50 1 1 B
+ENDDRAW
+ENDDEF
+#
+#End Library
diff --git a/Memory_RAM.dcm b/Memory_RAM.dcm
index 716b02345e..63a73437f3 100644
--- a/Memory_RAM.dcm
+++ b/Memory_RAM.dcm
@@ -19,7 +19,7 @@ F https://www.alliancememory.com/wp-content/uploads/pdf/ddr3/4GB-AS4C256M16D3.pd
 $ENDCMP
 #
 $CMP AS4C4M16SA
-D 64M – (4M x 16 bit) Synchronous DRAM (SDRAM), TSOP II 54pin
+D 64M – (4M x 16 bit) Synchronous DRAM (SDRAM), TSOP-II-54
 K SDRAM Synchronus DRAM PC166 PC143 64Mb 16Mbx4 MEMORY
 F https://www.alliancememory.com/wp-content/uploads/pdf/dram/64M-AS4C4M16SA-CI_v3.0_March%202015.pdf
 $ENDCMP
@@ -118,6 +118,18 @@ K DRAM MEMORY
 F http://www.issi.com/WW/pdf/42-45S16400J.pdf
 $ENDCMP
 #
+$CMP IS43LQ32256A-062BLI
+D 256Mx32 bit Low Power Double Data Rate 4 (LPDDR4) SDRAM, 1600 MHz, Industrial, BGA-200
+K DRAM MEMORY
+F http://www.issi.com/WW/pdf/43-46LQ32256A-AL.pdf
+$ENDCMP
+#
+$CMP IS43LQ32256AL-062BLI
+D 256Mx32 bit Low Power Double Data Rate 4X (LPDDR4X) SDRAM, 1600 MHz, Industrial, BGA-200
+K DRAM MEMORY
+F http://www.issi.com/WW/pdf/43-46LQ32256AL-AL.pdf
+$ENDCMP
+#
 $CMP IS61C5128AL-10KLI
 D 512K x 8 HIGH-SPEED CMOS STATIC RAM, 10ns, SOJ-36
 K SRAM MEMORY
@@ -166,6 +178,42 @@ K RAM SRAM CMOS MEMORY
 F https://www.futurlec.com/Datasheet/Memory/62256.pdf
 $ENDCMP
 #
+$CMP MT48LC16M16A2P
+D 256M – (16M x 16 bit) Synchronous DRAM (SDRAM), TSOP-II-54
+K SDRAM Synchronus DRAM PC100 PC133 256Mb 16Mbx16 MEMORY
+F https://www.micron.com/-/media/client/global/documents/products/data-sheet/dram/256mb_sdr.pdf
+$ENDCMP
+#
+$CMP MT48LC16M16A2TG
+D 256M – (16M x 16 bit) Synchronous DRAM (SDRAM), TSOP-II-54
+K SDRAM Synchronus DRAM PC100 PC133 256Mb 16Mbx16 MEMORY
+F https://www.micron.com/-/media/client/global/documents/products/data-sheet/dram/256mb_sdr.pdf
+$ENDCMP
+#
+$CMP MT48LC32M8A2P
+D 256M – (32M x 8 bit) Synchronous DRAM (SDRAM), TSOP-II-54
+K SDRAM Synchronus DRAM PC100 PC133 256Mb 32Mbx8 MEMORY
+F https://www.micron.com/-/media/client/global/documents/products/data-sheet/dram/256mb_sdr.pdf
+$ENDCMP
+#
+$CMP MT48LC32M8A2TG
+D 256M – (32M x 8 bit) Synchronous DRAM (SDRAM), TSOP-II-54
+K SDRAM Synchronus DRAM PC100 PC133 256Mb 32Mbx8 MEMORY
+F https://www.micron.com/-/media/client/global/documents/products/data-sheet/dram/256mb_sdr.pdf
+$ENDCMP
+#
+$CMP MT48LC64M4A2P
+D 256M – (64M x 4 bit) Synchronous DRAM (SDRAM), TSOP-II-54
+K SDRAM Synchronus DRAM PC100 PC133 256Mb 64Mbx4 MEMORY
+F https://www.micron.com/-/media/client/global/documents/products/data-sheet/dram/256mb_sdr.pdf
+$ENDCMP
+#
+$CMP MT48LC64M4A2TG
+D 256M – (64M x 4 bit) Synchronous DRAM (SDRAM), TSOP-II-54
+K SDRAM Synchronus DRAM PC100 PC133 256Mb 64Mbx4 MEMORY
+F https://www.micron.com/-/media/client/global/documents/products/data-sheet/dram/256mb_sdr.pdf
+$ENDCMP
+#
 $CMP W9812G6KH-5
 D 128Mb Synchronous DRAM, 2 Mb x 16 b x 4 Banks, 200 MHz, TSOP-II-54
 K DRAM MEMORY
diff --git a/Memory_RAM.lib b/Memory_RAM.lib
index 4486150768..a187655932 100644
--- a/Memory_RAM.lib
+++ b/Memory_RAM.lib
@@ -211,65 +211,70 @@ ENDDEF
 #
 # AS4C4M16SA
 #
-DEF AS4C4M16SA U 0 40 Y Y 1 F N
-F0 "U" -600 1200 50 H V C CNN
-F1 "AS4C4M16SA" 650 -1200 50 H V C CNN
-F2 "TSOPII-54" 0 0 50 H I C CIN
+DEF AS4C4M16SA U 0 20 Y Y 1 F N
+F0 "U" -300 1350 50 H V C CNN
+F1 "AS4C4M16SA" 300 1350 50 H V C CNN
+F2 "Package_SO:TSOP-II-54_22.2x10.16mm_P0.8mm" 0 -1400 50 H I C CIN
 F3 "" 0 -250 50 H I C CNN
+$FPLIST
+ TSOP?II*22.2x10.16mm*P0.8mm*
+$ENDFPLIST
 DRAW
-S -650 1150 650 -1150 0 1 10 f
-X VDD 1 -300 1300 150 D 40 40 1 1 W
-X DQ5 10 800 550 150 L 40 40 1 1 B
-X DQ6 11 800 450 150 L 40 40 1 1 B
-X VSSQ 12 100 -1300 150 U 40 40 1 1 W
-X DQ7 13 800 350 150 L 40 40 1 1 B
-X VDD 14 -200 1300 150 D 40 40 1 1 W
-X DQML 15 800 -700 150 L 40 40 1 1 I
-X ~WE~ 16 -800 -900 150 R 40 40 1 1 I
-X ~CAS~ 17 -800 -800 150 R 40 40 1 1 I
-X ~RAS~ 18 -800 -700 150 R 40 40 1 1 I
-X ~CS~ 19 -800 -1050 150 R 40 40 1 1 I
-X DQ0 2 800 1050 150 L 40 40 1 1 B
-X BA0 20 -800 -200 150 R 40 40 1 1 I
-X BA1 21 -800 -300 150 R 40 40 1 1 I
-X A10 22 -800 50 150 R 40 40 1 1 I
-X A0 23 -800 1050 150 R 40 40 1 1 I
-X A1 24 -800 950 150 R 40 40 1 1 I
-X A2 25 -800 850 150 R 40 40 1 1 I
-X A3 26 -800 750 150 R 40 40 1 1 I
-X VDD 27 -100 1300 150 D 40 40 1 1 W
-X VSS 28 -300 -1300 150 U 40 40 1 1 W
-X A4 29 -800 650 150 R 40 40 1 1 I
-X VDDQ 3 0 1300 150 D 40 40 1 1 W
-X A5 30 -800 550 150 R 40 40 1 1 I
-X A6 31 -800 450 150 R 40 40 1 1 I
-X A7 32 -800 350 150 R 40 40 1 1 I
-X A8 33 -800 250 150 R 40 40 1 1 I
-X A9 34 -800 150 150 R 40 40 1 1 I
-X A11 35 -800 -50 150 R 40 40 1 1 I
-X CKE 37 -800 -550 150 R 40 40 1 1 I
-X CLK 38 -800 -450 150 R 40 40 1 1 I
-X DQMH 39 800 -800 150 L 40 40 1 1 I
-X DQ1 4 800 950 150 L 40 40 1 1 B
-X VSS 41 -200 -1300 150 U 40 40 1 1 W
-X DQ8 42 800 250 150 L 40 40 1 1 B
-X VDDQ 43 200 1300 150 D 40 40 1 1 W
-X DQ9 44 800 150 150 L 40 40 1 1 B
-X DQ10 45 800 50 150 L 40 40 1 1 B
-X VSSQ 46 200 -1300 150 U 40 40 1 1 W
-X DQ11 47 800 -50 150 L 40 40 1 1 B
-X DQ12 48 800 -150 150 L 40 40 1 1 B
-X VDDQ 49 300 1300 150 D 40 40 1 1 W
-X DQ2 5 800 850 150 L 40 40 1 1 B
-X DQ13 50 800 -250 150 L 40 40 1 1 B
-X DQ14 51 800 -350 150 L 40 40 1 1 B
-X VSSQ 52 300 -1300 150 U 40 40 1 1 W
-X DQ15 53 800 -450 150 L 40 40 1 1 B
-X VSS 54 -100 -1300 150 U 40 40 1 1 W
-X VSSQ 6 0 -1300 150 U 40 40 1 1 W
-X DQ3 7 800 750 150 L 40 40 1 1 B
-X DQ4 8 800 650 150 L 40 40 1 1 B
-X VDDQ 9 100 1300 150 D 40 40 1 1 W
+S -400 1300 400 -1300 0 1 10 f
+X VDD 1 -100 1400 100 D 50 50 1 1 W
+X DQ5 10 500 700 100 L 50 50 1 1 B
+X DQ6 11 500 600 100 L 50 50 1 1 B
+X VSSQ 12 0 -1400 100 U 50 50 1 1 P N
+X DQ7 13 500 500 100 L 50 50 1 1 B
+X VDD 14 -100 1400 100 D 50 50 1 1 P N
+X LDQM 15 -500 -800 100 R 50 50 1 1 I
+X ~WE~ 16 -500 -1000 100 R 50 50 1 1 I
+X ~CAS~ 17 -500 -1100 100 R 50 50 1 1 I
+X ~RAS~ 18 -500 -1200 100 R 50 50 1 1 I
+X ~CS~ 19 -500 -500 100 R 50 50 1 1 I
+X DQ0 2 500 1200 100 L 50 50 1 1 B
+X BA0 20 -500 1200 100 R 50 50 1 1 I
+X BA1 21 -500 1100 100 R 50 50 1 1 I
+X A10/AP 22 -500 -100 100 R 50 50 1 1 I
+X A0 23 -500 900 100 R 50 50 1 1 I
+X A1 24 -500 800 100 R 50 50 1 1 I
+X A2 25 -500 700 100 R 50 50 1 1 I
+X A3 26 -500 600 100 R 50 50 1 1 I
+X VDD 27 -100 1400 100 D 50 50 1 1 P N
+X VSS 28 -100 -1400 100 U 50 50 1 1 W
+X A4 29 -500 500 100 R 50 50 1 1 I
+X VDDQ 3 0 1400 100 D 50 50 1 1 W
+X A5 30 -500 400 100 R 50 50 1 1 I
+X A6 31 -500 300 100 R 50 50 1 1 I
+X A7 32 -500 200 100 R 50 50 1 1 I
+X A8 33 -500 100 100 R 50 50 1 1 I
+X A9 34 -500 0 100 R 50 50 1 1 I
+X A11 35 -500 -200 100 R 50 50 1 1 I
+X NC 36 400 -700 100 L 50 50 1 1 N N
+X CKE 37 -500 -600 100 R 50 50 1 1 I
+X CLK 38 -500 -700 100 R 50 50 1 1 I
+X UDQM 39 -500 -900 100 R 50 50 1 1 I
+X DQ1 4 500 1100 100 L 50 50 1 1 B
+X NC/RFU 40 400 -800 100 L 50 50 1 1 N N
+X VSS 41 -100 -1400 100 U 50 50 1 1 P N
+X DQ8 42 500 400 100 L 50 50 1 1 B
+X VDDQ 43 0 1400 100 D 50 50 1 1 P N
+X DQ9 44 500 300 100 L 50 50 1 1 B
+X DQ10 45 500 200 100 L 50 50 1 1 B
+X VSSQ 46 0 -1400 100 U 50 50 1 1 P N
+X DQ11 47 500 100 100 L 50 50 1 1 B
+X DQ12 48 500 0 100 L 50 50 1 1 B
+X VDDQ 49 0 1400 100 D 50 50 1 1 P N
+X DQ2 5 500 1000 100 L 50 50 1 1 B
+X DQ13 50 500 -100 100 L 50 50 1 1 B
+X DQ14 51 500 -200 100 L 50 50 1 1 B
+X VSSQ 52 0 -1400 100 U 50 50 1 1 P N
+X DQ15 53 500 -300 100 L 50 50 1 1 B
+X VSS 54 -100 -1400 100 U 50 50 1 1 P N
+X VSSQ 6 0 -1400 100 U 50 50 1 1 W
+X DQ3 7 500 900 100 L 50 50 1 1 B
+X DQ4 8 500 800 100 L 50 50 1 1 B
+X VDDQ 9 0 1400 100 D 50 50 1 1 P N
 ENDDRAW
 ENDDEF
 #
@@ -1007,70 +1012,287 @@ ENDDEF
 # IS42S16400J-xC
 #
 DEF IS42S16400J-xC U 0 20 Y Y 1 F N
-F0 "U" -600 1250 50 H V C CNN
-F1 "IS42S16400J-xC" -600 -1250 50 H V C CNN
-F2 "Package_SO:TSOP-II-54_10.16x22.22mm_P0.8mm" 0 0 50 H I C CNN
+F0 "U" -350 1350 50 H V C CNN
+F1 "IS42S16400J-xC" 350 1350 50 H V C CNN
+F2 "Package_SO:TSOP-II-54_22.2x10.16mm_P0.8mm" 0 -1400 50 H I C CNN
 F3 "" -600 1250 50 H I C CNN
 ALIAS IS42S16400J-xT
 $FPLIST
- TSOP?II*10.16x22.22mm*P0.8mm*
+ TSOP?II*22.2x10.16mm*P0.8mm*
 $ENDFPLIST
 DRAW
-S -600 1200 600 -1200 1 1 10 f
-X VDD 1 100 1400 200 D 50 50 1 1 W
-X DQ5 10 800 600 200 L 50 50 1 1 B
-X DQ6 11 800 500 200 L 50 50 1 1 B
-X GNDQ 12 -200 -1400 200 U 50 50 1 1 W
-X DQ7 13 800 400 200 L 50 50 1 1 B
-X VDD 14 200 1400 200 D 50 50 1 1 W
-X LDQM 15 -800 -700 200 R 50 50 1 1 I
-X ~WE 16 -800 -900 200 R 50 50 1 1 I
-X ~CAS 17 -800 -1000 200 R 50 50 1 1 I
-X ~RAS 18 -800 -1100 200 R 50 50 1 1 I
-X ~CS 19 -800 -400 200 R 50 50 1 1 I
-X DQ0 2 800 1100 200 L 50 50 1 1 B
-X BA0 20 -800 1100 200 R 50 50 1 1 I
-X BA1 21 -800 1000 200 R 50 50 1 1 I
-X A10 22 -800 -100 200 R 50 50 1 1 I
-X A0 23 -800 900 200 R 50 50 1 1 I
-X A1 24 -800 800 200 R 50 50 1 1 I
-X A2 25 -800 700 200 R 50 50 1 1 I
-X A3 26 -800 600 200 R 50 50 1 1 I
-X VDD 27 300 1400 200 D 50 50 1 1 W
-X GND 28 100 -1400 200 U 50 50 1 1 W
-X A4 29 -800 500 200 R 50 50 1 1 I
-X VDDQ 3 -300 1400 200 D 50 50 1 1 W
-X A5 30 -800 400 200 R 50 50 1 1 I
-X A6 31 -800 300 200 R 50 50 1 1 I
-X A7 32 -800 200 200 R 50 50 1 1 I
-X A8 33 -800 100 200 R 50 50 1 1 I
-X A9 34 -800 0 200 R 50 50 1 1 I
-X A11 35 -800 -200 200 R 50 50 1 1 I
-X NC 36 600 -700 200 L 50 50 1 1 N N
-X CKE 37 -800 -500 200 R 50 50 1 1 I
-X CLK 38 -800 -600 200 R 50 50 1 1 I C
-X UDQM 39 -800 -800 200 R 50 50 1 1 I
-X DQ1 4 800 1000 200 L 50 50 1 1 B
-X NC 40 600 -800 200 L 50 50 1 1 N N
-X GND 41 200 -1400 200 U 50 50 1 1 W
-X DQ8 42 800 300 200 L 50 50 1 1 B
-X VDDQ 43 -100 1400 200 D 50 50 1 1 W
-X DQ9 44 800 200 200 L 50 50 1 1 B
-X DQ10 45 800 100 200 L 50 50 1 1 B
-X GNDQ 46 -100 -1400 200 U 50 50 1 1 W
-X DQ11 47 800 0 200 L 50 50 1 1 B
-X DQ12 48 800 -100 200 L 50 50 1 1 B
-X VDDQ 49 0 1400 200 D 50 50 1 1 W
-X DQ2 5 800 900 200 L 50 50 1 1 B
-X DQ13 50 800 -200 200 L 50 50 1 1 B
-X DQ14 51 800 -300 200 L 50 50 1 1 B
-X GNDQ 52 0 -1400 200 U 50 50 1 1 W
-X DQ15 53 800 -400 200 L 50 50 1 1 B
-X GND 54 300 -1400 200 U 50 50 1 1 W
-X GNDQ 6 -300 -1400 200 U 50 50 1 1 W
-X DQ3 7 800 800 200 L 50 50 1 1 B
-X DQ4 8 800 700 200 L 50 50 1 1 B
-X VDDQ 9 -200 1400 200 D 50 50 1 1 W
+S -400 1300 400 -1300 1 1 10 f
+X VDD 1 -100 1400 100 D 50 50 1 1 W
+X DQ5 10 500 700 100 L 50 50 1 1 B
+X DQ6 11 500 600 100 L 50 50 1 1 B
+X GNDQ 12 0 -1400 100 U 50 50 1 1 P N
+X DQ7 13 500 500 100 L 50 50 1 1 B
+X VDD 14 -100 1400 100 D 50 50 1 1 P N
+X LDQM 15 -500 -800 100 R 50 50 1 1 I
+X ~WE 16 -500 -1000 100 R 50 50 1 1 I
+X ~CAS 17 -500 -1100 100 R 50 50 1 1 I
+X ~RAS 18 -500 -1200 100 R 50 50 1 1 I
+X ~CS 19 -500 -500 100 R 50 50 1 1 I
+X DQ0 2 500 1200 100 L 50 50 1 1 B
+X BA0 20 -500 1200 100 R 50 50 1 1 I
+X BA1 21 -500 1100 100 R 50 50 1 1 I
+X A10 22 -500 -100 100 R 50 50 1 1 I
+X A0 23 -500 900 100 R 50 50 1 1 I
+X A1 24 -500 800 100 R 50 50 1 1 I
+X A2 25 -500 700 100 R 50 50 1 1 I
+X A3 26 -500 600 100 R 50 50 1 1 I
+X VDD 27 -100 1400 100 D 50 50 1 1 P N
+X GND 28 -100 -1400 100 U 50 50 1 1 W
+X A4 29 -500 500 100 R 50 50 1 1 I
+X VDDQ 3 0 1400 100 D 50 50 1 1 W
+X A5 30 -500 400 100 R 50 50 1 1 I
+X A6 31 -500 300 100 R 50 50 1 1 I
+X A7 32 -500 200 100 R 50 50 1 1 I
+X A8 33 -500 100 100 R 50 50 1 1 I
+X A9 34 -500 0 100 R 50 50 1 1 I
+X A11 35 -500 -200 100 R 50 50 1 1 I
+X NC 36 400 -700 100 L 50 50 1 1 N N
+X CKE 37 -500 -600 100 R 50 50 1 1 I
+X CLK 38 -500 -700 100 R 50 50 1 1 I
+X UDQM 39 -500 -900 100 R 50 50 1 1 I
+X DQ1 4 500 1100 100 L 50 50 1 1 B
+X NC 40 400 -800 100 L 50 50 1 1 N N
+X GND 41 -100 -1400 100 U 50 50 1 1 P N
+X DQ8 42 500 400 100 L 50 50 1 1 B
+X VDDQ 43 0 1400 100 D 50 50 1 1 P N
+X DQ9 44 500 300 100 L 50 50 1 1 B
+X DQ10 45 500 200 100 L 50 50 1 1 B
+X GNDQ 46 0 -1400 100 U 50 50 1 1 P N
+X DQ11 47 500 100 100 L 50 50 1 1 B
+X DQ12 48 500 0 100 L 50 50 1 1 B
+X VDDQ 49 0 1400 100 D 50 50 1 1 P N
+X DQ2 5 500 1000 100 L 50 50 1 1 B
+X DQ13 50 500 -100 100 L 50 50 1 1 B
+X DQ14 51 500 -200 100 L 50 50 1 1 B
+X GNDQ 52 0 -1400 100 U 50 50 1 1 P N
+X DQ15 53 500 -300 100 L 50 50 1 1 B
+X GND 54 -100 -1400 100 U 50 50 1 1 P N
+X GNDQ 6 0 -1400 100 U 50 50 1 1 W
+X DQ3 7 500 900 100 L 50 50 1 1 B
+X DQ4 8 500 800 100 L 50 50 1 1 B
+X VDDQ 9 0 1400 100 D 50 50 1 1 P N
+ENDDRAW
+ENDDEF
+#
+# IS43LQ32256A-062BLI
+#
+DEF IS43LQ32256A-062BLI U 0 20 Y Y 2 L N
+F0 "U" 300 1550 50 H V C CNN
+F1 "IS43LQ32256A-062BLI" 700 1450 50 H V C CNN
+F2 "Package_BGA:BGA-200_10.0x14.5mm_Layout12x22_P0.80x0.65mm" 50 -1900 50 H I C CNN
+F3 "" -100 -1200 50 H I C CNN
+ALIAS IS43LQ32256AL-062BLI
+$FPLIST
+ BGA*10.0x14.5mm*P0.80x0.65mm*
+$ENDFPLIST
+DRAW
+S -600 -1300 600 1300 1 0 10 f
+S -600 -1300 600 1300 2 0 10 f
+X DNU A1 600 500 200 L 50 50 1 1 N N
+X VSS A10 0 -1500 200 U 50 50 1 1 W
+X DNU A11 600 300 200 L 50 50 1 1 N N
+X DNU A12 600 200 200 L 50 50 1 1 N N
+X DNU A2 600 400 200 L 50 50 1 1 N N
+X VSS A3 0 -1500 200 U 50 50 1 1 P N
+X VDD2 A4 0 1500 200 D 50 50 1 1 W
+X VDD2 A9 0 1500 200 D 50 50 1 1 P N
+X DNU B1 600 100 200 L 50 50 1 1 N N
+X VDDQ B10 100 1500 200 D 50 50 1 1 W
+X DQ8_A B11 800 -400 200 L 50 50 1 1 B
+X DNU B12 600 0 200 L 50 50 1 1 N N
+X DQ0_A B2 -800 -400 200 R 50 50 1 1 B
+X VDDQ B3 100 1500 200 D 50 50 1 1 P N
+X DQ7_A B4 -800 -1100 200 R 50 50 1 1 B
+X VDDQ B5 100 1500 200 D 50 50 1 1 P N
+X VDDQ B8 100 1500 200 D 50 50 1 1 P N
+X DQ15_A B9 800 -1100 200 L 50 50 1 1 B
+X VSS C1 0 -1500 200 U 50 50 1 1 P N
+X DMI1_A C10 800 -1200 200 L 50 50 1 1 B
+X DQ9_A C11 800 -500 200 L 50 50 1 1 B
+X VSS C12 0 -1500 200 U 50 50 1 1 P N
+X DQ1_A C2 -800 -500 200 R 50 50 1 1 B
+X DMI0_A C3 -800 -1200 200 R 50 50 1 1 B
+X DQ6_A C4 -800 -1000 200 R 50 50 1 1 B
+X VSS C5 0 -1500 200 U 50 50 1 1 P N
+X VSS C8 0 -1500 200 U 50 50 1 1 P N
+X DQ14_A C9 800 -1000 200 L 50 50 1 1 B
+X VDDQ D1 100 1500 200 D 50 50 1 1 P N
+X DQS1_T_A D10 800 -200 200 L 50 50 1 1 B
+X VSS D11 0 -1500 200 U 50 50 1 1 P N
+X VDDQ D12 100 1500 200 D 50 50 1 1 P N
+X VSS D2 0 -1500 200 U 50 50 1 1 P N
+X DQS0_T_A D3 -800 -200 200 R 50 50 1 1 B
+X VSS D4 0 -1500 200 U 50 50 1 1 P N
+X VDDQ D5 100 1500 200 D 50 50 1 1 P N
+X VDDQ D8 100 1500 200 D 50 50 1 1 P N
+X VSS D9 0 -1500 200 U 50 50 1 1 P N
+X VSS E1 0 -1500 200 U 50 50 1 1 P N
+X DQS1_C_A E10 800 -300 200 L 50 50 1 1 B
+X DQ10_A E11 800 -600 200 L 50 50 1 1 B
+X VSS E12 0 -1500 200 U 50 50 1 1 P N
+X DQ2_A E2 -800 -600 200 R 50 50 1 1 B
+X DQS0_C_A E3 -800 -300 200 R 50 50 1 1 B
+X DQ5_A E4 -800 -900 200 R 50 50 1 1 B
+X VSS E5 0 -1500 200 U 50 50 1 1 P N
+X VSS E8 0 -1500 200 U 50 50 1 1 P N
+X DQ13_A E9 800 -900 200 L 50 50 1 1 B
+X VDD1 F1 -100 1500 200 D 50 50 1 1 W
+X VDDQ F10 100 1500 200 D 50 50 1 1 P N
+X DQ11_A F11 800 -700 200 L 50 50 1 1 B
+X VDD1 F12 -100 1500 200 D 50 50 1 1 P N
+X DQ3_A F2 -800 -700 200 R 50 50 1 1 B
+X VDDQ F3 100 1500 200 D 50 50 1 1 P N
+X DQ4_A F4 -800 -800 200 R 50 50 1 1 B
+X VDD2 F5 0 1500 200 D 50 50 1 1 P N
+X VDD2 F8 0 1500 200 D 50 50 1 1 P N
+X DQ12_A F9 800 -800 200 L 50 50 1 1 B
+X VSS G1 0 -1500 200 U 50 50 1 1 P N
+X VSS G10 0 -1500 200 U 50 50 1 1 P N
+X VSS G12 0 -1500 200 U 50 50 1 1 P N
+X ODT_CA_A G2 800 1200 200 L 50 50 1 1 I
+X VSS G3 0 -1500 200 U 50 50 1 1 P N
+X VDD1 G4 -100 1500 200 D 50 50 1 1 P N
+X VSS G5 0 -1500 200 U 50 50 1 1 P N
+X VSS G8 0 -1500 200 U 50 50 1 1 P N
+X VDD1 G9 -100 1500 200 D 50 50 1 1 P N
+X VDD2 H1 0 1500 200 D 50 50 1 1 P N
+X CA3_A H10 -800 400 200 R 50 50 1 1 I
+X CA4_A H11 -800 300 200 R 50 50 1 1 I
+X VDD2 H12 0 1500 200 D 50 50 1 1 P N
+X CA0_A H2 -800 700 200 R 50 50 1 1 I
+X NC H3 -600 900 200 R 50 50 1 1 N N
+X CS0_A H4 -800 1000 200 R 50 50 1 1 I
+X VDD2 H5 0 1500 200 D 50 50 1 1 P N
+X VDD2 H8 0 1500 200 D 50 50 1 1 P N
+X CA2_A H9 -800 500 200 R 50 50 1 1 I
+X VSS J1 0 -1500 200 U 50 50 1 1 P N
+X VSS J10 0 -1500 200 U 50 50 1 1 P N
+X CA5_A J11 -800 200 200 R 50 50 1 1 I
+X VSS J12 0 -1500 200 U 50 50 1 1 P N
+X CA1_A J2 -800 600 200 R 50 50 1 1 I
+X VSS J3 0 -1500 200 U 50 50 1 1 P N
+X CKE0_A J4 -800 100 200 R 50 50 1 1 I
+X NC J5 -600 0 200 R 50 50 1 1 N N
+X CK_T_A J8 -800 1200 200 R 50 50 1 1 I
+X CK_C_A J9 -800 1100 200 R 50 50 1 1 I
+X VDD2 K1 0 1500 200 D 50 50 1 1 P N
+X VDD2 K10 0 1500 200 D 50 50 1 1 P N
+X VSS K11 0 -1500 200 U 50 50 1 1 P N
+X VDD2 K12 0 1500 200 D 50 50 1 1 P N
+X VSS K2 0 -1500 200 U 50 50 1 1 P N
+X VDD2 K3 0 1500 200 D 50 50 1 1 P N
+X VSS K4 0 -1500 200 U 50 50 1 1 P N
+X NC K5 -600 800 200 R 50 50 1 1 N N
+X NC K8 -600 -100 200 R 50 50 1 1 N N
+X VSS K9 0 -1500 200 U 50 50 1 1 P N
+X ZQ0 A5 800 1000 200 L 50 50 2 1 I
+X NC A8 600 900 200 L 50 50 2 1 N N
+X DNU AA1 600 500 200 L 50 50 2 1 N N
+X VDDQ AA10 100 1500 200 D 50 50 2 1 W
+X DQ8_B AA11 800 -400 200 L 50 50 2 1 B
+X DNU AA12 600 400 200 L 50 50 2 1 N N
+X DQ0_B AA2 -800 -400 200 R 50 50 2 1 B
+X VDDQ AA3 100 1500 200 D 50 50 2 1 P N
+X DQ7_B AA4 -800 -1100 200 R 50 50 2 1 B
+X VDDQ AA5 100 1500 200 D 50 50 2 1 P N
+X VDDQ AA8 100 1500 200 D 50 50 2 1 P N
+X DQ15_B AA9 800 -1100 200 L 50 50 2 1 B
+X DNU AB1 600 300 200 L 50 50 2 1 N N
+X VSS AB10 0 -1500 200 U 50 50 2 1 W
+X DNU AB11 600 100 200 L 50 50 2 1 N N
+X DNU AB12 600 0 200 L 50 50 2 1 N N
+X DNU AB2 600 200 200 L 50 50 2 1 N N
+X VSS AB3 0 -1500 200 U 50 50 2 1 P N
+X VDD2 AB4 0 1500 200 D 50 50 2 1 W
+X VSS AB5 0 -1500 200 U 50 50 2 1 P N
+X VSS AB8 0 -1500 200 U 50 50 2 1 P N
+X VDD2 AB9 0 1500 200 D 50 50 2 1 P N
+X NC G11 600 800 200 L 50 50 2 1 N N
+X VDD2 N1 0 1500 200 D 50 50 2 1 P N
+X VDD2 N10 0 1500 200 D 50 50 2 1 P N
+X VSS N11 0 -1500 200 U 50 50 2 1 P N
+X VDD2 N12 0 1500 200 D 50 50 2 1 P N
+X VSS N2 0 -1500 200 U 50 50 2 1 P N
+X VDD2 N3 0 1500 200 D 50 50 2 1 P N
+X VSS N4 0 -1500 200 U 50 50 2 1 P N
+X NC N5 -600 800 200 R 50 50 2 1 N N
+X NC N8 -600 -100 200 R 50 50 2 1 N N
+X VSS N9 0 -1500 200 U 50 50 2 1 P N
+X VSS P1 0 -1500 200 U 50 50 2 1 P N
+X VSS P10 0 -1500 200 U 50 50 2 1 P N
+X CA5_B P11 -800 200 200 R 50 50 2 1 I
+X VSS P12 0 -1500 200 U 50 50 2 1 P N
+X CA1_B P2 -800 600 200 R 50 50 2 1 I
+X VSS P3 0 -1500 200 U 50 50 2 1 P N
+X CKE0_B P4 -800 100 200 R 50 50 2 1 I
+X NC P5 -600 0 200 R 50 50 2 1 N N
+X CK_T_B P8 -800 1200 200 R 50 50 2 1 I
+X CK_C_B P9 -800 1100 200 R 50 50 2 1 I
+X VDD2 R1 0 1500 200 D 50 50 2 1 P N
+X CA3_B R10 -800 400 200 R 50 50 2 1 I
+X CA4_B R11 -800 300 200 R 50 50 2 1 I
+X VDD2 R12 0 1500 200 D 50 50 2 1 P N
+X CA0_B R2 -800 700 200 R 50 50 2 1 I
+X NC R3 -600 900 200 R 50 50 2 1 N N
+X CS0_B R4 -800 1000 200 R 50 50 2 1 I
+X VDD2 R5 0 1500 200 D 50 50 2 1 P N
+X VDD2 R8 0 1500 200 D 50 50 2 1 P N
+X CA2_B R9 -800 500 200 R 50 50 2 1 I
+X VSS T1 0 -1500 200 U 50 50 2 1 P N
+X VSS T10 0 -1500 200 U 50 50 2 1 P N
+X RESET_N T11 800 1100 200 L 50 50 2 1 I
+X VSS T12 0 -1500 200 U 50 50 2 1 P N
+X ODT_CA_B T2 800 1200 200 L 50 50 2 1 I
+X VSS T3 0 -1500 200 U 50 50 2 1 P N
+X VDD1 T4 -100 1500 200 D 50 50 2 1 W
+X VSS T5 0 -1500 200 U 50 50 2 1 P N
+X VSS T8 0 -1500 200 U 50 50 2 1 P N
+X VDD1 T9 -100 1500 200 D 50 50 2 1 P N
+X VDD1 U1 -100 1500 200 D 50 50 2 1 P N
+X VDDQ U10 100 1500 200 D 50 50 2 1 P N
+X DQ11_B U11 800 -700 200 L 50 50 2 1 B
+X VDD1 U12 -100 1500 200 D 50 50 2 1 P N
+X DQ3_B U2 -800 -700 200 R 50 50 2 1 B
+X VDDQ U3 100 1500 200 D 50 50 2 1 P N
+X DQ4_B U4 -800 -800 200 R 50 50 2 1 B
+X VDD2 U5 0 1500 200 D 50 50 2 1 P N
+X VDD2 U8 0 1500 200 D 50 50 2 1 P N
+X DQ12_B U9 800 -800 200 L 50 50 2 1 B
+X VSS V1 0 -1500 200 U 50 50 2 1 P N
+X DQS1_C_B V10 800 -300 200 L 50 50 2 1 B
+X DQ10_B V11 800 -600 200 L 50 50 2 1 B
+X VSS V12 0 -1500 200 U 50 50 2 1 P N
+X DQ2_B V2 -800 -600 200 R 50 50 2 1 B
+X DQS0_C_B V3 -800 -300 200 R 50 50 2 1 B
+X DQ5_B V4 -800 -900 200 R 50 50 2 1 B
+X VSS V5 0 -1500 200 U 50 50 2 1 P N
+X VSS V8 0 -1500 200 U 50 50 2 1 P N
+X DQ13_B V9 800 -900 200 L 50 50 2 1 B
+X VDDQ W1 100 1500 200 D 50 50 2 1 P N
+X DQS1_T_B W10 800 -200 200 L 50 50 2 1 B
+X VSS W11 0 -1500 200 U 50 50 2 1 P N
+X VDDQ W12 100 1500 200 D 50 50 2 1 P N
+X VSS W2 0 -1500 200 U 50 50 2 1 P N
+X DQS0_T_B W3 -800 -200 200 R 50 50 2 1 B
+X VSS W4 0 -1500 200 U 50 50 2 1 P N
+X VDDQ W5 100 1500 200 D 50 50 2 1 P N
+X VDDQ W8 100 1500 200 D 50 50 2 1 P N
+X VSS W9 0 -1500 200 U 50 50 2 1 P N
+X VSS Y1 0 -1500 200 U 50 50 2 1 P N
+X DMI1_B Y10 800 -1200 200 L 50 50 2 1 B
+X DQ9_B Y11 800 -500 200 L 50 50 2 1 B
+X VSS Y12 0 -1500 200 U 50 50 2 1 P N
+X DQ1_B Y2 -800 -500 200 R 50 50 2 1 B
+X DMI0_B Y3 -800 -1200 200 R 50 50 2 1 B
+X DQ6_B Y4 -800 -1000 200 R 50 50 2 1 B
+X VSS Y5 0 -1500 200 U 50 50 2 1 P N
+X VSS Y8 0 -1500 200 U 50 50 2 1 P N
+X DQ14_B Y9 800 -1000 200 L 50 50 2 1 B
 ENDDRAW
 ENDDEF
 #
@@ -1371,6 +1593,216 @@ X A1 9 -500 600 100 R 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
+# MT48LC16M16A2TG
+#
+DEF MT48LC16M16A2TG U 0 20 Y Y 1 F N
+F0 "U" -350 1350 50 H V C CNN
+F1 "MT48LC16M16A2TG" 350 1350 50 H V C CNN
+F2 "Package_SO:TSOP-II-54_22.2x10.16mm_P0.8mm" 0 -1400 50 H I C CIN
+F3 "" 0 -250 50 H I C CNN
+ALIAS MT48LC16M16A2P
+$FPLIST
+ TSOP?II*22.2x10.16mm*P0.8mm*
+$ENDFPLIST
+DRAW
+S -400 1300 400 -1300 0 1 10 f
+X VDD 1 -100 1400 100 D 50 50 1 1 W
+X DQ5 10 500 700 100 L 50 50 1 1 B
+X DQ6 11 500 600 100 L 50 50 1 1 B
+X VSSQ 12 0 -1400 100 U 50 50 1 1 P N
+X DQ7 13 500 500 100 L 50 50 1 1 B
+X VDD 14 -100 1400 100 D 50 50 1 1 P N
+X DQML 15 -500 -800 100 R 50 50 1 1 I
+X ~WE~ 16 -500 -1000 100 R 50 50 1 1 I
+X ~CAS~ 17 -500 -1100 100 R 50 50 1 1 I
+X ~RAS~ 18 -500 -1200 100 R 50 50 1 1 I
+X ~CS~ 19 -500 -500 100 R 50 50 1 1 I
+X DQ0 2 500 1200 100 L 50 50 1 1 B
+X BA0 20 -500 1200 100 R 50 50 1 1 I
+X BA1 21 -500 1100 100 R 50 50 1 1 I
+X A10 22 -500 -100 100 R 50 50 1 1 I
+X A0 23 -500 900 100 R 50 50 1 1 I
+X A1 24 -500 800 100 R 50 50 1 1 I
+X A2 25 -500 700 100 R 50 50 1 1 I
+X A3 26 -500 600 100 R 50 50 1 1 I
+X VDD 27 -100 1400 100 D 50 50 1 1 P N
+X VSS 28 -100 -1400 100 U 50 50 1 1 W
+X A4 29 -500 500 100 R 50 50 1 1 I
+X VDDQ 3 0 1400 100 D 50 50 1 1 W
+X A5 30 -500 400 100 R 50 50 1 1 I
+X A6 31 -500 300 100 R 50 50 1 1 I
+X A7 32 -500 200 100 R 50 50 1 1 I
+X A8 33 -500 100 100 R 50 50 1 1 I
+X A9 34 -500 0 100 R 50 50 1 1 I
+X A11 35 -500 -200 100 R 50 50 1 1 I
+X A12 36 -500 -300 100 R 50 50 1 1 I
+X CKE 37 -500 -600 100 R 50 50 1 1 I
+X CLK 38 -500 -700 100 R 50 50 1 1 I
+X DQMH 39 -500 -900 100 R 50 50 1 1 I
+X DQ1 4 500 1100 100 L 50 50 1 1 B
+X NC 40 400 -800 100 L 50 50 1 1 N N
+X VSS 41 -100 -1400 100 U 50 50 1 1 P N
+X DQ8 42 500 400 100 L 50 50 1 1 B
+X VDDQ 43 0 1400 100 D 50 50 1 1 P N
+X DQ9 44 500 300 100 L 50 50 1 1 B
+X DQ10 45 500 200 100 L 50 50 1 1 B
+X VSSQ 46 0 -1400 100 U 50 50 1 1 P N
+X DQ11 47 500 100 100 L 50 50 1 1 B
+X DQ12 48 500 0 100 L 50 50 1 1 B
+X VDDQ 49 0 1400 100 D 50 50 1 1 P N
+X DQ2 5 500 1000 100 L 50 50 1 1 B
+X DQ13 50 500 -100 100 L 50 50 1 1 B
+X DQ14 51 500 -200 100 L 50 50 1 1 B
+X VSSQ 52 0 -1400 100 U 50 50 1 1 P N
+X DQ15 53 500 -300 100 L 50 50 1 1 B
+X VSS 54 -100 -1400 100 U 50 50 1 1 P N
+X VSSQ 6 0 -1400 100 U 50 50 1 1 W
+X DQ3 7 500 900 100 L 50 50 1 1 B
+X DQ4 8 500 800 100 L 50 50 1 1 B
+X VDDQ 9 0 1400 100 D 50 50 1 1 P N
+ENDDRAW
+ENDDEF
+#
+# MT48LC32M8A2TG
+#
+DEF MT48LC32M8A2TG U 0 20 Y Y 1 F N
+F0 "U" -350 1350 50 H V C CNN
+F1 "MT48LC32M8A2TG" 350 1350 50 H V C CNN
+F2 "Package_SO:TSOP-II-54_22.2x10.16mm_P0.8mm" 0 -1400 50 H I C CIN
+F3 "" 0 -250 50 H I C CNN
+ALIAS MT48LC32M8A2P
+$FPLIST
+ TSOP?II*22.2x10.16mm*P0.8mm*
+$ENDFPLIST
+DRAW
+S -400 1300 400 -1300 0 1 10 f
+X VDD 1 -100 1400 100 D 50 50 1 1 W
+X NC 10 400 100 100 L 50 50 1 1 N N
+X DQ3 11 500 900 100 L 50 50 1 1 B
+X VSSQ 12 0 -1400 100 U 50 50 1 1 P N
+X NC 13 400 300 100 L 50 50 1 1 N N
+X VDD 14 -100 1400 100 D 50 50 1 1 P N
+X NC 15 -400 -800 100 R 50 50 1 1 N N
+X ~WE~ 16 -500 -1000 100 R 50 50 1 1 I
+X ~CAS~ 17 -500 -1100 100 R 50 50 1 1 I
+X ~RAS~ 18 -500 -1200 100 R 50 50 1 1 I
+X ~CS~ 19 -500 -500 100 R 50 50 1 1 I
+X DQ0 2 500 1200 100 L 50 50 1 1 B
+X BA0 20 -500 1200 100 R 50 50 1 1 I
+X BA1 21 -500 1100 100 R 50 50 1 1 I
+X A10 22 -500 -100 100 R 50 50 1 1 I
+X A0 23 -500 900 100 R 50 50 1 1 I
+X A1 24 -500 800 100 R 50 50 1 1 I
+X A2 25 -500 700 100 R 50 50 1 1 I
+X A3 26 -500 600 100 R 50 50 1 1 I
+X VDD 27 -100 1400 100 D 50 50 1 1 P N
+X VSS 28 -100 -1400 100 U 50 50 1 1 W
+X A4 29 -500 500 100 R 50 50 1 1 I
+X VDDQ 3 0 1400 100 D 50 50 1 1 W
+X A5 30 -500 400 100 R 50 50 1 1 I
+X A6 31 -500 300 100 R 50 50 1 1 I
+X A7 32 -500 200 100 R 50 50 1 1 I
+X A8 33 -500 100 100 R 50 50 1 1 I
+X A9 34 -500 0 100 R 50 50 1 1 I
+X A11 35 -500 -200 100 R 50 50 1 1 I
+X A12 36 -500 -300 100 R 50 50 1 1 I
+X CKE 37 -500 -600 100 R 50 50 1 1 I
+X CLK 38 -500 -700 100 R 50 50 1 1 I
+X DQM 39 -500 -900 100 R 50 50 1 1 I
+X NC 4 400 -300 100 L 50 50 1 1 N N
+X NC 40 400 -800 100 L 50 50 1 1 N N
+X VSS 41 -100 -1400 100 U 50 50 1 1 P N
+X NC 42 400 400 100 L 50 50 1 1 N N
+X VDDQ 43 0 1400 100 D 50 50 1 1 P N
+X DQ4 44 500 800 100 L 50 50 1 1 B
+X NC 45 400 200 100 L 50 50 1 1 N N
+X VSSQ 46 0 -1400 100 U 50 50 1 1 P N
+X DQ5 47 500 700 100 L 50 50 1 1 B
+X NC 48 400 0 100 L 50 50 1 1 N N
+X VDDQ 49 0 1400 100 D 50 50 1 1 P N
+X DQ1 5 500 1100 100 L 50 50 1 1 B
+X DQ6 50 500 600 100 L 50 50 1 1 B
+X NC 51 400 -200 100 L 50 50 1 1 N N
+X VSSQ 52 0 -1400 100 U 50 50 1 1 P N
+X DQ7 53 500 500 100 L 50 50 1 1 B
+X VSS 54 -100 -1400 100 U 50 50 1 1 P N
+X VSSQ 6 0 -1400 100 U 50 50 1 1 W
+X NC 7 400 -100 100 L 50 50 1 1 N N
+X DQ2 8 500 1000 100 L 50 50 1 1 B
+X VDDQ 9 0 1400 100 D 50 50 1 1 P N
+ENDDRAW
+ENDDEF
+#
+# MT48LC64M4A2TG
+#
+DEF MT48LC64M4A2TG U 0 20 Y Y 1 F N
+F0 "U" -350 1350 50 H V C CNN
+F1 "MT48LC64M4A2TG" 350 1350 50 H V C CNN
+F2 "Package_SO:TSOP-II-54_22.2x10.16mm_P0.8mm" 0 -1400 50 H I C CIN
+F3 "" 0 -250 50 H I C CNN
+ALIAS MT48LC64M4A2P
+$FPLIST
+ TSOP?II*22.2x10.16mm*P0.8mm*
+$ENDFPLIST
+DRAW
+S -400 1300 400 -1300 0 1 10 f
+X VDD 1 -100 1400 100 D 50 50 1 1 W
+X NC 10 400 100 100 L 50 50 1 1 N N
+X DQ1 11 500 1100 100 L 50 50 1 1 B
+X VSSQ 12 0 -1400 100 U 50 50 1 1 P N
+X NC 13 400 300 100 L 50 50 1 1 N N
+X VDD 14 -100 1400 100 D 50 50 1 1 P N
+X NC 15 -400 -800 100 R 50 50 1 1 N N
+X ~WE~ 16 -500 -1000 100 R 50 50 1 1 I
+X ~CAS~ 17 -500 -1100 100 R 50 50 1 1 I
+X ~RAS~ 18 -500 -1200 100 R 50 50 1 1 I
+X ~CS~ 19 -500 -500 100 R 50 50 1 1 I
+X NC 2 400 500 100 L 50 50 1 1 N N
+X BA0 20 -500 1200 100 R 50 50 1 1 I
+X BA1 21 -500 1100 100 R 50 50 1 1 I
+X A10 22 -500 -100 100 R 50 50 1 1 I
+X A0 23 -500 900 100 R 50 50 1 1 I
+X A1 24 -500 800 100 R 50 50 1 1 I
+X A2 25 -500 700 100 R 50 50 1 1 I
+X A3 26 -500 600 100 R 50 50 1 1 I
+X VDD 27 -100 1400 100 D 50 50 1 1 P N
+X VSS 28 -100 -1400 100 U 50 50 1 1 W
+X A4 29 -500 500 100 R 50 50 1 1 I
+X VDDQ 3 0 1400 100 D 50 50 1 1 W
+X A5 30 -500 400 100 R 50 50 1 1 I
+X A6 31 -500 300 100 R 50 50 1 1 I
+X A7 32 -500 200 100 R 50 50 1 1 I
+X A8 33 -500 100 100 R 50 50 1 1 I
+X A9 34 -500 0 100 R 50 50 1 1 I
+X A11 35 -500 -200 100 R 50 50 1 1 I
+X A12 36 -500 -300 100 R 50 50 1 1 I
+X CKE 37 -500 -600 100 R 50 50 1 1 I
+X CLK 38 -500 -700 100 R 50 50 1 1 I
+X DQM 39 -500 -900 100 R 50 50 1 1 I
+X NC 4 400 -300 100 L 50 50 1 1 N N
+X NC 40 400 -800 100 L 50 50 1 1 N N
+X VSS 41 -100 -1400 100 U 50 50 1 1 P N
+X NC 42 400 400 100 L 50 50 1 1 N N
+X VDDQ 43 0 1400 100 D 50 50 1 1 P N
+X DQ2 44 500 1000 100 L 50 50 1 1 B
+X NC 45 400 200 100 L 50 50 1 1 N N
+X VSSQ 46 0 -1400 100 U 50 50 1 1 P N
+X NC 47 400 700 100 L 50 50 1 1 N N
+X NC 48 400 0 100 L 50 50 1 1 N N
+X VDDQ 49 0 1400 100 D 50 50 1 1 P N
+X DQ0 5 500 1200 100 L 50 50 1 1 B
+X DQ3 50 500 900 100 L 50 50 1 1 B
+X NC 51 400 -200 100 L 50 50 1 1 N N
+X VSSQ 52 0 -1400 100 U 50 50 1 1 P N
+X NC 53 400 800 100 L 50 50 1 1 N N
+X VSS 54 -100 -1400 100 U 50 50 1 1 P N
+X VSSQ 6 0 -1400 100 U 50 50 1 1 W
+X NC 7 400 -100 100 L 50 50 1 1 N N
+X NC 8 400 600 100 L 50 50 1 1 N N
+X VDDQ 9 0 1400 100 D 50 50 1 1 P N
+ENDDRAW
+ENDDEF
+#
 # W9812G6KH-5
 #
 DEF W9812G6KH-5 U 0 20 Y Y 1 F N
diff --git a/Power_Management.dcm b/Power_Management.dcm
index 936721deed..636ca11dea 100644
--- a/Power_Management.dcm
+++ b/Power_Management.dcm
@@ -288,6 +288,12 @@ K voltage detector cmos VSOF5
 F https://www.rohm.de/datasheet/BD4830FVE/bd48xxg-e
 $ENDCMP
 #
+$CMP BQ24230RGT
+D USB-Friendly Lithium-Ion Battery Charger And Power-Path Management IC, VQFN-16
+K Lithium-ion battery charger
+F http://www.ti.com/cn/lit/ds/symlink/bq24230.pdf
+$ENDCMP
+#
 $CMP BTN8982TA
 D High Current PN Half Bridge, TO-263-7
 K half bridge for motor drive applications
@@ -786,6 +792,24 @@ K high-voltage hot-swap
 F https://www.analog.com/media/en/technical-documentation/data-sheets/164112fc.pdf
 $ENDCMP
 #
+$CMP LT4230xDD
+D Ideal Diode Bridge Controller, DC to 60Hz, DFN-8
+K diode bridge replacement
+F https://www.analog.com/media/en/technical-documentation/data-sheets/4320fb.pdf
+$ENDCMP
+#
+$CMP LT4231xUF
+D PoE Ideal Diode Bridge Controller, QFN-16
+K LTPoE++ dual diode bridge replacement
+F https://www.analog.com/media/en/technical-documentation/data-sheets/4321f.pdf
+$ENDCMP
+#
+$CMP LT4320xDD-1
+D Ideal Diode Bridge Controller, DC to 600Hz, DFN-8
+K diode bridge replacement
+F https://www.analog.com/media/en/technical-documentation/data-sheets/4320fb.pdf
+$ENDCMP
+#
 $CMP LTC4242xUHF
 D Hot-Swap Power Controller, QFN-38
 K Dual-Slot PCIe
diff --git a/Power_Management.lib b/Power_Management.lib
index 1e512411a7..ee95594dc2 100644
--- a/Power_Management.lib
+++ b/Power_Management.lib
@@ -509,6 +509,38 @@ X VDD 5 0 300 100 D 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
+# BQ24230RGT
+#
+DEF BQ24230RGT U 0 20 Y Y 1 F N
+F0 "U" -350 750 50 H V C CNN
+F1 "BQ24230RGT" 200 750 50 H V C CNN
+F2 "Package_DFN_QFN:VQFN-16-1EP_3x3mm_P0.5mm_EP1.68x1.68mm_ThermalVias" 100 -1275 50 H I C CNN
+F3 "" -250 750 50 H I C CNN
+$FPLIST
+ VQFN*1EP*3x3mm*P0.5mm*
+$ENDFPLIST
+DRAW
+S -300 700 300 -600 0 1 10 f
+X TS 1 -400 -300 100 R 50 50 1 1 P
+X OUT 10 400 600 100 L 50 50 1 1 w
+X OUT 11 400 600 100 L 50 50 1 1 P N
+X ILIM 12 -400 400 100 R 50 50 1 1 P
+X IN 13 -400 600 100 R 50 50 1 1 W
+X TMR 14 -400 200 100 R 50 50 1 1 P
+X TD 15 400 -300 100 L 50 50 1 1 I
+X ISET 16 -400 300 100 R 50 50 1 1 P
+X VSS 17 0 -700 100 U 50 50 1 1 P N
+X BAT 2 -400 -500 100 R 50 50 1 1 B N
+X BAT 3 -400 -500 100 R 50 50 1 1 B
+X CE 4 400 -100 100 L 50 50 1 1 I
+X EN2 5 -400 0 100 R 50 50 1 1 I
+X EN1 6 -400 -100 100 R 50 50 1 1 I
+X PGOOD 7 400 200 100 L 50 50 1 1 C
+X VSS 8 0 -700 100 U 50 50 1 1 W
+X CHG 9 400 300 100 L 50 50 1 1 C
+ENDDRAW
+ENDDEF
+#
 # BTN8982TA
 #
 DEF BTN8982TA Q 0 20 Y Y 1 F N
@@ -1512,6 +1544,63 @@ X Vcc 8 -200 400 100 D 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
+# LT4230xDD
+#
+DEF LT4230xDD U 0 20 Y Y 1 F N
+F0 "U" -250 350 50 H V C CNN
+F1 "LT4230xDD" 50 350 50 H V L CNN
+F2 "Package_DFN_QFN:DFN-8-1EP_3x3mm_P0.5mm_EP1.65x2.38mm" 0 0 50 H I C CNN
+F3 "" -50 400 50 H I C CNN
+ALIAS LT4320xDD-1
+$FPLIST
+ DFN*1EP*3x3mm*P0.5mm*
+$ENDFPLIST
+DRAW
+S -300 300 300 -300 0 1 10 f
+X IN2 1 400 0 100 L 50 50 1 1 W
+X TG2 2 400 200 100 L 50 50 1 1 O
+X BG2 3 -400 -200 100 R 50 50 1 1 O
+X BG1 4 400 -200 100 L 50 50 1 1 O
+X OUTN 5 0 -400 100 U 50 50 1 1 W
+X OUTP 6 0 400 100 D 50 50 1 1 W
+X TG1 7 -400 200 100 R 50 50 1 1 O
+X IN1 8 -400 0 100 R 50 50 1 1 W
+X OUTN 9 0 -400 100 U 50 50 1 1 P N
+ENDDRAW
+ENDDEF
+#
+# LT4231xUF
+#
+DEF LT4231xUF U 0 20 Y Y 1 F N
+F0 "U" -250 550 50 H V C CNN
+F1 "LT4231xUF" 50 550 50 H V L CNN
+F2 "Package_DFN_QFN:QFN-16-1EP_4x4mm_P0.65mm_EP2.15x2.15mm" 0 0 50 H I C CNN
+F3 "" -50 600 50 H I C CNN
+$FPLIST
+ QFN*1EP*4x4mm*P0.65mm*
+$ENDFPLIST
+DRAW
+S -300 500 300 -500 0 1 10 f
+X TG36 1 -400 300 100 R 50 50 1 1 O
+X ~EN 10 400 400 100 L 50 50 1 1 O
+X EN 11 400 -400 100 L 50 50 1 1 O
+X OUTP 12 0 600 100 D 50 50 1 1 W
+X BG36 13 -400 -300 100 R 50 50 1 1 O
+X BG12 14 -400 -200 100 R 50 50 1 1 O
+X IN12 15 -400 100 100 R 50 50 1 1 W
+X TG12 16 -400 200 100 R 50 50 1 1 O
+X OUTN 17 0 -600 100 U 50 50 1 1 P N
+X IN36 2 -400 -100 100 R 50 50 1 1 W
+X IN45 3 400 100 100 L 50 50 1 1 W
+X TG45 4 400 300 100 L 50 50 1 1 O
+X TG78 5 400 200 100 L 50 50 1 1 O
+X IN78 6 400 -100 100 L 50 50 1 1 W
+X BG78 7 400 -200 100 L 50 50 1 1 O
+X BG45 8 400 -300 100 L 50 50 1 1 O
+X OUTN 9 0 -600 100 U 50 50 1 1 W
+ENDDRAW
+ENDDEF
+#
 # LTC4242xUHF
 #
 DEF LTC4242xUHF U 0 20 Y Y 1 F N
diff --git a/RF.dcm b/RF.dcm
index 4b4343fdcf..994c2aef3a 100644
--- a/RF.dcm
+++ b/RF.dcm
@@ -1,5 +1,11 @@
 EESchema-DOCLIB  Version 2.0
 #
+$CMP 0900PC15J0013
+D 868/915MHz Impedance Matched, Multi-Function, Integrated Ceramic Passive Component for Texas Instruments CC112x, CC117x & CC12xx Chipsets
+K CC1120 CC1121 CC1125 CC1175 CC1200 CC1201 balun
+F https://www.johansontechnology.com/datasheets/0900PC15J0013/0900PC15J0013.pdf
+$ENDCMP
+#
 $CMP ADC-10-1R
 D Directional Coupler, 5 to 900 MHz, 10 dB Coupling, 50 Ohm, Mini-Circuits CD542
 K Directional Coupler
diff --git a/RF.lib b/RF.lib
index bb73790872..c4353f8aae 100644
--- a/RF.lib
+++ b/RF.lib
@@ -1,6 +1,31 @@
 EESchema-LIBRARY Version 2.4
 #encoding utf-8
 #
+# 0900PC15J0013
+#
+DEF 0900PC15J0013 U 0 20 Y Y 1 F N
+F0 "U" -275 350 50 H V C CNN
+F1 "0900PC15J0013" 225 350 50 H V C CNN
+F2 "RF_Converter:Balun_Johanson_0900PC15J0013" 175 -400 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ Balun*Johanson*0900PC15J0013*
+$ENDFPLIST
+DRAW
+S -300 300 300 -200 0 1 10 f
+X LNA_N 1 -400 100 100 R 50 50 1 1 P
+X GND 10 0 -300 100 U 50 50 1 1 P N
+X LNA_P 2 -400 200 100 R 50 50 1 1 P
+X TRX 3 -400 0 100 R 50 50 1 1 P
+X PA 4 -400 -100 100 R 50 50 1 1 P
+X GND 5 0 -300 100 U 50 50 1 1 W
+X GND 6 0 -300 100 U 50 50 1 1 P N
+X ANT 7 400 200 100 L 50 50 1 1 P
+X GND 8 0 -300 100 U 50 50 1 1 P N
+X GND 9 0 -300 100 U 50 50 1 1 P N
+ENDDRAW
+ENDDEF
+#
 # ADC-10-1R
 #
 DEF ADC-10-1R U 0 20 Y Y 1 F N
diff --git a/RF_Amplifier.lib b/RF_Amplifier.lib
index 6836c8f28d..891d3fe097 100644
--- a/RF_Amplifier.lib
+++ b/RF_Amplifier.lib
@@ -205,22 +205,22 @@ ENDDEF
 DEF TRF37A73 U 0 20 Y Y 1 F N
 F0 "U" 300 100 50 H V C CNN
 F1 "TRF37A73" 450 -100 50 H V C CNN
-F2 "Package_SON:WSON-8-1EP_2x2mm_P0.5mm_EP0.9x1.6mm" 200 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
+F2 "Package_SON:WSON-8-1EP_2x2mm_P0.5mm_EP0.9x1.6mm" 0 0 50 H I C CNN
+F3 "" 500 -400 50 H I C CNN
 $FPLIST
  WSON*1EP*2x2mm*P0.5mm*
 $ENDFPLIST
 DRAW
-P 5 0 1 10 -100 200 -100 0 -100 -200 300 0 -100 200 f
-X VCC 1 100 200 100 D 20 20 1 1 W
-X RFIN 2 -200 0 100 R 20 20 1 1 I
-X NC 3 -100 100 100 R 20 20 1 1 N N
-X NC 4 -100 -100 100 R 20 20 1 1 N N
-X PWDN 5 0 200 50 D 20 20 1 1 P
-X NC 6 100 100 100 L 20 20 1 1 N N
+P 5 1 1 10 -200 250 -200 0 -200 -250 300 0 -200 250 f
+X VCC 1 100 300 200 D 20 20 1 1 W
+X RFIN 2 -300 0 100 R 20 20 1 1 I
+X NC 3 -300 -100 100 R 20 20 1 1 N
+X NC 4 -300 100 100 R 20 20 1 1 N
+X PWDN 5 0 300 150 D 20 20 1 1 P
+X NC 6 -300 200 100 R 20 20 1 1 N
 X RFOUT 7 400 0 100 L 20 20 1 1 O
-X NC 8 100 -100 100 L 20 20 1 1 N N
-X GND 9 100 -200 100 U 20 20 1 1 W
+X NC 8 -300 -200 100 R 20 20 1 1 N
+X GND 9 0 -300 150 U 20 20 1 1 W
 ENDDRAW
 ENDDEF
 #
diff --git a/RF_Bluetooth.dcm b/RF_Bluetooth.dcm
index 4833c1471a..5f03c25dc9 100644
--- a/RF_Bluetooth.dcm
+++ b/RF_Bluetooth.dcm
@@ -6,6 +6,18 @@ K Bluetooth Nordic nRF52
 F http://cdn.lairdtech.com/home/brandworld/files/Datasheet%20-%20BL652.pdf
 $ENDCMP
 #
+$CMP BM78SPPS5MC2
+D Bluetooth Dual-Mode, UART, Class 2
+K Bluetooth BLE BT GAP SPP SDP RFCOMM L2CAP GATT ATT SMP L2CAP
+F http://ww1.microchip.com/downloads/en/DeviceDoc/60001380C.pdf
+$ENDCMP
+#
+$CMP BM78SPPS5NC2
+D Bluetooth Dual-Mode, UART, Class 2
+K Bluetooth BLE BT GAP SPP SDP RFCOMM L2CAP GATT ATT SMP L2CAP
+F http://ww1.microchip.com/downloads/en/DeviceDoc/60001380C.pdf
+$ENDCMP
+#
 $CMP BTM112
 D Bluetooth SPP Module, UART, Class 2
 K Bluetooth BT SPP Module
@@ -24,12 +36,6 @@ K Bluetooth Low Energy nRF8001
 F https://www.olimex.com/Products/Modules/RF/MOD-nRF8001/
 $ENDCMP
 #
-$CMP nRF8001
-D BLE LE Connectivity IC, QFN-32
-K BLE, bluetooth
-F https://www.nordicsemi.com/eng/nordic/content_download/2981/38488/file/nRF8001_PS_v1.3.pdf
-$ENDCMP
-#
 $CMP RFD77101
 D Simblee Bluetooth Smart Module with ARM Cortex-M0 and integrated antenna
 K Simblee ARM Cortex-M0 Bluetooth antenna
@@ -66,4 +72,10 @@ K BLE bluetooth module low-power
 F http://www.st.com/resource/en/datasheet/spbtle-rf0.pdf
 $ENDCMP
 #
+$CMP nRF8001
+D BLE LE Connectivity IC, QFN-32
+K BLE, bluetooth
+F https://www.nordicsemi.com/eng/nordic/content_download/2981/38488/file/nRF8001_PS_v1.3.pdf
+$ENDCMP
+#
 #End Doc Library
diff --git a/RF_Bluetooth.lib b/RF_Bluetooth.lib
index 4c83a792ee..051958dce4 100644
--- a/RF_Bluetooth.lib
+++ b/RF_Bluetooth.lib
@@ -55,6 +55,62 @@ X SIO_18 9 1000 -800 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
+# BM78SPPS5MC2
+#
+DEF BM78SPPS5MC2 U 0 20 Y Y 1 F N
+F0 "U" -500 1150 50 H V L CNN
+F1 "BM78SPPS5MC2" 50 -1150 50 H V L CNN
+F2 "RF_Module:BM78SPPS5XC2" 650 1150 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+ALIAS BM78SPPS5NC2
+$FPLIST
+ BM78SPPS5XC2*
+$ENDFPLIST
+DRAW
+A -100 50 224 265 -265 0 1 10 f 100 150 100 -50
+A 0 0 112 -1534 -265 0 1 10 f -100 -50 100 -50
+A 0 100 112 1534 265 0 1 10 f -100 150 100 150
+A 100 50 224 1534 -1534 0 1 10 f -100 150 -100 -50
+S -500 1100 500 -1100 0 1 10 f
+P 2 0 1 20 0 50 -50 0 N
+P 2 0 1 20 0 50 -50 100 N
+P 6 0 1 20 0 150 50 100 0 50 50 0 0 -50 0 150 N
+X GND 1 0 -1200 100 U 50 50 1 1 W
+X PMULDO_O 10 600 300 100 L 50 50 1 1 P
+X P0_4 11 600 -200 100 L 50 50 1 1 O
+X P1_5 12 600 -700 100 L 50 50 1 1 O
+X SCL/P1_2 13 600 -500 100 L 50 50 1 1 O
+X SDA/P1_3 14 600 -600 100 L 50 50 1 1 B
+X P1_7 15 600 -800 100 L 50 50 1 1 B
+X P0_5 16 600 -300 100 L 50 50 1 1 B
+X P0_0 17 600 -100 100 L 50 50 1 1 B
+X P2_0 18 -600 -100 100 R 50 50 1 1 I
+X P2_4 19 -600 -200 100 R 50 50 1 1 I
+X GND 2 0 -1200 100 U 50 50 1 1 P N
+X EAN 20 -600 600 100 R 50 50 1 1 I
+X ~RST 21 -600 400 100 R 50 50 1 1 I
+X HCI_RXD 22 -600 200 100 R 50 50 1 1 I
+X HCI_TXD 23 -600 100 100 R 50 50 1 1 O
+X P3_1 24 -600 -400 100 R 50 50 1 1 B
+X P3_2 25 -600 -500 100 R 50 50 1 1 B
+X P3_3 26 -600 -600 100 R 50 50 1 1 B
+X P3_4 27 -600 -700 100 R 50 50 1 1 B
+X P3_6 28 -600 -800 100 R 50 50 1 1 B
+X P3_7 29 -600 -900 100 R 50 50 1 1 B
+X GND 3 0 -1200 100 U 50 50 1 1 P N
+X LED1 30 600 100 100 L 50 50 1 1 O
+X GND 31 0 -1200 100 U 50 50 1 1 P N
+X GND 32 0 -1200 100 U 50 50 1 1 P N
+X GND 33 0 -1200 100 U 50 50 1 1 P N
+X BAT_IN 4 0 1200 100 D 50 50 1 1 W
+X SW_BTN 5 -600 1000 100 R 50 50 1 1 I
+X LDO33_O 6 600 500 100 L 50 50 1 1 w
+X VDD_IO 7 100 1200 100 D 50 50 1 1 W
+X LDO18_O 8 600 600 100 L 50 50 1 1 w
+X WAKE_UP 9 -600 800 100 R 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
 # BTM112
 #
 DEF BTM112 U 0 40 Y Y 1 F N
@@ -203,54 +259,6 @@ X MISO 9 500 0 150 L 50 50 1 1 O
 ENDDRAW
 ENDDEF
 #
-# nRF8001
-#
-DEF nRF8001 U 0 40 Y Y 1 F N
-F0 "U" 0 -50 50 H V C CNN
-F1 "nRF8001" 0 50 50 H V C CNN
-F2 "Package_DFN_QFN:QFN-32-1EP_5x5mm_P0.5mm_EP3.45x3.45mm" 0 -1200 50 H I C CNN
-F3 "" 0 -50 50 H I C CNN
-$FPLIST
- QFN*1EP*5x5mm*P0.5mm*
-$ENDFPLIST
-DRAW
-S -650 650 650 -650 0 1 10 f
-X VDD 1 -200 800 150 D 50 50 1 1 W
-X RXD 10 -800 -100 150 R 50 50 1 1 I
-X SCK 11 -800 -200 150 R 50 50 1 1 I
-X REQN 12 -800 -300 150 R 50 50 1 1 B
-X MOSI 13 -800 -400 150 R 50 50 1 1 I
-X MISO 14 -800 -500 150 R 50 50 1 1 O
-X N/C 15 600 -400 150 L 50 50 1 1 N N
-X RDYN 16 800 -300 150 L 50 50 1 1 B
-X VSS 17 -200 -800 150 U 50 50 1 1 W
-X VSS 18 -100 -800 150 U 50 50 1 1 W
-X RESET 19 800 -200 150 L 50 50 1 1 I
-X DEC1 2 -800 500 150 R 50 50 1 1 B
-X VDD_PA 20 800 -100 150 L 50 50 1 1 O
-X ANT1 21 800 0 150 L 50 50 1 1 B
-X ANT2 22 800 100 150 L 50 50 1 1 B
-X VSS 23 0 -800 150 U 50 50 1 1 W
-X AVDD 24 0 800 150 D 50 50 1 1 W
-X IREF 25 800 200 150 L 50 50 1 1 I
-X AVDD 26 100 800 150 D 50 50 1 1 W
-X XC2 27 800 300 150 L 50 50 1 1 B
-X XC1 28 800 400 150 L 50 50 1 1 B
-X AVDD 29 200 800 150 D 50 50 1 1 W
-X DEC2 3 -800 400 150 R 50 50 1 1 B
-X VSS 30 100 -800 150 U 50 50 1 1 W
-X VSS 31 200 -800 150 U 50 50 1 1 W
-X DCC 32 800 500 150 L 50 50 1 1 B
-X EP 33 300 -800 150 U 50 50 1 1 W
-X XL2 4 -800 300 150 R 50 50 1 1 B
-X XL1 5 -800 200 150 R 50 50 1 1 B
-X ACTIVE 6 -800 100 150 R 50 50 1 1 B
-X TXD 7 -800 0 150 R 50 50 1 1 O
-X VSS 8 -300 -800 150 U 50 50 1 1 W
-X VDD 9 -100 800 150 D 50 50 1 1 W
-ENDDRAW
-ENDDEF
-#
 # RFD77101
 #
 DEF RFD77101 U 0 40 Y Y 1 F N
@@ -468,4 +476,52 @@ X SPI_MOSI 9 800 -200 150 L 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
+# nRF8001
+#
+DEF nRF8001 U 0 40 Y Y 1 F N
+F0 "U" 0 -50 50 H V C CNN
+F1 "nRF8001" 0 50 50 H V C CNN
+F2 "Package_DFN_QFN:QFN-32-1EP_5x5mm_P0.5mm_EP3.45x3.45mm" 0 -1200 50 H I C CNN
+F3 "" 0 -50 50 H I C CNN
+$FPLIST
+ QFN*1EP*5x5mm*P0.5mm*
+$ENDFPLIST
+DRAW
+S -650 650 650 -650 0 1 10 f
+X VDD 1 -200 800 150 D 50 50 1 1 W
+X RXD 10 -800 -100 150 R 50 50 1 1 I
+X SCK 11 -800 -200 150 R 50 50 1 1 I
+X REQN 12 -800 -300 150 R 50 50 1 1 B
+X MOSI 13 -800 -400 150 R 50 50 1 1 I
+X MISO 14 -800 -500 150 R 50 50 1 1 O
+X N/C 15 600 -400 150 L 50 50 1 1 N N
+X RDYN 16 800 -300 150 L 50 50 1 1 B
+X VSS 17 -200 -800 150 U 50 50 1 1 W
+X VSS 18 -100 -800 150 U 50 50 1 1 W
+X RESET 19 800 -200 150 L 50 50 1 1 I
+X DEC1 2 -800 500 150 R 50 50 1 1 B
+X VDD_PA 20 800 -100 150 L 50 50 1 1 O
+X ANT1 21 800 0 150 L 50 50 1 1 B
+X ANT2 22 800 100 150 L 50 50 1 1 B
+X VSS 23 0 -800 150 U 50 50 1 1 W
+X AVDD 24 0 800 150 D 50 50 1 1 W
+X IREF 25 800 200 150 L 50 50 1 1 I
+X AVDD 26 100 800 150 D 50 50 1 1 W
+X XC2 27 800 300 150 L 50 50 1 1 B
+X XC1 28 800 400 150 L 50 50 1 1 B
+X AVDD 29 200 800 150 D 50 50 1 1 W
+X DEC2 3 -800 400 150 R 50 50 1 1 B
+X VSS 30 100 -800 150 U 50 50 1 1 W
+X VSS 31 200 -800 150 U 50 50 1 1 W
+X DCC 32 800 500 150 L 50 50 1 1 B
+X EP 33 300 -800 150 U 50 50 1 1 W
+X XL2 4 -800 300 150 R 50 50 1 1 B
+X XL1 5 -800 200 150 R 50 50 1 1 B
+X ACTIVE 6 -800 100 150 R 50 50 1 1 B
+X TXD 7 -800 0 150 R 50 50 1 1 O
+X VSS 8 -300 -800 150 U 50 50 1 1 W
+X VDD 9 -100 800 150 D 50 50 1 1 W
+ENDDRAW
+ENDDEF
+#
 #End Library
diff --git a/RF_Module.dcm b/RF_Module.dcm
index abed9a262c..4febeceb65 100644
--- a/RF_Module.dcm
+++ b/RF_Module.dcm
@@ -1,5 +1,11 @@
 EESchema-DOCLIB  Version 2.0
 #
+$CMP ATSAMR21G18-MR210UA_NoRFPads
+D RF Module, ATSAMR21, Zigbee 802.15.4, external antenna, SMD
+K Wireless Zigbee 802.15.4 ATSAMR21G18 AT45DB041E TECC508A
+F http://ww1.microchip.com/downloads/en/devicedoc/atmel-42475-atsamr21g18-mr210ua_datasheet.pdf
+$ENDCMP
+#
 $CMP Ai-Thinker-Ra-01
 D Ai-Thinker Ra-01 410-525 MHz LoRa Module, SPI interface, external antenna
 K Ra-01 LoRa
@@ -144,6 +150,12 @@ K Wi-Fi module
 F https://docs.particle.io/datasheets/p1-datasheet/
 $ENDCMP
 #
+$CMP RAK4200
+D LoRa Module, STM32L071,  RAKwireless
+K IoT, LoRa, LoRaWAN, RF
+F https://downloads.rakwireless.com/LoRa/RAK4200/Hardware-Specification/RAK4200_Module_Specifications_V1.4.pdf
+$ENDCMP
+#
 $CMP RFM69HCW
 D Low power ISM Radio Transceiver Module, SPI interface, AES encryption, 434 or 915 MHz, up to 100mW, up to 300 kb/s, SMD-16, DIP-16
 K low power Radio ISM Transceiver Module AES encryption SPI HopeRF
@@ -258,4 +270,52 @@ K IOT LoRa
 F http://www.wireless-solutions.de/images/stories/downloads/Radio%20Modules/iM880B/General_Information/iM880B_Datasheet_V1_0.pdf
 $ENDCMP
 #
+$CMP RAK811-HF-EU868
+D LoRa Module, STM32L151, EU868, RAKwireless
+K IoT LoRa LoRaWAN RF
+F https://downloads.rakwireless.com/LoRa/RAK811/Hardware_Specification/RAK811_LoRa_Module_Datasheet_V1.4.pdf
+$ENDCMP
+#
+$CMP RAK811-HF-IN865
+D LoRa Module, STM32L151, IN865, RAKwireless
+K IoT LoRa LoRaWAN RF
+F https://downloads.rakwireless.com/LoRa/RAK811/Hardware_Specification/RAK811_LoRa_Module_Datasheet_V1.4.pdf
+$ENDCMP
+#
+$CMP RAK811-HF-US915
+D LoRa Module, STM32L151, US915, RAKwireless
+K IoT LoRa LoRaWAN RF
+F https://downloads.rakwireless.com/LoRa/RAK811/Hardware_Specification/RAK811_LoRa_Module_Datasheet_V1.4.pdf
+$ENDCMP
+#
+$CMP RAK811-HF-AU915
+D LoRa Module, STM32L151, AU915, RAKwireless
+K IoT LoRa LoRaWAN RF
+F https://downloads.rakwireless.com/LoRa/RAK811/Hardware_Specification/RAK811_LoRa_Module_Datasheet_V1.4.pdf
+$ENDCMP
+#
+$CMP RAK811-HF-KR920
+D LoRa Module, STM32L151, KR920, RAKwireless
+K IoT LoRa LoRaWAN RF
+F https://downloads.rakwireless.com/LoRa/RAK811/Hardware_Specification/RAK811_LoRa_Module_Datasheet_V1.4.pdf
+$ENDCMP
+#
+$CMP RAK811-HF-AS923
+D LoRa Module, STM32L151, AS923, RAKwireless
+K IoT LoRa LoRaWAN RF
+F https://downloads.rakwireless.com/LoRa/RAK811/Hardware_Specification/RAK811_LoRa_Module_Datasheet_V1.4.pdf
+$ENDCMP
+#
+$CMP RAK811-LF-EU433
+D LoRa Module, STM32L151, EU433, RAKwireless
+K IoT LoRa LoRaWAN RF
+F https://downloads.rakwireless.com/LoRa/RAK811/Hardware_Specification/RAK811_LoRa_Module_Datasheet_V1.4.pdf
+$ENDCMP
+#
+$CMP RAK811-LF-CN470
+D LoRa Module, STM32L151, CN470, RAKwireless
+K IoT LoRa LoRaWAN RF
+F https://downloads.rakwireless.com/LoRa/RAK811/Hardware_Specification/RAK811_LoRa_Module_Datasheet_V1.4.pdf
+$ENDCMP
+#
 #End Doc Library
diff --git a/RF_Module.lib b/RF_Module.lib
index d4f7a85965..e0e379453e 100644
--- a/RF_Module.lib
+++ b/RF_Module.lib
@@ -1,6 +1,63 @@
 EESchema-LIBRARY Version 2.4
 #encoding utf-8
 #
+# ATSAMR21G18-MR210UA_NoRFPads
+#
+DEF ATSAMR21G18-MR210UA_NoRFPads U 0 20 Y Y 1 F N
+F0 "U" -450 1150 50 H V L CNN
+F1 "ATSAMR21G18-MR210UA_NoRFPads" 50 1150 50 H V L CNN
+F2 "RF_Module:Atmel_ATSAMR21G18-MR210UA_NoRFPads" 100 0 50 V I C CNN
+F3 "" 0 -1500 50 H I C CNN
+$FPLIST
+ Atmel*ATSAMR21G18*MR210UA*NoRFPads*
+$ENDFPLIST
+DRAW
+S -400 1100 400 -1000 1 1 10 f
+X GND 1 0 -1100 100 U 50 50 1 1 W
+X PA28 10 500 -700 100 L 50 50 1 1 B
+X NC 11 -400 600 100 R 50 50 1 1 N N
+X GND 12 0 -1100 100 U 50 50 1 1 P N
+X PA07 13 500 700 100 L 50 50 1 1 B
+X PA08 14 500 600 100 L 50 50 1 1 B
+X NC 15 -400 500 100 R 50 50 1 1 N N
+X NC 16 -400 400 100 R 50 50 1 1 N N
+X PA13 17 500 400 100 L 50 50 1 1 B
+X PA12 18 500 500 100 L 50 50 1 1 B
+X PA24 19 500 -500 100 L 50 50 1 1 B
+X GND 2 0 -1100 100 U 50 50 1 1 P N
+X PA25 20 500 -600 100 L 50 50 1 1 B
+X NC 21 -400 300 100 R 50 50 1 1 N N
+X PA15 22 500 200 100 L 50 50 1 1 B
+X PA14 23 500 300 100 L 50 50 1 1 B
+X PA4 24 500 1000 100 L 50 50 1 1 B
+X PA5 25 500 900 100 L 50 50 1 1 B
+X PA6 26 500 800 100 L 50 50 1 1 B
+X NC 27 -400 200 100 R 50 50 1 1 N N
+X NC 28 -400 100 100 R 50 50 1 1 N N
+X GND 29 0 -1100 100 U 50 50 1 1 P N
+X VCC 3 0 1200 100 D 50 50 1 1 W
+X PA30 30 500 -800 100 L 50 50 1 1 B
+X PA31 31 500 -900 100 L 50 50 1 1 B
+X NC 32 -400 0 100 R 50 50 1 1 N N
+X ATECC508_GPIO 33 -500 800 100 R 50 50 1 1 B
+X NC 34 -400 -100 100 R 50 50 1 1 N N
+X NC 35 -400 -200 100 R 50 50 1 1 N N
+X PA23 36 500 -400 100 L 50 50 1 1 B
+X PA22 37 500 -300 100 L 50 50 1 1 B
+X NC 38 -400 -300 100 R 50 50 1 1 N N
+X NC 39 -400 -400 100 R 50 50 1 1 N N
+X VCC 4 0 1200 100 D 50 50 1 1 P N
+X NC 40 -400 -500 100 R 50 50 1 1 N N
+X GND 41 0 -1100 100 U 50 50 1 1 P N
+X GND 42 0 -1100 100 U 50 50 1 1 P N
+X ~RST 5 -500 1000 100 R 50 50 1 1 I
+X PA17 6 500 0 100 L 50 50 1 1 B
+X PA18 7 500 -100 100 L 50 50 1 1 B
+X PA16 8 500 100 100 L 50 50 1 1 B
+X PA19 9 500 -200 100 L 50 50 1 1 B
+ENDDRAW
+ENDDEF
+#
 # Ai-Thinker-Ra-01
 #
 DEF Ai-Thinker-Ra-01 U 0 20 Y Y 1 F N
@@ -838,6 +895,41 @@ X NC 9 -1000 1500 100 R 50 50 1 1 N N
 ENDDRAW
 ENDDEF
 #
+# RAK4200
+#
+DEF RAK4200 U 0 20 Y Y 1 F N
+F0 "U" 0 1100 50 H V C CNN
+F1 "RAK4200" 0 1000 50 H V C CNN
+F2 "RF_Module:RAK4200" 200 300 50 H I C CNN
+F3 "" 200 300 50 H I C CNN
+$FPLIST
+ RAK4200*
+$ENDFPLIST
+DRAW
+S -700 800 700 -800 0 1 10 f
+X PA3/UART2_RX 1 -800 400 100 R 50 50 1 1 B
+X I2C_SDA/PB7 10 800 500 100 L 50 50 1 1 B
+X GND 11 0 -900 100 U 50 50 1 1 W
+X RF 12 800 -600 100 L 50 50 1 1 P
+X GND 13 0 -900 100 U 50 50 1 1 P N
+X GND 14 0 -900 100 U 50 50 1 1 P N
+X PA5/SPI_CLK 15 -800 300 100 R 50 50 1 1 B
+X PA6/SPI_MISO 16 -800 200 100 R 50 50 1 1 B
+X PA7/SPI_MOSI 17 -800 100 100 R 50 50 1 1 B
+X ~MCU_NRESET 18 -800 -600 100 R 50 50 1 1 B
+X GND 19 0 -900 100 U 50 50 1 1 P N
+X PA2/UART2_TX 2 -800 500 100 R 50 50 1 1 B
+X VDD 20 0 900 100 D 50 50 1 1 W
+X PA1/UART2_DE 3 -800 600 100 R 50 50 1 1 B
+X PA9/UART1_TX 4 -800 0 100 R 50 50 1 1 B
+X PA10/UART1_RX 5 -800 -100 100 R 50 50 1 1 B
+X PA12/UART1_DE 6 -800 -200 100 R 50 50 1 1 B
+X PA13/SWDIO 7 -800 -300 100 R 50 50 1 1 B
+X PA14/SWCLK 8 -800 -400 100 R 50 50 1 1 B
+X I2C_SCL/PB6 9 800 600 100 L 50 50 1 1 B
+ENDDRAW
+ENDDEF
+#
 # RFM69HW
 #
 DEF RFM69HW U 0 40 Y Y 1 F N
@@ -1035,4 +1127,104 @@ X P6-IO/UART-RTS 9 -900 -300 100 R 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
+# RAK811-HF-EU868
+#
+DEF RAK811-HF-EU868 U 0 20 Y Y 1 F N
+F0 "U" 0 1250 50 H V C CNN
+F1 "RAK811-HF-EU868" 0 1100 50 H V C CNN
+F2 "RF_Module:RAK811" -450 1250 50 H I C CNN
+F3 "" -450 1250 50 H I C CNN
+ALIAS RAK811-HF-IN865 RAK811-HF-US915 RAK811-HF-AU915 RAK811-HF-KR920 RAK811-HF-AS923
+$FPLIST
+ RAK811*
+$ENDFPLIST
+DRAW
+S 500 -800 -500 800 0 1 10 f
+X GND 1 0 -900 100 U 50 50 0 0 W
+X PA13 10 -600 0 100 R 50 50 0 0 B
+X VCC 11 0 900 100 D 50 50 0 0 W
+X GND 12 0 -900 100 U 50 50 0 0 P N
+X PA14 13 -600 -100 100 R 50 50 0 0 B
+X PA15 14 -600 -200 100 R 50 50 0 0 B
+X PB3 15 600 600 100 L 50 50 0 0 B
+X PB5 16 600 400 100 L 50 50 0 0 B
+X BOOT0 17 -600 -700 100 R 50 50 0 0 I
+X PB8 18 600 300 100 L 50 50 0 0 B
+X PB9 19 600 200 100 L 50 50 0 0 B
+X PB12 2 600 -100 100 L 50 50 0 0 B
+X PA2 20 -600 500 100 R 50 50 0 0 B
+X GND 21 0 -900 100 U 50 50 0 0 P N
+X PA1 22 -600 600 100 R 50 50 0 0 B
+X PA0 23 -600 700 100 R 50 50 0 0 B
+X ~RST 24 -600 -500 100 R 50 50 0 0 I
+X PB10 25 600 100 100 L 50 50 0 0 B
+X PB11 26 600 0 100 L 50 50 0 0 B
+X PB2 27 600 700 100 L 50 50 0 0 B
+X GND 28 0 -900 100 U 50 50 0 0 P N
+X GND 29 0 -900 100 U 50 50 0 0 P N
+X PB14 3 600 -200 100 L 50 50 0 0 B
+X GND 30 0 -900 100 U 50 50 0 0 P N
+X GND 31 0 -900 100 U 50 50 0 0 P N
+X GND 32 0 -900 100 U 50 50 0 0 P N
+X RF_OUT 33 600 -500 100 L 50 50 0 0 P
+X GND 34 0 -900 100 U 50 50 0 0 P N
+X PB15 4 600 -300 100 L 50 50 0 0 B
+X PA8 5 -600 400 100 R 50 50 0 0 B
+X PA9/USART1_TX 6 -600 300 100 R 50 50 0 0 B
+X PA10/USART1_RX 7 -600 200 100 R 50 50 0 0 B
+X PA12 8 -600 100 100 R 50 50 0 0 B
+X PB4 9 600 500 100 L 50 50 0 0 B
+ENDDRAW
+ENDDEF
+#
+# RAK811-LF-EU433
+#
+DEF RAK811-LF-EU433 U 0 20 Y Y 1 F N
+F0 "U" 0 1250 50 H V C CNN
+F1 "RAK811-LF-EU433" 0 1100 50 H V C CNN
+F2 "RF_Module:RAK811" -450 1250 50 H I C CNN
+F3 "" -450 1250 50 H I C CNN
+ALIAS RAK811-LF-CN470
+$FPLIST
+ RAK811*
+$ENDFPLIST
+DRAW
+S 500 -800 -500 800 0 1 10 f
+X GND 1 0 -900 100 U 50 50 0 0 W
+X PA13 10 -600 -100 100 R 50 50 0 0 B
+X VCC 11 0 900 100 D 50 50 0 0 W
+X GND 12 0 -900 100 U 50 50 0 0 P N
+X PA14 13 -600 -200 100 R 50 50 0 0 B
+X PA15 14 -600 -300 100 R 50 50 0 0 B
+X PA3 15 -600 400 100 R 50 50 0 0 B
+X PB5 16 600 600 100 L 50 50 0 0 B
+X BOOT0 17 -600 -700 100 R 50 50 0 0 I
+X PB6 18 600 500 100 L 50 50 0 0 B
+X PB7 19 600 400 100 L 50 50 0 0 B
+X PB12 2 600 100 100 L 50 50 0 0 B
+X PA2 20 -600 500 100 R 50 50 0 0 B
+X GND 21 0 -900 100 U 50 50 0 0 P N
+X PA1 22 -600 600 100 R 50 50 0 0 B
+X PA0 23 -600 700 100 R 50 50 0 0 B
+X ~RST 24 -600 -500 100 R 50 50 0 0 I
+X PB10 25 600 300 100 L 50 50 0 0 B
+X PB11 26 600 200 100 L 50 50 0 0 B
+X PB2 27 600 700 100 L 50 50 0 0 B
+X GND 28 0 -900 100 U 50 50 0 0 P N
+X GND 29 0 -900 100 U 50 50 0 0 P N
+X PB14 3 600 -100 100 L 50 50 0 0 B
+X GND 30 0 -900 100 U 50 50 0 0 P N
+X GND 31 0 -900 100 U 50 50 0 0 P N
+X GND 32 0 -900 100 U 50 50 0 0 P N
+X RF_OUT 33 600 -500 100 L 50 50 0 0 P
+X GND 34 0 -900 100 U 50 50 0 0 P N
+X PB15 4 600 -200 100 L 50 50 0 0 B
+X PB13 5 600 0 100 L 50 50 0 0 B
+X PA9/USART1_TX 6 -600 300 100 R 50 50 0 0 B
+X PA10/USART1_RX 7 -600 200 100 R 50 50 0 0 B
+X PA12 8 -600 0 100 R 50 50 0 0 B
+X PA11 9 -600 100 100 R 50 50 0 0 B
+ENDDRAW
+ENDDEF
+#
 #End Library
diff --git a/RF_NFC.dcm b/RF_NFC.dcm
new file mode 100644
index 0000000000..384bba74a5
--- /dev/null
+++ b/RF_NFC.dcm
@@ -0,0 +1,9 @@
+EESchema-DOCLIB  Version 2.0
+#
+$CMP PN5321A3HN_C1xx
+D Near Field Communication (NFC) controller, QFN-40
+K NFC
+F https://www.nxp.com/docs/en/nxp/data-sheets/PN532_C1.pdf
+$ENDCMP
+#
+#End Doc Library
diff --git a/RF_NFC.lib b/RF_NFC.lib
new file mode 100644
index 0000000000..3c3d2afcd6
--- /dev/null
+++ b/RF_NFC.lib
@@ -0,0 +1,60 @@
+EESchema-LIBRARY Version 2.4
+#encoding utf-8
+#
+# PN5321A3HN_C1xx
+#
+DEF PN5321A3HN_C1xx U 0 20 Y Y 1 F N
+F0 "U" -600 1250 50 H V C CNN
+F1 "PN5321A3HN_C1xx" 600 1250 50 H V C CNN
+F2 "Package_DFN_QFN:HVQFN-40-1EP_6x6mm_P0.5mm_EP4.1x4.1mm" 1500 -1250 50 H I C CNN
+F3 "" 0 200 50 H I C CNN
+$FPLIST
+ HVQFN*1EP*6x6mm*P0.5mm*
+$ENDFPLIST
+DRAW
+S -700 1200 700 -1200 0 1 10 f
+X DVSS 1 -200 -1300 100 U 50 50 1 1 W
+X RX 10 800 700 100 L 50 50 1 1 I
+X AVSS 11 -100 -1300 100 U 50 50 1 1 W
+X AUX1 12 800 200 100 L 50 50 1 1 O
+X AUX2 13 800 100 100 L 50 50 1 1 O
+X OSCIN 14 -800 -600 100 R 50 50 1 1 I
+X OSCOUT 15 -800 -700 100 R 50 50 1 1 O
+X I0 16 -800 -900 100 R 50 50 1 1 P
+X I1 17 -800 -1000 100 R 50 50 1 1 P
+X TESTEN 18 200 -1300 100 U 50 50 1 1 P
+X P35 19 -800 -400 100 R 50 50 1 1 B
+X LOADMOD 2 800 500 100 L 50 50 1 1 O
+X N.C. 20 700 -100 100 L 50 50 1 1 N N
+X N.C. 21 700 -200 100 L 50 50 1 1 N N
+X N.C. 22 700 -300 100 L 50 50 1 1 N N
+X PVDD 23 100 1300 100 D 50 50 1 1 W
+X P30/UART_RX 24 -800 0 100 R 50 50 1 1 B
+X P70_IRQ 25 -800 700 100 R 50 50 1 1 B
+X ~RSTOUT 26 -800 800 100 R 50 50 1 1 O
+X NSS/P50_SCL/HSU_RX 27 -800 500 100 R 50 50 1 1 B
+X MOSI/SDA/HSU_TX 28 -800 400 100 R 50 50 1 1 B
+X MISO/P71 29 -800 300 100 R 50 50 1 1 B
+X TVSS1 3 0 -1300 100 U 50 50 1 1 W
+X SCK/P72 30 -800 200 100 R 50 50 1 1 B
+X P31/UART_TX 31 -800 -100 100 R 50 50 1 1 B
+X P32_INT0 32 -800 -200 100 R 50 50 1 1 B
+X P33_INT1 33 -800 -300 100 R 50 50 1 1 B
+X SIC_CLK/P34 34 800 -800 100 L 50 50 1 1 B
+X SIGOUT 35 800 -600 100 L 50 50 1 1 O
+X SIGIN 36 800 -700 100 L 50 50 1 1 I
+X SVDD 37 800 -500 100 L 50 50 1 1 O
+X ~RSTPD 38 -800 900 100 R 50 50 1 1 I
+X DVDD 39 200 1300 100 D 50 50 1 1 w
+X TX1 4 800 900 100 L 50 50 1 1 O
+X VBAT 40 -200 1300 100 D 50 50 1 1 W
+X AVSS 41 -100 -1300 100 U 50 50 1 1 P N
+X TVDD 5 0 1300 100 D 50 50 1 1 W
+X TX2 6 800 800 100 L 50 50 1 1 O
+X TVSS2 7 100 -1300 100 U 50 50 1 1 W
+X AVDD 8 -100 1300 100 D 50 50 1 1 W
+X VMID 9 800 400 100 L 50 50 1 1 O
+ENDDRAW
+ENDDEF
+#
+#End Library
diff --git a/RF_RFID.dcm b/RF_RFID.dcm
index 3058efac25..cd130e35ac 100644
--- a/RF_RFID.dcm
+++ b/RF_RFID.dcm
@@ -6,4 +6,10 @@ K HITAG RFID
 F https://www.nxp.com/docs/en/data-sheet/037031.pdf
 $ENDCMP
 #
+$CMP PN5120A0HN1
+D NFC frontend.  ISO/IEC 14443A&B, MIFARE®, FeliCa and NFC Forum tag types, HVQFN-32
+K PN512 RFID
+F https://www.nxp.com/docs/en/data-sheet/PN512.pdf
+$ENDCMP
+#
 #End Doc Library
diff --git a/RF_RFID.lib b/RF_RFID.lib
index 8bd7c82383..3562aaade1 100644
--- a/RF_RFID.lib
+++ b/RF_RFID.lib
@@ -1,4 +1,4 @@
-EESchema-LIBRARY Version 2.3
+EESchema-LIBRARY Version 2.4
 #encoding utf-8
 #
 # HTRC11001T
@@ -29,4 +29,52 @@ X DIN 9 -600 300 150 R 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
+# PN5120A0HN1
+#
+DEF PN5120A0HN1 U 0 20 Y Y 1 F N
+F0 "U" -600 1000 50 H V C CNN
+F1 "PN5120A0HN1" 600 -1000 50 H V C CNN
+F2 "Package_DFN_QFN:HVQFN-32-1EP_5x5mm_P0.5mm_EP3.1x3.1mm" 0 -1400 50 H I C CNN
+F3 "" 850 -550 50 H I C CNN
+$FPLIST
+ HVQFN*1EP*5x5mm*P0.5mm*
+$ENDFPLIST
+DRAW
+S -600 900 600 -900 0 1 10 f
+X A1 1 -700 0 100 R 50 50 1 1 I
+X TVSS 10 100 -1000 100 U 50 50 1 1 W
+X TX1 11 700 0 100 L 50 50 1 1 O
+X TVDD 12 100 1000 100 D 50 50 1 1 W
+X TX2 13 700 -100 100 L 50 50 1 1 O
+X TVSS 14 100 -1000 100 U 50 50 1 1 P N
+X AVDD 15 200 1000 100 D 50 50 1 1 W
+X VMID 16 400 1000 100 D 50 50 1 1 w
+X RX 17 -700 500 100 R 50 50 1 1 I
+X AVSS 18 200 -1000 100 U 50 50 1 1 W
+X AUX1 19 700 -300 100 L 50 50 1 1 O
+X PVDD 2 -200 1000 100 D 50 50 1 1 W
+X AUX2 20 700 -400 100 L 50 50 1 1 O
+X OSCIN 21 700 -700 100 L 50 50 1 1 I
+X OSCOUT 22 700 -600 100 L 50 50 1 1 O
+X IRQ 23 700 500 100 L 50 50 1 1 O
+X ALE 24 -700 300 100 R 50 50 1 1 I
+X D1 25 -700 -200 100 R 50 50 1 1 B
+X D2 26 -700 -300 100 R 50 50 1 1 B
+X D3 27 -700 -400 100 R 50 50 1 1 B
+X D4 28 -700 -500 100 R 50 50 1 1 B
+X D5 29 -700 -600 100 R 50 50 1 1 B
+X DVDD 3 -100 1000 100 D 50 50 1 1 W
+X D6 30 -700 -700 100 R 50 50 1 1 B
+X D7 31 -700 -800 100 R 50 50 1 1 B
+X A0 32 -700 100 100 R 50 50 1 1 I
+X EP 33 0 -1000 100 U 50 50 1 1 P
+X DVSS 4 -100 -1000 100 U 50 50 1 1 W
+X PVSS 5 -200 -1000 100 U 50 50 1 1 W
+X ~NRSTPD 6 -700 700 100 R 50 50 1 1 I
+X SIGIN 7 700 300 100 L 50 50 1 1 I
+X SIGOUT 8 700 200 100 L 50 50 1 1 O
+X SVDD 9 0 1000 100 D 50 50 1 1 W
+ENDDRAW
+ENDDEF
+#
 #End Library
diff --git a/Reference_Voltage.dcm b/Reference_Voltage.dcm
index 0eb28143dc..8aa4bff4e8 100644
--- a/Reference_Voltage.dcm
+++ b/Reference_Voltage.dcm
@@ -372,12 +372,228 @@ K Precision Micropower Low Dropout Voltage Reference 2.5V
 F http://www.ti.com/lit/ds/symlink/lm4128.pdf
 $ENDCMP
 #
+$CMP LM4132xMF-1.8
+D Precision Low Dropout Voltage Reference, 1.8V, ±0.05% to ±0.5%, SOT-23-5
+K Precision Low Dropout Voltage Reference 1.8V
+F http://www.ti.com/lit/ds/symlink/lm4132.pdf
+$ENDCMP
+#
+$CMP LM4132xMF-2.0
+D Precision Low Dropout Voltage Reference, 2.048V, ±0.05% to ±0.5%, SOT-23-5
+K Precision Low Dropout Voltage Reference 2.048V
+F http://www.ti.com/lit/ds/symlink/lm4132.pdf
+$ENDCMP
+#
+$CMP LM4132xMF-2.5
+D Precision Low Dropout Voltage Reference, 2.5V, ±0.05% to ±0.5%, SOT-23-5
+K Precision Low Dropout Voltage Reference 2.5V
+F http://www.ti.com/lit/ds/symlink/lm4132.pdf
+$ENDCMP
+#
+$CMP LM4132xMF-3.0
+D Precision Low Dropout Voltage Reference, 3.0V, ±0.05% to ±0.5%, SOT-23-5
+K Precision Low Dropout Voltage Reference 3.0V
+F http://www.ti.com/lit/ds/symlink/lm4132.pdf
+$ENDCMP
+#
+$CMP LM4132xMF-3.3
+D Precision Low Dropout Voltage Reference, 3.3V, ±0.05% to ±0.5%, SOT-23-5
+K Precision Low Dropout Voltage Reference 3.3V
+F http://www.ti.com/lit/ds/symlink/lm4132.pdf
+$ENDCMP
+#
+$CMP LM4132xMF-4.1
+D Precision Low Dropout Voltage Reference, 4.096V, ±0.05% to ±0.5%, SOT-23-5
+K Precision Low Dropout Voltage Reference 4.096V
+F http://www.ti.com/lit/ds/symlink/lm4132.pdf
+$ENDCMP
+#
 $CMP LT1019xN8
 D Precision Reference, Ultra Low Drift, DIP-8
 K voltage reference vref
 F https://www.analog.com/media/en/technical-documentation/data-sheets/1019fd.pdf
 $ENDCMP
 #
+$CMP LT1461AxS8-2.5
+D Voltage Reference, +/-0.04%, 2.5V, 100mA, 3V-20V Vin, SOIC-8
+K voltage reference precision
+F https://www.analog.com/media/en/technical-documentation/data-sheets/LT1461.pdf
+$ENDCMP
+#
+$CMP LT1461AxS8-3
+D Voltage Reference, +/-0.04%, 3V, 100mA, 3.5V-20V Vin, SOIC-8
+K voltage reference precision
+F https://www.analog.com/media/en/technical-documentation/data-sheets/LT1461.pdf
+$ENDCMP
+#
+$CMP LT1461AxS8-3.3
+D Voltage Reference, +/-0.04%, 3.3V, 100mA, 3.8V-20V Vin, SOIC-8
+K voltage reference precision
+F https://www.analog.com/media/en/technical-documentation/data-sheets/LT1461.pdf
+$ENDCMP
+#
+$CMP LT1461AxS8-4
+D Voltage Reference, +/-0.04%, 4.096V, 100mA, 4.596V-20V Vin, SOIC-8
+K voltage reference precision
+F https://www.analog.com/media/en/technical-documentation/data-sheets/LT1461.pdf
+$ENDCMP
+#
+$CMP LT1461AxS8-5
+D Voltage Reference, +/-0.04%, 5V, 100mA, 5.5V-20V Vin, SOIC-8
+K voltage reference precision
+F https://www.analog.com/media/en/technical-documentation/data-sheets/LT1461.pdf
+$ENDCMP
+#
+$CMP LT1461BxS8-2.5
+D Voltage Reference, +/-0.06%, 2.5V, 100mA, 3V-20V Vin, SOIC-8
+K voltage reference precision
+F https://www.analog.com/media/en/technical-documentation/data-sheets/LT1461.pdf
+$ENDCMP
+#
+$CMP LT1461BxS8-3
+D Voltage Reference, +/-0.06%, 3V, 100mA, 3.5V-20V Vin, SOIC-8
+K voltage reference precision
+F https://www.analog.com/media/en/technical-documentation/data-sheets/LT1461.pdf
+$ENDCMP
+#
+$CMP LT1461BxS8-3.3
+D Voltage Reference, +/-0.06%, 3.3V, 100mA, 3.8V-20V Vin, SOIC-8
+K voltage reference precision
+F https://www.analog.com/media/en/technical-documentation/data-sheets/LT1461.pdf
+$ENDCMP
+#
+$CMP LT1461BxS8-4
+D Voltage Reference, +/-0.06%, 4.096V, 100mA, 4.596V-20V Vin, SOIC-8
+K voltage reference precision
+F https://www.analog.com/media/en/technical-documentation/data-sheets/LT1461.pdf
+$ENDCMP
+#
+$CMP LT1461BxS8-5
+D Voltage Reference, +/-0.06%, 5V, 100mA, 5.5V-20V Vin, SOIC-8
+K voltage reference precision
+F https://www.analog.com/media/en/technical-documentation/data-sheets/LT1461.pdf
+$ENDCMP
+#
+$CMP LT1461CxS8-2.5
+D Voltage Reference, +/-0.08%, 2.5V, 100mA, 3V-20V Vin, SOIC-8
+K voltage reference precision
+F https://www.analog.com/media/en/technical-documentation/data-sheets/LT1461.pdf
+$ENDCMP
+#
+$CMP LT1461CxS8-3
+D Voltage Reference, +/-0.08%, 3V, 100mA, 3.5V-20V Vin, SOIC-8
+K voltage reference precision
+F https://www.analog.com/media/en/technical-documentation/data-sheets/LT1461.pdf
+$ENDCMP
+#
+$CMP LT1461CxS8-3.3
+D Voltage Reference, +/-0.08%, 3.3V, 100mA, 3.8V-20V Vin, SOIC-8
+K voltage reference precision
+F https://www.analog.com/media/en/technical-documentation/data-sheets/LT1461.pdf
+$ENDCMP
+#
+$CMP LT1461CxS8-4
+D Voltage Reference, +/-0.08%, 4.096V, 100mA, 4.596V-20V Vin, SOIC-8
+K voltage reference precision
+F https://www.analog.com/media/en/technical-documentation/data-sheets/LT1461.pdf
+$ENDCMP
+#
+$CMP LT1461CxS8-5
+D Voltage Reference, +/-0.08%, 5V, 100mA, 5.5V-20V Vin, SOIC-8
+K voltage reference precision
+F https://www.analog.com/media/en/technical-documentation/data-sheets/LT1461.pdf
+$ENDCMP
+#
+$CMP LT1461DxS8-2.5
+D Voltage Reference, +/-0.15%, 2.5V, 100mA, 3V-20V Vin, SOIC-8
+K voltage reference precision
+F https://www.analog.com/media/en/technical-documentation/data-sheets/LT1461.pdf
+$ENDCMP
+#
+$CMP LT1461DxS8-3
+D Voltage Reference, +/-0.15%, 3V, 100mA, 3.5V-20V Vin, SOIC-8
+K voltage reference precision
+F https://www.analog.com/media/en/technical-documentation/data-sheets/LT1461.pdf
+$ENDCMP
+#
+$CMP LT1461DxS8-3.3
+D Voltage Reference, +/-0.15%, 3.3V, 100mA, 3.8V-20V Vin, SOIC-8
+K voltage reference precision
+F https://www.analog.com/media/en/technical-documentation/data-sheets/LT1461.pdf
+$ENDCMP
+#
+$CMP LT1461DxS8-4
+D Voltage Reference, +/-0.15%, 4.096V, 100mA, 4.596V-20V Vin, SOIC-8
+K voltage reference precision
+F https://www.analog.com/media/en/technical-documentation/data-sheets/LT1461.pdf
+$ENDCMP
+#
+$CMP LT1461DxS8-5
+D Voltage Reference, +/-0.15%, 5V, 100mA, 5.5V-20V Vin, SOIC-8
+K voltage reference precision
+F https://www.analog.com/media/en/technical-documentation/data-sheets/LT1461.pdf
+$ENDCMP
+#
+$CMP LT1634BCMS8-1.25
+D 1.25V Micropower Precision Shunt Voltage Reference, MSOP-8
+K voltage reference Micropower
+F https://www.analog.com/media/en/technical-documentation/data-sheets/1634ff.pdf
+$ENDCMP
+#
+$CMP LT1634BCMS8-2.5
+D 2.5V Micropower Precision Shunt Voltage Reference, MSOP-8
+K voltage reference Micropower
+F https://www.analog.com/media/en/technical-documentation/data-sheets/1634ff.pdf
+$ENDCMP
+#
+$CMP LT1634CCZ-1.25
+D 1.25V Micropower Precision Shunt Voltage Reference, TO-92
+K voltage reference Micropower
+F https://www.analog.com/media/en/technical-documentation/data-sheets/1634ff.pdf
+$ENDCMP
+#
+$CMP LT1634CCZ-2.5
+D 2.5V Micropower Precision Shunt Voltage Reference, TO-92
+K voltage reference Micropower
+F https://www.analog.com/media/en/technical-documentation/data-sheets/1634ff.pdf
+$ENDCMP
+#
+$CMP LT1634CCZ-4.096
+D 4.096V Micropower Precision Shunt Voltage Reference, TO-92
+K voltage reference Micropower
+F https://www.analog.com/media/en/technical-documentation/data-sheets/1634ff.pdf
+$ENDCMP
+#
+$CMP LT1634CCZ-5
+D 5V Micropower Precision Shunt Voltage Reference, TO-92
+K voltage reference Micropower
+F https://www.analog.com/media/en/technical-documentation/data-sheets/1634ff.pdf
+$ENDCMP
+#
+$CMP LT1634xxS8-1.25
+D 1.25V Micropower Precision Shunt Voltage Reference, SO-8
+K voltage reference Micropower
+F https://www.analog.com/media/en/technical-documentation/data-sheets/1634ff.pdf
+$ENDCMP
+#
+$CMP LT1634xxS8-2.5
+D 2.5V Micropower Precision Shunt Voltage Reference, SO-8
+K voltage reference Micropower
+F https://www.analog.com/media/en/technical-documentation/data-sheets/1634ff.pdf
+$ENDCMP
+#
+$CMP LT1634xxS8-4.096
+D 4.096V Micropower Precision Shunt Voltage Reference, SO-8
+K voltage reference Micropower
+F https://www.analog.com/media/en/technical-documentation/data-sheets/1634ff.pdf
+$ENDCMP
+#
+$CMP LT1634xxS8-5
+D 5V Micropower Precision Shunt Voltage Reference, SO-8
+K voltage reference Micropower
+F https://www.analog.com/media/en/technical-documentation/data-sheets/1634ff.pdf
+$ENDCMP
+#
 $CMP LT1790-1.25
 D 1.25V Voltage Reference, Low Dropout, Micropower, TSOT-23-6
 K voltage reference Micropower
@@ -588,6 +804,150 @@ K Low-Dropout Precision Voltage Reference
 F https://pdfserv.maximintegrated.com/en/ds/MAX872-MAX874.pdf
 $ENDCMP
 #
+$CMP MCP1501-10xCH
+D 1.024V, 0.1%, 20mA, Precision Voltage Reference, SOT-23-6
+K precision buffered voltage reference 1.024V
+F http://ww1.microchip.com/downloads/en/DeviceDoc/20005474E.pdf
+$ENDCMP
+#
+$CMP MCP1501-10xRW
+D 1.024V, 0.1%, 20mA, Precision Voltage Reference, WDFN-8
+K precision buffered voltage reference 1.024V
+F http://ww1.microchip.com/downloads/en/DeviceDoc/20005474E.pdf
+$ENDCMP
+#
+$CMP MCP1501-10xSN
+D 1.024V, 0.1%, 20mA, Precision Voltage Reference, SOIC-8
+K precision buffered voltage reference 1.024V
+F http://ww1.microchip.com/downloads/en/DeviceDoc/20005474E.pdf
+$ENDCMP
+#
+$CMP MCP1501-12xCH
+D 1.25V, 0.1%, 20mA, Precision Voltage Reference, SOT-23-6
+K precision buffered voltage reference 1.25V
+F http://ww1.microchip.com/downloads/en/DeviceDoc/20005474E.pdf
+$ENDCMP
+#
+$CMP MCP1501-12xRW
+D 1.25V, 0.1%, 20mA, Precision Voltage Reference, WDFN-8
+K precision buffered voltage reference 1.25V
+F http://ww1.microchip.com/downloads/en/DeviceDoc/20005474E.pdf
+$ENDCMP
+#
+$CMP MCP1501-12xSN
+D 1.25V, 0.1%, 20mA, Precision Voltage Reference, SOIC-8
+K precision buffered voltage reference 1.25V
+F http://ww1.microchip.com/downloads/en/DeviceDoc/20005474E.pdf
+$ENDCMP
+#
+$CMP MCP1501-18xCH
+D 1.8V, 0.1%, 20mA, Precision Voltage Reference, SOT-23-6
+K precision buffered voltage reference 1.8V
+F http://ww1.microchip.com/downloads/en/DeviceDoc/20005474E.pdf
+$ENDCMP
+#
+$CMP MCP1501-18xRW
+D 1.8V, 0.1%, 20mA, Precision Voltage Reference, WDFN-8
+K precision buffered voltage reference 1.8V
+F http://ww1.microchip.com/downloads/en/DeviceDoc/20005474E.pdf
+$ENDCMP
+#
+$CMP MCP1501-18xSN
+D 1.8V, 0.1%, 20mA, Precision Voltage Reference, SOIC-8
+K precision buffered voltage reference 1.8V
+F http://ww1.microchip.com/downloads/en/DeviceDoc/20005474E.pdf
+$ENDCMP
+#
+$CMP MCP1501-20xCH
+D 2.048V, 0.1%, 20mA, Precision Voltage Reference, SOT-23-6
+K precision buffered voltage reference 2.048V
+F http://ww1.microchip.com/downloads/en/DeviceDoc/20005474E.pdf
+$ENDCMP
+#
+$CMP MCP1501-20xRW
+D 2.048V, 0.1%, 20mA, Precision Voltage Reference, WDFN-8
+K precision buffered voltage reference 2.048V
+F http://ww1.microchip.com/downloads/en/DeviceDoc/20005474E.pdf
+$ENDCMP
+#
+$CMP MCP1501-20xSN
+D 2.048V, 0.1%, 20mA, Precision Voltage Reference, SOIC-8
+K precision buffered voltage reference 2.048V
+F http://ww1.microchip.com/downloads/en/DeviceDoc/20005474E.pdf
+$ENDCMP
+#
+$CMP MCP1501-25xCH
+D 2.5V, 0.1%, 20mA, Precision Voltage Reference, SOT-23-6
+K precision buffered voltage reference 2.5V
+F http://ww1.microchip.com/downloads/en/DeviceDoc/20005474E.pdf
+$ENDCMP
+#
+$CMP MCP1501-25xRW
+D 2.5V, 0.1%, 20mA, Precision Voltage Reference, WDFN-8
+K precision buffered voltage reference 2.5V
+F http://ww1.microchip.com/downloads/en/DeviceDoc/20005474E.pdf
+$ENDCMP
+#
+$CMP MCP1501-25xSN
+D 2.5V, 0.1%, 20mA, Precision Voltage Reference, SOIC-8
+K precision buffered voltage reference 2.5V
+F http://ww1.microchip.com/downloads/en/DeviceDoc/20005474E.pdf
+$ENDCMP
+#
+$CMP MCP1501-30xCH
+D 3V, 0.1%, 20mA, Precision Voltage Reference, SOT-23-6
+K precision buffered voltage reference 3V
+F http://ww1.microchip.com/downloads/en/DeviceDoc/20005474E.pdf
+$ENDCMP
+#
+$CMP MCP1501-30xRW
+D 3V, 0.1%, 20mA, Precision Voltage Reference, WDFN-8
+K precision buffered voltage reference 3V
+F http://ww1.microchip.com/downloads/en/DeviceDoc/20005474E.pdf
+$ENDCMP
+#
+$CMP MCP1501-30xSN
+D 3V, 0.1%, 20mA, Precision Voltage Reference, SOIC-8
+K precision buffered voltage reference 3V
+F http://ww1.microchip.com/downloads/en/DeviceDoc/20005474E.pdf
+$ENDCMP
+#
+$CMP MCP1501-33xCH
+D 3.3V, 0.1%, 20mA, Precision Voltage Reference, SOT-23-6
+K precision buffered voltage reference 3.3V
+F http://ww1.microchip.com/downloads/en/DeviceDoc/20005474E.pdf
+$ENDCMP
+#
+$CMP MCP1501-33xRW
+D 3.3V, 0.1%, 20mA, Precision Voltage Reference, WDFN-8
+K precision buffered voltage reference 3.3V
+F http://ww1.microchip.com/downloads/en/DeviceDoc/20005474E.pdf
+$ENDCMP
+#
+$CMP MCP1501-33xSN
+D 3.3V, 0.1%, 20mA, Precision Voltage Reference, SOIC-8
+K precision buffered voltage reference 3.3V
+F http://ww1.microchip.com/downloads/en/DeviceDoc/20005474E.pdf
+$ENDCMP
+#
+$CMP MCP1501-40xCH
+D 4.096V, 0.1%, 20mA, Precision Voltage Reference, SOT-23-6
+K precision buffered voltage reference 4.096V
+F http://ww1.microchip.com/downloads/en/DeviceDoc/20005474E.pdf
+$ENDCMP
+#
+$CMP MCP1501-40xRW
+D 4.096V, 0.1%, 20mA, Precision Voltage Reference, WDFN-8
+K precision buffered voltage reference 4.096V
+F http://ww1.microchip.com/downloads/en/DeviceDoc/20005474E.pdf
+$ENDCMP
+#
+$CMP MCP1501-40xSN
+D 4.096V, 0.1%, 20mA, Precision Voltage Reference, SOIC-8
+K precision buffered voltage reference 4.096V
+F http://ww1.microchip.com/downloads/en/DeviceDoc/20005474E.pdf
+$ENDCMP
+#
 $CMP MCP1525-TO
 D 2.5V Voltage Reference, TO-92
 K Voltage Reference 2.5V
diff --git a/Reference_Voltage.lib b/Reference_Voltage.lib
index 75e7563956..aa22301199 100644
--- a/Reference_Voltage.lib
+++ b/Reference_Voltage.lib
@@ -347,6 +347,28 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -200 200 200 -200 0 1 10 f
+X NC 1 200 0 100 L 50 50 1 1 N N
+X GND 2 0 -300 100 U 50 50 1 1 W
+X EN 3 -300 0 100 R 50 50 1 1 I
+X VIN 4 -300 100 100 R 50 50 1 1 W
+X VREF 5 300 100 100 L 50 50 1 1 w
+ENDDRAW
+ENDDEF
+#
+# LM4132xMF-1.8
+#
+DEF LM4132xMF-1.8 U 0 20 Y Y 1 F N
+F0 "U" -170 240 50 H V C CNN
+F1 "LM4132xMF-1.8" 310 240 50 H V C CNN
+F2 "Package_TO_SOT_SMD:SOT-23-5" 0 -400 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+ALIAS LM4132xMF-2.0 LM4132xMF-2.5 LM4132xMF-3.0 LM4132xMF-3.3 LM4132xMF-4.1
+$FPLIST
+ SOT?23*
+$ENDFPLIST
+DRAW
+S -200 200 200 -200 0 1 10 f
+X NC 1 200 0 100 L 50 50 1 1 N N
 X GND 2 0 -300 100 U 50 50 1 1 W
 X EN 3 -300 0 100 R 50 50 1 1 I
 X VIN 4 -300 100 100 R 50 50 1 1 W
@@ -377,6 +399,96 @@ X DNC 8 -200 -100 100 R 50 50 1 0 N N
 ENDDRAW
 ENDDEF
 #
+# LT1461AxS8-2.5
+#
+DEF LT1461AxS8-2.5 U 0 20 Y Y 1 F N
+F0 "U" -250 250 50 H V C CNN
+F1 "LT1461AxS8-2.5" 350 250 50 H V C CNN
+F2 "Package_SO:SOIC-8_3.9x4.9mm_P1.27mm" -350 0 50 H I C CNN
+F3 "" -350 0 50 H I C CNN
+ALIAS LT1461AxS8-3 LT1461AxS8-3.3 LT1461AxS8-4 LT1461AxS8-5 LT1461BxS8-2.5 LT1461BxS8-3 LT1461BxS8-3.3 LT1461BxS8-4 LT1461BxS8-5 LT1461CxS8-2.5 LT1461CxS8-3 LT1461CxS8-3.3 LT1461CxS8-4 LT1461CxS8-5 LT1461DxS8-2.5 LT1461DxS8-3 LT1461DxS8-3.3 LT1461DxS8-4 LT1461DxS8-5
+$FPLIST
+ SOIC*3.9x4.9mm*P1.27mm*
+$ENDFPLIST
+DRAW
+S -300 200 300 -200 1 1 10 f
+X DNC 1 300 -100 100 L 50 50 1 1 N N
+X VIN 2 0 300 100 D 50 50 1 1 W
+X ~SHDN 3 -400 0 100 R 50 50 1 1 I
+X GND 4 0 -300 100 U 50 50 1 1 W
+X DNC 5 -300 -100 100 R 50 50 1 1 N N
+X VOUT 6 400 0 100 L 50 50 1 1 w
+X DNC 7 -300 100 100 R 50 50 1 1 N N
+X DNC 8 300 100 100 L 50 50 1 1 N N
+ENDDRAW
+ENDDEF
+#
+# LT1634BCMS8-1.25
+#
+DEF LT1634BCMS8-1.25 U 0 10 Y N 1 F N
+F0 "U" 50 150 50 H V C CNN
+F1 "LT1634BCMS8-1.25" 0 -100 50 H V C CNN
+F2 "Package_SO:MSOP-8_3x3mm_P0.65mm" 0 -200 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+ALIAS LT1634BCMS8-2.5
+$FPLIST
+ MSOP?8*3x3mm*P0.65mm*
+$ENDFPLIST
+DRAW
+P 2 1 1 0 0 100 0 15 N
+P 3 1 1 0 -50 0 0 0 50 0 N
+P 4 1 1 8 -50 -50 25 0 -50 50 -50 -50 N
+P 4 1 1 8 0 -50 25 -50 25 50 50 50 N
+X A 4 -150 0 100 R 50 50 1 1 P
+X Test 5 0 200 100 D 50 50 1 1 I
+X K 6 150 0 100 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# LT1634CCZ-1.25
+#
+DEF LT1634CCZ-1.25 U 0 20 Y N 1 F N
+F0 "U" 50 150 50 H V C CNN
+F1 "LT1634CCZ-1.25" 0 -100 50 H V C CNN
+F2 "Package_TO_SOT_THT:TO-92_Inline" 0 -200 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+ALIAS LT1634CCZ-2.5 LT1634CCZ-5 LT1634CCZ-4.096
+$FPLIST
+ TO?92*
+$ENDFPLIST
+DRAW
+P 2 1 1 0 0 100 0 15 N
+P 3 1 1 0 -50 0 0 0 50 0 N
+P 4 1 1 8 -50 -50 25 0 -50 50 -50 -50 N
+P 4 1 1 8 0 -50 25 -50 25 50 50 50 N
+X Test 1 0 200 100 D 50 50 1 1 I
+X K 2 150 0 100 L 50 50 1 1 P
+X A 3 -150 0 100 R 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# LT1634xxS8-1.25
+#
+DEF LT1634xxS8-1.25 U 0 20 Y N 1 F N
+F0 "U" 50 150 50 H V C CNN
+F1 "LT1634xxS8-1.25" 0 -100 50 H V C CNN
+F2 "Package_SO:SO-8_3.9x4.9mm_P1.27mm" 0 -200 50 H I C CNN
+F3 "" 0 200 50 H I C CNN
+ALIAS LT1634xxS8-2.5 LT1634xxS8-4.096 LT1634xxS8-5
+$FPLIST
+ SO?8*3.9x4.9mm*P1.27mm*
+$ENDFPLIST
+DRAW
+P 2 1 1 0 0 100 0 15 N
+P 3 1 1 0 -50 0 0 0 50 0 N
+P 4 1 1 8 -50 -50 25 0 -50 50 -50 -50 N
+P 4 1 1 8 0 -50 25 -50 25 50 50 50 N
+X A 4 -150 0 100 R 50 50 1 1 P
+X Test 5 0 200 100 D 50 50 1 1 I
+X K 6 150 0 100 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
 # LT1790-1.25
 #
 DEF LT1790-1.25 U 0 20 Y Y 1 F N
@@ -514,6 +626,76 @@ X COMP 8 500 0 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
+# MCP1501-10xCH
+#
+DEF MCP1501-10xCH U 0 20 Y Y 1 F N
+F0 "U" -250 250 50 H V C CNN
+F1 "MCP1501-10xCH" 400 250 50 H V C CNN
+F2 "Package_TO_SOT_SMD:SOT-23-6" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+ALIAS MCP1501-12xCH MCP1501-18xCH MCP1501-20xCH MCP1501-25xCH MCP1501-30xCH MCP1501-33xCH MCP1501-40xCH
+$FPLIST
+ SOT?23*
+$ENDFPLIST
+DRAW
+S -300 200 300 -200 0 1 10 f
+X OUT 1 400 0 100 L 50 50 0 0 w
+X GND 2 0 -300 100 U 50 50 0 0 W
+X GND 3 0 -300 100 U 50 50 0 0 P N
+X ~SHDN 4 -400 0 100 R 50 50 0 0 I
+X GND 5 0 -300 100 U 50 50 0 0 P N
+X VDD 6 0 300 100 D 50 50 0 0 W
+ENDDRAW
+ENDDEF
+#
+# MCP1501-10xRW
+#
+DEF MCP1501-10xRW U 0 20 Y Y 1 F N
+F0 "U" -200 250 50 H V C CNN
+F1 "MCP1501-10xRW" 400 250 50 H V C CNN
+F2 "Package_DFN_QFN:WDFN-8-1EP_2x2mm_P0.5mm_EP0.8x1.2mm" 100 0 50 H I C CNN
+F3 "" 200 0 50 H I C CNN
+ALIAS MCP1501-12xRW MCP1501-18xRW MCP1501-20xRW MCP1501-25xRW MCP1501-30xRW MCP1501-33xRW MCP1501-40xRW
+$FPLIST
+ WDFN*1EP*2x2mm*P0.5mm*
+$ENDFPLIST
+DRAW
+S -300 200 300 -200 0 1 10 f
+X VDD 1 0 300 100 D 50 50 0 0 W
+X GND 2 0 -300 100 U 50 50 0 0 W
+X ~SHDN 3 -400 0 100 R 50 50 0 0 I
+X GND 4 0 -300 100 U 50 50 0 0 P N
+X GND 5 0 -300 100 U 50 50 0 0 P N
+X GND 6 0 -300 100 U 50 50 0 0 P N
+X OUT 7 400 -100 100 L 50 50 0 0 w
+X FB 8 400 100 100 L 50 50 0 0 I
+ENDDRAW
+ENDDEF
+#
+# MCP1501-10xSN
+#
+DEF MCP1501-10xSN U 0 20 Y Y 1 F N
+F0 "U" -200 250 50 H V C CNN
+F1 "MCP1501-10xSN" 450 250 50 H V C CNN
+F2 "Package_SO:SOIC-8_3.9x4.9mm_P1.27mm" 0 0 50 H I C CNN
+F3 "" 200 0 50 H I C CNN
+ALIAS MCP1501-12xSN MCP1501-18xSN MCP1501-20xSN MCP1501-25xSN MCP1501-30xSN MCP1501-33xSN MCP1501-40xSN
+$FPLIST
+ SOIC*3.9x4.9mm*P1.27mm*
+$ENDFPLIST
+DRAW
+S -300 200 300 -200 0 1 10 f
+X VDD 1 0 300 100 D 50 50 0 0 W
+X GND 2 0 -300 100 U 50 50 0 0 W
+X ~SHDN 3 -400 0 100 R 50 50 0 0 I
+X GND 4 0 -300 100 U 50 50 0 0 P N
+X GND 5 0 -300 100 U 50 50 0 0 P N
+X GND 6 0 -300 100 U 50 50 0 0 P N
+X OUT 7 400 -100 100 L 50 50 0 0 w
+X FB 8 400 100 100 L 50 50 0 0 I
+ENDDRAW
+ENDDEF
+#
 # MCP1525-TO
 #
 DEF MCP1525-TO U 0 20 Y Y 1 F N
diff --git a/Regulator_Controller.dcm b/Regulator_Controller.dcm
index 148d9f9993..ff4b77221f 100644
--- a/Regulator_Controller.dcm
+++ b/Regulator_Controller.dcm
@@ -270,6 +270,12 @@ K pfc pwm controller
 F https://www.analog.com/media/en/technical-documentation/data-sheets/lt1509.pdf
 $ENDCMP
 #
+$CMP LT4295xUFD
+D IEEE 802.3bt PD Interface with Forward/Flyback Controller, QFN-28
+K LTPoE++ IEEE 802.3af IEEE 802.3at IEEE 802.3bt
+F https://www.analog.com/media/en/technical-documentation/data-sheets/LT4295.pdf
+$ENDCMP
+#
 $CMP LTC1624CS8
 D High Efficiency N-Channel Switching Regulator Controller, SOIC-8
 K Switching Regulator Controller
@@ -732,6 +738,12 @@ K SMPS PWM Controller
 F http://www.ti.com/lit/ds/symlink/ucc25600.pdf
 $ENDCMP
 #
+$CMP UCC256301
+D Hybrid Hysteretic LLC Resonant Controller, SOIC-16
+K SMPS PWM Controller
+F https://www.ti.com/lit/ds/symlink/ucc256301.pdf
+$ENDCMP
+#
 $CMP UCC2891
 D SMPS Current-Mode Active Clamp PWM Controller, SOIC-16/TSSOP-16
 K SMPS PWM Controller
diff --git a/Regulator_Controller.lib b/Regulator_Controller.lib
index e6f5cd9e24..30c7b0ca3f 100644
--- a/Regulator_Controller.lib
+++ b/Regulator_Controller.lib
@@ -837,6 +837,50 @@ X IAC 9 -600 100 100 R 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
+# LT4295xUFD
+#
+DEF LT4295xUFD U 0 20 Y Y 1 F N
+F0 "U" -500 750 50 H V L CNN
+F1 "LT4295xUFD" 150 750 50 H V L CNN
+F2 "Package_DFN_QFN:QFN-28-1EP_4x5mm_P0.5mm_EP2.65x3.65mm" 0 0 50 H I C CNN
+F3 "" 0 950 50 H I C CNN
+$FPLIST
+ QFN*1EP*4x5mm*P0.5mm*
+$ENDFPLIST
+DRAW
+S -500 700 500 -700 0 1 10 f
+X GND 1 0 -800 100 U 50 50 1 1 W
+X ROSC 10 -600 -300 100 R 50 50 1 1 P
+X SFST 11 -600 -400 100 R 50 50 1 1 P
+X FSSDLY 12 -600 600 100 R 50 50 1 1 I
+X ITHB 13 600 -200 100 L 50 50 1 1 I
+X FB31 14 600 -300 100 L 50 50 1 1 P
+X RLDCMP 15 -600 -500 100 R 50 50 1 1 P
+X ISEN- 16 600 400 100 L 50 50 1 1 P
+X ISEN+ 17 600 500 100 L 50 50 1 1 P
+X SG 18 600 200 100 L 50 50 1 1 O
+X GND 19 0 -800 100 U 50 50 1 1 P N
+X AUX 2 -600 -100 100 R 50 50 1 1 I
+X PG 20 600 600 100 L 50 50 1 1 O
+X VCC 21 -100 800 100 D 50 50 1 1 W
+X DNC 22 -500 -600 100 R 50 50 1 1 N N
+X SWVCC 23 -600 500 100 R 50 50 1 1 O
+X VIN 24 100 800 100 D 50 50 1 1 W
+X HSSRC 25 -600 300 100 R 50 50 1 1 I
+X HSGATE 26 -600 200 100 R 50 50 1 1 O
+X NC 27 -500 -700 100 R 50 50 1 1 N N
+X VPORT 28 -600 0 100 R 50 50 1 1 I
+X GND 29 0 -800 100 U 50 50 1 1 P N
+X RCLASS++ 3 600 -600 100 L 50 50 1 1 P
+X RCLASS 4 600 -500 100 L 50 50 1 1 P
+X T2P 5 600 0 100 L 50 50 1 1 C
+X VCC 6 0 800 100 D 50 50 1 1 W
+X VCC 7 0 800 100 D 50 50 1 1 P N
+X VCC 8 0 800 100 D 50 50 1 1 P N
+X VCC 9 0 800 100 D 50 50 1 1 P N
+ENDDRAW
+ENDDEF
+#
 # LTC1624CS8
 #
 DEF LTC1624CS8 U 0 20 Y Y 1 F N
@@ -1766,6 +1810,35 @@ X GD1 8 300 200 100 L 50 50 1 1 O
 ENDDRAW
 ENDDEF
 #
+# UCC256301
+#
+DEF UCC256301 U 0 20 Y Y 1 F N
+F0 "U" 100 -650 50 H V L CNN
+F1 "UCC256301" 100 -750 50 H V L CNN
+F2 "Package_SO:SOIC-14-16_3.9x9.9mm_P1.27mm" 50 0 50 H I C CIN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ SOIC*3.9x9.9mm*P1.27mm*
+$ENDFPLIST
+DRAW
+S -300 600 300 -600 0 1 10 f
+X HV 1 -400 400 100 R 50 50 1 1 I
+X LO 10 400 -500 100 L 50 50 1 1 O
+X GND 11 0 -700 100 U 50 50 1 1 W
+X RVCC 12 100 700 100 D 50 50 1 1 w
+X HB 14 400 400 100 L 50 50 1 1 I
+X HO 15 400 100 100 L 50 50 1 1 O
+X HS 16 400 -200 100 L 50 50 1 1 I
+X VCC 3 -100 700 100 D 50 50 1 1 W
+X BLK 4 -400 300 100 R 50 50 1 1 I
+X FB 5 -400 200 100 R 50 50 1 1 I
+X ISNS 6 -400 0 100 R 50 50 1 1 I
+X VCR 7 -400 -200 100 R 50 50 1 1 I
+X BW 8 -400 -400 100 R 50 50 1 1 I
+X LL/SS 9 -400 -500 100 R 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
 # UCC2891
 #
 DEF UCC2891 U 0 40 Y Y 1 F N
diff --git a/Regulator_Linear.dcm b/Regulator_Linear.dcm
index 0c46250e7d..a9c6747cfc 100644
--- a/Regulator_Linear.dcm
+++ b/Regulator_Linear.dcm
@@ -3486,6 +3486,30 @@ K Linear LDO Regulator 200mA 5V
 F http://www.ti.com/lit/ds/symlink/lp2987.pdf
 $ENDCMP
 #
+$CMP LP38512MR-ADJ
+D 1.5A Fast-Transient Response Low-Dropout Linear Voltage Regulator with Error Flag, Adjustable Output, HTSOP-8
+K LDO Linear Regulator
+F http://www.ti.com/lit/ds/symlink/lp38512-adj.pdf
+$ENDCMP
+#
+$CMP LP38512TJ-1.8
+D 1.5A Fast-Transient Response Low-Dropout Linear Voltage Regulator with Error Flag, 1.8V Output, NDQ
+K LDO Linear Regulator
+F http://www.ti.com/lit/ds/symlink/lp38512.pdf
+$ENDCMP
+#
+$CMP LP38512TJ-ADJ
+D 1.5A Fast-Transient Response Low-Dropout Linear Voltage Regulator with Error Flag, Adjustable Output, NDQ
+K LDO Linear Regulator
+F http://www.ti.com/lit/ds/symlink/lp38512-adj.pdf
+$ENDCMP
+#
+$CMP LP38512TS-1.8
+D 1.5A Fast-Transient Response Low-Dropout Linear Voltage Regulator with Error Flag, 1.8V Output, TO-263
+K LDO Linear Regulator DDPAK D2PAK
+F http://www.ti.com/lit/ds/symlink/lp38512.pdf
+$ENDCMP
+#
 $CMP LP38691SD-1.8
 D 500-mA Low-Dropout CMOS Linear Regulators Stable With Ceramic Output Capacitors, 1.8V output voltage, WSON-6
 K LDO Linear Regulator
@@ -5922,6 +5946,30 @@ K Single Output LDO
 F http://www.onsemi.com/pub/Collateral/NCP133-D.PDF
 $ENDCMP
 #
+$CMP NCP662SQ15
+D 100-mA, 12V Max. Input, Ultralow-IQ LDO, 1.5V, SC-82AB
+K LDO regulator voltage
+F https://www.onsemi.com/pub/Collateral/NCP662-D.PDF
+$ENDCMP
+#
+$CMP NCP662SQ18
+D 100-mA, 12V Max. Input, Ultralow-IQ LDO, 1.8V, SC-82AB
+K LDO regulator voltage
+F https://www.onsemi.com/pub/Collateral/NCP662-D.PDF
+$ENDCMP
+#
+$CMP NCP662SQ33
+D 100-mA, 12V Max. Input, Ultralow-IQ LDO, 3.3V, SC-82AB
+K LDO regulator voltage
+F https://www.onsemi.com/pub/Collateral/NCP662-D.PDF
+$ENDCMP
+#
+$CMP NCP662SQ50
+D 100-mA, 12V Max. Input, Ultralow-IQ LDO, 5.0V, SC-82AB
+K LDO regulator voltage
+F https://www.onsemi.com/pub/Collateral/NCP662-D.PDF
+$ENDCMP
+#
 $CMP NCP718xSN120
 D 300-mA, Wide Input Voltage, Low-IQ LDO, 1.2V, SOT-23
 K Single Output LDO Wide Input
@@ -7122,6 +7170,42 @@ K ldo positive
 F https://www.ti.com/lit/ds/symlink/tlv758p.pdf
 $ENDCMP
 #
+$CMP TLV76701DRVx
+D 1A, 16V Precision Linear Voltage Regulator, with enable pin, Adjustable Output 0.8-13.6V, WSON-6
+K 1A, 16V Precision Linear Voltage Regulator
+F www.ti.com/lit/gpn/TLV767
+$ENDCMP
+#
+$CMP TLV76708DRVx
+D 1A Precision Linear Voltage Regulator, with enable pin, Fixed Output 0.8V, WSON6
+K 1A Precision Linear Voltage Regulator
+F www.ti.com/lit/gpn/TLV767
+$ENDCMP
+#
+$CMP TLV76718DRVx
+D 1A Precision Linear Voltage Regulator, with enable pin, Fixed Output 1.8V, WSON6
+K 1A Precision Linear Voltage Regulator
+F www.ti.com/lit/gpn/TLV767
+$ENDCMP
+#
+$CMP TLV76728DRVx
+D 1A Precision Linear Voltage Regulator, with enable pin, Fixed Output 2.8V, WSON6
+K 1A Precision Linear Voltage Regulator
+F www.ti.com/lit/gpn/TLV767
+$ENDCMP
+#
+$CMP TLV76733DRVx
+D 1A Precision Linear Voltage Regulator, with enable pin, Fixed Output 3.3V, WSON6
+K 1A Precision Linear Voltage Regulator
+F www.ti.com/lit/gpn/TLV767
+$ENDCMP
+#
+$CMP TLV76750DRVx
+D 1A, 16V Precision Linear Voltage Regulator, with enable pin, Fixed Output 5.0V, WSON-6
+K 1A, 16V Precision Linear Voltage Regulator
+F www.ti.com/lit/gpn/TLV767
+$ENDCMP
+#
 $CMP TPS51200DRC
 D Sink and Source DDR Termination Regulator, VSON-10
 K DDR LDO
diff --git a/Regulator_Linear.lib b/Regulator_Linear.lib
index 88c7583d51..b2691fe0f6 100644
--- a/Regulator_Linear.lib
+++ b/Regulator_Linear.lib
@@ -559,6 +559,28 @@ X VI 3 -300 0 100 R 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
+# AZ1117-ADJ
+#
+DEF AZ1117-ADJ U 0 10 Y Y 1 F N
+F0 "U" -150 125 50 H V C CNN
+F1 "AZ1117-ADJ" 0 125 50 H V L CNN
+F2 "" 0 250 50 H I C CIN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ SOT?223*
+ SOT?89*
+ TO?220*
+ TO?252*
+ TO?263*
+$ENDFPLIST
+DRAW
+S -200 75 200 -200 0 1 10 f
+X ADJ 1 0 -300 100 U 50 50 1 1 I
+X VO 2 300 0 100 L 50 50 1 1 w
+X VI 3 -300 0 100 R 50 50 1 1 W
+ENDDRAW
+ENDDEF
+#
 # BD15GA5WEFJ
 #
 DEF BD15GA5WEFJ U 0 20 Y Y 1 F N
@@ -1357,28 +1379,6 @@ X VI 3 -300 0 100 R 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
-# AZ1117-ADJ
-#
-DEF AZ1117-ADJ U 0 10 Y Y 1 F N
-F0 "U" -150 125 50 H V C CNN
-F1 "AZ1117-ADJ" 0 125 50 H V L CNN
-F2 "" 0 250 50 H I C CIN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- SOT?223*
- SOT?89*
- TO?220*
- TO?252*
- TO?263*
-$ENDFPLIST
-DRAW
-S -200 75 200 -200 0 1 10 f
-X ADJ 1 0 -300 100 U 50 50 1 1 I
-X VO 2 300 0 100 L 50 50 1 1 w
-X VI 3 -300 0 100 R 50 50 1 1 W
-ENDDRAW
-ENDDEF
-#
 # LM317_SOT-223
 #
 DEF LM317_SOT-223 U 0 10 Y Y 1 F N
@@ -2050,6 +2050,93 @@ X GND 9 0 -400 100 U 50 50 1 1 P N
 ENDDRAW
 ENDDEF
 #
+# LP38512MR-ADJ
+#
+DEF LP38512MR-ADJ U 0 10 Y Y 1 F N
+F0 "U" -250 225 50 H V C CNN
+F1 "LP38512MR-ADJ" 0 225 50 H V L CNN
+F2 "Package_SO:Texas_HTSOP-8-1EP_3.9x4.9mm_P1.27mm_EP2.95x4.9mm_Mask2.4x3.1mm_ThermalVias" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ Texas*HTSOP*1EP*3.9x4.9mm*P1.27mm*
+$ENDFPLIST
+DRAW
+S -300 -200 300 175 0 1 10 f
+X OUT 1 400 100 100 L 50 50 1 1 w
+X OUT 2 400 100 100 L 50 50 1 1 P N
+X ADJ 3 400 0 100 L 50 50 1 1 I
+X NC 4 -300 -100 100 R 50 50 1 1 N N
+X GND 5 0 -300 100 U 50 50 1 1 W
+X EN 6 -400 0 100 R 50 50 1 1 I
+X IN 7 -400 100 100 R 50 50 1 1 W
+X IN 8 -400 100 100 R 50 50 1 1 P N
+X DAP 9 -100 -300 100 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# LP38512TJ-1.8
+#
+DEF LP38512TJ-1.8 U 0 10 Y Y 1 F N
+F0 "U" -250 225 50 H V C CNN
+F1 "LP38512TJ-1.8" 0 225 50 H V L CNN
+F2 "Package_TO_SOT_SMD:Texas_NDQ" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ Texas*NDQ*
+$ENDFPLIST
+DRAW
+S -300 -200 300 175 0 1 10 f
+X EN 1 -400 0 100 R 50 50 1 1 I
+X IN 2 -400 100 100 R 50 50 1 1 W
+X GND 3 0 -300 100 U 50 50 1 1 W
+X OUT 4 400 100 100 L 50 50 1 1 w
+X ~ERROR 5 400 0 100 L 50 50 1 1 C
+X GND 6 0 -300 100 U 50 50 1 1 P N
+ENDDRAW
+ENDDEF
+#
+# LP38512TJ-ADJ
+#
+DEF LP38512TJ-ADJ U 0 10 Y Y 1 F N
+F0 "U" -250 225 50 H V C CNN
+F1 "LP38512TJ-ADJ" 0 225 50 H V L CNN
+F2 "Package_TO_SOT_SMD:Texas_NDQ" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ Texas*NDQ*
+$ENDFPLIST
+DRAW
+S -300 -200 300 175 0 1 10 f
+X EN 1 -400 0 100 R 50 50 1 1 I
+X IN 2 -400 100 100 R 50 50 1 1 W
+X GND 3 0 -300 100 U 50 50 1 1 W
+X OUT 4 400 100 100 L 50 50 1 1 w
+X ADJ 5 400 0 100 L 50 50 1 1 I
+X GND 6 0 -300 100 U 50 50 1 1 P N
+ENDDRAW
+ENDDEF
+#
+# LP38512TS-1.8
+#
+DEF LP38512TS-1.8 U 0 10 Y Y 1 F N
+F0 "U" -250 225 50 H V C CNN
+F1 "LP38512TS-1.8" 0 225 50 H V L CNN
+F2 "Package_TO_SOT_SMD:TO-263-5_TabPin6" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ TO*263*TabPin6*
+$ENDFPLIST
+DRAW
+S -300 -200 300 175 0 1 10 f
+X EN 1 -400 0 100 R 50 50 1 1 I
+X IN 2 -400 100 100 R 50 50 1 1 W
+X GND 3 0 -300 100 U 50 50 1 1 W
+X OUT 4 400 100 100 L 50 50 1 1 w
+X ~ERROR 5 400 0 100 L 50 50 1 1 C
+X GND 6 0 -300 100 U 50 50 1 1 P N
+ENDDRAW
+ENDDEF
+#
 # LP38691SD-1.8
 #
 DEF LP38691SD-1.8 U 0 10 Y Y 1 F N
@@ -4191,6 +4278,26 @@ X GND 7 0 -300 150 U 50 50 0 1 P N
 ENDDRAW
 ENDDEF
 #
+# NCP662SQ15
+#
+DEF NCP662SQ15 U 0 10 Y Y 1 F N
+F0 "U" 0 325 50 H V C CNN
+F1 "NCP662SQ15" 0 250 50 H V C CNN
+F2 "Package_TO_SOT_SMD:SC-82AB" 0 400 50 H I C CNN
+F3 "" -300 800 50 H I C CNN
+ALIAS NCP662SQ18 NCP662SQ33 NCP662SQ50
+$FPLIST
+ SC?82AB*
+$ENDFPLIST
+DRAW
+S -200 200 200 -200 0 1 10 f
+X GND 1 0 -300 100 U 50 50 1 1 W
+X VIN 2 -300 100 100 R 50 50 1 1 W
+X VOUT 3 300 100 100 L 50 50 1 1 w
+X EN 4 -300 -100 100 R 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
 # NCV8114ASN120T1G
 #
 DEF NCV8114ASN120T1G U 0 20 Y Y 1 F N
@@ -4525,6 +4632,51 @@ X GND 7 0 -300 100 U 50 50 1 1 P N
 ENDDRAW
 ENDDEF
 #
+# TLV76701DRVx
+#
+DEF TLV76701DRVx U 0 20 Y Y 1 F N
+F0 "U" 0 350 50 H V C CNN
+F1 "TLV76701DRVx" 0 250 50 H V C CNN
+F2 "Package_SON:WSON-6-1EP_2x2mm_P0.65mm_EP1x1.6mm_ThermalVias" 0 450 50 H I C CNN
+F3 "" -50 0 50 H I C CNN
+$FPLIST
+ WSON*1EP*2x2mm*P0.65*
+$ENDFPLIST
+DRAW
+S -200 -200 200 200 0 1 10 f
+X OUT 1 300 100 100 L 50 50 1 1 w
+X FB 2 300 0 100 L 50 50 1 1 I
+X GND 3 0 -300 100 U 50 50 1 1 W
+X EN 4 -300 0 100 R 50 50 1 1 I
+X GND 5 0 -300 100 U 50 50 1 1 P N
+X IN 6 -300 100 100 R 50 50 1 1 W
+X PAD 7 -100 -300 100 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# TLV76750DRVx
+#
+DEF TLV76750DRVx U 0 20 Y Y 1 F N
+F0 "U" 0 350 50 H V C CNN
+F1 "TLV76750DRVx" 0 250 50 H V C CNN
+F2 "Package_SON:WSON-6-1EP_2x2mm_P0.65mm_EP1x1.6mm_ThermalVias" 0 450 50 H I C CNN
+F3 "" -50 0 50 H I C CNN
+ALIAS TLV76708DRVx TLV76718DRVx TLV76728DRVx TLV76733DRVx
+$FPLIST
+ WSON*1EP*2x2mm*P0.65*
+$ENDFPLIST
+DRAW
+S -200 -200 200 200 0 1 10 f
+X OUT 1 300 100 100 L 50 50 1 1 w
+X SNS 2 300 0 100 L 50 50 1 1 I
+X GND 3 0 -300 100 U 50 50 1 1 W
+X EN 4 -300 0 100 R 50 50 1 1 I
+X GND 5 0 -300 100 U 50 50 1 1 P N
+X IN 6 -300 100 100 R 50 50 1 1 W
+X PAD 7 -100 -300 100 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
 # TPS51200DRC
 #
 DEF TPS51200DRC U 0 20 Y Y 1 F N
diff --git a/Regulator_Switching.dcm b/Regulator_Switching.dcm
index c9d94e47ad..a9e19cb1ff 100644
--- a/Regulator_Switching.dcm
+++ b/Regulator_Switching.dcm
@@ -3813,43 +3813,43 @@ $ENDCMP
 $CMP NXE1S0303MC
 D 1W 3.3V to 3.3V 303mA DC-DC Converter with 3kV isolation
 K isolated isolation dc-dc converter transformer
-F http://power.murata.com/data/power/ncl/kdc_nxe1.pdf
+F https://www.murata.com/products/productdata/8807031865374/kdc-nxe1.pdf
 $ENDCMP
 #
 $CMP NXE1S0305MC
 D 1W 3.3V to 5V 200mA DC-DC Converter with 3kV isolation
 K isolated isolation dc-dc converter transformer
-F http://power.murata.com/data/power/ncl/kdc_nxe1.pdf
+F https://www.murata.com/products/productdata/8807031865374/kdc-nxe1.pdf
 $ENDCMP
 #
 $CMP NXE1S0505MC
 D 1W 5V to 5V 200mA DC-DC Converter with 3kV isolation
 K isolated isolation dc-dc converter transformer
-F http://power.murata.com/data/power/ncl/kdc_nxe1.pdf
+F https://www.murata.com/products/productdata/8807031865374/kdc-nxe1.pdf
 $ENDCMP
 #
 $CMP NXE2S0505MC
 D 2W 5V to 5V 400mA DC-DC Converter with 3kV isolation
 K isolated isolation dc-dc converter transformer
-F http://power.murata.com/data/power/ncl/kdc_nxe2.pdf
+F https://www.murata.com/products/productdata/8807031898142/kdc-nxe2.pdf
 $ENDCMP
 #
 $CMP NXE2S1205MC
 D 2W 12V to 5V 400mA DC-DC Converter with 3kV isolation
 K isolated isolation dc-dc converter transformer
-F http://power.murata.com/data/power/ncl/kdc_nxe2.pdf
+F https://www.murata.com/products/productdata/8807031898142/kdc-nxe2.pdf
 $ENDCMP
 #
 $CMP NXE2S1212MC
 D 2W 12V to 12V 400mA DC-DC Converter with 3kV isolation
 K isolated isolation dc-dc converter transformer
-F http://power.murata.com/data/power/ncl/kdc_nxe2.pdf
+F https://www.murata.com/products/productdata/8807031898142/kdc-nxe2.pdf
 $ENDCMP
 #
 $CMP NXE2S1215MC
 D 2W 12V to 15V 400mA DC-DC Converter with 3kV isolation
 K isolated isolation dc-dc converter transformer
-F http://power.murata.com/data/power/ncl/kdc_nxe2.pdf
+F https://www.murata.com/products/productdata/8807031898142/kdc-nxe2.pdf
 $ENDCMP
 #
 $CMP PAM2301CAAB120
diff --git a/Regulator_Switching.lib b/Regulator_Switching.lib
index 0e3f97683c..e92c8782d6 100644
--- a/Regulator_Switching.lib
+++ b/Regulator_Switching.lib
@@ -5548,11 +5548,11 @@ ENDDEF
 DEF NXE2S0505MC U 0 20 Y Y 1 F N
 F0 "U" -350 350 50 H V C CNN
 F1 "NXE2S0505MC" 100 350 50 H V C CNN
-F2 "Converter_DCDC:Converter_DCDC_muRata_NXExSxxxxMC_SMD" 0 -350 50 H I C CNN
+F2 "Converter_DCDC:Converter_DCDC_Murata_NXExSxxxxMC_SMD" 0 -350 50 H I C CNN
 F3 "" 0 -500 50 H I C CNN
 ALIAS NXE2S1205MC NXE2S1212MC NXE2S1215MC NXE1S0303MC NXE1S0305MC NXE1S0505MC
 $FPLIST
- Converter*DCDC*muRata*NXExSxxxxMC*
+ Converter*DCDC*Murata*NXExSxxxxMC*
 $ENDFPLIST
 DRAW
 S -400 300 400 -300 0 1 10 f
diff --git a/Sensor_Audio.dcm b/Sensor_Audio.dcm
index a58efdcb2a..3bb8aca149 100644
--- a/Sensor_Audio.dcm
+++ b/Sensor_Audio.dcm
@@ -18,4 +18,10 @@ K MEMS Microphone
 F http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/DM00025467.pdf
 $ENDCMP
 #
+$CMP SPH0641LU4H-1
+D Digital MEMS Microphone, LGA-5
+K Microphone MEMS
+F https://www.knowles.com/docs/default-source/model-downloads/sph0641lu4h-1-revb.pdf
+$ENDCMP
+#
 #End Doc Library
diff --git a/Sensor_Audio.lib b/Sensor_Audio.lib
index bc0ebecfd6..5832c5a78e 100644
--- a/Sensor_Audio.lib
+++ b/Sensor_Audio.lib
@@ -47,4 +47,26 @@ X VDD 6 0 300 100 D 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
+# SPH0641LU4H-1
+#
+DEF SPH0641LU4H-1 MK 0 20 Y Y 1 F N
+F0 "MK" 200 250 50 H V C CNN
+F1 "SPH0641LU4H-1" 350 -250 50 H V C CNN
+F2 "Sensor_Audio:Knowles_LGA-5_3.5x2.65mm" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ Knowles*LGA*3.5x2.65mm*
+$ENDFPLIST
+DRAW
+C -150 0 50 1 1 10 N
+S -300 200 300 -200 1 1 10 f
+P 2 1 1 15 -200 50 -200 -50 N
+X DATA 1 400 -100 100 L 50 50 1 1 O
+X SEL 2 400 100 100 L 50 50 1 1 I
+X GND 3 0 -300 100 U 50 50 1 1 W
+X CLOCK 4 400 0 100 L 50 50 1 1 I
+X VDD 5 0 300 100 D 50 50 1 1 W
+ENDDRAW
+ENDDEF
+#
 #End Library
diff --git a/Sensor_Gas.dcm b/Sensor_Gas.dcm
index ce08bfb4c4..0e0e8a99a0 100644
--- a/Sensor_Gas.dcm
+++ b/Sensor_Gas.dcm
@@ -1,5 +1,41 @@
 EESchema-DOCLIB  Version 2.0
 #
+$CMP 004-0-0010
+D S8 Commercial, CO2 sensor, 400-2000 PPM, 1kHz PWM output, Modbus, THT
+K Senseair co2 gas sensor pwm modbus
+F https://rmtplusstoragesenseair.blob.core.windows.net/docs/publicerat/PSP103.pdf
+$ENDCMP
+#
+$CMP 004-0-0013
+D S8 Residential, CO2 sensor, 400-2000 PPM, 1kHz PWM output, Modbus, THT
+K Senseair co2 gas sensor pwm modbus
+F https://rmtplusstoragesenseair.blob.core.windows.net/docs/publicerat/PSP107.pdf
+$ENDCMP
+#
+$CMP 004-0-0050
+D S8 2%, CO2 sensor, 0.04-2% by volume, 1kHz PWM output, Modbus, THT
+K Senseair co2 gas sensor pwm modbus
+F https://rmtplusstoragesenseair.blob.core.windows.net/docs/publicerat/PSP108.pdf
+$ENDCMP
+#
+$CMP 004-0-0053
+D S8 LP, CO2 sensor, 400-2000 PPM, 1kHz PWM output, Modbus, THT
+K Senseair co2 gas sensor pwm modbus
+F https://rmtplusstoragesenseair.blob.core.windows.net/docs/publicerat/PSP126.pdf
+$ENDCMP
+#
+$CMP 004-0-0071
+D S8 5%, CO2 sensor, 0.04-5% by volume, 1kHz PWM output, Modbus, THT
+K Senseair co2 gas sensor pwm modbus
+F https://rmtplusstoragesenseair.blob.core.windows.net/docs/publicerat/PSP0113.pdf
+$ENDCMP
+#
+$CMP 004-0-0075
+D S8 Commercial, CO2 sensor, 400-2000 PPM, 1kHz PWM output, Modbus, THT
+K Senseair co2 gas sensor pwm modbus
+F https://rmtplusstoragesenseair.blob.core.windows.net/docs/publicerat/PSP103.pdf
+$ENDCMP
+#
 $CMP CCS811
 D Ultra-low power digital gas sensor for monitoring indoor air quality
 K metal oxide gas sensor MOX volatile organix comounds VOC I2C
diff --git a/Sensor_Gas.lib b/Sensor_Gas.lib
index f3aba6dbcf..3cc1509e17 100644
--- a/Sensor_Gas.lib
+++ b/Sensor_Gas.lib
@@ -1,6 +1,31 @@
 EESchema-LIBRARY Version 2.4
 #encoding utf-8
 #
+# 004-0-0013
+#
+DEF 004-0-0013 U 0 20 Y Y 1 F N
+F0 "U" -450 350 50 H V C CNN
+F1 "004-0-0013" 300 350 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+ALIAS 004-0-0010 004-0-0075 004-0-0050 004-0-0071 004-0-0053
+$FPLIST
+ Senseair*S8*
+$ENDFPLIST
+DRAW
+S -500 300 500 -300 0 1 10 f
+X G+ 1 0 400 100 D 50 50 1 1 W
+X G0 2 0 -400 100 U 50 50 1 1 W
+X ALARM_OC 3 600 200 100 L 50 50 1 1 C
+X PWM_1KHZ 4 600 0 100 L 50 50 1 1 O
+X BCAL_IN 5 -600 -200 100 R 50 50 1 1 I
+X UART_R/T 6 -600 200 100 R 50 50 1 1 O
+X UART_TXD 7 -600 100 100 R 50 50 1 1 O
+X UART_RXD 8 -600 0 100 R 50 50 1 1 I
+X DVCC_OUT 9 600 -200 100 L 50 50 1 1 w
+ENDDRAW
+ENDDEF
+#
 # CCS811
 #
 DEF CCS811 U 0 20 Y Y 1 F N
diff --git a/Sensor_Magnetic.dcm b/Sensor_Magnetic.dcm
index 3e09e307d4..d2b113cdf8 100644
--- a/Sensor_Magnetic.dcm
+++ b/Sensor_Magnetic.dcm
@@ -1,51 +1,51 @@
 EESchema-DOCLIB  Version 2.0
 #
 $CMP A1101ELHL
-D Hall effect switch, unipolar, Bop=100G, Brp=45G, -40C to +85C
+D Hall effect switch, unipolar, Bop=100G, Brp=45G, -40C to +85C, SOT-23W
 K hall switch
-F http://www.allegromicro.com/en/Products/Part_Numbers/1101/1101.pdf
+F https://www.allegromicro.com/-/media/files/datasheets/a110x-datasheet.ashx
 $ENDCMP
 #
 $CMP A1101LLHL
-D Hall effect switch, unipolar, Bop=100G, Brp=45G, -40C to +125C
+D Hall effect switch, unipolar, Bop=100G, Brp=45G, -40C to +125C, SOT-23W
 K hall switch
-F http://www.allegromicro.com/en/Products/Part_Numbers/1101/1101.pdf
+F https://www.allegromicro.com/-/media/files/datasheets/a110x-datasheet.ashx
 $ENDCMP
 #
 $CMP A1102ELHL
-D Hall effect switch, unipolar, Bop=180G, Brp=125G, -40C to +85C
+D Hall effect switch, unipolar, Bop=180G, Brp=125G, -40C to +85C, SOT-23W
 K hall switch
-F http://www.allegromicro.com/en/Products/Part_Numbers/1101/1101.pdf
+F https://www.allegromicro.com/-/media/files/datasheets/a110x-datasheet.ashx
 $ENDCMP
 #
 $CMP A1102LLHL
-D Hall effect switch, unipolar, Bop=180G, Brp=125G, -40C to +125C
+D Hall effect switch, unipolar, Bop=180G, Brp=125G, -40C to +125C, SOT-23W
 K hall switch
-F http://www.allegromicro.com/en/Products/Part_Numbers/1101/1101.pdf
+F https://www.allegromicro.com/-/media/files/datasheets/a110x-datasheet.ashx
 $ENDCMP
 #
 $CMP A1103ELHL
-D Hall effect switch, unipolar, Bop=280G, Brp=225G, -40C to +85C
+D Hall effect switch, unipolar, Bop=280G, Brp=225G, -40C to +85C, SOT-23W
 K hall switch
-F http://www.allegromicro.com/en/Products/Part_Numbers/1101/1101.pdf
+F https://www.allegromicro.com/-/media/files/datasheets/a110x-datasheet.ashx
 $ENDCMP
 #
 $CMP A1103LLHL
-D Hall effect switch, unipolar, Bop=280G, Brp=225G, -40C to +125C
+D Hall effect switch, unipolar, Bop=280G, Brp=225G, -40C to +125C, SOT-23W
 K hall switch
-F http://www.allegromicro.com/en/Products/Part_Numbers/1101/1101.pdf
+F https://www.allegromicro.com/-/media/files/datasheets/a110x-datasheet.ashx
 $ENDCMP
 #
 $CMP A1104LLHL
-D Hall effect switch, unipolar, Bop=240G, Brp=200G, -40C to +125C
+D Hall effect switch, unipolar, Bop=240G, Brp=200G, -40C to +125C, SOT-23W
 K hall switch
-F http://www.allegromicro.com/en/Products/Part_Numbers/1101/1101.pdf
+F https://www.allegromicro.com/-/media/files/datasheets/a110x-datasheet.ashx
 $ENDCMP
 #
 $CMP A1106LLHL
-D Hall effect switch, unipolar, Bop=340G, Brp=240G, -40C to +125C
+D Hall effect switch, unipolar, Bop=340G, Brp=240G, -40C to +125C, SOT-23W
 K hall switch
-F http://www.allegromicro.com/en/Products/Part_Numbers/1101/1101.pdf
+F https://www.allegromicro.com/-/media/files/datasheets/a110x-datasheet.ashx
 $ENDCMP
 #
 $CMP A1301EUA-T
@@ -156,16 +156,76 @@ K BOSH Geomagnetic Sensor
 F https://www.mouser.com/datasheet/2/783/BST-BMM150-DS001-01-786480.pdf
 $ENDCMP
 #
-$CMP DRV5033AJQDBZ
-D Hall effect switch, omnipolar, Bop=6.9mT, Brp=3.5, -40C to +125C
-K hall switch
-F http://www.ti.com/lit/ds/symlink/drv5033.pdf
+$CMP DRV5033AJxDBZ
+D ±6.9 / ±3.5 mT, 20-kHz, 2-38V, SOT-23
+K Digital Omnipolar Switch Hall Effect Sensor
+F https://www.ti.com/lit/ds/symlink/drv5033.pdf
 $ENDCMP
 #
-$CMP DRV5033FAQDBZ
-D Hall effect switch, omnipolar, Bop=3.5mT, Brp=2.0, -40C to +125C
-K hall switch
-F http://www.ti.com/lit/ds/symlink/drv5033.pdf
+$CMP DRV5033AJxLPG
+D ±6.9 / ±3.5 mT, 20-kHz, 2-38V, TO-92
+K Digital Omnipolar Switch Hall Effect Sensor
+F https://www.ti.com/lit/ds/symlink/drv5033.pdf
+$ENDCMP
+#
+$CMP DRV5033FAxDBZ
+D ±3.5 / ±2 mT, 20-kHz, 2-38V, SOT-23
+K Digital Omnipolar Switch Hall Effect Sensor
+F https://www.ti.com/lit/ds/symlink/drv5033.pdf
+$ENDCMP
+#
+$CMP DRV5033FAxLPG
+D ±3.5 / ±2 mT, 20-kHz, 2-38V, TO-92
+K Digital Omnipolar Switch Hall Effect Sensor
+F https://www.ti.com/lit/ds/symlink/drv5033.pdf
+$ENDCMP
+#
+$CMP DRV5055A1xDBZxQ1
+D 100 mV/mT,±21-mT, 20-kHz, 3.3/5V, SOT-23
+K Automotive Ratiometric Linear Hall Effect Sensor AEC-Q100
+F https://www.ti.com/lit/ds/symlink/drv5055-q1.pdf
+$ENDCMP
+#
+$CMP DRV5055A1xLPGxQ1
+D 100 mV/mT,±21-mT, 20-kHz, 3.3/5V, TO-92
+K Automotive Ratiometric Linear Hall Effect Sensor AEC-Q100
+F https://www.ti.com/lit/ds/symlink/drv5055-q1.pdf
+$ENDCMP
+#
+$CMP DRV5055A2xDBZxQ1
+D 50 mV/mT,±42-mT, 20-kHz, 3.3/5V, SOT-23
+K Automotive Ratiometric Linear Hall Effect Sensor AEC-Q100
+F https://www.ti.com/lit/ds/symlink/drv5055-q1.pdf
+$ENDCMP
+#
+$CMP DRV5055A2xLPGxQ1
+D 50 mV/mT,±42-mT, 20-kHz, 3.3/5V, TO-92
+K Automotive Ratiometric Linear Hall Effect Sensor AEC-Q100
+F https://www.ti.com/lit/ds/symlink/drv5055-q1.pdf
+$ENDCMP
+#
+$CMP DRV5055A3xDBZxQ1
+D 25 mV/mT,±85-mT, 20-kHz, 3.3/5V, SOT-23
+K Automotive Ratiometric Linear Hall Effect Sensor AEC-Q100
+F https://www.ti.com/lit/ds/symlink/drv5055-q1.pdf
+$ENDCMP
+#
+$CMP DRV5055A3xLPGxQ1
+D 25 mV/mT,±85-mT, 20-kHz, 3.3/5V, TO-92
+K Automotive Ratiometric Linear Hall Effect Sensor AEC-Q100
+F https://www.ti.com/lit/ds/symlink/drv5055-q1.pdf
+$ENDCMP
+#
+$CMP DRV5055A4xDBZxQ1
+D 12.5 mV/mT,±169-mT, 20-kHz, 3.3/5V, SOT-23
+K Automotive Ratiometric Linear Hall Effect Sensor AEC-Q100
+F https://www.ti.com/lit/ds/symlink/drv5055-q1.pdf
+$ENDCMP
+#
+$CMP DRV5055A4xLPGxQ1
+D 12.5mV/mT,±169-mT, 20-kHz, 3.3/5V, TO-92
+K Automotive Ratiometric Linear Hall Effect Sensor AEC-Q100
+F https://www.ti.com/lit/ds/symlink/drv5055-q1.pdf
 $ENDCMP
 #
 $CMP IST8308
diff --git a/Sensor_Magnetic.lib b/Sensor_Magnetic.lib
index 673290e87b..14e06ae322 100644
--- a/Sensor_Magnetic.lib
+++ b/Sensor_Magnetic.lib
@@ -6,9 +6,9 @@ EESchema-LIBRARY Version 2.4
 DEF A1101ELHL U 0 20 Y Y 1 F N
 F0 "U" 0 450 50 H V L CNN
 F1 "A1101ELHL" 0 350 50 H V L CNN
-F2 "Package_TO_SOT_SMD:SOT-23" 0 -350 50 H I L CIN
+F2 "Package_TO_SOT_SMD:SOT-23W" 0 -350 50 H I L CIN
 F3 "" 0 650 50 H I C CNN
-ALIAS A1101LLHL A1102ELHL A1102LLHL A1103ELHL A1103LLHL A1104LLHL A1106LLHL DRV5033AJQDBZ DRV5033FAQDBZ
+ALIAS A1101LLHL A1102ELHL A1102LLHL A1103ELHL A1103LLHL A1104LLHL A1106LLHL
 $FPLIST
  SOT?23*
 $ENDFPLIST
@@ -369,6 +369,44 @@ X VDD E5 0 300 100 D 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
+# DRV5055A1xDBZxQ1
+#
+DEF DRV5055A1xDBZxQ1 U 0 20 Y Y 1 F N
+F0 "U" 100 500 50 H V C CNN
+F1 "DRV5055A1xDBZxQ1" 100 400 50 H V C CNN
+F2 "Package_TO_SOT_SMD:SOT-23" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+ALIAS DRV5055A2xDBZxQ1 DRV5055A3xDBZxQ1 DRV5055A4xDBZxQ1 DRV5033AJxDBZ DRV5033FAxDBZ
+$FPLIST
+ SOT?23*
+$ENDFPLIST
+DRAW
+S -200 300 200 -300 1 1 10 f
+X VCC 1 -100 400 100 D 50 50 1 1 W
+X OUT 2 300 0 100 L 50 50 1 1 O
+X GND 3 -100 -400 100 U 50 50 1 1 W
+ENDDRAW
+ENDDEF
+#
+# DRV5055A1xLPGxQ1
+#
+DEF DRV5055A1xLPGxQ1 U 0 20 Y Y 1 F N
+F0 "U" 200 500 50 H V C CNN
+F1 "DRV5055A1xLPGxQ1" 300 400 50 H V C CNN
+F2 "Package_TO_SOT_THT:TO-92_Inline" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+ALIAS DRV5055A2xLPGxQ1 DRV5055A3xLPGxQ1 DRV5055A4xLPGxQ1 DRV5033AJxLPG DRV5033FAxLPG
+$FPLIST
+ TO?92*
+$ENDFPLIST
+DRAW
+S -200 300 200 -300 1 1 10 f
+X VCC 1 -100 400 100 D 50 50 1 1 W
+X GND 2 -100 -400 100 U 50 50 1 1 W
+X OUT 3 300 0 100 L 50 50 1 1 O
+ENDDRAW
+ENDDEF
+#
 # IST8310
 #
 DEF IST8310 U 0 20 Y Y 1 F N
diff --git a/Sensor_Pressure.dcm b/Sensor_Pressure.dcm
index d8ee27e2dd..3632861538 100644
--- a/Sensor_Pressure.dcm
+++ b/Sensor_Pressure.dcm
@@ -72,6 +72,12 @@ K absolute pressure sensor
 F http://www.nxp.com/files/sensors/doc/data_sheet/MPXA6115A.pdf
 $ENDCMP
 #
+$CMP MS5525DSO
+D Integrated Digital Pressure Sensor
+K 24bit low-power I2C SPI
+F https://www.te.com/commerce/DocumentDelivery/DDEController?Action=srchrtrv&DocNm=MS5525DSO&DocType=DS&DocLang=English
+$ENDCMP
+#
 $CMP MS5607-02BA
 D Barometric pressure sensor, 20cm resolution, 10 to 1200 mbar, I2C and SPI interface up to 20MHz, LGA-8
 K pressure SPI I2C
diff --git a/Sensor_Pressure.lib b/Sensor_Pressure.lib
index e91cf98757..8dd898deb9 100644
--- a/Sensor_Pressure.lib
+++ b/Sensor_Pressure.lib
@@ -143,6 +143,40 @@ X NC 8 100 -200 100 U 50 50 1 1 N N
 ENDDRAW
 ENDDEF
 #
+# MS5525DSO
+#
+DEF MS5525DSO U 0 20 Y Y 1 F N
+F0 "U" -400 450 50 H V C CNN
+F1 "MS5525DSO" 350 450 50 H V C CNN
+F2 "" 0 -550 50 H I C CNN
+F3 "" 0 -650 50 H I C CNN
+$FPLIST
+ TE?MS5525DSO*DB*
+ TE?MS5525DSO*SB*
+ TE?MS5525DSO*ST*
+ TE?MS5525DSO*DH*
+ TE?MS5525DSO*FT*
+ TE?MS5525DSO*FB*
+$ENDFPLIST
+DRAW
+S -500 400 500 -400 0 1 10 f
+X SIN- 1 600 -200 100 L 50 50 1 1 P N
+X PS 10 -600 200 100 R 50 50 1 1 I
+X SUPPLY+ 11 0 500 100 D 50 50 1 1 P N
+X SOUT+ 12 600 200 100 L 50 50 1 1 P N
+X SUPPLY+ 13 0 500 100 D 50 50 1 1 W
+X SOUT+ 14 600 200 100 L 50 50 1 1 P
+X SOUT- 2 600 0 100 L 50 50 1 1 P N
+X SIN- 3 600 -200 100 L 50 50 1 1 P
+X SOUT- 4 600 0 100 L 50 50 1 1 P
+X SDO 5 -600 100 100 R 50 50 1 1 O
+X SDI/SDA 6 -600 0 100 R 50 50 1 1 I
+X SCLK/SCL 7 -600 -100 100 R 50 50 1 1 I
+X CSB 8 -600 -200 100 R 50 50 1 1 I
+X SUPPLY- 9 0 -500 100 U 50 50 1 1 W
+ENDDRAW
+ENDDEF
+#
 # MS5607-02BA
 #
 DEF MS5607-02BA U 0 20 Y Y 1 F N
diff --git a/Sensor_Temperature.dcm b/Sensor_Temperature.dcm
index b479c8d637..4391883a24 100644
--- a/Sensor_Temperature.dcm
+++ b/Sensor_Temperature.dcm
@@ -528,6 +528,24 @@ K temperature sensor i2c smbus
 F http://www.ti.com/lit/gpn/tmp101
 $ENDCMP
 #
+$CMP TMP1075D
+D I2C-bus digital temperature sensor and thermal watchdog, SO-8
+K temperature sensor I2C single channel
+F https://www.ti.com/lit/gpn/tmp1075
+$ENDCMP
+#
+$CMP TMP1075DGK
+D I2C-bus digital temperature sensor and thermal watchdog, VSSOP-8
+K temperature sensor I2C single channel
+F https://www.ti.com/lit/gpn/tmp1075
+$ENDCMP
+#
+$CMP TMP1075DSG
+D I2C-bus digital temperature sensor and thermal watchdog, WSON-8
+K temperature sensor I2C single channel
+F https://www.ti.com/lit/gpn/tmp1075
+$ENDCMP
+#
 $CMP TMP20AIDCK
 D Analog thermistor temperature sensor, ±2.5C accuracy, -55C to +130C, SC-70-5
 K temperature sensor thermistor
diff --git a/Sensor_Temperature.lib b/Sensor_Temperature.lib
index 307e1bddfc..5937599d3b 100644
--- a/Sensor_Temperature.lib
+++ b/Sensor_Temperature.lib
@@ -1443,6 +1443,76 @@ X SDA 6 -400 200 100 R 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
+# TMP1075D
+#
+DEF TMP1075D U 0 20 Y Y 1 F N
+F0 "U" -250 250 50 H V C CNN
+F1 "TMP1075D" 250 250 50 H V C CNN
+F2 "Package_SO:SO-8_3.9x4.9mm_P1.27mm" 0 -250 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ SO*3.9x4.9mm*P1.27mm*
+$ENDFPLIST
+DRAW
+S -300 200 300 -200 0 1 10 f
+X SDA 1 400 100 100 L 50 50 1 1 B
+X SCL 2 400 0 100 L 50 50 1 1 I
+X ALERT 3 400 -100 100 L 50 50 1 1 C
+X GND 4 0 -300 100 U 50 50 1 1 W
+X A2 5 -400 -100 100 R 50 50 1 1 I
+X A1 6 -400 0 100 R 50 50 1 1 I
+X A0 7 -400 100 100 R 50 50 1 1 I
+X V+ 8 0 300 100 D 50 50 1 1 W
+ENDDRAW
+ENDDEF
+#
+# TMP1075DGK
+#
+DEF TMP1075DGK U 0 20 Y Y 1 F N
+F0 "U" -250 250 50 H V C CNN
+F1 "TMP1075DGK" 250 250 50 H V C CNN
+F2 "Package_SO:VSSOP-8_3.0x3.0mm_P0.65mm" 0 -275 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ VSSOP*3.0x3.0mm*P0.65mm*
+$ENDFPLIST
+DRAW
+S -300 200 300 -200 0 1 10 f
+X SDA 1 400 100 100 L 50 50 1 1 B
+X SCL 2 400 0 100 L 50 50 1 1 I
+X ALERT 3 400 -100 100 L 50 50 1 1 C
+X GND 4 0 -300 100 U 50 50 1 1 W
+X A2 5 -400 -100 100 R 50 50 1 1 I
+X A1 6 -400 0 100 R 50 50 1 1 I
+X A0 7 -400 100 100 R 50 50 1 1 I
+X V+ 8 0 300 100 D 50 50 1 1 W
+ENDDRAW
+ENDDEF
+#
+# TMP1075DSG
+#
+DEF TMP1075DSG U 0 20 Y Y 1 F N
+F0 "U" -250 250 50 H V C CNN
+F1 "TMP1075DSG" 250 250 50 H V C CNN
+F2 "Package_SON:WSON-8-1EP_2x2mm_P0.5mm_EP0.9x1.6mm_ThermalVias" 75 -250 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ WSON*1EP*2x2mm*P0.5mm*
+$ENDFPLIST
+DRAW
+S -300 200 300 -200 0 1 10 f
+X SDA 1 400 100 100 L 50 50 1 1 B
+X SCL 2 400 0 100 L 50 50 1 1 I
+X ALERT 3 400 -100 100 L 50 50 1 1 C
+X GND 4 0 -300 100 U 50 50 1 1 W
+X A2 5 -400 -100 100 R 50 50 1 1 I
+X A1 6 -400 0 100 R 50 50 1 1 I
+X A0 7 -400 100 100 R 50 50 1 1 I
+X V+ 8 0 300 100 D 50 50 1 1 W
+X EP 9 -100 -300 100 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
 # TMP20AIDCK
 #
 DEF TMP20AIDCK U 0 40 Y Y 1 F N
diff --git a/Timer.dcm b/Timer.dcm
index c15fbfaac1..5e400d27e9 100644
--- a/Timer.dcm
+++ b/Timer.dcm
@@ -192,36 +192,6 @@ K single timer 555
 F https://www.onsemi.com/pub/Collateral/MC1455-D.PDF
 $ENDCMP
 #
-$CMP MCP7940N-xMNY
-D Real-Time Clock, I2C, Battery Backup, TDFN-8
-K realtime clock RTC
-F http://ww1.microchip.com/downloads/en/DeviceDoc/20005010F.pdf
-$ENDCMP
-#
-$CMP MCP7940N-xMS
-D Real-Time Clock, I2C, Battery Backup, MSOP-8
-K realtime clock RTC
-F http://ww1.microchip.com/downloads/en/DeviceDoc/20005010F.pdf
-$ENDCMP
-#
-$CMP MCP7940N-xP
-D Real-Time Clock, I2C, Battery Backup, DIP-8
-K realtime clock RTC
-F http://ww1.microchip.com/downloads/en/DeviceDoc/20005010F.pdf
-$ENDCMP
-#
-$CMP MCP7940N-xSN
-D Real-Time Clock, I2C, Battery Backup, SOIC-8
-K realtime clock RTC
-F http://ww1.microchip.com/downloads/en/DeviceDoc/20005010F.pdf
-$ENDCMP
-#
-$CMP MCP7940N-xST
-D Real-Time Clock, I2C, Battery Backup, TSSOP-8
-K realtime clock RTC
-F http://ww1.microchip.com/downloads/en/DeviceDoc/20005010F.pdf
-$ENDCMP
-#
 $CMP MN3101
 D Clock Generator Driver/Driver for MN3000 Series BBD (bucket brigade device), -8V to -16V, DIP-8
 K Matsushita Panasonic BBD CMOS
diff --git a/Timer.lib b/Timer.lib
index ebb1ef4085..20433fcbc7 100644
--- a/Timer.lib
+++ b/Timer.lib
@@ -489,57 +489,6 @@ X OUT 6 400 0 150 L 50 50 1 1 O
 ENDDRAW
 ENDDEF
 #
-# MCP7940N-xMNY
-#
-DEF MCP7940N-xMNY U 0 20 Y Y 1 F N
-F0 "U" -250 350 50 H V C CNN
-F1 "MCP7940N-xMNY" 450 350 50 H V C CNN
-F2 "Package_DFN_QFN:DFN-8-1EP_3x2mm_P0.5mm_EP1.36x1.46mm" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- DFN*3x2mm*P0.5mm*EP1.36x1.46mm*
-$ENDFPLIST
-DRAW
-S -300 300 300 -300 0 1 10 f
-X X1 1 400 100 100 L 50 50 1 1 I
-X X2 2 400 -100 100 L 50 50 1 1 O
-X VBAT 3 100 400 100 D 50 50 1 1 W
-X VSS 4 0 -400 100 U 50 50 1 1 W
-X SDA 5 -400 100 100 R 50 50 1 1 B
-X SCL 6 -400 200 100 R 50 50 1 1 I
-X MFP 7 -400 -100 100 R 50 50 1 1 C
-X VCC 8 0 400 100 D 50 50 1 1 W
-X EP 9 100 -400 100 U 50 50 1 1 W
-ENDDRAW
-ENDDEF
-#
-# MCP7940N-xMS
-#
-DEF MCP7940N-xMS U 0 20 Y Y 1 F N
-F0 "U" -250 350 50 H V C CNN
-F1 "MCP7940N-xMS" 450 350 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-ALIAS MCP7940N-xP MCP7940N-xSN MCP7940N-xST
-$FPLIST
- SOIC*3.9x4.9mm*P1.27mm*
- TSSOP*4.4x3mm*P0.65mm*
- MSOP*3x3mm*P0.65mm*
- DIP*W7.62mm*
-$ENDFPLIST
-DRAW
-S -300 300 300 -300 0 1 10 f
-X X1 1 400 100 100 L 50 50 1 1 I
-X X2 2 400 -100 100 L 50 50 1 1 O
-X VBAT 3 100 400 100 D 50 50 1 1 W
-X VSS 4 0 -400 100 U 50 50 1 1 W
-X SDA 5 -400 100 100 R 50 50 1 1 B
-X SCL 6 -400 200 100 R 50 50 1 1 I
-X MFP 7 -400 -100 100 R 50 50 1 1 C
-X VCC 8 0 400 100 D 50 50 1 1 W
-ENDDRAW
-ENDDEF
-#
 # MN3101
 #
 DEF MN3101 U 0 40 Y Y 1 F N
diff --git a/Timer_PLL.dcm b/Timer_PLL.dcm
index ecaefbbcfc..bd70fba95f 100644
--- a/Timer_PLL.dcm
+++ b/Timer_PLL.dcm
@@ -54,4 +54,76 @@ K Configurable clock
 F https://www.idt.com/document/dst/525-01-02-datasheet
 $ENDCMP
 #
+$CMP Si5342A-D
+D Jitter Attenuator/Clock Multiplier, 2 channel, Fractional, 0.001-1028 MHz, QFN-44
+K Clock Jitter Attenuator Multiplier
+F https://www.silabs.com/documents/public/data-sheets/Si5345-44-42-D-DataSheet.pdf
+$ENDCMP
+#
+$CMP Si5342B-D
+D Jitter Attenuator/Clock Multiplier, 2 channel, Fractional, 0.001-350 MHz, QFN-44
+K Clock Jitter Attenuator Multiplier
+F https://www.silabs.com/documents/public/data-sheets/Si5345-44-42-D-DataSheet.pdf
+$ENDCMP
+#
+$CMP Si5342C-D
+D Jitter Attenuator/Clock Multiplier, 2 channel, Integer, 0.001-1028 MHz, QFN-44
+K Clock Jitter Attenuator Multiplier
+F https://www.silabs.com/documents/public/data-sheets/Si5345-44-42-D-DataSheet.pdf
+$ENDCMP
+#
+$CMP Si5342D-D
+D Jitter Attenuator/Clock Multiplier, 2 channel, Integer, 0.001-350 MHz, QFN-44
+K Clock Jitter Attenuator Multiplier
+F https://www.silabs.com/documents/public/data-sheets/Si5345-44-42-D-DataSheet.pdf
+$ENDCMP
+#
+$CMP Si5344A-D
+D Jitter Attenuator/Clock Multiplier, 4 channel, Fractional, 0.001-1028 MHz, QFN-44
+K Clock Jitter Attenuator Multiplier
+F https://www.silabs.com/documents/public/data-sheets/Si5345-44-42-D-DataSheet.pdf
+$ENDCMP
+#
+$CMP Si5344B-D
+D Jitter Attenuator/Clock Multiplier, 4 channel, Fractional, 0.001-350 MHz, QFN-44
+K Clock Jitter Attenuator Multiplier
+F https://www.silabs.com/documents/public/data-sheets/Si5345-44-42-D-DataSheet.pdf
+$ENDCMP
+#
+$CMP Si5344C-D
+D Jitter Attenuator/Clock Multiplier, 4 channel, Integer, 0.001-1028 MHz, QFN-44
+K Clock Jitter Attenuator Multiplier
+F https://www.silabs.com/documents/public/data-sheets/Si5345-44-42-D-DataSheet.pdf
+$ENDCMP
+#
+$CMP Si5344D-D
+D Jitter Attenuator/Clock Multiplier, 4 channel, Integer, 0.001-350 MHz, QFN-44
+K Clock Jitter Attenuator Multiplier
+F https://www.silabs.com/documents/public/data-sheets/Si5345-44-42-D-DataSheet.pdf
+$ENDCMP
+#
+$CMP Si5345A-D
+D Jitter Attenuator/Clock Multiplier, 10-channel, Fractional, 0.001-1028 MHz, QFN-64
+K Clock Jitter Attenuator Multiplier
+F https://www.silabs.com/documents/public/data-sheets/Si5345-44-42-D-DataSheet.pdf
+$ENDCMP
+#
+$CMP Si5345B-D
+D Jitter Attenuator/Clock Multiplier, 10-channel, Fractional, 0.001-350 MHz, QFN-64
+K Clock Jitter Attenuator Multiplier
+F https://www.silabs.com/documents/public/data-sheets/Si5345-44-42-D-DataSheet.pdf
+$ENDCMP
+#
+$CMP Si5345C-D
+D Jitter Attenuator/Clock Multiplier, 10-channel, Integer, 0.001-1028 MHz, QFN-64
+K Clock Jitter Attenuator Multiplier
+F https://www.silabs.com/documents/public/data-sheets/Si5345-44-42-D-DataSheet.pdf
+$ENDCMP
+#
+$CMP Si5345D-D
+D Jitter Attenuator/Clock Multiplier, 10-channel, Integer, 0.001-350 MHz, QFN-64
+K Clock Jitter Attenuator Multiplier
+F https://www.silabs.com/documents/public/data-sheets/Si5345-44-42-D-DataSheet.pdf
+$ENDCMP
+#
 #End Doc Library
diff --git a/Timer_PLL.lib b/Timer_PLL.lib
index fc235098f6..734ab22565 100644
--- a/Timer_PLL.lib
+++ b/Timer_PLL.lib
@@ -250,4 +250,207 @@ X GND 9 0 -1500 100 U 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
+# Si5342A-D
+#
+DEF Si5342A-D U 0 20 Y Y 1 F N
+F0 "U" 0 100 50 H V C CNN
+F1 "Si5342A-D" 0 0 50 H V C CNN
+F2 "Package_DFN_QFN:QFN-44-1EP_7x7mm_P0.5mm_EP5.2x5.2mm" 0 -100 50 H I C CNN
+F3 "" -100 1000 50 H I C CNN
+ALIAS Si5342B-D Si5342C-D Si5342D-D
+$FPLIST
+ QFN*1EP*7x7mm*P0.5mm*
+$ENDFPLIST
+DRAW
+S -700 1500 700 -1500 0 1 10 f
+X IN1 1 -800 1100 100 R 50 50 1 1 I
+X IN2 10 -800 800 100 R 50 50 1 1 I
+X IN2b 11 -800 700 100 R 50 50 1 1 I
+X ~OE 12 -800 -500 100 R 50 50 1 1 I
+X SDA/SDIO 13 -800 -1100 100 R 50 50 1 1 B
+X SCLK 14 -800 -1300 100 R 50 50 1 1 I
+X A1/SDO 15 -800 -1200 100 R 50 50 1 1 B
+X A0/~CS 16 -800 -1400 100 R 50 50 1 1 I
+X ~RST 17 -800 -400 100 R 50 50 1 1 I
+X VDDO0 18 200 1600 100 D 50 50 1 1 W
+X OUT0b 19 800 1300 100 L 50 50 1 1 O
+X IN1b 2 -800 1000 100 R 50 50 1 1 I
+X OUT0 20 800 1400 100 L 50 50 1 1 O
+X VDD 21 -200 1600 100 D 50 50 1 1 W
+X NC 22 700 -1400 100 L 50 50 1 1 N N
+X VDDO1 23 300 1600 100 D 50 50 1 1 W
+X OUT1b 24 800 1000 100 L 50 50 1 1 O
+X OUT1 25 800 1100 100 L 50 50 1 1 O
+X VDDS 26 0 1600 100 D 50 50 1 1 W
+X ~LOL 27 800 0 100 L 50 50 1 1 O
+X ~LOS_XAXB 28 800 300 100 L 50 50 1 1 O
+X VDDS 29 0 1600 100 D 50 50 1 1 P N
+X IN_SEL0 3 -800 -700 100 R 50 50 1 1 I
+X ~LOS0 30 800 800 100 L 50 50 1 1 O
+X ~LOS1 31 800 700 100 L 50 50 1 1 O
+X VDD 32 -200 1600 100 D 50 50 1 1 P N
+X ~INTR 33 800 100 100 L 50 50 1 1 O
+X VDDS 34 0 1600 100 D 50 50 1 1 P N
+X ~LOS2 35 800 600 100 L 50 50 1 1 O
+X ~LOS3 36 800 500 100 L 50 50 1 1 O
+X IN_SEL1 37 -800 -800 100 R 50 50 1 1 I
+X I2C_SEL 38 -800 -1000 100 R 50 50 1 1 I
+X VDD 39 -200 1600 100 D 50 50 1 1 P N
+X X1 4 -800 200 100 R 50 50 1 1 I
+X VDD 40 -200 1600 100 D 50 50 1 1 P N
+X IN3/FB_IN 41 -800 500 100 R 50 50 1 1 I
+X IN3b/FB_INb 42 -800 400 100 R 50 50 1 1 I
+X IN0 43 -800 1400 100 R 50 50 1 1 I
+X IN0b 44 -800 1300 100 R 50 50 1 1 I
+X GND 45 0 -1600 100 U 50 50 1 1 W
+X XA 5 -800 100 100 R 50 50 1 1 I
+X XB 6 -800 -100 100 R 50 50 1 1 I
+X X2 7 -800 -200 100 R 50 50 1 1 I
+X VDDA 8 -300 1600 100 D 50 50 1 1 W
+X VDDA 9 -300 1600 100 D 50 50 1 1 P N
+ENDDRAW
+ENDDEF
+#
+# Si5344A-D
+#
+DEF Si5344A-D U 0 20 Y Y 1 F N
+F0 "U" 0 100 50 H V C CNN
+F1 "Si5344A-D" 0 0 50 H V C CNN
+F2 "Package_DFN_QFN:QFN-44-1EP_7x7mm_P0.5mm_EP5.2x5.2mm" 0 -100 50 H I C CNN
+F3 "" -100 1000 50 H I C CNN
+ALIAS Si5344B-D Si5344C-D Si5344D-D
+$FPLIST
+ QFN*1EP*7x7mm*P0.5mm*
+$ENDFPLIST
+DRAW
+S -800 1500 800 -1500 0 1 10 f
+X IN1 1 -900 1100 100 R 50 50 1 1 I
+X IN2 10 -900 800 100 R 50 50 1 1 I
+X IN2b 11 -900 700 100 R 50 50 1 1 I
+X ~OE 12 -900 -500 100 R 50 50 1 1 I
+X SDA/SDIO 13 -900 -1100 100 R 50 50 1 1 B
+X SCLK 14 -900 -1300 100 R 50 50 1 1 I
+X A1/SDO 15 -900 -1200 100 R 50 50 1 1 B
+X A0/~CS 16 -900 -1400 100 R 50 50 1 1 I
+X ~RST 17 -900 -400 100 R 50 50 1 1 I
+X VDDO0 18 100 1600 100 D 50 50 1 1 W
+X OUT0b 19 900 1300 100 L 50 50 1 1 O
+X IN1b 2 -900 1000 100 R 50 50 1 1 I
+X OUT0 20 900 1400 100 L 50 50 1 1 O
+X VDD 21 -300 1600 100 D 50 50 1 1 W
+X NC 22 800 -1400 100 L 50 50 1 1 N N
+X VDDO1 23 200 1600 100 D 50 50 1 1 W
+X OUT1b 24 900 1000 100 L 50 50 1 1 O
+X OUT1 25 900 1100 100 L 50 50 1 1 O
+X VDDS 26 -100 1600 100 D 50 50 1 1 W
+X ~LOL 27 900 -100 100 L 50 50 1 1 O
+X ~LOS_XAXB 28 900 200 100 L 50 50 1 1 O
+X VDDO2 29 300 1600 100 D 50 50 1 1 W
+X IN_SEL0 3 -900 -700 100 R 50 50 1 1 I
+X OUT2b 30 900 700 100 L 50 50 1 1 O
+X OUT2 31 900 800 100 L 50 50 1 1 O
+X VDD 32 -300 1600 100 D 50 50 1 1 P N
+X ~INTR 33 900 0 100 L 50 50 1 1 O
+X VDDO3 34 400 1600 100 D 50 50 1 1 W
+X OUT3b 35 900 400 100 L 50 50 1 1 O
+X OUT3 36 900 500 100 L 50 50 1 1 O
+X IN_SEL1 37 -900 -800 100 R 50 50 1 1 I
+X I2C_SEL 38 -900 -1000 100 R 50 50 1 1 I
+X VDD 39 -300 1600 100 D 50 50 1 1 P N
+X X1 4 -900 200 100 R 50 50 1 1 I
+X VDD 40 -300 1600 100 D 50 50 1 1 P N
+X IN3/FB_IN 41 -900 500 100 R 50 50 1 1 I
+X IN3b/FB_INb 42 -900 400 100 R 50 50 1 1 I
+X IN0 43 -900 1400 100 R 50 50 1 1 I
+X IN0b 44 -900 1300 100 R 50 50 1 1 I
+X GND 45 0 -1600 100 U 50 50 1 1 W
+X XA 5 -900 100 100 R 50 50 1 1 I
+X XB 6 -900 -100 100 R 50 50 1 1 I
+X X2 7 -900 -200 100 R 50 50 1 1 I
+X VDDA 8 -400 1600 100 D 50 50 1 1 W
+X VDDA 9 -400 1600 100 D 50 50 1 1 P N
+ENDDRAW
+ENDDEF
+#
+# Si5345A-D
+#
+DEF Si5345A-D U 0 20 Y Y 1 F N
+F0 "U" 0 100 50 H V C CNN
+F1 "Si5345A-D" 0 0 50 H V C CNN
+F2 "Package_DFN_QFN:QFN-64-1EP_9x9mm_P0.5mm_EP5.2x5.2mm" 0 -100 50 H I C CNN
+F3 "" -100 1100 50 H I C CNN
+ALIAS Si5345B-D Si5345C-D Si5345D-D
+$FPLIST
+ QFN*1EP*9x9mm*P0.5mm*
+$ENDFPLIST
+DRAW
+S -1000 1700 1000 -1700 0 1 10 f
+X IN1 1 -1100 1300 100 R 50 50 1 1 I
+X X2 10 -1100 -100 100 R 50 50 1 1 I
+X ~OE 11 -1100 -400 100 R 50 50 1 1 I
+X ~INTR 12 1100 -1500 100 L 50 50 1 1 O
+X VDDA 13 -600 1800 100 D 50 50 1 1 W
+X IN2 14 -1100 1000 100 R 50 50 1 1 I
+X IN2b 15 -1100 900 100 R 50 50 1 1 I
+X SCLK 16 -1100 -1500 100 R 50 50 1 1 I
+X A1/SDO 17 -1100 -1400 100 R 50 50 1 1 B
+X SDA/SDIO 18 -1100 -1300 100 R 50 50 1 1 B
+X A0/~CS 19 -1100 -1600 100 R 50 50 1 1 I
+X IN1b 2 -1100 1200 100 R 50 50 1 1 I
+X NC 20 1000 1100 100 L 50 50 1 1 N N
+X NC 21 1000 800 100 L 50 50 1 1 N N
+X VDDO0 22 -300 1800 100 D 50 50 1 1 W
+X OUT0b 23 1100 1500 100 L 50 50 1 1 O
+X OUT0 24 1100 1600 100 L 50 50 1 1 O
+X FDEC 25 -1100 -1000 100 R 50 50 1 1 I
+X VDDO1 26 -200 1800 100 D 50 50 1 1 W
+X OUT1b 27 1100 1200 100 L 50 50 1 1 O
+X OUT1 28 1100 1300 100 L 50 50 1 1 O
+X VDDO2 29 -100 1800 100 D 50 50 1 1 W
+X IN_SEL0 3 -1100 -600 100 R 50 50 1 1 I
+X OUT2b 30 1100 900 100 L 50 50 1 1 O
+X OUT2 31 1100 1000 100 L 50 50 1 1 O
+X VDD 32 -500 1800 100 D 50 50 1 1 W
+X VDDO3 33 0 1800 100 D 50 50 1 1 W
+X OUT3b 34 1100 600 100 L 50 50 1 1 O
+X OUT3 35 1100 700 100 L 50 50 1 1 O
+X VDDO4 36 100 1800 100 D 50 50 1 1 W
+X OUT4b 37 1100 300 100 L 50 50 1 1 O
+X OUT4 38 1100 400 100 L 50 50 1 1 O
+X I2C_SEL 39 -1100 -1200 100 R 50 50 1 1 I
+X IN_SEL1 4 -1100 -700 100 R 50 50 1 1 I
+X VDDO5 40 200 1800 100 D 50 50 1 1 W
+X OUT5b 41 1100 0 100 L 50 50 1 1 O
+X OUT5 42 1100 100 100 L 50 50 1 1 O
+X VDDO6 43 300 1800 100 D 50 50 1 1 W
+X OUT6b 44 1100 -300 100 L 50 50 1 1 O
+X OUT6 45 1100 -200 100 L 50 50 1 1 O
+X VDD 46 -500 1800 100 D 50 50 1 1 P N
+X ~LOL 47 1100 -1600 100 L 50 50 1 1 O
+X FINC 48 -1100 -900 100 R 50 50 1 1 I
+X VDDO7 49 400 1800 100 D 50 50 1 1 W
+X NC 5 1000 1400 100 L 50 50 1 1 N N
+X OUT7b 50 1100 -600 100 L 50 50 1 1 O
+X OUT7 51 1100 -500 100 L 50 50 1 1 O
+X VDDO8 52 500 1800 100 D 50 50 1 1 W
+X OUT8b 53 1100 -900 100 L 50 50 1 1 O
+X OUT8 54 1100 -800 100 L 50 50 1 1 O
+X NC 55 1000 500 100 L 50 50 1 1 N N
+X NC 56 1000 200 100 L 50 50 1 1 N N
+X VDDO9 57 600 1800 100 D 50 50 1 1 W
+X OUT9b 58 1100 -1200 100 L 50 50 1 1 O
+X OUT9 59 1100 -1100 100 L 50 50 1 1 O
+X ~RST 6 -1100 -300 100 R 50 50 1 1 I
+X VDD 60 -500 1800 100 D 50 50 1 1 P N
+X IN3/FB_IN 61 -1100 700 100 R 50 50 1 1 I
+X IN3b/FB_INb 62 -1100 600 100 R 50 50 1 1 I
+X IN0 63 -1100 1600 100 R 50 50 1 1 I
+X IN0b 64 -1100 1500 100 R 50 50 1 1 I
+X GND 65 0 -1800 100 U 50 50 1 1 W
+X X1 7 -1100 400 100 R 50 50 1 1 I
+X XA 8 -1100 300 100 R 50 50 1 1 I
+X XB 9 -1100 0 100 R 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
 #End Library
diff --git a/Timer_RTC.dcm b/Timer_RTC.dcm
index d837a3750e..96509c8d45 100644
--- a/Timer_RTC.dcm
+++ b/Timer_RTC.dcm
@@ -126,6 +126,36 @@ K I2C RTC Alarm interrupt
 F http://www.st.com/resource/en/datasheet/m41t62.pdf
 $ENDCMP
 #
+$CMP MCP7940N-xMNY
+D Real-Time Clock, I2C, Battery Backup, TDFN-8
+K realtime clock RTC
+F http://ww1.microchip.com/downloads/en/DeviceDoc/20005010F.pdf
+$ENDCMP
+#
+$CMP MCP7940N-xMS
+D Real-Time Clock, I2C, Battery Backup, MSOP-8
+K realtime clock RTC
+F http://ww1.microchip.com/downloads/en/DeviceDoc/20005010F.pdf
+$ENDCMP
+#
+$CMP MCP7940N-xP
+D Real-Time Clock, I2C, Battery Backup, DIP-8
+K realtime clock RTC
+F http://ww1.microchip.com/downloads/en/DeviceDoc/20005010F.pdf
+$ENDCMP
+#
+$CMP MCP7940N-xSN
+D Real-Time Clock, I2C, Battery Backup, SOIC-8
+K realtime clock RTC
+F http://ww1.microchip.com/downloads/en/DeviceDoc/20005010F.pdf
+$ENDCMP
+#
+$CMP MCP7940N-xST
+D Real-Time Clock, I2C, Battery Backup, TSSOP-8
+K realtime clock RTC
+F http://ww1.microchip.com/downloads/en/DeviceDoc/20005010F.pdf
+$ENDCMP
+#
 $CMP PCF8523T
 D Realtime Clock/Calendar I2C Interface, SOIC-8
 K I2C RTC Clock Calendar
diff --git a/Timer_RTC.lib b/Timer_RTC.lib
index f95ad2570c..211db2bbbc 100644
--- a/Timer_RTC.lib
+++ b/Timer_RTC.lib
@@ -398,6 +398,56 @@ X SDA 9 -400 -200 100 R 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
+# MCP7940N-xMNY
+#
+DEF MCP7940N-xMNY U 0 20 Y Y 1 F N
+F0 "U" -250 350 50 H V C CNN
+F1 "MCP7940N-xMNY" 450 350 50 H V C CNN
+F2 "Package_DFN_QFN:DFN-8-1EP_3x2mm_P0.5mm_EP1.36x1.46mm" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ DFN*3x2mm*P0.5mm*EP1.36x1.46mm*
+$ENDFPLIST
+DRAW
+S -300 300 300 -300 0 1 10 f
+X X1 1 400 100 100 L 50 50 1 1 I
+X X2 2 400 -100 100 L 50 50 1 1 O
+X VBAT 3 100 400 100 D 50 50 1 1 W
+X VSS 4 0 -400 100 U 50 50 1 1 W
+X SDA 5 -400 100 100 R 50 50 1 1 B
+X SCL 6 -400 200 100 R 50 50 1 1 I
+X MFP 7 -400 -100 100 R 50 50 1 1 C
+X VCC 8 0 400 100 D 50 50 1 1 W
+X EP 9 100 -400 100 U 50 50 1 1 W
+ENDDRAW
+ENDDEF
+#
+# MCP7940N-xMS
+#
+DEF MCP7940N-xMS U 0 20 Y Y 1 F N
+F0 "U" -250 350 50 H V C CNN
+F1 "MCP7940N-xMS" 450 350 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+ALIAS MCP7940N-xP MCP7940N-xSN MCP7940N-xST
+$FPLIST
+ SOIC*3.9x4.9mm*P1.27mm*
+ TSSOP*4.4x3mm*P0.65mm*
+ MSOP*3x3mm*P0.65mm*
+ DIP*W7.62mm*
+$ENDFPLIST
+DRAW
+S -300 300 300 -300 0 1 10 f
+X X1 1 400 100 100 L 50 50 1 1 I
+X X2 2 400 -100 100 L 50 50 1 1 O
+X VBAT 3 100 400 100 D 50 50 1 1 W
+X VSS 4 0 -400 100 U 50 50 1 1 W
+X SDA 5 -400 100 100 R 50 50 1 1 B
+X SCL 6 -400 200 100 R 50 50 1 1 I
+X MFP 7 -400 -100 100 R 50 50 1 1 C
+X VCC 8 0 400 100 D 50 50 1 1 W
+ENDDRAW
+ENDDEF
 # PCF8523T
 #
 DEF PCF8523T U 0 20 Y Y 1 F N
diff --git a/Transformer.dcm b/Transformer.dcm
index 90b42e1a48..dcd9987cac 100644
--- a/Transformer.dcm
+++ b/Transformer.dcm
@@ -1,5 +1,29 @@
 EESchema-DOCLIB  Version 2.0
 #
+$CMP 0433BM15A0001
+D 430-435MHz 1:1 RF Transformer, Unbalanced to Balanced, with integrated DC blocking capacitor
+K balun rf transformer
+F https://www.johansontechnology.com/datasheets/0433BM15A0001/0433BM15A0001.pdf
+$ENDCMP
+#
+$CMP 0868BM15C0001
+D 863-873MHz 1:1 RF Transformer, Unbalanced to Balanced, with integrated DC blocking capacitor
+K balun rf transformer
+F https://www.johansontechnology.com/datasheets/0868BM15C0001/0868BM15C0001.pdf
+$ENDCMP
+#
+$CMP 0896BM15A0001
+D 863-928MHz 1:1 RF Transformer, Unbalanced to Balanced
+K balun rf transformer
+F https://www.johansontechnology.com/datasheets/0896BM15A0001/0896BM15A0001.pdf
+$ENDCMP
+#
+$CMP 0915BM15A0001
+D 902-928MHz 1:1 RF Transformer, Unbalanced to Balanced, with integrated DC blocking capacitor
+K balun rf transformer
+F https://www.johansontechnology.com/datasheets/0915BM15A0001/0915BM15A0001.pdf
+$ENDCMP
+#
 $CMP 5400BL15B050
 D 4.9-5.9GHz 1:1 RF Transformer, Unbalanced to Balanced
 K balun rf transformer
diff --git a/Transformer.lib b/Transformer.lib
index cbb3f1d206..a5e6f17257 100644
--- a/Transformer.lib
+++ b/Transformer.lib
@@ -1,6 +1,39 @@
 EESchema-LIBRARY Version 2.4
 #encoding utf-8
 #
+# 0896BM15A0001
+#
+DEF 0896BM15A0001 U 0 20 Y Y 1 F N
+F0 "U" 0 250 50 H V C CNN
+F1 "0896BM15A0001" 0 -300 50 H V C CNN
+F2 "RF_Converter:Balun_Johanson_0896BM15A0001" 0 -300 50 H I C CNN
+F3 "" 0 300 50 H I C CNN
+ALIAS 0433BM15A0001 0868BM15C0001 0915BM15A0001
+$FPLIST
+ Balun*Johanson*0896BM15A0001*
+$ENDFPLIST
+DRAW
+A -60 -90 30 -899 899 1 1 8 N -60 -120 -60 -60
+A -60 -30 30 -899 899 1 1 8 N -60 -60 -60 0
+A -60 30 30 -899 899 1 1 8 N -60 0 -60 60
+A -60 90 30 -899 899 1 1 8 N -60 60 -60 120
+A 60 -90 30 901 -901 1 1 8 N 60 -60 60 -120
+A 60 -30 30 901 -901 1 1 8 N 60 0 60 -60
+A 60 30 30 901 -901 1 1 8 N 60 60 60 0
+A 60 90 30 901 -901 1 1 8 N 60 120 60 60
+P 3 1 1 6 -100 200 -60 200 -60 120 N
+P 3 1 1 6 -60 -120 -60 -200 -100 -200 N
+P 3 1 1 6 60 120 60 200 100 200 N
+P 3 1 1 6 100 -200 60 -200 60 -120 N
+X ~ 1 -200 200 100 R 50 50 1 1 P
+X GND 2 -100 -300 100 U 50 50 1 1 W
+X ~ 3 200 200 100 L 50 50 1 1 P
+X ~ 4 200 -200 100 L 50 50 1 1 P
+X GND 5 -100 -300 100 U 50 50 1 1 P N
+X GND 6 -100 -300 100 U 50 50 1 1 P N
+ENDDRAW
+ENDDEF
+#
 # 5400BL15B050
 #
 DEF 5400BL15B050 U 0 20 Y Y 1 F N
diff --git a/pspice.dcm b/pspice.dcm
index fea40783b1..95bf87db13 100644
--- a/pspice.dcm
+++ b/pspice.dcm
@@ -78,4 +78,22 @@ K simulation
 F ~
 $ENDCMP
 #
+$CMP BSOURCE
+D Arbitrary behavioral voltage or current source
+K simulation
+F http://ltwiki.org/?title=B_sources_%28complete_reference%29
+$ENDCMP
+#
+$CMP ESOURCE
+D Voltage-dependent Voltage source symbol for simulation only
+K simulation
+F https://www.pspice.com/source/controlled-sources
+$ENDCMP
+#
+$CMP GSOURCE
+D Voltage-dependent Current source symbol for simulation only
+K simulation
+F https://www.pspice.com/source/controlled-sources
+$ENDCMP
+#
 #End Doc Library
diff --git a/pspice.lib b/pspice.lib
index 15e40356ef..cc8bccff1c 100644
--- a/pspice.lib
+++ b/pspice.lib
@@ -210,4 +210,79 @@ X E2 2 0 -300 100 U 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
+# BSOURCE
+#
+DEF BSOURCE B 0 40 Y N 1 F N
+F0 "B" -250 300 50 H V C CNN
+F1 "BSOURCE" 0 0 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+DRAW
+C 0 0 200 1 1 0 N
+P 2 1 1 0 -250 -250 -250 150 F
+P 2 1 1 0 10 250 30 250 N
+P 2 1 1 0 20 260 20 240 N
+P 3 1 1 0 -300 150 -250 250 -200 150 F
+X N+ 1 0 300 100 D 50 50 1 1 I
+X N- 2 0 -300 100 U 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# ESOURCE
+#
+DEF ESOURCE E 0 40 Y N 1 F N
+F0 "E" -250 300 50 H V C CNN
+F1 "ESOURCE" 0 0 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+DRAW
+C 0 0 200 1 1 0 N
+C 300 0 100 1 1 10 N
+T 0 -320 -10 50 0 1 1 V Normal 0 C C
+T 0 300 0 100 0 1 1 V Normal 0 C C
+P 2 1 1 0 -250 -250 -250 150 F
+P 2 1 1 0 10 250 30 250 N
+P 2 1 1 0 20 260 20 240 N
+P 2 1 1 0 175 -125 225 -75 N
+P 2 1 1 0 310 150 330 150 N
+P 2 1 1 0 320 160 320 140 N
+P 2 1 1 0 375 75 425 125 N
+P 3 1 1 0 -300 150 -250 250 -200 150 F
+P 3 1 1 0 375 125 425 125 425 75 N
+X N+ 1 0 300 100 D 50 50 1 1 I
+X N- 2 0 -300 100 U 50 50 1 1 I
+X C+ 3 300 200 100 D 50 50 1 1 P
+X C- 4 300 -200 100 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# GSOURCE
+#
+DEF GSOURCE G 0 40 Y N 1 F N
+F0 "G" -300 350 50 H V C CNN
+F1 "GSOURCE" 0 0 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+DRAW
+C 0 -100 200 0 1 0 N
+C 0 100 202 0 1 0 N
+C 300 0 100 1 1 10 N
+T 0 -270 -10 50 0 0 1 I Normal 0 C C
+T 0 300 0 100 0 1 1 V Normal 0 C C
+P 2 0 1 0 -300 -200 -300 200 F
+P 3 0 1 0 -350 200 -300 300 -250 200 F
+P 2 1 1 0 10 350 30 350 N
+P 2 1 1 0 20 360 20 340 N
+P 2 1 1 0 175 -125 225 -75 N
+P 2 1 1 0 310 150 330 150 N
+P 2 1 1 0 320 160 320 140 N
+P 2 1 1 0 375 75 425 125 N
+P 3 1 1 0 375 125 425 125 425 75 N
+X N+ 1 0 400 100 D 50 50 1 1 I
+X N- 2 0 -400 100 U 50 50 1 1 I
+X C+ 3 300 200 100 D 50 50 1 1 P
+X C- 4 300 -200 100 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
 #End Library
diff --git a/sym-lib-table b/sym-lib-table
index a3a628dc83..7da4869b04 100644
--- a/sym-lib-table
+++ b/sym-lib-table
@@ -33,6 +33,7 @@
   (lib (name CPU_NXP_68000)(type Legacy)(uri ${KICAD_SYMBOL_DIR}/CPU_NXP_68000.lib)(options "")(descr "NXP (formerly Motorola) 68000 CPUs"))
   (lib (name CPU_NXP_IMX)(type Legacy)(uri ${KICAD_SYMBOL_DIR}/CPU_NXP_IMX.lib)(options "")(descr "NXP IMX CPUs"))
   (lib (name CPU_PowerPC)(type Legacy)(uri ${KICAD_SYMBOL_DIR}/CPU_PowerPC.lib)(options "")(descr "PowerPC-based CPUs"))
+  (lib (name CPU_WDC_6500)(type Legacy)(uri ${KICAD_SYMBOL_DIR}/CPU_WDC_6500.lib)(options "")(descr "Western Design Center 6502-based CPUs"))
   (lib (name Device)(type Legacy)(uri ${KICAD_SYMBOL_DIR}/Device.lib)(options "")(descr "Generic symbols for common devices"))
   (lib (name DSP_AnalogDevices)(type Legacy)(uri ${KICAD_SYMBOL_DIR}/DSP_AnalogDevices.lib)(options "")(descr "Analog Devices DSP symbols"))
   (lib (name DSP_Freescale)(type Legacy)(uri ${KICAD_SYMBOL_DIR}/DSP_Freescale.lib)(options "")(descr "Freescale DSP symbols"))
@@ -76,6 +77,7 @@
   (lib (name Interface_Telecom)(type Legacy)(uri ${KICAD_SYMBOL_DIR}/Interface_Telecom.lib)(options "")(descr "Telecom interface symbols"))
   (lib (name Interface_UART)(type Legacy)(uri ${KICAD_SYMBOL_DIR}/Interface_UART.lib)(options "")(descr "UART interface symbols"))
   (lib (name Interface_USB)(type Legacy)(uri ${KICAD_SYMBOL_DIR}/Interface_USB.lib)(options "")(descr "USB interface symbols"))
+  (lib (name Interface_WDC_6500)(type Legacy)(uri ${KICAD_SYMBOL_DIR}/Interface_WDC_6500.lib)(options "")(descr "Western Design Center 6502-based interface symbols"))
   (lib (name Isolator)(type Legacy)(uri ${KICAD_SYMBOL_DIR}/Isolator.lib)(options "")(descr "Isolator devices"))
   (lib (name Isolator_Analog)(type Legacy)(uri ${KICAD_SYMBOL_DIR}/Isolator_Analog.lib)(options "")(descr "Analog isolator devices"))
   (lib (name Jumper)(type Legacy)(uri ${KICAD_SYMBOL_DIR}/Jumper.lib)(options "")(descr "(Solder) jumper symbols"))
@@ -125,6 +127,7 @@
   (lib (name MCU_ST_STM32F3)(type Legacy)(uri ${KICAD_SYMBOL_DIR}/MCU_ST_STM32F3.lib)(options "")(descr "ST STM32F3 microcontrollers"))
   (lib (name MCU_ST_STM32F4)(type Legacy)(uri ${KICAD_SYMBOL_DIR}/MCU_ST_STM32F4.lib)(options "")(descr "ST STM32F4 microcontrollers"))
   (lib (name MCU_ST_STM32F7)(type Legacy)(uri ${KICAD_SYMBOL_DIR}/MCU_ST_STM32F7.lib)(options "")(descr "ST STM32F7 microcontrollers"))
+  (lib (name MCU_ST_STM32G0)(type Legacy)(uri ${KICAD_SYMBOL_DIR}/MCU_ST_STM32G0.lib)(options "")(descr "ST STM32G0 microcontrollers"))
   (lib (name MCU_ST_STM32H7)(type Legacy)(uri ${KICAD_SYMBOL_DIR}/MCU_ST_STM32H7.lib)(options "")(descr "ST STM32H7 microcontrollers"))
   (lib (name MCU_ST_STM32L0)(type Legacy)(uri ${KICAD_SYMBOL_DIR}/MCU_ST_STM32L0.lib)(options "")(descr "ST STM32L0 microcontrollers"))
   (lib (name MCU_ST_STM32L1)(type Legacy)(uri ${KICAD_SYMBOL_DIR}/MCU_ST_STM32L1.lib)(options "")(descr "ST STM32L1 microcontrollers"))
@@ -135,6 +138,7 @@
   (lib (name MCU_Texas)(type Legacy)(uri ${KICAD_SYMBOL_DIR}/MCU_Texas.lib)(options "")(descr "Texas Instruments microcontrollers (assorted)"))
   (lib (name MCU_Texas_MSP430)(type Legacy)(uri ${KICAD_SYMBOL_DIR}/MCU_Texas_MSP430.lib)(options "")(descr "Texas Instruments MSP430 microcontrollers"))
   (lib (name MCU_Texas_SimpleLink)(type Legacy)(uri ${KICAD_SYMBOL_DIR}/MCU_Texas_SimpleLink.lib)(options "")(descr "Texas Instruments SimpleLink microcontrollers"))
+  (lib (name MCU_WDC_6500)(type Legacy)(uri ${KICAD_SYMBOL_DIR}/MCU_WDC_6500.lib)(options "")(descr "Western Design Center 6502-based microcontrollers"))
   (lib (name Mechanical)(type Legacy)(uri ${KICAD_SYMBOL_DIR}/Mechanical.lib)(options "")(descr "Mechanical symbols"))
   (lib (name Motor)(type Legacy)(uri ${KICAD_SYMBOL_DIR}/Motor.lib)(options "")(descr "Motor symbols"))
   (lib (name Oscillator)(type Legacy)(uri ${KICAD_SYMBOL_DIR}/Oscillator.lib)(options "")(descr "Oscillator symbols"))
@@ -156,6 +160,7 @@
   (lib (name RF_GSM)(type Legacy)(uri ${KICAD_SYMBOL_DIR}/RF_GSM.lib)(options "")(descr "GSM devices"))
   (lib (name RF_Mixer)(type Legacy)(uri ${KICAD_SYMBOL_DIR}/RF_Mixer.lib)(options "")(descr "RF mixer symbols"))
   (lib (name RF_Module)(type Legacy)(uri ${KICAD_SYMBOL_DIR}/RF_Module.lib)(options "")(descr "RF module symbols"))
+  (lib (name RF_NFC)(type Legacy)(uri ${KICAD_SYMBOL_DIR}/RF_NFC.lib)(options "")(descr "Near Field Communication (RFID)"))
   (lib (name RF_RFID)(type Legacy)(uri ${KICAD_SYMBOL_DIR}/RF_RFID.lib)(options "")(descr "Radio Frequency ID (RFID)"))
   (lib (name RF_Switch)(type Legacy)(uri ${KICAD_SYMBOL_DIR}/RF_Switch.lib)(options "")(descr "RF switch symbols"))
   (lib (name RF_WiFi)(type Legacy)(uri ${KICAD_SYMBOL_DIR}/RF_WiFi.lib)(options "")(descr "WiFi symbols"))
@@ -198,4 +203,5 @@
   (lib (name MCU_Microchip_SAMD)(type Legacy)(uri ${KICAD_SYMBOL_DIR}/MCU_Microchip_SAMD.lib)(options "")(descr "Microchip SAMD microcontrollers"))
   (lib (name MCU_Microchip_SAME)(type Legacy)(uri ${KICAD_SYMBOL_DIR}/MCU_Microchip_SAME.lib)(options "")(descr "Microchip SAME microcontrollers"))
   (lib (name MCU_Microchip_SAML)(type Legacy)(uri ${KICAD_SYMBOL_DIR}/MCU_Microchip_SAML.lib)(options "")(descr "Microchip SAML microcontrollers"))
+  (lib (name MCU_Dialog)(type Legacy)(uri ${KICAD_SYMBOL_DIR}/MCU_Dialog.lib)(options "")(descr "Dialog Semiconductor microcontrollers"))
 )