Merge branch 'master' of https://github.com/KiCad/kicad-library into modify_resistor_3Dmodels

2017-01-12 15:32:21 +01:00 · 2017-01-12 15:32:21 +01:00 · b5d6a59da2
commit b5d6a59da2
parent c5b58f0039 2ddab41c76
29 changed files with 12138 additions and 2722 deletions
--- a/library/Oscillators.dcm
+++ b/library/Oscillators.dcm
@ -0,0 +1,273 @@
+EESchema-DOCLIB  Version 2.0
+#
+$CMP ACO-xxxMHz
+D HCMOS Crystal Clock Oscillator, DIP14-style metal package
+K Crystal Clock Oscillator
+F http://www.conwin.com/datasheets/cx/cx030.pdf
+$ENDCMP
+#
+$CMP ACO-xxxMHz-A
+D HCMOS Crystal Clock Oscillator, DIP14-style metal package
+K Crystal Clock Oscillator
+F http://www.conwin.com/datasheets/cx/cx030.pdf
+$ENDCMP
+#
+$CMP ASE-xxxMHz
+D 3.3V CMOS SMD Crystal Clock Oscillator, Abracon
+K 3.3V CMOS SMD Crystal Clock Oscillator
+F http://www.abracon.com/Oscillators/ASV.pdf
+$ENDCMP
+#
+$CMP ASV-xxxMHz
+D 3.3V HCMOS SMD Crystal Clock Oscillator, Abracon
+K 3.3V HCMOS SMD Crystal Clock Oscillator
+F http://www.abracon.com/Oscillators/ASV.pdf
+$ENDCMP
+#
+$CMP CXO_DIP14
+D Crystal Clock Oscillator, DIP14-style metal package
+K Crystal Clock Oscillator
+F http://cdn-reichelt.de/documents/datenblatt/B400/OSZI.pdf
+$ENDCMP
+#
+$CMP CXO_DIP8
+D Crystal Clock Oscillator, DIP8-style metal package
+K Crystal Clock Oscillator
+F http://cdn-reichelt.de/documents/datenblatt/B400/OSZI.pdf
+$ENDCMP
+#
+$CMP DFA-S11
+D Temperature compensated Crystal Clock Oscillator
+K Temperature compensated Crystal Clock Oscillator
+F http://www.metatech.com.hk/product/fordahl/pdf/2002%20TCXO%20Page%2043-58.pdf
+$ENDCMP
+#
+$CMP DFA-S15
+D Temperature compensated Crystal Clock Oscillator
+K Temperature compensated Crystal Clock Oscillator
+F http://www.metatech.com.hk/product/fordahl/pdf/2002%20TCXO%20Page%2043-58.pdf
+$ENDCMP
+#
+$CMP DFA-S2
+D Temperature compensated Crystal Clock Oscillator
+K Temperature compensated Crystal Clock Oscillator
+F http://www.metatech.com.hk/product/fordahl/pdf/2002%20TCXO%20Page%2043-58.pdf
+$ENDCMP
+#
+$CMP DFA-S3
+D Temperature compensated Crystal Clock Oscillator
+K Temperature compensated Crystal Clock Oscillator
+F http://www.metatech.com.hk/product/fordahl/pdf/2002%20TCXO%20Page%2043-58.pdf
+$ENDCMP
+#
+$CMP DGOF5S3
+D HCMOS Crystal Clock Oscillator, DIP14-style metal package
+K Crystal Clock Oscillator
+F http://www.conwin.com/datasheets/cx/cx030.pdf
+$ENDCMP
+#
+$CMP GTXO-14T
+D Crystal Clock Oscillator, DIP14-style metal package
+K Crystal Clock Oscillator
+F http://www.golledge.com/pdf/products/tcxos/gtxo14.pdf
+$ENDCMP
+#
+$CMP GTXO-14V
+D Voltage-Controlled Crystal Clock Oscillator, DIP14-style metal package
+K Crystal Clock Oscillator
+F http://www.golledge.com/pdf/products/tcxos/gtxo14.pdf
+$ENDCMP
+#
+$CMP GTXO-S14T
+D 3.3 & 5V Stratum 3 Sinewave TCXO, DIP14-style metal package
+K Crystal Clock Oscillator
+F http://www.golledge.com/pdf/products/tcxos/gtxos14.pdf
+$ENDCMP
+#
+$CMP GTXO-S14V
+D 3.3 & 5V Stratum 3 Sinewave TCXO, DIP14-style metal package
+K Crystal Clock Oscillator
+F http://www.golledge.com/pdf/products/tcxos/gtxos14.pdf
+$ENDCMP
+#
+$CMP IQXO-70
+D Crystal Clock Oscillator, SMD package 7.5x5.0mm²
+K Crystal Clock Oscillator
+F http://www.iqdfrequencyproducts.com/products/details/iqxo-70-11-30.pdf
+$ENDCMP
+#
+$CMP OCXO-14
+D Voltage-Controlled Crystal Clock Oscillator, DIP14-style metal package
+K Crystal Clock Oscillator
+F http://www.petermann-technik.de/fileadmin/petermann/pdf/crystal-oscillators/OCXO-14_PETERMANN-TECHNIK.pdf
+$ENDCMP
+#
+$CMP SG-210SCD
+D Crystal Oscillator Low Profile / High Stability SPXO
+K Crystal Clock Oscillator
+F https://support.epson.biz/td/api/doc_check.php?mode=dl&lang=en&Parts=SG-210SED
+$ENDCMP
+#
+$CMP SG-210SDD
+D Crystal Oscillator Low Profile / High Stability SPXO
+K Crystal Clock Oscillator
+F https://support.epson.biz/td/api/doc_check.php?mode=dl&lang=en&Parts=SG-210SED
+$ENDCMP
+#
+$CMP SG-210SED
+D Crystal Oscillator Low Profile / High Stability SPXO
+K Crystal Clock Oscillator
+F https://support.epson.biz/td/api/doc_check.php?mode=dl&lang=en&Parts=SG-210SED
+$ENDCMP
+#
+$CMP SG-210STF
+D CMOS Crystal Oscillator SPXO
+K Crystal Clock Oscillator
+F https://support.epson.biz/td/api/doc_check.php?mode=dl&lang=en&Parts=SG-210STF
+$ENDCMP
+#
+$CMP SG-211
+D CMOS Crystal Oscillator SPXO
+K Crystal Clock Oscillator
+F https://support.epson.biz/td/api/doc_check.php?mode=dl&lang=en&Parts=SG-211SEE
+$ENDCMP
+#
+$CMP SG-51
+D CMOS Crystal Clock Oscillator, DIP14-style plastic package
+K Crystal Clock Oscillator
+F https://support.epson.biz/td/api/doc_check.php?mode=dl&lang=en&Parts=SG-51P
+$ENDCMP
+#
+$CMP SG-531
+D CMOS Crystal Clock Oscillator, DIP8-style plastic package
+K Crystal Clock Oscillator
+F https://support.epson.biz/td/api/doc_check.php?mode=dl&lang=en&Parts=SG-51P
+$ENDCMP
+#
+$CMP SG-615
+D CMOS Clock Oscillator
+K Crystal Clock Oscillator
+F https://support.epson.biz/td/api/doc_check.php?mode=dl&lang=en&Parts=SG-51P
+$ENDCMP
+#
+$CMP SG-8002CA
+D CMOS Clock Oscillator
+K Crystal Clock Oscillator
+F https://support.epson.biz/td/api/doc_check.php?mode=dl&lang=en&Parts=SG-8002DC
+$ENDCMP
+#
+$CMP SG-8002CE
+D CMOS Clock Oscillator
+K Crystal Clock Oscillator
+F https://support.epson.biz/td/api/doc_check.php?mode=dl&lang=en&Parts=SG-8002DC
+$ENDCMP
+#
+$CMP SG-8002DB
+D Crystal Clock Oscillator, DIP14-style plastic package
+K Crystal Clock Oscillator
+F https://support.epson.biz/td/api/doc_check.php?mode=dl&lang=en&Parts=SG-8002DC
+$ENDCMP
+#
+$CMP SG-8002DC
+D Crystal Clock Oscillator, DIP8-style plastic package
+K Crystal Clock Oscillator
+F https://support.epson.biz/td/api/doc_check.php?mode=dl&lang=en&Parts=SG-8002DC
+$ENDCMP
+#
+$CMP SG-8002JA
+D CMOS Clock Oscillator
+K Crystal Clock Oscillator
+F https://support.epson.biz/td/api/doc_check.php?mode=dl&lang=en&Parts=SG-8002DC
+$ENDCMP
+#
+$CMP SG-8002JC
+D CMOS Clock Oscillator
+K Crystal Clock Oscillator
+F https://support.epson.biz/td/api/doc_check.php?mode=dl&lang=en&Parts=SG-8002DC
+$ENDCMP
+#
+$CMP SG-8002LB
+D CMOS Clock Oscillator
+K Crystal Clock Oscillator
+F https://support.epson.biz/td/api/doc_check.php?mode=dl&lang=en&Parts=SG-8002DC
+$ENDCMP
+#
+$CMP Si570
+D 10 MHZ TO 1.4 GHZ I2C PROGRAMMABLE XO/VCXO
+K 10 MHZ TO 1.4 GHZ I2C PROGRAMMABLE XO/VCXO
+F http://www.silabs.com/Support%20Documents/TechnicalDocs/si570.pdf
+$ENDCMP
+#
+$CMP Si571
+D 10 MHZ TO 1.4 GHZ I2C PROGRAMMABLE XO/VCXO
+K 10 MHZ TO 1.4 GHZ I2C PROGRAMMABLE XO/VCXO
+F http://www.silabs.com/Support%20Documents/TechnicalDocs/si570.pdf
+$ENDCMP
+#
+$CMP TCXO-14
+D Temperature Compensated Crystal Clock Oscillator, DIP14-style metal package
+K Crystal Clock Oscillator
+F http://www.golledge.com/pdf/products/tcxos/gtxos14.pdf
+$ENDCMP
+#
+$CMP TCXO3
+D Temperature compensated crystal oscillator
+K Temperature compensated crystal oscillator
+F http://www.hcelectronics.cz/PDF/TCXO3_A.pdf
+$ENDCMP
+#
+$CMP TFT660
+D Crystal Clock Oscillator, DIP8-style metal package
+K Crystal Clock Oscillator
+F http://cdn-reichelt.de/documents/datenblatt/B400/OSZI.pdf
+$ENDCMP
+#
+$CMP TFT680
+D Crystal Clock Oscillator, DIP14-style metal package
+K Crystal Clock Oscillator
+F http://cdn-reichelt.de/documents/datenblatt/B400/OSZI.pdf
+$ENDCMP
+#
+$CMP TXC-7C
+D CMOS SMD Crystal Clock Oscillator, TXC
+K CMOS SMD Crystal Clock Oscillator
+F http://www.txccorp.com/download/products/osc/7C_o.pdf
+$ENDCMP
+#
+$CMP VC-81
+D Voltage-Controlled Crystal Clock Oscillator, DIP8-style metal package
+K Crystal Clock Oscillator
+F http://www.scsiglobal.com/Hosonic/Documents/SCSI-VC-81&83.pdf
+$ENDCMP
+#
+$CMP VC-83
+D Voltage-Controlled Crystal Clock Oscillator, DIP8-style metal package
+K Crystal Clock Oscillator
+F http://www.scsiglobal.com/Hosonic/Documents/SCSI-VC-81&83.pdf
+$ENDCMP
+#
+$CMP VTCXO-14
+D Voltage-Controlled Crystal Clock Oscillator, DIP14-style metal package
+K Crystal Clock Oscillator
+F http://www.golledge.com/pdf/products/tcxos/gtxos14.pdf
+$ENDCMP
+#
+$CMP XO32
+D HCMOS Clock Oscillator
+K Crystal Clock Oscillator
+F http://cdn-reichelt.de/documents/datenblatt/B400/XO32.pdf
+$ENDCMP
+#
+$CMP XO53
+D Low Power Consumption Clock Oscillator
+K Crystal Clock Oscillator
+F http://cdn-reichelt.de/documents/datenblatt/B400/XO53.pdf
+$ENDCMP
+#
+$CMP XO91
+D HCMOS Clock Oscillator
+K Crystal Clock Oscillator
+F http://cdn-reichelt.de/documents/datenblatt/B400/XO91.pdf
+$ENDCMP
+#
+#End Doc Library
--- a/library/Oscillators.lib
+++ b/library/Oscillators.lib
@ -1,19 +1,432 @@
 EESchema-LIBRARY Version 2.3
 #encoding utf-8
 #
-# IQXO/7X
+# ACO-xxxMHz-A
 #
-DEF IQXO/7X X 0 40 Y Y 1 F N
-F0 "X" 0 300 50 H V C CNN
-F1 "IQXO/7X" 0 0 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
+DEF ACO-xxxMHz-A X 0 10 Y Y 1 F N
+F0 "X" -200 250 50 H V L CNN
+F1 "ACO-xxxMHz-A" 50 -250 50 H V L CNN
+F2 "Oscillators:Oscillator_DIP-14" 450 -350 50 H I C CNN
+F3 "" -275 125 50 H V C CNN
+$FPLIST
+ Oscillator*DIP*14*
+$ENDFPLIST
 DRAW
-S -300 250 300 -250 0 1 0 N
-X E/B 1 -600 150 300 R 50 50 1 1 I
-X GND 2 -600 -150 300 R 50 50 1 1 P
-X OUT 3 600 150 300 L 50 50 1 1 O
-X V+ 4 600 -150 300 L 50 50 1 1 P
+S -400 200 200 -200 0 1 10 f
+P 9 0 1 0 -275 100 -250 100 -250 150 -225 150 -225 100 -200 100 -200 150 -175 150 -175 100 N
+X Tri-State 1 -500 0 100 R 50 50 1 1 T
+X GND 7 0 -300 100 U 50 50 1 1 W
+X OUT 8 300 0 100 L 50 50 1 1 O
+X Vcc 14 0 300 100 D 50 50 1 1 W
+ENDDRAW
+ENDDEF
+#
+# ASE-xxxMHz
+#
+DEF ASE-xxxMHz X 0 10 Y Y 1 F N
+F0 "X" -200 250 50 H V L CNN
+F1 "ASE-xxxMHz" 50 -250 50 H V L CNN
+F2 "Oscillators:Oscillator_SMD_Abracon_ASE-4pin_3.2x2.5mm" 700 -350 50 H I C CNN
+F3 "" -100 0 50 H V C CNN
+$FPLIST
+ Oscillator*SMD*Abracon*ASE*3.2x2.5mm*
+$ENDFPLIST
+DRAW
+S -200 200 200 -200 0 1 10 f
+P 10 0 1 0 -50 -30 -40 -30 -40 30 -20 30 -20 -30 0 -30 0 30 20 30 20 -30 30 -30 N
+X EN 1 -300 0 100 R 50 50 1 1 I
+X GND 2 0 -300 100 U 50 50 1 1 W
+X OUT 3 300 0 100 L 50 50 1 1 O
+X Vdd 4 0 300 100 D 50 50 1 1 W
+ENDDRAW
+ENDDEF
+#
+# ASV-xxxMHz
+#
+DEF ASV-xxxMHz X 0 10 Y Y 1 F N
+F0 "X" -200 250 50 H V L CNN
+F1 "ASV-xxxMHz" 50 -250 50 H V L CNN
+F2 "Oscillators:Oscillator_SMD_Abracon_ASV-4pin_7.0x5.1mm" 700 -350 50 H I C CNN
+F3 "" -100 0 50 H V C CNN
+$FPLIST
+ Oscillator*SMD*Abracon*ASV*7.0x5.1mm*
+$ENDFPLIST
+DRAW
+S -200 200 200 -200 0 1 10 f
+P 10 0 1 0 -50 -30 -40 -30 -40 30 -20 30 -20 -30 0 -30 0 30 20 30 20 -30 30 -30 N
+X EN 1 -300 0 100 R 50 50 1 1 I
+X GND 2 0 -300 100 U 50 50 1 1 W
+X OUT 3 300 0 100 L 50 50 1 1 O
+X Vdd 4 0 300 100 D 50 50 1 1 W
+ENDDRAW
+ENDDEF
+#
+# CXO_DIP14
+#
+DEF CXO_DIP14 X 0 10 Y Y 1 F N
+F0 "X" -200 250 50 H V L CNN
+F1 "CXO_DIP14" 50 -250 50 H V L CNN
+F2 "Oscillators:Oscillator_DIP-14" 450 -350 50 H I C CNN
+F3 "" -100 0 50 H V C CNN
+ALIAS TFT680 GTXO-14T
+$FPLIST
+ Oscillator*DIP*14*
+$ENDFPLIST
+DRAW
+S -200 200 200 -200 0 1 10 f
+P 9 0 1 0 -75 -25 -50 -25 -50 25 -25 25 -25 -25 0 -25 0 25 25 25 25 -25 N
+X EN 1 -300 0 100 R 50 50 1 1 I
+X GND 7 0 -300 100 U 50 50 1 1 W
+X OUT 8 300 0 100 L 50 50 1 1 O
+X Vcc 14 0 300 100 D 50 50 1 1 W
+ENDDRAW
+ENDDEF
+#
+# CXO_DIP8
+#
+DEF CXO_DIP8 X 0 10 Y Y 1 F N
+F0 "X" -200 250 50 H V L CNN
+F1 "CXO_DIP8" 50 -250 50 H V L CNN
+F2 "Oscillators:Oscillator_DIP-8" 450 -350 50 H I C CNN
+F3 "" -100 0 50 H V C CNN
+ALIAS TFT660
+$FPLIST
+ Oscillator*DIP*8*
+$ENDFPLIST
+DRAW
+S -200 200 200 -200 0 1 10 f
+P 9 0 1 0 -75 -25 -50 -25 -50 25 -25 25 -25 -25 0 -25 0 25 25 25 25 -25 N
+X EN 1 -300 0 100 R 50 50 1 1 I
+X GND 4 0 -300 100 U 50 50 1 1 W
+X OUT 5 300 0 100 L 50 50 1 1 O
+X Vcc 8 0 300 100 D 50 50 1 1 W
+ENDDRAW
+ENDDEF
+#
+# DFA-S11
+#
+DEF DFA-S11 X 0 10 Y Y 1 F N
+F0 "X" -200 250 50 H V L CNN
+F1 "DFA-S11" 50 -250 50 H V L CNN
+F2 "Oscillators:Oscillator_SMD_Fordahl_DFAS11-4pin_7.0x5.0mm" 1100 -350 50 H I C CNN
+F3 "" -100 0 50 H V C CNN
+$FPLIST
+ Oscillator*SMD*Fordahl*DFAS11*7.0x5.0mm*
+$ENDFPLIST
+DRAW
+S -200 200 300 -200 0 1 10 f
+P 8 0 1 0 25 -25 50 -25 50 25 75 25 75 -25 100 -25 100 25 125 25 N
+X Vctrl 1 -300 0 100 R 50 50 1 1 I
+X GND 2 0 -300 100 U 50 50 1 1 W
+X OUT 3 400 0 100 L 50 50 1 1 O
+X V+ 4 0 300 100 D 50 50 1 1 W
+ENDDRAW
+ENDDEF
+#
+# DFA-S15
+#
+DEF DFA-S15 X 0 10 Y Y 1 F N
+F0 "X" -200 250 50 H V L CNN
+F1 "DFA-S15" 50 -250 50 H V L CNN
+F2 "Oscillators:Oscillator_SMD_Fordahl_DFAS15-4pin_5.0x3.2mm" 1100 -350 50 H I C CNN
+F3 "" -100 0 50 H V C CNN
+$FPLIST
+ Oscillator*SMD*Fordahl*DFAS15*5.0x3.2mm*
+$ENDFPLIST
+DRAW
+S -200 200 300 -200 0 1 10 f
+P 8 0 1 0 25 -25 50 -25 50 25 75 25 75 -25 100 -25 100 25 125 25 N
+X Vctrl 1 -300 0 100 R 50 50 1 1 I
+X GND 2 0 -300 100 U 50 50 1 1 W
+X OUT 3 400 0 100 L 50 50 1 1 O
+X V+ 4 0 300 100 D 50 50 1 1 W
+ENDDRAW
+ENDDEF
+#
+# DFA-S2
+#
+DEF DFA-S2 X 0 10 Y Y 1 F N
+F0 "X" -200 250 50 H V L CNN
+F1 "DFA-S2" 50 -250 50 H V L CNN
+F2 "Oscillators:Oscillator_SMD_Fordahl_DFAS2-4pin_7.3x5.1mm" 1100 -350 50 H I C CNN
+F3 "" -100 0 50 H V C CNN
+$FPLIST
+ Oscillator*SMD*Fordahl*DFAS2*7.3x5.1mm*
+$ENDFPLIST
+DRAW
+S -200 200 300 -200 0 1 10 f
+P 8 0 1 0 25 -25 50 -25 50 25 75 25 75 -25 100 -25 100 25 125 25 N
+X Vctrl 1 -300 0 100 R 50 50 1 1 I
+X GND 2 0 -300 100 U 50 50 1 1 W
+X OUT 3 400 0 100 L 50 50 1 1 O
+X V+ 4 0 300 100 D 50 50 1 1 W
+ENDDRAW
+ENDDEF
+#
+# DFA-S3
+#
+DEF DFA-S3 X 0 10 Y Y 1 F N
+F0 "X" -200 250 50 H V L CNN
+F1 "DFA-S3" 50 -250 50 H V L CNN
+F2 "Oscillators:Oscillator_SMD_Fordahl_DFAS3-4pin_9.1x7.2mm" 1100 -350 50 H I C CNN
+F3 "" -100 0 50 H V C CNN
+$FPLIST
+ Oscillator*SMD*Fordahl*DFAS3*9.1x7.2mm*
+$ENDFPLIST
+DRAW
+S -200 200 300 -200 0 1 10 f
+P 8 0 1 0 25 -25 50 -25 50 25 75 25 75 -25 100 -25 100 25 125 25 N
+X Vctrl 1 -300 0 100 R 50 50 1 1 I
+X GND 2 0 -300 100 U 50 50 1 1 W
+X OUT 3 400 0 100 L 50 50 1 1 O
+X V+ 4 0 300 100 D 50 50 1 1 W
+ENDDRAW
+ENDDEF
+#
+# DGOF5S3
+#
+DEF DGOF5S3 X 0 10 Y Y 1 F N
+F0 "X" -200 250 50 H V L CNN
+F1 "DGOF5S3" 50 -250 50 H V L CNN
+F2 "Oscillators:Oscillator_DIP-14" 450 -350 50 H I C CNN
+F3 "" -100 0 50 H V C CNN
+ALIAS ACO-xxxMHz GTXO-S14T TCXO-14
+$FPLIST
+ Oscillator*DIP*14*
+$ENDFPLIST
+DRAW
+S -200 200 200 -200 0 1 10 f
+P 9 0 1 0 -100 -25 -75 -25 -75 25 -50 25 -50 -25 -25 -25 -25 25 0 25 0 -25 N
+X NC 1 -300 0 100 R 50 50 1 1 N N
+X GND 7 0 -300 100 U 50 50 1 1 W
+X OUT 8 300 0 100 L 50 50 1 1 O
+X Vcc 14 0 300 100 D 50 50 1 1 W
+ENDDRAW
+ENDDEF
+#
+# IQXO-70
+#
+DEF IQXO-70 X 0 10 Y Y 1 F N
+F0 "X" -200 250 50 H V L CNN
+F1 "IQXO-70" 50 -250 50 H V L CNN
+F2 "Oscillators:Oscillator_SMD_IQD_IQXO70-4pin_7.5x5.0mm" 675 -325 50 H I C CNN
+F3 "" -100 0 50 H V C CNN
+$FPLIST
+ Oscillator*SMD*IQD*IQXO70*7.5x5.0mm*
+$ENDFPLIST
+DRAW
+S -200 200 200 -200 0 1 10 f
+P 10 0 1 0 -40 -30 -30 -30 -30 30 -10 30 -10 -30 10 -30 10 30 30 30 30 -30 40 -30 N
+X E/B 1 -300 0 100 R 50 50 1 1 I
+X GND 2 0 -300 100 U 50 50 1 1 W
+X OUT 3 300 0 100 L 50 50 1 1 O
+X V+ 4 0 300 100 D 50 50 1 1 W
+ENDDRAW
+ENDDEF
+#
+# OCXO-14
+#
+DEF OCXO-14 X 0 10 Y Y 1 F N
+F0 "X" -200 250 50 H V L CNN
+F1 "OCXO-14" 50 -250 50 H V L CNN
+F2 "Oscillators:Oscillator_DIP-14" 450 -350 50 H I C CNN
+F3 "" -300 100 50 H V C CNN
+ALIAS GTXO-14V GTXO-S14V VTCXO-14
+$FPLIST
+ Oscillator*DIP*14*
+$ENDFPLIST
+DRAW
+S -400 200 200 -200 0 1 10 f
+P 9 0 1 0 -275 75 -250 75 -250 125 -225 125 -225 75 -200 75 -200 125 -175 125 -175 75 N
+X Vcontrol 1 -500 0 100 R 50 50 1 1 I
+X GND 7 0 -300 100 U 50 50 1 1 W
+X OUT 8 300 0 100 L 50 50 1 1 O
+X Vcc 14 0 300 100 D 50 50 1 1 W
+ENDDRAW
+ENDDEF
+#
+# SG-210SED
+#
+DEF SG-210SED X 0 10 Y Y 1 F N
+F0 "X" -200 250 50 H V L CNN
+F1 "SG-210SED" 50 -250 50 H V L CNN
+F2 "Oscillators:Oscillator_SMD_SeikoEpson_SG210-4pin_2.5x2.0mm" 450 -350 50 H I C CNN
+F3 "" -100 0 50 H V C CNN
+ALIAS SG-210SDD SG-210SCD
+$FPLIST
+ Oscillator*SMD*SeikoEpson*SG210*2.5x2.0mm*
+$ENDFPLIST
+DRAW
+S -200 200 200 -200 0 1 10 f
+P 9 0 1 0 -75 -25 -50 -25 -50 25 -25 25 -25 -25 0 -25 0 25 25 25 25 -25 N
+X OE 1 -300 0 100 R 50 50 1 1 I
+X GND 2 0 -300 100 U 50 50 1 1 W
+X OUT 3 300 0 100 L 50 50 1 1 O
+X Vcc 4 0 300 100 D 50 50 1 1 W
+ENDDRAW
+ENDDEF
+#
+# SG-210STF
+#
+DEF SG-210STF X 0 10 Y Y 1 F N
+F0 "X" -200 250 50 H V L CNN
+F1 "SG-210STF" 50 -250 50 H V L CNN
+F2 "Oscillators:Oscillator_SMD_SeikoEpson_SG210-4pin_2.5x2.0mm" 450 -350 50 H I C CNN
+F3 "" -100 0 50 H V C CNN
+ALIAS SG-211
+$FPLIST
+ Oscillator*SMD*SeikoEpson*SG210*2.5x2.0mm*
+$ENDFPLIST
+DRAW
+S -200 200 200 -200 0 1 10 f
+P 9 0 1 0 -75 -25 -50 -25 -50 25 -25 25 -25 -25 0 -25 0 25 25 25 25 -25 N
+X ~ST~ 1 -300 0 100 R 50 50 1 1 I
+X GND 2 0 -300 100 U 50 50 1 1 W
+X OUT 3 300 0 100 L 50 50 1 1 O
+X Vcc 4 0 300 100 D 50 50 1 1 W
+ENDDRAW
+ENDDEF
+#
+# SG-8002CA
+#
+DEF SG-8002CA X 0 10 Y Y 1 F N
+F0 "X" -200 250 50 H V L CNN
+F1 "SG-8002CA" 50 -250 50 H V L CNN
+F2 "Oscillators:Oscillator_SMD_SeikoEpson_SG8002CA-4pin_7.0x5.0mm" 700 -350 50 H I C CNN
+F3 "" -100 0 50 H V C CNN
+$FPLIST
+ Oscillator*SMD*SeikoEpson*SG8002CA*7.0x5.0mm*
+$ENDFPLIST
+DRAW
+S -200 200 200 -200 0 1 10 f
+P 10 0 1 0 -50 -30 -40 -30 -40 30 -20 30 -20 -30 0 -30 0 30 20 30 20 -30 30 -30 N
+X OE 1 -300 0 100 R 50 50 1 1 I
+X GND 2 0 -300 100 U 50 50 1 1 W
+X OUT 3 300 0 100 L 50 50 1 1 O
+X V+ 4 0 300 100 D 50 50 1 1 W
+ENDDRAW
+ENDDEF
+#
+# SG-8002CE
+#
+DEF SG-8002CE X 0 10 Y Y 1 F N
+F0 "X" -200 250 50 H V L CNN
+F1 "SG-8002CE" 50 -250 50 H V L CNN
+F2 "Oscillators:Oscillator_SMD_SeikoEpson_SG8002CE-4pin_3.2x2.5mm" 700 -350 50 H I C CNN
+F3 "" -100 0 50 H V C CNN
+$FPLIST
+ Oscillator*SMD*SeikoEpson*SG8002CE*3.2x2.5mm*
+$ENDFPLIST
+DRAW
+S -200 200 200 -200 0 1 10 f
+P 10 0 1 0 -50 -30 -40 -30 -40 30 -20 30 -20 -30 0 -30 0 30 20 30 20 -30 30 -30 N
+X OE 1 -300 0 100 R 50 50 1 1 I
+X GND 2 0 -300 100 U 50 50 1 1 W
+X OUT 3 300 0 100 L 50 50 1 1 O
+X V+ 4 0 300 100 D 50 50 1 1 W
+ENDDRAW
+ENDDEF
+#
+# SG-8002DB
+#
+DEF SG-8002DB X 0 10 Y Y 1 F N
+F0 "X" -200 250 50 H V L CNN
+F1 "SG-8002DB" 50 -250 50 H V L CNN
+F2 "Oscillators:Oscillator_SeikoEpson_SG-8002DB" 450 -350 50 H I C CNN
+F3 "" -100 0 50 H V C CNN
+ALIAS SG-51
+$FPLIST
+ Oscillator*SeikoEpson*SG?8002DB*
+$ENDFPLIST
+DRAW
+S -200 200 200 -200 0 1 10 f
+P 9 0 1 0 -75 -25 -50 -25 -50 25 -25 25 -25 -25 0 -25 0 25 25 25 25 -25 N
+X OE 1 -300 0 100 R 50 50 1 1 I
+X GND 7 0 -300 100 U 50 50 1 1 W
+X OUT 8 300 0 100 L 50 50 1 1 O
+X Vcc 14 0 300 100 D 50 50 1 1 W
+ENDDRAW
+ENDDEF
+#
+# SG-8002DC
+#
+DEF SG-8002DC X 0 10 Y Y 1 F N
+F0 "X" -200 250 50 H V L CNN
+F1 "SG-8002DC" 50 -250 50 H V L CNN
+F2 "Oscillators:Oscillator_SeikoEpson_SG-8002DC" 450 -350 50 H I C CNN
+F3 "" -100 0 50 H V C CNN
+ALIAS SG-531
+$FPLIST
+ Oscillator*SeikoEpson*SG?8002DC*
+$ENDFPLIST
+DRAW
+S -200 200 200 -200 0 1 10 f
+P 9 0 1 0 -75 -25 -50 -25 -50 25 -25 25 -25 -25 0 -25 0 25 25 25 25 -25 N
+X OE 1 -300 0 100 R 50 50 1 1 I
+X GND 4 0 -300 100 U 50 50 1 1 W
+X OUT 5 300 0 100 L 50 50 1 1 O
+X Vcc 8 0 300 100 D 50 50 1 1 W
+ENDDRAW
+ENDDEF
+#
+# SG-8002JA
+#
+DEF SG-8002JA X 0 10 Y Y 1 F N
+F0 "X" -200 250 50 H V L CNN
+F1 "SG-8002JA" 50 -250 50 H V L CNN
+F2 "Oscillators:Oscillator_SMD_SeikoEpson_SG8002JA-4pin_14.0x8.7mm" 700 -350 50 H I C CNN
+F3 "" -100 0 50 H V C CNN
+ALIAS SG-615
+$FPLIST
+ Oscillator*SMD*SeikoEpson*SG8002JA*14.0x8.7mm*
+$ENDFPLIST
+DRAW
+S -200 200 200 -200 0 1 10 f
+P 10 0 1 0 -50 -30 -40 -30 -40 30 -20 30 -20 -30 0 -30 0 30 20 30 20 -30 30 -30 N
+X OE 1 -300 0 100 R 50 50 1 1 I
+X GND 2 0 -300 100 U 50 50 1 1 W
+X OUT 3 300 0 100 L 50 50 1 1 O
+X V+ 4 0 300 100 D 50 50 1 1 W
+ENDDRAW
+ENDDEF
+#
+# SG-8002JC
+#
+DEF SG-8002JC X 0 10 Y Y 1 F N
+F0 "X" -200 250 50 H V L CNN
+F1 "SG-8002JC" 50 -250 50 H V L CNN
+F2 "Oscillators:Oscillator_SMD_SeikoEpson_SG8002JC-4pin_10.5x5.0mm" 700 -350 50 H I C CNN
+F3 "" -100 0 50 H V C CNN
+$FPLIST
+ Oscillator*SMD*SeikoEpson*SG8002JC*10.5x5.0mm*
+$ENDFPLIST
+DRAW
+S -200 200 200 -200 0 1 10 f
+P 10 0 1 0 -50 -30 -40 -30 -40 30 -20 30 -20 -30 0 -30 0 30 20 30 20 -30 30 -30 N
+X OE 1 -300 0 100 R 50 50 1 1 I
+X GND 2 0 -300 100 U 50 50 1 1 W
+X OUT 3 300 0 100 L 50 50 1 1 O
+X V+ 4 0 300 100 D 50 50 1 1 W
+ENDDRAW
+ENDDEF
+#
+# SG-8002LB
+#
+DEF SG-8002LB X 0 10 Y Y 1 F N
+F0 "X" -200 250 50 H V L CNN
+F1 "SG-8002LB" 50 -250 50 H V L CNN
+F2 "Oscillators:Oscillator_SMD_SeikoEpson_SG8002LB-4pin_5.0x3.2mm" 700 -350 50 H I C CNN
+F3 "" -100 0 50 H V C CNN
+$FPLIST
+ Oscillator*SMD*SeikoEpson*SG8002LB*5.0x3.2mm*
+$ENDFPLIST
+DRAW
+S -200 200 200 -200 0 1 10 f
+P 10 0 1 0 -50 -30 -40 -30 -40 30 -20 30 -20 -30 0 -30 0 30 20 30 20 -30 30 -30 N
+X OE 1 -300 0 100 R 50 50 1 1 I
+X GND 2 0 -300 100 U 50 50 1 1 W
+X OUT 3 300 0 100 L 50 50 1 1 O
+X V+ 4 0 300 100 D 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
@ -22,15 +435,15 @@ ENDDEF
 DEF Si570 IC 0 40 Y Y 1 F N
 F0 "IC" -400 400 50 H V C CNN
 F1 "Si570" 350 -400 50 H V C CNN
-F2 "SI570_SI571_Standard" -550 600 50 H I C CNN
-F3 "http://www.silabs.com/Support Documents/TechnicalDocs/si570.pdf" -400 700 50 H I C CNN
+F2 "Oscillators:Oscillator_SI570_SI571_Standard" -550 600 50 H I C CNN
+F3 "" -400 700 50 H I C CNN
 $FPLIST
- SI570_SI571_Standard
- SI570_SI571_HandSoldering
+ Oscillator*SI570*SI571*
 $ENDFPLIST
 DRAW
-S -450 350 450 -350 0 1 0 N
-X NC 1 -600 200 150 R 50 50 1 1 N
+S -450 350 450 -350 0 1 10 f
+P 10 0 1 0 -75 -50 -50 -50 -50 50 0 50 0 -50 50 -50 50 50 100 50 100 -50 125 -50 N
+X NC 1 -600 200 150 R 50 50 1 1 N N
 X OE 2 -600 100 150 R 50 50 1 1 I
 X GND 3 0 -500 150 U 50 50 1 1 W
 X CLK+ 4 600 100 150 L 50 50 1 1 O
@ -46,14 +459,14 @@ ENDDEF
 DEF Si571 IC 0 40 Y Y 1 F N
 F0 "IC" -400 400 50 H V C CNN
 F1 "Si571" 350 -400 50 H V C CNN
-F2 "SI570_SI571_Standard" -550 600 50 H I C CNN
-F3 "http://www.silabs.com/Support Documents/TechnicalDocs/si570.pdf" -400 700 50 H I C CNN
+F2 "Oscillators:Oscillator_SI570_SI571_Standard" -550 600 50 H I C CNN
+F3 "" -400 700 50 H I C CNN
 $FPLIST
- SI570_SI571_Standard
- SI570_SI571_HandSoldering
+ Oscillator*SI570*SI571*
 $ENDFPLIST
 DRAW
-S -450 350 450 -350 0 1 0 N
+S -450 350 450 -350 0 1 10 f
+P 10 0 1 0 -75 -50 -50 -50 -50 50 0 50 0 -50 50 -50 50 50 100 50 100 -50 125 -50 N
 X Vc 1 -600 200 150 R 50 50 1 1 I
 X OE 2 -600 100 150 R 50 50 1 1 I
 X GND 3 0 -500 150 U 50 50 1 1 W
@ -67,49 +480,138 @@ ENDDEF
 #
 # TCXO3
 #
-DEF TCXO3 X 0 40 Y Y 1 F N
-F0 "X" 0 300 50 H V C CNN
-F1 "TCXO3" 0 0 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
+DEF TCXO3 X 0 20 Y Y 1 F N
+F0 "X" 325 450 50 H V L CNN
+F1 "TCXO3" 325 350 50 H V L CNN
+F2 "" -550 250 50 H V C CNN
 F3 "" 0 0 50 H V C CNN
 DRAW
-S -400 -250 400 250 0 1 0 N
-X NC 1 700 -150 300 L 50 50 1 1 P
-X GND 4 -700 -150 300 R 50 50 1 1 P
-X FREQ 5 700 150 300 L 50 50 1 1 O
-X +5V 8 -700 150 300 R 50 50 1 1 P
+S -500 -200 400 300 0 1 10 f
+P 10 0 1 0 -100 0 -75 0 -75 100 -25 100 -25 0 25 0 25 100 75 100 75 0 100 0 N
+X FREQ 1 500 100 100 L 50 50 1 1 O
+X NC 2 500 200 100 L 50 50 1 1 N N
+X URef 3 -200 400 100 D 50 50 1 1 w
+X NC 4 -600 200 100 R 50 50 1 1 N N
+X NC 5 100 400 100 D 50 50 1 1 N N
+X NC 6 -600 0 100 R 50 50 1 1 N N
+X NC 7 -600 -100 100 R 50 50 1 1 N N
+X NC 8 -300 -300 100 U 50 50 1 1 N N
+X NC 9 200 -300 100 U 50 50 1 1 N N
+X GND 10 -200 -300 100 U 50 50 1 1 W
+X NC 20 -400 400 100 D 50 50 1 1 N N
+X GND 11 -100 -300 100 U 50 50 1 1 W
+X NC 21 300 400 100 D 50 50 1 1 N N
+X GND 12 0 -300 100 U 50 50 1 1 W
+X NC 22 500 -100 100 L 50 50 1 1 N N
+X NC 13 300 -300 100 U 50 50 1 1 N N
+X GND 23 100 -300 100 U 50 50 1 1 W
+X NC 14 500 0 100 L 50 50 1 1 N N
+X +5V 15 0 400 100 D 50 50 1 1 W
+X NC 16 200 400 100 D 50 50 1 1 N N
+X NC 17 -100 400 100 D 50 50 1 1 N N
+X Vctrl 18 -600 100 100 R 50 50 1 1 I
+X NC 19 -300 400 100 D 50 50 1 1 N N
 ENDDRAW
 ENDDEF
 #
-# TCXO_DFAS11
+# TXC-7C
 #
-DEF TCXO_DFAS11 X 0 40 Y Y 1 F N
-F0 "X" 0 300 50 H V C CNN
-F1 "TCXO_DFAS11" 0 0 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
+DEF TXC-7C X 0 10 Y Y 1 F N
+F0 "X" -200 250 50 H V L CNN
+F1 "TXC-7C" 50 -250 50 H V L CNN
+F2 "Oscillators:Oscillator_SMD_TXC_7C-4pin_5.0x3.2mm" 700 -350 50 H I C CNN
+F3 "" -100 0 50 H V C CNN
+$FPLIST
+ Oscillator*SMD*TXC*7C*5.0x3.2mm*
+$ENDFPLIST
 DRAW
-S -400 -250 400 250 0 1 0 N
-X VContr 1 -700 -150 300 R 50 50 1 1 P
-X GND 2 700 -150 300 L 50 50 1 1 P
-X FREQ 3 700 150 300 L 50 50 1 1 O
-X VCC 4 -700 150 300 R 50 50 1 1 W
+S -200 200 200 -200 0 1 10 f
+P 10 0 1 0 -50 -30 -40 -30 -40 30 -20 30 -20 -30 0 -30 0 30 20 30 20 -30 30 -30 N
+X EN 1 -300 0 100 R 50 50 1 1 I
+X GND 2 0 -300 100 U 50 50 1 1 W
+X OUT 3 300 0 100 L 50 50 1 1 O
+X Vdd 4 0 300 100 D 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
-# TQSMT-35
+# VC-81
 #
-DEF TQSMT-35 X 0 40 Y Y 1 F N
-F0 "X" 0 300 50 H V C CNN
-F1 "TQSMT-35" 0 0 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
+DEF VC-81 X 0 10 Y Y 1 F N
+F0 "X" -200 250 50 H V L CNN
+F1 "VC-81" 50 -250 50 H V L CNN
+F2 "Oscillators:Oscillator_DIP-8" 450 -350 50 H I C CNN
+F3 "" -300 100 50 H V C CNN
+ALIAS VC-83
+$FPLIST
+ Oscillator*DIP*8*
+$ENDFPLIST
 DRAW
-S -400 -250 400 250 0 1 0 N
-X VC/NC 1 700 150 300 L 50 50 1 1 P
-X GND 2 -700 -150 300 R 50 50 1 1 P
-X FREQ 3 700 -150 300 L 50 50 1 1 O
-X +B 4 -700 150 300 R 50 50 1 1 P
+S -400 200 200 -200 0 1 10 f
+P 9 0 1 0 -275 75 -250 75 -250 125 -225 125 -225 75 -200 75 -200 125 -175 125 -175 75 N
+X Vcontrol 1 -500 0 100 R 50 50 1 1 I
+X GND 4 0 -300 100 U 50 50 1 1 W
+X OUT 5 300 0 100 L 50 50 1 1 O
+X Vcc 8 0 300 100 D 50 50 1 1 W
+ENDDRAW
+ENDDEF
+#
+# XO32
+#
+DEF XO32 X 0 10 Y Y 1 F N
+F0 "X" -200 250 50 H V L CNN
+F1 "XO32" 50 -250 50 H V L CNN
+F2 "Oscillators:Oscillator_SMD_EuroQuartz_XO32-4pin_3.2x2.5mm" 700 -350 50 H I C CNN
+F3 "" -100 0 50 H V C CNN
+$FPLIST
+ Oscillator*SMD*EuroQuartz*XO32*3.2x2.5mm*
+$ENDFPLIST
+DRAW
+S -200 200 200 -200 0 1 10 f
+P 10 0 1 0 -50 -30 -40 -30 -40 30 -20 30 -20 -30 0 -30 0 30 20 30 20 -30 30 -30 N
+X EN 1 -300 0 100 R 50 50 1 1 I
+X GND 2 0 -300 100 U 50 50 1 1 W
+X OUT 3 300 0 100 L 50 50 1 1 O
+X V+ 4 0 300 100 D 50 50 1 1 W
+ENDDRAW
+ENDDEF
+#
+# XO53
+#
+DEF XO53 X 0 10 Y Y 1 F N
+F0 "X" -200 250 50 H V L CNN
+F1 "XO53" 50 -250 50 H V L CNN
+F2 "Oscillators:Oscillator_SMD_EuroQuartz_XO53-4pin_5.0x3.2mm" 700 -350 50 H I C CNN
+F3 "" -100 0 50 H V C CNN
+$FPLIST
+ Oscillator*SMD*EuroQuartz*XO53*5.0x3.2mm*
+$ENDFPLIST
+DRAW
+S -200 200 200 -200 0 1 10 f
+P 10 0 1 0 30 -30 20 -30 20 30 0 30 0 -30 -20 -30 -20 30 -40 30 -40 -30 -50 -30 N
+X EN 1 -300 0 100 R 50 50 1 1 I
+X GND 2 0 -300 100 U 50 50 1 1 W
+X OUT 3 300 0 100 L 50 50 1 1 O
+X V+ 4 0 300 100 D 50 50 1 1 W
+ENDDRAW
+ENDDEF
+#
+# XO91
+#
+DEF XO91 X 0 10 Y Y 1 F N
+F0 "X" -200 250 50 H V L CNN
+F1 "XO91" 50 -250 50 H V L CNN
+F2 "Oscillators:Oscillator_SMD_EuroQuartz_XO91-4pin_7.0x5.0mm" 700 -350 50 H I C CNN
+F3 "" -100 0 50 H V C CNN
+$FPLIST
+ Oscillator*SMD*EuroQuartz*XO91*7.0x5.0mm*
+$ENDFPLIST
+DRAW
+S -200 200 200 -200 0 1 10 f
+P 10 0 1 0 30 -30 20 -30 20 30 0 30 0 -30 -20 -30 -20 30 -40 30 -40 -30 -50 -30 N
+X EN 1 -300 0 100 R 50 50 1 1 I
+X GND 2 0 -300 100 U 50 50 1 1 W
+X OUT 3 300 0 100 L 50 50 1 1 O
+X V+ 4 0 300 100 D 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
--- a/library/diode.dcm
+++ b/library/diode.dcm
@ -1,5 +1,317 @@
 EESchema-DOCLIB  Version 2.0
 #
+$CMP 1N4001
+D 50V 1A General Purpose Rectifier Diode, DO-41
+K diode
+F http://www.vishay.com/docs/88503/1n4001.pdf
+$ENDCMP
+#
+$CMP 1N4002
+D 100V 1A General Purpose Rectifier Diode, DO-41
+K diode
+F http://www.vishay.com/docs/88503/1n4001.pdf
+$ENDCMP
+#
+$CMP 1N4003
+D 20V 1A General Purpose Rectifier Diode, DO-41
+K diode
+F http://www.vishay.com/docs/88503/1n4001.pdf
+$ENDCMP
+#
+$CMP 1N4004
+D 400V 1A General Purpose Rectifier Diode, DO-41
+K diode
+F http://www.vishay.com/docs/88503/1n4001.pdf
+$ENDCMP
+#
+$CMP 1N4005
+D 600V 1A General Purpose Rectifier Diode, DO-41
+K diode
+F http://www.vishay.com/docs/88503/1n4001.pdf
+$ENDCMP
+#
+$CMP 1N4006
+D 800V 1A General Purpose Rectifier Diode, DO-41
+K diode
+F http://www.vishay.com/docs/88503/1n4001.pdf
+$ENDCMP
+#
+$CMP 1N4007
+D 1000V 1A General Purpose Rectifier Diode, DO-41
+K diode
+F http://www.vishay.com/docs/88503/1n4001.pdf
+$ENDCMP
+#
+$CMP 1N4148
+D 100V 0.15A standard switching diode, DO-35
+K diode
+F http://www.nxp.com/documents/data_sheet/1N4148_1N4448.pdf
+$ENDCMP
+#
+$CMP 1N4149
+D 75V Vrm 0.5A Ifsm standard switching diode, DO-35
+K diode
+F http://www.microsemi.com/document-portal/doc_view/11580-lds-0239
+$ENDCMP
+#
+$CMP 1N4151
+D 75V 0.5A standard switching diode, DO-35
+K diode
+F http://www.microsemi.com/document-portal/doc_view/11580-lds-0239
+$ENDCMP
+#
+$CMP 1N4448
+D 100V 0.15A High-speed standard diode, DO-35
+K diode
+F http://www.nxp.com/documents/data_sheet/1N4148_1N4448.pdf
+$ENDCMP
+#
+$CMP 1N5400
+D 50V 3A General Purpose Rectifier Diode, DO-201AD
+K diode
+F http://www.vishay.com/docs/88516/1n5400.pdf
+$ENDCMP
+#
+$CMP 1N5401
+D 100V 3A General Purpose Rectifier Diode, DO-201AD
+K diode
+F http://www.vishay.com/docs/88516/1n5400.pdf
+$ENDCMP
+#
+$CMP 1N5402
+D 200V 3A General Purpose Rectifier Diode, DO-201AD
+K diode
+F http://www.vishay.com/docs/88516/1n5400.pdf
+$ENDCMP
+#
+$CMP 1N5403
+D 300V 3A General Purpose Rectifier Diode, DO-201AD
+K diode
+F http://www.vishay.com/docs/88516/1n5400.pdf
+$ENDCMP
+#
+$CMP 1N5404
+D 400V 3A General Purpose Rectifier Diode, DO-201AD
+K diode
+F http://www.vishay.com/docs/88516/1n5400.pdf
+$ENDCMP
+#
+$CMP 1N5405
+D 500V 3A General Purpose Rectifier Diode, DO-201AD
+K diode
+F http://www.vishay.com/docs/88516/1n5400.pdf
+$ENDCMP
+#
+$CMP 1N5406
+D 600V 3A General Purpose Rectifier Diode, DO-201AD
+K diode
+F http://www.vishay.com/docs/88516/1n5400.pdf
+$ENDCMP
+#
+$CMP 1N5407
+D 800V 3A General Purpose Rectifier Diode, DO-201AD
+K diode
+F http://www.vishay.com/docs/88516/1n5400.pdf
+$ENDCMP
+#
+$CMP 1N5408
+D 1000V 3A General Purpose Rectifier Diode, DO-201AD
+K diode
+F http://www.vishay.com/docs/88516/1n5400.pdf
+$ENDCMP
+#
+$CMP 1N5817
+D 20V 1A Schottky Barrier Rectifier Diode, DO-41
+K diode Schottky
+F http://www.vishay.com/docs/88525/1n5817.pdf
+$ENDCMP
+#
+$CMP 1N5818
+D 30V 1A Schottky Barrier Rectifier Diode, DO-41
+K diode Schottky
+F http://www.vishay.com/docs/88525/1n5817.pdf
+$ENDCMP
+#
+$CMP 1N5819
+D 40V 1A Schottky Barrier Rectifier Diode, DO-41
+K diode Schottky
+F http://www.vishay.com/docs/88525/1n5817.pdf
+$ENDCMP
+#
+$CMP 1N5820
+D 20V 3A Schottky Barrier Rectifier Diode, DO-201AD
+K diode Schottky
+F http://www.vishay.com/docs/88526/1n5820.pdf
+$ENDCMP
+#
+$CMP 1N5821
+D 30V 3A Schottky Barrier Rectifier Diode, DO-201AD
+K diode Schottky
+F http://www.vishay.com/docs/88526/1n5820.pdf
+$ENDCMP
+#
+$CMP 1N5822
+D 40V 3A Schottky Barrier Rectifier Diode, DO-201AD
+K diode Schottky
+F http://www.vishay.com/docs/88526/1n5820.pdf
+$ENDCMP
+#
+$CMP 1N6263
+D 60V 15mA Schottky diode, DO-35
+K diode Schottky
+F http://www.st.com/content/ccc/resource/technical/document/datasheet/b3/a2/fa/7c/21/78/43/6f/CD00000760.pdf/files/CD00000760.pdf/jcr:content/translations/en.CD00000760.pdf
+$ENDCMP
+#
+$CMP 1N914
+D 100V 0.3A Small Signal Fast Switching Diode, DO-35
+K diode
+F http://www.vishay.com/docs/85622/1n914.pdf
+$ENDCMP
+#
+$CMP B120-E3
+D 20V 1A Schottky Barrier Rectifier Diode, SMA/DO-214AC
+K diode Schottky
+F http://www.vishay.com/docs/88946/b120.pdf
+$ENDCMP
+#
+$CMP B130-E3
+D 30V 1A Schottky Barrier Rectifier Diode, SMA/DO-214AC
+K diode Schottky
+F http://www.vishay.com/docs/88946/b120.pdf
+$ENDCMP
+#
+$CMP B140-E3
+D 40V 1A Schottky Barrier Rectifier Diode, SMA/DO-214AC
+K diode Schottky
+F http://www.vishay.com/docs/88946/b120.pdf
+$ENDCMP
+#
+$CMP B150-E3
+D 50V 1A Schottky Barrier Rectifier Diode, SMA/DO-214AC
+K diode Schottky
+F http://www.vishay.com/docs/88946/b120.pdf
+$ENDCMP
+#
+$CMP B160-E3
+D 60V 1A Schottky Barrier Rectifier Diode, SMA/DO-214AC
+K diode Schottky
+F http://www.vishay.com/docs/88946/b120.pdf
+$ENDCMP
+#
+$CMP B220
+D 20V 2A Schottky Barrier Rectifier Diode, SMB
+K diode Schottky
+F http://www.jameco.com/Jameco/Products/ProdDS/1538777.pdf
+$ENDCMP
+#
+$CMP B230
+D 30V 2A Schottky Barrier Rectifier Diode, SMB
+K diode Schottky
+F http://www.jameco.com/Jameco/Products/ProdDS/1538777.pdf
+$ENDCMP
+#
+$CMP B240
+D 40V 2A Schottky Barrier Rectifier Diode, SMB
+K diode Schottky
+F http://www.jameco.com/Jameco/Products/ProdDS/1538777.pdf
+$ENDCMP
+#
+$CMP B250
+D 50V 2A Schottky Barrier Rectifier Diode, SMB
+K diode Schottky
+F http://www.jameco.com/Jameco/Products/ProdDS/1538777.pdf
+$ENDCMP
+#
+$CMP B260
+D 60V 2A Schottky Barrier Rectifier Diode, SMB
+K diode Schottky
+F http://www.jameco.com/Jameco/Products/ProdDS/1538777.pdf
+$ENDCMP
+#
+$CMP B320
+D 20V 3A Schottky Barrier Rectifier Diode, SMC
+K diode Schottky
+F http://www.jameco.com/Jameco/Products/ProdDS/1538777.pdf
+$ENDCMP
+#
+$CMP B330
+D 30V 3A Schottky Barrier Rectifier Diode, SMC
+K diode Schottky
+F http://www.jameco.com/Jameco/Products/ProdDS/1538777.pdf
+$ENDCMP
+#
+$CMP B340
+D 40V 3A Schottky Barrier Rectifier Diode, SMC
+K diode Schottky
+F http://www.jameco.com/Jameco/Products/ProdDS/1538777.pdf
+$ENDCMP
+#
+$CMP B350
+D 50V 3A Schottky Barrier Rectifier Diode, SMC
+K diode Schottky
+F http://www.jameco.com/Jameco/Products/ProdDS/1538777.pdf
+$ENDCMP
+#
+$CMP B360
+D 60V 3A Schottky Barrier Rectifier Diode, SMC
+K diode Schottky
+F http://www.jameco.com/Jameco/Products/ProdDS/1538777.pdf
+$ENDCMP
+#
+$CMP BA157
+D 400V 1A Fast recovery Rectifier Diode, DO-41
+K diode
+F http://diotec.com/tl_files/diotec/files/pdf/datasheets/ba157
+$ENDCMP
+#
+$CMP BA158
+D 600V 1A Fast recovery Rectifier Diode, DO-41
+K diode
+F http://diotec.com/tl_files/diotec/files/pdf/datasheets/ba157
+$ENDCMP
+#
+$CMP BA159
+D 1000V 1A Fast recovery Rectifier Diode, DO-41
+K diode
+F http://diotec.com/tl_files/diotec/files/pdf/datasheets/ba157
+$ENDCMP
+#
+$CMP BA243
+D 20V 0.1A silicon planar diode for VHF tuner band selection, DO-35
+K diode
+F http://cdn-reichelt.de/documents/datenblatt/A400/BA243_TFK.pdf
+$ENDCMP
+#
+$CMP BA244
+D 20V 0.1A silicon planar diode for VHF tuner band selection, DO-35
+K diode
+F http://cdn-reichelt.de/documents/datenblatt/A400/BA243_TFK.pdf
+$ENDCMP
+#
+$CMP BA282
+D 35V 0.1A Band Switching Diode, DO-35
+K diode
+F http://docs-europe.electrocomponents.com/webdocs/1304/0900766b813040d6.pdf
+$ENDCMP
+#
+$CMP BA283
+D 35V 0.1A Band Switching Diode, DO-35
+K diode
+F http://docs-europe.electrocomponents.com/webdocs/1304/0900766b813040d6.pdf
+$ENDCMP
+#
+$CMP BAR42FILM
+D 30V 0.1A Small signal Schottky diode, SOT-23
+K diode Schottky
+F http://www.st.com/content/ccc/resource/technical/document/datasheet/b3/b4/6e/ab/17/40/40/62/CD00000764.pdf/files/CD00000764.pdf/jcr:content/translations/en.CD00000764.pdf
+$ENDCMP
+#
+$CMP BAR43FILM
+D 30V 0.1A Small signal Schottky diode, SOT-23
+K diode Schottky
+F http://www.st.com/content/ccc/resource/technical/document/datasheet/b3/b4/6e/ab/17/40/40/62/CD00000764.pdf/files/CD00000764.pdf/jcr:content/translations/en.CD00000764.pdf
+$ENDCMP
+#
 $CMP BAS16TW
 D Fast switching diode array 3 independent
 K diode
@ -12,12 +324,114 @@ K diode
 F http://www.nxp.com/documents/data_sheet/BAS16_SER.pdf
 $ENDCMP
 #
+$CMP BAT41
+D 100V 0.1A Small Signal Schottky Diode, DO-35
+K diode Schottky
+F http://www.vishay.com/docs/85659/bat41.pdf
+$ENDCMP
+#
+$CMP BAT42
+D 30V 0.2A Small Signal Schottky Diode, DO-35
+K diode Schottky
+F http://www.vishay.com/docs/85660/bat42.pdf
+$ENDCMP
+#
+$CMP BAT42W-V
+D 30V 0.2A Small Signal Schottky diode, SOD-123
+K diode Schottky
+F http://www.vishay.com/docs/85660/bat42.pdf
+$ENDCMP
+#
+$CMP BAT43
+D 30V 0.2A Small Signal Schottky Diode, DO-35
+K diode Schottky
+F http://www.vishay.com/docs/85660/bat42.pdf
+$ENDCMP
+#
+$CMP BAT43W-V
+D 30V 0.2A Small Signal Schottky diode, SOD-123
+K diode Schottky
+F http://www.vishay.com/docs/85660/bat42.pdf
+$ENDCMP
+#
+$CMP BAT46
+D 100V 0.15A Small Signal Schottky Diode, DO-35
+K diode Schottky
+F http://www.vishay.com/docs/85662/bat46.pdf
+$ENDCMP
+#
+$CMP BAT48JFILM
+D 40V 0.35A Small Signal Schottky Diode, SOD-323
+K diode Schottky
+F http://www.st.com/content/ccc/resource/technical/document/datasheet/b2/2f/2a/0c/8b/b5/46/a3/CD00130229.pdf/files/CD00130229.pdf/jcr:content/translations/en.CD00130229.pdf
+$ENDCMP
+#
+$CMP BAT48RL
+D 40V 0.35A Small Signal Schottky Diode, DO-35
+K diode Schottky
+F http://www.st.com/content/ccc/resource/technical/document/datasheet/b2/2f/2a/0c/8b/b5/46/a3/CD00130229.pdf/files/CD00130229.pdf/jcr:content/translations/en.CD00130229.pdf
+$ENDCMP
+#
+$CMP BAT48ZFILM
+D 40V 0.35A Small Signal Schottky Diode, SOD-123
+K diode Schottky
+F http://www.st.com/content/ccc/resource/technical/document/datasheet/b2/2f/2a/0c/8b/b5/46/a3/CD00130229.pdf/files/CD00130229.pdf/jcr:content/translations/en.CD00130229.pdf
+$ENDCMP
+#
 $CMP BAT54ADW
 D Schottky diode array 2 pair Com A
 K diode
 F http://www.diodes.com/datasheets/ds30152.pdf
 $ENDCMP
 #
+$CMP BAT85
+D 30V 0.2A Schottky barrier single diode, DO-35
+K diode Schottky
+F http://www.nxp.com/documents/data_sheet/BAT85.pdf
+$ENDCMP
+#
+$CMP BAT86
+D 50V 0.2A Small Signal Schottky Diode, DO-35
+K diode Schottky
+F http://www.nxp.com/documents/data_sheet/BAT86.pdf
+$ENDCMP
+#
+$CMP BAT86S
+D 50V 0.2A Small Signal Schottky Diode, DO-35
+K diode Schottky
+F http://www.vishay.com/docs/85514/bat86s.pdf
+$ENDCMP
+#
+$CMP BAV17
+D 20V 0.25A Small Signal Switching Diode, High Voltage, DO-35
+K diode
+F http://www.vishay.com/docs/85543/bav17.pdf
+$ENDCMP
+#
+$CMP BAV18
+D 50V 0.25A Small Signal Switching Diode, High Voltage, DO-35
+K diode
+F http://www.vishay.com/docs/85543/bav17.pdf
+$ENDCMP
+#
+$CMP BAV19
+D 100V 0.25A Small Signal Switching Diode, High Voltage, DO-35
+K diode
+F http://www.vishay.com/docs/85543/bav17.pdf
+$ENDCMP
+#
+$CMP BAV20
+D 150V 0.25A Small Signal Switching Diode, High Voltage, DO-35
+K diode
+F http://www.vishay.com/docs/85543/bav17.pdf
+$ENDCMP
+#
+$CMP BAV21
+D 200V 0.25A Small Signal Switching Diode, High Voltage, DO-35
+K diode
+F http://www.vishay.com/docs/85543/bav17.pdf
+$ENDCMP
+#
 $CMP BAV99
 D BAV99 High-speed switching diodes
 K diode
@ -36,6 +450,42 @@ K diode
 F http://www.nxp.com/documents/data_sheet/BAV756S_BAW56_SER.pdf
 $ENDCMP
 #
+$CMP BAW75
+D 25V 0.45A Small Signal Switching Diode, DO-35
+K diode
+F http://www.vishay.com/docs/85550/baw75.pdf
+$ENDCMP
+#
+$CMP BAW76
+D 50V 0.3A Small Signal Fast Switching Diode, DO-35
+K diode
+F http://www.vishay.com/docs/85551/baw76.pdf
+$ENDCMP
+#
+$CMP BAY93
+D 20V 0.115A Very Fast Switching Diode, DO-35
+K diode
+F https://cdn-reichelt.de/documents/datenblatt/A400/BAY93_TFK.pdf
+$ENDCMP
+#
+$CMP BYV79-100
+D 100V 14A Ultrafast Rectifier Diode, TO-220
+K diode
+F http://pdf.datasheetcatalog.com/datasheet/philips/BYV79-100.pdf
+$ENDCMP
+#
+$CMP BYV79-150
+D 150V 14A Ultrafast Rectifier Diode, TO-220
+K diode
+F http://pdf.datasheetcatalog.com/datasheet/philips/BYV79-100.pdf
+$ENDCMP
+#
+$CMP BYV79-200
+D 200V 14A Ultrafast Rectifier Diode, TO-220
+K diode
+F http://pdf.datasheetcatalog.com/datasheet/philips/BYV79-100.pdf
+$ENDCMP
+#
 $CMP Central_Semi_CMKD4448
 D High speed switching diode array 3 independent
 K diode
@ -66,12 +516,126 @@ K diode
 F http://www.comchiptech.com/cms/UserFiles/CDSV6-4448XX-G%20RevC285574.pdf
 $ENDCMP
 #
+$CMP DB3
+D 32V 2A Bidirectional trigger diode, DO-35
+K AC diode DIAC
+F http://cdn-reichelt.de/documents/datenblatt/A100/DB%203%23st.pdf
+$ENDCMP
+#
+$CMP DB4
+D 34V 2A Bidirectional trigger diode, DO-35
+K AC diode DIAC
+F http://cdn-reichelt.de/documents/datenblatt/A100/DB%203%23st.pdf
+$ENDCMP
+#
+$CMP DC34
+D 40V 2A Bidirectional trigger diode, DO-35
+K AC diode DIAC
+F http://cdn-reichelt.de/documents/datenblatt/A100/DB%203%23st.pdf
+$ENDCMP
+#
 $CMP HN2D02FU
 D Ultra high speed switching diode array 3 independent
 K diode
 F http://www.onsemi.com/pub_link/Collateral/HN2D02FUTW1T1-D.PDF
 $ENDCMP
 #
+$CMP LL41
+D 100V 0.1A Small Signal Schottky diode, MiniMELF
+K diode Schottky
+F http://www.vishay.com/docs/85659/bat41.pdf
+$ENDCMP
+#
+$CMP LL4148
+D 100V 0.15A standard switching diode, MiniMELF
+K diode
+F http://www.vishay.com/docs/85557/ll4148.pdf
+$ENDCMP
+#
+$CMP LL42
+D 30V 0.2A Small Signal Schottky diode, MiniMELF
+K diode Schottky
+F http://www.vishay.com/docs/85672/ll42.pdf
+$ENDCMP
+#
+$CMP LL43
+D 30V 0.2A Small Signal Schottky diode, MiniMELF
+K diode Schottky
+F http://www.vishay.com/docs/85672/ll42.pdf
+$ENDCMP
+#
+$CMP LL4448
+D 100V 0.15A standard switching diode, MiniMELF
+K diode
+F http://www.vishay.com/docs/85557/ll4148.pdf
+$ENDCMP
+#
+$CMP MBR0520LT
+D 20V 0.5A Schottky Power Rectifier Diode, SOD-123
+K diode Schottky
+F http://www.onsemi.com/pub_link/Collateral/MBR0520LT1-D.PDF
+$ENDCMP
+#
+$CMP MBR0520
+D 20V 0.5A Schottky Power Rectifier Diode, SOD-123
+K diode Schottky
+F http://www.mccsemi.com/up_pdf/MBR0520~MBR0580(SOD123).pdf
+$ENDCMP
+#
+$CMP MBR0530
+D 30V 0.5A Schottky Power Rectifier Diode, SOD-123
+K diode Schottky
+F http://www.mccsemi.com/up_pdf/MBR0520~MBR0580(SOD123).pdf
+$ENDCMP
+#
+$CMP MBR0540
+D 40V 0.5A Schottky Power Rectifier Diode, SOD-123
+K diode Schottky
+F http://www.mccsemi.com/up_pdf/MBR0520~MBR0580(SOD123).pdf
+$ENDCMP
+#
+$CMP MBR0550
+D 50V 0.5A Schottky Power Rectifier Diode, SOD-123
+K diode Schottky
+F http://www.mccsemi.com/up_pdf/MBR0520~MBR0580(SOD123).pdf
+$ENDCMP
+#
+$CMP MBR0560
+D 60V 0.5A Schottky Power Rectifier Diode, SOD-123
+K diode Schottky
+F http://www.mccsemi.com/up_pdf/MBR0520~MBR0580(SOD123).pdf
+$ENDCMP
+#
+$CMP MBR0570
+D 70V 0.5A Schottky Power Rectifier Diode, SOD-123
+K diode Schottky
+F http://www.mccsemi.com/up_pdf/MBR0520~MBR0580(SOD123).pdf
+$ENDCMP
+#
+$CMP MBR0580
+D 80V 0.5A Schottky Power Rectifier Diode, SOD-123
+K diode Schottky
+F http://www.mccsemi.com/up_pdf/MBR0520~MBR0580(SOD123).pdf
+$ENDCMP
+#
+$CMP MBR340
+D 40V 3A Schottky Barrier Rectifier Diode, DO-201AD
+K diode Schottky
+F http://www.onsemi.com/pub_link/Collateral/MBR340-D.PDF
+$ENDCMP
+#
+$CMP MBR735
+D 35V 7.5A Schottky Barrier Rectifier Diode, TO-220
+K diode Schottky
+F http://www.onsemi.com/pub_link/Collateral/MBR735-D.PDF
+$ENDCMP
+#
+$CMP MBR745
+D 45V 7.5A Schottky Barrier Rectifier Diode, TO-220
+K diode Schottky
+F http://www.onsemi.com/pub_link/Collateral/MBR735-D.PDF
+$ENDCMP
+#
 $CMP MMBD4148TW
 D Fast switching diode array 3 independent
 K diode
@ -114,10 +678,184 @@ K diode
 F http://rohmfs.rohm.com/en/products/databook/datasheet/discrete/diode/switching/ump11n.pdf
 $ENDCMP
 #
+$CMP SB120
+D 20V 1A Schottky Barrier Rectifier Diode, DO-41
+K diode Schottky
+F http://www.diodes.com/_files/datasheets/ds23022.pdf
+$ENDCMP
+#
+$CMP SB130
+D 30V 1A Schottky Barrier Rectifier Diode, DO-41
+K diode Schottky
+F http://www.diodes.com/_files/datasheets/ds23022.pdf
+$ENDCMP
+#
+$CMP SB140
+D 40V 1A Schottky Barrier Rectifier Diode, DO-41
+K diode Schottky
+F http://www.diodes.com/_files/datasheets/ds23022.pdf
+$ENDCMP
+#
+$CMP SB150
+D 50V 1A Schottky Barrier Rectifier Diode, DO-41
+K diode Schottky
+F http://www.diodes.com/_files/datasheets/ds23022.pdf
+$ENDCMP
+#
+$CMP SB160
+D 60V 1A Schottky Barrier Rectifier Diode, DO-41
+K diode Schottky
+F http://www.diodes.com/_files/datasheets/ds23022.pdf
+$ENDCMP
+#
+$CMP SM2000
+D 2000V 1A General Purpose Rectifier Diode, MELF
+K diode
+F http://cdn-reichelt.de/documents/datenblatt/A400/SMD1N400%23DIO.pdf
+$ENDCMP
+#
+$CMP SM4001
+D 50V 1A General Purpose Rectifier Diode, MELF
+K diode
+F http://cdn-reichelt.de/documents/datenblatt/A400/SMD1N400%23DIO.pdf
+$ENDCMP
+#
+$CMP SM4002
+D 100V 1A General Purpose Rectifier Diode, MELF
+K diode
+F http://cdn-reichelt.de/documents/datenblatt/A400/SMD1N400%23DIO.pdf
+$ENDCMP
+#
+$CMP SM4003
+D 200V 1A General Purpose Rectifier Diode, MELF
+K diode
+F http://cdn-reichelt.de/documents/datenblatt/A400/SMD1N400%23DIO.pdf
+$ENDCMP
+#
+$CMP SM4004
+D 400V 1A General Purpose Rectifier Diode, MELF
+K diode
+F http://cdn-reichelt.de/documents/datenblatt/A400/SMD1N400%23DIO.pdf
+$ENDCMP
+#
+$CMP SM4005
+D 600V 1A General Purpose Rectifier Diode, MELF
+K diode
+F http://cdn-reichelt.de/documents/datenblatt/A400/SMD1N400%23DIO.pdf
+$ENDCMP
+#
+$CMP SM4006
+D 800V 1A General Purpose Rectifier Diode, MELF
+K diode
+F http://cdn-reichelt.de/documents/datenblatt/A400/SMD1N400%23DIO.pdf
+$ENDCMP
+#
+$CMP SM4007
+D 1000V 1A General Purpose Rectifier Diode, MELF
+K diode
+F http://cdn-reichelt.de/documents/datenblatt/A400/SMD1N400%23DIO.pdf
+$ENDCMP
+#
+$CMP SM513
+D 130V 1A General Purpose Rectifier Diode, MELF
+K diode
+F http://cdn-reichelt.de/documents/datenblatt/A400/SMD1N400%23DIO.pdf
+$ENDCMP
+#
+$CMP SM516
+D 1600V 1A General Purpose Rectifier Diode, MELF
+K diode
+F http://cdn-reichelt.de/documents/datenblatt/A400/SMD1N400%23DIO.pdf
+$ENDCMP
+#
+$CMP SM518
+D 1800V 1A General Purpose Rectifier Diode, MELF
+K diode
+F http://cdn-reichelt.de/documents/datenblatt/A400/SMD1N400%23DIO.pdf
+$ENDCMP
+#
 $CMP Toshiba_HN1D01FU
 D Ultra High Speed Switching Diode Array 2 pair Com A
 K diode
 F http://www.toshiba.com/taec/components2/Datasheet_Sync/200901/DST_HN1D01FU-TDE_EN_1882.pdf
 $ENDCMP
 #
