From ae506e822372258b48626d17a3cc171c41aabab0 Mon Sep 17 00:00:00 2001
From: jean-pierre charras <jp.charras@wanadoo.fr>
Date: Mon, 2 Nov 2015 10:24:32 +0100
Subject: [PATCH] polygons in footprint body: fix incorrect calculation of
polygons with clearance or outline thickness (fix bug #1511366) Clean demos
---
demos/complex_hierarchy/ampli_ht.sch | 90 +-
demos/complex_hierarchy/complex_hierarchy.sch | 20 +-
demos/ecc83/ecc83-pp.cmp | 108 --
demos/ecc83/ecc83-pp_v2.cmp | 108 --
demos/flat_hierarchy/flat_hierarchy.cmp | 409 ------
demos/flat_hierarchy/pic_programmer.sch | 106 +-
demos/flat_hierarchy/pic_sockets.sch | 16 +-
.../kit-dev-coldfire-xilinx_5213.cmp | 1137 -----------------
demos/pic_programmer/pic_programmer.cmp | 444 -------
demos/sonde xilinx/sonde xilinx.cmp | 178 ---
demos/sonde xilinx/sonde xilinx.sch | 158 +--
.../test_pads_inside_pads-cache.lib | 4 +-
.../test_pads_inside_pads.cmp | 31 -
.../test_pads_inside_pads.sch | 15 +-
demos/test_xil_95108/carte_test-cache.lib | 4 +-
demos/test_xil_95108/carte_test.cmp | 297 -----
demos/test_xil_95108/carte_test.sch | 2 +-
demos/video/bus_pci.sch | 44 +-
demos/video/esvideo.sch | 20 +-
demos/video/graphic.sch | 38 +-
demos/video/modul.sch | 24 +-
demos/video/muxdata.sch | 20 +-
demos/video/pal-ntsc.sch | 30 +-
demos/video/rams.sch | 20 +-
demos/video/video.sch | 30 +-
...board_items_to_polygon_shape_transform.cpp | 22 +-
26 files changed, 236 insertions(+), 3139 deletions(-)
delete mode 100644 demos/ecc83/ecc83-pp.cmp
delete mode 100644 demos/ecc83/ecc83-pp_v2.cmp
delete mode 100644 demos/flat_hierarchy/flat_hierarchy.cmp
delete mode 100644 demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213.cmp
delete mode 100644 demos/pic_programmer/pic_programmer.cmp
delete mode 100644 demos/sonde xilinx/sonde xilinx.cmp
delete mode 100644 demos/test_pads_inside_pads/test_pads_inside_pads.cmp
delete mode 100644 demos/test_xil_95108/carte_test.cmp
diff --git a/demos/complex_hierarchy/ampli_ht.sch b/demos/complex_hierarchy/ampli_ht.sch
index 2d6ae4b6f7..b61b1a85aa 100644
--- a/demos/complex_hierarchy/ampli_ht.sch
+++ b/demos/complex_hierarchy/ampli_ht.sch
@@ -1,6 +1,6 @@
EESchema Schematic File Version 2
-LIBS:device
LIBS:power
+LIBS:complex_hierarchy_schlib
LIBS:complex_hierarchy-cache
EELAYER 25 0
EELAYER END
@@ -129,7 +129,7 @@ AR Path="/4B3A1333/4B617B88" Ref="R26" Part="1"
AR Path="/4B3A13A4/4B617B88" Ref="R28" Part="1"
F 0 "R28" H 9200 4850 50 0000 C CNN
F 1 "220K" V 9100 5100 50 0000 C CNN
-F 2 "discret:R3-LARGE_PADS" H 9100 5100 60 0001 C CNN
+F 2 "Discret:R3-LARGE_PADS" H 9100 5100 60 0001 C CNN
F 3 "" H 9100 5100 60 0001 C CNN
1 9100 5100
-1 0 0 1
@@ -142,7 +142,7 @@ AR Path="/4B3A1333/4B616B96" Ref="R25" Part="1"
AR Path="/4B3A13A4/4B616B96" Ref="R27" Part="1"
F 0 "R27" V 9530 4450 50 0000 C CNN
F 1 "47" V 9450 4450 50 0000 C CNN
-F 2 "discret:R3-LARGE_PADS" H 9450 4450 60 0001 C CNN
+F 2 "Discret:R3-LARGE_PADS" H 9450 4450 60 0001 C CNN
F 3 "" H 9450 4450 60 0001 C CNN
1 9450 4450
0 1 1 0
@@ -155,7 +155,7 @@ AR Path="/4B3A1333/4B616AFA" Ref="D8" Part="1"
AR Path="/4B3A13A4/4B616AFA" Ref="D9" Part="1"
F 0 "D9" V 7850 4200 50 0000 C CNN
F 1 "1N4148" V 7950 4200 50 0000 C CNN
-F 2 "discret:D3" H 7900 4000 60 0001 C CNN
+F 2 "Discret:D3" H 7900 4000 60 0001 C CNN
F 3 "" H 7900 4000 60 0001 C CNN
1 7900 4000
0 -1 -1 0
@@ -166,7 +166,7 @@ U 1 1 4B6168A3
P 8100 5950
AR Path="/4B3A13A4/4B6168A3" Ref="#PWR019" Part="1"
AR Path="/4B3A1333/4B6168A3" Ref="#PWR035" Part="1"
-F 0 "#PWR035" H 8100 5950 30 0001 C CNN
+F 0 "#PWR019" H 8100 5950 30 0001 C CNN
F 1 "GND" H 8100 5880 30 0001 C CNN
F 2 "" H 8100 5950 60 0001 C CNN
F 3 "" H 8100 5950 60 0001 C CNN
@@ -181,7 +181,7 @@ 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 1 "5,6K" V 8100 5250 50 0000 C CNN
-F 2 "discret:R3-LARGE_PADS" H 8100 5250 60 0001 C CNN
+F 2 "Discret:R3-LARGE_PADS" H 8100 5250 60 0001 C CNN
F 3 "" H 8100 5250 60 0001 C CNN
1 8100 5250
1 0 0 -1
@@ -192,7 +192,7 @@ U 1 1 4B4F364A
P 2850 2450
AR Path="/4B3A1333/4B4F364A" Ref="#PWR036" Part="1"
AR Path="/4B3A13A4/4B4F364A" Ref="#PWR020" Part="1"
-F 0 "#PWR036" H 2850 2450 30 0001 C CNN
+F 0 "#PWR020" H 2850 2450 30 0001 C CNN
F 1 "GND" H 2850 2380 30 0001 C CNN
F 2 "" H 2850 2450 60 0001 C CNN
F 3 "" H 2850 2450 60 0001 C CNN
@@ -207,7 +207,7 @@ AR Path="/4B3A1333/4B4F3641" Ref="C12" Part="1"
AR Path="/4B3A13A4/4B4F3641" Ref="C14" Part="1"
F 0 "C14" H 3000 2300 50 0000 L CNN
F 1 "150nF" H 3000 2200 50 0000 L CNN
-F 2 "discret:C2" H 2850 2250 60 0001 C CNN
+F 2 "Discret:C2" H 2850 2250 60 0001 C CNN
F 3 "" H 2850 2250 60 0001 C CNN
1 2850 2250
1 0 0 -1
@@ -220,7 +220,7 @@ AR Path="/4B3A1333/4B4F363E" Ref="R23" Part="1"
AR Path="/4B3A13A4/4B4F363E" Ref="R24" Part="1"
F 0 "R24" V 2350 2000 50 0000 C CNN
F 1 "1K" V 2450 2000 50 0000 C CNN
-F 2 "discret:R3-LARGE_PADS" H 2450 2000 60 0001 C CNN
+F 2 "Discret:R3-LARGE_PADS" H 2450 2000 60 0001 C CNN
F 3 "" H 2450 2000 60 0001 C CNN
1 2450 2000
0 1 1 0
@@ -231,7 +231,7 @@ U 1 1 4B4B1086
P 6300 5850
AR Path="/4B3A13A4/4B4B1086" Ref="#PWR021" Part="1"
AR Path="/4B3A1333/4B4B1086" Ref="#PWR037" Part="1"
-F 0 "#PWR037" H 6300 5950 20 0001 C CNN
+F 0 "#PWR021" H 6300 5950 20 0001 C CNN
F 1 "-VAA" H 6300 5950 40 0000 C CNN
F 2 "" H 6300 5850 60 0001 C CNN
F 3 "" H 6300 5850 60 0001 C CNN
@@ -244,7 +244,7 @@ U 1 1 4B4B1080
P 4750 2850
AR Path="/4B3A13A4/4B4B1080" Ref="#PWR022" Part="1"
AR Path="/4B3A1333/4B4B1080" Ref="#PWR038" Part="1"
-F 0 "#PWR038" H 4750 2950 20 0001 C CNN
+F 0 "#PWR022" H 4750 2950 20 0001 C CNN
F 1 "-VAA" H 4750 2950 40 0000 C CNN
F 2 "" H 4750 2850 60 0001 C CNN
F 3 "" H 4750 2850 60 0001 C CNN
@@ -265,7 +265,7 @@ AR Path="/4B3A13A4/4B3A137D" Ref="Q6" Part="1"
AR Path="/4B3A1333/4B3A137D" Ref="Q2" Part="1"
F 0 "Q6" H 8500 3950 50 0000 R CNN
F 1 "MPAS42" H 8500 3850 50 0000 R CNN
-F 2 "discret:TO92-CBE" H 8500 3700 60 0001 C CNN
+F 2 "Discret:TO92-CBE" H 8500 3700 60 0001 C CNN
F 3 "" H 8500 3700 60 0001 C CNN
1 8500 3700
1 0 0 -1
@@ -278,7 +278,7 @@ AR Path="/4B3A13A4/4B3A137C" Ref="Q7" Part="1"
AR Path="/4B3A1333/4B3A137C" Ref="Q3" Part="1"
F 0 "Q7" H 8500 4650 60 0000 R CNN
F 1 "MPAS92" H 8500 4950 60 0000 R CNN
-F 2 "discret:TO92-CBE" H 8500 4800 60 0001 C CNN
+F 2 "Discret:TO92-CBE" H 8500 4800 60 0001 C CNN
F 3 "" H 8500 4800 60 0001 C CNN
1 8500 4800
1 0 0 1
@@ -291,7 +291,7 @@ AR Path="/4B3A13A4/4B3A137B" Ref="D7" Part="1"
AR Path="/4B3A1333/4B3A137B" Ref="D4" Part="1"
F 0 "D7" V 7850 4700 50 0000 C CNN
F 1 "1N4148" V 7950 4700 50 0000 C CNN
-F 2 "discret:D3" H 7900 4500 60 0001 C CNN
+F 2 "Discret:D3" H 7900 4500 60 0001 C CNN
F 3 "" H 7900 4500 60 0001 C CNN
1 7900 4500
0 -1 -1 0
@@ -302,7 +302,7 @@ U 1 1 4B3A137A
P 8600 5300
AR Path="/4B3A13A4/4B3A137A" Ref="#PWR023" Part="1"
AR Path="/4B3A1333/4B3A137A" Ref="#PWR039" Part="1"
-F 0 "#PWR039" H 8600 5300 30 0001 C CNN
+F 0 "#PWR023" H 8600 5300 30 0001 C CNN
F 1 "GND" H 8600 5230 30 0001 C CNN
F 2 "" H 8600 5300 60 0001 C CNN
F 3 "" H 8600 5300 60 0001 C CNN
@@ -317,7 +317,7 @@ 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 1 "MPAS42" H 7800 5250 50 0000 R CNN
-F 2 "discret:TO92-CBE" H 7800 5100 60 0001 C CNN
+F 2 "Discret:TO92-CBE" H 7800 5100 60 0001 C CNN
F 3 "" H 7800 5100 60 0001 C CNN
1 7800 5100
1 0 0 -1
@@ -328,7 +328,7 @@ U 1 1 4B3A1378
P 7000 5200
AR Path="/4B3A13A4/4B3A1378" Ref="#PWR024" Part="1"
AR Path="/4B3A1333/4B3A1378" Ref="#PWR040" Part="1"
-F 0 "#PWR040" H 7000 5200 30 0001 C CNN
+F 0 "#PWR024" H 7000 5200 30 0001 C CNN
F 1 "GND" H 7000 5130 30 0001 C CNN
F 2 "" H 7000 5200 60 0001 C CNN
F 3 "" H 7000 5200 60 0001 C CNN
@@ -343,7 +343,7 @@ AR Path="/4B3A13A4/4B3A1377" Ref="D6" Part="1"
AR Path="/4B3A1333/4B3A1377" Ref="D3" Part="1"
F 0 "D6" V 7250 3300 50 0000 C CNN
F 1 "1N4148" V 7350 3300 50 0000 C CNN
-F 2 "discret:D3" H 7300 3100 60 0001 C CNN
+F 2 "Discret:D3" H 7300 3100 60 0001 C CNN
F 3 "" H 7300 3100 60 0001 C CNN
1 7300 3100
0 -1 -1 0
@@ -356,7 +356,7 @@ AR Path="/4B3A13A4/4B3A1376" Ref="R13" Part="1"
AR Path="/4B3A1333/4B3A1376" Ref="R3" Part="1"
F 0 "R13" V 7980 2750 50 0000 C CNN
F 1 "470" V 7900 2750 50 0000 C CNN
-F 2 "discret:R3-LARGE_PADS" H 7900 2750 60 0001 C CNN
+F 2 "Discret:R3-LARGE_PADS" H 7900 2750 60 0001 C CNN
F 3 "" H 7900 2750 60 0001 C CNN
1 7900 2750
1 0 0 -1
@@ -369,7 +369,7 @@ AR Path="/4B3A13A4/4B3A1375" Ref="D5" Part="1"
AR Path="/4B3A1333/4B3A1375" Ref="D2" Part="1"
F 0 "D5" V 7250 3000 50 0000 C CNN
F 1 "1N4148" V 7350 3000 50 0000 C CNN
-F 2 "discret:D3" H 7300 2800 60 0001 C CNN
+F 2 "Discret:D3" H 7300 2800 60 0001 C CNN
F 3 "" H 7300 2800 60 0001 C CNN
1 7300 2800
0 -1 -1 0
@@ -382,7 +382,7 @@ AR Path="/4B3A13A4/4B3A1374" Ref="R14" Part="1"
AR Path="/4B3A1333/4B3A1374" Ref="R4" Part="1"
F 0 "R14" V 7380 3600 50 0000 C CNN
F 1 "220K" V 7300 3600 50 0000 C CNN
-F 2 "discret:R3-LARGE_PADS" H 7300 3600 60 0001 C CNN
+F 2 "Discret:R3-LARGE_PADS" H 7300 3600 60 0001 C CNN
F 3 "" H 7300 3600 60 0001 C CNN
1 7300 3600
1 0 0 -1
@@ -393,7 +393,7 @@ U 1 1 4B3A1373
P 7300 3850
AR Path="/4B3A13A4/4B3A1373" Ref="#PWR025" Part="1"
AR Path="/4B3A1333/4B3A1373" Ref="#PWR041" Part="1"
-F 0 "#PWR041" H 7300 3850 30 0001 C CNN
+F 0 "#PWR025" H 7300 3850 30 0001 C CNN
F 1 "GND" H 7300 3780 30 0001 C CNN
F 2 "" H 7300 3850 60 0001 C CNN
F 3 "" H 7300 3850 60 0001 C CNN
@@ -408,7 +408,7 @@ AR Path="/4B3A13A4/4B3A1371" Ref="R18" Part="1"
AR Path="/4B3A1333/4B3A1371" Ref="R8" Part="1"
F 0 "R18" V 7150 5100 50 0000 C CNN
F 1 "1K" V 7250 5100 50 0000 C CNN
-F 2 "discret:R3-LARGE_PADS" H 7250 5100 60 0001 C CNN
+F 2 "Discret:R3-LARGE_PADS" H 7250 5100 60 0001 C CNN
F 3 "" H 7250 5100 60 0001 C CNN
1 7250 5100
0 1 1 0
@@ -421,7 +421,7 @@ AR Path="/4B3A13A4/4B3A1370" Ref="R22" Part="1"
AR Path="/4B3A1333/4B3A1370" Ref="R12" Part="1"
F 0 "R22" H 9000 4850 50 0000 C CNN
F 1 "220K" V 8900 5100 50 0000 C CNN
-F 2 "discret:R3-LARGE_PADS" H 8900 5100 60 0001 C CNN
+F 2 "Discret:R3-LARGE_PADS" H 8900 5100 60 0001 C CNN
F 3 "" H 8900 5100 60 0001 C CNN
1 8900 5100
-1 0 0 1
@@ -432,7 +432,7 @@ U 1 1 4B3A136F
P 6300 4950
AR Path="/4B3A13A4/4B3A136F" Ref="#U026" Part="1"
AR Path="/4B3A1333/4B3A136F" Ref="#U042" Part="1"
-F 0 "#U042" H 6300 4900 20 0001 C CNN
+F 0 "#U026" H 6300 4900 20 0001 C CNN
F 1 "+12V" H 6300 5050 40 0000 C CNN
F 2 "" H 6300 4950 60 0001 C CNN
F 3 "" H 6300 4950 60 0001 C CNN
@@ -447,7 +447,7 @@ AR Path="/4B3A13A4/4B3A136D" Ref="R19" Part="1"
AR Path="/4B3A1333/4B3A136D" Ref="R9" Part="1"
F 0 "R19" V 7300 5400 50 0000 C CNN
F 1 "1K" V 7400 5400 50 0000 C CNN
-F 2 "discret:R3-LARGE_PADS" H 7400 5400 60 0001 C CNN
+F 2 "Discret:R3-LARGE_PADS" H 7400 5400 60 0001 C CNN
F 3 "" H 7400 5400 60 0001 C CNN
1 7400 5400
0 1 1 0
@@ -460,7 +460,7 @@ AR Path="/4B3A13A4/4B3A136C" Ref="P5" Part="1"
AR Path="/4B3A1333/4B3A136C" Ref="P3" Part="1"
F 0 "P5" V 10700 4400 40 0000 C CNN
F 1 "CONN_2" V 10800 4400 40 0000 C CNN
-F 2 "connect:bornier2" H 10750 4400 60 0001 C CNN
+F 2 "Connect:bornier2" H 10750 4400 60 0001 C CNN
F 3 "" H 10750 4400 60 0001 C CNN
1 10750 4400
1 0 0 -1
@@ -475,7 +475,7 @@ AR Path="/4B3A13A4/4B3A136B" Ref="R16" Part="1"
AR Path="/4B3A1333/4B3A136B" Ref="R6" Part="1"
F 0 "R16" V 3150 2000 50 0000 C CNN
F 1 "22K" V 3250 2000 50 0000 C CNN
-F 2 "discret:R3-LARGE_PADS" H 3250 2000 60 0001 C CNN
+F 2 "Discret:R3-LARGE_PADS" H 3250 2000 60 0001 C CNN
F 3 "" H 3250 2000 60 0001 C CNN
1 3250 2000
0 1 1 0
@@ -486,7 +486,7 @@ U 1 1 4B3A136A
P 1800 2250
AR Path="/4B3A13A4/4B3A136A" Ref="#PWR027" Part="1"
AR Path="/4B3A1333/4B3A136A" Ref="#PWR043" Part="1"
-F 0 "#PWR043" H 1800 2250 30 0001 C CNN
+F 0 "#PWR027" H 1800 2250 30 0001 C CNN
F 1 "GND" H 1800 2180 30 0001 C CNN
F 2 "" H 1800 2250 60 0001 C CNN
F 3 "" H 1800 2250 60 0001 C CNN
@@ -499,7 +499,7 @@ U 1 1 4B3A1369
P 4000 2750
AR Path="/4B3A13A4/4B3A1369" Ref="#PWR028" Part="1"
AR Path="/4B3A1333/4B3A1369" Ref="#PWR044" Part="1"
-F 0 "#PWR044" H 4000 2750 30 0001 C CNN
+F 0 "#PWR028" H 4000 2750 30 0001 C CNN
F 1 "GND" H 4000 2680 30 0001 C CNN
F 2 "" H 4000 2750 60 0001 C CNN
F 3 "" H 4000 2750 60 0001 C CNN
@@ -527,7 +527,7 @@ AR Path="/4B3A13A4/4B3A1367" Ref="P6" Part="1"
AR Path="/4B3A1333/4B3A1367" Ref="P4" Part="1"
F 0 "P6" V 1300 2100 40 0000 C CNN
F 1 "CONN_2" V 1400 2100 40 0000 C CNN
-F 2 "connect:bornier2" H 1350 2100 60 0001 C CNN
+F 2 "Connect:bornier2" H 1350 2100 60 0001 C CNN
F 3 "" H 1350 2100 60 0001 C CNN
1 1350 2100
-1 0 0 -1
@@ -540,7 +540,7 @@ AR Path="/4B3A13A4/4B3A1366" Ref="C7" Part="1"
AR Path="/4B3A1333/4B3A1366" Ref="C4" Part="1"
F 0 "C7" H 4100 2650 50 0000 L CNN
F 1 "4.7nF" H 4100 2450 50 0000 L CNN
-F 2 "discret:C2" H 4000 2550 60 0001 C CNN
+F 2 "Discret:C2" H 4000 2550 60 0001 C CNN
F 3 "" H 4000 2550 60 0001 C CNN
1 4000 2550
1 0 0 -1
@@ -553,7 +553,7 @@ 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 1 "820pF" H 8150 5650 50 0000 L CNN
-F 2 "discret:C2" H 8100 5750 60 0001 C CNN
+F 2 "Discret:C2" H 8100 5750 60 0001 C CNN
F 3 "" H 8100 5750 60 0001 C CNN
1 8100 5750
1 0 0 -1
@@ -566,7 +566,7 @@ AR Path="/4B3A13A4/4B3A1364" Ref="R15" Part="1"
AR Path="/4B3A1333/4B3A1364" Ref="R5" Part="1"
F 0 "R15" V 9530 4150 50 0000 C CNN
F 1 "47" V 9450 4150 50 0000 C CNN
-F 2 "discret:R3-LARGE_PADS" H 9450 4150 60 0001 C CNN
+F 2 "Discret:R3-LARGE_PADS" H 9450 4150 60 0001 C CNN
F 3 "" H 9450 4150 60 0001 C CNN
1 9450 4150
0 1 1 0
@@ -577,7 +577,7 @@ U 1 1 4B3A1363
P 10250 4550
AR Path="/4B3A13A4/4B3A1363" Ref="#PWR029" Part="1"
AR Path="/4B3A1333/4B3A1363" Ref="#PWR045" Part="1"
-F 0 "#PWR045" H 10250 4550 30 0001 C CNN
+F 0 "#PWR029" H 10250 4550 30 0001 C CNN
F 1 "GND" H 10250 4480 30 0001 C CNN
F 2 "" H 10250 4550 60 0001 C CNN
F 3 "" H 10250 4550 60 0001 C CNN
@@ -592,7 +592,7 @@ AR Path="/4B3A13A4/4B3A1362" Ref="R21" Part="1"
AR Path="/4B3A1333/4B3A1362" Ref="R11" Part="1"
F 0 "R21" V 5150 6400 50 0000 C CNN
F 1 "4,7K" V 5250 6400 50 0000 C CNN
-F 2 "discret:R3-LARGE_PADS" H 5250 6400 60 0001 C CNN
+F 2 "Discret:R3-LARGE_PADS" H 5250 6400 60 0001 C CNN
F 3 "" H 5250 6400 60 0001 C CNN
1 5250 6400
0 1 1 0
@@ -603,7 +603,7 @@ U 1 1 4B3A1361
P 5050 6400
AR Path="/4B3A13A4/4B3A1361" Ref="#PWR030" Part="1"
AR Path="/4B3A1333/4B3A1361" Ref="#PWR046" Part="1"
-F 0 "#PWR046" H 5050 6400 30 0001 C CNN
+F 0 "#PWR030" H 5050 6400 30 0001 C CNN
F 1 "GND" H 5050 6330 30 0001 C CNN
F 2 "" H 5050 6400 60 0001 C CNN
F 3 "" H 5050 6400 60 0001 C CNN
@@ -618,7 +618,7 @@ AR Path="/4B3A13A4/4B3A1360" Ref="Q5" Part="1"
AR Path="/4B3A1333/4B3A1360" Ref="Q1" Part="1"
F 0 "Q5" H 7800 3150 60 0000 R CNN
F 1 "MPAS92" H 7800 3450 60 0000 R CNN
-F 2 "discret:TO92-CBE" H 7800 3300 60 0001 C CNN
+F 2 "Discret:TO92-CBE" H 7800 3300 60 0001 C CNN
F 3 "" H 7800 3300 60 0001 C CNN
1 7800 3300
1 0 0 1
@@ -629,7 +629,7 @@ U 1 1 4B3A135F
P 7300 2650
AR Path="/4B3A13A4/4B3A135F" Ref="#PWR031" Part="1"
AR Path="/4B3A1333/4B3A135F" Ref="#PWR047" Part="1"
-F 0 "#PWR047" H 7300 2770 20 0001 C CNN
+F 0 "#PWR031" H 7300 2770 20 0001 C CNN
F 1 "HT" H 7300 2740 40 0000 C CNN
F 2 "" H 7300 2650 60 0001 C CNN
F 3 "" H 7300 2650 60 0001 C CNN
@@ -642,7 +642,7 @@ U 1 1 4B3A135E
P 7900 2550
AR Path="/4B3A13A4/4B3A135E" Ref="#PWR032" Part="1"
AR Path="/4B3A1333/4B3A135E" Ref="#PWR048" Part="1"
-F 0 "#PWR048" H 7900 2670 20 0001 C CNN
+F 0 "#PWR032" H 7900 2670 20 0001 C CNN
F 1 "HT" H 7900 2640 40 0000 C CNN
F 2 "" H 7900 2550 60 0001 C CNN
F 3 "" H 7900 2550 60 0001 C CNN
@@ -655,7 +655,7 @@ U 1 1 4B3A135D
P 8600 3300
AR Path="/4B3A13A4/4B3A135D" Ref="#PWR033" Part="1"
AR Path="/4B3A1333/4B3A135D" Ref="#PWR049" Part="1"
-F 0 "#PWR049" H 8600 3420 20 0001 C CNN
+F 0 "#PWR033" H 8600 3420 20 0001 C CNN
F 1 "HT" H 8600 3390 40 0000 C CNN
F 2 "" H 8600 3300 60 0001 C CNN
F 3 "" H 8600 3300 60 0001 C CNN
@@ -681,7 +681,7 @@ U 1 1 4B3A135B
P 4750 1950
AR Path="/4B3A13A4/4B3A135B" Ref="#U034" Part="1"
AR Path="/4B3A1333/4B3A135B" Ref="#U050" Part="1"
-F 0 "#U050" H 4750 1900 20 0001 C CNN
+F 0 "#U034" H 4750 1900 20 0001 C CNN
F 1 "+12V" H 4750 2050 40 0000 C CNN
F 2 "" H 4750 1950 60 0001 C CNN
F 3 "" H 4750 1950 60 0001 C CNN
@@ -696,7 +696,7 @@ AR Path="/4B3A13A4/4B3A1359" Ref="R17" Part="1"
AR Path="/4B3A1333/4B3A1359" Ref="R7" Part="1"
F 0 "R17" V 3850 2000 50 0000 C CNN
F 1 "22K" V 3950 2000 50 0000 C CNN
-F 2 "discret:R3-LARGE_PADS" H 3950 2000 60 0001 C CNN
+F 2 "Discret:R3-LARGE_PADS" H 3950 2000 60 0001 C CNN
F 3 "" H 3950 2000 60 0001 C CNN
1 3950 2000
0 1 1 0
@@ -709,7 +709,7 @@ AR Path="/4B3A13A4/4B3A1358" Ref="C6" Part="1"
AR Path="/4B3A1333/4B3A1358" Ref="C3" Part="1"
F 0 "C6" V 4200 1600 50 0000 C CNN
F 1 "15nF" V 4500 1600 50 0000 C CNN
-F 2 "discret:C2" H 4350 1600 60 0001 C CNN
+F 2 "Discret:C2" H 4350 1600 60 0001 C CNN
F 3 "" H 4350 1600 60 0001 C CNN
1 4350 1600
0 1 1 0
@@ -724,7 +724,7 @@ 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 1 "4,7K" H 5850 6400 50 0000 C CNN
-F 2 "discret:RV2" H 5850 6400 60 0001 C CNN
+F 2 "Discret:RV2" H 5850 6400 60 0001 C CNN
F 3 "" H 5850 6400 60 0001 C CNN
1 5850 6400
1 0 0 -1
diff --git a/demos/complex_hierarchy/complex_hierarchy.sch b/demos/complex_hierarchy/complex_hierarchy.sch
index 6596f2cc83..acc9c58720 100644
--- a/demos/complex_hierarchy/complex_hierarchy.sch
+++ b/demos/complex_hierarchy/complex_hierarchy.sch
@@ -1,6 +1,6 @@
EESchema Schematic File Version 2
-LIBS:device
LIBS:power
+LIBS:complex_hierarchy_schlib
LIBS:complex_hierarchy-cache
EELAYER 25 0
EELAYER END
@@ -85,7 +85,7 @@ U 1 1 4B4B15E7
P 6650 2750
F 0 "C10" H 6800 2800 50 0000 L CNN
F 1 "10uF" H 6800 2750 50 0000 L TNN
-F 2 "discret:CP6" H 6650 2750 60 0001 C CNN
+F 2 "Discret:CP6" H 6650 2750 60 0001 C CNN
F 3 "" H 6650 2750 60 0001 C CNN
1 6650 2750
1 0 0 -1
@@ -107,7 +107,7 @@ U 1 1 4B4B15D9
P 9200 2500
F 0 "C11" H 9350 2550 50 0000 L CNN
F 1 "10uF" H 9350 2500 50 0000 L TNN
-F 2 "discret:CP6" H 9200 2500 60 0001 C CNN
+F 2 "Discret:CP6" H 9200 2500 60 0001 C CNN
F 3 "" H 9200 2500 60 0001 C CNN
1 9200 2500
1 0 0 -1
@@ -130,7 +130,7 @@ U 1 1 4B4B1532
P 7900 1350
F 0 "U2" H 7900 1650 60 0000 C CNN
F 1 "78L05" H 7900 1550 60 0000 C CNN
-F 2 "discret:LM78LXX" H 7900 1350 60 0001 C CNN
+F 2 "Discret:LM78LXX" H 7900 1350 60 0001 C CNN
F 3 "" H 7900 1350 60 0001 C CNN
1 7900 1350
1 0 0 -1
@@ -187,7 +187,7 @@ U 1 1 4B3A1558
P 2500 1500
F 0 "C9" H 2650 1550 50 0000 L CNN
F 1 "47uF/63V" H 2650 1500 50 0000 L TNN
-F 2 "discret:CP8" H 2500 1500 60 0001 C CNN
+F 2 "Discret:CP8" H 2500 1500 60 0001 C CNN
F 3 "" H 2500 1500 60 0001 C CNN
1 2500 1500
1 0 0 -1
@@ -232,7 +232,7 @@ U 1 1 4B3A12F4
P 1650 1400
F 0 "P1" V 1600 1400 40 0000 C CNN
F 1 "CONN_2" V 1700 1400 40 0000 C CNN
-F 2 "connect:bornier2" H 1650 1400 60 0001 C CNN
+F 2 "Connect:bornier2" H 1650 1400 60 0001 C CNN
F 3 "" H 1650 1400 60 0001 C CNN
1 1650 1400
-1 0 0 -1
@@ -254,7 +254,7 @@ U 1 1 4B03CEC2
P 9200 1600
F 0 "C1" H 9350 1650 50 0000 L CNN
F 1 "47uF" H 9350 1600 50 0000 L TNN
-F 2 "discret:CP6" H 9200 1600 60 0001 C CNN
+F 2 "Discret:CP6" H 9200 1600 60 0001 C CNN
F 3 "" H 9200 1600 60 0001 C CNN
1 9200 1600
1 0 0 -1
@@ -364,7 +364,7 @@ U 1 1 4AE173CF
P 3200 2750
F 0 "C2" H 3350 2800 50 0000 L CNN
F 1 "47uF/20V" H 3350 2700 50 0000 L TNN
-F 2 "discret:CP6" H 3200 2750 60 0001 C CNN
+F 2 "Discret:CP6" H 3200 2750 60 0001 C CNN
F 3 "" H 3200 2750 60 0001 C CNN
1 3200 2750
1 0 0 -1
@@ -375,7 +375,7 @@ U 1 1 4AE172F4
P 2700 2500
F 0 "D1" H 2700 2400 40 0000 C CNN
F 1 "1N4007" H 2700 2600 40 0000 C CNN
-F 2 "discret:D5" H 2700 2500 60 0001 C CNN
+F 2 "Discret:D5" H 2700 2500 60 0001 C CNN
F 3 "" H 2700 2500 60 0001 C CNN
1 2700 2500
-1 0 0 -1
@@ -397,7 +397,7 @@ U 1 1 4AD71B06
P 1650 2600
F 0 "P2" V 1600 2600 40 0000 C CNN
F 1 "CONN_2" V 1700 2600 40 0000 C CNN
-F 2 "connect:bornier2" H 1650 2600 60 0001 C CNN
+F 2 "Connect:bornier2" H 1650 2600 60 0001 C CNN
F 3 "" H 1650 2600 60 0001 C CNN
1 1650 2600
-1 0 0 -1
diff --git a/demos/ecc83/ecc83-pp.cmp b/demos/ecc83/ecc83-pp.cmp
deleted file mode 100644
index 304174be7f..0000000000
--- a/demos/ecc83/ecc83-pp.cmp
+++ /dev/null
@@ -1,108 +0,0 @@
-Cmp-Mod V01 Created by Cvpcb (2014-12-31 BZR 5344)-product date = 01/01/2015 18:02:29
-
-BeginCmp
-TimeStamp = /4549F4BE;
-Reference = C1;
-ValeurCmp = 10uF;
-IdModule = discret:C2V10;
-EndCmp
-
-BeginCmp
-TimeStamp = /4549F3BE;
-Reference = C2;
-ValeurCmp = 680nF;
-IdModule = discret:C2;
-EndCmp
-
-BeginCmp
-TimeStamp = /4549F464;
-Reference = P1;
-ValeurCmp = IN;
-IdModule = connect:bornier2;
-EndCmp
-
-BeginCmp
-TimeStamp = /4549F46C;
-Reference = P2;
-ValeurCmp = OUT;
-IdModule = connect:bornier2;
-EndCmp
-
-BeginCmp
-TimeStamp = /4549F4A5;
-Reference = P3;
-ValeurCmp = POWER;
-IdModule = connect:bornier2;
-EndCmp
-
-BeginCmp
-TimeStamp = /456A8ACC;
-Reference = P4;
-ValeurCmp = CONN_2;
-IdModule = connect:bornier2;
-EndCmp
-
-BeginCmp
-TimeStamp = /54A5890A;
-Reference = P5;
-ValeurCmp = CONN_1;
-IdModule = connect:1pin;
-EndCmp
-
-BeginCmp
-TimeStamp = /54A58C65;
-Reference = P6;
-ValeurCmp = CONN_1;
-IdModule = connect:1pin;
-EndCmp
-
-BeginCmp
-TimeStamp = /54A58C8A;
-Reference = P7;
-ValeurCmp = CONN_1;
-IdModule = connect:1pin;
-EndCmp
-
-BeginCmp
-TimeStamp = /54A58CA3;
-Reference = P8;
-ValeurCmp = CONN_1;
-IdModule = connect:1pin;
-EndCmp
-
-BeginCmp
-TimeStamp = /4549F38A;
-Reference = R1;
-ValeurCmp = 1.5K;
-IdModule = discret:R3;
-EndCmp
-
-BeginCmp
-TimeStamp = /4549F39D;
-Reference = R2;
-ValeurCmp = 1.5K;
-IdModule = discret:R3;
-EndCmp
-
-BeginCmp
-TimeStamp = /4549F3AD;
-Reference = R3;
-ValeurCmp = 100K;
-IdModule = discret:R3;
-EndCmp
-
-BeginCmp
-TimeStamp = /4549F3A2;
-Reference = R4;
-ValeurCmp = 47K;
-IdModule = discret:R3;
-EndCmp
-
-BeginCmp
-TimeStamp = /48B4F266;
-Reference = U1;
-ValeurCmp = ECC83;
-IdModule = Valves:VALVE-ECC-83-1;
-EndCmp
-
-EndListe
diff --git a/demos/ecc83/ecc83-pp_v2.cmp b/demos/ecc83/ecc83-pp_v2.cmp
deleted file mode 100644
index 4306bec632..0000000000
--- a/demos/ecc83/ecc83-pp_v2.cmp
+++ /dev/null
@@ -1,108 +0,0 @@
-Cmp-Mod V01 Created by Cvpcb (2014-12-31 BZR 5344)-product date = 01/01/2015 20:57:19
-
-BeginCmp
-TimeStamp = /4549F4BE;
-Reference = C1;
-ValeurCmp = 10uF;
-IdModule = discret:C2V10;
-EndCmp
-
-BeginCmp
-TimeStamp = /4549F3BE;
-Reference = C2;
-ValeurCmp = 680nF;
-IdModule = discret:CP8;
-EndCmp
-
-BeginCmp
-TimeStamp = /4549F464;
-Reference = P1;
-ValeurCmp = IN;
-IdModule = pin_array:pin_array_1x02;
-EndCmp
-
-BeginCmp
-TimeStamp = /4549F46C;
-Reference = P2;
-ValeurCmp = OUT;
-IdModule = pin_array:pin_array_1x02;
-EndCmp
-
-BeginCmp
-TimeStamp = /4549F4A5;
-Reference = P3;
-ValeurCmp = POWER;
-IdModule = pin_array:pin_array_1x02;
-EndCmp
-
-BeginCmp
-TimeStamp = /456A8ACC;
-Reference = P4;
-ValeurCmp = CONN_2;
-IdModule = pin_array:pin_array_1x02;
-EndCmp
-
-BeginCmp
-TimeStamp = /54A5830A;
-Reference = P5;
-ValeurCmp = CONN_1;
-IdModule = connect:1pin;
-EndCmp
-
-BeginCmp
-TimeStamp = /54A58363;
-Reference = P6;
-ValeurCmp = CONN_1;
-IdModule = connect:1pin;
-EndCmp
-
-BeginCmp
-TimeStamp = /54A5837A;
-Reference = P7;
-ValeurCmp = CONN_1;
-IdModule = connect:1pin;
-EndCmp
-
-BeginCmp
-TimeStamp = /54A58391;
-Reference = P8;
-ValeurCmp = CONN_1;
-IdModule = connect:1pin;
-EndCmp
-
-BeginCmp
-TimeStamp = /4549F38A;
-Reference = R1;
-ValeurCmp = 1.5K;
-IdModule = discret:R3;
-EndCmp
-
-BeginCmp
-TimeStamp = /4549F39D;
-Reference = R2;
-ValeurCmp = 1.5K;
-IdModule = discret:R3;
-EndCmp
-
-BeginCmp
-TimeStamp = /4549F3AD;
-Reference = R3;
-ValeurCmp = 100K;
-IdModule = discret:R3;
-EndCmp
-
-BeginCmp
-TimeStamp = /4549F3A2;
-Reference = R4;
-ValeurCmp = 47K;
-IdModule = discret:R3;
-EndCmp
-
-BeginCmp
-TimeStamp = /48B4F266;
-Reference = U1;
-ValeurCmp = ECC83;
-IdModule = Valves:VALVE-ECC-83-2;
-EndCmp
-
-EndListe
diff --git a/demos/flat_hierarchy/flat_hierarchy.cmp b/demos/flat_hierarchy/flat_hierarchy.cmp
deleted file mode 100644
index 0bc01b74b3..0000000000
--- a/demos/flat_hierarchy/flat_hierarchy.cmp
+++ /dev/null
@@ -1,409 +0,0 @@
-Cmp-Mod V01 Created by Cvpcb (2014-07-04 BZR 4974)-product date = 05/07/2014 20:15:53
-
-BeginCmp
-TimeStamp = /48553E53/442A5056;
-Reference = C1;
-ValeurCmp = 100uF;
-IdModule = discret:CP10;
-EndCmp
-
-BeginCmp
-TimeStamp = /48553E53/442A501D;
-Reference = C2;
-ValeurCmp = 220uF;
-IdModule = discret:CP10;
-EndCmp
-
-BeginCmp
-TimeStamp = /48553E53/442A584C;
-Reference = C3;
-ValeurCmp = 22uF/25V;
-IdModule = discret:CP8;
-EndCmp
-
-BeginCmp
-TimeStamp = /48553E53/442A5F61;
-Reference = C4;
-ValeurCmp = 0;
-IdModule = discret:C1-1;
-EndCmp
-
-BeginCmp
-TimeStamp = /48553E53/442A58B1;
-Reference = C5;
-ValeurCmp = 10nF;
-IdModule = discret:C1-1;
-EndCmp
-
-BeginCmp
-TimeStamp = /48553E7C/442AA12B;
-Reference = C6;
-ValeurCmp = 100nF;
-IdModule = discret:C1-1;
-EndCmp
-
-BeginCmp
-TimeStamp = /48553E7C/442AA145;
-Reference = C7;
-ValeurCmp = 100nF;
-IdModule = discret:C1-1;
-EndCmp
-
-BeginCmp
-TimeStamp = /48553E7C/4639BE2C;
-Reference = C8;
-ValeurCmp = 100nF;
-IdModule = discret:C1-1;
-EndCmp
-
-BeginCmp
-TimeStamp = /48553E53/464AD280;
-Reference = C9;
-ValeurCmp = 22OnF;
-IdModule = discret:C1-1;
-EndCmp
-
-BeginCmp
-TimeStamp = /48553E53/442A500B;
-Reference = D1;
-ValeurCmp = 1N4004;
-IdModule = discret:D5;
-EndCmp
-
-BeginCmp
-TimeStamp = /48553E53/442A4D1B;
-Reference = D2;
-ValeurCmp = BAT43;
-IdModule = discret:D3;
-EndCmp
-
-BeginCmp
-TimeStamp = /48553E53/442A4D25;
-Reference = D3;
-ValeurCmp = BAT43;
-IdModule = discret:D3;
-EndCmp
-
-BeginCmp
-TimeStamp = /48553E53/442A4D5C;
-Reference = D4;
-ValeurCmp = BAT43;
-IdModule = discret:D3;
-EndCmp
-
-BeginCmp
-TimeStamp = /48553E53/442A4D5D;
-Reference = D5;
-ValeurCmp = BAT43;
-IdModule = discret:D3;
-EndCmp
-
-BeginCmp
-TimeStamp = /48553E53/442A4D64;
-Reference = D6;
-ValeurCmp = BAT43;
-IdModule = discret:D3;
-EndCmp
-
-BeginCmp
-TimeStamp = /48553E53/442A4D65;
-Reference = D7;
-ValeurCmp = BAT43;
-IdModule = discret:D3;
-EndCmp
-
-BeginCmp
-TimeStamp = /48553E53/442A4F5D;
-Reference = D8;
-ValeurCmp = RED-LED;
-IdModule = discret:LEDV;
-EndCmp
-
-BeginCmp
-TimeStamp = /48553E53/442A5084;
-Reference = D9;
-ValeurCmp = GREEN-LED;
-IdModule = discret:LEDV;
-EndCmp
-
-BeginCmp
-TimeStamp = /48553E53/442A6026;
-Reference = D10;
-ValeurCmp = SCHOTTKY;
-IdModule = discret:D5;
-EndCmp
-
-BeginCmp
-TimeStamp = /48553E53/4639BA28;
-Reference = D11;
-ValeurCmp = BAT43;
-IdModule = discret:D3;
-EndCmp
-
-BeginCmp
-TimeStamp = /48553E53/4639B9EA;
-Reference = D12;
-ValeurCmp = YELLOW-LED;
-IdModule = discret:LEDV;
-EndCmp
-
-BeginCmp
-TimeStamp = /48553E53/442A4C93;
-Reference = J1;
-ValeurCmp = DB9-FEMAL;
-IdModule = connect:DB9FC;
-EndCmp
-
-BeginCmp
-TimeStamp = /48553E53/4639BAF8;
-Reference = JP1;
-ValeurCmp = JUMPER;
-IdModule = pin_array:PIN_ARRAY_2X1;
-EndCmp
-
-BeginCmp
-TimeStamp = /48553E53/442A57BE;
-Reference = L1;
-ValeurCmp = 22uH;
-IdModule = inductors:INDUCTOR_V;
-EndCmp
-
-BeginCmp
-TimeStamp = /48553E53/442A4FE7;
-Reference = P1;
-ValeurCmp = CONN_2;
-IdModule = connect:bornier2;
-EndCmp
-
-BeginCmp
-TimeStamp = /48553E7C/4436967E;
-Reference = P2;
-ValeurCmp = SUPP28;
-IdModule = 28DIP-ELL300;
-EndCmp
-
-BeginCmp
-TimeStamp = /48553E7C/442A88ED;
-Reference = P3;
-ValeurCmp = SUPP40;
-IdModule = 40DIP-ELL600;
-EndCmp
-
-BeginCmp
-TimeStamp = /48553E53/442A4EB9;
-Reference = Q1;
-ValeurCmp = BC237;
-IdModule = discret:TO92;
-EndCmp
-
-BeginCmp
-TimeStamp = /48553E53/442A4F30;
-Reference = Q2;
-ValeurCmp = BC307;
-IdModule = discret:TO92;
-EndCmp
-
-BeginCmp
-TimeStamp = /48553E53/4639B996;
-Reference = Q3;
-ValeurCmp = BC307;
-IdModule = discret:TO92;
-EndCmp
-
-BeginCmp
-TimeStamp = /48553E53/442A4CF4;
-Reference = R1;
-ValeurCmp = 10K;
-IdModule = discret:R4;
-EndCmp
-
-BeginCmp
-TimeStamp = /48553E53/442A4CFB;
-Reference = R2;
-ValeurCmp = 10K;
-IdModule = discret:R4;
-EndCmp
-
-BeginCmp
-TimeStamp = /48553E53/442A4D5A;
-Reference = R3;
-ValeurCmp = 10K;
-IdModule = discret:R4;
-EndCmp
-
-BeginCmp
-TimeStamp = /48553E53/442A4D5B;
-Reference = R4;
-ValeurCmp = 10K;
-IdModule = discret:R4;
-EndCmp
-
-BeginCmp
-TimeStamp = /48553E53/442A4D62;
-Reference = R5;
-ValeurCmp = 10K;
-IdModule = discret:R4;
-EndCmp
-
-BeginCmp
-TimeStamp = /48553E53/442A4D63;
-Reference = R6;
-ValeurCmp = 10K;
-IdModule = discret:R4;
-EndCmp
-
-BeginCmp
-TimeStamp = /48553E53/442A4F2A;
-Reference = R7;
-ValeurCmp = 10K;
-IdModule = discret:R4;
-EndCmp
-
-BeginCmp
-TimeStamp = /48553E53/442A4D92;
-Reference = R8;
-ValeurCmp = 1K;
-IdModule = discret:R4;
-EndCmp
-
-BeginCmp
-TimeStamp = /48553E53/442A4F52;
-Reference = R9;
-ValeurCmp = 2.2K;
-IdModule = discret:R4;
-EndCmp
-
-BeginCmp
-TimeStamp = /48553E53/442A5F83;
-Reference = R10;
-ValeurCmp = 5,1K;
-IdModule = discret:R4;
-EndCmp
-
-BeginCmp
-TimeStamp = /48553E53/442A4F23;
-Reference = R11;
-ValeurCmp = 22K;
-IdModule = discret:R4;
-EndCmp
-
-BeginCmp
-TimeStamp = /48553E53/442A4D85;
-Reference = R12;
-ValeurCmp = 470;
-IdModule = discret:R4;
-EndCmp
-
-BeginCmp
-TimeStamp = /48553E53/442A4D8D;
-Reference = R13;
-ValeurCmp = 470;
-IdModule = discret:R4;
-EndCmp
-
-BeginCmp
-TimeStamp = /48553E53/442A5083;
-Reference = R14;
-ValeurCmp = 470;
-IdModule = discret:R4;
-EndCmp
-
-BeginCmp
-TimeStamp = /48553E53/442A58D7;
-Reference = R15;
-ValeurCmp = 6.2K;
-IdModule = discret:R4;
-EndCmp
-
-BeginCmp
-TimeStamp = /48553E53/442A58DC;
-Reference = R16;
-ValeurCmp = 62K;
-IdModule = discret:R4;
-EndCmp
-
-BeginCmp
-TimeStamp = /48553E53/442A50BF;
-Reference = R17;
-ValeurCmp = 22K;
-IdModule = discret:R4;
-EndCmp
-
-BeginCmp
-TimeStamp = /48553E53/44369638;
-Reference = R18;
-ValeurCmp = 220;
-IdModule = discret:R4;
-EndCmp
-
-BeginCmp
-TimeStamp = /48553E53/4639B9B0;
-Reference = R19;
-ValeurCmp = 2.2K;
-IdModule = discret:R4;
-EndCmp
-
-BeginCmp
-TimeStamp = /48553E53/4639B9B3;
-Reference = R20;
-ValeurCmp = 2.2K;
-IdModule = discret:R4;
-EndCmp
-
-BeginCmp
-TimeStamp = /48553E53/4639B9E9;
-Reference = R21;
-ValeurCmp = 470;
-IdModule = discret:R4;
-EndCmp
-
-BeginCmp
-TimeStamp = /48553E53/443D0101;
-Reference = RV1;
-ValeurCmp = 1K;
-IdModule = discret:RV2X4;
-EndCmp
-
-BeginCmp
-TimeStamp = /48553E7C/442A87F7;
-Reference = U1;
-ValeurCmp = 24Cxx;
-IdModule = dip_sockets:DIP-8__300_ELL;
-EndCmp
-
-BeginCmp
-TimeStamp = /48553E53/442A4D6B;
-Reference = U2;
-ValeurCmp = 74HC125;
-IdModule = dip_sockets:DIP-14__300_ELL;
-EndCmp
-
-BeginCmp
-TimeStamp = /48553E53/442A504A;
-Reference = U3;
-ValeurCmp = 7805;
-IdModule = discret:LM78XX;
-EndCmp
-
-BeginCmp
-TimeStamp = /48553E53/442A5E20;
-Reference = U4;
-ValeurCmp = LT1373;
-IdModule = dip_sockets:DIP-8__300_ELL;
-EndCmp
-
-BeginCmp
-TimeStamp = /48553E7C/442A81A7;
-Reference = U5;
-ValeurCmp = PIC_18_PINS;
-IdModule = dip_sockets:DIP-18__300_ELL;
-EndCmp
-
-BeginCmp
-TimeStamp = /48553E7C/442A81A5;
-Reference = U6;
-ValeurCmp = PIC_8_PINS;
-IdModule = dip_sockets:DIP-8__300_ELL;
-EndCmp
-
-EndListe
diff --git a/demos/flat_hierarchy/pic_programmer.sch b/demos/flat_hierarchy/pic_programmer.sch
index 8f9cdb32c7..5b79138d9b 100644
--- a/demos/flat_hierarchy/pic_programmer.sch
+++ b/demos/flat_hierarchy/pic_programmer.sch
@@ -179,7 +179,7 @@ U 1 1 464AD280
P 6200 1150
F 0 "C9" H 6250 1250 50 0000 L CNN
F 1 "22OnF" H 6250 1050 50 0000 L CNN
-F 2 "" H 6200 1150 60 0001 C CNN
+F 2 "Discret:C1-1" H 6200 1150 60 0001 C CNN
F 3 "" H 6200 1150 60 0001 C CNN
1 6200 1150
1 0 0 -1
@@ -201,7 +201,7 @@ U 1 1 4639BAF8
P 8300 3400
F 0 "JP1" V 8100 3500 60 0000 C CNN
F 1 "JUMPER" H 8300 3320 40 0000 C CNN
-F 2 "" H 8300 3400 60 0001 C CNN
+F 2 "pin_array:PIN_ARRAY_2X1" H 8300 3400 60 0001 C CNN
F 3 "" H 8300 3400 60 0001 C CNN
1 8300 3400
0 1 1 0
@@ -212,7 +212,7 @@ U 1 1 4639BA28
P 7400 4300
F 0 "D11" V 7350 4500 50 0000 C CNN
F 1 "BAT43" V 7450 4500 50 0000 C CNN
-F 2 "" H 7400 4300 60 0001 C CNN
+F 2 "Discret:D3" H 7400 4300 60 0001 C CNN
F 3 "" H 7400 4300 60 0001 C CNN
1 7400 4300
0 1 1 0
@@ -245,7 +245,7 @@ U 1 1 4639B9EA
P 7900 4700
F 0 "D12" V 7800 4550 50 0000 C CNN
F 1 "YELLOW-LED" H 7900 4800 50 0000 C CNN
-F 2 "" H 7900 4700 60 0001 C CNN
+F 2 "Discret:LEDV" H 7900 4700 60 0001 C CNN
F 3 "" H 7900 4700 60 0001 C CNN
F 4 "YELLOW-LED" H 7900 4900 40 0000 C CNN "Champ4"
1 7900 4700
@@ -257,7 +257,7 @@ U 1 1 4639B9E9
P 7900 4150
F 0 "R21" H 7800 4350 50 0000 C CNN
F 1 "470" V 7900 4150 50 0000 C CNN
-F 2 "" H 7900 4150 60 0001 C CNN
+F 2 "Discret:R4" H 7900 4150 60 0001 C CNN
F 3 "" H 7900 4150 60 0001 C CNN
1 7900 4150
1 0 0 -1
@@ -268,7 +268,7 @@ U 1 1 4639B9B3
P 7400 3050
F 0 "R20" H 7300 3250 50 0000 C CNN
F 1 "2.2K" V 7400 3050 50 0000 C CNN
-F 2 "" H 7400 3050 60 0001 C CNN
+F 2 "Discret:R4" H 7400 3050 60 0001 C CNN
F 3 "" H 7400 3050 60 0001 C CNN
1 7400 3050
1 0 0 -1
@@ -279,7 +279,7 @@ U 1 1 4639B9B0
P 7400 3800
F 0 "R19" H 7500 3600 50 0000 C CNN
F 1 "2.2K" V 7400 3800 50 0000 C CNN
-F 2 "" H 7400 3800 60 0001 C CNN
+F 2 "Discret:R4" H 7400 3800 60 0001 C CNN
F 3 "" H 7400 3800 60 0001 C CNN
1 7400 3800
-1 0 0 1
@@ -290,7 +290,7 @@ U 1 1 4639B996
P 7800 3400
F 0 "Q3" H 7700 3150 50 0000 C CNN
F 1 "BC307" H 7700 3250 50 0000 C CNN
-F 2 "" H 7800 3400 60 0001 C CNN
+F 2 "Discret:TO92" H 7800 3400 60 0001 C CNN
F 3 "" H 7800 3400 60 0001 C CNN
1 7800 3400
1 0 0 1
@@ -314,7 +314,7 @@ U 1 1 443D0101
P 3600 6750
F 0 "RV1" V 3750 6900 50 0000 C CNN
F 1 "1K" H 3600 6750 50 0000 C CNN
-F 2 "" H 3600 6750 60 0001 C CNN
+F 2 "Discret:RV2X4" H 3600 6750 60 0001 C CNN
F 3 "" H 3600 6750 60 0001 C CNN
1 3600 6750
0 -1 -1 0
@@ -325,7 +325,7 @@ U 1 1 44369638
P 8650 1500
F 0 "R18" V 8730 1500 50 0000 C CNN
F 1 "220" V 8650 1500 50 0000 C CNN
-F 2 "" H 8650 1500 60 0001 C CNN
+F 2 "Discret:R4" H 8650 1500 60 0001 C CNN
F 3 "" H 8650 1500 60 0001 C CNN
1 8650 1500
0 -1 -1 0
@@ -369,7 +369,7 @@ U 1 1 442A6026
P 3300 5850
F 0 "D10" H 3300 5950 40 0000 C CNN
F 1 "SCHOTTKY" H 3300 5750 40 0000 C CNN
-F 2 "" H 3300 5850 60 0001 C CNN
+F 2 "Discret:D5" H 3300 5850 60 0001 C CNN
F 3 "" H 3300 5850 60 0001 C CNN
1 3300 5850
1 0 0 -1
@@ -380,7 +380,7 @@ U 1 1 442A5F83
P 2150 7200
F 0 "R10" V 2230 7200 50 0000 C CNN
F 1 "5.1K" V 2150 7200 50 0000 C CNN
-F 2 "" H 2150 7200 60 0001 C CNN
+F 2 "Discret:R4" H 2150 7200 60 0001 C CNN
F 3 "" H 2150 7200 60 0001 C CNN
1 2150 7200
0 1 -1 0
@@ -391,7 +391,7 @@ U 1 1 442A5F61
P 1900 7450
F 0 "C4" V 2050 7450 50 0000 C CNN
F 1 "0" V 1750 7450 50 0000 C CNN
-F 2 "" H 1900 7450 60 0001 C CNN
+F 2 "Discret:C1-1" H 1900 7450 60 0001 C CNN
F 3 "" H 1900 7450 60 0001 C CNN
1 1900 7450
0 1 -1 0
@@ -402,7 +402,7 @@ U 1 1 442A5E20
P 1900 6100
F 0 "U4" H 2500 6600 60 0000 C CNN
F 1 "LT1373" H 1400 6600 60 0000 C CNN
-F 2 "" H 1900 6100 60 0001 C CNN
+F 2 "Sockets_DIP:DIP-8__300_ELL" H 1900 6100 60 0001 C CNN
F 3 "" H 1900 6100 60 0001 C CNN
1 1900 6100
1 0 0 -1
@@ -415,7 +415,7 @@ U 1 1 442A58DC
P 3600 6200
F 0 "R16" H 3750 6050 50 0000 C CNN
F 1 "62K" V 3600 6200 50 0000 C CNN
-F 2 "" H 3600 6200 60 0001 C CNN
+F 2 "Discret:R4" H 3600 6200 60 0001 C CNN
F 3 "" H 3600 6200 60 0001 C CNN
1 3600 6200
-1 0 0 1
@@ -426,7 +426,7 @@ U 1 1 442A58D7
P 3600 7300
F 0 "R15" H 3450 7450 50 0000 C CNN
F 1 "6.2K" V 3600 7300 50 0000 C CNN
-F 2 "" H 3600 7300 60 0001 C CNN
+F 2 "Discret:R4" H 3600 7300 60 0001 C CNN
F 3 "" H 3600 7300 60 0001 C CNN
1 3600 7300
1 0 0 -1
@@ -438,7 +438,7 @@ U 1 1 442A58B1
P 1650 7200
F 0 "C5" V 1800 7200 50 0000 C CNN
F 1 "10nF" V 1500 7200 50 0000 C CNN
-F 2 "" H 1650 7200 60 0001 C CNN
+F 2 "Discret:C1-1" H 1650 7200 60 0001 C CNN
F 3 "" H 1650 7200 60 0001 C CNN
1 1650 7200
0 1 -1 0
@@ -460,7 +460,7 @@ U 1 1 442A584C
P 3950 6200
F 0 "C3" H 4100 6250 50 0000 L CNN
F 1 "22uF/25V" H 4100 6150 50 0000 L CNN
-F 2 "" H 3950 6200 60 0001 C CNN
+F 2 "Discret:CP8" H 3950 6200 60 0001 C CNN
F 3 "" H 3950 6200 60 0001 C CNN
1 3950 6200
1 0 0 -1
@@ -493,7 +493,7 @@ U 1 1 442A57BE
P 2550 5350
F 0 "L1" V 2500 5350 40 0000 C CNN
F 1 "22uH" V 2650 5350 40 0000 C CNN
-F 2 "" H 2550 5350 60 0001 C CNN
+F 2 "inductors:INDUCTOR_V" H 2550 5350 60 0001 C CNN
F 3 "" H 2550 5350 60 0001 C CNN
1 2550 5350
0 1 -1 0
@@ -519,7 +519,7 @@ U 1 1 442A50BF
P 8300 1950
F 0 "R17" H 8200 2150 50 0000 C CNN
F 1 "22K" V 8300 1950 50 0000 C CNN
-F 2 "" H 8300 1950 60 0001 C CNN
+F 2 "Discret:R4" H 8300 1950 60 0001 C CNN
F 3 "" H 8300 1950 60 0001 C CNN
1 8300 1950
1 0 0 -1
@@ -552,7 +552,7 @@ U 1 1 442A5084
P 10200 6150
F 0 "D9" V 10100 6000 50 0000 C CNN
F 1 "GREEN-LED" H 10200 6250 50 0000 C CNN
-F 2 "" H 10200 6150 60 0001 C CNN
+F 2 "Discret:LEDV" H 10200 6150 60 0001 C CNN
F 3 "" H 10200 6150 60 0001 C CNN
F 4 "GREEN LED" H 10200 6350 40 0000 C CNN "Champ4"
1 10200 6150
@@ -564,7 +564,7 @@ U 1 1 442A5083
P 10200 5600
F 0 "R14" H 10100 5800 50 0000 C CNN
F 1 "470" V 10200 5600 50 0000 C CNN
-F 2 "" H 10200 5600 60 0001 C CNN
+F 2 "Discret:R4" H 10200 5600 60 0001 C CNN
F 3 "" H 10200 5600 60 0001 C CNN
1 10200 5600
1 0 0 -1
@@ -586,7 +586,7 @@ U 1 1 442A5056
P 9650 5550
F 0 "C1" H 9800 5600 50 0000 L CNN
F 1 "100uF" H 9800 5500 50 0000 L CNN
-F 2 "" H 9650 5550 60 0001 C CNN
+F 2 "Discret:CP10" H 9650 5550 60 0001 C CNN
F 3 "" H 9650 5550 60 0001 C CNN
1 9650 5550
1 0 0 -1
@@ -608,7 +608,7 @@ U 1 1 442A504A
P 9150 5350
F 0 "U3" H 9150 5650 60 0000 C CNN
F 1 "7805" H 9150 5550 60 0000 C CNN
-F 2 "" H 9150 5350 60 0001 C CNN
+F 2 "Discret:LM78XX" H 9150 5350 60 0001 C CNN
F 3 "" H 9150 5350 60 0001 C CNN
1 9150 5350
1 0 0 -1
@@ -630,7 +630,7 @@ U 1 1 442A501D
P 8400 5550
F 0 "C2" H 8550 5600 50 0000 L CNN
F 1 "220uF" H 8550 5500 50 0000 L CNN
-F 2 "" H 8400 5550 60 0001 C CNN
+F 2 "Discret:CP10" H 8400 5550 60 0001 C CNN
F 3 "" H 8400 5550 60 0001 C CNN
1 8400 5550
1 0 0 -1
@@ -652,7 +652,7 @@ U 1 1 442A500B
P 8100 5300
F 0 "D1" H 8100 5400 50 0000 C CNN
F 1 "1N4004" H 8100 5200 50 0000 C CNN
-F 2 "" H 8100 5300 60 0001 C CNN
+F 2 "Discret:D5" H 8100 5300 60 0001 C CNN
F 3 "" H 8100 5300 60 0001 C CNN
1 8100 5300
1 0 0 -1
@@ -663,7 +663,7 @@ U 1 1 442A4FE7
P 7450 5400
F 0 "P1" V 7400 5400 40 0000 C CNN
F 1 "CONN_2" V 7500 5400 40 0000 C CNN
-F 2 "" H 7450 5400 60 0001 C CNN
+F 2 "Connect:bornier2" H 7450 5400 60 0001 C CNN
F 3 "" H 7450 5400 60 0001 C CNN
1 7450 5400
-1 0 0 1
@@ -674,7 +674,7 @@ U 1 1 442A4F5D
P 7900 2350
F 0 "D8" V 7800 2200 50 0000 C CNN
F 1 "RED-LED" H 7900 2450 50 0000 C CNN
-F 2 "" H 7900 2350 60 0001 C CNN
+F 2 "Discret:LEDV" H 7900 2350 60 0001 C CNN
F 3 "" H 7900 2350 60 0001 C CNN
F 4 "Low Current Led" V 8250 2350 40 0000 C CNN "Champ4"
F 5 "RED LED" H 7900 2550 40 0000 C CNN "Champ5"
@@ -687,7 +687,7 @@ U 1 1 442A4F52
P 7900 1850
F 0 "R9" H 7800 2050 50 0000 C CNN
F 1 "2.2K" V 7900 1850 50 0000 C CNN
-F 2 "" H 7900 1850 60 0001 C CNN
+F 2 "Discret:R4" H 7900 1850 60 0001 C CNN
F 3 "" H 7900 1850 60 0001 C CNN
1 7900 1850
1 0 0 -1
@@ -720,7 +720,7 @@ U 1 1 442A4F30
P 7800 1200
F 0 "Q2" H 7700 900 50 0000 C CNN
F 1 "BC307" H 7700 1000 50 0000 C CNN
-F 2 "" H 7800 1200 60 0001 C CNN
+F 2 "Discret:TO92" H 7800 1200 60 0001 C CNN
F 3 "" H 7800 1200 60 0001 C CNN
1 7800 1200
1 0 0 1
@@ -731,7 +731,7 @@ U 1 1 442A4F2A
P 6700 1050
F 0 "R7" H 6600 1200 50 0000 C CNN
F 1 "10K" V 6700 1050 50 0000 C CNN
-F 2 "" H 6700 1050 60 0001 C CNN
+F 2 "Discret:R4" H 6700 1050 60 0001 C CNN
F 3 "" H 6700 1050 60 0001 C CNN
1 6700 1050
1 0 0 -1
@@ -742,7 +742,7 @@ U 1 1 442A4F23
P 6700 1950
F 0 "R11" H 6800 1750 50 0000 C CNN
F 1 "22K" V 6700 1950 50 0000 C CNN
-F 2 "" H 6700 1950 60 0001 C CNN
+F 2 "Discret:R4" H 6700 1950 60 0001 C CNN
F 3 "" H 6700 1950 60 0001 C CNN
1 6700 1950
-1 0 0 1
@@ -766,7 +766,7 @@ U 1 1 442A4EB9
P 6600 2600
F 0 "Q1" H 6500 2850 50 0000 C CNN
F 1 "BC237" H 6502 2750 50 0000 C CNN
-F 2 "" H 6600 2600 60 0001 C CNN
+F 2 "Discret:TO92" H 6600 2600 60 0001 C CNN
F 3 "" H 6600 2600 60 0001 C CNN
1 6600 2600
1 0 0 -1
@@ -827,7 +827,7 @@ U 1 1 442A4D92
P 5100 1200
F 0 "R8" V 5180 1200 50 0000 C CNN
F 1 "1K" V 5100 1200 50 0000 C CNN
-F 2 "" H 5100 1200 60 0001 C CNN
+F 2 "Discret:R4" H 5100 1200 60 0001 C CNN
F 3 "" H 5100 1200 60 0001 C CNN
1 5100 1200
0 -1 -1 0
@@ -838,7 +838,7 @@ U 1 1 442A4D8D
P 5350 4500
F 0 "R13" V 5450 4500 50 0000 C CNN
F 1 "470" V 5350 4500 50 0000 C CNN
-F 2 "" H 5350 4500 60 0001 C CNN
+F 2 "Discret:R4" H 5350 4500 60 0001 C CNN
F 3 "" H 5350 4500 60 0001 C CNN
1 5350 4500
0 -1 -1 0
@@ -849,7 +849,7 @@ U 1 1 442A4D85
P 5150 3150
F 0 "R12" V 5230 3150 50 0000 C CNN
F 1 "470" V 5150 3150 50 0000 C CNN
-F 2 "" H 5150 3150 60 0001 C CNN
+F 2 "Discret:R4" H 5150 3150 60 0001 C CNN
F 3 "" H 5150 3150 60 0001 C CNN
1 5150 3150
0 -1 -1 0
@@ -871,7 +871,7 @@ U 4 1 442A4D6B
P 4150 2200
F 0 "U2" H 4150 2500 50 0000 C BNN
F 1 "74HC125" H 4150 2450 50 0000 C TNN
-F 2 "" H 4150 2200 60 0001 C CNN
+F 2 "Sockets_DIP:DIP-10__300_ELL" H 4150 2200 60 0001 C CNN
F 3 "" H 4150 2200 60 0001 C CNN
4 4150 2200
-1 0 0 -1
@@ -915,7 +915,7 @@ U 1 1 442A4D65
P 3900 4800
F 0 "D7" V 3950 4600 50 0000 C CNN
F 1 "BAT43" V 3850 4600 50 0000 C CNN
-F 2 "" H 3900 4800 60 0001 C CNN
+F 2 "Discret:D3" H 3900 4800 60 0001 C CNN
F 3 "" H 3900 4800 60 0001 C CNN
1 3900 4800
0 -1 -1 0
@@ -926,7 +926,7 @@ U 1 1 442A4D64
P 3900 4100
F 0 "D6" V 3950 3900 50 0000 C CNN
F 1 "BAT43" V 3850 3900 50 0000 C CNN
-F 2 "" H 3900 4100 60 0001 C CNN
+F 2 "Discret:D3" H 3900 4100 60 0001 C CNN
F 3 "" H 3900 4100 60 0001 C CNN
1 3900 4100
0 -1 -1 0
@@ -937,7 +937,7 @@ U 1 1 442A4D63
P 3200 4750
F 0 "R6" H 3100 4950 50 0000 C CNN
F 1 "10K" V 3200 4750 50 0000 C CNN
-F 2 "" H 3200 4750 60 0001 C CNN
+F 2 "Discret:R4" H 3200 4750 60 0001 C CNN
F 3 "" H 3200 4750 60 0001 C CNN
1 3200 4750
1 0 0 -1
@@ -948,7 +948,7 @@ U 1 1 442A4D62
P 3550 4400
F 0 "R5" V 3630 4400 50 0000 C CNN
F 1 "10K" V 3550 4400 50 0000 C CNN
-F 2 "" H 3550 4400 60 0001 C CNN
+F 2 "Discret:R4" H 3550 4400 60 0001 C CNN
F 3 "" H 3550 4400 60 0001 C CNN
1 3550 4400
0 -1 -1 0
@@ -959,7 +959,7 @@ U 3 1 442A4D61
P 4550 4500
F 0 "U2" H 4550 4750 50 0000 C BNN
F 1 "74HC125" H 4550 4700 50 0000 C TNN
-F 2 "" H 4550 4500 60 0001 C CNN
+F 2 "Sockets_DIP:DIP-10__300_ELL" H 4550 4500 60 0001 C CNN
F 3 "" H 4550 4500 60 0001 C CNN
3 4550 4500
1 0 0 -1
@@ -1003,7 +1003,7 @@ U 1 1 442A4D5D
P 3700 3550
F 0 "D5" V 3750 3350 50 0000 C CNN
F 1 "BAT43" V 3650 3350 50 0000 C CNN
-F 2 "" H 3700 3550 60 0001 C CNN
+F 2 "Discret:D3" H 3700 3550 60 0001 C CNN
F 3 "" H 3700 3550 60 0001 C CNN
1 3700 3550
0 -1 -1 0
@@ -1014,7 +1014,7 @@ U 1 1 442A4D5C
P 3700 2850
F 0 "D4" V 3750 2650 50 0000 C CNN
F 1 "BAT43" V 3650 2650 50 0000 C CNN
-F 2 "" H 3700 2850 60 0001 C CNN
+F 2 "Discret:D3" H 3700 2850 60 0001 C CNN
F 3 "" H 3700 2850 60 0001 C CNN
1 3700 2850
0 -1 -1 0
@@ -1025,7 +1025,7 @@ U 1 1 442A4D5B
P 3000 3600
F 0 "R4" V 3080 3600 50 0000 C CNN
F 1 "10K" V 3000 3600 50 0000 C CNN
-F 2 "" H 3000 3600 60 0001 C CNN
+F 2 "Discret:R4" H 3000 3600 60 0001 C CNN
F 3 "" H 3000 3600 60 0001 C CNN
1 3000 3600
1 0 0 -1
@@ -1036,7 +1036,7 @@ U 1 1 442A4D5A
P 3350 3250
F 0 "R3" V 3430 3250 50 0000 C CNN
F 1 "10K" V 3350 3250 50 0000 C CNN
-F 2 "" H 3350 3250 60 0001 C CNN
+F 2 "Discret:R4" H 3350 3250 60 0001 C CNN
F 3 "" H 3350 3250 60 0001 C CNN
1 3350 3250
0 -1 -1 0
@@ -1047,7 +1047,7 @@ U 2 1 442A4D59
P 4350 3150
F 0 "U2" H 4350 3400 50 0000 C BNN
F 1 "74HC125" H 4350 3350 50 0000 C TNN
-F 2 "" H 4350 3150 60 0001 C CNN
+F 2 "Sockets_DIP:DIP-10__300_ELL" H 4350 3150 60 0001 C CNN
F 3 "" H 4350 3150 60 0001 C CNN
2 4350 3150
1 0 0 -1
@@ -1091,7 +1091,7 @@ U 1 1 442A4D25
P 3750 1600
F 0 "D3" V 3800 1400 50 0000 C CNN
F 1 "BAT43" V 3700 1400 50 0000 C CNN
-F 2 "" H 3750 1600 60 0001 C CNN
+F 2 "Discret:D3" H 3750 1600 60 0001 C CNN
F 3 "" H 3750 1600 60 0001 C CNN
1 3750 1600
0 -1 -1 0
@@ -1102,7 +1102,7 @@ U 1 1 442A4D1B
P 3750 900
F 0 "D2" V 3800 700 50 0000 C CNN
F 1 "BAT43" V 3700 700 50 0000 C CNN
-F 2 "" H 3750 900 60 0001 C CNN
+F 2 "Discret:D3" H 3750 900 60 0001 C CNN
F 3 "" H 3750 900 60 0001 C CNN
1 3750 900
0 -1 -1 0
@@ -1113,7 +1113,7 @@ U 1 1 442A4CFB
P 2900 1650
F 0 "R2" H 2800 1850 50 0000 C CNN
F 1 "10K" V 2900 1650 50 0000 C CNN
-F 2 "" H 2900 1650 60 0001 C CNN
+F 2 "Discret:R4" H 2900 1650 60 0001 C CNN
F 3 "" H 2900 1650 60 0001 C CNN
1 2900 1650
1 0 0 -1
@@ -1124,7 +1124,7 @@ U 1 1 442A4CF4
P 3400 1300
F 0 "R1" V 3480 1300 50 0000 C CNN
F 1 "10K" V 3400 1300 50 0000 C CNN
-F 2 "" H 3400 1300 60 0001 C CNN
+F 2 "Discret:R4" H 3400 1300 60 0001 C CNN
F 3 "" H 3400 1300 60 0001 C CNN
1 3400 1300
0 -1 -1 0
@@ -1135,7 +1135,7 @@ U 1 1 442A4CC8
P 4300 1200
F 0 "U2" H 4300 1500 50 0000 C BNN
F 1 "74HC125" H 4300 1450 50 0000 C TNN
-F 2 "" H 4300 1200 60 0001 C CNN
+F 2 "Sockets_DIP:DIP-10__300_ELL" H 4300 1200 60 0001 C CNN
F 3 "" H 4300 1200 60 0001 C CNN
1 4300 1200
1 0 0 -1
@@ -1146,7 +1146,7 @@ U 1 1 442A4C93
P 1250 3600
F 0 "J1" H 1250 3000 70 0000 C CNN
F 1 "DB9-FEMAL" H 1250 4200 70 0000 C CNN
-F 2 "" H 1250 3600 60 0001 C CNN
+F 2 "Connect:DB9FC" H 1250 3600 60 0001 C CNN
F 3 "" H 1250 3600 60 0001 C CNN
1 1250 3600
-1 0 0 1
diff --git a/demos/flat_hierarchy/pic_sockets.sch b/demos/flat_hierarchy/pic_sockets.sch
index b43bfecda8..d64692f3f1 100644
--- a/demos/flat_hierarchy/pic_sockets.sch
+++ b/demos/flat_hierarchy/pic_sockets.sch
@@ -100,7 +100,7 @@ U 1 1 4639BE2C
P 2200 6800
F 0 "C8" H 2250 6900 50 0000 L CNN
F 1 "100nF" H 2250 6700 50 0000 L CNN
-F 2 "" H 2200 6800 60 0001 C CNN
+F 2 "Discret:C1-1" H 2200 6800 60 0001 C CNN
F 3 "" H 2200 6800 60 0001 C CNN
1 2200 6800
1 0 0 -1
@@ -191,7 +191,7 @@ U 1 1 4436967E
P 8300 2800
F 0 "P2" H 8300 3600 70 0000 C CNN
F 1 "SUPP28" H 8300 1950 70 0000 C CNN
-F 2 "" H 8300 2800 60 0001 C CNN
+F 2 "Sockets_DIP:DIP-28__300_ELL" H 8300 2800 60 0001 C CNN
F 3 "" H 8300 2800 60 0001 C CNN
1 8300 2800
1 0 0 -1
@@ -213,7 +213,7 @@ U 1 1 442AA145
P 1650 6800
F 0 "C7" H 1700 6900 50 0000 L CNN
F 1 "100nF" H 1700 6700 50 0000 L CNN
-F 2 "" H 1650 6800 60 0001 C CNN
+F 2 "Discret:C1-1" H 1650 6800 60 0001 C CNN
F 3 "" H 1650 6800 60 0001 C CNN
1 1650 6800
1 0 0 -1
@@ -246,7 +246,7 @@ U 1 1 442AA12B
P 2750 6800
F 0 "C6" H 2800 6900 50 0000 L CNN
F 1 "100nF" H 2800 6700 50 0000 L CNN
-F 2 "" H 2750 6800 60 0001 C CNN
+F 2 "Discret:C1-1" H 2750 6800 60 0001 C CNN
F 3 "" H 2750 6800 60 0001 C CNN
1 2750 6800
1 0 0 -1
@@ -300,7 +300,7 @@ U 1 1 442A88ED
P 8300 4950
F 0 "P3" H 8300 6050 70 0000 C CNN
F 1 "SUPP40" H 8300 3800 70 0000 C CNN
-F 2 "" H 8300 4950 60 0001 C CNN
+F 2 "Sockets_DIP:DIP-40__600_ELL" H 8300 4950 60 0001 C CNN
F 3 "" H 8300 4950 60 0001 C CNN
1 8300 4950
1 0 0 -1
@@ -327,7 +327,7 @@ U 1 1 442A87F7
P 3250 1400
F 0 "U1" H 3400 1750 60 0000 C CNN
F 1 "24Cxx" H 3450 1050 60 0000 C CNN
-F 2 "" H 3250 1400 60 0001 C CNN
+F 2 "Sockets_DIP:DIP-8__300_ELL" H 3250 1400 60 0001 C CNN
F 3 "" H 3250 1400 60 0001 C CNN
1 3250 1400
1 0 0 -1
@@ -357,7 +357,7 @@ U 1 1 442A81A7
P 3300 4850
F 0 "U5" H 3300 5600 60 0000 C CNN
F 1 "PIC_18_PINS" H 3300 4050 60 0000 C CNN
-F 2 "" H 3300 4850 60 0001 C CNN
+F 2 "Sockets_DIP:DIP-18__300_ELL" H 3300 4850 60 0001 C CNN
F 3 "" H 3300 4850 60 0001 C CNN
1 3300 4850
1 0 0 -1
@@ -403,7 +403,7 @@ U 1 1 442A81A5
P 3300 3000
F 0 "U6" H 3250 3700 60 0000 C CNN
F 1 "PIC_8_PINS" H 3300 2300 60 0000 C CNN
-F 2 "" H 3300 3000 60 0001 C CNN
+F 2 "Sockets_DIP:DIP-8__300_ELL" H 3300 3000 60 0001 C CNN
F 3 "" H 3300 3000 60 0001 C CNN
1 3300 3000
1 0 0 -1
diff --git a/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213.cmp b/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213.cmp
deleted file mode 100644
index 4adcb975c4..0000000000
--- a/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213.cmp
+++ /dev/null
@@ -1,1137 +0,0 @@
-Cmp-Mod V01 Created by Cvpcb (2014-07-29 BZR 5035)-product date = 30/07/2014 13:09:03
-
-BeginCmp
-TimeStamp = /46237F50;
-Reference = ABRT_SW1;
-ValeurCmp = SW_PUSH;
-IdModule = discret:SW_PUSH_SMALL;
-EndCmp
-
-BeginCmp
-TimeStamp = /46238965;
-Reference = ALLPST1;
-ValeurCmp = CONN_1;
-IdModule = connect:PINTST;
-EndCmp
-
-BeginCmp
-TimeStamp = /461BAF4F;
-Reference = BDM_EN1;
-ValeurCmp = JUMPER;
-IdModule = pin_array:PIN_ARRAY_2X1;
-EndCmp
-
-BeginCmp
-TimeStamp = /461BAEE7;
-Reference = BDM_PORT1;
-ValeurCmp = CONN_13X2;
-IdModule = pin_array:pin_array_13x2;
-EndCmp
-
-BeginCmp
-TimeStamp = /462389BC;
-Reference = C1;
-ValeurCmp = 10pF;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /462389C0;
-Reference = C2;
-ValeurCmp = 10pF;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /46238468;
-Reference = C3;
-ValeurCmp = 1nF;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /46161CB5;
-Reference = C4;
-ValeurCmp = 100nF;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /46161CB8;
-Reference = C5;
-ValeurCmp = 100nF;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /461BB5E5;
-Reference = C6;
-ValeurCmp = 100nF;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /46161CD3;
-Reference = C7;
-ValeurCmp = 100nF;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /46161CD4;
-Reference = C8;
-ValeurCmp = 100nF;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /46161CD7;
-Reference = C9;
-ValeurCmp = 100nF;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /46161CD8;
-Reference = C10;
-ValeurCmp = 100nF;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /46161CD9;
-Reference = C11;
-ValeurCmp = 100nF;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /46161CDA;
-Reference = C12;
-ValeurCmp = 100nF;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /46237DF9;
-Reference = C14;
-ValeurCmp = 100nF;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /46237E36;
-Reference = C15;
-ValeurCmp = 100nF;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /462382CE;
-Reference = C16;
-ValeurCmp = 10uF;
-IdModule = lib_smd:SM1206POL;
-EndCmp
-
-BeginCmp
-TimeStamp = /46161D3C;
-Reference = C17;
-ValeurCmp = 100uF;
-IdModule = lib_smd:SM1206POL;
-EndCmp
-
-BeginCmp
-TimeStamp = /46238286;
-Reference = C18;
-ValeurCmp = 100nF;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /461BE364;
-Reference = C20;
-ValeurCmp = 1nF;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /461BE35C;
-Reference = C21;
-ValeurCmp = 100nF;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80202/4652B365;
-Reference = C22;
-ValeurCmp = 100nF;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80202/4652B33B;
-Reference = C23;
-ValeurCmp = 100nF;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80202/4652B354;
-Reference = C24;
-ValeurCmp = 100nF;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80202/4652B35B;
-Reference = C25;
-ValeurCmp = 100nF;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80202/46546CA6;
-Reference = C26;
-ValeurCmp = 100nF;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80202/4652B486;
-Reference = C27;
-ValeurCmp = 100nF;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80202/4652B4C7;
-Reference = C28;
-ValeurCmp = 100nF;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80202/4652B4C4;
-Reference = C30;
-ValeurCmp = 100nF;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80202/4652B4C5;
-Reference = C31;
-ValeurCmp = 100nF;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80202/4652B4C6;
-Reference = C32;
-ValeurCmp = 100nF;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80202/4652B4CA;
-Reference = C33;
-ValeurCmp = 100nF;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80202/4653FFFE;
-Reference = C34;
-ValeurCmp = 100nF;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80202/4652B4D6;
-Reference = C35;
-ValeurCmp = 100nF;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80202/4652B4D8;
-Reference = C36;
-ValeurCmp = 100nF;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80202/465306B1;
-Reference = C38;
-ValeurCmp = 10uF;
-IdModule = discret:C2V8;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80202/465305FE;
-Reference = C40;
-ValeurCmp = 220uF;
-IdModule = discret:C2V8;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80202/465306F6;
-Reference = C41;
-ValeurCmp = 100nF;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80202/4652A9D3;
-Reference = C43;
-ValeurCmp = 100nF;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80202/4652B4D7;
-Reference = C44;
-ValeurCmp = 100nF;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80202/4652B4DC;
-Reference = C45;
-ValeurCmp = 100nF;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80202/4652B4D9;
-Reference = C46;
-ValeurCmp = 100nF;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80204/46A76BB2;
-Reference = C51;
-ValeurCmp = 100nF;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80204/46A76BB3;
-Reference = C52;
-ValeurCmp = 100nF;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80204/46A76BB4;
-Reference = C53;
-ValeurCmp = 100nF;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80204/46A76BB5;
-Reference = C54;
-ValeurCmp = 100nF;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80204/46A76BAE;
-Reference = C55;
-ValeurCmp = 100nF;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80204/46A76BAF;
-Reference = C56;
-ValeurCmp = 100nF;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80204/46A76BB0;
-Reference = C57;
-ValeurCmp = 100nF;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80204/46A76BB1;
-Reference = C58;
-ValeurCmp = 100nF;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80204/46A76BBA;
-Reference = C59;
-ValeurCmp = 100nF;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80204/46A76BBB;
-Reference = C60;
-ValeurCmp = 100nF;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80204/46A76BBC;
-Reference = C61;
-ValeurCmp = 100nF;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80202/4652BFF1;
-Reference = CAN_EN1;
-ValeurCmp = CONN_2X2;
-IdModule = pin_array:PIN_ARRAY_2X2;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80202/46540159;
-Reference = CAN_TERM1;
-ValeurCmp = JUMPER;
-IdModule = pin_array:PIN_ARRAY_2X1;
-EndCmp
-
-BeginCmp
-TimeStamp = /461BB62E;
-Reference = CLK0;
-ValeurCmp = JUMPER;
-IdModule = pin_array:PIN_ARRAY_2X1;
-EndCmp
-
-BeginCmp
-TimeStamp = /461BB648;
-Reference = CLK1;
-ValeurCmp = JUMPER;
-IdModule = pin_array:PIN_ARRAY_2X1;
-EndCmp
-
-BeginCmp
-TimeStamp = /461BB894;
-Reference = CLKOUT1;
-ValeurCmp = CONN_1;
-IdModule = connect:PINTST;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80202/4652BADD;
-Reference = COM_SEL1;
-ValeurCmp = CONN_3;
-IdModule = pin_array:PIN_ARRAY_3X1;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80202/4652BAD4;
-Reference = COM_SEL2;
-ValeurCmp = CONN_3;
-IdModule = pin_array:PIN_ARRAY_3X1;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80202/4652BA65;
-Reference = COM_SEL3;
-ValeurCmp = CONN_3;
-IdModule = pin_array:PIN_ARRAY_3X1;
-EndCmp
-
-BeginCmp
-TimeStamp = /46545507;
-Reference = CT1;
-ValeurCmp = JUMPER;
-IdModule = pin_array:PIN_ARRAY_2X1;
-EndCmp
-
-BeginCmp
-TimeStamp = /46237F86;
-Reference = D1;
-ValeurCmp = BAT54;
-IdModule = lib_smd:ST23AK#1;
-EndCmp
-
-BeginCmp
-TimeStamp = /4623846D;
-Reference = D3;
-ValeurCmp = BAT54;
-IdModule = lib_smd:ST23AK#1;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80202/465306C8;
-Reference = D7;
-ValeurCmp = 1N4004;
-IdModule = discret:D5;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80204/46A76BC4;
-Reference = D8;
-ValeurCmp = LED;
-IdModule = lib_smd:SM1206POL;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80204/46A76BA8;
-Reference = D9;
-ValeurCmp = LED;
-IdModule = lib_smd:SM1206POL;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80202/46530747;
-Reference = F1;
-ValeurCmp = FUSE;
-IdModule = lib_smd:FSUPCMS;
-EndCmp
-
-BeginCmp
-TimeStamp = /462380B8;
-Reference = FB1;
-ValeurCmp = BEAD;
-IdModule = lib_smd:SM1206;
-EndCmp
-
-BeginCmp
-TimeStamp = /465FE6C5;
-Reference = GND1;
-ValeurCmp = CONN_1;
-IdModule = connect:PINTST;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80202/465307C6;
-Reference = J1;
-ValeurCmp = JACK_2P;
-IdModule = connect:JACK_ALIM;
-EndCmp
-
-BeginCmp
-TimeStamp = /46238092;
-Reference = L1;
-ValeurCmp = 10uH;
-IdModule = lib_smd:SM1206;
-EndCmp
-
-BeginCmp
-TimeStamp = /461BE327;
-Reference = L2;
-ValeurCmp = 10uH;
-IdModule = lib_smd:SM1206;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80202/4652B0AE;
-Reference = LED1;
-ValeurCmp = LED;
-IdModule = lib_smd:SM1206POL;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80202/4652B0B7;
-Reference = LED2;
-ValeurCmp = LED;
-IdModule = lib_smd:SM1206POL;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80202/4652B0BB;
-Reference = LED3;
-ValeurCmp = LED;
-IdModule = lib_smd:SM1206POL;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80202/4652B0BC;
-Reference = LED4;
-ValeurCmp = LED;
-IdModule = lib_smd:SM1206POL;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80202/46530639;
-Reference = LED5;
-ValeurCmp = LED;
-IdModule = lib_smd:SM1206POL;
-EndCmp
-
-BeginCmp
-TimeStamp = /46237E52;
-Reference = LEDABRT1;
-ValeurCmp = RED;
-IdModule = lib_smd:SM1206POL;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80202/4652B108;
-Reference = LED_EN1;
-ValeurCmp = JUMPER;
-IdModule = pin_array:PIN_ARRAY_2X1;
-EndCmp
-
-BeginCmp
-TimeStamp = /462383E5;
-Reference = LV1;
-ValeurCmp = DS1818;
-IdModule = discret:TO92-INVERT;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80202/4652A4FB;
-Reference = MCU_PORT1;
-ValeurCmp = CONN_30X2;
-IdModule = pin_array:PIN_ARRAY_30X2;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80204/46A76BA6;
-Reference = P1;
-ValeurCmp = CONN_6;
-IdModule = pin_array:PIN_ARRAY-6X1;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80204/46A76EB2;
-Reference = P3;
-ValeurCmp = CONN_2X2;
-IdModule = pin_array:PIN_ARRAY_2X2;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80204/46ADE55A;
-Reference = P4;
-ValeurCmp = CONN_20X2;
-IdModule = pin_array:PIN_ARRAY_20X2;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80202/4652BF26;
-Reference = PULUPEN1;
-ValeurCmp = CONN_4X2;
-IdModule = pin_array:pin_array_4x2;
-EndCmp
-
-BeginCmp
-TimeStamp = /46238519;
-Reference = Q1;
-ValeurCmp = 3906;
-IdModule = lib_smd:SOT23EBC;
-EndCmp
-
-BeginCmp
-TimeStamp = /462389B6;
-Reference = R1;
-ValeurCmp = 1M;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /461BB661;
-Reference = R2;
-ValeurCmp = 4,7K;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /461BE039;
-Reference = R4;
-ValeurCmp = 10K;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /461BE041;
-Reference = R5;
-ValeurCmp = 10K;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /461BE046;
-Reference = R6;
-ValeurCmp = 10K;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /46237E28;
-Reference = R7;
-ValeurCmp = 1K;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /461BE047;
-Reference = R8;
-ValeurCmp = 10K;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /461BE230;
-Reference = R9;
-ValeurCmp = 0;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /461BE04B;
-Reference = R10;
-ValeurCmp = 10K;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /461BE051;
-Reference = R11;
-ValeurCmp = 10K;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /46237E2F;
-Reference = R12;
-ValeurCmp = 20K;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /461BE054;
-Reference = R13;
-ValeurCmp = 10K;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /46237E3D;
-Reference = R14;
-ValeurCmp = 270;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /4623847B;
-Reference = R15;
-ValeurCmp = 4,7K;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /461BAF5C;
-Reference = R16;
-ValeurCmp = 4,7K;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /461BB790;
-Reference = R17;
-ValeurCmp = 4,7K;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /461BB795;
-Reference = R18;
-ValeurCmp = 4,7K;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /461BB798;
-Reference = R19;
-ValeurCmp = 4,7K;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /461BB799;
-Reference = R20;
-ValeurCmp = 4,7K;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /46238545;
-Reference = R21;
-ValeurCmp = 4,7K;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /4623857F;
-Reference = R22;
-ValeurCmp = 270;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80202/4652B5F4;
-Reference = R23;
-ValeurCmp = 10K;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /461BB65F;
-Reference = R25;
-ValeurCmp = 4,7K;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /461BB8C0;
-Reference = R26;
-ValeurCmp = 10K;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80202/4652B061;
-Reference = R28;
-ValeurCmp = 270;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80202/4652B9D5;
-Reference = R30;
-ValeurCmp = 10K;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80202/4652B067;
-Reference = R31;
-ValeurCmp = 270;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80202/4652B069;
-Reference = R32;
-ValeurCmp = 270;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80202/4652B06A;
-Reference = R33;
-ValeurCmp = 270;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80202/4652B111;
-Reference = R34;
-ValeurCmp = 10K;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80202/4652B9CC;
-Reference = R35;
-ValeurCmp = 10K;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80202/46540063;
-Reference = R36;
-ValeurCmp = 1K;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80202/46540164;
-Reference = R38;
-ValeurCmp = 62;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /461BE50C;
-Reference = R45;
-ValeurCmp = 4,7K;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /461BB742;
-Reference = R46;
-ValeurCmp = 22;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80202/4652BF65;
-Reference = R47;
-ValeurCmp = 4,7K;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80202/4652BF62;
-Reference = R48;
-ValeurCmp = 4,7K;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80202/4652BF5C;
-Reference = R49;
-ValeurCmp = 4,7K;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80202/4652BF48;
-Reference = R50;
-ValeurCmp = 4,7K;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80202/46530638;
-Reference = R53;
-ValeurCmp = 270;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80204/46A76BCA;
-Reference = R57;
-ValeurCmp = 4K7;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80204/46A76BC3;
-Reference = R62;
-ValeurCmp = 1K;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80204/46A76BA7;
-Reference = R63;
-ValeurCmp = 1K;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80204/4791D59D;
-Reference = R64;
-ValeurCmp = 3,3;
-IdModule = discret:R4;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80202/4654018B;
-Reference = RCAN1;
-ValeurCmp = R;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80202/46540184;
-Reference = RCAN2;
-ValeurCmp = R;
-IdModule = lib_smd:SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /46238597;
-Reference = RED1;
-ValeurCmp = LED_RESET1;
-IdModule = lib_smd:SM1206POL;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80202/4654007F;
-Reference = RS1;
-ValeurCmp = CONN_1;
-IdModule = connect:PINTST;
-EndCmp
-
-BeginCmp
-TimeStamp = /465451D4;
-Reference = RST_SW1;
-ValeurCmp = SW_PUSH;
-IdModule = discret:SW_PUSH_SMALL;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80202/4652DDDF;
-Reference = SW1;
-ValeurCmp = SW_PUSH;
-IdModule = discret:SW_PUSH_SMALL;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80202/4652DDE7;
-Reference = SW2;
-ValeurCmp = SW_PUSH;
-IdModule = discret:SW_PUSH_SMALL;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80202/46530763;
-Reference = SW_ONOFF1;
-ValeurCmp = SWITCH_INV;
-IdModule = discret:SW_SPDT;
-EndCmp
-
-BeginCmp
-TimeStamp = /461BBA34;
-Reference = TA-1;
-ValeurCmp = CONN_1;
-IdModule = connect:PINTST;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80202/46530806;
-Reference = TB1;
-ValeurCmp = CONN_2;
-IdModule = connect:bornier2;
-EndCmp
-
-BeginCmp
-TimeStamp = /46161C39;
-Reference = U1;
-ValeurCmp = MCF5213-LQFP100;
-IdModule = lib_smd:VQFP100;
-EndCmp
-
-BeginCmp
-TimeStamp = /46554FB5;
-Reference = U2;
-ValeurCmp = 74AHC1G14;
-IdModule = lib_smd:SOT353;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80202/4652B22B;
-Reference = U3;
-ValeurCmp = MAX202;
-IdModule = lib_smd:SO16E;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80202/4652B03E;
-Reference = U4;
-ValeurCmp = 74HC125;
-IdModule = lib_smd:SO14E;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80202/4652B4C1;
-Reference = U5;
-ValeurCmp = MAX202;
-IdModule = lib_smd:SO16E;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80202/4653FF97;
-Reference = U7;
-ValeurCmp = PCA82C251;
-IdModule = lib_smd:SO8E;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80202/4652B4D3;
-Reference = U8;
-ValeurCmp = MAX202;
-IdModule = lib_smd:SO16E;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80204/470F38BE;
-Reference = U9;
-ValeurCmp = XCR3256-TQ144;
-IdModule = lib_smd:TQFP144;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80202/4652B26D;
-Reference = UARTCAN0;
-ValeurCmp = DB9;
-IdModule = connect:DB9FC;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80202/4652B4C2;
-Reference = UARTCAN1;
-ValeurCmp = DB9;
-IdModule = connect:DB9FC;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80202/4652B4D4;
-Reference = UARTCAN2;
-ValeurCmp = DB9;
-IdModule = connect:DB9FC;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80202/4652B289;
-Reference = UART_EN0;
-ValeurCmp = CONN_4X2;
-IdModule = pin_array:pin_array_4x2;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80202/4652B4C3;
-Reference = UART_EN1;
-ValeurCmp = CONN_4X2;
-IdModule = pin_array:pin_array_4x2;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80202/4652B4D5;
-Reference = UART_EN2;
-ValeurCmp = CONN_4X2;
-IdModule = pin_array:pin_array_4x2;
-EndCmp
-
-BeginCmp
-TimeStamp = /46238079;
-Reference = VDDA1;
-ValeurCmp = JUMPER;
-IdModule = pin_array:PIN_ARRAY_2X1;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80202/46603376;
-Reference = VR1;
-ValeurCmp = LT1129_QPACK;
-IdModule = lib_smd:DPAK5;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80202/4654003D;
-Reference = VREF1;
-ValeurCmp = CONN_1;
-IdModule = connect:PINTST;
-EndCmp
-
-BeginCmp
-TimeStamp = /47D80202/4652A9C4;
-Reference = VX_EN1;
-ValeurCmp = JUMPER;
-IdModule = pin_array:PIN_ARRAY_2X1;
-EndCmp
-
-BeginCmp
-TimeStamp = /462389C7;
-Reference = Y1;
-ValeurCmp = 8MHz;
-IdModule = discret:HC-18UH;
-EndCmp
-
-EndListe
diff --git a/demos/pic_programmer/pic_programmer.cmp b/demos/pic_programmer/pic_programmer.cmp
deleted file mode 100644
index 0a80a71e2d..0000000000
--- a/demos/pic_programmer/pic_programmer.cmp
+++ /dev/null
@@ -1,444 +0,0 @@
-Cmp-Mod V01 Created by Cvpcb (2014-09-16 BZR 5138)-product date = 20/09/2014 09:54:11
-
-BeginCmp
-TimeStamp = /442A5056;
-Reference = C1;
-ValeurCmp = 100µF;
-IdModule = discret:CP10;
-EndCmp
-
-BeginCmp
-TimeStamp = /442A501D;
-Reference = C2;
-ValeurCmp = 220uF;
-IdModule = discret:CP10;
-EndCmp
-
-BeginCmp
-TimeStamp = /442A584C;
-Reference = C3;
-ValeurCmp = 22uF/25V;
-IdModule = discret:CP8;
-EndCmp
-
-BeginCmp
-TimeStamp = /442A5F61;
-Reference = C4;
-ValeurCmp = 0;
-IdModule = discret:C1-1;
-EndCmp
-
-BeginCmp
-TimeStamp = /442A58B1;
-Reference = C5;
-ValeurCmp = 10nF;
-IdModule = discret:C1-1;
-EndCmp
-
-BeginCmp
-TimeStamp = /4804A5E2/442AA12B;
-Reference = C6;
-ValeurCmp = 100nF;
-IdModule = discret:C1-1;
-EndCmp
-
-BeginCmp
-TimeStamp = /4804A5E2/442AA145;
-Reference = C7;
-ValeurCmp = 100nF;
-IdModule = discret:C1-1;
-EndCmp
-
-BeginCmp
-TimeStamp = /464AD280;
-Reference = C9;
-ValeurCmp = 22OnF;
-IdModule = discret:C1-1;
-EndCmp
-
-BeginCmp
-TimeStamp = /442A500B;
-Reference = D1;
-ValeurCmp = 1N4004;
-IdModule = discret:D5;
-EndCmp
-
-BeginCmp
-TimeStamp = /442A4D1B;
-Reference = D2;
-ValeurCmp = BAT43;
-IdModule = discret:D3;
-EndCmp
-
-BeginCmp
-TimeStamp = /442A4D25;
-Reference = D3;
-ValeurCmp = BAT43;
-IdModule = discret:D3;
-EndCmp
-
-BeginCmp
-TimeStamp = /442A4D5C;
-Reference = D4;
-ValeurCmp = BAT43;
-IdModule = discret:D3;
-EndCmp
-
-BeginCmp
-TimeStamp = /442A4D5D;
-Reference = D5;
-ValeurCmp = BAT43;
-IdModule = discret:D3;
-EndCmp
-
-BeginCmp
-TimeStamp = /442A4D64;
-Reference = D6;
-ValeurCmp = BAT43;
-IdModule = discret:D3;
-EndCmp
-
-BeginCmp
-TimeStamp = /442A4D65;
-Reference = D7;
-ValeurCmp = BAT43;
-IdModule = discret:D3;
-EndCmp
-
-BeginCmp
-TimeStamp = /442A4F5D;
-Reference = D8;
-ValeurCmp = RED-LED;
-IdModule = discret:LEDV;
-EndCmp
-
-BeginCmp
-TimeStamp = /442A5084;
-Reference = D9;
-ValeurCmp = GREEN-LED;
-IdModule = discret:LEDV;
-EndCmp
-
-BeginCmp
-TimeStamp = /442A6026;
-Reference = D10;
-ValeurCmp = SCHOTTKY;
-IdModule = discret:D5;
-EndCmp
-
-BeginCmp
-TimeStamp = /4639BA28;
-Reference = D11;
-ValeurCmp = BAT43;
-IdModule = discret:D3;
-EndCmp
-
-BeginCmp
-TimeStamp = /4639B9EA;
-Reference = D12;
-ValeurCmp = YELLOW-LED;
-IdModule = discret:LEDV;
-EndCmp
-
-BeginCmp
-TimeStamp = /442A4C93;
-Reference = J1;
-ValeurCmp = DB9-FEMAL;
-IdModule = connect:DB9FC;
-EndCmp
-
-BeginCmp
-TimeStamp = /4639BAF8;
-Reference = JP1;
-ValeurCmp = JUMPER;
-IdModule = connect:GS2;
-EndCmp
-
-BeginCmp
-TimeStamp = /442A57BE;
-Reference = L1;
-ValeurCmp = 22uH;
-IdModule = inductors:INDUCTOR_V;
-EndCmp
-
-BeginCmp
-TimeStamp = /442A4FE7;
-Reference = P1;
-ValeurCmp = CONN_2;
-IdModule = connect:bornier2;
-EndCmp
-
-BeginCmp
-TimeStamp = /4804A5E2/4436967E;
-Reference = P2;
-ValeurCmp = SUPP28;
-IdModule = dip_sockets:DIP-28__300_ELL;
-EndCmp
-
-BeginCmp
-TimeStamp = /4804A5E2/442A88ED;
-Reference = P3;
-ValeurCmp = SUPP40;
-IdModule = sockets:40tex-Ell600;
-EndCmp
-
-BeginCmp
-TimeStamp = /54020BEA;
-Reference = P101;
-ValeurCmp = CONN_1;
-IdModule = footprints:1pin-4;
-EndCmp
-
-BeginCmp
-TimeStamp = /54020DA9;
-Reference = P102;
-ValeurCmp = CONN_1;
-IdModule = footprints:1pin-4;
-EndCmp
-
-BeginCmp
-TimeStamp = /54020DC2;
-Reference = P103;
-ValeurCmp = CONN_1;
-IdModule = footprints:1pin-4;
-EndCmp
-
-BeginCmp
-TimeStamp = /54020DE3;
-Reference = P104;
-ValeurCmp = CONN_1;
-IdModule = footprints:1pin-4;
-EndCmp
-
-BeginCmp
-TimeStamp = /54020E5D;
-Reference = P105;
-ValeurCmp = CONN_1;
-IdModule = footprints:1pin-4;
-EndCmp
-
-BeginCmp
-TimeStamp = /54020E76;
-Reference = P106;
-ValeurCmp = CONN_1;
-IdModule = footprints:1pin-4;
-EndCmp
-
-BeginCmp
-TimeStamp = /442A4EB9;
-Reference = Q1;
-ValeurCmp = BC237;
-IdModule = discret:TO92;
-EndCmp
-
-BeginCmp
-TimeStamp = /442A4F30;
-Reference = Q2;
-ValeurCmp = BC307;
-IdModule = discret:TO92;
-EndCmp
-
-BeginCmp
-TimeStamp = /4639B996;
-Reference = Q3;
-ValeurCmp = BC307;
-IdModule = discret:TO92;
-EndCmp
-
-BeginCmp
-TimeStamp = /442A4CF4;
-Reference = R1;
-ValeurCmp = 10K;
-IdModule = discret:R4;
-EndCmp
-
-BeginCmp
-TimeStamp = /442A4CFB;
-Reference = R2;
-ValeurCmp = 10K;
-IdModule = discret:R4;
-EndCmp
-
-BeginCmp
-TimeStamp = /442A4D5A;
-Reference = R3;
-ValeurCmp = 10K;
-IdModule = discret:R4;
-EndCmp
-
-BeginCmp
-TimeStamp = /442A4D5B;
-Reference = R4;
-ValeurCmp = 10K;
-IdModule = discret:R4;
-EndCmp
-
-BeginCmp
-TimeStamp = /442A4D62;
-Reference = R5;
-ValeurCmp = 10K;
-IdModule = discret:R4;
-EndCmp
-
-BeginCmp
-TimeStamp = /442A4D63;
-Reference = R6;
-ValeurCmp = 10K;
-IdModule = discret:R4;
-EndCmp
-
-BeginCmp
-TimeStamp = /442A4F2A;
-Reference = R7;
-ValeurCmp = 10K;
-IdModule = discret:R4;
-EndCmp
-
-BeginCmp
-TimeStamp = /442A4D92;
-Reference = R8;
-ValeurCmp = 1K;
-IdModule = discret:R4;
-EndCmp
-
-BeginCmp
-TimeStamp = /442A4F52;
-Reference = R9;
-ValeurCmp = 2.2K;
-IdModule = discret:R4;
-EndCmp
-
-BeginCmp
-TimeStamp = /442A5F83;
-Reference = R10;
-ValeurCmp = 5,1K;
-IdModule = discret:R4;
-EndCmp
-
-BeginCmp
-TimeStamp = /442A4F23;
-Reference = R11;
-ValeurCmp = 22K;
-IdModule = discret:R4;
-EndCmp
-
-BeginCmp
-TimeStamp = /442A4D85;
-Reference = R12;
-ValeurCmp = 470;
-IdModule = discret:R4;
-EndCmp
-
-BeginCmp
-TimeStamp = /442A4D8D;
-Reference = R13;
-ValeurCmp = 470;
-IdModule = discret:R4;
-EndCmp
-
-BeginCmp
-TimeStamp = /442A5083;
-Reference = R14;
-ValeurCmp = 470;
-IdModule = discret:R4;
-EndCmp
-
-BeginCmp
-TimeStamp = /442A58D7;
-Reference = R15;
-ValeurCmp = 6.2K;
-IdModule = discret:R4;
-EndCmp
-
-BeginCmp
-TimeStamp = /442A58DC;
-Reference = R16;
-ValeurCmp = 62K;
-IdModule = discret:R4;
-EndCmp
-
-BeginCmp
-TimeStamp = /442A50BF;
-Reference = R17;
-ValeurCmp = 22K;
-IdModule = discret:R4;
-EndCmp
-
-BeginCmp
-TimeStamp = /44369638;
-Reference = R18;
-ValeurCmp = 220;
-IdModule = discret:R4;
-EndCmp
-
-BeginCmp
-TimeStamp = /4639B9B0;
-Reference = R19;
-ValeurCmp = 2.2K;
-IdModule = discret:R4;
-EndCmp
-
-BeginCmp
-TimeStamp = /4639B9B3;
-Reference = R20;
-ValeurCmp = 2.2K;
-IdModule = discret:R4;
-EndCmp
-
-BeginCmp
-TimeStamp = /4639B9E9;
-Reference = R21;
-ValeurCmp = 470;
-IdModule = discret:R4;
-EndCmp
-
-BeginCmp
-TimeStamp = /443D0101;
-Reference = RV1;
-ValeurCmp = 1K;
-IdModule = discret:RV2X4;
-EndCmp
-
-BeginCmp
-TimeStamp = /4804A5E2/442A87F7;
-Reference = U1;
-ValeurCmp = 24Cxx;
-IdModule = dip_sockets:DIP-8__300_ELL;
-EndCmp
-
-BeginCmp
-TimeStamp = /442A4D6B;
-Reference = U2;
-ValeurCmp = 74HC125;
-IdModule = dip_sockets:DIP-14__300_ELL;
-EndCmp
-
-BeginCmp
-TimeStamp = /442A504A;
-Reference = U3;
-ValeurCmp = 7805;
-IdModule = discret:LM78XX;
-EndCmp
-
-BeginCmp
-TimeStamp = /442A5E20;
-Reference = U4;
-ValeurCmp = LT1373;
-IdModule = dip_sockets:DIP-8__300_ELL;
-EndCmp
-
-BeginCmp
-TimeStamp = /4804A5E2/442A81A7;
-Reference = U5;
-ValeurCmp = PIC_18_PINS;
-IdModule = dip_sockets:DIP-18__300_ELL;
-EndCmp
-
-BeginCmp
-TimeStamp = /4804A5E2/442A81A5;
-Reference = U6;
-ValeurCmp = PIC_8_PINS;
-IdModule = dip_sockets:DIP-8__300_ELL;
-EndCmp
-
-EndListe
diff --git a/demos/sonde xilinx/sonde xilinx.cmp b/demos/sonde xilinx/sonde xilinx.cmp
deleted file mode 100644
index 359d901bbb..0000000000
--- a/demos/sonde xilinx/sonde xilinx.cmp
+++ /dev/null
@@ -1,178 +0,0 @@
-Cmp-Mod V01 Genere par Cvpcb 06-dec le 31/12/2005-17:06:34
-
-BeginCmp
-TimeStamp = 3EBF82C6;
-Reference = C1;
-ValeurCmp = 1uF;
-IdModule = CP5;
-EndCmp
-
-BeginCmp
-TimeStamp = 3EBF81A7;
-Reference = C2;
-ValeurCmp = 100pF;
-IdModule = C2;
-EndCmp
-
-BeginCmp
-TimeStamp = 3EBF81A7;
-Reference = C3;
-ValeurCmp = 100pF;
-IdModule = C2;
-EndCmp
-
-BeginCmp
-TimeStamp = 3EBF81A7;
-Reference = C4;
-ValeurCmp = 100pF;
-IdModule = C2;
-EndCmp
-
-BeginCmp
-TimeStamp = 3EBF81A7;
-Reference = C5;
-ValeurCmp = 100pF;
-IdModule = C2;
-EndCmp
-
-BeginCmp
-TimeStamp = 3EBF815E;
-Reference = D1;
-ValeurCmp = BAT46;
-IdModule = D3;
-EndCmp
-
-BeginCmp
-TimeStamp = 3EBF8176;
-Reference = D2;
-ValeurCmp = BAT46;
-IdModule = D3;
-EndCmp
-
-BeginCmp
-TimeStamp = 3EBF7D04;
-Reference = J1;
-ValeurCmp = DB25;
-IdModule = DB25M_CI;
-EndCmp
-
-BeginCmp
-TimeStamp = 3ECDE5C8;
-Reference = J2;
-ValeurCmp = DB9MALE;
-IdModule = DB9M_CI_INVERT;
-EndCmp
-
-BeginCmp
-TimeStamp = 3EBF830C;
-Reference = P1;
-ValeurCmp = CONN_6;
-IdModule = bornier6;
-EndCmp
-
-BeginCmp
-TimeStamp = 3EBF7D16;
-Reference = R1;
-ValeurCmp = 100;
-IdModule = R4;
-EndCmp
-
-BeginCmp
-TimeStamp = 3EBF8187;
-Reference = R2;
-ValeurCmp = 5,1K;
-IdModule = R4;
-EndCmp
-
-BeginCmp
-TimeStamp = 3EBF7D22;
-Reference = R4;
-ValeurCmp = 47;
-IdModule = R4;
-EndCmp
-
-BeginCmp
-TimeStamp = 3EBF818E;
-Reference = R5;
-ValeurCmp = 1K;
-IdModule = R4;
-EndCmp
-
-BeginCmp
-TimeStamp = 3EBF7D26;
-Reference = R6;
-ValeurCmp = 100;
-IdModule = R4;
-EndCmp
-
-BeginCmp
-TimeStamp = 3EBF7D31;
-Reference = R7;
-ValeurCmp = 100;
-IdModule = R4;
-EndCmp
-
-BeginCmp
-TimeStamp = 3EBF7D33;
-Reference = R8;
-ValeurCmp = 100;
-IdModule = R4;
-EndCmp
-
-BeginCmp
-TimeStamp = 3EBF7D33;
-Reference = R9;
-ValeurCmp = 100;
-IdModule = R4;
-EndCmp
-
-BeginCmp
-TimeStamp = 3EBF7D31;
-Reference = R10;
-ValeurCmp = 100;
-IdModule = R4;
-EndCmp
-
-BeginCmp
-TimeStamp = 3EBF819B;
-Reference = R11;
-ValeurCmp = 100;
-IdModule = R4;
-EndCmp
-
-BeginCmp
-TimeStamp = 3EBF819B;
-Reference = R12;
-ValeurCmp = 100;
-IdModule = R4;
-EndCmp
-
-BeginCmp
-TimeStamp = 3EBF819B;
-Reference = R13;
-ValeurCmp = 100;
-IdModule = R4;
-EndCmp
-
-BeginCmp
-TimeStamp = 3EBF819B;
-Reference = R14;
-ValeurCmp = 100;
-IdModule = R4;
-EndCmp
-
-BeginCmp
-TimeStamp = 3EBF7DBD;
-Reference = U1;
-ValeurCmp = 74LS125;
-IdModule = 14DIP-ELL300;
-EndCmp
-
-BeginCmp
-TimeStamp = 3EBF7EEC;
-Reference = U2;
-ValeurCmp = 74LS125;
-IdModule = 14DIP-ELL300;
-EndCmp
-
-EndListe
diff --git a/demos/sonde xilinx/sonde xilinx.sch b/demos/sonde xilinx/sonde xilinx.sch
index 05ef1f60b3..fc67f7a83b 100644
--- a/demos/sonde xilinx/sonde xilinx.sch
+++ b/demos/sonde xilinx/sonde xilinx.sch
@@ -1,8 +1,6 @@
EESchema Schematic File Version 2
+LIBS:sonde xilinx_schlib
LIBS:power
-LIBS:device
-LIBS:conn
-LIBS:74xx
LIBS:sonde xilinx-cache
EELAYER 25 0
EELAYER END
@@ -24,7 +22,7 @@ U 1 1 4D527316
P 6650 2600
F 0 "R11" V 6730 2600 50 0000 C CNN
F 1 "100" V 6650 2600 50 0000 C CNN
-F 2 "" H 6650 2600 60 0001 C CNN
+F 2 "Discret:R4" H 6650 2600 60 0001 C CNN
F 3 "" H 6650 2600 60 0001 C CNN
1 6650 2600
0 1 1 0
@@ -37,9 +35,7 @@ Connection ~ 6300 4200
Wire Wire Line
6300 4250 6300 4200
Wire Wire Line
- 5900 4200 6300 4200
-Wire Wire Line
- 6300 4200 6400 4200
+ 5900 4200 6400 4200
$Comp
L GND #PWR01
U 1 1 3EBF81B1
@@ -57,7 +53,7 @@ U 1 1 3EBF81A7
P 6300 4450
F 0 "C4" H 6350 4550 50 0000 L CNN
F 1 "100pF" H 6350 4350 50 0000 L CNN
-F 2 "" H 6300 4450 60 0001 C CNN
+F 2 "Discret:C2" H 6300 4450 60 0001 C CNN
F 3 "" H 6300 4450 60 0001 C CNN
1 6300 4450
1 0 0 -1
@@ -68,7 +64,7 @@ U 1 1 4D528082
P 6650 4200
F 0 "R13" V 6730 4200 50 0000 C CNN
F 1 "100" V 6650 4200 50 0000 C CNN
-F 2 "" H 6650 4200 60 0001 C CNN
+F 2 "Discret:R4" H 6650 4200 60 0001 C CNN
F 3 "" H 6650 4200 60 0001 C CNN
1 6650 4200
0 1 1 0
@@ -83,15 +79,13 @@ U 4 1 3EBF7DBD
P 5450 4200
F 0 "U1" H 5450 4300 50 0000 L BNN
F 1 "74LS125" H 5500 4051 50 0000 L TNN
-F 2 "" H 5450 4200 60 0001 C CNN
+F 2 "Sockets_DIP:DIP-14__300_ELL" H 5450 4200 60 0001 C CNN
F 3 "" H 5450 4200 60 0001 C CNN
4 5450 4200
1 0 0 -1
$EndComp
Wire Wire Line
- 4800 2900 4800 3600
-Wire Wire Line
- 4800 3600 4800 4500
+ 4800 2900 4800 4500
Text Label 8100 3800 1 60 ~ 0
TMS-PROG
Wire Wire Line
@@ -103,9 +97,7 @@ Wire Wire Line
Wire Wire Line
10250 3700 8400 3700
Wire Wire Line
- 10050 3600 10200 3600
-Wire Wire Line
- 10200 3600 10250 3600
+ 10050 3600 10250 3600
Connection ~ 10200 3600
Connection ~ 10200 4000
Connection ~ 10200 3800
@@ -114,11 +106,7 @@ Wire Wire Line
Wire Wire Line
10250 3800 10200 3800
Wire Wire Line
- 10200 3600 10200 3800
-Wire Wire Line
- 10200 3800 10200 4000
-Wire Wire Line
- 10200 4000 10200 4200
+ 10200 3600 10200 4200
Wire Wire Line
10200 4200 10250 4200
$Comp
@@ -127,7 +115,7 @@ U 1 1 3ECDE5C8
P 10700 3900
F 0 "J2" H 10700 4450 70 0000 C CNN
F 1 "DB9MALE" H 10700 3353 70 0000 C CNN
-F 2 "" H 10700 3900 60 0001 C CNN
+F 2 "Connect:DB9M_CI_INVERT" H 10700 3900 60 0001 C CNN
F 3 "" H 10700 3900 60 0001 C CNN
1 10700 3900
1 0 0 1
@@ -253,29 +241,21 @@ F 3 "" H 8450 2650 60 0001 C CNN
0 1 1 0
$EndComp
Wire Wire Line
- 7350 3050 8100 3050
+ 7350 3050 8500 3050
Wire Wire Line
- 8100 3050 8500 3050
-Wire Wire Line
- 7250 2950 8200 2950
-Wire Wire Line
- 8200 2950 8500 2950
+ 7250 2950 8500 2950
Wire Wire Line
7250 2950 7250 3300
Wire Wire Line
7250 3300 6900 3300
Wire Wire Line
- 7250 2850 8300 2850
-Wire Wire Line
- 8300 2850 8500 2850
+ 7250 2850 8500 2850
Wire Wire Line
7250 2850 7250 2600
Wire Wire Line
7250 2600 6900 2600
Wire Wire Line
- 7450 2750 8400 2750
-Wire Wire Line
- 8400 2750 8500 2750
+ 7450 2750 8500 2750
Wire Wire Line
7450 2750 7450 1900
Wire Wire Line
@@ -285,16 +265,14 @@ Wire Wire Line
Wire Wire Line
7650 2550 7650 1000
Wire Wire Line
- 7300 1000 7650 1000
-Wire Wire Line
- 7650 1000 9400 1000
+ 7300 1000 9400 1000
$Comp
L CONN_6 P1
U 1 1 3EBF830C
P 8850 2800
F 0 "P1" V 8800 2800 60 0000 C CNN
F 1 "CONN_6" V 8900 2800 60 0000 C CNN
-F 2 "" H 8850 2800 60 0001 C CNN
+F 2 "Connect:bornier6" H 8850 2800 60 0001 C CNN
F 3 "" H 8850 2800 60 0001 C CNN
1 8850 2800
1 0 0 -1
@@ -319,7 +297,7 @@ U 1 1 3EBF82C6
P 6500 1250
F 0 "C1" H 6550 1350 50 0000 L CNN
F 1 "1uF" H 6550 1151 50 0000 L CNN
-F 2 "" H 6500 1250 60 0001 C CNN
+F 2 "Discret:CP5" H 6500 1250 60 0001 C CNN
F 3 "" H 6500 1250 60 0001 C CNN
1 6500 1250
1 0 0 -1
@@ -334,19 +312,11 @@ Wire Wire Line
Wire Wire Line
6300 3350 6300 3300
Wire Wire Line
- 5900 3300 6300 3300
+ 5900 3300 6400 3300
Wire Wire Line
- 6300 3300 6400 3300
+ 5900 2600 6400 2600
Wire Wire Line
- 5900 2600 6300 2600
-Wire Wire Line
- 6300 2600 6400 2600
-Wire Wire Line
- 5850 1900 5900 1900
-Wire Wire Line
- 5900 1900 6300 1900
-Wire Wire Line
- 6300 1900 6400 1900
+ 5850 1900 6400 1900
$Comp
L GND #PWR010
U 1 1 4D528089
@@ -364,7 +334,7 @@ U 1 1 4D528086
P 6300 3550
F 0 "C5" H 6350 3650 50 0000 L CNN
F 1 "100pF" H 6350 3450 50 0000 L CNN
-F 2 "" H 6300 3550 60 0001 C CNN
+F 2 "Discret:C2" H 6300 3550 60 0001 C CNN
F 3 "" H 6300 3550 60 0001 C CNN
1 6300 3550
1 0 0 -1
@@ -375,7 +345,7 @@ U 1 1 4D528083
P 6650 3300
F 0 "R12" V 6730 3300 50 0000 C CNN
F 1 "100" V 6650 3300 50 0000 C CNN
-F 2 "" H 6650 3300 60 0001 C CNN
+F 2 "Discret:R4" H 6650 3300 60 0001 C CNN
F 3 "" H 6650 3300 60 0001 C CNN
1 6650 3300
0 1 1 0
@@ -397,7 +367,7 @@ U 1 1 4D528085
P 6300 2850
F 0 "C2" H 6350 2950 50 0000 L CNN
F 1 "100pF" H 6350 2750 50 0000 L CNN
-F 2 "" H 6300 2850 60 0001 C CNN
+F 2 "Discret:C2" H 6300 2850 60 0001 C CNN
F 3 "" H 6300 2850 60 0001 C CNN
1 6300 2850
1 0 0 -1
@@ -409,17 +379,7 @@ Wire Wire Line
Wire Wire Line
2300 1000 2300 3700
Wire Wire Line
- 4700 1000 5800 1000
-Wire Wire Line
- 5800 1000 5900 1000
-Wire Wire Line
- 5900 1000 6100 1000
-Wire Wire Line
- 6100 1000 6200 1000
-Wire Wire Line
- 6200 1000 6500 1000
-Wire Wire Line
- 6500 1000 6900 1000
+ 4700 1000 6900 1000
Wire Wire Line
5900 1000 5900 1050
Wire Wire Line
@@ -452,7 +412,7 @@ U 1 1 4D528084
P 6300 2150
F 0 "C3" H 6350 2250 50 0000 L CNN
F 1 "100pF" H 6350 2050 50 0000 L CNN
-F 2 "" H 6300 2150 60 0001 C CNN
+F 2 "Discret:C2" H 6300 2150 60 0001 C CNN
F 3 "" H 6300 2150 60 0001 C CNN
1 6300 2150
1 0 0 -1
@@ -463,7 +423,7 @@ U 1 1 3EBF819B
P 6650 1900
F 0 "R14" V 6730 1900 50 0000 C CNN
F 1 "100" V 6650 1900 50 0000 C CNN
-F 2 "" H 6650 1900 60 0001 C CNN
+F 2 "Discret:R4" H 6650 1900 60 0001 C CNN
F 3 "" H 6650 1900 60 0001 C CNN
1 6650 1900
0 1 1 0
@@ -474,7 +434,7 @@ U 1 1 3EBF818E
P 6200 1300
F 0 "R5" H 6050 1500 50 0000 C CNN
F 1 "1K" V 6200 1300 50 0000 C CNN
-F 2 "" H 6200 1300 60 0001 C CNN
+F 2 "Discret:R4" H 6200 1300 60 0001 C CNN
F 3 "" H 6200 1300 60 0001 C CNN
1 6200 1300
1 0 0 -1
@@ -485,7 +445,7 @@ U 1 1 3EBF8187
P 5900 1300
F 0 "R2" H 5750 1500 50 0000 C CNN
F 1 "5,1K" V 5900 1300 50 0000 C CNN
-F 2 "" H 5900 1300 60 0001 C CNN
+F 2 "Discret:R4" H 5900 1300 60 0001 C CNN
F 3 "" H 5900 1300 60 0001 C CNN
1 5900 1300
1 0 0 -1
@@ -496,7 +456,7 @@ U 1 1 3EBF8176
P 7100 1000
F 0 "D2" H 7100 1100 50 0000 C CNN
F 1 "BAT46" H 7100 900 50 0000 C CNN
-F 2 "" H 7100 1000 60 0001 C CNN
+F 2 "Discret:D3" H 7100 1000 60 0001 C CNN
F 3 "" H 7100 1000 60 0001 C CNN
1 7100 1000
-1 0 0 -1
@@ -507,16 +467,14 @@ U 1 1 3EBF815E
P 4500 1000
F 0 "D1" H 4500 1100 50 0000 C CNN
F 1 "BAT46" H 4500 900 50 0000 C CNN
-F 2 "" H 4500 1000 60 0001 C CNN
+F 2 "Discret:D3" H 4500 1000 60 0001 C CNN
F 3 "" H 4500 1000 60 0001 C CNN
1 4500 1000
-1 0 0 -1
$EndComp
Connection ~ 2350 2000
Wire Wire Line
- 2350 1800 2350 2000
-Wire Wire Line
- 2350 2000 2350 2600
+ 2350 1800 2350 2600
Wire Wire Line
2350 2600 2200 2600
Wire Wire Line
@@ -629,17 +587,7 @@ Wire Wire Line
Wire Wire Line
1150 6900 1250 6900
Wire Wire Line
- 1150 5600 1150 5900
-Wire Wire Line
- 1150 5900 1150 6250
-Wire Wire Line
- 1150 6250 1150 6550
-Wire Wire Line
- 1150 6550 1150 6900
-Wire Wire Line
- 1150 6900 1150 7200
-Wire Wire Line
- 1150 7200 1150 7300
+ 1150 5600 1150 7300
Wire Wire Line
1150 5600 1250 5600
$Comp
@@ -648,7 +596,7 @@ U 4 1 3EBF7EEC
P 1700 5600
F 0 "U2" H 1700 5700 50 0000 L BNN
F 1 "74LS125" H 1750 5450 40 0000 L TNN
-F 2 "" H 1700 5600 60 0001 C CNN
+F 2 "Sockets_DIP:DIP-14__300_ELL" H 1700 5600 60 0001 C CNN
F 3 "" H 1700 5600 60 0001 C CNN
4 1700 5600
1 0 0 -1
@@ -659,7 +607,7 @@ U 3 1 3EBF7EDF
P 1700 6250
F 0 "U2" H 1700 6350 50 0000 L BNN
F 1 "74LS125" H 1750 6100 40 0000 L TNN
-F 2 "" H 1700 6250 60 0001 C CNN
+F 2 "Sockets_DIP:DIP-14__300_ELL" H 1700 6250 60 0001 C CNN
F 3 "" H 1700 6250 60 0001 C CNN
3 1700 6250
1 0 0 -1
@@ -670,7 +618,7 @@ U 2 1 3EBF7EDD
P 1700 6900
F 0 "U2" H 1700 7000 50 0000 L BNN
F 1 "74LS125" H 1750 6750 40 0000 L TNN
-F 2 "" H 1700 6900 60 0001 C CNN
+F 2 "Sockets_DIP:DIP-14__300_ELL" H 1700 6900 60 0001 C CNN
F 3 "" H 1700 6900 60 0001 C CNN
2 1700 6900
1 0 0 -1
@@ -678,9 +626,7 @@ $EndComp
Wire Wire Line
5450 3600 4800 3600
Wire Wire Line
- 4200 2900 4800 2900
-Wire Wire Line
- 4800 2900 5450 2900
+ 4200 2900 5450 2900
Wire Wire Line
5000 3300 4200 3300
Wire Wire Line
@@ -697,7 +643,7 @@ U 3 1 3EBF7DB3
P 5450 3300
F 0 "U1" H 5450 3400 50 0000 L BNN
F 1 "74LS125" H 5500 3151 50 0000 L TNN
-F 2 "" H 5450 3300 60 0001 C CNN
+F 2 "Sockets_DIP:DIP-14__300_ELL" H 5450 3300 60 0001 C CNN
F 3 "" H 5450 3300 60 0001 C CNN
3 5450 3300
1 0 0 -1
@@ -708,7 +654,7 @@ U 2 1 3EBF7DAD
P 5450 2600
F 0 "U1" H 5450 2700 50 0000 L BNN
F 1 "74LS125" H 5500 2451 50 0000 L TNN
-F 2 "" H 5450 2600 60 0001 C CNN
+F 2 "Sockets_DIP:DIP-14__300_ELL" H 5450 2600 60 0001 C CNN
F 3 "" H 5450 2600 60 0001 C CNN
2 5450 2600
1 0 0 -1
@@ -719,7 +665,7 @@ U 1 1 3EBF7D9F
P 5400 1900
F 0 "U1" H 5400 2000 50 0000 L BNN
F 1 "74LS125" H 5450 1750 50 0000 L TNN
-F 2 "" H 5400 1900 60 0001 C CNN
+F 2 "Sockets_DIP:DIP-14__300_ELL" H 5400 1900 60 0001 C CNN
F 3 "" H 5400 1900 60 0001 C CNN
1 5400 1900
1 0 0 -1
@@ -730,7 +676,7 @@ U 1 1 3EBF7D92
P 4650 1600
F 0 "U2" H 4650 1700 50 0000 L BNN
F 1 "74LS125" H 4700 1450 50 0000 L TNN
-F 2 "" H 4650 1600 60 0001 C CNN
+F 2 "Sockets_DIP:DIP-14__300_ELL" H 4650 1600 60 0001 C CNN
F 3 "" H 4650 1600 60 0001 C CNN
1 4650 1600
-1 0 0 -1
@@ -743,7 +689,7 @@ U 1 1 3EBF7D33
P 3950 4200
F 0 "R9" V 4030 4200 50 0000 C CNN
F 1 "100" V 3950 4200 50 0000 C CNN
-F 2 "" H 3950 4200 60 0001 C CNN
+F 2 "Discret:R4" H 3950 4200 60 0001 C CNN
F 3 "" H 3950 4200 60 0001 C CNN
1 3950 4200
0 1 1 0
@@ -754,7 +700,7 @@ U 1 1 3EBF7D31
P 3950 3300
F 0 "R10" V 4030 3300 50 0000 C CNN
F 1 "100" V 3950 3300 50 0000 C CNN
-F 2 "" H 3950 3300 60 0001 C CNN
+F 2 "Discret:R4" H 3950 3300 60 0001 C CNN
F 3 "" H 3950 3300 60 0001 C CNN
1 3950 3300
0 1 1 0
@@ -765,7 +711,7 @@ U 1 1 4D528080
P 3950 2900
F 0 "R8" V 4030 2900 50 0000 C CNN
F 1 "100" V 3950 2900 50 0000 C CNN
-F 2 "" H 3950 2900 60 0001 C CNN
+F 2 "Discret:R4" H 3950 2900 60 0001 C CNN
F 3 "" H 3950 2900 60 0001 C CNN
1 3950 2900
0 1 1 0
@@ -776,7 +722,7 @@ U 1 1 4D52807F
P 3950 2600
F 0 "R7" V 4030 2600 50 0000 C CNN
F 1 "100" V 3950 2600 50 0000 C CNN
-F 2 "" H 3950 2600 60 0001 C CNN
+F 2 "Discret:R4" H 3950 2600 60 0001 C CNN
F 3 "" H 3950 2600 60 0001 C CNN
1 3950 2600
0 1 1 0
@@ -787,7 +733,7 @@ U 1 1 3EBF7D26
P 3950 2250
F 0 "R6" V 4030 2250 50 0000 C CNN
F 1 "100" V 3950 2250 50 0000 C CNN
-F 2 "" H 3950 2250 60 0001 C CNN
+F 2 "Discret:R4" H 3950 2250 60 0001 C CNN
F 3 "" H 3950 2250 60 0001 C CNN
1 3950 2250
0 1 1 0
@@ -798,7 +744,7 @@ U 1 1 3EBF7D22
P 3950 1600
F 0 "R4" V 4030 1600 50 0000 C CNN
F 1 "47" V 3950 1600 50 0000 C CNN
-F 2 "" H 3950 1600 60 0001 C CNN
+F 2 "Discret:R4" H 3950 1600 60 0001 C CNN
F 3 "" H 3950 1600 60 0001 C CNN
1 3950 1600
0 1 1 0
@@ -809,7 +755,7 @@ U 1 1 3EBF7D16
P 3950 1000
F 0 "R1" V 4030 1000 50 0000 C CNN
F 1 "100" V 3950 1000 50 0000 C CNN
-F 2 "" H 3950 1000 60 0001 C CNN
+F 2 "Discret:R4" H 3950 1000 60 0001 C CNN
F 3 "" H 3950 1000 60 0001 C CNN
1 3950 1000
0 1 1 0
@@ -820,7 +766,7 @@ U 1 1 3EBF7D04
P 1750 2800
F 0 "J1" H 1800 4150 70 0000 C CNN
F 1 "DB25MALE" H 1700 1450 70 0000 C CNN
-F 2 "" H 1750 2800 60 0001 C CNN
+F 2 "Connect:DB25M_CI" H 1750 2800 60 0001 C CNN
F 3 "" H 1750 2800 60 0001 C CNN
1 1750 2800
-1 0 0 -1
@@ -829,10 +775,10 @@ Wire Wire Line
9400 1000 9400 3500
Connection ~ 7650 1000
$Comp
-L GND #PWR?
+L GND #PWR017
U 1 1 5510FC05
P 4950 2000
-F 0 "#PWR?" H 4950 2000 30 0001 C CNN
+F 0 "#PWR017" H 4950 2000 30 0001 C CNN
F 1 "GND" H 4950 1930 30 0001 C CNN
F 2 "" H 4950 2000 60 0000 C CNN
F 3 "" H 4950 2000 60 0000 C CNN
@@ -844,9 +790,7 @@ Wire Wire Line
Wire Wire Line
5100 1600 5900 1600
Wire Wire Line
- 5900 1550 5900 1600
-Wire Wire Line
- 5900 1600 5900 1900
+ 5900 1550 5900 1900
Connection ~ 5900 1900
Connection ~ 5900 1600
Wire Wire Line
diff --git a/demos/test_pads_inside_pads/test_pads_inside_pads-cache.lib b/demos/test_pads_inside_pads/test_pads_inside_pads-cache.lib
index a84b5b2e11..7c107a8bb3 100644
--- a/demos/test_pads_inside_pads/test_pads_inside_pads-cache.lib
+++ b/demos/test_pads_inside_pads/test_pads_inside_pads-cache.lib
@@ -1,4 +1,4 @@
-EESchema-LIBRARY Version 2.3 Date: 19/12/2011 12:55:30
+EESchema-LIBRARY Version 2.3
#encoding utf-8
#
# CONN_1
@@ -6,6 +6,8 @@ EESchema-LIBRARY Version 2.3 Date: 19/12/2011 12:55:30
DEF ~CONN_1 P 0 30 N N 1 F N
F0 "P" 80 0 40 H V L CNN
F1 "CONN_1" 0 55 30 H I C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
DRAW
C 0 0 31 0 1 0 N
P 2 0 1 0 -30 0 -50 0 N
diff --git a/demos/test_pads_inside_pads/test_pads_inside_pads.cmp b/demos/test_pads_inside_pads/test_pads_inside_pads.cmp
deleted file mode 100644
index f5b3361cb8..0000000000
--- a/demos/test_pads_inside_pads/test_pads_inside_pads.cmp
+++ /dev/null
@@ -1,31 +0,0 @@
-Cmp-Mod V01 Created by CvPcb (2011-12-09 BZR 3290)-testing date = 11/12/2011 20:34:04
-
-BeginCmp
-TimeStamp = /4EDF7CC5;
-Reference = P1;
-ValeurCmp = CONN_1;
-IdModule = 1pin;
-EndCmp
-
-BeginCmp
-TimeStamp = /4EDF7CC0;
-Reference = P2;
-ValeurCmp = CONN_1;
-IdModule = 1pin;
-EndCmp
-
-BeginCmp
-TimeStamp = /4EE5056C;
-Reference = P3;
-ValeurCmp = CONN_1;
-IdModule = 1pin;
-EndCmp
-
-BeginCmp
-TimeStamp = /4EE5056D;
-Reference = P4;
-ValeurCmp = CONN_1;
-IdModule = 1pin;
-EndCmp
-
-EndListe
diff --git a/demos/test_pads_inside_pads/test_pads_inside_pads.sch b/demos/test_pads_inside_pads/test_pads_inside_pads.sch
index 4cb734cf45..f193dc4c59 100644
--- a/demos/test_pads_inside_pads/test_pads_inside_pads.sch
+++ b/demos/test_pads_inside_pads/test_pads_inside_pads.sch
@@ -1,4 +1,4 @@
-EESchema Schematic File Version 2 date 19/12/2011 12:55:30
+EESchema Schematic File Version 2
LIBS:power
LIBS:device
LIBS:transistors
@@ -29,9 +29,10 @@ LIBS:opto
LIBS:atmel
LIBS:contrib
LIBS:valves
-EELAYER 25 0
+LIBS:test_pads_inside_pads-cache
+EELAYER 25 0
EELAYER END
-$Descr A4 11700 8267
+$Descr A4 11693 8268
encoding utf-8
Sheet 1 1
Title ""
@@ -55,6 +56,8 @@ U 1 1 4EE5056D
P 4300 1450
F 0 "P4" H 4380 1450 40 0000 L CNN
F 1 "CONN_1" H 4300 1505 30 0001 C CNN
+F 2 "Connect:1pin" H 4300 1400 60 0000 C CNN
+F 3 "" H 4300 1450 60 0001 C CNN
1 4300 1450
1 0 0 -1
$EndComp
@@ -64,6 +67,8 @@ U 1 1 4EE5056C
P 3600 1450
F 0 "P3" H 3680 1450 40 0000 L CNN
F 1 "CONN_1" H 3600 1505 30 0001 C CNN
+F 2 "Connect:1pin" H 3600 1500 60 0000 C CNN
+F 3 "" H 3600 1450 60 0001 C CNN
1 3600 1450
-1 0 0 1
$EndComp
@@ -73,6 +78,8 @@ U 1 1 4EDF7CC5
P 3600 1750
F 0 "P1" H 3680 1750 40 0000 L CNN
F 1 "CONN_1" H 3600 1805 30 0001 C CNN
+F 2 "Connect:1pin" H 3600 1800 60 0000 C CNN
+F 3 "" H 3600 1750 60 0001 C CNN
1 3600 1750
-1 0 0 1
$EndComp
@@ -82,6 +89,8 @@ U 1 1 4EDF7CC0
P 4300 1750
F 0 "P2" H 4380 1750 40 0000 L CNN
F 1 "CONN_1" H 4300 1805 30 0001 C CNN
+F 2 "Connect:1pin" H 4300 1700 60 0000 C CNN
+F 3 "" H 4300 1750 60 0001 C CNN
1 4300 1750
1 0 0 -1
$EndComp
diff --git a/demos/test_xil_95108/carte_test-cache.lib b/demos/test_xil_95108/carte_test-cache.lib
index 40b3ad96af..a4ad919cda 100644
--- a/demos/test_xil_95108/carte_test-cache.lib
+++ b/demos/test_xil_95108/carte_test-cache.lib
@@ -353,8 +353,8 @@ $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 20 20 1 1 P
-X K 2 200 0 150 L 20 20 1 1 P
+X K 1 200 0 150 L 20 20 1 1 P
+X A 2 -200 0 150 R 20 20 1 1 P
ENDDRAW
ENDDEF
#
diff --git a/demos/test_xil_95108/carte_test.cmp b/demos/test_xil_95108/carte_test.cmp
deleted file mode 100644
index d429548870..0000000000
--- a/demos/test_xil_95108/carte_test.cmp
+++ /dev/null
@@ -1,297 +0,0 @@
-Cmp-Mod V01 Genere par PcbNew le 26/5/2003-7:55:8
-
-BeginCmp
-TimeStamp = 3EC23ABA;
-Reference = C1;
-ValeurCmp = 100nF;
-IdModule = SM1206;
-EndCmp
-
-BeginCmp
-TimeStamp = 3EC23B98;
-Reference = C2;
-ValeurCmp = 10uF;
-IdModule = CP6;
-EndCmp
-
-BeginCmp
-TimeStamp = 3EC23DCD;
-Reference = C3;
-ValeurCmp = 10uF;
-IdModule = CP6;
-EndCmp
-
-BeginCmp
-TimeStamp = 3EC242AD;
-Reference = C4;
-ValeurCmp = 22pF;
-IdModule = SM1206;
-EndCmp
-
-BeginCmp
-TimeStamp = 3EC242AD;
-Reference = C5;
-ValeurCmp = 22pF;
-IdModule = SM1206;
-EndCmp
-
-BeginCmp
-TimeStamp = 3EC243D6;
-Reference = C6;
-ValeurCmp = 47uF;
-IdModule = CP6;
-EndCmp
-
-BeginCmp
-TimeStamp = 3EC4C7DB;
-Reference = C7;
-ValeurCmp = 100nF;
-IdModule = SM1206;
-EndCmp
-
-BeginCmp
-TimeStamp = 3EC4C7DB;
-Reference = C8;
-ValeurCmp = 100nF;
-IdModule = SM1206;
-EndCmp
-
-BeginCmp
-TimeStamp = 3EC4C7DB;
-Reference = C10;
-ValeurCmp = 100nF;
-IdModule = SM1206;
-EndCmp
-
-BeginCmp
-TimeStamp = 3EC4C7DB;
-Reference = C11;
-ValeurCmp = 100nF;
-IdModule = SM1206;
-EndCmp
-
-BeginCmp
-TimeStamp = 3EC4C7DB;
-Reference = C12;
-ValeurCmp = 100nF;
-IdModule = SM1206;
-EndCmp
-
-BeginCmp
-TimeStamp = 3ECDDCAD;
-Reference = C13;
-ValeurCmp = 10uF;
-IdModule = CP6;
-EndCmp
-
-BeginCmp
-TimeStamp = 3ECDDACB;
-Reference = C14;
-ValeurCmp = 10uF;
-IdModule = CP6;
-EndCmp
-
-BeginCmp
-TimeStamp = 3EC243C8;
-Reference = D1;
-ValeurCmp = 1N4004;
-IdModule = D5;
-EndCmp
-
-BeginCmp
-TimeStamp = 3EC4D08F;
-Reference = D2;
-ValeurCmp = LED;
-IdModule = LEDV;
-EndCmp
-
-BeginCmp
-TimeStamp = 3EC4D08F;
-Reference = D3;
-ValeurCmp = LED;
-IdModule = LEDV;
-EndCmp
-
-BeginCmp
-TimeStamp = 3ECDDCDD;
-Reference = D4;
-ValeurCmp = 1N4004;
-IdModule = D5;
-EndCmp
-
-BeginCmp
-TimeStamp = 3EC4C60F;
-Reference = J1;
-ValeurCmp = DB25;
-IdModule = DB25FC;
-EndCmp
-
-BeginCmp
-TimeStamp = 3ECDEBEA;
-Reference = J2;
-ValeurCmp = DB9FEM;
-IdModule = DB9F_CI_INVERT;
-EndCmp
-
-BeginCmp
-TimeStamp = 3EC4C49F;
-Reference = K1;
-ValeurCmp = CONN_3;
-IdModule = SIL-3;
-EndCmp
-
-BeginCmp
-TimeStamp = 3EC243AC;
-Reference = P2;
-ValeurCmp = CONN_3;
-IdModule = bornier3;
-EndCmp
-
-BeginCmp
-TimeStamp = 3EC2446D;
-Reference = P3;
-ValeurCmp = CONN_2;
-IdModule = bornier2;
-EndCmp
-
-BeginCmp
-TimeStamp = 3ECB3F5E;
-Reference = P4;
-ValeurCmp = CONN_2X2;
-IdModule = head_2x2;
-EndCmp
-
-BeginCmp
-TimeStamp = 3EC242C1;
-Reference = R1;
-ValeurCmp = 100K;
-IdModule = R4;
-EndCmp
-
-BeginCmp
-TimeStamp = 3EC4D082;
-Reference = R2;
-ValeurCmp = 330;
-IdModule = R4;
-EndCmp
-
-BeginCmp
-TimeStamp = 3EC4D082;
-Reference = R3;
-ValeurCmp = 330;
-IdModule = R4;
-EndCmp
-
-BeginCmp
-TimeStamp = 3EC8B970;
-Reference = R4;
-ValeurCmp = 4,7K;
-IdModule = R4;
-EndCmp
-
-BeginCmp
-TimeStamp = 3EC8B978;
-Reference = R5;
-ValeurCmp = 4,7K;
-IdModule = R4;
-EndCmp
-
-BeginCmp
-TimeStamp = 3ECDDB57;
-Reference = R6;
-ValeurCmp = 1,1k;
-IdModule = R4;
-EndCmp
-
-BeginCmp
-TimeStamp = 3ECDDB60;
-Reference = R7;
-ValeurCmp = 1,1K;
-IdModule = R4;
-EndCmp
-
-BeginCmp
-TimeStamp = 3ECDDB43;
-Reference = R8;
-ValeurCmp = 2,2K;
-IdModule = R4;
-EndCmp
-
-BeginCmp
-TimeStamp = 3ECDDB4B;
-Reference = R9;
-ValeurCmp = 2,2K;
-IdModule = R4;
-EndCmp
-
-BeginCmp
-TimeStamp = 3ECDDB6D;
-Reference = R10;
-ValeurCmp = 75;
-IdModule = R4;
-EndCmp
-
-BeginCmp
-TimeStamp = 3EC8B876;
-Reference = SW1;
-ValeurCmp = SW_PUSH;
-IdModule = SW_PUSH;
-EndCmp
-
-BeginCmp
-TimeStamp = 3EC8B882;
-Reference = SW2;
-ValeurCmp = SW_PUSH;
-IdModule = SW_PUSH;
-EndCmp
-
-BeginCmp
-TimeStamp = 3EC238E5;
-Reference = U1;
-ValeurCmp = TDA8702;
-IdModule = 16DIP-ELL300;
-EndCmp
-
-BeginCmp
-TimeStamp = 3EC230AD;
-Reference = U2;
-ValeurCmp = XC95108PC84;
-IdModule = PLCC84;
-EndCmp
-
-BeginCmp
-TimeStamp = 3EC2436D;
-Reference = U3;
-ValeurCmp = LM7805;
-IdModule = LM78XX;
-EndCmp
-
-BeginCmp
-TimeStamp = 3EC4C318;
-Reference = U4;
-ValeurCmp = 74HC04;
-IdModule = 14DIP-ELL300;
-EndCmp
-
-BeginCmp
-TimeStamp = 3EC4C463;
-Reference = U5;
-ValeurCmp = RAM_32KO;
-IdModule = 28DIP-ELL300-600;
-EndCmp
-
-BeginCmp
-TimeStamp = 3ECDDB8B;
-Reference = U6;
-ValeurCmp = LM318N;
-IdModule = 8DIP-ELL300;
-EndCmp
-
-BeginCmp
-TimeStamp = 3EC2428D;
-Reference = X1;
-ValeurCmp = 10MHz;
-IdModule = HC-18UH;
-EndCmp
-
-EndListe
diff --git a/demos/test_xil_95108/carte_test.sch b/demos/test_xil_95108/carte_test.sch
index b5e13f48ae..826ed41b01 100644
--- a/demos/test_xil_95108/carte_test.sch
+++ b/demos/test_xil_95108/carte_test.sch
@@ -33,7 +33,7 @@ L PWR_FLAG #FLG01
U 1 1 3ECDDD9A
P 2400 7750
F 0 "#FLG01" H 2400 8020 30 0001 C CNN
-F 1 "PWR_FLAG" H 2400 7980 30 0000 C CNN
+F 1 "PWR_FLAG" H 2400 7950 30 0000 C CNN
F 2 "" H 2400 7750 60 0001 C CNN
F 3 "" H 2400 7750 60 0001 C CNN
1 2400 7750
diff --git a/demos/video/bus_pci.sch b/demos/video/bus_pci.sch
index d3b9276388..0d613b4ccb 100644
--- a/demos/video/bus_pci.sch
+++ b/demos/video/bus_pci.sch
@@ -1,24 +1,6 @@
EESchema Schematic File Version 2
+LIBS:video_schlib
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:analog_switches
-LIBS:motorola
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:philips
-LIBS:cypress
-LIBS:siliconi
LIBS:video-cache
EELAYER 25 0
EELAYER END
@@ -1037,7 +1019,7 @@ U 1 1 269C6109
P 3300 4200
F 0 "BUS1" H 3300 7400 60 0000 C CNN
F 1 "BUSPCI_5V" H 3300 1000 60 0000 C CNN
-F 2 "connect:BUSPCI" H 3300 4200 60 0001 C CNN
+F 2 "Connect:BUSPCI" H 3300 4200 60 0001 C CNN
F 3 "" H 3300 4200 60 0001 C CNN
1 3300 4200
1 0 0 -1
@@ -1059,7 +1041,7 @@ U 1 1 C8AF8090
P 14350 1300
F 0 "RR1" H 14400 1850 70 0000 C CNN
F 1 "8x10K" V 14380 1300 70 0000 C CNN
-F 2 "connect:SIL-9" H 14350 1300 60 0001 C CNN
+F 2 "Connect:SIL-9" H 14350 1300 60 0001 C CNN
F 3 "" H 14350 1300 60 0001 C CNN
1 14350 1300
1 0 0 -1
@@ -1070,7 +1052,7 @@ U 1 1 C8B01EF2
P 14350 2300
F 0 "RR2" H 14400 2850 70 0000 C CNN
F 1 "8x10K" V 14380 2300 70 0000 C CNN
-F 2 "connect:SIL-9" H 14350 2300 60 0001 C CNN
+F 2 "Connect:SIL-9" H 14350 2300 60 0001 C CNN
F 3 "" H 14350 2300 60 0001 C CNN
1 14350 2300
1 0 0 -1
@@ -1081,7 +1063,7 @@ U 1 1 C8B23B9F
P 14350 3300
F 0 "RR3" H 14400 3850 70 0000 C CNN
F 1 "8x10K" V 14380 3300 70 0000 C CNN
-F 2 "connect:SIL-9" H 14350 3300 60 0001 C CNN
+F 2 "Connect:SIL-9" H 14350 3300 60 0001 C CNN
F 3 "" H 14350 3300 60 0001 C CNN
1 14350 3300
1 0 0 -1
@@ -1092,7 +1074,7 @@ U 1 1 C8B2B4CE
P 14350 4300
F 0 "RR4" H 14400 4850 70 0000 C CNN
F 1 "8x10K" V 14380 4300 70 0000 C CNN
-F 2 "discret:r_pack8" H 14350 4300 60 0001 C CNN
+F 2 "Discret:r_pack8" H 14350 4300 60 0001 C CNN
F 3 "" H 14350 4300 60 0001 C CNN
1 14350 4300
1 0 0 -1
@@ -1103,7 +1085,7 @@ U 1 1 C8B2B4E3
P 14350 5300
F 0 "RR5" H 14400 5850 70 0000 C CNN
F 1 "8x10K" V 14380 5300 70 0000 C CNN
-F 2 "discret:r_pack8" H 14350 5300 60 0001 C CNN
+F 2 "Discret:r_pack8" H 14350 5300 60 0001 C CNN
F 3 "" H 14350 5300 60 0001 C CNN
1 14350 5300
1 0 0 -1
@@ -1114,7 +1096,7 @@ U 1 1 C93123CE
P 14350 6300
F 0 "RR6" H 14400 6850 70 0000 C CNN
F 1 "8x10K" V 14380 6300 70 0000 C CNN
-F 2 "connect:SIL-9" H 14350 6300 60 0001 C CNN
+F 2 "Connect:SIL-9" H 14350 6300 60 0001 C CNN
F 3 "" H 14350 6300 60 0001 C CNN
1 14350 6300
1 0 0 -1
@@ -1125,7 +1107,7 @@ U 1 1 C931248E
P 14350 7300
F 0 "RR7" H 14400 7850 70 0000 C CNN
F 1 "8x10K" V 14380 7300 70 0000 C CNN
-F 2 "discret:r_pack8" H 14350 7300 60 0001 C CNN
+F 2 "Discret:r_pack8" H 14350 7300 60 0001 C CNN
F 3 "" H 14350 7300 60 0001 C CNN
1 14350 7300
1 0 0 -1
@@ -1136,7 +1118,7 @@ U 1 1 C9363A3F
P 14350 8300
F 0 "RR8" H 14400 8850 70 0000 C CNN
F 1 "8x10K" V 14380 8300 70 0000 C CNN
-F 2 "connect:SIL-9" H 14350 8300 60 0001 C CNN
+F 2 "Connect:SIL-9" H 14350 8300 60 0001 C CNN
F 3 "" H 14350 8300 60 0001 C CNN
1 14350 8300
1 0 0 -1
@@ -1147,7 +1129,7 @@ U 1 1 26A799F7
P 11900 7650
F 0 "W2" H 11900 7750 60 0000 C CNN
F 1 "FLOAT#" H 11900 7550 60 0000 C CNN
-F 2 "connect:GS2" H 11900 7650 60 0001 C CNN
+F 2 "Connect:GS2" H 11900 7650 60 0001 C CNN
F 3 "" H 11900 7650 60 0001 C CNN
1 11900 7650
0 -1 -1 0
@@ -1158,7 +1140,7 @@ U 1 1 26A79A10
P 11900 8550
F 0 "W3" H 11900 8610 40 0000 C CNN
F 1 "SERNV" H 11900 8480 40 0000 C CNN
-F 2 "connect:GS2" H 11900 8550 60 0001 C CNN
+F 2 "Connect:GS2" H 11900 8550 60 0001 C CNN
F 3 "" H 11900 8550 60 0001 C CNN
1 11900 8550
0 -1 -1 0
@@ -1169,7 +1151,7 @@ U 1 1 26A799ED
P 12050 6450
F 0 "W1" H 12050 6550 60 0000 C CNN
F 1 "16/32" H 12050 6350 60 0000 C CNN
-F 2 "connect:GS2" H 12050 6450 60 0001 C CNN
+F 2 "Connect:GS2" H 12050 6450 60 0001 C CNN
F 3 "" H 12050 6450 60 0001 C CNN
1 12050 6450
0 -1 -1 0
diff --git a/demos/video/esvideo.sch b/demos/video/esvideo.sch
index 8da524088b..8c7603f72e 100644
--- a/demos/video/esvideo.sch
+++ b/demos/video/esvideo.sch
@@ -1,24 +1,6 @@
EESchema Schematic File Version 2
+LIBS:video_schlib
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:analog_switches
-LIBS:motorola
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:philips
-LIBS:cypress
-LIBS:siliconi
LIBS:video-cache
EELAYER 25 0
EELAYER END
diff --git a/demos/video/graphic.sch b/demos/video/graphic.sch
index 1410ca5df9..15db3a9233 100644
--- a/demos/video/graphic.sch
+++ b/demos/video/graphic.sch
@@ -1,24 +1,6 @@
EESchema Schematic File Version 2
+LIBS:video_schlib
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:analog_switches
-LIBS:motorola
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:philips
-LIBS:cypress
-LIBS:siliconi
LIBS:video-cache
EELAYER 25 0
EELAYER END
@@ -65,7 +47,7 @@ U 1 1 34E1751D
P 4850 800
F 0 "P12" V 5050 800 50 0000 C CNN
F 1 "CONN_1" V 4950 800 50 0000 C CNN
-F 2 "connect:TESTPOINT" H 4850 800 60 0001 C CNN
+F 2 "Connect:TESTPOINT" H 4850 800 60 0001 C CNN
F 3 "" H 4850 800 60 0001 C CNN
1 4850 800
0 -1 -1 0
@@ -83,7 +65,7 @@ U 1 1 34E1718B
P 5850 5500
F 0 "P9" H 5850 5400 50 0000 C CNN
F 1 "CONN_1" H 5850 5300 50 0000 C CNN
-F 2 "connect:PINTST" H 5850 5500 60 0001 C CNN
+F 2 "Connect:PINTST" H 5850 5500 60 0001 C CNN
F 3 "" H 5850 5500 60 0001 C CNN
1 5850 5500
1 0 0 -1
@@ -94,7 +76,7 @@ U 1 1 4BF036DA
P 6400 3400
F 0 "P11" H 6400 3550 50 0000 C CNN
F 1 "CONN_1" H 6400 3450 50 0000 C CNN
-F 2 "connect:PINTST" H 6400 3400 60 0001 C CNN
+F 2 "Connect:PINTST" H 6400 3400 60 0001 C CNN
F 3 "" H 6400 3400 60 0001 C CNN
1 6400 3400
1 0 0 -1
@@ -105,7 +87,7 @@ U 1 1 4BF036D9
P 6400 2800
F 0 "P10" H 6400 2950 50 0000 C CNN
F 1 "CONN_1" H 6400 2850 50 0000 C CNN
-F 2 "connect:PINTST" H 6400 2800 60 0001 C CNN
+F 2 "Connect:PINTST" H 6400 2800 60 0001 C CNN
F 3 "" H 6400 2800 60 0001 C CNN
1 6400 2800
1 0 0 -1
@@ -579,7 +561,7 @@ U 1 1 33A7E0C8
P 3550 750
F 0 "P4" V 3500 750 40 0000 C CNN
F 1 "CONN_2" V 3600 750 40 0000 C CNN
-F 2 "connect:SIL-2" H 3550 750 60 0001 C CNN
+F 2 "Connect:SIL-2" H 3550 750 60 0001 C CNN
F 3 "" H 3550 750 60 0001 C CNN
1 3550 750
0 -1 -1 0
@@ -888,7 +870,7 @@ U 1 1 2D5AA041
P 7700 2850
F 0 "D6" H 7700 2600 60 0000 C CNN
F 1 "LED" H 7720 2700 60 0000 C CNN
-F 2 "discret:LEDV" H 7700 2850 60 0001 C CNN
+F 2 "Discret:LEDV" H 7700 2850 60 0001 C CNN
F 3 "" H 7700 2850 60 0001 C CNN
1 7700 2850
-1 0 0 1
@@ -1246,7 +1228,7 @@ U 1 1 B3BF4EDE
P 7400 5800
F 0 "C49" H 7550 5900 50 0000 C CNN
F 1 "22pF" H 7550 5700 50 0000 C CNN
-F 2 "discret:C1" H 7400 5800 60 0001 C CNN
+F 2 "Discret:C1" H 7400 5800 60 0001 C CNN
F 3 "" H 7400 5800 60 0001 C CNN
1 7400 5800
1 0 0 -1
@@ -1257,7 +1239,7 @@ U 1 1 B3BF4EE8
P 8200 5800
F 0 "C50" H 8350 5900 50 0000 C CNN
F 1 "22pF" H 8350 5700 50 0000 C CNN
-F 2 "discret:C1" H 8200 5800 60 0001 C CNN
+F 2 "Discret:C1" H 8200 5800 60 0001 C CNN
F 3 "" H 8200 5800 60 0001 C CNN
1 8200 5800
1 0 0 -1
@@ -1279,7 +1261,7 @@ U 1 1 B3BF4ED4
P 7800 5300
F 0 "X1" H 7800 5450 60 0000 C CNN
F 1 "10MHz" H 7800 5150 60 0000 C CNN
-F 2 "discret:HC-18UV" H 7800 5300 60 0001 C CNN
+F 2 "Discret:HC-18UV" H 7800 5300 60 0001 C CNN
F 3 "" H 7800 5300 60 0001 C CNN
1 7800 5300
1 0 0 -1
diff --git a/demos/video/modul.sch b/demos/video/modul.sch
index 7842242c47..07705ae95a 100644
--- a/demos/video/modul.sch
+++ b/demos/video/modul.sch
@@ -1,24 +1,6 @@
EESchema Schematic File Version 2
+LIBS:video_schlib
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:analog_switches
-LIBS:motorola
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:philips
-LIBS:cypress
-LIBS:siliconi
LIBS:video-cache
EELAYER 25 0
EELAYER END
@@ -748,7 +730,7 @@ U 1 1 22760FA8
P 2100 5350
F 0 "CV1" H 2230 5270 50 0000 C CNN
F 1 "5/30pF" H 2250 5190 50 0000 C CNN
-F 2 "discret:CV3-30PF" H 2100 5350 60 0001 C CNN
+F 2 "Discret:CV3-30PF" H 2100 5350 60 0001 C CNN
F 3 "" H 2100 5350 60 0001 C CNN
1 2100 5350
1 0 0 -1
@@ -937,7 +919,7 @@ U 1 1 22760FA3
P 2100 4800
F 0 "X3" V 2300 4900 60 0000 C CNN
F 1 "4.433618MHz" V 1900 4450 60 0000 C CNN
-F 2 "discret:HC-18UH" H 2100 4800 60 0001 C CNN
+F 2 "Discret:HC-18UH" H 2100 4800 60 0001 C CNN
F 3 "" H 2100 4800 60 0001 C CNN
1 2100 4800
0 -1 -1 0
diff --git a/demos/video/muxdata.sch b/demos/video/muxdata.sch
index 3eff0f3850..4b310caf34 100644
--- a/demos/video/muxdata.sch
+++ b/demos/video/muxdata.sch
@@ -1,24 +1,6 @@
EESchema Schematic File Version 2
+LIBS:video_schlib
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:analog_switches
-LIBS:motorola
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:philips
-LIBS:cypress
-LIBS:siliconi
LIBS:video-cache
EELAYER 25 0
EELAYER END
diff --git a/demos/video/pal-ntsc.sch b/demos/video/pal-ntsc.sch
index d0beaa6969..d8b4a2d45d 100644
--- a/demos/video/pal-ntsc.sch
+++ b/demos/video/pal-ntsc.sch
@@ -1,24 +1,6 @@
EESchema Schematic File Version 2
+LIBS:video_schlib
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:analog_switches
-LIBS:motorola
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:philips
-LIBS:cypress
-LIBS:siliconi
LIBS:video-cache
EELAYER 25 0
EELAYER END
@@ -423,7 +405,7 @@ U 1 1 A9CA7F7F
P 3850 3700
F 0 "D1" H 3850 3800 50 0000 C CNN
F 1 "BAT46" H 3850 3600 50 0000 C CNN
-F 2 "discret:D3" H 3850 3700 60 0001 C CNN
+F 2 "Discret:D3" H 3850 3700 60 0001 C CNN
F 3 "" H 3850 3700 60 0001 C CNN
1 3850 3700
1 0 0 -1
@@ -434,7 +416,7 @@ U 1 1 A9CA7F84
P 3850 3300
F 0 "D2" H 3850 3200 50 0000 C CNN
F 1 "BAT46" H 3850 3400 50 0000 C CNN
-F 2 "discret:D3" H 3850 3300 60 0001 C CNN
+F 2 "Discret:D3" H 3850 3300 60 0001 C CNN
F 3 "" H 3850 3300 60 0001 C CNN
1 3850 3300
-1 0 0 1
@@ -445,7 +427,7 @@ U 1 1 A9CA7F8E
P 4050 6000
F 0 "D3" H 4050 6100 60 0000 C CNN
F 1 "BAT46" H 4050 5900 60 0000 C CNN
-F 2 "discret:D3" H 4050 6000 60 0001 C CNN
+F 2 "Discret:D3" H 4050 6000 60 0001 C CNN
F 3 "" H 4050 6000 60 0001 C CNN
1 4050 6000
1 0 0 -1
@@ -456,7 +438,7 @@ U 1 1 A9CA7F93
P 4050 5600
F 0 "D4" H 4050 5700 60 0000 C CNN
F 1 "BAT46" H 4050 5500 60 0000 C CNN
-F 2 "discret:D3" H 4050 5600 60 0001 C CNN
+F 2 "Discret:D3" H 4050 5600 60 0001 C CNN
F 3 "" H 4050 5600 60 0001 C CNN
1 4050 5600
-1 0 0 -1
@@ -588,7 +570,7 @@ U 1 1 B15DA8C0
P 5250 2100
F 0 "X2" H 5250 2250 60 0000 C CNN
F 1 "30MHz" H 5250 1950 60 0000 C CNN
-F 2 "discret:HC-18UV" H 5250 2100 60 0001 C CNN
+F 2 "Discret:HC-18UV" H 5250 2100 60 0001 C CNN
F 3 "" H 5250 2100 60 0001 C CNN
1 5250 2100
1 0 0 -1
diff --git a/demos/video/rams.sch b/demos/video/rams.sch
index 3360eb55cf..cc47c98cf6 100644
--- a/demos/video/rams.sch
+++ b/demos/video/rams.sch
@@ -1,24 +1,6 @@
EESchema Schematic File Version 2
+LIBS:video_schlib
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:analog_switches
-LIBS:motorola
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:philips
-LIBS:cypress
-LIBS:siliconi
LIBS:video-cache
EELAYER 25 0
EELAYER END
diff --git a/demos/video/video.sch b/demos/video/video.sch
index fc2a81a899..9f4d059c8c 100644
--- a/demos/video/video.sch
+++ b/demos/video/video.sch
@@ -1,24 +1,6 @@
EESchema Schematic File Version 2
+LIBS:video_schlib
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:analog_switches
-LIBS:motorola
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:philips
-LIBS:cypress
-LIBS:siliconi
LIBS:video-cache
EELAYER 25 0
EELAYER END
@@ -266,7 +248,7 @@ U 1 1 84DFBB8F
P 15350 4050
F 0 "J4" H 15350 4600 70 0000 C CNN
F 1 "DB9FEM" H 15350 3500 70 0000 C CNN
-F 2 "connect:DB9FC" H 15350 4050 60 0001 C CNN
+F 2 "Connect:DB9FC" H 15350 4050 60 0001 C CNN
F 3 "" H 15350 4050 60 0001 C CNN
1 15350 4050
1 0 0 1
@@ -299,7 +281,7 @@ U 1 1 30705D02
P 15350 2700
F 0 "P8" H 15360 2820 60 0000 C CNN
F 1 "BNC" V 15460 2640 40 0000 C CNN
-F 2 "discret:SUBCLICK" H 15350 2700 60 0001 C CNN
+F 2 "Discret:SUBCLICK" H 15350 2700 60 0001 C CNN
F 3 "" H 15350 2700 60 0001 C CNN
1 15350 2700
1 0 0 -1
@@ -436,7 +418,7 @@ U 1 1 32F9F1AD
P 12100 3400
F 0 "P3" H 12110 3520 60 0000 C CNN
F 1 "BNC" V 12210 3340 40 0000 C CNN
-F 2 "discret:SUBCLICK" H 12100 3400 60 0001 C CNN
+F 2 "Discret:SUBCLICK" H 12100 3400 60 0001 C CNN
F 3 "" H 12100 3400 60 0001 C CNN
1 12100 3400
1 0 0 -1
@@ -447,7 +429,7 @@ U 1 1 32F9F1A3
P 12100 2600
F 0 "P2" H 12110 2720 60 0000 C CNN
F 1 "BNC" V 12210 2540 40 0000 C CNN
-F 2 "discret:SUBCLICK" H 12100 2600 60 0001 C CNN
+F 2 "Discret:SUBCLICK" H 12100 2600 60 0001 C CNN
F 3 "" H 12100 2600 60 0001 C CNN
1 12100 2600
1 0 0 -1
@@ -458,7 +440,7 @@ U 1 1 32F9F198
P 12100 1800
F 0 "P1" H 12110 1920 60 0000 C CNN
F 1 "BNC" V 12210 1740 40 0000 C CNN
-F 2 "discret:SUBCLICK" H 12100 1800 60 0001 C CNN
+F 2 "Discret:SUBCLICK" H 12100 1800 60 0001 C CNN
F 3 "" H 12100 1800 60 0001 C CNN
1 12100 1800
1 0 0 -1
diff --git a/pcbnew/board_items_to_polygon_shape_transform.cpp b/pcbnew/board_items_to_polygon_shape_transform.cpp
index 36b5afd96c..8e7577e6b7 100644
--- a/pcbnew/board_items_to_polygon_shape_transform.cpp
+++ b/pcbnew/board_items_to_polygon_shape_transform.cpp
@@ -421,9 +421,9 @@ void TEXTE_PCB::TransformShapeWithClearanceToPolygonSet(
* to the real clearance value (usually near from 1.0)
*/
void DRAWSEGMENT::TransformShapeWithClearanceToPolygon( SHAPE_POLY_SET& aCornerBuffer,
- int aClearanceValue,
- int aCircleToSegmentsCount,
- double aCorrectionFactor ) const
+ int aClearanceValue,
+ int aCircleToSegmentsCount,
+ double aCorrectionFactor ) const
{
// The full width of the lines to create:
int linewidth = m_Width + (2 * aClearanceValue);
@@ -455,8 +455,6 @@ void DRAWSEGMENT::TransformShapeWithClearanceToPolygon( SHAPE_POLY_SET& aCornerB
MODULE* module = GetParentModule(); // NULL for items not in footprints
double orientation = module ? module->GetOrientation() : 0.0;
- aCornerBuffer.NewOutline();
-
// Build the polygon with the actual position and orientation:
std::vector< wxPoint> poly;
poly = GetPolyPoints();
@@ -470,6 +468,13 @@ void DRAWSEGMENT::TransformShapeWithClearanceToPolygon( SHAPE_POLY_SET& aCornerB
// Generate polygons for the outline + clearance
// This code is compatible with a polygon with holes linked to external outline
// by overlapping segments.
+
+ // Insert the initial polygon:
+ aCornerBuffer.NewOutline();
+
+ for( unsigned ii = 0; ii < poly.size(); ii++ )
+ aCornerBuffer.Append( poly[ii].x, poly[ii].y );
+
if( linewidth ) // Add thick outlines
{
CPolyPt corner1( poly[poly.size()-1] );
@@ -487,13 +492,6 @@ void DRAWSEGMENT::TransformShapeWithClearanceToPolygon( SHAPE_POLY_SET& aCornerB
corner1 = corner2;
}
}
-
- // Polygon for the inside
- for( unsigned ii = 0; ii < poly.size(); ii++ )
- {
- CPolyPt corner( poly[ii] );
- aCornerBuffer.Append( corner.x, corner.y );
- }
}
break;