Merge remote-tracking branch 'refs/remotes/KiCad/master' into Travis-CI-Integration

library/conn.dcm

@@ -665,6 +665,18 @@ K connector SD microsd
 F http://katalog.we-online.de/em/datasheet/693072010801.pdf
 $ENDCMP
 #
+$CMP Micro_SD_Card_Det
+D Micro SD Card Socket with card detection pins
+K connector SD microsd
+F https://www.hirose.com/product/en/download_file/key_name/DM3/category/Catalog/doc_file_id/49662/?file_category_id=4&item_id=195&is_series=1
+$ENDCMP
+#
+$CMP Micro_SD_Card_Det_Hirose_DM3AT
+D Micro SD Card Socket with card detection pins
+K connector SD microsd
+F https://www.hirose.com/product/en/download_file/key_name/DM3/category/Catalog/doc_file_id/49662/?file_category_id=4&item_id=195&is_series=1
+$ENDCMP
+#
 $CMP PCI_5V_32BIT
 D Connector BUS PCI
 K PCI

library/conn.lib

@@ -9578,6 +9578,42 @@ X SHIELD 9 800 -600 150 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
+# Micro_SD_Card_Det
+#
+DEF Micro_SD_Card_Det J 0 40 Y Y 1 F N
+F0 "J" -650 700 50 H V C CNN
+F1 "Micro_SD_Card_Det" 650 700 50 H V R CNN
+F2 "" 2050 700 50 H I C CNN
+F3 "" 0 100 50 H I C CNN
+ALIAS Micro_SD_Card_Det_Hirose_DM3AT
+$FPLIST
+ microSD*Card*Receptable*
+$ENDFPLIST
+DRAW
+S -300 -275 -200 -325 0 1 0 F
+S -300 -175 -200 -225 0 1 0 F
+S -300 -75 -200 -125 0 1 0 F
+S -300 25 -200 -25 0 1 0 F
+S -300 125 -200 75 0 1 0 F
+S -300 225 -200 175 0 1 0 F
+S -300 325 -200 275 0 1 0 F
+S -300 425 -200 375 0 1 0 F
+P 6 0 1 10 650 600 650 650 -750 650 -750 -650 650 -650 650 -350 N
+P 11 0 1 10 -350 -350 -350 450 -50 450 100 600 150 600 150 550 250 550 300 600 800 600 800 -350 -350 -350 f
+X DAT2 1 -900 400 150 R 50 50 1 1 B
+X DAT3/CD 2 -900 300 150 R 50 50 1 1 B
+X CMD 3 -900 200 150 R 50 50 1 1 I
+X VDD 4 -900 100 150 R 50 50 1 1 W
+X CLK 5 -900 0 150 R 50 50 1 1 I
+X VSS 6 -900 -100 150 R 50 50 1 1 W
+X DAT0 7 -900 -200 150 R 50 50 1 1 I
+X DAT1 8 -900 -300 150 R 50 50 1 1 I
+X DET_B 9 -900 -500 150 R 50 50 1 1 P
+X DET_A 10 -900 -400 150 R 50 50 1 1 P
+X SHIELD 11 800 -500 150 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
 # PAL20
 #
 DEF PAL20 J 0 40 Y Y 1 F N

library/microchip_pic16mcu.lib

@@ -180,9 +180,9 @@ X RA3/T1G/~SS~/~MCLR~/Vpp 4 -2000 0 150 R 50 50 1 1 I
 X PWM1/CWG1A/T0CKI/RC5 5 2000 -300 150 L 50 50 1 1 B
 X CWG1B/C1OUT/C2OUT/RC4 6 2000 -200 150 L 50 50 1 1 B
 X CLKR/C1IN3-/C2IN3-/DACOUT2/AN7/RC3 7 2000 -100 150 L 50 50 1 1 B
-X RB7/TX/CK 7 -2000 -700 150 R 50 50 1 1 B
 X ~SS~/PWM2/AN8/RC6 8 2000 -400 150 L 50 50 1 1 B
 X SDO/AN9/RC7 9 2000 -500 150 L 50 50 1 1 B
+X RB7/TX/CK 10 -2000 -700 150 R 50 50 1 1 B
 X VSS 20 0 -1000 150 U 50 50 1 1 W
 X RB6/SCL/SCK 11 -2000 -600 150 R 50 50 1 1 B
 X RB5/AN11/RX/DX 12 -2000 -500 150 R 50 50 1 1 B

library/powerint.dcm

@@ -1392,12 +1392,6 @@ K Eco Smart Off-Line Switcher, Extendend Power Range
 F https://ac-dc.power.com/sites/default/files/product-docs/topswitch-hx_family_datasheet.pdf
 $ENDCMP
 #
-$CMP TOP262YN
-D TOPSwitch-HX Family, 254W Output Power
-K Eco Smart Off-Line Switcher, Extendend Power Range
-F https://ac-dc.power.com/sites/default/files/product-docs/topswitch-hx_family_datasheet.pdf
-$ENDCMP
-#
 $CMP TOP264EG
 D TOPSwitch-JX Family, 43W Output Power, eSIP-7C
 K Integrated Off-Line Switcher with EcoSmart™ Technology