+$CMP UF5400
+D 50V 3A Soft Recovery Ultrafast Rectifier Diode, DO-201AD
+K diode
+F http://www.vishay.com/docs/88756/uf5400.pdf
+$ENDCMP
+#
+$CMP UF5401
+D 100V 3A Soft Recovery Ultrafast Rectifier Diode, DO-201AD
+K diode
+F http://www.vishay.com/docs/88756/uf5400.pdf
+$ENDCMP
+#
+$CMP UF5402
+D 200V 3A Soft Recovery Ultrafast Rectifier Diode, DO-201AD
+K diode
+F http://www.vishay.com/docs/88756/uf5400.pdf
+$ENDCMP
+#
+$CMP UF5403
+D 300V 3A Soft Recovery Ultrafast Rectifier Diode, DO-201AD
+K diode
+F http://www.vishay.com/docs/88756/uf5400.pdf
+$ENDCMP
+#
+$CMP UF5404
+D 400V 3A Soft Recovery Ultrafast Rectifier Diode, DO-201AD
+K diode
+F http://www.vishay.com/docs/88756/uf5400.pdf
+$ENDCMP
+#
+$CMP UF5405
+D 500V 3A Soft Recovery Ultrafast Rectifier Diode, DO-201AD
+K diode
+F http://www.vishay.com/docs/88756/uf5400.pdf
+$ENDCMP
+#
+$CMP UF5406
+D 600V 3A Soft Recovery Ultrafast Rectifier Diode, DO-201AD
+K diode
+F http://www.vishay.com/docs/88756/uf5400.pdf
+$ENDCMP
+#
+$CMP UF5407
+D 800V 3A Soft Recovery Ultrafast Rectifier Diode, DO-201AD
+K diode
+F http://www.vishay.com/docs/88756/uf5400.pdf
+$ENDCMP
+#
+$CMP UF5408
+D 1000V 3A Soft Recovery Ultrafast Rectifier Diode, DO-201AD
+K diode
+F http://www.vishay.com/docs/88756/uf5400.pdf
+$ENDCMP
+#
+$CMP ZMDxx
+D 1000mW Zener Diode, MiniMELF
+K zener diode
+F http://diotec.com/tl_files/diotec/files/pdf/datasheets/zmd1
+$ENDCMP
+#
+$CMP ZMYxx
+D 1300mW Zener Diode, MELF
+K zener diode
+F http://www.vishay.com/docs/85790/zpy3v9.pdf
+$ENDCMP
+#
+$CMP ZPDxx
+D 500mW Zener Diode, DO-35
+K diode
+F http://diotec.com/tl_files/diotec/files/pdf/datasheets/zpd1
+$ENDCMP
+#
+$CMP ZPYxx
+D 1300mW Zener Diode, DO-41
+K diode
+F http://www.vishay.com/docs/85790/zpy3v9.pdf
+$ENDCMP
+#
 #End Doc Library
--- a/library/diode.lib
+++ b/library/diode.lib
@ -1,12 +1,206 @@
 EESchema-LIBRARY Version 2.3
 #encoding utf-8
 #
+# 1N4001
+#
+DEF 1N4001 D 0 40 N N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "1N4001" 0 -100 50 H V C CNN
+F2 "Diodes_ThroughHole:Diode_DO-41_SOD81_Horizontal_RM10" 0 -175 50 H I C CNN
+F3 "" 0 0 50 H V C CNN
+ALIAS 1N4002 1N4003 1N4004 1N4005 1N4006 1N4007 BA157 BA158 BA159
+$FPLIST
+ Diode*DO?41*
+ Diode*DO?204AL*
+ Diode*SOD81*
+$ENDFPLIST
+DRAW
+P 2 0 1 8 -50 50 -50 -50 N
+P 2 0 1 0 50 0 -50 0 N
+P 4 0 1 8 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
+#
+# 1N4148
+#
+DEF 1N4148 D 0 40 N N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "1N4148" 0 -100 50 H V C CNN
+F2 "Diodes_ThroughHole:Diode_DO-35_SOD27_Horizontal_RM10" 0 -175 50 H I C CNN
+F3 "" 0 0 50 H V C CNN
+ALIAS 1N4448 1N4149 1N4151 1N914 BA243 BA244 BA282 BA283 BAV17 BAV18 BAV19 BAV20 BAV21 BAW75 BAW76 BAY93
+$FPLIST
+ Diode*DO?35*
+ Diode*SOD27*
+$ENDFPLIST
+DRAW
+P 2 0 1 8 -50 50 -50 -50 N
+P 2 0 1 0 50 0 -50 0 N
+P 4 0 1 8 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
+#
+# 1N5400
+#
+DEF 1N5400 D 0 40 N N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "1N5400" 0 -100 50 H V C CNN
+F2 "Diodes_ThroughHole:Diode_DO-201AD_Horizontal_RM15" 0 -175 50 H I C CNN
+F3 "" 0 0 50 H V C CNN
+ALIAS 1N5401 1N5402 1N5404 1N5405 1N5406 1N5407 1N5408 UF5400 UF5401 UF5402 UF5403 UF5404 UF5405 UF5406 UF5407 UF5408 1N5403
+$FPLIST
+ Diode*DO?201AD*
+$ENDFPLIST
+DRAW
+P 2 0 1 8 -50 50 -50 -50 N
+P 2 0 1 0 50 0 -50 0 N
+P 4 0 1 8 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
+#
+# 1N5820
+#
+DEF 1N5820 D 0 40 N N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "1N5820" 0 -100 50 H V C CNN
+F2 "Diodes_ThroughHole:Diode_DO-201AD_Horizontal_RM15" 0 -175 50 H I C CNN
+F3 "" 0 0 50 H V C CNN
+ALIAS 1N5821 1N5822 MBR340
+$FPLIST
+ Diode*DO?201AD*
+$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 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
+#
+# 1N6263
+#
+DEF 1N6263 D 0 40 N N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "1N6263" 0 -100 50 H V C CNN
+F2 "Diodes_ThroughHole:Diode_DO-35_SOD27_Horizontal_RM10" 0 -175 50 H I C CNN
+F3 "" 0 0 50 H V C CNN
+ALIAS BAT41 BAT42 BAT43 BAT46 BAT48RL BAT85 BAT86S BAT86
+$FPLIST
+ Diode*SOD23*
+ Diode*DO?35*
+$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 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
+#
+# B120-E3
+#
+DEF B120-E3 D 0 40 N N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "B120-E3" 0 -100 50 H V C CNN
+F2 "Diodes_SMD:SMA_Standard" 0 -175 50 H I C CNN
+F3 "" 0 0 50 H V C CNN
+ALIAS B130-E3 B140-E3 B150-E3 B160-E3
+$FPLIST
+ Diode*DO?214AC*
+ Diode*SMA*
+ DO?214AC*
+ SMA*
+$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 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
+#
+# B220
+#
+DEF B220 D 0 40 N N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "B220" 0 -100 50 H V C CNN
+F2 "Diodes_SMD:SMB_Standard" 0 -175 50 H I C CNN
+F3 "" 0 0 50 H V C CNN
+ALIAS B230 B240 B250 B260
+$FPLIST
+ Diode*DO?214AC*
+ Diode*SMA*
+ DO?214AC*
+ SMA*
+$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 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
+#
+# B320
+#
+DEF B320 D 0 40 N N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "B320" 0 -100 50 H V C CNN
+F2 "Diodes_SMD:SMC_Standard" 0 -175 50 H I C CNN
+F3 "" 0 0 50 H V C CNN
+ALIAS B330 B340 B350 B360
+$FPLIST
+ Diode*DO?214AC*
+ Diode*SMA*
+ DO?214AC*
+ SMA*
+$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 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
+#
+# BAR42FILM
+#
+DEF BAR42FILM D 0 40 N N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "BAR42FILM" 0 -100 50 H V C CNN
+F2 "TO_SOT_Packages_SMD:SOT-23" 0 -175 50 H I C CNN
+F3 "" 0 0 50 H V C CNN
+ALIAS BAR43FILM
+$FPLIST
+ SOT?23*
+$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 K 3 -150 0 100 R 50 50 1 1 P
+X 2 NC 150 100 100 L 50 50 1 1 N N
+ENDDRAW
+ENDDEF
+#
 # BAS16TW
 #
 DEF BAS16TW D 0 40 Y N 3 F N
 F0 "D" 0 100 50 H V C CNN
 F1 "BAS16TW" 0 -100 50 H V C CNN
-F2 "" -100 0 50 H V C CNN
+F2 "TO_SOT_Packages_SMD:SOT-363" 0 -175 50 H I C CNN
 F3 "" 0 100 50 H V C CNN
 ALIAS BAS16VY MMBD4148TW MMBD4448HTW HN2D02FU Comchip_ACDSV6-4448TI-G Central_Semi_CMKD6001 Central_Semi_CMKD4448 Comchip_CDSV6-4148-G Comchip_CDSV6-4448TI-G
 $FPLIST
@ -16,7 +210,9 @@ $FPLIST
 $ENDFPLIST
 DRAW
 P 2 0 1 6 -50 50 -50 -50 N
-P 3 0 1 0  50 50  -50 0  50 -50 F
+P 2 0 1 0 50 0 -50 0 N
+P 2 0 1 0 50 50 50 -50 N
+P 3 0 1 0 50 50 -50 0 50 -50 N
 X A 1 200 0 150 L 50 50 1 1 P
 X K 6 -200 0 150 R 50 50 1 1 P
 X A 2 200 0 150 L 50 50 2 1 P
@ -26,12 +222,51 @@ X K 4 -200 0 150 R 50 50 3 1 P
 ENDDRAW
 ENDDEF
 #
+# BAT48JFILM
+#
+DEF BAT48JFILM D 0 40 N N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "BAT48JFILM" 0 -100 50 H V C CNN
+F2 "Diodes_SMD:SOD-323" 0 -175 50 H I C CNN
+F3 "" 0 0 50 H V C CNN
+$FPLIST
+ Diode*SOD?323*
+$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 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
+#
+# BAT48ZFILM
+#
+DEF BAT48ZFILM D 0 40 N N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "BAT48ZFILM" 0 -100 50 H V C CNN
+F2 "Diodes_SMD:SOD-123" 0 -175 50 H I C CNN
+F3 "" 0 0 50 H V C CNN
+ALIAS MBR0520LT MBR0520 MBR0530 MBR0540 MBR0550 MBR0560 MBR0570 MBR0580 BAT42W-V BAT43W-V
+$FPLIST
+ Diode*SOD?123*
+$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 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
+#
 # BAT54ADW
 #
 DEF BAT54ADW D 0 40 Y N 4 F N
 F0 "D" 0 100 50 H V C CNN
 F1 "BAT54ADW" 0 -100 50 H V C CNN
-F2 "" -100 0 50 H V C CNN
+F2 "TO_SOT_Packages_SMD:SOT-363" 0 -175 50 H I C CNN
 F3 "" 0 100 50 H V C CNN
 $FPLIST
 *SC-70-6*
@ -39,7 +274,9 @@ $FPLIST
 *SOT-363*
 $ENDFPLIST
 DRAW
-P 3 0 1 0 50 50 -50 0 50 -50 F
+P 2 0 1 0 50 -50 50 50 N
+P 2 0 1 0 50 0 -50 0 N
+P 3 0 1 0 50 50 -50 0 50 -50 N
 P 6 0 1 0 -25 25 -25 50 -50 50 -50 -50 -75 -50 -75 -25 N
 X K 1 -200 0 150 R 50 50 1 1 P
 X A 6 200 0 150 L 50 50 1 1 P
@ -54,17 +291,19 @@ ENDDEF
 #
 # BAV99
 #
-DEF BAV99 D 0 40 N N 2 F N
+DEF BAV99 D 0 40 Y N 2 F N
 F0 "D" 0 100 50 H V C CNN
 F1 "BAV99" 0 -100 50 H V C CNN
-F2 "" -100 0 50 H V C CNN
+F2 "TO_SOT_Packages_SMD:SOT-23" 0 -150 50 H I C CNN
 F3 "" 0 100 50 H V C CNN
 $FPLIST
- Housings_SOT-23*
+ SOT?23*
 $ENDFPLIST
 DRAW
 P 2 0 1 6 -50 50 -50 -50 N
-P 3 0 1 0 50 50 -50 0 50 -50 F
+P 2 0 1 0 50 0 -50 0 N
+P 2 0 1 0 50 50 50 -50 N
+P 3 0 1 0 50 50 -50 0 50 -50 N
 X A 1 200 0 150 L 50 50 1 1 P
 X K 3 -200 0 150 R 50 50 1 1 P
 X K 2 -200 0 150 R 50 50 2 1 P
@ -72,12 +311,116 @@ X A 3 200 0 150 L 50 50 2 1 P
 ENDDRAW
 ENDDEF
 #
+# BYV79-100
+#
+DEF BYV79-100 D 0 40 N N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "BYV79-100" 0 -100 50 H V C CNN
+F2 "TO_SOT_Packages_THT:TO-220-2pin_Vertical" 0 -175 50 H I C CNN
+F3 "" 0 0 50 H V C CNN
+ALIAS BYV79-200 BYV79-150
+$FPLIST
+ TO?220*
+$ENDFPLIST
+DRAW
+P 2 0 1 8 -50 50 -50 -50 N
+P 2 0 1 0 50 0 -50 0 N
+P 4 0 1 8 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
+#
+# DB3
+#
+DEF DB3 D 0 40 N N 1 F N
+F0 "D" 0 150 50 H V C CNN
+F1 "DB3" 0 -150 50 H V C CNN
+F2 "Diodes_ThroughHole:Diode_DO-35_SOD27_Horizontal_RM10" 0 -225 50 H I C CNN
+F3 "" 0 0 50 H V C CNN
+ALIAS DB4 DC34
+$FPLIST
+ Diode*SOD27*
+ Diode*DO?35*
+$ENDFPLIST
+DRAW
+P 2 0 1 8 -50 0 -50 -100 N
+P 2 0 1 8 50 100 50 0 N
+P 4 0 1 8 -50 100 -50 0 50 50 -50 100 N
+P 4 0 1 8 50 0 50 -100 -50 -50 50 0 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
+#
+# LL41
+#
+DEF LL41 D 0 40 N N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "LL41" 0 -100 50 H V C CNN
+F2 "Diodes_SMD:MiniMELF_Standard" 0 -175 50 H I C CNN
+F3 "" 0 0 50 H V C CNN
+ALIAS LL42 LL43
+$FPLIST
+ Diode*MiniMELF*
+ MiniMELF*
+$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 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
+#
+# LL4148
+#
+DEF LL4148 D 0 40 N N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "LL4148" 0 -100 50 H V C CNN
+F2 "Diodes_SMD:MiniMELF_Standard" 0 -175 50 H I C CNN
+F3 "" 0 0 50 H V C CNN
+ALIAS LL4448
+$FPLIST
+ Diode*MiniMELF*
+ MiniMELF*
+$ENDFPLIST
+DRAW
+P 2 0 1 8 -50 50 -50 -50 N
+P 2 0 1 0 50 0 -50 0 N
+P 4 0 1 8 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
+#
+# MBR735
+#
+DEF MBR735 D 0 40 N N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "MBR735" 0 -100 50 H V C CNN
+F2 "TO_SOT_Packages_THT:TO-220-2pin_Vertical" 0 -175 50 H I C CNN
+F3 "" 0 0 50 H V C CNN
+ALIAS MBR745
+$FPLIST
+ TO?220*
+$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 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
+#
 # Rohm_UMN1N
 #
 DEF Rohm_UMN1N D 0 40 Y N 4 F N
 F0 "D" 0 100 50 H V C CNN
 F1 "Rohm_UMN1N" 0 -100 50 H V C CNN
-F2 "" -100 0 50 H V C CNN
+F2 "TO_SOT_Packages_SMD:SOT-353" 0 -175 50 H I C CNN
 F3 "" 0 100 50 H V C CNN
 ALIAS MMBD4448HCQW Panasonic_MA5J002E
 $FPLIST
@ -85,7 +428,9 @@ $FPLIST
 $ENDFPLIST
 DRAW
 P 2 0 1 6 -50 50 -50 -50 N
-P 3 0 1 0 50 50 -50 0 50 -50 F
+P 2 0 1 0 50 -50 50 50 N
+P 2 0 1 0 50 0 -50 0 N
+P 3 0 1 0 50 50 -50 0 50 -50 N
 X A 1 200 0 150 L 50 50 1 1 P
 X K 2 -200 0 150 R 50 50 1 1 P
 X K 2 -200 0 150 R 50 50 2 1 P
@ -102,7 +447,7 @@ ENDDEF
 DEF Rohm_UMP11N D 0 40 Y N 4 F N
 F0 "D" 0 100 50 H V C CNN
 F1 "Rohm_UMP11N" 0 -100 50 H V C CNN
-F2 "" -100 0 50 H V C CNN
+F2 "TO_SOT_Packages_SMD:SOT-363" 0 -175 50 H I C CNN
 F3 "" 0 100 50 H V C CNN
 ALIAS BAW56DW BAW56S MMBD4448HADW Toshiba_HN1D01FU
 $FPLIST
@ -112,7 +457,9 @@ $FPLIST
 $ENDFPLIST
 DRAW
 P 2 0 1 6 -50 50 -50 -50 N
-P 3 0 1 0 50 50 -50 0 50 -50 F
+P 2 0 1 0 50 -50 50 50 N
+P 2 0 1 0 50 0 -50 0 N
+P 3 0 1 0 50 50 -50 0 50 -50 N
 X K 1 -200 0 150 R 50 50 1 1 P
 X A 6 200 0 150 L 50 50 1 1 P
 X K 2 -200 0 150 R 50 50 2 1 P
@ -124,4 +471,125 @@ X K 5 -200 0 150 R 50 50 4 1 P
 ENDDRAW
 ENDDEF
 #
+# SB120
+#
+DEF SB120 D 0 40 N N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "SB120" 0 -100 50 H V C CNN
+F2 "Diodes_ThroughHole:Diode_DO-41_SOD81_Horizontal_RM10" 0 -175 50 H I C CNN
+F3 "" 0 0 50 H V C CNN
+ALIAS SB130 SB140 SB150 SB160 1N5817 1N5818 1N5819
+$FPLIST
+ Diode*SOD81*
+ Diode*DO?41*
+$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 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
+#
+# SM4001
+#
+DEF SM4001 D 0 40 N N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "SM4001" 0 -100 50 H V C CNN
+F2 "Diodes_SMD:MELF_Standard" 0 -175 50 H I C CNN
+F3 "" 0 0 50 H V C CNN
+ALIAS SM4002 SM4003 SM4004 SM4005 SM4006 SM4007 SM513 SM516 SM518 SM2000
+$FPLIST
+ Diode*MELF*
+ MELF*
+$ENDFPLIST
+DRAW
+P 2 0 1 8 -50 50 -50 -50 N
+P 2 0 1 0 50 0 -50 0 N
+P 4 0 1 8 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
+#
+# ZMDxx
+#
+DEF ZMDxx D 0 40 N N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "ZMDxx" 0 -100 50 H V C CNN
+F2 "Diodes_SMD:MiniMELF_Standard" 0 -175 50 H I C CNN
+F3 "" 0 0 50 H V C CNN
+$FPLIST
+ Diode*MiniMELF*
+ MiniMELF*
+$ENDFPLIST
+DRAW
+P 2 0 1 0 50 0 -50 0 N
+P 3 0 1 8 -50 -50 -50 50 -30 50 N
+P 4 0 1 8 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
+#
+# ZMYxx
+#
+DEF ZMYxx D 0 40 N N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "ZMYxx" 0 -100 50 H V C CNN
+F2 "Diodes_SMD:MELF_Standard" 0 -175 50 H I C CNN
+F3 "" 0 0 50 H V C CNN
+$FPLIST
+ Diode*MELF*
+ MELF*
+$ENDFPLIST
+DRAW
+P 2 0 1 0 50 0 -50 0 N
+P 3 0 1 8 -50 -50 -50 50 -30 50 N
+P 4 0 1 8 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
+#
+# ZPDxx
+#
+DEF ZPDxx D 0 40 N N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "ZPDxx" 0 -100 50 H V C CNN
+F2 "Diodes_ThroughHole:Diode_DO-35_SOD27_Horizontal_RM10" 0 -175 50 H I C CNN
+F3 "" 0 0 50 H V C CNN
+$FPLIST
+ Diode*DO?35*
+ Diode*SOD27*
+$ENDFPLIST
+DRAW
+P 2 0 1 0 50 0 -50 0 N
+P 3 0 1 8 -50 -50 -50 50 -30 50 N
+P 4 0 1 8 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
+#
+# ZPYxx
+#
+DEF ZPYxx D 0 40 N N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "ZPYxx" 0 -100 50 H V C CNN
+F2 "Diodes_ThroughHole:Diode_DO-41_SOD81_Horizontal_RM10" 0 -175 50 H I C CNN
+F3 "" 0 0 50 H V C CNN
+$FPLIST
+ Diode*DO?41*
+$ENDFPLIST
+DRAW
+P 2 0 1 0 50 0 -50 0 N
+P 3 0 1 8 -50 -50 -50 50 -30 50 N
+P 4 0 1 8 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
+#
 #End Library
--- a/library/microchip.dcm
+++ b/library/microchip.dcm
@ -36,6 +36,42 @@ K ETH PHY RMII
 F http://ww1.microchip.com/downloads/en/DeviceDoc/8720a.pdf
 $ENDCMP
 #
+$CMP MCP2050-330-E/MQ
+D LIN Transceiver with Voltage Regulator, 3.3V, QFN
+K LIN transceiver regulator
+F http://ww1.microchip.com/downloads/en/DeviceDoc/22299B.pdf
+$ENDCMP
+#
+$CMP MCP2050-330-E/P
+D LIN Transceiver with Voltage Regulator, 3.3V, PDIP
+K LIN transceiver regulator
+F http://ww1.microchip.com/downloads/en/DeviceDoc/22299B.pdf
+$ENDCMP
+#
+$CMP MCP2050-330-E/SL
+D LIN Transceiver with Voltage Regulator, 3.3V, SOIC
+K LIN transceiver regulator
+F http://ww1.microchip.com/downloads/en/DeviceDoc/22299B.pdf
+$ENDCMP
+#
+$CMP MCP2050-500-E/MQ
+D LIN Transceiver with Voltage Regulator, 5V, QFN
+K LIN transceiver regulator
+F http://ww1.microchip.com/downloads/en/DeviceDoc/22299B.pdf
+$ENDCMP
+#
+$CMP MCP2050-500-E/P
+D LIN Transceiver with Voltage Regulator, 5V, PDIP
+K LIN transceiver regulator
+F http://ww1.microchip.com/downloads/en/DeviceDoc/22299B.pdf
+$ENDCMP
+#
+$CMP MCP2050-500-E/SL
+D LIN Transceiver with Voltage Regulator, 5V, SOIC
+K LIN transceiver regulator
+F http://ww1.microchip.com/downloads/en/DeviceDoc/22299B.pdf
+$ENDCMP
+#
 $CMP MCP23008
 D 8-Bit I/O Expander with I²C Interface (PDIP/SOIC)
 K IO Expander I²C IIC I2C
--- a/library/microchip.lib
+++ b/library/microchip.lib
@ -240,6 +240,145 @@ X PAD_GND 49 100 -1600 200 U 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
+# LAN8720A
+#
+DEF LAN8720A U 0 40 Y Y 1 F N
+F0 "U" -300 1125 50 H V R CNN
+F1 "LAN8720A" -300 1050 50 H V R CNN
+F2 "Housings_DFN_QFN:QFN-24-1EP_4x4mm_Pitch0.5mm" 50 -950 50 H I L CNN
+F3 "" -200 -950 50 H V C CNN
+$FPLIST
+ QFN*1EP*4x4mm*Pitch0.5mm*
+$ENDFPLIST
+DRAW
+T 0 -100 -150 50 0 0 0 RMII Normal 0 C C
+S -600 1000 500 -900 0 1 10 f
+P 4 0 1 0 -600 -250 50 -250 50 650 -600 650 N
+X VDD2A 1 100 1200 200 D 50 50 1 1 W
+X LED2/nINTSEL 2 700 -400 200 L 50 50 1 1 B
+X LED1/REGOFF 3 700 -300 200 L 50 50 1 1 B
+X XTAL2 4 -800 -800 200 R 50 50 1 1 P
+X XTAL1/CLKIN 5 -800 -700 200 R 50 50 1 1 P
+X VDDCR 6 -100 1200 200 D 50 50 1 1 W
+X RXD1/MODE1 7 -800 200 200 R 50 50 1 1 O
+X RXD0/MODE0 8 -800 300 200 R 50 50 1 1 O
+X VDDIO 9 -200 1200 200 D 50 50 1 1 W
+X RXER/PHYAD0 10 -800 100 200 R 50 50 1 1 O
+X TXN 20 700 400 200 L 50 50 1 1 O I
+X CRS_DV/MODE2 11 -800 0 200 R 50 50 1 1 O
+X TXP 21 700 500 200 L 50 50 1 1 O
+X MDIO 12 -800 -100 200 R 50 50 1 1 B
+X RXN 22 700 200 200 L 50 50 1 1 O I
+X MDC 13 -800 -200 200 R 50 50 1 1 I
+X RXP 23 700 300 200 L 50 50 1 1 O
+X INT/REFCLKO 14 -800 -500 200 R 50 50 1 1 O I
+X RBIAS 24 700 -100 200 L 50 50 1 1 I
+X RST 15 -800 -400 200 R 50 50 1 1 I I
+X VSS 25 0 -1100 200 U 50 50 1 1 W
+X TXEN 16 -800 400 200 R 50 50 1 1 I
+X TXD0 17 -800 600 200 R 50 50 1 1 I
+X TXD1 18 -800 500 200 R 50 50 1 1 I
+X VDD1A 19 0 1200 200 D 50 50 1 1 W
+ENDDRAW
+ENDDEF
+#
+# MCP2050-330-E/MQ
+#
+DEF MCP2050-330-E/MQ U 0 40 Y Y 1 F N
+F0 "U" -900 -550 50 H V L CNN
+F1 "MCP2050-330-E/MQ" -900 650 50 H V L CNN
+F2 "Housings_DFN_QFN:QFN-20-1EP_5x5mm_Pitch0.65mm" 0 -750 50 H I C CNN
+F3 "" 0 -1000 50 H I C CNN
+ALIAS MCP2050-500-E/MQ
+$FPLIST
+ QFN*1EP*5x5mm*Pitch0.65mm*
+$ENDFPLIST
+DRAW
+S -900 600 900 -500 0 1 10 f
+X RXD 1 1000 300 100 L 50 50 1 1 O
+X CS/LWAKE 2 1000 100 100 L 50 50 1 1 I
+X VREG 3 100 700 100 D 50 50 1 1 w
+X TXD 4 1000 400 100 L 50 50 1 1 I
+X ~RESET 5 1000 -300 100 L 50 50 1 1 O
+X NC 6 -1000 500 100 R 50 50 1 1 N N
+X LBUS 7 -1000 0 100 R 50 50 1 1 C
+X VSS 8 0 -600 100 U 50 50 1 1 W
+X NC 9 -1000 400 100 R 50 50 1 1 N N
+X NC 10 -1000 300 100 R 50 50 1 1 N N
+X NC 20 -1000 -200 100 R 50 50 1 1 N N
+X NC 11 -1000 200 100 R 50 50 1 1 N N
+X PAD 21 -1000 -300 100 R 50 50 1 1 N N
+X VBB 12 0 700 100 D 50 50 1 1 W
+X FAULT/TXE 13 1000 0 100 L 50 50 1 1 C
+X WWDTSELECT 14 1000 -400 100 L 50 50 1 1 I
+X ~WWDTTRIG 15 1000 -100 100 L 50 50 1 1 I
+X NC 16 -1000 100 100 R 50 50 1 1 N N
+X ~WWDTRESET 17 1000 -200 100 L 50 50 1 1 O
+X VBAT_RATIO 18 1000 200 100 L 50 50 1 1 O
+X NC 19 -1000 -100 100 R 50 50 1 1 N N
+ENDDRAW
+ENDDEF
+#
+# MCP2050-330-E/P
+#
+DEF MCP2050-330-E/P U 0 40 Y Y 1 F N
+F0 "U" -900 -550 50 H V L CNN
+F1 "MCP2050-330-E/P" -900 650 50 H V L CNN
+F2 "Housings_DIP:DIP-14_W7.62mm" 0 -750 50 H I C CNN
+F3 "" 0 -1000 50 H I C CNN
+ALIAS MCP2050-500-E/P
+$FPLIST
+ DIP*W7.62mm*
+$ENDFPLIST
+DRAW
+S -900 600 900 -500 0 1 10 f
+X VBAT_RATIO 1 1000 200 100 L 50 50 1 1 O
+X RXD 2 1000 300 100 L 50 50 1 1 O
+X CS/LWAKE 3 1000 100 100 L 50 50 1 1 I
+X VREG 4 100 700 100 D 50 50 1 1 w
+X TXD 5 1000 400 100 L 50 50 1 1 I
+X ~RESET 6 1000 -300 100 L 50 50 1 1 O
+X NC 7 -1000 -300 100 R 50 50 1 1 N N
+X VSS 8 0 -600 100 U 50 50 1 1 W
+X LBUS 9 -1000 0 100 R 50 50 1 1 C
+X VBB 10 0 700 100 D 50 50 1 1 W
+X FAULT/TXE 11 1000 0 100 L 50 50 1 1 C
+X WWDTSELECT 12 1000 -400 100 L 50 50 1 1 I
+X ~WWDTTRIG 13 1000 -100 100 L 50 50 1 1 I
+X ~WWDTRESET 14 1000 -200 100 L 50 50 1 1 O
+ENDDRAW
+ENDDEF
+#
+# MCP2050-330-E/SL
+#
+DEF MCP2050-330-E/SL U 0 40 Y Y 1 F N
+F0 "U" -900 -550 50 H V L CNN
+F1 "MCP2050-330-E/SL" -900 650 50 H V L CNN
+F2 "Housings_SOIC:SOIC-14_3.9x8.7mm_Pitch1.27mm" 0 -750 50 H I C CNN
+F3 "" 0 -1000 50 H I C CNN
+ALIAS MCP2050-500-E/SL
+$FPLIST
+ SOIC*3.9x8.7mm*Pitch1.27mm*
+$ENDFPLIST
+DRAW
+S -900 600 900 -500 0 1 10 f
+X VBAT_RATIO 1 1000 200 100 L 50 50 1 1 O
+X RXD 2 1000 300 100 L 50 50 1 1 O
+X CS/LWAKE 3 1000 100 100 L 50 50 1 1 I
+X VREG 4 100 700 100 D 50 50 1 1 w
+X TXD 5 1000 400 100 L 50 50 1 1 I
+X ~RESET 6 1000 -300 100 L 50 50 1 1 O
+X NC 7 -1000 -300 100 R 50 50 1 1 N N
+X VSS 8 0 -600 100 U 50 50 1 1 W
+X LBUS 9 -1000 0 100 R 50 50 1 1 C
+X VBB 10 0 700 100 D 50 50 1 1 W
+X FAULT/TXE 11 1000 0 100 L 50 50 1 1 C
+X WWDTSELECT 12 1000 -400 100 L 50 50 1 1 I
+X ~WWDTTRIG 13 1000 -100 100 L 50 50 1 1 I
+X ~WWDTRESET 14 1000 -200 100 L 50 50 1 1 O
+ENDDRAW
+ENDDEF
+#
 # MCP23008
 #
 DEF MCP23008 U 0 40 Y Y 1 F N
@ -616,46 +755,4 @@ X VDDA1.8 29 800 600 150 L 50 50 1 1 w
 ENDDRAW
 ENDDEF
 #
-# LAN8720A
-#
-DEF LAN8720A U 0 40 Y Y 1 F N
-F0 "U" -300 1125 50 H V R CNN
-F1 "LAN8720A" -300 1050 50 H V R CNN
-F2 "Housings_DFN_QFN:QFN-24-1EP_4x4mm_Pitch0.5mm" 50 -950 50 H I L CNN
-F3 "" -200 -950 50 H V C CNN
-$FPLIST
- QFN*1EP*4x4mm*Pitch0.5mm*
-$ENDFPLIST
-DRAW
-T 0 -100 -150 50 0 0 0 RMII Normal 0 C C
-S -600 1000 500 -900 0 1 10 f
-P 4 0 1 0 -600 -250 50 -250 50 650 -600 650 N
-X VDD2A 1 100 1200 200 D 50 50 1 1 W
-X LED2/nINTSEL 2 700 -400 200 L 50 50 1 1 B
-X LED1/REGOFF 3 700 -300 200 L 50 50 1 1 B
-X XTAL2 4 -800 -800 200 R 50 50 1 1 P
-X XTAL1/CLKIN 5 -800 -700 200 R 50 50 1 1 P
-X VDDCR 6 -100 1200 200 D 50 50 1 1 W
-X RXD1/MODE1 7 -800 200 200 R 50 50 1 1 O
-X RXD0/MODE0 8 -800 300 200 R 50 50 1 1 O
-X VDDIO 9 -200 1200 200 D 50 50 1 1 W
-X RXER/PHYAD0 10 -800 100 200 R 50 50 1 1 O
-X TXN 20 700 400 200 L 50 50 1 1 O I
-X CRS_DV/MODE2 11 -800 0 200 R 50 50 1 1 O
-X TXP 21 700 500 200 L 50 50 1 1 O
-X MDIO 12 -800 -100 200 R 50 50 1 1 B
-X RXN 22 700 200 200 L 50 50 1 1 O I
-X MDC 13 -800 -200 200 R 50 50 1 1 I
-X RXP 23 700 300 200 L 50 50 1 1 O
-X INT/REFCLKO 14 -800 -500 200 R 50 50 1 1 O I
-X RBIAS 24 700 -100 200 L 50 50 1 1 I
-X RST 15 -800 -400 200 R 50 50 1 1 I I
-X VSS 25 0 -1100 200 U 50 50 1 1 W
-X TXEN 16 -800 400 200 R 50 50 1 1 I
-X TXD0 17 -800 600 200 R 50 50 1 1 I
-X TXD1 18 -800 500 200 R 50 50 1 1 I
-X VDD1A 19 0 1200 200 D 50 50 1 1 W
-ENDDRAW
-ENDDEF
-#
 #End Library
--- a/library/microchip_pic16mcu.dcm
+++ b/library/microchip_pic16mcu.dcm
@ -288,6 +288,42 @@ K FLASH-Based 8-Bit CMOS Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41458B.pdf
 $ENDCMP
 #
+$CMP PIC16(L)F1829-I/ML
+D Flash-Based, 8-Bit CMOS Microcontrollers, QFN
+K Flash-Based 8-Bit CMOS Microcontroller Low Power
+F http://ww1.microchip.com/downloads/en/DeviceDoc/41440C.pdf
+$ENDCMP
+#
+$CMP PIC16(L)F1829-I/P
+D Flash-Based, 8-Bit CMOS Microcontrollers, PDIP
+K Flash-Based 8-Bit CMOS Microcontroller Low Power
+F http://ww1.microchip.com/downloads/en/DeviceDoc/41440C.pdf
+$ENDCMP
+#
+$CMP PIC16(L)F1829-I/SL
+D Flash-Based, 8-Bit CMOS Microcontrollers, SOIC
+K Flash-Based 8-Bit CMOS Microcontroller Low Power
+F http://ww1.microchip.com/downloads/en/DeviceDoc/41440C.pdf
+$ENDCMP
+#
+$CMP PIC16(L)F1829-I/SO
+D Flash-Based, 8-Bit CMOS Microcontrollers, SOIC
+K Flash-Based 8-Bit CMOS Microcontroller Low Power
+F http://ww1.microchip.com/downloads/en/DeviceDoc/41440C.pdf
+$ENDCMP
+#
+$CMP PIC16(L)F1829-I/SS
+D Flash-Based, 8-Bit CMOS Microcontrollers, SSOP
+K Flash-Based 8-Bit CMOS Microcontroller Low Power
+F http://ww1.microchip.com/downloads/en/DeviceDoc/41440C.pdf
+$ENDCMP
+#
+$CMP PIC16(L)F1829-I/ST
+D Flash-Based, 8-Bit CMOS Microcontrollers, TSSOP
+K Flash-Based 8-Bit CMOS Microcontroller Low Power
+F http://ww1.microchip.com/downloads/en/DeviceDoc/41440C.pdf
+$ENDCMP
+#
 $CMP PIC16(L)F1934-I/ML
 D PIC16F193X/LF193X - Flash-Based, 8-Bit CMOS Microcontrollers, QFN-44
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41364E.pdf
@ -684,6 +720,12 @@ K ROM-Based 8bit Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41236E.pdf
 $ENDCMP
 #
