[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: branch: master updated (1.0-20070526-70-gb44a1e5)
The branch, master has been updated
via b44a1e527497e55471a75b0af410e78310ed50d8 (commit)
from 2b8cc26ddbb4af4db653d913c49f6d365dc89df9 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
=========
Summary
=========
gnetlist/scheme/gnet-cascade.scm | 6 +-
gnetlist/scheme/gnet-pcbpins.scm | 4 +-
gnetlist/tests/Makefile.am | 12 +++-
gnetlist/tests/cascade.cascade | 19 ++++++
gnetlist/tests/cascade.sch | 126 ++++++++++++++++++++++++++++++++++++++
gnetlist/tests/singlenet.pcbpins | 18 ++++++
6 files changed, 179 insertions(+), 6 deletions(-)
create mode 100644 gnetlist/tests/cascade.cascade
create mode 100644 gnetlist/tests/cascade.sch
create mode 100644 gnetlist/tests/singlenet.pcbpins
=================
Commit Messages
=================
commit b44a1e527497e55471a75b0af410e78310ed50d8
Author: Dan McMahill <dan@xxxxxxxxxxxx>
Date: Tue Jun 26 18:11:39 2007 -0400
guile-1.8.1 fixes and testsuite additions.
Updated the cascade and pcbpins backends to work with guile-1.8.1.
While here added a testsuite entry for these two backends.
:100644 100644 2b59d44... 840ec87... M gnetlist/scheme/gnet-cascade.scm
:100644 100644 0358054... 67f951e... M gnetlist/scheme/gnet-pcbpins.scm
:100644 100644 b6a40d0... 0ff4e17... M gnetlist/tests/Makefile.am
:000000 100644 0000000... e11fa3c... A gnetlist/tests/cascade.cascade
:000000 100644 0000000... 8d91db9... A gnetlist/tests/cascade.sch
:000000 100644 0000000... 354731e... A gnetlist/tests/singlenet.pcbpins
=========
Changes
=========
commit b44a1e527497e55471a75b0af410e78310ed50d8
Author: Dan McMahill <dan@xxxxxxxxxxxx>
Date: Tue Jun 26 18:11:39 2007 -0400
guile-1.8.1 fixes and testsuite additions.
Updated the cascade and pcbpins backends to work with guile-1.8.1.
While here added a testsuite entry for these two backends.
diff --git a/gnetlist/scheme/gnet-cascade.scm b/gnetlist/scheme/gnet-cascade.scm
index 2b59d44..840ec87 100644
--- a/gnetlist/scheme/gnet-cascade.scm
+++ b/gnetlist/scheme/gnet-cascade.scm
@@ -52,7 +52,7 @@
(lambda (port pkgs)
(if (not (null? pkgs))
(let ( (package (car pkgs) )
- (sourcenet nil)
+ (sourcenet #f)
)
(if (string=? (get-device package) "cascade-source")
(begin
@@ -78,7 +78,7 @@
)
)
;; the list of packages is now empty
- nil
+ '()
)
)
)
@@ -143,7 +143,7 @@
(display (string-append "Writing to output file \"" filename
"\"... ") )
(let ((port (open-output-file filename))
- (first_block nil)
+ (first_block #f)
)
;; write the header
diff --git a/gnetlist/scheme/gnet-pcbpins.scm b/gnetlist/scheme/gnet-pcbpins.scm
index 0358054..67f951e 100644
--- a/gnetlist/scheme/gnet-pcbpins.scm
+++ b/gnetlist/scheme/gnet-pcbpins.scm
@@ -25,8 +25,8 @@
(begin
(let (
(pin (car pins))
- (label nil)
- (pinnum nil)
+ (label #f)
+ (pinnum #f)
)
(display "ChangePinName(" port)
(display package port)
diff --git a/gnetlist/tests/Makefile.am b/gnetlist/tests/Makefile.am
index b6a40d0..0ff4e17 100644
--- a/gnetlist/tests/Makefile.am
+++ b/gnetlist/tests/Makefile.am
@@ -3,11 +3,13 @@
SUBDIRS = hierarchy drc2 spice-sdb
EXTRA_DIST = runtest.sh \
- 7447.vhdl README amp.spice darlington.spice netattrib.geda \
+ 7447.vhdl README amp.spice cascade.sch cascade.cascade \
+ darlington.spice netattrib.geda \
netattrib.sch powersupply.PCB powersupply.allegro \
powersupply.bae powersupply.geda powersupply.maxascii \
powersupply.pads powersupply.protelII powersupply.sch \
powersupply.tango singlenet.PCB singlenet.geda singlenet.pads \
+ singlenet.pcbpins \
singlenet.protelII singlenet.sch stack_1.geda amp.spice-sdb \
darlington.spice-sdb skt.switcap test.ana multiequal.sch \
multiequal.spice-sdb gnetlistrc.vhdl
@@ -40,6 +42,10 @@ tests:
$(SRCDIR)/runtest.sh $(SRCDIR)/singlenet.sch PCB \
$(BUILDDIR) $(SRCDIR)
+# singlenet pcbpins
+ $(SRCDIR)/runtest.sh $(SRCDIR)/singlenet.sch pcbpins \
+ $(BUILDDIR) $(SRCDIR)
+
# singlenet PADS
$(SRCDIR)/runtest.sh $(SRCDIR)/singlenet.sch pads \
$(BUILDDIR) $(SRCDIR)
@@ -84,6 +90,10 @@ tests:
$(SRCDIR)/runtest.sh $(SRCDIR)/multiequal.sch spice-sdb \
$(BUILDDIR) $(SRCDIR)
+# cascade backend
+ $(SRCDIR)/runtest.sh $(SRCDIR)/cascade.sch cascade \
+ $(BUILDDIR) $(SRCDIR)
+
# Cleanup
rm -f $(BUILDDIR)/new_*
rm -rf $(BUILDDIR)/devfiles
diff --git a/gnetlist/tests/cascade.cascade b/gnetlist/tests/cascade.cascade
new file mode 100644
index 0000000..e11fa3c
--- /dev/null
+++ b/gnetlist/tests/cascade.cascade
@@ -0,0 +1,19 @@
+# Cascade (http://rfcascade.sourceforge.net)
+# Created with gEDA/gnetlist
+
+# Initial global defaults
+defaults RIN=50 ROUT=50 RHO=0
+
+# Source definition
+source C=0 CN=70 BW=1
+
+# Cascaded system
+AMP1 G=12 NF=5 IIP3=-2
+defaults RIN=50 ROUT=50 RHO=0.2
+FL1 G=-5.5 NF=5.5
+MX1 G=12 NF=15 IIP3=5
+T1 G=0 NF=0 RIN=50 ROUT=50
+AMP2 G=10 NF=12 IIP3=12
+
+# End of netlist created by gEDA/gnetlist
+
diff --git a/gnetlist/tests/cascade.sch b/gnetlist/tests/cascade.sch
new file mode 100644
index 0000000..8d91db9
--- /dev/null
+++ b/gnetlist/tests/cascade.sch
@@ -0,0 +1,126 @@
+v 20070526 1
+C 40000 40000 0 0 0 title-B.sym
+C 41300 48800 1 0 0 cascade-defaults-2.sym
+{
+T 43100 52200 5 10 0 1 0 0 1
+device=cascade-defaults-top
+T 41400 48900 5 10 1 1 0 0 1
+refdes=DEFAULTS
+T 41500 49500 5 10 1 0 0 0 1
+RIN=50
+T 42900 49500 5 10 1 0 0 0 1
+ROUT=50
+T 44500 49500 5 10 1 0 0 0 1
+RHO=0
+}
+C 40800 46000 1 0 0 cascade-source-1.sym
+{
+T 39600 45900 5 10 0 0 0 0 1
+device=cascade-source
+T 40900 47300 5 10 1 1 0 0 1
+refdes=SOURCE
+T 40100 46200 5 10 0 1 0 0 1
+footprint=none
+T 40900 46400 5 10 1 0 0 0 1
+C=0
+T 40900 46200 5 10 1 0 0 0 1
+CN=70
+T 40900 46000 5 10 1 0 0 0 1
+BW=1
+}
+C 42500 46100 1 0 0 cascade-amp-1.sym
+{
+T 42425 46650 5 8 0 0 0 0 1
+device=cascade-amp
+T 42700 47500 5 10 1 1 0 0 1
+refdes=AMP1
+T 42100 46400 5 10 0 1 0 0 1
+footprint=none
+T 42800 46500 5 10 1 0 0 0 1
+G=12
+T 42800 46300 5 10 1 0 0 0 1
+NF=5
+T 42800 46100 5 10 1 0 0 0 1
+IIP3=-2
+}
+C 44000 46600 1 0 0 cascade-defaults-1.sym
+{
+T 44525 47550 5 8 0 0 0 0 1
+device=cascade-defaults
+T 44200 47700 5 10 1 1 0 0 1
+refdes=DEF1
+T 44300 47200 5 10 1 0 0 1 1
+RIN=50
+T 44300 47000 5 10 1 0 0 1 1
+ROUT=50
+T 44300 46800 5 10 1 0 0 1 1
+RHO=0.2
+T 44000 46600 5 10 0 1 0 0 1
+footprint=none
+}
+C 46500 46200 1 0 0 cascade-filter-1.sym
+{
+T 46700 47700 5 10 0 0 0 0 1
+footprint=none
+T 44700 44850 5 10 0 1 0 0 1
+device=cascade-filter
+T 46800 47500 5 10 1 1 0 0 1
+refdes=FL1
+T 46900 46400 5 10 1 0 0 0 1
+G=-5.5
+T 46900 46200 5 10 1 0 0 0 1
+NF=5.5
+}
+C 48500 45800 1 0 0 cascade-mixer-1.sym
+{
+T 49000 47400 5 10 0 0 0 0 1
+footprint=none
+T 47300 45650 5 10 0 1 0 0 1
+device=cascade-mixer
+T 48800 47600 5 10 1 1 0 0 1
+refdes=MX1
+T 49000 46200 5 10 1 0 0 0 1
+G=12
+T 49000 46000 5 10 1 0 0 0 1
+NF=15
+T 49000 45800 5 10 1 0 0 0 1
+IIP3=5
+}
+C 50500 45100 1 0 0 cascade-transformer-1.sym
+{
+T 50800 47150 5 10 1 1 0 0 1
+refdes=T1
+T 49200 45550 5 10 0 0 0 0 1
+device=cascade-transformer
+T 50200 46300 5 10 0 1 0 0 1
+footprint=none
+T 51100 45700 5 10 1 0 0 0 1
+G=0
+T 51100 45500 5 10 1 0 0 0 1
+NF=0
+T 51100 45300 5 10 1 0 0 0 1
+RIN=50
+T 51100 45100 5 10 1 0 0 0 1
+ROUT=50
+}
+C 52900 46100 1 0 0 cascade-amp-1.sym
+{
+T 52825 46650 5 8 0 0 0 0 1
+device=cascade-amp
+T 53100 47500 5 10 1 1 0 0 1
+refdes=AMP2
+T 52500 46400 5 10 0 1 0 0 1
+footprint=none
+T 53200 46500 5 10 1 0 0 0 1
+G=10
+T 53200 46300 5 10 1 0 0 0 1
+NF=12
+T 53200 46100 5 10 1 0 0 0 1
+IIP3=12
+}
+N 52900 47000 52000 47000 4
+N 50500 47000 49900 47000 4
+N 48500 47000 47800 47000 4
+N 46500 47000 45600 47000 4
+N 44000 47000 43500 47000 4
+N 42500 47000 41500 47000 4
diff --git a/gnetlist/tests/singlenet.pcbpins b/gnetlist/tests/singlenet.pcbpins
new file mode 100644
index 0000000..354731e
--- /dev/null
+++ b/gnetlist/tests/singlenet.pcbpins
@@ -0,0 +1,18 @@
+# Pin name action command file
+
+# Start of element U100
+ChangePinName(U100, unknown, unknown)
+ChangePinName(U100, unknown, unknown)
+ChangePinName(U100, 9, A)
+ChangePinName(U100, 10, B)
+ChangePinName(U100, 8, Y)
+ChangePinName(U100, unknown, unknown)
+ChangePinName(U100, unknown, unknown)
+ChangePinName(U100, 1, A)
+ChangePinName(U100, 2, B)
+ChangePinName(U100, 3, Y)
+ChangePinName(U100, unknown, unknown)
+ChangePinName(U100, unknown, unknown)
+ChangePinName(U100, 4, A)
+ChangePinName(U100, 5, B)
+ChangePinName(U100, 6, Y)
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs