Update demo files

demos/complex_hierarchy/ampli_ht.sch

@@ -7,12 +7,11 @@ LIBS:linear
 LIBS:regul
 LIBS:interface
 LIBS:special
-LIBS:complex_hierarchy-cache
 EELAYER 24 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
-Sheet 2 3
+Sheet 3 3
 Title ""
 Date "1 apr 2010"
 Rev ""
@@ -152,7 +151,7 @@ U 1 1 4B617B88
 P 9150 5350
 AR Path="/4B3A1333/4B617B88" Ref="R26"  Part="1" 
 AR Path="/4B3A13A4/4B617B88" Ref="R28"  Part="1" 
-F 0 "R28" V 9230 5350 50  0000 C CNN
+F 0 "R26" V 9230 5350 50  0000 C CNN
 F 1 "220K" V 9150 5350 50  0000 C CNN
 F 2 "" H 9150 5350 60  0001 C CNN
 F 3 "" H 9150 5350 60  0001 C CNN
@@ -173,7 +172,7 @@ U 1 1 4B616B96
 P 9450 4700
 AR Path="/4B3A1333/4B616B96" Ref="R25"  Part="1" 
 AR Path="/4B3A13A4/4B616B96" Ref="R27"  Part="1" 
-F 0 "R27" V 9530 4700 50  0000 C CNN
+F 0 "R25" V 9530 4700 50  0000 C CNN
 F 1 "47" V 9450 4700 50  0000 C CNN
 F 2 "" H 9450 4700 60  0001 C CNN
 F 3 "" H 9450 4700 60  0001 C CNN
@@ -186,7 +185,7 @@ U 1 1 4B616AFA
 P 8200 4600
 AR Path="/4B3A1333/4B616AFA" Ref="D8"  Part="1" 
 AR Path="/4B3A13A4/4B616AFA" Ref="D9"  Part="1" 
-F 0 "D9" H 8200 4700 40  0000 C CNN
+F 0 "D8" H 8200 4700 40  0000 C CNN
 F 1 "1N4148" H 8200 4500 40  0000 C CNN
 F 2 "" H 8200 4600 60  0001 C CNN
 F 3 "" H 8200 4600 60  0001 C CNN
@@ -228,7 +227,7 @@ U 1 1 4B61688C
 P 8100 5250
 AR Path="/4B3A1333/4B61688C" Ref="R10"  Part="1" 
 AR Path="/4B3A13A4/4B61688C" Ref="R20"  Part="1" 
-F 0 "R20" V 8180 5250 50  0000 C CNN
+F 0 "R10" V 8180 5250 50  0000 C CNN
 F 1 "5,6K" V 8100 5250 50  0000 C CNN
 F 2 "" H 8100 5250 60  0001 C CNN
 F 3 "" H 8100 5250 60  0001 C CNN
@@ -270,7 +269,7 @@ U 1 1 4B4F3641
 P 2850 2250
 AR Path="/4B3A1333/4B4F3641" Ref="C12"  Part="1" 
 AR Path="/4B3A13A4/4B4F3641" Ref="C14"  Part="1" 
-F 0 "C14" H 2900 2350 50  0000 L CNN
+F 0 "C12" H 2900 2350 50  0000 L CNN
 F 1 "150nF" H 2900 2150 50  0000 L CNN
 F 2 "" H 2850 2250 60  0001 C CNN
 F 3 "" H 2850 2250 60  0001 C CNN
@@ -283,7 +282,7 @@ U 1 1 4B4F363E
 P 2500 2000
 AR Path="/4B3A1333/4B4F363E" Ref="R23"  Part="1" 
 AR Path="/4B3A13A4/4B4F363E" Ref="R24"  Part="1" 
-F 0 "R24" V 2580 2000 50  0000 C CNN
+F 0 "R23" V 2580 2000 50  0000 C CNN
 F 1 "1K" V 2500 2000 50  0000 C CNN
 F 2 "" H 2500 2000 60  0001 C CNN
 F 3 "" H 2500 2000 60  0001 C CNN
@@ -336,7 +335,7 @@ U 1 1 4B3A137D
 P 8500 4250
 AR Path="/4B3A13A4/4B3A137D" Ref="Q6"  Part="1" 
 AR Path="/4B3A1333/4B3A137D" Ref="Q2"  Part="1" 
-F 0 "Q6" H 8500 4100 50  0000 R CNN
+F 0 "Q2" H 8500 4100 50  0000 R CNN
 F 1 "MPAS42" H 8500 4400 50  0000 R CNN
 F 2 "" H 8500 4250 60  0001 C CNN
 F 3 "" H 8500 4250 60  0001 C CNN
@@ -357,7 +356,7 @@ U 1 1 4B3A137C
 P 8500 4900
 AR Path="/4B3A13A4/4B3A137C" Ref="Q7"  Part="1" 
 AR Path="/4B3A1333/4B3A137C" Ref="Q3"  Part="1" 
-F 0 "Q7" H 8500 4750 60  0000 R CNN
+F 0 "Q3" H 8500 4750 60  0000 R CNN
 F 1 "MPAS92" H 8500 5050 60  0000 R CNN
 F 2 "" H 8500 4900 60  0001 C CNN
 F 3 "" H 8500 4900 60  0001 C CNN
@@ -378,7 +377,7 @@ U 1 1 4B3A137B
 P 7900 4600
 AR Path="/4B3A13A4/4B3A137B" Ref="D7"  Part="1" 
 AR Path="/4B3A1333/4B3A137B" Ref="D4"  Part="1" 
-F 0 "D7" H 7900 4700 40  0000 C CNN
+F 0 "D4" H 7900 4700 40  0000 C CNN
 F 1 "1N4148" H 7900 4500 40  0000 C CNN
 F 2 "" H 7900 4600 60  0001 C CNN
 F 3 "" H 7900 4600 60  0001 C CNN
@@ -420,7 +419,7 @@ U 1 1 4B3A1379
 P 7800 5100
 AR Path="/4B3A13A4/4B3A1379" Ref="Q8"  Part="1" 
 AR Path="/4B3A1333/4B3A1379" Ref="Q4"  Part="1" 
-F 0 "Q8" H 7800 4950 50  0000 R CNN
+F 0 "Q4" H 7800 4950 50  0000 R CNN
 F 1 "MPAS42" H 7800 5250 50  0000 R CNN
 F 2 "" H 7800 5100 60  0001 C CNN
 F 3 "" H 7800 5100 60  0001 C CNN
@@ -462,7 +461,7 @@ U 1 1 4B3A1377
 P 7650 3600
 AR Path="/4B3A13A4/4B3A1377" Ref="D6"  Part="1" 
 AR Path="/4B3A1333/4B3A1377" Ref="D3"  Part="1" 
-F 0 "D6" H 7650 3700 40  0000 C CNN
+F 0 "D3" H 7650 3700 40  0000 C CNN
 F 1 "1N4148" H 7650 3500 40  0000 C CNN
 F 2 "" H 7650 3600 60  0001 C CNN
 F 3 "" H 7650 3600 60  0001 C CNN
@@ -483,7 +482,7 @@ U 1 1 4B3A1376
 P 8200 3300
 AR Path="/4B3A13A4/4B3A1376" Ref="R13"  Part="1" 
 AR Path="/4B3A1333/4B3A1376" Ref="R3"  Part="1" 
-F 0 "R13" V 8280 3300 50  0000 C CNN
+F 0 "R3" V 8280 3300 50  0000 C CNN
 F 1 "470" V 8200 3300 50  0000 C CNN
 F 2 "" H 8200 3300 60  0001 C CNN
 F 3 "" H 8200 3300 60  0001 C CNN
@@ -504,7 +503,7 @@ U 1 1 4B3A1375
 P 7650 3150
 AR Path="/4B3A13A4/4B3A1375" Ref="D5"  Part="1" 
 AR Path="/4B3A1333/4B3A1375" Ref="D2"  Part="1" 
-F 0 "D5" H 7650 3250 40  0000 C CNN
+F 0 "D2" H 7650 3250 40  0000 C CNN
 F 1 "1N4148" H 7650 3050 40  0000 C CNN
 F 2 "" H 7650 3150 60  0001 C CNN
 F 3 "" H 7650 3150 60  0001 C CNN
@@ -525,7 +524,7 @@ U 1 1 4B3A1374
 P 7650 4150
 AR Path="/4B3A13A4/4B3A1374" Ref="R14"  Part="1" 
 AR Path="/4B3A1333/4B3A1374" Ref="R4"  Part="1" 
-F 0 "R14" V 7730 4150 50  0000 C CNN
+F 0 "R4" V 7730 4150 50  0000 C CNN
 F 1 "220K" V 7650 4150 50  0000 C CNN
 F 2 "" H 7650 4150 60  0001 C CNN
 F 3 "" H 7650 4150 60  0001 C CNN
@@ -567,7 +566,7 @@ U 1 1 4B3A1371
 P 7250 5100
 AR Path="/4B3A13A4/4B3A1371" Ref="R18"  Part="1" 
 AR Path="/4B3A1333/4B3A1371" Ref="R8"  Part="1" 
-F 0 "R18" V 7330 5100 50  0000 C CNN
+F 0 "R8" V 7330 5100 50  0000 C CNN
 F 1 "1K" V 7250 5100 50  0000 C CNN
 F 2 "" H 7250 5100 60  0001 C CNN
 F 3 "" H 7250 5100 60  0001 C CNN
@@ -588,7 +587,7 @@ U 1 1 4B3A1370
 P 8900 5350
 AR Path="/4B3A13A4/4B3A1370" Ref="R22"  Part="1" 
 AR Path="/4B3A1333/4B3A1370" Ref="R12"  Part="1" 
-F 0 "R22" V 8980 5350 50  0000 C CNN
+F 0 "R12" V 8980 5350 50  0000 C CNN
 F 1 "220K" V 8900 5350 50  0000 C CNN
 F 2 "" H 8900 5350 60  0001 C CNN
 F 3 "" H 8900 5350 60  0001 C CNN
@@ -630,7 +629,7 @@ U 1 1 4B3A136D
 P 7400 5400
 AR Path="/4B3A13A4/4B3A136D" Ref="R19"  Part="1" 
 AR Path="/4B3A1333/4B3A136D" Ref="R9"  Part="1" 
-F 0 "R19" V 7480 5400 50  0000 C CNN
+F 0 "R9" V 7480 5400 50  0000 C CNN
 F 1 "1K" V 7400 5400 50  0000 C CNN
 F 2 "" H 7400 5400 60  0001 C CNN
 F 3 "" H 7400 5400 60  0001 C CNN
@@ -651,7 +650,7 @@ U 1 1 4B3A136C
 P 10750 4700
 AR Path="/4B3A13A4/4B3A136C" Ref="P5"  Part="1" 
 AR Path="/4B3A1333/4B3A136C" Ref="P3"  Part="1" 
-F 0 "P5" V 10700 4700 40  0000 C CNN
+F 0 "P3" V 10700 4700 40  0000 C CNN
 F 1 "CONN_2" V 10800 4700 40  0000 C CNN
 F 2 "" H 10750 4700 60  0001 C CNN
 F 3 "" H 10750 4700 60  0001 C CNN
@@ -666,7 +665,7 @@ U 1 1 4B3A136B
 P 3400 2000
 AR Path="/4B3A13A4/4B3A136B" Ref="R16"  Part="1" 
 AR Path="/4B3A1333/4B3A136B" Ref="R6"  Part="1" 
-F 0 "R16" V 3480 2000 50  0000 C CNN
+F 0 "R6" V 3480 2000 50  0000 C CNN
 F 1 "22K" V 3400 2000 50  0000 C CNN
 F 2 "" H 3400 2000 60  0001 C CNN
 F 3 "" H 3400 2000 60  0001 C CNN
@@ -729,7 +728,7 @@ U 1 1 4B3A1368
 P 6400 5400
 AR Path="/4B3A13A4/4B3A1368" Ref="U4"  Part="1" 
 AR Path="/4B3A1333/4B3A1368" Ref="U3"  Part="1" 
-F 0 "U4" H 6450 5600 60  0000 C CNN
+F 0 "U3" H 6450 5600 60  0000 C CNN
 F 1 "LM358N" H 6550 5200 50  0000 C CNN
 F 2 "" H 6400 5400 60  0001 C CNN
 F 3 "" H 6400 5400 60  0001 C CNN
@@ -742,7 +741,7 @@ U 1 1 4B3A1367
 P 1400 2100
 AR Path="/4B3A13A4/4B3A1367" Ref="P6"  Part="1" 
 AR Path="/4B3A1333/4B3A1367" Ref="P4"  Part="1" 
-F 0 "P6" V 1350 2100 40  0000 C CNN
+F 0 "P4" V 1350 2100 40  0000 C CNN
 F 1 "CONN_2" V 1450 2100 40  0000 C CNN
 F 2 "" H 1400 2100 60  0001 C CNN
 F 3 "" H 1400 2100 60  0001 C CNN
@@ -763,7 +762,7 @@ U 1 1 4B3A1366
 P 4100 2450
 AR Path="/4B3A13A4/4B3A1366" Ref="C7"  Part="1" 
 AR Path="/4B3A1333/4B3A1366" Ref="C4"  Part="1" 
-F 0 "C7" H 4150 2550 50  0000 L CNN
+F 0 "C4" H 4150 2550 50  0000 L CNN
 F 1 "4,7nF" H 4150 2350 50  0000 L CNN
 F 2 "" H 4100 2450 60  0001 C CNN
 F 3 "" H 4100 2450 60  0001 C CNN
@@ -776,7 +775,7 @@ U 1 1 4B3A1365
 P 8100 5750
 AR Path="/4B3A13A4/4B3A1365" Ref="C8"  Part="1" 
 AR Path="/4B3A1333/4B3A1365" Ref="C5"  Part="1" 
-F 0 "C8" H 8150 5850 50  0000 L CNN
+F 0 "C5" H 8150 5850 50  0000 L CNN
 F 1 "820pF" H 8150 5650 50  0000 L CNN
 F 2 "" H 8100 5750 60  0001 C CNN
 F 3 "" H 8100 5750 60  0001 C CNN
@@ -789,7 +788,7 @@ U 1 1 4B3A1364
 P 9450 4450
 AR Path="/4B3A13A4/4B3A1364" Ref="R15"  Part="1" 
 AR Path="/4B3A1333/4B3A1364" Ref="R5"  Part="1" 
-F 0 "R15" V 9530 4450 50  0000 C CNN
+F 0 "R5" V 9530 4450 50  0000 C CNN
 F 1 "47" V 9450 4450 50  0000 C CNN
 F 2 "" H 9450 4450 60  0001 C CNN
 F 3 "" H 9450 4450 60  0001 C CNN
@@ -815,7 +814,7 @@ U 1 1 4B3A1362
 P 5150 6400
 AR Path="/4B3A13A4/4B3A1362" Ref="R21"  Part="1" 
 AR Path="/4B3A1333/4B3A1362" Ref="R11"  Part="1" 
-F 0 "R21" V 5230 6400 50  0000 C CNN
+F 0 "R11" V 5230 6400 50  0000 C CNN
 F 1 "4,7K" V 5150 6400 50  0000 C CNN
 F 2 "" H 5150 6400 60  0001 C CNN
 F 3 "" H 5150 6400 60  0001 C CNN
@@ -857,7 +856,7 @@ U 1 1 4B3A1360
 P 8100 3850
 AR Path="/4B3A13A4/4B3A1360" Ref="Q5"  Part="1" 
 AR Path="/4B3A1333/4B3A1360" Ref="Q1"  Part="1" 
-F 0 "Q5" H 8100 3700 60  0000 R CNN
+F 0 "Q1" H 8100 3700 60  0000 R CNN
 F 1 "MPAS92" H 8100 4000 60  0000 R CNN
 F 2 "" H 8100 3850 60  0001 C CNN
 F 3 "" H 8100 3850 60  0001 C CNN
@@ -917,7 +916,7 @@ U 2 1 4B3A135C
 P 4850 2400
 AR Path="/4B3A13A4/4B3A135C" Ref="U4"  Part="2" 
 AR Path="/4B3A1333/4B3A135C" Ref="U3"  Part="2" 
-F 0 "U4" H 4900 2600 60  0000 C CNN
+F 0 "U3" H 4900 2600 60  0000 C CNN
 F 1 "LM358N" H 5000 2200 50  0000 C CNN
 F 2 "" H 4850 2400 60  0001 C CNN
 F 3 "" H 4850 2400 60  0001 C CNN
@@ -951,7 +950,7 @@ U 1 1 4B3A1359
 P 4000 2000
 AR Path="/4B3A13A4/4B3A1359" Ref="R17"  Part="1" 
 AR Path="/4B3A1333/4B3A1359" Ref="R7"  Part="1" 
-F 0 "R17" V 4080 2000 50  0000 C CNN
+F 0 "R7" V 4080 2000 50  0000 C CNN
 F 1 "22K" V 4000 2000 50  0000 C CNN
 F 2 "" H 4000 2000 60  0001 C CNN
 F 3 "" H 4000 2000 60  0001 C CNN
@@ -972,7 +971,7 @@ U 1 1 4B3A1358
 P 4350 1600
 AR Path="/4B3A13A4/4B3A1358" Ref="C6"  Part="1" 
 AR Path="/4B3A1333/4B3A1358" Ref="C3"  Part="1" 
-F 0 "C6" H 4400 1700 50  0000 L CNN
+F 0 "C3" H 4400 1700 50  0000 L CNN
 F 1 "15nF" H 4400 1500 50  0000 L CNN
 F 2 "" H 4350 1600 60  0001 C CNN
 F 3 "" H 4350 1600 60  0001 C CNN
@@ -987,7 +986,7 @@ U 1 1 4B3A1357
 P 5850 6400
 AR Path="/4B3A13A4/4B3A1357" Ref="RV2"  Part="1" 
 AR Path="/4B3A1333/4B3A1357" Ref="RV1"  Part="1" 
-F 0 "RV2" H 5850 6300 50  0000 C CNN
+F 0 "RV1" H 5850 6300 50  0000 C CNN
 F 1 "4,7K" H 5850 6400 50  0000 C CNN
 F 2 "" H 5850 6400 60  0001 C CNN
 F 3 "" H 5850 6400 60  0001 C CNN

demos/complex_hierarchy/complex_hierarchy-cache.lib

+EESchema-LIBRARY Version 2.3
+#encoding utf-8
+#
+# +12C
+#
+DEF +12C #PWR 0 0 N Y 1 F P
+F0 "#PWR" 0 -30 30 H I C CNN
+F1 "+12C" 0 110 40 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+X +12C 1 0 0 0 U 30 30 0 0 W N
+C 0 60 20 0 1 0 N
+P 4 0 1 0  0 0  0 40  0 40  0 40 N
+ENDDRAW
+ENDDEF
+#
+# +12V
+#
+DEF +12V #PWR 0 0 N Y 1 F P
+F0 "#PWR" 0 -50 20 H I C CNN
+F1 "+12V" 0 100 30 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+X +12V 1 0 0 0 U 20 30 0 0 W N
+C 0 60 20 0 1 0 N
+P 3 0 1 0  0 0  0 40  0 40 N
+ENDDRAW
+ENDDEF
+#
+# -VAA
+#
+DEF -VAA #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 100 20 H I C CNN
+F1 "-VAA" 0 100 30 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+X -VAA 1 0 0 0 U 20 20 0 0 W N
+P 3 0 1 0  0 0  0 50  0 50 N
+P 7 0 1 0  0 80  30 50  -20 50  -30 50  0 80  0 80  0 80 F
+ENDDRAW
+ENDDEF
+#
+# 7805
+#
+DEF 7805 U 0 30 N Y 1 F N
+F0 "U" 150 -196 60 H V C CNN
+F1 "7805" 0 200 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+ALIAS LM7805 LM7812 78L05
+DRAW
+S -200 -150 200 150 0 1 0 N
+X VI VI -400 50 200 R 40 40 1 1 I
+X VO VO 400 50 200 L 40 40 1 1 w
+X GND GND 0 -250 100 U 40 40 1 1 I
+ENDDRAW
+ENDDEF
+#
+# C
+#
+DEF C C 0 10 N Y 1 F N
+F0 "C" 0 100 40 H V L CNN
+F1 "C" 6 -85 40 H V L CNN
+F2 "" 38 -150 30 H V C CNN
+F3 "" 0 100 30 H V C CNN
+$FPLIST
+ SM*
+ C?
+ C1-1
+$ENDFPLIST
+DRAW
+P 2 0 1 20  -80 -30  80 -30 N
+P 2 0 1 20  -80 30  80 30 N
+X ~ 1 0 200 170 D 40 40 1 1 P
+X ~ 2 0 -200 170 U 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# CONN_2
+#
+DEF CONN_2 P 0 40 Y N 1 F N
+F0 "P" -50 0 40 V V C CNN
+F1 "CONN_2" 50 0 40 V V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+S -100 150 100 -150 0 1 0 N
+X P1 1 -350 100 250 R 60 60 1 1 P I
+X PM 2 -350 -100 250 R 60 60 1 1 P I
+ENDDRAW
+ENDDEF
+#
+# CP
+#
+DEF CP C 0 10 N N 1 F N
+F0 "C" 50 100 40 H V L CNN
+F1 "CP" 50 -100 40 H V L CNN
+F2 "" 100 -150 30 H V C CNN
+F3 "" 50 100 30 H V C CNN
+ALIAS CAPAPOL
+$FPLIST
+ CP*
+ SM*
+$ENDFPLIST
+DRAW
+P 4 0 1 8  -80 50  -80 -50  80 -50  80 50 N
+P 4 0 1 0  -50 50  -50 -20  50 -20  50 50 F
+X ~ 1 0 200 150 D 40 40 1 1 P
+X ~ 2 0 -200 150 U 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# DIODE
+#
+DEF DIODE D 0 40 N N 1 F N
+F0 "D" 0 100 40 H V C CNN
+F1 "DIODE" 0 -100 40 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+$FPLIST
+ D?
+ S*
+$ENDFPLIST
+DRAW
+P 2 0 1 6  50 50  50 -50 N
+P 3 0 1 0  -50 50  50 0  -50 -50 F
+X A 1 -200 0 150 R 40 40 1 1 P
+X K 2 200 0 150 L 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# GND
+#
+DEF ~GND #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 0 30 H I C CNN
+F1 "GND" 0 -70 30 H I C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+P 4 0 1 0  -50 0  0 -50  50 0  -50 0 N
+X GND 1 0 0 0 U 30 30 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# HT
+#
+DEF HT #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 120 20 H I C CNN
+F1 "HT" 0 90 30 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+X HT 1 0 0 0 U 20 20 0 0 W N
+P 3 0 1 0  0 0  0 40  0 40 N
+P 6 0 1 0  0 40  20 20  0 70  -20 20  0 40  0 40 N
+ENDDRAW
+ENDDEF
+#
+# ICL7660
+#
+DEF ICL7660 U 0 40 Y Y 1 F N
+F0 "U" 200 400 70 H V L CNN
+F1 "ICL7660" 50 -450 70 H V L CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+S -550 -350 550 350 0 1 0 N
+X CAP+ 2 -850 250 300 R 60 60 1 1 I
+X GND 3 -50 -650 300 U 60 60 1 1 W
+X CAP- 4 -850 50 300 R 60 60 1 1 I
+X VOUT 5 850 150 300 L 60 60 1 1 w
+X LV 6 850 -150 300 L 60 60 1 1 I
+X OSC 7 -850 -150 300 R 60 60 1 1 I
+X V+ 8 -50 650 300 D 60 60 1 1 W
+ENDDRAW
+ENDDEF
+#
+# LM358
+#
+DEF LM358 U 0 20 Y Y 2 F N
+F0 "U" -50 200 60 H V L CNN
+F1 "LM358" -50 -250 60 H V L CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+ALIAS LMC6062 LMC6082 LM358N TL072 TL082
+DRAW
+P 4 0 1 6  -200 200  200 0  -200 -200  -200 200 f
+X V- 4 -100 -400 250 U 40 40 0 1 W
+X V+ 8 -100 400 250 D 40 40 0 1 W
+X ~ 1 500 0 300 L 40 40 1 1 O
+X - 2 -500 -100 300 R 40 40 1 1 I
+X + 3 -500 100 300 R 40 40 1 1 I
+X + 5 -500 100 300 R 40 40 2 1 I
+X - 6 -500 -100 300 R 40 40 2 1 I
+X ~ 7 500 0 300 L 40 40 2 1 O
+ENDDRAW
+ENDDEF
+#
+# MPSA42
+#
+DEF MPSA42 Q 0 40 Y N 1 F N
+F0 "Q" 150 -150 60 H V L CNN
+F1 "MPSA42" 150 150 60 H V L CNN
+F2 "TO92-CBE" 150 0 30 H I C CNN
+F3 "" 0 0 60 H V C CNN
+$FPLIST
+ TO92-CBE
+$ENDFPLIST
+DRAW
+C 50 0 111 0 1 10 N
+P 2 0 1 0  0 0  100 100 N
+P 3 0 1 10  0 75  0 -75  0 -75 N
+P 3 0 1 0  50 -50  0 0  0 0 N
+P 3 0 1 0  90 -90  100 -100  100 -100 N
+P 5 0 1 0  90 -90  70 -30  30 -70  90 -90  90 -90 F
+X B B -200 0 200 R 40 40 1 1 I
+X C C 100 200 100 D 40 40 1 1 P
+X E E 100 -200 100 U 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# MPSA92
+#
+DEF MPSA92 Q 0 40 Y N 1 F N
+F0 "Q" 150 -150 60 H V L CNN
+F1 "MPSA92" 150 150 60 H V L CNN
+F2 "TO92-CBE" 150 0 30 H I C CNN
+F3 "" 0 0 60 H V C CNN
+$FPLIST
+ TO92-CBE
+$ENDFPLIST
+DRAW
+C 50 0 111 0 1 10 N
+P 2 0 1 0  0 0  100 100 N
+P 3 0 1 10  0 75  0 -75  0 -75 F
+P 3 0 1 0  25 -25  0 0  0 0 N
+P 3 0 1 0  100 -100  65 -65  65 -65 N
+P 5 0 1 0  25 -25  50 -75  75 -50  25 -25  25 -25 F
+X B B -200 0 200 R 40 40 1 1 I
+X C C 100 200 100 D 40 40 1 1 P
+X E E 100 -200 100 U 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# POT
+#
+DEF POT RV 0 40 Y N 1 F N
+F0 "RV" 0 -100 50 H V C CNN
+F1 "POT" 0 0 50 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+S -150 50 150 -50 0 1 0 N
+P 3 0 1 0  0 50  -20 70  20 70 F
+X 1 1 -250 0 100 R 40 40 1 1 P
+X 2 2 0 150 80 D 40 40 1 1 P
+X 3 3 250 0 100 L 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# PWR_FLAG
+#
+DEF PWR_FLAG #FLG 0 0 N N 1 F P
+F0 "#FLG" 0 95 30 H I C CNN
+F1 "PWR_FLAG" 0 180 30 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+X pwr 1 0 0 0 U 20 20 0 0 w
+P 6 0 1 0  0 0  0 50  -75 100  0 150  75 100  0 50 N
+ENDDRAW
+ENDDEF
+#
+# R
+#
+DEF R R 0 0 N Y 1 F N
+F0 "R" 80 0 40 V V C CNN
+F1 "R" 7 1 40 V V C CNN
+F2 "" -70 0 30 V V C CNN
+F3 "" 0 0 30 H V C CNN
+$FPLIST
+ R?
+ SM0603
+ SM0805
+ R?-*
+ SM1206
+$ENDFPLIST
+DRAW
+S -40 150 40 -150 0 1 12 N
+X ~ 1 0 250 100 D 60 60 1 1 P
+X ~ 2 0 -250 100 U 60 60 1 1 P
+ENDDRAW
+ENDDEF
+#
+# VCC
+#
+DEF VCC #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 100 30 H I C CNN
+F1 "VCC" 0 100 30 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+X VCC 1 0 0 0 U 20 20 0 0 W N
+C 0 50 20 0 1 0 N
+P 3 0 1 0  0 0  0 30  0 30 N
+ENDDRAW
+ENDDEF
+#
+#End Library

demos/complex_hierarchy/complex_hierarchy.sch

@@ -7,7 +7,6 @@ LIBS:linear
 LIBS:regul
 LIBS:interface
 LIBS:special
-LIBS:complex_hierarchy-cache
 EELAYER 24 0
 EELAYER END
 $Descr A4 11693 8268

demos/electric/electric-cache.lib

-EESchema-LIBRARY Version 2.3  Date: 09/02/2010 21:35:02
+EESchema-LIBRARY Version 2.3
+#encoding utf-8
 #
 # A_1KVA
 #
 DEF A_1KVA EA 0 10 N Y 1 F N
 F0 "EA" -90 200 40 H V C CNN
 F1 "A_1KVA" 0 130 40 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 P 2 0 0 0  200 -200  200 -200 N
 C -20 10 31 0 1 0 N
@@ -24,6 +27,8 @@ ENDDEF
 DEF C_3x1.5mm2 EC 0 10 N Y 1 F N
 F0 "EC" -170 130 40 H V C CNN
 F1 "C_3x1.5mm2" 0 -100 40 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 P 2 0 0 0  200 -200  200 -200 N
 C -30 50 10 0 1 0 F
@@ -42,6 +47,8 @@ ENDDEF
 DEF C_3x2.5mm2 EC 0 10 N Y 1 F N
 F0 "EC" -170 130 40 H V C CNN
 F1 "C_3x2.5mm2" 0 -100 40 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 P 2 0 0 0  200 -200  200 -200 N
 C -30 50 10 0 1 0 F
@@ -60,6 +67,8 @@ ENDDEF
 DEF C_3x6mm2 EC 0 10 N Y 1 F N
 F0 "EC" -170 130 40 H V C CNN
 F1 "C_3x6mm2" 0 -100 40 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 P 2 0 0 0  200 -200  200 -200 N
 C -30 50 10 0 1 0 F
@@ -78,6 +87,8 @@ ENDDEF
 DEF D_06A ED 0 10 N Y 1 F N
 F0 "ED" -160 120 40 H V C CNN
 F1 "D_06A" -100 -80 40 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 P 2 0 0 0  200 -200  200 -200 N
 P 3 0 1 0  -100 0  60 100  60 100 N
@@ -93,6 +104,8 @@ ENDDEF
 DEF D_10A ED 0 10 N Y 1 F N
 F0 "ED" -160 120 40 H V C CNN
 F1 "D_10A" -100 -80 40 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 P 2 0 0 0  200 -200  200 -200 N
 P 3 0 1 0  -100 0  60 100  60 100 N
@@ -108,6 +121,8 @@ ENDDEF
 DEF D_16A ED 0 10 N Y 1 F N
 F0 "ED" -160 120 40 H V C CNN
 F1 "D_16A" -100 -80 40 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 P 2 0 0 0  200 -200  200 -200 N
 P 3 0 1 0  -100 0  60 100  60 100 N
@@ -123,6 +138,8 @@ ENDDEF
 DEF D_32A ED 0 10 N Y 1 F N
 F0 "ED" -160 120 40 H V C CNN
 F1 "D_32A" -100 -80 40 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 P 2 0 0 0  200 -200  200 -200 N
 P 3 0 1 0  -100 0  60 100  60 100 N
@@ -138,8 +155,10 @@ ENDDEF
 DEF G_Th_3KVA EG 0 10 N Y 1 F N
 F0 "EG" -160 120 40 H V C CNN
 F1 "G_Th_3KVA" 0 -120 40 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
-T 0 0 0 70 0 0 0 G  Normal 1 C C
+T 0 0 0 70 0 0 0 G  Normal 0 C C
 P 2 0 0 0  200 -200  200 -200 N
 C 0 0 84 0 1 0 N
 X ~ 1 200 0 118 L 10 40 1 1 w
@@ -151,6 +170,8 @@ ENDDEF
 DEF I_25A_LUM EI 0 10 N Y 1 F N
 F0 "EI" -160 120 40 H V C CNN
 F1 "I_25A_LUM" 0 -100 40 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 P 2 0 0 0  200 -200  200 -200 N
 C 0 0 36 0 1 0 N
@@ -167,8 +188,10 @@ ENDDEF
 DEF J_40A_30mA EJ 0 10 N Y 1 F N
 F0 "EJ" -210 180 40 H V C CNN
 F1 "J_40A_30mA" -20 -120 40 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
-T 0 120 200 20 0 0 0 OFS  Normal 1 C C
+T 0 120 200 20 0 0 0 OFS  Normal 0 C C
 P 2 0 0 0  200 -200  200 -200 N
 P 5 0 0 0  120 20  120 -20  120 -20  120 -20  120 -20 N
 A -120 60 20 1799 1 0 1 0 N -140 60 -100 60
@@ -190,6 +213,8 @@ ENDDEF
 DEF O_600VA EO 0 10 N Y 1 F N
 F0 "EO" -70 120 40 H V C CNN
 F1 "O_600VA" -40 -150 40 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 P 2 0 0 0  200 -200  200 -200 N
 C -20 0 31 0 1 0 N
@@ -228,6 +253,8 @@ ENDDEF
 DEF O_900VA EO 0 10 N Y 1 F N
 F0 "EO" -70 120 40 H V C CNN
 F1 "O_900VA" -40 -150 40 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 P 2 0 0 0  200 -200  200 -200 N
 C -20 0 31 0 1 0 N
@@ -266,6 +293,8 @@ ENDDEF
 DEF P_10A EP 0 10 N Y 1 F N
 F0 "EP" -160 120 40 H V C CNN
 F1 "P_10A" -80 -140 40 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 A 0 0 80 891 -891 0 0 0 N 1 80 1 -80
 P 2 0 0 0  200 -200  200 -200 N
@@ -278,8 +307,10 @@ ENDDEF
 DEF Q_25A_2F2O EQ 0 10 N Y 1 F N
 F0 "EQ" -160 120 40 H V C CNN
 F1 "Q_25A_2F2O" 0 -140 40 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
-T 0 90 150 20 0 0 0 O+F  Normal 1 C C
+T 0 90 150 20 0 0 0 O+F  Normal 0 C C
 S -100 -30 100 -70 0 0 0 N
 P 2 0 0 0  200 -200  200 -200 N
 P 3 0 0 0  0 60  0 -60  0 -60 N
@@ -302,6 +333,8 @@ ENDDEF
 DEF Q_2A_12O_40KV EQ 0 10 N Y 1 F N
 F0 "EQ" -160 120 40 H V C CNN
 F1 "Q_2A_12O_40KV" 0 -730 40 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 S -100 -580 100 -620 0 0 0 N
 P 2 0 0 0  200 -200  200 -200 N
@@ -353,9 +386,11 @@ ENDDEF
 DEF R_16A_30mA ER 0 10 N Y 1 F N
 F0 "ER" -210 180 40 H V C CNN
 F1 "R_16A_30mA" 0 -200 40 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
-T 0 20 -100 50 0 0 0 M  Normal 1 C C
-T 0 120 200 20 0 0 0 OF  Normal 1 C C
+T 0 20 -100 50 0 0 0 M  Normal 0 C C
+T 0 120 200 20 0 0 0 OF  Normal 0 C C
 P 2 0 0 0  200 -200  200 -200 N
 P 2 0 0 0  400 -200  400 -200 N
 P 3 0 0 0  20 -50  20 50  20 50 N
@@ -382,8 +417,10 @@ ENDDEF
 DEF S_63A ES 0 10 N Y 1 F N
 F0 "ES" -210 180 40 H V C CNN
 F1 "S_63A" 0 -110 40 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
-T 0 120 200 20 0 0 0 OFS  Normal 1 C C
+T 0 120 200 20 0 0 0 OFS  Normal 0 C C
 P 2 0 0 0  200 -200  200 -200 N
 P 2 0 0 0  400 -200  400 -200 N
 P 3 0 0 0  -150 0  -100 0  -100 0 N
@@ -408,8 +445,10 @@ ENDDEF
 DEF V_A10A EV 0 10 N Y 1 F N
 F0 "EV" -160 120 40 H V C CNN
 F1 "V_A10A" -60 -140 40 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
-T 0 0 0 70 0 0 0 A  Normal 1 C C
+T 0 0 0 70 0 0 0 A  Normal 0 C C
 P 2 0 0 0  200 -200  200 -200 N
 C 0 0 84 0 1 0 N
 P 3 0 1 0  -100 0  -80 0  -80 0 N
@@ -418,26 +457,15 @@ X ~ 2 200 0 118 L 10 40 1 1 w
 ENDDRAW
 ENDDEF
 #
-# V_F50Hz
-#
-DEF V_F50Hz EV 0 10 N Y 1 F N
-F0 "EV" -160 120 40 H V C CNN
-F1 "V_F50Hz" -40 -140 40 H V C CNN
-DRAW
-T 0 0 0 50 0 0 0 Hz  Normal 1 C C
-P 2 0 0 0  200 -200  200 -200 N
-C 0 0 84 0 1 0 N
-X ~ 1 200 0 118 L 10 40 1 1 W
-ENDDRAW
-ENDDEF
-#
 # V_U400V
 #
 DEF V_U400V EV 0 10 N Y 1 F N
 F0 "EV" -160 120 40 H V C CNN
 F1 "V_U400V" -60 -140 40 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
-T 0 0 0 70 0 0 0 V  Normal 1 C C
+T 0 0 0 70 0 0 0 V  Normal 0 C C
 P 2 0 0 0  200 -200  200 -200 N
 C 0 0 84 0 1 0 N
 X ~ 1 200 0 118 L 10 40 1 1 W
@@ -449,6 +477,8 @@ ENDDEF
 DEF W_15KA EW 0 10 N Y 1 F N
 F0 "EW" -160 120 40 H V C CNN
 F1 "W_15KA" -50 -210 40 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 P 2 0 0 0  200 -200  200 -200 N
 S -120 60 120 -60 0 1 0 N
@@ -467,6 +497,8 @@ ENDDEF
 DEF Y_ELC EY 0 10 N Y 1 F N
 F0 "EY" -10 120 40 H V C CNN
 F1 "Y_ELC" 60 -120 40 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 P 2 0 0 0  200 -200  200 -200 N
 P 3 0 0 0  -50 10  -50 -10  -50 -10 N

demos/electric/electric.sch

-EESchema Schematic File Version 1
-LIBS:power,elec-unifil,device,conn,regul,.\electric.cache
-EELAYER 23  0
+EESchema Schematic File Version 2
+LIBS:power
+LIBS:elec-unifil
+LIBS:device
+LIBS:conn
+LIBS:regul
+LIBS:electric-cache
+EELAYER 24 0
 EELAYER END
-$Descr A4 11700 8267
-Sheet 2 2
+$Descr A4 11693 8268
+encoding utf-8
+Sheet 1 1
 Title "Exemple librairie elec-unifil"
 Date "4 jan 2006"
 Rev "0.3"
@@ -113,7 +119,7 @@ Wire Notes Line
 	5500 6000 5500 3150
 Wire Notes Line
 	5500 3150 8100 3150
-Text Notes 4150 3000 0    60   ~
+Text Notes 4150 3000 0    60   ~ 0
 AGBT
 Wire Notes Line
 	5350 1150 4750 1150
@@ -166,31 +172,34 @@ Wire Wire Line
 Wire Wire Line
 	850  3350 1200 3350
 $Comp
-L R_16A_30MA ER01
+L R_16A_30mA ER01
 U 1 1 416242BF
 P 1450 2150
-F 0 "ER01" H 1400 2380 40  0000 C C
-F 1 "R_16A_30MA" H 1450 1950 40  0000 C C
-F 2 "Courbe D" H 1450 1900 30  0000 C C
+F 0 "ER01" H 1400 2380 40  0000 C CNN
+F 1 "R_16A_30mA" H 1450 1950 40  0000 C CNN
+F 2 "Courbe D" H 1450 1900 30  0000 C CNN
+F 3 "" H 1450 2150 60  0001 C CNN
 	1    1450 2150
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
 	850  2750 1200 2750
 $Comp
-L C_3X2.5MM2 EC?
+L C_3x2.5mm2 EC?
 U 1 1 41652EC2
 P 2950 6950
-F 0 "EC?" H 2780 7080 40  0000 C C
-F 1 "C_3X2.5MM2" H 2950 6850 40  0000 C C
+F 0 "EC?" H 2780 7080 40  0000 C CNN
+F 1 "C_3x2.5mm2" H 2950 6850 40  0000 C CNN
+F 2 "" H 2950 6950 60  0001 C CNN
+F 3 "" H 2950 6950 60  0001 C CNN
 	1    2950 6950
 	1    0    0    -1  
 $EndComp
-Text Notes 4400 7650 0    60   ~
+Text Notes 4400 7650 0    60   ~ 0
 Extérieur
-Text Notes 3800 6260 0    60   ~
+Text Notes 3800 6260 0    60   ~ 0
 Prises pièces à vivre
-Text Notes 6860 5960 0    60   ~
+Text Notes 6860 5960 0    60   ~ 0
 Cuisine & Lingerie
 Wire Notes Line
 	2150 6300 5250 6300
@@ -198,7 +207,6 @@ Wire Notes Line
 	5250 4100 2150 4100
 Wire Notes Line
 	5250 6300 5250 4100
-Connection ~ 2050 7550
 Connection ~ 2050 7300
 Connection ~ 2050 6950
 Connection ~ 2050 6600
@@ -238,7 +246,7 @@ Wire Wire Line
 	1950 3850 5400 3850
 Wire Notes Line
 	5500 6000 8100 6000
-Text Notes 10150 6250 0    60   ~
+Text Notes 10150 6250 0    60   ~ 0
 Prises Grange
 Wire Notes Line
 	8150 6300 8150 4200
@@ -264,27 +272,20 @@ $Comp
 L P_10A EP4
 U 1 1 41652537
 P 9450 5100
-F 0 "EP4" H 9600 5220 40  0000 C C
-F 1 "P_10A" H 9640 5000 40  0000 C C
-F 2 "TGBT" H 9280 5100 40  0000 C C
+F 0 "EP4" H 9600 5220 40  0000 C CNN
+F 1 "P_10A" H 9640 5000 40  0000 C CNN
+F 2 "TGBT" H 9280 5100 40  0000 C CNN
+F 3 "" H 9450 5100 60  0001 C CNN
 	1    9450 5100
 	-1   0    0    -1  
 $EndComp
-Text Notes 10300 3950 0    60   ~
-permanentes
-Text Notes 10450 4100 0    60   ~
-primaires
-Text Notes 10350 3800 0    60   ~
-Servitudes
-Text Notes 10300 2550 0    60   ~
-secondaires
-Text Notes 10300 2400 0    60   ~
-permanentes
-Text Notes 10350 2250 0    60   ~
-Servitudes
-Text Notes 6050 2150 0    60   ~
+Text Notes 10450 4050 0    60   ~ 0
+Servitudes\npermanentes\nprimaires
+Text Notes 10350 2500 0    60   ~ 0
+Servitudes\npermanentes\nsecondaires
+Text Notes 6050 2150 0    60   ~ 0
 Servitudes secourues protégées
-Text Notes 6700 700  0    60   ~
+Text Notes 6700 700  0    60   ~ 0
 Servitudes secourues
 Wire Notes Line
 	8150 4150 8150 2650
@@ -326,288 +327,351 @@ $Comp
 L D_06A ED30
 U 1 1 41642C2F
 P 8550 2900
-F 0 "ED30" H 8390 3020 40  0000 C C
-F 1 "D_06A" H 8450 2820 40  0000 C C
-F 2 "Supervision" H 9780 2900 40  0000 C C
+F 0 "ED30" H 8390 3020 40  0000 C CNN
+F 1 "D_06A" H 8450 2820 40  0000 C CNN
+F 2 "Supervision" H 9780 2900 40  0000 C CNN
+F 3 "" H 8550 2900 60  0001 C CNN
 	1    8550 2900
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_3X6MM2 EC27
+L C_3x6mm2 EC27
 U 1 1 4164215E
 P 6300 3350
-F 0 "EC27" H 6130 3480 40  0000 C C
-F 1 "C_3X6MM2" H 6300 3250 40  0000 C C
+F 0 "EC27" H 6130 3480 40  0000 C CNN
+F 1 "C_3x6mm2" H 6300 3250 40  0000 C CNN
+F 2 "" H 6300 3350 60  0001 C CNN
+F 3 "" H 6300 3350 60  0001 C CNN
 	1    6300 3350
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_3X2.5MM2 EC?
+L C_3x2.5mm2 EC?
 U 1 1 41642129
 P 2950 6600
-F 0 "EC?" H 2780 6730 40  0000 C C
-F 1 "C_3X2.5MM2" H 2950 6500 40  0000 C C
+F 0 "EC?" H 2780 6730 40  0000 C CNN
+F 1 "C_3x2.5mm2" H 2950 6500 40  0000 C CNN
+F 2 "" H 2950 6600 60  0001 C CNN
+F 3 "" H 2950 6600 60  0001 C CNN
 	1    2950 6600
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_3X2.5MM2 EC28
+L C_3x2.5mm2 EC28
 U 1 1 4164211E
 P 2950 6100
-F 0 "EC28" H 2780 6230 40  0000 C C
-F 1 "C_3X2.5MM2" H 2950 6000 40  0000 C C
+F 0 "EC28" H 2780 6230 40  0000 C CNN
+F 1 "C_3x2.5mm2" H 2950 6000 40  0000 C CNN
+F 2 "" H 2950 6100 60  0001 C CNN
+F 3 "" H 2950 6100 60  0001 C CNN
 	1    2950 6100
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_3X2.5MM2 EC22
+L C_3x2.5mm2 EC22
 U 1 1 4164211C
 P 2950 5750
-F 0 "EC22" H 2780 5880 40  0000 C C
-F 1 "C_3X2.5MM2" H 2950 5650 40  0000 C C
+F 0 "EC22" H 2780 5880 40  0000 C CNN
+F 1 "C_3x2.5mm2" H 2950 5650 40  0000 C CNN
+F 2 "" H 2950 5750 60  0001 C CNN
+F 3 "" H 2950 5750 60  0001 C CNN
 	1    2950 5750
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_3X2.5MM2 EC37
+L C_3x2.5mm2 EC37
 U 1 1 41642119
 P 2950 5400
-F 0 "EC37" H 2780 5530 40  0000 C C
-F 1 "C_3X2.5MM2" H 2950 5300 40  0000 C C
+F 0 "EC37" H 2780 5530 40  0000 C CNN
+F 1 "C_3x2.5mm2" H 2950 5300 40  0000 C CNN
+F 2 "" H 2950 5400 60  0001 C CNN
+F 3 "" H 2950 5400 60  0001 C CNN
 	1    2950 5400
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_3X2.5MM2 EC33
+L C_3x2.5mm2 EC33
 U 1 1 41642116
 P 2950 5050
-F 0 "EC33" H 2780 5180 40  0000 C C
-F 1 "C_3X2.5MM2" H 2950 4950 40  0000 C C
+F 0 "EC33" H 2780 5180 40  0000 C CNN
+F 1 "C_3x2.5mm2" H 2950 4950 40  0000 C CNN
+F 2 "" H 2950 5050 60  0001 C CNN
+F 3 "" H 2950 5050 60  0001 C CNN
 	1    2950 5050
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_3X2.5MM2 EC21
+L C_3x2.5mm2 EC21
 U 1 1 41642114
 P 2950 4700
-F 0 "EC21" H 2780 4830 40  0000 C C
-F 1 "C_3X2.5MM2" H 2950 4600 40  0000 C C
+F 0 "EC21" H 2780 4830 40  0000 C CNN
+F 1 "C_3x2.5mm2" H 2950 4600 40  0000 C CNN
+F 2 "" H 2950 4700 60  0001 C CNN
+F 3 "" H 2950 4700 60  0001 C CNN
 	1    2950 4700
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_3X2.5MM2 EC20
+L C_3x2.5mm2 EC20
 U 1 1 41642111
 P 2950 4350
-F 0 "EC20" H 2780 4480 40  0000 C C
-F 1 "C_3X2.5MM2" H 2950 4250 40  0000 C C
+F 0 "EC20" H 2780 4480 40  0000 C CNN
+F 1 "C_3x2.5mm2" H 2950 4250 40  0000 C CNN
+F 2 "" H 2950 4350 60  0001 C CNN
+F 3 "" H 2950 4350 60  0001 C CNN
 	1    2950 4350
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_3X2.5MM2 EC32
+L C_3x2.5mm2 EC32
 U 1 1 41642105
 P 6300 5800
-F 0 "EC32" H 6130 5930 40  0000 C C
-F 1 "C_3X2.5MM2" H 6300 5700 40  0000 C C
+F 0 "EC32" H 6130 5930 40  0000 C CNN
+F 1 "C_3x2.5mm2" H 6300 5700 40  0000 C CNN
+F 2 "" H 6300 5800 60  0001 C CNN
+F 3 "" H 6300 5800 60  0001 C CNN
 	1    6300 5800
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_3X2.5MM2 EC29
+L C_3x2.5mm2 EC29
 U 1 1 41642102
 P 6300 5450
-F 0 "EC29" H 6130 5580 40  0000 C C
-F 1 "C_3X2.5MM2" H 6300 5350 40  0000 C C
+F 0 "EC29" H 6130 5580 40  0000 C CNN
+F 1 "C_3x2.5mm2" H 6300 5350 40  0000 C CNN
+F 2 "" H 6300 5450 60  0001 C CNN
+F 3 "" H 6300 5450 60  0001 C CNN
 	1    6300 5450
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_3X2.5MM2 EC30
+L C_3x2.5mm2 EC30
 U 1 1 416420FE
 P 6300 5100
-F 0 "EC30" H 6130 5230 40  0000 C C
-F 1 "C_3X2.5MM2" H 6300 5000 40  0000 C C
+F 0 "EC30" H 6130 5230 40  0000 C CNN
+F 1 "C_3x2.5mm2" H 6300 5000 40  0000 C CNN
+F 2 "" H 6300 5100 60  0001 C CNN
+F 3 "" H 6300 5100 60  0001 C CNN
 	1    6300 5100
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_3X2.5MM2 EC23
+L C_3x2.5mm2 EC23
 U 1 1 416420FB
 P 6300 4750
-F 0 "EC23" H 6130 4880 40  0000 C C
-F 1 "C_3X2.5MM2" H 6300 4650 40  0000 C C
+F 0 "EC23" H 6130 4880 40  0000 C CNN
+F 1 "C_3x2.5mm2" H 6300 4650 40  0000 C CNN
+F 2 "" H 6300 4750 60  0001 C CNN
+F 3 "" H 6300 4750 60  0001 C CNN
 	1    6300 4750
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_3X2.5MM2 EC26
+L C_3x2.5mm2 EC26
 U 1 1 416420F8
 P 6300 4400
-F 0 "EC26" H 6130 4530 40  0000 C C
-F 1 "C_3X2.5MM2" H 6300 4300 40  0000 C C
+F 0 "EC26" H 6130 4530 40  0000 C CNN
+F 1 "C_3x2.5mm2" H 6300 4300 40  0000 C CNN
+F 2 "" H 6300 4400 60  0001 C CNN
+F 3 "" H 6300 4400 60  0001 C CNN
 	1    6300 4400
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_3X2.5MM2 EC25
+L C_3x2.5mm2 EC25
 U 1 1 416420F5
 P 6300 4050
-F 0 "EC25" H 6130 4180 40  0000 C C
-F 1 "C_3X2.5MM2" H 6300 3950 40  0000 C C
+F 0 "EC25" H 6130 4180 40  0000 C CNN
+F 1 "C_3x2.5mm2" H 6300 3950 40  0000 C CNN
+F 2 "" H 6300 4050 60  0001 C CNN
+F 3 "" H 6300 4050 60  0001 C CNN
 	1    6300 4050
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_3X2.5MM2 EC24
+L C_3x2.5mm2 EC24
 U 1 1 416420F1
 P 6300 3700
-F 0 "EC24" H 6130 3830 40  0000 C C
-F 1 "C_3X2.5MM2" H 6300 3600 40  0000 C C
+F 0 "EC24" H 6130 3830 40  0000 C CNN
+F 1 "C_3x2.5mm2" H 6300 3600 40  0000 C CNN
+F 2 "" H 6300 3700 60  0001 C CNN
+F 3 "" H 6300 3700 60  0001 C CNN
 	1    6300 3700
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_3X2.5MM2 EC39
+L C_3x2.5mm2 EC39
 U 1 1 416420E1
 P 8950 6100
-F 0 "EC39" H 8780 6230 40  0000 C C
-F 1 "C_3X2.5MM2" H 8950 6000 40  0000 C C
+F 0 "EC39" H 8780 6230 40  0000 C CNN
+F 1 "C_3x2.5mm2" H 8950 6000 40  0000 C CNN
+F 2 "" H 8950 6100 60  0001 C CNN
+F 3 "" H 8950 6100 60  0001 C CNN
 	1    8950 6100
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_3X2.5MM2 EC38
+L C_3x2.5mm2 EC38
 U 1 1 416420DF
 P 8950 5750
-F 0 "EC38" H 8780 5880 40  0000 C C
-F 1 "C_3X2.5MM2" H 8950 5650 40  0000 C C
+F 0 "EC38" H 8780 5880 40  0000 C CNN
+F 1 "C_3x2.5mm2" H 8950 5650 40  0000 C CNN
+F 2 "" H 8950 5750 60  0001 C CNN
+F 3 "" H 8950 5750 60  0001 C CNN
 	1    8950 5750
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_3X2.5MM2 EC35
+L C_3x2.5mm2 EC35
 U 1 1 416420DC
 P 8950 5400
-F 0 "EC35" H 8900 5560 40  0000 C C
-F 1 "C_3X2.5MM2" H 8950 5300 40  0000 C C
+F 0 "EC35" H 8900 5560 40  0000 C CNN
+F 1 "C_3x2.5mm2" H 8950 5300 40  0000 C CNN
+F 2 "" H 8950 5400 60  0001 C CNN
+F 3 "" H 8950 5400 60  0001 C CNN
 	1    8950 5400
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_3X2.5MM2 EC36
+L C_3x2.5mm2 EC36
 U 1 1 416420D9
 P 8950 4800
-F 0 "EC36" H 8780 4930 40  0000 C C
-F 1 "C_3X2.5MM2" H 8950 4700 40  0000 C C
+F 0 "EC36" H 8780 4930 40  0000 C CNN
+F 1 "C_3x2.5mm2" H 8950 4700 40  0000 C CNN
+F 2 "" H 8950 4800 60  0001 C CNN
+F 3 "" H 8950 4800 60  0001 C CNN
 	1    8950 4800
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_3X2.5MM2 EC34
+L C_3x2.5mm2 EC34
 U 1 1 416420D1
 P 8950 4450
-F 0 "EC34" H 8780 4580 40  0000 C C
-F 1 "C_3X2.5MM2" H 8950 4350 40  0000 C C
+F 0 "EC34" H 8780 4580 40  0000 C CNN
+F 1 "C_3x2.5mm2" H 8950 4350 40  0000 C CNN
+F 2 "" H 8950 4450 60  0001 C CNN
+F 3 "" H 8950 4450 60  0001 C CNN
 	1    8950 4450
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_3X1.5MM2 EC44
+L C_3x1.5mm2 EC44
 U 1 1 416420B8
 P 8950 3950
-F 0 "EC44" H 8780 4080 40  0000 C C
-F 1 "C_3X1.5MM2" H 8950 3850 40  0000 C C
+F 0 "EC44" H 8780 4080 40  0000 C CNN
+F 1 "C_3x1.5mm2" H 8950 3850 40  0000 C CNN
+F 2 "" H 8950 3950 60  0001 C CNN
+F 3 "" H 8950 3950 60  0001 C CNN
 	1    8950 3950
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_3X1.5MM2 EC19
+L C_3x1.5mm2 EC19
 U 1 1 416420B5
 P 8950 2900
-F 0 "EC19" H 8780 3030 40  0000 C C
-F 1 "C_3X1.5MM2" H 8950 2800 40  0000 C C
+F 0 "EC19" H 8780 3030 40  0000 C CNN
+F 1 "C_3x1.5mm2" H 8950 2800 40  0000 C CNN
+F 2 "" H 8950 2900 60  0001 C CNN
+F 3 "" H 8950 2900 60  0001 C CNN
 	1    8950 2900
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_3X1.5MM2 EC43
+L C_3x1.5mm2 EC43
 U 1 1 416420B2
 P 8950 3600
-F 0 "EC43" H 8780 3730 40  0000 C C
-F 1 "C_3X1.5MM2" H 8950 3500 40  0000 C C
+F 0 "EC43" H 8780 3730 40  0000 C CNN
+F 1 "C_3x1.5mm2" H 8950 3500 40  0000 C CNN
+F 2 "" H 8950 3600 60  0001 C CNN
+F 3 "" H 8950 3600 60  0001 C CNN
 	1    8950 3600
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_3X1.5MM2 EC42
+L C_3x1.5mm2 EC42
 U 1 1 416420A7
 P 8950 2400
-F 0 "EC42" H 8780 2530 40  0000 C C
-F 1 "C_3X1.5MM2" H 8950 2300 40  0000 C C
+F 0 "EC42" H 8780 2530 40  0000 C CNN
+F 1 "C_3x1.5mm2" H 8950 2300 40  0000 C CNN
+F 2 "" H 8950 2400 60  0001 C CNN
+F 3 "" H 8950 2400 60  0001 C CNN
 	1    8950 2400
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_3X1.5MM2 EC16
+L C_3x1.5mm2 EC16
 U 1 1 416420A1
 P 8950 2050
-F 0 "EC16" H 8780 2180 40  0000 C C
-F 1 "C_3X1.5MM2" H 8950 1950 40  0000 C C
+F 0 "EC16" H 8780 2180 40  0000 C CNN
+F 1 "C_3x1.5mm2" H 8950 1950 40  0000 C CNN
+F 2 "" H 8950 2050 60  0001 C CNN
+F 3 "" H 8950 2050 60  0001 C CNN
 	1    8950 2050
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_3X1.5MM2 EC15
+L C_3x1.5mm2 EC15
 U 1 1 41642099
 P 8950 1700
-F 0 "EC15" H 8780 1830 40  0000 C C
-F 1 "C_3X1.5MM2" H 8950 1600 40  0000 C C
+F 0 "EC15" H 8780 1830 40  0000 C CNN
+F 1 "C_3x1.5mm2" H 8950 1600 40  0000 C CNN
+F 2 "" H 8950 1700 60  0001 C CNN
+F 3 "" H 8950 1700 60  0001 C CNN
 	1    8950 1700
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_3X1.5MM2 EC14
+L C_3x1.5mm2 EC14
 U 1 1 41642094
 P 8950 1350
-F 0 "EC14" H 8780 1480 40  0000 C C
-F 1 "C_3X1.5MM2" H 8950 1250 40  0000 C C
+F 0 "EC14" H 8780 1480 40  0000 C CNN
+F 1 "C_3x1.5mm2" H 8950 1250 40  0000 C CNN
+F 2 "" H 8950 1350 60  0001 C CNN
+F 3 "" H 8950 1350 60  0001 C CNN
 	1    8950 1350
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_3X1.5MM2 EC13
+L C_3x1.5mm2 EC13
 U 1 1 41642090
 P 8950 1000
-F 0 "EC13" H 8780 1130 40  0000 C C
-F 1 "C_3X1.5MM2" H 8950 900 40  0000 C C
+F 0 "EC13" H 8780 1130 40  0000 C CNN
+F 1 "C_3x1.5mm2" H 8950 900 40  0000 C CNN
+F 2 "" H 8950 1000 60  0001 C CNN
+F 3 "" H 8950 1000 60  0001 C CNN
 	1    8950 1000
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_3X1.5MM2 EC18
+L C_3x1.5mm2 EC18
 U 1 1 41642083
 P 6300 1900
-F 0 "EC18" H 6130 2030 40  0000 C C
-F 1 "C_3X1.5MM2" H 6300 1800 40  0000 C C
+F 0 "EC18" H 6130 2030 40  0000 C CNN
+F 1 "C_3x1.5mm2" H 6300 1800 40  0000 C CNN
+F 2 "" H 6300 1900 60  0001 C CNN
+F 3 "" H 6300 1900 60  0001 C CNN
 	1    6300 1900
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_3X1.5MM2 EC31
+L C_3x1.5mm2 EC31
 U 1 1 41642074
 P 6300 1500
-F 0 "EC31" H 6130 1630 40  0000 C C
-F 1 "C_3X1.5MM2" H 6300 1400 40  0000 C C
+F 0 "EC31" H 6130 1630 40  0000 C CNN
+F 1 "C_3x1.5mm2" H 6300 1400 40  0000 C CNN
+F 2 "" H 6300 1500 60  0001 C CNN
+F 3 "" H 6300 1500 60  0001 C CNN
 	1    6300 1500
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_3X1.5MM2 EC17
+L C_3x1.5mm2 EC17
 U 1 1 4164206D
 P 6300 1150
-F 0 "EC17" H 6130 1280 40  0000 C C
-F 1 "C_3X1.5MM2" H 6300 1050 40  0000 C C
+F 0 "EC17" H 6130 1280 40  0000 C CNN
+F 1 "C_3x1.5mm2" H 6300 1050 40  0000 C CNN
+F 2 "" H 6300 1150 60  0001 C CNN
+F 3 "" H 6300 1150 60  0001 C CNN
 	1    6300 1150
 	1    0    0    -1  
 $EndComp
@@ -615,90 +679,96 @@ $Comp
 L I_25A_LUM EI11
 U 1 1 4163DF39
 P 9350 650
-F 0 "EI11" H 9190 770 40  0000 C C
-F 1 "I_25A_LUM" H 9500 550 40  0000 C C
+F 0 "EI11" H 9190 770 40  0000 C CNN
+F 1 "I_25A_LUM" H 9500 550 40  0000 C CNN
+F 2 "" H 9350 650 60  0001 C CNN
+F 3 "" H 9350 650 60  0001 C CNN
 	1    9350 650 
 	1    0    0    -1  
 $EndComp
-Text GLabel 9150 6100 2    60   Output
+Text HLabel 9150 6100 2    60   Output ~ 0
 EC39
-Text GLabel 9150 5750 2    60   Output
+Text HLabel 9150 5750 2    60   Output ~ 0
 EC38
-Text GLabel 9150 5400 2    60   Output
+Text HLabel 9150 5400 2    60   Output ~ 0
 EC35
-Text GLabel 9150 4800 2    60   Output
+Text HLabel 9150 4800 2    60   Output ~ 0
 EC36
-Text GLabel 9150 4450 2    60   Output
+Text HLabel 9150 4450 2    60   Output ~ 0
 EC34
-Text GLabel 3150 6100 2    60   Output
+Text HLabel 3150 6100 2    60   Output ~ 0
 EC28
-Text GLabel 3150 5750 2    60   Output
+Text HLabel 3150 5750 2    60   Output ~ 0
 EC22
-Text GLabel 3150 5400 2    60   Output
+Text HLabel 3150 5400 2    60   Output ~ 0
 EC37
-Text GLabel 3150 5050 2    60   Output
+Text HLabel 3150 5050 2    60   Output ~ 0
 EC33
-Text GLabel 3150 4700 2    60   Output
+Text HLabel 3150 4700 2    60   Output ~ 0
 EC21
-Text GLabel 3150 4350 2    60   Output
+Text HLabel 3150 4350 2    60   Output ~ 0
 EC20
-Text GLabel 6500 5800 2    60   Output
+Text HLabel 6500 5800 2    60   Output ~ 0
 EC32
-Text GLabel 6500 5450 2    60   Output
+Text HLabel 6500 5450 2    60   Output ~ 0
 EC29
-Text GLabel 6500 5100 2    60   Output
+Text HLabel 6500 5100 2    60   Output ~ 0
 EC30
-Text GLabel 6500 4750 2    60   Output
+Text HLabel 6500 4750 2    60   Output ~ 0
 EC23
-Text GLabel 6500 4400 2    60   Output
+Text HLabel 6500 4400 2    60   Output ~ 0
 EC26
-Text GLabel 6500 4050 2    60   Output
+Text HLabel 6500 4050 2    60   Output ~ 0
 EC25
-Text GLabel 6500 3700 2    60   Output
+Text HLabel 6500 3700 2    60   Output ~ 0
 EC24
-Text GLabel 6500 3350 2    60   Output
+Text HLabel 6500 3350 2    60   Output ~ 0
 EC27
-Text GLabel 9150 3950 2    60   Output
+Text HLabel 9150 3950 2    60   Output ~ 0
 EC44
-Text GLabel 9150 3600 2    60   Output
+Text HLabel 9150 3600 2    60   Output ~ 0
 EC43
-Text GLabel 9150 3250 2    60   Output
+Text HLabel 9150 3250 2    60   Output ~ 0
 EC41
-Text GLabel 9150 2900 2    60   Output
+Text HLabel 9150 2900 2    60   Output ~ 0
 EC19
-Text GLabel 9150 2400 2    60   Output
+Text HLabel 9150 2400 2    60   Output ~ 0
 EC42
-Text GLabel 9150 2050 2    60   Output
+Text HLabel 9150 2050 2    60   Output ~ 0
 EC16
-Text GLabel 9150 1700 2    60   Output
+Text HLabel 9150 1700 2    60   Output ~ 0
 EC15
-Text GLabel 9150 1350 2    60   Output
+Text HLabel 9150 1350 2    60   Output ~ 0
 EC14
-Text GLabel 9150 1000 2    60   Output
+Text HLabel 9150 1000 2    60   Output ~ 0
 EC13
-Text GLabel 9550 650  2    60   Output
+Text HLabel 9550 650  2    60   Output ~ 0
 EC11
-Text GLabel 6500 1900 2    60   Output
+Text HLabel 6500 1900 2    60   Output ~ 0
 EC18
