diff --git a/drafter_28/annotations/C325_D1_P1.xml b/drafter_28/annotations/C325_D1_P1.xml
index 0f30d8ef46d90b4c9ff503a47a6cc344a52a8c79..12e7587bcc2ce644d47de9b9a570807b489fd26f 100644
--- a/drafter_28/annotations/C325_D1_P1.xml
+++ b/drafter_28/annotations/C325_D1_P1.xml
@@ -6,8 +6,8 @@
CGHD
- 1000
- 1000
+ 3000
+ 2000
3
0
diff --git a/drafter_28/annotations/C325_D1_P2.xml b/drafter_28/annotations/C325_D1_P2.xml
index 2bce05277c92e0b4b24a07bc6aa08992da6f5a9a..b0572a544934997bec17db903cf46d1db2cbb999 100644
--- a/drafter_28/annotations/C325_D1_P2.xml
+++ b/drafter_28/annotations/C325_D1_P2.xml
@@ -6,8 +6,8 @@
CGHD
- 1000
- 1000
+ 3000
+ 2000
3
0
diff --git a/drafter_28/annotations/C325_D1_P3.xml b/drafter_28/annotations/C325_D1_P3.xml
index bf9a0e25ff8ad9fe9c328efa96d5a0d71373cb40..e577a2b1601cc64dcb9c6f2b681ba43e7584b423 100644
--- a/drafter_28/annotations/C325_D1_P3.xml
+++ b/drafter_28/annotations/C325_D1_P3.xml
@@ -6,8 +6,8 @@
CGHD
- 1000
- 1000
+ 3000
+ 2000
3
0
diff --git a/drafter_28/annotations/C325_D1_P4.xml b/drafter_28/annotations/C325_D1_P4.xml
index 95745263e7780e25a0dbfc980070a6e462fff0e6..369f3edd4e0fc57eb1f91b1fcb3203435783a2f2 100644
--- a/drafter_28/annotations/C325_D1_P4.xml
+++ b/drafter_28/annotations/C325_D1_P4.xml
@@ -6,8 +6,8 @@
CGHD
- 1000
- 1000
+ 3000
+ 2000
3
0
diff --git a/drafter_28/annotations/C325_D2_P1.xml b/drafter_28/annotations/C325_D2_P1.xml
index d20b8c606ddfc2d97d52cc19e17e4726ff38d9d2..e771a3bb272970e674a51ae6c171e1b1869749f8 100644
--- a/drafter_28/annotations/C325_D2_P1.xml
+++ b/drafter_28/annotations/C325_D2_P1.xml
@@ -6,8 +6,8 @@
CGHD
- 1000
- 1000
+ 3000
+ 2000
3
0
diff --git a/drafter_28/annotations/C325_D2_P2.xml b/drafter_28/annotations/C325_D2_P2.xml
index 9ba01b506fbbe15ded4855080af9b8bc92c13439..5fcc0281f7d44cfd28938cd953c32fcdc81999b4 100644
--- a/drafter_28/annotations/C325_D2_P2.xml
+++ b/drafter_28/annotations/C325_D2_P2.xml
@@ -6,8 +6,8 @@
CGHD
- 1000
- 1000
+ 3000
+ 2000
3
0
diff --git a/drafter_28/annotations/C325_D2_P3.xml b/drafter_28/annotations/C325_D2_P3.xml
index 2700fa6b1140450ff235de6a65dad64c7ee5ed64..0e47538276d62b652b684f34b4914a10503390bb 100644
--- a/drafter_28/annotations/C325_D2_P3.xml
+++ b/drafter_28/annotations/C325_D2_P3.xml
@@ -6,8 +6,8 @@
CGHD
- 1000
- 1000
+ 3000
+ 2000
3
0
diff --git a/drafter_28/annotations/C325_D2_P4.xml b/drafter_28/annotations/C325_D2_P4.xml
index a755d77af01d605428b3c8bc94c65fa6c2180a22..56d6bc3e25cde81161dc5436b1af309bb976b9bc 100644
--- a/drafter_28/annotations/C325_D2_P4.xml
+++ b/drafter_28/annotations/C325_D2_P4.xml
@@ -6,8 +6,8 @@
CGHD
- 1000
- 1000
+ 3000
+ 2000
3
0
diff --git a/drafter_28/annotations/C326_D1_P1.xml b/drafter_28/annotations/C326_D1_P1.xml
index 80b91c971bd29d3d71b9a5abd93ff559db79c5dc..c2f30c503f084f1db2e5ac08d679c992c35caaed 100644
--- a/drafter_28/annotations/C326_D1_P1.xml
+++ b/drafter_28/annotations/C326_D1_P1.xml
@@ -6,8 +6,8 @@
CGHD
- 1000
- 1000
+ 3000
+ 2000
3
0
@@ -56,11 +56,12 @@
0
0
- 2293
- 1155
+ 2294
+ 1156
2411
1231
+ 180
+
+
+
diff --git a/drafter_28/annotations/C326_D1_P2.xml b/drafter_28/annotations/C326_D1_P2.xml
index 7ef9bf0678f4fbfc1f84d606fbbed8ccdbb1d762..e0cc090ff6aeca63f7a48a735a4b8db8f4b3ad7d 100644
--- a/drafter_28/annotations/C326_D1_P2.xml
+++ b/drafter_28/annotations/C326_D1_P2.xml
@@ -6,8 +6,8 @@
CGHD
- 1000
- 1000
+ 3000
+ 2000
3
0
diff --git a/drafter_28/annotations/C326_D1_P3.xml b/drafter_28/annotations/C326_D1_P3.xml
index d86383df1d651e1c6555851eefad2c35f7e3c967..8570b5403747ea3e88190ae8d20dff1a92be3ae2 100644
--- a/drafter_28/annotations/C326_D1_P3.xml
+++ b/drafter_28/annotations/C326_D1_P3.xml
@@ -6,8 +6,8 @@
CGHD
- 1000
- 1000
+ 3000
+ 2000
3
0
diff --git a/drafter_28/annotations/C326_D1_P4.xml b/drafter_28/annotations/C326_D1_P4.xml
index 79d50381199014e683560446dd8faa288bc29532..15e67ae406b125751fcc5f08701cd98d2cd58ec3 100644
--- a/drafter_28/annotations/C326_D1_P4.xml
+++ b/drafter_28/annotations/C326_D1_P4.xml
@@ -6,8 +6,8 @@
CGHD
- 1000
- 1000
+ 3000
+ 2000
3
0
diff --git a/drafter_28/annotations/C326_D2_P1.xml b/drafter_28/annotations/C326_D2_P1.xml
index 06ac4b69aa17bb9bbfa251c0f8b36d12864eae55..b95556822d6a2229516d91f9879f515046571661 100644
--- a/drafter_28/annotations/C326_D2_P1.xml
+++ b/drafter_28/annotations/C326_D2_P1.xml
@@ -6,8 +6,8 @@
CGHD
- 1000
- 1000
+ 3000
+ 2000
3
0
diff --git a/drafter_28/annotations/C326_D2_P2.xml b/drafter_28/annotations/C326_D2_P2.xml
index 4fb60517c09f22fff323c7f652a6d0b82df1e018..2374cd2ba3736b2824f274d9e4e0c46502b90353 100644
--- a/drafter_28/annotations/C326_D2_P2.xml
+++ b/drafter_28/annotations/C326_D2_P2.xml
@@ -6,8 +6,8 @@
CGHD
- 1000
- 1000
+ 3000
+ 2000
3
0
diff --git a/drafter_28/annotations/C326_D2_P3.xml b/drafter_28/annotations/C326_D2_P3.xml
index 03946b84f200135e5b9c786d668f373508b3374c..3e857c3346fc6b33e9c3175eec0a14d0abaa61a6 100644
--- a/drafter_28/annotations/C326_D2_P3.xml
+++ b/drafter_28/annotations/C326_D2_P3.xml
@@ -6,8 +6,8 @@
CGHD
- 1000
- 1000
+ 3000
+ 2000
3
0
diff --git a/drafter_28/annotations/C326_D2_P4.xml b/drafter_28/annotations/C326_D2_P4.xml
index 82b3f75be5cdc533e384c2e6aca2224f6a65bd97..9bf352fc538e890256528e2b56eb8a8c45834ecd 100644
--- a/drafter_28/annotations/C326_D2_P4.xml
+++ b/drafter_28/annotations/C326_D2_P4.xml
@@ -6,8 +6,8 @@
CGHD
- 1000
- 1000
+ 3000
+ 2000
3
0
@@ -241,6 +241,7 @@
1003
729
+ DIS7
transistor.bjt
@@ -96,6 +97,7 @@
996
592
+ R1
text
@@ -128,11 +130,12 @@
0
0
- 1811
- 1106
+ 1804
+ 1104
1987
1168
+ BC549
text
@@ -140,11 +143,12 @@
0
0
- 919
+ 912
606
1055
670
+ 4K7
text
@@ -170,6 +174,7 @@
1765
530
+ 510
text
@@ -194,6 +199,7 @@
345
1852
527
+ 98
@@ -207,6 +213,7 @@
310
1014
+ SW
voltage.battery
@@ -227,11 +234,12 @@
0
0
- 1689
+ 1695
400
1763
464
+ R2
text
@@ -241,9 +249,10 @@
1407
1393
- 1491
- 1449
+ 1487
+ 1453
+ SW
text
@@ -267,6 +276,7 @@
505
897
667
+ 94
@@ -301,8 +311,9 @@
1740
947
- 1898
- 1283
+ 1909
+ 1264
+ 6
@@ -327,6 +338,7 @@
615
1935
711
+ 277
@@ -364,6 +376,7 @@
1883
1096
+ T2
junction
@@ -523,4 +536,17 @@
94
+
+ text
+ Unspecified
+ 0
+ 0
+
+ 1411
+ 672
+ 1516
+ 724
+
+ LED
+
diff --git a/drafter_28/annotations/C330_D1_P3.xml b/drafter_28/annotations/C330_D1_P3.xml
index 0e4cfb529ef9e56911d1d385bae08545298e8946..33addd831cbdfbf50ba9d7ecbccfbd57a677a1b8 100644
--- a/drafter_28/annotations/C330_D1_P3.xml
+++ b/drafter_28/annotations/C330_D1_P3.xml
@@ -6,8 +6,8 @@
CGHD
- 1000
- 1000
+ 3000
+ 2000
3
0
@@ -326,6 +326,7 @@
480
1025
+ SW
junction
@@ -384,9 +385,10 @@
1529
1315
- 1607
- 1363
+ 1594
+ 1368
+ SW
junction
diff --git a/drafter_28/annotations/C330_D1_P4.xml b/drafter_28/annotations/C330_D1_P4.xml
index 735965b4e603aee30100a4d169ce3253f424b865..060a52aa10a5a182e5a15f8e43158889e59cddec 100644
--- a/drafter_28/annotations/C330_D1_P4.xml
+++ b/drafter_28/annotations/C330_D1_P4.xml
@@ -6,8 +6,8 @@
CGHD
- 1000
- 1000
+ 3000
+ 2000
3
0
@@ -17,11 +17,12 @@
0
0
- 1056
+ 1036
1530
1202
1594
+ BC549
transistor.bjt
@@ -198,6 +199,7 @@
601
1441
+ R3
resistor
@@ -275,6 +277,7 @@
531
984
+ SW
junction
@@ -296,9 +299,10 @@
1523
1447
- 1599
- 1497
+ 1593
+ 1500
+ SW
junction
@@ -335,6 +339,7 @@
772
1450
+ 1M
junction
@@ -371,6 +376,7 @@
1121
1508
+ T1
resistor
diff --git a/drafter_28/annotations/C330_D2_P1.xml b/drafter_28/annotations/C330_D2_P1.xml
index be27150602e154b7f60623c7abac491ad72517d3..d561f009006856a58f03df7da31881785af72a65 100644
--- a/drafter_28/annotations/C330_D2_P1.xml
+++ b/drafter_28/annotations/C330_D2_P1.xml
@@ -6,8 +6,8 @@
CGHD
- 1000
- 1000
+ 3000
+ 2000
3
0
@@ -55,11 +55,12 @@
0
0
- 928
- 1414
+ 915
+ 1419
1126
- 1496
+ 1493
+ BC549
text
@@ -147,6 +148,7 @@
2658
1044
+ VDC1
text
@@ -172,6 +174,7 @@
322
1010
+ SW2
text
@@ -206,9 +209,10 @@
1561
1373
- 1675
+ 1686
1461
+ SW
diode.light_emitting
@@ -220,6 +224,7 @@
620
2103
764
+ 270
@@ -529,4 +534,17 @@
798
+
+ text
+ Unspecified
+ 0
+ 0
+
+ 942
+ 1316
+ 1045
+ 1399
+
+ T1
+
diff --git a/drafter_28/annotations/C330_D2_P2.xml b/drafter_28/annotations/C330_D2_P2.xml
index 4def63364c404a39055a9b9652238e90359f41a7..ba145f7c03a259ed28157bae49641cc44d65123d 100644
--- a/drafter_28/annotations/C330_D2_P2.xml
+++ b/drafter_28/annotations/C330_D2_P2.xml
@@ -6,8 +6,8 @@
CGHD
- 1000
- 1000
+ 3000
+ 2000
3
0
@@ -71,6 +71,7 @@
443
1025
+ SW2
text
@@ -197,8 +198,9 @@
1519
1406
1607
- 1466
+ 1481
+ SW
transistor.bjt
@@ -418,9 +420,10 @@
0
586
- 1361
+ 1365
724
- 1457
+ 1454
+ 354
diff --git a/drafter_28/annotations/C330_D2_P3.xml b/drafter_28/annotations/C330_D2_P3.xml
index 58c494cb8140adcd0fdc99c710de79bf1db3153f..1a2cce22346332380c526f1faff6ad4f4a8b1dde 100644
--- a/drafter_28/annotations/C330_D2_P3.xml
+++ b/drafter_28/annotations/C330_D2_P3.xml
@@ -6,8 +6,8 @@
CGHD
- 1000
- 1000
+ 3000
+ 2000
3
0
@@ -82,9 +82,10 @@
1531
1373
- 1629
- 1449
+ 1632
+ 1455
+ SW
text
@@ -234,9 +235,10 @@
196
968
- 374
- 1048
+ 377
+ 1051
+ SW2
text
diff --git a/drafter_28/annotations/C330_D2_P4.xml b/drafter_28/annotations/C330_D2_P4.xml
index 8e8f602eec68ed2c9023be56fb47ff6f57e34e59..29b676e2a9626f60b8bc85c949e0e980c920b334 100644
--- a/drafter_28/annotations/C330_D2_P4.xml
+++ b/drafter_28/annotations/C330_D2_P4.xml
@@ -6,8 +6,8 @@
CGHD
- 1000
- 1000
+ 3000
+ 2000
3
0
@@ -84,6 +84,7 @@
425
925
+ SW2
text
diff --git a/drafter_28/annotations/C331_D1_P1.xml b/drafter_28/annotations/C331_D1_P1.xml
index ec0f3cb93cd813224b14b58c3d35187afa0939e0..8e96dcc431cecf0a7e617d71c6352d807a219f20 100644
--- a/drafter_28/annotations/C331_D1_P1.xml
+++ b/drafter_28/annotations/C331_D1_P1.xml
@@ -6,8 +6,8 @@
CGHD
- 1000
- 1000
+ 3000
+ 2000
3
0
diff --git a/drafter_28/annotations/C331_D1_P2.xml b/drafter_28/annotations/C331_D1_P2.xml
index ae260ef1eea6e3cb39b5b9d18ed431de997a103c..9b7253a043e654ec50a9af2a61e6f225bad5f826 100644
--- a/drafter_28/annotations/C331_D1_P2.xml
+++ b/drafter_28/annotations/C331_D1_P2.xml
@@ -6,8 +6,8 @@
CGHD
- 1000
- 1000
+ 3000
+ 2000
3
0
diff --git a/drafter_28/annotations/C331_D1_P3.xml b/drafter_28/annotations/C331_D1_P3.xml
index 681cc4e759e5a8f5686a7a74160c99dced0308c4..9cb49a49eb9c87e33f1d468e9b55fb7550428b76 100644
--- a/drafter_28/annotations/C331_D1_P3.xml
+++ b/drafter_28/annotations/C331_D1_P3.xml
@@ -6,8 +6,8 @@
CGHD
- 1000
- 1000
+ 3000
+ 2000
3
0
diff --git a/drafter_28/annotations/C331_D1_P4.xml b/drafter_28/annotations/C331_D1_P4.xml
index e9d5af2db0c7f9f8f9a569e3b60c8bb282ad1d84..22041b720ddceff08d88cf8ac4b89dba4c6cb11b 100644
--- a/drafter_28/annotations/C331_D1_P4.xml
+++ b/drafter_28/annotations/C331_D1_P4.xml
@@ -6,8 +6,8 @@
CGHD
- 1000
- 1000
+ 3000
+ 2000
3
0
diff --git a/drafter_28/annotations/C331_D2_P1.xml b/drafter_28/annotations/C331_D2_P1.xml
index 06d24f7d7e49a6a7901f0230e3827c0c4a09b24f..c80fbc3fe4126ca8c52f1d6c0993244ce6e42c06 100644
--- a/drafter_28/annotations/C331_D2_P1.xml
+++ b/drafter_28/annotations/C331_D2_P1.xml
@@ -6,8 +6,8 @@
CGHD
- 1000
- 1000
+ 3000
+ 2000
3
0
diff --git a/drafter_28/annotations/C331_D2_P2.xml b/drafter_28/annotations/C331_D2_P2.xml
index 10e646806d5f4574c3041a9403df1684a7895b91..8c3f3cad9dbf5b6d49fe63af11fb5697f964ae6a 100644
--- a/drafter_28/annotations/C331_D2_P2.xml
+++ b/drafter_28/annotations/C331_D2_P2.xml
@@ -6,8 +6,8 @@
CGHD
- 1000
- 1000
+ 3000
+ 2000
3
0
diff --git a/drafter_28/annotations/C331_D2_P3.xml b/drafter_28/annotations/C331_D2_P3.xml
index b8547d0e0af737f7676bb8218d06249dc4dbf8d6..874e59b6de1b1fa04647dd97bf0e3a611f60ff7d 100644
--- a/drafter_28/annotations/C331_D2_P3.xml
+++ b/drafter_28/annotations/C331_D2_P3.xml
@@ -6,8 +6,8 @@
CGHD
- 1000
- 1000
+ 3000
+ 2000
3
0
diff --git a/drafter_28/annotations/C331_D2_P4.xml b/drafter_28/annotations/C331_D2_P4.xml
index 0db068886adf6598625dbaccc1e5cbc8c9cb488e..0734a0048005dbce4cdce4d8307aec4504c79fc2 100644
--- a/drafter_28/annotations/C331_D2_P4.xml
+++ b/drafter_28/annotations/C331_D2_P4.xml
@@ -6,8 +6,8 @@
CGHD
- 1000
- 1000
+ 3000
+ 2000
3
0
diff --git a/drafter_28/annotations/C332_D1_P1.xml b/drafter_28/annotations/C332_D1_P1.xml
index 75eb36be363eed6a396cf0227b8ebb52eab8e895..ac9df9744fd42045ff706ef25be528059d85f57d 100644
--- a/drafter_28/annotations/C332_D1_P1.xml
+++ b/drafter_28/annotations/C332_D1_P1.xml
@@ -6,8 +6,8 @@
CGHD
- 1000
- 1000
+ 3000
+ 2000
3
0
diff --git a/drafter_28/annotations/C332_D1_P2.xml b/drafter_28/annotations/C332_D1_P2.xml
index 09f4950a40e22b5c147990e79390231173210a8d..53109309c6e669b50d99e5db8e96a11504396a49 100644
--- a/drafter_28/annotations/C332_D1_P2.xml
+++ b/drafter_28/annotations/C332_D1_P2.xml
@@ -6,8 +6,8 @@
CGHD
- 1000
- 1000
+ 3000
+ 2000
3
0
diff --git a/drafter_28/annotations/C332_D1_P3.xml b/drafter_28/annotations/C332_D1_P3.xml
index d7ab3dd71466f942031e199787dbeea1e820af0c..d9c1437ca1f0d7578d6278fb27844af9e1d3ea59 100644
--- a/drafter_28/annotations/C332_D1_P3.xml
+++ b/drafter_28/annotations/C332_D1_P3.xml
@@ -6,8 +6,8 @@
CGHD
- 1000
- 1000
+ 3000
+ 2000
3
0
diff --git a/drafter_28/annotations/C332_D1_P4.xml b/drafter_28/annotations/C332_D1_P4.xml
index 634826fffc2562d3bfbf4a55f58d881621ca1a4b..32c65a3381e2e3e9f44a71d42c0ef429b619390e 100644
--- a/drafter_28/annotations/C332_D1_P4.xml
+++ b/drafter_28/annotations/C332_D1_P4.xml
@@ -6,8 +6,8 @@
CGHD
- 1000
- 1000
+ 3000
+ 2000
3
0
diff --git a/drafter_28/annotations/C332_D2_P1.xml b/drafter_28/annotations/C332_D2_P1.xml
index 2e13a46b40a53057ac4e83179c55ed656e424076..816b48b5f0c1d27cf3ad3470685a6944127925ab 100644
--- a/drafter_28/annotations/C332_D2_P1.xml
+++ b/drafter_28/annotations/C332_D2_P1.xml
@@ -6,8 +6,8 @@
CGHD
- 1000
- 1000
+ 3000
+ 2000
3
0
@@ -656,18 +656,6 @@
730
-
- terminal
- Unspecified
- 0
- 0
-
- 1863
- 1832
- 1887
- 1856
-
-
junction
Unspecified
diff --git a/drafter_28/annotations/C332_D2_P2.xml b/drafter_28/annotations/C332_D2_P2.xml
index eb6f23151a14d26eb69c25f7054521ab2b6d8256..f49af11a9154deca2bf2dbe50ee0180ec2d818c1 100644
--- a/drafter_28/annotations/C332_D2_P2.xml
+++ b/drafter_28/annotations/C332_D2_P2.xml
@@ -6,8 +6,8 @@
CGHD
- 1000
- 1000
+ 3000
+ 2000
3
0
diff --git a/drafter_28/annotations/C332_D2_P3.xml b/drafter_28/annotations/C332_D2_P3.xml
index 58153d842ad3da75c0ec18fff46a2ca92387d76b..fbc5cbc4190fd1aaf9b1377dbbe8ab9407bc251c 100644
--- a/drafter_28/annotations/C332_D2_P3.xml
+++ b/drafter_28/annotations/C332_D2_P3.xml
@@ -6,8 +6,8 @@
CGHD
- 1000
- 1000
+ 3000
+ 2000
3
0
diff --git a/drafter_28/annotations/C332_D2_P4.xml b/drafter_28/annotations/C332_D2_P4.xml
index 469abd626588746a2c798ffbf8e412a7cb2ac523..912994473a2faf05329eb5506a6f4b4c33029b93 100644
--- a/drafter_28/annotations/C332_D2_P4.xml
+++ b/drafter_28/annotations/C332_D2_P4.xml
@@ -6,8 +6,8 @@
CGHD
- 1000
- 1000
+ 3000
+ 2000
3
0
diff --git a/drafter_28/annotations/C333_D1_P1.xml b/drafter_28/annotations/C333_D1_P1.xml
index 0a1b9742bdcd1628f19c2001a0c86ff7965534db..4313624f1ce8686436088fb94ac2b7baffdbb4fd 100644
--- a/drafter_28/annotations/C333_D1_P1.xml
+++ b/drafter_28/annotations/C333_D1_P1.xml
@@ -6,8 +6,8 @@
CGHD
- 1000
- 1000
+ 3000
+ 2000
3
0
diff --git a/drafter_28/annotations/C333_D1_P2.xml b/drafter_28/annotations/C333_D1_P2.xml
index 99b340d25ecce40e9e93f70b673a76c8be8557d7..c3cae704c251013fd66f6f1a76bd370b39181f6f 100644
--- a/drafter_28/annotations/C333_D1_P2.xml
+++ b/drafter_28/annotations/C333_D1_P2.xml
@@ -6,8 +6,8 @@
CGHD
- 1000
- 1000
+ 3000
+ 2000
3
0
diff --git a/drafter_28/annotations/C333_D1_P3.xml b/drafter_28/annotations/C333_D1_P3.xml
index e1ca986f7cb58174ff822159ee55867f420cbf6b..78e2b4cd314d80a873e428e9d128f366cb323f91 100644
--- a/drafter_28/annotations/C333_D1_P3.xml
+++ b/drafter_28/annotations/C333_D1_P3.xml
@@ -6,8 +6,8 @@
CGHD
- 1000
- 1000
+ 3000
+ 2000
3
0
diff --git a/drafter_28/annotations/C333_D1_P4.xml b/drafter_28/annotations/C333_D1_P4.xml
index ae310ab9a5ae8a2466cd98ee371543b35ff1182f..fd0d121d00b2ded2ca5703990049ef5fc1466c58 100644
--- a/drafter_28/annotations/C333_D1_P4.xml
+++ b/drafter_28/annotations/C333_D1_P4.xml
@@ -6,8 +6,8 @@
CGHD
- 1000
- 1000
+ 3000
+ 2000
3
0
diff --git a/drafter_28/annotations/C333_D2_P1.xml b/drafter_28/annotations/C333_D2_P1.xml
index b1df94c339dd8e0eaf639d78f97c19103081b91c..5ab8c4efb9c03ec2a9a1778a67294e9fd3056504 100644
--- a/drafter_28/annotations/C333_D2_P1.xml
+++ b/drafter_28/annotations/C333_D2_P1.xml
@@ -6,8 +6,8 @@
CGHD
- 1000
- 1000
+ 3000
+ 2000
3
0
diff --git a/drafter_28/annotations/C333_D2_P2.xml b/drafter_28/annotations/C333_D2_P2.xml
index 6af51872c671be5b48374b9652703f33b4a35ac3..c8be9334fef0a5d4bbd4d84921db8e0449109594 100644
--- a/drafter_28/annotations/C333_D2_P2.xml
+++ b/drafter_28/annotations/C333_D2_P2.xml
@@ -6,8 +6,8 @@
CGHD
- 1000
- 1000
+ 3000
+ 2000
3
0
diff --git a/drafter_28/annotations/C333_D2_P3.xml b/drafter_28/annotations/C333_D2_P3.xml
index c038ad5c48604359d8c436e43df9696fd956dcb9..ff26d1a77b3cabede06d58e54a033d75fe641de0 100644
--- a/drafter_28/annotations/C333_D2_P3.xml
+++ b/drafter_28/annotations/C333_D2_P3.xml
@@ -6,8 +6,8 @@
CGHD
- 1000
- 1000
+ 3000
+ 2000
3
0
diff --git a/drafter_28/annotations/C333_D2_P4.xml b/drafter_28/annotations/C333_D2_P4.xml
index f5b09949545e82b1a0c94a7ba48b48d86cdb6489..76f24985250d71ce58c604d51f2dc3bf5468e76c 100644
--- a/drafter_28/annotations/C333_D2_P4.xml
+++ b/drafter_28/annotations/C333_D2_P4.xml
@@ -6,8 +6,8 @@
CGHD
- 1000
- 1000
+ 3000
+ 2000
3
0
diff --git a/drafter_28/annotations/C334_D1_P1.xml b/drafter_28/annotations/C334_D1_P1.xml
index 66b5945484246f9f5bb0e2fede2d9dba75f4a008..d31dabf806018ac3d9816d4bbf421074b670cbdf 100644
--- a/drafter_28/annotations/C334_D1_P1.xml
+++ b/drafter_28/annotations/C334_D1_P1.xml
@@ -6,8 +6,8 @@
CGHD
- 1000
- 1000
+ 3000
+ 2000
3
0
@@ -71,9 +71,10 @@
1613
294
- 1855
+ 1894
366
+ Servosteuerung 1
text
@@ -125,6 +126,7 @@
2084
1047
+ IC5/2
text
@@ -188,6 +190,7 @@
1948
1070
+ 5
text
@@ -337,11 +340,12 @@
0
0
- 2432
+ 2435
703
2540
- 747
+ 745
+ IC5/3
text
@@ -459,6 +463,7 @@
2538
787
+ 7400
text
@@ -479,11 +484,12 @@
0
0
- 1833
+ 1829
677
1939
- 727
+ 724
+ IC5/1
text
@@ -491,11 +497,12 @@
0
0
- 2035
+ 1973
305
2117
353
+ IC5/4
junction
@@ -693,8 +700,9 @@
1828
1389
1862
- 1427
+ 1429
+ 4
text
@@ -890,11 +898,12 @@
0
0
- 1867
- 727
+ 1857
+ 725
1953
759
+ 7400
gnd
@@ -928,9 +937,10 @@
2202
1566
- 2248
+ 2256
1600
+ 10
text
@@ -1020,6 +1030,7 @@
1287
686
+ 6
text
@@ -1147,18 +1158,6 @@
100n
-
- text
- Unspecified
- 0
- 0
-
- 1971
- 311
- 2019
- 349
-
-
integrated_circuit.ne555
Unspecified
@@ -1172,7 +1171,7 @@
- integrated_circuit.voltage_regulator
+ and
Unspecified
0
0
@@ -1207,6 +1206,7 @@
1813
681
+ 2
text
@@ -1216,9 +1216,10 @@
1336
1763
- 1584
+ 1613
1821
+ Servosteuerung 2
text
@@ -1231,9 +1232,10 @@
2175
457
+ 11
- resistor
+ integrated_circuit
Unspecified
0
0
@@ -1265,8 +1267,9 @@
1261
695
1285
- 737
+ 745
+ 7
gnd
@@ -2267,4 +2270,203 @@
233
+
+ text
+ Unspecified
+ 0
+ 0
+
+ 1262
+ 750
+ 1286
+ 785
+
+ 2
+
+
+ text
+ Unspecified
+ 0
+ 0
+
+ 1394
+ 540
+ 1424
+ 583
+
+ 3
+
+
+ text
+ Unspecified
+ 0
+ 0
+
+ 1676
+ 636
+ 1705
+ 678
+
+ 1
+
+
+ text
+ Unspecified
+ 0
+ 0
+
+ 1823
+ 773
+ 1849
+ 822
+
+ 3
+
+
+ text
+ Unspecified
+ 0
+ 0
+
+ 1630
+ 1596
+ 1656
+ 1624
+
+ 1
+
+
+ text
+ Unspecified
+ 0
+ 0
+
+ 1730
+ 1592
+ 1759
+ 1625
+
+ 2
+
+
+ text
+ Unspecified
+ 0
+ 0
+
+ 1905
+ 902
+ 1942
+ 967
+
+ 4
+
+
+ and
+ Unspecified
+ 0
+ 0
+
+ 1939
+ 376
+ 2099
+ 555
+
+
+
+ and
+ Unspecified
+ 0
+ 0
+
+ 2214
+ 577
+ 2367
+ 712
+
+
+
+ and
+ Unspecified
+ 0
+ 0
+
+ 1866
+ 1254
+ 2029
+ 1430
+
+
+
+ nand
+ Unspecified
+ 0
+ 0
+
+ 1946
+ 1606
+ 2093
+ 1753
+
+
+
+ nand
+ Unspecified
+ 0
+ 0
+
+ 2259
+ 1433
+ 2410
+ 1603
+
+
+
+ nand
+ Unspecified
+ 0
+ 0
+
+ 1613
+ 1474
+ 1773
+ 1600
+
+
+
+ junction
+ Unspecified
+ 0
+ 0
+
+ 1778
+ 1501
+ 1793
+ 1518
+
+
+
+ junction
+ Unspecified
+ 0
+ 0
+
+ 1675
+ 1660
+ 1701
+ 1690
+
+
+
+ terminal
+ Unspecified
+ 0
+ 0
+
+ 1663
+ 1759
+ 1694
+ 1790
+
+
diff --git a/drafter_28/annotations/C334_D1_P2.xml b/drafter_28/annotations/C334_D1_P2.xml
index 91cab92695b27c95be828be0e2740be49c7a48b5..e48474d82215e61534ad221ecd9df51354892c7a 100644
--- a/drafter_28/annotations/C334_D1_P2.xml
+++ b/drafter_28/annotations/C334_D1_P2.xml
@@ -6,8 +6,8 @@
CGHD
- 1000
- 1000
+ 3000
+ 2000
3
0
@@ -48,6 +48,7 @@
2877
1786
+ Servo2
text
@@ -146,9 +147,10 @@
1673
308
- 1941
+ 1982
372
+ Servosteuerung 1
text
@@ -200,6 +202,7 @@
2492
1875
+ IC6/3
text
@@ -273,11 +276,12 @@
0
0
- 2596
- 765
+ 2591
+ 767
2710
- 813
+ 811
+ IC5/3
text
@@ -820,8 +824,9 @@
1276
699
1302
- 743
+ 752
+ 7
text
@@ -2078,4 +2083,130 @@
204
+
+ terminal
+ Unspecified
+ 0
+ 0
+
+ 1787
+ 384
+ 1825
+ 423
+
+
+
+ nand
+ Unspecified
+ 0
+ 0
+
+ 1980
+ 1769
+ 2154
+ 1947
+ 358
+
+
+
+ and
+ Unspecified
+ 0
+ 0
+
+ 1905
+ 1354
+ 2090
+ 1565
+ 356
+
+
+
+ nand
+ Unspecified
+ 0
+ 0
+
+ 2363
+ 1591
+ 2540
+ 1800
+ 358
+
+
+
+ nand
+ Unspecified
+ 0
+ 0
+
+ 1603
+ 1585
+ 1787
+ 1745
+
+
+
+ terminal
+ Unspecified
+ 0
+ 0
+
+ 2701
+ 1599
+ 2740
+ 1636
+
+
+
+ junction
+ Unspecified
+ 0
+ 0
+
+ 2720
+ 1803
+ 2741
+ 1826
+
+
+
+ text
+ Unspecified
+ 0
+ 0
+
+ 2509
+ 590
+ 2542
+ 642
+
+ 8
+
+
+ text
+ Unspecified
+ 0
+ 0
+
+ 1276
+ 760
+ 1299
+ 794
+
+ 2
+
+
+ integrated_circuit
+ Unspecified
+ 0
+ 0
+
+ 1257
+ 515
+ 1480
+ 814
+ 356
+
+
diff --git a/drafter_28/annotations/C334_D1_P3.xml b/drafter_28/annotations/C334_D1_P3.xml
index 6b0ee1a4b9f1077476513729b9d9a54ac882f259..dcc983bea483fdfcae391b5df0e6908189d9b93c 100644
--- a/drafter_28/annotations/C334_D1_P3.xml
+++ b/drafter_28/annotations/C334_D1_P3.xml
@@ -6,8 +6,8 @@
CGHD
- 1000
- 1000
+ 3000
+ 2000
3
0
@@ -2296,4 +2296,28 @@
546
+
+ terminal
+ Unspecified
+ 0
+ 0
+
+ 2552
+ 458
+ 2584
+ 492
+
+
+
+ terminal
+ Unspecified
+ 0
+ 0
+
+ 1091
+ 136
+ 1123
+ 163
+
+
diff --git a/drafter_28/annotations/C334_D1_P4.xml b/drafter_28/annotations/C334_D1_P4.xml
index 01c69c2f4d150a32ff416639c0e3462b0d545f57..1cf838ad755d4cd3e9977c8aecdfd89d5411c0c0 100644
--- a/drafter_28/annotations/C334_D1_P4.xml
+++ b/drafter_28/annotations/C334_D1_P4.xml
@@ -6,8 +6,8 @@
CGHD
- 1000
- 1000
+ 3000
+ 2000
3
0
@@ -147,11 +147,12 @@
0
0
- 2656
- 1459
+ 2659
+ 1461
2782
1523
+ Servo2
text
@@ -381,6 +382,7 @@
2117
1022
+ IC5/2
text
@@ -521,6 +523,7 @@
2074
336
+ 7400
resistor
@@ -592,11 +595,12 @@
0
0
- 1828
- 645
- 1946
+ 1825
+ 649
+ 1940
701
+ IC5/1
text
@@ -617,11 +621,12 @@
0
0
- 2024
+ 1958
250
2114
296
+ IC5/4
text
@@ -1144,15 +1149,16 @@
6
- resistor
+ integrated_circuit
Unspecified
0
0
- 1936
+ 1944
829
- 2108
- 953
+ 2111
+ 959
+ 4
@@ -2105,4 +2111,105 @@
7
+
+ and
+ Unspecified
+ 0
+ 0
+
+ 1919
+ 1234
+ 2093
+ 1429
+ 2
+
+
+
+ nand
+ Unspecified
+ 0
+ 0
+
+ 2038
+ 1609
+ 2197
+ 1775
+ 6
+
+
+
+ nand
+ Unspecified
+ 0
+ 0
+
+ 2343
+ 1403
+ 2495
+ 1587
+ 8
+
+
+
+ nand
+ Unspecified
+ 0
+ 0
+
+ 1657
+ 657
+ 1833
+ 800
+ 2
+
+
+
+ text
+ Unspecified
+ 0
+ 0
+
+ 1918
+ 887
+ 1954
+ 949
+
+ 4
+
+
+ and
+ Unspecified
+ 0
+ 0
+
+ 2206
+ 529
+ 2364
+ 662
+
+
+
+ and
+ Unspecified
+ 0
+ 0
+
+ 1928
+ 330
+ 2096
+ 514
+
+
+
+ terminal
+ Unspecified
+ 0
+ 0
+
+ 2482
+ 412
+ 2511
+ 442
+
+
diff --git a/drafter_28/annotations/C334_D2_P1.xml b/drafter_28/annotations/C334_D2_P1.xml
index ed0a39f30bb9388cac5fc65d91977bd8d0f73f82..07e7fbc4960889b0aa2b322477f581de0ef8f585 100644
--- a/drafter_28/annotations/C334_D2_P1.xml
+++ b/drafter_28/annotations/C334_D2_P1.xml
@@ -6,8 +6,8 @@
CGHD
- 1000
- 1000
+ 3000
+ 2000
3
0
@@ -35,6 +35,7 @@
1884
686
+ 7400
text
@@ -47,6 +48,7 @@
2469
774
+ IC5/2
text
@@ -72,6 +74,7 @@
2728
739
+ Servo1
text
@@ -84,6 +87,7 @@
2341
1356
+ IC6/2
text
@@ -117,11 +121,12 @@
0
0
- 1998
+ 2007
1517
2106
1565
+ 7400
text
@@ -185,6 +190,7 @@
2321
1765
+ 7400
text
@@ -287,6 +293,7 @@
2126
1512
+ IC6(1
text
@@ -325,6 +332,7 @@
2424
1418
+ 7400
text
@@ -453,6 +461,7 @@
2863
1399
+ +5V
text
@@ -485,11 +494,12 @@
0
0
- 1791
+ 1746
536
1907
596
+ IC5/1
text
@@ -502,6 +512,7 @@
2681
1802
+ Servo2
text
@@ -536,9 +547,9 @@
0
2297
- 788
- 2475
- 860
+ 789
+ 2459
+ 847
@@ -627,6 +638,7 @@
2176
1664
+ 12
resistor
@@ -689,6 +701,7 @@
2028
1422
+ 3
text
@@ -950,18 +963,6 @@
C3
-
- text
- Unspecified
- 0
- 0
-
- 2058
- 882
- 2432
- 960
-
-
junction
Unspecified
@@ -1172,6 +1173,7 @@
2723
678
+ 7400
resistor
@@ -1198,18 +1200,6 @@
671
-
- switch
- Unspecified
- 0
- 0
-
- 1907
- 487
- 2083
- 553
-
-
integrated_circuit.ne555
Unspecified
@@ -2099,4 +2089,430 @@
1
+
+ text
+ Unspecified
+ 0
+ 0
+
+ 2129
+ 1496
+ 2184
+ 1539
+
+ 13
+
+
+ terminal
+ Unspecified
+ 0
+ 0
+
+ 1926
+ 1826
+ 1957
+ 1859
+
+
+
+ and
+ Unspecified
+ 0
+ 0
+
+ 2162
+ 1366
+ 2297
+ 1487
+
+
+
+ text
+ Unspecified
+ 0
+ 0
+
+ 2071
+ 1051
+ 2105
+ 1089
+
+ 1
+
+
+ text
+ Unspecified
+ 0
+ 0
+
+ 2171
+ 1047
+ 2208
+ 1087
+
+ 1
+
+
+ text
+ Unspecified
+ 0
+ 0
+
+ 2279
+ 1039
+ 2340
+ 1087
+
+ 1
+
+
+ text
+ Unspecified
+ 0
+ 0
+
+ 2427
+ 1041
+ 2470
+ 1089
+
+ 1
+
+
+ text
+ Unspecified
+ 0
+ 0
+
+ 2545
+ 1050
+ 2577
+ 1089
+
+ 7
+
+
+ text
+ Unspecified
+ 0
+ 0
+
+ 2631
+ 1052
+ 2666
+ 1096
+
+ 7
+
+
+ text
+ Unspecified
+ 0
+ 0
+
+ 2512
+ 914
+ 2542
+ 951
+
+ 8
+
+
+ text
+ Unspecified
+ 0
+ 0
+
+ 2601
+ 916
+ 2644
+ 946
+
+ 14
+
+
+ text
+ Unspecified
+ 0
+ 0
+
+ 2401
+ 830
+ 2477
+ 875
+
+ 5V
+
+
+ text
+ Unspecified
+ 0
+ 0
+
+ 2013
+ 917
+ 2049
+ 954
+
+ 4
+
+
+ text
+ Unspecified
+ 0
+ 0
+
+ 2118
+ 913
+ 2146
+ 950
+
+ 8
+
+
+ text
+ Unspecified
+ 0
+ 0
+
+ 2159
+ 913
+ 2190
+ 945
+
+ 4
+
+
+ text
+ Unspecified
+ 0
+ 0
+
+ 2245
+ 913
+ 2267
+ 947
+
+ 8
+
+
+ text
+ Unspecified
+ 0
+ 0
+
+ 2289
+ 914
+ 2317
+ 950
+
+ 4
+
+
+ text
+ Unspecified
+ 0
+ 0
+
+ 2425
+ 915
+ 2451
+ 948
+
+ 4
+
+
+ text
+ Unspecified
+ 0
+ 0
+
+ 2380
+ 915
+ 2404
+ 948
+
+ 8
+
+
+ nand
+ Unspecified
+ 0
+ 0
+
+ 2331
+ 575
+ 2474
+ 696
+
+
+
+ nand
+ Unspecified
+ 0
+ 0
+
+ 2606
+ 419
+ 2748
+ 559
+
+
+
+ and
+ Unspecified
+ 0
+ 0
+
+ 2265
+ 275
+ 2424
+ 470
+
+
+
+ text
+ Unspecified
+ 0
+ 0
+
+ 1851
+ 1510
+ 1877
+ 1543
+
+ 1
+
+
+ junction
+ Unspecified
+ 0
+ 0
+
+ 1835
+ 1522
+ 1854
+ 1539
+
+
+
+ junction
+ Unspecified
+ 0
+ 0
+
+ 1841
+ 1563
+ 1859
+ 1582
+
+
+
+ crossover
+ Unspecified
+ 0
+ 0
+
+ 1926
+ 1563
+ 1948
+ 1581
+
+
+
+ terminal
+ Unspecified
+ 0
+ 0
+
+ 2804
+ 1418
+ 2840
+ 1453
+
+
+
+ junction
+ Unspecified
+ 0
+ 0
+
+ 2804
+ 1575
+ 2825
+ 1598
+
+
+
+ junction
+ Unspecified
+ 0
+ 0
+
+ 2523
+ 361
+ 2546
+ 385
+
+
+
+ junction
+ Unspecified
+ 0
+ 0
+
+ 2571
+ 501
+ 2590
+ 522
+
+
+
+ junction
+ Unspecified
+ 0
+ 0
+
+ 2571
+ 626
+ 2596
+ 645
+
+
+
+ terminal
+ Unspecified
+ 0
+ 0
+
+ 1254
+ 166
+ 1283
+ 191
+
+
+
+ terminal
+ Unspecified
+ 0
+ 0
+
+ 2832
+ 352
+ 2864
+ 383
+
+
+
+ terminal
+ Unspecified
+ 0
+ 0
+
+ 2001
+ 257
+ 2043
+ 300
+
+
diff --git a/drafter_28/annotations/C334_D2_P2.xml b/drafter_28/annotations/C334_D2_P2.xml
index cd70fc7a0ef4d7f3e8320f6a28342f7dd61fd56e..36879f9ae976f219363f25e89deb7e102f3c636f 100644
--- a/drafter_28/annotations/C334_D2_P2.xml
+++ b/drafter_28/annotations/C334_D2_P2.xml
@@ -6,8 +6,8 @@
CGHD
- 1000
- 1000
+ 3000
+ 2000
3
0
@@ -97,9 +97,10 @@
2293
620
- 2469
+ 2497
682
+ Servo1
text
@@ -304,6 +305,7 @@
2465
1618
+ Servo2
text
@@ -329,6 +331,7 @@
2144
1243
+ IC6/2
text
@@ -431,6 +434,7 @@
1906
593
+ 3
text
@@ -587,11 +591,12 @@
0
0
- 2382
+ 2378
533
2490
- 591
+ 586
+ IC5/3
text
@@ -892,6 +897,7 @@
1254
519
1288
+ 10
@@ -930,6 +936,7 @@
2515
385
+ 8
junction
@@ -1038,9 +1045,10 @@
2432
907
- 2472
- 953
+ 2487
+ 952
+ IC6
capacitor.unpolarized
@@ -1148,11 +1156,12 @@
0
0
- 2350
- 491
- 2376
- 529
+ 2349
+ 490
+ 2378
+ 541
+ 9
nand
@@ -1163,7 +1172,7 @@
2294
1291
2422
- 1423
+ 1416
@@ -1177,6 +1186,7 @@
2489
619
+ 7400
terminal
@@ -1288,7 +1298,7 @@
1265
898
1291
- 5
+ 17
@@ -2079,4 +2089,300 @@
13
+
+ nand
+ Unspecified
+ 0
+ 0
+
+ 2018
+ 1367
+ 2166
+ 1495
+ 6
+
+
+
+ and
+ Unspecified
+ 0
+ 0
+
+ 1994
+ 1252
+ 2118
+ 1371
+ 8
+
+
+
+ terminal
+ Unspecified
+ 0
+ 0
+
+ 2593
+ 1288
+ 2628
+ 1320
+
+
+
+ terminal
+ Unspecified
+ 0
+ 0
+
+ 1718
+ 262
+ 1755
+ 301
+
+
+
+ text
+ Unspecified
+ 0
+ 0
+
+ 1678
+ 480
+ 1725
+ 525
+
+ 1
+
+
+ text
+ Unspecified
+ 0
+ 0
+
+ 2063
+ 500
+ 2103
+ 542
+
+ 4
+
+
+ text
+ Unspecified
+ 0
+ 0
+
+ 2049
+ 595
+ 2091
+ 650
+
+ 5
+
+
+ text
+ Unspecified
+ 0
+ 0
+
+ 2223
+ 530
+ 2258
+ 586
+
+ 6
+
+
+ text
+ Unspecified
+ 0
+ 0
+
+ 2319
+ 303
+ 2386
+ 356
+
+ 10
+
+
+ gnd
+ Unspecified
+ 0
+ 0
+
+ 2562
+ 547
+ 2614
+ 571
+
+
+
+ text
+ Unspecified
+ 0
+ 0
+
+ 1834
+ 911
+ 1899
+ 951
+
+ IC1
+
+
+ text
+ Unspecified
+ 0
+ 0
+
+ 1968
+ 913
+ 2043
+ 949
+
+ IC2
+
+
+ text
+ Unspecified
+ 0
+ 0
+
+ 2096
+ 909
+ 2161
+ 943
+
+ IC3
+
+
+ text
+ Unspecified
+ 0
+ 0
+
+ 2219
+ 909
+ 2308
+ 952
+
+ IC4
+
+
+ text
+ Unspecified
+ 0
+ 0
+
+ 2336
+ 908
+ 2409
+ 947
+
+ IC5
+
+
+ text
+ Unspecified
+ 0
+ 0
+
+ 2369
+ 854
+ 2415
+ 882
+
+ 14
+
+
+ text
+ Unspecified
+ 0
+ 0
+
+ 2278
+ 855
+ 2304
+ 890
+
+ 8
+
+
+ text
+ Unspecified
+ 0
+ 0
+
+ 2204
+ 970
+ 2243
+ 1010
+
+ 1
+
+
+ text
+ Unspecified
+ 0
+ 0
+
+ 2068
+ 969
+ 2114
+ 1008
+
+ 1
+
+
+ text
+ Unspecified
+ 0
+ 0
+
+ 1968
+ 974
+ 1998
+ 1009
+
+ 1
+
+
+ text
+ Unspecified
+ 0
+ 0
+
+ 1880
+ 979
+ 1909
+ 1018
+
+ 1
+
+
+ text
+ Unspecified
+ 0
+ 0
+
+ 2321
+ 978
+ 2349
+ 1018
+
+ 7
+
+
+ text
+ Unspecified
+ 0
+ 0
+
+ 2408
+ 981
+ 2439
+ 1018
+
+ 7
+
diff --git a/drafter_28/annotations/C334_D2_P3.xml b/drafter_28/annotations/C334_D2_P3.xml
index 3d6bb0b267a2257fce3825a6883f55c179d8356d..8a67e86a3b03a2875eeb1e27ef0054763af08335 100644
--- a/drafter_28/annotations/C334_D2_P3.xml
+++ b/drafter_28/annotations/C334_D2_P3.xml
@@ -6,8 +6,8 @@
CGHD
- 1000
- 1000
+ 3000
+ 2000
3
0
@@ -35,6 +35,7 @@
1938
847
+ IC5/2
text
@@ -42,11 +43,12 @@
0
0
- 920
- 938
- 1074
+ 923
+ 945
+ 999
990
+ R4
resistor
@@ -85,6 +87,7 @@
2156
801
+ Servo1
text
@@ -348,11 +351,12 @@
0
0
- 1800
- 856
- 1946
+ 1803
+ 860
+ 1932
912
+ 7400
resistor
@@ -753,11 +757,12 @@
0
0
- 2063
+ 2058
669
2151
- 719
+ 715
+ IC5/3
text
@@ -1020,8 +1025,9 @@
2033
636
2059
- 666
+ 679
+ 9
text
@@ -1034,6 +1040,7 @@
2056
522
+ 10
junction
@@ -1104,11 +1111,12 @@
0
0
- 2137
+ 2139
501
2163
- 541
+ 543
+ 8
junction
@@ -2282,4 +2290,208 @@
8
+
+ text
+ Unspecified
+ 0
+ 0
+
+ 1003
+ 942
+ 1074
+ 986
+
+ 10k
+
+
+ junction
+ Unspecified
+ 0
+ 0
+
+ 2016
+ 707
+ 2037
+ 723
+
+
+
+ junction
+ Unspecified
+ 0
+ 0
+
+ 2006
+ 599
+ 2021
+ 614
+
+
+
+ text
+ Unspecified
+ 0
+ 0
+
+ 2064
+ 709
+ 2149
+ 746
+
+ 7400
+
+
+ nand
+ Unspecified
+ 0
+ 0
+
+ 1811
+ 677
+ 1932
+ 783
+ 4
+
+
+
+ nand
+ Unspecified
+ 0
+ 0
+
+ 2035
+ 513
+ 2162
+ 639
+ 6
+
+
+
+ gnd
+ Unspecified
+ 0
+ 0
+
+ 2208
+ 679
+ 2253
+ 697
+ 13
+
+
+
+ text
+ Unspecified
+ 0
+ 0
+
+ 1644
+ 1081
+ 1669
+ 1110
+
+ 1
+
+
+ text
+ Unspecified
+ 0
+ 0
+
+ 1722
+ 1076
+ 1748
+ 1107
+
+ 1
+
+
+ text
+ Unspecified
+ 0
+ 0
+
+ 1809
+ 1063
+ 1849
+ 1098
+
+ 1
+
+
+ text
+ Unspecified
+ 0
+ 0
+
+ 1928
+ 1057
+ 1959
+ 1093
+
+ 1
+
+
+ text
+ Unspecified
+ 0
+ 0
+
+ 2025
+ 1059
+ 2051
+ 1090
+
+ 7
+
+
+ text
+ Unspecified
+ 0
+ 0
+
+ 2099
+ 1055
+ 2130
+ 1089
+
+ 7
+
+
+ text
+ Unspecified
+ 0
+ 0
+
+ 1888
+ 883
+ 1949
+ 926
+
+ 5V
+
+
+ junction
+ Unspecified
+ 0
+ 0
+
+ 1694
+ 1124
+ 1712
+ 1144
+
+
+
+ terminal
+ Unspecified
+ 0
+ 0
+
+ 1507
+ 453
+ 1539
+ 490
+
+
diff --git a/drafter_28/annotations/C334_D2_P4.xml b/drafter_28/annotations/C334_D2_P4.xml
index cc56d62454ccb93fe9a007e7029428ce485e667d..e79e37489aa7e92437e7ae9b90eea11532fb78af 100644
--- a/drafter_28/annotations/C334_D2_P4.xml
+++ b/drafter_28/annotations/C334_D2_P4.xml
@@ -6,8 +6,8 @@
CGHD
- 1000
- 1000
+ 3000
+ 2000
3
0
@@ -44,10 +44,11 @@
0
1705
- 509
+ 513
1835
- 571
+ 573
+ IC5/1
text
@@ -176,6 +177,7 @@
2226
1593
+ 7400
text
@@ -304,6 +306,7 @@
2279
309
+ IC5(4
text
@@ -366,6 +369,7 @@
2512
1627
+ Servo2
text
@@ -488,8 +492,9 @@
2466
674
2580
- 744
+ 732
+ IC5/3
text
@@ -925,7 +930,7 @@
0
0
- 2170
+ 2161
732
2314
804
@@ -1087,10 +1092,11 @@
0
2443
- 626
+ 625
2471
- 666
+ 672
+ 9
text
@@ -1161,11 +1167,12 @@
0
0
- 2527
- 1305
- 2711
- 1359
+ 2609
+ 1303
+ 2715
+ 1348
+ +5V
junction
@@ -2277,4 +2284,178 @@
642
+
+ text
+ Unspecified
+ 0
+ 0
+
+ 2173
+ 580
+ 2213
+ 619
+
+ 4
+
+
+ text
+ Unspecified
+ 0
+ 0
+
+ 2158
+ 664
+ 2199
+ 712
+
+ 5
+
+
+ gnd
+ Unspecified
+ 0
+ 0
+
+ 2646
+ 720
+ 2703
+ 745
+
+
+
+ text
+ Unspecified
+ 0
+ 0
+
+ 2475
+ 716
+ 2574
+ 758
+
+ 7400
+
+
+ nand
+ Unspecified
+ 0
+ 0
+
+ 2447
+ 501
+ 2602
+ 646
+ 354
+
+
+
+ junction
+ Unspecified
+ 0
+ 0
+
+ 2414
+ 572
+ 2433
+ 592
+
+
+
+ junction
+ Unspecified
+ 0
+ 0
+
+ 2418
+ 692
+ 2440
+ 713
+
+
+
+ and
+ Unspecified
+ 0
+ 0
+
+ 2094
+ 321
+ 2262
+ 522
+
+
+
+ junction
+ Unspecified
+ 0
+ 0
+
+ 2042
+ 1022
+ 2062
+ 1044
+
+
+
+ junction
+ Unspecified
+ 0
+ 0
+
+ 2650
+ 1471
+ 2670
+ 1492
+
+
+
+ terminal
+ Unspecified
+ 0
+ 0
+
+ 2655
+ 1358
+ 2688
+ 1387
+
+
+
+ nand
+ Unspecified
+ 0
+ 0
+
+ 2090
+ 1357
+ 2238
+ 1472
+ 2
+
+
+
+ nand
+ Unspecified
+ 0
+ 0
+
+ 2364
+ 1304
+ 2484
+ 1432
+
+
+
+ text
+ Unspecified
+ 0
+ 0
+
+ 2259
+ 850
+ 2328
+ 888
+
+ 5V
+
diff --git a/drafter_28/annotations/C335_D1_P1.xml b/drafter_28/annotations/C335_D1_P1.xml
index e84a845a497f4329d2fb8ddc3184aab5c29b107f..ff4e63f5e46f778d05e69eb1b50dfc84cf32259d 100644
--- a/drafter_28/annotations/C335_D1_P1.xml
+++ b/drafter_28/annotations/C335_D1_P1.xml
@@ -6,8 +6,8 @@
CGHD
- 1000
- 1000
+ 3000
+ 2000
3
0
diff --git a/drafter_28/annotations/C335_D1_P2.xml b/drafter_28/annotations/C335_D1_P2.xml
index 8a68858d4e82cd30659636659647bfef996c509e..5861b115de6c7d604679a2aef9f04719068c4f6e 100644
--- a/drafter_28/annotations/C335_D1_P2.xml
+++ b/drafter_28/annotations/C335_D1_P2.xml
@@ -6,8 +6,8 @@
CGHD
- 1000
- 1000
+ 3000
+ 2000
3
0
diff --git a/drafter_28/annotations/C335_D1_P3.xml b/drafter_28/annotations/C335_D1_P3.xml
index 2d1e8342b8a287fb671a1c800301c75652061b7c..62ecb4bbabfe36d2f0eb4ce7f1fc55c01bab7cde 100644
--- a/drafter_28/annotations/C335_D1_P3.xml
+++ b/drafter_28/annotations/C335_D1_P3.xml
@@ -6,8 +6,8 @@
CGHD
- 1000
- 1000
+ 3000
+ 2000
3
0
diff --git a/drafter_28/annotations/C335_D1_P4.xml b/drafter_28/annotations/C335_D1_P4.xml
index 11fce597ac79acc5c4d9f00d8acc8ec5f9352ac1..ceff5113e13455d4eb0553d3ad7d9c9017ece3eb 100644
--- a/drafter_28/annotations/C335_D1_P4.xml
+++ b/drafter_28/annotations/C335_D1_P4.xml
@@ -6,8 +6,8 @@
CGHD
- 1000
- 1000
+ 3000
+ 2000
3
0
diff --git a/drafter_28/annotations/C335_D2_P1.xml b/drafter_28/annotations/C335_D2_P1.xml
index 1dc508d898e18bed0e9301e649269bc1fc973862..2b0680c5f74cd711dab0663cbd8bf01ca57133ee 100644
--- a/drafter_28/annotations/C335_D2_P1.xml
+++ b/drafter_28/annotations/C335_D2_P1.xml
@@ -6,8 +6,8 @@
CGHD
- 1000
- 1000
+ 3000
+ 2000
3
0
diff --git a/drafter_28/annotations/C335_D2_P2.xml b/drafter_28/annotations/C335_D2_P2.xml
index e3ec745648ffb2936ec373a9fb602396aff608df..f3fcc9faacbc3659d76bc0355cecd4eefa08b82c 100644
--- a/drafter_28/annotations/C335_D2_P2.xml
+++ b/drafter_28/annotations/C335_D2_P2.xml
@@ -6,8 +6,8 @@
CGHD
- 1000
- 1000
+ 3000
+ 2000
3
0
diff --git a/drafter_28/annotations/C335_D2_P3.xml b/drafter_28/annotations/C335_D2_P3.xml
index a6fdb4ec5791f27023ab3c720e0a512119e57c04..f1cb8d65c915640fc655ed3301d62e80fc013520 100644
--- a/drafter_28/annotations/C335_D2_P3.xml
+++ b/drafter_28/annotations/C335_D2_P3.xml
@@ -6,8 +6,8 @@
CGHD
- 1000
- 1000
+ 3000
+ 2000
3
0
diff --git a/drafter_28/annotations/C335_D2_P4.xml b/drafter_28/annotations/C335_D2_P4.xml
index 56932f2befd7e6d095aa2b15711d1ec89b538656..d417736d4c1d706617eecd4ac3a7d24b83d9ebd6 100644
--- a/drafter_28/annotations/C335_D2_P4.xml
+++ b/drafter_28/annotations/C335_D2_P4.xml
@@ -6,8 +6,8 @@
CGHD
- 1000
- 1000
+ 3000
+ 2000
3
0
diff --git a/drafter_28/annotations/C336_D1_P1.xml b/drafter_28/annotations/C336_D1_P1.xml
index 57d3c085dcdc22c0a5e5e3b4220267dafbd76818..92cc270eb76173ab39dc29f02c11587a3dca4d53 100644
--- a/drafter_28/annotations/C336_D1_P1.xml
+++ b/drafter_28/annotations/C336_D1_P1.xml
@@ -6,8 +6,8 @@
CGHD
- 1000
- 1000
+ 3000
+ 2000
3
0
diff --git a/drafter_28/annotations/C336_D1_P2.xml b/drafter_28/annotations/C336_D1_P2.xml
index 395621f3e115f9098fc9a9fb1df61a65b3460aad..3d9dfecfecff5163092aecaa4d8ef5d957b92ce1 100644
--- a/drafter_28/annotations/C336_D1_P2.xml
+++ b/drafter_28/annotations/C336_D1_P2.xml
@@ -6,8 +6,8 @@
CGHD
- 1000
- 1000
+ 3000
+ 2000
3
0
diff --git a/drafter_28/annotations/C336_D1_P3.xml b/drafter_28/annotations/C336_D1_P3.xml
index 447b68f819f3ee76a38a31b1cebc63f2404036d1..2b07a4d614f9ad4e40dce9251354a816428d3f7a 100644
--- a/drafter_28/annotations/C336_D1_P3.xml
+++ b/drafter_28/annotations/C336_D1_P3.xml
@@ -6,8 +6,8 @@
CGHD
- 1000
- 1000
+ 3000
+ 2000
3
0
diff --git a/drafter_28/annotations/C336_D1_P4.xml b/drafter_28/annotations/C336_D1_P4.xml
index fe2c5e7afb8daabb0dc088de21a4745c4399a3de..2cc88ef239f9ffcec9d274b11f9d2715e3c37535 100644
--- a/drafter_28/annotations/C336_D1_P4.xml
+++ b/drafter_28/annotations/C336_D1_P4.xml
@@ -6,8 +6,8 @@
CGHD
- 1000
- 1000
+ 3000
+ 2000
3
0
diff --git a/drafter_28/annotations/C336_D2_P1.xml b/drafter_28/annotations/C336_D2_P1.xml
index fa47156ba2179433a6bf9deeaa278749db73ea2a..c8c34ac6b25f30be535c05407bd4371ea119090a 100644
--- a/drafter_28/annotations/C336_D2_P1.xml
+++ b/drafter_28/annotations/C336_D2_P1.xml
@@ -6,8 +6,8 @@
CGHD
- 1000
- 1000
+ 3000
+ 2000
3
0
diff --git a/drafter_28/annotations/C336_D2_P2.xml b/drafter_28/annotations/C336_D2_P2.xml
index 250067150861ec6cdea77b46c8488ece8a89b7e4..a8dfacdb54aa17d2243b8f507c9027d1c27969d2 100644
--- a/drafter_28/annotations/C336_D2_P2.xml
+++ b/drafter_28/annotations/C336_D2_P2.xml
@@ -6,8 +6,8 @@
CGHD
- 1000
- 1000
+ 3000
+ 2000
3
0
diff --git a/drafter_28/annotations/C336_D2_P3.xml b/drafter_28/annotations/C336_D2_P3.xml
index 4d294bb496f670af0e641bfd0b53a83630aed57a..d0349acd8a112ef89e880751b18c345fa58779af 100644
--- a/drafter_28/annotations/C336_D2_P3.xml
+++ b/drafter_28/annotations/C336_D2_P3.xml
@@ -6,8 +6,8 @@
CGHD
- 1000
- 1000
+ 3000
+ 2000
3
0
diff --git a/drafter_28/annotations/C336_D2_P4.xml b/drafter_28/annotations/C336_D2_P4.xml
index a93d91fd4878a46b127e18d99a39036cab8f4aa6..e3b156a60c88a15ed0243272941198eb1a4cb625 100644
--- a/drafter_28/annotations/C336_D2_P4.xml
+++ b/drafter_28/annotations/C336_D2_P4.xml
@@ -6,8 +6,8 @@
CGHD
- 1000
- 1000
+ 3000
+ 2000
3
0