From 56d3d8f5f3373b0612d34f019a20be257ae48755 Mon Sep 17 00:00:00 2001 From: Stefan Frederik Date: Thu, 28 Jul 2022 00:36:09 +0200 Subject: [PATCH] recognize \r\n sequences on windows rawfiles in "Binary:" lines, just in case ngspice developers want to add it someday. Quote ROUT ('ROUT') values for output resistors in ngspice_logic gates --- src/save.c | 2 +- xschem_library/ngspice/and3_ngspice.sch | 2 +- xschem_library/ngspice/and_ngspice.sch | 2 +- xschem_library/ngspice/buf_ngspice.sch | 2 +- xschem_library/ngspice/inv_ngspice.sch | 2 +- xschem_library/ngspice/nand_ngspice.sch | 2 +- xschem_library/ngspice/nor_ngspice.sch | 2 +- xschem_library/ngspice/or_ngspice.sch | 2 +- xschem_library/ngspice/xnor_ngspice.sch | 2 +- xschem_library/ngspice/xor_ngspice.sch | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/save.c b/src/save.c index 09dbad0b..4db909f2 100644 --- a/src/save.c +++ b/src/save.c @@ -309,7 +309,7 @@ static int read_dataset(FILE *fd) "Use binary format in ngspice (set filetype=binary)}"); return 0; } - if(!strcmp(line, "Binary:\n")) { + if(!strcmp(line, "Binary:\n") || !strcmp(line, "Binary:\r\n")) { int npoints = xctx->graph_npoints[xctx->graph_datasets]; if(xctx->graph_sim_type) { done_header = 1; diff --git a/xschem_library/ngspice/and3_ngspice.sch b/xschem_library/ngspice/and3_ngspice.sch index 4419abed..12d20c28 100644 --- a/xschem_library/ngspice/and3_ngspice.sch +++ b/xschem_library/ngspice/and3_ngspice.sch @@ -18,7 +18,7 @@ C {bsource.sym} 480 -330 0 1 {name=B1 VAR=V FUNC="'VCC/2*(1+tanh((min(V(C1),min( C {lab_pin.sym} 310 -400 0 0 {name=l2 sig_type=std_logic lab=A1} C {lab_pin.sym} 480 -250 0 0 {name=l3 sig_type=std_logic lab=0} C {res.sym} 580 -400 1 0 {name=R1 -value=ROUT +value='ROUT' footprint=1206 device=resistor m=1} diff --git a/xschem_library/ngspice/and_ngspice.sch b/xschem_library/ngspice/and_ngspice.sch index 1e7cdec1..4bf1c940 100644 --- a/xschem_library/ngspice/and_ngspice.sch +++ b/xschem_library/ngspice/and_ngspice.sch @@ -17,7 +17,7 @@ C {bsource.sym} 480 -330 0 1 {name=B1 VAR=V FUNC="'VCC/2*(1+tanh((min(V(A1),V(B1 C {lab_pin.sym} 330 -400 0 0 {name=l2 sig_type=std_logic lab=A1} C {lab_pin.sym} 480 -250 0 0 {name=l3 sig_type=std_logic lab=0} C {res.sym} 580 -400 1 0 {name=R1 -value=ROUT +value='ROUT' footprint=1206 device=resistor m=1} diff --git a/xschem_library/ngspice/buf_ngspice.sch b/xschem_library/ngspice/buf_ngspice.sch index 4e5fc5e9..ebc44a53 100644 --- a/xschem_library/ngspice/buf_ngspice.sch +++ b/xschem_library/ngspice/buf_ngspice.sch @@ -17,7 +17,7 @@ C {bsource.sym} 470 -400 0 1 {name=B1 VAR=V FUNC="'VCC/2*(1+tanh((V(A1)-VCC/2)*1 C {lab_pin.sym} 320 -470 0 0 {name=l2 sig_type=std_logic lab=A1} C {lab_pin.sym} 470 -320 0 0 {name=l3 sig_type=std_logic lab=0} C {res.sym} 570 -470 1 0 {name=R1 -value=ROUT +value='ROUT' footprint=1206 device=resistor m=1} diff --git a/xschem_library/ngspice/inv_ngspice.sch b/xschem_library/ngspice/inv_ngspice.sch index f37c7c0b..23a91ffd 100644 --- a/xschem_library/ngspice/inv_ngspice.sch +++ b/xschem_library/ngspice/inv_ngspice.sch @@ -17,7 +17,7 @@ C {bsource.sym} 470 -400 0 1 {name=B1 VAR=V FUNC="'VCC/2*(1-tanh((V(A1)-VCC/2)*1 C {lab_pin.sym} 320 -470 0 0 {name=l2 sig_type=std_logic lab=A1} C {lab_pin.sym} 470 -320 0 0 {name=l3 sig_type=std_logic lab=0} C {res.sym} 570 -470 1 0 {name=R1 -value=ROUT +value='ROUT' footprint=1206 device=resistor m=1} diff --git a/xschem_library/ngspice/nand_ngspice.sch b/xschem_library/ngspice/nand_ngspice.sch index 08562c79..b007b520 100644 --- a/xschem_library/ngspice/nand_ngspice.sch +++ b/xschem_library/ngspice/nand_ngspice.sch @@ -17,7 +17,7 @@ C {bsource.sym} 480 -330 0 1 {name=B1 VAR=V FUNC="'VCC/2*(1-tanh((min(V(A1),V(B1 C {lab_pin.sym} 330 -400 0 0 {name=l2 sig_type=std_logic lab=A1} C {lab_pin.sym} 480 -250 0 0 {name=l3 sig_type=std_logic lab=0} C {res.sym} 580 -400 1 0 {name=R1 -value=ROUT +value='ROUT' footprint=1206 device=resistor m=1} diff --git a/xschem_library/ngspice/nor_ngspice.sch b/xschem_library/ngspice/nor_ngspice.sch index 82e44f6d..270d317c 100644 --- a/xschem_library/ngspice/nor_ngspice.sch +++ b/xschem_library/ngspice/nor_ngspice.sch @@ -17,7 +17,7 @@ C {bsource.sym} 480 -330 0 1 {name=B1 VAR=V FUNC="'VCC/2*(1-tanh((max(V(A1),V(B1 C {lab_pin.sym} 330 -400 0 0 {name=l2 sig_type=std_logic lab=A1} C {lab_pin.sym} 480 -250 0 0 {name=l3 sig_type=std_logic lab=0} C {res.sym} 580 -400 1 0 {name=R1 -value=ROUT +value='ROUT' footprint=1206 device=resistor m=1} diff --git a/xschem_library/ngspice/or_ngspice.sch b/xschem_library/ngspice/or_ngspice.sch index 5b62d5c1..c80dc950 100644 --- a/xschem_library/ngspice/or_ngspice.sch +++ b/xschem_library/ngspice/or_ngspice.sch @@ -17,7 +17,7 @@ C {bsource.sym} 480 -330 0 1 {name=B1 VAR=V FUNC="'VCC/2*(1+tanh((max(V(A1),V(B1 C {lab_pin.sym} 330 -400 0 0 {name=l2 sig_type=std_logic lab=A1} C {lab_pin.sym} 480 -250 0 0 {name=l3 sig_type=std_logic lab=0} C {res.sym} 580 -400 1 0 {name=R1 -value=ROUT +value='ROUT' footprint=1206 device=resistor m=1} diff --git a/xschem_library/ngspice/xnor_ngspice.sch b/xschem_library/ngspice/xnor_ngspice.sch index dc916eed..523168e7 100644 --- a/xschem_library/ngspice/xnor_ngspice.sch +++ b/xschem_library/ngspice/xnor_ngspice.sch @@ -17,7 +17,7 @@ C {bsource.sym} 480 -330 0 1 {name=B1 VAR=V FUNC="'VCC/2*(1-tanh((abs(V(A1)-V(B1 C {lab_pin.sym} 330 -400 0 0 {name=l2 sig_type=std_logic lab=A1} C {lab_pin.sym} 480 -250 0 0 {name=l3 sig_type=std_logic lab=0} C {res.sym} 580 -400 1 0 {name=R1 -value=ROUT +value='ROUT' footprint=1206 device=resistor m=1} diff --git a/xschem_library/ngspice/xor_ngspice.sch b/xschem_library/ngspice/xor_ngspice.sch index 74309b9b..37273afb 100644 --- a/xschem_library/ngspice/xor_ngspice.sch +++ b/xschem_library/ngspice/xor_ngspice.sch @@ -17,7 +17,7 @@ C {bsource.sym} 480 -330 0 1 {name=B1 VAR=V FUNC="'VCC/2*(1+tanh((abs(V(A1)-V(B1 C {lab_pin.sym} 330 -400 0 0 {name=l2 sig_type=std_logic lab=A1} C {lab_pin.sym} 480 -250 0 0 {name=l3 sig_type=std_logic lab=0} C {res.sym} 580 -400 1 0 {name=R1 -value=ROUT +value='ROUT' footprint=1206 device=resistor m=1}