+$CMP PIC16F1829LIN-E/SS
+D Flash-Based, 8-Bit CMOS Microcontrollers with integrated voltage regulator and LIN transceiver
+K Flash-Based 8-Bit CMOS microcontroller regulator LIN
+F http://ww1.microchip.com/downloads/en/DeviceDoc/41673A.pdf
+$ENDCMP
+#
 $CMP PIC16F505-I/MG
 D PIC16F505, 1024W FLASH, 72B SRAM, QFN16
 K FLASH-Based 8bit Microcontroller
--- a/library/microchip_pic16mcu.lib
+++ b/library/microchip_pic16mcu.lib
--- a/library/rfcom.dcm
+++ b/library/rfcom.dcm
@ -1,5 +1,11 @@
 EESchema-DOCLIB  Version 2.0
 #
+$CMP BL652
+D Bluetooth module
+K Bluetooth Nordic nRF52
+F http://cdn.lairdtech.com/home/brandworld/files/Datasheet%20-%20BL652.pdf
+$ENDCMP
+#
 $CMP BTM112
 D Bluetooth SPP Module, UART, Class 2
 K Bluetooth BT SPP Module
--- a/library/rfcom.lib
+++ b/library/rfcom.lib
@ -1,6 +1,60 @@
 EESchema-LIBRARY Version 2.3
 #encoding utf-8
 #
+# BL652
+#
+DEF BL652 U 0 40 Y Y 1 F N
+F0 "U" 0 50 50 H V C CNN
+F1 "BL652" 0 -50 50 H V C CNN
+F2 "" 0 -1200 50 H I C CNN
+F3 "" 0 -1300 50 H I C CNN
+$FPLIST
+ Laird*BL652*
+$ENDFPLIST
+DRAW
+S 900 1000 -900 -900 0 1 10 f
+X GND 1 -100 -1000 100 U 50 50 1 1 W
+X SIO_24 2 1000 -200 100 L 50 50 1 1 B
+X SIO_23 3 1000 -300 100 L 50 50 1 1 B
+X SIO_22 4 1000 -400 100 L 50 50 1 1 B
+X SWDIO 5 1000 800 100 L 50 50 1 1 B
+X SWDCLK 6 1000 900 100 L 50 50 1 1 B
+X SIO_21 7 1000 -500 100 L 50 50 1 1 B
+X SIO_20 8 1000 -600 100 L 50 50 1 1 B
+X SIO_18 9 1000 -800 100 L 50 50 1 1 B
+X SIO_16 10 -1000 -700 100 R 50 50 1 1 B
+X SIO_05/AIN3 20 -1000 400 100 R 50 50 1 1 B
+X SIO_17 30 -1000 -800 100 R 50 50 1 1 B
+X SIO_14 11 -1000 -500 100 R 50 50 1 1 B
+X SIO_04/AIN2 21 -1000 500 100 R 50 50 1 1 B
+X SIO_19 31 1000 -700 100 L 50 50 1 1 B
+X SIO_12 12 -1000 -300 100 R 50 50 1 1 B
+X SIO_03/AIN1 22 -1000 600 100 R 50 50 1 1 B
+X SIO_31/AIN7 32 1000 500 100 L 50 50 1 1 B
+X SIO_11 13 -1000 -200 100 R 50 50 1 1 B
+X SIO_02/AIN0 23 -1000 700 100 R 50 50 1 1 B
+X SIO_30/AIN6 33 1000 400 100 L 50 50 1 1 B
+X SIO_10/NFC2 14 -1000 -100 100 R 50 50 1 1 B
+X SIO_01 24 -1000 800 100 R 50 50 1 1 B
+X SIO_29/AIN5 34 1000 300 100 L 50 50 1 1 B
+X SIO_09/NFC1 15 -1000 0 100 R 50 50 1 1 B
+X SIO_00 25 -1000 900 100 R 50 50 1 1 B
+X SIO_28/AIN4 35 1000 200 100 L 50 50 1 1 B
+X GND 16 0 -1000 100 U 50 50 1 1 W
+X VDD 26 0 1100 100 D 50 50 1 1 W
+X SIO_27 36 1000 100 100 L 50 50 1 1 B
+X SIO_08 17 -1000 100 100 R 50 50 1 1 B
+X GND 27 100 -1000 100 U 50 50 1 1 W
+X SIO_26 37 1000 0 100 L 50 50 1 1 B
+X SIO_07 18 -1000 200 100 R 50 50 1 1 B
+X SIO_13 28 -1000 -400 100 R 50 50 1 1 B
+X SIO_25 38 1000 -100 100 L 50 50 1 1 B
+X SIO_06 19 -1000 300 100 R 50 50 1 1 B
+X SIO_15 29 -1000 -600 100 R 50 50 1 1 B
+X GND 39 200 -1000 100 U 50 50 1 1 W
+ENDDRAW
+ENDDEF
+#
 # BTM112
 #
 DEF BTM112 IC 0 40 Y Y 1 F N
--- a/library/stm32.lib
+++ b/library/stm32.lib
@ -938,112 +938,106 @@ ENDDEF
 # STM32F042F4PX
 #
 DEF STM32F042F4Px U 0 40 Y Y 1 L N
-F0 "U" -2100 1025 50 H V L B
-F1 "STM32F042F4Px" 2100 1025 50 H V R B
-F2 "TSSOP20" 2100 975 50 H V R T
+F0 "U" -2800 925 50 H V L B
+F1 "STM32F042F4Px" 2800 925 50 H V R B
+F2 "TSSOP20" 2800 875 50 H V R T
 F3 "~" 0 0 50 H V C CNN
 DRAW
-X ADC_IN0/RTC_TAMP2/SYS_WKUP1/TIM2_CH1/TIM2_ETR/TSC_G1_IO1/USART2_CTS/PA0 6 2200 700 100 L 50 50 1 1 B
-X ADC_IN1/TIM2_CH2/TSC_G1_IO2/USART2_DE/USART2_RTS/PA1 7 2200 600 100 L 50 50 1 1 B
-X ADC_IN2/SYS_WKUP4/TIM2_CH3/TSC_G1_IO3/USART2_TX/PA2 8 2200 500 100 L 50 50 1 1 B
-X ADC_IN3/TIM2_CH4/TSC_G1_IO4/USART2_RX/PA3 9 2200 400 100 L 50 50 1 1 B
-X ADC_IN4/I2S1_WS/SPI1_NSS/TIM14_CH1/TSC_G2_IO1/USART2_CK/USB_OE/PA4 10 2200 300 100 L 50 50 1 1 B
-X ADC_IN5/CEC/I2S1_CK/SPI1_SCK/TIM2_CH1/TIM2_ETR/TSC_G2_IO2/PA5 11 2200 200 100 L 50 50 1 1 B
-X ADC_IN6/I2S1_MCK/SPI1_MISO/TIM16_CH1/TIM1_BKIN/TIM3_CH1/TSC_G2_IO3/PA6 12 2200 100 100 L 50 50 1 1 B
-X ADC_IN7/I2S1_SD/SPI1_MOSI/TIM14_CH1/TIM17_CH1/TIM1_CH1N/TIM3_CH2/TSC_G2_IO4/PA7 13 2200 0 100 L 50 50 1 1 B
-X I2C1_SCL/TIM1_CH2/TSC_G4_IO1/USART1_TX/PA9 17 2200 -100 100 L 50 50 1 1 B
-X I2C1_SDA/TIM17_BKIN/TIM1_CH3/TSC_G4_IO2/USART1_RX/PA10 18 2200 -200 100 L 50 50 1 1 B
-X CAN_RX/I2C1_SCL/TIM1_CH4/TSC_G4_IO3/USB_DM/PA11 17 2200 -300 100 L 50 50 1 1 B
-X CAN_TX/TIM1_ETR/TSC_G4_IO4/USB_DP/PA12 18 2200 -400 100 L 50 50 1 1 B
-X IR_OUT/SYS_SWDIO/USB_OE/PA13 19 2200 -500 100 L 50 50 1 1 B
-X SYS_SWCLK/USART2_TX/PA14 20 2200 -600 100 L 50 50 1 1 B
-X NRST 4 -2200 700 100 R 50 50 1 1 I
-X PF0/CRS_SYNC/I2C1_SDA/RCC_OSC_IN 2 -2200 -200 100 R 50 50 1 1 I
-X PF1/I2C1_SCL/RCC_OSC_OUT 3 -2200 -300 100 R 50 50 1 1 I
-X PB1/ADC_IN9/TIM14_CH1/TIM1_CH3N/TIM3_CH4/TSC_G3_IO3 14 -2200 -500 100 R 50 50 1 1 B
-X PB8/CAN_RX/CEC/I2C1_SCL/TIM16_CH1/TSC_SYNC 1 -2200 -600 100 R 50 50 1 1 B
-X VDD 16 -100 1100 100 D 50 50 1 1 W
-X VDDA 5 0 1100 100 D 50 50 1 1 W
-X VSSA 15 0 -1000 100 U 50 50 1 1 W
-S -2100 -900 2100 1000 0 1 10 f
+X ADC_IN0/RTC_TAMP2/SYS_WKUP1/TIM2_CH1/TIM2_ETR/TSC_G1_IO1/USART2_CTS/PA0 6 2900 600 100 L 50 50 1 1 B
+X ADC_IN1/TIM2_CH2/TSC_G1_IO2/USART2_DE/USART2_RTS/PA1 7 2900 500 100 L 50 50 1 1 B
+X ADC_IN2/SYS_WKUP4/TIM2_CH3/TSC_G1_IO3/USART2_TX/PA2 8 2900 400 100 L 50 50 1 1 B
+X ADC_IN3/TIM2_CH4/TSC_G1_IO4/USART2_RX/PA3 9 2900 300 100 L 50 50 1 1 B
+X ADC_IN4/I2S1_WS/SPI1_NSS/TIM14_CH1/TSC_G2_IO1/USART2_CK/USB_OE/PA4 10 2900 200 100 L 50 50 1 1 B
+X ADC_IN5/CEC/I2S1_CK/SPI1_SCK/TIM2_CH1/TIM2_ETR/TSC_G2_IO2/PA5 11 2900 100 100 L 50 50 1 1 B
+X ADC_IN6/I2S1_MCK/SPI1_MISO/TIM16_CH1/TIM1_BKIN/TIM3_CH1/TSC_G2_IO3/PA6 12 2900 0 100 L 50 50 1 1 B
+X ADC_IN7/I2S1_SD/SPI1_MOSI/TIM14_CH1/TIM17_CH1/TIM1_CH1N/TIM3_CH2/TSC_G2_IO4/PA7 13 2900 -100 100 L 50 50 1 1 B
+X I2C1_SCL/TIM1_CH2/TSC_G4_IO1/USART1_TX/CAN_RX/I2C1_SCL/TIM1_CH4/TSC_G4_IO3/USB_DM/PA11/PA9 17 2900 -200 100 L 50 50 1 1 B
+X I2C1_SDA/TIM17_BKIN/TIM1_CH3/TSC_G4_IO2/USART1_RX/CAN_TX/TIM1_ETR/TSC_G4_IO4/USB_DP/PA12/PA10 18 2900 -300 100 L 50 50 1 1 B
+X IR_OUT/SYS_SWDIO/USB_OE/PA13 19 2900 -400 100 L 50 50 1 1 B
+X SYS_SWCLK/USART2_TX/PA14 20 2900 -500 100 L 50 50 1 1 B
+X NRST 4 -2900 600 100 R 50 50 1 1 I
+X PF0/CRS_SYNC/I2C1_SDA/RCC_OSC_IN 2 -2900 -100 100 R 50 50 1 1 I
+X PF1/I2C1_SCL/RCC_OSC_OUT 3 -2900 -200 100 R 50 50 1 1 I
+X PB1/ADC_IN9/TIM14_CH1/TIM1_CH3N/TIM3_CH4/TSC_G3_IO3 14 -2900 -400 100 R 50 50 1 1 B
+X PB8/CAN_RX/CEC/I2C1_SCL/TIM16_CH1/TSC_SYNC 1 -2900 -500 100 R 50 50 1 1 B
+X VDD 16 -100 1000 100 D 50 50 1 1 W
+X VDDA 5 0 1000 100 D 50 50 1 1 W
+X VSSA 15 0 -900 100 U 50 50 1 1 W
+S -2800 -800 2800 900 0 1 10 f
 ENDDRAW
 ENDDEF
 #
 # STM32F042F6PX
 #
 DEF STM32F042F6Px U 0 40 Y Y 1 L N
-F0 "U" -2100 1025 50 H V L B
-F1 "STM32F042F6Px" 2100 1025 50 H V R B
-F2 "TSSOP20" 2100 975 50 H V R T
+F0 "U" -2800 925 50 H V L B
+F1 "STM32F042F6Px" 2800 925 50 H V R B
+F2 "TSSOP20" 2800 875 50 H V R T
 F3 "~" 0 0 50 H V C CNN
 DRAW
-X ADC_IN0/RTC_TAMP2/SYS_WKUP1/TIM2_CH1/TIM2_ETR/TSC_G1_IO1/USART2_CTS/PA0 6 2200 700 100 L 50 50 1 1 B
-X ADC_IN1/TIM2_CH2/TSC_G1_IO2/USART2_DE/USART2_RTS/PA1 7 2200 600 100 L 50 50 1 1 B
-X ADC_IN2/SYS_WKUP4/TIM2_CH3/TSC_G1_IO3/USART2_TX/PA2 8 2200 500 100 L 50 50 1 1 B
-X ADC_IN3/TIM2_CH4/TSC_G1_IO4/USART2_RX/PA3 9 2200 400 100 L 50 50 1 1 B
-X ADC_IN4/I2S1_WS/SPI1_NSS/TIM14_CH1/TSC_G2_IO1/USART2_CK/USB_OE/PA4 10 2200 300 100 L 50 50 1 1 B
-X ADC_IN5/CEC/I2S1_CK/SPI1_SCK/TIM2_CH1/TIM2_ETR/TSC_G2_IO2/PA5 11 2200 200 100 L 50 50 1 1 B
-X ADC_IN6/I2S1_MCK/SPI1_MISO/TIM16_CH1/TIM1_BKIN/TIM3_CH1/TSC_G2_IO3/PA6 12 2200 100 100 L 50 50 1 1 B
-X ADC_IN7/I2S1_SD/SPI1_MOSI/TIM14_CH1/TIM17_CH1/TIM1_CH1N/TIM3_CH2/TSC_G2_IO4/PA7 13 2200 0 100 L 50 50 1 1 B
-X I2C1_SCL/TIM1_CH2/TSC_G4_IO1/USART1_TX/PA9 17 2200 -100 100 L 50 50 1 1 B
-X I2C1_SDA/TIM17_BKIN/TIM1_CH3/TSC_G4_IO2/USART1_RX/PA10 18 2200 -200 100 L 50 50 1 1 B
-X CAN_RX/I2C1_SCL/TIM1_CH4/TSC_G4_IO3/USB_DM/PA11 17 2200 -300 100 L 50 50 1 1 B
-X CAN_TX/TIM1_ETR/TSC_G4_IO4/USB_DP/PA12 18 2200 -400 100 L 50 50 1 1 B
-X IR_OUT/SYS_SWDIO/USB_OE/PA13 19 2200 -500 100 L 50 50 1 1 B
-X SYS_SWCLK/USART2_TX/PA14 20 2200 -600 100 L 50 50 1 1 B
-X NRST 4 -2200 700 100 R 50 50 1 1 I
-X PF0/CRS_SYNC/I2C1_SDA/RCC_OSC_IN 2 -2200 -200 100 R 50 50 1 1 I
-X PF1/I2C1_SCL/RCC_OSC_OUT 3 -2200 -300 100 R 50 50 1 1 I
-X PB1/ADC_IN9/TIM14_CH1/TIM1_CH3N/TIM3_CH4/TSC_G3_IO3 14 -2200 -500 100 R 50 50 1 1 B
-X PB8/CAN_RX/CEC/I2C1_SCL/TIM16_CH1/TSC_SYNC 1 -2200 -600 100 R 50 50 1 1 B
-X VDD 16 -100 1100 100 D 50 50 1 1 W
-X VDDA 5 0 1100 100 D 50 50 1 1 W
-X VSSA 15 0 -1000 100 U 50 50 1 1 W
-S -2100 -900 2100 1000 0 1 10 f
+X ADC_IN0/RTC_TAMP2/SYS_WKUP1/TIM2_CH1/TIM2_ETR/TSC_G1_IO1/USART2_CTS/PA0 6 2900 600 100 L 50 50 1 1 B
+X ADC_IN1/TIM2_CH2/TSC_G1_IO2/USART2_DE/USART2_RTS/PA1 7 2900 500 100 L 50 50 1 1 B
+X ADC_IN2/SYS_WKUP4/TIM2_CH3/TSC_G1_IO3/USART2_TX/PA2 8 2900 400 100 L 50 50 1 1 B
+X ADC_IN3/TIM2_CH4/TSC_G1_IO4/USART2_RX/PA3 9 2900 300 100 L 50 50 1 1 B
+X ADC_IN4/I2S1_WS/SPI1_NSS/TIM14_CH1/TSC_G2_IO1/USART2_CK/USB_OE/PA4 10 2900 200 100 L 50 50 1 1 B
+X ADC_IN5/CEC/I2S1_CK/SPI1_SCK/TIM2_CH1/TIM2_ETR/TSC_G2_IO2/PA5 11 2900 100 100 L 50 50 1 1 B
+X ADC_IN6/I2S1_MCK/SPI1_MISO/TIM16_CH1/TIM1_BKIN/TIM3_CH1/TSC_G2_IO3/PA6 12 2900 0 100 L 50 50 1 1 B
+X ADC_IN7/I2S1_SD/SPI1_MOSI/TIM14_CH1/TIM17_CH1/TIM1_CH1N/TIM3_CH2/TSC_G2_IO4/PA7 13 2900 -100 100 L 50 50 1 1 B
+X I2C1_SCL/TIM1_CH2/TSC_G4_IO1/USART1_TX/CAN_RX/I2C1_SCL/TIM1_CH4/TSC_G4_IO3/USB_DM/PA11/PA9 17 2900 -200 100 L 50 50 1 1 B
+X I2C1_SDA/TIM17_BKIN/TIM1_CH3/TSC_G4_IO2/USART1_RX/CAN_TX/TIM1_ETR/TSC_G4_IO4/USB_DP/PA12/PA10 18 2900 -300 100 L 50 50 1 1 B
+X IR_OUT/SYS_SWDIO/USB_OE/PA13 19 2900 -400 100 L 50 50 1 1 B
+X SYS_SWCLK/USART2_TX/PA14 20 2900 -500 100 L 50 50 1 1 B
+X NRST 4 -2900 600 100 R 50 50 1 1 I
+X PF0/CRS_SYNC/I2C1_SDA/RCC_OSC_IN 2 -2900 -100 100 R 50 50 1 1 I
+X PF1/I2C1_SCL/RCC_OSC_OUT 3 -2900 -200 100 R 50 50 1 1 I
+X PB1/ADC_IN9/TIM14_CH1/TIM1_CH3N/TIM3_CH4/TSC_G3_IO3 14 -2900 -400 100 R 50 50 1 1 B
+X PB8/CAN_RX/CEC/I2C1_SCL/TIM16_CH1/TSC_SYNC 1 -2900 -500 100 R 50 50 1 1 B
+X VDD 16 -100 1000 100 D 50 50 1 1 W
+X VDDA 5 0 1000 100 D 50 50 1 1 W
+X VSSA 15 0 -900 100 U 50 50 1 1 W
+S -2800 -800 2800 900 0 1 10 f
 ENDDRAW
 ENDDEF
 #
 # STM32F042G4UX
 #
 DEF STM32F042G4Ux U 0 40 Y Y 1 L N
-F0 "U" -2900 1125 50 H V L B
-F1 "STM32F042G4Ux" 2900 1125 50 H V R B
-F2 "UFQFPN28" 2900 1075 50 H V R T
+F0 "U" -4200 1025 50 H V L B
+F1 "STM32F042G4Ux" 4200 1025 50 H V R B
+F2 "UFQFPN28" 4200 975 50 H V R T
 F3 "~" 0 0 50 H V C CNN
 ALIAS STM32F042G6Ux
 DRAW
-X ADC_IN0/RTC_TAMP2/SYS_WKUP1/TIM2_CH1/TIM2_ETR/TSC_G1_IO1/USART2_CTS/PA0 6 3000 700 100 L 50 50 1 1 B
-X ADC_IN1/TIM2_CH2/TSC_G1_IO2/USART2_DE/USART2_RTS/PA1 7 3000 600 100 L 50 50 1 1 B
-X ADC_IN2/SYS_WKUP4/TIM2_CH3/TSC_G1_IO3/USART2_TX/PA2 8 3000 500 100 L 50 50 1 1 B
-X ADC_IN3/TIM2_CH4/TSC_G1_IO4/USART2_RX/PA3 9 3000 400 100 L 50 50 1 1 B
-X ADC_IN4/I2S1_WS/SPI1_NSS/TIM14_CH1/TSC_G2_IO1/USART2_CK/USB_OE/PA4 10 3000 300 100 L 50 50 1 1 B
-X ADC_IN5/CEC/I2S1_CK/SPI1_SCK/TIM2_CH1/TIM2_ETR/TSC_G2_IO2/PA5 11 3000 200 100 L 50 50 1 1 B
-X ADC_IN6/I2S1_MCK/SPI1_MISO/TIM16_CH1/TIM1_BKIN/TIM3_CH1/TSC_G2_IO3/PA6 12 3000 100 100 L 50 50 1 1 B
-X ADC_IN7/I2S1_SD/SPI1_MOSI/TIM14_CH1/TIM17_CH1/TIM1_CH1N/TIM3_CH2/TSC_G2_IO4/PA7 13 3000 0 100 L 50 50 1 1 B
-X I2C1_SCL/TIM1_CH2/TSC_G4_IO1/USART1_TX/PA9 19 3000 -100 100 L 50 50 1 1 B
-X I2C1_SDA/TIM17_BKIN/TIM1_CH3/TSC_G4_IO2/USART1_RX/PA10 20 3000 -200 100 L 50 50 1 1 B
-X CAN_RX/I2C1_SCL/TIM1_CH4/TSC_G4_IO3/USART1_CTS/USB_DM/PA11 19 3000 -300 100 L 50 50 1 1 B
-X CAN_TX/TIM1_ETR/TSC_G4_IO4/USART1_DE/USART1_RTS/USB_DP/PA12 20 3000 -400 100 L 50 50 1 1 B
-X IR_OUT/SYS_SWDIO/USB_OE/PA13 21 3000 -500 100 L 50 50 1 1 B
-X SYS_SWCLK/USART2_TX/PA14 22 3000 -600 100 L 50 50 1 1 B
-X I2S1_WS/SPI1_NSS/TIM2_CH1/TIM2_ETR/USART2_RX/USB_OE/PA15 23 3000 -700 100 L 50 50 1 1 B
-X NRST 4 -3000 700 100 R 50 50 1 1 I
-X PF0/CRS_SYNC/I2C1_SDA/RCC_OSC_IN 2 -3000 300 100 R 50 50 1 1 I
-X PF1/I2C1_SCL/RCC_OSC_OUT 3 -3000 200 100 R 50 50 1 1 I
-X PB0/ADC_IN8/TIM1_CH2N/TIM3_CH3/TSC_G3_IO2 14 -3000 0 100 R 50 50 1 1 B
-X PB1/ADC_IN9/TIM14_CH1/TIM1_CH3N/TIM3_CH4/TSC_G3_IO3 15 -3000 -100 100 R 50 50 1 1 B
-X PB3/I2S1_CK/SPI1_SCK/TIM2_CH2/TSC_G5_IO1 24 -3000 -200 100 R 50 50 1 1 B
-X PB4/I2S1_MCK/SPI1_MISO/TIM17_BKIN/TIM3_CH1/TSC_G5_IO2 25 -3000 -300 100 R 50 50 1 1 B
-X PB5/I2C1_SMBA/I2S1_SD/SPI1_MOSI/SYS_WKUP6/TIM16_BKIN/TIM3_CH2 26 -3000 -400 100 R 50 50 1 1 B
-X PB6/I2C1_SCL/TIM16_CH1N/TSC_G5_IO3/USART1_TX 27 -3000 -500 100 R 50 50 1 1 B
-X PB7/I2C1_SDA/TIM17_CH1N/TSC_G5_IO4/USART1_RX 28 -3000 -600 100 R 50 50 1 1 B
-X PB8/CAN_RX/CEC/I2C1_SCL/TIM16_CH1/TSC_SYNC 1 -3000 -700 100 R 50 50 1 1 B
-X VDD 17 -100 1200 100 D 50 50 1 1 W
-X VDDA 5 0 1200 100 D 50 50 1 1 W
-X VDDIO2 18 100 1200 100 D 50 50 1 1 W
-X VSS 29 -100 -1100 100 U 50 50 1 1 W
-X VSSA 16 0 -1100 100 U 50 50 1 1 W
-S -2900 -1000 2900 1100 0 1 10 f
+X ADC_IN0/RTC_TAMP2/SYS_WKUP1/TIM2_CH1/TIM2_ETR/TSC_G1_IO1/USART2_CTS/PA0 6 4300 600 100 L 50 50 1 1 B
+X ADC_IN1/TIM2_CH2/TSC_G1_IO2/USART2_DE/USART2_RTS/PA1 7 4300 500 100 L 50 50 1 1 B
+X ADC_IN2/SYS_WKUP4/TIM2_CH3/TSC_G1_IO3/USART2_TX/PA2 8 4300 400 100 L 50 50 1 1 B
+X ADC_IN3/TIM2_CH4/TSC_G1_IO4/USART2_RX/PA3 9 4300 300 100 L 50 50 1 1 B
+X ADC_IN4/I2S1_WS/SPI1_NSS/TIM14_CH1/TSC_G2_IO1/USART2_CK/USB_OE/PA4 10 4300 200 100 L 50 50 1 1 B
+X ADC_IN5/CEC/I2S1_CK/SPI1_SCK/TIM2_CH1/TIM2_ETR/TSC_G2_IO2/PA5 11 4300 100 100 L 50 50 1 1 B
+X ADC_IN6/I2S1_MCK/SPI1_MISO/TIM16_CH1/TIM1_BKIN/TIM3_CH1/TSC_G2_IO3/PA6 12 4300 0 100 L 50 50 1 1 B
+X ADC_IN7/I2S1_SD/SPI1_MOSI/TIM14_CH1/TIM17_CH1/TIM1_CH1N/TIM3_CH2/TSC_G2_IO4/PA7 13 4300 -100 100 L 50 50 1 1 B
+X I2C1_SCL/TIM1_CH2/TSC_G4_IO1/USART1_TX/CAN_RX/I2C1_SCL/TIM1_CH4/TSC_G4_IO3/USART1_CTS/USB_DM/PA11/PA9 19 4300 -200 100 L 50 50 1 1 B
+X I2C1_SDA/TIM17_BKIN/TIM1_CH3/TSC_G4_IO2/USART1_RX/CAN_TX/TIM1_ETR/TSC_G4_IO4/USART1_DE/USART1_RTS/USB_DP/PA12/PA10 20 4300 -300 100 L 50 50 1 1 B
+X IR_OUT/SYS_SWDIO/USB_OE/PA13 21 4300 -400 100 L 50 50 1 1 B
+X SYS_SWCLK/USART2_TX/PA14 22 4300 -500 100 L 50 50 1 1 B
+X I2S1_WS/SPI1_NSS/TIM2_CH1/TIM2_ETR/USART2_RX/USB_OE/PA15 23 4300 -600 100 L 50 50 1 1 B
+X NRST 4 -4300 600 100 R 50 50 1 1 I
+X PF0/CRS_SYNC/I2C1_SDA/RCC_OSC_IN 2 -4300 400 100 R 50 50 1 1 I
+X PF1/I2C1_SCL/RCC_OSC_OUT 3 -4300 300 100 R 50 50 1 1 I
+X PB0/ADC_IN8/TIM1_CH2N/TIM3_CH3/TSC_G3_IO2 14 -4300 100 100 R 50 50 1 1 B
+X PB1/ADC_IN9/TIM14_CH1/TIM1_CH3N/TIM3_CH4/TSC_G3_IO3 15 -4300 0 100 R 50 50 1 1 B
+X PB3/I2S1_CK/SPI1_SCK/TIM2_CH2/TSC_G5_IO1 24 -4300 -100 100 R 50 50 1 1 B
+X PB4/I2S1_MCK/SPI1_MISO/TIM17_BKIN/TIM3_CH1/TSC_G5_IO2 25 -4300 -200 100 R 50 50 1 1 B
+X PB5/I2C1_SMBA/I2S1_SD/SPI1_MOSI/SYS_WKUP6/TIM16_BKIN/TIM3_CH2 26 -4300 -300 100 R 50 50 1 1 B
+X PB6/I2C1_SCL/TIM16_CH1N/TSC_G5_IO3/USART1_TX 27 -4300 -400 100 R 50 50 1 1 B
+X PB7/I2C1_SDA/TIM17_CH1N/TSC_G5_IO4/USART1_RX 28 -4300 -500 100 R 50 50 1 1 B
+X PB8/CAN_RX/CEC/I2C1_SCL/TIM16_CH1/TSC_SYNC 1 -4300 -600 100 R 50 50 1 1 B
+X VDD 17 -100 1100 100 D 50 50 1 1 W
+X VDDA 5 0 1100 100 D 50 50 1 1 W
+X VDDIO2 18 100 1100 100 D 50 50 1 1 W
+X VSS 29 -100 -1000 100 U 50 50 1 1 W
+X VSSA 16 0 -1000 100 U 50 50 1 1 W
+S -4200 -900 4200 1000 0 1 10 f
 ENDDRAW
 ENDDEF
 #
@ -1249,43 +1243,41 @@ ENDDEF
 # STM32F048G6UX
 #
 DEF STM32F048G6Ux U 0 40 Y Y 1 L N
-F0 "U" -2700 1125 50 H V L B
-F1 "STM32F048G6Ux" 2700 1125 50 H V R B
-F2 "UFQFPN28" 2700 1075 50 H V R T
+F0 "U" -4000 1025 50 H V L B
+F1 "STM32F048G6Ux" 4000 1025 50 H V R B
+F2 "UFQFPN28" 4000 975 50 H V R T
 F3 "~" 0 0 50 H V C CNN
 DRAW
-X ADC_IN0/RTC_TAMP2/SYS_WKUP1/TIM2_CH1/TIM2_ETR/TSC_G1_IO1/USART2_CTS/PA0 6 2800 700 100 L 50 50 1 1 B
-X ADC_IN1/TIM2_CH2/TSC_G1_IO2/USART2_DE/USART2_RTS/PA1 7 2800 600 100 L 50 50 1 1 B
-X ADC_IN2/SYS_WKUP4/TIM2_CH3/TSC_G1_IO3/USART2_TX/PA2 8 2800 500 100 L 50 50 1 1 B
-X ADC_IN3/TIM2_CH4/TSC_G1_IO4/USART2_RX/PA3 9 2800 400 100 L 50 50 1 1 B
-X ADC_IN4/I2S1_WS/SPI1_NSS/TIM14_CH1/TSC_G2_IO1/USART2_CK/USB_OE/PA4 10 2800 300 100 L 50 50 1 1 B
-X ADC_IN5/CEC/I2S1_CK/SPI1_SCK/TIM2_CH1/TIM2_ETR/TSC_G2_IO2/PA5 11 2800 200 100 L 50 50 1 1 B
-X ADC_IN6/I2S1_MCK/SPI1_MISO/TIM16_CH1/TIM1_BKIN/TIM3_CH1/TSC_G2_IO3/PA6 12 2800 100 100 L 50 50 1 1 B
-X ADC_IN7/I2S1_SD/SPI1_MOSI/TIM14_CH1/TIM17_CH1/TIM1_CH1N/TIM3_CH2/TSC_G2_IO4/PA7 13 2800 0 100 L 50 50 1 1 B
-X I2C1_SCL/TIM1_CH2/TSC_G4_IO1/USART1_TX/PA9 19 2800 -100 100 L 50 50 1 1 B
-X I2C1_SDA/TIM17_BKIN/TIM1_CH3/TSC_G4_IO2/USART1_RX/PA10 20 2800 -200 100 L 50 50 1 1 B
-X I2C1_SCL/TIM1_CH4/TSC_G4_IO3/USART1_CTS/USB_DM/PA11 19 2800 -300 100 L 50 50 1 1 B
-X TIM1_ETR/TSC_G4_IO4/USART1_DE/USART1_RTS/USB_DP/PA12 20 2800 -400 100 L 50 50 1 1 B
-X IR_OUT/SYS_SWDIO/USB_OE/PA13 21 2800 -500 100 L 50 50 1 1 B
-X SYS_SWCLK/USART2_TX/PA14 22 2800 -600 100 L 50 50 1 1 B
-X I2S1_WS/SPI1_NSS/TIM2_CH1/TIM2_ETR/USART2_RX/USB_OE/PA15 23 2800 -700 100 L 50 50 1 1 B
-X NRST 4 -2800 700 100 R 50 50 1 1 I
-X NPOR 15 -2800 500 100 R 50 50 1 1 W
-X PF0/CRS_SYNC/I2C1_SDA/RCC_OSC_IN 2 -2800 200 100 R 50 50 1 1 I
-X PF1/I2C1_SCL/RCC_OSC_OUT 3 -2800 100 100 R 50 50 1 1 I
-X PB0/ADC_IN8/TIM1_CH2N/TIM3_CH3/TSC_G3_IO2 14 -2800 -100 100 R 50 50 1 1 B
-X PB3/I2S1_CK/SPI1_SCK/TIM2_CH2/TSC_G5_IO1 24 -2800 -200 100 R 50 50 1 1 B
-X PB4/I2S1_MCK/SPI1_MISO/TIM17_BKIN/TIM3_CH1/TSC_G5_IO2 25 -2800 -300 100 R 50 50 1 1 B
-X PB5/I2C1_SMBA/I2S1_SD/SPI1_MOSI/SYS_WKUP6/TIM16_BKIN/TIM3_CH2 26 -2800 -400 100 R 50 50 1 1 B
-X PB6/I2C1_SCL/TIM16_CH1N/TSC_G5_IO3/USART1_TX 27 -2800 -500 100 R 50 50 1 1 B
-X PB7/I2C1_SDA/TIM17_CH1N/TSC_G5_IO4/USART1_RX 28 -2800 -600 100 R 50 50 1 1 B
-X PB8/CEC/I2C1_SCL/TIM16_CH1/TSC_SYNC 1 -2800 -700 100 R 50 50 1 1 B
-X VDD 17 -100 1200 100 D 50 50 1 1 W
-X VDDA 5 0 1200 100 D 50 50 1 1 W
-X VDDIO2 18 100 1200 100 D 50 50 1 1 W
+X ADC_IN0/RTC_TAMP2/SYS_WKUP1/TIM2_CH1/TIM2_ETR/TSC_G1_IO1/USART2_CTS/PA0 6 4100 500 100 L 50 50 1 1 B
+X ADC_IN1/TIM2_CH2/TSC_G1_IO2/USART2_DE/USART2_RTS/PA1 7 4100 400 100 L 50 50 1 1 B
+X ADC_IN2/SYS_WKUP4/TIM2_CH3/TSC_G1_IO3/USART2_TX/PA2 8 4100 300 100 L 50 50 1 1 B
+X ADC_IN3/TIM2_CH4/TSC_G1_IO4/USART2_RX/PA3 9 4100 200 100 L 50 50 1 1 B
+X ADC_IN4/I2S1_WS/SPI1_NSS/TIM14_CH1/TSC_G2_IO1/USART2_CK/USB_OE/PA4 10 4100 100 100 L 50 50 1 1 B
+X ADC_IN5/CEC/I2S1_CK/SPI1_SCK/TIM2_CH1/TIM2_ETR/TSC_G2_IO2/PA5 11 4100 0 100 L 50 50 1 1 B
+X ADC_IN6/I2S1_MCK/SPI1_MISO/TIM16_CH1/TIM1_BKIN/TIM3_CH1/TSC_G2_IO3/PA6 12 4100 -100 100 L 50 50 1 1 B
+X ADC_IN7/I2S1_SD/SPI1_MOSI/TIM14_CH1/TIM17_CH1/TIM1_CH1N/TIM3_CH2/TSC_G2_IO4/PA7 13 4100 -200 100 L 50 50 1 1 B
+X I2C1_SCL/TIM1_CH2/TSC_G4_IO1/USART1_TX/I2C1_SCL/TIM1_CH4/TSC_G4_IO3/USART1_CTS/USB_DM/PA11/PA9 19 4100 -300 100 L 50 50 1 1 B
+X I2C1_SDA/TIM17_BKIN/TIM1_CH3/TSC_G4_IO2/USART1_RX/TIM1_ETR/TSC_G4_IO4/USART1_DE/USART1_RTS/USB_DP/PA12/PA10 20 4100 -400 100 L 50 50 1 1 B
+X IR_OUT/SYS_SWDIO/USB_OE/PA13 21 4100 -500 100 L 50 50 1 1 B
+X SYS_SWCLK/USART2_TX/PA14 22 4100 -600 100 L 50 50 1 1 B
+X I2S1_WS/SPI1_NSS/TIM2_CH1/TIM2_ETR/USART2_RX/USB_OE/PA15 23 4100 -700 100 L 50 50 1 1 B
+X NRST 4 -4100 600 100 R 50 50 1 1 I
+X NPOR 15 -4100 400 100 R 50 50 1 1 W
+X PF0/CRS_SYNC/I2C1_SDA/RCC_OSC_IN 2 -4100 200 100 R 50 50 1 1 I
+X PF1/I2C1_SCL/RCC_OSC_OUT 3 -4100 100 100 R 50 50 1 1 I
+X PB0/ADC_IN8/TIM1_CH2N/TIM3_CH3/TSC_G3_IO2 14 -4100 -100 100 R 50 50 1 1 B
+X PB3/I2S1_CK/SPI1_SCK/TIM2_CH2/TSC_G5_IO1 24 -4100 -200 100 R 50 50 1 1 B
+X PB4/I2S1_MCK/SPI1_MISO/TIM17_BKIN/TIM3_CH1/TSC_G5_IO2 25 -4100 -300 100 R 50 50 1 1 B
+X PB5/I2C1_SMBA/I2S1_SD/SPI1_MOSI/SYS_WKUP6/TIM16_BKIN/TIM3_CH2 26 -4100 -400 100 R 50 50 1 1 B
+X PB6/I2C1_SCL/TIM16_CH1N/TSC_G5_IO3/USART1_TX 27 -4100 -500 100 R 50 50 1 1 B
+X PB7/I2C1_SDA/TIM17_CH1N/TSC_G5_IO4/USART1_RX 28 -4100 -600 100 R 50 50 1 1 B
+X PB8/CEC/I2C1_SCL/TIM16_CH1/TSC_SYNC 1 -4100 -700 100 R 50 50 1 1 B
+X VDD 17 -100 1100 100 D 50 50 1 1 W
+X VDDA 5 0 1100 100 D 50 50 1 1 W
+X VDDIO2 18 100 1100 100 D 50 50 1 1 W
 X VSS 29 -100 -1100 100 U 50 50 1 1 W
 X VSSA 16 0 -1100 100 U 50 50 1 1 W
