Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add resistor's parameters tc1 and tc2 to ngspice #434

Merged
merged 1 commit into from
Jan 6, 2024
Merged

Add resistor's parameters tc1 and tc2 to ngspice #434

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion qucs/components/capq.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ CapQ::CapQ()
QObject::tr("Q frequency profile")+
" [Linear, SquareRoot, Constant]"));
Props.append(new Property("Temp", "26.85", false,
QObject::tr("simulation temperature in degree Celsius")));
QObject::tr("simulation temperature in degree Celsius (Qucsator only)")));
}
CapQ::~CapQ()
{
Expand Down
2 changes: 1 addition & 1 deletion qucs/components/indq.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ IndQ::IndQ()
QObject::tr("Q frequency profile")+
" [Linear, SquareRoot, Constant]"));
Props.append(new Property("Temp", "26.85", false,
QObject::tr("simulation temperature in degree Celsius")));
QObject::tr("simulation temperature in degree Celsius (Qucsator only)")));
}
IndQ::~IndQ()
{
Expand Down
21 changes: 17 additions & 4 deletions qucs/components/resistor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ Resistor::Resistor(bool european)
Props.append(new Property("R", "1 kOhm", true,
QObject::tr("ohmic resistance in Ohms")));
Props.append(new Property("Temp", "26.85", false,
QObject::tr("simulation temperature in degree Celsius")));
QObject::tr("simulation temperature in degree Celsius (Qucsator only)")));
Props.append(new Property("Tc1", "0.0", false,
QObject::tr("first order temperature coefficient")));
Props.append(new Property("Tc2", "0.0", false,
QObject::tr("second order temperature coefficient")));
Props.append(new Property("Tnom", "26.85", false,
QObject::tr("temperature at which parameters were extracted")));
QObject::tr("temperature at which parameters were extracted (Qucsator only)")));

// this must be the last property in the list !!!
Props.append(new Property("Symbol", "european", false,
Expand All @@ -57,13 +57,26 @@ Component* Resistor::newOne()

QString Resistor::spice_netlist(bool )
{
QString s=spicecompat::check_refdes(Name,SpiceModel);
QString s = spicecompat::check_refdes(Name,SpiceModel);

s += QString(" %1 %2 ").arg(Ports.at(0)->Connection->Name)
.arg(Ports.at(1)->Connection->Name); // output 2 nodes
s.replace(" gnd ", " 0 ");

s += QString(" %1\n").arg(spicecompat::normalize_value(Props.at(0)->Value));
QString Tc1 = getProperty("Tc1")->Value;
QString Tc2 = getProperty("Tc2")->Value;

s += QString(" %1").arg(spicecompat::normalize_value(Props.at(0)->Value));

if (!Tc1.isEmpty()) {
s += " tc1=" + Tc1;
}

if (!Tc2.isEmpty()) {
s += " tc2=" + Tc2;
}

s += QString(" \n");

return s;
}
Expand Down