Merge remote-tracking branch 'kicad/master'

library/regul.dcm

@@ -936,6 +936,12 @@ K Voltage Regulator 3A Positive LDO Disable Pin
 F http://www.fairchildsemi.com/ds/KA/KA378R33.pdf
 $ENDCMP
 #
+$CMP L200
+D Adjustable voltage and current regulator, 2A, 36V
+K 2A Regulator Adjustable Positive
+F http://www.zen22142.zen.co.uk/Circuits/Power/l200.pdf
+$ENDCMP
+#
 $CMP LD1117S12CTR
 D 800mA Fixed Low Drop Positive Voltage Regulator, Fixed Output 1.2V, SOT223
 K REGULATOR LDO 1.2V

library/regul.lib

@@ -292,6 +292,26 @@ X Vdis 4 -400 -100 150 R 40 40 1 1 I
 ENDDRAW
 ENDDEF
 #
+# L200
+#
+DEF L200 U 0 40 Y Y 1 F N
+F0 "U" 250 350 50 H V C CNN
+F1 "L200" -200 350 50 H V C CNN
+F2 "" 0 100 50 H V C CNN
+F3 "" 0 100 50 H V C CNN
+$FPLIST
+ Pentawatt*
+$ENDFPLIST
+DRAW
+S -300 300 300 -300 0 1 10 f
+X VIN 1 -400 200 100 R 50 50 1 1 W
+X LIMIT 2 400 0 100 L 50 50 1 1 I
+X GND 3 -200 -400 100 U 50 50 1 1 W
+X REF 4 200 -400 100 U 50 50 1 1 I
+X VOUT 5 400 200 100 L 50 50 1 1 w
+ENDDRAW
+ENDDEF
+#
 # LD1117S33TR
 #
 DEF LD1117S33TR U 0 30 Y Y 1 F N