-S -2700 -1000 2700 1100 0 1 10 f
+S -4000 -1000 4000 1000 0 1 10 f
 ENDDRAW
 ENDDEF
 #
@ -2604,34 +2596,32 @@ ENDDEF
 # STM32F070F6PX
 #
 DEF STM32F070F6Px U 0 40 Y Y 1 L N
-F0 "U" -1600 1025 50 H V L B
-F1 "STM32F070F6Px" 1600 1025 50 H V R B
-F2 "TSSOP20" 1600 975 50 H V R T
+F0 "U" -2600 925 50 H V L B
+F1 "STM32F070F6Px" 2600 925 50 H V R B
+F2 "TSSOP20" 2600 875 50 H V R T
 F3 "~" 0 0 50 H V C CNN
 DRAW
-X ADC_IN0/RTC_TAMP2/SYS_WKUP1/USART2_CTS/PA0 6 1700 700 100 L 50 50 1 1 B
-X ADC_IN1/USART2_DE/USART2_RTS/PA1 7 1700 600 100 L 50 50 1 1 B
-X ADC_IN2/SYS_WKUP4/USART2_TX/PA2 8 1700 500 100 L 50 50 1 1 B
-X ADC_IN3/USART2_RX/PA3 9 1700 400 100 L 50 50 1 1 B
-X ADC_IN4/SPI1_NSS/TIM14_CH1/USART2_CK/USB_OE/PA4 10 1700 300 100 L 50 50 1 1 B
-X ADC_IN5/SPI1_SCK/PA5 11 1700 200 100 L 50 50 1 1 B
-X ADC_IN6/SPI1_MISO/TIM16_CH1/TIM1_BKIN/TIM3_CH1/PA6 12 1700 100 100 L 50 50 1 1 B
-X ADC_IN7/SPI1_MOSI/TIM14_CH1/TIM17_CH1/TIM1_CH1N/TIM3_CH2/PA7 13 1700 0 100 L 50 50 1 1 B
-X I2C1_SCL/TIM1_CH2/USART1_TX/PA9 17 1700 -100 100 L 50 50 1 1 B
-X I2C1_SDA/TIM17_BKIN/TIM1_CH3/USART1_RX/PA10 18 1700 -200 100 L 50 50 1 1 B
-X I2C1_SCL/TIM1_CH4/USART1_CTS/USB_DM/PA11 17 1700 -300 100 L 50 50 1 1 B
-X TIM1_ETR/USART1_DE/USART1_RTS/USB_DP/PA12 18 1700 -400 100 L 50 50 1 1 B
-X IR_OUT/SYS_SWDIO/USB_OE/PA13 19 1700 -500 100 L 50 50 1 1 B
-X SYS_SWCLK/USART2_TX/PA14 20 1700 -600 100 L 50 50 1 1 B
-X NRST 4 -1700 700 100 R 50 50 1 1 I
-X BOOT0 1 -1700 500 100 R 50 50 1 1 I
-X PF0/I2C1_SDA/RCC_OSC_IN 2 -1700 -300 100 R 50 50 1 1 I
-X PF1/I2C1_SCL/RCC_OSC_OUT 3 -1700 -400 100 R 50 50 1 1 I
-X PB1/ADC_IN9/TIM14_CH1/TIM1_CH3N/TIM3_CH4 14 -1700 -600 100 R 50 50 1 1 B
-X VDD 16 -100 1100 100 D 50 50 1 1 W
-X VDDA 5 0 1100 100 D 50 50 1 1 W
-X VSS 15 0 -1000 100 U 50 50 1 1 W
-S -1600 -900 1600 1000 0 1 10 f
+X ADC_IN0/RTC_TAMP2/SYS_WKUP1/USART2_CTS/PA0 6 2700 600 100 L 50 50 1 1 B
+X ADC_IN1/USART2_DE/USART2_RTS/PA1 7 2700 500 100 L 50 50 1 1 B
+X ADC_IN2/SYS_WKUP4/USART2_TX/PA2 8 2700 400 100 L 50 50 1 1 B
+X ADC_IN3/USART2_RX/PA3 9 2700 300 100 L 50 50 1 1 B
+X ADC_IN4/SPI1_NSS/TIM14_CH1/USART2_CK/USB_OE/PA4 10 2700 200 100 L 50 50 1 1 B
+X ADC_IN5/SPI1_SCK/PA5 11 2700 100 100 L 50 50 1 1 B
+X ADC_IN6/SPI1_MISO/TIM16_CH1/TIM1_BKIN/TIM3_CH1/PA6 12 2700 0 100 L 50 50 1 1 B
+X ADC_IN7/SPI1_MOSI/TIM14_CH1/TIM17_CH1/TIM1_CH1N/TIM3_CH2/PA7 13 2700 -100 100 L 50 50 1 1 B
+X I2C1_SCL/TIM1_CH2/USART1_TX/I2C1_SCL/TIM1_CH4/USART1_CTS/USB_DM/PA11/PA9 17 2700 -200 100 L 50 50 1 1 B
+X I2C1_SDA/TIM17_BKIN/TIM1_CH3/USART1_RX/TIM1_ETR/USART1_DE/USART1_RTS/USB_DP/PA12/PA10 18 2700 -300 100 L 50 50 1 1 B
+X IR_OUT/SYS_SWDIO/USB_OE/PA13 19 2700 -400 100 L 50 50 1 1 B
+X SYS_SWCLK/USART2_TX/PA14 20 2700 -500 100 L 50 50 1 1 B
+X NRST 4 -2700 600 100 R 50 50 1 1 I
+X BOOT0 1 -2700 400 100 R 50 50 1 1 I
+X PF0/I2C1_SDA/RCC_OSC_IN 2 -2700 -200 100 R 50 50 1 1 I
+X PF1/I2C1_SCL/RCC_OSC_OUT 3 -2700 -300 100 R 50 50 1 1 I
+X PB1/ADC_IN9/TIM14_CH1/TIM1_CH3N/TIM3_CH4 14 -2700 -500 100 R 50 50 1 1 B
+X VDD 16 -100 1000 100 D 50 50 1 1 W
+X VDDA 5 0 1000 100 D 50 50 1 1 W
+X VSS 15 0 -900 100 U 50 50 1 1 W
+S -2600 -800 2600 900 0 1 10 f
 ENDDRAW
 ENDDEF
 #