-Text GLabel 6500 1500 2    60   Output
+Text HLabel 6500 1500 2    60   Output ~ 0
 EC31
-Text GLabel 6500 1150 2    60   Output
+Text HLabel 6500 1150 2    60   Output ~ 0
 EC17
 $Comp
-L C_3X1.5MM2 EC41
+L C_3x1.5mm2 EC41
 U 1 1 4163D7A2
 P 8950 3250
-F 0 "EC41" H 8780 3380 40  0000 C C
-F 1 "C_3X1.5MM2" H 8950 3150 40  0000 C C
+F 0 "EC41" H 8780 3380 40  0000 C CNN
+F 1 "C_3x1.5mm2" H 8950 3150 40  0000 C CNN
+F 2 "" H 8950 3250 60  0001 C CNN
+F 3 "" H 8950 3250 60  0001 C CNN
 	1    8950 3250
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_3X1.5MM2 EC11
+L C_3x1.5mm2 EC11
 U 1 1 4163D79F
 P 8950 650
-F 0 "EC11" H 8780 780 40  0000 C C
-F 1 "C_3X1.5MM2" H 8950 550 40  0000 C C
+F 0 "EC11" H 8780 780 40  0000 C CNN
+F 1 "C_3x1.5mm2" H 8950 550 40  0000 C CNN
+F 2 "" H 8950 650 60  0001 C CNN
+F 3 "" H 8950 650 60  0001 C CNN
 	1    8950 650 
 	1    0    0    -1  
 $EndComp
@@ -728,14 +798,16 @@ Wire Wire Line
 	8250 1700 8250 2050
 Wire Wire Line
 	8250 2050 8250 2400
-Text GLabel 6500 800  2    60   Output
+Text HLabel 6500 800  2    60   Output ~ 0
 EC12
 $Comp
-L C_3X1.5MM2 EC12
+L C_3x1.5mm2 EC12
 U 1 1 4163D458
 P 6300 800
-F 0 "EC12" H 6150 900 40  0000 C C
-F 1 "C_3X1.5MM2" H 6300 700 40  0000 C C
+F 0 "EC12" H 6150 900 40  0000 C CNN
+F 1 "C_3x1.5mm2" H 6300 700 40  0000 C CNN
+F 2 "" H 6300 800 60  0001 C CNN
+F 3 "" H 6300 800 60  0001 C CNN
 	1    6300 800 
 	1    0    0    -1  
 $EndComp
@@ -791,8 +863,10 @@ $Comp
 L D_10A ED73
 U 1 1 4162F22A
 P 2550 7550
-F 0 "ED73" H 2390 7670 40  0000 C C
-F 1 "D_10A" H 2450 7470 40  0000 C C
+F 0 "ED73" H 2390 7670 40  0000 C CNN
+F 1 "D_10A" H 2450 7470 40  0000 C CNN
+F 2 "" H 2550 7550 60  0001 C CNN
+F 3 "" H 2550 7550 60  0001 C CNN
 	1    2550 7550
 	1    0    0    -1  
 $EndComp
@@ -800,8 +874,10 @@ $Comp
 L D_10A ED72
 U 1 1 4162F1F7
 P 2550 7300
-F 0 "ED72" H 2390 7420 40  0000 C C
-F 1 "D_10A" H 2450 7220 40  0000 C C
+F 0 "ED72" H 2390 7420 40  0000 C CNN
+F 1 "D_10A" H 2450 7220 40  0000 C CNN
+F 2 "" H 2550 7300 60  0001 C CNN
+F 3 "" H 2550 7300 60  0001 C CNN
 	1    2550 7300
 	1    0    0    -1  
 $EndComp
@@ -809,9 +885,10 @@ $Comp
 L D_10A ED71
 U 1 1 4162F1F0
 P 2550 6950
-F 0 "ED71" H 2390 7070 40  0000 C C
-F 1 "D_10A" H 2450 6870 40  0000 C C
-F 2 "Abri pré Mouillière proche" H 4160 6980 40  0000 C C
+F 0 "ED71" H 2390 7070 40  0000 C CNN
+F 1 "D_10A" H 2450 6870 40  0000 C CNN
+F 2 "Abri pré Mouillière proche" H 4160 6980 40  0000 C CNN
+F 3 "" H 2550 6950 60  0001 C CNN
 	1    2550 6950
 	1    0    0    -1  
 $EndComp
@@ -819,9 +896,10 @@ $Comp
 L D_10A ED70
 U 1 1 4162F1CA
 P 2550 6600
-F 0 "ED70" H 2390 6720 40  0000 C C
-F 1 "D_10A" H 2450 6520 40  0000 C C
-F 2 "Abri coté route" H 3920 6600 40  0000 C C
+F 0 "ED70" H 2390 6720 40  0000 C CNN
+F 1 "D_10A" H 2450 6520 40  0000 C CNN
+F 2 "Abri coté route" H 3920 6600 40  0000 C CNN
+F 3 "" H 2550 6600 60  0001 C CNN
 	1    2550 6600
 	1    0    0    -1  
 $EndComp
@@ -829,9 +907,10 @@ $Comp
 L D_16A ED55
 U 1 1 4162F8B1
 P 2550 6100
-F 0 "ED55" H 2390 6220 40  0000 C C
-F 1 "D_16A" H 2450 6020 40  0000 C C
-F 2 "Entrée et salle de bain" H 4080 6100 40  0000 C C
+F 0 "ED55" H 2390 6220 40  0000 C CNN
+F 1 "D_16A" H 2450 6020 40  0000 C CNN
+F 2 "Entrée et salle de bain" H 4080 6100 40  0000 C CNN
+F 3 "" H 2550 6100 60  0001 C CNN
 	1    2550 6100
 	1    0    0    -1  
 $EndComp
@@ -839,9 +918,10 @@ $Comp
 L D_16A ED54
 U 1 1 4162F875
 P 2550 5750
-F 0 "ED54" H 2390 5870 40  0000 C C
-F 1 "D_16A" H 2450 5670 40  0000 C C
-F 2 "Séjour et sam" H 3860 5740 40  0000 C C
+F 0 "ED54" H 2390 5870 40  0000 C CNN
+F 1 "D_16A" H 2450 5670 40  0000 C CNN
+F 2 "Séjour et sam" H 3860 5740 40  0000 C CNN
+F 3 "" H 2550 5750 60  0001 C CNN
 	1    2550 5750
 	1    0    0    -1  
 $EndComp
@@ -849,9 +929,10 @@ $Comp
 L D_16A ED53
 U 1 1 4162F862
 P 2550 5400
-F 0 "ED53" H 2390 5520 40  0000 C C
-F 1 "D_16A" H 2450 5320 40  0000 C C
-F 2 "Bureau" H 3700 5400 40  0000 C C
+F 0 "ED53" H 2390 5520 40  0000 C CNN
+F 1 "D_16A" H 2450 5320 40  0000 C CNN
+F 2 "Bureau" H 3700 5400 40  0000 C CNN
+F 3 "" H 2550 5400 60  0001 C CNN
 	1    2550 5400
 	1    0    0    -1  
 $EndComp
@@ -859,9 +940,10 @@ $Comp
 L D_16A ED52
 U 1 1 4162F856
 P 2550 5050
-F 0 "ED52" H 2390 5170 40  0000 C C
-F 1 "D_16A" H 2450 4970 40  0000 C C
-F 2 "Chambre 3" H 3760 5040 40  0000 C C
+F 0 "ED52" H 2390 5170 40  0000 C CNN
+F 1 "D_16A" H 2450 4970 40  0000 C CNN
+F 2 "Chambre 3" H 3760 5040 40  0000 C CNN
+F 3 "" H 2550 5050 60  0001 C CNN
 	1    2550 5050
 	1    0    0    -1  
 $EndComp
@@ -869,9 +951,10 @@ $Comp
 L D_16A ED51
 U 1 1 4162F84D
 P 2550 4700
-F 0 "ED51" H 2390 4820 40  0000 C C
-F 1 "D_16A" H 2450 4620 40  0000 C C
-F 2 "Chambre 2" H 3760 4700 40  0000 C C
+F 0 "ED51" H 2390 4820 40  0000 C CNN
+F 1 "D_16A" H 2450 4620 40  0000 C CNN
+F 2 "Chambre 2" H 3760 4700 40  0000 C CNN
+F 3 "" H 2550 4700 60  0001 C CNN
 	1    2550 4700
 	1    0    0    -1  
 $EndComp
@@ -879,9 +962,10 @@ $Comp
 L D_16A ED50
 U 1 1 4162F848
 P 2550 4350
-F 0 "ED50" H 2390 4470 40  0000 C C
-F 1 "D_16A" H 2450 4270 40  0000 C C
-F 2 "Chambre 1" H 3760 4340 40  0000 C C
+F 0 "ED50" H 2390 4470 40  0000 C CNN
+F 1 "D_16A" H 2450 4270 40  0000 C CNN
+F 2 "Chambre 1" H 3760 4340 40  0000 C CNN
+F 3 "" H 2550 4350 60  0001 C CNN
 	1    2550 4350
 	1    0    0    -1  
 $EndComp
@@ -889,9 +973,10 @@ $Comp
 L D_16A ED64
 U 1 1 4162F875
 P 8550 6100
-F 0 "ED64" H 8390 6220 40  0000 C C
-F 1 "D_16A" H 8450 6020 40  0000 C C
-F 2 "Etage coté atelier" H 9940 6100 40  0000 C C
+F 0 "ED64" H 8390 6220 40  0000 C CNN
+F 1 "D_16A" H 8450 6020 40  0000 C CNN
+F 2 "Etage coté atelier" H 9940 6100 40  0000 C CNN
+F 3 "" H 8550 6100 60  0001 C CNN
 	1    8550 6100
 	1    0    0    -1  
 $EndComp
@@ -899,9 +984,10 @@ $Comp
 L D_16A ED63
 U 1 1 4162F862
 P 8550 5750
-F 0 "ED63" H 8390 5870 40  0000 C C
-F 1 "D_16A" H 8450 5670 40  0000 C C
-F 2 "Etage coté sellerie" H 9960 5740 40  0000 C C
+F 0 "ED63" H 8390 5870 40  0000 C CNN
+F 1 "D_16A" H 8450 5670 40  0000 C CNN
+F 2 "Etage coté sellerie" H 9960 5740 40  0000 C CNN
+F 3 "" H 8550 5750 60  0001 C CNN
 	1    8550 5750
 	1    0    0    -1  
 $EndComp
@@ -909,9 +995,10 @@ $Comp
 L D_16A ED62
 U 1 1 4162F856
 P 8550 5400
-F 0 "ED62" H 8390 5520 40  0000 C C
-F 1 "D_16A" H 8450 5320 40  0000 C C
-F 2 "Local technique" H 9880 5400 40  0000 C C
+F 0 "ED62" H 8390 5520 40  0000 C CNN
+F 1 "D_16A" H 8450 5320 40  0000 C CNN
+F 2 "Local technique" H 9880 5400 40  0000 C CNN
+F 3 "" H 8550 5400 60  0001 C CNN
 	1    8550 5400
 	1    0    0    -1  
 $EndComp
@@ -919,9 +1006,10 @@ $Comp
 L D_16A ED61
 U 1 1 4162F84D
 P 8550 4800
-F 0 "ED61" H 8390 4920 40  0000 C C
-F 1 "D_16A" H 8450 4720 40  0000 C C
-F 2 "Sellerie" H 9720 4800 40  0000 C C
+F 0 "ED61" H 8390 4920 40  0000 C CNN
+F 1 "D_16A" H 8450 4720 40  0000 C CNN
+F 2 "Sellerie" H 9720 4800 40  0000 C CNN
+F 3 "" H 8550 4800 60  0001 C CNN
 	1    8550 4800
 	1    0    0    -1  
 $EndComp
@@ -929,9 +1017,10 @@ $Comp
 L D_16A ED60
 U 1 1 4162F848
 P 8550 4450
-F 0 "ED60" H 8390 4570 40  0000 C C
-F 1 "D_16A" H 8450 4370 40  0000 C C
-F 2 "Atelier" H 9700 4450 40  0000 C C
+F 0 "ED60" H 8390 4570 40  0000 C CNN
+F 1 "D_16A" H 8450 4370 40  0000 C CNN
+F 2 "Atelier" H 9700 4450 40  0000 C CNN
+F 3 "" H 8550 4450 60  0001 C CNN
 	1    8550 4450
 	1    0    0    -1  
 $EndComp
@@ -978,9 +1067,10 @@ $Comp
 L D_10A ED47
 U 1 1 4162F76B
 P 5900 5800
-F 0 "ED47" H 5740 5920 40  0000 C C
-F 1 "D_10A" H 5800 5720 40  0000 C C
-F 2 "Prises lingerie" H 7240 5800 40  0000 C C
+F 0 "ED47" H 5740 5920 40  0000 C CNN
+F 1 "D_10A" H 5800 5720 40  0000 C CNN
+F 2 "Prises lingerie" H 7240 5800 40  0000 C CNN
+F 3 "" H 5900 5800 60  0001 C CNN
 	1    5900 5800
 	1    0    0    -1  
 $EndComp
@@ -988,9 +1078,10 @@ $Comp
 L D_16A ED46
 U 1 1 4162F75D
 P 5900 5450
-F 0 "ED46" H 5740 5570 40  0000 C C
-F 1 "D_16A" H 5800 5370 40  0000 C C
-F 2 "Séchoir" H 7060 5440 40  0000 C C
+F 0 "ED46" H 5740 5570 40  0000 C CNN
+F 1 "D_16A" H 5800 5370 40  0000 C CNN
+F 2 "Séchoir" H 7060 5440 40  0000 C CNN
+F 3 "" H 5900 5450 60  0001 C CNN
 	1    5900 5450
 	1    0    0    -1  
 $EndComp
@@ -998,9 +1089,10 @@ $Comp
 L D_16A ED45
 U 1 1 4162F74E
 P 5900 5100
-F 0 "ED45" H 5740 5220 40  0000 C C
-F 1 "D_16A" H 5800 5020 40  0000 C C
-F 2 "Lave linge" H 7120 5100 40  0000 C C
+F 0 "ED45" H 5740 5220 40  0000 C CNN
+F 1 "D_16A" H 5800 5020 40  0000 C CNN
+F 2 "Lave linge" H 7120 5100 40  0000 C CNN
+F 3 "" H 5900 5100 60  0001 C CNN
 	1    5900 5100
 	1    0    0    -1  
 $EndComp
@@ -1008,9 +1100,10 @@ $Comp
 L D_10A ED44
 U 1 1 4162F745
 P 5900 4750
-F 0 "ED44" H 5740 4870 40  0000 C C
-F 1 "D_10A" H 5800 4670 40  0000 C C
-F 2 "Prises cuisine" H 7200 4740 40  0000 C C
+F 0 "ED44" H 5740 4870 40  0000 C CNN
+F 1 "D_10A" H 5800 4670 40  0000 C CNN
+F 2 "Prises cuisine" H 7200 4740 40  0000 C CNN
+F 3 "" H 5900 4750 60  0001 C CNN
 	1    5900 4750
 	1    0    0    -1  
 $EndComp
@@ -1018,9 +1111,10 @@ $Comp
 L D_10A ED43
 U 1 1 4162F739
 P 5900 4400
-F 0 "ED43" H 5740 4520 40  0000 C C
-F 1 "D_10A" H 5800 4320 40  0000 C C
-F 2 "Micro-ondes et hotte" H 7340 4400 40  0000 C C
+F 0 "ED43" H 5740 4520 40  0000 C CNN
+F 1 "D_10A" H 5800 4320 40  0000 C CNN
+F 2 "Micro-ondes et hotte" H 7340 4400 40  0000 C CNN
+F 3 "" H 5900 4400 60  0001 C CNN
 	1    5900 4400
 	1    0    0    -1  
 $EndComp
@@ -1028,9 +1122,10 @@ $Comp
 L D_16A ED42
 U 1 1 4162F729
 P 5900 4050
-F 0 "ED42" H 5740 4170 40  0000 C C
-F 1 "D_16A" H 5800 3970 40  0000 C C
-F 2 "Four" H 6980 4040 40  0000 C C
+F 0 "ED42" H 5740 4170 40  0000 C CNN
+F 1 "D_16A" H 5800 3970 40  0000 C CNN
+F 2 "Four" H 6980 4040 40  0000 C CNN
+F 3 "" H 5900 4050 60  0001 C CNN
 	1    5900 4050
 	1    0    0    -1  
 $EndComp
@@ -1038,9 +1133,10 @@ $Comp
 L D_16A ED41
 U 1 1 4162F71F
 P 5900 3700
-F 0 "ED41" H 5740 3820 40  0000 C C
-F 1 "D_16A" H 5800 3620 40  0000 C C
-F 2 "Lave vaisselle" H 7200 3700 40  0000 C C
+F 0 "ED41" H 5740 3820 40  0000 C CNN
+F 1 "D_16A" H 5800 3620 40  0000 C CNN
+F 2 "Lave vaisselle" H 7200 3700 40  0000 C CNN
+F 3 "" H 5900 3700 60  0001 C CNN
 	1    5900 3700
 	1    0    0    -1  
 $EndComp
@@ -1048,9 +1144,10 @@ $Comp
 L D_32A ED40
 U 1 1 4162F6F8
 P 5900 3350
-F 0 "ED40" H 5740 3470 40  0000 C C
-F 1 "D_32A" H 5800 3270 40  0000 C C
-F 2 "Plaque électrique" H 7260 3340 40  0000 C C
+F 0 "ED40" H 5740 3470 40  0000 C CNN
+F 1 "D_32A" H 5800 3270 40  0000 C CNN
+F 2 "Plaque électrique" H 7260 3340 40  0000 C CNN
+F 3 "" H 5900 3350 60  0001 C CNN
 	1    5900 3350
 	1    0    0    -1  
 $EndComp
@@ -1058,9 +1155,10 @@ $Comp
 L D_06A ED32
 U 1 1 4162F2EE
 P 8550 3600
-F 0 "ED32" H 8390 3720 40  0000 C C
-F 1 "D_06A" H 8450 3520 40  0000 C C
-F 2 "Traitement de l'eau" H 9960 3600 40  0000 C C
+F 0 "ED32" H 8390 3720 40  0000 C CNN
+F 1 "D_06A" H 8450 3520 40  0000 C CNN
+F 2 "Traitement de l'eau" H 9960 3600 40  0000 C CNN
+F 3 "" H 8550 3600 60  0001 C CNN
 	1    8550 3600
 	1    0    0    -1  
 $EndComp
@@ -1068,9 +1166,10 @@ $Comp
 L D_06A ED33
 U 1 1 4162F2D8
 P 8550 3950
-F 0 "ED33" H 8390 4070 40  0000 C C
-F 1 "D_06A" H 8450 3870 40  0000 C C
-F 2 "Silveloxs, volets" H 9920 3940 40  0000 C C
+F 0 "ED33" H 8390 4070 40  0000 C CNN
+F 1 "D_06A" H 8450 3870 40  0000 C CNN
+F 2 "Silveloxs, volets" H 9920 3940 40  0000 C CNN
+F 3 "" H 8550 3950 60  0001 C CNN
 	1    8550 3950
 	1    0    0    -1  
 $EndComp
@@ -1109,9 +1208,10 @@ $Comp
 L D_06A ED15
 U 1 1 4162F301
 P 8550 2050
-F 0 "ED15" H 8390 2170 40  0000 C C
-F 1 "D_06A" H 8450 1970 40  0000 C C
-F 2 "Eclairage grange" H 9900 2040 40  0000 C C
+F 0 "ED15" H 8390 2170 40  0000 C CNN
+F 1 "D_06A" H 8450 1970 40  0000 C CNN
+F 2 "Eclairage grange" H 9900 2040 40  0000 C CNN
+F 3 "" H 8550 2050 60  0001 C CNN
 	1    8550 2050
 	1    0    0    -1  
 $EndComp
@@ -1119,9 +1219,10 @@ $Comp
 L D_06A ED16
 U 1 1 4162F2F6
 P 8550 2400
-F 0 "ED16" H 8390 2520 40  0000 C C
-F 1 "D_06A" H 8450 2320 40  0000 C C
-F 2 "Informatique" H 9820 2400 40  0000 C C
+F 0 "ED16" H 8390 2520 40  0000 C CNN
+F 1 "D_06A" H 8450 2320 40  0000 C CNN
+F 2 "Informatique" H 9820 2400 40  0000 C CNN
+F 3 "" H 8550 2400 60  0001 C CNN
 	1    8550 2400
 	1    0    0    -1  
 $EndComp
@@ -1129,9 +1230,10 @@ $Comp
 L D_06A ED31
 U 1 1 4162F2D8
 P 8550 3250
-F 0 "ED31" H 8390 3370 40  0000 C C
-F 1 "D_06A" H 8450 3170 40  0000 C C
-F 2 "Chauffage" H 9740 3240 40  0000 C C
+F 0 "ED31" H 8390 3370 40  0000 C CNN
+F 1 "D_06A" H 8450 3170 40  0000 C CNN
+F 2 "Chauffage" H 9740 3240 40  0000 C CNN
+F 3 "" H 8550 3250 60  0001 C CNN
 	1    8550 3250
 	1    0    0    -1  
 $EndComp
@@ -1139,9 +1241,10 @@ $Comp
 L D_06A ED11
 U 1 1 4162F301
 P 8550 650
-F 0 "ED11" H 8390 770 40  0000 C C
-F 1 "D_06A" H 8450 570 40  0000 C C
-F 2 "Eclairage vide sanitaire" H 10480 640 40  0000 C C
+F 0 "ED11" H 8390 770 40  0000 C CNN
+F 1 "D_06A" H 8450 570 40  0000 C CNN
+F 2 "Eclairage vide sanitaire" H 10480 640 40  0000 C CNN
+F 3 "" H 8550 650 60  0001 C CNN
 	1    8550 650 
 	1    0    0    -1  
 $EndComp
@@ -1149,10 +1252,10 @@ $Comp
 L D_06A ED12
 U 1 1 4162F2F6
 P 8550 1000
-F 0 "ED12" H 8390 1120 40  0000 C C
-F 1 "D_06A" H 8450 920 40  0000 C C
-F 2 "Eclairage chambre 1, chambre 2" H 10200 1040 40  0000 C C
-F 3 "couloir1, wc1, sdb, entrée" H 10180 980 40  0000 C C
+F 0 "ED12" H 8390 1120 40  0000 C CNN
+F 1 "D_06A" H 8450 920 40  0000 C CNN
+F 2 "Eclairage chambre 1, chambre 2" H 10200 1040 40  0000 C CNN
+F 3 "couloir1, wc1, sdb, entrée" H 10180 980 40  0000 C CNN
 	1    8550 1000
 	1    0    0    -1  
 $EndComp
@@ -1160,10 +1263,10 @@ $Comp
 L D_06A ED13
 U 1 1 4162F2EE
 P 8550 1350
-F 0 "ED13" H 8390 1470 40  0000 C C
-F 1 "D_06A" H 8450 1270 40  0000 C C
-F 2 "Eclairage séjour, cuisine" H 10100 1380 40  0000 C C
-F 3 "sam, escalier, bureau" H 10100 1320 40  0000 C C
+F 0 "ED13" H 8390 1470 40  0000 C CNN
+F 1 "D_06A" H 8450 1270 40  0000 C CNN
+F 2 "Eclairage séjour, cuisine" H 10100 1380 40  0000 C CNN
+F 3 "sam, escalier, bureau" H 10100 1320 40  0000 C CNN
 	1    8550 1350
 	1    0    0    -1  
 $EndComp
@@ -1171,10 +1274,10 @@ $Comp
 L D_06A ED14
 U 1 1 4162F2D8
 P 8550 1700
-F 0 "ED14" H 8390 1820 40  0000 C C
-F 1 "D_06A" H 8450 1620 40  0000 C C
-F 2 "Eclairage chambre 3, couloir 2" H 10220 1740 40  0000 C C
-F 3 "wc2, douche, lingerie" H 10180 1680 40  0000 C C
+F 0 "ED14" H 8390 1820 40  0000 C CNN
+F 1 "D_06A" H 8450 1620 40  0000 C CNN
+F 2 "Eclairage chambre 3, couloir 2" H 10220 1740 40  0000 C CNN
+F 3 "wc2, douche, lingerie" H 10180 1680 40  0000 C CNN
 	1    8550 1700
 	1    0    0    -1  
 $EndComp
@@ -1182,9 +1285,10 @@ $Comp
 L D_10A ED25
 U 1 1 4162F22A
 P 5900 1900
-F 0 "ED25" H 5740 2020 40  0000 C C
-F 1 "D_10A" H 5800 1820 40  0000 C C
-F 2 "Matériel sensible" H 7260 1900 40  0000 C C
+F 0 "ED25" H 5740 2020 40  0000 C CNN
+F 1 "D_10A" H 5800 1820 40  0000 C CNN
+F 2 "Matériel sensible" H 7260 1900 40  0000 C CNN
+F 3 "" H 5900 1900 60  0001 C CNN
 	1    5900 1900
 	1    0    0    -1  
 $EndComp
@@ -1192,9 +1296,10 @@ $Comp
 L D_10A ED22
 U 1 1 4162F1F7
 P 5900 1500
-F 0 "ED22" H 5740 1620 40  0000 C C
-F 1 "D_10A" H 5800 1420 40  0000 C C
-F 2 "Réfrigérateur & congélateur" H 7480 1500 40  0000 C C
+F 0 "ED22" H 5740 1620 40  0000 C CNN
+F 1 "D_10A" H 5800 1420 40  0000 C CNN
+F 2 "Réfrigérateur & congélateur" H 7480 1500 40  0000 C CNN
+F 3 "" H 5900 1500 60  0001 C CNN
 	1    5900 1500
 	1    0    0    -1  
 $EndComp
@@ -1202,9 +1307,10 @@ $Comp
 L D_10A ED21
 U 1 1 4162F1F0
 P 5900 1150
-F 0 "ED21" H 5750 1250 40  0000 C C
-F 1 "D_10A" H 5800 1070 40  0000 C C
-F 2 "Pompe surpresseur" H 7260 1140 40  0000 C C
+F 0 "ED21" H 5750 1250 40  0000 C CNN
+F 1 "D_10A" H 5800 1070 40  0000 C CNN
+F 2 "Pompe surpresseur" H 7260 1140 40  0000 C CNN
+F 3 "" H 5900 1150 60  0001 C CNN
 	1    5900 1150
 	1    0    0    -1  
 $EndComp
@@ -1212,9 +1318,10 @@ $Comp
 L D_10A ED20
 U 1 1 4162F1CA
 P 5900 800
-F 0 "ED20" H 5740 920 40  0000 C C
-F 1 "D_10A" H 5800 720 40  0000 C C
-F 2 "Vide sanitaire, portail" H 7400 800 40  0000 C C
+F 0 "ED20" H 5740 920 40  0000 C CNN
+F 1 "D_10A" H 5800 720 40  0000 C CNN
+F 2 "Vide sanitaire, portail" H 7400 800 40  0000 C CNN
+F 3 "" H 5900 800 60  0001 C CNN
 	1    5900 800 
 	1    0    0    -1  
 $EndComp
@@ -1239,8 +1346,10 @@ $Comp
 L O_600VA EO2
 U 1 1 4162E0E4
 P 5050 2900
-F 0 "EO2" H 5300 3000 40  0000 C C
-F 1 "O_600VA" H 5050 2750 40  0000 C C
+F 0 "EO2" H 5300 3000 40  0000 C CNN
+F 1 "O_600VA" H 5050 2750 40  0000 C CNN
+F 2 "" H 5050 2900 60  0001 C CNN
+F 3 "" H 5050 2900 60  0001 C CNN
 	1    5050 2900
 	1    0    0    -1  
 $EndComp
@@ -1248,11 +1357,11 @@ $Comp
 L O_900VA EO1
 U 1 1 4162E0D5
 P 5050 2400
-F 0 "EO1" H 5300 2300 40  0000 C C
-F 1 "O_900VA" H 5050 2500 40  0000 C C
-F 2 "Onduleurs" H 5050 2200 30  0000 C C
-F 3 "autonomie" H 5050 2150 30  0000 C C
-F 4 "rallongée" H 5050 2100 30  0000 C C
+F 0 "EO1" H 5300 2300 40  0000 C CNN
+F 1 "O_900VA" H 5050 2500 40  0000 C CNN
+F 2 "Onduleurs" H 5050 2200 30  0000 C CNN
+F 3 "autonomie" H 5050 2150 30  0000 C CNN
+F 4 "rallongée" H 5050 2100 30  0000 C CNN "Champ4"
 	1    5050 2400
 	1    0    0    -1  
 $EndComp
@@ -1260,10 +1369,10 @@ $Comp
 L Q_2A_12O_40KV EQ4
 U 1 1 4162DE98
 P 5050 1350
-F 0 "EQ4" H 4850 700 40  0000 C C
-F 1 "Q_2A_12O_40KV" H 5050 1450 40  0000 C C
-F 2 "Contacteur" H 5150 650 30  0000 C C
-F 3 "isolation HT " H 5150 600 30  0000 C C
+F 0 "EQ4" H 4850 700 40  0000 C CNN
+F 1 "Q_2A_12O_40KV" H 5050 1450 40  0000 C CNN
+F 2 "Contacteur" H 5150 650 30  0000 C CNN
+F 3 "isolation HT " H 5150 600 30  0000 C CNN
 	1    5050 1350
 	1    0    0    -1  
 $EndComp
@@ -1272,8 +1381,10 @@ $Comp
 L V_F50HZ EV2
 U 1 1 4162DD75
 P 2400 1400
-F 0 "EV2" H 2400 1550 40  0000 C C
-F 1 "V_F50HZ" H 2400 1250 40  0000 C C
+F 0 "EV2" H 2400 1550 40  0000 C CNN
+F 1 "V_F50HZ" H 2400 1250 40  0000 C CNN
+F 2 "" H 2400 1400 60  0001 C CNN
+F 3 "" H 2400 1400 60  0001 C CNN
 	1    2400 1400
 	1    0    0    -1  
 $EndComp
@@ -1281,8 +1392,10 @@ $Comp
 L V_U400V EV3
 U 1 1 4162DD5E
 P 2400 1900
-F 0 "EV3" H 2400 2050 40  0000 C C
-F 1 "V_U400V" H 2400 1750 40  0000 C C
+F 0 "EV3" H 2400 2050 40  0000 C CNN
+F 1 "V_U400V" H 2400 1750 40  0000 C CNN
+F 2 "" H 2400 1900 60  0001 C CNN
+F 3 "" H 2400 1900 60  0001 C CNN
 	1    2400 1900
 	1    0    0    -1  
 $EndComp
@@ -1290,8 +1403,10 @@ $Comp
 L Y_ELC EY2
 U 1 1 4162DC78
 P 3550 2750
-F 0 "EY2" H 3650 2800 40  0000 C C
-F 1 "Y_ELC" V 3400 2750 40  0000 C C
+F 0 "EY2" H 3650 2800 40  0000 C CNN
+F 1 "Y_ELC" V 3400 2750 40  0000 C CNN
+F 2 "" H 3550 2750 60  0001 C CNN
+F 3 "" H 3550 2750 60  0001 C CNN
 	1    3550 2750
 	0    -1   -1   0   
 $EndComp
@@ -1299,10 +1414,10 @@ $Comp
 L A_1KVA EA1
 U 1 1 4162DC5B
 P 3550 2450
-F 0 "EA1" H 3550 2650 40  0000 C C
-F 1 "A_1KVA" H 3550 2580 40  0000 C C
-F 2 "Absorbeur" H 3550 2800 30  0000 C C
-F 3 "d'ondes" H 3550 2750 30  0000 C C
+F 0 "EA1" H 3550 2650 40  0000 C CNN
+F 1 "A_1KVA" H 3550 2580 40  0000 C CNN
+F 2 "Absorbeur" H 3550 2800 30  0000 C CNN
+F 3 "d'ondes" H 3550 2750 30  0000 C CNN
 	1    3550 2450
 	1    0    0    -1  
 $EndComp
@@ -1310,8 +1425,10 @@ $Comp
 L Q_25A_2F2O EQ2
 U 1 1 4162DB86
 P 4250 1900
-F 0 "EQ2" H 4090 2020 40  0000 C C
-F 1 "Q_25A_2F2O" H 4250 1760 40  0000 C C
+F 0 "EQ2" H 4090 2020 40  0000 C CNN
+F 1 "Q_25A_2F2O" H 4250 1760 40  0000 C CNN
+F 2 "" H 4250 1900 60  0001 C CNN
+F 3 "" H 4250 1900 60  0001 C CNN
 	1    4250 1900
 	-1   0    0    1   
 $EndComp
@@ -1319,8 +1436,10 @@ $Comp
 L Q_25A_2F2O EQ3
 U 1 1 4162DB5E
 P 4250 2400
