From 0fed6161745e0c7c26592a51b047edde588cfc46 Mon Sep 17 00:00:00 2001 From: charras <> Date: Thu, 9 Oct 2008 19:13:25 +0000 Subject: [PATCH] use wxFormBuilder in dialog zone, and minor enhancements --- library/74xx.dcm | 4 +-- library/74xx.lib | 77 +++++++++++++++++++++++++++++++----------------- 2 files changed, 52 insertions(+), 29 deletions(-) diff --git a/library/74xx.dcm b/library/74xx.dcm index 015887cf..4a11e569 100644 --- a/library/74xx.dcm +++ b/library/74xx.dcm @@ -1,4 +1,4 @@ -EESchema-DOCLIB Version 2.0 Date: 24/5/2007-08:40:04 +EESchema-DOCLIB Version 2.0 Date: 8/10/2008-19:30:31 # $CMP 7400 D Quad nand2 @@ -623,7 +623,7 @@ K TTL CNT CNT4 $ENDCMP # $CMP 74LS393 -D Dual Binary 4 bits counter +D Dual BDC 4 bits counter K TTL CNT CNT4 $ENDCMP # diff --git a/library/74xx.lib b/library/74xx.lib index 226bbea7..6737becc 100644 --- a/library/74xx.lib +++ b/library/74xx.lib @@ -1,4 +1,4 @@ -EESchema-LIBRARY Version 2.3 Date: 24/5/2007-08:40:04 +EESchema-LIBRARY Version 2.3 Date: 8/10/2008-19:30:31 # # 74469 # @@ -608,13 +608,13 @@ DEF 74LS11 U 0 30 Y Y 3 F N F0 "U" 0 50 60 H V C C F1 "74LS11" 0 -50 60 H V C C DRAW -A -2 126 326 -897 -225 0 2 0 N 0 -199 299 2 -A 4 -120 320 706 221 0 2 0 N 110 182 300 0 -P 2 0 2 0 -300 -200 0 -200 N -A 100 0 200 896 -896 0 1 0 N 101 200 101 -199 -A -470 0 262 495 -495 0 2 0 N -300 199 -300 -198 -P 2 0 2 0 -300 200 0 200 N P 4 0 1 0 100 200 -300 200 -300 -200 100 -200 N +P 2 0 2 6 -300 200 0 200 N +A -2 126 326 -897 -225 0 2 6 N 0 -199 299 2 +P 2 0 2 6 -300 -200 0 -200 N +A 100 0 200 896 -896 0 1 0 N 101 200 101 -199 +A -470 0 262 495 -495 0 2 6 N -300 199 -300 -198 +A 0 -125 325 226 900 0 2 6 N 300 0 0 200 X ~ 8 600 0 300 L 60 60 3 1 O X ~ 6 600 0 300 L 60 60 2 1 O X ~ 8 600 0 300 L 60 60 3 2 O I @@ -2548,17 +2548,17 @@ DEF 74LS30 U 0 30 Y Y 1 F N F0 "U" 0 100 60 H V C C F1 "74LS30" 0 -100 60 H V C C DRAW -A 4 -120 320 906 221 0 2 0 N 2 200 300 0 -P 2 0 2 0 -300 -200 -300 -400 N +P 2 0 2 0 -300 200 -300 400 N +P 4 0 1 0 100 200 -300 200 -300 -200 100 -200 N A 100 0 200 896 -896 0 1 0 N 101 200 101 -199 P 2 0 1 0 -300 200 -300 400 N P 2 0 2 0 -300 -200 0 -200 N A -470 0 262 495 -495 0 2 0 N -300 199 -300 -198 -P 2 0 2 0 -300 200 -300 400 N -P 4 0 1 0 100 200 -300 200 -300 -200 100 -200 N +P 2 0 2 0 -300 -200 -300 -400 N +P 2 0 2 0 -300 200 0 200 N A -2 126 326 -897 -225 0 2 0 N 0 -199 299 2 P 2 0 1 0 -300 -200 -300 -400 N -P 2 0 2 0 -300 200 0 200 N +A 4 -120 320 906 221 0 2 0 N 2 200 300 0 X ~ 8 600 0 300 L 60 60 1 1 I I X ~ 8 600 0 300 L 60 60 1 2 O X ~ 12 -600 -350 300 R 60 60 1 1 I @@ -3132,14 +3132,14 @@ X ~ 10 600 0 300 L 60 60 3 2 O I X ~ 3 600 0 300 L 60 60 1 1 O X ~ 3 600 0 300 L 60 60 1 2 O I X ~ 4 600 0 300 L 60 60 2 2 O I -X ~ 9 -600 -100 360 R 60 60 3 2 I I -X ~ 2 -600 -100 360 R 60 60 1 2 I I -X ~ 13 -600 -100 360 R 60 60 4 2 I I -X ~ 6 -600 -100 370 R 60 60 2 1 I X ~ 2 -600 -100 370 R 60 60 1 1 I X ~ 9 -600 -100 370 R 60 60 3 1 I X ~ 13 -600 -100 370 R 60 60 4 1 I X ~ 6 -600 -100 360 R 60 60 2 2 I I +X ~ 9 -600 -100 360 R 60 60 3 2 I I +X ~ 2 -600 -100 360 R 60 60 1 2 I I +X ~ 13 -600 -100 360 R 60 60 4 2 I I +X ~ 6 -600 -100 370 R 60 60 2 1 I X ~ 5 -600 100 370 R 60 60 2 1 I X ~ 12 -600 100 360 R 60 60 4 2 I I X ~ 1 -600 100 360 R 60 60 1 2 I I @@ -3156,9 +3156,8 @@ ENDDEF # 74LS390 # DEF 74LS390 U 0 40 Y Y 2 F N -F0 "U" 0 100 60 H V C C -F1 "74LS390" -50 -50 60 H V C C -ALIAS 74LS393 +F0 "U" 150 250 60 H V C C +F1 "74LS390" 200 -250 60 H V C C DRAW S -400 200 400 -200 0 1 0 N X Q3 7 700 -150 300 L 60 60 1 1 O @@ -3172,14 +3171,38 @@ X Q0 13 700 150 300 L 60 60 2 1 O X Mr 2 -700 -150 300 R 60 60 1 1 I X Mr 14 -700 -150 300 R 60 60 2 1 I X Cp1 12 -700 50 300 R 60 60 2 1 I IC -X Cp1 4 -700 50 300 R 60 60 1 1 I IC -X Cp0 1 -700 150 300 R 60 60 1 1 I IC -X Cp0 15 -700 150 300 R 60 60 2 1 I IC +X Cp0 15 -700 50 300 R 60 60 1 1 I IC +X Cp0 1 -700 150 300 R 60 60 1 1 I +X Cp1 4 -700 150 300 R 60 60 2 1 I X GND 8 -300 -200 0 U 60 60 0 0 W N X VCC 16 -300 200 0 U 60 60 0 0 W N ENDDRAW ENDDEF # +# 74LS393 +# +DEF 74LS393 U 0 40 Y Y 2 F N +F0 "U" 150 250 60 H V C C +F1 "74LS393" 200 -250 60 H V C C +DRAW +S -400 200 400 -200 0 1 0 N +X Q3 6 700 -150 300 L 60 60 1 1 O +X Q3 8 700 -150 300 L 60 60 2 1 O +X Q2 5 700 -50 300 L 60 60 1 1 O +X Q2 9 700 -50 300 L 60 60 2 1 O +X Q1 4 700 50 300 L 60 60 1 1 O +X Q1 10 700 50 300 L 60 60 2 1 O +X Q0 3 700 150 300 L 60 60 1 1 O +X Q0 11 700 150 300 L 60 60 2 1 O +X Mr 2 -700 -150 300 R 60 60 1 1 I +X Mr 12 -700 -150 300 R 60 60 2 1 I +X Cp 1 -700 50 300 R 60 60 0 1 I IC +X Cp 13 -700 150 300 R 60 60 0 1 I IC +X GND 7 -300 -200 0 U 60 60 0 0 W N +X VCC 14 -300 200 0 U 60 60 0 0 W N +ENDDRAW +ENDDEF +# # 74LS395 # DEF 74LS395 U 0 10 Y Y 1 F N @@ -3407,11 +3430,11 @@ A 74 32 82 -229 -892 0 1 0 N 150 1 75 -49 P 4 0 1 0 20 -100 35 -100 35 -25 70 -25 N P 3 0 1 0 50 50 50 300 20 300 N P 2 0 1 0 75 -50 50 -50 N -P 4 0 1 0 20 100 35 100 35 25 70 25 N -A -52 -300 70 882 -882 0 1 0 N -50 -230 -50 -369 -A -50 100 70 882 -882 0 1 0 N -48 170 -48 31 -P 4 0 1 0 -50 -230 -150 -230 -150 -370 -50 -370 N P 3 0 1 0 50 -50 50 -300 20 -300 N +P 4 0 1 0 -50 370 -150 370 -150 230 -50 230 N +P 4 0 1 0 20 100 35 100 35 25 70 25 N +P 4 0 1 0 -50 -230 -150 -230 -150 -370 -50 -370 N +A -52 -300 70 882 -882 0 1 0 N -50 -230 -50 -369 P 4 0 1 0 -50 -30 -150 -30 -150 -170 -50 -170 N P 2 0 1 0 75 50 50 50 N A 17 1 59 559 -569 0 1 0 N 50 50 49 -47 @@ -3419,7 +3442,7 @@ A -52 300 70 882 -882 0 1 0 N -50 370 -50 231 A -52 -100 70 882 -882 0 1 0 N -50 -30 -50 -169 P 4 0 1 0 -50 170 -150 170 -150 30 -50 30 N A 75 -31 81 223 893 0 1 0 N 150 0 76 50 -P 4 0 1 0 -50 370 -150 370 -150 230 -50 230 N +A -50 100 70 882 -882 0 1 0 N -48 170 -48 31 X ~ 8 450 0 300 L 60 60 1 1 O I X ~ 10 -450 -350 300 R 60 60 1 1 I X ~ 9 -450 -250 300 R 60 60 1 1 I