--- a/modules/packages3d/Oscillators.3dshapes/KXO-200.wings
+++ b/modules/packages3d/Oscillators.3dshapes/KXO-200.wings
--- a/modules/packages3d/Oscillators.3dshapes/KXO-200.wrl
+++ b/modules/packages3d/Oscillators.3dshapes/KXO-200.wrl
@ -1,690 +0,0 @@
-#VRML V2.0 utf8
-#Exported from Wings 3D 0.98.31
-DEF torus1_copy6 Transform {
-  children [
-    Shape {
-      appearance Appearance {
-        material DEF pins Material {
-          diffuseColor 0.826667 0.826667 0.826667
-          emissiveColor 0.00000e+0 0.00000e+0 0.00000e+0
-          specularColor 1.00000 1.00000 1.00000
-          ambientIntensity 1.00000
-          transparency 0.00000e+0
-          shininess 1.00000
-        }
-      }
-      geometry IndexedFaceSet {
-        normalPerVertex TRUE
-        coord Coordinate { point [
-          3.18600 1.48969 0.799496,
-          3.17005 1.40955 0.799496,
-          3.12466 1.34161 0.799496,
-          3.05672 1.29621 0.799496,
-          2.97658 1.28027 0.799496,
-          2.89644 1.29621 0.799496,
-          2.82850 1.34161 0.799496,
-          2.78311 1.40955 0.799496,
-          2.76717 1.48969 0.799496,
-          2.78311 1.56983 0.799496,
-          2.82850 1.63776 0.799496,
-          2.89644 1.68316 0.799496,
-          2.97658 1.69910 0.799496,
-          3.05672 1.68316 0.799496,
-          3.12466 1.63776 0.799496,
-          3.17005 1.56983 0.799496,
-          3.18600 1.48969 -1.03430,
-          3.17005 1.40955 -1.03430,
-          3.12466 1.34161 -1.03430,
-          3.05672 1.29621 -1.03430,
-          2.97658 1.28027 -1.03430,
-          2.89644 1.29621 -1.03430,
-          2.82850 1.34161 -1.03430,
-          2.78311 1.40955 -1.03430,
-          2.76717 1.48969 -1.03430,
-          2.78311 1.56983 -1.03430,
-          2.82850 1.63776 -1.03430,
-          2.89644 1.68316 -1.03430,
-          2.97658 1.69910 -1.03430,
-          3.05672 1.68316 -1.03430,
-          3.12466 1.63776 -1.03430,
-          3.17005 1.56983 -1.03430 ] }
-        coordIndex [
-          0, 1, 17, 16, -1,
-          0, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, -1,
-          0, 16, 31, 15, -1,
-          1, 2, 18, 17, -1,
-          2, 3, 19, 18, -1,
-          3, 4, 20, 19, -1,
-          4, 5, 21, 20, -1,
-          5, 6, 22, 21, -1,
-          6, 7, 23, 22, -1,
-          7, 8, 24, 23, -1,
-          8, 9, 25, 24, -1,
-          9, 10, 26, 25, -1,
-          10, 11, 27, 26, -1,
-          11, 12, 28, 27, -1,
-          12, 13, 29, 28, -1,
-          13, 14, 30, 29, -1,
-          14, 15, 31, 30, -1,
-          16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, -1 ]
-        normal Normal { vector [
-          0.890909 4.15244e-7 0.454182,
-          0.823093 -0.340936 0.454182,
-          0.629968 -0.629968 0.454182,
-          0.340936 -0.823093 0.454182,
-          -5.04243e-17 -0.890909 0.454182,
-          -0.340936 -0.823093 0.454182,
-          -0.629968 -0.629968 0.454182,
-          -0.823093 -0.340936 0.454182,
-          -0.890909 4.15244e-7 0.454182,
-          -0.823093 0.340937 0.454181,
-          -0.629968 0.629968 0.454181,
-          -0.340936 0.823093 0.454181,
-          -5.04243e-17 0.890909 0.454181,
-          0.340936 0.823093 0.454181,
-          0.629968 0.629968 0.454181,
-          0.823093 0.340937 0.454181,
-          0.890909 -4.15244e-7 -0.454182,
-          0.823093 -0.340937 -0.454181,
-          0.629968 -0.629968 -0.454181,
-          0.340936 -0.823093 -0.454181,
-          5.04243e-17 -0.890909 -0.454181,
-          -0.340936 -0.823093 -0.454181,
-          -0.629968 -0.629968 -0.454181,
-          -0.823093 -0.340937 -0.454181,
-          -0.890909 -4.15244e-7 -0.454182,
-          -0.823093 0.340936 -0.454182,
-          -0.629968 0.629968 -0.454182,
-          -0.340936 0.823093 -0.454182,
-          5.04243e-17 0.890909 -0.454182,
-          0.340936 0.823093 -0.454182,
-          0.629968 0.629968 -0.454182,
-          0.823093 0.340936 -0.454182 ] }
-        normalIndex [
-          0, 1, 17, 16, -1,
-          0, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, -1,
-          0, 16, 31, 15, -1,
-          1, 2, 18, 17, -1,
-          2, 3, 19, 18, -1,
-          3, 4, 20, 19, -1,
-          4, 5, 21, 20, -1,
-          5, 6, 22, 21, -1,
-          6, 7, 23, 22, -1,
-          7, 8, 24, 23, -1,
-          8, 9, 25, 24, -1,
-          9, 10, 26, 25, -1,
-          10, 11, 27, 26, -1,
-          11, 12, 28, 27, -1,
-          12, 13, 29, 28, -1,
-          13, 14, 30, 29, -1,
-          14, 15, 31, 30, -1,
-          16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, -1 ]
-      }
-    }
-  ]
-}
-
-DEF torus1_copy5 Transform {
-  children [
-    Shape {
-      appearance Appearance {
-        material USE pins
-      }
-      geometry IndexedFaceSet {
-        normalPerVertex TRUE
-        coord Coordinate { point [
-          -2.79175 -1.50044 0.799496,
-          -2.80769 -1.58058 0.799496,
-          -2.85309 -1.64852 0.799496,
-          -2.92103 -1.69392 0.799496,
-          -3.00117 -1.70986 0.799496,
-          -3.08131 -1.69392 0.799496,
-          -3.14925 -1.64852 0.799496,
-          -3.19464 -1.58058 0.799496,
-          -3.21058 -1.50044 0.799496,
-          -3.19464 -1.42030 0.799496,
-          -3.14925 -1.35236 0.799496,
-          -3.08131 -1.30697 0.799496,
-          -3.00117 -1.29103 0.799496,
-          -2.92103 -1.30697 0.799496,
-          -2.85309 -1.35236 0.799496,
-          -2.80769 -1.42030 0.799496,
-          -2.79175 -1.50044 -1.03430,
-          -2.80769 -1.58058 -1.03430,
-          -2.85309 -1.64852 -1.03430,
-          -2.92103 -1.69392 -1.03430,
-          -3.00117 -1.70986 -1.03430,
-          -3.08131 -1.69392 -1.03430,
-          -3.14925 -1.64852 -1.03430,
-          -3.19464 -1.58058 -1.03430,
-          -3.21058 -1.50044 -1.03430,
-          -3.19464 -1.42030 -1.03430,
-          -3.14925 -1.35236 -1.03430,
-          -3.08131 -1.30697 -1.03430,
-          -3.00117 -1.29103 -1.03430,
-          -2.92103 -1.30697 -1.03430,
-          -2.85309 -1.35236 -1.03430,
-          -2.80769 -1.42030 -1.03430 ] }
-        coordIndex [
-          0, 1, 17, 16, -1,
-          0, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, -1,
-          0, 16, 31, 15, -1,
-          1, 2, 18, 17, -1,
-          2, 3, 19, 18, -1,
-          3, 4, 20, 19, -1,
-          4, 5, 21, 20, -1,
-          5, 6, 22, 21, -1,
-          6, 7, 23, 22, -1,
-          7, 8, 24, 23, -1,
-          8, 9, 25, 24, -1,
-          9, 10, 26, 25, -1,
-          10, 11, 27, 26, -1,
-          11, 12, 28, 27, -1,
-          12, 13, 29, 28, -1,
-          13, 14, 30, 29, -1,
-          14, 15, 31, 30, -1,
-          16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, -1 ]
-        normal Normal { vector [
-          0.890909 4.15244e-7 0.454182,
-          0.823093 -0.340936 0.454182,
-          0.629968 -0.629968 0.454182,
-          0.340936 -0.823093 0.454182,
-          -8.82425e-16 -0.890909 0.454182,
-          -0.340936 -0.823093 0.454182,
-          -0.629968 -0.629968 0.454182,
-          -0.823093 -0.340936 0.454182,
-          -0.890909 4.15244e-7 0.454182,
-          -0.823093 0.340937 0.454181,
-          -0.629968 0.629968 0.454181,
-          -0.340936 0.823093 0.454181,
-          -9.07637e-16 0.890909 0.454181,
-          0.340936 0.823093 0.454181,
-          0.629968 0.629968 0.454181,
-          0.823093 0.340937 0.454181,
-          0.890909 -4.15244e-7 -0.454182,
-          0.823093 -0.340937 -0.454181,
-          0.629968 -0.629968 -0.454181,
-          0.340936 -0.823093 -0.454181,
-          -1.02109e-15 -0.890909 -0.454181,
-          -0.340936 -0.823093 -0.454181,
-          -0.629968 -0.629968 -0.454181,
-          -0.823093 -0.340937 -0.454181,
-          -0.890909 -4.15244e-7 -0.454182,
-          -0.823093 0.340936 -0.454182,
-          -0.629968 0.629968 -0.454182,
-          -0.340936 0.823093 -0.454182,
-          -1.04630e-15 0.890909 -0.454182,
-          0.340936 0.823093 -0.454182,
-          0.629968 0.629968 -0.454182,
-          0.823093 0.340936 -0.454182 ] }
-        normalIndex [
-          0, 1, 17, 16, -1,
-          0, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, -1,
-          0, 16, 31, 15, -1,
-          1, 2, 18, 17, -1,
-          2, 3, 19, 18, -1,
-          3, 4, 20, 19, -1,
-          4, 5, 21, 20, -1,
-          5, 6, 22, 21, -1,
-          6, 7, 23, 22, -1,
-          7, 8, 24, 23, -1,
-          8, 9, 25, 24, -1,
-          9, 10, 26, 25, -1,
-          10, 11, 27, 26, -1,
-          11, 12, 28, 27, -1,
-          12, 13, 29, 28, -1,
-          13, 14, 30, 29, -1,
-          14, 15, 31, 30, -1,
-          16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, -1 ]
-      }
-    }
-  ]
-}
-
-DEF cube8_copy9 Transform {
-  children [
-    Shape {
-      appearance Appearance {
-        material DEF corpo Material {
-          diffuseColor 0.913420 0.913420 0.913420
-          emissiveColor 0.840160 0.840160 0.840160
-          specularColor 0.866800 0.866800 0.866800
-          ambientIntensity 0.900100
-          transparency 0.00000e+0
-          shininess 1.00000
-        }
-      }
-      geometry IndexedFaceSet {
-        normalPerVertex TRUE
-        coord Coordinate { point [
-          -3.63059 -2.26600 0.336464,
-          -3.26742 -2.50000 0.336464,
-          -3.63059 2.26600 0.336464,
-          -3.26742 2.50000 0.336464,
-          3.76624 2.50000 0.336464,
-          4.12941 2.26600 0.336464,
-          4.12941 -2.26600 0.336464,
-          3.76624 -2.50000 0.336464,
-          -3.63059 -2.26600 1.77860,
-          -3.26742 -2.50000 1.77860,
-          -3.63059 2.26600 1.77860,
-          -3.26742 2.50000 1.77860,
-          3.76624 2.50000 1.77860,
-          4.12941 2.26600 1.77860,
-          4.12941 -2.26600 1.77860,
-          3.76624 -2.50000 1.77860,
-          -3.30964 -2.18034 1.98540,
-          -3.13448 -2.29320 1.98540,
-          3.63330 -2.29320 1.98540,
-          3.80846 -2.18034 1.98540,
-          3.80846 2.18034 1.98540,
-          3.63330 2.29320 1.98540,
-          -3.13448 2.29320 1.98540,
-          -3.30964 2.18034 1.98540 ] }
-        coordIndex [
-          0, 1, 9, 8, -1,
-          0, 2, 3, 4, 5, 6, 7, 1, -1,
-          0, 8, 10, 2, -1,
-          1, 7, 15, 9, -1,
-          2, 10, 11, 3, -1,
-          3, 11, 12, 4, -1,
-          4, 12, 13, 5, -1,
-          5, 13, 14, 6, -1,
-          6, 14, 15, 7, -1,
-          8, 9, 17, 16, -1,
-          8, 16, 23, 10, -1,
-          9, 15, 18, 17, -1,
-          10, 23, 22, 11, -1,
-          11, 22, 21, 12, -1,
-          12, 21, 20, 13, -1,
-          13, 20, 19, 14, -1,
-          14, 19, 18, 15, -1,
-          16, 17, 18, 19, 20, 21, 22, 23, -1 ]
-        normal Normal { vector [
-          -0.762917 -0.416000 -0.494876,
-          -0.250337 -0.850713 -0.462189,
-          -0.762917 0.416000 -0.494876,
-          -0.250337 0.850713 -0.462189,
-          0.250337 0.850713 -0.462189,
-          0.762917 0.416000 -0.494876,
-          0.762917 -0.416000 -0.494876,
-          0.250337 -0.850713 -0.462189,
-          -0.754025 -0.428411 0.497906,
-          -0.251799 -0.873606 0.416424,
-          -0.754025 0.428411 0.497906,
-          -0.251799 0.873606 0.416424,
-          0.251799 0.873606 0.416424,
-          0.754025 0.428411 0.497906,
-          0.754025 -0.428411 0.497906,
-          0.251799 -0.873606 0.416424,
-          -0.317234 -0.192815 0.928539,
-          -0.124903 -0.447160 0.885690,
-          0.124903 -0.447160 0.885690,
-          0.317234 -0.192815 0.928539,
-          0.317234 0.192815 0.928539,
-          0.124903 0.447160 0.885690,
-          -0.124903 0.447160 0.885690,
-          -0.317234 0.192815 0.928539 ] }
-        normalIndex [
-          0, 1, 9, 8, -1,
-          0, 2, 3, 4, 5, 6, 7, 1, -1,
-          0, 8, 10, 2, -1,
-          1, 7, 15, 9, -1,
-          2, 10, 11, 3, -1,
-          3, 11, 12, 4, -1,
-          4, 12, 13, 5, -1,
-          5, 13, 14, 6, -1,
-          6, 14, 15, 7, -1,
-          8, 9, 17, 16, -1,
-          8, 16, 23, 10, -1,
-          9, 15, 18, 17, -1,
-          10, 23, 22, 11, -1,
-          11, 22, 21, 12, -1,
-          12, 21, 20, 13, -1,
-          13, 20, 19, 14, -1,
-          14, 19, 18, 15, -1,
-          16, 17, 18, 19, 20, 21, 22, 23, -1 ]
-      }
-    }
-  ]
-}
-
-DEF cube8 Transform {
-  children [
-    Shape {
-      appearance Appearance {
-        material USE corpo
-      }
-      geometry IndexedFaceSet {
-        normalPerVertex TRUE
-        coord Coordinate { point [
-          -3.99071 -2.37024 0.393596,
-          -3.96662 -2.61500 0.393596,
-          -3.99071 -2.37024 0.182602,
-          -3.96662 -2.61500 0.182602,
-          -3.99071 2.25305 0.393596,
-          -3.86211 2.45310 0.393596,
-          -3.73944 2.53214 0.393596,
-          -3.42897 2.61500 0.393596,
-          3.56451 2.61500 0.393596,
-          3.87497 2.53214 0.393596,
-          3.99765 2.45310 0.393596,
-          4.12625 2.25305 0.393596,
-          4.12625 -2.25305 0.393596,
-          3.99765 -2.45310 0.393596,
-          3.87497 -2.53214 0.393596,
-          3.56451 -2.61500 0.393596,
-          -3.99071 2.25305 0.182602,
-          -3.86211 2.45310 0.182602,
-          -3.42897 2.61500 0.182602,
-          -3.73944 2.53214 0.182602,
-          3.56451 2.61500 0.182602,
-          3.87497 2.53214 0.182602,
-          4.12625 2.25305 0.182602,
-          3.99765 2.45310 0.182602,
-          4.12625 -2.25305 0.182602,
-          3.99765 -2.45310 0.182602,
-          3.56451 -2.61500 0.182602,
-          3.87497 -2.53214 0.182602 ] }
-        coordIndex [
-          0, 1, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, -1,
-          0, 2, 3, 1, -1,
-          0, 4, 16, 2, -1,
-          1, 3, 26, 15, -1,
-          2, 16, 17, 19, 18, 20, 21, 23, 22, 24, 25, 27, 26, 3, -1,
-          4, 5, 17, 16, -1,
-          5, 6, 19, 17, -1,
-          6, 7, 18, 19, -1,
-          7, 8, 20, 18, -1,
-          8, 9, 21, 20, -1,
-          9, 10, 23, 21, -1,
-          10, 11, 22, 23, -1,
-          11, 12, 24, 22, -1,
-          12, 13, 25, 24, -1,
-          13, 14, 27, 25, -1,
-          14, 15, 26, 27, -1 ]
-        normal Normal { vector [
-          -0.893136 -4.38512e-2 0.447644,
-          -0.556683 -0.614170 0.559374,
-          -0.893136 -4.38512e-2 -0.447644,
-          -0.556683 -0.614170 -0.559374,
-          -0.850871 0.249903 0.462134,
-          -0.629830 0.629175 0.455471,
-          -0.361040 0.815919 0.451583,
-          -0.116108 0.885311 0.450269,
-          0.116108 0.885311 0.450269,
-          0.361040 0.815919 0.451583,
-          0.629830 0.629175 0.455471,
-          0.850871 0.249903 0.462134,
-          0.850871 -0.249903 0.462134,
-          0.629830 -0.629175 0.455471,
-          0.361040 -0.815919 0.451583,
-          0.116108 -0.885311 0.450269,
-          -0.850871 0.249903 -0.462134,
-          -0.629830 0.629175 -0.455471,
-          -0.116108 0.885311 -0.450269,
-          -0.361040 0.815919 -0.451583,
-          0.116108 0.885311 -0.450269,
-          0.361040 0.815919 -0.451583,
-          0.850871 0.249903 -0.462134,
-          0.629830 0.629175 -0.455471,
-          0.850871 -0.249903 -0.462134,
-          0.629830 -0.629175 -0.455471,
-          0.116108 -0.885311 -0.450269,
-          0.361040 -0.815919 -0.451583 ] }
-        normalIndex [
-          0, 1, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, -1,
-          0, 2, 3, 1, -1,
-          0, 4, 16, 2, -1,
-          1, 3, 26, 15, -1,
-          2, 16, 17, 19, 18, 20, 21, 23, 22, 24, 25, 27, 26, 3, -1,
-          4, 5, 17, 16, -1,
-          5, 6, 19, 17, -1,
-          6, 7, 18, 19, -1,
-          7, 8, 20, 18, -1,
-          8, 9, 21, 20, -1,
-          9, 10, 23, 21, -1,
-          10, 11, 22, 23, -1,
-          11, 12, 24, 22, -1,
-          12, 13, 25, 24, -1,
-          13, 14, 27, 25, -1,
-          14, 15, 26, 27, -1 ]
-      }
-    }
-  ]
-}
-
-DEF torus1_sep7 Transform {
-  children [
-    Shape {
-      appearance Appearance {
-        material USE pins
-      }
-      geometry IndexedFaceSet {
-        normalPerVertex TRUE
-        coord Coordinate { point [
-          3.18174 -1.49841 0.799496,
-          3.16580 -1.57855 0.799496,
-          3.12041 -1.64649 0.799496,
-          3.05247 -1.69189 0.799496,
-          2.97233 -1.70783 0.799496,
-          2.89219 -1.69189 0.799496,
-          2.82425 -1.64649 0.799496,
-          2.77886 -1.57855 0.799496,
-          2.76292 -1.49841 0.799496,
-          2.77886 -1.41827 0.799496,
-          2.82425 -1.35033 0.799496,
-          2.89219 -1.30494 0.799496,
-          2.97233 -1.28900 0.799496,
-          3.05247 -1.30494 0.799496,
-          3.12041 -1.35033 0.799496,
-          3.16580 -1.41827 0.799496,
-          3.18174 -1.49841 -1.03430,
-          3.16580 -1.57855 -1.03430,
-          3.12041 -1.64649 -1.03430,
-          3.05247 -1.69189 -1.03430,
-          2.97233 -1.70783 -1.03430,
-          2.89219 -1.69189 -1.03430,
-          2.82425 -1.64649 -1.03430,
-          2.77886 -1.57855 -1.03430,
-          2.76292 -1.49841 -1.03430,
-          2.77886 -1.41827 -1.03430,
-          2.82425 -1.35033 -1.03430,
-          2.89219 -1.30494 -1.03430,
-          2.97233 -1.28900 -1.03430,
-          3.05247 -1.30494 -1.03430,
-          3.12041 -1.35033 -1.03430,
-          3.16580 -1.41827 -1.03430 ] }
-        coordIndex [
-          0, 1, 17, 16, -1,
-          0, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, -1,
-          0, 16, 31, 15, -1,
-          1, 2, 18, 17, -1,
-          2, 3, 19, 18, -1,
-          3, 4, 20, 19, -1,
-          4, 5, 21, 20, -1,
-          5, 6, 22, 21, -1,
-          6, 7, 23, 22, -1,
-          7, 8, 24, 23, -1,
-          8, 9, 25, 24, -1,
-          9, 10, 26, 25, -1,
-          10, 11, 27, 26, -1,
-          11, 12, 28, 27, -1,
-          12, 13, 29, 28, -1,
-          13, 14, 30, 29, -1,
-          14, 15, 31, 30, -1,
-          16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, -1 ]
-        normal Normal { vector [
-          0.890909 4.15244e-7 0.454182,
-          0.823093 -0.340936 0.454182,
-          0.629968 -0.629968 0.454182,
-          0.340936 -0.823093 0.454182,
-          -5.04243e-17 -0.890909 0.454182,
-          -0.340936 -0.823093 0.454182,
-          -0.629968 -0.629968 0.454182,
-          -0.823093 -0.340936 0.454182,
-          -0.890909 4.15244e-7 0.454182,
-          -0.823093 0.340937 0.454181,
-          -0.629968 0.629968 0.454181,
-          -0.340936 0.823093 0.454181,
-          -5.04243e-17 0.890909 0.454181,
-          0.340936 0.823093 0.454181,
-          0.629968 0.629968 0.454181,
-          0.823093 0.340937 0.454181,
-          0.890909 -4.15244e-7 -0.454182,
-          0.823093 -0.340937 -0.454181,
-          0.629968 -0.629968 -0.454181,
-          0.340936 -0.823093 -0.454181,
-          -8.82425e-17 -0.890909 -0.454181,
-          -0.340936 -0.823093 -0.454181,
-          -0.629968 -0.629968 -0.454181,
-          -0.823093 -0.340937 -0.454181,
-          -0.890909 -4.15244e-7 -0.454182,
-          -0.823093 0.340936 -0.454182,
-          -0.629968 0.629968 -0.454182,
-          -0.340936 0.823093 -0.454182,
-          -8.82425e-17 0.890909 -0.454182,
-          0.340936 0.823093 -0.454182,
-          0.629968 0.629968 -0.454182,
-          0.823093 0.340936 -0.454182 ] }
-        normalIndex [
-          0, 1, 17, 16, -1,
-          0, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, -1,
-          0, 16, 31, 15, -1,
-          1, 2, 18, 17, -1,
-          2, 3, 19, 18, -1,
-          3, 4, 20, 19, -1,
-          4, 5, 21, 20, -1,
-          5, 6, 22, 21, -1,
-          6, 7, 23, 22, -1,
-          7, 8, 24, 23, -1,
-          8, 9, 25, 24, -1,
-          9, 10, 26, 25, -1,
-          10, 11, 27, 26, -1,
-          11, 12, 28, 27, -1,
-          12, 13, 29, 28, -1,
-          13, 14, 30, 29, -1,
-          14, 15, 31, 30, -1,
-          16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, -1 ]
-      }
-    }
-  ]
-}
-
-DEF torus1_sep6 Transform {
-  children [
-    Shape {
-      appearance Appearance {
-        material USE pins
-      }
-      geometry IndexedFaceSet {
-        normalPerVertex TRUE
-        coord Coordinate { point [
-          -2.80374 1.48360 0.799496,
-          -2.81968 1.40346 0.799496,
-          -2.86507 1.33552 0.799496,
-          -2.93301 1.29012 0.799496,
-          -3.01315 1.27418 0.799496,
-          -3.09329 1.29012 0.799496,
-          -3.16123 1.33552 0.799496,
-          -3.20662 1.40346 0.799496,
-          -3.22257 1.48360 0.799496,
-          -3.20662 1.56374 0.799496,
-          -3.16123 1.63168 0.799496,
-          -3.09329 1.67707 0.799496,
-          -3.01315 1.69301 0.799496,
-          -2.93301 1.67707 0.799496,
-          -2.86507 1.63168 0.799496,
-          -2.81968 1.56374 0.799496,
-          -2.80374 1.48360 -1.03430,
-          -2.81968 1.40346 -1.03430,
-          -2.86507 1.33552 -1.03430,
-          -2.93301 1.29012 -1.03430,
-          -3.01315 1.27418 -1.03430,
-          -3.09329 1.29012 -1.03430,
-          -3.16123 1.33552 -1.03430,
-          -3.20662 1.40346 -1.03430,
-          -3.22257 1.48360 -1.03430,
-          -3.20662 1.56374 -1.03430,
-          -3.16123 1.63168 -1.03430,
-          -3.09329 1.67707 -1.03430,
-          -3.01315 1.69301 -1.03430,
-          -2.93301 1.67707 -1.03430,
-          -2.86507 1.63168 -1.03430,
-          -2.81968 1.56374 -1.03430 ] }
-        coordIndex [
-          0, 1, 17, 16, -1,
-          0, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, -1,
-          0, 16, 31, 15, -1,
-          1, 2, 18, 17, -1,
-          2, 3, 19, 18, -1,
-          3, 4, 20, 19, -1,
-          4, 5, 21, 20, -1,
-          5, 6, 22, 21, -1,
-          6, 7, 23, 22, -1,
-          7, 8, 24, 23, -1,
-          8, 9, 25, 24, -1,
-          9, 10, 26, 25, -1,
-          10, 11, 27, 26, -1,
-          11, 12, 28, 27, -1,
-          12, 13, 29, 28, -1,
-          13, 14, 30, 29, -1,
-          14, 15, 31, 30, -1,
-          16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, -1 ]
-        normal Normal { vector [
-          0.890909 4.15244e-7 0.454182,
-          0.823093 -0.340936 0.454182,
-          0.629968 -0.629968 0.454182,
-          0.340936 -0.823093 0.454182,
-          5.92485e-16 -0.890909 0.454182,
-          -0.340936 -0.823093 0.454182,
-          -0.629968 -0.629968 0.454182,
-          -0.823093 -0.340936 0.454182,
-          -0.890909 4.15244e-7 0.454182,
-          -0.823093 0.340937 0.454181,
-          -0.629968 0.629968 0.454181,
-          -0.340936 0.823093 0.454181,
-          5.92485e-16 0.890909 0.454181,
-          0.340936 0.823093 0.454181,
-          0.629968 0.629968 0.454181,
-          0.823093 0.340937 0.454181,
-          0.890909 -4.15244e-7 -0.454182,
-          0.823093 -0.340937 -0.454181,
-          0.629968 -0.629968 -0.454181,
-          0.340936 -0.823093 -0.454181,
-          5.42061e-16 -0.890909 -0.454181,
-          -0.340936 -0.823093 -0.454181,
-          -0.629968 -0.629968 -0.454181,
-          -0.823093 -0.340937 -0.454181,
-          -0.890909 -4.15244e-7 -0.454182,
-          -0.823093 0.340936 -0.454182,
-          -0.629968 0.629968 -0.454182,
-          -0.340936 0.823093 -0.454182,
-          5.42061e-16 0.890909 -0.454182,
-          0.340936 0.823093 -0.454182,
-          0.629968 0.629968 -0.454182,
-          0.823093 0.340936 -0.454182 ] }
-        normalIndex [
-          0, 1, 17, 16, -1,
-          0, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, -1,
-          0, 16, 31, 15, -1,
-          1, 2, 18, 17, -1,
-          2, 3, 19, 18, -1,
-          3, 4, 20, 19, -1,
-          4, 5, 21, 20, -1,
-          5, 6, 22, 21, -1,
-          6, 7, 23, 22, -1,
-          7, 8, 24, 23, -1,
-          8, 9, 25, 24, -1,
-          9, 10, 26, 25, -1,
-          10, 11, 27, 26, -1,
-          11, 12, 28, 27, -1,
-          12, 13, 29, 28, -1,
-          13, 14, 30, 29, -1,
-          14, 15, 31, 30, -1,
-          16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, -1 ]
-      }
-    }
-  ]
-}
-
--- a/modules/packages3d/Oscillators.3dshapes/KXO-200_LargePads.wings
+++ b/modules/packages3d/Oscillators.3dshapes/KXO-200_LargePads.wings
--- a/modules/packages3d/Oscillators.3dshapes/KXO-200_LargePads.wrl
+++ b/modules/packages3d/Oscillators.3dshapes/KXO-200_LargePads.wrl
@ -1,690 +0,0 @@
-#VRML V2.0 utf8
-#Exported from Wings 3D 0.98.31
-DEF torus1_copy6 Transform {
-  children [
-    Shape {
-      appearance Appearance {
-        material DEF pins Material {
-          diffuseColor 0.826667 0.826667 0.826667
-          emissiveColor 0.00000e+0 0.00000e+0 0.00000e+0
-          specularColor 1.00000 1.00000 1.00000
-          ambientIntensity 1.00000
-          transparency 0.00000e+0
-          shininess 1.00000
-        }
-      }
-      geometry IndexedFaceSet {
-        normalPerVertex TRUE
-        coord Coordinate { point [
-          3.18600 1.48969 0.799496,
-          3.17005 1.40955 0.799496,
-          3.12466 1.34161 0.799496,
-          3.05672 1.29621 0.799496,
-          2.97658 1.28027 0.799496,
-          2.89644 1.29621 0.799496,
-          2.82850 1.34161 0.799496,
-          2.78311 1.40955 0.799496,
-          2.76717 1.48969 0.799496,
-          2.78311 1.56983 0.799496,
-          2.82850 1.63776 0.799496,
-          2.89644 1.68316 0.799496,
-          2.97658 1.69910 0.799496,
-          3.05672 1.68316 0.799496,
-          3.12466 1.63776 0.799496,
-          3.17005 1.56983 0.799496,
-          3.18600 1.48969 -1.03430,
-          3.17005 1.40955 -1.03430,
-          3.12466 1.34161 -1.03430,
-          3.05672 1.29621 -1.03430,
-          2.97658 1.28027 -1.03430,
-          2.89644 1.29621 -1.03430,
-          2.82850 1.34161 -1.03430,
-          2.78311 1.40955 -1.03430,
-          2.76717 1.48969 -1.03430,
-          2.78311 1.56983 -1.03430,
-          2.82850 1.63776 -1.03430,
-          2.89644 1.68316 -1.03430,
-          2.97658 1.69910 -1.03430,
-          3.05672 1.68316 -1.03430,
-          3.12466 1.63776 -1.03430,
-          3.17005 1.56983 -1.03430 ] }
-        coordIndex [
-          0, 1, 17, 16, -1,
-          0, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, -1,
-          0, 16, 31, 15, -1,
-          1, 2, 18, 17, -1,
-          2, 3, 19, 18, -1,
-          3, 4, 20, 19, -1,
-          4, 5, 21, 20, -1,
-          5, 6, 22, 21, -1,
-          6, 7, 23, 22, -1,
-          7, 8, 24, 23, -1,
-          8, 9, 25, 24, -1,
-          9, 10, 26, 25, -1,
-          10, 11, 27, 26, -1,
-          11, 12, 28, 27, -1,
-          12, 13, 29, 28, -1,
-          13, 14, 30, 29, -1,
-          14, 15, 31, 30, -1,
-          16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, -1 ]
-        normal Normal { vector [
-          0.890909 4.15244e-7 0.454182,
-          0.823093 -0.340936 0.454182,
-          0.629968 -0.629968 0.454182,
-          0.340936 -0.823093 0.454182,
-          -5.04243e-17 -0.890909 0.454182,
-          -0.340936 -0.823093 0.454182,
-          -0.629968 -0.629968 0.454182,
-          -0.823093 -0.340936 0.454182,
-          -0.890909 4.15244e-7 0.454182,
-          -0.823093 0.340937 0.454181,
-          -0.629968 0.629968 0.454181,
-          -0.340936 0.823093 0.454181,
-          -5.04243e-17 0.890909 0.454181,
-          0.340936 0.823093 0.454181,
-          0.629968 0.629968 0.454181,
-          0.823093 0.340937 0.454181,
-          0.890909 -4.15244e-7 -0.454182,
-          0.823093 -0.340937 -0.454181,
-          0.629968 -0.629968 -0.454181,
-          0.340936 -0.823093 -0.454181,
-          5.04243e-17 -0.890909 -0.454181,
-          -0.340936 -0.823093 -0.454181,
-          -0.629968 -0.629968 -0.454181,
-          -0.823093 -0.340937 -0.454181,
-          -0.890909 -4.15244e-7 -0.454182,
-          -0.823093 0.340936 -0.454182,
-          -0.629968 0.629968 -0.454182,
-          -0.340936 0.823093 -0.454182,
-          5.04243e-17 0.890909 -0.454182,
-          0.340936 0.823093 -0.454182,
-          0.629968 0.629968 -0.454182,
-          0.823093 0.340936 -0.454182 ] }
-        normalIndex [
-          0, 1, 17, 16, -1,
-          0, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, -1,
-          0, 16, 31, 15, -1,
-          1, 2, 18, 17, -1,
-          2, 3, 19, 18, -1,
-          3, 4, 20, 19, -1,
-          4, 5, 21, 20, -1,
-          5, 6, 22, 21, -1,
-          6, 7, 23, 22, -1,
-          7, 8, 24, 23, -1,
-          8, 9, 25, 24, -1,
-          9, 10, 26, 25, -1,
-          10, 11, 27, 26, -1,
-          11, 12, 28, 27, -1,
-          12, 13, 29, 28, -1,
-          13, 14, 30, 29, -1,
-          14, 15, 31, 30, -1,
-          16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, -1 ]
-      }
-    }
-  ]
-}
-
-DEF torus1_copy5 Transform {
-  children [
-    Shape {
-      appearance Appearance {
-        material USE pins
-      }
-      geometry IndexedFaceSet {
-        normalPerVertex TRUE
-        coord Coordinate { point [
-          -2.79175 -1.50044 0.799496,
-          -2.80769 -1.58058 0.799496,
-          -2.85309 -1.64852 0.799496,
-          -2.92103 -1.69392 0.799496,
-          -3.00117 -1.70986 0.799496,
-          -3.08131 -1.69392 0.799496,
-          -3.14925 -1.64852 0.799496,
-          -3.19464 -1.58058 0.799496,
-          -3.21058 -1.50044 0.799496,
-          -3.19464 -1.42030 0.799496,
-          -3.14925 -1.35236 0.799496,
-          -3.08131 -1.30697 0.799496,
-          -3.00117 -1.29103 0.799496,
-          -2.92103 -1.30697 0.799496,
-          -2.85309 -1.35236 0.799496,
-          -2.80769 -1.42030 0.799496,
-          -2.79175 -1.50044 -1.03430,
-          -2.80769 -1.58058 -1.03430,
-          -2.85309 -1.64852 -1.03430,
-          -2.92103 -1.69392 -1.03430,
-          -3.00117 -1.70986 -1.03430,
-          -3.08131 -1.69392 -1.03430,
-          -3.14925 -1.64852 -1.03430,
-          -3.19464 -1.58058 -1.03430,
-          -3.21058 -1.50044 -1.03430,
-          -3.19464 -1.42030 -1.03430,
-          -3.14925 -1.35236 -1.03430,
-          -3.08131 -1.30697 -1.03430,
-          -3.00117 -1.29103 -1.03430,
-          -2.92103 -1.30697 -1.03430,
-          -2.85309 -1.35236 -1.03430,
-          -2.80769 -1.42030 -1.03430 ] }
-        coordIndex [
-          0, 1, 17, 16, -1,
-          0, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, -1,
-          0, 16, 31, 15, -1,
-          1, 2, 18, 17, -1,
-          2, 3, 19, 18, -1,
-          3, 4, 20, 19, -1,
-          4, 5, 21, 20, -1,
-          5, 6, 22, 21, -1,
-          6, 7, 23, 22, -1,
-          7, 8, 24, 23, -1,
-          8, 9, 25, 24, -1,
-          9, 10, 26, 25, -1,
-          10, 11, 27, 26, -1,
-          11, 12, 28, 27, -1,
-          12, 13, 29, 28, -1,
-          13, 14, 30, 29, -1,
-          14, 15, 31, 30, -1,
-          16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, -1 ]
-        normal Normal { vector [
-          0.890909 4.15244e-7 0.454182,
-          0.823093 -0.340936 0.454182,
-          0.629968 -0.629968 0.454182,
-          0.340936 -0.823093 0.454182,
-          -8.82425e-16 -0.890909 0.454182,
-          -0.340936 -0.823093 0.454182,
-          -0.629968 -0.629968 0.454182,
-          -0.823093 -0.340936 0.454182,
-          -0.890909 4.15244e-7 0.454182,
-          -0.823093 0.340937 0.454181,
-          -0.629968 0.629968 0.454181,
-          -0.340936 0.823093 0.454181,
-          -9.07637e-16 0.890909 0.454181,
-          0.340936 0.823093 0.454181,
-          0.629968 0.629968 0.454181,
-          0.823093 0.340937 0.454181,
-          0.890909 -4.15244e-7 -0.454182,
-          0.823093 -0.340937 -0.454181,
-          0.629968 -0.629968 -0.454181,
-          0.340936 -0.823093 -0.454181,
-          -1.02109e-15 -0.890909 -0.454181,
-          -0.340936 -0.823093 -0.454181,
-          -0.629968 -0.629968 -0.454181,
-          -0.823093 -0.340937 -0.454181,
-          -0.890909 -4.15244e-7 -0.454182,
-          -0.823093 0.340936 -0.454182,
-          -0.629968 0.629968 -0.454182,
-          -0.340936 0.823093 -0.454182,
-          -1.04630e-15 0.890909 -0.454182,
-          0.340936 0.823093 -0.454182,
-          0.629968 0.629968 -0.454182,
-          0.823093 0.340936 -0.454182 ] }
-        normalIndex [
-          0, 1, 17, 16, -1,
-          0, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, -1,
-          0, 16, 31, 15, -1,
-          1, 2, 18, 17, -1,
-          2, 3, 19, 18, -1,
-          3, 4, 20, 19, -1,
-          4, 5, 21, 20, -1,
-          5, 6, 22, 21, -1,
-          6, 7, 23, 22, -1,
-          7, 8, 24, 23, -1,
-          8, 9, 25, 24, -1,
-          9, 10, 26, 25, -1,
-          10, 11, 27, 26, -1,
-          11, 12, 28, 27, -1,
-          12, 13, 29, 28, -1,
-          13, 14, 30, 29, -1,
-          14, 15, 31, 30, -1,
-          16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, -1 ]
-      }
-    }
-  ]
-}
-
-DEF cube8_copy9 Transform {
-  children [
-    Shape {
-      appearance Appearance {
-        material DEF corpo Material {
-          diffuseColor 0.913420 0.913420 0.913420
-          emissiveColor 0.840160 0.840160 0.840160
-          specularColor 0.866800 0.866800 0.866800
-          ambientIntensity 0.900100
-          transparency 0.00000e+0
-          shininess 1.00000
-        }
-      }
-      geometry IndexedFaceSet {
-        normalPerVertex TRUE
-        coord Coordinate { point [
-          -3.63059 -2.26600 0.336464,
-          -3.26742 -2.50000 0.336464,
-          -3.63059 2.26600 0.336464,
-          -3.26742 2.50000 0.336464,
-          3.76624 2.50000 0.336464,
-          4.12941 2.26600 0.336464,
-          4.12941 -2.26600 0.336464,
-          3.76624 -2.50000 0.336464,
-          -3.63059 -2.26600 1.77860,
-          -3.26742 -2.50000 1.77860,
-          -3.63059 2.26600 1.77860,
-          -3.26742 2.50000 1.77860,
-          3.76624 2.50000 1.77860,
-          4.12941 2.26600 1.77860,
-          4.12941 -2.26600 1.77860,
-          3.76624 -2.50000 1.77860,
-          -3.30964 -2.18034 1.98540,
-          -3.13448 -2.29320 1.98540,
-          3.63330 -2.29320 1.98540,
-          3.80846 -2.18034 1.98540,
-          3.80846 2.18034 1.98540,
-          3.63330 2.29320 1.98540,
-          -3.13448 2.29320 1.98540,
-          -3.30964 2.18034 1.98540 ] }
-        coordIndex [
-          0, 1, 9, 8, -1,
-          0, 2, 3, 4, 5, 6, 7, 1, -1,
-          0, 8, 10, 2, -1,
-          1, 7, 15, 9, -1,
-          2, 10, 11, 3, -1,
-          3, 11, 12, 4, -1,
-          4, 12, 13, 5, -1,
-          5, 13, 14, 6, -1,
-          6, 14, 15, 7, -1,
-          8, 9, 17, 16, -1,
-          8, 16, 23, 10, -1,
-          9, 15, 18, 17, -1,
-          10, 23, 22, 11, -1,
-          11, 22, 21, 12, -1,
-          12, 21, 20, 13, -1,
-          13, 20, 19, 14, -1,
-          14, 19, 18, 15, -1,
-          16, 17, 18, 19, 20, 21, 22, 23, -1 ]
-        normal Normal { vector [
-          -0.762917 -0.416000 -0.494876,
-          -0.250337 -0.850713 -0.462189,
-          -0.762917 0.416000 -0.494876,
-          -0.250337 0.850713 -0.462189,
-          0.250337 0.850713 -0.462189,
-          0.762917 0.416000 -0.494876,
-          0.762917 -0.416000 -0.494876,
-          0.250337 -0.850713 -0.462189,
-          -0.754025 -0.428411 0.497906,
-          -0.251799 -0.873606 0.416424,
-          -0.754025 0.428411 0.497906,
-          -0.251799 0.873606 0.416424,
-          0.251799 0.873606 0.416424,
-          0.754025 0.428411 0.497906,
-          0.754025 -0.428411 0.497906,
-          0.251799 -0.873606 0.416424,
-          -0.317234 -0.192815 0.928539,
-          -0.124903 -0.447160 0.885690,
-          0.124903 -0.447160 0.885690,
-          0.317234 -0.192815 0.928539,
-          0.317234 0.192815 0.928539,
-          0.124903 0.447160 0.885690,
-          -0.124903 0.447160 0.885690,
-          -0.317234 0.192815 0.928539 ] }
-        normalIndex [
-          0, 1, 9, 8, -1,
-          0, 2, 3, 4, 5, 6, 7, 1, -1,
-          0, 8, 10, 2, -1,
-          1, 7, 15, 9, -1,
-          2, 10, 11, 3, -1,
-          3, 11, 12, 4, -1,
-          4, 12, 13, 5, -1,
-          5, 13, 14, 6, -1,
-          6, 14, 15, 7, -1,
-          8, 9, 17, 16, -1,
-          8, 16, 23, 10, -1,
-          9, 15, 18, 17, -1,
-          10, 23, 22, 11, -1,
-          11, 22, 21, 12, -1,
-          12, 21, 20, 13, -1,
-          13, 20, 19, 14, -1,
-          14, 19, 18, 15, -1,
-          16, 17, 18, 19, 20, 21, 22, 23, -1 ]
-      }
-    }
-  ]
-}
-
-DEF cube8 Transform {
-  children [
-    Shape {
-      appearance Appearance {
-        material USE corpo
-      }
-      geometry IndexedFaceSet {
-        normalPerVertex TRUE
-        coord Coordinate { point [
-          -3.99071 -2.37024 0.393596,
-          -3.96662 -2.61500 0.393596,
-          -3.99071 -2.37024 0.182602,
-          -3.96662 -2.61500 0.182602,
-          -3.99071 2.25305 0.393596,
-          -3.86211 2.45310 0.393596,
-          -3.73944 2.53214 0.393596,
-          -3.42897 2.61500 0.393596,
-          3.56451 2.61500 0.393596,
-          3.87497 2.53214 0.393596,
-          3.99765 2.45310 0.393596,
-          4.12625 2.25305 0.393596,
-          4.12625 -2.25305 0.393596,
-          3.99765 -2.45310 0.393596,
-          3.87497 -2.53214 0.393596,
-          3.56451 -2.61500 0.393596,
-          -3.99071 2.25305 0.182602,
-          -3.86211 2.45310 0.182602,
-          -3.42897 2.61500 0.182602,
-          -3.73944 2.53214 0.182602,
-          3.56451 2.61500 0.182602,
-          3.87497 2.53214 0.182602,
-          4.12625 2.25305 0.182602,
-          3.99765 2.45310 0.182602,
-          4.12625 -2.25305 0.182602,
-          3.99765 -2.45310 0.182602,
-          3.56451 -2.61500 0.182602,
-          3.87497 -2.53214 0.182602 ] }
-        coordIndex [
-          0, 1, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, -1,
-          0, 2, 3, 1, -1,
-          0, 4, 16, 2, -1,
-          1, 3, 26, 15, -1,
-          2, 16, 17, 19, 18, 20, 21, 23, 22, 24, 25, 27, 26, 3, -1,
-          4, 5, 17, 16, -1,
-          5, 6, 19, 17, -1,
-          6, 7, 18, 19, -1,
-          7, 8, 20, 18, -1,
-          8, 9, 21, 20, -1,
-          9, 10, 23, 21, -1,
-          10, 11, 22, 23, -1,
-          11, 12, 24, 22, -1,
-          12, 13, 25, 24, -1,
-          13, 14, 27, 25, -1,
-          14, 15, 26, 27, -1 ]
-        normal Normal { vector [
-          -0.893136 -4.38512e-2 0.447644,
-          -0.556683 -0.614170 0.559374,
-          -0.893136 -4.38512e-2 -0.447644,
-          -0.556683 -0.614170 -0.559374,
-          -0.850871 0.249903 0.462134,
-          -0.629830 0.629175 0.455471,
-          -0.361040 0.815919 0.451583,
-          -0.116108 0.885311 0.450269,
-          0.116108 0.885311 0.450269,
-          0.361040 0.815919 0.451583,
-          0.629830 0.629175 0.455471,
-          0.850871 0.249903 0.462134,
-          0.850871 -0.249903 0.462134,
-          0.629830 -0.629175 0.455471,
-          0.361040 -0.815919 0.451583,
-          0.116108 -0.885311 0.450269,
-          -0.850871 0.249903 -0.462134,
-          -0.629830 0.629175 -0.455471,
-          -0.116108 0.885311 -0.450269,
-          -0.361040 0.815919 -0.451583,
-          0.116108 0.885311 -0.450269,
-          0.361040 0.815919 -0.451583,
-          0.850871 0.249903 -0.462134,
-          0.629830 0.629175 -0.455471,
-          0.850871 -0.249903 -0.462134,
-          0.629830 -0.629175 -0.455471,
-          0.116108 -0.885311 -0.450269,
-          0.361040 -0.815919 -0.451583 ] }
-        normalIndex [
-          0, 1, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, -1,
-          0, 2, 3, 1, -1,
-          0, 4, 16, 2, -1,
-          1, 3, 26, 15, -1,
-          2, 16, 17, 19, 18, 20, 21, 23, 22, 24, 25, 27, 26, 3, -1,
-          4, 5, 17, 16, -1,
-          5, 6, 19, 17, -1,
-          6, 7, 18, 19, -1,
-          7, 8, 20, 18, -1,
-          8, 9, 21, 20, -1,
-          9, 10, 23, 21, -1,
-          10, 11, 22, 23, -1,
-          11, 12, 24, 22, -1,
-          12, 13, 25, 24, -1,
-          13, 14, 27, 25, -1,
-          14, 15, 26, 27, -1 ]
-      }
-    }
-  ]
-}
-
-DEF torus1_sep7 Transform {
-  children [
-    Shape {
-      appearance Appearance {
-        material USE pins
-      }
-      geometry IndexedFaceSet {
-        normalPerVertex TRUE
-        coord Coordinate { point [
-          3.18174 -1.49841 0.799496,
-          3.16580 -1.57855 0.799496,
-          3.12041 -1.64649 0.799496,
-          3.05247 -1.69189 0.799496,
-          2.97233 -1.70783 0.799496,
-          2.89219 -1.69189 0.799496,
-          2.82425 -1.64649 0.799496,
-          2.77886 -1.57855 0.799496,
-          2.76292 -1.49841 0.799496,
-          2.77886 -1.41827 0.799496,
-          2.82425 -1.35033 0.799496,
-          2.89219 -1.30494 0.799496,
-          2.97233 -1.28900 0.799496,
-          3.05247 -1.30494 0.799496,
-          3.12041 -1.35033 0.799496,
-          3.16580 -1.41827 0.799496,
-          3.18174 -1.49841 -1.03430,
-          3.16580 -1.57855 -1.03430,
-          3.12041 -1.64649 -1.03430,
-          3.05247 -1.69189 -1.03430,
-          2.97233 -1.70783 -1.03430,
-          2.89219 -1.69189 -1.03430,
-          2.82425 -1.64649 -1.03430,
-          2.77886 -1.57855 -1.03430,
-          2.76292 -1.49841 -1.03430,
-          2.77886 -1.41827 -1.03430,
-          2.82425 -1.35033 -1.03430,
-          2.89219 -1.30494 -1.03430,
-          2.97233 -1.28900 -1.03430,
-          3.05247 -1.30494 -1.03430,
-          3.12041 -1.35033 -1.03430,
-          3.16580 -1.41827 -1.03430 ] }
-        coordIndex [
-          0, 1, 17, 16, -1,
-          0, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, -1,
-          0, 16, 31, 15, -1,
-          1, 2, 18, 17, -1,
-          2, 3, 19, 18, -1,
-          3, 4, 20, 19, -1,
-          4, 5, 21, 20, -1,
-          5, 6, 22, 21, -1,
-          6, 7, 23, 22, -1,
-          7, 8, 24, 23, -1,
-          8, 9, 25, 24, -1,
-          9, 10, 26, 25, -1,
-          10, 11, 27, 26, -1,
-          11, 12, 28, 27, -1,
-          12, 13, 29, 28, -1,
-          13, 14, 30, 29, -1,
-          14, 15, 31, 30, -1,
-          16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, -1 ]
-        normal Normal { vector [
-          0.890909 4.15244e-7 0.454182,
-          0.823093 -0.340936 0.454182,
-          0.629968 -0.629968 0.454182,
-          0.340936 -0.823093 0.454182,
-          -5.04243e-17 -0.890909 0.454182,
-          -0.340936 -0.823093 0.454182,
-          -0.629968 -0.629968 0.454182,
-          -0.823093 -0.340936 0.454182,
-          -0.890909 4.15244e-7 0.454182,
-          -0.823093 0.340937 0.454181,
-          -0.629968 0.629968 0.454181,
-          -0.340936 0.823093 0.454181,
-          -5.04243e-17 0.890909 0.454181,
-          0.340936 0.823093 0.454181,
-          0.629968 0.629968 0.454181,
-          0.823093 0.340937 0.454181,
-          0.890909 -4.15244e-7 -0.454182,
-          0.823093 -0.340937 -0.454181,
-          0.629968 -0.629968 -0.454181,
-          0.340936 -0.823093 -0.454181,
-          -8.82425e-17 -0.890909 -0.454181,
-          -0.340936 -0.823093 -0.454181,
-          -0.629968 -0.629968 -0.454181,
-          -0.823093 -0.340937 -0.454181,
-          -0.890909 -4.15244e-7 -0.454182,
-          -0.823093 0.340936 -0.454182,
-          -0.629968 0.629968 -0.454182,
-          -0.340936 0.823093 -0.454182,
-          -8.82425e-17 0.890909 -0.454182,
-          0.340936 0.823093 -0.454182,
-          0.629968 0.629968 -0.454182,
-          0.823093 0.340936 -0.454182 ] }
-        normalIndex [
-          0, 1, 17, 16, -1,
-          0, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, -1,
-          0, 16, 31, 15, -1,
-          1, 2, 18, 17, -1,
-          2, 3, 19, 18, -1,
-          3, 4, 20, 19, -1,
-          4, 5, 21, 20, -1,
-          5, 6, 22, 21, -1,
-          6, 7, 23, 22, -1,
-          7, 8, 24, 23, -1,
-          8, 9, 25, 24, -1,
-          9, 10, 26, 25, -1,
-          10, 11, 27, 26, -1,
-          11, 12, 28, 27, -1,
-          12, 13, 29, 28, -1,
-          13, 14, 30, 29, -1,
-          14, 15, 31, 30, -1,
-          16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, -1 ]
-      }
-    }
-  ]
-}
-
-DEF torus1_sep6 Transform {
-  children [
-    Shape {
-      appearance Appearance {
-        material USE pins
-      }
-      geometry IndexedFaceSet {
-        normalPerVertex TRUE
-        coord Coordinate { point [
-          -2.80374 1.48360 0.799496,
-          -2.81968 1.40346 0.799496,
-          -2.86507 1.33552 0.799496,
-          -2.93301 1.29012 0.799496,
-          -3.01315 1.27418 0.799496,
-          -3.09329 1.29012 0.799496,
-          -3.16123 1.33552 0.799496,
-          -3.20662 1.40346 0.799496,
-          -3.22257 1.48360 0.799496,
-          -3.20662 1.56374 0.799496,
-          -3.16123 1.63168 0.799496,
-          -3.09329 1.67707 0.799496,
-          -3.01315 1.69301 0.799496,
-          -2.93301 1.67707 0.799496,
-          -2.86507 1.63168 0.799496,
-          -2.81968 1.56374 0.799496,
-          -2.80374 1.48360 -1.03430,
-          -2.81968 1.40346 -1.03430,
-          -2.86507 1.33552 -1.03430,
-          -2.93301 1.29012 -1.03430,
-          -3.01315 1.27418 -1.03430,
-          -3.09329 1.29012 -1.03430,
-          -3.16123 1.33552 -1.03430,
-          -3.20662 1.40346 -1.03430,
-          -3.22257 1.48360 -1.03430,
-          -3.20662 1.56374 -1.03430,
-          -3.16123 1.63168 -1.03430,
-          -3.09329 1.67707 -1.03430,
-          -3.01315 1.69301 -1.03430,
-          -2.93301 1.67707 -1.03430,
-          -2.86507 1.63168 -1.03430,
-          -2.81968 1.56374 -1.03430 ] }
-        coordIndex [
-          0, 1, 17, 16, -1,
-          0, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, -1,
-          0, 16, 31, 15, -1,
-          1, 2, 18, 17, -1,
-          2, 3, 19, 18, -1,
-          3, 4, 20, 19, -1,
-          4, 5, 21, 20, -1,
-          5, 6, 22, 21, -1,
-          6, 7, 23, 22, -1,
-          7, 8, 24, 23, -1,
-          8, 9, 25, 24, -1,
-          9, 10, 26, 25, -1,
-          10, 11, 27, 26, -1,
-          11, 12, 28, 27, -1,
-          12, 13, 29, 28, -1,
-          13, 14, 30, 29, -1,
-          14, 15, 31, 30, -1,
-          16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, -1 ]
-        normal Normal { vector [
-          0.890909 4.15244e-7 0.454182,
-          0.823093 -0.340936 0.454182,
-          0.629968 -0.629968 0.454182,
-          0.340936 -0.823093 0.454182,
-          5.92485e-16 -0.890909 0.454182,
-          -0.340936 -0.823093 0.454182,
-          -0.629968 -0.629968 0.454182,
-          -0.823093 -0.340936 0.454182,
-          -0.890909 4.15244e-7 0.454182,
-          -0.823093 0.340937 0.454181,
-          -0.629968 0.629968 0.454181,
-          -0.340936 0.823093 0.454181,
-          5.92485e-16 0.890909 0.454181,
-          0.340936 0.823093 0.454181,
-          0.629968 0.629968 0.454181,
-          0.823093 0.340937 0.454181,
-          0.890909 -4.15244e-7 -0.454182,
-          0.823093 -0.340937 -0.454181,
-          0.629968 -0.629968 -0.454181,
-          0.340936 -0.823093 -0.454181,
-          5.42061e-16 -0.890909 -0.454181,
-          -0.340936 -0.823093 -0.454181,
-          -0.629968 -0.629968 -0.454181,
-          -0.823093 -0.340937 -0.454181,
-          -0.890909 -4.15244e-7 -0.454182,
-          -0.823093 0.340936 -0.454182,
-          -0.629968 0.629968 -0.454182,
-          -0.340936 0.823093 -0.454182,
-          5.42061e-16 0.890909 -0.454182,
-          0.340936 0.823093 -0.454182,
-          0.629968 0.629968 -0.454182,
-          0.823093 0.340936 -0.454182 ] }
-        normalIndex [
-          0, 1, 17, 16, -1,
-          0, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, -1,
-          0, 16, 31, 15, -1,
-          1, 2, 18, 17, -1,
-          2, 3, 19, 18, -1,
-          3, 4, 20, 19, -1,
-          4, 5, 21, 20, -1,
-          5, 6, 22, 21, -1,
-          6, 7, 23, 22, -1,
-          7, 8, 24, 23, -1,
-          8, 9, 25, 24, -1,
-          9, 10, 26, 25, -1,
-          10, 11, 27, 26, -1,
-          11, 12, 28, 27, -1,
-          12, 13, 29, 28, -1,
-          13, 14, 30, 29, -1,
-          14, 15, 31, 30, -1,
-          16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, -1 ]
-      }
-    }
-  ]
-}
-
--- a/modules/packages3d/Oscillators.3dshapes/OSC_DIP8.wings
+++ b/modules/packages3d/Oscillators.3dshapes/OSC_DIP8.wings
--- a/modules/packages3d/Oscillators.3dshapes/OSC_DIP8.wrl
+++ b/modules/packages3d/Oscillators.3dshapes/OSC_DIP8.wrl
@ -1,690 +0,0 @@
-#VRML V2.0 utf8
-#Exported from Wings 3D 0.98.31
-DEF torus1_copy6 Transform {
-  children [
-    Shape {
-      appearance Appearance {
-        material DEF pins Material {
-          diffuseColor 0.826667 0.826667 0.826667
-          emissiveColor 0.00000e+0 0.00000e+0 0.00000e+0
-          specularColor 1.00000 1.00000 1.00000
-          ambientIntensity 1.00000
-          transparency 0.00000e+0
-          shininess 1.00000
-        }
-      }
-      geometry IndexedFaceSet {
-        normalPerVertex TRUE
-        coord Coordinate { point [
-          1.72071 1.48969 0.799496,
-          1.70477 1.40955 0.799496,
-          1.65938 1.34161 0.799496,
-          1.59144 1.29621 0.799496,
-          1.51130 1.28027 0.799496,
-          1.43116 1.29621 0.799496,
-          1.36322 1.34161 0.799496,
-          1.31782 1.40955 0.799496,
-          1.30188 1.48969 0.799496,
-          1.31782 1.56983 0.799496,
-          1.36322 1.63776 0.799496,
-          1.43116 1.68316 0.799496,
-          1.51130 1.69910 0.799496,
-          1.59144 1.68316 0.799496,
-          1.65938 1.63776 0.799496,
-          1.70477 1.56983 0.799496,
-          1.72071 1.48969 -1.03430,
-          1.70477 1.40955 -1.03430,
-          1.65938 1.34161 -1.03430,
-          1.59144 1.29621 -1.03430,
-          1.51130 1.28027 -1.03430,
-          1.43116 1.29621 -1.03430,
-          1.36322 1.34161 -1.03430,
-          1.31782 1.40955 -1.03430,
-          1.30188 1.48969 -1.03430,
-          1.31782 1.56983 -1.03430,
-          1.36322 1.63776 -1.03430,
-          1.43116 1.68316 -1.03430,
-          1.51130 1.69910 -1.03430,
-          1.59144 1.68316 -1.03430,
-          1.65938 1.63776 -1.03430,
-          1.70477 1.56983 -1.03430 ] }
-        coordIndex [
-          0, 1, 17, 16, -1,
-          0, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, -1,
-          0, 16, 31, 15, -1,
-          1, 2, 18, 17, -1,
-          2, 3, 19, 18, -1,
-          3, 4, 20, 19, -1,
-          4, 5, 21, 20, -1,
-          5, 6, 22, 21, -1,
-          6, 7, 23, 22, -1,
-          7, 8, 24, 23, -1,
-          8, 9, 25, 24, -1,
-          9, 10, 26, 25, -1,
-          10, 11, 27, 26, -1,
-          11, 12, 28, 27, -1,
-          12, 13, 29, 28, -1,
-          13, 14, 30, 29, -1,
-          14, 15, 31, 30, -1,
-          16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, -1 ]
-        normal Normal { vector [
-          0.890909 4.15244e-7 0.454182,
-          0.823093 -0.340936 0.454182,
-          0.629968 -0.629968 0.454182,
-          0.340936 -0.823093 0.454182,
-          4.03394e-16 -0.890909 0.454182,
-          -0.340936 -0.823093 0.454182,
-          -0.629968 -0.629968 0.454182,
-          -0.823093 -0.340936 0.454182,
-          -0.890909 4.15244e-7 0.454182,
-          -0.823093 0.340937 0.454181,
-          -0.629968 0.629968 0.454181,
-          -0.340936 0.823093 0.454181,
-          4.28606e-16 0.890909 0.454181,
-          0.340936 0.823093 0.454181,
-          0.629968 0.629968 0.454181,
-          0.823093 0.340937 0.454181,
-          0.890909 -4.15244e-7 -0.454182,
-          0.823093 -0.340937 -0.454181,
-          0.629968 -0.629968 -0.454181,
-          0.340936 -0.823093 -0.454181,
-          5.04243e-16 -0.890909 -0.454181,
-          -0.340936 -0.823093 -0.454181,
-          -0.629968 -0.629968 -0.454181,
-          -0.823093 -0.340937 -0.454181,
-          -0.890909 -4.15244e-7 -0.454182,
-          -0.823093 0.340936 -0.454182,
-          -0.629968 0.629968 -0.454182,
-          -0.340936 0.823093 -0.454182,
-          5.29455e-16 0.890909 -0.454182,
-          0.340936 0.823093 -0.454182,
-          0.629968 0.629968 -0.454182,
-          0.823093 0.340936 -0.454182 ] }
-        normalIndex [
-          0, 1, 17, 16, -1,
-          0, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, -1,
-          0, 16, 31, 15, -1,
-          1, 2, 18, 17, -1,
-          2, 3, 19, 18, -1,
-          3, 4, 20, 19, -1,
-          4, 5, 21, 20, -1,
-          5, 6, 22, 21, -1,
-          6, 7, 23, 22, -1,
-          7, 8, 24, 23, -1,
-          8, 9, 25, 24, -1,
-          9, 10, 26, 25, -1,
-          10, 11, 27, 26, -1,
-          11, 12, 28, 27, -1,
-          12, 13, 29, 28, -1,
-          13, 14, 30, 29, -1,
-          14, 15, 31, 30, -1,
-          16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, -1 ]
-      }
-    }
-  ]
-}
-
-DEF torus1_copy5 Transform {
-  children [
-    Shape {
-      appearance Appearance {
-        material USE pins
-      }
-      geometry IndexedFaceSet {
-        normalPerVertex TRUE
-        coord Coordinate { point [
-          -1.27262 -1.50044 0.799496,
-          -1.28856 -1.58058 0.799496,
-          -1.33396 -1.64852 0.799496,
-          -1.40190 -1.69392 0.799496,
-          -1.48204 -1.70986 0.799496,
-          -1.56217 -1.69392 0.799496,
-          -1.63011 -1.64852 0.799496,
-          -1.67551 -1.58058 0.799496,
-          -1.69145 -1.50044 0.799496,
-          -1.67551 -1.42030 0.799496,
-          -1.63011 -1.35236 0.799496,
-          -1.56217 -1.30697 0.799496,
-          -1.48204 -1.29103 0.799496,
-          -1.40190 -1.30697 0.799496,
-          -1.33396 -1.35236 0.799496,
-          -1.28856 -1.42030 0.799496,
-          -1.27262 -1.50044 -1.03430,
-          -1.28856 -1.58058 -1.03430,
-          -1.33396 -1.64852 -1.03430,
-          -1.40190 -1.69392 -1.03430,
-          -1.48204 -1.70986 -1.03430,
-          -1.56217 -1.69392 -1.03430,
-          -1.63011 -1.64852 -1.03430,
-          -1.67551 -1.58058 -1.03430,
-          -1.69145 -1.50044 -1.03430,
-          -1.67551 -1.42030 -1.03430,
-          -1.63011 -1.35236 -1.03430,
-          -1.56217 -1.30697 -1.03430,
-          -1.48204 -1.29103 -1.03430,
-          -1.40190 -1.30697 -1.03430,
-          -1.33396 -1.35236 -1.03430,
-          -1.28856 -1.42030 -1.03430 ] }
-        coordIndex [
-          0, 1, 17, 16, -1,
-          0, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, -1,
-          0, 16, 31, 15, -1,
-          1, 2, 18, 17, -1,
-          2, 3, 19, 18, -1,
-          3, 4, 20, 19, -1,
-          4, 5, 21, 20, -1,
-          5, 6, 22, 21, -1,
-          6, 7, 23, 22, -1,
-          7, 8, 24, 23, -1,
-          8, 9, 25, 24, -1,
-          9, 10, 26, 25, -1,
-          10, 11, 27, 26, -1,
-          11, 12, 28, 27, -1,
-          12, 13, 29, 28, -1,
-          13, 14, 30, 29, -1,
-          14, 15, 31, 30, -1,
-          16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, -1 ]
-        normal Normal { vector [
-          0.890909 4.15244e-7 0.454182,
-          0.823093 -0.340936 0.454182,
-          0.629968 -0.629968 0.454182,
-          0.340936 -0.823093 0.454182,
-          -4.28606e-16 -0.890909 0.454182,
-          -0.340936 -0.823093 0.454182,
-          -0.629968 -0.629968 0.454182,
-          -0.823093 -0.340936 0.454182,
-          -0.890909 4.15244e-7 0.454182,
-          -0.823093 0.340937 0.454181,
-          -0.629968 0.629968 0.454181,
-          -0.340936 0.823093 0.454181,
-          -4.03394e-16 0.890909 0.454181,
-          0.340936 0.823093 0.454181,
-          0.629968 0.629968 0.454181,
-          0.823093 0.340937 0.454181,
-          0.890909 -4.15244e-7 -0.454182,
-          0.823093 -0.340937 -0.454181,
-          0.629968 -0.629968 -0.454181,
-          0.340936 -0.823093 -0.454181,
-          -5.67273e-16 -0.890909 -0.454181,
-          -0.340936 -0.823093 -0.454181,
-          -0.629968 -0.629968 -0.454181,
-          -0.823093 -0.340937 -0.454181,
-          -0.890909 -4.15244e-7 -0.454182,
-          -0.823093 0.340936 -0.454182,
-          -0.629968 0.629968 -0.454182,
-          -0.340936 0.823093 -0.454182,
-          -5.42061e-16 0.890909 -0.454182,
-          0.340936 0.823093 -0.454182,
-          0.629968 0.629968 -0.454182,
-          0.823093 0.340936 -0.454182 ] }
-        normalIndex [
-          0, 1, 17, 16, -1,
-          0, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, -1,
-          0, 16, 31, 15, -1,
-          1, 2, 18, 17, -1,
-          2, 3, 19, 18, -1,
-          3, 4, 20, 19, -1,
-          4, 5, 21, 20, -1,
-          5, 6, 22, 21, -1,
-          6, 7, 23, 22, -1,
-          7, 8, 24, 23, -1,
-          8, 9, 25, 24, -1,
-          9, 10, 26, 25, -1,
-          10, 11, 27, 26, -1,
-          11, 12, 28, 27, -1,
-          12, 13, 29, 28, -1,
-          13, 14, 30, 29, -1,
-          14, 15, 31, 30, -1,
-          16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, -1 ]
-      }
-    }
-  ]
-}
-
-DEF cube8_copy9 Transform {
-  children [
-    Shape {
-      appearance Appearance {
-        material DEF corpo Material {
-          diffuseColor 0.913420 0.913420 0.913420
-          emissiveColor 0.840160 0.840160 0.840160
-          specularColor 0.866800 0.866800 0.866800
-          ambientIntensity 0.900100
-          transparency 0.00000e+0
-          shininess 1.00000
-        }
-      }
-      geometry IndexedFaceSet {
-        normalPerVertex TRUE
-        coord Coordinate { point [
-          -2.50000 -2.26600 0.336464,
-          -2.26600 -2.50000 0.336464,
-          -2.50000 2.26600 0.336464,
-          -2.26600 2.50000 0.336464,
-          2.26600 2.50000 0.336464,
-          2.50000 2.26600 0.336464,
-          2.50000 -2.26600 0.336464,
-          2.26600 -2.50000 0.336464,
-          -2.50000 -2.26600 1.77860,
-          -2.26600 -2.50000 1.77860,
-          -2.50000 2.26600 1.77860,
-          -2.26600 2.50000 1.77860,
-          2.26600 2.50000 1.77860,
-          2.50000 2.26600 1.77860,
-          2.50000 -2.26600 1.77860,
-          2.26600 -2.50000 1.77860,
-          -2.29320 -2.18034 1.98540,
-          -2.18034 -2.29320 1.98540,
-          2.18034 -2.29320 1.98540,
-          2.29320 -2.18034 1.98540,
-          2.29320 2.18034 1.98540,
-          2.18034 2.29320 1.98540,
-          -2.18034 2.29320 1.98540,
-          -2.29320 2.18034 1.98540 ] }
-        coordIndex [
-          0, 1, 9, 8, -1,
-          0, 2, 3, 4, 5, 6, 7, 1, -1,
-          0, 8, 10, 2, -1,
-          1, 7, 15, 9, -1,
-          2, 10, 11, 3, -1,
-          3, 11, 12, 4, -1,
-          4, 12, 13, 5, -1,
-          5, 13, 14, 6, -1,
-          6, 14, 15, 7, -1,
-          8, 9, 17, 16, -1,
-          8, 16, 23, 10, -1,
-          9, 15, 18, 17, -1,
-          10, 23, 22, 11, -1,
-          11, 22, 21, 12, -1,
-          12, 21, 20, 13, -1,
-          13, 20, 19, 14, -1,
-          14, 19, 18, 15, -1,
-          16, 17, 18, 19, 20, 21, 22, 23, -1 ]
-        normal Normal { vector [
-          -0.812520 -0.336557 -0.475963,
-          -0.336557 -0.812520 -0.475963,
-          -0.812520 0.336557 -0.475963,
-          -0.336557 0.812520 -0.475963,
-          0.336557 0.812520 -0.475963,
-          0.812520 0.336557 -0.475963,
-          0.812520 -0.336557 -0.475963,
-          0.336557 -0.812520 -0.475963,
-          -0.843028 -0.349194 0.409106,
-          -0.349194 -0.843028 0.409106,
-          -0.843028 0.349194 0.409106,
-          -0.349194 0.843028 0.409106,
-          0.349194 0.843028 0.409106,
-          0.843028 0.349194 0.409106,
-          0.843028 -0.349194 0.409106,
-          0.349194 -0.843028 0.409106,
-          -0.439733 -0.182143 0.879465,
-          -0.182143 -0.439733 0.879465,
-          0.182143 -0.439733 0.879465,
-          0.439733 -0.182143 0.879465,
-          0.439733 0.182143 0.879465,
-          0.182143 0.439733 0.879465,
-          -0.182143 0.439733 0.879465,
-          -0.439733 0.182143 0.879465 ] }
-        normalIndex [
-          0, 1, 9, 8, -1,
-          0, 2, 3, 4, 5, 6, 7, 1, -1,
-          0, 8, 10, 2, -1,
-          1, 7, 15, 9, -1,
-          2, 10, 11, 3, -1,
-          3, 11, 12, 4, -1,
-          4, 12, 13, 5, -1,
-          5, 13, 14, 6, -1,
-          6, 14, 15, 7, -1,
-          8, 9, 17, 16, -1,
-          8, 16, 23, 10, -1,
-          9, 15, 18, 17, -1,
-          10, 23, 22, 11, -1,
-          11, 22, 21, 12, -1,
-          12, 21, 20, 13, -1,
-          13, 20, 19, 14, -1,
-          14, 19, 18, 15, -1,
-          16, 17, 18, 19, 20, 21, 22, 23, -1 ]
-      }
-    }
-  ]
-}
-
-DEF cube8 Transform {
-  children [
-    Shape {
-      appearance Appearance {
-        material USE corpo
-      }
-      geometry IndexedFaceSet {
-        normalPerVertex TRUE
-        coord Coordinate { point [
-          -2.61374 -2.37024 0.393596,
-          -2.59822 -2.61500 0.393596,
-          -2.61374 -2.37024 0.182602,
-          -2.59822 -2.61500 0.182602,
-          -2.61374 2.25305 0.393596,
-          -2.53088 2.45310 0.393596,
-          -2.45184 2.53214 0.393596,
-          -2.25179 2.61500 0.393596,
-          2.25431 2.61500 0.393596,
-          2.45436 2.53214 0.393596,
-          2.53340 2.45310 0.393596,
-          2.61626 2.25305 0.393596,
-          2.61626 -2.25305 0.393596,
-          2.53340 -2.45310 0.393596,
-          2.45436 -2.53214 0.393596,
-          2.25431 -2.61500 0.393596,
-          -2.61374 2.25305 0.182602,
-          -2.53088 2.45310 0.182602,
-          -2.25179 2.61500 0.182602,
-          -2.45184 2.53214 0.182602,
-          2.25431 2.61500 0.182602,
-          2.45436 2.53214 0.182602,
-          2.61626 2.25305 0.182602,
-          2.53340 2.45310 0.182602,
-          2.61626 -2.25305 0.182602,
-          2.53340 -2.45310 0.182602,
-          2.25431 -2.61500 0.182602,
-          2.45436 -2.53214 0.182602 ] }
-        coordIndex [
-          0, 1, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, -1,
-          0, 2, 3, 1, -1,
-          0, 4, 16, 2, -1,
-          1, 3, 26, 15, -1,
-          2, 16, 17, 19, 18, 20, 21, 23, 22, 24, 25, 27, 26, 3, -1,
-          4, 5, 17, 16, -1,
-          5, 6, 19, 17, -1,
-          6, 7, 18, 19, -1,
-          7, 8, 20, 18, -1,
-          8, 9, 21, 20, -1,
-          9, 10, 23, 21, -1,
-          10, 11, 22, 23, -1,
-          11, 12, 24, 22, -1,
-          12, 13, 25, 24, -1,
-          13, 14, 27, 25, -1,
-          14, 15, 26, 27, -1 ]
-        normal Normal { vector [
-          -0.893889 -2.83184e-2 0.447393,
-          -0.564407 -0.601338 0.565541,
-          -0.893889 -2.83184e-2 -0.447393,
-          -0.564407 -0.601338 -0.565541,
-          -0.873791 0.173808 0.454182,
-          -0.740764 0.494963 0.454182,
-          -0.494963 0.740764 0.454182,
-          -0.173808 0.873791 0.454182,
-          0.173808 0.873791 0.454182,
-          0.494963 0.740764 0.454182,
-          0.740764 0.494963 0.454182,
-          0.873791 0.173808 0.454182,
-          0.873791 -0.173808 0.454182,
-          0.740764 -0.494963 0.454182,
-          0.494963 -0.740764 0.454182,
-          0.173808 -0.873791 0.454182,
-          -0.873791 0.173808 -0.454182,
-          -0.740764 0.494963 -0.454182,
-          -0.173808 0.873791 -0.454182,
-          -0.494963 0.740764 -0.454182,
-          0.173808 0.873791 -0.454182,
-          0.494963 0.740764 -0.454182,
-          0.873791 0.173808 -0.454182,
-          0.740764 0.494963 -0.454182,
-          0.873791 -0.173808 -0.454182,
-          0.740764 -0.494963 -0.454182,
-          0.173808 -0.873791 -0.454182,
-          0.494963 -0.740764 -0.454182 ] }
-        normalIndex [
-          0, 1, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, -1,
-          0, 2, 3, 1, -1,
-          0, 4, 16, 2, -1,
-          1, 3, 26, 15, -1,
-          2, 16, 17, 19, 18, 20, 21, 23, 22, 24, 25, 27, 26, 3, -1,
-          4, 5, 17, 16, -1,
-          5, 6, 19, 17, -1,
-          6, 7, 18, 19, -1,
-          7, 8, 20, 18, -1,
-          8, 9, 21, 20, -1,
-          9, 10, 23, 21, -1,
-          10, 11, 22, 23, -1,
-          11, 12, 24, 22, -1,
-          12, 13, 25, 24, -1,
-          13, 14, 27, 25, -1,
-          14, 15, 26, 27, -1 ]
-      }
-    }
-  ]
-}
-
-DEF torus1_sep7 Transform {
-  children [
-    Shape {
-      appearance Appearance {
-        material USE pins
-      }
-      geometry IndexedFaceSet {
-        normalPerVertex TRUE
-        coord Coordinate { point [
-          1.71646 -1.49841 0.799496,
-          1.70052 -1.57855 0.799496,
-          1.65513 -1.64649 0.799496,
-          1.58719 -1.69189 0.799496,
-          1.50705 -1.70783 0.799496,
-          1.42691 -1.69189 0.799496,
-          1.35897 -1.64649 0.799496,
-          1.31357 -1.57855 0.799496,
-          1.29763 -1.49841 0.799496,
-          1.31357 -1.41827 0.799496,
-          1.35897 -1.35033 0.799496,
-          1.42691 -1.30494 0.799496,
-          1.50705 -1.28900 0.799496,
-          1.58719 -1.30494 0.799496,
-          1.65513 -1.35033 0.799496,
-          1.70052 -1.41827 0.799496,
-          1.71646 -1.49841 -1.03430,
-          1.70052 -1.57855 -1.03430,
-          1.65513 -1.64649 -1.03430,
-          1.58719 -1.69189 -1.03430,
-          1.50705 -1.70783 -1.03430,
-          1.42691 -1.69189 -1.03430,
-          1.35897 -1.64649 -1.03430,
-          1.31357 -1.57855 -1.03430,
-          1.29763 -1.49841 -1.03430,
-          1.31357 -1.41827 -1.03430,
-          1.35897 -1.35033 -1.03430,
-          1.42691 -1.30494 -1.03430,
-          1.50705 -1.28900 -1.03430,
-          1.58719 -1.30494 -1.03430,
-          1.65513 -1.35033 -1.03430,
-          1.70052 -1.41827 -1.03430 ] }
-        coordIndex [
-          0, 1, 17, 16, -1,
-          0, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, -1,
-          0, 16, 31, 15, -1,
-          1, 2, 18, 17, -1,
-          2, 3, 19, 18, -1,
-          3, 4, 20, 19, -1,
-          4, 5, 21, 20, -1,
-          5, 6, 22, 21, -1,
-          6, 7, 23, 22, -1,
-          7, 8, 24, 23, -1,
-          8, 9, 25, 24, -1,
-          9, 10, 26, 25, -1,
-          10, 11, 27, 26, -1,
-          11, 12, 28, 27, -1,
-          12, 13, 29, 28, -1,
-          13, 14, 30, 29, -1,
-          14, 15, 31, 30, -1,
-          16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, -1 ]
-        normal Normal { vector [
-          0.890909 4.15244e-7 0.454182,
-          0.823093 -0.340936 0.454182,
-          0.629968 -0.629968 0.454182,
-          0.340936 -0.823093 0.454182,
-          4.03394e-16 -0.890909 0.454182,
-          -0.340936 -0.823093 0.454182,
-          -0.629968 -0.629968 0.454182,
-          -0.823093 -0.340936 0.454182,
-          -0.890909 4.15244e-7 0.454182,
-          -0.823093 0.340937 0.454181,
-          -0.629968 0.629968 0.454181,
-          -0.340936 0.823093 0.454181,
-          4.03394e-16 0.890909 0.454181,
-          0.340936 0.823093 0.454181,
-          0.629968 0.629968 0.454181,
-          0.823093 0.340937 0.454181,
-          0.890909 -4.15244e-7 -0.454182,
-          0.823093 -0.340937 -0.454181,
-          0.629968 -0.629968 -0.454181,
-          0.340936 -0.823093 -0.454181,
-          3.65576e-16 -0.890909 -0.454181,
-          -0.340936 -0.823093 -0.454181,
-          -0.629968 -0.629968 -0.454181,
-          -0.823093 -0.340937 -0.454181,
-          -0.890909 -4.15244e-7 -0.454182,
-          -0.823093 0.340936 -0.454182,
-          -0.629968 0.629968 -0.454182,
-          -0.340936 0.823093 -0.454182,
-          3.65576e-16 0.890909 -0.454182,
-          0.340936 0.823093 -0.454182,
-          0.629968 0.629968 -0.454182,
-          0.823093 0.340936 -0.454182 ] }
-        normalIndex [
-          0, 1, 17, 16, -1,
-          0, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, -1,
-          0, 16, 31, 15, -1,
-          1, 2, 18, 17, -1,
-          2, 3, 19, 18, -1,
-          3, 4, 20, 19, -1,
-          4, 5, 21, 20, -1,
-          5, 6, 22, 21, -1,
-          6, 7, 23, 22, -1,
-          7, 8, 24, 23, -1,
-          8, 9, 25, 24, -1,
-          9, 10, 26, 25, -1,
-          10, 11, 27, 26, -1,
-          11, 12, 28, 27, -1,
-          12, 13, 29, 28, -1,
-          13, 14, 30, 29, -1,
-          14, 15, 31, 30, -1,
-          16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, -1 ]
-      }
-    }
-  ]
-}
-
-DEF torus1_sep6 Transform {
-  children [
-    Shape {
-      appearance Appearance {
-        material USE pins
-      }
-      geometry IndexedFaceSet {
-        normalPerVertex TRUE
-        coord Coordinate { point [
-          -1.28460 1.48360 0.799496,
-          -1.30055 1.40346 0.799496,
-          -1.34594 1.33552 0.799496,
-          -1.41388 1.29012 0.799496,
-          -1.49402 1.27418 0.799496,
-          -1.57416 1.29012 0.799496,
-          -1.64210 1.33552 0.799496,
-          -1.68749 1.40346 0.799496,
-          -1.70343 1.48360 0.799496,
-          -1.68749 1.56374 0.799496,
-          -1.64210 1.63168 0.799496,
-          -1.57416 1.67707 0.799496,
-          -1.49402 1.69301 0.799496,
-          -1.41388 1.67707 0.799496,
-          -1.34594 1.63168 0.799496,
-          -1.30055 1.56374 0.799496,
-          -1.28460 1.48360 -1.03430,
-          -1.30055 1.40346 -1.03430,
-          -1.34594 1.33552 -1.03430,
-          -1.41388 1.29012 -1.03430,
-          -1.49402 1.27418 -1.03430,
-          -1.57416 1.29012 -1.03430,
-          -1.64210 1.33552 -1.03430,
-          -1.68749 1.40346 -1.03430,
-          -1.70343 1.48360 -1.03430,
-          -1.68749 1.56374 -1.03430,
-          -1.64210 1.63168 -1.03430,
-          -1.57416 1.67707 -1.03430,
-          -1.49402 1.69301 -1.03430,
-          -1.41388 1.67707 -1.03430,
-          -1.34594 1.63168 -1.03430,
-          -1.30055 1.56374 -1.03430 ] }
-        coordIndex [
-          0, 1, 17, 16, -1,
-          0, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, -1,
-          0, 16, 31, 15, -1,
-          1, 2, 18, 17, -1,
-          2, 3, 19, 18, -1,
-          3, 4, 20, 19, -1,
-          4, 5, 21, 20, -1,
-          5, 6, 22, 21, -1,
-          6, 7, 23, 22, -1,
-          7, 8, 24, 23, -1,
-          8, 9, 25, 24, -1,
-          9, 10, 26, 25, -1,
-          10, 11, 27, 26, -1,
-          11, 12, 28, 27, -1,
-          12, 13, 29, 28, -1,
-          13, 14, 30, 29, -1,
-          14, 15, 31, 30, -1,
-          16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, -1 ]
-        normal Normal { vector [
-          0.890909 4.15244e-7 0.454182,
-          0.823093 -0.340936 0.454182,
-          0.629968 -0.629968 0.454182,
-          0.340936 -0.823093 0.454182,
-          5.92485e-16 -0.890909 0.454182,
-          -0.340936 -0.823093 0.454182,
-          -0.629968 -0.629968 0.454182,
-          -0.823093 -0.340936 0.454182,
-          -0.890909 4.15244e-7 0.454182,
-          -0.823093 0.340937 0.454181,
-          -0.629968 0.629968 0.454181,
-          -0.340936 0.823093 0.454181,
-          5.92485e-16 0.890909 0.454181,
-          0.340936 0.823093 0.454181,
-          0.629968 0.629968 0.454181,
-          0.823093 0.340937 0.454181,
-          0.890909 -4.15244e-7 -0.454182,
-          0.823093 -0.340937 -0.454181,
-          0.629968 -0.629968 -0.454181,
-          0.340936 -0.823093 -0.454181,
-          5.42061e-16 -0.890909 -0.454181,
-          -0.340936 -0.823093 -0.454181,
-          -0.629968 -0.629968 -0.454181,
-          -0.823093 -0.340937 -0.454181,
-          -0.890909 -4.15244e-7 -0.454182,
-          -0.823093 0.340936 -0.454182,
-          -0.629968 0.629968 -0.454182,
-          -0.340936 0.823093 -0.454182,
-          5.42061e-16 0.890909 -0.454182,
-          0.340936 0.823093 -0.454182,
-          0.629968 0.629968 -0.454182,
-          0.823093 0.340936 -0.454182 ] }
-        normalIndex [
-          0, 1, 17, 16, -1,
-          0, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, -1,
-          0, 16, 31, 15, -1,
-          1, 2, 18, 17, -1,
-          2, 3, 19, 18, -1,
-          3, 4, 20, 19, -1,
-          4, 5, 21, 20, -1,
-          5, 6, 22, 21, -1,
-          6, 7, 23, 22, -1,
-          7, 8, 24, 23, -1,
-          8, 9, 25, 24, -1,
-          9, 10, 26, 25, -1,
-          10, 11, 27, 26, -1,
-          11, 12, 28, 27, -1,
-          12, 13, 29, 28, -1,
-          13, 14, 30, 29, -1,
-          14, 15, 31, 30, -1,
-          16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, -1 ]
-      }
-    }
-  ]
-}
-
--- a/modules/packages3d/Oscillators.3dshapes/Oscillator_DIP-14.FCStd
+++ b/modules/packages3d/Oscillators.3dshapes/Oscillator_DIP-14.FCStd
--- a/modules/packages3d/Oscillators.3dshapes/Oscillator_DIP-14.wrl
+++ b/modules/packages3d/Oscillators.3dshapes/Oscillator_DIP-14.wrl
--- a/modules/packages3d/Oscillators.3dshapes/Oscillator_DIP-14_LargePads.wrl
+++ b/modules/packages3d/Oscillators.3dshapes/Oscillator_DIP-14_LargePads.wrl
--- a/modules/packages3d/Oscillators.3dshapes/Oscillator_DIP-8.FCStd
+++ b/modules/packages3d/Oscillators.3dshapes/Oscillator_DIP-8.FCStd
--- a/modules/packages3d/Oscillators.3dshapes/Oscillator_DIP-8.wrl
+++ b/modules/packages3d/Oscillators.3dshapes/Oscillator_DIP-8.wrl
--- a/modules/packages3d/Oscillators.3dshapes/Oscillator_DIP-8_LargePads.wrl
+++ b/modules/packages3d/Oscillators.3dshapes/Oscillator_DIP-8_LargePads.wrl
--- a/modules/packages3d/Oscillators.3dshapes/Oscillator_SMD_TCXO_G158.wings
+++ b/modules/packages3d/Oscillators.3dshapes/Oscillator_SMD_TCXO_G158.wings
--- a/modules/packages3d/Oscillators.3dshapes/Oscillator_SMD_TCXO_G158.wrl
+++ b/modules/packages3d/Oscillators.3dshapes/Oscillator_SMD_TCXO_G158.wrl
--- a/modules/packages3d/Oscillators.3dshapes/Oscillator_SeikoEpson_SG-8002DB.FCStd
+++ b/modules/packages3d/Oscillators.3dshapes/Oscillator_SeikoEpson_SG-8002DB.FCStd
--- a/modules/packages3d/Oscillators.3dshapes/Oscillator_SeikoEpson_SG-8002DB.wrl
+++ b/modules/packages3d/Oscillators.3dshapes/Oscillator_SeikoEpson_SG-8002DB.wrl
@ -0,0 +1,630 @@
+#VRML V2.0 utf8
+
+
+Group {
+  children 
+    Group {
+      children [ 
+        Group {
+          children 
+            Transform {
+              translation 0 0 0
+              rotation -1 0 0  4.712389
+              scale 1 1 1
+              scaleOrientation 0 0 1  0
+              center 0 0 0
+              children 
+                Switch {
+                  whichChoice 0
+                  choice [ 
+                    Group {
+                      children [ 
+                        DEF o0 Group {
+                          children 
+                            Shape {
+                              appearance 
+                              Appearance {
+                                material 
+                                Material {
+                                  diffuseColor 0.098039217 0.098039217 0.098039217
+                                  shininess 1
+
+                                }
+
+                              }
+                              geometry 
+                              IndexedLineSet {
+                                coord 
+                                DEF o1 Coordinate {
+                                  point [ 7.8200002 2.52 -0.30000001,
+                                      7.8200002 2.52 0.30000001,
+                                      -0.2 2.52 -0.30000001,
+                                      -0.2 2.52 0.30000001,
+                                      -0.2 2.52 -0.30000001,
+                                      -0.2 2.52 0.30000001,
+                                      -0.2 -3 -0.30000001,
+                                      -0.2 -3 0.30000001,
+                                      -0.2 -3 -0.30000001,
+                                      -0.2 -3 0.30000001,
+                                      0.2 -3 -0.30000001,
+                                      0.2 -3 0.30000001,
+                                      0.2 2.1199999 -0.30000001,
+                                      0.2 2.1199999 0.30000001,
+                                      0.2 -3 -0.30000001,
+                                      0.2 -3 0.30000001,
+                                      7.4200001 2.1199999 -0.30000001,
+                                      7.4200001 2.1199999 0.30000001,
+                                      0.2 2.1199999 -0.30000001,
+                                      0.2 2.1199999 0.30000001,
+                                      7.4200001 -3 -0.30000001,
+                                      7.4200001 -3 0.30000001,
+                                      7.4200001 2.1199999 -0.30000001,
+                                      7.4200001 2.1199999 0.30000001,
+                                      7.8200002 -3 -0.30000001,
+                                      7.8200002 -3 0.30000001,
+                                      7.4200001 -3 -0.30000001,
+                                      7.4200001 -3 0.30000001,
+                                      7.8200002 2.52 -0.30000001,
+                                      7.8200002 2.52 0.30000001,
+                                      7.8200002 -3 -0.30000001,
+                                      7.8200002 -3 0.30000001,
+                                      7.8200002 2.52 -0.30000001,
+                                      -0.2 2.52 -0.30000001,
+                                      -0.2 -3 -0.30000001,
+                                      0.2 -3 -0.30000001,
+                                      0.2 2.1199999 -0.30000001,
+                                      7.4200001 2.1199999 -0.30000001,
+                                      7.4200001 -3 -0.30000001,
+                                      7.8200002 -3 -0.30000001,
+                                      7.8200002 2.52 0.30000001,
+                                      -0.2 2.52 0.30000001,
+                                      -0.2 -3 0.30000001,
+                                      0.2 -3 0.30000001,
+                                      0.2 2.1199999 0.30000001,
+                                      7.4200001 2.1199999 0.30000001,
+                                      7.4200001 -3 0.30000001,
+                                      7.8200002 -3 0.30000001,
+                                      7.8200002 2.52 -0.30000001,
+                                      7.8200002 2.52 0.30000001,
+                                      -0.2 2.52 -0.30000001,
+                                      -0.2 2.52 0.30000001,
+                                      -0.2 -3 -0.30000001,
+                                      -0.2 -3 0.30000001,
+                                      0.2 -3 -0.30000001,
+                                      0.2 -3 0.30000001,
+                                      0.2 2.1199999 -0.30000001,
+                                      0.2 2.1199999 0.30000001,
+                                      7.4200001 2.1199999 -0.30000001,
+                                      7.4200001 2.1199999 0.30000001,
+                                      7.4200001 -3 -0.30000001,
+                                      7.4200001 -3 0.30000001,
+                                      7.8200002 -3 -0.30000001,
+                                      7.8200002 -3 0.30000001 ]
+
+                                }
+                                coordIndex [ 0, 1, -1, 2, 3, -1, 0, 2,
+                                    -1, 1, 3, -1, 6, 7, -1, 4,
+                                    6, -1, 5, 7, -1, 10, 11, -1,
+                                    8, 10, -1, 9, 11, -1, 12, 13,
+                                    -1, 12, 14, -1, 13, 15, -1, 16,
+                                    17, -1, 16, 18, -1, 17, 19, -1,
+                                    20, 21, -1, 20, 22, -1, 21, 23,
+                                    -1, 24, 25, -1, 24, 26, -1, 25,
+                                    27, -1, 28, 30, -1, 29, 31, -1 ]
+
+                              }
+
+                            }
+
+                        },
+                          
+                        DEF o2 Group {
+                          children 
+                            Shape {
+                              appearance 
+                              Appearance {
+                                material 
+                                Material {
+                                  diffuseColor 0.50749999 0.50749999 0.50749999
+                                  ambientIntensity 0.19220001
+                                  specularColor 0.50830001 0.50830001 0.50830001
+
+                                }
+
+                              }
+                              geometry 
+                              IndexedFaceSet {
+                                coord 
+                                USE o1
+                                coordIndex [ 0, 2, 1, -1, 1, 2, 3, -1,
+                                    4, 6, 5, -1, 5, 6, 7, -1,
+                                    9, 8, 11, -1, 8, 10, 11, -1,
+                                    15, 12, 13, -1, 14, 12, 15, -1,
+                                    18, 16, 17, -1, 18, 17, 19, -1,
+                                    23, 20, 21, -1, 22, 20, 23, -1,
+                                    24, 25, 27, -1, 26, 24, 27, -1,
+                                    31, 28, 29, -1, 30, 28, 31, -1,
+                                    36, 34, 33, -1, 36, 35, 34, -1,
+                                    37, 39, 38, -1, 37, 36, 33, -1,
+                                    32, 39, 37, -1, 32, 37, 33, -1,
+                                    42, 44, 41, -1, 43, 44, 42, -1,
+                                    47, 45, 46, -1, 44, 45, 41, -1,
+                                    47, 40, 45, -1, 45, 40, 41, -1 ]
+                                ccw TRUE
+                                solid FALSE
+                                convex TRUE
+                                creaseAngle 0
+
+                              }
+
+                            }
+
+                        },
+                          
+                        DEF o3 Group {
+                          children 
+                            Shape {
+                              appearance 
+                              Appearance {
+                                material 
+                                Material {
+                                  emissiveColor 0.098039217 0.098039217 0.098039217
+
+                                }
+
+                              }
+                              geometry 
+                              PointSet {
+                                coord 
+                                USE o1
+
+                              }
+
+                            }
+
+                        } ]
+
+                    },
+                      
+                    USE o2,
+                      
+                    Group {
+                      children [ 
+                        USE o0,
+                          
+                        USE o3 ]
+
+                    },
+                      
+                    USE o3 ]
+
+                }
+
+            }
+
+        },
+          
+        Group {
+          children 
+            Transform {
+              translation 0 -15.24 0
+              rotation 1 0 0  1.5707964
+              scale 1 1 1
+              scaleOrientation 0 0 1  0
+              center 0 0 0
+              children 
+                Switch {
+                  whichChoice 0
+                  choice [ 
+                    Group {
+                      children [ 
+                        DEF o4 Group {
+                          children 
+                            Shape {
+                              appearance 
+                              Appearance {
+                                material 
+                                Material {
+                                  diffuseColor 0.098039217 0.098039217 0.098039217
+                                  shininess 1
+
+                                }
+
+                              }
+                              geometry 
+                              IndexedLineSet {
+                                coord 
+                                USE o1
+                                coordIndex [ 0, 1, -1, 2, 3, -1, 0, 2,
+                                    -1, 1, 3, -1, 6, 7, -1, 4,
+                                    6, -1, 5, 7, -1, 10, 11, -1,
+                                    8, 10, -1, 9, 11, -1, 12, 13,
+                                    -1, 12, 14, -1, 13, 15, -1, 16,
+                                    17, -1, 16, 18, -1, 17, 19, -1,
+                                    20, 21, -1, 20, 22, -1, 21, 23,
+                                    -1, 24, 25, -1, 24, 26, -1, 25,
+                                    27, -1, 28, 30, -1, 29, 31, -1 ]
+
+                              }
+
+                            }
+
+                        },
+                          
+                        DEF o5 Group {
+                          children 
+                            Shape {
+                              appearance 
+                              Appearance {
+                                material 
+                                Material {
+                                  diffuseColor 0.50749999 0.50749999 0.50749999
+                                  ambientIntensity 0.19220001
+                                  specularColor 0.50830001 0.50830001 0.50830001
+
+                                }
+
+                              }
+                              geometry 
+                              IndexedFaceSet {
+                                coord 
+                                USE o1
+                                coordIndex [ 0, 2, 1, -1, 1, 2, 3, -1,
+                                    4, 6, 5, -1, 5, 6, 7, -1,
+                                    8, 10, 9, -1, 9, 10, 11, -1,
+                                    14, 12, 13, -1, 14, 13, 15, -1,
+                                    18, 16, 17, -1, 18, 17, 19, -1,
+                                    22, 20, 21, -1, 22, 21, 23, -1,
+                                    26, 24, 25, -1, 26, 25, 27, -1,
+                                    30, 28, 29, -1, 30, 29, 31, -1,
+                                    36, 35, 34, -1, 33, 36, 34, -1,
+                                    37, 39, 38, -1, 37, 36, 33, -1,
+                                    32, 39, 37, -1, 32, 37, 33, -1,
+                                    43, 44, 42, -1, 44, 41, 42, -1,
+                                    47, 45, 46, -1, 44, 45, 41, -1,
+                                    47, 40, 45, -1, 45, 40, 41, -1 ]
+                                ccw TRUE
+                                solid FALSE
+                                convex TRUE
+                                creaseAngle 0
+
+                              }
+
+                            }
+
+                        },
+                          
+                        DEF o6 Group {
+                          children 
+                            Shape {
+                              appearance 
+                              Appearance {
+                                material 
+                                Material {
+                                  emissiveColor 0.098039217 0.098039217 0.098039217
+
+                                }
+
+                              }
+                              geometry 
+                              PointSet {
+                                coord 
+                                USE o1
+
+                              }
+
+                            }
+
+                        } ]
+
+                    },
+                      
+                    USE o5,
+                      
+                    Group {
+                      children [ 
+                        USE o4,
+                          
+                        USE o6 ]
+
+                    },
+                      
+                    USE o6 ]
+
+                }
+
+            }
+
+        },
+          
+        Group {
+          children 
+            Transform {
+              translation 0 -7.6199999 0
+              rotation -1 0 0  4.712389
+              scale 1 1 1
+              scaleOrientation 0 0 1  0
+              center 0 0 0
+              children 
+                Switch {
+                  whichChoice 0
+                  choice [ 
+                    Group {
+                      children [ 
+                        DEF o7 Group {
+                          children 
+                            Shape {
+                              appearance 
+                              Appearance {
+                                material 
+                                Material {
+                                  diffuseColor 0.098039217 0.098039217 0.098039217
+                                  shininess 1
+
+                                }
+
+                              }
+                              geometry 
+                              IndexedLineSet {
+                                coord 
+                                DEF o8 Coordinate {
+                                  point [ 1.01 0.2 -9.8999996,
+                                      1.01 0.2 9.8999996,
+                                      6.6100001 0.2 -9.8999996,
+                                      6.6100001 0.2 9.8999996,
+                                      1.01 0.2 -9.8999996,
+                                      1.01 0.2 9.8999996,
+                                      0.50999999 2.3199999 -9.8999996,
+                                      0.50999999 2.3199999 9.8999996,
+                                      7.1100001 2.3199999 -9.8999996,
+                                      7.1100001 2.3199999 9.8999996,
+                                      6.6100001 0.2 -9.8999996,
+                                      6.6100001 0.2 9.8999996,
+                                      1.01 0.2 -9.8999996,
+                                      6.6100001 0.2 -9.8999996,
+                                      7.1100001 2.3199999 -9.8999996,
+                                      6.6100001 5.5 -9.8999996,
+                                      4.5599999 5.5 -9.8999996,
+                                      4.5599999 4.5 -9.8999996,
+                                      3.0599999 4.5 -9.8999996,
+                                      3.0599999 5.5 -9.8999996,
+                                      1.01 5.5 -9.8999996,
+                                      0.50999999 2.3199999 -9.8999996,
+                                      1.01 0.2 9.8999996,
+                                      6.6100001 0.2 9.8999996,
+                                      7.1100001 2.3199999 9.8999996,
+                                      6.6100001 5.5 9.8999996,
+                                      1.01 5.5 9.8999996,
+                                      0.50999999 2.3199999 9.8999996,
+                                      0.50999999 2.3199999 -9.8999996,
+                                      0.50999999 2.3199999 9.8999996,
+                                      1.01 5.5 -9.8999996,
+                                      1.01 5.5 9.8999996,
+                                      6.6100001 5.5 -9.8999996,
+                                      6.6100001 5.5 9.8999996,
+                                      7.1100001 2.3199999 -9.8999996,
+                                      7.1100001 2.3199999 9.8999996,
+                                      1.01 5.5 -9.8999996,
+                                      3.0599999 5.5 -9.8999996,
+                                      3.0599999 5.5 -8.3999996,
+                                      4.5599999 5.5 -8.3999996,
+                                      3.0855556 5.5 -8.2058859,
+                                      3.160481 5.5 -8.0249996,
+                                      3.27967 5.5 -7.8696699,
+                                      3.4349999 5.5 -7.7504811,
+                                      3.6158857 5.5 -7.6755557,
+                                      3.8099999 5.5 -7.6500001,
+                                      4.0041142 5.5 -7.6755557,
+                                      4.1849999 5.5 -7.7504811,
+                                      4.3403301 5.5 -7.8696699,
+                                      4.4595189 5.5 -8.0249996,
+                                      4.5344443 5.5 -8.2058859,
+                                      4.5599999 5.5 -9.8999996,
+                                      6.6100001 5.5 -9.8999996,
+                                      6.6100001 5.5 9.8999996,
+                                      1.01 5.5 9.8999996,
+                                      4.5599999 5.5 -8.3999996,
+                                      4.5599999 4.5 -8.3999996,
+                                      4.5599999 5.5 -9.8999996,
+                                      4.5599999 4.5 -9.8999996,
+                                      3.0599999 4.5 -8.3999996,
+                                      4.5599999 4.5 -8.3999996,
+                                      3.0855556 4.5 -8.2058859,
+                                      3.160481 4.5 -8.0249996,
+                                      3.27967 4.5 -7.8696699,
+                                      3.4349999 4.5 -7.7504811,
+                                      3.6158857 4.5 -7.6755557,
+                                      3.8099999 4.5 -7.6500001,
+                                      4.0041142 4.5 -7.6755557,
+                                      4.1849999 4.5 -7.7504811,
+                                      4.3403301 4.5 -7.8696699,
+                                      4.4595189 4.5 -8.0249996,
+                                      4.5344443 4.5 -8.2058859,
+                                      3.0599999 4.5 -9.8999996,
+                                      4.5599999 4.5 -9.8999996,
+                                      3.0599999 5.5 -9.8999996,
+                                      3.0599999 4.5 -9.8999996,
+                                      3.0599999 5.5 -8.3999996,
+                                      3.0599999 4.5 -8.3999996,
+                                      3.0599999 5.5 -8.3999996,
+                                      3.0599999 4.5 -8.3999996,
+                                      4.5599999 5.5 -8.3999996,
+                                      3.0855556 5.5 -8.2058859,
+                                      3.160481 5.5 -8.0249996,
+                                      3.27967 5.5 -7.8696699,
+                                      3.4349999 5.5 -7.7504811,
+                                      3.6158857 5.5 -7.6755557,
+                                      3.8099999 5.5 -7.6500001,
+                                      4.0041142 5.5 -7.6755557,
+                                      4.1849999 5.5 -7.7504811,
+                                      4.3403301 5.5 -7.8696699,
+                                      4.4595189 5.5 -8.0249996,
+                                      4.5344443 5.5 -8.2058859,
+                                      4.5599999 4.5 -8.3999996,
+                                      3.0855556 4.5 -8.2058859,
+                                      3.160481 4.5 -8.0249996,
+                                      3.27967 4.5 -7.8696699,
+                                      3.4349999 4.5 -7.7504811,
+                                      3.6158857 4.5 -7.6755557,
+                                      3.8099999 4.5 -7.6500001,
+                                      4.0041142 4.5 -7.6755557,
+                                      4.1849999 4.5 -7.7504811,
+                                      4.3403301 4.5 -7.8696699,
+                                      4.4595189 4.5 -8.0249996,
+                                      4.5344443 4.5 -8.2058859,
+                                      1.01 0.2 -9.8999996,
+                                      1.01 0.2 9.8999996,
+                                      6.6100001 0.2 -9.8999996,
+                                      6.6100001 0.2 9.8999996,
+                                      0.50999999 2.3199999 -9.8999996,
+                                      0.50999999 2.3199999 9.8999996,
+                                      7.1100001 2.3199999 -9.8999996,
+                                      7.1100001 2.3199999 9.8999996,
+                                      6.6100001 5.5 -9.8999996,
+                                      4.5599999 5.5 -9.8999996,
+                                      4.5599999 4.5 -9.8999996,
+                                      3.0599999 4.5 -9.8999996,
+                                      3.0599999 5.5 -9.8999996,
+                                      1.01 5.5 -9.8999996,
+                                      6.6100001 5.5 9.8999996,
+                                      1.01 5.5 9.8999996,
+                                      3.0599999 5.5 -8.3999996,
+                                      4.5599999 5.5 -8.3999996,
+                                      4.5599999 4.5 -8.3999996,
+                                      3.0599999 4.5 -8.3999996 ]
+
+                                }
+                                coordIndex [ 0, 1, -1, 2, 3, -1, 0, 2,
+                                    -1, 1, 3, -1, 6, 7, -1, 4,
+                                    6, -1, 5, 7, -1, 8, 9, -1,
+                                    8, 10, -1, 9, 11, -1, 15, 14,
+                                    -1, 16, 15, -1, 16, 17, -1, 17,
+                                    18, -1, 19, 18, -1, 20, 19, -1,
+                                    21, 20, -1, 25, 24, -1, 26, 25,
+                                    -1, 27, 26, -1, 30, 31, -1, 32,
+                                    33, -1, 37, 38, -1, 38, 40, 41,
+                                    42, 43, 44, 45, 46, 47, 48, 49,
+                                    50, 39, -1, 39, 51, -1, 55, 56,
+                                    -1, 56, 58, -1, 59, 61, 62, 63,
+                                    64, 65, 66, 67, 68, 69, 70, 71,
+                                    60, -1, 72, 59, -1, 76, 77, -1 ]
+
+                              }
+
+                            }
+
+                        },
+                          
+                        DEF o9 Group {
+                          children 
+                            Shape {
+                              appearance 
+                              Appearance {
+                                material 
+                                Material {
+                                  diffuseColor 0 0 0
+
+                                }
+
+                              }
+                              geometry 
+                              IndexedFaceSet {
+                                coord 
+                                USE o8
+                                coordIndex [ 0, 2, 1, -1, 1, 2, 3, -1,
+                                    6, 4, 5, -1, 6, 5, 7, -1,
+                                    10, 8, 9, -1, 10, 9, 11, -1,
+                                    18, 13, 12, -1, 18, 21, 20, -1,
+                                    18, 12, 21, -1, 19, 18, 20, -1,
+                                    17, 13, 18, -1, 14, 13, 17, -1,
+                                    15, 17, 16, -1, 15, 14, 17, -1,
+                                    23, 24, 22, -1, 27, 24, 26, -1,
+                                    22, 24, 27, -1, 24, 25, 26, -1,
+                                    30, 28, 29, -1, 30, 29, 31, -1,
+                                    34, 32, 33, -1, 34, 33, 35, -1,
+                                    42, 36, 54, -1, 43, 42, 54, -1,
+                                    41, 36, 42, -1, 44, 43, 54, -1,
+                                    40, 36, 41, -1, 45, 54, 53, -1,
+                                    45, 44, 54, -1, 38, 36, 40, -1,
+                                    46, 45, 53, -1, 47, 46, 53, -1,
+                                    48, 47, 53, -1, 37, 36, 38, -1,
+                                    52, 49, 48, -1, 52, 50, 49, -1,
+                                    52, 39, 50, -1, 52, 51, 39, -1,
+                                    52, 48, 53, -1, 55, 58, 56, -1,
+                                    55, 57, 58, -1, 67, 65, 66, -1,
+                                    68, 65, 67, -1, 64, 62, 63, -1,
+                                    65, 62, 64, -1, 68, 62, 65, -1,
+                                    69, 61, 68, -1, 68, 61, 62, -1,
+                                    70, 59, 69, -1, 71, 59, 70, -1,
+                                    60, 59, 71, -1, 69, 59, 61, -1,
+                                    73, 72, 60, -1, 60, 72, 59, -1,
+                                    74, 77, 75, -1, 74, 76, 77, -1,
+                                    78, 81, 79, -1, 79, 81, 93, -1,
+                                    93, 82, 94, -1, 81, 82, 93, -1,
+                                    94, 83, 95, -1, 95, 83, 96, -1,
+                                    82, 83, 94, -1, 96, 84, 97, -1,
+                                    83, 84, 96, -1, 97, 85, 98, -1,
+                                    84, 85, 97, -1, 98, 86, 99, -1,
+                                    85, 86, 98, -1, 99, 87, 100, -1,
+                                    86, 87, 99, -1, 87, 88, 100, -1,
+                                    100, 89, 101, -1, 101, 89, 102, -1,
+                                    88, 89, 100, -1, 89, 90, 102, -1,
+                                    102, 91, 103, -1, 90, 91, 102, -1,
+                                    103, 80, 92, -1, 91, 80, 103, -1 ]
+                                ccw TRUE
+                                solid FALSE
+                                convex TRUE
+                                creaseAngle 0
+
+                              }
+
+                            }
+
+                        },
+                          
+                        DEF o10 Group {
+                          children 
+                            Shape {
+                              appearance 
+                              Appearance {
+                                material 
+                                Material {
+                                  emissiveColor 0.098039217 0.098039217 0.098039217
+
+                                }
+
+                              }
+                              geometry 
+                              PointSet {
+                                coord 
+                                USE o8
+
+                              }
+
+                            }
+
+                        } ]
+
+                    },
+                      
+                    USE o9,
+                      
+                    Group {
+                      children [ 
+                        USE o7,
+                          
+                        USE o10 ]
+
+                    },
+                      
+                    USE o10 ]
+
+                }
+
+            }
+
+        } ]
+
+    }
+
+}
--- a/modules/packages3d/Oscillators.3dshapes/Oscillator_SeikoEpson_SG-8002DC.FCStd
+++ b/modules/packages3d/Oscillators.3dshapes/Oscillator_SeikoEpson_SG-8002DC.FCStd
--- a/modules/packages3d/Oscillators.3dshapes/Oscillator_SeikoEpson_SG-8002DC.wrl
+++ b/modules/packages3d/Oscillators.3dshapes/Oscillator_SeikoEpson_SG-8002DC.wrl
@ -0,0 +1,630 @@
+#VRML V2.0 utf8
+
+
+Group {
+  children 
+    Group {
+      children [ 
+        Group {
+          children 
+            Transform {
+              translation 0 -3.8099999 0
+              rotation -1 0 0  4.712389
+              scale 1 1 1
+              scaleOrientation 0 0 1  0
+              center 0 0 0
+              children 
+                Switch {
+                  whichChoice 0
+                  choice [ 
+                    Group {
+                      children [ 
+                        DEF o0 Group {
+                          children 
+                            Shape {
+                              appearance 
+                              Appearance {
+                                material 
+                                Material {
+                                  diffuseColor 0.098039217 0.098039217 0.098039217
+                                  shininess 1
+
+                                }
+
+                              }
+                              geometry 
+                              IndexedLineSet {
+                                coord 
+                                DEF o1 Coordinate {
+                                  point [ 1.01 0.2 -6.8499999,
+                                      1.01 0.2 6.8499999,
+                                      6.6100001 0.2 -6.8499999,
+                                      6.6100001 0.2 6.8499999,
+                                      1.01 0.2 -6.8499999,
+                                      1.01 0.2 6.8499999,
+                                      0.50999999 2.3199999 -6.8499999,
+                                      0.50999999 2.3199999 6.8499999,
+                                      7.1100001 2.3199999 -6.8499999,
+                                      7.1100001 2.3199999 6.8499999,
+                                      6.6100001 0.2 -6.8499999,
+                                      6.6100001 0.2 6.8499999,
+                                      1.01 0.2 -6.8499999,
+                                      6.6100001 0.2 -6.8499999,
+                                      7.1100001 2.3199999 -6.8499999,
+                                      6.6100001 5.5 -6.8499999,
+                                      4.5599999 5.5 -6.8499999,
+                                      4.5599999 4.5 -6.8499999,
+                                      3.0599999 4.5 -6.8499999,
+                                      3.0599999 5.5 -6.8499999,
+                                      1.01 5.5 -6.8499999,
+                                      0.50999999 2.3199999 -6.8499999,
+                                      1.01 0.2 6.8499999,
+                                      6.6100001 0.2 6.8499999,
+                                      7.1100001 2.3199999 6.8499999,
+                                      6.6100001 5.5 6.8499999,
+                                      1.01 5.5 6.8499999,
+                                      0.50999999 2.3199999 6.8499999,
+                                      0.50999999 2.3199999 -6.8499999,
+                                      0.50999999 2.3199999 6.8499999,
+                                      1.01 5.5 -6.8499999,
+                                      1.01 5.5 6.8499999,
+                                      6.6100001 5.5 -6.8499999,
+                                      6.6100001 5.5 6.8499999,
+                                      7.1100001 2.3199999 -6.8499999,
+                                      7.1100001 2.3199999 6.8499999,
+                                      1.01 5.5 -6.8499999,
+                                      3.0599999 5.5 -6.8499999,
+                                      3.0599999 5.5 -5.3499999,
+                                      4.5599999 5.5 -5.3499999,
+                                      3.0855556 5.5 -5.1558857,
+                                      3.160481 5.5 -4.9749999,
+                                      3.27967 5.5 -4.8196697,
+                                      3.4349999 5.5 -4.7004809,
+                                      3.6158857 5.5 -4.6255555,
+                                      3.8099999 5.5 -4.5999999,
+                                      4.0041142 5.5 -4.6255555,
+                                      4.1849999 5.5 -4.7004809,
+                                      4.3403301 5.5 -4.8196697,
+                                      4.4595189 5.5 -4.9749999,
+                                      4.5344443 5.5 -5.1558857,
+                                      4.5599999 5.5 -6.8499999,
+                                      6.6100001 5.5 -6.8499999,
+                                      6.6100001 5.5 6.8499999,
+                                      1.01 5.5 6.8499999,
+                                      4.5599999 5.5 -5.3499999,
+                                      4.5599999 4.5 -5.3499999,
+                                      4.5599999 5.5 -6.8499999,
+                                      4.5599999 4.5 -6.8499999,
+                                      3.0599999 4.5 -5.3499999,
+                                      4.5599999 4.5 -5.3499999,
+                                      3.0855556 4.5 -5.1558857,
+                                      3.160481 4.5 -4.9749999,
+                                      3.27967 4.5 -4.8196697,
+                                      3.4349999 4.5 -4.7004809,
+                                      3.6158857 4.5 -4.6255555,
+                                      3.8099999 4.5 -4.5999999,
+                                      4.0041142 4.5 -4.6255555,
+                                      4.1849999 4.5 -4.7004809,
+                                      4.3403301 4.5 -4.8196697,
+                                      4.4595189 4.5 -4.9749999,
+                                      4.5344443 4.5 -5.1558857,
+                                      3.0599999 4.5 -6.8499999,
+                                      4.5599999 4.5 -6.8499999,
+                                      3.0599999 5.5 -6.8499999,
+                                      3.0599999 4.5 -6.8499999,
+                                      3.0599999 5.5 -5.3499999,
+                                      3.0599999 4.5 -5.3499999,
+                                      3.0599999 5.5 -5.3499999,
+                                      3.0599999 4.5 -5.3499999,
+                                      4.5599999 5.5 -5.3499999,
+                                      3.0855556 5.5 -5.1558857,
+                                      3.160481 5.5 -4.9749999,
+                                      3.27967 5.5 -4.8196697,
+                                      3.4349999 5.5 -4.7004809,
+                                      3.6158857 5.5 -4.6255555,
+                                      3.8099999 5.5 -4.5999999,
+                                      4.0041142 5.5 -4.6255555,
+                                      4.1849999 5.5 -4.7004809,
+                                      4.3403301 5.5 -4.8196697,
+                                      4.4595189 5.5 -4.9749999,
+                                      4.5344443 5.5 -5.1558857,
+                                      4.5599999 4.5 -5.3499999,
+                                      3.0855556 4.5 -5.1558857,
+                                      3.160481 4.5 -4.9749999,
+                                      3.27967 4.5 -4.8196697,
+                                      3.4349999 4.5 -4.7004809,
+                                      3.6158857 4.5 -4.6255555,
+                                      3.8099999 4.5 -4.5999999,
+                                      4.0041142 4.5 -4.6255555,
+                                      4.1849999 4.5 -4.7004809,
+                                      4.3403301 4.5 -4.8196697,
+                                      4.4595189 4.5 -4.9749999,
+                                      4.5344443 4.5 -5.1558857,
+                                      1.01 0.2 -6.8499999,
+                                      1.01 0.2 6.8499999,
+                                      6.6100001 0.2 -6.8499999,
+                                      6.6100001 0.2 6.8499999,
+                                      0.50999999 2.3199999 -6.8499999,
+                                      0.50999999 2.3199999 6.8499999,
+                                      7.1100001 2.3199999 -6.8499999,
+                                      7.1100001 2.3199999 6.8499999,
+                                      6.6100001 5.5 -6.8499999,
+                                      4.5599999 5.5 -6.8499999,
+                                      4.5599999 4.5 -6.8499999,
+                                      3.0599999 4.5 -6.8499999,
+                                      3.0599999 5.5 -6.8499999,
+                                      1.01 5.5 -6.8499999,
+                                      6.6100001 5.5 6.8499999,
+                                      1.01 5.5 6.8499999,
+                                      3.0599999 5.5 -5.3499999,
+                                      4.5599999 5.5 -5.3499999,
+                                      4.5599999 4.5 -5.3499999,
+                                      3.0599999 4.5 -5.3499999 ]
+
+                                }
+                                coordIndex [ 0, 1, -1, 2, 3, -1, 0, 2,
+                                    -1, 1, 3, -1, 6, 7, -1, 4,
+                                    6, -1, 5, 7, -1, 8, 9, -1,
+                                    8, 10, -1, 9, 11, -1, 15, 14,
+                                    -1, 16, 15, -1, 16, 17, -1, 17,
+                                    18, -1, 19, 18, -1, 20, 19, -1,
+                                    21, 20, -1, 25, 24, -1, 26, 25,
+                                    -1, 27, 26, -1, 30, 31, -1, 32,
+                                    33, -1, 37, 38, -1, 38, 40, 41,
+                                    42, 43, 44, 45, 46, 47, 48, 49,
+                                    50, 39, -1, 39, 51, -1, 55, 56,
+                                    -1, 56, 58, -1, 59, 61, 62, 63,
+                                    64, 65, 66, 67, 68, 69, 70, 71,
+                                    60, -1, 72, 59, -1, 76, 77, -1 ]
+
+                              }
+
+                            }
+
+                        },
+                          
+                        DEF o2 Group {
+                          children 
+                            Shape {
+                              appearance 
+                              Appearance {
+                                material 
+                                Material {
+                                  diffuseColor 0 0 0
+
+                                }
+
+                              }
+                              geometry 
+                              IndexedFaceSet {
+                                coord 
+                                USE o1
+                                coordIndex [ 0, 2, 1, -1, 1, 2, 3, -1,
+                                    6, 4, 5, -1, 6, 5, 7, -1,
+                                    10, 8, 9, -1, 10, 9, 11, -1,
+                                    18, 21, 20, -1, 18, 12, 21, -1,
+                                    19, 18, 20, -1, 17, 13, 12, -1,
+                                    17, 12, 18, -1, 14, 13, 17, -1,
+                                    15, 17, 16, -1, 15, 14, 17, -1,
+                                    23, 24, 22, -1, 27, 24, 26, -1,
+                                    22, 24, 27, -1, 24, 25, 26, -1,
+                                    30, 28, 29, -1, 30, 29, 31, -1,
+                                    34, 32, 33, -1, 34, 33, 35, -1,
+                                    42, 36, 54, -1, 43, 42, 54, -1,
+                                    41, 36, 42, -1, 44, 43, 54, -1,
+                                    40, 36, 41, -1, 45, 54, 53, -1,
+                                    45, 44, 54, -1, 38, 36, 40, -1,
+                                    46, 45, 53, -1, 47, 46, 53, -1,
+                                    48, 47, 53, -1, 37, 36, 38, -1,
+                                    52, 49, 48, -1, 52, 50, 49, -1,
+                                    52, 39, 50, -1, 52, 51, 39, -1,
+                                    52, 48, 53, -1, 55, 58, 56, -1,
+                                    55, 57, 58, -1, 72, 60, 73, -1,
+                                    71, 69, 70, -1, 69, 67, 68, -1,
+                                    71, 67, 69, -1, 60, 59, 71, -1,
+                                    72, 59, 60, -1, 71, 59, 67, -1,
+                                    61, 62, 59, -1, 59, 62, 67, -1,
+                                    66, 64, 65, -1, 67, 63, 66, -1,
+                                    66, 63, 64, -1, 62, 63, 67, -1,
+                                    74, 77, 75, -1, 74, 76, 77, -1,
+                                    78, 81, 79, -1, 79, 81, 93, -1,
+                                    93, 82, 94, -1, 81, 82, 93, -1,
+                                    94, 83, 95, -1, 95, 83, 96, -1,
+                                    82, 83, 94, -1, 96, 84, 97, -1,
+                                    83, 84, 96, -1, 97, 85, 98, -1,
+                                    84, 85, 97, -1, 98, 86, 99, -1,
+                                    85, 86, 98, -1, 99, 87, 100, -1,
+                                    86, 87, 99, -1, 87, 88, 100, -1,
+                                    100, 89, 101, -1, 101, 89, 102, -1,
+                                    88, 89, 100, -1, 89, 90, 102, -1,
+                                    102, 91, 103, -1, 90, 91, 102, -1,
+                                    103, 80, 92, -1, 91, 80, 103, -1 ]
+                                ccw TRUE
+                                solid FALSE
+                                convex TRUE
+                                creaseAngle 0
+
+                              }
+
+                            }
+
+                        },
+                          
+                        DEF o3 Group {
+                          children 
+                            Shape {
+                              appearance 
+                              Appearance {
+                                material 
+                                Material {
+                                  emissiveColor 0.098039217 0.098039217 0.098039217
+
+                                }
+
+                              }
+                              geometry 
+                              PointSet {
+                                coord 
+                                USE o1
+
+                              }
+
+                            }
+
+                        } ]
+
+                    },
+                      
+                    USE o2,
+                      
+                    Group {
+                      children [ 
+                        USE o0,
+                          
+                        USE o3 ]
+
+                    },
+                      
+                    USE o3 ]
+
+                }
+
+            }
+
+        },
+          
+        Group {
+          children 
+            Transform {
+              translation 0 -7.6199999 0
+              rotation 1 0 0  1.5707964
+              scale 1 1 1
+              scaleOrientation 0 0 1  0
+              center 0 0 0
+              children 
+                Switch {
+                  whichChoice 0
+                  choice [ 
+                    Group {
+                      children [ 
+                        DEF o4 Group {
+                          children 
+                            Shape {
+                              appearance 
+                              Appearance {
+                                material 
+                                Material {
+                                  diffuseColor 0.098039217 0.098039217 0.098039217
+                                  shininess 1
+
+                                }
+
+                              }
+                              geometry 
+                              IndexedLineSet {
+                                coord 
+                                DEF o5 Coordinate {
+                                  point [ 7.8200002 2.52 -0.30000001,
+                                      7.8200002 2.52 0.30000001,
+                                      -0.2 2.52 -0.30000001,
+                                      -0.2 2.52 0.30000001,
+                                      -0.2 2.52 -0.30000001,
+                                      -0.2 2.52 0.30000001,
+                                      -0.2 -3 -0.30000001,
+                                      -0.2 -3 0.30000001,
+                                      -0.2 -3 -0.30000001,
+                                      -0.2 -3 0.30000001,
+                                      0.2 -3 -0.30000001,
+                                      0.2 -3 0.30000001,
+                                      0.2 2.1199999 -0.30000001,
+                                      0.2 2.1199999 0.30000001,
+                                      0.2 -3 -0.30000001,
+                                      0.2 -3 0.30000001,
+                                      7.4200001 2.1199999 -0.30000001,
+                                      7.4200001 2.1199999 0.30000001,
+                                      0.2 2.1199999 -0.30000001,
+                                      0.2 2.1199999 0.30000001,
+                                      7.4200001 -3 -0.30000001,
+                                      7.4200001 -3 0.30000001,
+                                      7.4200001 2.1199999 -0.30000001,
+                                      7.4200001 2.1199999 0.30000001,
+                                      7.8200002 -3 -0.30000001,
+                                      7.8200002 -3 0.30000001,
+                                      7.4200001 -3 -0.30000001,
+                                      7.4200001 -3 0.30000001,
+                                      7.8200002 2.52 -0.30000001,
+                                      7.8200002 2.52 0.30000001,
+                                      7.8200002 -3 -0.30000001,
+                                      7.8200002 -3 0.30000001,
+                                      7.8200002 2.52 -0.30000001,
+                                      -0.2 2.52 -0.30000001,
+                                      -0.2 -3 -0.30000001,
+                                      0.2 -3 -0.30000001,
+                                      0.2 2.1199999 -0.30000001,
+                                      7.4200001 2.1199999 -0.30000001,
+                                      7.4200001 -3 -0.30000001,
+                                      7.8200002 -3 -0.30000001,
+                                      7.8200002 2.52 0.30000001,
+                                      -0.2 2.52 0.30000001,
+                                      -0.2 -3 0.30000001,
+                                      0.2 -3 0.30000001,
+                                      0.2 2.1199999 0.30000001,
+                                      7.4200001 2.1199999 0.30000001,
+                                      7.4200001 -3 0.30000001,
+                                      7.8200002 -3 0.30000001,
+                                      7.8200002 2.52 -0.30000001,
+                                      7.8200002 2.52 0.30000001,
+                                      -0.2 2.52 -0.30000001,
+                                      -0.2 2.52 0.30000001,
+                                      -0.2 -3 -0.30000001,
+                                      -0.2 -3 0.30000001,
+                                      0.2 -3 -0.30000001,
+                                      0.2 -3 0.30000001,
+                                      0.2 2.1199999 -0.30000001,
+                                      0.2 2.1199999 0.30000001,
+                                      7.4200001 2.1199999 -0.30000001,
+                                      7.4200001 2.1199999 0.30000001,
+                                      7.4200001 -3 -0.30000001,
+                                      7.4200001 -3 0.30000001,
+                                      7.8200002 -3 -0.30000001,
+                                      7.8200002 -3 0.30000001 ]
+
+                                }
+                                coordIndex [ 0, 1, -1, 2, 3, -1, 0, 2,
+                                    -1, 1, 3, -1, 6, 7, -1, 4,
+                                    6, -1, 5, 7, -1, 10, 11, -1,
+                                    8, 10, -1, 9, 11, -1, 12, 13,
+                                    -1, 12, 14, -1, 13, 15, -1, 16,
+                                    17, -1, 16, 18, -1, 17, 19, -1,
+                                    20, 21, -1, 20, 22, -1, 21, 23,
+                                    -1, 24, 25, -1, 24, 26, -1, 25,
+                                    27, -1, 28, 30, -1, 29, 31, -1 ]
+
+                              }
+
+                            }
+
+                        },
+                          
+                        DEF o6 Group {
+                          children 
+                            Shape {
+                              appearance 
+                              Appearance {
+                                material 
+                                Material {
+                                  diffuseColor 0.50749999 0.50749999 0.50749999
+                                  ambientIntensity 0.19220001
+                                  specularColor 0.50830001 0.50830001 0.50830001
+
+                                }
+
+                              }
+                              geometry 
+                              IndexedFaceSet {
+                                coord 
+                                USE o5
+                                coordIndex [ 0, 2, 1, -1, 1, 2, 3, -1,
+                                    4, 7, 5, -1, 4, 6, 7, -1,
+                                    8, 10, 9, -1, 9, 10, 11, -1,
+                                    15, 12, 13, -1, 14, 12, 15, -1,
+                                    18, 16, 17, -1, 18, 17, 19, -1,
+                                    23, 20, 21, -1, 22, 20, 23, -1,
+                                    26, 24, 25, -1, 26, 25, 27, -1,
+                                    31, 28, 29, -1, 30, 28, 31, -1,
+                                    36, 35, 34, -1, 33, 36, 34, -1,
+                                    37, 39, 38, -1, 37, 36, 33, -1,
+                                    32, 39, 37, -1, 32, 37, 33, -1,
+                                    43, 44, 42, -1, 44, 41, 42, -1,
+                                    47, 45, 46, -1, 44, 45, 41, -1,
+                                    47, 40, 45, -1, 45, 40, 41, -1 ]
+                                ccw TRUE
+                                solid FALSE
+                                convex TRUE
+                                creaseAngle 0
+
+                              }
+
+                            }
+
+                        },
+                          
+                        DEF o7 Group {
+                          children 
+                            Shape {
+                              appearance 
+                              Appearance {
+                                material 
+                                Material {
+                                  emissiveColor 0.098039217 0.098039217 0.098039217
+
+                                }
+
+                              }
+                              geometry 
+                              PointSet {
+                                coord 
+                                USE o5
+
+                              }
+
+                            }
+
+                        } ]
+
+                    },
+                      
+                    USE o6,
+                      
+                    Group {
+                      children [ 
+                        USE o4,
+                          
+                        USE o7 ]
+
+                    },
+                      
+                    USE o7 ]
+
+                }
+
+            }
+
+        },
+          
+        Group {
+          children 
+            Transform {
+              translation 0 0 0
+              rotation -1 0 0  4.712389
+              scale 1 1 1
+              scaleOrientation 0 0 1  0
+              center 0 0 0
+              children 
+                Switch {
+                  whichChoice 0
+                  choice [ 
+                    Group {
+                      children [ 
+                        DEF o8 Group {
+                          children 
+                            Shape {
+                              appearance 
+                              Appearance {
+                                material 
+                                Material {
+                                  diffuseColor 0.098039217 0.098039217 0.098039217
+                                  shininess 1
+
+                                }
+
+                              }
+                              geometry 
+                              IndexedLineSet {
+                                coord 
+                                USE o5
+                                coordIndex [ 0, 1, -1, 2, 3, -1, 0, 2,
+                                    -1, 1, 3, -1, 6, 7, -1, 4,
+                                    6, -1, 5, 7, -1, 10, 11, -1,
+                                    8, 10, -1, 9, 11, -1, 12, 13,
+                                    -1, 12, 14, -1, 13, 15, -1, 16,
+                                    17, -1, 16, 18, -1, 17, 19, -1,
+                                    20, 21, -1, 20, 22, -1, 21, 23,
+                                    -1, 24, 25, -1, 24, 26, -1, 25,
+                                    27, -1, 28, 30, -1, 29, 31, -1 ]
+
+                              }
+
+                            }
+
+                        },
+                          
+                        DEF o9 Group {
+                          children 
+                            Shape {
+                              appearance 
+                              Appearance {
+                                material 
+                                Material {
+                                  diffuseColor 0.50749999 0.50749999 0.50749999
+                                  ambientIntensity 0.19220001
+                                  specularColor 0.50830001 0.50830001 0.50830001
+
+                                }
+
+                              }
+                              geometry 
+                              IndexedFaceSet {
+                                coord 
+                                USE o5
+                                coordIndex [ 0, 2, 1, -1, 1, 2, 3, -1,
+                                    4, 6, 5, -1, 5, 6, 7, -1,
+                                    9, 8, 11, -1, 8, 10, 11, -1,
+                                    15, 12, 13, -1, 14, 12, 15, -1,
+                                    18, 16, 17, -1, 18, 17, 19, -1,
+                                    23, 20, 21, -1, 22, 20, 23, -1,
+                                    24, 25, 27, -1, 26, 24, 27, -1,
+                                    31, 28, 29, -1, 30, 28, 31, -1,
+                                    36, 34, 33, -1, 36, 35, 34, -1,
+                                    37, 39, 38, -1, 37, 36, 33, -1,
+                                    32, 39, 37, -1, 32, 37, 33, -1,
+                                    42, 44, 41, -1, 43, 44, 42, -1,
+                                    47, 45, 46, -1, 44, 45, 41, -1,
+                                    47, 40, 45, -1, 45, 40, 41, -1 ]
+                                ccw TRUE
+                                solid FALSE
+                                convex TRUE
+                                creaseAngle 0
+
+                              }
+
+                            }
+
+                        },
+                          
+                        DEF o10 Group {
+                          children 
+                            Shape {
+                              appearance 
+                              Appearance {
+                                material 
+                                Material {
+                                  emissiveColor 0.098039217 0.098039217 0.098039217
+
+                                }
+
+                              }
+                              geometry 
+                              PointSet {
+                                coord 
+                                USE o5
+
+                              }
+
+                            }
+
+                        } ]
+
+                    },
+                      
+                    USE o9,
+                      
+                    Group {
+                      children [ 
+                        USE o8,
+                          
+                        USE o10 ]
+
+                    },
+                      
+                    USE o10 ]
+
+                }
+
+            }
+
+        } ]
+
+    }
+
+}