-F 0 "EQ3" H 4090 2520 40  0000 C C
-F 1 "Q_25A_2F2O" H 4250 2260 40  0000 C C
+F 0 "EQ3" H 4090 2520 40  0000 C CNN
+F 1 "Q_25A_2F2O" H 4250 2260 40  0000 C CNN
+F 2 "" H 4250 2400 60  0001 C CNN
+F 3 "" H 4250 2400 60  0001 C CNN
 	1    4250 2400
 	-1   0    0    1   
 $EndComp
@@ -1328,8 +1447,10 @@ $Comp
 L Q_25A_2F2O EQ1b
 U 1 1 416245A7
 P 2800 2400
-F 0 "EQ1b" H 2700 2550 40  0000 C C
-F 1 "Q_25A_2F2O" H 2800 2260 40  0000 C C
+F 0 "EQ1b" H 2700 2550 40  0000 C CNN
+F 1 "Q_25A_2F2O" H 2800 2260 40  0000 C CNN
+F 2 "" H 2800 2400 60  0001 C CNN
+F 3 "" H 2800 2400 60  0001 C CNN
 	1    2800 2400
 	1    0    0    1   
 $EndComp
@@ -1337,8 +1458,10 @@ $Comp
 L V_A10A EV1
 U 1 1 4162458B
 P 2400 2400
-F 0 "EV1" H 2400 2550 40  0000 C C
-F 1 "V_A10A" H 2400 2250 40  0000 C C
+F 0 "EV1" H 2400 2550 40  0000 C CNN
+F 1 "V_A10A" H 2400 2250 40  0000 C CNN
+F 2 "" H 2400 2400 60  0001 C CNN
+F 3 "" H 2400 2400 60  0001 C CNN
 	1    2400 2400
 	1    0    0    -1  
 $EndComp
@@ -1346,67 +1469,78 @@ $Comp
 L Q_25A_2F2O EQ1a
 U 1 1 41624555
 P 2000 2400
-F 0 "EQ1a" H 1900 2550 40  0000 C C
-F 1 "Q_25A_2F2O" H 2000 2260 40  0000 C C
+F 0 "EQ1a" H 1900 2550 40  0000 C CNN
+F 1 "Q_25A_2F2O" H 2000 2260 40  0000 C CNN
+F 2 "" H 2000 2400 60  0001 C CNN
+F 3 "" H 2000 2400 60  0001 C CNN
 	1    2000 2400
 	-1   0    0    1   
 $EndComp
 $Comp
-L J_40A_30MA EJ4
+L J_40A_30mA EJ4
 U 1 1 4162432C
 P 1450 4850
-F 0 "EJ4" H 1240 5030 40  0000 C C
-F 1 "J_40A_30MA" H 1430 4730 40  0000 C C
+F 0 "EJ4" H 1240 5030 40  0000 C CNN
+F 1 "J_40A_30mA" H 1430 4730 40  0000 C CNN
+F 2 "" H 1450 4850 60  0001 C CNN
+F 3 "" H 1450 4850 60  0001 C CNN
 	1    1450 4850
 	1    0    0    -1  
 $EndComp
 $Comp
-L J_40A_30MA EJ3
+L J_40A_30mA EJ3
 U 1 1 41624321
 P 1450 4350
-F 0 "EJ3" H 1240 4530 40  0000 C C
-F 1 "J_40A_30MA" H 1430 4230 40  0000 C C
+F 0 "EJ3" H 1240 4530 40  0000 C CNN
+F 1 "J_40A_30mA" H 1430 4230 40  0000 C CNN
+F 2 "" H 1450 4350 60  0001 C CNN
+F 3 "" H 1450 4350 60  0001 C CNN
 	1    1450 4350
 	1    0    0    -1  
 $EndComp
 $Comp
-L J_40A_30MA EJ2
+L J_40A_30mA EJ2
 U 1 1 41624310
 P 1450 3850
-F 0 "EJ2" H 1240 4030 40  0000 C C
-F 1 "J_40A_30MA" H 1430 3730 40  0000 C C
+F 0 "EJ2" H 1240 4030 40  0000 C CNN
+F 1 "J_40A_30mA" H 1430 3730 40  0000 C CNN
+F 2 "" H 1450 3850 60  0001 C CNN
+F 3 "" H 1450 3850 60  0001 C CNN
 	1    1450 3850
 	1    0    0    -1  
 $EndComp
 $Comp
-L J_40A_30MA EJ1
+L J_40A_30mA EJ1
 U 1 1 41624306
 P 1450 3350
-F 0 "EJ1" H 1240 3530 40  0000 C C
-F 1 "J_40A_30MA" H 1430 3230 40  0000 C C
+F 0 "EJ1" H 1240 3530 40  0000 C CNN
+F 1 "J_40A_30mA" H 1430 3230 40  0000 C CNN
+F 2 "" H 1450 3350 60  0001 C CNN
+F 3 "" H 1450 3350 60  0001 C CNN
 	1    1450 3350
 	1    0    0    -1  
 $EndComp
 $Comp
-L R_16A_30MA ER02
+L R_16A_30mA ER02
 U 1 1 416242F0
 P 1450 2750
-F 0 "ER02" H 1240 2930 40  0000 C C
-F 1 "R_16A_30MA" H 1450 2550 40  0000 C C
-F 2 "Courbe B" H 1450 2500 30  0000 C C
+F 0 "ER02" H 1240 2930 40  0000 C CNN
+F 1 "R_16A_30mA" H 1450 2550 40  0000 C CNN
+F 2 "Courbe B" H 1450 2500 30  0000 C CNN
+F 3 "" H 1450 2750 60  0001 C CNN
 	1    1450 2750
 	1    0    0    -1  
 $EndComp
 $Comp
-L G_TH_3KVA EG1
+L G_Th_3KVA EG1
 U 1 1 4162428A
 P 1000 2150
-F 0 "EG1" H 1050 2300 40  0000 C C
-F 1 "G_TH_3KVA" H 1080 2380 40  0000 C C
-F 2 "Groupe" H 640 2260 30  0000 C C
-F 3 "électrogène" H 640 2200 30  0000 C C
-F 4 "automatique" H 640 2140 30  0000 C C
-F 5 "diesel" H 640 2080 30  0000 C C
+F 0 "EG1" H 1050 2300 40  0000 C CNN
+F 1 "G_Th_3KVA" H 1080 2380 40  0000 C CNN
+F 2 "Groupe" H 640 2260 30  0000 C CNN
+F 3 "électrogène" H 640 2200 30  0000 C CNN
+F 4 "automatique" H 640 2140 30  0000 C CNN "Champ4"
+F 5 "diesel" H 640 2080 30  0000 C CNN "Champ5"
 	1    1000 2150
 	1    0    0    -1  
 $EndComp
@@ -1414,10 +1548,10 @@ $Comp
 L S_63A ES1
 U 1 1 416241E5
 P 850 1100
-F 0 "ES1" V 800 1350 40  0000 C C
-F 1 "S_63A" H 850 990 40  0000 C C
-F 2 "Sectionneur" V 650 1350 30  0000 C C
-F 3 "TGBT" V 600 1350 30  0000 C C
+F 0 "ES1" V 800 1350 40  0000 C CNN
+F 1 "S_63A" H 850 990 40  0000 C CNN
+F 2 "Sectionneur" V 650 1350 30  0000 C CNN
+F 3 "TGBT" V 600 1350 30  0000 C CNN
 	1    850  1100
 	0    -1   -1   0   
 $EndComp
@@ -1425,8 +1559,10 @@ $Comp
 L Y_ELC EY1
 U 1 1 41623FE0
 P 1800 1550
-F 0 "EY1" H 1900 1600 40  0000 C C
-F 1 "Y_ELC" V 1650 1550 40  0000 C C
+F 0 "EY1" H 1900 1600 40  0000 C CNN
+F 1 "Y_ELC" V 1650 1550 40  0000 C CNN
+F 2 "" H 1800 1550 60  0001 C CNN
+F 3 "" H 1800 1550 60  0001 C CNN
 	1    1800 1550
 	0    -1   -1   0   
 $EndComp
@@ -1436,8 +1572,10 @@ $Comp
 L W_15KA EW01
 U 1 1 41618802
 P 1800 1150
-F 0 "EW01" H 1800 1300 40  0000 C C
-F 1 "W_15KA" H 1800 950 40  0000 C C
+F 0 "EW01" H 1800 1300 40  0000 C CNN
+F 1 "W_15KA" H 1800 950 40  0000 C CNN
+F 2 "" H 1800 1150 60  0001 C CNN
+F 3 "" H 1800 1150 60  0001 C CNN
 	1    1800 1150
 	0    -1   -1   0   
 $EndComp
@@ -1445,8 +1583,10 @@ $Comp
 L D_10A ED10
 U 1 1 41618699
 P 1350 1150
-F 0 "ED10" H 1190 1270 40  0000 C C
-F 1 "D_10A" H 1250 1070 40  0000 C C
+F 0 "ED10" H 1190 1270 40  0000 C CNN
+F 1 "D_10A" H 1250 1070 40  0000 C CNN
+F 2 "" H 1350 1150 60  0001 C CNN
+F 3 "" H 1350 1150 60  0001 C CNN
 	1    1350 1150
 	0    -1   -1   0   
 $EndComp

demos/flat_hierarchy/flat_hierarchy-cache.lib

+EESchema-LIBRARY Version 2.3
+#encoding utf-8
+#
+# 24C16
+#
+DEF 24C16 U 0 30 Y Y 1 F N
+F0 "U" 150 350 60 H V C CNN
+F1 "24C16" 200 -350 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+ALIAS 24C512
+DRAW
+X GND 4 0 -500 200 U 60 60 0 0 W
+X VCC 8 0 500 200 D 60 60 0 0 W
+S -400 -300 400 300 1 1 0 N
+X A0 1 -700 200 300 R 60 60 1 1 I
+X A1 2 -700 100 300 R 60 60 1 1 I
+X A2 3 -700 0 300 R 60 60 1 1 I
+X SDA 5 700 -200 300 L 60 60 1 1 B
+X SCL 6 700 -100 300 L 60 60 1 1 I
+X WP 7 700 100 300 L 60 60 1 1 I
+ENDDRAW
+ENDDEF
+#
+# 74LS125
+#
+DEF 74LS125 U 0 30 Y Y 4 F N
+F0 "U" 0 100 50 H V L BNN
+F1 "74LS125" 50 -150 40 H V L TNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+X GND 7 -150 -150 0 U 50 30 0 0 W N
+X VCC 14 -150 150 0 D 50 30 0 0 W N
+X E 1 0 -300 220 U 50 30 1 0 I I
+X E 4 0 -300 220 U 50 30 2 0 I I
+X E 10 0 -300 220 U 50 30 3 0 I I
+X E 13 0 -300 220 U 50 30 4 0 I I
+P 4 0 1 0  -150 150  -150 -150  150 0  -150 150 N
+X D 2 -450 0 300 R 50 30 1 1 I
+X O 3 450 0 300 L 50 30 1 1 T
+X D 5 -450 0 300 R 50 30 2 1 I
+X O 6 450 0 300 L 50 30 2 1 T
+X O 8 450 0 300 L 50 30 3 1 T
+X D 9 -450 0 300 R 50 30 3 1 I
+X O 11 450 0 300 L 50 30 4 1 T
+X D 12 -450 0 300 R 50 30 4 1 I
+ENDDRAW
+ENDDEF
+#
+# 7805
+#
+DEF 7805 U 0 30 N Y 1 F N
+F0 "U" 150 -196 60 H V C CNN
+F1 "7805" 0 200 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+ALIAS LM7805 LM7812 78L05
+DRAW
+S -200 -150 200 150 0 1 0 N
+X VI VI -400 50 200 R 40 40 1 1 I
+X VO VO 400 50 200 L 40 40 1 1 w
+X GND GND 0 -250 100 U 40 40 1 1 I
+ENDDRAW
+ENDDEF
+#
+# C
+#
+DEF C C 0 10 N Y 1 F N
+F0 "C" 0 100 40 H V L CNN
+F1 "C" 6 -85 40 H V L CNN
+F2 "" 38 -150 30 H V C CNN
+F3 "" 0 100 30 H V C CNN
+$FPLIST
+ SM*
+ C?
+ C1-1
+$ENDFPLIST
+DRAW
+P 2 0 1 20  -80 -30  80 -30 N
+P 2 0 1 20  -80 30  80 30 N
+X ~ 1 0 200 170 D 40 40 1 1 P
+X ~ 2 0 -200 170 U 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# CONN_2
+#
+DEF CONN_2 P 0 40 Y N 1 F N
+F0 "P" -50 0 40 V V C CNN
+F1 "CONN_2" 50 0 40 V V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+S -100 150 100 -150 0 1 0 N
+X P1 1 -350 100 250 R 60 60 1 1 P I
+X PM 2 -350 -100 250 R 60 60 1 1 P I
+ENDDRAW
+ENDDEF
+#
+# CP
+#
+DEF CP C 0 10 N N 1 F N
+F0 "C" 50 100 40 H V L CNN
+F1 "CP" 50 -100 40 H V L CNN
+F2 "" 100 -150 30 H V C CNN
+F3 "" 50 100 30 H V C CNN
+ALIAS CAPAPOL
+$FPLIST
+ CP*
+ SM*
+$ENDFPLIST
+DRAW
+P 4 0 1 8  -80 50  -80 -50  80 -50  80 50 N
+P 4 0 1 0  -50 50  -50 -20  50 -20  50 50 F
+X ~ 1 0 200 150 D 40 40 1 1 P
+X ~ 2 0 -200 150 U 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# DB9
+#
+DEF DB9 J 0 40 Y N 1 F N
+F0 "J" 0 550 70 H V C CNN
+F1 "DB9" 0 -550 70 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+$FPLIST
+ DB9*
+$ENDFPLIST
+DRAW
+C -70 -400 30 0 1 0 N
+C -70 -200 30 0 1 0 N
+C -70 0 30 0 1 0 N
+C -70 200 30 0 1 0 N
+C -70 400 30 0 1 0 N
+C 50 -300 30 0 1 0 N
+C 50 -100 30 0 1 0 N
+C 50 100 30 0 1 0 N
+C 50 300 30 0 1 0 N
+P 2 0 1 8  -150 -460  -150 460 N
+P 2 0 1 8  -150 -459  -140 -470 N
+P 2 0 1 0  -150 -400  -100 -400 N
+P 2 0 1 0  -150 -300  20 -300 N
+P 2 0 1 0  -150 -200  -100 -200 N
+P 2 0 1 0  -150 -100  20 -100 N
+P 2 0 1 0  -150 0  -100 0 N
+P 2 0 1 0  -150 100  20 100 N
+P 2 0 1 0  -150 200  -100 200 N
+P 2 0 1 0  -150 300  20 300 N
+P 2 0 1 0  -150 400  -100 400 N
+P 2 0 1 8  -140 -470  -110 -490 N
+P 2 0 1 8  -140 470  -150 460 N
+P 2 0 1 8  -140 470  -100 490 N
+P 2 0 1 8  -110 -490  -50 -490 N
+P 2 0 1 8  -100 490  -70 490 N
+P 2 0 1 8  129 390  -70 490 N
+P 2 0 1 8  129 390  150 370 N
+P 2 0 1 8  140 -409  -50 -490 N
+P 2 0 1 8  150 -390  140 -409 N
+P 2 0 1 8  150 370  150 -390 N
+X 1 1 -450 -400 300 R 60 60 1 1 P
+X 2 2 -450 -200 300 R 60 60 1 1 P
+X 3 3 -450 0 300 R 60 60 1 1 P
+X 4 4 -450 200 300 R 60 60 1 1 P
+X 5 5 -450 400 300 R 60 60 1 1 P
+X P6 6 -450 -300 300 R 60 60 1 1 P
+X P7 7 -450 -100 300 R 60 60 1 1 P
+X P8 8 -450 100 300 R 60 60 1 1 P
+X P9 9 -450 300 300 R 60 60 1 1 P
+ENDDRAW
+ENDDEF
+#
+# DIODE
+#
+DEF DIODE D 0 40 N N 1 F N
+F0 "D" 0 100 40 H V C CNN
+F1 "DIODE" 0 -100 40 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+$FPLIST
+ D?
+ S*
+$ENDFPLIST
+DRAW
+P 2 0 1 6  50 50  50 -50 N
+P 3 0 1 0  -50 50  50 0  -50 -50 F
+X A 1 -200 0 150 R 40 40 1 1 P
+X K 2 200 0 150 L 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# DIODESCH
+#
+DEF DIODESCH D 0 40 N N 1 F N
+F0 "D" 0 100 40 H V C CNN
+F1 "DIODESCH" 0 -100 40 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+$FPLIST
+ D?
+ S*
+$ENDFPLIST
+DRAW
+P 3 0 1 0  -50 50  50 0  -50 -50 F
+P 6 0 1 8  75 25  75 50  50 50  50 -50  25 -50  25 -25 N
+X A 1 -200 0 150 R 40 40 1 1 P
+X K 2 200 0 150 L 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# GND
+#
+DEF ~GND #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 0 30 H I C CNN
+F1 "GND" 0 -70 30 H I C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+P 4 0 1 0  -50 0  0 -50  50 0  -50 0 N
+X GND 1 0 0 0 U 30 30 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# INDUCTOR
+#
+DEF INDUCTOR L 0 40 N N 1 F N
+F0 "L" -50 0 40 V V C CNN
+F1 "INDUCTOR" 100 0 40 V V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+A 0 -150 50 -889 889 0 1 0 N 1 -199 1 -100
+A 0 -49 51 -889 889 0 1 0 N 1 -99 1 2
+A 0 51 51 -889 889 0 1 0 N 1 1 1 102
+A 0 148 48 -889 889 0 1 0 N 1 101 1 196
+X 1 1 0 300 100 D 70 70 1 1 P
+X 2 2 0 -300 100 U 70 70 1 1 P
+ENDDRAW
+ENDDEF
+#
+# JUMPER
+#
+DEF JUMPER JP 0 30 Y N 1 F N
+F0 "JP" 0 150 60 H V C CNN
+F1 "JUMPER" 0 -80 40 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+A 0 -26 125 1426 373 0 1 0 N -98 50 99 50
+C -100 0 35 0 1 0 N
+C 100 0 35 0 1 0 N
+X 1 1 -300 0 165 R 60 60 0 1 P
+X 2 2 300 0 165 L 60 60 0 1 P
+ENDDRAW
+ENDDEF
+#
+# LED
+#
+DEF LED D 0 40 Y N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "LED" 0 -100 50 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+$FPLIST
+ LED-3MM
+ LED-5MM
+ LED-10MM
+ LED-0603
+ LED-0805
+ LED-1206
+ LEDV
+$ENDFPLIST
+DRAW
+P 2 0 1 0  50 50  50 -50 N
+P 3 0 1 0  -50 50  50 0  -50 -50 F
+P 3 0 1 0  65 -40  110 -80  105 -55 N
+P 3 0 1 0  80 -25  125 -65  120 -40 N
+X A 1 -200 0 150 R 40 40 1 1 P
+X K 2 200 0 150 L 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# LT1372
+#
+DEF LT1372 U 0 30 Y Y 1 F N
+F0 "U" 600 500 60 H V C CNN
+F1 "LT1372" -500 500 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+ALIAS LT1373
+DRAW
+S -700 -400 700 400 0 1 0 N
+X Vc 1 250 -700 300 U 60 60 1 1 I
+X FB+ 2 1000 -250 300 L 60 60 1 1 I
+X FB- 3 -1000 250 300 R 60 60 1 1 P
+X S/S 4 -1000 -250 300 R 60 60 1 1 P
+X Vin 5 0 700 300 D 60 60 1 1 W
+X GND_S 6 -150 -700 300 U 60 60 1 1 I
+X GND 7 -300 -700 300 U 60 60 1 1 I
+X Vsw 8 1000 250 300 L 60 60 1 1 I
+ENDDRAW
+ENDDEF
+#
+# NPN
+#
+DEF NPN Q 0 0 Y Y 1 F N
+F0 "Q" 0 -150 50 H V R CNN
+F1 "NPN" 0 150 50 H V R CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+C 50 0 111 0 1 10 N
+P 2 0 1 0  0 0  100 100 N
+P 3 0 1 10  0 75  0 -75  0 -75 N
+P 3 0 1 0  50 -50  0 0  0 0 N
+P 3 0 1 0  90 -90  100 -100  100 -100 N
+P 5 0 1 0  90 -90  70 -30  30 -70  90 -90  90 -90 F
+X E 1 100 -200 100 U 40 40 1 1 P
+X B 2 -200 0 200 R 40 40 1 1 I
+X C 3 100 200 100 D 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# PIC12C508A
+#
+DEF PIC12C508A U 0 40 Y Y 1 F N
+F0 "U" 0 700 60 H V C CNN
+F1 "PIC12C508A" 0 -650 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+ALIAS PIC12C509A
+DRAW
+S 400 -600 -450 650 0 1 0 N
+X VDD 1 -750 500 300 R 50 50 1 1 W
+X GP5/OSC1 2 -750 200 300 R 50 50 1 1 I
+X GP4/OSC2 3 -750 -200 300 R 50 50 1 1 I
+X GP3/MCLR 4 -750 -500 300 R 50 50 1 1 I
+X GP2 5 700 -500 300 L 50 50 1 1 I
+X GP1 6 700 -200 300 L 50 50 1 1 I
+X GP0 7 700 200 300 L 50 50 1 1 I
+X VSS 8 700 500 300 L 50 50 1 1 W
+X VDD 1 -750 500 300 R 50 50 1 2 W
+X GP5/OSC1 2 -750 200 300 R 50 50 1 2 I
+X GP4/OSC2 3 -750 -200 300 R 50 50 1 2 I
+X GP3/MCLR 4 -750 -500 300 R 50 50 1 2 I
+X GP2 5 700 -500 300 L 50 50 1 2 I
+X GP1 6 700 -200 300 L 50 50 1 2 I
+X GP0 7 700 200 300 L 50 50 1 2 I
+X VSS 8 700 500 300 L 50 50 1 2 W
+ENDDRAW
+ENDDEF
+#
+# PIC16F54
+#
+DEF PIC16F54 U? 0 40 Y Y 1 F N
+F0 "U?" 0 -750 60 H V C CNN
+F1 "PIC16F54" 0 800 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+S -500 700 450 -700 0 1 0 N
+X RA2 1 -800 600 300 R 50 50 1 1 B
+X RA3 2 -800 450 300 R 50 50 1 1 B
+X T0ckl 3 -800 300 300 R 50 50 1 1 O
+X MCLR 4 -800 150 300 R 50 50 1 1 I
+X VSS 5 -800 0 300 R 50 50 1 1 W
+X RB0 6 -800 -150 300 R 50 50 1 1 B
+X RB1 7 -800 -300 300 R 50 50 1 1 B
+X RB2 8 -800 -450 300 R 50 50 1 1 B
+X RB3 9 -800 -600 300 R 50 50 1 1 B
+X RB4 10 750 -600 300 L 50 50 1 1 B
+X RB5 11 750 -450 300 L 50 50 1 1 B
+X ICSPC/RB6 12 750 -300 300 L 50 50 1 1 B
+X ICSPD/RB7 13 750 -150 300 L 50 50 1 1 B
+X VDD 14 750 0 300 L 50 50 1 1 W
+X OSC2/CLKO 15 750 150 300 L 50 50 1 1 O
+X OSC1/CLKI 16 750 300 300 L 50 50 1 1 I
+X RA0 17 750 450 300 L 50 50 1 1 B
+X RA1 18 750 600 300 L 50 50 1 1 B
+X RA2 1 -800 600 300 R 50 50 1 2 B
+X RA3 2 -800 450 300 R 50 50 1 2 B
+X T0ckl 3 -800 300 300 R 50 50 1 2 O
+X MCLR 4 -800 150 300 R 50 50 1 2 I
+X VSS 5 -800 0 300 R 50 50 1 2 W
+X RB0 6 -800 -150 300 R 50 50 1 2 B
+X RB1 7 -800 -300 300 R 50 50 1 2 B
+X RB2 8 -800 -450 300 R 50 50 1 2 B
+X RB3 9 -800 -600 300 R 50 50 1 2 B
+X RB4 10 750 -600 300 L 50 50 1 2 B
+X RB5 11 750 -450 300 L 50 50 1 2 B
+X ICSPC/RB6 12 750 -300 300 L 50 50 1 2 B
+X ICSPD/RB7 13 750 -150 300 L 50 50 1 2 B
+X VDD 14 750 0 300 L 50 50 1 2 W
+X OSC2/CLKO 15 750 150 300 L 50 50 1 2 O
+X OSC1/CLKI 16 750 300 300 L 50 50 1 2 I
+X RA0 17 750 450 300 L 50 50 1 2 B
+X RA1 18 750 600 300 L 50 50 1 2 B
+ENDDRAW
+ENDDEF
+#
+# PNP
+#
+DEF PNP Q 0 0 Y Y 1 F N
+F0 "Q" 0 -150 60 H V R CNN
+F1 "PNP" 0 150 60 H V R CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+C 50 0 111 0 1 10 N
+P 2 0 1 0  0 0  100 100 N
+P 3 0 1 10  0 75  0 -75  0 -75 F
+P 3 0 1 0  25 -25  0 0  0 0 N
+P 3 0 1 0  100 -100  65 -65  65 -65 N
+P 5 0 1 0  25 -25  50 -75  75 -50  25 -25  25 -25 F
+X E 1 100 -200 100 U 40 40 1 1 P
+X B 2 -200 0 200 R 40 40 1 1 I
+X C 3 100 200 100 D 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# POT
+#
+DEF POT RV 0 40 Y N 1 F N
+F0 "RV" 0 -100 50 H V C CNN
+F1 "POT" 0 0 50 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+S -150 50 150 -50 0 1 0 N
+P 3 0 1 0  0 50  -20 70  20 70 F
+X 1 1 -250 0 100 R 40 40 1 1 P
+X 2 2 0 150 80 D 40 40 1 1 P
+X 3 3 250 0 100 L 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# PWR_FLAG
+#
+DEF PWR_FLAG #FLG 0 0 N N 1 F P
+F0 "#FLG" 0 95 30 H I C CNN
+F1 "PWR_FLAG" 0 180 30 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+X pwr 1 0 0 0 U 20 20 0 0 w
+P 6 0 1 0  0 0  0 50  -75 100  0 150  75 100  0 50 N
+ENDDRAW
+ENDDEF
+#
+# R
+#
+DEF R R 0 0 N Y 1 F N
+F0 "R" 80 0 40 V V C CNN
+F1 "R" 7 1 40 V V C CNN
+F2 "" -70 0 30 V V C CNN
+F3 "" 0 0 30 H V C CNN
+$FPLIST
+ R?
+ SM0603
+ SM0805
+ R?-*
+ SM1206
+$ENDFPLIST
+DRAW
+S -40 150 40 -150 0 1 12 N
+X ~ 1 0 250 100 D 60 60 1 1 P
+X ~ 2 0 -250 100 U 60 60 1 1 P
+ENDDRAW
+ENDDEF
+#
+# SUPP28
+#
+DEF SUPP28 J 0 40 Y Y 1 F N
+F0 "J" 0 100 70 H V C CNN
+F1 "SUPP28" 0 -100 70 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+S -300 -750 300 750 0 1 0 N
+X 1 1 -600 650 300 R 60 60 1 1 P
+X 2 2 -600 550 300 R 60 60 1 1 P
+X 3 3 -600 450 300 R 60 60 1 1 P
+X 4 4 -600 350 300 R 60 60 1 1 P
+X 5 5 -600 250 300 R 60 60 1 1 P
+X 6 6 -600 150 300 R 60 60 1 1 P
+X 7 7 -600 50 300 R 60 60 1 1 P
+X 8 8 -600 -50 300 R 60 60 1 1 P
+X 9 9 -600 -150 300 R 60 60 1 1 P
+X 10 10 -600 -250 300 R 60 60 1 1 P
+X 20 20 600 -150 300 L 60 60 1 1 P
+X 11 11 -600 -350 300 R 60 60 1 1 P
+X 21 21 600 -50 300 L 60 60 1 1 P
+X 12 12 -600 -450 300 R 60 60 1 1 P
+X 22 22 600 50 300 L 60 60 1 1 P
+X 13 13 -600 -550 300 R 60 60 1 1 P
+X 23 23 600 150 300 L 60 60 1 1 P
+X 14 14 -600 -650 300 R 60 60 1 1 P
+X 24 24 600 250 300 L 60 60 1 1 P
+X 15 15 600 -650 300 L 60 60 1 1 P
+X 25 25 600 350 300 L 60 60 1 1 P
+X 16 16 600 -550 300 L 60 60 1 1 P
+X 26 26 600 450 300 L 60 60 1 1 P
+X 17 17 600 -450 300 L 60 60 1 1 P
+X 27 27 600 550 300 L 60 60 1 1 P
+X 18 18 600 -350 300 L 60 60 1 1 P
+X 28 28 600 650 300 L 60 60 1 1 P
+X 19 19 600 -250 300 L 60 60 1 1 P
+ENDDRAW
+ENDDEF
+#
+# SUPP40
+#
+DEF SUPP40 P 0 40 Y Y 1 F N
+F0 "P" 0 1100 70 H V C CNN
+F1 "SUPP40" 0 -1100 70 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+S -300 -1050 300 1050 0 1 0 N
+X 1 1 -600 950 300 R 60 60 1 1 P
+X 2 2 -600 850 300 R 60 60 1 1 P
+X 3 3 -600 750 300 R 60 60 1 1 P
+X 4 4 -600 650 300 R 60 60 1 1 P
+X 5 5 -600 550 300 R 60 60 1 1 P
+X 6 6 -600 450 300 R 60 60 1 1 P
+X 7 7 -600 350 300 R 60 60 1 1 P
+X 8 8 -600 250 300 R 60 60 1 1 P
+X 9 9 -600 150 300 R 60 60 1 1 P
+X 10 10 -600 50 300 R 60 60 1 1 P
+X 20 20 -600 -950 300 R 60 60 1 1 P
+X 30 30 600 -50 300 L 60 60 1 1 P
+X 40 40 600 950 300 L 60 60 1 1 P
+X 11 11 -600 -50 300 R 60 60 1 1 P
+X 21 21 600 -950 300 L 60 60 1 1 P
+X 31 31 600 50 300 L 60 60 1 1 P
+X 12 12 -600 -150 300 R 60 60 1 1 P
+X 22 22 600 -850 300 L 60 60 1 1 P
+X 32 32 600 150 300 L 60 60 1 1 P
+X 13 13 -600 -250 300 R 60 60 1 1 P
+X 23 23 600 -750 300 L 60 60 1 1 P
+X 33 33 600 250 300 L 60 60 1 1 P
+X 14 14 -600 -350 300 R 60 60 1 1 P
+X 24 24 600 -650 300 L 60 60 1 1 P
+X 34 34 600 350 300 L 60 60 1 1 P
+X 15 15 -600 -450 300 R 60 60 1 1 P
+X 25 25 600 -550 300 L 60 60 1 1 P
+X 35 35 600 450 300 L 60 60 1 1 P
+X 16 16 -600 -550 300 R 60 60 1 1 P
+X 26 26 600 -450 300 L 60 60 1 1 P
+X 36 36 600 550 300 L 60 60 1 1 P
+X 17 17 -600 -650 300 R 60 60 1 1 P
+X 27 27 600 -350 300 L 60 60 1 1 P
+X 37 37 600 650 300 L 60 60 1 1 P
+X 18 18 -600 -750 300 R 60 60 1 1 P
+X 28 28 600 -250 300 L 60 60 1 1 P
+X 38 38 600 750 300 L 60 60 1 1 P
+X 19 19 -600 -850 300 R 60 60 1 1 P
+X 29 29 600 -150 300 L 60 60 1 1 P
+X 39 39 600 850 300 L 60 60 1 1 P
+ENDDRAW
+ENDDEF
+#
+# VCC
+#
+DEF VCC #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 100 30 H I C CNN
+F1 "VCC" 0 100 30 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+X VCC 1 0 0 0 U 20 20 0 0 W N
+C 0 50 20 0 1 0 N
+P 3 0 1 0  0 0  0 30  0 30 N
+ENDDRAW
+ENDDEF
+#
+# VPP
+#
+DEF VPP #PWR 0 0 Y Y 1 F N
+F0 "#PWR" 0 200 40 H I C CNN
+F1 "VPP" 0 150 40 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+X VPP 1 0 0 0 U 40 40 0 0 W N
+C 0 80 20 0 1 0 N
+P 2 0 1 0  0 60  0 0 N
+ENDDRAW
+ENDDEF
+#
+#End Library

demos/flat_hierarchy/flat_hierarchy.cmp

-Cmp-Mod V01 Created by Cvpcb (2007-05-11) date = 16/5/2007-09:46:07
+Cmp-Mod V01 Created by Cvpcb (2014-07-04 BZR 4974)-product   date = 05/07/2014 20:15:53
 
 BeginCmp
-TimeStamp = 442A5056;
+TimeStamp = /48553E53/442A5056;
 Reference = C1;
 ValeurCmp = 100uF;
-IdModule  = CP10;
+IdModule  = discret:CP10;
 EndCmp
 
 BeginCmp
-TimeStamp = 442A501D;
+TimeStamp = /48553E53/442A501D;
 Reference = C2;
 ValeurCmp = 220uF;
-IdModule  = CP10;
+IdModule  = discret:CP10;
 EndCmp
 
 BeginCmp
-TimeStamp = 442A584C;
+TimeStamp = /48553E53/442A584C;
 Reference = C3;
 ValeurCmp = 22uF/25V;
-IdModule  = CP8;
+IdModule  = discret:CP8;
 EndCmp
 
 BeginCmp
-TimeStamp = 442A5F61;
+TimeStamp = /48553E53/442A5F61;
 Reference = C4;
 ValeurCmp = 0;
-IdModule  = C1-1;
+IdModule  = discret:C1-1;
 EndCmp
 
 BeginCmp
-TimeStamp = 442A58B1;
+TimeStamp = /48553E53/442A58B1;
 Reference = C5;
 ValeurCmp = 10nF;
-IdModule  = C1-1;
+IdModule  = discret:C1-1;
 EndCmp
 
 BeginCmp
-TimeStamp = 442AA12B;
+TimeStamp = /48553E7C/442AA12B;
 Reference = C6;
 ValeurCmp = 100nF;
-IdModule  = C1-1;
+IdModule  = discret:C1-1;
 EndCmp
 
 BeginCmp
-TimeStamp = 442AA145;
+TimeStamp = /48553E7C/442AA145;
 Reference = C7;
 ValeurCmp = 100nF;
-IdModule  = C1-1;
+IdModule  = discret:C1-1;
 EndCmp
 
 BeginCmp
-TimeStamp = 4639BE2C;
+TimeStamp = /48553E7C/4639BE2C;
 Reference = C8;
 ValeurCmp = 100nF;
-IdModule  = C1-1;
+IdModule  = discret:C1-1;
 EndCmp
 
 BeginCmp
-TimeStamp = 464AD280;
+TimeStamp = /48553E53/464AD280;
 Reference = C9;
 ValeurCmp = 22OnF;
-IdModule  = C1-1;
+IdModule  = discret:C1-1;
 EndCmp
 
 BeginCmp
-TimeStamp = 442A500B;
+TimeStamp = /48553E53/442A500B;
 Reference = D1;
 ValeurCmp = 1N4004;
-IdModule  = D5;
+IdModule  = discret:D5;
 EndCmp
 
 BeginCmp
-TimeStamp = 442A4D1B;
+TimeStamp = /48553E53/442A4D1B;
 Reference = D2;
 ValeurCmp = BAT43;
-IdModule  = D3;
+IdModule  = discret:D3;
 EndCmp
 
 BeginCmp
-TimeStamp = 442A4D25;
+TimeStamp = /48553E53/442A4D25;
 Reference = D3;
 ValeurCmp = BAT43;
-IdModule  = D3;
+IdModule  = discret:D3;
 EndCmp
 
 BeginCmp
-TimeStamp = 442A4D5C;
+TimeStamp = /48553E53/442A4D5C;
 Reference = D4;
 ValeurCmp = BAT43;
-IdModule  = D3;
+IdModule  = discret:D3;
 EndCmp
 
 BeginCmp
-TimeStamp = 442A4D5D;
+TimeStamp = /48553E53/442A4D5D;
 Reference = D5;
 ValeurCmp = BAT43;
-IdModule  = D3;
+IdModule  = discret:D3;
 EndCmp
 
 BeginCmp
-TimeStamp = 442A4D64;
+TimeStamp = /48553E53/442A4D64;
 Reference = D6;
 ValeurCmp = BAT43;
-IdModule  = D3;
+IdModule  = discret:D3;
 EndCmp
 
 BeginCmp
-TimeStamp = 442A4D65;
+TimeStamp = /48553E53/442A4D65;
 Reference = D7;
 ValeurCmp = BAT43;
-IdModule  = D3;
+IdModule  = discret:D3;
 EndCmp
 
 BeginCmp
-TimeStamp = 442A4F5D;
+TimeStamp = /48553E53/442A4F5D;
 Reference = D8;
 ValeurCmp = RED-LED;
-IdModule  = LEDV;
+IdModule  = discret:LEDV;
 EndCmp
 
 BeginCmp
-TimeStamp = 442A5084;
+TimeStamp = /48553E53/442A5084;
 Reference = D9;
 ValeurCmp = GREEN-LED;
-IdModule  = LEDV;
+IdModule  = discret:LEDV;
 EndCmp
 
 BeginCmp
-TimeStamp = 442A6026;
+TimeStamp = /48553E53/442A6026;
 Reference = D10;
 ValeurCmp = SCHOTTKY;
-IdModule  = D5;
+IdModule  = discret:D5;
 EndCmp
 
 BeginCmp
-TimeStamp = 4639BA28;
+TimeStamp = /48553E53/4639BA28;
 Reference = D11;
 ValeurCmp = BAT43;
-IdModule  = D3;
+IdModule  = discret:D3;
 EndCmp
 
 BeginCmp
-TimeStamp = 4639B9EA;
+TimeStamp = /48553E53/4639B9EA;
 Reference = D12;
 ValeurCmp = YELLOW-LED;
-IdModule  = LEDV;
+IdModule  = discret:LEDV;
 EndCmp
 
 BeginCmp
-TimeStamp = 442A4C93;
+TimeStamp = /48553E53/442A4C93;
 Reference = J1;
 ValeurCmp = DB9-FEMAL;
-IdModule  = DB9FC;
+IdModule  = connect:DB9FC;
 EndCmp
 
 BeginCmp
-TimeStamp = 4639BAF8;
+TimeStamp = /48553E53/4639BAF8;
 Reference = JP1;
 ValeurCmp = JUMPER;
-IdModule  = PIN_ARRAY_2X1;
+IdModule  = pin_array:PIN_ARRAY_2X1;
 EndCmp
 
 BeginCmp
-TimeStamp = 442A57BE;
+TimeStamp = /48553E53/442A57BE;
 Reference = L1;
 ValeurCmp = 22uH;
-IdModule  = INDUCTOR_V;
+IdModule  = inductors:INDUCTOR_V;
 EndCmp
 
 BeginCmp
-TimeStamp = 442A4FE7;
+TimeStamp = /48553E53/442A4FE7;
 Reference = P1;
 ValeurCmp = CONN_2;
-IdModule  = bornier2;
+IdModule  = connect:bornier2;
 EndCmp
 
 BeginCmp
-TimeStamp = 4436967E;
+TimeStamp = /48553E7C/4436967E;
 Reference = P2;
 ValeurCmp = SUPP28;
 IdModule  = 28DIP-ELL300;
 EndCmp
 
 BeginCmp
-TimeStamp = 442A88ED;
+TimeStamp = /48553E7C/442A88ED;
 Reference = P3;
 ValeurCmp = SUPP40;
 IdModule  = 40DIP-ELL600;
 EndCmp
 
 BeginCmp
-TimeStamp = 442A4EB9;
+TimeStamp = /48553E53/442A4EB9;
 Reference = Q1;
 ValeurCmp = BC237;
-IdModule  = TO92;
+IdModule  = discret:TO92;
 EndCmp
 
 BeginCmp
-TimeStamp = 442A4F30;
+TimeStamp = /48553E53/442A4F30;
 Reference = Q2;
 ValeurCmp = BC307;
-IdModule  = TO92;
+IdModule  = discret:TO92;
 EndCmp
 
 BeginCmp
-TimeStamp = 4639B996;
+TimeStamp = /48553E53/4639B996;
 Reference = Q3;
 ValeurCmp = BC307;
-IdModule  = TO92;
+IdModule  = discret:TO92;
 EndCmp
 
 BeginCmp
-TimeStamp = 442A4CF4;
+TimeStamp = /48553E53/442A4CF4;
 Reference = R1;
 ValeurCmp = 10K;
-IdModule  = R4;
+IdModule  = discret:R4;
 EndCmp
 
 BeginCmp
-TimeStamp = 442A4CFB;
+TimeStamp = /48553E53/442A4CFB;
 Reference = R2;
 ValeurCmp = 10K;
-IdModule  = R4;
+IdModule  = discret:R4;
 EndCmp
 
 BeginCmp
-TimeStamp = 442A4D5A;
+TimeStamp = /48553E53/442A4D5A;
 Reference = R3;
 ValeurCmp = 10K;
-IdModule  = R4;
+IdModule  = discret:R4;
 EndCmp
 
 BeginCmp
-TimeStamp = 442A4D5B;
+TimeStamp = /48553E53/442A4D5B;
 Reference = R4;
 ValeurCmp = 10K;
-IdModule  = R4;
+IdModule  = discret:R4;
 EndCmp
 
 BeginCmp
-TimeStamp = 442A4D62;
+TimeStamp = /48553E53/442A4D62;
 Reference = R5;
 ValeurCmp = 10K;
-IdModule  = R4;
+IdModule  = discret:R4;
 EndCmp
 
 BeginCmp
-TimeStamp = 442A4D63;
+TimeStamp = /48553E53/442A4D63;
 Reference = R6;
 ValeurCmp = 10K;
-IdModule  = R4;
+IdModule  = discret:R4;
 EndCmp
 
 BeginCmp
-TimeStamp = 442A4F2A;
+TimeStamp = /48553E53/442A4F2A;
 Reference = R7;
 ValeurCmp = 10K;
-IdModule  = R4;
+IdModule  = discret:R4;
 EndCmp
 
 BeginCmp
-TimeStamp = 442A4D92;
+TimeStamp = /48553E53/442A4D92;
 Reference = R8;
 ValeurCmp = 1K;
-IdModule  = R4;
+IdModule  = discret:R4;
 EndCmp
 
 BeginCmp
-TimeStamp = 442A4F52;
+TimeStamp = /48553E53/442A4F52;
 Reference = R9;
 ValeurCmp = 2.2K;
-IdModule  = R4;
+IdModule  = discret:R4;
 EndCmp
 
 BeginCmp
-TimeStamp = 442A5F83;
+TimeStamp = /48553E53/442A5F83;
 Reference = R10;
 ValeurCmp = 5,1K;
-IdModule  = R4;
+IdModule  = discret:R4;
 EndCmp
 
 BeginCmp
-TimeStamp = 442A4F23;
+TimeStamp = /48553E53/442A4F23;
 Reference = R11;
 ValeurCmp = 22K;
-IdModule  = R4;
+IdModule  = discret:R4;
 EndCmp
 
 BeginCmp
-TimeStamp = 442A4D85;
+TimeStamp = /48553E53/442A4D85;
 Reference = R12;
 ValeurCmp = 470;
-IdModule  = R4;
+IdModule  = discret:R4;
 EndCmp
 
 BeginCmp
-TimeStamp = 442A4D8D;
+TimeStamp = /48553E53/442A4D8D;
 Reference = R13;
 ValeurCmp = 470;
-IdModule  = R4;
+IdModule  = discret:R4;
 EndCmp
 
 BeginCmp
-TimeStamp = 442A5083;
+TimeStamp = /48553E53/442A5083;
 Reference = R14;
 ValeurCmp = 470;
-IdModule  = R4;
+IdModule  = discret:R4;
 EndCmp
 
 BeginCmp
-TimeStamp = 442A58D7;
+TimeStamp = /48553E53/442A58D7;
 Reference = R15;
 ValeurCmp = 6.2K;
-IdModule  = R4;
+IdModule  = discret:R4;
 EndCmp
 
 BeginCmp
-TimeStamp = 442A58DC;
+TimeStamp = /48553E53/442A58DC;
 Reference = R16;
 ValeurCmp = 62K;
-IdModule  = R4;
+IdModule  = discret:R4;
 EndCmp
 
 BeginCmp
-TimeStamp = 442A50BF;
+TimeStamp = /48553E53/442A50BF;
 Reference = R17;
 ValeurCmp = 22K;
-IdModule  = R4;
+IdModule  = discret:R4;
 EndCmp
 
 BeginCmp
-TimeStamp = 44369638;
+TimeStamp = /48553E53/44369638;
 Reference = R18;
 ValeurCmp = 220;
-IdModule  = R4;
+IdModule  = discret:R4;
 EndCmp
 
 BeginCmp
-TimeStamp = 4639B9B0;
+TimeStamp = /48553E53/4639B9B0;
 Reference = R19;
 ValeurCmp = 2.2K;
-IdModule  = R4;
+IdModule  = discret:R4;
 EndCmp
 
 BeginCmp
-TimeStamp = 4639B9B3;
+TimeStamp = /48553E53/4639B9B3;
 Reference = R20;
 ValeurCmp = 2.2K;
-IdModule  = R4;
+IdModule  = discret:R4;
 EndCmp
 
 BeginCmp
-TimeStamp = 4639B9E9;
+TimeStamp = /48553E53/4639B9E9;
 Reference = R21;
 ValeurCmp = 470;
-IdModule  = R4;
+IdModule  = discret:R4;
 EndCmp
 
 BeginCmp
-TimeStamp = 443D0101;
+TimeStamp = /48553E53/443D0101;
 Reference = RV1;
 ValeurCmp = 1K;
-IdModule  = RV2X4;
+IdModule  = discret:RV2X4;
 EndCmp
 
 BeginCmp
-TimeStamp = 442A87F7;
+TimeStamp = /48553E7C/442A87F7;
 Reference = U1;
 ValeurCmp = 24Cxx;
-IdModule  = 8DIP-ELL300;
+IdModule  = dip_sockets:DIP-8__300_ELL;
 EndCmp
 
 BeginCmp
-TimeStamp = 442A4D6B;
+TimeStamp = /48553E53/442A4D6B;
 Reference = U2;
 ValeurCmp = 74HC125;
-IdModule  = 14DIP-ELL300;
+IdModule  = dip_sockets:DIP-14__300_ELL;
 EndCmp
 
 BeginCmp
-TimeStamp = 442A504A;
+TimeStamp = /48553E53/442A504A;
 Reference = U3;
 ValeurCmp = 7805;
-IdModule  = LM78XX;
+IdModule  = discret:LM78XX;
 EndCmp
 
 BeginCmp
-TimeStamp = 442A5E20;
+TimeStamp = /48553E53/442A5E20;
 Reference = U4;
 ValeurCmp = LT1373;
-IdModule  = 8DIP-ELL300;
+IdModule  = dip_sockets:DIP-8__300_ELL;
 EndCmp
 
 BeginCmp
-TimeStamp = 442A81A7;
+TimeStamp = /48553E7C/442A81A7;
 Reference = U5;
 ValeurCmp = PIC_18_PINS;
-IdModule  = 18DIP-ELL300;
+IdModule  = dip_sockets:DIP-18__300_ELL;
 EndCmp
 
 BeginCmp
-TimeStamp = 442A81A5;
+TimeStamp = /48553E7C/442A81A5;
 Reference = U6;
 ValeurCmp = PIC_8_PINS;
-IdModule  = 8DIP-ELL300;
+IdModule  = dip_sockets:DIP-8__300_ELL;
 EndCmp
 
 EndListe

demos/flat_hierarchy/flat_hierarchy.net

 (export (version D)
   (design
     (source F:/kicad-launchpad/testing/demos/flat_hierarchy/flat_hierarchy.sch)
-    (date "14/01/2013 12:42:23")
-    (tool "eeschema (2013-01-12 BZR 3902)-testing"))
+    (date "05/07/2014 20:23:42")
+    (tool "Eeschema (2014-07-04 BZR 4974)-product"))
   (components
     (comp (ref C8)
       (value 100nF)
@@ -302,121 +302,6 @@
       (sheetpath (names /pic_programmer/) (tstamps /48553E53/))
       (tstamp 442A4C93)))
   (libparts
-    (libpart (lib device) (part C)
-      (description "Condensateur non polarise")
-      (footprints
-        (fp SM*)
-        (fp C?)
-        (fp C1-1))
-      (fields
-        (field (name Reference) C)
-        (field (name Value) C))
-      (pins
-        (pin (num 1) (name ~) (type passive))
-        (pin (num 2) (name ~) (type passive))))
-    (libpart (lib device) (part CP)
-      (description "Condensateur polarise")
-      (footprints
-        (fp CP*)
-        (fp SM*))
-      (fields
-        (field (name Reference) C)
-        (field (name Value) CP))
-      (pins
-        (pin (num 1) (name ~) (type passive))
-        (pin (num 2) (name ~) (type passive))))
-    (libpart (lib device) (part DIODE)
-      (description "Diode simple")
-      (footprints
-        (fp D?)
-        (fp S*))
-      (fields
-        (field (name Reference) D)
-        (field (name Value) DIODE))
-      (pins
-        (pin (num 1) (name A) (type passive))
-        (pin (num 2) (name K) (type passive))))
-    (libpart (lib device) (part DIODESCH)
-      (description "Diode schottky")
-      (footprints
-        (fp D?)
-        (fp S*))
-      (fields
-        (field (name Reference) D)
-        (field (name Value) DIODESCH))
-      (pins
-        (pin (num 1) (name A) (type passive))
-        (pin (num 2) (name K) (type passive))))
-    (libpart (lib device) (part INDUCTOR)
-      (fields
-        (field (name Reference) L)
-        (field (name Value) INDUCTOR))
-      (pins
-        (pin (num 1) (name 1) (type passive))
-        (pin (num 2) (name 2) (type passive))))
-    (libpart (lib device) (part JUMPER)
-      (fields
-        (field (name Reference) JP)
-        (field (name Value) JUMPER))
-      (pins
-        (pin (num 1) (name 1) (type passive))
-        (pin (num 2) (name 2) (type passive))))
-    (libpart (lib device) (part LED)
-      (footprints
-        (fp LED-3MM)
-        (fp LED-5MM)
-        (fp LED-10MM)
-        (fp LED-0603)
-        (fp LED-0805)
-        (fp LED-1206)
-        (fp LEDV))
-      (fields
-        (field (name Reference) D)
-        (field (name Value) LED))
-      (pins
-        (pin (num 1) (name A) (type passive))
-        (pin (num 2) (name K) (type passive))))
-    (libpart (lib device) (part NPN)
-      (docs transistors/bipolar/*.*)
-      (fields
-        (field (name Reference) Q)
-        (field (name Value) NPN))
-      (pins
-        (pin (num 1) (name E) (type passive))
-        (pin (num 2) (name B) (type input))
-        (pin (num 3) (name C) (type passive))))
-    (libpart (lib device) (part PNP)
-      (docs transistors/bipolar/*.*)
-      (fields
-        (field (name Reference) Q)
-        (field (name Value) PNP))
-      (pins
-        (pin (num 1) (name E) (type passive))
-        (pin (num 2) (name B) (type input))
-        (pin (num 3) (name C) (type passive))))
-    (libpart (lib device) (part POT)
-      (description Potentionmetre)
-      (fields
-        (field (name Reference) RV)
-        (field (name Value) POT))
-      (pins
-        (pin (num 1) (name 1) (type passive))
-        (pin (num 2) (name 2) (type passive))
-        (pin (num 3) (name 3) (type passive))))
-    (libpart (lib device) (part R)
-      (description Resistance)
-      (footprints
-        (fp R?)
-        (fp SM0603)
-        (fp SM0805)
-        (fp R?-*)
-        (fp SM1206))
-      (fields
-        (field (name Reference) R)
-        (field (name Value) R))
-      (pins
-        (pin (num 1) (name ~) (type passive))
-        (pin (num 2) (name ~) (type passive))))
     (libpart (lib conn) (part CONN_2)
       (description "Symbole general de connecteur")
       (fields
@@ -519,7 +404,27 @@
         (pin (num 38) (name 38) (type passive))
         (pin (num 39) (name 39) (type passive))
         (pin (num 40) (name 40) (type passive))))
+    (libpart (lib memory) (part 24C16)
+      (aliases
+        (alias 24C512))
+      (description "I2C Serial EEPROM")
+      (fields
+        (field (name Reference) U)
+        (field (name Value) 24C16))
+      (pins
+        (pin (num 1) (name A0) (type input))
+        (pin (num 2) (name A1) (type input))
+        (pin (num 3) (name A2) (type input))
+        (pin (num 4) (name GND) (type power_in))
+        (pin (num 5) (name SDA) (type BiDi))
+        (pin (num 6) (name SCL) (type input))
+        (pin (num 7) (name WP) (type input))
+        (pin (num 8) (name VCC) (type power_in))))
     (libpart (lib regul) (part 7805)
+      (aliases
+        (alias LM7805)
+        (alias LM7812)
+        (alias 78L05))
       (description "Linear Regulator +5V")
       (docs regulator\lm78xx.pdf)
       (fields
@@ -530,6 +435,8 @@
         (pin (num VI) (name VI) (type input))
         (pin (num VO) (name VO) (type power_out))))
     (libpart (lib regul) (part LT1372)
+      (aliases
+        (alias LT1373))
       (description "Set up/step down switching regulator")
       (docs regulator/lt1372-1377.pdf)
       (fields
@@ -564,21 +471,9 @@
         (pin (num 12) (name D) (type input))
         (pin (num 13) (name E) (type input))
         (pin (num 14) (name VCC) (type power_in))))
-    (libpart (lib memory) (part 24C16)
-      (description "I2C Serial EEPROM")
-      (fields
-        (field (name Reference) U)
-        (field (name Value) 24C16))
-      (pins
-        (pin (num 1) (name A0) (type input))
-        (pin (num 2) (name A1) (type input))
-        (pin (num 3) (name A2) (type input))
-        (pin (num 4) (name GND) (type power_in))
-        (pin (num 5) (name SDA) (type BiDi))
-        (pin (num 6) (name SCL) (type input))
-        (pin (num 7) (name WP) (type input))
-        (pin (num 8) (name VCC) (type power_in))))
     (libpart (lib microcontrollers) (part PIC12C508A)
+      (aliases
+        (alias PIC12C509A))
       (description "8-Bit CMOS Microcontroller")
       (fields
         (field (name Reference) U)
@@ -615,45 +510,150 @@
         (pin (num 15) (name OSC2/CLKO) (type output))
         (pin (num 16) (name OSC1/CLKI) (type input))
         (pin (num 17) (name RA0) (type BiDi))
-        (pin (num 18) (name RA1) (type BiDi)))))
+        (pin (num 18) (name RA1) (type BiDi))))
+    (libpart (lib device) (part NPN)
+      (docs transistors/bipolar/*.*)
+      (fields
+        (field (name Reference) Q)
+        (field (name Value) NPN))
+      (pins
+        (pin (num 1) (name E) (type passive))
+        (pin (num 2) (name B) (type input))
+        (pin (num 3) (name C) (type passive))))
+    (libpart (lib device) (part DIODESCH)
+      (description "Diode schottky")
+      (footprints
+        (fp D?)
+        (fp S*))
+      (fields
+        (field (name Reference) D)
+        (field (name Value) DIODESCH))
+      (pins
+        (pin (num 1) (name A) (type passive))
+        (pin (num 2) (name K) (type passive))))
+    (libpart (lib device) (part JUMPER)
+      (fields
+        (field (name Reference) JP)
+        (field (name Value) JUMPER))
+      (pins
+        (pin (num 1) (name 1) (type passive))
+        (pin (num 2) (name 2) (type passive))))
+    (libpart (lib device) (part DIODE)
+      (description "Diode simple")
+      (footprints
+        (fp D?)
+        (fp S*))
+      (fields
+        (field (name Reference) D)
+        (field (name Value) DIODE))
+      (pins
+        (pin (num 1) (name A) (type passive))
+        (pin (num 2) (name K) (type passive))))
+    (libpart (lib device) (part INDUCTOR)
+      (fields
+        (field (name Reference) L)
+        (field (name Value) INDUCTOR))
+      (pins
+        (pin (num 1) (name 1) (type passive))
+        (pin (num 2) (name 2) (type passive))))
+    (libpart (lib device) (part LED)
+      (footprints
+        (fp LED-3MM)
+        (fp LED-5MM)
+        (fp LED-10MM)
+        (fp LED-0603)
+        (fp LED-0805)
+        (fp LED-1206)
+        (fp LEDV))
+      (fields
+        (field (name Reference) D)
+        (field (name Value) LED))
+      (pins
+        (pin (num 1) (name A) (type passive))
+        (pin (num 2) (name K) (type passive))))
+    (libpart (lib device) (part R)
+      (description Resistance)
+      (footprints
+        (fp R?)
+        (fp SM0603)
+        (fp SM0805)
+        (fp R?-*)
+        (fp SM1206))
+      (fields
+        (field (name Reference) R)
+        (field (name Value) R))
+      (pins
+        (pin (num 1) (name ~) (type passive))
+        (pin (num 2) (name ~) (type passive))))
+    (libpart (lib device) (part CP)
+      (aliases
+        (alias CAPAPOL))
+      (description "Condensateur polarise")
+      (footprints
+        (fp CP*)
+        (fp SM*))
+      (fields
+        (field (name Reference) C)
+        (field (name Value) CP))
+      (pins
+        (pin (num 1) (name ~) (type passive))
+        (pin (num 2) (name ~) (type passive))))
+    (libpart (lib device) (part POT)
+      (description Potentionmetre)
+      (fields
+        (field (name Reference) RV)
+        (field (name Value) POT))
+      (pins
+        (pin (num 1) (name 1) (type passive))
+        (pin (num 2) (name 2) (type passive))
+        (pin (num 3) (name 3) (type passive))))
+    (libpart (lib device) (part PNP)
+      (docs transistors/bipolar/*.*)
+      (fields
+        (field (name Reference) Q)
+        (field (name Value) PNP))
+      (pins
+        (pin (num 1) (name E) (type passive))
+        (pin (num 2) (name B) (type input))
+        (pin (num 3) (name C) (type passive))))
+    (libpart (lib device) (part C)
+      (description "Condensateur non polarise")
+      (footprints
+        (fp SM*)
+        (fp C?)
+        (fp C1-1))
+      (fields
+        (field (name Reference) C)
+        (field (name Value) C))
+      (pins
+        (pin (num 1) (name ~) (type passive))
+        (pin (num 2) (name ~) (type passive)))))
   (libraries
     (library (logical device)
-      (uri F:\kicad\share\library\device.lib))
-    (library (logical conn)
-      (uri F:\kicad\share\library\conn.lib))
+      (uri f:\kicad\share\library\device.lib))
+    (library (logical memory)
+      (uri f:\kicad\share\library\memory.lib))
     (library (logical regul)
-      (uri F:\kicad\share\library\regul.lib))
+      (uri f:\kicad\share\library\regul.lib))
     (library (logical 74xx)
-      (uri F:\kicad\share\library\74xx.lib))
-    (library (logical memory)
-      (uri F:\kicad\share\library\memory.lib))
+      (uri f:\kicad\share\library\74xx.lib))
     (library (logical microcontrollers)
-      (uri F:\kicad\share\library\microcontrollers.lib)))
+      (uri f:\kicad\share\library\microcontrollers.lib))
+    (library (logical conn)
+      (uri f:\kicad\share\library\conn.lib)))
   (nets
-    (net (code 1) (name VCC)
-      (node (ref L1) (pin 2))
-      (node (ref R20) (pin 1))
-      (node (ref Q3) (pin 1))
-      (node (ref U2) (pin 14))
-      (node (ref C6) (pin 1))
-      (node (ref C1) (pin 1))
-      (node (ref U4) (pin 5))
-      (node (ref D4) (pin 2))
-      (node (ref R14) (pin 1))
-      (node (ref U3) (pin VO))
-      (node (ref D2) (pin 2))
-      (node (ref JP1) (pin 1))
-      (node (ref D6) (pin 2)))
-    (net (code 2) (name GND)
+    (net (code 1) (name GND)
+      (node (ref U3) (pin GND))
       (node (ref C2) (pin 2))
-      (node (ref R17) (pin 2))
       (node (ref P1) (pin 1))
       (node (ref D8) (pin 2))
-      (node (ref C1) (pin 2))
+      (node (ref R17) (pin 2))
       (node (ref D9) (pin 2))
+      (node (ref C1) (pin 2))
+      (node (ref D7) (pin 1))
+      (node (ref U2) (pin 10))
       (node (ref D5) (pin 1))
       (node (ref R4) (pin 2))
-      (node (ref D7) (pin 1))
       (node (ref U2) (pin 13))
       (node (ref R6) (pin 2))
       (node (ref U2) (pin 1))
@@ -662,323 +662,332 @@
       (node (ref U2) (pin 7))
       (node (ref U2) (pin 4))
       (node (ref D3) (pin 1))
-      (node (ref U3) (pin GND))
       (node (ref C8) (pin 2))
-      (node (ref P2) (pin 19))
-      (node (ref P3) (pin 31))
-      (node (ref P3) (pin 12))
-      (node (ref P3) (pin 8))
-      (node (ref C7) (pin 2))
-      (node (ref U6) (pin 8))
-      (node (ref U1) (pin 1))
-      (node (ref U1) (pin 2))
-      (node (ref U1) (pin 3))
       (node (ref U5) (pin 5))
+      (node (ref U1) (pin 3))
+      (node (ref U1) (pin 2))
+      (node (ref U1) (pin 1))
+      (node (ref U6) (pin 8))
+      (node (ref P3) (pin 8))
+      (node (ref U1) (pin 4))
+      (node (ref P3) (pin 12))
+      (node (ref P3) (pin 31))
       (node (ref Q1) (pin 1))
-      (node (ref C6) (pin 2))
       (node (ref P2) (pin 8))
-      (node (ref R15) (pin 2))
-      (node (ref U4) (pin 7))
+      (node (ref C6) (pin 2))
+      (node (ref C7) (pin 2))
+      (node (ref P2) (pin 19))
       (node (ref U4) (pin 6))
-      (node (ref C4) (pin 2))
+      (node (ref U4) (pin 7))
       (node (ref C3) (pin 2))
+      (node (ref C4) (pin 2))
       (node (ref C5) (pin 2))
-      (node (ref D12) (pin 2))
-      (node (ref U2) (pin 10)))
-    (net (code 3) (name "")
+      (node (ref R15) (pin 2))
+      (node (ref D12) (pin 2)))
+    (net (code 2) (name VCC)
+      (node (ref D2) (pin 2))
+      (node (ref U3) (pin VO))
+      (node (ref U2) (pin 14))
+      (node (ref D6) (pin 2))
+      (node (ref Q3) (pin 1))
+      (node (ref R20) (pin 1))
+      (node (ref C6) (pin 1))
+      (node (ref JP1) (pin 1))
+      (node (ref L1) (pin 2))
+      (node (ref U4) (pin 5))
+      (node (ref C1) (pin 1))
+      (node (ref R14) (pin 1))
+      (node (ref U1) (pin 8))
+      (node (ref D4) (pin 2)))
+    (net (code 3) (name "Net-(U4-Pad3)")
       (node (ref U4) (pin 3)))
-    (net (code 4) (name "")
-      (node (ref C5) (pin 1))
-      (node (ref R10) (pin 2)))
-    (net (code 5) (name "")
-      (node (ref C4) (pin 1))
-      (node (ref R10) (pin 1))
-      (node (ref U4) (pin 1)))
-    (net (code 6) (name "")
+    (net (code 4) (name "Net-(D10-Pad1)")
+      (node (ref L1) (pin 1))
+      (node (ref U4) (pin 8))
+      (node (ref D10) (pin 1)))
+    (net (code 5) (name "Net-(C5-Pad1)")
+      (node (ref R10) (pin 2))
+      (node (ref C5) (pin 1)))
+    (net (code 6) (name "Net-(D12-Pad1)")
       (node (ref D12) (pin 1))
       (node (ref R21) (pin 1)))
-    (net (code 7) (name "")
+    (net (code 7) (name "Net-(D11-Pad1)")
       (node (ref D11) (pin 1))
       (node (ref R19) (pin 1)))
-    (net (code 8) (name "")
-      (node (ref R20) (pin 2))
+    (net (code 8) (name "Net-(Q3-Pad2)")
       (node (ref R19) (pin 2))
-      (node (ref Q3) (pin 2)))
+      (node (ref Q3) (pin 2))
+      (node (ref R20) (pin 2)))
     (net (code 9) (name VPP)
-      (node (ref R7) (pin 1))
-      (node (ref Q2) (pin 1))
-      (node (ref C3) (pin 1))
       (node (ref R16) (pin 2))
       (node (ref D10) (pin 2))
-      (node (ref C9) (pin 1)))
-    (net (code 10) (name "")
+      (node (ref Q2) (pin 1))
+      (node (ref R7) (pin 1))
+      (node (ref C9) (pin 1))
+      (node (ref C3) (pin 1)))
+    (net (code 10) (name "Net-(J1-Pad9)")
       (node (ref J1) (pin 9)))
-    (net (code 11) (name "")
-      (node (ref J1) (pin 2)))
-    (net (code 12) (name "")
-      (node (ref RV1) (pin 2))
-      (node (ref U4) (pin 2)))
-    (net (code 13) (name "")
+    (net (code 11) (name "Net-(C4-Pad1)")
+      (node (ref U4) (pin 1))
+      (node (ref C4) (pin 1))
+      (node (ref R10) (pin 1)))
+    (net (code 12) (name "Net-(RV1-Pad2)")
+      (node (ref U4) (pin 2))
+      (node (ref RV1) (pin 2)))
+    (net (code 13) (name "Net-(U4-Pad4)")
       (node (ref U4) (pin 4)))
-    (net (code 14) (name "")
-      (node (ref U4) (pin 8))
-      (node (ref L1) (pin 1))
-      (node (ref D10) (pin 1)))
-    (net (code 15) (name "")
+    (net (code 14) (name "Net-(R16-Pad1)")
       (node (ref R16) (pin 1))
       (node (ref RV1) (pin 3)))
-    (net (code 16) (name "")
+    (net (code 15) (name "Net-(R15-Pad1)")
       (node (ref R15) (pin 1))
       (node (ref RV1) (pin 1)))
-    (net (code 17) (name "")
-      (node (ref R9) (pin 2))
-      (node (ref D8) (pin 1)))
-    (net (code 18) (name "")
-      (node (ref U2) (pin 3))
-      (node (ref R8) (pin 1)))
-    (net (code 19) (name "")
-      (node (ref D1) (pin 1))
-      (node (ref P1) (pin 2)))
-    (net (code 20) (name "")
+    (net (code 16) (name "Net-(D8-Pad1)")
+      (node (ref D8) (pin 1))
+      (node (ref R9) (pin 2)))
+    (net (code 17) (name "Net-(D9-Pad1)")
       (node (ref D9) (pin 1))
       (node (ref R14) (pin 2)))
-    (net (code 21) (name "")
+    (net (code 18) (name "Net-(C2-Pad1)")
       (node (ref C2) (pin 1))
       (node (ref U3) (pin VI))
       (node (ref D1) (pin 2)))
-    (net (code 22) (name "")
-      (node (ref U2) (pin 6))
-      (node (ref R12) (pin 1)))
-    (net (code 23) (name "")
-      (node (ref R8) (pin 2))
-      (node (ref Q1) (pin 2)))
-    (net (code 24) (name "")
+    (net (code 19) (name "Net-(R8-Pad1)")
+      (node (ref R8) (pin 1))
+      (node (ref U2) (pin 3)))
+    (net (code 20) (name "Net-(D1-Pad1)")
+      (node (ref P1) (pin 2))
+      (node (ref D1) (pin 1)))
+    (net (code 21) (name "Net-(Q1-Pad2)")
+      (node (ref Q1) (pin 2))
+      (node (ref R8) (pin 2)))
+    (net (code 22) (name "Net-(D11-Pad2)")
+      (node (ref D11) (pin 2))
       (node (ref R11) (pin 1))
-      (node (ref Q1) (pin 3))
-      (node (ref D11) (pin 2)))
-    (net (code 25) (name "")
+      (node (ref Q1) (pin 3)))
+    (net (code 23) (name "Net-(Q2-Pad3)")
+      (node (ref R17) (pin 1))
       (node (ref R18) (pin 1))
-      (node (ref Q2) (pin 3))
       (node (ref R9) (pin 1))
-      (node (ref R17) (pin 1)))
-    (net (code 26) (name VPP/MCLR)
-      (node (ref R18) (pin 2)))
-    (net (code 27) (name "")
+      (node (ref Q2) (pin 3)))
+    (net (code 24) (name "Net-(C9-Pad2)")
       (node (ref C9) (pin 2))
+      (node (ref R7) (pin 2))
       (node (ref R11) (pin 2))
-      (node (ref Q2) (pin 2))
-      (node (ref R7) (pin 2)))
-    (net (code 28) (name "")
-      (node (ref D6) (pin 1))
+      (node (ref Q2) (pin 2)))
+    (net (code 25) (name "Net-(D4-Pad1)")
+      (node (ref D5) (pin 2))
+      (node (ref R3) (pin 2))
+      (node (ref D4) (pin 1))
+      (node (ref U2) (pin 5)))
+    (net (code 26) (name "Net-(R12-Pad1)")
+      (node (ref R12) (pin 1))
+      (node (ref U2) (pin 6)))
+    (net (code 27) (name "Net-(D6-Pad1)")
       (node (ref R5) (pin 2))
+      (node (ref D6) (pin 1))
       (node (ref D7) (pin 2))
       (node (ref U2) (pin 9)))
-    (net (code 29) (name "")
-      (node (ref D5) (pin 2))
-      (node (ref D4) (pin 1))
-      (node (ref U2) (pin 5))
-      (node (ref R3) (pin 2)))
-    (net (code 30) (name "")
-      (node (ref J1) (pin 6)))
-    (net (code 31) (name "")
-      (node (ref D3) (pin 2))
-      (node (ref R1) (pin 2))
+    (net (code 28) (name "Net-(J1-Pad2)")
+      (node (ref J1) (pin 2)))
+    (net (code 29) (name "Net-(D2-Pad1)")
       (node (ref D2) (pin 1))
-      (node (ref U2) (pin 2)))
-    (net (code 32) (name "")
+      (node (ref D3) (pin 2))
+      (node (ref U2) (pin 2))
+      (node (ref R1) (pin 2)))
+    (net (code 30) (name "Net-(J1-Pad1)")
       (node (ref J1) (pin 1)))
-    (net (code 33) (name "")
-      (node (ref U2) (pin 8))
-      (node (ref R13) (pin 1)))
-    (net (code 34) (name /pic_programmer/DTR)
+    (net (code 31) (name "Net-(J1-Pad6)")
+      (node (ref J1) (pin 6)))
+    (net (code 32) (name /pic_programmer/DTR)
       (node (ref R3) (pin 1))
-      (node (ref R4) (pin 1))
-      (node (ref J1) (pin 4)))
+      (node (ref J1) (pin 4))
+      (node (ref R4) (pin 1)))
+    (net (code 33) (name "Net-(R13-Pad1)")
+      (node (ref R13) (pin 1))
+      (node (ref U2) (pin 8)))
+    (net (code 34) (name /pic_programmer/CTS)
+      (node (ref U2) (pin 11))
+      (node (ref J1) (pin 8)))
     (net (code 35) (name /pic_programmer/TXD)
+      (node (ref R1) (pin 1))
       (node (ref J1) (pin 3))
-      (node (ref R2) (pin 1))
-      (node (ref R1) (pin 1)))
+      (node (ref R2) (pin 1)))
     (net (code 36) (name /pic_programmer/PC-CLOCK-OUT)
-      (node (ref R5) (pin 1))
       (node (ref J1) (pin 7))
+      (node (ref R5) (pin 1))
       (node (ref R6) (pin 1)))
-    (net (code 37) (name /pic_programmer/CTS)
-      (node (ref U2) (pin 11))
-      (node (ref J1) (pin 8)))
-    (net (code 38) (name "")
+    (net (code 37) (name "Net-(P2-Pad9)")
       (node (ref P2) (pin 9)))
-    (net (code 39) (name "")
+    (net (code 38) (name "Net-(P2-Pad10)")
       (node (ref P2) (pin 10)))
-    (net (code 40) (name "")
-      (node (ref P2) (pin 4)))
-    (net (code 41) (name "")
+    (net (code 39) (name "Net-(P2-Pad11)")
+      (node (ref P2) (pin 11)))
+    (net (code 40) (name "Net-(P2-Pad5)")
+      (node (ref P2) (pin 5)))
+    (net (code 41) (name "Net-(P2-Pad7)")
       (node (ref P2) (pin 7)))
-    (net (code 42) (name "")
+    (net (code 42) (name "Net-(P2-Pad6)")
       (node (ref P2) (pin 6)))
-    (net (code 43) (name "")
-      (node (ref P2) (pin 5)))
-    (net (code 44) (name "")
-      (node (ref P2) (pin 24)))
-    (net (code 45) (name "")
-      (node (ref P2) (pin 11)))
-    (net (code 46) (name "")
+    (net (code 43) (name "Net-(P2-Pad15)")
+      (node (ref P2) (pin 15)))
+    (net (code 44) (name "Net-(P2-Pad21)")
       (node (ref P2) (pin 21)))
-    (net (code 47) (name "")
+    (net (code 45) (name "Net-(P2-Pad12)")
       (node (ref P2) (pin 12)))
-    (net (code 48) (name "")
+    (net (code 46) (name "Net-(P2-Pad22)")
       (node (ref P2) (pin 22)))
-    (net (code 49) (name "")
+    (net (code 47) (name "Net-(P2-Pad13)")
       (node (ref P2) (pin 13)))
-    (net (code 50) (name "")
+    (net (code 48) (name "Net-(P2-Pad23)")
       (node (ref P2) (pin 23)))
-    (net (code 51) (name "")
+    (net (code 49) (name "Net-(P2-Pad14)")
       (node (ref P2) (pin 14)))
-    (net (code 52) (name "")
-      (node (ref P3) (pin 25)))
-    (net (code 53) (name "")
+    (net (code 50) (name "Net-(P2-Pad24)")
+      (node (ref P2) (pin 24)))
+    (net (code 51) (name "Net-(P3-Pad26)")
+      (node (ref P3) (pin 26)))
+    (net (code 52) (name "Net-(P2-Pad4)")
+      (node (ref P2) (pin 4)))
+    (net (code 53) (name "Net-(P2-Pad3)")
       (node (ref P2) (pin 3)))
-    (net (code 54) (name "")
+    (net (code 54) (name "Net-(P2-Pad2)")
       (node (ref P2) (pin 2)))
     (net (code 55) (name VPP-MCLR)
+      (node (ref P3) (pin 1))
+      (node (ref R18) (pin 2))
       (node (ref U5) (pin 4))
-      (node (ref U6) (pin 4))
       (node (ref P2) (pin 1))
-      (node (ref P3) (pin 1)))
-    (net (code 56) (name "")
-      (node (ref P3) (pin 35)))
-    (net (code 57) (name "")
-      (node (ref P3) (pin 34)))
-    (net (code 58) (name "")
-      (node (ref P3) (pin 33)))
-    (net (code 59) (name "")
-      (node (ref P3) (pin 30)))
-    (net (code 60) (name "")
-      (node (ref P3) (pin 29)))
-    (net (code 61) (name "")
+      (node (ref U6) (pin 4)))
+    (net (code 56) (name "Net-(P3-Pad28)")
       (node (ref P3) (pin 28)))
-    (net (code 62) (name "")
-      (node (ref P3) (pin 27)))
-    (net (code 63) (name "")
-      (node (ref P3) (pin 26)))
-    (net (code 64) (name VCC_PIC)
-      (node (ref JP1) (pin 2))
+    (net (code 57) (name "Net-(P3-Pad21)")
+      (node (ref P3) (pin 21)))
+    (net (code 58) (name "Net-(P3-Pad22)")
+      (node (ref P3) (pin 22)))
+    (net (code 59) (name "Net-(P3-Pad23)")
+      (node (ref P3) (pin 23)))
+    (net (code 60) (name "Net-(P3-Pad24)")
+      (node (ref P3) (pin 24)))
+    (net (code 61) (name "Net-(P3-Pad25)")
+      (node (ref P3) (pin 25)))
+    (net (code 62) (name VCC_PIC)
+      (node (ref U6) (pin 1))
+      (node (ref P2) (pin 20))
       (node (ref C8) (pin 1))
-      (node (ref C7) (pin 1))
-      (node (ref P3) (pin 11))
       (node (ref U5) (pin 14))
+      (node (ref JP1) (pin 2))
+      (node (ref P3) (pin 11))
+      (node (ref C7) (pin 1))
       (node (ref Q3) (pin 3))
-      (node (ref P2) (pin 20))
-      (node (ref U6) (pin 1))
       (node (ref R21) (pin 2))
       (node (ref P3) (pin 32)))
-    (net (code 65) (name "")
-      (node (ref P3) (pin 24)))
-    (net (code 66) (name "")
-      (node (ref P3) (pin 23)))
-    (net (code 67) (name "")
-      (node (ref P3) (pin 22)))
-    (net (code 68) (name "")
-      (node (ref P3) (pin 21)))
-    (net (code 69) (name "")
-      (node (ref P2) (pin 15)))
-    (net (code 70) (name DATA-RB7)
+    (net (code 63) (name "Net-(P3-Pad27)")
+      (node (ref P3) (pin 27)))
+    (net (code 64) (name "Net-(P3-Pad29)")
+      (node (ref P3) (pin 29)))
+    (net (code 65) (name "Net-(P3-Pad30)")
+      (node (ref P3) (pin 30)))
+    (net (code 66) (name "Net-(P3-Pad33)")
+      (node (ref P3) (pin 33)))
+    (net (code 67) (name "Net-(P3-Pad34)")
+      (node (ref P3) (pin 34)))
+    (net (code 68) (name "Net-(P3-Pad35)")
+      (node (ref P3) (pin 35)))
+    (net (code 69) (name "Net-(P3-Pad36)")
+      (node (ref P3) (pin 36)))
+    (net (code 70) (name "Net-(P3-Pad37)")
+      (node (ref P3) (pin 37)))
+    (net (code 71) (name "Net-(P2-Pad25)")
+      (node (ref P2) (pin 25)))
+    (net (code 72) (name DATA-RB7)
+      (node (ref U6) (pin 7))
       (node (ref U2) (pin 12))
+      (node (ref R12) (pin 2))
       (node (ref U1) (pin 5))
       (node (ref P2) (pin 28))
-      (node (ref R12) (pin 2))
-      (node (ref U6) (pin 7))
-      (node (ref P3) (pin 40))
-      (node (ref U5) (pin 13)))
-    (net (code 71) (name "")
+      (node (ref U5) (pin 13))
+      (node (ref P3) (pin 40)))
+    (net (code 73) (name "Net-(P2-Pad18)")
       (node (ref P2) (pin 18)))
-    (net (code 72) (name CLOCK-RB6)
-      (node (ref P2) (pin 27))
+    (net (code 74) (name CLOCK-RB6)
       (node (ref U5) (pin 12))
-      (node (ref U6) (pin 6))
-      (node (ref U1) (pin 6))
       (node (ref P3) (pin 39))
-      (node (ref R13) (pin 2)))
-    (net (code 73) (name "")
+      (node (ref P2) (pin 27))
+      (node (ref U1) (pin 6))
+      (node (ref R13) (pin 2))
+      (node (ref U6) (pin 6)))
+    (net (code 75) (name "Net-(P2-Pad17)")
       (node (ref P2) (pin 17)))
-    (net (code 74) (name "")
+    (net (code 76) (name "Net-(P2-Pad26)")
       (node (ref P2) (pin 26)))
-    (net (code 75) (name "")
+    (net (code 77) (name "Net-(P2-Pad16)")
       (node (ref P2) (pin 16)))
-    (net (code 76) (name "")
-      (node (ref P2) (pin 25)))
-    (net (code 77) (name "")
-      (node (ref P3) (pin 3)))
-    (net (code 78) (name "")
-      (node (ref U5) (pin 16)))
-    (net (code 79) (name "")
-      (node (ref U5) (pin 6)))
-    (net (code 80) (name "")
+    (net (code 78) (name "Net-(P3-Pad4)")
+      (node (ref P3) (pin 4)))
+    (net (code 79) (name "Net-(U5-Pad3)")
       (node (ref U5) (pin 3)))
-    (net (code 81) (name "")
-      (node (ref U5) (pin 2)))
-    (net (code 82) (name "")
-      (node (ref U5) (pin 1)))
-    (net (code 83) (name "")
-      (node (ref U5) (pin 7)))
-    (net (code 84) (name "")
-      (node (ref U5) (pin 8)))
-    (net (code 85) (name "")
+    (net (code 80) (name "Net-(U5-Pad9)")
       (node (ref U5) (pin 9)))
-    (net (code 86) (name "")
+    (net (code 81) (name "Net-(U5-Pad8)")
+      (node (ref U5) (pin 8)))
+    (net (code 82) (name "Net-(U5-Pad7)")
+      (node (ref U5) (pin 7)))
+    (net (code 83) (name "Net-(U5-Pad6)")
+      (node (ref U5) (pin 6)))
+    (net (code 84) (name "Net-(U5-Pad1)")
+      (node (ref U5) (pin 1)))
+    (net (code 85) (name "Net-(U5-Pad2)")
+      (node (ref U5) (pin 2)))
+    (net (code 86) (name "Net-(U5-Pad18)")
       (node (ref U5) (pin 18)))
-    (net (code 87) (name "")
+    (net (code 87) (name "Net-(U5-Pad10)")
+      (node (ref U5) (pin 10)))
+    (net (code 88) (name "Net-(U5-Pad11)")
+      (node (ref U5) (pin 11)))
+    (net (code 89) (name "Net-(U5-Pad17)")
       (node (ref U5) (pin 17)))
-    (net (code 88) (name "")
+    (net (code 90) (name "Net-(U5-Pad15)")
       (node (ref U5) (pin 15)))
-    (net (code 89) (name "")
-      (node (ref U5) (pin 11)))
-    (net (code 90) (name "")
-      (node (ref U5) (pin 10)))
-    (net (code 91) (name "")
+    (net (code 91) (name "Net-(U5-Pad16)")
+      (node (ref U5) (pin 16)))
+    (net (code 92) (name "Net-(U1-Pad7)")
       (node (ref U1) (pin 7)))
-    (net (code 92) (name "")
-      (node (ref U1) (pin 8)))
-    (net (code 93) (name "")
-      (node (ref U1) (pin 4)))
-    (net (code 94) (name "")
+    (net (code 93) (name "Net-(U6-Pad5)")
       (node (ref U6) (pin 5)))
-    (net (code 95) (name "")
+    (net (code 94) (name "Net-(U6-Pad3)")
       (node (ref U6) (pin 3)))
-    (net (code 96) (name "")
+    (net (code 95) (name "Net-(U6-Pad2)")
       (node (ref U6) (pin 2)))
-    (net (code 97) (name "")
-      (node (ref P3) (pin 4)))
-    (net (code 98) (name "")
-      (node (ref P3) (pin 20)))
-    (net (code 99) (name "")
-      (node (ref P3) (pin 10)))
-    (net (code 100) (name "")
-      (node (ref P3) (pin 9)))
-    (net (code 101) (name "")
+    (net (code 96) (name "Net-(P3-Pad7)")
       (node (ref P3) (pin 7)))
-    (net (code 102) (name "")
-      (node (ref P3) (pin 6)))
-    (net (code 103) (name "")
-      (node (ref P3) (pin 5)))
-    (net (code 104) (name "")
+    (net (code 97) (name "Net-(P3-Pad2)")
       (node (ref P3) (pin 2)))
-    (net (code 105) (name "")
+    (net (code 98) (name "Net-(P3-Pad3)")
+      (node (ref P3) (pin 3)))
+    (net (code 99) (name "Net-(P3-Pad5)")
+      (node (ref P3) (pin 5)))
+    (net (code 100) (name "Net-(P3-Pad6)")
+      (node (ref P3) (pin 6)))
+    (net (code 101) (name "Net-(P3-Pad9)")
+      (node (ref P3) (pin 9)))
+    (net (code 102) (name "Net-(P3-Pad10)")
+      (node (ref P3) (pin 10)))
+    (net (code 103) (name "Net-(P3-Pad20)")
+      (node (ref P3) (pin 20)))
+    (net (code 104) (name "Net-(P3-Pad13)")
       (node (ref P3) (pin 13)))
-    (net (code 106) (name "")
+    (net (code 105) (name "Net-(P3-Pad14)")
       (node (ref P3) (pin 14)))
-    (net (code 107) (name "")
+    (net (code 106) (name "Net-(P3-Pad15)")
       (node (ref P3) (pin 15)))
-    (net (code 108) (name "")
+    (net (code 107) (name "Net-(P3-Pad16)")
       (node (ref P3) (pin 16)))
-    (net (code 109) (name "")
+    (net (code 108) (name "Net-(P3-Pad17)")
       (node (ref P3) (pin 17)))
-    (net (code 110) (name "")
+    (net (code 109) (name "Net-(P3-Pad18)")
       (node (ref P3) (pin 18)))
-    (net (code 111) (name "")
+    (net (code 110) (name "Net-(P3-Pad19)")
       (node (ref P3) (pin 19)))
-    (net (code 112) (name "")
-      (node (ref P3) (pin 38)))
-    (net (code 113) (name "")
+    (net (code 111) (name "Net-(P3-Pad38)")
+      (node (ref P3) (pin 38)))))
\ No newline at end of file
-      (node (ref P3) (pin 37)))
-    (net (code 114) (name "")
-      (node (ref P3) (pin 36)))))
\ No newline at end of file

demos/flat_hierarchy/flat_hierarchy.sch

 EESchema Schematic File Version 2
-LIBS:power,device,transistors,conn,linear,regul,74xx,cmos4000,adc-dac,memory,xilinx,special,microcontrollers,dsp,microchip,analog_switches,motorola,texas,intel,audio,interface,digital-audio,philips,display,cypress,siliconi,contrib,valves
-EELAYER 23  0
+LIBS:power
+LIBS:device
+LIBS:transistors
+LIBS:conn
+LIBS:linear
+LIBS:regul
+LIBS:74xx
+LIBS:cmos4000
+LIBS:adc-dac
+LIBS:memory
+LIBS:xilinx
+LIBS:special
+LIBS:microcontrollers
+LIBS:dsp
+LIBS:microchip
+LIBS:analog_switches
+LIBS:motorola
+LIBS:texas
+LIBS:intel
+LIBS:audio
+LIBS:interface
+LIBS:digital-audio
+LIBS:philips
+LIBS:display
+LIBS:cypress
+LIBS:siliconi
+LIBS:opto
+LIBS:atmel
+LIBS:flat_hierarchy-cache
+EELAYER 24 0
 EELAYER END
-$Descr A4 11700 8267
+$Descr A4 11693 8268
+encoding utf-8
 Sheet 1 3
 Title ""
 Date "15 jun 2008"

demos/flat_hierarchy/pic_programmer.sch

 EESchema Schematic File Version 2
-LIBS:power,device,transistors,conn,linear,regul,74xx,cmos4000,adc-dac,memory,xilinx,special,microcontrollers,dsp,microchip,analog_switches,motorola,texas,intel,audio,interface,digital-audio,philips,display,cypress,siliconi,contrib,valves
-EELAYER 23  0
+LIBS:power
+LIBS:device
+LIBS:transistors
+LIBS:conn
+LIBS:linear
+LIBS:regul
+LIBS:74xx
+LIBS:cmos4000
+LIBS:adc-dac
+LIBS:memory
+LIBS:xilinx
+LIBS:special
+LIBS:microcontrollers
+LIBS:dsp
+LIBS:microchip
+LIBS:analog_switches
+LIBS:motorola
+LIBS:texas
+LIBS:intel
+LIBS:audio
+LIBS:interface
+LIBS:digital-audio
+LIBS:philips
+LIBS:display
+LIBS:cypress
+LIBS:siliconi
+LIBS:opto
+LIBS:atmel
+LIBS:flat_hierarchy-cache
+EELAYER 24 0
 EELAYER END
-$Descr A4 11700 8267
+$Descr A4 11693 8268
+encoding utf-8
 Sheet 3 3
 Title "JDM - COM84 PIC Programmer with 13V DC/DC converter"
 Date "15 apr 2008"
@@ -231,46 +260,54 @@ Wire Wire Line
 	7800 1500 7800 1600
 Connection ~ 7800 1600
 $Comp
-L PWR_FLAG #FLG013
+L PWR_FLAG #FLG015
 U 1 1 48553F47
 P 9100 3050
-F 0 "#FLG013" H 9100 3320 30  0001 C C
-F 1 "PWR_FLAG" H 9100 3280 30  0000 C C
+F 0 "#FLG015" H 9100 3320 30  0001 C CNN
+F 1 "PWR_FLAG" H 9100 3280 30  0000 C CNN
+F 2 "" H 9100 3050 60  0001 C CNN
+F 3 "" H 9100 3050 60  0001 C CNN
 	1    9100 3050
 	1    0    0    -1  
 $EndComp
 $Comp
-L PWR_FLAG #FLG014
+L PWR_FLAG #FLG016
 U 1 1 48553F27
 P 7800 1500
-F 0 "#FLG014" H 7800 1770 30  0001 C C
-F 1 "PWR_FLAG" H 7800 1730 30  0000 C C
+F 0 "#FLG016" H 7800 1770 30  0001 C CNN
+F 1 "PWR_FLAG" H 7800 1730 30  0000 C CNN
+F 2 "" H 7800 1500 60  0001 C CNN
+F 3 "" H 7800 1500 60  0001 C CNN
 	1    7800 1500
 	1    0    0    -1  
 $EndComp
-Text GLabel 6300 4750 2    60   Output
+Text GLabel 6300 4750 2    60   Output ~ 0
 CLOCK-RB6
-Text GLabel 6200 3150 2    60   Output
+Text GLabel 6200 3150 2    60   Output ~ 0
 DATA-RB7
-Text GLabel 8350 1600 2    60   Output
-VPP/MCLR
-Text GLabel 9200 3200 2    60   Output
+Text GLabel 8350 1600 2    60   Output ~ 0
+VPP-MCLR
+Text GLabel 9200 3200 2    60   Output ~ 0
 VCC_PIC
 $Comp
 L C C9
 U 1 1 464AD280
 P 5700 1000
-F 0 "C9" H 5750 1100 50  0000 L C
-F 1 "22OnF" H 5750 900 50  0000 L C
+F 0 "C9" H 5750 1100 50  0000 L CNN
+F 1 "22OnF" H 5750 900 50  0000 L CNN
+F 2 "" H 5700 1000 60  0001 C CNN
+F 3 "" H 5700 1000 60  0001 C CNN
 	1    5700 1000
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR015
+L VCC #PWR017
 U 1 1 4639BB04
 P 8650 2550
-F 0 "#PWR015" H 8650 2650 30  0001 C C
-F 1 "VCC" H 8650 2650 30  0000 C C
+F 0 "#PWR017" H 8650 2650 30  0001 C CNN
+F 1 "VCC" H 8650 2650 30  0000 C CNN
+F 2 "" H 8650 2550 60  0001 C CNN
+F 3 "" H 8650 2550 60  0001 C CNN
 	1    8650 2550
 	1    0    0    -1  
 $EndComp
@@ -278,8 +315,10 @@ $Comp
 L JUMPER JP1
 U 1 1 4639BAF8
 P 8650 2850
-F 0 "JP1" H 8650 3000 60  0000 C C
-F 1 "JUMPER" H 8650 2770 40  0000 C C
+F 0 "JP1" H 8650 3000 60  0000 C CNN
+F 1 "JUMPER" H 8650 2770 40  0000 C CNN
+F 2 "" H 8650 2850 60  0001 C CNN
+F 3 "" H 8650 2850 60  0001 C CNN
 	1    8650 2850
 	0    1    1    0   
 $EndComp
@@ -287,26 +326,32 @@ $Comp
 L DIODESCH D11
 U 1 1 4639BA28
 P 7150 2900
-F 0 "D11" H 7150 3000 40  0000 C C
-F 1 "BAT43" H 7150 2800 40  0000 C C
+F 0 "D11" H 7150 3000 40  0000 C CNN
+F 1 "BAT43" H 7150 2800 40  0000 C CNN
+F 2 "" H 7150 2900 60  0001 C CNN
+F 3 "" H 7150 2900 60  0001 C CNN
 	1    7150 2900
 	-1   0    0    1   
 $EndComp
 $Comp
-L VCC #PWR016
+L VCC #PWR018
 U 1 1 4639BA17
 P 8300 2700
-F 0 "#PWR016" H 8300 2800 30  0001 C C
-F 1 "VCC" H 8300 2800 30  0000 C C
+F 0 "#PWR018" H 8300 2800 30  0001 C CNN
+F 1 "VCC" H 8300 2800 30  0000 C CNN
+F 2 "" H 8300 2700 60  0001 C CNN
+F 3 "" H 8300 2700 60  0001 C CNN
 	1    8300 2700
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR017
+L GND #PWR019
 U 1 1 4639B9EB
 P 7650 3700
-F 0 "#PWR017" H 7650 3700 30  0001 C C
-F 1 "GND" H 7650 3630 30  0001 C C
+F 0 "#PWR019" H 7650 3700 30  0001 C CNN
+F 1 "GND" H 7650 3630 30  0001 C CNN
+F 2 "" H 7650 3700 60  0001 C CNN
+F 3 "" H 7650 3700 60  0001 C CNN
 	1    7650 3700
 	1    0    0    -1  
 $EndComp
@@ -314,9 +359,11 @@ $Comp
 L LED D12
 U 1 1 4639B9EA
 P 7650 3500
-F 0 "D12" H 7650 3600 50  0000 C C
-F 1 "YELLOW-LED" H 7650 3400 50  0000 C C
-F 4 "YELLOW-LED" H 7700 3650 40  0000 C C
+F 0 "D12" H 7650 3600 50  0000 C CNN
+F 1 "YELLOW-LED" H 7650 3400 50  0000 C CNN
+F 2 "" H 7650 3500 60  0001 C CNN
+F 3 "" H 7650 3500 60  0001 C CNN
+F 4 "YELLOW-LED" H 7700 3650 40  0000 C CNN "Champ4"
 	1    7650 3500
 	0    1    1    0   
 $EndComp
@@ -324,8 +371,10 @@ $Comp
 L R R21
 U 1 1 4639B9E9
 P 7900 3200
-F 0 "R21" V 7980 3200 50  0000 C C
-F 1 "470" V 7900 3200 50  0000 C C
+F 0 "R21" V 7980 3200 50  0000 C CNN
+F 1 "470" V 7900 3200 50  0000 C CNN
+F 2 "" H 7900 3200 60  0001 C CNN
+F 3 "" H 7900 3200 60  0001 C CNN
 	1    7900 3200
 	0    -1   -1   0   
 $EndComp
@@ -333,8 +382,10 @@ $Comp
 L R R20
 U 1 1 4639B9B3
 P 7650 2650
-F 0 "R20" V 7730 2650 50  0000 C C
-F 1 "2.2K" V 7650 2650 50  0000 C C
+F 0 "R20" V 7730 2650 50  0000 C CNN
+F 1 "2.2K" V 7650 2650 50  0000 C CNN
+F 2 "" H 7650 2650 60  0001 C CNN
+F 3 "" H 7650 2650 60  0001 C CNN
 	1    7650 2650
 	0    -1   -1   0   
 $EndComp
@@ -342,8 +393,10 @@ $Comp
 L R R19
 U 1 1 4639B9B0
 P 7650 2900
-F 0 "R19" V 7730 2900 50  0000 C C
-F 1 "2.2K" V 7650 2900 50  0000 C C
+F 0 "R19" V 7730 2900 50  0000 C CNN
+F 1 "2.2K" V 7650 2900 50  0000 C CNN
+F 2 "" H 7650 2900 60  0001 C CNN
+F 3 "" H 7650 2900 60  0001 C CNN
 	1    7650 2900
 	0    -1   -1   0   
 $EndComp
@@ -351,28 +404,34 @@ $Comp
 L PNP Q3
 U 1 1 4639B996
 P 8200 2900
-F 0 "Q3" H 8350 2900 60  0000 C C
-F 1 "BC307" H 8104 3050 60  0000 C C
+F 0 "Q3" H 8350 2900 60  0000 C CNN
+F 1 "BC307" H 8104 3050 60  0000 C CNN
+F 2 "" H 8200 2900 60  0001 C CNN
+F 3 "" H 8200 2900 60  0001 C CNN
 	1    8200 2900
 	1    0    0    1   
 $EndComp
 $Comp
-L VCC #PWR018
+L VCC #PWR020
 U 1 1 4638AB33
 P 7400 2650
-F 0 "#PWR018" H 7400 2750 30  0001 C C
-F 1 "VCC" H 7400 2750 30  0000 C C
+F 0 "#PWR020" H 7400 2750 30  0001 C CNN
+F 1 "VCC" H 7400 2750 30  0000 C CNN
+F 2 "" H 7400 2650 60  0001 C CNN
+F 3 "" H 7400 2650 60  0001 C CNN
 	1    7400 2650
 	1    0    0    -1  
 $EndComp
-Text Notes 9700 6500 0    50   ~
+Text Notes 9700 6500 0    50   ~ 0
 ADJUST for VPP = 13V
 $Comp
 L POT RV1
 U 1 1 443D0101
 P 9500 6500
-F 0 "RV1" H 9500 6400 50  0000 C C
-F 1 "1K" H 9500 6500 50  0000 C C
+F 0 "RV1" H 9500 6400 50  0000 C CNN
+F 1 "1K" H 9500 6500 50  0000 C CNN
+F 2 "" H 9500 6500 60  0001 C CNN
+F 3 "" H 9500 6500 60  0001 C CNN
 	1    9500 6500
 	0    -1   -1   0   
 $EndComp
@@ -380,46 +439,54 @@ $Comp
 L R R18
 U 1 1 44369638
 P 7350 1600
-F 0 "R18" V 7430 1600 50  0000 C C
-F 1 "220" V 7350 1600 50  0000 C C
+F 0 "R18" V 7430 1600 50  0000 C CNN
+F 1 "220" V 7350 1600 50  0000 C CNN
+F 2 "" H 7350 1600 60  0001 C CNN
+F 3 "" H 7350 1600 60  0001 C CNN
 	1    7350 1600
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR019
+L GND #PWR021
 U 1 1 442AABC2
 P 6550 2650
-F 0 "#PWR019" H 6550 2650 30  0001 C C
-F 1 "GND" H 6550 2580 30  0001 C C
+F 0 "#PWR021" H 6550 2650 30  0001 C CNN
+F 1 "GND" H 6550 2580 30  0001 C CNN
+F 2 "" H 6550 2650 60  0001 C CNN
+F 3 "" H 6550 2650 60  0001 C CNN
 	1    6550 2650
 	1    0    0    -1  
 $EndComp
 $Comp
-L PWR_FLAG #FLG020
+L PWR_FLAG #FLG022
 U 1 1 442A8330
 P 1600 6900
-F 0 "#FLG020" H 1600 7170 30  0001 C C
-F 1 "PWR_FLAG" H 1600 7130 30  0000 C C
+F 0 "#FLG022" H 1600 7170 30  0001 C CNN
+F 1 "PWR_FLAG" H 1600 7130 30  0000 C CNN
+F 2 "" H 1600 6900 60  0001 C CNN
+F 3 "" H 1600 6900 60  0001 C CNN
 	1    1600 6900
 	-1   0    0    1   
 $EndComp
-Text Label 1850 3800 0    60   ~
+Text Label 1850 3800 0    60   ~ 0
 DTR
-Text Label 1850 3700 0    60   ~
+Text Label 1850 3700 0    60   ~ 0
 CTS
-Text Label 1850 3600 0    60   ~
+Text Label 1850 3600 0    60   ~ 0
 TXD
-Text Label 1850 3500 0    60   ~
+Text Label 1850 3500 0    60   ~ 0
 RTS
-Text Notes 850  6500 0    60   ~
+Text Notes 850  6500 0    60   ~ 0
 8 to 15V
 NoConn ~ 6650 5750
 $Comp
 L DIODESCH D10
 U 1 1 442A6026
 P 9300 6000
-F 0 "D10" H 9300 6100 40  0000 C C
-F 1 "SCHOTTKY" H 9300 5900 40  0000 C C
+F 0 "D10" H 9300 6100 40  0000 C CNN
+F 1 "SCHOTTKY" H 9300 5900 40  0000 C CNN
+F 2 "" H 9300 6000 60  0001 C CNN
+F 3 "" H 9300 6000 60  0001 C CNN
 	1    9300 6000
 	1    0    0    -1  
 $EndComp
@@ -427,8 +494,10 @@ $Comp
 L R R10
 U 1 1 442A5F83
 P 8250 6700
-F 0 "R10" V 8330 6700 50  0000 C C
-F 1 "5,1K" V 8250 6700 50  0000 C C
+F 0 "R10" V 8330 6700 50  0000 C CNN
+F 1 "5,1K" V 8250 6700 50  0000 C CNN
+F 2 "" H 8250 6700 60  0001 C CNN
+F 3 "" H 8250 6700 60  0001 C CNN
 	1    8250 6700
 	0    -1   -1   0   
 $EndComp
@@ -436,8 +505,10 @@ $Comp
 L C C4
 U 1 1 442A5F61
 P 8750 6900
-F 0 "C4" H 8800 7000 50  0000 L C
-F 1 "0" V 8800 6800 50  0000 L C
+F 0 "C4" H 8800 7000 50  0000 L CNN
+F 1 "0" V 8800 6800 50  0000 L CNN
+F 2 "" H 8750 6900 60  0001 C CNN
+F 3 "" H 8750 6900 60  0001 C CNN
 	1    8750 6900
 	0    -1   -1   0   
 $EndComp
@@ -445,19 +516,23 @@ $Comp
 L LT1373 U4
 U 1 1 442A5E20
 P 7650 6000
-F 0 "U4" H 8250 6500 60  0000 C C
-F 1 "LT1373" H 7150 6500 60  0000 C C
+F 0 "U4" H 8250 6500 60  0000 C CNN
+F 1 "LT1373" H 7150 6500 60  0000 C CNN
+F 2 "" H 7650 6000 60  0001 C CNN
+F 3 "" H 7650 6000 60  0001 C CNN
 	1    7650 6000
 	1    0    0    -1  
 $EndComp
-Text Notes 6150 5200 0    60   ~
+Text Notes 6150 5200 0    60   ~ 0
 VPP (13V) power
 $Comp
-L GND #PWR021
+L GND #PWR023
 U 1 1 442A58DF
 P 10150 6800
-F 0 "#PWR021" H 10150 6800 30  0001 C C
-F 1 "GND" H 10150 6730 30  0001 C C
+F 0 "#PWR023" H 10150 6800 30  0001 C CNN
+F 1 "GND" H 10150 6730 30  0001 C CNN
+F 2 "" H 10150 6800 60  0001 C CNN
+F 3 "" H 10150 6800 60  0001 C CNN
 	1    10150 6800
 	1    0    0    -1  
 $EndComp
@@ -465,8 +540,10 @@ $Comp
 L R R16
 U 1 1 442A58DC
 P 9900 6250
-F 0 "R16" V 9980 6250 50  0000 C C
-F 1 "62K" V 9900 6250 50  0000 C C
+F 0 "R16" V 9980 6250 50  0000 C CNN
+F 1 "62K" V 9900 6250 50  0000 C CNN
+F 2 "" H 9900 6250 60  0001 C CNN
+F 3 "" H 9900 6250 60  0001 C CNN
 	1    9900 6250
 	0    -1   -1   0   
 $EndComp
@@ -474,18 +551,22 @@ $Comp
 L R R15
 U 1 1 442A58D7
 P 9900 6750
-F 0 "R15" V 9980 6750 50  0000 C C
-F 1 "6.2K" V 9900 6750 50  0000 C C
+F 0 "R15" V 9980 6750 50  0000 C CNN
+F 1 "6.2K" V 9900 6750 50  0000 C CNN
+F 2 "" H 9900 6750 60  0001 C CNN
+F 3 "" H 9900 6750 60  0001 C CNN
 	1    9900 6750
 	0    -1   -1   0   
 $EndComp
 NoConn ~ 6650 6250
 $Comp
-L GND #PWR022
+L GND #PWR024
 U 1 1 442A58B8
 P 9150 6600
-F 0 "#PWR022" H 9150 6600 30  0001 C C
-F 1 "GND" H 9150 6530 30  0001 C C
+F 0 "#PWR024" H 9150 6600 30  0001 C CNN
+F 1 "GND" H 9150 6530 30  0001 C CNN
+F 2 "" H 9150 6600 60  0001 C CNN
+F 3 "" H 9150 6600 60  0001 C CNN
 	1    9150 6600
 	0    -1   -1   0   
 $EndComp
@@ -493,35 +574,43 @@ $Comp
 L C C5
 U 1 1 442A58B1
 P 8900 6600
-F 0 "C5" H 8950 6700 50  0000 L C
-F 1 "10nF" V 9050 6450 50  0000 L C
+F 0 "C5" H 8950 6700 50  0000 L CNN
+F 1 "10nF" V 9050 6450 50  0000 L CNN
+F 2 "" H 8900 6600 60  0001 C CNN
+F 3 "" H 8900 6600 60  0001 C CNN
 	1    8900 6600
 	0    -1   -1   0   
 $EndComp
 $Comp
-L PWR_FLAG #FLG023
+L PWR_FLAG #FLG025
 U 1 1 442A5893
 P 9950 5950
-F 0 "#FLG023" H 9950 6220 30  0001 C C
-F 1 "PWR_FLAG" H 9950 6180 30  0000 C C
+F 0 "#FLG025" H 9950 6220 30  0001 C CNN
+F 1 "PWR_FLAG" H 9950 6180 30  0000 C CNN
+F 2 "" H 9950 5950 60  0001 C CNN
+F 3 "" H 9950 5950 60  0001 C CNN
 	1    9950 5950
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR024
+L VCC #PWR026
 U 1 1 442A5882
 P 9300 5650
-F 0 "#PWR024" H 9300 5750 30  0001 C C
-F 1 "VCC" H 9300 5750 30  0000 C C
+F 0 "#PWR026" H 9300 5750 30  0001 C CNN
+F 1 "VCC" H 9300 5750 30  0000 C CNN
+F 2 "" H 9300 5650 60  0001 C CNN
+F 3 "" H 9300 5650 60  0001 C CNN
 	1    9300 5650
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR025
+L GND #PWR027
 U 1 1 442A5852
 P 10700 6050
-F 0 "#PWR025" H 10700 6050 30  0001 C C
-F 1 "GND" H 10700 5980 30  0001 C C
+F 0 "#PWR027" H 10700 6050 30  0001 C CNN
+F 1 "GND" H 10700 5980 30  0001 C CNN
+F 2 "" H 10700 6050 60  0001 C CNN
+F 3 "" H 10700 6050 60  0001 C CNN
 	1    10700 6050
 	1    0    0    -1  
 $EndComp
@@ -529,8 +618,10 @@ $Comp
 L CP C3
 U 1 1 442A584C
 P 10450 6000
-F 0 "C3" H 10500 6100 50  0000 L C
-F 1 "22uF/25V" H 10500 5900 50  0000 L C
+F 0 "C3" H 10500 6100 50  0000 L CNN
+F 1 "22uF/25V" H 10500 5900 50  0000 L CNN
+F 2 "" H 10450 6000 60  0001 C CNN
+F 3 "" H 10450 6000 60  0001 C CNN
 	1    10450 6000
 	0    -1   -1   0   
 $EndComp
@@ -538,26 +629,32 @@ $Comp
 L VPP #PWR34
 U 1 1 442A5846
 P 10150 5950
-F 0 "#PWR34" H 10150 6150 40  0001 C C
-F 1 "VPP" H 10150 6100 40  0000 C C
+F 0 "#PWR34" H 10150 6150 40  0001 C CNN
+F 1 "VPP" H 10150 6100 40  0000 C CNN
+F 2 "" H 10150 5950 60  0001 C CNN
+F 3 "" H 10150 5950 60  0001 C CNN
 	1    10150 5950
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR026
+L GND #PWR028
 U 1 1 442A580B
 P 7350 6750
-F 0 "#PWR026" H 7350 6750 30  0001 C C
-F 1 "GND" H 7350 6680 30  0001 C C
+F 0 "#PWR028" H 7350 6750 30  0001 C CNN
+F 1 "GND" H 7350 6680 30  0001 C CNN
+F 2 "" H 7350 6750 60  0001 C CNN
+F 3 "" H 7350 6750 60  0001 C CNN
 	1    7350 6750
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR027
+L VCC #PWR029
 U 1 1 442A57CB
 P 7650 5250
-F 0 "#PWR027" H 7650 5350 30  0001 C C
-F 1 "VCC" H 7650 5350 30  0000 C C
+F 0 "#PWR029" H 7650 5350 30  0001 C CNN
+F 1 "VCC" H 7650 5350 30  0000 C CNN
+F 2 "" H 7650 5250 60  0001 C CNN
+F 3 "" H 7650 5250 60  0001 C CNN
 	1    7650 5250
 	1    0    0    -1  
 $EndComp
@@ -565,8 +662,10 @@ $Comp
 L INDUCTOR L1
 U 1 1 442A57BE
 P 9000 5750
-F 0 "L1" V 8950 5750 40  0000 C C
-F 1 "22uH" V 9100 5750 40  0000 C C
+F 0 "L1" V 8950 5750 40  0000 C CNN
+F 1 "22uH" V 9100 5750 40  0000 C CNN
+F 2 "" H 9000 5750 60  0001 C CNN
+F 3 "" H 9000 5750 60  0001 C CNN
 	1    9000 5750
 	0    -1   -1   0   
 $EndComp
@@ -575,11 +674,13 @@ NoConn ~ 1700 3400
 NoConn ~ 1700 3300
 NoConn ~ 1700 3200
 $Comp
-L GND #PWR028
+L GND #PWR030
 U 1 1 442A50C2
 P 7050 2350
-F 0 "#PWR028" H 7050 2350 30  0001 C C
-F 1 "GND" H 7050 2280 30  0001 C C
+F 0 "#PWR030" H 7050 2350 30  0001 C CNN
+F 1 "GND" H 7050 2280 30  0001 C CNN
+F 2 "" H 7050 2350 60  0001 C CNN
+F 3 "" H 7050 2350 60  0001 C CNN
 	1    7050 2350
 	1    0    0    -1  
 $EndComp
@@ -587,26 +688,32 @@ $Comp
 L R R17
 U 1 1 442A50BF
 P 7050 2100
-F 0 "R17" V 7130 2100 50  0000 C C
-F 1 "22K" V 7050 2100 50  0000 C C
+F 0 "R17" V 7130 2100 50  0000 C CNN
+F 1 "22K" V 7050 2100 50  0000 C CNN
+F 2 "" H 7050 2100 60  0001 C CNN
+F 3 "" H 7050 2100 60  0001 C CNN
 	1    7050 2100
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR029
+L VCC #PWR031
 U 1 1 442A50B3
 P 3400 6600
-F 0 "#PWR029" H 3400 6700 30  0001 C C
-F 1 "VCC" H 3400 6700 30  0000 C C
+F 0 "#PWR031" H 3400 6700 30  0001 C CNN
+F 1 "VCC" H 3400 6700 30  0000 C CNN
+F 2 "" H 3400 6600 60  0001 C CNN
+F 3 "" H 3400 6600 60  0001 C CNN
 	1    3400 6600
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR030
+L GND #PWR032
 U 1 1 442A5095
 P 4150 7150
-F 0 "#PWR030" H 4150 7150 30  0001 C C
-F 1 "GND" H 4150 7080 30  0001 C C
+F 0 "#PWR032" H 4150 7150 30  0001 C CNN
+F 1 "GND" H 4150 7080 30  0001 C CNN
+F 2 "" H 4150 7150 60  0001 C CNN
+F 3 "" H 4150 7150 60  0001 C CNN
 	1    4150 7150
 	1    0    0    -1  
 $EndComp
@@ -614,9 +721,11 @@ $Comp
 L LED D9
 U 1 1 442A5084
 P 4150 6950
-F 0 "D9" H 4150 7050 50  0000 C C
-F 1 "GREEN-LED" H 4150 6850 50  0000 C C
-F 4 "GREEN LED" H 4200 7100 40  0000 C C
+F 0 "D9" H 4150 7050 50  0000 C CNN
+F 1 "GREEN-LED" H 4150 6850 50  0000 C CNN
+F 2 "" H 4150 6950 60  0001 C CNN
+F 3 "" H 4150 6950 60  0001 C CNN
+F 4 "GREEN LED" H 4200 7100 40  0000 C CNN "Champ4"
 	1    4150 6950
 	0    1    1    0   
 $EndComp
@@ -624,17 +733,21 @@ $Comp
 L R R14
 U 1 1 442A5083
 P 3850 6650
-F 0 "R14" V 3930 6650 50  0000 C C
-F 1 "470" V 3850 6650 50  0000 C C
+F 0 "R14" V 3930 6650 50  0000 C CNN
+F 1 "470" V 3850 6650 50  0000 C CNN
+F 2 "" H 3850 6650 60  0001 C CNN
+F 3 "" H 3850 6650 60  0001 C CNN
 	1    3850 6650
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR031
+L GND #PWR033
 U 1 1 442A5057
 P 3200 7100
-F 0 "#PWR031" H 3200 7100 30  0001 C C
-F 1 "GND" H 3200 7030 30  0001 C C
+F 0 "#PWR033" H 3200 7100 30  0001 C CNN
+F 1 "GND" H 3200 7030 30  0001 C CNN
+F 2 "" H 3200 7100 60  0001 C CNN
+F 3 "" H 3200 7100 60  0001 C CNN
 	1    3200 7100
 	1    0    0    -1  
 $EndComp
@@ -642,17 +755,21 @@ $Comp
 L CP C1
 U 1 1 442A5056
 P 3200 6900
-F 0 "C1" H 3250 7000 50  0000 L C
-F 1 "100uF" H 3250 6800 50  0000 L C
+F 0 "C1" H 3250 7000 50  0000 L CNN
+F 1 "100uF" H 3250 6800 50  0000 L CNN
+F 2 "" H 3200 6900 60  0001 C CNN
+F 3 "" H 3200 6900 60  0001 C CNN
 	1    3200 6900
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR032
+L GND #PWR034
 U 1 1 442A5050
 P 2700 6950
-F 0 "#PWR032" H 2700 6950 30  0001 C C
-F 1 "GND" H 2700 6880 30  0001 C C
+F 0 "#PWR034" H 2700 6950 30  0001 C CNN
+F 1 "GND" H 2700 6880 30  0001 C CNN
+F 2 "" H 2700 6950 60  0001 C CNN
+F 3 "" H 2700 6950 60  0001 C CNN
 	1    2700 6950
 	1    0    0    -1  
 $EndComp
@@ -660,17 +777,21 @@ $Comp
 L 7805 U3
 U 1 1 442A504A
 P 2700 6700
-F 0 "U3" H 2850 6504 60  0000 C C
-F 1 "7805" H 2700 6900 60  0000 C C
+F 0 "U3" H 2850 6504 60  0000 C CNN
+F 1 "7805" H 2700 6900 60  0000 C CNN
+F 2 "" H 2700 6700 60  0001 C CNN
+F 3 "" H 2700 6700 60  0001 C CNN
 	1    2700 6700
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR033
+L GND #PWR035
 U 1 1 442A5023
 P 1950 7100
-F 0 "#PWR033" H 1950 7100 30  0001 C C
-F 1 "GND" H 1950 7030 30  0001 C C
+F 0 "#PWR035" H 1950 7100 30  0001 C CNN
+F 1 "GND" H 1950 7030 30  0001 C CNN
+F 2 "" H 1950 7100 60  0001 C CNN
+F 3 "" H 1950 7100 60  0001 C CNN
 	1    1950 7100
 	1    0    0    -1  
 $EndComp
@@ -678,17 +799,21 @@ $Comp
 L CP C2
 U 1 1 442A501D
 P 1950 6900
-F 0 "C2" H 2000 7000 50  0000 L C
-F 1 "220uF" H 2000 6800 50  0000 L C
+F 0 "C2" H 2000 7000 50  0000 L CNN
+F 1 "220uF" H 2000 6800 50  0000 L CNN
+F 2 "" H 1950 6900 60  0001 C CNN
+F 3 "" H 1950 6900 60  0001 C CNN
 	1    1950 6900
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR034
+L GND #PWR036
 U 1 1 442A500F
 P 1400 6900
-F 0 "#PWR034" H 1400 6900 30  0001 C C
-F 1 "GND" H 1400 6830 30  0001 C C
+F 0 "#PWR036" H 1400 6900 30  0001 C CNN
+F 1 "GND" H 1400 6830 30  0001 C CNN
+F 2 "" H 1400 6900 60  0001 C CNN
+F 3 "" H 1400 6900 60  0001 C CNN
 	1    1400 6900
 	1    0    0    -1  
 $EndComp
@@ -696,8 +821,10 @@ $Comp
 L DIODE D1
 U 1 1 442A500B
 P 1650 6650
-F 0 "D1" H 1650 6750 40  0000 C C
-F 1 "1N4004" H 1650 6550 40  0000 C C
+F 0 "D1" H 1650 6750 40  0000 C CNN
+F 1 "1N4004" H 1650 6550 40  0000 C CNN
+F 2 "" H 1650 6650 60  0001 C CNN
+F 3 "" H 1650 6650 60  0001 C CNN
 	1    1650 6650
 	1    0    0    -1  
 $EndComp
@@ -705,8 +832,10 @@ $Comp
 L CONN_2 P1
 U 1 1 442A4FE7
 P 1000 6750
-F 0 "P1" V 950 6750 40  0000 C C
-F 1 "CONN_2" V 1050 6750 40  0000 C C
+F 0 "P1" V 950 6750 40  0000 C CNN
+F 1 "CONN_2" V 1050 6750 40  0000 C CNN
+F 2 "" H 1000 6750 60  0001 C CNN
+F 3 "" H 1000 6750 60  0001 C CNN
 	1    1000 6750
 	-1   0    0    1   
 $EndComp
@@ -714,10 +843,12 @@ $Comp
 L LED D8
 U 1 1 442A4F5D
 P 6550 2400
-F 0 "D8" H 6550 2500 50  0000 C C
-F 1 "RED-LED" H 6550 2300 50  0000 C C
-F 4 "Low Current Led" H 6600 2550 40  0000 C C
-F 5 "RED LED" H 6550 2250 40  0000 C C
+F 0 "D8" H 6550 2500 50  0000 C CNN
+F 1 "RED-LED" H 6550 2300 50  0000 C CNN
+F 2 "" H 6550 2400 60  0001 C CNN
+F 3 "" H 6550 2400 60  0001 C CNN
+F 4 "Low Current Led" H 6600 2550 40  0000 C CNN "Champ4"
+F 5 "RED LED" H 6550 2250 40  0000 C CNN "Champ5"
 	1    6550 2400
 	0    1    1    0   
 $EndComp
@@ -725,8 +856,10 @@ $Comp
 L R R9
 U 1 1 442A4F52
 P 6550 1900
-F 0 "R9" V 6630 1900 50  0000 C C
-F 1 "2.2K" V 6550 1900 50  0000 C C
+F 0 "R9" V 6630 1900 50  0000 C CNN
+F 1 "2.2K" V 6550 1900 50  0000 C CNN
+F 2 "" H 6550 1900 60  0001 C CNN
+F 3 "" H 6550 1900 60  0001 C CNN
 	1    6550 1900
 	1    0    0    -1  
 $EndComp
@@ -734,8 +867,10 @@ $Comp
 L VPP #PWR23
 U 1 1 442A4F48
 P 6550 1100
-F 0 "#PWR23" H 6550 1300 40  0001 C C
-F 1 "VPP" H 6550 1250 40  0000 C C
+F 0 "#PWR23" H 6550 1300 40  0001 C CNN
+F 1 "VPP" H 6550 1250 40  0000 C CNN
+F 2 "" H 6550 1100 60  0001 C CNN
+F 3 "" H 6550 1100 60  0001 C CNN
 	1    6550 1100
 	1    0    0    -1  
 $EndComp
@@ -743,8 +878,10 @@ $Comp
 L VPP #PWR22
 U 1 1 442A4F44
 P 6100 700
-F 0 "#PWR22" H 6100 900 40  0001 C C
-F 1 "VPP" H 6100 850 40  0000 C C
+F 0 "#PWR22" H 6100 900 40  0001 C CNN
+F 1 "VPP" H 6100 850 40  0000 C CNN
+F 2 "" H 6100 700 60  0001 C CNN
+F 3 "" H 6100 700 60  0001 C CNN
 	1    6100 700 
 	1    0    0    -1  
 $EndComp
@@ -752,8 +889,10 @@ $Comp
 L PNP Q2
 U 1 1 442A4F30
 P 6450 1400
-F 0 "Q2" H 6600 1400 60  0000 C C
-F 1 "BC307" H 6354 1550 60  0000 C C
+F 0 "Q2" H 6600 1400 60  0000 C CNN
+F 1 "BC307" H 6354 1550 60  0000 C CNN
+F 2 "" H 6450 1400 60  0001 C CNN
+F 3 "" H 6450 1400 60  0001 C CNN
 	1    6450 1400
 	1    0    0    1   
 $EndComp
@@ -761,8 +900,10 @@ $Comp
 L R R7
 U 1 1 442A4F2A
 P 6100 1000
-F 0 "R7" V 6180 1000 50  0000 C C
-F 1 "10K" V 6100 1000 50  0000 C C
+F 0 "R7" V 6180 1000 50  0000 C CNN
+F 1 "10K" V 6100 1000 50  0000 C CNN
+F 2 "" H 6100 1000 60  0001 C CNN
+F 3 "" H 6100 1000 60  0001 C CNN
 	1    6100 1000
 	1    0    0    -1  
 $EndComp
@@ -770,70 +911,84 @@ $Comp
 L R R11
 U 1 1 442A4F23
 P 5750 1400
-F 0 "R11" V 5830 1400 50  0000 C C
-F 1 "22K" V 5750 1400 50  0000 C C
+F 0 "R11" V 5830 1400 50  0000 C CNN
+F 1 "22K" V 5750 1400 50  0000 C CNN
+F 2 "" H 5750 1400 60  0001 C CNN
+F 3 "" H 5750 1400 60  0001 C CNN
 	1    5750 1400
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR035
+L GND #PWR037
 U 1 1 442A4F1C
 P 5450 1900
-F 0 "#PWR035" H 5450 1900 30  0001 C C
-F 1 "GND" H 5450 1830 30  0001 C C
+F 0 "#PWR037" H 5450 1900 30  0001 C CNN
+F 1 "GND" H 5450 1830 30  0001 C CNN
+F 2 "" H 5450 1900 60  0001 C CNN
+F 3 "" H 5450 1900 60  0001 C CNN
 	1    5450 1900
 	1    0    0    -1  
 $EndComp
-Text Label 2300 1700 0    60   ~
+Text Label 2300 1700 0    60   ~ 0
 VPP_ON
 $Comp
 L NPN Q1
 U 1 1 442A4EB9
 P 5350 1700
-F 0 "Q1" H 5500 1700 50  0000 C C
-F 1 "BC237" H 5252 1850 50  0000 C C
+F 0 "Q1" H 5500 1700 50  0000 C CNN
+F 1 "BC237" H 5252 1850 50  0000 C CNN
+F 2 "" H 5350 1700 60  0001 C CNN
+F 3 "" H 5350 1700 60  0001 C CNN
 	1    5350 1700
 	1    0    0    -1  
 $EndComp
-Text Label 2350 5100 0    60   ~
+Text Label 2350 5100 0    60   ~ 0
 PC-CLOCK-OUT
 $Comp
-L GND #PWR036
+L GND #PWR038
 U 1 1 442A4E06
 P 1700 4000
-F 0 "#PWR036" H 1700 4000 30  0001 C C
-F 1 "GND" H 1700 3930 30  0001 C C
+F 0 "#PWR038" H 1700 4000 30  0001 C CNN
+F 1 "GND" H 1700 3930 30  0001 C CNN
+F 2 "" H 1700 4000 60  0001 C CNN
+F 3 "" H 1700 4000 60  0001 C CNN
 	1    1700 4000
 	0    -1   -1   0   
 $EndComp
-Text Label 2700 4200 0    60   ~
+Text Label 2700 4200 0    60   ~ 0
 PC-DATA-IN
-Text Label 2500 3150 0    60   ~
+Text Label 2500 3150 0    60   ~ 0
 PC-DATA-OUT
 $Comp
-L GND #PWR037
+L GND #PWR039
 U 1 1 442A4DB3
 P 2800 2250
-F 0 "#PWR037" H 2800 2250 30  0001 C C
-F 1 "GND" H 2800 2180 30  0001 C C
+F 0 "#PWR039" H 2800 2250 30  0001 C CNN
+F 1 "GND" H 2800 2180 30  0001 C CNN
+F 2 "" H 2800 2250 60  0001 C CNN
+F 3 "" H 2800 2250 60  0001 C CNN
 	1    2800 2250
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR038
+L GND #PWR040
 U 1 1 442A4DAE
 P 3200 5650
-F 0 "#PWR038" H 3200 5650 30  0001 C C
-F 1 "GND" H 3200 5580 30  0001 C C
+F 0 "#PWR040" H 3200 5650 30  0001 C CNN
+F 1 "GND" H 3200 5580 30  0001 C CNN
+F 2 "" H 3200 5650 60  0001 C CNN
+F 3 "" H 3200 5650 60  0001 C CNN
 	1    3200 5650
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR039
+L GND #PWR041
 U 1 1 442A4DAB
 P 3200 3700
-F 0 "#PWR039" H 3200 3700 30  0001 C C
-F 1 "GND" H 3200 3630 30  0001 C C
+F 0 "#PWR041" H 3200 3700 30  0001 C CNN
+F 1 "GND" H 3200 3630 30  0001 C CNN
+F 2 "" H 3200 3700 60  0001 C CNN
+F 3 "" H 3200 3700 60  0001 C CNN
 	1    3200 3700
 	1    0    0    -1  
 $EndComp
@@ -841,8 +996,10 @@ $Comp
 L R R8
 U 1 1 442A4D92
 P 4700 1700
-F 0 "R8" V 4780 1700 50  0000 C C
-F 1 "1K" V 4700 1700 50  0000 C C
+F 0 "R8" V 4780 1700 50  0000 C CNN
+F 1 "1K" V 4700 1700 50  0000 C CNN
+F 2 "" H 4700 1700 60  0001 C CNN
+F 3 "" H 4700 1700 60  0001 C CNN
 	1    4700 1700
 	0    -1   -1   0   
 $EndComp
@@ -850,8 +1007,10 @@ $Comp
 L R R13
 U 1 1 442A4D8D
 P 5100 4750
-F 0 "R13" V 5180 4750 50  0000 C C
-F 1 "470" V 5100 4750 50  0000 C C
+F 0 "R13" V 5180 4750 50  0000 C CNN
+F 1 "470" V 5100 4750 50  0000 C CNN
+F 2 "" H 5100 4750 60  0001 C CNN
+F 3 "" H 5100 4750 60  0001 C CNN
 	1    5100 4750
 	0    -1   -1   0   
 $EndComp
@@ -859,17 +1018,21 @@ $Comp
 L R R12
 U 1 1 442A4D85
 P 5100 3150
-F 0 "R12" V 5180 3150 50  0000 C C
-F 1 "470" V 5100 3150 50  0000 C C
+F 0 "R12" V 5180 3150 50  0000 C CNN
+F 1 "470" V 5100 3150 50  0000 C CNN
+F 2 "" H 5100 3150 60  0001 C CNN
+F 3 "" H 5100 3150 60  0001 C CNN
 	1    5100 3150
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR040
+L GND #PWR042
 U 1 1 442A4D75
 P 4350 4500
-F 0 "#PWR040" H 4350 4500 30  0001 C C
-F 1 "GND" H 4350 4430 30  0001 C C
+F 0 "#PWR042" H 4350 4500 30  0001 C CNN
+F 1 "GND" H 4350 4430 30  0001 C CNN
+F 2 "" H 4350 4500 60  0001 C CNN
+F 3 "" H 4350 4500 60  0001 C CNN
 	1    4350 4500
 	1    0    0    -1  
 $EndComp
@@ -877,35 +1040,43 @@ $Comp
 L 74LS125 U2
 U 4 1 442A4D6B
 P 4350 4200
-F 0 "U2" H 4350 4300 50  0000 L B
-F 1 "74HC125" H 4400 4050 40  0000 L T
+F 0 "U2" H 4350 4300 50  0000 L BNN
+F 1 "74HC125" H 4400 4050 40  0000 L TNN
+F 2 "" H 4350 4200 60  0001 C CNN
+F 3 "" H 4350 4200 60  0001 C CNN
 	4    4350 4200
 	-1   0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR041
+L VCC #PWR043
 U 1 1 442A4D68
 P 3850 4650
-F 0 "#PWR041" H 3850 4750 30  0001 C C
-F 1 "VCC" H 3850 4750 30  0000 C C
+F 0 "#PWR043" H 3850 4750 30  0001 C CNN
+F 1 "VCC" H 3850 4750 30  0000 C CNN
+F 2 "" H 3850 4650 60  0001 C CNN
+F 3 "" H 3850 4650 60  0001 C CNN
 	1    3850 4650
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR042
+L GND #PWR044
 U 1 1 442A4D67
 P 3850 5600
-F 0 "#PWR042" H 3850 5600 30  0001 C C
-F 1 "GND" H 3850 5530 30  0001 C C
+F 0 "#PWR044" H 3850 5600 30  0001 C CNN
+F 1 "GND" H 3850 5530 30  0001 C CNN
+F 2 "" H 3850 5600 60  0001 C CNN
+F 3 "" H 3850 5600 60  0001 C CNN
 	1    3850 5600
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR043
+L GND #PWR045
 U 1 1 442A4D66
 P 4350 5400
-F 0 "#PWR043" H 4350 5400 30  0001 C C
-F 1 "GND" H 4350 5330 30  0001 C C
+F 0 "#PWR045" H 4350 5400 30  0001 C CNN
+F 1 "GND" H 4350 5330 30  0001 C CNN
+F 2 "" H 4350 5400 60  0001 C CNN
+F 3 "" H 4350 5400 60  0001 C CNN
 	1    4350 5400
 	1    0    0    -1  
 $EndComp
@@ -913,8 +1084,10 @@ $Comp
 L DIODESCH D7
 U 1 1 442A4D65
 P 3850 5400
-F 0 "D7" H 3850 5500 40  0000 C C
-F 1 "BAT43" H 3850 5300 40  0000 C C
+F 0 "D7" H 3850 5500 40  0000 C CNN
+F 1 "BAT43" H 3850 5300 40  0000 C CNN
+F 2 "" H 3850 5400 60  0001 C CNN
+F 3 "" H 3850 5400 60  0001 C CNN
 	1    3850 5400
 	0    -1   -1   0   
 $EndComp
@@ -922,8 +1095,10 @@ $Comp
 L DIODESCH D6
 U 1 1 442A4D64
 P 3850 4850
-F 0 "D6" H 3850 4950 40  0000 C C
-F 1 "BAT43" H 3850 4750 40  0000 C C
+F 0 "D6" H 3850 4950 40  0000 C CNN
+F 1 "BAT43" H 3850 4750 40  0000 C CNN
+F 2 "" H 3850 4850 60  0001 C CNN
+F 3 "" H 3850 4850 60  0001 C CNN
 	1    3850 4850
 	0    -1   -1   0   
 $EndComp
@@ -931,8 +1106,10 @@ $Comp
 L R R6
 U 1 1 442A4D63
 P 3200 5400
-F 0 "R6" V 3280 5400 50  0000 C C
-F 1 "10K" V 3200 5400 50  0000 C C
+F 0 "R6" V 3280 5400 50  0000 C CNN
+F 1 "10K" V 3200 5400 50  0000 C CNN
+F 2 "" H 3200 5400 60  0001 C CNN
+F 3 "" H 3200 5400 60  0001 C CNN
 	1    3200 5400
 	1    0    0    -1  
 $EndComp
@@ -940,8 +1117,10 @@ $Comp
 L R R5
 U 1 1 442A4D62
 P 3500 5100
-F 0 "R5" V 3580 5100 50  0000 C C
-F 1 "10K" V 3500 5100 50  0000 C C
+F 0 "R5" V 3580 5100 50  0000 C CNN
+F 1 "10K" V 3500 5100 50  0000 C CNN
+F 2 "" H 3500 5100 60  0001 C CNN
+F 3 "" H 3500 5100 60  0001 C CNN
 	1    3500 5100
 	0    -1   -1   0   
 $EndComp
@@ -949,35 +1128,43 @@ $Comp
 L 74LS125 U2
 U 3 1 442A4D61
 P 4350 5100
-F 0 "U2" H 4350 5200 50  0000 L B
-F 1 "74HC125" H 4400 4950 40  0000 L T
+F 0 "U2" H 4350 5200 50  0000 L BNN
+F 1 "74HC125" H 4400 4950 40  0000 L TNN
+F 2 "" H 4350 5100 60  0001 C CNN
+F 3 "" H 4350 5100 60  0001 C CNN
 	3    4350 5100
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR044
+L VCC #PWR046
 U 1 1 442A4D60
 P 3850 2700
-F 0 "#PWR044" H 3850 2800 30  0001 C C
-F 1 "VCC" H 3850 2800 30  0000 C C
+F 0 "#PWR046" H 3850 2800 30  0001 C CNN
+F 1 "VCC" H 3850 2800 30  0000 C CNN
+F 2 "" H 3850 2700 60  0001 C CNN
+F 3 "" H 3850 2700 60  0001 C CNN
 	1    3850 2700
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR045
+L GND #PWR047
 U 1 1 442A4D5F
 P 3850 3650
-F 0 "#PWR045" H 3850 3650 30  0001 C C
-F 1 "GND" H 3850 3580 30  0001 C C
+F 0 "#PWR047" H 3850 3650 30  0001 C CNN
+F 1 "GND" H 3850 3580 30  0001 C CNN
+F 2 "" H 3850 3650 60  0001 C CNN
+F 3 "" H 3850 3650 60  0001 C CNN
 	1    3850 3650
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR046
+L GND #PWR048
 U 1 1 442A4D5E
 P 4350 3450
-F 0 "#PWR046" H 4350 3450 30  0001 C C
-F 1 "GND" H 4350 3380 30  0001 C C
+F 0 "#PWR048" H 4350 3450 30  0001 C CNN
+F 1 "GND" H 4350 3380 30  0001 C CNN
+F 2 "" H 4350 3450 60  0001 C CNN
+F 3 "" H 4350 3450 60  0001 C CNN
 	1    4350 3450
 	1    0    0    -1  
 $EndComp
@@ -985,8 +1172,10 @@ $Comp
 L DIODESCH D5
 U 1 1 442A4D5D
 P 3850 3450
-F 0 "D5" H 3850 3550 40  0000 C C
-F 1 "BAT43" H 3850 3350 40  0000 C C
+F 0 "D5" H 3850 3550 40  0000 C CNN
+F 1 "BAT43" H 3850 3350 40  0000 C CNN
+F 2 "" H 3850 3450 60  0001 C CNN
+F 3 "" H 3850 3450 60  0001 C CNN
 	1    3850 3450
 	0    -1   -1   0   
 $EndComp
@@ -994,8 +1183,10 @@ $Comp
 L DIODESCH D4
 U 1 1 442A4D5C
 P 3850 2900
-F 0 "D4" H 3850 3000 40  0000 C C
-F 1 "BAT43" H 3850 2800 40  0000 C C
+F 0 "D4" H 3850 3000 40  0000 C CNN
+F 1 "BAT43" H 3850 2800 40  0000 C CNN
+F 2 "" H 3850 2900 60  0001 C CNN
+F 3 "" H 3850 2900 60  0001 C CNN
 	1    3850 2900
 	0    -1   -1   0   
 $EndComp
@@ -1003,8 +1194,10 @@ $Comp
 L R R4
 U 1 1 442A4D5B
 P 3200 3450
-F 0 "R4" V 3280 3450 50  0000 C C
-F 1 "10K" V 3200 3450 50  0000 C C
+F 0 "R4" V 3280 3450 50  0000 C CNN
+F 1 "10K" V 3200 3450 50  0000 C CNN
+F 2 "" H 3200 3450 60  0001 C CNN
+F 3 "" H 3200 3450 60  0001 C CNN
 	1    3200 3450
 	1    0    0    -1  
 $EndComp
@@ -1012,8 +1205,10 @@ $Comp
 L R R3
 U 1 1 442A4D5A
 P 3500 3150
-F 0 "R3" V 3580 3150 50  0000 C C
-F 1 "10K" V 3500 3150 50  0000 C C
+F 0 "R3" V 3580 3150 50  0000 C CNN
+F 1 "10K" V 3500 3150 50  0000 C CNN
+F 2 "" H 3500 3150 60  0001 C CNN
+F 3 "" H 3500 3150 60  0001 C CNN
 	1    3500 3150
 	0    -1   -1   0   
 $EndComp
@@ -1021,35 +1216,43 @@ $Comp
 L 74LS125 U2
 U 2 1 442A4D59
 P 4350 3150
-F 0 "U2" H 4350 3250 50  0000 L B
-F 1 "74HC125" H 4400 3000 40  0000 L T
+F 0 "U2" H 4350 3250 50  0000 L BNN
+F 1 "74HC125" H 4400 3000 40  0000 L TNN
+F 2 "" H 4350 3150 60  0001 C CNN
+F 3 "" H 4350 3150 60  0001 C CNN
 	2    4350 3150
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR047
+L VCC #PWR049
 U 1 1 442A4D41
 P 3450 1250
-F 0 "#PWR047" H 3450 1350 30  0001 C C
-F 1 "VCC" H 3450 1350 30  0000 C C
+F 0 "#PWR049" H 3450 1350 30  0001 C CNN
+F 1 "VCC" H 3450 1350 30  0000 C CNN
+F 2 "" H 3450 1250 60  0001 C CNN
+F 3 "" H 3450 1250 60  0001 C CNN
 	1    3450 1250
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR048
+L GND #PWR050
 U 1 1 442A4D3B
 P 3450 2200
-F 0 "#PWR048" H 3450 2200 30  0001 C C
-F 1 "GND" H 3450 2130 30  0001 C C
+F 0 "#PWR050" H 3450 2200 30  0001 C CNN
+F 1 "GND" H 3450 2130 30  0001 C CNN
+F 2 "" H 3450 2200 60  0001 C CNN
+F 3 "" H 3450 2200 60  0001 C CNN
 	1    3450 2200
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR049
+L GND #PWR051
 U 1 1 442A4D38
 P 3950 2000
-F 0 "#PWR049" H 3950 2000 30  0001 C C
-F 1 "GND" H 3950 1930 30  0001 C C
+F 0 "#PWR051" H 3950 2000 30  0001 C CNN
+F 1 "GND" H 3950 1930 30  0001 C CNN
+F 2 "" H 3950 2000 60  0001 C CNN
+F 3 "" H 3950 2000 60  0001 C CNN
 	1    3950 2000
 	1    0    0    -1  
 $EndComp
@@ -1057,8 +1260,10 @@ $Comp
 L DIODESCH D3
 U 1 1 442A4D25
 P 3450 2000
-F 0 "D3" H 3450 2100 40  0000 C C
-F 1 "BAT43" H 3450 1900 40  0000 C C
+F 0 "D3" H 3450 2100 40  0000 C CNN
+F 1 "BAT43" H 3450 1900 40  0000 C CNN
+F 2 "" H 3450 2000 60  0001 C CNN
+F 3 "" H 3450 2000 60  0001 C CNN
 	1    3450 2000
 	0    -1   -1   0   
 $EndComp
@@ -1066,8 +1271,10 @@ $Comp
 L DIODESCH D2
 U 1 1 442A4D1B
 P 3450 1450
-F 0 "D2" H 3450 1550 40  0000 C C
-F 1 "BAT43" H 3450 1350 40  0000 C C
+F 0 "D2" H 3450 1550 40  0000 C CNN
+F 1 "BAT43" H 3450 1350 40  0000 C CNN
+F 2 "" H 3450 1450 60  0001 C CNN
+F 3 "" H 3450 1450 60  0001 C CNN
 	1    3450 1450
 	0    -1   -1   0   
 $EndComp
@@ -1075,8 +1282,10 @@ $Comp
 L R R2
 U 1 1 442A4CFB
 P 2800 2000
-F 0 "R2" V 2880 2000 50  0000 C C
-F 1 "10K" V 2800 2000 50  0000 C C
+F 0 "R2" V 2880 2000 50  0000 C CNN
+F 1 "10K" V 2800 2000 50  0000 C CNN
+F 2 "" H 2800 2000 60  0001 C CNN
+F 3 "" H 2800 2000 60  0001 C CNN
 	1    2800 2000
 	1    0    0    -1  
 $EndComp
@@ -1084,8 +1293,10 @@ $Comp
 L R R1
 U 1 1 442A4CF4
 P 3100 1700
-F 0 "R1" V 3180 1700 50  0000 C C
-F 1 "10K" V 3100 1700 50  0000 C C
+F 0 "R1" V 3180 1700 50  0000 C CNN
+F 1 "10K" V 3100 1700 50  0000 C CNN
+F 2 "" H 3100 1700 60  0001 C CNN
+F 3 "" H 3100 1700 60  0001 C CNN
 	1    3100 1700
 	0    -1   -1   0   
 $EndComp
@@ -1093,8 +1304,10 @@ $Comp
 L 74LS125 U2
 U 1 1 442A4CC8
 P 3950 1700
-F 0 "U2" H 3950 1800 50  0000 L B
-F 1 "74HC125" H 4000 1550 40  0000 L T
+F 0 "U2" H 3950 1800 50  0000 L BNN
+F 1 "74HC125" H 4000 1550 40  0000 L TNN
+F 2 "" H 3950 1700 60  0001 C CNN
+F 3 "" H 3950 1700 60  0001 C CNN
 	1    3950 1700
 	1    0    0    -1  
 $EndComp
@@ -1102,8 +1315,10 @@ $Comp
 L DB9 J1
 U 1 1 442A4C93
 P 1250 3600
-F 0 "J1" H 1250 4150 70  0000 C C
-F 1 "DB9-FEMAL" H 1250 3050 70  0000 C C
+F 0 "J1" H 1250 4150 70  0000 C CNN
+F 1 "DB9-FEMAL" H 1250 3050 70  0000 C CNN
+F 2 "" H 1250 3600 60  0001 C CNN
+F 3 "" H 1250 3600 60  0001 C CNN
 	1    1250 3600
 	-1   0    0    1   
 $EndComp

demos/flat_hierarchy/pic_sockets.sch

 EESchema Schematic File Version 2
-LIBS:power,device,transistors,conn,linear,regul,74xx,cmos4000,adc-dac,memory,xilinx,special,microcontrollers,dsp,microchip,analog_switches,motorola,texas,intel,audio,interface,digital-audio,philips,display,cypress,siliconi,contrib,valves
-EELAYER 23  0
+LIBS:power
+LIBS:device
+LIBS:transistors
+LIBS:conn
+LIBS:linear
+LIBS:regul
+LIBS:74xx
+LIBS:cmos4000
+LIBS:adc-dac
+LIBS:memory
+LIBS:xilinx
+LIBS:special
+LIBS:microcontrollers
+LIBS:dsp
+LIBS:microchip
+LIBS:analog_switches
+LIBS:motorola
+LIBS:texas
+LIBS:intel
+LIBS:audio
+LIBS:interface
+LIBS:digital-audio
+LIBS:philips
+LIBS:display
+LIBS:cypress
+LIBS:siliconi
+LIBS:opto
+LIBS:atmel
+LIBS:flat_hierarchy-cache
+EELAYER 24 0
 EELAYER END
-$Descr A4 11700 8267
+$Descr A4 11693 8268
+encoding utf-8
 Sheet 2 3
 Title "JDM - COM84 PIC Programmer with 13V DC/DC converter"
 Date "15 apr 2008"
@@ -13,17 +42,17 @@ Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
-Text GLabel 2350 1900 0    60   Input
+Text GLabel 2350 1900 0    60   Input ~ 0
 VPP-MCLR
-Text GLabel 2350 1700 0    60   Input
+Text GLabel 2350 1700 0    60   Input ~ 0
 CLOCK-RB6
-Text GLabel 2350 1500 0    60   Input
+Text GLabel 2350 1500 0    60   Input ~ 0
 DATA-RB7
-Text GLabel 2350 2150 0    60   Input
+Text GLabel 2350 2150 0    60   Input ~ 0
 VCC_PIC
-Text Label 2550 2150 0    60   ~
+Text Label 2550 2150 0    60   ~ 0
 VCC_PIC
-Text Label 2450 3150 0    60   ~
+Text Label 2450 3150 0    60   ~ 0
 VPP-MCLR
 Wire Wire Line
 	3700 7000 3700 6900
@@ -83,14 +112,16 @@ Wire Wire Line
 	3700 6900 4550 6900
 Wire Wire Line
 	4550 6900 4550 7000
-Text Label 3950 6900 0    60   ~
+Text Label 3950 6900 0    60   ~ 0
 VCC_PIC
 $Comp
 L GND #PWR01
 U 1 1 4639BE2E
 P 4550 7400
-F 0 "#PWR01" H 4550 7400 30  0001 C C
-F 1 "GND" H 4550 7330 30  0001 C C
+F 0 "#PWR01" H 4550 7400 30  0001 C CNN
+F 1 "GND" H 4550 7330 30  0001 C CNN
+F 2 "" H 4550 7400 60  0001 C CNN
+F 3 "" H 4550 7400 60  0001 C CNN
 	1    4550 7400
 	1    0    0    -1  
 $EndComp
@@ -98,34 +129,40 @@ $Comp
 L C C8
 U 1 1 4639BE2C
 P 4550 7200
-F 0 "C8" H 4600 7300 50  0000 L C
-F 1 "100nF" H 4600 7100 50  0000 L C
+F 0 "C8" H 4600 7300 50  0000 L CNN
+F 1 "100nF" H 4600 7100 50  0000 L CNN
+F 2 "" H 4550 7200 60  0001 C CNN
+F 3 "" H 4550 7200 60  0001 C CNN
 	1    4550 7200
 	1    0    0    -1  
 $EndComp
-Text Label 7650 5150 0    60   ~
+Text Label 7650 5150 0    60   ~ 0
 VCC_PIC
-Text Label 9900 4950 0    60   ~
+Text Label 9900 4950 0    60   ~ 0
 VCC_PIC
-Text Label 9650 2500 0    60   ~
+Text Label 9650 2500 0    60   ~ 0
 VCC_PIC
 $Comp
 L GND #PWR02
 U 1 1 442A8794
 P 8450 5250
-F 0 "#PWR02" H 8450 5250 30  0001 C C
-F 1 "GND" H 8450 5180 30  0001 C C
+F 0 "#PWR02" H 8450 5250 30  0001 C CNN
+F 1 "GND" H 8450 5180 30  0001 C CNN
+F 2 "" H 8450 5250 60  0001 C CNN
+F 3 "" H 8450 5250 60  0001 C CNN
 	1    8450 5250
 	0    1    1    0   
 $EndComp
-Text Label 4300 4850 0    60   ~
+Text Label 4300 4850 0    60   ~ 0
 VCC_PIC
 $Comp
 L GND #PWR03
 U 1 1 443CCA5D
 P 8450 4850
-F 0 "#PWR03" H 8450 4850 30  0001 C C
-F 1 "GND" H 8450 4780 30  0001 C C
+F 0 "#PWR03" H 8450 4850 30  0001 C CNN
+F 1 "GND" H 8450 4780 30  0001 C CNN
+F 2 "" H 8450 4850 60  0001 C CNN
+F 3 "" H 8450 4850 60  0001 C CNN
 	1    8450 4850
 	0    1    1    0   
 $EndComp
@@ -155,8 +192,10 @@ $Comp
 L GND #PWR04
 U 1 1 443697C7
 P 9400 2600
-F 0 "#PWR04" H 9400 2600 30  0001 C C
-F 1 "GND" H 9400 2530 30  0001 C C
+F 0 "#PWR04" H 9400 2600 30  0001 C CNN
+F 1 "GND" H 9400 2530 30  0001 C CNN
+F 2 "" H 9400 2600 60  0001 C CNN
+F 3 "" H 9400 2600 60  0001 C CNN
 	1    9400 2600
 	0    -1   -1   0   
 $EndComp
@@ -164,23 +203,27 @@ $Comp
 L GND #PWR05
 U 1 1 443697C3
 P 8200 2400
-F 0 "#PWR05" H 8200 2400 30  0001 C C
-F 1 "GND" H 8200 2330 30  0001 C C
+F 0 "#PWR05" H 8200 2400 30  0001 C CNN
+F 1 "GND" H 8200 2330 30  0001 C CNN
+F 2 "" H 8200 2400 60  0001 C CNN
+F 3 "" H 8200 2400 60  0001 C CNN
 	1    8200 2400
 	0    1    1    0   
 $EndComp
-Text Label 9550 1800 0    60   ~
+Text Label 9550 1800 0    60   ~ 0
 CLOCK-RB6
-Text Label 9550 1700 0    60   ~
+Text Label 9550 1700 0    60   ~ 0
 DATA-RB7
-Text Label 7550 1700 0    60   ~
+Text Label 7550 1700 0    60   ~ 0
 VPP-MCLR
 $Comp
 L SUPP28 P2
 U 1 1 4436967E
 P 8800 2350
-F 0 "P2" H 8850 3150 70  0000 C C
-F 1 "SUPP28" H 8800 1550 70  0000 C C
+F 0 "P2" H 8850 3150 70  0000 C CNN
+F 1 "SUPP28" H 8800 1550 70  0000 C CNN
+F 2 "" H 8800 2350 60  0001 C CNN
+F 3 "" H 8800 2350 60  0001 C CNN
 	1    8800 2350
 	1    0    0    -1  
 $EndComp
@@ -188,8 +231,10 @@ $Comp
 L GND #PWR06
 U 1 1 442AA147
 P 3700 7400
-F 0 "#PWR06" H 3700 7400 30  0001 C C
-F 1 "GND" H 3700 7330 30  0001 C C
+F 0 "#PWR06" H 3700 7400 30  0001 C CNN
+F 1 "GND" H 3700 7330 30  0001 C CNN
+F 2 "" H 3700 7400 60  0001 C CNN
+F 3 "" H 3700 7400 60  0001 C CNN
 	1    3700 7400
 	1    0    0    -1  
 $EndComp
@@ -197,8 +242,10 @@ $Comp
 L C C7
 U 1 1 442AA145
 P 3700 7200
-F 0 "C7" H 3750 7300 50  0000 L C
-F 1 "100nF" H 3750 7100 50  0000 L C
+F 0 "C7" H 3750 7300 50  0000 L CNN
+F 1 "100nF" H 3750 7100 50  0000 L CNN
+F 2 "" H 3700 7200 60  0001 C CNN
+F 3 "" H 3700 7200 60  0001 C CNN
 	1    3700 7200
 	1    0    0    -1  
 $EndComp
@@ -206,8 +253,10 @@ $Comp
 L GND #PWR07
 U 1 1 442AA138
 P 2700 7400
-F 0 "#PWR07" H 2700 7400 30  0001 C C
-F 1 "GND" H 2700 7330 30  0001 C C
+F 0 "#PWR07" H 2700 7400 30  0001 C CNN
+F 1 "GND" H 2700 7330 30  0001 C CNN
+F 2 "" H 2700 7400 60  0001 C CNN
+F 3 "" H 2700 7400 60  0001 C CNN
 	1    2700 7400
 	1    0    0    -1  
 $EndComp
@@ -215,8 +264,10 @@ $Comp
 L VCC #PWR08
 U 1 1 442AA134
 P 2700 7000
-F 0 "#PWR08" H 2700 7100 30  0001 C C
-F 1 "VCC" H 2700 7100 30  0000 C C
+F 0 "#PWR08" H 2700 7100 30  0001 C CNN
+F 1 "VCC" H 2700 7100 30  0000 C CNN
+F 2 "" H 2700 7000 60  0001 C CNN
+F 3 "" H 2700 7000 60  0001 C CNN
 	1    2700 7000
 	1    0    0    -1  
 $EndComp
@@ -224,8 +275,10 @@ $Comp
 L C C6
 U 1 1 442AA12B
 P 2700 7200
-F 0 "C6" H 2750 7300 50  0000 L C
-F 1 "100nF" H 2750 7100 50  0000 L C
+F 0 "C6" H 2750 7300 50  0000 L CNN
+F 1 "100nF" H 2750 7100 50  0000 L CNN
+F 2 "" H 2700 7200 60  0001 C CNN
+F 3 "" H 2700 7200 60  0001 C CNN
 	1    2700 7200
 	1    0    0    -1  
 $EndComp
@@ -265,8 +318,10 @@ $Comp
 L GND #PWR09
 U 1 1 442A896A
 P 9650 5050
-F 0 "#PWR09" H 9650 5050 30  0001 C C
-F 1 "GND" H 9650 4980 30  0001 C C
+F 0 "#PWR09" H 9650 5050 30  0001 C CNN
+F 1 "GND" H 9650 4980 30  0001 C CNN
+F 2 "" H 9650 5050 60  0001 C CNN
+F 3 "" H 9650 5050 60  0001 C CNN
 	1    9650 5050
 	0    -1   -1   0   
 $EndComp
@@ -274,8 +329,10 @@ $Comp
 L SUPP40 P3
 U 1 1 442A88ED
 P 9050 5100
-F 0 "P3" H 9100 6200 70  0000 C C
-F 1 "SUPP40" H 8900 4000 70  0000 C C
+F 0 "P3" H 9100 6200 70  0000 C CNN
+F 1 "SUPP40" H 8900 4000 70  0000 C CNN
+F 2 "" H 9050 5100 60  0001 C CNN
+F 3 "" H 9050 5100 60  0001 C CNN
 	1    9050 5100
 	1    0    0    -1  
 $EndComp
@@ -284,29 +341,33 @@ $Comp
 L GND #PWR010
 U 1 1 442A8838
 P 2950 1250
-F 0 "#PWR010" H 2950 1250 30  0001 C C
-F 1 "GND" H 2950 1180 30  0001 C C
+F 0 "#PWR010" H 2950 1250 30  0001 C CNN
+F 1 "GND" H 2950 1180 30  0001 C CNN
+F 2 "" H 2950 1250 60  0001 C CNN
+F 3 "" H 2950 1250 60  0001 C CNN
 	1    2950 1250
 	1    0    0    -1  
 $EndComp
-Text Label 4700 1400 0    60   ~
+Text Label 4700 1400 0    60   ~ 0
 DATA-RB7
-Text Label 4700 1300 0    60   ~
+Text Label 4700 1300 0    60   ~ 0
 CLOCK-RB6
 $Comp
 L 24C16 U1
 U 1 1 442A87F7
 P 3850 1200
-F 0 "U1" H 4000 1550 60  0000 C C
-F 1 "24Cxx" H 4050 850 60  0000 C C
+F 0 "U1" H 4000 1550 60  0000 C CNN
+F 1 "24Cxx" H 4050 850 60  0000 C CNN
+F 2 "" H 3850 1200 60  0001 C CNN
+F 3 "" H 3850 1200 60  0001 C CNN
 	1    3850 1200
 	1    0    0    -1  
 $EndComp
-Text Label 9800 4250 0    60   ~
+Text Label 9800 4250 0    60   ~ 0
 CLOCK-RB6
-Text Label 9800 4150 0    60   ~
+Text Label 9800 4150 0    60   ~ 0
 DATA-RB7
-Text Label 7800 4150 0    60   ~
+Text Label 7800 4150 0    60   ~ 0
 VPP-MCLR
 NoConn ~ 2500 4400
 NoConn ~ 4050 5450
@@ -325,30 +386,34 @@ $Comp
 L PIC16F54 U5
 U 1 1 442A81A7
 P 3300 4850
-F 0 "U5" H 3600 5650 60  0000 C C
-F 1 "PIC_18_PINS" H 3750 4050 60  0000 C C
+F 0 "U5" H 3600 5650 60  0000 C CNN
+F 1 "PIC_18_PINS" H 3750 4050 60  0000 C CNN
+F 2 "" H 3300 4850 60  0001 C CNN
+F 3 "" H 3300 4850 60  0001 C CNN
 	1    3300 4850
 	1    0    0    -1  
 $EndComp
 NoConn ~ 4550 3150
 NoConn ~ 3100 2850
 NoConn ~ 3100 2450
-Text Label 4200 5150 0    60   ~
+Text Label 4200 5150 0    60   ~ 0
 CLOCK-RB6
-Text Label 4200 5000 0    60   ~
+Text Label 4200 5000 0    60   ~ 0
 DATA-RB7
-Text Label 1850 4700 0    60   ~
+Text Label 1850 4700 0    60   ~ 0
 VPP-MCLR
-Text Label 4700 2850 0    60   ~
+Text Label 4700 2850 0    60   ~ 0
 CLOCK-RB6
-Text Label 4700 2450 0    60   ~
+Text Label 4700 2450 0    60   ~ 0
 DATA-RB7
 $Comp
 L GND #PWR011
 U 1 1 442A820F
 P 2300 4900
-F 0 "#PWR011" H 2300 4900 30  0001 C C
-F 1 "GND" H 2300 4830 30  0001 C C
+F 0 "#PWR011" H 2300 4900 30  0001 C CNN
+F 1 "GND" H 2300 4830 30  0001 C CNN
+F 2 "" H 2300 4900 60  0001 C CNN
+F 3 "" H 2300 4900 60  0001 C CNN
 	1    2300 4900
 	1    0    0    -1  
 $EndComp
@@ -356,8 +421,10 @@ $Comp
 L GND #PWR012
 U 1 1 442A8205
 P 4550 2150
-F 0 "#PWR012" H 4550 2150 30  0001 C C
-F 1 "GND" H 4550 2080 30  0001 C C
+F 0 "#PWR012" H 4550 2150 30  0001 C CNN
+F 1 "GND" H 4550 2080 30  0001 C CNN
+F 2 "" H 4550 2150 60  0001 C CNN
+F 3 "" H 4550 2150 60  0001 C CNN
 	1    4550 2150
 	0    -1   -1   0   
 $EndComp
@@ -365,9 +432,33 @@ $Comp
 L PIC12C508A U6
 U 1 1 442A81A5
 P 3850 2650
-F 0 "U6" H 3800 3350 60  0000 C C
-F 1 "PIC_8_PINS" H 3850 1950 60  0000 C C
+F 0 "U6" H 3800 3350 60  0000 C CNN
+F 1 "PIC_8_PINS" H 3850 1950 60  0000 C CNN
+F 2 "" H 3850 2650 60  0001 C CNN
+F 3 "" H 3850 2650 60  0001 C CNN
 	1    3850 2650
 	1    0    0    -1  
 $EndComp
+$Comp
+L VCC #PWR013
+U 1 1 53B84749
+P 3850 700
+F 0 "#PWR013" H 3850 800 30  0001 C CNN
+F 1 "VCC" H 3850 800 30  0000 C CNN
+F 2 "" H 3850 700 60  0001 C CNN
+F 3 "" H 3850 700 60  0001 C CNN
+	1    3850 700 
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR014
+U 1 1 53B847AC
+P 3850 1700
+F 0 "#PWR014" H 3850 1700 30  0001 C CNN
+F 1 "GND" H 3850 1630 30  0001 C CNN
+F 2 "" H 3850 1700 60  0001 C CNN
+F 3 "" H 3850 1700 60  0001 C CNN
+	1    3850 1700
+	1    0    0    -1  
+$EndComp
 $EndSCHEMATC

demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213-cache.dcm

-EESchema-DOCLIB  Version 2.0  05/07/2009 12:03:24
-#
-$CMP 74LS125
-D Quad buffer 3 State out
-K TTL buffer 3State
-$ENDCMP
-#
-$CMP C
-D Condensateur non polarise
-$ENDCMP
-#
-$CMP CONN_1
-D 1 pin
-K CONN
-$ENDCMP
-#
-$CMP CONN_2
-D Symbole general de connecteur
-K CONN
-$ENDCMP
-#
-$CMP CONN_2X2
-D Symbole general de connecteur
-K CONN
-$ENDCMP
-#
-$CMP CONN_3
-D Symbole general de connecteur
-K CONN
-$ENDCMP
-#
-$CMP CONN_4X2
-D Symbole general de connecteur
-K CONN
-$ENDCMP
-#
-$CMP CONN_6
-D ymbole general de connecteur
-K CONN
-$ENDCMP
-#
-$CMP CP
-D Condensateur polarise
-$ENDCMP
-#
-$CMP DB9
-K CONN
-$ENDCMP
-#
-$CMP DIODE
-D Diode simple
-K DEV DIODE
-$ENDCMP
-#
-$CMP LED
-K LED
-$ENDCMP
-#
-$CMP LT1129_QPACK
-D LowDrop Linear Regulator (QPACK 5 pins)
-K REGUL POWER
-F linear-tec/lt1129.pdf
-$ENDCMP
-#
-$CMP MAX232
-D Driver de Ligne RS232
-K RS232
-F maxim/MAX220-MAX249.pdf
-$ENDCMP
-#
-$CMP MC34064P
-D Undervoltage sensing circuit (TP-226AA package)
-F onsemi/mc34064.pdf
-$ENDCMP
-#
-$CMP MCF5213-LQFP100
-D Coldfire with SRAM and Flash Eprom - LQFP100 package
-K COLDFIRE
-$ENDCMP
-#
-$CMP PCA82C251
-D CAN Transceiver
-K BUS CAN
-$ENDCMP
-#
-$CMP PNP
-F transistors/bipolar/*.*
-$ENDCMP
-#
-$CMP R
-D Resistance
-K R DEV
-$ENDCMP
-#
-$CMP SW_PUSH
-D Push Button
-K Switch
-$ENDCMP
-#
-$CMP SWITCH_INV
-D Switch inverseur
-K switch
-$ENDCMP
-#
-#End Doc Library

demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213-cache.lib

@@ -835,21 +835,6 @@ X ~ 2 0 -250 100 U 60 60 1 1 P
 ENDDRAW
 ENDDEF
 #
-# SW_PUSH
-#
-DEF SW_PUSH SW 0 40 N N 1 F N
-F0 "SW" 150 110 50 H V C CNN
-F1 "SW_PUSH" 0 -80 50 H V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
-DRAW
-S -170 50 170 60 0 1 0 N
-P 4 0 1 0  -40 60  -30 90  30 90  40 60 N
-X 1 1 -300 0 200 R 60 60 0 1 P I
-X 2 2 300 0 200 L 60 60 0 1 P I
-ENDDRAW
-ENDDEF
-#
 # SWITCH_INV
 #
 DEF SWITCH_INV SW 0 0 N Y 1 F N
@@ -868,6 +853,21 @@ X 3 3 500 -100 300 L 60 60 1 1 P
 ENDDRAW
 ENDDEF
 #
+# SW_PUSH
+#
+DEF SW_PUSH SW 0 40 N N 1 F N
+F0 "SW" 150 110 50 H V C CNN
+F1 "SW_PUSH" 0 -80 50 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+S -170 50 170 60 0 1 0 N
+P 4 0 1 0  -40 60  -30 90  30 90  40 60 N
+X 1 1 -300 0 200 R 60 60 0 1 P I
+X 2 2 300 0 200 L 60 60 0 1 P I
+ENDDRAW
+ENDDEF
+#
 # VCC
 #
 DEF VCC #PWR 0 0 Y Y 1 F P